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

…9.4.x
hpcc-systems · Dec 7, 2023 · c3a5532 · c3a5532
2 parents e4ed087 + e750598
commit c3a5532
Show file tree

Hide file tree

Showing 26 changed files with 1,851 additions and 103 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -112,6 +112,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"

diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "esp/src/xstyle"]
-	path = esp/src/xstyle
-	url = https://github.com/hpcc-systems/xstyle.git
-[submodule "esp/src/put-selector"]
-	path = esp/src/put-selector
-	url = https://github.com/hpcc-systems/put-selector.git
 [submodule "esp/src/dgrid"]
 	path = esp/src/dgrid
 	url = https://github.com/hpcc-systems/dgrid.git

diff --git a/esp/src/.vscode/tasks.json b/esp/src/.vscode/tasks.json
@@ -47,7 +47,9 @@
                 "tsc watch",
                 "webpack-dev-server"
             ],
-            "group": "build",
+            "group": {
+                "kind": "build"
+            },
             "problemMatcher": []
         },
         {

diff --git a/esp/src/CMakeLists.txt b/esp/src/CMakeLists.txt
@@ -28,10 +28,8 @@ file(COPY
     ${CMAKE_CURRENT_SOURCE_DIR}/eslint
     ${CMAKE_CURRENT_SOURCE_DIR}/ganglia
     ${CMAKE_CURRENT_SOURCE_DIR}/loader
-    ${CMAKE_CURRENT_SOURCE_DIR}/put-selector
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/src-react
-    ${CMAKE_CURRENT_SOURCE_DIR}/xstyle
     ${CMAKE_CURRENT_SOURCE_DIR}/.eslintrc.js
     ${CMAKE_CURRENT_SOURCE_DIR}/GetUserName.html
     ${CMAKE_CURRENT_SOURCE_DIR}/index.html

diff --git a/esp/src/eclwatch/InfoGridWidget.js b/esp/src/eclwatch/InfoGridWidget.js
@@ -222,7 +222,7 @@ define([
                 this.widget.ErrWarnDialogTextArea.domNode.select();
             },
             _onDownload: function (evt) {
-                Utility.downloadText(Utility.toCSV(this.infoData, ","), "ErrWarn.csv");
+                Utility.downloadCSV(Utility.toCSV(this.infoData, ","), "ErrWarn.csv");
             },
 
             _onErrors: function (args) {

diff --git a/esp/src/eclwatch/css/hpcc.css b/esp/src/eclwatch/css/hpcc.css
@@ -1297,6 +1297,7 @@ table.miniSelect span {
 .WarningCell {
     padding-left: 4px;
     background: yellow;
+    color: black;
 }
 
 .NormalCell {