bug fixes; fixes #283, #282

package.json

@@ -257,11 +257,6 @@
         "title": "Disable Local File",
         "category": "Zowe Explorer for IBM CICS"
       },
-      {
-        "command": "cics-extension-for-zowe.enableLibrary",
-        "title": "Enable Library",
-        "category": "Zowe Explorer for IBM CICS"
-      },
       {
         "command": "cics-extension-for-zowe.disableLibrary",
         "title": "Disable Library",
@@ -486,16 +481,6 @@
           "command": "cics-extension-for-zowe.disableProgram",
           "group": ""
         },
-        {
-          "when": "view == cics-view && viewItem =~ /^cicslibrary.disabled.*/",
-          "command": "cics-extension-for-zowe.enableLibrary",
-          "group": ""
-        },
-        {
-          "when": "view == cics-view && viewItem =~ /^cicslibrary.enabled.*/",
-          "command": "cics-extension-for-zowe.disableLibrary",
-          "group": ""
-        },
         {
           "when": "view == cics-view && viewItem =~ /^cicstransaction.disabled.*/",
           "command": "cics-extension-for-zowe.enableTransaction",
@@ -602,6 +587,12 @@
           "description": "Default filter criteria for Tasks",
           "scope": "window"
         },
+        "zowe.cics.library.filter": {
+          "type": "string",
+          "default": "(NAME=*)",
+          "description": "Default filter criteria for Library",
+          "scope": "window"
+        },
         "zowe.cics.allPrograms.recordCountIncrement": {
           "type": "number",
           "default": 500,
@@ -640,6 +631,14 @@
       }
     }
   },
+  "resolutions": {
+    "**/ansi-regex": "^5.0.1",
+    "**/log4js": "6.4.6",
+    "**/glob-parent": "^5.1.2",
+    "**/minimist": "^1.2.6",
+    "**/moment": "^2.29.4",
+    "**/tar": "^6.1.9"
+  },
   "scripts": {
     "vscode:prepublish": "npm run build",
     "build": "run-script-os",
@@ -668,9 +667,9 @@
   "dependencies": {
     "@types/axios": "^0.14.0",
     "@zowe/cics-for-zowe-cli": "^5.0.0",
-    "@zowe/cli": "^7.0.1",
-    "@zowe/imperative": "^5.0.1",
-    "@zowe/zowe-explorer-api": "^2.0.3",
+    "@zowe/cli": "7.2.3",
+    "@zowe/imperative": "5.3.3",
+    "@zowe/zowe-explorer-api": "2.2.1",
     "axios": "^0.21.4",
     "https": "^1.0.0",
     "run-script-os": "^1.1.6",

src/extension.ts

@@ -41,8 +41,6 @@ import { getDeleteSessionCommand } from "./commands/deleteSessionCommand";
 import { getDisableTransactionCommand } from "./commands/disableTransactionCommand";
 import { getEnableTransactionCommand } from "./commands/enableTransactionCommand";
 import { getEnableLocalFileCommand } from "./commands/enableLocalFileCommand";
-import { getEnableLibraryCommand } from "./commands/enableLibraryCommand";
-import { getDisableLibraryCommand } from "./commands/disableLibraryCommand";
 import { getDisableLocalFileCommand } from "./commands/disableLocalFileCommand";
 import { getCloseLocalFileCommand } from "./commands/closeLocalFileCommand";
 import { getOpenLocalFileCommand } from "./commands/openLocalFileCommand";
@@ -310,8 +308,6 @@ export async function activate(context: ExtensionContext) {
     getDisableTransactionCommand(treeDataProv, treeview),
     getEnableLocalFileCommand(treeDataProv, treeview),
     getDisableLocalFileCommand(treeDataProv, treeview),
-    getEnableLibraryCommand(treeDataProv, treeview),
-    getDisableLibraryCommand(treeDataProv, treeview),
 
     getCloseLocalFileCommand(treeDataProv, treeview),
     getOpenLocalFileCommand(treeDataProv, treeview),

src/trees/CICSCombinedLibraryTree.ts

@@ -41,7 +41,7 @@ export class CICSCombinedLibraryTree extends TreeItem {
     this.activeFilter = undefined;
     this.currentCount = 0;
     this.incrementCount = +`${workspace.getConfiguration().get('zowe.cics.allLibraries.recordCountIncrement')}`;
-    this.constant = CicsCmciConstants.CICS_LIBRARY_RESOURCE;
+    this.constant = "CICSLibrary";
     }
 
     public async loadContents(tree: CICSTree){

src/trees/CICSLibraryTree.ts

@@ -66,7 +66,7 @@ export class CICSLibraryTree extends TreeItem {
       https.globalAgent.options.rejectUnauthorized = undefined;
       if ((error as any)!.mMessage!.includes('exceeded a resource limit')) {
         window.showErrorMessage(`Resource Limit Exceeded - Set a library filter to narrow search`);
-      } else if ((error as any).mMessage!.split(" ").join("").includes('recordcount:0')) {
+      } else if (this.children.length == 0) {
         window.showInformationMessage(`No libraries found`);
         this.label = `Libraries${this.activeFilter?` (${this.activeFilter}) `: " "}[0]`;
       } else {

src/trees/CICSLocalFileTree.ts

@@ -72,7 +72,7 @@ export class CICSLocalFileTree extends TreeItem {
       if (error!.mMessage!.includes('exceeded a resource limit')) {
         window.showErrorMessage(`Resource Limit Exceeded - Set a local file filter to narrow search`);
         // @ts-ignore
-      } else if (error!.mMessage!.split(" ").join("").includes('recordcount:0')) {
+      } else if (this.children.length == 0) {
         window.showInformationMessage(`No local files found`);
         this.label = `Local Files${this.activeFilter?` (${this.activeFilter}) `: " "}[0]`;
       } else {