@zowe/cli 7.10.2 → 7.10.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/zosfiles/compare/ds/Dataset.handler.js +18 -22
- package/lib/zosfiles/compare/ds/Dataset.handler.js.map +1 -1
- package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js +19 -25
- package/lib/zosfiles/compare/lf-ds/LocalfileDataset.handler.js.map +1 -1
- package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js +25 -24
- package/lib/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.js.map +1 -1
- package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js +19 -24
- package/lib/zosfiles/compare/lf-uss/LocalfileUss.handler.js.map +1 -1
- package/lib/zosfiles/compare/sdd/Spooldd.handler.js +21 -11
- package/lib/zosfiles/compare/sdd/Spooldd.handler.js.map +1 -1
- package/lib/zosfiles/compare/uss/UssFile.handler.js +18 -22
- package/lib/zosfiles/compare/uss/UssFile.handler.js.map +1 -1
- package/lib/zosjobs/-strings-/en.d.ts +5 -6
- package/lib/zosjobs/-strings-/en.js +6 -8
- package/lib/zosjobs/-strings-/en.js.map +1 -1
- package/lib/zosjobs/ZosJobs.options.d.ts +4 -0
- package/lib/zosjobs/ZosJobs.options.js +29 -0
- package/lib/zosjobs/ZosJobs.options.js.map +1 -0
- package/lib/zosjobs/cancel/job/Job.definition.js +2 -9
- package/lib/zosjobs/cancel/job/Job.definition.js.map +1 -1
- package/lib/zosjobs/delete/job/Job.definition.js +2 -9
- package/lib/zosjobs/delete/job/Job.definition.js.map +1 -1
- package/lib/zosjobs/delete/old-jobs/OldJobs.definition.js +2 -7
- package/lib/zosjobs/delete/old-jobs/OldJobs.definition.js.map +1 -1
- package/npm-shrinkwrap.json +92 -92
- package/package.json +13 -13
|
@@ -34,6 +34,7 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
34
34
|
statusMessage: "Retrieving first dataset",
|
|
35
35
|
stageName: imperative_1.TaskStage.IN_PROGRESS
|
|
36
36
|
};
|
|
37
|
+
// RETRIEVING THE FIRST DATA-SET
|
|
37
38
|
commandParameters.response.progress.startBar({ task });
|
|
38
39
|
const dsContentBuf1 = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName1, {
|
|
39
40
|
binary: commandParameters.arguments.binary,
|
|
@@ -44,11 +45,12 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
44
45
|
task: task
|
|
45
46
|
});
|
|
46
47
|
commandParameters.response.progress.endBar();
|
|
48
|
+
// RETRIEVING THE DATA-SET TO COMPARE
|
|
49
|
+
task.statusMessage = "Retrieving second dataset";
|
|
47
50
|
commandParameters.response.progress.startBar({ task });
|
|
48
51
|
let binary2 = commandParameters.arguments.binary2;
|
|
49
52
|
let encoding2 = commandParameters.arguments.encoding2;
|
|
50
53
|
let record2 = commandParameters.arguments.record2;
|
|
51
|
-
const browserView = commandParameters.arguments.browserView;
|
|
52
54
|
const volumeSerial2 = commandParameters.arguments.volumeSerial2;
|
|
53
55
|
if (binary2 == undefined) {
|
|
54
56
|
binary2 = commandParameters.arguments.binary;
|
|
@@ -59,7 +61,6 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
59
61
|
if (record2 == undefined) {
|
|
60
62
|
record2 = commandParameters.arguments.record;
|
|
61
63
|
}
|
|
62
|
-
task.statusMessage = "Retrieving second dataset";
|
|
63
64
|
const dsContentBuf2 = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName2, {
|
|
64
65
|
binary: binary2,
|
|
65
66
|
encoding: encoding2,
|
|
@@ -68,29 +69,25 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
68
69
|
responseTimeout: commandParameters.arguments.responseTimeout,
|
|
69
70
|
task: task
|
|
70
71
|
});
|
|
72
|
+
commandParameters.response.progress.endBar();
|
|
73
|
+
//CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
|
|
71
74
|
let dsContentString1 = "";
|
|
72
75
|
let dsContentString2 = "";
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
const dsStringArray2 = dsContentBuf2.toString().split("\n");
|
|
82
|
-
for (const i in dsStringArray2) {
|
|
83
|
-
const sl = dsStringArray2[i].length;
|
|
84
|
-
const tempString = dsStringArray2[i].substring(0, sl - seqnumlen);
|
|
85
|
-
dsContentString2 += tempString + "\n";
|
|
86
|
-
}
|
|
76
|
+
const seqnumlen = 8;
|
|
77
|
+
if (commandParameters.arguments.seqnum === false) {
|
|
78
|
+
dsContentString1 = dsContentBuf1.toString().split("\n")
|
|
79
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
80
|
+
.join("\n");
|
|
81
|
+
dsContentString2 = dsContentBuf2.toString().split("\n")
|
|
82
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
83
|
+
.join("\n");
|
|
87
84
|
}
|
|
88
85
|
else {
|
|
89
86
|
dsContentString1 = dsContentBuf1.toString();
|
|
90
87
|
dsContentString2 = dsContentBuf2.toString();
|
|
91
88
|
}
|
|
92
|
-
//
|
|
93
|
-
if (browserView) {
|
|
89
|
+
// CHECK TO OPEN UP DIFF IN BROWSER WINDOW
|
|
90
|
+
if (commandParameters.arguments.browserView) {
|
|
94
91
|
yield imperative_1.DiffUtils.openDiffInbrowser(dsContentString1, dsContentString2);
|
|
95
92
|
return {
|
|
96
93
|
success: true,
|
|
@@ -98,11 +95,10 @@ class DatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
98
95
|
apiResponse: {}
|
|
99
96
|
};
|
|
100
97
|
}
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
jsonDiff = yield imperative_1.DiffUtils.getDiffString(dsContentString1, dsContentString2, {
|
|
98
|
+
// RETURNING DIFF
|
|
99
|
+
const jsonDiff = yield imperative_1.DiffUtils.getDiffString(dsContentString1, dsContentString2, {
|
|
104
100
|
outputFormat: 'terminal',
|
|
105
|
-
contextLinesArg:
|
|
101
|
+
contextLinesArg: commandParameters.arguments.contextLines
|
|
106
102
|
});
|
|
107
103
|
return {
|
|
108
104
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/ds/Dataset.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAC9G,yEAAsE;AACtE,qEAAiE;AACjE;;;GAGG;AACH,MAAqB,cAAe,SAAQ,0CAAmB;IAC9C,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,0BAA0B;gBACzC,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;YAEF,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Dataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/ds/Dataset.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,11 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
|
|
|
36
36
|
statusMessage: "Retrieving local file",
|
|
37
37
|
stageName: imperative_1.TaskStage.IN_PROGRESS
|
|
38
38
|
};
|
|
39
|
+
// CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
|
|
39
40
|
commandParameters.response.progress.startBar({ task });
|
|
40
41
|
let localFile;
|
|
41
|
-
// resolving to full path if local path passed is not absolute
|
|
42
42
|
if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
|
|
43
|
+
// resolving to full path if local path passed is not absolute
|
|
43
44
|
localFile = commandParameters.arguments.localFilePath;
|
|
44
45
|
}
|
|
45
46
|
else {
|
|
@@ -70,9 +71,9 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
|
|
|
70
71
|
fs.closeSync(localFileHandle);
|
|
71
72
|
}
|
|
72
73
|
commandParameters.response.progress.endBar();
|
|
73
|
-
//
|
|
74
|
-
commandParameters.response.progress.startBar({ task });
|
|
74
|
+
// RETRIEVING THE DATA-SET TO COMPARE
|
|
75
75
|
task.statusMessage = "Retrieving dataset";
|
|
76
|
+
commandParameters.response.progress.startBar({ task });
|
|
76
77
|
const dsContentBuf = yield zos_files_for_zowe_sdk_1.Get.dataSet(session, commandParameters.arguments.dataSetName, {
|
|
77
78
|
binary: commandParameters.arguments.binary,
|
|
78
79
|
encoding: commandParameters.arguments.encoding,
|
|
@@ -81,30 +82,25 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
|
|
|
81
82
|
responseTimeout: commandParameters.arguments.responseTimeout,
|
|
82
83
|
task: task
|
|
83
84
|
});
|
|
84
|
-
|
|
85
|
+
commandParameters.response.progress.endBar();
|
|
86
|
+
//CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
|
|
85
87
|
let lfContentString = "";
|
|
86
88
|
let dsContentString = "";
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
const dsStringArray = dsContentBuf.toString().split("\n");
|
|
96
|
-
for (const i in dsStringArray) {
|
|
97
|
-
const sl = dsStringArray[i].length;
|
|
98
|
-
const tempString = dsStringArray[i].substring(0, sl - seqnumlen);
|
|
99
|
-
dsContentString += tempString + "\n";
|
|
100
|
-
}
|
|
89
|
+
const seqnumlen = 8;
|
|
90
|
+
if (commandParameters.arguments.seqnum === false) {
|
|
91
|
+
lfContentString = lfContentBuf.toString().split("\n")
|
|
92
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
93
|
+
.join("\n");
|
|
94
|
+
dsContentString = dsContentBuf.toString().split("\n")
|
|
95
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
96
|
+
.join("\n");
|
|
101
97
|
}
|
|
102
98
|
else {
|
|
103
99
|
lfContentString = lfContentBuf.toString();
|
|
104
100
|
dsContentString = dsContentBuf.toString();
|
|
105
101
|
}
|
|
106
|
-
//
|
|
107
|
-
if (browserView) {
|
|
102
|
+
// CHECK TO OPEN UP DIFF IN BROWSER WINDOW
|
|
103
|
+
if (commandParameters.arguments.browserView) {
|
|
108
104
|
yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, dsContentString);
|
|
109
105
|
return {
|
|
110
106
|
success: true,
|
|
@@ -112,12 +108,10 @@ class LocalfileDatasetHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
|
|
|
112
108
|
apiResponse: {}
|
|
113
109
|
};
|
|
114
110
|
}
|
|
115
|
-
|
|
116
|
-
const
|
|
117
|
-
//remove all line break encodings from strings
|
|
118
|
-
jsonDiff = yield imperative_1.DiffUtils.getDiffString(imperative_1.IO.processNewlines(lfContentString), imperative_1.IO.processNewlines(dsContentString), {
|
|
111
|
+
// RETURNING DIFF
|
|
112
|
+
const jsonDiff = yield imperative_1.DiffUtils.getDiffString(imperative_1.IO.processNewlines(lfContentString), imperative_1.IO.processNewlines(dsContentString), {
|
|
119
113
|
outputFormat: 'terminal',
|
|
120
|
-
contextLinesArg:
|
|
114
|
+
contextLinesArg: commandParameters.arguments.contextLines
|
|
121
115
|
});
|
|
122
116
|
return {
|
|
123
117
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalfileDataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-ds/LocalfileDataset.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,yBAAyB;AACzB,6BAA6B;AAE7B,iDAAmI;AACnI,yEAAsE;AACtE,qEAAiE;AAEjE;;;GAGG;AACH,MAAqB,uBAAwB,SAAQ,0CAAmB;IACvD,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,uBAAuB;gBACtC,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"LocalfileDataset.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-ds/LocalfileDataset.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,17 +31,17 @@ const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
|
|
|
31
31
|
class LocalfileSpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
32
32
|
processWithSession(commandParameters, session) {
|
|
33
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
const descriptionSeperator = ":";
|
|
34
35
|
const task = {
|
|
35
36
|
percentComplete: 0,
|
|
36
37
|
statusMessage: "Retrieving local file",
|
|
37
38
|
stageName: imperative_1.TaskStage.IN_PROGRESS
|
|
38
39
|
};
|
|
39
|
-
|
|
40
|
+
// CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
|
|
40
41
|
commandParameters.response.progress.startBar({ task });
|
|
41
|
-
// retrieving local file
|
|
42
42
|
let localFile;
|
|
43
|
-
// resolving to full path if local path passed is not absolute
|
|
44
43
|
if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
|
|
44
|
+
// resolving to full path if local path passed is not absolute
|
|
45
45
|
localFile = commandParameters.arguments.localFilePath;
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
@@ -71,30 +71,32 @@ class LocalfileSpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
|
|
|
71
71
|
finally {
|
|
72
72
|
fs.closeSync(localFileHandle);
|
|
73
73
|
}
|
|
74
|
-
let lfContentString = "";
|
|
75
|
-
if (!commandParameters.arguments.seqnum) {
|
|
76
|
-
const seqnumlen = 8;
|
|
77
|
-
const lfStringArray = lfContentBuf.toString().split("\n");
|
|
78
|
-
for (const i in lfStringArray) {
|
|
79
|
-
const sl = lfStringArray[i].length;
|
|
80
|
-
const tempString = lfStringArray[i].substring(0, sl - seqnumlen);
|
|
81
|
-
lfContentString += tempString + "\n";
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
else {
|
|
85
|
-
lfContentString = lfContentBuf.toString();
|
|
86
|
-
}
|
|
87
74
|
commandParameters.response.progress.endBar();
|
|
88
|
-
|
|
75
|
+
// RETRIEVING SPOOLDD
|
|
89
76
|
task.statusMessage = "Retrieving spooldd";
|
|
90
|
-
|
|
77
|
+
commandParameters.response.progress.startBar({ task });
|
|
91
78
|
const spoolDescription = commandParameters.arguments.spoolDescription;
|
|
92
79
|
const spoolDescArr = spoolDescription.split(descriptionSeperator);
|
|
93
80
|
const jobName = spoolDescArr[0];
|
|
94
81
|
const jobId = spoolDescArr[1];
|
|
95
82
|
const spoolId = Number(spoolDescArr[2]);
|
|
96
|
-
|
|
97
|
-
|
|
83
|
+
let spoolContentString = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName, jobId, spoolId);
|
|
84
|
+
commandParameters.response.progress.endBar();
|
|
85
|
+
//CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
|
|
86
|
+
let lfContentString = "";
|
|
87
|
+
const seqnumlen = 8;
|
|
88
|
+
if (commandParameters.arguments.seqnum === false) {
|
|
89
|
+
lfContentString = lfContentBuf.toString().split("\n")
|
|
90
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
91
|
+
.join("\n");
|
|
92
|
+
spoolContentString = spoolContentString.split("\n")
|
|
93
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
94
|
+
.join("\n");
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
lfContentString = lfContentBuf.toString();
|
|
98
|
+
}
|
|
99
|
+
// CHECK TO OPEN UP DIFF IN BROWSER WINDOW
|
|
98
100
|
if (commandParameters.arguments.browserView) {
|
|
99
101
|
yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, spoolContentString);
|
|
100
102
|
return {
|
|
@@ -103,11 +105,10 @@ class LocalfileSpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler
|
|
|
103
105
|
apiResponse: {}
|
|
104
106
|
};
|
|
105
107
|
}
|
|
106
|
-
|
|
107
|
-
const
|
|
108
|
-
jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, spoolContentString, {
|
|
108
|
+
// RETURNING DIFF
|
|
109
|
+
const jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, spoolContentString, {
|
|
109
110
|
outputFormat: 'terminal',
|
|
110
|
-
contextLinesArg:
|
|
111
|
+
contextLinesArg: commandParameters.arguments.contextLines
|
|
111
112
|
});
|
|
112
113
|
return {
|
|
113
114
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalfileSpooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,6BAA6B;AAC7B,yBAAyB;
|
|
1
|
+
{"version":3,"file":"LocalfileSpooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-sdd/LocalfileSpooldd.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,11 @@ class LocalfileUssHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
36
36
|
statusMessage: "Retrieving local file",
|
|
37
37
|
stageName: imperative_1.TaskStage.IN_PROGRESS
|
|
38
38
|
};
|
|
39
|
+
// CHECKING IF LOCAL FILE EXISTS, THEN RETRIEVING IT
|
|
39
40
|
commandParameters.response.progress.startBar({ task });
|
|
40
41
|
let localFile;
|
|
41
|
-
// resolving to full path if local path passed is not absolute
|
|
42
42
|
if (path.isAbsolute(commandParameters.arguments.localFilePath)) {
|
|
43
|
+
// resolving to full path if local path passed is not absolute
|
|
43
44
|
localFile = commandParameters.arguments.localFilePath;
|
|
44
45
|
}
|
|
45
46
|
else {
|
|
@@ -70,39 +71,34 @@ class LocalfileUssHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
70
71
|
fs.closeSync(localFileHandle);
|
|
71
72
|
}
|
|
72
73
|
commandParameters.response.progress.endBar();
|
|
73
|
-
//
|
|
74
|
-
commandParameters.response.progress.startBar({ task });
|
|
74
|
+
// RETRIEVING USS FILE TO COMPARE
|
|
75
75
|
task.statusMessage = "Retrieving uss file";
|
|
76
|
+
commandParameters.response.progress.startBar({ task });
|
|
76
77
|
const ussContentBuf = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath, {
|
|
77
78
|
binary: commandParameters.arguments.binary,
|
|
78
79
|
encoding: commandParameters.arguments.encoding,
|
|
79
80
|
responseTimeout: commandParameters.arguments.responseTimeout,
|
|
80
81
|
task: task
|
|
81
82
|
});
|
|
82
|
-
|
|
83
|
+
commandParameters.response.progress.endBar();
|
|
84
|
+
//CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
|
|
83
85
|
let lfContentString = "";
|
|
84
86
|
let ussContentString = "";
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
const ussStringArray = ussContentBuf.toString().split("\n");
|
|
94
|
-
for (const i in ussStringArray) {
|
|
95
|
-
const sl = ussStringArray[i].length;
|
|
96
|
-
const tempString = ussStringArray[i].substring(0, sl - seqnumlen);
|
|
97
|
-
ussContentString += tempString + "\n";
|
|
98
|
-
}
|
|
87
|
+
const seqnumlen = 8;
|
|
88
|
+
if (commandParameters.arguments.seqnum === false) {
|
|
89
|
+
lfContentString = lfContentBuf.toString().split("\n")
|
|
90
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
91
|
+
.join("\n");
|
|
92
|
+
ussContentString = ussContentBuf.toString().split("\n")
|
|
93
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
94
|
+
.join("\n");
|
|
99
95
|
}
|
|
100
96
|
else {
|
|
101
97
|
lfContentString = lfContentBuf.toString();
|
|
102
98
|
ussContentString = ussContentBuf.toString();
|
|
103
99
|
}
|
|
104
|
-
//
|
|
105
|
-
if (browserView) {
|
|
100
|
+
// CHECK TO OPEN UP DIFF IN BROWSER WINDOW
|
|
101
|
+
if (commandParameters.arguments.browserView) {
|
|
106
102
|
yield imperative_1.DiffUtils.openDiffInbrowser(lfContentString, ussContentString);
|
|
107
103
|
return {
|
|
108
104
|
success: true,
|
|
@@ -110,11 +106,10 @@ class LocalfileUssHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
110
106
|
apiResponse: {}
|
|
111
107
|
};
|
|
112
108
|
}
|
|
113
|
-
|
|
114
|
-
const
|
|
115
|
-
jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, ussContentString, {
|
|
109
|
+
// RETURNING DIFF
|
|
110
|
+
const jsonDiff = yield imperative_1.DiffUtils.getDiffString(lfContentString, ussContentString, {
|
|
116
111
|
outputFormat: 'terminal',
|
|
117
|
-
contextLinesArg:
|
|
112
|
+
contextLinesArg: commandParameters.arguments.contextLines
|
|
118
113
|
});
|
|
119
114
|
return {
|
|
120
115
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalfileUss.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-uss/LocalfileUss.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,yBAAyB;AACzB,6BAA6B;AAE7B,iDAA+H;AAC/H,yEAAsE;AACtE,qEAAiE;AAEjE;;;GAGG;AACH,MAAqB,mBAAoB,SAAQ,0CAAmB;IACnD,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,uBAAuB;gBACtC,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"LocalfileUss.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/lf-uss/LocalfileUss.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,31 +29,42 @@ const ZosFilesBase_handler_1 = require("../../ZosFilesBase.handler");
|
|
|
29
29
|
class SpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
30
30
|
processWithSession(commandParameters, session) {
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
+
const descriptionSeperator = ":";
|
|
32
33
|
const task = {
|
|
33
34
|
percentComplete: 0,
|
|
34
35
|
statusMessage: "Retrieving first spool dd",
|
|
35
36
|
stageName: imperative_1.TaskStage.IN_PROGRESS
|
|
36
37
|
};
|
|
37
|
-
|
|
38
|
+
// RETRIEVING INFO FOR FIRST SPOOLDD
|
|
38
39
|
commandParameters.response.progress.startBar({ task });
|
|
39
40
|
const spoolDescription1 = commandParameters.arguments.spoolDescription1;
|
|
40
|
-
// retrieving information for first spooldd
|
|
41
41
|
const spoolDescArr1 = spoolDescription1.split(descriptionSeperator);
|
|
42
42
|
const jobName1 = spoolDescArr1[0];
|
|
43
43
|
const jobId1 = spoolDescArr1[1];
|
|
44
44
|
const spoolId1 = Number(spoolDescArr1[2]);
|
|
45
|
-
|
|
45
|
+
let spoolContentString1 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName1, jobId1, spoolId1);
|
|
46
46
|
commandParameters.response.progress.endBar();
|
|
47
|
-
|
|
47
|
+
// RETRIEVING INFO FOR SECOND SPOOLDD
|
|
48
48
|
task.statusMessage = "Retrieving second spooldd";
|
|
49
|
-
|
|
49
|
+
commandParameters.response.progress.startBar({ task });
|
|
50
50
|
const spoolDescription2 = commandParameters.arguments.spoolDescription2;
|
|
51
51
|
const spoolDescArr2 = spoolDescription2.split(descriptionSeperator);
|
|
52
52
|
const jobName2 = spoolDescArr2[0];
|
|
53
53
|
const jobId2 = spoolDescArr2[1];
|
|
54
54
|
const spoolId2 = Number(spoolDescArr2[2]);
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
let spoolContentString2 = yield zos_jobs_for_zowe_sdk_1.GetJobs.getSpoolContentById(session, jobName2, jobId2, spoolId2);
|
|
56
|
+
commandParameters.response.progress.endBar();
|
|
57
|
+
//CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
|
|
58
|
+
const seqnumlen = 8;
|
|
59
|
+
if (commandParameters.arguments.seqnum === false) {
|
|
60
|
+
spoolContentString1 = spoolContentString1.split("\n")
|
|
61
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
62
|
+
.join("\n");
|
|
63
|
+
spoolContentString2 = spoolContentString2.split("\n")
|
|
64
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
65
|
+
.join("\n");
|
|
66
|
+
}
|
|
67
|
+
// CHECK TO OPEN UP DIFF IN BROWSER WINDOW
|
|
57
68
|
if (commandParameters.arguments.browserView) {
|
|
58
69
|
yield imperative_1.DiffUtils.openDiffInbrowser(spoolContentString1, spoolContentString2);
|
|
59
70
|
return {
|
|
@@ -62,11 +73,10 @@ class SpoolddHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
62
73
|
apiResponse: {}
|
|
63
74
|
};
|
|
64
75
|
}
|
|
65
|
-
|
|
66
|
-
const
|
|
67
|
-
jsonDiff = yield imperative_1.DiffUtils.getDiffString(spoolContentString1, spoolContentString2, {
|
|
76
|
+
// RETURNING DIFF
|
|
77
|
+
const jsonDiff = yield imperative_1.DiffUtils.getDiffString(spoolContentString1, spoolContentString2, {
|
|
68
78
|
outputFormat: 'terminal',
|
|
69
|
-
contextLinesArg:
|
|
79
|
+
contextLinesArg: commandParameters.arguments.contextLines
|
|
70
80
|
});
|
|
71
81
|
return {
|
|
72
82
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Spooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/sdd/Spooldd.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAE9G,uEAAsD;AACtD,qEAAiE;AACjE;;;GAGG;AACH,MAAqB,cAAe,SAAQ,0CAAmB;IAC9C,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,2BAA2B;gBAC1C,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"Spooldd.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/sdd/Spooldd.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ class UssFileHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
34
34
|
statusMessage: "Retrieving first uss file",
|
|
35
35
|
stageName: imperative_1.TaskStage.IN_PROGRESS
|
|
36
36
|
};
|
|
37
|
+
// RETRIEVING USS FILE
|
|
37
38
|
commandParameters.response.progress.startBar({ task });
|
|
38
39
|
const ussFileContentBuf1 = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath1, {
|
|
39
40
|
binary: commandParameters.arguments.binary,
|
|
@@ -42,46 +43,42 @@ class UssFileHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
42
43
|
task: task
|
|
43
44
|
});
|
|
44
45
|
commandParameters.response.progress.endBar();
|
|
46
|
+
// RETRIEVING THE SECOND USS FILE TO COMPARE
|
|
47
|
+
task.statusMessage = "Retrieving second uss-file";
|
|
45
48
|
commandParameters.response.progress.startBar({ task });
|
|
46
49
|
let binary2 = commandParameters.arguments.binary2;
|
|
47
50
|
let encoding2 = commandParameters.arguments.encoding2;
|
|
48
|
-
const browserView = commandParameters.arguments.browserView;
|
|
49
51
|
if (binary2 == undefined) {
|
|
50
52
|
binary2 = commandParameters.arguments.binary;
|
|
51
53
|
}
|
|
52
54
|
if (encoding2 == undefined) {
|
|
53
55
|
encoding2 = commandParameters.arguments.encoding;
|
|
54
56
|
}
|
|
55
|
-
task.statusMessage = "Retrieving second uss-file";
|
|
56
57
|
const ussFileContentBuf2 = yield zos_files_for_zowe_sdk_1.Get.USSFile(session, commandParameters.arguments.ussFilePath2, {
|
|
57
58
|
binary: binary2,
|
|
58
59
|
encoding: encoding2,
|
|
59
60
|
responseTimeout: commandParameters.arguments.responseTimeout,
|
|
60
61
|
task: task
|
|
61
62
|
});
|
|
63
|
+
commandParameters.response.progress.endBar();
|
|
64
|
+
//CHECKING IF NEEDING TO SPLIT CONTENT STRINGS FOR SEQNUM OPTION
|
|
62
65
|
let ussContentString1 = "";
|
|
63
66
|
let ussContentString2 = "";
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
const ussFileStringArray2 = ussFileContentBuf2.toString().split("\n");
|
|
73
|
-
for (const i in ussFileStringArray2) {
|
|
74
|
-
const sl = ussFileStringArray2[i].length;
|
|
75
|
-
const tempString = ussFileStringArray2[i].substring(0, sl - seqnumlen);
|
|
76
|
-
ussContentString2 += tempString + "\n";
|
|
77
|
-
}
|
|
67
|
+
const seqnumlen = 8;
|
|
68
|
+
if (commandParameters.arguments.seqnum === false) {
|
|
69
|
+
ussContentString1 = ussFileContentBuf1.toString().split("\n")
|
|
70
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
71
|
+
.join("\n");
|
|
72
|
+
ussContentString2 = ussFileContentBuf2.toString().split("\n")
|
|
73
|
+
.map((line) => line.slice(0, -seqnumlen))
|
|
74
|
+
.join("\n");
|
|
78
75
|
}
|
|
79
76
|
else {
|
|
80
77
|
ussContentString1 = ussFileContentBuf1.toString();
|
|
81
78
|
ussContentString2 = ussFileContentBuf2.toString();
|
|
82
79
|
}
|
|
83
|
-
//
|
|
84
|
-
if (browserView) {
|
|
80
|
+
// CHECKING IF THE BROWSER VIEW IS TRUE, OPEN UP THE DIFFS IN BROWSER
|
|
81
|
+
if (commandParameters.arguments.browserView) {
|
|
85
82
|
yield imperative_1.DiffUtils.openDiffInbrowser(ussContentString1, ussContentString2);
|
|
86
83
|
return {
|
|
87
84
|
success: true,
|
|
@@ -89,11 +86,10 @@ class UssFileHandler extends ZosFilesBase_handler_1.ZosFilesBaseHandler {
|
|
|
89
86
|
apiResponse: {}
|
|
90
87
|
};
|
|
91
88
|
}
|
|
92
|
-
|
|
93
|
-
const
|
|
94
|
-
jsonDiff = yield imperative_1.DiffUtils.getDiffString(ussContentString1, ussContentString2, {
|
|
89
|
+
// RETURNING DIFF
|
|
90
|
+
const jsonDiff = yield imperative_1.DiffUtils.getDiffString(ussContentString1, ussContentString2, {
|
|
95
91
|
outputFormat: 'terminal',
|
|
96
|
-
contextLinesArg:
|
|
92
|
+
contextLinesArg: commandParameters.arguments.contextLines
|
|
97
93
|
});
|
|
98
94
|
return {
|
|
99
95
|
success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UssFile.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/uss/UssFile.handler.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;;;;;;AAEF,iDAA8G;AAC9G,yEAAsE;AACtE,qEAAiE;AACjE;;;GAGG;AACH,MAAqB,cAAe,SAAQ,0CAAmB;IAC9C,kBAAkB,CAAC,iBAAqC,EAAE,OAAwB;;YAC3F,MAAM,IAAI,GAAoB;gBAC1B,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,2BAA2B;gBAC1C,SAAS,EAAE,sBAAS,CAAC,WAAW;aACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"UssFile.handler.js","sourceRoot":"","sources":["../../../../src/zosfiles/compare/uss/UssFile.handler.ts"],"names":[],"mappings":"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"}
|