17256: Added map to enable item resolution

[arvados-workbench2.git] / src / store / search-bar / search-bar-actions.ts

diff --git a/src/store/search-bar/search-bar-actions.ts b/src/store/search-bar/search-bar-actions.ts
index 54678b504b52c0f22ffd83c77071033b74e70821..b010af1448d9c410a64883c4863c0fc2e90b1a2f 100644 (file)
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@ -268,6 +268,7 @@ export const getQueryFromAdvancedData = (data: SearchBarAdvancedFormData, prevDa
             cluster: data.cluster,
             projectUuid: data.projectUuid,
             inTrash: data.inTrash,
+            pastVersions: data.pastVersions,
             dateFrom: data.dateFrom,
             dateTo: data.dateTo,
         };
@@ -282,6 +283,7 @@ export const getQueryFromAdvancedData = (data: SearchBarAdvancedFormData, prevDa
         ['cluster', 'cluster'],
         ['project', 'projectUuid'],
         [`is:${parser.States.TRASHED}`, 'inTrash'],
+        [`is:${parser.States.PAST_VERSION}`, 'pastVersions'],
         ['from', 'dateFrom'],
         ['to', 'dateTo']
     ];
@@ -307,6 +309,7 @@ export const getAdvancedDataFromQuery = (query: string, vocabulary?: Vocabulary)
         cluster: getValue(Keywords.CLUSTER),
         projectUuid: getValue(Keywords.PROJECT),
         inTrash: parser.isTrashed(tokens),
+        pastVersions: parser.isPastVersion(tokens),
         dateFrom: getValue(Keywords.FROM) || '',
         dateTo: getValue(Keywords.TO) || '',
         properties: vocabulary
@@ -354,12 +357,14 @@ export const queryToFilters = (query: string, apiRevision: number) => {
         if (p.value) {
             if (apiRevision < 20200212) {
                 filter
-                    .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT)
-                    .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION);
+                    .addEqual(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT)
+                    .addEqual(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION)
+                    .addEqual(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROCESS);
             } else {
                 filter
                     .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT)
-                    .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION);
+                    .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION)
+                    .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROCESS);
             }
         }
         filter.addExists(p.key);