Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed v1 changes from vsce package #185

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/vsce/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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.0`

- BugFix: Initializing new Team Configuration File. [#33](https://github.com/zowe/cics-for-zowe-client/issues/33)
Expand Down
2 changes: 0 additions & 2 deletions packages/vsce/src/commands/deleteSessionCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ export function getDeleteSessionCommand(tree: CICSTree, treeview: TreeView<any>)
const filePath = currentProfile.profLoc.osLoc ? currentProfile.profLoc.osLoc[0] : "";
await openConfigFile(filePath);
}
} else {
await tree.deleteSession(allSelectedNodes);
}
} catch (error) {
window.showErrorMessage(
Expand Down
179 changes: 7 additions & 172 deletions packages/vsce/src/trees/CICSTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,6 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
await configInstance.updateProperty({ ...upd, property: "rejectUnauthorized", value: false });
updatedProfile = await ProfileManagement.getProfilesCache().getLoadedProfConfig(profile.name);
} else {
// flip rejectUnauthorized to false
const message = {
name: profile.name,
profile: {
...profile.profile,
rejectUnauthorized: false,
},
};
const newProfile = await ProfileManagement.updateProfile(message);
await ProfileManagement.profilesCacheRefresh();
updatedProfile = await ProfileManagement.getProfilesCache().loadNamedProfile(profile.name, "cics");
}
Expand Down Expand Up @@ -376,115 +367,13 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
* and creates a profile.
*/
async createNewProfile() {
if (isTheia()) {
const connnectionName = await Gui.showInputBox({
prompt: "Name of connection",
placeHolder: "e.g. my-cics-profile",
ignoreFocusOut: true,
});
if (!connnectionName) {
return;
}
const hostDetails = await Gui.showInputBox({
prompt: "Input protocol, host and port for connection",
placeHolder: "e.g. https://mycicshostname.com:12345",
ignoreFocusOut: true,
});

if (!hostDetails) {
return;
}

const splitHostDetails = hostDetails.split(":");

const protocol = splitHostDetails[0].toLowerCase();
if (!["http", "https"].includes(protocol)) {
return;
}

let host = splitHostDetails[1];
if (host.slice(0, 2) !== "//") {
return;
}
host = host.slice(2);

const port = parseInt(splitHostDetails[2]);
if (!port || isNaN(port)) {
return;
}

const username = await Gui.showInputBox({
prompt: "Input Username",
placeHolder: "e.g. user123",
ignoreFocusOut: true,
});
if (!username) {
return;
}

const userPassword = await Gui.showInputBox({
prompt: "Input Password",
placeHolder: "e.g. 12345678",
password: true,
ignoreFocusOut: true,
});
if (!userPassword) {
return;
}

const plexName = await Gui.showInputBox({
prompt: "Input Plex Name",
placeHolder: "e.g. PLEX123",
ignoreFocusOut: true,
});

const regionName = await Gui.showInputBox({
prompt: "Input Region Name",
placeHolder: "e.g. REGION123",
ignoreFocusOut: true,
});

const rejectUnauthorized = await Gui.showQuickPick(["True", "False"], {
placeHolder: "Reject Unauthorized",
ignoreFocusOut: true,
});
if (!rejectUnauthorized) {
return;
}
const message = {
profile: {
name: connnectionName,
host: host,
port: port,
user: username,
password: userPassword,
rejectUnauthorized: rejectUnauthorized === "True" ? true : false,
protocol: protocol,
cicsPlex: plexName.length === 0 ? undefined : plexName,
regionName: regionName.length === 0 ? undefined : regionName,
},
name: connnectionName,
type: "CICS",
overwrite: true,
};

try {
await ProfileManagement.createNewProfile(message);
await ProfileManagement.profilesCacheRefresh();
await this.loadProfile(ProfileManagement.getProfilesCache().loadNamedProfile(message.name, "cics"));
} catch (error) {
// @ts-ignore
window.showErrorMessage(error);
}
} else {
// Initialize new team configuration file
const response = await window.showQuickPick([{ label: "\uFF0B Create a New Team Configuration File" }], {
ignoreFocusOut: true,
placeHolder: "Create a New Team Configuration File",
});
if (response) {
commands.executeCommand("zowe.all.config.init");
}
// Initialize new team configuration file
const response = await window.showQuickPick([{ label: "\uFF0B Create a New Team Configuration File" }], {
ignoreFocusOut: true,
placeHolder: "Create a New Team Configuration File",
});
if (response) {
commands.executeCommand("zowe.all.config.init");
}
}

Expand All @@ -498,60 +387,6 @@ export class CICSTree implements TreeDataProvider<CICSSessionTree> {
this._onDidChangeTreeData.fire(undefined);
}

/**
* Delete profile functionality for V1 profile configuration
* @param sessions
*/
async deleteSession(sessions: CICSSessionTree[]) {
let answer;
if (sessions.length === 1) {
answer = await window.showInformationMessage(
`Are you sure you want to delete the profile "${sessions[0].label?.toString()!}"`,
...["Yes", "No"]
);
} else if (sessions.length > 1) {
answer = await window.showInformationMessage(
`Are you sure you want to delete the profiles "${sessions.map((sessionTree) => {
return sessionTree.label?.toString()!;
})}"`,
...["Yes", "No"]
);
}
if (answer === "Yes") {
window.withProgress(
{
title: "Delete Profile",
location: ProgressLocation.Notification,
cancellable: true,
},
async (progress, token) => {
token.onCancellationRequested(() => {
console.log("Cancelling the delete command");
});
for (const index in sessions) {
progress.report({
message: `Deleting profile ${parseInt(index) + 1} of ${sessions.length}`,
increment: (parseInt(index) / sessions.length) * 100,
});
try {
await ProfileManagement.deleteProfile({
name: sessions[parseInt(index)].label?.toString()!,
rejectIfDependency: true,
});
const persistentStorage = new PersistentStorage("zowe.cics.persistent");
await persistentStorage.removeLoadedCICSProfile(sessions[parseInt(index)].label.toString());

this.loadedProfiles = this.loadedProfiles.filter((profile) => profile !== sessions[parseInt(index)]);
this._onDidChangeTreeData.fire(undefined);
} catch (error) {
// @ts-ignore
window.showErrorMessage(error);
}
}
}
);
}
}

async updateSession(session: CICSSessionTree) {
await ProfileManagement.profilesCacheRefresh();
Expand Down
27 changes: 0 additions & 27 deletions packages/vsce/src/utils/loggerUtils.ts

This file was deleted.

8 changes: 1 addition & 7 deletions packages/vsce/src/utils/profileDefinition.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,7 @@ const cicsProfileMeta: imperative.ICommandProfileTypeConfiguration[] = [
},
},
required: [],
},
createProfileExamples: [
{
options: "cics123 --host zos123 --port 1490 --user ibmuser --password myp4ss",
description: "Create a cics profile named 'cics123' to connect to CICS at host zos123 and port 1490",
},
],
}
},
];

Expand Down
19 changes: 1 addition & 18 deletions packages/vsce/src/utils/profileManagement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
*
*/

import { ProfilesCache, Types, ZoweVsCodeExtension, imperative } from "@zowe/zowe-explorer-api";
import { Types, ZoweVsCodeExtension, imperative } from "@zowe/zowe-explorer-api";
import axios, { AxiosRequestConfig } from "axios";
import { window } from "vscode";
import { xml2json } from "xml-js";
import cicsProfileMeta from "./profileDefinition";
import * as https from "https";
import { CICSPlexTree } from "../trees/CICSPlexTree";
import { LoggerUtils } from "./loggerUtils";

export class ProfileManagement {
private static zoweExplorerAPI = ZoweVsCodeExtension.getZoweExplorerApi();
Expand Down Expand Up @@ -48,22 +47,6 @@ export class ProfileManagement {
await ProfileManagement.getProfilesCache().refresh(apiRegiser);
}

public static async createNewProfile(formResponse: imperative.ISaveProfile) {
await ProfileManagement.ProfilesCache.getCliProfileManager("cics")?.save(formResponse);
await ProfileManagement.getExplorerApis().getExplorerExtenderApi().reloadProfiles();
}

public static async updateProfile(formResponse: imperative.IUpdateProfile) {
const profile: imperative.IProfileUpdated = await ProfileManagement.ProfilesCache.getCliProfileManager("cics")?.update(formResponse);
await ProfileManagement.getExplorerApis().getExplorerExtenderApi().reloadProfiles();
return profile;
}

public static async deleteProfile(formResponse: imperative.IDeleteProfile) {
await ProfileManagement.ProfilesCache.getCliProfileManager("cics")?.delete(formResponse);
await ProfileManagement.getExplorerApis().getExplorerExtenderApi().reloadProfiles();
}

public static async getConfigInstance(): Promise<imperative.ProfileInfo> {
const mProfileInfo = await ProfileManagement.getProfilesCache().getProfileInfo();
return mProfileInfo;
Expand Down
Loading