@spinnaker/core 0.19.4 → 0.21.0

package/dist/pipeline/config/stages/bakeManifest/ManifestRenderers.d.ts

@@ -1,6 +1,8 @@
 export declare enum ManifestRenderers {
     HELM2 = "HELM2",
     HELM3 = "HELM3",
-    KUSTOMIZE = "KUSTOMIZE"
+    KUSTOMIZE = "KUSTOMIZE",
+    KUSTOMIZE4 = "KUSTOMIZE4"
 }
 export declare const HELM_RENDERERS: Readonly<ManifestRenderers[]>;
+export declare const KUSTOMIZE_RENDERERS: Readonly<ManifestRenderers[]>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.19.4",
+  "version": "0.21.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -74,7 +74,7 @@
     "react-virtualized": "9.18.5",
     "react-virtualized-select": "3.1.3",
     "react2angular": "3.2.1",
-    "recoil": "0.0.10",
+    "recoil": "0.7.2",
     "rxjs": "6.6.7",
     "select2": "3.5.1",
     "select2-bootstrap-css": "1.4.6",
@@ -120,5 +120,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "3d37fe6b9dfe120308bf0374e7f93146b745f272"
+  "gitHead": "966862b2caf82b5c9879cf418a7c79ec51152dfd"
 }

package/src/application/nav/navAtoms.ts

@@ -1,7 +1,25 @@
 import { atom } from 'recoil';
-import { CollapsibleSectionStateCache } from '../../cache/collapsibleSectionStateCache';
+import { CollapsibleSectionStateCache } from '../../cache';
 
 export const verticalNavExpandedAtom = atom({
   key: 'verticalNavExpanded',
   default: !CollapsibleSectionStateCache.isSet('verticalNav') || CollapsibleSectionStateCache.isExpanded('verticalNav'),
+  effects: [
+    ({ setSelf, trigger }) => {
+      if (trigger === 'get') {
+        // Avoid expensive initialization
+        setSelf(
+          !CollapsibleSectionStateCache.isSet('verticalNav') || CollapsibleSectionStateCache.isExpanded('verticalNav'),
+        );
+      }
+      CollapsibleSectionStateCache.onChange('verticalNav', (expanded: boolean) => {
+        setSelf(expanded);
+      });
+
+      return () => {
+        // clean up
+        CollapsibleSectionStateCache.onChange('verticalNav', null);
+      };
+    },
+  ],
 });

package/src/cache/collapsibleSectionStateCache.ts

@@ -5,6 +5,7 @@ export class CollapsibleSectionStateCacheInternal {
   private cacheFactory = new CacheFactory();
   private cacheId = 'collapsibleSectionStateCache';
   private stateCache: Cache;
+  private handlers = new Map();
 
   constructor() {
     try {
@@ -31,6 +32,16 @@ export class CollapsibleSectionStateCacheInternal {
   public setExpanded(heading: string, expanded: boolean) {
     if (heading) {
       this.stateCache.put(heading, !!expanded);
+      const handler = this.handlers.get(heading);
+      if (handler) {
+        handler(!CollapsibleSectionStateCache.isSet(heading) || CollapsibleSectionStateCache.isExpanded(heading));
+      }
+    }
+  }
+
+  public onChange(heading: string, listener: Function) {
+    if (!this.handlers.get(heading)) {
+      this.handlers.set(heading, listener);
     }
   }
 }

package/src/pipeline/config/stages/bakeManifest/BakeManifestStageForm.tsx

@@ -2,7 +2,7 @@ import { isNil } from 'lodash';
 import React from 'react';
 
 import type { IFormikStageConfigInjectedProps } from '../FormikStageConfig';
-import { HELM_RENDERERS, ManifestRenderers } from './ManifestRenderers';
+import { HELM_RENDERERS, KUSTOMIZE_RENDERERS } from './ManifestRenderers';
 import { ExpectedArtifactService } from '../../../../artifact';
 import { StageConfigField } from '../common';
 import type { IExpectedArtifact } from '../../../../domain';
@@ -26,7 +26,7 @@ export function BakeManifestStageForm({ application, formik, pipeline }: IFormik
 
   // Clear renderer-specific fields when selected renderer changes
   React.useEffect(() => {
-    if (stage.templateRenderer == ManifestRenderers.KUSTOMIZE && !isNil(stage.inputArtifacts)) {
+    if (KUSTOMIZE_RENDERERS.includes(stage.templateRenderer) && !isNil(stage.inputArtifacts)) {
       formik.setFieldValue('inputArtifacts', null);
     }
     if (HELM_RENDERERS.includes(stage.templateRenderer) && !isNil(stage.inputArtifact)) {
@@ -35,7 +35,7 @@ export function BakeManifestStageForm({ application, formik, pipeline }: IFormik
   }, [stage.templateRenderer]);
 
   const templateRenderers = React.useMemo(() => {
-    return [...HELM_RENDERERS, ManifestRenderers.KUSTOMIZE];
+    return [...KUSTOMIZE_RENDERERS, ...HELM_RENDERERS];
   }, []);
 
   return (
@@ -56,7 +56,7 @@ export function BakeManifestStageForm({ application, formik, pipeline }: IFormik
             stringOptions={templateRenderers}
           />
         </StageConfigField>
-        {stage.templateRenderer === ManifestRenderers.KUSTOMIZE && (
+        {KUSTOMIZE_RENDERERS.includes(stage.templateRenderer) && (
           <BakeKustomizeConfigForm pipeline={pipeline} application={application} formik={formik} />
         )}
         {HELM_RENDERERS.includes(stage.templateRenderer) && (

package/src/pipeline/config/stages/bakeManifest/ManifestRenderers.ts

@@ -2,6 +2,11 @@ export enum ManifestRenderers {
   HELM2 = 'HELM2',
   HELM3 = 'HELM3',
   KUSTOMIZE = 'KUSTOMIZE',
+  KUSTOMIZE4 = 'KUSTOMIZE4',
 }
 
 export const HELM_RENDERERS: Readonly<ManifestRenderers[]> = [ManifestRenderers.HELM2, ManifestRenderers.HELM3];
+export const KUSTOMIZE_RENDERERS: Readonly<ManifestRenderers[]> = [
+  ManifestRenderers.KUSTOMIZE,
+  ManifestRenderers.KUSTOMIZE4,
+];

package/src/pipeline/config/stages/bakeManifest/helm/BakeHelmConfigForm.tsx

@@ -34,6 +34,7 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
     ArtifactTypePatterns.S3_OBJECT,
     ArtifactTypePatterns.HELM_CHART,
     ArtifactTypePatterns.HTTP_FILE,
+    ArtifactTypePatterns.ORACLE_OBJECT,
   );
 
   public componentDidMount() {

package/src/pipeline/executions/execution/ExecutionMarker.tsx

@@ -7,7 +7,7 @@ import { OrchestratedItemRunningTime } from './OrchestratedItemRunningTime';
 import type { Application } from '../../../application/application.model';
 import { SETTINGS } from '../../../config/settings';
 import { ExecutionBarLabel } from '../../config/stages/common/ExecutionBarLabel';
-import type { IExecution, IExecutionStageSummary } from '../../../domain';
+import type { IExecution, IExecutionStageSummary, IStage } from '../../../domain';
 import { logger } from '../../../utils';
 import { duration } from '../../../utils/timeFormatters';
 
@@ -94,7 +94,19 @@ export class ExecutionMarker extends React.Component<IExecutionMarkerProps, IExe
 
   public render() {
     const { stage, application, execution, active, previousStageActive, width } = this.props;
-    const stageType = (stage.activeStageType || stage.type).toLowerCase(); // support groups
+    let stageType = (stage.activeStageType || stage.type).toLowerCase(); // support groups
+    stage.stages.forEach((childStage: IStage) => {
+      if (childStage.type == 'pipeline') {
+        const childPipeline = application.executions.data.find((p: any) => p.id === childStage.context.executionId);
+        if (childPipeline != undefined) {
+          childPipeline.stages.forEach((stageToCheck: IStage) => {
+            if (stageToCheck.type == 'manualJudgment' && stageToCheck.status == 'RUNNING') {
+              stageType = 'manualjudgment';
+            }
+          });
+        }
+      }
+    });
     const pipelineStatus = this.stageStatus(stage.status.toLowerCase());
     const markerClassName = [
       stage.type !== 'group' ? 'clickable' : '',