Update project object on projectCreation event (#243)

eclipse-archived/codewind#720 Signed-off-by: Tim Etchells <[email protected]>
eclipse-archived · Oct 18, 2019 · 569face · 569face
1 parent 3b15891
commit 569face
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/dev/src/codewind/connection/MCSocket.ts b/dev/src/codewind/connection/MCSocket.ts
@@ -65,8 +65,9 @@ export default class MCSocket implements vscode.Disposable {
             .on("connect",      this.connection.onConnect)      // non-nls
             .on("disconnect",   this.connection.onDisconnect)   // non-nls
 
-            // .on(SocketEvents.Types.PROJECT_CREATED,         this.onProjectCreated)
-            .on(SocketEvents.Types.PROJECT_BOUND,           this.onProjectCreated)
+            .on(SocketEvents.Types.PROJECT_BOUND,           this.onProjectBound)
+
+            .on(SocketEvents.Types.PROJECT_CREATED,         this.onProjectCreation)
             .on(SocketEvents.Types.PROJECT_CHANGED,         this.onProjectChanged)
             .on(SocketEvents.Types.PROJECT_STATUS_CHANGED,  this.onProjectStatusChanged)
             .on(SocketEvents.Types.PROJECT_CLOSED,          this.onProjectClosed)
@@ -91,7 +92,7 @@ export default class MCSocket implements vscode.Disposable {
         this.socket.disconnect();
     }
 
-    private readonly onProjectCreated = async (payload: { success: boolean; projectID?: string; error?: string; }): Promise<void> => {
+    private readonly onProjectBound = async (payload: { success: boolean; projectID?: string; error?: string; }): Promise<void> => {
         await this.connection.forceUpdateProjectList();
 
         if (payload.projectID) {
@@ -120,9 +121,15 @@ export default class MCSocket implements vscode.Disposable {
         }
     }
 
+    private readonly onProjectCreation = async (payload: any): Promise<void> => {
+        // https://github.com/eclipse/codewind/issues/720#issuecomment-543801321
+        // creation event is now, apparently, the same as changed event
+        this.onProjectChanged(payload);
+    }
+
     private readonly onProjectStatusChanged = async (payload: { projectID: string }): Promise<void> => {
         // Log.d("onProjectStatusChanged", payload);
-        // I don't see any reason why these should be handled differently
+        // portal emits the entire inf file with a statusChanged event, so we can treat this the same as projectChanged
         this.onProjectChanged(payload);
     }
 

diff --git a/dev/src/codewind/project/Project.ts b/dev/src/codewind/project/Project.ts
@@ -224,7 +224,7 @@ export default class Project implements vscode.QuickPickItem {
         }
 
         const ports = projectInfo.ports;
-        if (ports != null) {
+        if (ports) {
             this.updatePorts(ports);
         }
         else if (this._state.isStarted) {
@@ -596,8 +596,10 @@ export default class Project implements vscode.QuickPickItem {
         }
         else if (currentPort !== newPortNumber) {
             if (isNaN(newPortNumber)) {
+                if (this._ports[portType]) {
+                    Log.d(`Unset ${portType} for ${this.name}`);
+                }
                 this._ports[portType] = undefined;
-                // Log.d(`Unset ${portType} for ${this.name}`);
             }
             else if (newPortNumber !== currentPort) {
                 Log.d(`New ${portType} for ${this.name} is ${newPortNumber}`);