Merge branch 'master' into chore/update-workflows-and-deps

zowe · Dec 26, 2024 · e78d303 · e78d303
2 parents d2a4fcd + f94ed83
commit e78d303
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "8.10.1",
+  "version": "8.10.2",
   "command": {
     "publish": {
       "ignoreChanges": [

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli",
-  "version": "8.10.1",
+  "version": "8.10.2",
   "zoweVersion": "v3.0.0",
   "description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
   "author": "Zowe",
@@ -63,7 +63,7 @@
     "@zowe/provisioning-for-zowe-sdk": "8.10.1",
     "@zowe/zos-console-for-zowe-sdk": "8.10.1",
     "@zowe/zos-files-for-zowe-sdk": "8.10.1",
-    "@zowe/zos-jobs-for-zowe-sdk": "8.10.1",
+    "@zowe/zos-jobs-for-zowe-sdk": "8.10.2",
     "@zowe/zos-logs-for-zowe-sdk": "8.10.1",
     "@zowe/zos-tso-for-zowe-sdk": "8.10.1",
     "@zowe/zos-uss-for-zowe-sdk": "8.10.1",

diff --git a/packages/zosjobs/CHANGELOG.md b/packages/zosjobs/CHANGELOG.md
@@ -2,11 +2,16 @@
 
 All notable changes to the Zowe z/OS jobs SDK package will be documented in this file.
 
+## `8.10.2`
+
+- BugFix: Check if encoding is set and not empty now works for numeric-only value in encoding (GetJobs.ts). [#2392] (https://github.com/zowe/zowe-cli/pull/2392).
+
 ## `8.7.1`
 
 - BugFix: Fixed an error where the Delete Jobs API response was not returned if the `modifyVersion` parameter was not specified, even though it was available. [#2352](https://github.com/zowe/zowe-cli/pull/2352)
 
 ## `8.7.0`
+
 - Enhancement: Added waitForOutput & waitForActive as optional parameters to download on zosjobs. [#2326] (https://github.com/zowe/zowe-cli/pull/2326).
 
 ## `8.5.0`

diff --git a/packages/zosjobs/__tests__/__unit__/GetJobs.unit.test.ts b/packages/zosjobs/__tests__/__unit__/GetJobs.unit.test.ts
@@ -521,6 +521,13 @@ describe("GetJobs tests", () => {
             expect(content).toEqual(GetJobsData.SAMPLE_JES_MSG_LG);
         });
 
+        it("should return spool content from getSpoolContentById with encoding as a number if z/OSMF response is mocked", async () => {
+            (ZosmfRestClient.getExpectString as any) = mockGetJobsStringData(GetJobsData.SAMPLE_JES_MSG_LG);
+            const content = await GetJobs.getSpoolContentById(pretendSession, "MYJOB1", "JOB0123", 1, 278 as any);
+            expect((ZosmfRestClient.getExpectString as any).mock.calls[0][1]).toContain("fileEncoding=278");
+            expect(content).toEqual(GetJobsData.SAMPLE_JES_MSG_LG);
+        });
+
         it("should error if spoolID is omitted from getSpoolContentById", async () => {
             let err: Error;
             try {

diff --git a/packages/zosjobs/package.json b/packages/zosjobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/zos-jobs-for-zowe-sdk",
-  "version": "8.10.1",
+  "version": "8.10.2",
   "description": "Zowe SDK to interact with jobs on z/OS",
   "author": "Zowe",
   "license": "EPL-2.0",

diff --git a/packages/zosjobs/src/GetJobs.ts b/packages/zosjobs/src/GetJobs.ts
@@ -375,7 +375,9 @@ export class GetJobs {
         ImperativeExpect.toNotBeNullOrUndefined(spoolId, "Required parameter spoolId must be defined");
         let parameters: string = "/" + encodeURIComponent(jobname) + "/" + encodeURIComponent(jobid) +
             JobsConstants.RESOURCE_SPOOL_FILES + "/" + encodeURIComponent(spoolId) + JobsConstants.RESOURCE_SPOOL_CONTENT;
-        if (encoding && encoding.trim() != "") {parameters += "?fileEncoding=" + encoding;}
+        if (encoding != null && String(encoding).trim() !== "") {
+            parameters += "?fileEncoding=" + encoding;
+        }
         Logger.getAppLogger().info("GetJobs.getSpoolContentById() parameters: " + parameters);
         return ZosmfRestClient.getExpectString(session, JobsConstants.RESOURCE + parameters, [Headers.TEXT_PLAIN_UTF8]);
     }