jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(ui) - url search - handle source

Browse source
This commit is contained in:
Shekar Siri 2022-08-17 18:39:10 +02:00
parent 9d0ce368a3
commit 2709c96e90
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
frontend/app/components/shared/SessionSearchQueryParamHandler/SessionSearchQueryParamHandler.tsx
View file

@ -51,7 +51,11 @@ const SessionSearchQueryParamHandler = React.memo((props: Props) => {
filters.forEach((filter: any) => {
if (filter.value.length > 0) {
const _key = setQueryParamKeyFromFilterkey(filter.key);
query[_key] = `${filter.operator}|${filter.value.join('|')}`;
let str = `${filter.operator}|${filter.value.join('|')}`;
if (filter.hasSource) {
str = `${str}^${filter.sourceOperator}|${filter.source.join('|')}`;
}
query[_key] = str;
}
});
return query;
@ -60,11 +64,15 @@ const SessionSearchQueryParamHandler = React.memo((props: Props) => {
const addFilter = ([key, value]: [string, string]): void => {
if (value !== '') {
const filterKey = getFilterKeyTypeByKey(key);
const valueArr = value.split('|');
const tmp = value.split('^');
const valueArr = tmp[0].split('|');
const operator = valueArr.shift();
const sourceArr = tmp[1] ? tmp[1].split('|') : [];
const sourceOperator = sourceArr.shift();
const source = sourceArr;
// TODO validate operator
if (filterKey) {
props.addFilterByKeyAndValue(filterKey, valueArr, operator);
props.addFilterByKeyAndValue(filterKey, valueArr, operator, sourceOperator, source);
}
}
};
@ -78,7 +86,8 @@ const SessionSearchQueryParamHandler = React.memo((props: Props) => {
const generateUrlQuery = () => {
const query: any = createUrlQuery(appliedFilter.filters);
history.replace({ search: new URLSearchParams(query).toString() });
const queryString = new URLSearchParams(query).toString();
history.replace({ search: queryString });
};
useEffect(applyFilterFromQuery, []);

6
frontend/app/duck/search.js
View file

@ -315,13 +315,17 @@ export const addFilter = (filter) => (dispatch, getState) => {
};
export const addFilterByKeyAndValue =
(key, value, operator = undefined) =>
(key, value, operator = undefined, sourceOperator = undefined, source = undefined) =>
(dispatch, getState) => {
let defaultFilter = filtersMap[key];
defaultFilter.value = value;
if (operator) {
defaultFilter.operator = operator;
}
if (defaultFilter.hasSource && source && sourceOperator) {
defaultFilter.sourceOperator = sourceOperator;
defaultFilter.source = source;
}
dispatch(addFilter(defaultFilter));
};