@spinnaker/core 0.27.0 → 0.28.0

package/dist/orchestratedItem/orchestratedItem.transformer.d.ts

@@ -2,11 +2,12 @@ export declare class OrchestratedItemTransformer {
     static addRunningTime(item: any): void;
     private static shouldReplace;
     static defineProperties(item: any): void;
-    private static mergeExceptions;
-    private static getOrchestrationException;
+    private static getFailureMessagesAsString;
+    private static getFailureMessages;
+    private static getOrchestrationExceptionMessage;
     private static getLockFailureException;
-    private static getCustomException;
-    private static getGeneralException;
+    private static getCustomExceptionMessage;
+    private static getGeneralExceptionMessages;
     private static calculateRunningTime;
     private static normalizeStatus;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -92,7 +92,7 @@
     "@graphql-codegen/typescript-operations": "^1.18.3",
     "@graphql-codegen/typescript-react-apollo": "^2.3.0",
     "@spinnaker/eslint-plugin": "^3.0.2",
-    "@spinnaker/scripts": "^0.3.1",
+    "@spinnaker/scripts": "^0.4.0",
     "@types/angular": "1.6.26",
     "@types/angular-mocks": "1.5.10",
     "@types/angular-ui-bootstrap": "0.13.41",
@@ -123,5 +123,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "217b75396c5ec25d9b2019a849593b0b8d52e916"
+  "gitHead": "20d6ca89f39a5f44a802a1ccaffd669587450d76"
 }

package/src/config/settings.ts

@@ -39,6 +39,7 @@ export interface IFeatures {
   mdGitIntegration?: boolean;
   managedServiceAccounts?: boolean;
   managedResources?: boolean;
+  multiBlockFailureMessages?: boolean;
   notifications?: boolean;
   pagerDuty?: boolean;
   pipelines?: boolean;

package/src/domain/IOrchestratedItem.ts

@@ -16,6 +16,7 @@ export interface IOrchestratedItem extends ITimedItem {
   getValueFor: (k: string) => any;
   originalStatus: string;
   status: string;
+  failureMessages: string[];
   failureMessage: string;
   isBuffered: boolean;
   isCompleted: boolean;

package/src/orchestratedItem/orchestratedItem.transformer.ts

@@ -75,8 +75,11 @@ export class OrchestratedItemTransformer {
     item.originalStatus = item.status;
 
     Object.defineProperties(item, {
+      failureMessages: {
+        get: (): string[] => this.getFailureMessages(item),
+      },
       failureMessage: {
-        get: (): string => this.mergeExceptions(item),
+        get: (): string => this.getFailureMessagesAsString(item),
       },
       isCompleted: {
         get: (): boolean => ['SUCCEEDED', 'SKIPPED'].includes(item.status),
@@ -131,19 +134,23 @@ export class OrchestratedItemTransformer {
     });
   }
 
-  private static mergeExceptions(item: any): string | null {
-    const exceptions = [
-      this.getCustomException(item),
-      this.getGeneralException(item),
-      this.getOrchestrationException(item),
-    ].filter((it) => !!it);
+  private static getFailureMessagesAsString(item: any): string | null {
+    const exceptions = this.getFailureMessages(item);
     if (exceptions.length === 0) {
       return null;
     }
     return exceptions.join('\n\n');
   }
 
-  private static getOrchestrationException(task: ITask): string {
+  private static getFailureMessages(task: ITask): string[] {
+    return [
+      this.getCustomExceptionMessage(task),
+      ...this.getGeneralExceptionMessages(task),
+      this.getOrchestrationExceptionMessage(task),
+    ].filter((it) => !!it);
+  }
+
+  private static getOrchestrationExceptionMessage(task: ITask): string {
     const katoTasks: any[] = task.getValueFor('kato.tasks');
     if (katoTasks && katoTasks.length) {
       const failedTask: any = katoTasks.find((t) => t.status && t.status.failed);
@@ -190,7 +197,7 @@ export class OrchestratedItemTransformer {
     return null;
   }
 
-  private static getCustomException(task: ITask): string {
+  private static getCustomExceptionMessage(task: ITask): string {
     const generalException: any = task.getValueFor('exception');
     if (generalException) {
       if (generalException.exceptionType && generalException.exceptionType === 'LockFailureException') {
@@ -200,16 +207,17 @@ export class OrchestratedItemTransformer {
     return null;
   }
 
-  private static getGeneralException(task: ITask): string {
+  private static getGeneralExceptionMessages(task: ITask): string[] {
     const generalException: any = task.getValueFor('exception');
     if (generalException) {
       const errors = (generalException.details?.errors ?? []).filter((m: any) => !!m);
       if (errors.length) {
-        return errors.join('\n\n');
+        return errors;
       }
-      return generalException.details?.error ?? null;
+
+      return generalException.details?.error ? [generalException.details.error] : [];
     }
-    return null;
+    return [];
   }
 
   private static calculateRunningTime(item: IOrchestratedItem): () => number {

package/src/plugins/sharedLibraries.ts

@@ -8,7 +8,6 @@ import * as reactDOM from 'react-dom';
 import * as rxjs from 'rxjs';
 
 import * as spinnakerCore from '../index';
-
 export const sharedLibraries = {
   // This is the global (window) variable that the shared libs will be exposed on
   globalVariablePrefix: 'spinnaker.plugins.sharedLibraries',
@@ -30,7 +29,9 @@ export const sharedLibraries = {
     if (destinationObject) {
       // Temporarily expose @spinnaker/core.
       // This should be removed at some point and replaced with a much smaller spinnaker/ui module which doesn't yet exist
+      exposeSharedLibrary('ajv', require('ajv'));
       exposeSharedLibrary('@spinnaker/core', spinnakerCore);
+      exposeSharedLibrary('@spinnaker/kayenta', require('@spinnaker/kayenta'));
       exposeSharedLibrary('@uirouter/core', uiRouterCore);
       exposeSharedLibrary('@uirouter/react', uiRouterReact);
       exposeSharedLibrary('@uirouter/rx', uiRouterRx);
@@ -38,6 +39,9 @@ export const sharedLibraries = {
       exposeSharedLibrary('prop-types', propTypes);
       exposeSharedLibrary('react', react);
       exposeSharedLibrary('react-dom', reactDOM);
+      exposeSharedLibrary('react-redux', require('react-redux'));
+      exposeSharedLibrary('redux-actions', require('redux-actions'));
+      exposeSharedLibrary('reselect', require('reselect'));
       exposeSharedLibrary('rxjs', rxjs);
       exposeSharedLibrary('rxjs/Observable', { Observable: rxjs.Observable });
     }

package/src/presentation/CollapsibleElement.tsx

@@ -12,9 +12,11 @@ export const CollapsibleElement: React.FC<{ maxHeight: number }> = ({ children,
     setIsOverflowing(contentRef.current.offsetHeight < contentRef.current.scrollHeight);
   }, []);
 
-  React.useEffect(() => {
-    checkIsOverflowing();
-  }, [children, checkIsOverflowing]);
+  React.useLayoutEffect(() => {
+    setTimeout(() => {
+      checkIsOverflowing();
+    });
+  }, [checkIsOverflowing]);
 
   React.useEffect(() => {
     window.addEventListener('resize', checkIsOverflowing);