diff --git a/frontend/src/store/actions/traceFilters.ts b/frontend/src/store/actions/traceFilters.ts index 53723d28fb..7922710bc6 100644 --- a/frontend/src/store/actions/traceFilters.ts +++ b/frontend/src/store/actions/traceFilters.ts @@ -32,16 +32,4 @@ export const updateTraceFilters = (traceFilters: TraceFilters) => { }; }; -export interface updateInputTagAction { - type: ActionTypes.updateInput; - payload: string; -} - -export const updateInputTag = (Input: string) => { - return { - type: ActionTypes.updateInput, - payload: Input, - }; -}; - //named export when you want to export multiple functions from the same file diff --git a/frontend/src/store/reducers/index.ts b/frontend/src/store/reducers/index.ts index 8c33fde3d5..af4cf0829d 100644 --- a/frontend/src/store/reducers/index.ts +++ b/frontend/src/store/reducers/index.ts @@ -25,13 +25,12 @@ import { externalMetricsReducer, externalAvgDurationMetricsReducer, } from "./metrics"; -import { traceFiltersReducer, inputsReducer } from "./traceFilters"; +import TraceFilterReducer from "./traceFilters"; import { traceItemReducer, tracesReducer } from "./traces"; import { usageDataReducer } from "./usage"; import { ServiceMapReducer } from "./serviceMap"; export interface StoreState { traceFilters: TraceFilters; - inputTag: string; traces: traceResponseNew; traceItem: spansWSameTraceIDResponse; servicesList: servicesListItem[]; @@ -48,8 +47,7 @@ export interface StoreState { } const reducers = combineReducers({ - traceFilters: traceFiltersReducer, - inputTag: inputsReducer, + traceFilters: TraceFilterReducer, traces: tracesReducer, traceItem: traceItemReducer, servicesList: serviceTableReducer, diff --git a/frontend/src/store/reducers/serviceMap.ts b/frontend/src/store/reducers/serviceMap.ts index aef22e17f1..f3a5db4fe4 100644 --- a/frontend/src/store/reducers/serviceMap.ts +++ b/frontend/src/store/reducers/serviceMap.ts @@ -1,12 +1,11 @@ import { ActionTypes, Action, serviceMapStore } from "../actions"; -export const ServiceMapReducer = ( - state: serviceMapStore = { - items: [], - services: [], - }, - action: Action, -) => { +const initialState: serviceMapStore = { + items: [], + services: [], +}; + +export const ServiceMapReducer = (state = initialState, action: Action) => { switch (action.type) { case ActionTypes.getServiceMapItems: return { diff --git a/frontend/src/store/reducers/traceFilters.ts b/frontend/src/store/reducers/traceFilters.ts index 05fe240edb..32aa198f1f 100644 --- a/frontend/src/store/reducers/traceFilters.ts +++ b/frontend/src/store/reducers/traceFilters.ts @@ -1,19 +1,17 @@ -import { - ActionTypes, - TraceFilters, - updateInputTagAction, - updateTraceFiltersAction, -} from "../actions"; +import { ActionTypes, TraceFilters } from "../actions"; -export const traceFiltersReducer = ( - state: TraceFilters = { - service: "", - tags: [], - operation: "", - latency: { min: "", max: "" }, - }, - action: updateTraceFiltersAction, -) => { +type ACTION = { + type: ActionTypes; + payload: TraceFilters; +}; +const initialState: TraceFilters = { + service: "", + tags: [], + operation: "", + latency: { min: "", max: "" }, +}; + +const TraceFilterReducer = (state = initialState, action: ACTION) => { switch (action.type) { case ActionTypes.updateTraceFilters: return action.payload; @@ -22,14 +20,4 @@ export const traceFiltersReducer = ( } }; -export const inputsReducer = ( - state: string = "", - action: updateInputTagAction, -) => { - switch (action.type) { - case ActionTypes.updateInput: - return action.payload; - default: - return state; - } -}; +export default TraceFilterReducer;