fix: Relaunch form does not persist security context values when chan…

…ged (flyteorg#527) fix: use execution security context in relaunch; #none Signed-off-by: James <[email protected]>
blackshark-ai · Jun 29, 2022 · 1be5572 · 1be5572
1 parent e933f21
commit 1be5572
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/packages/zapp/console/src/components/Executions/ExecutionDetails/RelaunchExecutionForm.tsx b/packages/zapp/console/src/components/Executions/ExecutionDetails/RelaunchExecutionForm.tsx
@@ -117,6 +117,7 @@ const RelaunchWorkflowForm: React.FC<RelaunchExecutionFormProps> = (props) => {
   const { initialParameters } = useRelaunchWorkflowFormState(props);
   const {
     closure: { workflowId },
+    spec: { securityContext },
   } = props.execution;
 
   return (
@@ -127,6 +128,7 @@ const RelaunchWorkflowForm: React.FC<RelaunchExecutionFormProps> = (props) => {
           onClose={props.onClose}
           referenceExecutionId={props.execution.id}
           workflowId={workflowId}
+          securityContext={securityContext}
         />
       ) : null}
     </WaitForData>

diff --git a/packages/zapp/console/src/components/Launch/LaunchForm/LaunchWorkflowForm.tsx b/packages/zapp/console/src/components/Launch/LaunchForm/LaunchWorkflowForm.tsx
@@ -26,6 +26,7 @@ export const LaunchWorkflowForm: React.FC<LaunchWorkflowFormProps> = (props) =>
     service,
     workflowSourceSelectorState,
   } = useLaunchWorkflowFormState(props);
+  const { securityContext } = props;
 
   const styles = useStyles();
   const baseState = state as BaseInterpretedLaunchState;
@@ -57,6 +58,15 @@ export const LaunchWorkflowForm: React.FC<LaunchWorkflowFormProps> = (props) =>
       state.matches,
     );
 
+  const roleInitialValue = React.useMemo(() => {
+    if (securityContext) return { securityContext };
+    return (
+      state.context.defaultAuthRole ||
+      selectedLaunchPlan?.data.spec.securityContext ||
+      selectedLaunchPlan?.data.spec.authRole
+    );
+  }, [securityContext, state.context.defaultAuthRole, selectedLaunchPlan]);
+
   return (
     <>
       <LaunchFormHeader title={state.context.sourceId?.name} />
@@ -97,11 +107,7 @@ export const LaunchWorkflowForm: React.FC<LaunchWorkflowFormProps> = (props) =>
           <AccordionDetails classes={{ root: styles.detailsWrapper }}>
             {isEnterInputsState(baseState) ? (
               <LaunchRoleInput
-                initialValue={
-                  state.context.defaultAuthRole ||
-                  selectedLaunchPlan?.data.spec.securityContext ||
-                  selectedLaunchPlan?.data.spec.authRole
-                }
+                initialValue={roleInitialValue}
                 ref={roleInputRef}
                 showErrors={state.context.showErrors}
               />

diff --git a/packages/zapp/console/src/components/Launch/LaunchForm/types.ts b/packages/zapp/console/src/components/Launch/LaunchForm/types.ts
@@ -65,6 +65,7 @@ export interface WorkflowInitialLaunchParameters extends BaseInitialLaunchParame
 
 export interface LaunchWorkflowFormProps extends BaseLaunchFormProps {
   workflowId: NamedEntityIdentifier;
+  securityContext?: Core.ISecurityContext;
   initialParameters?: WorkflowInitialLaunchParameters;
 }