Update buildQueryFromKeyMap patterns to match new property tokens
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 14 Mar 2019 14:34:15 +0000 (15:34 +0100)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Thu, 14 Mar 2019 14:34:15 +0000 (15:34 +0100)
Feature #14917

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

src/store/search-bar/search-bar-actions.ts

index bffa337b28640b3d21fd5a006ce7ebf840e8c8bc..8734888bbcd329532848c89695a4788b69197f63 100644 (file)
@@ -235,7 +235,7 @@ const buildQueryFromKeyMap = (data: any, keyMap: string[][], mode: 'rebuild' | '
         if (data.hasOwnProperty(key)) {
             const pattern = v === false
                 ? `${field.replace(':', '\\:\\s*')}\\s*`
-                : `${field.replace(':', '\\:\\s*')}\\:\\s*[\\w|\\#|\\-|\\/]*\\s*`;
+                : `${field.replace(':', '\\:\\s*')}\\:\\s*"[\\w|\\#|\\-|\\/]*"\\s*`;
             value = value.replace(new RegExp(pattern), '');
         }
 
@@ -286,6 +286,8 @@ export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevDat
         .forEach(p => keyMap.push([`has:"${p.key}"`, `prop-"${p.key}"`]));
 
     if (prevData) {
+        const fd = flatData(data);
+        const pfd = flatData(prevData);
         const obj = getModifiedKeysValues(flatData(data), flatData(prevData));
         value = buildQueryFromKeyMap({
             searchValue: data.searchValue,