Add check for quotes after midConditional (#2803)

Author: laurakwhit

src/lib/utilities/query/tokenize.test.ts

@@ -63,6 +63,22 @@ describe('tokenize', () => {
     ]);
   });
 
+  it('should tokenize the not equal to conditional', () => {
+    const result = [
+      'WorkflowId',
+      '=',
+      'Hello',
+      'and',
+      'WorkflowType',
+      '!=',
+      'World',
+    ];
+    let query = '`WorkflowId`="Hello" and `WorkflowType`!="World"';
+    expect(tokenize(query)).toEqual(result);
+    query = '`WorkflowId` = "Hello" and `WorkflowType` != "World"';
+    expect(tokenize(query)).toEqual(result);
+  });
+
   it('should tokenize the customAttributesWithSpacesQuery', () => {
     const query = customAttributesWithSpacesQuery;
 
@@ -153,6 +169,12 @@ describe('tokenize', () => {
     expect(tokenize(query)).toEqual(['WorkflowType', 'STARTS_WITH', 'Hello']);
   });
 
+  it('should tokenize the startsWithQuery without spaces', () => {
+    const query = '`WorkflowType`STARTS_WITH"Hello"';
+
+    expect(tokenize(query)).toEqual(['WorkflowType', 'STARTS_WITH', 'Hello']);
+  });
+
   it('should tokenize the startsWithInQuery for values with IN conditional in them', () => {
     const query = '`WorkflowType` STARTS_WITH "Inspect"';
 

src/lib/utilities/query/tokenize.ts

@@ -84,9 +84,11 @@ export const tokenize = (string: string): Tokens => {
       continue;
     } else if (
       isConditional(midConditional) &&
-      (isSpace(string[cursor + 2]) || isParenthesis(string[cursor + 2]))
+      (isSpace(string[cursor + 2]) ||
+        isQuote(string[cursor + 2]) ||
+        isParenthesis(string[cursor + 2]))
     ) {
-      // To prevent false positives like "inspect" being a "in" conditional, check for space or parenthesis after the midConditional
+      // To prevent false positives like "inspect" being a "in" conditional, check for space, quote, or parenthesis after the midConditional
       buffer += midConditional;
       addBufferToTokens();
       cursor += 2;