zowe · JeffinSiby · Jan 28, 2022 · Jan 28, 2022 · Jan 28, 2022 · Jan 28, 2022
diff --git a/src/commands/clearResourceFilterCommand.ts b/src/commands/clearResourceFilterCommand.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { commands, TreeView, window } from "vscode";
+import { commands, ProgressLocation, TreeView, window } from "vscode";
 import { CICSLocalFileTree } from "../trees/CICSLocalFileTree";
 import { CICSProgramTree } from "../trees/CICSProgramTree";
 import { CICSTransactionTree } from "../trees/CICSTransactionTree";
@@ -30,8 +30,17 @@ export function getClearResourceFilterCommand(tree: CICSTree, treeview: TreeView
       }
       for (const node of allSelectedNodes) {
         node.clearFilter();
+        window.withProgress({
+          title: 'Loading Resources',
+          location: ProgressLocation.Notification,
+          cancellable: false
+        }, async (_, token) => {
+          token.onCancellationRequested(() => {
+            console.log("Cancelling the loading of resources");
+          });
         await node.loadContents();
         tree._onDidChangeTreeData.fire(undefined);
+        });
       }
     }
   );

diff --git a/src/commands/filterLocalFileCommand.ts b/src/commands/filterLocalFileCommand.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { commands, TreeView, window } from "vscode";
+import { commands, ProgressLocation, TreeView, window } from "vscode";
 import { CICSLocalFileTree } from "../trees/CICSLocalFileTree";
 import { CICSTree } from "../trees/CICSTree";
 import { getPatternFromFilter } from "../utils/FilterUtils";
@@ -20,7 +20,7 @@ export function getFilterLocalFilesCommand(tree: CICSTree, treeview: TreeView<an
     "cics-extension-for-zowe.filterLocalFiles",
     async (node) => {
       const selection = treeview.selection;
-      let chosenNode;
+      let chosenNode: CICSLocalFileTree;
       if (node) {
         chosenNode = node;
       } else if (selection[selection.length-1] && selection[selection.length-1] instanceof CICSLocalFileTree) {
@@ -36,8 +36,17 @@ export function getFilterLocalFilesCommand(tree: CICSTree, treeview: TreeView<an
       }
       await persistentStorage.addLocalFileSearchHistory(pattern!);
       chosenNode.setFilter(pattern!);
-      await chosenNode.loadContents();
-      tree._onDidChangeTreeData.fire(undefined);
+      window.withProgress({
+        title: 'Loading Local Files',
+        location: ProgressLocation.Notification,
+        cancellable: false
+      }, async (_, token) => {
+        token.onCancellationRequested(() => {
+          console.log("Cancelling the loading of local files");
+        });
+        await chosenNode.loadContents();
+        tree._onDidChangeTreeData.fire(undefined);
+      });
     }
   );
 }
diff --git a/src/commands/filterProgramsCommand.ts b/src/commands/filterProgramsCommand.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { commands, TreeView, window } from "vscode";
+import { commands, ProgressLocation, TreeView, window } from "vscode";
 import { CICSProgramTree } from "../trees/CICSProgramTree";
 import { CICSTree } from "../trees/CICSTree";
 import { getPatternFromFilter } from "../utils/FilterUtils";
@@ -20,7 +20,7 @@ export function getFilterProgramsCommand(tree: CICSTree, treeview: TreeView<any>
     "cics-extension-for-zowe.filterPrograms",
     async (node) => {
       const selection = treeview.selection;
-      let chosenNode;
+      let chosenNode: CICSProgramTree;
       if (node) {
         chosenNode = node;
       } else if (selection[selection.length-1] && selection[selection.length-1] instanceof CICSProgramTree) {
@@ -36,8 +36,17 @@ export function getFilterProgramsCommand(tree: CICSTree, treeview: TreeView<any>
       }
       await persistentStorage.addProgramSearchHistory(pattern!);
       chosenNode.setFilter(pattern!);
+      window.withProgress({
+        title: 'Loading Programs',
+        location: ProgressLocation.Notification,
+        cancellable: false
+      }, async (_, token) => {
+        token.onCancellationRequested(() => {
+          console.log("Cancelling the loading of programs");
+        });
       await chosenNode.loadContents();
       tree._onDidChangeTreeData.fire(undefined);
+      });
     }
   );
 }
diff --git a/src/commands/filterTransactionCommand.ts b/src/commands/filterTransactionCommand.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { commands, TreeView, window } from "vscode";
+import { commands, ProgressLocation, TreeView, window } from "vscode";
 import { CICSTransactionTree } from "../trees/CICSTransactionTree";
 import { CICSTree } from "../trees/CICSTree";
 import { getPatternFromFilter } from "../utils/FilterUtils";
@@ -20,7 +20,7 @@ export function getFilterTransactionCommand(tree: CICSTree, treeview: TreeView<a
     "cics-extension-for-zowe.filterTransactions",
     async (node) => {
       const selection = treeview.selection;
-      let chosenNode;
+      let chosenNode: CICSTransactionTree;
       if (node) {
         chosenNode = node;
       } else if (selection[selection.length-1] && selection[selection.length-1] instanceof CICSTransactionTree) {
@@ -36,8 +36,17 @@ export function getFilterTransactionCommand(tree: CICSTree, treeview: TreeView<a
       }
       await persistentStorage.addTransactionSearchHistory(pattern!);
       chosenNode.setFilter(pattern!);
-      await chosenNode.loadContents();
-      tree._onDidChangeTreeData.fire(undefined);
+      window.withProgress({
+        title: 'Loading Transactions',
+        location: ProgressLocation.Notification,
+        cancellable: false
+      }, async (_, token) => {
+        token.onCancellationRequested(() => {
+          console.log("Cancelling the loading of transactions");
+        });
+        await chosenNode.loadContents();
+        tree._onDidChangeTreeData.fire(undefined);
+      });
     }
   );
 }
diff --git a/src/commands/getFilterPlexResources.ts b/src/commands/getFilterPlexResources.ts
@@ -9,7 +9,7 @@
 *
 */
 
-import { commands, TreeItemCollapsibleState, TreeView, window } from "vscode";
+import { commands, ProgressLocation, TreeItemCollapsibleState, TreeView, window } from "vscode";
 import { CICSRegionsContainer } from "../trees/CICSRegionsContainer";
 import { CICSRegionTree } from "../trees/CICSRegionTree";
 import { CICSTree } from "../trees/CICSTree";
@@ -21,7 +21,7 @@ export function getFilterPlexResources(tree: CICSTree, treeview: TreeView<any>)
     "cics-extension-for-zowe.filterPlexResources",
     async (node) => {
       const selection = treeview.selection;
-      let chosenNode;
+      let chosenNode: any;
       if (node) {
         chosenNode = node;
       } else if (selection[selection.length-1] && selection[selection.length-1] instanceof CICSRegionsContainer) {
@@ -32,7 +32,7 @@ export function getFilterPlexResources(tree: CICSTree, treeview: TreeView<any>)
       }
       const plex = chosenNode.getParent();
       const plexProfile = plex.getProfile();
-      let resourceToFilter;
+      let resourceToFilter: any;
       if (plexProfile.profile.regionName && plexProfile.profile.cicsPlex) {
         resourceToFilter = await window.showQuickPick(["Programs", "Local Transactions", "Local Files"]);
       } else {
@@ -53,44 +53,55 @@ export function getFilterPlexResources(tree: CICSTree, treeview: TreeView<any>)
           return;
       }
       const pattern = await getPatternFromFilter(resourceToFilter.slice(0,-1), resourceHistory);
+      if (pattern) {
+        if (resourceToFilter === "Programs"){
+            await persistentStorage.addProgramSearchHistory(pattern);
+        } else if(resourceToFilter === "Local Transactions"){
+            await persistentStorage.addTransactionSearchHistory(pattern);
+        } else if (resourceToFilter === "Local Files"){
+            await persistentStorage.addLocalFileSearchHistory(pattern);
+        } else if (resourceToFilter === "Regions"){
+            await persistentStorage.addRegionSearchHistory(pattern);
+        }
 
-      if (resourceToFilter === "Programs"){
-          await persistentStorage.addProgramSearchHistory(pattern!);
-      } else if(resourceToFilter === "Local Transactions"){
-          await persistentStorage.addTransactionSearchHistory(pattern!);
-      } else if (resourceToFilter === "Local Files"){
-          await persistentStorage.addLocalFileSearchHistory(pattern!);
-      } else if (resourceToFilter === "Regions"){
-          await persistentStorage.addRegionSearchHistory(pattern!);
-      }
-
-      chosenNode.collapsibleState = TreeItemCollapsibleState.Expanded;
+        chosenNode.collapsibleState = TreeItemCollapsibleState.Expanded;
 
-      if (resourceToFilter === "Regions"){
-        chosenNode.filterRegions(pattern!, tree);
-      } else {
-        for (const region of chosenNode.children){
-          if (region instanceof CICSRegionTree) {
-            if (region.getIsActive()) {
-              let treeToFilter;
-              if (resourceToFilter === "Programs"){
-                  treeToFilter = region.children?.filter((child: any) => child.contextValue.includes("cicstreeprogram."))[0];
-              } else if (resourceToFilter === "Local Transactions"){
-                  treeToFilter = region.children?.filter((child: any) => child.contextValue.includes("cicstreetransaction."))[0];
-              } else if (resourceToFilter === "Local Files"){
-                  treeToFilter = region.children?.filter((child: any) => child.contextValue.includes("cicstreelocalfile."))[0];
-              }
-              if (treeToFilter) {
-                treeToFilter.setFilter(pattern!);
-                await treeToFilter.loadContents();
-                treeToFilter.collapsibleState = TreeItemCollapsibleState.Expanded;
+        if (resourceToFilter === "Regions"){
+          chosenNode.filterRegions(pattern!, tree);
+        } else {
+          window.withProgress({
+            title: 'Loading Resources',
+            location: ProgressLocation.Notification,
+            cancellable: true
+          }, async (_, token) => {
+            token.onCancellationRequested(() => {
+              console.log("Cancelling the loading of resources");
+            });
+          for (const region of chosenNode.children){
+            if (region instanceof CICSRegionTree) {
+              if (region.getIsActive()) {
+                let treeToFilter;
+                if (resourceToFilter === "Programs"){
+                    treeToFilter = region.children?.filter((child: any) => child.contextValue.includes("cicstreeprogram."))[0];
+                } else if (resourceToFilter === "Local Transactions"){
+                    treeToFilter = region.children?.filter((child: any) => child.contextValue.includes("cicstreetransaction."))[0];
+                } else if (resourceToFilter === "Local Files"){
+                    treeToFilter = region.children?.filter((child: any) => child.contextValue.includes("cicstreelocalfile."))[0];
+                }
+                if (treeToFilter) {
+                  treeToFilter.setFilter(pattern!);
+                  await treeToFilter.loadContents();
+                  treeToFilter.collapsibleState = TreeItemCollapsibleState.Expanded;
+                }
+                region.collapsibleState = TreeItemCollapsibleState.Expanded;
               }
-              region.collapsibleState = TreeItemCollapsibleState.Expanded;
             }
           }
+          tree._onDidChangeTreeData.fire(undefined);
+          });
         }
+        tree._onDidChangeTreeData.fire(undefined);
       }
-      tree._onDidChangeTreeData.fire(undefined);
-    }
+  }
   );
 }