projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17637: Fixes edge case while simplifying code.
[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 d9dc0a64905aa5c3596e244f36b935e53bc7d4f4..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,
cluster: data.cluster,
projectUuid: data.projectUuid,
inTrash: data.inTrash,
+ pastVersions: data.pastVersions,
dateFrom: data.dateFrom,
dateTo: data.dateTo,
};
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'],
['cluster', 'cluster'],
['project', 'projectUuid'],
[`is:${parser.States.TRASHED}`, 'inTrash'],
+ [`is:${parser.States.PAST_VERSION}`, 'pastVersions'],
['from', 'dateFrom'],
['to', 'dateTo']
];
['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),
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
dateFrom: getValue(Keywords.FROM) || '',
dateTo: getValue(Keywords.TO) || '',
properties: vocabulary