From 39170da86b82c507259553c7fa9e221974ac2dbd Mon Sep 17 00:00:00 2001 From: Chinmay Das <55234150+chinmdas@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:40:34 +0530 Subject: [PATCH 1/3] Correcting condition to read team configuration file. Signed-off-by: Chinmay Das <55234150+chinmdas@users.noreply.github.com> --- packages/vsce/src/trees/CICSTree.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/vsce/src/trees/CICSTree.ts b/packages/vsce/src/trees/CICSTree.ts index e7d7907a..58cb5392 100644 --- a/packages/vsce/src/trees/CICSTree.ts +++ b/packages/vsce/src/trees/CICSTree.ts @@ -86,7 +86,7 @@ export class CICSTree implements TreeDataProvider { const allCICSProfiles = (await ProfileManagement.getProfilesCache().getProfileInfo()).getAllProfiles("cics"); // const allCICSProfiles = await ProfileManagement.getProfilesCache().getProfiles('cics'); if (!allCICSProfiles) { - if (!configInstance.usingTeamConfig) { + if (!configInstance.getTeamConfig().exists) { window.showErrorMessage(`Could not find any CICS profiles`); return; } @@ -94,7 +94,7 @@ export class CICSTree implements TreeDataProvider { } const allCICSProfileNames: string[] = allCICSProfiles ? (allCICSProfiles.map((profile) => profile.profName) as unknown as [string]) : []; // No cics profiles needed beforhand for team config method - if (configInstance.usingTeamConfig || allCICSProfileNames.length > 0) { + if (configInstance.getTeamConfig().exists || allCICSProfileNames.length > 0) { const profileNameToLoad = await window.showQuickPick( [{ label: "\uFF0B Create New CICS Profile..." }].concat( allCICSProfileNames @@ -118,7 +118,7 @@ export class CICSTree implements TreeDataProvider { if (profileNameToLoad) { // If Create New CICS Profile option chosen if (profileNameToLoad.label.includes("\uFF0B")) { - if (configInstance.usingTeamConfig) { + if (configInstance.getTeamConfig().exists) { // get all profiles of all types including zosmf const profiles = configInstance.getAllProfiles(); if (!profiles.length) { @@ -133,7 +133,7 @@ export class CICSTree implements TreeDataProvider { } else { let profileToLoad; // TODO: Just use loadNamedProfile once the method is configured to v2 profiles - if (configInstance.usingTeamConfig) { + if (configInstance.getTeamConfig().exists) { profileToLoad = await ProfileManagement.getProfilesCache().getLoadedProfConfig(profileNameToLoad.label); //ProfileManagement.getProfilesCache().loadNamedProfile(profileNameToLoad.label, 'cics'); } else { await ProfileManagement.profilesCacheRefresh(); @@ -184,7 +184,7 @@ export class CICSTree implements TreeDataProvider { }); try { const configInstance = await ProfileManagement.getConfigInstance(); - if (configInstance.usingTeamConfig) { + if (configInstance.getTeamConfig().exists) { let missingParamters = missingSessionParameters(profile.profile); if (missingParamters.length) { const userPass = ["user", "password"]; @@ -318,7 +318,7 @@ export class CICSTree implements TreeDataProvider { if (decision === "Yes") { const configInstance = await ProfileManagement.getConfigInstance(); let updatedProfile; - if (configInstance.usingTeamConfig) { + if (configInstance.getTeamConfig().exists) { const upd = { profileName: profile.name, profileType: "cics" }; // const configInstance = await ProfileManagement.getConfigInstance(); // flip rejectUnauthorized to false From 451dbda5652bb44c6df43763a41e79d822be5ff8 Mon Sep 17 00:00:00 2001 From: Chinmay Das <55234150+chinmdas@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:32:32 +0530 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: Chinmay Das <55234150+chinmdas@users.noreply.github.com> --- packages/vsce/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md index a26d7ae1..d95db95b 100644 --- a/packages/vsce/CHANGELOG.md +++ b/packages/vsce/CHANGELOG.md @@ -14,6 +14,7 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente - Renamed the VSCE to `IBM CICS for Zowe Explorer`. [#129](https://github.com/zowe/cics-for-zowe-client/issues/129) - Update: See `2.3.6` for details. - BugFix: Fixed several identified problems with possible null values in the tree and web views. [#122](https://github.com/zowe/cics-for-zowe-client/issues/122) +- BugFix: Correcting condition to read team configuration file. [#160](https://github.com/zowe/cics-for-zowe-client/pull/160) ## `3.0.0-next.202403011419` From 4ac982337c185988d745e2d215151592d0fdce7e Mon Sep 17 00:00:00 2001 From: Chinmay Das <55234150+chinmdas@users.noreply.github.com> Date: Wed, 11 Dec 2024 20:49:21 +0530 Subject: [PATCH 3/3] Updating CHANGELOG.md to provide recent changes Signed-off-by: Chinmay Das <55234150+chinmdas@users.noreply.github.com> --- packages/vsce/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md index d95db95b..6e40de77 100644 --- a/packages/vsce/CHANGELOG.md +++ b/packages/vsce/CHANGELOG.md @@ -6,6 +6,10 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente - MAJOR: v3.0.0 release +## Recent Changes + +- BugFix: Correcting condition to read team configuration file. [#160](https://github.com/zowe/cics-for-zowe-client/pull/160) + ## `3.0.0-next.202409201904` - Update: Final prerelease @@ -14,7 +18,6 @@ All notable changes to the "cics-extension-for-zowe" extension will be documente - Renamed the VSCE to `IBM CICS for Zowe Explorer`. [#129](https://github.com/zowe/cics-for-zowe-client/issues/129) - Update: See `2.3.6` for details. - BugFix: Fixed several identified problems with possible null values in the tree and web views. [#122](https://github.com/zowe/cics-for-zowe-client/issues/122) -- BugFix: Correcting condition to read team configuration file. [#160](https://github.com/zowe/cics-for-zowe-client/pull/160) ## `3.0.0-next.202403011419`