Enable node communication mode editing

This was only enabled in dev mode before. Now that we've updated to the latest API version, we can enable in production.
Azure · Oct 16, 2023 · 75c8c8f · 75c8c8f
1 parent cbd42c1
commit 75c8c8f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 7 deletions.
diff --git a/desktop/src/app/components/pool/details/configuration/pool-configuration.component.ts b/desktop/src/app/components/pool/details/configuration/pool-configuration.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, isDevMode } from "@angular/core";
+import { Component, Input } from "@angular/core";
 import { autobind } from "@batch-flask/core";
 import { SidebarManager } from "@batch-flask/ui/sidebar";
 import { EditMetadataFormComponent } from "app/components/common/edit-metadata-form";
@@ -27,13 +27,25 @@ export class PoolConfigurationComponent {
     }
     public get pool() { return this._pool; }
 
-    public isDevMode: boolean = isDevMode();
-
     public decorator: PoolDecorator;
     public certificates: List<CertificateReference>;
     public appPackages: List<ApplicationPackageReference>;
     public metadata: List<Metadata> = List([]);
 
+    public get nodeCommSummary(): string {
+        const current = this._pool.currentNodeCommunicationMode;
+        const currentLabel = this.decorator.currentNodeCommunicationMode;
+
+        const target = this._pool.targetNodeCommunicationMode;
+        const targetLabel = this.decorator.targetNodeCommunicationMode;
+
+        if (target === "default" || current === target) {
+            return currentLabel;
+        } else {
+            return `${currentLabel} -> ${targetLabel}`;
+        }
+    }
+
     private _pool: Pool;
 
     constructor(private sidebarManager: SidebarManager,

diff --git a/desktop/src/app/components/pool/details/configuration/pool-configuration.html b/desktop/src/app/components/pool/details/configuration/pool-configuration.html
@@ -155,10 +155,9 @@
             </bl-no-item>
         </bl-property-group>
 
-        <!-- TODO: Remove ngIf="isDevMode" (and the isDevMode property) when the API version is updated to support node communication mode -->
-        <bl-property-group *ngIf="isDevMode" label="Node communication" class="wide" [collapsed]="true"  [edit]="editNodeComms">
+        <bl-property-group label="Node communication" class="wide" [collapsed]="true"  [edit]="editNodeComms">
             <div collapsed-preview>
-                <span>{{decorator.currentNodeCommunicationMode}}</span>
+                <span>{{nodeCommSummary}}</span>
             </div>
             <bl-text-property label="Current mode" value="{{decorator.currentNodeCommunicationMode || 'N/A'}}"></bl-text-property>
             <bl-text-property label="Target mode" value="{{decorator.targetNodeCommunicationMode || 'Default'}}"></bl-text-property>

diff --git a/desktop/src/app/decorators/pool-decorator.ts b/desktop/src/app/decorators/pool-decorator.ts
@@ -1,6 +1,11 @@
 import { StartTaskDecorator } from "app/decorators/start-task.decorator";
 import {
-    ApplicationPackageReference, CertificateReference, Pool, UserAccount, UserAccountElevationLevel,
+    ApplicationPackageReference,
+    CertificateReference,
+    NodeCommunicationMode,
+    Pool,
+    UserAccount,
+    UserAccountElevationLevel,
 } from "app/models";
 import { PoolUtils } from "app/utils";
 import { DecoratorBase } from "app/utils/decorators";
@@ -41,6 +46,8 @@ export class PoolDecorator extends DecoratorBase<Pool> {
     public networkSubnetId: string;
     public startTask: StartTaskDecorator;
     public applicationLicenses: string;
+    public targetNodeCommunicationMode?: string;
+    public currentNodeCommunicationMode?: string;
 
     public get routerLink() {
         return this.pool.routerLink;
@@ -69,6 +76,8 @@ export class PoolDecorator extends DecoratorBase<Pool> {
         this.startTask = pool.startTask && new StartTaskDecorator(pool.startTask);
         this.lowPriorityNodes = PoolUtils.poolNodesStatus(pool,
             pool.currentLowPriorityNodes, pool.targetLowPriorityNodes);
+        this.targetNodeCommunicationMode = this._nodeCommsField(pool.targetNodeCommunicationMode);
+        this.currentNodeCommunicationMode = this._nodeCommsField(pool.currentNodeCommunicationMode);
 
         this.poolOs = this._computePoolOs();
 
@@ -94,4 +103,17 @@ export class PoolDecorator extends DecoratorBase<Pool> {
         }
         return user.name;
     }
+
+    private _nodeCommsField(value: NodeCommunicationMode): string {
+        switch (value) {
+            case "default":
+                return "Default";
+            case "classic":
+                return "Classic";
+            case "simplified":
+                return "Simplified";
+            default:
+                return value;
+        }
+    }
 }