@spinnaker/core 2026.3.1 → 2026.3.2

package/src/pipeline/config/stages/FormikStageConfig.tsx

@@ -32,6 +32,17 @@ const decorate = (validate: IContextualValidator, props: IFormikStageConfigProps
   return (values: IStage) => validate(values, { application, pipeline });
 };
 
+// Applies only the fields the form changed, so stage edits made outside the form are kept
+const applyChangedValues = (stage: IStage, values: IStage, prevValues: IStage): IStage => {
+  const changes: Partial<IStage> = {};
+  new Set([...Object.keys(prevValues), ...Object.keys(values)]).forEach((key) => {
+    if (values[key] !== prevValues[key]) {
+      changes[key] = values[key];
+    }
+  });
+  return { ...stage, ...changes };
+};
+
 export class FormikStageConfig extends React.Component<IFormikStageConfigProps> {
   public render() {
     const { render, onChange, stage, validate, application, pipeline } = this.props;
@@ -42,7 +53,13 @@ export class FormikStageConfig extends React.Component<IFormikStageConfigProps>
         onSubmit={() => {}}
         render={(formik) => (
           <LayoutProvider value={ResponsiveFieldLayout}>
-            <WatchValue onChange={onChange} value={formik.values} />
+            <WatchValue
+              onChange={
+                onChange &&
+                ((values: IStage, prevValues: IStage) => onChange(applyChangedValues(stage, values, prevValues)))
+              }
+              value={formik.values}
+            />
             {render({ application, pipeline, formik })}
           </LayoutProvider>
         )}

package/src/pipeline/config/triggers/ExecutionOptionsPageContent.tsx

@@ -11,9 +11,16 @@ export interface IExecutionOptionsPageContentProps {
 
 export function ExecutionOptionsPageContent(props: IExecutionOptionsPageContentProps) {
   const { pipeline, updatePipelineConfig } = props;
-  const [currentMaxConcurrent, setCurrentMaxConcurrent] = useState(pipeline.maxConcurrentExecutions || 0);
+  const maxConcurrent = pipeline.maxConcurrentExecutions || 0;
+  const [currentMaxConcurrent, setCurrentMaxConcurrent] = useState(maxConcurrent);
+  const [lastPipeline, setLastPipeline] = useState(pipeline);
+  // Show the pipeline's value when the pipeline changes, such as after a revert or pipeline JSON edit
+  if (pipeline !== lastPipeline) {
+    setLastPipeline(pipeline);
+    setCurrentMaxConcurrent(maxConcurrent);
+  }
   const handleMaxConcurrentChange = (changeEvent: any) => {
-    const value = Number.parseInt(changeEvent.target.value);
+    const value = Number.parseInt(changeEvent.target.value) || 0;
     setCurrentMaxConcurrent(value);
     updatePipelineConfig({ maxConcurrentExecutions: value });
   };
@@ -29,11 +36,11 @@ export function ExecutionOptionsPageContent(props: IExecutionOptionsPageContentP
             />
           )}
           onChange={() => {
-            updatePipelineConfig({ limitConcurrent: !pipeline.limitConcurrent });
+            const changes: Partial<IPipeline> = { limitConcurrent: !pipeline.limitConcurrent };
             if (!pipeline.limitConcurrent && !pipeline.keepWaitingPipelines) {
-              pipeline.keepWaitingPipelines = true;
-              updatePipelineConfig({ keepWaitingPipelines: true });
+              changes.keepWaitingPipelines = true;
             }
+            updatePipelineConfig(changes);
           }}
           value={pipeline.limitConcurrent}
         />

package/src/pipeline/config/triggers/Triggers.spec.tsx

@@ -31,7 +31,6 @@ describe('<Triggers />', () => {
       application: ApplicationModelBuilder.createApplicationForTests('products'),
       fieldUpdated: jasmine.createSpy('fieldUpdated'),
       updatePipelineConfig: jasmine.createSpy('updatePipelineConfig'),
-      revertCount: 0,
     };
   });
 

package/src/pipeline/config/triggers/Triggers.tsx

@@ -15,14 +15,10 @@ export interface ITriggersProps {
   pipelineConfig?: IPipeline;
   fieldUpdated: () => void;
   updatePipelineConfig: (changes: Partial<IPipeline>) => void;
-  revertCount: number;
 }
 
 export function Triggers(props: ITriggersProps) {
   const pipeline = props.pipeline;
-  // KLUDGE: This value is used as a React key when rendering the Triggers.
-  // Whenever the pipeline is reverted, this causes the Triggers to remount and reset formik state.
-  const revertCountKLUDGE = props.revertCount;
 
   return (
     <PageNavigator scrollableContainer=".pipeline-config-page">
@@ -35,7 +31,7 @@ export function Triggers(props: ITriggersProps) {
         badge={pipeline.triggers ? pipeline.triggers.length.toString() : '0'}
         noWrapper={true}
       >
-        <TriggersPageContent {...props} key={revertCountKLUDGE} />
+        <TriggersPageContent {...props} />
       </PageSection>
       <PageSection
         pageKey="parameters"
@@ -57,7 +53,6 @@ export function Triggers(props: ITriggersProps) {
         <MetadataPageContent
           pipeline={props.pipelineConfig || props.pipeline}
           updatePipelineConfig={props.updatePipelineConfig}
-          key={revertCountKLUDGE}
         />
       </PageSection>
     </PageNavigator>

package/src/pipeline/config/triggers/TriggersPageContent.tsx

@@ -24,12 +24,15 @@ export function TriggersPageContent(props: ITriggersPageContentProps) {
   const { pipeline, application, updatePipelineConfig } = props;
   const expectedArtifacts = pipeline?.expectedArtifacts ?? [];
   const triggers = pipeline?.triggers ?? [];
-  // KLUDGE: because we don't have a stable identifier to use for each trigger object, we need to reset the keys
-  // used for each trigger in the list when a delete happens (because the array of triggers shifts by one).
-  // For now, we do this by incrementing a counter every time a delete happens, and sticking that number
-  // into the key of each trigger before its index value. Ideally, we should generate stable UUIDs for
-  // each trigger object that we can use instead of relying on index keys.
-  const [deleteCount, setDeleteCount] = useState(0);
+  // Each trigger object gets its own form, so replacing a trigger remounts it.
+  // The key follows a trigger through its form's own edits.
+  const [triggerKeys] = useState(() => ({ ids: new WeakMap<ITrigger, number>(), next: 0 }));
+  const getTriggerKey = (trigger: ITrigger) => {
+    if (!triggerKeys.ids.has(trigger)) {
+      triggerKeys.ids.set(trigger, triggerKeys.next++);
+    }
+    return triggerKeys.ids.get(trigger);
+  };
 
   function updateRoles(roles: any[]): void {
     updatePipelineConfig({ roles });
@@ -72,7 +75,6 @@ export function TriggersPageContent(props: ITriggersPageContentProps) {
     }
 
     updatePipelineConfig(pipelineUpdate);
-    setDeleteCount(deleteCount + 1);
   }
 
   /**
@@ -82,6 +84,7 @@ export function TriggersPageContent(props: ITriggersPageContentProps) {
    * @param updatedTrigger The updated trigger
    */
   function updateTrigger(indexToUpdate: number, updatedTrigger: ITrigger): void {
+    triggerKeys.ids.set(updatedTrigger, getTriggerKey(triggers[indexToUpdate]));
     PipelineConfigValidator.validatePipeline(pipeline);
     updatePipelineConfig({
       triggers: triggers.map((trigger, index) => {
@@ -181,7 +184,7 @@ export function TriggersPageContent(props: ITriggersPageContentProps) {
         </div>
       )}
       {triggers.map((trigger, index) => (
-        <div className="trigger-config" key={`${deleteCount}:${index}`}>
+        <div className="trigger-config" key={getTriggerKey(trigger)}>
           <Trigger
             application={application}
             index={index}