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

…9.4.x Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Nov 22, 2023 · 637ecf2 · 637ecf2
2 parents 7094fa3 + 0078472
commit 637ecf2
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 32 deletions.
diff --git a/ecl/hql/hqlgram2.cpp b/ecl/hql/hqlgram2.cpp
@@ -9700,11 +9700,11 @@ void HqlGram::checkDerivedCompatible(IIdAtom * name, IHqlExpression * scope, IHq
             if (match)
             {
                 if (!canBeVirtual(match))
-                    reportError(ERR_MISMATCH_PROTO, errpos, "Definition %s, cannot override this kind of definition", str(name));
+                    reportError(ERR_MISMATCH_PROTO, errpos, "Definition %s, cannot override this kind of definition", nullText(str(name)));
                 else
                 {
                     if (!areSymbolsCompatible(expr, isParametered, parameters, match))
-                        reportError(ERR_MISMATCH_PROTO, errpos, "Prototypes for %s in base and derived modules must match", str(name));
+                        reportError(ERR_MISMATCH_PROTO, errpos, "Prototypes for %s in base and derived modules must match", nullText(str(name)));
                 }
             }
         }

diff --git a/esp/services/ws_workunits/ws_workunitsService.cpp b/esp/services/ws_workunits/ws_workunitsService.cpp
@@ -3638,6 +3638,16 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons
                             {
                                 jobName.set(cw->queryJobName());
                                 owner.set(cw->queryUser());
+                                if ((cw->getState() == WUStateScheduled) && cw->aborting())
+                                {
+                                    stateID = WUStateAborting;
+                                    state.set("aborting");
+                                }
+                                else
+                                {
+                                    stateID = cw->getState();
+                                    state.set(cw->queryStateDesc());
+                                }
                             }
 
                             if (!filters->jobName.isEmpty() && (jobName.isEmpty() || !WildMatch(jobName.str(), filters->jobName, true)))
@@ -3646,26 +3656,8 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons
                                 match =  false;
                             else if (!filters->eventText.isEmpty() && (ieventText.isEmpty() || !WildMatch(ieventText, filters->eventText, true)))
                                 match =  false;
-                            else if (!filters->state.isEmpty())
-                            {
-                                if (!cw)
-                                    match =  false;
-                                else
-                                {
-                                    if ((cw->getState() == WUStateScheduled) && cw->aborting())
-                                    {
-                                        stateID = WUStateAborting;
-                                        state.set("aborting");
-                                    }
-                                    else
-                                    {
-                                        stateID = cw->getState();
-                                        state.set(cw->queryStateDesc());
-                                    }
-                                    if (!strieq(filters->state, state.str()))
-                                        match =  false;
-                                }
-                            }
+                            else if (!filters->state.isEmpty() && !strisame(filters->state, state.str()))
+                                match =  false;
                         }
                         catch (IException *e)
                         {

diff --git a/esp/src/eclwatch/PermissionsWidget.js b/esp/src/eclwatch/PermissionsWidget.js
@@ -11,7 +11,12 @@ define([
     "hpcc/GridDetailsWidget",
     "src/ws_access",
     "src/ESPUtil",
-    "src/Utility"
+    "src/Utility",
+
+    "dijit/Dialog",
+    "dijit/form/TextBox",
+
+    "hpcc/TableContainer"
 
 ], function (declare, nlsHPCCMod,
     registry, CheckBox,

diff --git a/esp/src/eclwatch/ShowAccountPermissionsWidget.js b/esp/src/eclwatch/ShowAccountPermissionsWidget.js
@@ -13,7 +13,12 @@ define([
     "src/ws_access",
     "src/ESPUtil",
     "src/Utility",
-    "hpcc/ShowInheritedPermissionsWidget"
+    "hpcc/ShowInheritedPermissionsWidget",
+
+    "dijit/Dialog",
+    "dijit/form/TextBox",
+
+    "hpcc/TableContainer"
 
 ], function (declare, lang, nlsHPCCMod, arrayUtil,
     registry, CheckBox,

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
@@ -42,7 +42,7 @@
     "@hpcc-js/chart": "2.81.7",
     "@hpcc-js/codemirror": "2.60.12",
     "@hpcc-js/common": "2.71.12",
-    "@hpcc-js/comms": "2.84.4",
+    "@hpcc-js/comms": "2.85.0",
     "@hpcc-js/dataflow": "8.1.6",
     "@hpcc-js/eclwatch": "2.73.27",
     "@hpcc-js/graph": "2.85.8",

diff --git a/esp/src/src-react/hooks/workunit.ts b/esp/src/src-react/hooks/workunit.ts
@@ -23,7 +23,7 @@ export function useWorkunit(wuid: string, full: boolean = false): [Workunit, WUS
         let active = true;
         let handle;
         const refresh = singletonDebounce(wu, "refresh");
-        refresh(full)
+        refresh(full, { IncludeTotalClusterTime: true })
             .then(() => {
                 if (active) {
                     setRetVal({ workunit: wu, state: wu.StateID, lastUpdate: Date.now(), isComplete: wu.isComplete(), refresh });

diff --git a/esp/src/src-react/layouts/DojoAdapter.tsx b/esp/src/src-react/layouts/DojoAdapter.tsx
@@ -60,8 +60,12 @@ export const DojoAdapter: React.FunctionComponent<DojoAdapterProps> = ({
                     },
                     ...delayProps
                 }, elem);
-                widget.startup();
-                widget.resize();
+                if (widget.startup) {
+                    widget.startup();
+                }
+                if (widget.resize) {
+                    widget.resize();
+                }
                 if (widget.init) {
                     widget.init(params || {});
                 }

diff --git a/system/jlib/jsecrets.cpp b/system/jlib/jsecrets.cpp
@@ -31,6 +31,9 @@
 #if defined(__clang__) || defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
+//httplib also generates warning about access outside of array bounds in gcc
+#pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
 
 #ifdef _USE_OPENSSL