review tidyups

Signed-off-by: Andrew Twydell <[email protected]>

Author: AndrewTwydell

packages/vsce/src/commands/disableCommands/disableBundleCommand.ts

@@ -28,8 +28,11 @@ export function getDisableBundleCommand(tree: CICSTree, treeview: TreeView<any>)
       return;
     }
 
-    await disableTreeItem(nodes, tree, undefined, (response) => {
-      return response.records?.cicsbundle?.enablestatus.toUpperCase() === "DISABLED";
-    });
+    await disableTreeItem(
+      nodes,
+      tree,
+      undefined,
+      (response) => response.records?.cicsbundle?.enablestatus.toUpperCase() === "DISABLED"
+    );
   });
 }

packages/vsce/src/commands/disableCommands/disableJVMEndpointCommand.ts

@@ -32,11 +32,12 @@ export function getDisableJVMEndpointCommand(tree: CICSTree, treeview: TreeView<
         return;
       }
 
-      await disableTreeItem(nodes, tree, (node: CICSResourceContainerNode<IJVMServer>) => {
-        return node.getContainedResource().resource.attributes;
-      }, (response) => {
-        return response.records?.cicsjvmendpoint?.enablestatus.toUpperCase() === "DISABLED";
-      });
+      await disableTreeItem(
+        nodes,
+        tree,
+        (node: CICSResourceContainerNode<IJVMServer>) => node.getContainedResource().resource.attributes,
+        (response) => response.records?.cicsjvmendpoint?.enablestatus.toUpperCase() === "DISABLED"
+      );
     }
   );
 }

packages/vsce/src/commands/disableCommands/disableJVMServerCommand.ts

@@ -38,11 +38,15 @@ export function getDisableJVMServerCommand(tree: CICSTree, treeview: TreeView<an
 
     disableType = disableType.replace(" ", "").toUpperCase();
 
-    await disableTreeItem(nodes, tree, undefined, (response) => {
-      return response.records?.cicsjvmserver?.enablestatus.toUpperCase() === "DISABLED";
-    }, {
-      name: "PURGETYPE",
-      value: disableType
-    });
+    await disableTreeItem(
+      nodes,
+      tree,
+      undefined,
+      (response) => response.records?.cicsjvmserver?.enablestatus.toUpperCase() === "DISABLED",
+      {
+        name: "PURGETYPE",
+        value: disableType
+      }
+    );
   });
 }

packages/vsce/src/commands/enableCommands/enableBundleCommand.ts

@@ -28,8 +28,11 @@ export function getEnableBundleCommand(tree: CICSTree, treeview: TreeView<any>)
       return;
     }
 
-    await enableTreeItem(nodes, tree, undefined, (response) => {
-      return response.records?.cicsbundle?.enablestatus.toUpperCase() === "ENABLED";
-    });
+    await enableTreeItem(
+      nodes,
+      tree,
+      undefined,
+      (response) => response.records?.cicsbundle?.enablestatus.toUpperCase() === "ENABLED"
+    );
   });
 }

packages/vsce/src/commands/enableCommands/enableJVMEndpointCommand.ts

@@ -30,10 +30,11 @@ export function getEnableJVMEndpointCommand(tree: CICSTree, treeview: TreeView<a
       return;
     }
 
-    await enableTreeItem(nodes, tree, (node: CICSResourceContainerNode<IJVMServer>) => {
-      return node.getContainedResource().resource.attributes;
-    }, (response) => {
-      return response.records?.cicsjvmendpoint?.enablestatus.toUpperCase() === "ENABLED";
-    });
+    await enableTreeItem(
+      nodes,
+      tree,
+      (node: CICSResourceContainerNode<IJVMServer>) => node.getContainedResource().resource.attributes,
+      (response) => response.records?.cicsjvmendpoint?.enablestatus.toUpperCase() === "ENABLED"
+    );
   });
 }

packages/vsce/src/commands/enableCommands/enableJVMServerCommand.ts

@@ -28,8 +28,11 @@ export function getEnableJVMServerCommand(tree: CICSTree, treeview: TreeView<any
       return;
     }
 
-    await enableTreeItem(nodes, tree, undefined, (response) => {
-      return response.records?.cicsjvmserver?.enablestatus.toUpperCase() === "ENABLED";
-    });
+    await enableTreeItem(
+      nodes,
+      tree,
+      undefined,
+      (response) => response.records?.cicsjvmserver?.enablestatus.toUpperCase() === "ENABLED"
+    );
   });
 }

packages/vsce/src/utils/resourceUtils.ts

@@ -207,8 +207,8 @@ export const buildRequestLoggerString = (
 
 export async function pollForCompleteAction<T extends IResource>(
   node: CICSResourceContainerNode<T>,
-  completionMet: (response: { resultsummary: ICMCIResponseResultSummary; records: any; }) => boolean,
-  cb: (response: ICMCIApiResponse) => void,
+  isCompletionCriteriaMet: (response: { resultsummary: ICMCIResponseResultSummary; records: any; }) => boolean,
+  criteriaMetCallback: (response: ICMCIApiResponse) => void,
   parentResource?: IResource,
 ) {
   let response: ICMCIApiResponse;
@@ -226,13 +226,13 @@ export async function pollForCompleteAction<T extends IResource>(
         criteria: node.getContainedResource().meta.buildCriteria([node.getContainedResource().meta.getName(node.getContainedResource().resource)], parentResource),
       },
     });
-    if (completionMet(response.response)) {
+    if (isCompletionCriteriaMet(response.response)) {
       break;
     }
     await new Promise((f) => setTimeout(f, 1000));
   }
 
-  cb(response);
+  criteriaMetCallback(response);
 }
 
 export function buildUserAgentHeader(): { "User-Agent": string } {