Merge branch 'main' into removed-v1-changes

Signed-off-by: Rushabh Sojitra <[email protected]>
zowe · Jan 6, 2025 · 93588fc · 93588fc
2 parents 0e899ae + 9b9326e
commit 93588fc
Show file tree

Hide file tree

Showing 9 changed files with 12,891 additions and 12,881 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@zowe/cics_monorepo",
   "private": true,
-  "version": "6.2.2",
+  "version": "6.2.3",
   "publishConfig": {
     "registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/"
   },
@@ -31,7 +31,7 @@
     "@typescript-eslint/eslint-plugin": "^5.57.1",
     "@typescript-eslint/parser": "^5.57.1",
     "@zowe/cli-test-utils": "^8.0.0",
-    "@zowe/imperative": "^8.10.1",
+    "@zowe/imperative": "^8.10.3",
     "@zowe/zowe-explorer-api": "^3.0.3",
     "chalk": "^4.1.2",
     "eslint": "^8.37.0",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 All notable changes to the IBM® CICS® Plug-in for Zowe CLI will be documented in this file.
 
+## `6.2.3`
+
+- BugFix: Removed bundled dependencies from npm package. [#192](https://github.com/zowe/cics-for-zowe-client/pull/192)
+
 ## `6.2.2`
 
-- BugFix: Removed bundled dependencies from npm package and restored the npm-shrinkwrap file. [#187](https://github.com/zowe/cics-for-zowe-client/pull/187)
+- BugFix: Restored the npm-shrinkwrap file in npm package. [#187](https://github.com/zowe/cics-for-zowe-client/pull/187)
 
 ## `6.0.0`
 

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cics-for-zowe-cli",
-  "version": "6.2.2",
+  "version": "6.2.3",
   "author": "Zowe",
   "license": "EPL-2.0",
   "description": "IBM CICS Plug-in for Zowe CLI",
@@ -54,9 +54,6 @@
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0"
   },
-  "bundledDependencies": [
-    "@zowe/cics-for-zowe-sdk"
-  ],
   "engines": {
     "node": ">=18.12.0"
   }

diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md
@@ -2,10 +2,15 @@
 
 All notable changes to the "cics-extension-for-zowe" extension will be documented in this file.
 
+
 ## Recent Changes
 
 - Remove v1 deprecated code from the extension. [#184](https://github.com/zowe/cics-for-zowe-client/issues/184)
 
+## `3.2.1`
+- BugFix: Remove the 'Show SIT Parameters' menu option when a region is inactive. [#167](https://github.com/zowe/cics-for-zowe-client/issues/167)
+
+
 ## `3.2.0`
 
 - BugFix: Initializing new Team Configuration File. [#33](https://github.com/zowe/cics-for-zowe-client/issues/33)

diff --git a/packages/vsce/package.json b/packages/vsce/package.json
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/zowe/cics-for-zowe-client.git"
   },
-  "version": "3.2.1",
+  "version": "3.2.2",
   "engines": {
     "vscode": "^1.79.0"
   },
@@ -464,7 +464,7 @@
           "group": ""
         },
         {
-          "when": "view == cics-view && viewItem =~ /^cicsregion\\./",
+          "when": "view == cics-view && viewItem =~ /cicsregion.*\\.active/",
           "command": "cics-extension-for-zowe.showRegionParameters",
           "group": ""
         },

diff --git a/packages/vsce/src/commands/showParameterCommand.ts b/packages/vsce/src/commands/showParameterCommand.ts
@@ -23,6 +23,11 @@ export function getShowRegionSITParametersCommand(treeview: TreeView<any>) {
       return;
     }
     for (const regionTree of allSelectedNodes) {
+      if (regionTree.contextValue.includes(".inactive")) {
+        // Ignore region if not active - required for the command palette.
+        continue;
+      }
+
       const db2transactionResponse = await getResource(regionTree.parentSession.session, {
         name: "CICSSystemParameter",
         regionName: regionTree.label,

diff --git a/packages/vsce/src/trees/CICSRegionTree.ts b/packages/vsce/src/trees/CICSRegionTree.ts
@@ -55,7 +55,9 @@ export class CICSRegionTree extends TreeItem {
       this.children = null;
       this.collapsibleState = TreeItemCollapsibleState.None;
       this.iconPath = getIconPathInResources("region-dark-disabled.svg", "region-light-disabled.svg");
+      this.contextValue += ".inactive";
     } else {
+      this.contextValue += ".active";
       this.children = [
         new CICSProgramTree(this),
         new CICSTransactionTree(this),

diff --git a/scripts/bundleTgz.js b/scripts/bundleTgz.js
@@ -19,7 +19,7 @@ const rootDir = path.join(__dirname, "..");
 process.chdir(rootDir);
 const cliPkgDir = path.join(process.cwd(), "packages", "cli");
 const pkgJsonFile = path.join(cliPkgDir, "package.json");
-const tempPkgJson = JSON.parse(fsE.readFileSync(pkgJsonFile, "utf-8"));
+const sdkPkgJson = JSON.parse(fsE.readFileSync(path.join(cliPkgDir, "../sdk/package.json"), "utf-8"));
 const npmInstallCmd = "npm install --ignore-scripts --workspaces=false";
 const execCmd = (cmd) => childProcess.execSync(cmd, { cwd: cliPkgDir, stdio: "inherit" });
 fsE.mkdirpSync("dist");
@@ -44,9 +44,9 @@ try {
     try {
         // Install node_modules directly inside packages/cli
         execCmd("npm run preshrinkwrap");
-        execCmd(`npm view @zowe/cics-for-zowe-sdk@${tempPkgJson.version}`);
+        execCmd(`npm view @zowe/cics-for-zowe-sdk@${sdkPkgJson.version}`);
     } catch (err) {
-        const sdkTgzPath = path.relative(__dirname, "../dist/zowe-cics-for-zowe-sdk-" + tempPkgJson.version + ".tgz");
+        const sdkTgzPath = path.relative(__dirname, "../dist/zowe-cics-for-zowe-sdk-" + sdkPkgJson.version + ".tgz");
         execCmd(`${npmInstallCmd} ${sdkTgzPath}`);
     }
     execCmd(npmInstallCmd);