fix(core/pipeline): fix Artifactory and Nexus trigger NPE

These were throwing upon initial mount because 'error' wasn't defined.
spinnaker · Oct 10, 2019 · d03ce48 · d03ce48
1 parent a9469e9
commit d03ce48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx
@@ -7,8 +7,9 @@ import { ArtifactoryReaderService } from './artifactoryReader.service';
 export function ArtifactoryTrigger() {
   const fetchNames = useLatestPromise(() => ArtifactoryReaderService.getArtifactoryNames(), []);
 
-  const fetchError = `Error fetching artifactory names: ${fetchNames.error.data.status} ${fetchNames.error.data.error}`;
-  const validationMessage = fetchNames.status === 'REJECTED' ? errorMessage(fetchError) : null;
+  const fetchError = () =>
+    errorMessage(`Error fetching artifactory names: ${fetchNames.error.data.status} ${fetchNames.error.data.error}`);
+  const validationMessage = fetchNames.status === 'REJECTED' ? fetchError() : null;
 
   return (
     <FormikFormField

diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/nexus/NexusTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/nexus/NexusTrigger.tsx
@@ -7,8 +7,9 @@ import { NexusReaderService } from './nexusReader.service';
 export function NexusTrigger() {
   const fetchNames = useLatestPromise(() => NexusReaderService.getNexusNames(), []);
 
-  const fetchError = `Error fetching nexus names: ${fetchNames.error.data.status} ${fetchNames.error.data.error}`;
-  const validationMessage = fetchNames.status === 'REJECTED' ? errorMessage(fetchError) : null;
+  const fetchError = () =>
+    errorMessage(`Error fetching nexus names: ${fetchNames.error.data.status} ${fetchNames.error.data.error}`);
+  const validationMessage = fetchNames.status === 'REJECTED' ? fetchError() : null;
 
   return (
     <FormikFormField