Further progress tweaks

Author: matthewpwilson

__tests__/api/BundlePush/SubtaskWithStatus.test.ts

@@ -76,4 +76,26 @@ describe("SubtaskWithStatus", () => {
         subTask.percentComplete = 50;
         expect(subTask.percentComplete).toEqual(50);
     });
+
+    it("should allow really small increments", () => {
+        const subTask = new SubtaskWithStatus(parentTask, 40);
+        subTask.percentComplete = 50;
+        for (let i = 0; i < 40; i++) {
+            subTask.percentComplete += 0.25;
+        }
+        expect(parentTask.percentComplete).toBeCloseTo(24);
+
+    });
+
+    it("should return subtask stage", () => {
+        const subTask = new SubtaskWithStatus(parentTask, 40);
+        subTask.stageName = TaskStage.IN_PROGRESS;
+        expect(subTask.stageName).toEqual(TaskStage.IN_PROGRESS);
+    });
+
+    it("should return subtask status message", () => {
+        const subTask = new SubtaskWithStatus(parentTask, 40);
+        subTask.statusMessage = "Status";
+        expect(subTask.statusMessage).toEqual("Status");
+    });
 });

src/api/BundleDeploy/BundleDeployer.ts

@@ -271,7 +271,7 @@ export class BundleDeployer {
 
   private updateProgressBar(action: string) {
     // Increment the progress bar. This will refresh what the user sees on the console.
-    this.progressBar.percentComplete += this.PROGRESS_BAR_INCREMENT;
+    this.progressBar.percentComplete = this.progressBar.percentComplete + this.PROGRESS_BAR_INCREMENT;
 
     // Have a look at the status message for the progress bar, has it been updated with
     // the jobid yet? If so, parse it out and refresh the message.

src/api/BundlePush/BundlePusher.ts

@@ -328,7 +328,6 @@ export class BundlePusher {
   private async undeployExistingBundle(zosMFSession: AbstractSession, bd: BundleDeployer) {
     // End the current progress bar so that UNDEPLOY can create its own
     this.updateStatus("Undeploying bundle '" + this.params.arguments.name + "' from CICS");
-    this.endProgressBar();
 
     const targetstateLocal = this.params.arguments.targetstate;
     this.params.arguments.targetstate = "DISCARDED";
@@ -350,7 +349,7 @@ export class BundlePusher {
     let deployError: Error;
     let dfhdployOutput = "";
     try {
-      await bd.deployBundle(zosMFSession,subtask);
+      await bd.deployBundle(zosMFSession, subtask);
     }
     catch (error) {
       // temporarily ignore the error as we might want to generate additional resource

src/api/BundlePush/SubtaskWithStatus.ts

@@ -1,4 +1,4 @@
-import { ITaskWithStatus, TaskProgress, TaskStage, ImperativeExpect, ImperativeError} from "@zowe/imperative";
+import { ITaskWithStatus, TaskProgress, TaskStage, ImperativeExpect, ImperativeError, Logger} from "@zowe/imperative";
 
 
 export class SubtaskWithStatus {
@@ -20,12 +20,20 @@ export class SubtaskWithStatus {
         this.parent.statusMessage = statusMessage;
     }
 
+    public get statusMessage() {
+        return this.parent.statusMessage;
+    }
+
     public set stageName(stageName: TaskStage) {
         if (stageName !== TaskStage.COMPLETE && stageName !== TaskStage.NOT_STARTED) {
             this.parent.stageName = stageName;
         }
     }
 
+    public get stageName() {
+        return this.parent.stageName;
+    }
+
     public set percentComplete(percentComplete: number) {
         const delta = percentComplete - this.percentCompleteInternal;
         this.percentCompleteInternal = percentComplete;