Skip to content

Commit af7e9fa

Browse files
authored
Fix eslint (#49595) (#49725)
* fix: πŸ› fix unused persistedLog object * chore: πŸ€– ignore ESLint rule * fix: πŸ› correct dependencies in useUnmount() hook * fix: πŸ› fix ESLint errors * chore: πŸ€– disable ESLint rule * fix: πŸ› add savedQueryService to dependency list * fix: πŸ› fix ESLint errors in data plugin * chore: πŸ€– fix self-closing ESLint rule * test: πŸ’ update Jest snapshot * refactor: πŸ’‘ memoize persistedLog in more idiomatic way * chore: πŸ€– remomve unused import * chore: πŸ€– revert possible test breaker * fix: πŸ› fix query bar merge errors
1 parent cb9c582 commit af7e9fa

File tree

9 files changed

+32
-29
lines changed

9 files changed

+32
-29
lines changed

β€Žsrc/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snapβ€Ž

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žsrc/legacy/core_plugins/data/public/query/query_bar/components/query_bar_top_row.tsxβ€Ž

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import dateMath from '@elastic/datemath';
2121
import { doesKueryExpressionHaveLuceneSyntaxError } from '@kbn/es-query';
2222

2323
import classNames from 'classnames';
24-
import React, { useState, useEffect } from 'react';
24+
import React, { useState } from 'react';
2525

2626
import {
2727
EuiButton,
@@ -78,12 +78,10 @@ function QueryBarTopRowUI(props: Props) {
7878
const kueryQuerySyntaxLink: string = docLinks!.links.query.kueryQuerySyntax;
7979

8080
const queryLanguage = props.query && props.query.language;
81-
let persistedLog: PersistedLog | undefined;
82-
83-
useEffect(() => {
84-
if (!props.query) return;
85-
persistedLog = getQueryLog(uiSettings!, storage, appName, props.query.language);
86-
}, [queryLanguage]);
81+
const persistedLog: PersistedLog | undefined = React.useMemo(
82+
() => (queryLanguage ? getQueryLog(uiSettings!, storage, appName, queryLanguage) : undefined),
83+
[queryLanguage]
84+
);
8785

8886
function onClickSubmitButton(event: React.MouseEvent<HTMLButtonElement>) {
8987
if (persistedLog && props.query) {

β€Žsrc/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/save_query_form.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const SaveQueryForm: FunctionComponent<Props> = ({
8383
setSavedQueries(sortedAllSavedQueries);
8484
};
8585
fetchQueries();
86-
}, []);
86+
}, [savedQueryService]);
8787

8888
const savedQueryDescriptionText = i18n.translate(
8989
'data.search.searchBar.savedQueryDescriptionText',

β€Žsrc/legacy/core_plugins/data/public/search/search_bar/components/saved_query_management/saved_query_management_component.tsxβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const SavedQueryManagementComponent: FunctionComponent<Props> = ({
7575
if (isOpen) {
7676
fetchCountAndSavedQueries();
7777
}
78-
}, [isOpen, activePage]);
78+
}, [isOpen, activePage, savedQueryService]);
7979

8080
const goToPage = (pageNumber: number) => {
8181
setActivePage(pageNumber);

β€Žsrc/legacy/core_plugins/expressions/public/np_ready/public/expression_renderer.tsxβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export const ExpressionRendererImplementation = ({
5757
const [state, setState] = useState<State>({ ...defaultState });
5858

5959
// Re-fetch data automatically when the inputs change
60+
/* eslint-disable react-hooks/exhaustive-deps */
6061
useEffect(() => {
6162
if (handlerRef.current) {
6263
handlerRef.current.update(expression, options);
@@ -68,6 +69,7 @@ export const ExpressionRendererImplementation = ({
6869
options.variables,
6970
options.disableCaching,
7071
]);
72+
/* eslint-enable react-hooks/exhaustive-deps */
7173

7274
// Initialize the loader only once
7375
useEffect(() => {

β€Žsrc/plugins/kibana_react/public/context/context.tsxβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ export const useKibana = <Extra extends object = {}>(): KibanaReactContextValue<
4242
export const withKibana = <Props extends { kibana: KibanaReactContextValue<any> }>(
4343
type: React.ComponentType<Props>
4444
): React.FC<Omit<Props, 'kibana'>> => {
45-
const enhancedType: React.FC<Omit<Props, 'kibana'>> = (props: Omit<Props, 'kibana'>) => {
45+
const EnhancedType: React.FC<Omit<Props, 'kibana'>> = (props: Omit<Props, 'kibana'>) => {
4646
const kibana = useKibana();
4747
return React.createElement(type, { ...props, kibana } as Props);
4848
};
49-
return enhancedType;
49+
return EnhancedType;
5050
};
5151

5252
export const UseKibana: React.FC<{
@@ -69,7 +69,7 @@ export const createKibanaReactContext = <Services extends KibanaServices>(
6969
const oldValue = useKibana();
7070
const { value: newValue } = useMemo(
7171
() => createKibanaReactContext({ ...services, ...oldValue.services, ...newServices }),
72-
Object.keys(services)
72+
[services, oldValue, newServices]
7373
);
7474
return createElement(context.Provider as React.ComponentType<any>, {
7575
value: newValue,

β€Žsrc/plugins/kibana_react/public/ui_settings/use_ui_setting.test.tsxβ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ describe('useUiSetting', () => {
106106
});
107107

108108
describe('useUiSetting$', () => {
109-
const TestConsumer: React.FC<{
109+
const TestConsumerX: React.FC<{
110110
setting: string;
111111
newValue?: string;
112112
}> = ({ setting, newValue = '' }) => {
@@ -126,7 +126,7 @@ describe('useUiSetting$', () => {
126126

127127
ReactDOM.render(
128128
<Provider>
129-
<TestConsumer setting="foo" />
129+
<TestConsumerX setting="foo" />
130130
</Provider>,
131131
container
132132
);
@@ -143,7 +143,7 @@ describe('useUiSetting$', () => {
143143

144144
ReactDOM.render(
145145
<Provider>
146-
<TestConsumer setting="non_existing" />
146+
<TestConsumerX setting="non_existing" />
147147
</Provider>,
148148
container
149149
);
@@ -159,7 +159,7 @@ describe('useUiSetting$', () => {
159159

160160
ReactDOM.render(
161161
<Provider>
162-
<TestConsumer setting="theme:darkMode" />
162+
<TestConsumerX setting="theme:darkMode" />
163163
</Provider>,
164164
container
165165
);
@@ -174,7 +174,7 @@ describe('useUiSetting$', () => {
174174

175175
ReactDOM.render(
176176
<Provider>
177-
<TestConsumer setting="a" newValue="c" />
177+
<TestConsumerX setting="a" newValue="c" />
178178
</Provider>,
179179
container
180180
);

β€Žsrc/plugins/kibana_react/public/ui_settings/use_ui_setting.tsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export const useUiSetting$ = <T>(key: string, defaultValue?: T): [T, Setter<T>]
6565
const observable$ = useMemo(() => services.uiSettings!.get$(key, defaultValue), [
6666
key,
6767
defaultValue,
68+
services.uiSettings,
6869
]);
6970
const value = useObservable<T>(observable$, services.uiSettings!.get(key, defaultValue));
7071
const set = useCallback((newValue: T) => services.uiSettings!.set(key, newValue), [key]);

β€Žsrc/plugins/kibana_utils/public/store/react.tsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ export const createContext = <
8686
comparator?: Comparator<Result>
8787
): Result => {
8888
const { state$, get } = useStore();
89+
/* eslint-disable react-hooks/exhaustive-deps */
8990
const [observable$, unsubscribe] = useMemo(
9091
() => observableSelector(get(), state$, selector, comparator),
9192
[state$]
9293
);
94+
/* eslint-enable react-hooks/exhaustive-deps */
9395
useLayoutEffect(() => unsubscribe, [observable$, unsubscribe]);
9496
const value = useObservable(observable$, selector(get()));
9597
return value;

0 commit comments

Comments
Β (0)