Merge remote-tracking branch 'origin/candidate-9.4.x' into candidate-…

…9.6.x Signed-off-by: Jake Smith <[email protected]>
hpcc-systems · May 2, 2024 · 4be19cb · 4be19cb
2 parents 4713168 + 9a40cd6
commit 4be19cb
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/common/pkgfiles/referencedfilelist.cpp b/common/pkgfiles/referencedfilelist.cpp
@@ -228,7 +228,7 @@ class ReferencedFileList : implements IReferencedFileList, public CInterface
     ReferencedFileList(const char *username, const char *pw, bool allowForeignFiles, bool allowFileSizeCalc, const char *_jobname)
         : jobName(_jobname), allowForeign(allowForeignFiles), allowSizeCalc(allowFileSizeCalc)
     {
-        if (username && pw)
+        if (username)
         {
             user.setown(createUserDescriptor());
             user->set(username, pw);

diff --git a/esp/services/ws_packageprocess/ws_packageprocessService.cpp b/esp/services/ws_packageprocess/ws_packageprocessService.cpp
@@ -319,7 +319,7 @@ class PackageMapUpdater
     }
     void setUser(const char *user, const char *password, IEspContext *context)
     {
-        if (user && *user && password && *password)
+        if (user && *user)
         {
             userdesc.setown(createUserDescriptor());
             userdesc->set(user, password);

diff --git a/esp/src/eclwatch/_Widget.js b/esp/src/eclwatch/_Widget.js
@@ -130,22 +130,22 @@ define([
             return retVal;
         },
 
-        getURL: function () {
+        getURL: function (componentFilterParams) {
             var baseUrl = document.URL.split("#")[0].replace("index.html", "stub.htm");
             var baseUrlParts = baseUrl.split("?");
             baseUrl = baseUrlParts[0];
             var args = baseUrlParts[1];
             delete this.params.__filter;
-            var filterParams = this.getFilterParams();
+            var filterParams = componentFilterParams ? componentFilterParams : this.getFilterParams();
             if (filterParams) {
                 this.params.__filter = ioQuery.objectToQuery(filterParams);
             }
             var paramsString = ioQuery.objectToQuery(this.params);
             return baseUrl + "?" + paramsString;
         },
 
-        _onNewPage: function (event) {
-            var win = window.open(this.getURL(), "_blank");
+        _onNewPage: function (_event, componentFilterParams) {
+            var win = window.open(this.getURL(componentFilterParams), "_blank");
             if (win) {
                 win.focus();
             }

diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
diff --git a/esp/src/src-react/components/Security.tsx b/esp/src/src-react/components/Security.tsx
@@ -28,6 +28,20 @@ export const Security: React.FunctionComponent<SecurityProps> = ({
 
     const [, { opsCategory }] = useBuildInfo();
 
+    const [permissionTabTitle, setPermissionTabTitle] = React.useState(nlsHPCC.Permissions);
+
+    React.useEffect(() => {
+        setPermissionTabTitle(nlsHPCC.Permissions);
+        if (name === "_") {
+            if (baseDn === "File Scopes") setPermissionTabTitle(nlsHPCC.FileScopeDefaultPermissions);
+            else if (baseDn === "Workunit Scopes") setPermissionTabTitle(nlsHPCC.WorkUnitScopeDefaultPermissions);
+        } else if (name === "file") {
+            if (baseDn === "File Scopes") setPermissionTabTitle(nlsHPCC.PhysicalFiles);
+        } else if (name) {
+            setPermissionTabTitle(name);
+        }
+    }, [name, baseDn]);
+
     return <>
         <SizeMe monitorHeight>{({ size }) =>
             <Pivot
@@ -40,7 +54,7 @@ export const Security: React.FunctionComponent<SecurityProps> = ({
                 <PivotItem headerText={nlsHPCC.Groups} itemKey="groups" style={pivotItemStyle(size)}>
                     <Groups page={page} />
                 </PivotItem>
-                <PivotItem headerText={nlsHPCC.Permissions} itemKey="permissions" style={pivotItemStyle(size)}>
+                <PivotItem headerText={permissionTabTitle} itemKey="permissions" style={pivotItemStyle(size)}>
                     {!name && !baseDn &&
                         <Permissions />
                     }

diff --git a/esp/src/src/react/recentFilters.tsx b/esp/src/src/react/recentFilters.tsx
@@ -37,7 +37,7 @@ export const RecentFilters: React.FunctionComponent<RecentFilterProps> = ({
 
     const handleClick = (e) => {
         const tempObj = JSON.parse(decodeURIComponent(e.currentTarget.value));
-        widget.NewPage.onClick(tempObj);
+        widget.NewPage.onClick(e, tempObj);
     };
 
     const shimmerElements = React.useMemo(() => [

diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
@@ -1339,7 +1339,7 @@ Pass in dict with root, me and instances defined
 {{- $stubInstanceResources := .stubResources | default .root.Values.global.stubInstanceResources | default dict }}
 {{- $milliCPUText := $stubInstanceResources.cpu | default "200m" }}
 {{- $milliCPUs := int (include "hpcc.k8sCPUStringToMilliCPU" $milliCPUText) }}
-{{- $memoryText := $stubInstanceResources.memory | default "50Mi" }}
+{{- $memoryText := $stubInstanceResources.memory | default "400Mi" }}
 {{- $memory := int64 (include "hpcc.k8sMemoryStringToBytes" $memoryText) }}
 resources:
   limits: