Updates from feedback

Author: ashley-o0o

packages/model-serving/src/components/deploymentWizard/ModelDeploymentWizard.tsx

@@ -53,15 +53,21 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
   // External data state - loaded by ExternalDataLoader component
   const [externalData, setExternalData] = React.useState<ExternalDataMap>({});
 
-  const wizardState = useModelDeploymentWizard(existingData, project?.metadata.name, externalData);
-  const validation = useModelDeploymentWizardValidation(wizardState.state, wizardState.fields);
-  const currentProjectName = wizardState.state.project.projectName ?? undefined;
+  const currentProjectName = project?.metadata.name;
 
   const [canCreateRoleBindings] = useAccessReview({
     ...accessReviewResource,
     namespace: currentProjectName,
   });
 
+  const wizardState = useModelDeploymentWizard(
+    existingData,
+    currentProjectName,
+    externalData,
+    canCreateRoleBindings,
+  );
+  const validation = useModelDeploymentWizardValidation(wizardState.state, wizardState.fields);
+
   const { deployMethod, deployMethodLoaded } = useDeployMethod(wizardState.state);
   // TODO in same jira, replace deployMethod with applyFieldData for all other fields
   const { applyFieldData, applyExtensionsLoaded } = useWizardFieldApply(wizardState.state);
@@ -145,10 +151,7 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
           serverResource,
           serverResourceTemplateName,
           overwrite,
-          {
-            ...wizardState.initialData,
-            canCreateRoleBindings,
-          },
+          wizardState.initialData,
           applyFieldData,
         );
       } catch (error) {
@@ -160,7 +163,6 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
     [
       applyExtensionsLoaded,
       applyFieldData,
-      canCreateRoleBindings,
       deployMethod,
       deployMethodLoaded,
       existingDeployment,
@@ -253,8 +255,8 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
             {wizardState.loaded.advancedOptionsLoaded ? (
               <AdvancedSettingsStepContent
                 wizardState={wizardState}
-                projectName={currentProjectName}
                 externalData={externalData}
+                allowCreate={canCreateRoleBindings}
               />
             ) : (
               <Spinner data-testid="spinner" />

packages/model-serving/src/components/deploymentWizard/fields/EnvironmentVariablesField.tsx

@@ -95,7 +95,7 @@ type EnvironmentVariablesFieldProps = {
 export const EnvironmentVariablesField: React.FC<EnvironmentVariablesFieldProps> = ({
   data = { enabled: false, variables: [] },
   onChange,
-  allowCreate = false,
+  allowCreate = true,
   predefinedVars,
 }) => {
   const lastNameFieldRef = React.useRef<HTMLInputElement>(null);

packages/model-serving/src/components/deploymentWizard/fields/RuntimeArgsField.tsx

@@ -55,7 +55,7 @@ type RuntimeArgsFieldProps = {
 export const RuntimeArgsField: React.FC<RuntimeArgsFieldProps> = ({
   data = { enabled: false, args: [] },
   onChange,
-  allowCreate = false,
+  allowCreate = true,
   predefinedArgs,
 }) => {
   const handleCheckboxChange = (event: React.FormEvent<HTMLInputElement>, checked: boolean) => {

packages/model-serving/src/components/deploymentWizard/steps/AdvancedOptionsStep.tsx

@@ -7,7 +7,6 @@ import {
 } from '@odh-dashboard/internal/k8sTypes';
 import { isServingRuntimeKind } from '@odh-dashboard/internal/pages/modelServing/customServingRuntimes/utils';
 import { Form, Stack, StackItem, Alert, FormGroup, FormSection } from '@patternfly/react-core';
-import { useAccessReview } from '@odh-dashboard/internal/api/index';
 import { ExternalRouteField } from '../fields/ExternalRouteField';
 import { TokenAuthenticationField } from '../fields/TokenAuthenticationField';
 import { RuntimeArgsField } from '../fields/RuntimeArgsField';
@@ -26,14 +25,14 @@ export const accessReviewResource: AccessReviewResourceAttributes = {
 
 type AdvancedSettingsStepContentProps = {
   wizardState: UseModelDeploymentWizardState;
-  projectName?: string;
   externalData: ExternalDataMap;
+  allowCreate: boolean;
 };
 
 export const AdvancedSettingsStepContent: React.FC<AdvancedSettingsStepContentProps> = ({
   wizardState,
-  projectName,
   externalData,
+  allowCreate,
 }) => {
   const externalRouteData = wizardState.state.externalRoute.data;
   const tokenAuthData = wizardState.state.tokenAuthentication.data;
@@ -84,11 +83,6 @@ export const AdvancedSettingsStepContent: React.FC<AdvancedSettingsStepContentPr
     return kserveContainer.env?.map((ev) => `${ev.name}=${ev.value ?? ''}`) || [];
   };
 
-  const [allowCreate] = useAccessReview({
-    ...accessReviewResource,
-    namespace: projectName,
-  });
-
   const handleExternalRouteChange = (checked: boolean) => {
     wizardState.state.externalRoute.setData(checked);
 
@@ -181,15 +175,13 @@ export const AdvancedSettingsStepContent: React.FC<AdvancedSettingsStepContentPr
                     <RuntimeArgsField
                       data={wizardState.state.runtimeArgs.data}
                       onChange={wizardState.state.runtimeArgs.setData}
-                      allowCreate={allowCreate}
                       predefinedArgs={getKServeContainerArgs(selectedModelServer)}
                     />
                   </StackItem>
                   <StackItem>
                     <EnvironmentVariablesField
                       data={wizardState.state.environmentVariables.data}
                       onChange={wizardState.state.environmentVariables.setData}
-                      allowCreate={allowCreate}
                       predefinedVars={getKServeContainerEnvVarStrs(selectedModelServer)}
                     />
                   </StackItem>

packages/model-serving/src/components/deploymentWizard/useDeploymentWizard.ts

@@ -23,6 +23,7 @@ import { useDeploymentWizardReducer, type WizardFormAction } from './useDeployme
 import type { ExternalDataMap } from './ExternalDataLoader';
 
 export type UseModelDeploymentWizardState = WizardFormData & {
+  canCreateRoleBindings: boolean;
   loaded: {
     modelSourceLoaded: boolean;
     modelDeploymentLoaded: boolean;
@@ -42,6 +43,7 @@ export const useModelDeploymentWizard = (
   initialData?: InitialWizardFormData,
   initialProjectName?: string | undefined,
   externalDataMap: ExternalDataMap = {},
+  canCreateRoleBindings = true,
 ): UseModelDeploymentWizardState => {
   // Step 1: Model Source
   const modelType = useModelTypeField(initialData?.modelTypeField);
@@ -171,6 +173,7 @@ export const useModelDeploymentWizard = (
     state,
     dispatch,
     fields,
+    canCreateRoleBindings,
     loaded: {
       modelSourceLoaded,
       modelDeploymentLoaded,

packages/model-serving/src/components/deploymentWizard/utils.ts

@@ -79,7 +79,7 @@ export const getTokenAuthenticationFromDeployment = (
 };
 
 export const deployModel = async (
-  wizardState: WizardFormData,
+  wizardState: WizardFormData & { canCreateRoleBindings: boolean },
   secretName: string,
   exitWizard: () => void,
   deployMethod?: (
@@ -126,7 +126,7 @@ export const deployModel = async (
             true,
             undefined,
             undefined,
-            initialWizardData,
+            { ...initialWizardData, canCreateRoleBindings: wizardState.canCreateRoleBindings },
             applyFieldData,
           ),
         ]
@@ -160,7 +160,7 @@ export const deployModel = async (
     false,
     actualSecretName,
     overwrite,
-    initialWizardData,
+    { ...initialWizardData, canCreateRoleBindings: wizardState.canCreateRoleBindings },
     applyFieldData,
   );