Преглед изворни кода

Merge pull request #12717 from GordonSmith/HPCC-22391

HPCC-22391: ECL Watch add Data Patterns Message

Reviewed-By: Miguel Vazquez <miguel.vazquez@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman пре 6 година
родитељ
комит
2f2614e101
2 измењених фајлова са 26 додато и 2 уклоњено
  1. 2 0
      esp/src/eclwatch/nls/hpcc.js
  2. 24 2
      esp/src/src/DataPatternsWidget.ts

+ 2 - 0
esp/src/eclwatch/nls/hpcc.js

@@ -132,6 +132,8 @@ define({root:
     Dali: "Dali",
     DaliIP: "DaliIP",
     DataPatterns: "Data Patterns",
+    DataPatternsNotStarted: "Analysis not found.  To start, press Analyze button above.",
+    DataPatternsStarted: "Analysing.  Once complete report will display here.",
     dataset: ":=dataset*",
     Date: "Date",
     Day: "Day",

+ 24 - 2
esp/src/src/DataPatternsWidget.ts

@@ -113,7 +113,6 @@ export class DataPatternsWidget {
             .baseUrl("")
             ;
         this.dpReport = new Report();
-
     }
 
     startup(args) {
@@ -234,6 +233,7 @@ export class DataPatternsWidget {
                     this._wu.watchUntilComplete(changes => {
                         if (this._wu && this._wu.isComplete()) {
                             this.dpReport
+                                .visible(true)
                                 .wu(this._dpWu)
                                 .render(w => {
                                     w
@@ -244,6 +244,11 @@ export class DataPatternsWidget {
                         }
                         this.refreshActionState();
                     });
+                } else {
+                    this.dpReport
+                        .visible(false)
+                        .render()
+                        ;
                 }
             }
             this.refreshActionState();
@@ -270,6 +275,23 @@ export class DataPatternsWidget {
         domClass.add(this.id + "StateIdImage", stateIconClass);
 
         d3Select(`#${this.id}WU`).style("display", isComplete ? "none" : null);
-        d3Select(`#${this.id}DPReport`).style("display", isComplete ? null : "none");
+
+        const msg = [];
+        if (!this._wu) {
+            msg.push(this.i18n.DataPatternsNotStarted);
+        } else if (!this._wu.isComplete()) {
+            msg.push(this.i18n.DataPatternsStarted);
+        }
+
+        const dpMessage = d3Select(`#${this.id + "DPReport"}`).selectAll(".DPMessage").data(msg);
+        dpMessage.enter().insert("p", ":first-child")
+            .attr("class", "DPMessage")
+            .style("text-align", "center")
+            .merge(dpMessage as any)
+            .text(d => d)
+            ;
+        dpMessage.exit()
+            .remove()
+            ;
     }
 }