@spinnaker/kayenta 2.1.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinnaker/kayenta",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/kayenta/canary.settings.ts

@@ -19,6 +19,7 @@ export interface ICanarySettings {
   atlasGraphBaseUrl: string;
   templatesEnabled: boolean;
   manualAnalysisEnabled: boolean;
+  disableConfigEdit: boolean;
   legacySiteLocalFieldsEnabled: boolean; // legacy fields for backwards-compat with old systems, no long term support planned
 }
 

package/src/kayenta/edit/changeMetricGroupModal.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { ICanaryMetricConfig } from 'kayenta/domain/ICanaryConfig';
 import { DISABLE_EDIT_CONFIG, DisableableSelect } from 'kayenta/layout/disableable';
 import Styleguide from 'kayenta/layout/styleguide';
@@ -43,6 +44,7 @@ function ChangeMetricGroupModal({
             value={toGroup || ''}
             onChange={select}
             className="form-control input-sm"
+            disabled={CanarySettings.disableConfigEdit}
             disabledStateKeys={[DISABLE_EDIT_CONFIG]}
           >
             <option value={''}>-- select group --</option>

package/src/kayenta/edit/configDetailHeader.tsx

@@ -1,4 +1,5 @@
 import { UISref } from '@uirouter/react';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { ICanaryConfig } from 'kayenta/domain';
 import FormattedDate from 'kayenta/layout/formattedDate';
 import { ICanaryState } from 'kayenta/reducers';
@@ -11,6 +12,7 @@ import ConfigDetailActionButtons from './configDetailActionButtons';
 interface IConfigDetailStateProps {
   selectedConfig: ICanaryConfig;
   editingDisabled: boolean;
+  disableConfigEdit: boolean;
 }
 
 const getOwnerAppLinks = (owners: string[]) => {
@@ -52,10 +54,21 @@ const EditingDisabledWarning = ({ owners }: { owners: string[] }) => {
   );
 };
 
+const ConfigEditingDisabledWarning = () => {
+  return (
+    <div className="horizontal middle well-compact alert alert-warning config-detail-edit-warning">
+      <i className="fa fa-exclamation-triangle sp-margin-m-right" />
+      <span>
+        <b>Canary config is locked and does not allow modification</b>
+      </span>
+    </div>
+  );
+};
+
 /*
  * Config detail header layout.
  */
-function ConfigDetailHeader({ selectedConfig, editingDisabled }: IConfigDetailStateProps) {
+function ConfigDetailHeader({ selectedConfig, editingDisabled, disableConfigEdit }: IConfigDetailStateProps) {
   return (
     <div className="vertical">
       <div className="horizontal config-detail-header">
@@ -72,7 +85,10 @@ function ConfigDetailHeader({ selectedConfig, editingDisabled }: IConfigDetailSt
           <ConfigDetailActionButtons />
         </div>
       </div>
-      {selectedConfig && editingDisabled && <EditingDisabledWarning owners={selectedConfig.applications} />}
+      {selectedConfig && editingDisabled && !disableConfigEdit && (
+        <EditingDisabledWarning owners={selectedConfig.applications} />
+      )}
+      {selectedConfig && disableConfigEdit && <ConfigEditingDisabledWarning />}
     </div>
   );
 }
@@ -81,6 +97,7 @@ function mapStateToProps(state: ICanaryState): IConfigDetailStateProps {
   return {
     selectedConfig: mapStateToConfig(state),
     editingDisabled: state.app.disableConfigEdit,
+    disableConfigEdit: CanarySettings.disableConfigEdit,
   };
 }
 

package/src/kayenta/edit/configJsonModal.tsx

@@ -1,7 +1,7 @@
 import 'brace/ext/searchbox';
 import 'brace/mode/json';
 import * as Creators from 'kayenta/actions/creators';
-import { DISABLE_EDIT_CONFIG } from 'kayenta/layout/disableable';
+import { CanarySettings } from 'kayenta/canary.settings';
 import Styleguide from 'kayenta/layout/styleguide';
 import { Tab, Tabs } from 'kayenta/layout/tabs';
 import { ICanaryState } from 'kayenta/reducers';
@@ -142,7 +142,7 @@ function mapStateToProps(state: ICanaryState): IConfigJsonStateProps {
     state.selectedConfig.json.configJson ||
     JsonUtils.makeSortedStringFromObject(omit(mapStateToConfig(state) || {}, 'id'));
 
-  const disabled = get(state, DISABLE_EDIT_CONFIG, false);
+  const disabled = state.app.disableConfigEdit || CanarySettings.disableConfigEdit;
 
   return {
     configJson,

package/src/kayenta/edit/copyConfigButton.tsx

@@ -1,4 +1,5 @@
 import { UISref } from '@uirouter/react';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { get } from 'lodash';
 import * as React from 'react';
 import { connect } from 'react-redux';
@@ -25,7 +26,8 @@ function CopyConfigButton({ disabled }: ICopyConfigButtonStateProps) {
 
 function mapStateToProps(state: ICanaryState) {
   return {
-    disabled: get(state.selectedConfig, 'config.isNew') || state.app.disableConfigEdit,
+    disabled:
+      get(state.selectedConfig, 'config.isNew') || state.app.disableConfigEdit || CanarySettings.disableConfigEdit,
   };
 }
 

package/src/kayenta/edit/createConfigButton.tsx

@@ -1,4 +1,5 @@
 import { UISref } from '@uirouter/react';
+import { CanarySettings } from 'kayenta/canary.settings';
 import * as React from 'react';
 import { connect } from 'react-redux';
 
@@ -26,7 +27,7 @@ function CreateConfigButton({ disabled }: ICreateConfigButtonStateProps) {
 
 function mapStateToProps(state: ICanaryState): ICreateConfigButtonStateProps {
   return {
-    disabled: state.selectedConfig.config && state.selectedConfig.config.isNew,
+    disabled: (state.selectedConfig.config && state.selectedConfig.config.isNew) || CanarySettings.disableConfigEdit,
   };
 }
 

package/src/kayenta/edit/editMetricEffectSizes.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { ICanaryMetricEffectSizeConfig } from 'kayenta/domain';
 import FormRow from 'kayenta/layout/formRow';
 import RadioChoice from 'kayenta/layout/radioChoice';
@@ -114,6 +115,7 @@ export function EditMetricEffectSizes({
               step={isCles ? 0.01 : 1}
               onChange={(e) => updateSize(field, e.target.value)}
               value={isCles ? value : toPercent(value, field)}
+              disabled={CanarySettings.disableConfigEdit}
               disabledStateKeys={[DISABLE_EDIT_CONFIG]}
             />
             {!isCles && <div className="input-group-addon">%</div>}
@@ -169,7 +171,7 @@ function mapStateToProps(state: ICanaryState): IEditMetricEffectSizesProps {
   return {
     metricId: state.selectedConfig.editingMetric.id,
     direction: state.selectedConfig.editingMetric.analysisConfigurations?.canary?.direction ?? 'either',
-    disabled: state.app.disableConfigEdit,
+    disabled: state.app.disableConfigEdit || CanarySettings.disableConfigEdit,
     effectSizes: state.selectedConfig.editingMetric.analysisConfigurations?.canary?.effectSize ?? {},
   };
 }

package/src/kayenta/edit/editMetricModal.tsx

@@ -69,7 +69,11 @@ function EditMetricModal({
   const direction = metric.analysisConfigurations?.canary?.direction ?? 'either';
   const nanStrategy = metric.analysisConfigurations?.canary?.nanStrategy ?? 'default';
   const critical = metric.analysisConfigurations?.canary?.critical ?? false;
-  const isConfirmDisabled = !isTemplateValid || disableEdit || values(validationErrors).some((e) => !isNull(e));
+  const isConfirmDisabled =
+    !isTemplateValid ||
+    disableEdit ||
+    CanarySettings.disableConfigEdit ||
+    values(validationErrors).some((e) => !isNull(e));
 
   const metricGroup = metric.groups.length ? metric.groups[0] : groups[0];
   const templatesEnabled =
@@ -80,7 +84,9 @@ function EditMetricModal({
     <Modal bsSize="large" show={true} onHide={noop} className={classNames('kayenta-edit-metric-modal')}>
       <Styleguide>
         <Modal.Header>
-          <Modal.Title>{disableEdit ? 'Metric Details' : 'Configure Metric'}</Modal.Title>
+          <Modal.Title>
+            {disableEdit || CanarySettings.disableConfigEdit ? 'Metric Details' : 'Configure Metric'}
+          </Modal.Title>
         </Modal.Header>
         <Modal.Body>
           <FormRow label="Group" inputOnly={true}>
@@ -90,6 +96,7 @@ function EditMetricModal({
                 value={metric.groups}
                 data-id={metric.id}
                 onChange={changeGroup}
+                disabled={CanarySettings.disableConfigEdit}
                 disabledStateKeys={[DISABLE_EDIT_CONFIG]}
               />
             )}
@@ -98,6 +105,7 @@ function EditMetricModal({
                 value={metricGroup}
                 onChange={changeGroup}
                 className="form-control input-sm"
+                disabled={CanarySettings.disableConfigEdit}
                 disabledStateKeys={[DISABLE_EDIT_CONFIG]}
               >
                 {groups.map((g) => (
@@ -114,6 +122,7 @@ function EditMetricModal({
               value={metric.name}
               data-id={metric.id}
               onChange={rename}
+              disabled={CanarySettings.disableConfigEdit}
               disabledStateKeys={[DISABLE_EDIT_CONFIG]}
             />
           </FormRow>
@@ -140,6 +149,7 @@ function EditMetricModal({
                 type="checkbox"
                 checked={critical}
                 onChange={updateCriticality}
+                disabled={CanarySettings.disableConfigEdit}
                 disabledStateKeys={[DISABLE_EDIT_CONFIG]}
               />
               Fail the canary if this metric fails
@@ -227,7 +237,7 @@ function mapStateToProps(state: ICanaryState): IEditMetricModalStateProps {
     isTemplateValid: isTemplateValidSelector(state),
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useInlineTemplateEditor: useInlineTemplateEditorSelector(state),
-    disableEdit: state.app.disableConfigEdit,
+    disableEdit: state.app.disableConfigEdit || CanarySettings.disableConfigEdit,
     validationErrors: editingMetricValidationErrorsSelector(state),
   };
 }

package/src/kayenta/edit/filterTemplateSelector.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { ICanaryFilterTemplateValidationMessages } from 'kayenta/edit/filterTemplatesValidation';
 import {
   DISABLE_EDIT_CONFIG,
@@ -95,6 +96,7 @@ export class FilterTemplateSelector extends React.Component<IFilterTemplateSelec
             <DisableableReactSelect
               value={selectedTemplateName}
               disabledStateKeys={[DISABLE_EDIT_CONFIG]}
+              disabled={CanarySettings.disableConfigEdit}
               onChange={selectTemplate}
               options={this.getOptions()}
               optionRenderer={this.optionRenderer}
@@ -106,6 +108,7 @@ export class FilterTemplateSelector extends React.Component<IFilterTemplateSelec
             <FormRow label="Name" error={get(validation, 'errors.templateName.message')} inputOnly={true}>
               <DisableableInput
                 disabledStateKeys={[DISABLE_EDIT_CONFIG]}
+                disabled={CanarySettings.disableConfigEdit}
                 onChange={editTemplateName}
                 value={editedTemplateName}
               />
@@ -119,6 +122,7 @@ export class FilterTemplateSelector extends React.Component<IFilterTemplateSelec
               <DisableableTextarea
                 className="template-editor-textarea"
                 disabledStateKeys={[DISABLE_EDIT_CONFIG]}
+                disabled={CanarySettings.disableConfigEdit}
                 onChange={editTemplateValue}
                 value={editedTemplateValue}
               />

package/src/kayenta/edit/groupName.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { DISABLE_EDIT_CONFIG, DisableableInput } from 'kayenta/layout/disableable';
 import { ICanaryState } from 'kayenta/reducers';
 import * as React from 'react';
@@ -42,6 +43,7 @@ function GroupName({
           autoFocus={true}
           value={edit}
           onChange={handleUpdate}
+          disabled={CanarySettings.disableConfigEdit}
           disabledStateKeys={[DISABLE_EDIT_CONFIG]}
         />
       </form>

package/src/kayenta/edit/groupTabs.tsx

@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { DISABLE_EDIT_CONFIG, DisableableButton } from 'kayenta/layout/disableable';
 import { Tab, Tabs } from 'kayenta/layout/tabs';
 import { ICanaryState } from 'kayenta/reducers';
@@ -46,8 +47,10 @@ function GroupTabs({
         {selected && editable && !editing && (
           <i
             data-group={group}
-            onClick={disableConfigEdit ? noop : editGroupBegin}
-            className={classNames('fas', 'fa-pencil-alt', { disabled: disableConfigEdit })}
+            onClick={disableConfigEdit || CanarySettings.disableConfigEdit ? noop : editGroupBegin}
+            className={classNames('fas', 'fa-pencil-alt', {
+              disabled: disableConfigEdit || CanarySettings.disableConfigEdit,
+            })}
           />
         )}
       </Tab>
@@ -60,7 +63,12 @@ function GroupTabs({
         {groupList.map((group) => (
           <GroupTab key={group} group={group} editable={true} />
         ))}
-        <DisableableButton className="passive float-right" onClick={addGroup} disabledStateKeys={[DISABLE_EDIT_CONFIG]}>
+        <DisableableButton
+          className="passive float-right"
+          onClick={addGroup}
+          disabled={CanarySettings.disableConfigEdit}
+          disabledStateKeys={[DISABLE_EDIT_CONFIG]}
+        >
           Add Group
         </DisableableButton>
       </Tabs>
@@ -73,7 +81,7 @@ function mapStateToProps(state: ICanaryState): IGroupTabsStateProps {
     groupList: state.selectedConfig.group.list,
     selectedGroup: state.selectedConfig.group.selected,
     editing: !!state.selectedConfig.group.edit || state.selectedConfig.group.edit === '',
-    disableConfigEdit: state.app.disableConfigEdit,
+    disableConfigEdit: state.app.disableConfigEdit || CanarySettings.disableConfigEdit,
   };
 }
 

package/src/kayenta/edit/groupWeight.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { ICanaryConfig } from 'kayenta/domain/ICanaryConfig';
 import { DISABLE_EDIT_CONFIG, DisableableInput } from 'kayenta/layout/disableable';
 import { ICanaryState } from 'kayenta/reducers';
@@ -39,6 +40,7 @@ function GroupWeight({
         onChange={handleInputChange}
         min={0}
         max={100}
+        disabled={CanarySettings.disableConfigEdit}
         disabledStateKeys={[DISABLE_EDIT_CONFIG]}
       />
     </FormRow>

package/src/kayenta/edit/inlineTemplateEditor.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { DISABLE_EDIT_CONFIG, DisableableTextarea } from 'kayenta/layout/disableable';
 import FormRow from 'kayenta/layout/formRow';
 import { ICanaryState } from 'kayenta/reducers';
@@ -36,6 +37,7 @@ export function InlineTemplateEditor({
       <DisableableTextarea
         className="template-editor-textarea"
         disabledStateKeys={[DISABLE_EDIT_CONFIG]}
+        disabled={CanarySettings.disableConfigEdit}
         onChange={(e: any) => editTemplateValue(transformValueForSave(e.target.value))}
         value={templateValue}
       />

package/src/kayenta/edit/judgeSelect.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { DISABLE_EDIT_CONFIG, DisableableInput, DisableableReactSelect } from 'kayenta/layout/disableable';
 import FormRow from 'kayenta/layout/formRow';
 import { ICanaryState } from 'kayenta/reducers';
@@ -41,6 +42,7 @@ function JudgeSelect({
             options={judgeOptions}
             clearable={false}
             onChange={handleJudgeSelect}
+            disabled={CanarySettings.disableConfigEdit}
             disabledStateKeys={[DISABLE_EDIT_CONFIG]}
           />
         </FormRow>

package/src/kayenta/edit/metricList.tsx

@@ -1,5 +1,6 @@
 import classNames from 'classnames';
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { ICanaryMetricConfig } from 'kayenta/domain';
 import { DISABLE_EDIT_CONFIG, DisableableButton } from 'kayenta/layout/disableable';
 import { ITableColumn, NativeTable } from 'kayenta/layout/table';
@@ -97,15 +98,30 @@ function MetricList({
       getContent: (metric) => (
         <div className="horizontal pull-right metrics-action-buttons">
           <button className="link" data-id={metric.id} onClick={editMetric}>
-            {disableEdit ? 'View' : 'Edit'}
+            {disableEdit || CanarySettings.disableConfigEdit ? 'View' : 'Edit'}
           </button>
-          <button className="link" data-id={metric.id} disabled={disableEdit} onClick={openChangeMetricGroupModal}>
+          <button
+            className="link"
+            data-id={metric.id}
+            disabled={disableEdit || CanarySettings.disableConfigEdit}
+            onClick={openChangeMetricGroupModal}
+          >
             Move Group
           </button>
-          <button className="link" data-id={metric.id} disabled={disableEdit} onClick={() => copyMetric(metric)}>
+          <button
+            className="link"
+            data-id={metric.id}
+            disabled={disableEdit || CanarySettings.disableConfigEdit}
+            onClick={() => copyMetric(metric)}
+          >
             Copy
           </button>
-          <button className="link" data-id={metric.id} disabled={disableEdit} onClick={removeMetric}>
+          <button
+            className="link"
+            data-id={metric.id}
+            disabled={disableEdit || CanarySettings.disableConfigEdit}
+            onClick={removeMetric}
+          >
             Delete
           </button>
         </div>
@@ -129,6 +145,7 @@ function MetricList({
         data-default={groupList[0]}
         data-metric-store={metricStore}
         onClick={addMetric}
+        disabled={CanarySettings.disableConfigEdit}
         disabledStateKeys={[DISABLE_EDIT_CONFIG]}
       >
         Add Metric
@@ -151,7 +168,7 @@ function mapStateToProps(state: ICanaryState): IMetricListStateProps {
       (m) => m.id === state.selectedConfig.changeMetricGroup.metric,
     ),
     metricStore: state.selectedConfig.selectedStore,
-    disableEdit: state.app.disableConfigEdit,
+    disableEdit: state.app.disableConfigEdit || CanarySettings.disableConfigEdit,
   };
 }
 

package/src/kayenta/edit/metricStoreSelector.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { KayentaAccountType } from 'kayenta/domain';
 import { DISABLE_EDIT_CONFIG, DisableableSelect } from 'kayenta/layout/disableable';
 import FormRow from 'kayenta/layout/formRow';
@@ -31,6 +32,7 @@ const MetricStoreSelector = ({
         value={selectedStore || ''}
         onChange={select}
         className="form-control input-sm"
+        disabled={CanarySettings.disableConfigEdit}
         disabledStateKeys={[DISABLE_EDIT_CONFIG]}
       >
         {stores.map((s) => (

package/src/kayenta/edit/nameAndDescription.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { DISABLE_EDIT_CONFIG, DisableableInput, DisableableTextarea } from 'kayenta/layout/disableable';
 import FormList from 'kayenta/layout/formList';
 import FormRow from 'kayenta/layout/formRow';
@@ -31,7 +32,13 @@ function NameAndDescription({
   return (
     <FormList>
       <FormRow label="Configuration Name" inputOnly={true}>
-        <DisableableInput type="text" value={name} onChange={changeName} disabledStateKeys={[DISABLE_EDIT_CONFIG]} />
+        <DisableableInput
+          type="text"
+          value={name}
+          onChange={changeName}
+          disabled={CanarySettings.disableConfigEdit}
+          disabledStateKeys={[DISABLE_EDIT_CONFIG]}
+        />
       </FormRow>
       <MetricStoreSelector />
       <FormRow label="Description" inputOnly={true}>
@@ -39,6 +46,7 @@ function NameAndDescription({
           className="form-control input-sm"
           value={description}
           onChange={changeDescription}
+          disabled={CanarySettings.disableConfigEdit}
           disabledStateKeys={[DISABLE_EDIT_CONFIG]}
         />
       </FormRow>

package/src/kayenta/edit/openDeleteModalButton.tsx

@@ -1,4 +1,5 @@
 import * as Creators from 'kayenta/actions/creators';
+import { CanarySettings } from 'kayenta/canary.settings';
 import { DISABLE_EDIT_CONFIG, DisableableButton } from 'kayenta/layout/disableable';
 import { ICanaryState } from 'kayenta/reducers';
 import * as React from 'react';
@@ -22,7 +23,7 @@ function DeleteConfigButton({ openDeleteConfigModal, disabled }: IDeleteButtonDi
     <div>
       <DisableableButton
         className="passive"
-        disabled={disabled}
+        disabled={disabled || CanarySettings.disableConfigEdit}
         onClick={openDeleteConfigModal}
         disabledStateKeys={[DISABLE_EDIT_CONFIG]}
       >
@@ -36,7 +37,7 @@ function DeleteConfigButton({ openDeleteConfigModal, disabled }: IDeleteButtonDi
 
 function mapStateToProps(state: ICanaryState) {
   return {
-    disabled: state.selectedConfig.config && state.selectedConfig.config.isNew,
+    disabled: (state.selectedConfig.config && state.selectedConfig.config.isNew) || CanarySettings.disableConfigEdit,
   };
 }
 

package/src/kayenta/edit/saveConfigButton.tsx

@@ -1,3 +1,4 @@
+import { CanarySettings } from 'kayenta/canary.settings';
 import * as React from 'react';
 import { connect } from 'react-redux';
 
@@ -37,7 +38,7 @@ function SaveConfigButton({
       <SubmitButton
         label="Save Changes"
         onClick={saveConfig}
-        isDisabled={disable}
+        isDisabled={disable || CanarySettings.disableConfigEdit}
         submitting={saveConfigState === AsyncRequestState.Requesting}
       />
     );
@@ -45,7 +46,7 @@ function SaveConfigButton({
 }
 
 function mapStateToProps(state: ICanaryState): ISaveButtonStateProps {
-  const disable = !!state.selectedConfig.validationErrors.length;
+  const disable = !!state.selectedConfig.validationErrors.length || CanarySettings.disableConfigEdit;
   return {
     saveConfigState: state.selectedConfig.save.state,
     inSyncWithServer: state.selectedConfig.isInSyncWithServer,