Merge branch 'master' into updateResponseIZosFilesResponseObject

zowe · Jul 24, 2023 · 20dac45 · 20dac45
2 parents 43fe318 + 889411a
commit 20dac45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/cli/src/zosfiles/edit/Edit.utils.ts b/packages/cli/src/zosfiles/edit/Edit.utils.ts
@@ -135,7 +135,7 @@ export class EditUtilities {
             input = await CliUtils.readPrompt(TextUtils.chalk.green(promptText));
         }
         while (input != null && input.toLowerCase() != 'y' &&  input.toLowerCase() != 'n');
-        if (input === null) {
+        if (input == null) {
             throw new ImperativeError({
                 msg: TextUtils.chalk.red('No input provided. Command terminated. Temp file will persist.')
             });

diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md
@@ -2,9 +2,14 @@
 
 All notable changes to the Zowe z/OS files SDK package will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Fixed error when listing data set members that include double quote in the name.
+
 ## `7.17.0`
-- Enhancement: Added streaming capabilities to the Download.dataSet and Download.ussFile methods.
-- BugFix: Fixed Get.USSFile API not respecting USS file tags.
+
+- Enhancement: Added streaming capabilities to the `Download.dataSet` and `Download.ussFile` methods.
+- BugFix: Fixed `Get.USSFile` API not respecting USS file tags.
 
 ## `7.16.6`
 

diff --git a/packages/zosfiles/src/methods/list/List.ts b/packages/zosfiles/src/methods/list/List.ts
@@ -83,7 +83,7 @@ export class List {
                 response = JSONUtils.parse(data);
             } catch {
                 // Escape invalid JSON characters in encrypted member names
-                for (const match of Array.from(data.matchAll(/"member":\s*"(?![A-Za-z@#$][A-Za-z0-9@#$]{0,7}")/g)).reverse()) {
+                for (const match of Array.from(data.matchAll(/"member":\s*"/g)).reverse()) {
                     const memberStartIdx = match.index + match[0].length;
                     const memberNameLength = data.substring(memberStartIdx,
                         memberStartIdx + data.substring(memberStartIdx).match(/"[A-Za-z]{6,}"\s*:/).index).lastIndexOf(`"`);