@spinnaker/core 0.25.0 → 0.27.0

package/dist/pipeline/executions/Executions.d.ts

@@ -24,6 +24,7 @@ export declare class Executions extends React.Component<IExecutionsProps, IExecu
     private filterCountOptions;
     constructor(props: IExecutionsProps);
     private setReloadingForFilters;
+    private loadDefaultFilters;
     private clearFilters;
     private forceUpdateExecutionGroups;
     private updateExecutionGroups;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "clean": "shx rm -rf dist",
     "prepublishOnly": "npm run build",
@@ -17,7 +20,7 @@
     "@apollo/client": "^3.6.9",
     "@fortawesome/fontawesome-free": "5.5.0",
     "@spinnaker/mocks": "1.0.7",
-    "@spinnaker/presentation": "^0.3.0",
+    "@spinnaker/presentation": "^0.3.1",
     "@spinnaker/styleguide": "2.0.0",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/core": "6.0.8",
@@ -88,8 +91,8 @@
     "@graphql-codegen/typescript": "^1.22.4",
     "@graphql-codegen/typescript-operations": "^1.18.3",
     "@graphql-codegen/typescript-react-apollo": "^2.3.0",
-    "@spinnaker/eslint-plugin": "^3.0.1",
-    "@spinnaker/scripts": "^0.3.0",
+    "@spinnaker/eslint-plugin": "^3.0.2",
+    "@spinnaker/scripts": "^0.3.1",
     "@types/angular": "1.6.26",
     "@types/angular-mocks": "1.5.10",
     "@types/angular-ui-bootstrap": "0.13.41",
@@ -120,5 +123,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "8de1e3c576a24ce9a62290f86bc52772df4842d2"
+  "gitHead": "217b75396c5ec25d9b2019a849593b0b8d52e916"
 }

package/src/application/config/applicationConfig.controller.js

@@ -8,6 +8,7 @@ import { CORE_APPLICATION_CONFIG_APPLICATIONSNAPSHOTSECTION_COMPONENT } from './
 import { CHAOS_MONKEY_CONFIG_COMPONENT } from '../../chaosMonkey/chaosMonkeyConfig.component';
 import { SETTINGS } from '../../config/settings';
 import { APPLICATION_DATA_SOURCE_EDITOR } from './dataSources/applicationDataSourceEditor.component';
+import { DEFAULT_TAG_FILTER_CONFIG } from './defaultTagFilter/defaultTagFilterConfig.component';
 import { DELETE_APPLICATION_SECTION } from './deleteApplicationSection.module';
 import { CORE_APPLICATION_CONFIG_LINKS_APPLICATIONLINKS_COMPONENT } from './links/applicationLinks.component';
 import { ApplicationWriter } from '../service/ApplicationWriter';
@@ -25,6 +26,7 @@ module(CORE_APPLICATION_CONFIG_APPLICATIONCONFIG_CONTROLLER, [
   CHAOS_MONKEY_CONFIG_COMPONENT,
   TRAFFIC_GUARD_CONFIG_COMPONENT,
   CORE_APPLICATION_CONFIG_LINKS_APPLICATIONLINKS_COMPONENT,
+  DEFAULT_TAG_FILTER_CONFIG,
 ]).controller('ApplicationConfigController', [
   '$state',
   'app',
@@ -63,6 +65,30 @@ module(CORE_APPLICATION_CONFIG_APPLICATIONCONFIG_CONTROLLER, [
         });
     };
 
+    this.defaultTagFilterProps = {
+      isSaving: false,
+      saveError: false,
+    };
+    this.updateDefaultTagFilterConfigs = (tagConfigs /* IDefaultTagFilterConfig[] */) => {
+      const applicationAttributes = cloneDeep(this.application.attributes);
+      applicationAttributes.defaultFilteredTags = tagConfigs;
+      $scope.$applyAsync(() => {
+        this.defaultTagFilterProps.isSaving = true;
+        this.defaultTagFilterProps.saveError = false;
+      });
+      ApplicationWriter.updateApplication(applicationAttributes)
+        .then(() => {
+          $scope.$applyAsync(() => {
+            this.defaultTagFilterProps.isSaving = false;
+            this.application.attributes = applicationAttributes;
+          });
+        })
+        .catch(() => {
+          this.defaultTagFilterProps.isSaving = false;
+          this.defaultTagFilterProps.saveError = true;
+        });
+    };
+
     this.notifications = [];
     this.updateNotifications = (notifications) => {
       $scope.$applyAsync(() => {

package/src/application/config/applicationConfig.view.html

@@ -54,6 +54,15 @@
       >
       </custom-banner-config>
     </page-section>
+    <page-section key="default-filters" label="Default Filters">
+      <default-tag-filter-config
+        default-tag-filter-configs="config.application.attributes.defaultFilteredTags"
+        is-saving="config.defaultTagFilterProps.isSaving"
+        save-error="config.defaultTagFilterProps.saveError"
+        update-default-tag-filter-configs="config.updateDefaultTagFilterConfigs"
+      >
+      </default-tag-filter-config>
+    </page-section>
     <page-section key="delete" label="Delete Application">
       <delete-application-section application="config.application"></delete-application-section>
     </page-section>

package/src/application/config/defaultTagFilter/DefaultTagFilterConfig.spec.tsx

@@ -0,0 +1,75 @@
+import { shallow } from 'enzyme';
+import React from 'react';
+
+import type { IDefaultTagFilterConfig } from './DefaultTagFilterConfig';
+import { DefaultTagFilterConfig } from './DefaultTagFilterConfig';
+import { noop } from '../../../utils';
+
+describe('<DefaultTagFilterConfig />', () => {
+  let tagConfigs: IDefaultTagFilterConfig[];
+  let wrapper: any;
+
+  beforeEach(() => {
+    tagConfigs = getTestDefaultFilterTagConfigs();
+    wrapper = shallow(
+      <DefaultTagFilterConfig
+        defaultTagFilterConfigs={tagConfigs}
+        isSaving={false}
+        saveError={false}
+        updateDefaultTagFilterConfigs={noop}
+      />,
+    );
+  });
+
+  describe('view', () => {
+    it('renders a row for each banner config', () => {
+      expect(wrapper.find('.default-filter-config-row').length).toEqual(tagConfigs.length);
+    });
+    it('renders an "add" button', () => {
+      expect(wrapper.find('.add-new').length).toEqual(1);
+    });
+  });
+
+  describe('functionality', () => {
+    it('update default tag filter config', () => {
+      expect(wrapper.state('defaultTagFilterConfigsEditing')).toEqual(tagConfigs);
+      wrapper
+        .find('textarea')
+        .at(1)
+        .simulate('change', { target: { value: 'hello' } });
+      const updatedConfigs = [
+        {
+          ...tagConfigs[0],
+          tagValue: 'hello',
+        },
+        {
+          ...tagConfigs[1],
+        },
+      ];
+      expect(wrapper.state('defaultTagFilterConfigsEditing')).toEqual(updatedConfigs);
+    });
+    it('add default filter tag config', () => {
+      expect(wrapper.state('defaultTagFilterConfigsEditing').length).toEqual(2);
+      wrapper.find('.add-new').simulate('click');
+      expect(wrapper.state('defaultTagFilterConfigsEditing').length).toEqual(3);
+    });
+    it('remove default filter tag config', () => {
+      expect(wrapper.state('defaultTagFilterConfigsEditing').length).toEqual(2);
+      wrapper.find('.default-filter-config-remove').at(1).simulate('click');
+      expect(wrapper.state('defaultTagFilterConfigsEditing').length).toEqual(1);
+    });
+  });
+});
+
+export function getTestDefaultFilterTagConfigs(): IDefaultTagFilterConfig[] {
+  return [
+    {
+      tagName: 'Pipeline Type',
+      tagValue: 'Deployment Pipelines',
+    },
+    {
+      tagName: 'Pipeline Type',
+      tagValue: 'Repair Pipelines',
+    },
+  ];
+}

package/src/application/config/defaultTagFilter/DefaultTagFilterConfig.tsx

@@ -0,0 +1,161 @@
+import { isEqual } from 'lodash';
+import React from 'react';
+
+import { ConfigSectionFooter } from '../footer/ConfigSectionFooter';
+import { noop } from '../../../utils';
+
+import './defaultTagFilterConfig.less';
+
+export interface IDefaultTagFilterConfig {
+  tagName: string;
+  tagValue: string;
+}
+
+export interface IDefaultTagFilterProps {
+  defaultTagFilterConfigs: IDefaultTagFilterConfig[];
+  isSaving: boolean;
+  saveError: boolean;
+  updateDefaultTagFilterConfigs: (defaultTagFilterConfigs: IDefaultTagFilterConfig[]) => void;
+}
+
+export interface IDefaultTagFilterState {
+  defaultTagFilterConfigsEditing: IDefaultTagFilterConfig[];
+}
+
+export class DefaultTagFilterConfig extends React.Component<IDefaultTagFilterProps, IDefaultTagFilterState> {
+  public static defaultProps: Partial<IDefaultTagFilterProps> = {
+    defaultTagFilterConfigs: [],
+    isSaving: false,
+    saveError: false,
+    updateDefaultTagFilterConfigs: noop,
+  };
+
+  constructor(props: IDefaultTagFilterProps) {
+    super(props);
+    this.state = {
+      defaultTagFilterConfigsEditing: props.defaultTagFilterConfigs,
+    };
+  }
+
+  private onTagNameChange = (idx: number, text: string) => {
+    this.setState({
+      defaultTagFilterConfigsEditing: this.state.defaultTagFilterConfigsEditing.map((config, i) => {
+        if (i === idx) {
+          return {
+            ...config,
+            tagName: text,
+          };
+        }
+        return config;
+      }),
+    });
+  };
+
+  private onTagValueChange = (idx: number, text: string) => {
+    this.setState({
+      defaultTagFilterConfigsEditing: this.state.defaultTagFilterConfigsEditing.map((config, i) => {
+        if (i === idx) {
+          return {
+            ...config,
+            tagValue: text,
+          };
+        }
+        return config;
+      }),
+    });
+  };
+
+  private addFilterTag = (): void => {
+    this.setState({
+      defaultTagFilterConfigsEditing: this.state.defaultTagFilterConfigsEditing.concat([
+        {
+          tagName: 'Name of the tag (E.g. Pipeline Type)',
+          tagValue: 'Value of the tag (E.g. Default Pipelines)',
+        } as IDefaultTagFilterConfig,
+      ]),
+    });
+  };
+
+  private removeFilterTag = (idx: number): void => {
+    this.setState({
+      defaultTagFilterConfigsEditing: this.state.defaultTagFilterConfigsEditing.filter((_config, i) => i !== idx),
+    });
+  };
+
+  private isDirty = (): boolean => {
+    return !isEqual(this.props.defaultTagFilterConfigs, this.state.defaultTagFilterConfigsEditing);
+  };
+
+  private onRevertClicked = (): void => {
+    this.setState({
+      defaultTagFilterConfigsEditing: this.props.defaultTagFilterConfigs,
+    });
+  };
+
+  private onSaveClicked = (): void => {
+    this.props.updateDefaultTagFilterConfigs(this.state.defaultTagFilterConfigsEditing);
+  };
+
+  public render() {
+    return (
+      <div className="default-filter-config-container">
+        <div className="default-filter-config-description">
+          Default Tag filters allow you to specify which tags are immediately filtered to when the pipeline execution
+          page is loaded in.
+        </div>
+        <div className="col-md-10 col-md-offset-1">
+          <table className="table table-condensed">
+            <thead>
+              <tr>
+                <th>Tag Name</th>
+                <th>Tag Value</th>
+              </tr>
+            </thead>
+            <tbody>
+              {this.state.defaultTagFilterConfigsEditing.map((defaultTagFilter, idx) => (
+                <tr key={idx} className="default-filter-config-row">
+                  <td>
+                    <textarea
+                      className="form-control input-sm"
+                      onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
+                        this.onTagNameChange(idx, e.target.value)
+                      }
+                      value={defaultTagFilter.tagName}
+                    />
+                  </td>
+                  <td>
+                    <textarea
+                      className="form-control input-sm"
+                      onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) =>
+                        this.onTagValueChange(idx, e.target.value)
+                      }
+                      value={defaultTagFilter.tagValue}
+                    />
+                  </td>
+                  <td>
+                    <button className="link default-filter-config-remove" onClick={() => this.removeFilterTag(idx)}>
+                      <span className="glyphicon glyphicon-trash" />
+                    </button>
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+        <div className="col-md-10 col-md-offset-1">
+          <button className="btn btn-block add-new" onClick={this.addFilterTag}>
+            <span className="glyphicon glyphicon-plus-sign" /> Add Default Filter
+          </button>
+        </div>
+        <ConfigSectionFooter
+          isDirty={this.isDirty()}
+          isValid={true}
+          isSaving={this.props.isSaving}
+          saveError={false}
+          onRevertClicked={this.onRevertClicked}
+          onSaveClicked={this.onSaveClicked}
+        />
+      </div>
+    );
+  }
+}

package/src/application/config/defaultTagFilter/defaultTagFilterConfig.component.ts

@@ -0,0 +1,15 @@
+import { module } from 'angular';
+import { react2angular } from 'react2angular';
+import { DefaultTagFilterConfig } from './DefaultTagFilterConfig';
+import { withErrorBoundary } from '../../../presentation/SpinErrorBoundary';
+
+export const DEFAULT_TAG_FILTER_CONFIG = 'spinnaker.micros.application.defaultTagFilterConfig.component';
+module(DEFAULT_TAG_FILTER_CONFIG, []).component(
+  'defaultTagFilterConfig',
+  react2angular(withErrorBoundary(DefaultTagFilterConfig, 'defaultTagFilterConfig'), [
+    'defaultTagFilterConfigs',
+    'isSaving',
+    'saveError',
+    'updateDefaultTagFilterConfigs',
+  ]),
+);

package/src/application/config/defaultTagFilter/defaultTagFilterConfig.less

@@ -0,0 +1,8 @@
+.default-filter-config-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.default-filter-config-description {
+  margin-bottom: 10px;
+}

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

@@ -10,6 +10,7 @@ import {
   StageArtifactSelectorDelegate,
 } from '../../../../../artifact';
 import { StageConfigField } from '../../common/stageConfigField/StageConfigField';
+import { SETTINGS } from '../../../../../config';
 import type { IArtifact, IExpectedArtifact } from '../../../../../domain';
 import { MapEditor } from '../../../../../forms';
 import { CheckboxInput, TextInput } from '../../../../../presentation';
@@ -152,9 +153,30 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
 
   public render() {
     const stage = this.props.formik.values;
+    const enableApiVersions = SETTINGS.feature.helmApiVersions;
     return (
       <>
         <h4>Helm Options</h4>
+        {enableApiVersions && ( // Only render if enableApiVersions is true
+          <>
+            <StageConfigField fieldColumns={3} label={'ApiVersions'}>
+              <TextInput
+                onChange={(e: React.ChangeEvent<any>) => {
+                  this.props.formik.setFieldValue('apiVersions', e.target.value);
+                }}
+                value={stage.apiVersions}
+              />
+            </StageConfigField>
+            <StageConfigField fieldColumns={3} label={'KubeVersion'}>
+              <TextInput
+                onChange={(e: React.ChangeEvent<any>) => {
+                  this.props.formik.setFieldValue('kubeVersion', e.target.value);
+                }}
+                value={stage.kubeVersion}
+              />
+            </StageConfigField>
+          </>
+        )}
         <StageConfigField fieldColumns={3} label={'Name'}>
           <TextInput
             onChange={(e: React.ChangeEvent<any>) => {

package/src/pipeline/details/StageFailureMessage.tsx

@@ -73,33 +73,19 @@ export class StageFailureMessage extends React.Component<IStageFailureMessagePro
   }
 
   public render() {
-    const { message, messages, stage } = this.props;
+    const { message, messages } = this.props;
     const { isFailed, failedTask, failedExecutionId, failedStageName, failedStageId } = this.state;
 
-    let stageMessages = message && !messages.length ? [message] : messages;
-    if (stageMessages.length > 0) {
+    if (isFailed || failedTask || message || messages.length) {
       const exceptionTitle = isFailed ? (messages.length ? 'Exceptions' : 'Exception') : 'Warning';
-
-      // expression evaluation warnings can get really long and hide actual failure messages, source
-      // filter out expression evaluation failure messages if either:
-      // - there was a stage failure (and failed expressions don't fail the stage)
-      // - expression evaluation was explicitly disabled for the stage(as Orca still processes expressions and populates
-      //   warnings when evaluation is disabled disabled)
-      const shouldFilterExpressionFailures =
-        (isFailed && !stage.context?.failOnFailedExpressions) || stage.context?.skipExpressionEvaluation;
-
-      if (shouldFilterExpressionFailures) {
-        stageMessages = stageMessages.filter((m) => !m.startsWith('Failed to evaluate'));
-
-        if (stageMessages.length === 0) {
-          // no messages to be displayed after filtering
-          return null;
-        }
-      }
-
-      const displayMessages = stageMessages.map((m, i) => (
-        <Markdown key={i} message={m || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
-      ));
+      const displayMessages =
+        message || !messages.length ? (
+          <Markdown message={message || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
+        ) : (
+          messages.map((m, i) => (
+            <Markdown key={i} message={m || StageFailureMessages.NO_REASON_PROVIDED} className="break-word" />
+          ))
+        );
 
       if (displayMessages) {
         return (

package/src/pipeline/executions/Executions.tsx

@@ -4,6 +4,7 @@ import React from 'react';
 import type { Subscription } from 'rxjs';
 
 import type { Application } from '../../application';
+import type { IDefaultTagFilterConfig } from '../../application/config/defaultTagFilter/DefaultTagFilterConfig';
 import { CreatePipeline } from '../config/CreatePipeline';
 import { CreatePipelineButton } from '../create/CreatePipelineButton';
 import type { IExecution, IPipeline, IPipelineCommand } from '../../domain';
@@ -74,6 +75,16 @@ export class Executions extends React.Component<IExecutionsProps, IExecutionsSta
     }
   };
 
+  private loadDefaultFilters = (): void => {
+    const defaultTags = this.props.app.attributes.defaultFilteredTags;
+    if (defaultTags != null) {
+      this.props.app.attributes.defaultFilteredTags.forEach((defaultTag: IDefaultTagFilterConfig) => {
+        ExecutionState.filterModel.asFilterModel.sortFilter.tags[`${defaultTag.tagName}:${defaultTag.tagValue}`] = true;
+      });
+      this.updateExecutionGroups(true);
+    }
+  };
+
   private clearFilters = (): void => {
     ExecutionFilterService.clearFilters();
     this.updateExecutionGroups(true);
@@ -235,6 +246,8 @@ export class Executions extends React.Component<IExecutionsProps, IExecutionsSta
       () => this.dataInitializationFailure(),
     );
 
+    this.loadDefaultFilters();
+
     $q.all([app.executions.ready(), app.pipelineConfigs.ready()]).then(() => {
       this.updateExecutionGroups();
       const nameOrIdToStart = ReactInjector.$stateParams.startManualExecution;

package/src/pipeline/status/ExecutionCancellationReason.tsx

@@ -7,7 +7,7 @@ interface IExecutionCancellationReasonProps {
 }
 
 export function ExecutionCancellationReason({ cancellationReason }: IExecutionCancellationReasonProps) {
-  const [isExpanded, setIsExpanded] = React.useState(false);
+  const [isExpanded, setIsExpanded] = React.useState(true);
   return (
     <>
       <div className="execution-cancellation-reason-button">