fix(reacthooks): Fix React Hooks linter errors

Left the warnings to be dealt with/ignored later
spinnaker · Mar 12, 2020 · b347120 · b347120
1 parent 98c7caf
commit b347120
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/...ipts/modules/core/src/pipeline/config/stages/bakeManifest/ManualExecutionBakeManifest.tsx b/...ipts/modules/core/src/pipeline/config/stages/bakeManifest/ManualExecutionBakeManifest.tsx
@@ -26,6 +26,14 @@ export function ManualExecutionBakeManifest(props: ITriggerTemplateComponentProp
     props.updateCommand('extraFields.artifacts', updatedArtifacts);
   };
 
+  React.useEffect(() => {
+    if (overrideArtifact === false) {
+      removeHelmArtifact();
+    } else {
+      updateHelmArtifact(defaultArtifact);
+    }
+  }, [overrideArtifact]);
+
   /*
   Only allow manual override of a helm chart artifact when there is exactly one Helm
   Bake (Manifest) stage and exactly one artifact of type `helm/chart`.
@@ -51,14 +59,6 @@ export function ManualExecutionBakeManifest(props: ITriggerTemplateComponentProp
     version: null,
   };
 
-  React.useEffect(() => {
-    if (overrideArtifact === false) {
-      removeHelmArtifact();
-    } else {
-      updateHelmArtifact(defaultArtifact);
-    }
-  }, [overrideArtifact]);
-
   return (
     <>
       <div className="form-group">

diff --git a/app/scripts/modules/core/src/presentation/forms/SpinFormik.tsx b/app/scripts/modules/core/src/presentation/forms/SpinFormik.tsx
@@ -10,7 +10,8 @@ import { traverseObject } from 'core/utils';
  * Use this component like you would use the <Formik/> component
  */
 function SpinFormikImpl<Values extends {}>(props: FormikConfig<Values>, ref?: React.MutableRefObject<Formik<Values>>) {
-  const formikRef = ref || React.useRef<Formik<Values>>();
+  const defaultRef = React.useRef<Formik<Values>>();
+  const formikRef = ref || defaultRef;
   const [refSaved, setRefSaved] = React.useState(false);
   const [ready, setReady] = React.useState(false);
 

diff --git a/app/scripts/modules/core/src/task/monitor/TaskMonitorWrapper.tsx b/app/scripts/modules/core/src/task/monitor/TaskMonitorWrapper.tsx
@@ -13,21 +13,14 @@ export interface ITaskMonitorProps {
 }
 
 export const TaskMonitorWrapper = ({ monitor }: ITaskMonitorProps) => {
-  if (!monitor) {
-    return null;
-  }
-
   const forceUpdate = useForceUpdate();
-  if (!monitor) {
-    return null;
-  }
 
   useEffect(() => {
-    const subscription = monitor.statusUpdatedStream.subscribe(() => forceUpdate());
-    return () => subscription.unsubscribe();
+    const subscription = monitor?.statusUpdatedStream.subscribe(() => forceUpdate());
+    return () => subscription?.unsubscribe();
   }, []);
 
-  if (!monitor.submitting && !monitor.error) {
+  if (!monitor || (!monitor.submitting && !monitor.error)) {
     return null;
   }