Fix for DPs not loading in tab when task change not detected (#1511)

Azure · Jul 30, 2018 · 6b17e10 · 6b17e10
1 parent 68b39c9
commit 6b17e10
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/app/components/pool/browse/pool-list.html b/app/components/pool/browse/pool-list.html
@@ -64,8 +64,7 @@
 
         <bl-column name="poolState">
             <div *blHeadCellDef>Node counts</div>
-            <div *blCellDef="let pool"> <bl-pool-state-graph [pool]="pool" [interactive]="false"></bl-pool-state-graph></div>
-
+            <div *blCellDef="let pool"><bl-pool-state-graph [pool]="pool" [interactive]="false"></bl-pool-state-graph></div>
         </bl-column>
     </bl-table>
 </bl-focus-section>

diff --git a/app/components/pool/browse/pool-list.scss b/app/components/pool/browse/pool-list.scss
@@ -14,4 +14,10 @@ bl-pool-list {
             right: 0;
         }
     }
+
+    bl-table {
+        bl-pool-state-graph {
+            height: 20px;
+        }
+    }
 }
diff --git a/app/components/task/details/task-dependency-browser/task-dependency-browser.component.ts b/app/components/task/details/task-dependency-browser/task-dependency-browser.component.ts
@@ -30,7 +30,9 @@ export class TaskDependencyBrowserComponent implements OnChanges {
             this._tasks.clear();
         }
 
-        if (changes.jobId || ComponentUtils.recordChangedId(changes.task)) {
+        if (changes.jobId
+            || ComponentUtils.recordChangedId(changes.task)
+            || ComponentUtils.recordChangedAttr(changes.task, "dependsOn")) {
             this._loaded = 0;
             this._refresh(this.task);
         }

diff --git a/app/utils/component-utils/component-utils.ts b/app/utils/component-utils/component-utils.ts
@@ -9,9 +9,17 @@ export class ComponentUtils {
      * @param change Simple change from ngOnChanges
      */
     public static recordChangedId(change: SimpleChange): boolean {
+        return this.recordChangedAttr(change, "id");
+    }
+
+    /**
+     * Return true if the record changed id
+     * @param change Simple change from ngOnChanges
+     */
+    public static recordChangedAttr(change: SimpleChange, attr: string): boolean {
         if (!change) { return false; }
         const { previousValue, currentValue } = change;
-        const same = previousValue && currentValue && previousValue.id === currentValue.id;
+        const same = previousValue && currentValue && previousValue[attr] === currentValue[attr];
         return !same;
     }
 

diff --git a/src/@batch-flask/ui/table/table.scss b/src/@batch-flask/ui/table/table.scss
@@ -173,7 +173,6 @@ bl-table {
         font-size: 13px;
         position: relative;
         white-space: nowrap;
-        height: $table-row-height;
 
         .cell-value {
             width: 98%;