Skip to content

Commit db8eecc

Browse files
committed
junhao review
1 parent 90fd230 commit db8eecc

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

src/components/StatusBar/LogLevelSelect/index.tsx

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React, {
22
useCallback,
33
useContext,
4+
useEffect,
5+
useState,
46
} from "react";
57

68
import {SelectValue} from "@mui/base/useSelect";
@@ -30,7 +32,10 @@ import {
3032
LOG_LEVEL_NAMES,
3133
MAX_LOG_LEVEL,
3234
} from "../../../typings/logs";
33-
import {UI_ELEMENT} from "../../../typings/states";
35+
import {
36+
UI_STATE,
37+
UI_ELEMENT,
38+
} from "../../../typings/states";
3439
import {range} from "../../../utils/data";
3540
import {
3641
ignorePointerIfFastLoading,
@@ -149,7 +154,8 @@ const ClearFiltersOption = ({onClick}: ClearFiltersOptionProps) => {
149154
* @return
150155
*/
151156
const LogLevelSelect = () => {
152-
const {uiState, filterLogs, selectedLogLevels, setSelectedLogLevels} = useContext(StateContext);
157+
const {uiState, filterLogs} = useContext(StateContext);
158+
const [selectedLogLevels, setSelectedLogLevels] = useState<LOG_LEVEL[]>([]);
153159
const disabled = isDisabled(uiState, UI_ELEMENT.LOG_LEVEL_FILTER);
154160

155161
const handleRenderValue = (selected: SelectValue<SelectOption<LOG_LEVEL>, true>) => (
@@ -215,6 +221,13 @@ const LogLevelSelect = () => {
215221
updateFilter([]);
216222
};
217223

224+
// On `uiState` update, clear `selectedLogLevels` if the state is `UI_STATE.FILE_LOADING`
225+
useEffect(() => {
226+
if (UI_STATE.FILE_LOADING === uiState) {
227+
setSelectedLogLevels([]);
228+
}
229+
}, [uiState]);
230+
218231
return (
219232
<Select
220233
className={`log-level-select ${ignorePointerIfFastLoading(uiState)}`}

src/contexts/StateContextProvider.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ interface StateContextType {
7373
numPages: number,
7474
onDiskFileSizeInBytes: number,
7575
pageNum: number,
76-
selectedLogLevels: LOG_LEVEL[],
7776
queryProgress: number,
7877
queryResults: QueryResults,
7978

@@ -82,7 +81,6 @@ interface StateContextType {
8281
loadFile: (fileSrc: FileSrcType, cursor: CursorType) => void,
8382
loadPageByAction: (navAction: NavigationAction) => void,
8483
setIsSettingsModalOpen: (isOpen: boolean) => void,
85-
setSelectedLogLevels: (levels: LOG_LEVEL[]) => void,
8684
startQuery: (queryString: string, isRegex: boolean, isCaseSensitive: boolean) => void,
8785
}
8886
const StateContext = createContext<StateContextType>({} as StateContextType);
@@ -102,15 +100,13 @@ const STATE_DEFAULT: Readonly<StateContextType> = Object.freeze({
102100
pageNum: 0,
103101
queryProgress: QUERY_PROGRESS_INIT,
104102
queryResults: new Map(),
105-
selectedLogLevels: [],
106103
uiState: UI_STATE.UNOPENED,
107104

108105
exportLogs: () => null,
109106
filterLogs: () => null,
110107
loadFile: () => null,
111108
loadPageByAction: () => null,
112109
setIsSettingsModalOpen: () => null,
113-
setSelectedLogLevels: () => null,
114110
startQuery: () => null,
115111
});
116112

@@ -263,8 +259,6 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
263259
const [pageNum, setPageNum] = useState<number>(STATE_DEFAULT.pageNum);
264260
const [queryProgress, setQueryProgress] = useState<number>(STATE_DEFAULT.queryProgress);
265261
const [queryResults, setQueryResults] = useState<QueryResults>(STATE_DEFAULT.queryResults);
266-
const [selectedLogLevels, setSelectedLogLevels] =
267-
useState<LOG_LEVEL[]>(STATE_DEFAULT.selectedLogLevels);
268262
const [uiState, setUiState] = useState<UI_STATE>(STATE_DEFAULT.uiState);
269263

270264
// Refs
@@ -413,7 +407,6 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
413407
setLogData("Loading...");
414408
setOnDiskFileSizeInBytes(STATE_DEFAULT.onDiskFileSizeInBytes);
415409
setExportProgress(STATE_DEFAULT.exportProgress);
416-
setSelectedLogLevels(STATE_DEFAULT.selectedLogLevels);
417410

418411
if ("string" !== typeof fileSrc) {
419412
updateWindowUrlSearchParams({[SEARCH_PARAM_NAMES.FILE_PATH]: null});
@@ -553,15 +546,13 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
553546
pageNum: pageNum,
554547
queryProgress: queryProgress,
555548
queryResults: queryResults,
556-
selectedLogLevels: selectedLogLevels,
557549
uiState: uiState,
558550

559551
exportLogs: exportLogs,
560552
filterLogs: filterLogs,
561553
loadFile: loadFile,
562554
loadPageByAction: loadPageByAction,
563555
setIsSettingsModalOpen: setIsSettingsModalOpen,
564-
setSelectedLogLevels: setSelectedLogLevels,
565556
startQuery: startQuery,
566557
}}
567558
>

0 commit comments

Comments
 (0)