Merge remote-tracking branch 'origin/candidate-9.8.x'

Signed-off-by: Gordon Smith <[email protected]>
AttilaVamos · Jul 5, 2024 · 0920e87 · 0920e87
2 parents 1f81c92 + 216dca1
commit 0920e87
Show file tree

Hide file tree

Showing 32 changed files with 482 additions and 85 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -102,11 +102,6 @@ jobs:
             name: docs
             documentation: true
           - os: ubuntu-20.04
-          - os: centos-8
-          - os: centos-7
-            cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
-          - os: amazonlinux
-            cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-amazonlinux-dynamic"
           - os: rockylinux-8
           - os: ubuntu-22.04
             name: LN k8s
@@ -121,22 +116,10 @@ jobs:
           - os: ubuntu-20.04
             name: LN
             ln: true
-          - os: centos-8
-            name: LN
-            cmake_options_extra: ""
-            ln: true
-          - os: centos-7
-            name: LN
-            cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
-            ln: true
           - os: rockylinux-8
             name: LN
             cmake_options_extra: ""
             ln: true
-          - os: centos-7-rh-python38
-            name: LN Python 3.8
-            cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic -DCUSTOM_LABEL=_rh_python38"
-            ln: true
       fail-fast: false
 
     steps:

diff --git a/.github/workflows/build-gh_runner.yml b/.github/workflows/build-gh_runner.yml
@@ -93,7 +93,6 @@ jobs:
             gnupg \
             groff-base \
             libtool \
-            pkg-config \
             software-properties-common \
             tar \
             unzip \

diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -10,9 +10,6 @@ on:
           - 'ubuntu-22.04'
           - 'ubuntu-20.04'
           - 'rockylinux-8'
-          - 'centos-8'
-          - 'centos-7'
-          - 'amazonlinux'
         description: 'Operating System'
         required: false
         default: 'ubuntu-22.04'
@@ -141,29 +138,6 @@ jobs:
       os: rockylinux-8
     secrets: inherit
 
-  build-docker-centos-8:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: centos-8
-    secrets: inherit
-
-  build-docker-centos-7:
-    if: ${{ contains('pull_request,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: centos-7
-      cmake-configuration-ex: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
-    secrets: inherit
-
-  build-docker-amazonlinux:
-    if: ${{ contains('schedule,push', github.event_name) }}
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      os: amazonlinux
-      cmake-configuration-ex: "-DVCPKG_TARGET_TRIPLET=x64-amazonlinux-dynamic"
-    secrets: inherit
-
   build-gh_runner-ubuntu-22_04:
     if: ${{ contains('schedule,push', github.event_name) }}
     uses: ./.github/workflows/build-gh_runner.yml

diff --git a/.github/workflows/test-smoke-gh_runner.yml b/.github/workflows/test-smoke-gh_runner.yml
@@ -17,7 +17,7 @@ on:
         type: string
         description: 'Dependencies'
         required: false
-        default: 'bison flex build-essential binutils-dev curl lsb-release libcppunit-dev python3-dev default-jdk r-base-dev r-cran-rcpp r-cran-rinside r-cran-inline pkg-config libtool autotools-dev automake git cmake xmlstarlet'
+        default: 'bison flex build-essential binutils-dev curl lsb-release libcppunit-dev python3-dev default-jdk r-base-dev r-cran-rcpp r-cran-rinside r-cran-inline libtool autotools-dev automake git cmake xmlstarlet'
 
 jobs:
 

diff --git a/.github/workflows/test-ui-gh_runner.yml b/.github/workflows/test-ui-gh_runner.yml
@@ -17,7 +17,7 @@ on:
         type: string
         description: 'Dependencies'
         required: false
-        default: 'bison flex build-essential binutils-dev curl lsb-release libcppunit-dev python3-dev default-jdk r-base-dev r-cran-rcpp r-cran-rinside r-cran-inline pkg-config libtool autotools-dev automake git cmake xmlstarlet'
+        default: 'bison flex build-essential binutils-dev curl lsb-release libcppunit-dev python3-dev default-jdk r-base-dev r-cran-rcpp r-cran-rinside r-cran-inline libtool autotools-dev automake git cmake xmlstarlet'
 
 jobs:
 

diff --git a/.github/workflows/test-unit-gh_runner.yml b/.github/workflows/test-unit-gh_runner.yml
@@ -17,7 +17,7 @@ on:
         type: string
         description: 'Dependencies'
         required: false
-        default: 'bison flex build-essential binutils-dev curl lsb-release libcppunit-dev python3-dev default-jdk r-base-dev r-cran-rcpp r-cran-rinside r-cran-inline pkg-config libtool autotools-dev automake git cmake xmlstarlet'
+        default: 'bison flex build-essential binutils-dev curl lsb-release libcppunit-dev python3-dev default-jdk r-base-dev r-cran-rcpp r-cran-rinside r-cran-inline libtool autotools-dev automake git cmake xmlstarlet'
 
 jobs:
 

diff --git a/docs/EN_US/ECLLanguageReference/ECLR_mods/Value-TypeCasting.xml b/docs/EN_US/ECLLanguageReference/ECLR_mods/Value-TypeCasting.xml
@@ -34,7 +34,7 @@ MyValue := (INTEGER) MAP(MyString = '1' =&gt; MyString, '0');
 MySet := (SET OF INTEGER1) [1,2,3,4,5,6,7,8,9,10];
           //casts from a SET OF INTEGER8 (the default) to SET OF INTEGER1
 
-UTPUT(MyBoolean);
+OUTPUT(MyBoolean);
 OUTPUT(MyString);
 OUTPUT(MyValue);
 OUTPUT(MySet);

diff --git a/esp/services/ws_workunits/ws_workunitsHelpers.hpp b/esp/services/ws_workunits/ws_workunitsHelpers.hpp
@@ -188,13 +188,15 @@ struct WUComponentLogOptions
         }
         else if (!isEmptyString(end))
         {
-            if (isEmptyString(end))
+            if (isEmptyString(start))
                 throw makeStringException(ECLWATCH_INVALID_INPUT, "ZapLogFilter: Empty 'Absolute TimeRange Start' detected!");
         }
         else
         {
             if (relativeTimeBufferSecs > 0 )
                 wuLogSearchTimeBuffSecs = relativeTimeBufferSecs;
+            else
+                throw makeStringException(ECLWATCH_INVALID_INPUT, "ZapLogFilter: Invalid 'TimeRange' detected!");
         }
     }
 
@@ -208,9 +210,9 @@ struct WUComponentLogOptions
             logDataFormat = logAccessFormatFromName(requestedLogDataFormat.str());
 
         StringBuffer start; // Absolute query time range start in YYYY-DD-MMTHH:MM:SS
-        zapHttpRequest->getParameter("LogFilter_AbsoluteTimeRange_Start", start);
+        zapHttpRequest->getParameter("LogFilter_AbsoluteTimeRange_StartDate", start);
         StringBuffer end; // Absolute query time range end in YYYY-DD-MMTHH:MM:SS
-        zapHttpRequest->getParameter("LogFilter_AbsoluteTimeRange_End", end);
+        zapHttpRequest->getParameter("LogFilter_AbsoluteTimeRange_EndDate", end);
         // Query time range based on WU Time +- Buffer in seconds
         unsigned bufferSecs = (unsigned)zapHttpRequest->getParameterInt("LogFilter_RelativeTimeRangeBuffer", 0);
 

diff --git a/esp/src/eclwatch/ShowIndividualPermissionsWidget.js b/esp/src/eclwatch/ShowIndividualPermissionsWidget.js
@@ -181,6 +181,7 @@ define([
                 evt.preventDefault();
                 context.calcPermissionState(evt.cell.column.field, evt.value, evt.cell.row.data);
                 evt.grid.store.put(evt.cell.row.data);
+                const t = window.setTimeout(() => { context.grid.refresh(); window.clearTimeout(t); }, 100);
             });
             return retVal;
         },

diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
diff --git a/esp/src/package.json b/esp/src/package.json
@@ -44,7 +44,7 @@
     "@hpcc-js/chart": "2.83.3",
     "@hpcc-js/codemirror": "2.62.0",
     "@hpcc-js/common": "2.71.17",
-    "@hpcc-js/comms": "2.92.2",
+    "@hpcc-js/comms": "2.92.3",
     "@hpcc-js/dataflow": "8.1.6",
     "@hpcc-js/eclwatch": "2.74.5",
     "@hpcc-js/graph": "2.85.15",

diff --git a/esp/src/src-react/components/FileDetails.tsx b/esp/src/src-react/components/FileDetails.tsx
@@ -41,10 +41,10 @@ export const FileDetails: React.FunctionComponent<FileDetailsProps> = ({
 }) => {
     const [file] = useFile(cluster, logicalFile);
     React.useEffect(() => {
-        if (file?.NodeGroup && cluster === undefined) {
+        if (file?.NodeGroup && cluster === undefined && !file?.isSuperfile) {
             replaceUrl(`/files/${file.NodeGroup}/${logicalFile}`);
         }
-    }, [cluster, file?.NodeGroup, logicalFile]);
+    }, [cluster, file?.NodeGroup, file?.isSuperfile, logicalFile]);
     const [defFile] = useDefFile(cluster, logicalFile, WsDfu.DFUDefFileFormat.def);
     const [xmlFile] = useDefFile(cluster, logicalFile, WsDfu.DFUDefFileFormat.xml);
 

diff --git a/esp/src/src-react/components/LogicalFileSummary.tsx b/esp/src/src-react/components/LogicalFileSummary.tsx
@@ -181,7 +181,7 @@ export const LogicalFileSummary: React.FunctionComponent<LogicalFileSummaryProps
             <TableGroup fields={{
                 "Wuid": { label: nlsHPCC.Workunit, type: "link", value: file?.Wuid, href: `#/${isDFUWorkunit ? "dfu" : ""}workunits/${file?.Wuid}`, readonly: true, },
                 "Owner": { label: nlsHPCC.Owner, type: "string", value: file?.Owner, readonly: true },
-                "SuperOwner": { label: nlsHPCC.SuperFile, type: "links", links: file?.Superfiles?.DFULogicalFile?.map(row => ({ label: "", type: "link", value: row.Name, href: `#/files/${row.Name}` })) },
+                "SuperOwner": { label: nlsHPCC.SuperFile, type: "links", links: file?.Superfiles?.DFULogicalFile?.map(row => ({ label: "", type: "link", value: row.Name, href: `#/files/${row.NodeGroup !== null ? row.NodeGroup : undefined}/${row.Name}` })) },
                 "NodeGroup": { label: nlsHPCC.ClusterName, type: "string", value: file?.NodeGroup, readonly: true },
                 "Description": { label: nlsHPCC.Description, type: "string", value: description },
                 "JobName": { label: nlsHPCC.JobName, type: "string", value: file?.JobName, readonly: true },

diff --git a/esp/src/src-react/components/Metrics.tsx b/esp/src/src-react/components/Metrics.tsx
@@ -450,6 +450,7 @@ export const Metrics: React.FunctionComponent<MetricsProps> = ({
     const propsTable2 = useConst(() => new Table()
         .columns([nlsHPCC.Property, nlsHPCC.Value])
         .columnWidth("auto")
+        .sortable(true)
     );
 
     const updatePropsTable2 = React.useCallback((selection: IScope[]) => {

diff --git a/esp/src/src-react/components/MetricsPropertiesTables.tsx b/esp/src/src-react/components/MetricsPropertiesTables.tsx
@@ -23,6 +23,7 @@ export const MetricsPropertiesTables: React.FunctionComponent<MetricsPropertiesT
     const propsTable = useConst(() => new Table()
         .columns([nlsHPCC.Property, nlsHPCC.Value, "Avg", "Min", "Max", "Delta", "StdDev", "SkewMin", "SkewMax", "NodeMin", "NodeMax"])
         .columnWidth("auto")
+        .sortable(true)
     );
 
     React.useEffect(() => {