Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4e4277d

Browse files
committedJun 22, 2021
fix cypress test + few bugs found
1 parent fe4be92 commit 4e4277d

File tree

14 files changed

+20
-37
lines changed

14 files changed

+20
-37
lines changed
 

‎x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import React, { useEffect, useMemo, useState } from 'react';
1010
import styled from 'styled-components';
1111
import deepEqual from 'fast-deep-equal';
1212

13+
import { useDispatch } from 'react-redux';
1314
import { Direction } from '../../../../common/search_strategy';
1415
import { BrowserFields, DocValueFields } from '../../containers/source';
1516
import { useTimelineEvents } from '../../../timelines/containers';
@@ -165,14 +166,15 @@ const EventsViewerComponent: React.FC<Props> = ({
165166
utilityBar,
166167
graphEventId,
167168
}) => {
169+
const dispatch = useDispatch();
168170
const { globalFullScreen, setGlobalFullScreen } = useGlobalFullScreen();
169171
const columnsHeader = isEmpty(columns) ? defaultHeaders : columns;
170172
const kibana = useKibana();
171173
const [isQueryLoading, setIsQueryLoading] = useState(false);
172174

173175
useEffect(() => {
174-
timelineActions.updateIsLoading({ id, isLoading: isQueryLoading });
175-
}, [id, isQueryLoading]);
176+
dispatch(timelineActions.updateIsLoading({ id, isLoading: isQueryLoading }));
177+
}, [dispatch, id, isQueryLoading]);
176178

177179
const getManageTimeline = useMemo(() => timelineSelectors.getManageTimelineById(), []);
178180
const unit = useMemo(() => (n: number) => i18n.UNIT(n), []);

‎x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ const EventsQueryTabBodyComponent: React.FC<HostsComponentsQueryProps> = ({
6666
const dispatch = useDispatch();
6767
const { globalFullScreen } = useGlobalFullScreen();
6868
useEffect(() => {
69-
timelineActions.initializeTGridSettings({
70-
id: TimelineId.hostsPageEvents,
71-
defaultColumns: eventsDefaultModel.columns,
72-
});
69+
dispatch(
70+
timelineActions.initializeTGridSettings({
71+
id: TimelineId.hostsPageEvents,
72+
defaultColumns: eventsDefaultModel.columns,
73+
})
74+
);
7375
}, [dispatch]);
7476

7577
useEffect(() => {

‎x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ export const EventColumnView = React.memo<Props>(
134134
isEventPinned={isEventPinned}
135135
isEventViewer={isEventViewer}
136136
onRuleChange={onRuleChange}
137+
refetch={refetch}
137138
showNotes={showNotes}
138139
tabType={tabType}
139140
timelineId={timelineId}
@@ -159,6 +160,7 @@ export const EventColumnView = React.memo<Props>(
159160
onEventDetailsPanelOpened,
160161
onRowSelected,
161162
onRuleChange,
163+
refetch,
162164
selectedEventIds,
163165
showCheckboxes,
164166
showNotes,

‎x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ export const EqlTabContentComponent: React.FC<Props> = ({
237237

238238
useEffect(() => {
239239
dispatch(
240-
timelineActions.setTGridIsLoading({
240+
timelineActions.updateIsLoading({
241241
id: timelineId,
242-
isTGridLoading: isQueryLoading || loadingSourcerer,
242+
isLoading: isQueryLoading || loadingSourcerer,
243243
})
244244
);
245245
}, [loadingSourcerer, timelineId, isQueryLoading, dispatch]);

‎x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ export const FooterComponent = ({
328328
dataTestSubj: 'LoadingPanelTimeline',
329329
height: '35px',
330330
showBorder: false,
331-
text: `${loadingText}...`,
331+
text: loadingText,
332332
width: '100%',
333333
})}
334334
</LoadingPanelContainer>

‎x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,9 @@ export const QueryTabContentComponent: React.FC<Props> = ({
273273

274274
useEffect(() => {
275275
dispatch(
276-
timelineActions.setTGridIsLoading({
276+
timelineActions.updateIsLoading({
277277
id: timelineId,
278-
isTGridLoading: isQueryLoading || loadingSourcerer,
278+
isLoading: isQueryLoading || loadingSourcerer,
279279
})
280280
);
281281
}, [loadingSourcerer, timelineId, isQueryLoading, dispatch]);

‎x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export const {
3535
setEventsDeleted,
3636
setEventsLoading,
3737
setSelected,
38-
setTGridIsLoading,
3938
setTGridSelectAll,
4039
toggleDetailPanel,
4140
updateColumns,

‎x-pack/plugins/timelines/public/components/t_grid/integrated/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const TGridIntegratedComponent: React.FC<TGridIntegratedProps> = ({
182182
);
183183

184184
useEffect(() => {
185-
dispatch(tGridActions.setTGridIsLoading({ id, isTGridLoading: isQueryLoading }));
185+
dispatch(tGridActions.updateIsLoading({ id, isLoading: isQueryLoading }));
186186
}, [dispatch, id, isQueryLoading]);
187187

188188
const justTitle = useMemo(() => <TitleText data-test-subj="title">{title}</TitleText>, [title]);

‎x-pack/plugins/timelines/public/components/t_grid/standalone/index.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
157157
} = useDeepEqualSelector((state) => getTGrid(state, STANDALONE_ID ?? ''));
158158
const unit = useMemo(() => (n: number) => i18n.UNIT(n), []);
159159
useEffect(() => {
160-
dispatch(tGridActions.setTGridIsLoading({ id: STANDALONE_ID, isTGridLoading: isQueryLoading }));
160+
dispatch(tGridActions.updateIsLoading({ id: STANDALONE_ID, isLoading: isQueryLoading }));
161161
}, [dispatch, isQueryLoading]);
162162

163163
const justTitle = useMemo(() => <TitleText data-test-subj="title">{title}</TitleText>, [title]);
@@ -174,12 +174,7 @@ const TGridStandaloneComponent: React.FC<TGridStandaloneProps> = ({
174174
});
175175

176176
const canQueryTimeline = useMemo(
177-
() =>
178-
combinedQueries != null &&
179-
// isLoadingIndexPattern != null &&
180-
// !isLoadingIndexPattern &&
181-
!isEmpty(start) &&
182-
!isEmpty(end),
177+
() => combinedQueries != null && !isEmpty(start) && !isEmpty(end),
183178
[combinedQueries, start, end]
184179
);
185180

‎x-pack/plugins/timelines/public/mock/global_state.ts

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export const mockGlobalState: TimelineState = {
4545
defaultColumns: defaultHeaders,
4646
footerText: 'total of events',
4747
loadingText: 'loading events',
48-
isTGridLoading: false,
4948
queryFields: [],
5049
selectAll: false,
5150
title: 'Events',

‎x-pack/plugins/timelines/public/store/t_grid/actions.ts

-3
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ export const clearEventsDeleted = actionCreator<{
9898

9999
export const initializeTGridSettings = actionCreator<InitialyzeTGridSettings>('INITIALIZE_TGRID');
100100

101-
export const setTGridIsLoading = actionCreator<{ id: string; isTGridLoading: boolean }>(
102-
'SET_TGRID_IS_LOADING'
103-
);
104101
export const setTGridSelectAll = actionCreator<{ id: string; selectAll: boolean }>(
105102
'SET_TGRID_SELECT_ALL'
106103
);

‎x-pack/plugins/timelines/public/store/t_grid/helpers.ts

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ export const createInitTGrid = ({
7373
...tGridDefaults,
7474
...tGridProps,
7575
isLoading: false,
76-
isTGridLoading: false,
7776
savedObjectId: null,
7877
version: null,
7978
},

‎x-pack/plugins/timelines/public/store/t_grid/model.ts

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export interface TGridModelSettings {
2828
filterManager?: FilterManager;
2929
footerText: string;
3030
loadingText: string;
31-
isTGridLoading: boolean;
3231
queryFields: string[];
3332
selectAll: boolean;
3433
showCheckboxes?: boolean;

‎x-pack/plugins/timelines/public/store/t_grid/reducer.ts

-11
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
removeColumn,
1717
setEventsDeleted,
1818
setEventsLoading,
19-
setTGridIsLoading,
2019
setTGridSelectAll,
2120
setSelected,
2221
toggleDetailPanel,
@@ -200,16 +199,6 @@ export const tGridReducer = reducerWithInitialState(initialTGridState)
200199
tGridSettingsProps,
201200
}),
202201
}))
203-
.case(setTGridIsLoading, (state, { id, isTGridLoading }) => ({
204-
...state,
205-
timelineById: {
206-
...state.timelineById,
207-
[id]: {
208-
...state.timelineById[id],
209-
isTGridLoading,
210-
},
211-
},
212-
}))
213202
.case(setTGridSelectAll, (state, { id, selectAll }) => ({
214203
...state,
215204
timelineById: {

0 commit comments

Comments
 (0)
Please sign in to comment.