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

fix(ui): filter keys conflcit with metadata

Browse source
This commit is contained in:
Shekar Siri 2023-11-22 14:40:36 +01:00
parent 4f99341583
commit 9c8e915387
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/app/components/shared/Filters/FilterAutoComplete/FilterAutoComplete.tsx
View file

@ -146,7 +146,7 @@ function FilterAutoComplete(props: Props) {
const loadOptions = (inputValue: string, callback: (options: []) => void) => {
// remove underscore from params
const _params = Object.keys(params).reduce((acc: any, key: string) => {
acc[key] = params[key].replace('_', '');
acc[key] = params[key].replace(/^_/, '');
return acc;
}, {});

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

@ -140,7 +140,7 @@ export const filterMap = ({ category, value, key, operator, sourceOperator, sour
custom,
type: category === FilterCategory.METADATA ? FilterKey.METADATA : key,
operator,
source: category === FilterCategory.METADATA ? key : source,
source: category === FilterCategory.METADATA ? key.replace(/^_/, '') : source,
sourceOperator,
isEvent,
filters: filters ? filters.map(filterMap) : [],

6
frontend/app/mstore/types/filterItem.ts
View file

@ -59,7 +59,7 @@ export default class FilterItem {
fromJson(json: any, mainFilterKey = '') {
const isMetadata = json.type === FilterKey.METADATA;
let _filter: any = (isMetadata ? filtersMap[json.source] : filtersMap[json.type]) || {};
let _filter: any = (isMetadata ? filtersMap['_' + json.source] : filtersMap[json.type]) || {};
if (mainFilterKey) {
const mainFilter = filtersMap[mainFilterKey];
@ -83,7 +83,7 @@ export default class FilterItem {
(this.value = !json.value || json.value.length === 0 ? [''] : json.value);
(this.operator = json.operator);
this.source = json.source;
this.source = isMetadata ? '_' + json.source : json.source;
this.sourceOperator = json.sourceOperator;
this.filters =
@ -102,7 +102,7 @@ export default class FilterItem {
isEvent: this.isEvent,
value: this.value,
operator: this.operator,
source: isMetadata ? this.key : this.source,
source: isMetadata ? this.key.replace(/^_/, '') : this.source,
sourceOperator: this.sourceOperator,
filters: Array.isArray(this.filters) ? this.filters.map((i) => i.toJson()) : [],
};