Skip to content

Commit

Permalink
fix: eslint warnings left 11/26
Browse files Browse the repository at this point in the history
  • Loading branch information
mbondyra committed Jun 25, 2020
1 parent 3b9bbdb commit e406243
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 40 deletions.
6 changes: 0 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,6 @@ module.exports = {
'react-hooks/rules-of-hooks': 'off',
},
},
{
files: ['x-pack/plugins/lens/**/*.{js,ts,tsx}'],
rules: {
'react-hooks/exhaustive-deps': 'off',
},
},
{
files: ['x-pack/plugins/ml/**/*.{js,ts,tsx}'],
rules: {
Expand Down
8 changes: 7 additions & 1 deletion x-pack/plugins/lens/public/app_plugin/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@ export function App({
filterSubscription.unsubscribe();
timeSubscription.unsubscribe();
};
}, [data.query.filterManager, data.query.timefilter.timefilter]);
}, [
data.query.filterManager,
data.query.timefilter.timefilter,
core.uiSettings,
data.query,
history,
]);

useEffect(() => {
onAppLeave((actions) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ export function DatatableComponent(props: DatatableRenderProps) {
formatters[column.id] = props.formatFactory(column.formatHint);
});

const { onClickValue } = props;
const handleFilterClick = useMemo(
() => (field: string, value: unknown, colIndex: number, negate: boolean = false) => {
const col = firstTable.columns[colIndex];
Expand All @@ -180,9 +181,9 @@ export function DatatableComponent(props: DatatableRenderProps) {
],
timeFieldName,
};
props.onClickValue(desanitizeFilterContext(data));
onClickValue(desanitizeFilterContext(data));
},
[firstTable]
[firstTable, onClickValue]
);

const bucketColumns = firstTable.columns
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ export function debouncedComponent<TProps>(component: FunctionComponent<TProps>,

return (props: TProps) => {
const [cachedProps, setCachedProps] = useState(props);
const debouncePropsChange = debounce(setCachedProps, delay);
const delayRender = useMemo(() => debouncePropsChange, []);
const debouncePropsChange = useMemo(() => debounce(setCachedProps, delay), [setCachedProps]);

// cancel debounced prop change if component has been unmounted in the meantime
useEffect(() => () => debouncePropsChange.cancel(), []);

delayRender(props);
useEffect(() => () => debouncePropsChange.cancel(), [debouncePropsChange]);
debouncePropsChange(props);

return React.createElement(MemoizedComponent, cachedProps);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,32 +50,33 @@ function LayerPanels(
dispatch,
activeDatasourceId,
datasourceMap,
dispatch,
} = props;
const setVisualizationState = useMemo(
() => (newState: unknown) => {
props.dispatch({
dispatch({
type: 'UPDATE_VISUALIZATION_STATE',
visualizationId: activeVisualization.id,
newState,
clearStagedPreview: false,
});
},
[props.dispatch, activeVisualization]
[dispatch, activeVisualization]
);
const updateDatasource = useMemo(
() => (datasourceId: string, newState: unknown) => {
props.dispatch({
dispatch({
type: 'UPDATE_DATASOURCE_STATE',
updater: () => newState,
datasourceId,
clearStagedPreview: false,
});
},
[props.dispatch]
[dispatch]
);
const updateAll = useMemo(
() => (datasourceId: string, newDatasourceState: unknown, newVisualizationState: unknown) => {
props.dispatch({
dispatch({
type: 'UPDATE_STATE',
subType: 'UPDATE_ALL_STATES',
updater: (prevState) => {
Expand All @@ -97,7 +98,7 @@ function LayerPanels(
},
});
},
[props.dispatch]
[dispatch]
);
const layerIds = activeVisualization.getLayerIds(visualizationState);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ interface DataPanelWrapperProps {
}

export const DataPanelWrapper = memo((props: DataPanelWrapperProps) => {
const { dispatch, activeDatasource } = props;
const setDatasourceState: StateSetter<unknown> = useMemo(
() => (updater) => {
props.dispatch({
dispatch({
type: 'UPDATE_DATASOURCE_STATE',
updater,
datasourceId: props.activeDatasource!,
datasourceId: activeDatasource!,
clearStagedPreview: true,
});
},
[props.dispatch, props.activeDatasource]
[dispatch, activeDatasource]
);

const datasourceProps: DatasourceDataPanelProps = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ export function SuggestionPanel({

return { suggestions: newSuggestions, currentStateExpression: newStateExpression };
}, [
frame,
currentDatasourceStates,
currentVisualizationState,
currentVisualizationId,
Expand All @@ -215,7 +216,7 @@ export function SuggestionPanel({
return (props: ReactExpressionRendererProps) => (
<ExpressionRendererComponent {...props} reload$={autoRefreshFetch$} />
);
}, [plugins.data.query.timefilter.timefilter.getAutoRefreshFetch$, ExpressionRendererComponent]);
}, [plugins.data.query.timefilter.timefilter]);

const [lastSelectedSuggestion, setLastSelectedSuggestion] = useState<number>(-1);

Expand All @@ -226,7 +227,7 @@ export function SuggestionPanel({
if (!stagedPreview && lastSelectedSuggestion !== -1) {
setLastSelectedSuggestion(-1);
}
}, [stagedPreview]);
}, [stagedPreview, lastSelectedSuggestion]);

if (!activeDatasourceId) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export function InnerWorkspacePanel({
const activeVisualization = activeVisualizationId
? visualizationMap[activeVisualizationId]
: null;

const expression = useMemo(() => {
try {
return buildExpression({
Expand All @@ -126,15 +127,7 @@ export function InnerWorkspacePanel({
// Most likely an error in the expression provided by a datasource or visualization
setLocalState((s) => ({ ...s, expressionBuildError: e.toString() }));
}
}, [
activeVisualization,
visualizationState,
datasourceMap,
datasourceStates,
framePublicAPI.dateRange,
framePublicAPI.query,
framePublicAPI.filters,
]);
}, [activeVisualization, visualizationState, datasourceMap, datasourceStates, framePublicAPI]);

const onEvent = useCallback(
(event: ExpressionRendererEvent) => {
Expand All @@ -158,7 +151,7 @@ export function InnerWorkspacePanel({

const autoRefreshFetch$ = useMemo(
() => plugins.data.query.timefilter.timefilter.getAutoRefreshFetch$(),
[plugins.data.query.timefilter.timefilter.getAutoRefreshFetch$]
[plugins.data.query.timefilter.timefilter]
);

useEffect(() => {
Expand All @@ -169,7 +162,7 @@ export function InnerWorkspacePanel({
expressionBuildError: undefined,
}));
}
}, [expression]);
}, [expression, localState.expressionBuildError]);

function onDrop() {
if (suggestionForDraggedField) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export function FieldSelect({
existingFields,
}: FieldSelectProps) {
const { operationByField } = operationFieldSupportMatrix;

const memoizedFieldOptions = useMemo(() => {
const fields = Object.keys(operationByField).sort();

Expand Down Expand Up @@ -123,11 +124,11 @@ export function FieldSelect({
}, [
incompatibleSelectedOperationType,
selectedColumnOperationType,
selectedColumnSourceField,
operationFieldSupportMatrix,
currentIndexPattern,
fieldMap,
showEmptyFields,
existingFields,
operationByField,
]);

return (
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/lens/public/loader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ export function Loader(props: { load: () => Promise<unknown>; loadDeps: unknown[
const [isProcessing, setIsProcessing] = useState(false);
const prevRequest = useRef<Promise<unknown> | undefined>(undefined);
const nextRequest = useRef<(() => void) | undefined>(undefined);

useEffect(function performLoad() {
if (prevRequest.current) {
nextRequest.current = performLoad;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export function XYChartReportable(props: XYChartRenderProps) {
// reporting from printing a blank chart placeholder.
useEffect(() => {
setState({ isReady: true });
}, []);
}, [setState]);

return (
<VisualizationContainer className="lnsXyExpression__container" isReady={state.isReady}>
Expand Down

0 comments on commit e406243

Please sign in to comment.