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

fix(ui) - saved search on save and update

Browse source
This commit is contained in:
Shekar Siri 2022-02-14 11:17:33 +01:00
parent 098a067528
commit 3a696b971f
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/app/components/shared/SessionSearch/SessionSearch.tsx
View file

@ -1,5 +1,4 @@
import React from 'react';
import { List } from 'immutable';
import FilterList from 'Shared/Filters/FilterList';
import FilterSelection from 'Shared/Filters/FilterSelection';
import SaveFilterButton from 'Shared/SaveFilterButton';
@ -13,7 +12,7 @@ interface Props {
edit: typeof edit;
addFilter: typeof addFilter;
}
function SessionSearch(props) {
function SessionSearch(props: Props) {
const { appliedFilter } = props;
const hasEvents = appliedFilter.filters.filter(i => i.isEvent).size > 0;
const hasFilters = appliedFilter.filters.filter(i => !i.isEvent).size > 0;
@ -82,7 +81,6 @@ function SessionSearch(props) {
<div className="ml-auto flex items-center">
<SaveFilterButton />
<SaveFunnelButton />
{/* <IconButton primaryText label="SAVE FUNNEL" icon="filter" /> */}
</div>
</div>
</div>

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

@ -38,7 +38,7 @@ function chartWrapper(chart = []) {
const savedSearchIdKey = 'searchId'
const updateItemInList = createListUpdater(savedSearchIdKey);
const updateInstance = (state, instance) => state.getIn([ "savedSearch", savedSearchIdKey ]) === instance[savedSearchIdKey]
? state.mergeIn([ "savedSearch" ], instance)
? state.mergeIn([ "savedSearch" ], SavedFilter(instance))
: state;
const initialState = Map({
@ -63,10 +63,6 @@ function reducer(state = initialState, action = {}) {
return action.fromUrl
? state.set('instance', Filter(action.filter))
: state.mergeIn(['instance'], action.filter);
case success(SAVE):
return updateItemInList(updateInstance(state, action.data), action.data);
case success(REMOVE):
return state.update('list', list => list.filter(item => item.searchId !== action.id));
case success(FETCH):
return state.set("instance", action.data);
case success(FETCH_LIST):
@ -136,7 +132,18 @@ export const edit = reduceThenFetchResource((instance) => ({
instance,
}));
export const remove = createRemove(name, (id) => `/saved_search/${id}`);
export const remove = (id) => (dispatch, getState) => {
return dispatch({
types: REMOVE.array,
call: client => client.delete(`/saved_search/${id}`),
id,
}).then(() => {
dispatch(applySavedSearch(new SavedFilter({})));
dispatch(fetchList());
});
};
// export const remove = createRemove(name, (id) => `/saved_search/${id}`);
export const applyFilter = reduceThenFetchResource((filter, fromUrl=false) => ({
type: APPLY,
@ -172,15 +179,21 @@ export function fetch(id) {
}
export const save = (id) => (dispatch, getState) => {
// export function save(id) {
const filter = getState().getIn([ 'search', 'instance']).toData();
filter.filters = filter.filters.map(filterMap);
const isNew = !id;
const instance = getState().getIn([ 'search', 'savedSearch']).toData();
// instance = instance instanceof SavedFilter ? instance : new SavedFilter(instance);
return dispatch({
types: SAVE.array,
call: client => client.post(!id ? '/saved_search' : `/saved_search/${id}`, { ...instance, filter })
call: client => client.post(isNew ? '/saved_search' : `/saved_search/${id}`, { ...instance, filter })
}).then(() => {
dispatch(fetchList()).then(() => {
if (isNew) {
const lastSavedSearch = getState().getIn([ 'search', 'list']).last();
dispatch(applySavedSearch(lastSavedSearch));
}
});
});
}