Rebasing to manage Conflicts

Signed-off-by: Chinmay Das <[email protected]>
zowe · Jan 16, 2025 · 06e6d49 · 06e6d49
1 parent 2305e63
commit 06e6d49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md
@@ -30,7 +30,6 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente
 - 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`
@@ -211,4 +210,4 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente
 - Added the ability to run a command across multiple Programs, Transactions or Files by selecting them and running the command.
 - Included auto-reading of CICS Plexes and Regions if not specified in your Zowe profile.
 - Inluded compatibility with Theia, allowing for web-based use-cases of this extension.
-- Prevention of CICS Profiles leaking into the other Zowe Explorer trees.
+- Prevention of CICS Profiles leaking into the other Zowe Explorer trees.
diff --git a/packages/vsce/src/commands/index.ts b/packages/vsce/src/commands/index.ts
@@ -18,7 +18,7 @@ import { getAddSessionCommand } from "./addSessionCommand";
 import { getClearPlexFilterCommand } from "./clearPlexFilterCommand";
 import { getClearResourceFilterCommand } from "./clearResourceFilterCommand";
 import { getCloseLocalFileCommand } from "./closeLocalFileCommand";
-import { getDeleteSessionCommand } from "./deleteSessionCommand";
+import { getManageSessionCommand } from "./manageSessionCommand";
 import * as filterAllResourceCommands from "./filterAllResourceCommand";
 import * as filterResourceCommands from "./filterResourceCommands";
 import { getFilterPlexResources } from "./getFilterPlexResources";
@@ -29,19 +29,14 @@ import { getOpenLocalFileCommand } from "./openLocalFileCommand";
 import { getPhaseInCommand } from "./phaseInCommand";
 import { getPurgeTaskCommand } from "./purgeTaskCommand";
 import { getRefreshCommand } from "./refreshCommand";
-import { getRemoveSessionCommand } from "./removeSessionCommand";
 import * as showAttributesCommands from "./showAttributesCommand";
 import { getShowRegionSITParametersCommand } from "./showParameterCommand";
-import { getUpdateSessionCommand } from "./updateSessionCommand";
 import { viewMoreCommand } from "./viewMoreCommand";
 
 export const getCommands = (treeDataProv: CICSTree, treeview: TreeView<any>) => {
-
   return [
     getAddSessionCommand(treeDataProv),
-    getRemoveSessionCommand(treeDataProv, treeview),
-    getUpdateSessionCommand(treeDataProv, treeview),
-    getDeleteSessionCommand(treeDataProv, treeview),
+    getManageSessionCommand(treeDataProv, treeview),
 
     getRefreshCommand(treeDataProv),
 
@@ -106,5 +101,4 @@ export const getCommands = (treeDataProv: CICSTree, treeview: TreeView<any>) =>
     getInquireTransactionCommand(treeDataProv, treeview),
     getInquireProgramCommand(treeDataProv, treeview),
   ];
-
 };
diff --git a/packages/vsce/src/extension.ts b/packages/vsce/src/extension.ts
@@ -147,7 +147,6 @@ export async function activate(context: ExtensionContext) {
   });
 
   treeview.onDidCollapseElement((node) => {
-
     const interestedContextValues = [
       "cicsregionscontainer.",
       "cicscombinedprogramtree.",
@@ -180,4 +179,4 @@ export async function activate(context: ExtensionContext) {
   });
 
   context.subscriptions.concat(getCommands(treeDataProv, treeview));
-}
+}
diff --git a/packages/vsce/src/trees/CICSTree.ts b/packages/vsce/src/trees/CICSTree.ts
@@ -48,7 +48,7 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
   public async refreshLoadedProfiles() {
     this.clearLoadedProfiles();
     await this.loadStoredProfileNames();
-    commands.executeCommand("workbench.actions.treeView.cics-view.collapseAll");
+    commands.executeCommand('workbench.actions.treeView.cics-view.collapseAll');
   }
   public clearLoadedProfiles() {
     this.loadedProfiles = [];
@@ -207,7 +207,6 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
         commands.executeCommand("zowe.all.config.init");
       }
     } catch (error) {
-      console.log(error);
       window.showErrorMessage(JSON.stringify(error, Object.getOwnPropertyNames(error)).replace(/(\\n\t|\\n|\\t)/gm, " "));
     }
   }
@@ -252,7 +251,7 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
               }
               if (missingParamters.length) {
                 window.showInformationMessage(
-                  `The following fields are missing from ${profile.name}: ${missingParamters.join(", ")}. Please update them in your config file.`,
+                  `The following fields are missing from ${profile.name}: ${missingParamters.join(", ")}. Please update them in your config file.`
                 );
                 return;
               }
@@ -292,7 +291,7 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
                 regionsObtained.response.records.cicsregion,
                 newSessionTree,
                 undefined,
-                newSessionTree,
+                newSessionTree
               );
               newSessionTree.addRegion(newRegionTree);
             } else {
@@ -357,7 +356,7 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
                     const decision = await window.showInformationMessage(
                       `Warning: Your connection is not private (${error.code}) - ` +
                         `would you still like to proceed to ${profile.profile.host} (unsafe)?`,
-                      ...["Yes", "No"],
+                      ...["Yes", "No"]
                     );
                     if (decision) {
                       if (decision === "Yes") {
@@ -382,8 +381,8 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
                   window.showErrorMessage(
                     `Error: An error has occurred ${profile.profile.host}:${profile.profile.port} (${profile.name}) - ${JSON.stringify(
                       error,
-                      Object.getOwnPropertyNames(error),
-                    ).replace(/(\\n\t|\\n|\\t)/gm, " ")}`,
+                      Object.getOwnPropertyNames(error)
+                    ).replace(/(\\n\t|\\n|\\t)/gm, " ")}`
                   );
               }
             } else if ("response" in error) {
@@ -409,8 +408,8 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
                 window.showErrorMessage(
                   `Error: An error has occurred ${profile.profile.host}:${profile.profile.port} (${profile.name}) - ${JSON.stringify(
                     error,
-                    Object.getOwnPropertyNames(error),
-                  ).replace(/(\\n\t|\\n|\\t)/gm, " ")}`,
+                    Object.getOwnPropertyNames(error)
+                  ).replace(/(\\n\t|\\n|\\t)/gm, " ")}`
                 );
               }
             }