[ARVADOS-WORKBENCH2] updated: 1.3.1-413-gdf60d340
Git user
git at public.curoverse.com
Thu Mar 14 10:35:28 EDT 2019
Summary of changes:
src/store/search-bar/search-bar-actions.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
via df60d34060e3031bdec0ea58c25bcff99d4d3817 (commit)
via ab3f48f4a017ede820ae1358964b52ebc720857e (commit)
from cdd30b9a623a18671ac610c5503774cc4c322b11 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit df60d34060e3031bdec0ea58c25bcff99d4d3817
Merge: cdd30b9a ab3f48f4
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Mar 14 15:34:58 2019 +0100
Merge branch '14917-searching-by-properties'
refs #14917
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
commit ab3f48f4a017ede820ae1358964b52ebc720857e
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Mar 14 15:34:15 2019 +0100
Update buildQueryFromKeyMap patterns to match new property tokens
Feature #14917
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/search-bar/search-bar-actions.ts b/src/store/search-bar/search-bar-actions.ts
index bffa337b..8734888b 100644
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@ -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,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list