feat: add support for deleting profiles #689

crawr · 2020-04-15T20:53:58Z

Addresses:

Fix #332 - Support deleting a profile

Details:

New feature: adds deleteProfile() under Profiles which can be executed via context menu and command palette
The function makes use of the CliProfileManager to perform the delete
Via the command palette, the user has to choose from the list of all profiles
All the trees are updated to remove the successfully deleted profile
Favorites related to the profile deleted are cleaned up
"Remove Profile" context menu option is now called "Hide Profile" to avoid confusion

Release Notes:

Milestone: v1.5
Changelog: Provide ability to delete profiles via the explorer.

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Signed-off-by: jellypuno <jessielaine.punongbayan@broadcom.com>

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

…nsion-for-zowe into delete-profiles

Signed-off-by: jellypuno <jessielaine.punongbayan@broadcom.com>

codecov · 2020-04-15T21:04:45Z

Codecov Report

Merging #689 into master will decrease coverage by 1.94%.
The diff coverage is 93.61%.

@@            Coverage Diff             @@
##           master     #689      +/-   ##
==========================================
- Coverage   92.17%   90.22%   -1.95%     
==========================================
  Files          47       44       -3     
  Lines        4764     3847     -917     
  Branches     1003      658     -345     
==========================================
- Hits         4391     3471     -920     
- Misses        370      373       +3     
  Partials        3        3

Impacted Files	Coverage Δ
src/extension.ts	`86.28% <55.55%> (-8.40%)`	⬇️
src/Profiles.ts	`93.79% <96.15%> (-1.63%)`	⬇️
src/PersistentFilters.ts	`98.95% <100.00%> (+0.01%)`	⬆️
src/dataset/actions.ts	`85.63% <0.00%> (-3.31%)`	⬇️
src/api/ZoweExplorerApiRegister.ts	`91.37% <0.00%> (-2.86%)`	⬇️
src/dataset/DatasetTree.ts	`89.36% <0.00%> (-2.65%)`	⬇️
src/uss/actions.ts	`80.13% <0.00%> (-2.03%)`	⬇️
src/job/ZosJobsProvider.ts	`87.14% <0.00%> (-1.49%)`	⬇️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aedefcf...0d6cb4d. Read the comment docs.

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Signed-off-by: jellypuno <jessielaine.punongbayan@broadcom.com>

Colin-Stone

Neat function and made a lot of sense changing the remove to hide. Can you just check that settings.json is being cleaned up completely please?.
I noticed some traces of a deleted profile in the sessions and recall section but the views were fine. Thank you.

katelynienaber · 2020-04-22T09:20:29Z

Yes, works great for me :) Except for what Colin mentioned ofc

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

katelynienaber · 2020-04-23T09:04:57Z

Heyoo, 3 things V:

The recall list isn't updated when I delete a profile
If I delete my default profile, there are a bunch of errors related to not having a default ZOSMF profile. Is there a way to set the default through the graphical interface?
If I delete my default/all profiles, the + button doesn't work to add a profile back again. I had to use the CLI to do it.

Colin-Stone

Thanks Richelle this all seems to working neatly now. Thank you for cleaning up the recall section. The sessions that were left over was a throwback to not having cleaned up some old sessions that had been left behind.
It may be worth quickly running npm run vscode:prepublish and committing Package.json and the i18n file get changed slightly. I don't know if the linter on the pipeline would flag it otherwise

VitGottwald · 2020-04-24T09:31:32Z

@crawr I am just testing this branch and I am not able to list files in a filter. After a long wait I get a 500 error.

VitGottwald

Made some stylistic comments to make stuff easier to read. When the problem with fetching datasets is fixed, will be happy to approve. If you want some help with the debugging, plese, let me know!

__tests__/__unit__/Profiles.unit.test.ts

__tests__/__unit__/extension.unit.test.ts

i18n/sample/package.i18n.json

src/Profiles.ts

VitGottwald · 2020-04-24T16:09:44Z

src/Profiles.ts

+
+            // Delete from Data Set Favorites
+            datasetTree.mFavorites.forEach((ses) => {
+                const findNode = ses.label.substring(1, ses.label.indexOf("]")).trim();


This looks like trouble going forward 😁 But I do not know how to do it better at this point.

src/Profiles.ts

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

src/Profiles.ts

crawr · 2020-04-27T08:05:18Z

Thanks for the reviews!

If I delete my default profile, there are a bunch of errors related to not having a default ZOSMF profile. Is there a way to set the default through the graphical interface?

If I delete my default/all profiles, the + button doesn't work to add a profile back again. I had to use the CLI to do it.

This looks like a regression in the handling of the Profile loader. I fixed it so that the extension will still load even if the default profile is not set. An informational message will appear instead.
Note that this does not have impact on the case for new users that do not have any profiles at all.
In both cases, the next profile the user will create will be set as default in the meta yaml file.

It may be worth quickly running npm run vscode:prepublish and committing Package.json and the i18n file get changed slightly. I don't know if the linter on the pipeline would flag it otherwise

Thanks for the tip, I ran the script and included the i18n file as a result.

I am just testing this branch and I am not able to list files in a filter. After a long wait I get a 500 error.

I tested listing with my just my HLQ using regular DS filter search and Ctrl + Alt + P and it loaded the entire list without any problems. Please let me know if you were able to replicate it after the new commit.

VitGottwald · 2020-04-27T10:43:17Z

Checked the latest commit d4ae34d9609494fb354 and was able to list datasets. Then tried remove the (only) profile by right-clicking it and selecting Delete Profile
.

Got an error message as a result

jellypuno · 2020-04-27T10:53:49Z

Checked the latest commit d4ae34d9609494fb354 and was able to list datasets. Then tried remove the (only) profile by right-clicking it and selecting Delete Profile
.

Got an error message as a result

@VitGottwald Are you sure? I just tried it now, I am not experiencing this error.

VitGottwald · 2020-04-27T11:04:18Z

Checked the latest commit d4ae34d9609494fb354 and was able to list datasets. Then tried remove the (only) profile by right-clicking it and selecting Delete Profile
.
Got an error message as a result

@VitGottwald Are you sure? I just tried it now, I am not experiencing this error.

Thanks @jellypuno . Looks like it was a problem on my end. After recompiling and deleting/adding profile from CLI I am not getting the error anymore. 👍

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

jellypuno

Demo'ed it today in Zowe Playback. Both commands works great!

Colin-Stone · 2020-04-27T15:24:34Z

src/extension.ts

@@ -153,6 +153,16 @@ export async function activate(context: vscode.ExtensionContext): Promise<ZoweEx
            }
        });
    }
+    if (datasetProvider || ussFileProvider || jobsProvider) {


Not worth adding this so close to v1.5 but the three trees have a superclass ZoweTreeProvider so you could have ZoweTreeProvider.
No action required.

Colin-Stone

Thanks for this functionality Richelle

VitGottwald · 2020-04-27T15:35:23Z

src/Profiles.ts

+            // Delete from USS Sessions list
+            const ussSetting: any = {...vscode.workspace.getConfiguration().get(this.ussSchema)};
+            let sessUSS: string[] = ussSetting.sessions;
+            let faveUSS: string[] = ussSetting.favorites;
+            sessUSS = sessUSS.filter( (element) => {
+                return element.trim() !== deleteLabel;
+            });
+            faveUSS = faveUSS.filter( (element) => {
+                return element.substring(1, element.indexOf("]")).trim() !== deleteLabel;
+            });
+            ussSetting.sessions = sessUSS;
+            ussSetting.favorites = faveUSS;
+            await vscode.workspace.getConfiguration().update(this.ussSchema, ussSetting, vscode.ConfigurationTarget.Global);
+
+            // Delete from Jobs Sessions list
+            const jobsSetting: any = {...vscode.workspace.getConfiguration().get(this.jobsSchema)};
+            let sessJobs: string[] = jobsSetting.sessions;
+            let faveJobs: string[] = jobsSetting.favorites;
+            sessJobs = sessJobs.filter( (element) => {
+                return element.trim() !== deleteLabel;
+            });
+            faveJobs = faveJobs.filter( (element) => {
+                return element.substring(1, element.indexOf("]")).trim() !== deleteLabel;
+            });
+            jobsSetting.sessions = sessJobs;
+            jobsSetting.favorites = faveJobs;
+            await vscode.workspace.getConfiguration().update(this.jobsSchema, jobsSetting, vscode.ConfigurationTarget.Global);


There seems to be a lot of knowledge duplication here. How about this:

Suggested change

// Delete from USS Sessions list

const ussSetting: any = {...vscode.workspace.getConfiguration().get(this.ussSchema)};

let sessUSS: string[] = ussSetting.sessions;

let faveUSS: string[] = ussSetting.favorites;

sessUSS = sessUSS.filter( (element) => {

return element.trim() !== deleteLabel;

});

faveUSS = faveUSS.filter( (element) => {

return element.substring(1, element.indexOf("]")).trim() !== deleteLabel;

});

ussSetting.sessions = sessUSS;

ussSetting.favorites = faveUSS;

await vscode.workspace.getConfiguration().update(this.ussSchema, ussSetting, vscode.ConfigurationTarget.Global);

// Delete from Jobs Sessions list

const jobsSetting: any = {...vscode.workspace.getConfiguration().get(this.jobsSchema)};

let sessJobs: string[] = jobsSetting.sessions;

let faveJobs: string[] = jobsSetting.favorites;

sessJobs = sessJobs.filter( (element) => {

return element.trim() !== deleteLabel;

});

faveJobs = faveJobs.filter( (element) => {

return element.substring(1, element.indexOf("]")).trim() !== deleteLabel;

});

jobsSetting.sessions = sessJobs;

jobsSetting.favorites = faveJobs;

await vscode.workspace.getConfiguration().update(this.jobsSchema, jobsSetting, vscode.ConfigurationTarget.Global);

// Delete from Session List

const isNotDeletedSession = (element) => element.trim() !== deleteLabel;

const isNotDeletedFavorite = (element) =>

element.substring(1, element.indexOf("]")).trim() !== deleteLabel;

const deleteFromSessionList = async (schema) => {

const setting: {

settings: string[];

favorites: string[];

} = vscode.workspace.getConfiguration().get(schema);

await vscode.workspace.getConfiguration().update(

schema,

{

...setting,

session: setting.favorites.filter(isNotDeletedSession),

favorites: setting.favorites.filter(isNotDeletedFavorite),

},

vscode.ConfigurationTarget.Global

);

};

deleteFromSessionList(this.dsSchema);

deleteFromSessionList(this.ussSchema);

deleteFromSessionList(this.jobsSchema);

VitGottwald

I think there is room to extract pieces of knowledge like checking if an item is to be removed into functions and then reusing it. That would make the code more concise and "dry". But I think that is not a reason to block this PR.

Great job identifying all the places that need to be updated for a delete!

…-zowe into delete-profiles Signed-off-by: zFernand0 <fernando.rijocedeno@broadcom.com> # Conflicts: # __mocks__/@zowe/imperative.ts # __tests__/__unit__/Profiles.unit.test.ts # __tests__/__unit__/extension.unit.test.ts # src/Profiles.ts

zFernand0

Nice work!
Initially was getting a few timeouts on jest hooks. Maybe we should increment the default timeout on before/after hooks if we expect to perform some zowe action on them?

zFernand0 · 2020-04-27T19:22:44Z

It had 2 or more approvals before resolving merge conflicts.
Merging!

crawr and others added 9 commits April 14, 2020 10:53

Add deletion of profiles

6c46e33

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Change text from Remove to Hide

f7458ae

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Fix favorites deletion

f681858

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Streamline function

ed24ec8

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Move to Profiles file

1e8a381

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

fix existing unit test

f6fcc7e

Signed-off-by: jellypuno <jessielaine.punongbayan@broadcom.com>

Refresh list of profiles

d9f6452

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Merge branch 'delete-profiles' of https://github.com/zowe/vscode-exte…

d2ddaa2

…nsion-for-zowe into delete-profiles

Add Unit Test

c560341

Signed-off-by: jellypuno <jessielaine.punongbayan@broadcom.com>

crawr added this to the 1.5 Release milestone Apr 15, 2020

crawr added 2 commits April 16, 2020 14:54

Add more unit tests

6634e32

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Add tests for Favorites

cf875f0

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

crawr marked this pull request as ready for review April 16, 2020 18:59

crawr and others added 3 commits April 16, 2020 21:14

Merge branch 'master' into delete-profiles

efc2010

Fix imports and regex

e13bbe6

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Add more test for deleteProfile USS

4f5a037

Signed-off-by: jellypuno <jessielaine.punongbayan@broadcom.com>

crawr added the Profiles label Apr 17, 2020

crawr self-assigned this Apr 17, 2020

Merge branch 'master' into delete-profiles

fe8b4b9

Colin-Stone reviewed Apr 20, 2020

View reviewed changes

Merge branch 'master' into delete-profiles

6d3f58f

Remove from recall list

1bc989e

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Colin-Stone previously approved these changes Apr 23, 2020

View reviewed changes

VitGottwald reviewed Apr 24, 2020

View reviewed changes

Handle deletion of default profile + fixes

d4ae34d

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

crawr dismissed Colin-Stone’s stale review via d4ae34d April 25, 2020 12:20

VitGottwald reviewed Apr 27, 2020

View reviewed changes

src/Profiles.ts Outdated Show resolved Hide resolved

VitGottwald reviewed Apr 27, 2020

View reviewed changes

src/Profiles.ts Outdated Show resolved Hide resolved

VitGottwald reviewed Apr 27, 2020

View reviewed changes

src/Profiles.ts Outdated Show resolved Hide resolved

crawr added 2 commits April 27, 2020 16:25

Simplify conditional statements

6023127

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

Simplify conditional statements

0d6cb4d

Signed-off-by: Richelle Anne Craw <richelleanne.craw@broadcom.com>

jellypuno self-requested a review April 27, 2020 15:12

jellypuno previously approved these changes Apr 27, 2020

View reviewed changes

Colin-Stone reviewed Apr 27, 2020

View reviewed changes

Colin-Stone previously approved these changes Apr 27, 2020

View reviewed changes

VitGottwald reviewed Apr 27, 2020

View reviewed changes

VitGottwald previously approved these changes Apr 27, 2020

View reviewed changes

zFernand0 dismissed stale reviews from VitGottwald, Colin-Stone, and jellypuno via a886ca2 April 27, 2020 18:25

zFernand0 approved these changes Apr 27, 2020

View reviewed changes

zFernand0 merged commit 33d8e87 into master Apr 27, 2020

zFernand0 deleted the delete-profiles branch April 27, 2020 19:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add support for deleting profiles #689

feat: add support for deleting profiles #689

crawr commented Apr 15, 2020

codecov bot commented Apr 15, 2020 •

edited

Loading

Colin-Stone left a comment •

edited

Loading

katelynienaber commented Apr 22, 2020

katelynienaber commented Apr 23, 2020 •

edited

Loading

Colin-Stone left a comment

VitGottwald commented Apr 24, 2020

VitGottwald left a comment

VitGottwald Apr 24, 2020

crawr commented Apr 27, 2020

VitGottwald commented Apr 27, 2020

jellypuno commented Apr 27, 2020

VitGottwald commented Apr 27, 2020

jellypuno left a comment

Colin-Stone Apr 27, 2020

Colin-Stone left a comment

VitGottwald Apr 27, 2020

VitGottwald left a comment

zFernand0 left a comment

zFernand0 commented Apr 27, 2020

feat: add support for deleting profiles #689

feat: add support for deleting profiles #689

Conversation

crawr commented Apr 15, 2020

Addresses:

Details:

Release Notes:

codecov bot commented Apr 15, 2020 • edited Loading

Codecov Report

Colin-Stone left a comment • edited Loading

Choose a reason for hiding this comment

katelynienaber commented Apr 22, 2020

katelynienaber commented Apr 23, 2020 • edited Loading

Colin-Stone left a comment

Choose a reason for hiding this comment

VitGottwald commented Apr 24, 2020

VitGottwald left a comment

Choose a reason for hiding this comment

VitGottwald Apr 24, 2020

Choose a reason for hiding this comment

crawr commented Apr 27, 2020

VitGottwald commented Apr 27, 2020

jellypuno commented Apr 27, 2020

VitGottwald commented Apr 27, 2020

jellypuno left a comment

Choose a reason for hiding this comment

Colin-Stone Apr 27, 2020

Choose a reason for hiding this comment

Colin-Stone left a comment

Choose a reason for hiding this comment

VitGottwald Apr 27, 2020

Choose a reason for hiding this comment

VitGottwald left a comment

Choose a reason for hiding this comment

zFernand0 left a comment

Choose a reason for hiding this comment

zFernand0 commented Apr 27, 2020

codecov bot commented Apr 15, 2020 •

edited

Loading

Colin-Stone left a comment •

edited

Loading

katelynienaber commented Apr 23, 2020 •

edited

Loading