@spinnaker/kubernetes 0.5.2 → 0.6.1

package/dist/pipelines/stages/deployManifest/manifestStatus/DeployStatus.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { IExecutionDetailsSectionProps, IManifest } from '@spinnaker/core';
+import './DeployStatus.less';
 export interface IManifestSubscription {
     id: string;
     unsubscribe: () => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/kubernetes",
   "license": "Apache-2.0",
-  "version": "0.5.2",
+  "version": "0.6.1",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -16,7 +16,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.27.0",
+    "@spinnaker/core": "^0.29.0",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/react": "1.0.7",
     "angular": "1.6.10",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@spinnaker/eslint-plugin": "^3.0.2",
-    "@spinnaker/scripts": "^0.3.1",
+    "@spinnaker/scripts": "^0.4.0",
     "@types/angular": "1.6.26",
     "@types/angular-ui-bootstrap": "0.13.41",
     "@types/dompurify": "^2.3.3",
@@ -53,5 +53,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "217b75396c5ec25d9b2019a849593b0b8d52e916"
+  "gitHead": "082a084908e13888d640e88a5bd6e1571479de14"
 }

package/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.less

@@ -0,0 +1,11 @@
+.deploy-status .collapsible-element {
+  margin-bottom: 20px;
+
+  .alert {
+    margin-bottom: 0;
+  }
+
+  .content {
+    padding: 0;
+  }
+}

package/src/pipelines/stages/deployManifest/manifestStatus/DeployStatus.tsx

@@ -2,12 +2,14 @@ import { get } from 'lodash';
 import React from 'react';
 
 import type { IExecutionDetailsSectionProps, IManifest } from '@spinnaker/core';
-import { ExecutionDetailsSection, StageFailureMessage } from '@spinnaker/core';
+import { CollapsibleElement, ExecutionDetailsSection, SETTINGS, StageFailureMessage } from '@spinnaker/core';
 
 import { ManifestStatus } from './ManifestStatus';
 import type { IStageManifest } from '../../../../manifest/manifest.service';
 import { KubernetesManifestService } from '../../../../manifest/manifest.service';
 
+import './DeployStatus.less';
+
 export interface IManifestSubscription {
   id: string;
   unsubscribe: () => void;
@@ -87,22 +89,32 @@ export class DeployStatus extends React.Component<IExecutionDetailsSectionProps,
     const { name: sectionName, current: currentSection, stage } = this.props;
     const manifests: IManifest[] = this.state.subscriptions.filter((sub) => !!sub.manifest).map((sub) => sub.manifest);
     return (
-      <ExecutionDetailsSection name={sectionName} current={currentSection}>
-        <StageFailureMessage stage={stage} message={stage.failureMessage} />
-        {manifests && (
-          <div className="row">
-            <div className="col-md-12">
-              <div className="well alert alert-info">
-                {manifests.map((manifest) => {
-                  const uid =
-                    manifest.manifest.metadata.uid || KubernetesManifestService.manifestIdentifier(manifest.manifest);
-                  return <ManifestStatus key={uid} manifest={manifest} account={stage.context.account} />;
-                })}
+      <div className="deploy-status">
+        <ExecutionDetailsSection name={sectionName} current={currentSection}>
+          {SETTINGS.feature.multiBlockFailureMessages ? (
+            stage.failureMessages.map((failureMessage) => (
+              <CollapsibleElement key={failureMessage} maxHeight={150}>
+                <StageFailureMessage stage={stage} message={failureMessage} />
+              </CollapsibleElement>
+            ))
+          ) : (
+            <StageFailureMessage stage={stage} message={stage.failureMessage} />
+          )}
+          {!!manifests?.length && (
+            <div className="row">
+              <div className="col-md-12">
+                <div className="well alert alert-info">
+                  {manifests.map((manifest) => {
+                    const uid =
+                      manifest.manifest.metadata.uid || KubernetesManifestService.manifestIdentifier(manifest.manifest);
+                    return <ManifestStatus key={uid} manifest={manifest} account={stage.context.account} />;
+                  })}
+                </div>
               </div>
             </div>
-          </div>
-        )}
-      </ExecutionDetailsSection>
+          )}
+        </ExecutionDetailsSection>
+      </div>
     );
   }
 }