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

feat(ui) - custom metrics - series name on delete

Browse source
This commit is contained in:
Shekar Siri 2022-02-08 16:59:57 +01:00
parent aae818a5e7
commit 782d6b313e
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/app/components/shared/CustomMetrics/FilterSeries/SeriesName/SeriesName.tsx
View file

@ -25,6 +25,10 @@ function SeriesName(props: Props) {
} }
}, [editing]) }, [editing])
useEffect(() => {
setName(props.name)
}, [props.name])
// const { name } = props; // const { name } = props;
return ( return (
<div className="flex items-center"> <div className="flex items-center">

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

@ -47,9 +47,9 @@ function FilterList(props: Props) {
onSelect={props.onChangeEventsOrder} onSelect={props.onChangeEventsOrder}
value={{ value: filter.eventsOrder }} value={{ value: filter.eventsOrder }}
list={ [ list={ [
{ name: 'THEN', value: 'then' },
{ name: 'AND', value: 'and' }, { name: 'AND', value: 'and' },
{ name: 'OR', value: 'or' }, { name: 'OR', value: 'or' },
{ name: 'THEN', value: 'then' },
]} ]}
/> />
</div> </div>

4
frontend/app/duck/customMetrics.js
View file

@ -44,7 +44,7 @@ const defaultInstance = CustomMetric({
series: List([ series: List([
{ {
name: 'Series 1', name: 'Series 1',
filter: new Filter({ filters: List(), eventsOrder: 'and' }), filter: new Filter({ filters: List(), eventsOrder: 'then' }),
}, },
]) ])
}) })
@ -159,7 +159,7 @@ export const addSeries = (series = null) => (dispatch, getState) => {
const seriesIndex = instance.series.size; const seriesIndex = instance.series.size;
const newSeries = series || { const newSeries = series || {
name: `Series ${seriesIndex + 1}`, name: `Series ${seriesIndex + 1}`,
filter: new Filter({ filters: [], eventsOrder: 'and' }), filter: new Filter({ filters: [], eventsOrder: 'then' }),
}; };
dispatch({ dispatch({

2
frontend/app/types/customMetric.js
View file

@ -2,7 +2,7 @@ import Record from 'Types/Record';
import { List } from 'immutable'; import { List } from 'immutable';
import Filter from 'Types/filter'; import Filter from 'Types/filter';
import { validateName } from 'App/validate'; import { validateName } from 'App/validate';
import Period, { LAST_24_HOURS, LAST_30_MINUTES, YESTERDAY, LAST_7_DAYS } from 'Types/app/period'; import { LAST_7_DAYS } from 'Types/app/period';
import { filterMap } from 'Duck/search'; import { filterMap } from 'Duck/search';
export const FilterSeries = Record({ export const FilterSeries = Record({