Fixing linter hints

Author: linuspahl

graylog2-web-interface/src/pages/EditContentPackPage.tsx

@@ -35,9 +35,9 @@ import { useStore } from 'stores/connect';
 import useProductName from 'customization/useProductName';
 
 const EditContentPackPage = () => {
+  useStore(ContentPacksStore);
   const productName = useProductName();
   const { entityIndex } = useStore(CatalogStore);
-  const {} = useStore(ContentPacksStore);
   const { contentPackId, contentPackRev } = useParams<{ contentPackId: string; contentPackRev: string }>();
   const history = useHistory();
   const [selectedEntities, setSelectedEntities] = useState({});
@@ -49,30 +49,28 @@ const EditContentPackPage = () => {
   useEffect(() => {
     ContentPacksActions.get(contentPackId).then((result) => {
       const { contentPackRevisions } = result;
-      const originContentPackRev = contentPackRev;
-      const newContentPack = contentPackRevisions.createNewVersionFromRev(originContentPackRev);
+      const newContentPack = contentPackRevisions.createNewVersionFromRev(contentPackRev);
 
       setContentPack(newContentPack);
       setContentPackEntities(cloneDeep(newContentPack.entities));
 
       CatalogActions.showEntityIndex();
     });
-  }, []);
+  }, [contentPackId, contentPackRev]);
 
   const entityCatalog = useMemo(() => {
     if (!contentPack || !entityIndex) {
       return {};
     }
 
     const groupedContentPackEntities = groupBy(contentPackEntities, 'type.name');
-    const newEntityCatalog = Object.keys(entityIndex).reduce((result, entityType) => {
+
+    return Object.keys(entityIndex).reduce((result, entityType) => {
       /* eslint-disable-next-line no-param-reassign */
       result[entityType] = entityIndex[entityType].concat(groupedContentPackEntities[entityType] || []);
 
       return result;
     }, {});
-
-    return newEntityCatalog;
   }, [contentPack, entityIndex, contentPackEntities]);
 
   useEffect(() => {
@@ -97,7 +95,7 @@ const EditContentPackPage = () => {
     }, {});
 
     setSelectedEntities(newSelectedEntities);
-  }, [contentPack, entityIndex]);
+  }, [contentPack, entityCatalog, entityIndex]);
 
   useEffect(() => {
     if (!contentPack) {
@@ -151,13 +149,13 @@ const EditContentPackPage = () => {
     );
   };
 
-  const _getEntities = (selectedEntities) => {
-    CatalogActions.getSelectedEntities(selectedEntities).then((result) => {
-      const contentPackEntities = Object.keys(selectedEntities)
-        .reduce((acc, entityType) => acc.concat(selectedEntities[entityType]), [])
+  const _getEntities = (newSelectedEntities) => {
+    CatalogActions.getSelectedEntities(newSelectedEntities).then((result) => {
+      const selectedContentPackEntities = Object.keys(newSelectedEntities)
+        .reduce((acc, entityType) => acc.concat(newSelectedEntities[entityType]), [])
         .filter((e) => e instanceof Entity);
       /* Mark entities from server */
-      const entities = contentPackEntities.concat(result.entities.map((e) => Entity.fromJSON(e, true)));
+      const entities = selectedContentPackEntities.concat(result.entities.map((e) => Entity.fromJSON(e, true)));
       const builtContentPack = contentPack.toBuilder().entities(entities).build();
 
       setContentPack(builtContentPack);

graylog2-web-interface/src/pages/ImportExtractorsPage.tsx

@@ -14,7 +14,7 @@
  * along with this program. If not, see
  * <http://www.mongodb.com/licensing/server-side-public-license>.
  */
-import React from 'react';
+import * as React from 'react';
 import { useEffect, useState } from 'react';
 
 import { DocumentTitle, PageHeader, Spinner } from 'components/common';
@@ -33,7 +33,7 @@ const ImportExtractorsPage = ({ params }: Props) => {
 
   useEffect(() => {
     InputsActions.get(params.inputId).then((_input) => setInput(_input));
-  }, []);
+  }, [params.inputId]);
 
   const _isLoading = !input;
 

graylog2-web-interface/src/pages/IndexSetPage.tsx

@@ -94,10 +94,6 @@ class IndexSetPage extends React.Component<Props, State> {
     indexerOverview: undefined,
     indexerOverviewError: undefined,
     indexSet: undefined,
-    indexDetails: {
-      indices: undefined,
-      closedIndices: undefined,
-    },
   };
 
   constructor(props) {

graylog2-web-interface/src/pages/ServerUnavailablePage.tsx

@@ -38,7 +38,7 @@ type Props = {
   };
 };
 
-const ServerUnavailablePage = ({ server }: Props) => {
+const ServerUnavailablePage = ({ server = undefined }: Props) => {
   const productName = useProductName();
   const [showDetails, setShowDetails] = useState(false);
 

graylog2-web-interface/src/pages/SidecarStatusPage.tsx

@@ -37,6 +37,8 @@ class SidecarStatusPage extends React.Component<
     [key: string]: any;
   }
 > {
+  private interval: NodeJS.Timeout;
+
   constructor(props) {
     super(props);
 
@@ -45,8 +47,6 @@ class SidecarStatusPage extends React.Component<
     };
   }
 
-  private interval: NodeJS.Timeout;
-
   componentDidMount() {
     const reloadSidecar = () => this.reloadSidecar(this.props.history);
     reloadSidecar();