manually fix remaining issues

oatkiller · Jun 1, 2020 · e028461 · e028461
1 parent 5025447
commit e028461
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 149 deletions.
diff --git a/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.tsx
@@ -111,11 +111,10 @@ const CreateRulePageComponent: React.FC = () => {
     [RuleStep.ruleActions]: false,
   });
   const [{ isLoading, isSaved }, setRule] = usePersistRule();
-  const actionMessageParams = useMemo(
-    () =>
-      getActionMessageParams((stepsData.current['define-rule'].data as DefineStepRule).ruleType),
-    [stepsData.current['define-rule'].data]
-  );
+  const defineRuleData: DefineStepRule = stepsData.current['define-rule'].data;
+  const actionMessageParams = useMemo(() => getActionMessageParams(defineRuleData.ruleType), [
+    defineRuleData.ruleType,
+  ]);
 
   const setStepData = useCallback(
     (step: RuleStep, data: unknown, isValid: boolean) => {

diff --git a/x-pack/plugins/siem/public/cases/containers/use_get_tags.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_tags.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useEffect, useReducer } from 'react';
+import { useEffect, useReducer, useCallback } from 'react';
 
 import { errorToToaster, useStateToaster } from '../../common/components/toasters';
 import { getTags } from './api';
@@ -86,7 +86,7 @@ export const useGetTags = (): UseGetTags => {
       abortCtrl.abort();
       didCancel = true;
     };
-  });
+  }, [dispatchToaster]);
   useEffect(() => {
     callFetch();
   }, [callFetch]);

diff --git a/x-pack/plugins/siem/public/common/components/markdown_editor/index.tsx b/x-pack/plugins/siem/public/common/components/markdown_editor/index.tsx
@@ -95,15 +95,18 @@ export const MarkdownEditor = React.memo<{
       [onChange]
     );
 
-    const setCursorPosition = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-      if (onCursorPositionUpdate) {
-        onCursorPositionUpdate({
-          start: e!.target!.selectionStart ?? 0,
-          end: e!.target!.selectionEnd ?? 0,
-        });
-      }
-      return false;
-    };
+    const setCursorPosition = useCallback(
+      (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+        if (onCursorPositionUpdate) {
+          onCursorPositionUpdate({
+            start: e!.target!.selectionStart ?? 0,
+            end: e!.target!.selectionEnd ?? 0,
+          });
+        }
+        return false;
+      },
+      [onCursorPositionUpdate]
+    );
 
     const tabs = useMemo(
       () => [

diff --git a/x-pack/plugins/siem/public/common/components/url_state/use_url_state.tsx b/x-pack/plugins/siem/public/common/components/url_state/use_url_state.tsx
@@ -56,104 +56,103 @@ export const useUrlStateHooks = ({
   const { filterManager, savedQueries } = useKibana().services.data.query;
   const prevProps = usePrevious({ pathName, pageName, urlState });
 
-  const handleInitialize = (type: UrlStateType, needUpdate?: boolean) => {
-    let mySearch = search;
-    let urlStateToUpdate: UrlStateToRedux[] = [];
-    URL_STATE_KEYS[type].forEach((urlKey: KeyUrlState) => {
-      const newUrlStateString = getParamFromQueryString(
-        getQueryStringFromLocation(mySearch),
-        urlKey
-      );
-      if (newUrlStateString) {
-        mySearch = updateUrlStateString({
-          history,
-          isInitializing,
-          newUrlStateString,
-          pathName,
-          search: mySearch,
-          updateTimerange: (needUpdate ?? false) || isInitializing,
-          urlKey,
-        });
-        if (isInitializing || needUpdate) {
-          const updatedUrlStateString =
-            getParamFromQueryString(getQueryStringFromLocation(mySearch), urlKey) ??
-            newUrlStateString;
-          if (isInitializing || !deepEqual(updatedUrlStateString, newUrlStateString)) {
-            urlStateToUpdate = [
-              ...urlStateToUpdate,
-              {
-                urlKey,
-                newUrlStateString: updatedUrlStateString,
-              },
-            ];
+  useEffect(() => {
+    const handleInitialize = (type: UrlStateType, needUpdate?: boolean) => {
+      let mySearch = search;
+      let urlStateToUpdate: UrlStateToRedux[] = [];
+      URL_STATE_KEYS[type].forEach((urlKey: KeyUrlState) => {
+        const newUrlStateString = getParamFromQueryString(
+          getQueryStringFromLocation(mySearch),
+          urlKey
+        );
+        if (newUrlStateString) {
+          mySearch = updateUrlStateString({
+            history,
+            isInitializing,
+            newUrlStateString,
+            pathName,
+            search: mySearch,
+            updateTimerange: (needUpdate ?? false) || isInitializing,
+            urlKey,
+          });
+          if (isInitializing || needUpdate) {
+            const updatedUrlStateString =
+              getParamFromQueryString(getQueryStringFromLocation(mySearch), urlKey) ??
+              newUrlStateString;
+            if (isInitializing || !deepEqual(updatedUrlStateString, newUrlStateString)) {
+              urlStateToUpdate = [
+                ...urlStateToUpdate,
+                {
+                  urlKey,
+                  newUrlStateString: updatedUrlStateString,
+                },
+              ];
+            }
           }
+        } else if (
+          urlKey === CONSTANTS.appQuery &&
+          urlState[urlKey] != null &&
+          urlState[urlKey]?.query === ''
+        ) {
+          mySearch = replaceStateInLocation({
+            history,
+            pathName,
+            search: mySearch,
+            urlStateToReplace: '',
+            urlStateKey: urlKey,
+          });
+        } else if (urlKey === CONSTANTS.filters && isEmpty(urlState[urlKey])) {
+          mySearch = replaceStateInLocation({
+            history,
+            pathName,
+            search: mySearch,
+            urlStateToReplace: '',
+            urlStateKey: urlKey,
+          });
+        } else if (
+          urlKey === CONSTANTS.timeline &&
+          urlState[urlKey] != null &&
+          urlState[urlKey].id === ''
+        ) {
+          mySearch = replaceStateInLocation({
+            history,
+            pathName,
+            search: mySearch,
+            urlStateToReplace: '',
+            urlStateKey: urlKey,
+          });
+        } else {
+          mySearch = replaceStateInLocation({
+            history,
+            pathName,
+            search: mySearch,
+            urlStateToReplace: urlState[urlKey] || '',
+            urlStateKey: urlKey,
+          });
         }
-      } else if (
-        urlKey === CONSTANTS.appQuery &&
-        urlState[urlKey] != null &&
-        urlState[urlKey]?.query === ''
-      ) {
-        mySearch = replaceStateInLocation({
-          history,
-          pathName,
-          search: mySearch,
-          urlStateToReplace: '',
-          urlStateKey: urlKey,
-        });
-      } else if (urlKey === CONSTANTS.filters && isEmpty(urlState[urlKey])) {
-        mySearch = replaceStateInLocation({
-          history,
-          pathName,
-          search: mySearch,
-          urlStateToReplace: '',
-          urlStateKey: urlKey,
-        });
-      } else if (
-        urlKey === CONSTANTS.timeline &&
-        urlState[urlKey] != null &&
-        urlState[urlKey].id === ''
-      ) {
+      });
+      difference(ALL_URL_STATE_KEYS, URL_STATE_KEYS[type]).forEach((urlKey: KeyUrlState) => {
         mySearch = replaceStateInLocation({
           history,
           pathName,
           search: mySearch,
           urlStateToReplace: '',
           urlStateKey: urlKey,
         });
-      } else {
-        mySearch = replaceStateInLocation({
-          history,
-          pathName,
-          search: mySearch,
-          urlStateToReplace: urlState[urlKey] || '',
-          urlStateKey: urlKey,
-        });
-      }
-    });
-    difference(ALL_URL_STATE_KEYS, URL_STATE_KEYS[type]).forEach((urlKey: KeyUrlState) => {
-      mySearch = replaceStateInLocation({
-        history,
-        pathName,
-        search: mySearch,
-        urlStateToReplace: '',
-        urlStateKey: urlKey,
       });
-    });
 
-    setInitialStateFromUrl({
-      apolloClient,
-      detailName,
-      filterManager,
-      indexPattern,
-      pageName,
-      savedQueries,
-      updateTimeline,
-      updateTimelineIsLoading,
-      urlStateToUpdate,
-    })();
-  };
-
-  useEffect(() => {
+      setInitialStateFromUrl({
+        apolloClient,
+        detailName,
+        filterManager,
+        indexPattern,
+        pageName,
+        savedQueries,
+        updateTimeline,
+        updateTimelineIsLoading,
+        urlStateToUpdate,
+      })();
+    };
     const type: UrlStateType = getUrlType(pageName);
     if (isInitializing && pageName != null && pageName !== '') {
       handleInitialize(type);
@@ -206,7 +205,24 @@ export const useUrlStateHooks = ({
     } else if (pathName !== prevProps.pathName) {
       handleInitialize(type, pageName === SiemPageName.detections);
     }
-  }, [isInitializing, history, pathName, pageName, prevProps, urlState, handleInitialize, search]);
+  }, [
+    apolloClient,
+    detailName,
+    filterManager,
+    history,
+    indexPattern,
+    isInitializing,
+    pageName,
+    pathName,
+    prevProps.pathName,
+    prevProps.urlState,
+    savedQueries,
+    search,
+    setInitialStateFromUrl,
+    updateTimeline,
+    updateTimelineIsLoading,
+    urlState,
+  ]);
 
   useEffect(() => {
     document.title = `${getTitle(pageName, detailName, navTabs)} - Kibana`;

diff --git a/x-pack/plugins/siem/public/common/containers/events/last_event_time/index.ts b/x-pack/plugins/siem/public/common/containers/events/last_event_time/index.ts
@@ -33,7 +33,7 @@ export interface OwnProps extends QueryTemplateProps {
   indexKey: LastEventIndexKey;
 }
 
-export function useLastEventTimeQuery<TCache = object>(
+export function useLastEventTimeQuery(
   indexKey: LastEventIndexKey,
   details: LastTimeDetails,
   sourceId: string
@@ -44,7 +44,10 @@ export function useLastEventTimeQuery<TCache = object>(
   const [currentIndexKey, updateCurrentIndexKey] = useState<LastEventIndexKey | null>(null);
   const [defaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
   const apolloClient = useApolloClient();
-  async function fetchLastEventTime(signal: AbortSignal) {
+
+  useEffect(() => {
+    const abortCtrl = new AbortController();
+    const signal = abortCtrl.signal;
     updateLoading(true);
     if (apolloClient) {
       apolloClient
@@ -77,14 +80,8 @@ export function useLastEventTimeQuery<TCache = object>(
           }
         );
     }
-  }
-
-  useEffect(() => {
-    const abortCtrl = new AbortController();
-    const signal = abortCtrl.signal;
-    fetchLastEventTime(signal);
     return () => abortCtrl.abort();
-  }, [apolloClient, indexKey, details.hostName, details.ip, fetchLastEventTime]);
+  }, [apolloClient, currentIndexKey, defaultIndex, details, indexKey, sourceId]);
 
   return { lastSeen, loading, errorMessage };
 }
diff --git a/x-pack/plugins/siem/public/common/containers/source/index.tsx b/x-pack/plugins/siem/public/common/containers/source/index.tsx
@@ -75,7 +75,7 @@ export const getIndexFields = memoizeOne(
 );
 
 export const getBrowserFields = memoizeOne(
-  (title: string, fields: IndexField[]): BrowserFields =>
+  (_title: string, fields: IndexField[]): BrowserFields =>
     fields && fields.length > 0
       ? fields.reduce<BrowserFields>(
           (accumulator: BrowserFields, field: IndexField) =>
@@ -131,7 +131,10 @@ export const useWithSource = (sourceId: string, indices: string[]) => {
   const [errorMessage, updateErrorMessage] = useState<string | null>(null);
 
   const apolloClient = useApolloClient();
-  async function fetchSource(signal: AbortSignal) {
+
+  useEffect(() => {
+    const abortCtrl = new AbortController();
+    const signal = abortCtrl.signal;
     updateLoading(true);
     if (apolloClient) {
       apolloClient
@@ -166,14 +169,8 @@ export const useWithSource = (sourceId: string, indices: string[]) => {
           }
         );
     }
-  }
-
-  useEffect(() => {
-    const abortCtrl = new AbortController();
-    const signal = abortCtrl.signal;
-    fetchSource(signal);
     return () => abortCtrl.abort();
-  }, [apolloClient, sourceId, indices, fetchSource]);
+  }, [apolloClient, sourceId, indices]);
 
   return { indicesExist, browserFields, indexPattern, loading, errorMessage };
 };
diff --git a/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/index.ts b/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/index.ts
@@ -41,9 +41,11 @@ export function useFirstLastSeenHostQuery<TCache = object>(
   const [errorMessage, updateErrorMessage] = useState<string | null>(null);
   const [defaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
 
-  async function fetchFirstLastSeenHost(signal: AbortSignal) {
+  useEffect(() => {
+    const abortCtrl = new AbortController();
+    const signal = abortCtrl.signal;
     updateLoading(true);
-    return apolloClient
+    apolloClient
       .query<GetHostFirstLastSeenQuery.Query, GetHostFirstLastSeenQuery.Variables>({
         query: HostFirstLastSeenGqlQuery,
         fetchPolicy: 'cache-first',
@@ -72,14 +74,8 @@ export function useFirstLastSeenHostQuery<TCache = object>(
           updateErrorMessage(error.message);
         }
       );
-  }
-
-  useEffect(() => {
-    const abortCtrl = new AbortController();
-    const signal = abortCtrl.signal;
-    fetchFirstLastSeenHost(signal);
     return () => abortCtrl.abort();
-  }, [fetchFirstLastSeenHost]);
+  }, [apolloClient, defaultIndex, hostName, sourceId]);
 
   return { firstSeen, lastSeen, loading, errorMessage };
 }