fix(artifacts): default helm artifact editor is broken (#6811)

spinnaker · Apr 3, 2019 · 2039b34 · 2039b34
1 parent 728ddbe
commit 2039b34
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 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
@@ -103,6 +103,6 @@ export const HelmDefault: IArtifactKindConfig = {
   isDefault: true,
   isMatch: false,
   description: 'A helm chart to be deployed',
-  key: 'helm',
+  key: 'default.helm',
   editCmp: HelmEditor,
 };
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/helm/helm.artifact.ts b/app/scripts/modules/core/src/pipeline/config/triggers/artifacts/helm/helm.artifact.ts
@@ -10,12 +10,12 @@ import { ArtifactService } from '../ArtifactService';
 export const HELM_ARTIFACT = 'spinnaker.core.pipeline.trigger.artifact.helm';
 
 module(HELM_ARTIFACT, []).config(() => {
-  Registry.pipeline.mergeArtifactKind({
+  const helmArtifact = {
     label: 'Helm',
     typePattern: ArtifactTypePatterns.HELM_CHART,
     type: 'helm/chart',
-    isDefault: true,
-    isMatch: true,
+    isDefault: false,
+    isMatch: false,
     description: 'A helm chart to be deployed',
     key: 'helm',
     controller: function(artifact: IArtifact) {
@@ -101,5 +101,7 @@ module(HELM_ARTIFACT, []).config(() => {
   </div>
 </div>
 `,
-  });
+  };
+  Registry.pipeline.mergeArtifactKind(Object.assign({}, helmArtifact, { key: 'default.helm', isDefault: true }));
+  Registry.pipeline.mergeArtifactKind(Object.assign({}, helmArtifact, { key: 'helm', isMatch: true }));
 });