fix(helm): Fix helm artifacts not updating name and vesions (#8455)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Aug 3, 2020 · 92eeb4f · 92eeb4f
1 parent 9503258
commit 92eeb4f
Showing 1 changed file with 34 additions and 15 deletions.
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/helm/HelmArtifactEditor.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/helm/HelmArtifactEditor.tsx
@@ -40,12 +40,22 @@ class HelmEditor extends React.Component<IArtifactEditorProps, IHelmArtifactEdit
       props.onChange(clonedArtifact);
     }
 
-    ArtifactService.getArtifactNames(TYPE, this.props.account.name).then(names => {
-      this.setState({
-        names,
-        namesLoading: false,
-      });
-    });
+    ArtifactService.getArtifactNames(TYPE, this.props.account.name).then(
+      names => {
+        this.setState({
+          names,
+          namesLoading: false,
+        });
+      },
+      () => {
+        this.setState({
+          names: [],
+          namesLoading: false,
+          versionsLoading: false,
+          versions: [],
+        });
+      },
+    );
   }
 
   public componentDidMount() {
@@ -55,15 +65,24 @@ class HelmEditor extends React.Component<IArtifactEditorProps, IHelmArtifactEdit
     }
   }
 
-  public componentDidUpdate(nextProps: IArtifactEditorProps) {
-    if (this.props.account.name !== nextProps.account.name) {
-      ArtifactService.getArtifactNames(TYPE, nextProps.account.name).then(names => {
-        this.setState({
-          names,
-          namesLoading: false,
-          versions: [],
-        });
-      });
+  public componentDidUpdate(prevProps: IArtifactEditorProps) {
+    if (this.props.account.name !== prevProps.account.name) {
+      ArtifactService.getArtifactNames(TYPE, this.props.account.name).then(
+        names => {
+          this.setState({
+            names,
+            namesLoading: false,
+            versions: [],
+          });
+        },
+        () => {
+          this.setState({
+            names: [],
+            namesLoading: false,
+            versions: [],
+          });
+        },
+      );
     }
   }