Merge branch 'candidate-7.10.x'

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Aug 28, 2020 · 41783a0 · 41783a0
2 parents b76af64 + bf01bd5
commit 41783a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/esp/src/src/DataPatterns/AttributeDesc.ts b/esp/src/src/DataPatterns/AttributeDesc.ts
@@ -64,7 +64,7 @@ class AttributeSummary extends StyledTable {
         this
             .data([
                 ["Cardinality", row.cardinality, "(~" + (row.cardinality / row.fill_count * 100).toFixed(0) + "%)"],
-                ["Filled", row.fill_count, fillRate <= config.fillRateRedThreshold ? `(<b style="color:${config.redColor}">` + fillRate + "%</b>)" : "(" + fillRate + "%)"]
+                ["Filled", row.fill_count, "(" + fillRate + "%)"]
             ])
             .tbodyColumnStyles([
                 { "font-weight": "bold", "font-size": config.secondaryFontSize + "px", "width": "1%" },

diff --git a/esp/src/src/DataPatterns/config.ts b/esp/src/src/DataPatterns/config.ts
@@ -13,6 +13,5 @@ export const config = {
     secondaryColor: "#DDD",
     offwhiteColor: "#FBFBFB",
     blueColor: "#1A99D5",
-    redColor: "#ED1C24",
-    fillRateRedThreshold: 33
+    redColor: "#ED1C24"
 };
diff --git a/esp/src/util/genLangTypes.js b/esp/src/util/genLangTypes.js
@@ -3,7 +3,7 @@
 
 const fs = require('fs');
 
-globalThis.define = nlsHPCC => {
+global.define = nlsHPCC => {
     fs.writeFileSync('./src/nlsHPCCType.ts', `\
 export default interface nlsHPCC {
 ${Object.keys(nlsHPCC.root).map(id => `    ${id}: string;`).join("\n")}