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.

Sign up for GitHub

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

Updates to Spool File Labels in Jobs View #1920

Merged
merged 11 commits into from
Aug 25, 2022
Merged

Updates to Spool File Labels in Jobs View #1920

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4e9ac1c
add procstep to spool in tree
JillieBeanSim Aug 23, 2022
56bfd32
Merge remote-tracking branch 'origin/main' into procstep-in-jobs-view
JillieBeanSim Aug 23, 2022
201dfba
update job tree view and hover over spool file
JillieBeanSim Aug 23, 2022
d86dde8
fix unit test
JillieBeanSim Aug 23, 2022
24dc22e
lint issue fix
JillieBeanSim Aug 23, 2022
def4c6f
lint issue
JillieBeanSim Aug 23, 2022
7143f71
Merge branch 'main' into procstep-in-jobs-view
JillieBeanSim Aug 23, 2022
139332a
cleanup
JillieBeanSim Aug 23, 2022
2eb3be1
Merge branch 'procstep-in-jobs-view' of https://github.com/zowe/vscod…
JillieBeanSim Aug 23, 2022
1889233
address comments
JillieBeanSim Aug 23, 2022
215f54c
Merge branch 'main' into procstep-in-jobs-view
kristinochka Aug 24, 2022
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: 2 additions & 2 deletions packages/zowe-explorer/__tests__/__unit__/job/ZoweJobNode.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ describe("ZoweJobNode unit tests - Function getChildren", () => {

const spoolFiles = await globalMocks.testJobNode.getChildren();
expect(spoolFiles.length).toBe(1);
expect(spoolFiles[0].label).toEqual("STEP:STDOUT(101)");
expect(spoolFiles[0].label).toEqual("STEP:STDOUT - 1");
expect(spoolFiles[0].owner).toEqual("fake");
});

Expand All @@ -319,7 +319,7 @@ describe("ZoweJobNode unit tests - Function getChildren", () => {
globalMocks.testJobNode.session.ISession = globalMocks.testSessionNoCred;
const spoolFiles = await globalMocks.testJobNode.getChildren();
expect(spoolFiles.length).toBe(1);
expect(spoolFiles[0].label).toEqual("STEP:STDOUT(101)");
expect(spoolFiles[0].label).toEqual("STEP:STDOUT - 1");
expect(spoolFiles[0].owner).toEqual("*");
});
});
Expand Down
31 changes: 30 additions & 1 deletion packages/zowe-explorer/src/job/ZoweJobNode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export class Job extends ZoweTreeNode implements IZoweJobTreeNode {
private _prefix: string;
// tslint:disable-next-line: variable-name
private _searchId: string;
// tslint:disable-next-line: variable-name
private _tooltip: string;

constructor(
label: string,
Expand Down Expand Up @@ -128,8 +130,15 @@ export class Job extends ZoweTreeNode implements IZoweJobTreeNode {
prefix = spool.procstep;
}
const sessionName = this.getProfileName();
const procstep = spool.procstep ? spool.procstep : undefined;
let newLabel: string;
if (procstep) {
newLabel = `${spool.stepname}:${spool.ddname} - ${procstep}`;
} else {
newLabel = `${spool.stepname}:${spool.ddname} - ${spool["record-count"]}`;
}
const spoolNode = new Spool(
`${spool.stepname}:${spool.ddname}(${spool.id})`,
newLabel,
vscode.TreeItemCollapsibleState.None,
this,
this.session,
Expand All @@ -141,6 +150,17 @@ export class Job extends ZoweTreeNode implements IZoweJobTreeNode {
if (icon) {
spoolNode.iconPath = icon.path;
}
const arr = [];
Object.keys(spool).map((key) => {
if (key !== "records-url") {
arr.push({ [key]: spool[key] });
}
});
let newTooltip = "";
arr.forEach((item) => {
newTooltip += `${JSON.stringify(item).replace(/({|})/g, "")}\n`;
});
spoolNode.tooltip = newTooltip;
spoolNode.command = {
command: "zowe.jobs.zosJobsOpenspool",
title: "",
Expand Down Expand Up @@ -211,7 +231,16 @@ export class Job extends ZoweTreeNode implements IZoweJobTreeNode {
return this.getParent() ? this.getParent().getSessionNode() : this;
}

set tooltip(newTooltip: string) {
if (newTooltip) {
this._tooltip = newTooltip;
}
}
JillieBeanSim marked this conversation as resolved.
Show resolved Hide resolved

get tooltip(): string {
if (this._tooltip) {
return this._tooltip;
}
JillieBeanSim marked this conversation as resolved.
Show resolved Hide resolved
if (this.job !== null) {
if (this.job.retcode) {
return `${this.job.jobname}(${this.job.jobid}) - ${this.job.retcode}`;
Expand Down