Merge pull request #181 from zowe/bracketing

Change criteria bracketing behaviour
zowe · Dec 19, 2024 · 3786293 · 3786293
2 parents 8915c56 + b9df585
commit 3786293
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the IBM® CICS® Plug-in for Zowe CLI will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Change getResource criteria bracketing behaviour. [#180](https://github.com/zowe/cics-for-zowe-client/issues/180)
+
 ## `6.2.0`
 
 - Enhancement: Add optional query parameters on getResource SDK method. [#168](https://github.com/zowe/cics-for-zowe-client/issues/168)

diff --git a/packages/sdk/__tests__/__unit__/utils/Utils.unit.test.ts b/packages/sdk/__tests__/__unit__/utils/Utils.unit.test.ts
@@ -398,12 +398,12 @@ describe('Utils - enforceParentheses', () => {
 
   it("should add first bracket when end exists", () => {
     const output = Utils.enforceParentheses("input with spaces)");
-    expect(output).toEqual("(input with spaces)");
+    expect(output).toEqual("(input with spaces))");
   });
 
   it("should add last bracket when first exists", () => {
     const output = Utils.enforceParentheses("(input with spec1@| characters");
-    expect(output).toEqual("(input with spec1@| characters)");
+    expect(output).toEqual("(input with spec1@| characters");
   });
 
   it("should do nothing when both brackets exist", () => {
@@ -415,6 +415,11 @@ describe('Utils - enforceParentheses', () => {
     const output = Utils.enforceParentheses("((()))");
     expect(output).toEqual("((()))");
   });
+
+  it("should add appropriate brackets", () => {
+    const output = Utils.enforceParentheses("NOT (PROGRAM=CEE* OR PROGRAM=DFH* OR PROGRAM=CJ* OR PROGRAM=EYU* OR PROGRAM=CSQ* OR PROGRAM=CEL* OR PROGRAM=IGZ*)");
+    expect(output).toEqual("(NOT (PROGRAM=CEE* OR PROGRAM=DFH* OR PROGRAM=CJ* OR PROGRAM=EYU* OR PROGRAM=CSQ* OR PROGRAM=CEL* OR PROGRAM=IGZ*))");
+  });
 });
 
 describe("Utils - getCacheUri", () => {

diff --git a/packages/sdk/src/utils/Utils.ts b/packages/sdk/src/utils/Utils.ts
@@ -93,13 +93,6 @@ export class Utils {
   }
 
   public static enforceParentheses(input: string): string {
-    if (!input.startsWith('(') && !input.endsWith(')')) {
-      return `(${input})`;
-    } else if (input.startsWith('(') && !input.endsWith(')')) {
-      return `${input})`;
-    } else if (!input.startsWith('(') && input.endsWith(')')) {
-      return `(${input}`;
-    }
-    return input;
+    return input.startsWith("(") ? input : `(${input})`;
   }
 }