fix(cf): add Artifactory link (spinnaker#6994)

christopherthielen · May 15, 2019 · ce8a163 · ce8a163
1 parent f7cb7ab
commit ce8a163
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 45 deletions.
diff --git a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts
@@ -17,6 +17,7 @@ export interface ICloudFoundryServerGroup extends IServerGroup {
   serviceInstances: ICloudFoundryServiceInstance[];
   env: ICloudFoundryEnvVar[];
   ciBuild: ICloudFoundryBuildInfo;
+  appArtifact: ICloudFoundryArtifactInfo;
 }
 
 export interface ICloudFoundryServiceInstance {
@@ -35,5 +36,10 @@ export interface ICloudFoundryBuildInfo {
   jobName: string;
   jobNumber: string;
   jobUrl: string;
+}
+
+export interface ICloudFoundryArtifactInfo {
+  name: string;
   version: string;
+  url: string;
 }
diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/details/sections/BuildSection.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/details/sections/BuildSection.tsx
@@ -12,40 +12,50 @@ export class BuildSection extends React.Component<ICloudFoundryServerGroupDetail
   public render(): JSX.Element {
     const { serverGroup } = this.props;
     return (
-      <>
-        {serverGroup.droplet && serverGroup.droplet.sourcePackage && (
-          <CollapsibleSection heading="Build" defaultExpanded={true}>
-            <dl className="dl-horizontal dl-flex">
-              {serverGroup.ciBuild && serverGroup.ciBuild.version && (
-                <div>
-                  <dt>Version</dt>
-                  <dd>{serverGroup.ciBuild.version}</dd>
-                </div>
+      <CollapsibleSection heading="Build" defaultExpanded={true}>
+        <dl className="dl-horizontal dl-flex">
+          {serverGroup.ciBuild && serverGroup.ciBuild.jobName && (
+            <div>
+              <dt>Job Name</dt>
+              <dd>{serverGroup.ciBuild.jobName}</dd>
+            </div>
+          )}
+          {serverGroup.ciBuild && serverGroup.ciBuild.jobNumber && (
+            <div>
+              <dt>Job Number</dt>
+              {serverGroup.ciBuild.jobUrl ? (
+                <dd>
+                  <a target="_blank" href={serverGroup.ciBuild.jobUrl}>
+                    {serverGroup.ciBuild.jobNumber}
+                  </a>
+                </dd>
+              ) : (
+                <dd>{serverGroup.ciBuild.jobNumber}</dd>
               )}
-              {serverGroup.ciBuild && serverGroup.ciBuild.jobName && (
-                <div>
-                  <dt>Job</dt>
-                  <dd>{serverGroup.ciBuild.jobName}</dd>
-                </div>
+            </div>
+          )}
+          {serverGroup.appArtifact && serverGroup.appArtifact.name && (
+            <div>
+              <dt>Artifact Name</dt>
+              <dd>{serverGroup.appArtifact.name}</dd>
+            </div>
+          )}
+          {serverGroup.appArtifact && serverGroup.appArtifact.version && (
+            <div>
+              <dt>Version</dt>
+              {serverGroup.appArtifact.url ? (
+                <dd>
+                  <a target="_blank" href={serverGroup.appArtifact.url}>
+                    {serverGroup.appArtifact.version}
+                  </a>
+                </dd>
+              ) : (
+                <dd>{serverGroup.appArtifact.version}</dd>
               )}
-              {serverGroup.ciBuild && serverGroup.ciBuild.jobNumber && (
-                <div>
-                  <dt>Build</dt>
-                  {serverGroup.ciBuild.jobUrl ? (
-                    <dd>
-                      <a target="_blank" href={serverGroup.ciBuild.jobUrl}>
-                        {serverGroup.ciBuild.jobNumber}
-                      </a>
-                    </dd>
-                  ) : (
-                    <dd>{serverGroup.ciBuild.jobNumber}</dd>
-                  )}
-                </div>
-              )}
-            </dl>
-          </CollapsibleSection>
-        )}
-      </>
+            </div>
+          )}
+        </dl>
+      </CollapsibleSection>
     );
   }
 }
diff --git a/app/scripts/modules/core/src/serverGroup/ServerGroup.tsx b/app/scripts/modules/core/src/serverGroup/ServerGroup.tsx
@@ -63,20 +63,14 @@ export class ServerGroup extends React.Component<IServerGroupProps, IServerGroup
     const instances = serverGroup.instances.filter(i => ClusterState.filterService.shouldShowInstance(i));
     const isSelected = this.isSelected(serverGroup);
     const isMultiSelected = this.isMultiSelected(props.sortFilter.multiselect, serverGroup);
-    const ciBuildConfig = serverGroup.buildInfo && serverGroup.buildInfo.ciBuild;
     const jenkinsConfig = serverGroup.buildInfo && serverGroup.buildInfo.jenkins;
     const dockerConfig = serverGroup.buildInfo && serverGroup.buildInfo.docker;
 
     let jenkins: IJenkinsViewModel = null;
     let images: string[] = null;
     let docker: IDockerViewModel = null;
 
-    if (ciBuildConfig && ciBuildConfig.jobNumber) {
-      jenkins = {
-        number: ciBuildConfig.number,
-        href: ciBuildConfig.jobUrl,
-      };
-    } else if (jenkinsConfig && (jenkinsConfig.host || jenkinsConfig.fullUrl || serverGroup.buildInfo.buildInfoUrl)) {
+    if (jenkinsConfig && (jenkinsConfig.host || jenkinsConfig.fullUrl || serverGroup.buildInfo.buildInfoUrl)) {
       const fromHost =
         jenkinsConfig.host && [jenkinsConfig.host + 'job', jenkinsConfig.name, jenkinsConfig.number, ''].join('/');
       const fromFullUrl = jenkinsConfig.fullUrl;

diff --git a/app/scripts/modules/core/src/serverGroup/ServerGroupHeader.tsx b/app/scripts/modules/core/src/serverGroup/ServerGroupHeader.tsx
@@ -116,6 +116,7 @@ export class SequenceAndBuildAndImages extends React.Component<IServerGroupHeade
     const { serverGroup, jenkins, images, docker } = this.props;
     const serverGroupSequence = NameUtils.getSequence(serverGroup.moniker.sequence);
     const ciBuild = serverGroup.buildInfo && serverGroup.buildInfo.ciBuild;
+    const appArtifact = serverGroup.buildInfo && serverGroup.buildInfo.appArtifact;
     return (
       <div>
         {!!serverGroupSequence && <span className="server-group-sequence"> {serverGroupSequence}</span>}
@@ -131,13 +132,14 @@ export class SequenceAndBuildAndImages extends React.Component<IServerGroupHeade
           </a>
         )}
         {!!images && <ImageList {...this.props} />}
-        {!!ciBuild && ciBuild.jobUrl && (
+        {(!!ciBuild || !!appArtifact) && (
           <span>
-            {' '}
-            ({ciBuild.version})
-            <a className="build-link" href={ciBuild.jobUrl} target="_blank">
-              Build: #{ciBuild.jobNumber}
-            </a>
+            {!!appArtifact.version && <span> ({appArtifact.version})</span>}
+            {!!ciBuild.jobUrl && (
+              <a className="build-link" href={ciBuild.jobUrl} target="_blank">
+                Build: #{ciBuild.jobNumber}
+              </a>
+            )}
           </span>
         )}
       </div>