updated with local filtering of jobs #2476

SanthoshiBoyina · 2023-09-23T02:39:44Z

Proposed changes

-> For filtering the jobs at the zOSMF session level a filter icon is added for the easier accessibility to filter jobs based on job name, job id and return code.

-> and also provided with an option 'Filter Jobs' at the right click menu of zOSMF session level to filter jobs based on job name, job id and return code.

And the input box added here will be filtering the content of Jobs dynamically. That means for each and every character user enters it will be displaying results based on that, which is an enhancement over the old method of filtering once the user enters text and hits the enter button.

Release Notes

Milestone:

Changelog:

Types of changes

What types of changes does your code introduce to Zowe Explorer?
Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Updates to Documentation or Tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

Further comments

codecov · 2023-09-25T13:19:47Z

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Files	Coverage Δ
packages/zowe-explorer/src/globals.ts	`98.61% <100.00%> (ø)`
packages/zowe-explorer/src/job/init.ts	`98.30% <100.00%> (+0.04%)`	⬆️
packages/zowe-explorer/src/job/actions.ts	`90.70% <93.33%> (+0.15%)`	⬆️

... and 1 file with indirect coverage changes

📢 Thoughts on this report? Let us know!.

traeok

Thanks for working on this enhancement @SanthoshiBoyina! I left some comments regarding error handling and use of the tree provider.

packages/zowe-explorer/src/job/actions.ts

JillieBeanSim

While testing and clicking the filter icon I get the info message about needing a search in place to filter but do have a search in place.

JillieBeanSim · 2023-09-28T13:16:03Z

packages/zowe-explorer/i18n/sample/src/job/actions.i18n.json

@@ -21,5 +21,7 @@
  "cancelJobs.notImplemented": "The cancel function is not implemented in this API.",
  "cancelJobs.notCancelled": "The job was not cancelled.",
  "cancelJobs.failed": "One or more jobs failed to cancel: {0}",
-  "cancelJobs.succeeded": "Cancelled selected jobs successfully."
+  "cancelJobs.succeeded": "Cancelled selected jobs successfully.",
+  "filterJobs.message": "Inorder to filter jobs,first populate them using search icon",


Could we change this message to say the same as if profile was expanded without search in place.
Use the search button to display jobs
Or something along those lines, possibly A jobs search must be in place before local filtering is possible

JillieBeanSim · 2023-09-28T13:18:45Z

packages/zowe-explorer/i18n/sample/src/job/actions.i18n.json

-  "cancelJobs.succeeded": "Cancelled selected jobs successfully."
+  "cancelJobs.succeeded": "Cancelled selected jobs successfully.",
+  "filterJobs.message": "Inorder to filter jobs,first populate them using search icon",
+  "filterJobs.prompt.message": "Type here..."


Could we explain what is to be entered here? Maybe something like Enter local filter...

traeok · 2023-10-02T14:33:25Z

packages/zowe-explorer/src/job/actions.ts

            );
-            return spoolNode;
+            jobsProvider.refresh();


Thanks for addressing my previous comments 🙂 I have one more comment:

We should refresh the job element here instead of the whole tree; otherwise, it will perform logic on other job nodes that are not a part of this filter operation.

This would also apply to line 571 in the filterJobs function - we can refresh the session (level) element for that case

I tried both jobProvider.refresh and refreshElement(job) and don't see either of these working like I see the filter search at the session level. it worked so well at the session level with jobProvider.refresh() I wonder if the spool file level will need the spoolProvider.refresh() to see the same outcome.

JillieBeanSim

the inputBox.show then return of inputBox doesn't allow the input box to disappear after hitting enter, I have to escape the input box for it to leave the screen in both filter searches. One way to solve that is to to an
await vscode.window.showInputBox(inputBox) and if wanting to return what is entered can store and return value or just have a void return.
Is there a way to clear the local filtering and return user to initial filter search?

JillieBeanSim · 2023-10-03T21:10:09Z

packages/zowe-explorer/src/job/actions.ts

@@ -549,16 +549,16 @@ export async function filterJobs(jobsProvider: IZoweTree<IZoweJobTreeNode>): Pro
    for (const level of jobsProvider.mSessionNodes) {
        if (level.label === "zosmf") {


We don't want to have any particular type calls like checking for zosmf profile type or if this is a check for profile name. We want to be able to handle this for all profile types and names. This may need to be a check on context value for if session node.

JillieBeanSim · 2023-10-03T21:11:33Z

packages/zowe-explorer/src/job/actions.ts

            );
-            return spoolNode;
+            jobsProvider.refresh();


I tried both jobProvider.refresh and refreshElement(job) and don't see either of these working like I see the filter search at the session level. it worked so well at the session level with jobProvider.refresh() I wonder if the spool file level will need the spoolProvider.refresh() to see the same outcome.

Signed-off-by: SanthoshiBoyina <[email protected]>

rudyflores · 2023-10-11T13:55:06Z

@JillieBeanSim do we have a milestone for this PR?

Signed-off-by: SanthoshiBoyina <[email protected]>

…n tests Signed-off-by: Trae Yelovich <[email protected]>

Signed-off-by: Trae Yelovich <[email protected]>

- Also adds unit tests for dataset filtering, sorting, and sorting jobs Signed-off-by: Trae Yelovich <[email protected]>

Signed-off-by: Trae Yelovich <[email protected]>

- Renamed `m4date` to `modifiedDate` in `DatasetStats` API type Signed-off-by: Trae Yelovich <[email protected]>

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.17.10 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: SanthoshiBoyina <[email protected]>

sonarqubecloud · 2023-10-19T14:47:09Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
6.8% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

traeok

Seems like the recent changes to this branch pulled in some other commits that were already merged into main. To fix this, it might require undoing the last merge attempt, and then running git merge again with the main branch. I'd be happy to help with resolving any merge conflicts that come up during the merge 🙂

JTonda requested review from JillieBeanSim and traeok September 26, 2023 15:07

traeok requested changes Sep 27, 2023

View reviewed changes

zFernand0 self-requested a review September 27, 2023 18:27

SanthoshiBoyina force-pushed the local-filtering-of-jobs branch from 58b1478 to 6f8548c Compare September 28, 2023 11:58

JillieBeanSim requested changes Sep 28, 2023

View reviewed changes

SanthoshiBoyina requested review from JillieBeanSim and traeok September 29, 2023 14:18

traeok reviewed Oct 2, 2023

View reviewed changes

JillieBeanSim reviewed Oct 3, 2023

View reviewed changes

SanthoshiBoyina1 added 13 commits October 10, 2023 21:59

updated with local filtering of jobs

e7da1d0

Signed-off-by: SanthoshiBoyina <[email protected]>

updated changelog file

f780957

Signed-off-by: SanthoshiBoyina <[email protected]>

Updated sample data in actions.unit.test.ts file

59737e9

Signed-off-by: SanthoshiBoyina <[email protected]>

Updated with error handling

88024cc

Signed-off-by: SanthoshiBoyina <[email protected]>

resolved conflicts

936c909

Signed-off-by: SanthoshiBoyina <[email protected]>

updated with local filtering of jobs

2df66b6

Signed-off-by: SanthoshiBoyina <[email protected]>

updated changelog file

ada826b

Signed-off-by: SanthoshiBoyina <[email protected]>

resolved conflicts

b78a4f2

Signed-off-by: SanthoshiBoyina <[email protected]>

updated use of tree provider

000c87f

Signed-off-by: SanthoshiBoyina <[email protected]>

resolved latest conflicts

e88cbee

Signed-off-by: SanthoshiBoyina <[email protected]>

addressed the code smell

01f14b5

Signed-off-by: SanthoshiBoyina <[email protected]>

Improved code coverage in init.ts

5098ac9

Signed-off-by: SanthoshiBoyina <[email protected]>

updated with filter jobs

0e0d4a3

Signed-off-by: SanthoshiBoyina <[email protected]>

SanthoshiBoyina force-pushed the local-filtering-of-jobs branch from bd05209 to 0e0d4a3 Compare October 10, 2023 16:41

SanthoshiBoyina requested review from JillieBeanSim and traeok October 10, 2023 16:47

updated global.ts file

5da04b7

Signed-off-by: SanthoshiBoyina <[email protected]>

JillieBeanSim added this to the v2.12.0 milestone Oct 11, 2023

traeok and others added 24 commits October 19, 2023 19:26

feat(ds): Filter PDS members (session-level and PDS-level); fix broke…

f4d67e2

…n tests Signed-off-by: Trae Yelovich <[email protected]>

fix: some SonarCloud code smells

7de9bb3

Signed-off-by: Trae Yelovich <[email protected]>

tests(ds): Bump patch coverage for DatasetTree.filterPdsMembers

0801cee

Signed-off-by: Trae Yelovich <[email protected]>

chore(ds/sort): code refactor, add typedoc, cleanup strings

4b287a9

Signed-off-by: Trae Yelovich <[email protected]>

fix(ds/sort): some SonarCloud code smells

30ebd6e

Signed-off-by: Trae Yelovich <[email protected]>

test(ds): Add test cases for filter/sort options

3750998

Signed-off-by: Trae Yelovich <[email protected]>

fix: sort direction should only apply to PDS members

5c7ac39

- Also adds unit tests for dataset filtering, sorting, and sorting jobs Signed-off-by: Trae Yelovich <[email protected]>

fix(test): Fix 'fake session node' sort options in test case

0c9acae

Signed-off-by: Trae Yelovich <[email protected]>

fix, chore: remove unnecessary refresh in sortBy; update CHANGELOGS

b1ba6a7

Signed-off-by: Trae Yelovich <[email protected]>

fix(ds/filter): Refresh PDS if session/PDS had a previous filter

73b65ed

Signed-off-by: Trae Yelovich <[email protected]>

fix(ds): Add sort/filter support for FTP response; fix test cases

482d045

Signed-off-by: Trae Yelovich <[email protected]>

fix(jobs/sort): Proper handling for jobs with null retcodes

f65cc2c

Signed-off-by: Trae Yelovich <[email protected]>

fix(jobs/sort): use nullish coalescing for retcode/status check

74f6869

Signed-off-by: Trae Yelovich <[email protected]>

feat(ds, jobs): Show status bar msg when sort/filter is applied

1d657e6

- Renamed `m4date` to `modifiedDate` in `DatasetStats` API type Signed-off-by: Trae Yelovich <[email protected]>

updated with local filtering of jobs

e6f988b

Signed-off-by: SanthoshiBoyina <[email protected]>

Updated sample data in actions.unit.test.ts file

65c8cdc

Signed-off-by: SanthoshiBoyina <[email protected]>

resolved conflicts

25839de

Signed-off-by: SanthoshiBoyina <[email protected]>

updated changelog file

352f4ba

Signed-off-by: SanthoshiBoyina <[email protected]>

updated use of tree provider

e30a00b

Signed-off-by: SanthoshiBoyina <[email protected]>

resolved latest conflicts

91ce7bb

Signed-off-by: SanthoshiBoyina <[email protected]>

updated with filter jobs

a4e1e05

Signed-off-by: SanthoshiBoyina <[email protected]>

updated with changes

f8559cc

Signed-off-by: SanthoshiBoyina <[email protected]>

Resolved conflicts

14ebbc8

Signed-off-by: SanthoshiBoyina <[email protected]>

SanthoshiBoyina dismissed stale reviews from rudyflores and JillieBeanSim via 14ebbc8 October 19, 2023 14:46

traeok requested changes Oct 19, 2023

View reviewed changes

SanthoshiBoyina closed this Oct 19, 2023

SanthoshiBoyina deleted the local-filtering-of-jobs branch October 19, 2023 17:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

updated with local filtering of jobs #2476

updated with local filtering of jobs #2476

SanthoshiBoyina commented Sep 23, 2023 •

edited

Loading

codecov bot commented Sep 25, 2023 •

edited

Loading

traeok left a comment

JillieBeanSim left a comment •

edited

Loading

JillieBeanSim Sep 28, 2023

JillieBeanSim Sep 28, 2023

traeok Oct 2, 2023 •

edited

Loading

JillieBeanSim Oct 3, 2023 •

edited

Loading

JillieBeanSim left a comment

JillieBeanSim Oct 3, 2023

JillieBeanSim Oct 3, 2023 •

edited

Loading

rudyflores commented Oct 11, 2023

sonarqubecloud bot commented Oct 19, 2023

traeok left a comment

		@@ -549,16 +549,16 @@ export async function filterJobs(jobsProvider: IZoweTree<IZoweJobTreeNode>): Pro
		for (const level of jobsProvider.mSessionNodes) {
		if (level.label === "zosmf") {

updated with local filtering of jobs #2476

updated with local filtering of jobs #2476

Conversation

SanthoshiBoyina commented Sep 23, 2023 • edited Loading

Proposed changes

Release Notes

Types of changes

Checklist

Further comments

codecov bot commented Sep 25, 2023 • edited Loading

Codecov Report

traeok left a comment

Choose a reason for hiding this comment

JillieBeanSim left a comment • edited Loading

Choose a reason for hiding this comment

JillieBeanSim Sep 28, 2023

Choose a reason for hiding this comment

JillieBeanSim Sep 28, 2023

Choose a reason for hiding this comment

traeok Oct 2, 2023 • edited Loading

Choose a reason for hiding this comment

JillieBeanSim Oct 3, 2023 • edited Loading

Choose a reason for hiding this comment

JillieBeanSim left a comment

Choose a reason for hiding this comment

JillieBeanSim Oct 3, 2023

Choose a reason for hiding this comment

JillieBeanSim Oct 3, 2023 • edited Loading

Choose a reason for hiding this comment

rudyflores commented Oct 11, 2023

sonarqubecloud bot commented Oct 19, 2023

traeok left a comment

Choose a reason for hiding this comment

SanthoshiBoyina commented Sep 23, 2023 •

edited

Loading

codecov bot commented Sep 25, 2023 •

edited

Loading

JillieBeanSim left a comment •

edited

Loading

traeok Oct 2, 2023 •

edited

Loading

JillieBeanSim Oct 3, 2023 •

edited

Loading

JillieBeanSim Oct 3, 2023 •

edited

Loading