fix(FR-2862): trigger deploy/add mutation by calling form.submit() directly

handleOk previously called validateFields().then(submit).catch(() => {}),
which silently swallowed validation rejections — including transient
races when BAIProjectResourceGroupSelect's autoSelectDefault hadn't
populated resourceGroup yet — and the deploy mutation never fired.

Call activeForm.submit() directly so antd routes to onFinish on success
and onFinishFailed on failure, and consume the values arg directly in
handlePresetFinish / handleCustomFinish (no redundant validateFields).
Add onFinishFailed to the Preset Form for parity with Custom.

Author: agatha197

react/src/components/DeploymentAddRevisionModal.tsx

@@ -63,6 +63,7 @@ import {
   Typography,
   theme,
 } from 'antd';
+import type { FormInstance } from 'antd';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
 import {
   BAIAvailablePresetSelect,
@@ -850,7 +851,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
     }
   };
 
-  const handleCustomFinish = (values: FormValues) => {
+  const handleCustomFinish = (values: FormValues): void => {
     // `setFields` raises an error programmatically — antd's
     // `scrollToFirstError` only fires from `onFinishFailed`, so we have
     // to nudge the scroll explicitly here.
@@ -966,113 +967,113 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
         ? (values.commandModelMount ?? '/models')
         : values.mountDestination || '/models';
 
-    customForm.validateFields().then(() => {
-      setIsSubmitting(true);
-      commitAdd({
-        variables: {
-          input: {
-            deploymentId: toLocalId(deploymentId) ?? deploymentId,
-            clusterConfig: {
-              mode: clusterMode,
-              size: values.cluster_size,
-            },
-            resourceConfig: {
-              resourceGroup: { name: values.resourceGroup },
-              resourceSlots: { entries: slotEntries },
-              resourceOpts:
-                optsEntries.length > 0 ? { entries: optsEntries } : null,
-            },
-            image: { id: decodedImageId },
-            modelRuntimeConfig: {
-              runtimeVariantId: values.runtimeVariantId,
-              inferenceRuntimeConfig: null,
-              environ:
-                environEntries.length > 0 ? { entries: environEntries } : null,
-            },
-            modelMountConfig: {
-              vfolderId: convertToUUID(values.modelFolderId),
-              mountDestination,
-              definitionPath: values.definitionPath,
-            },
-            modelDefinition,
-            extraMounts: extraMounts.length > 0 ? extraMounts : null,
-            options: { autoActivate },
+    setIsSubmitting(true);
+    commitAdd({
+      variables: {
+        input: {
+          deploymentId: toLocalId(deploymentId) ?? deploymentId,
+          clusterConfig: {
+            mode: clusterMode,
+            size: values.cluster_size,
           },
+          resourceConfig: {
+            resourceGroup: { name: values.resourceGroup },
+            resourceSlots: { entries: slotEntries },
+            resourceOpts:
+              optsEntries.length > 0 ? { entries: optsEntries } : null,
+          },
+          image: { id: decodedImageId },
+          modelRuntimeConfig: {
+            runtimeVariantId: values.runtimeVariantId,
+            inferenceRuntimeConfig: null,
+            environ:
+              environEntries.length > 0 ? { entries: environEntries } : null,
+          },
+          modelMountConfig: {
+            vfolderId: convertToUUID(values.modelFolderId),
+            mountDestination,
+            definitionPath: values.definitionPath,
+          },
+          modelDefinition,
+          extraMounts: extraMounts.length > 0 ? extraMounts : null,
+          options: { autoActivate },
         },
-        onCompleted: (_, errors) => {
-          setIsSubmitting(false);
-          if (errors && errors.length > 0) {
-            const err = errors[0];
-            const isInProgress = err?.message?.includes(
-              'Another deployment is already in progress',
-            );
-            message.error(
-              isInProgress
-                ? t('deployment.AnotherDeploymentInProgress')
-                : (err?.message ?? t('general.ErrorOccurred')),
-            );
-            return;
-          }
-          customForm.resetFields();
-          onRequestClose(true);
-        },
-        onError: (err) => {
-          setIsSubmitting(false);
-          const isInProgress = err.message?.includes(
+      },
+      onCompleted: (_, errors) => {
+        setIsSubmitting(false);
+        if (errors && errors.length > 0) {
+          const err = errors[0];
+          const isInProgress = err?.message?.includes(
             'Another deployment is already in progress',
           );
           message.error(
             isInProgress
               ? t('deployment.AnotherDeploymentInProgress')
-              : (err.message ?? t('general.ErrorOccurred')),
+              : (err?.message ?? t('general.ErrorOccurred')),
           );
-        },
-      });
+          return;
+        }
+        customForm.resetFields();
+        onRequestClose(true);
+      },
+      onError: (err) => {
+        setIsSubmitting(false);
+        const isInProgress = err.message?.includes(
+          'Another deployment is already in progress',
+        );
+        message.error(
+          isInProgress
+            ? t('deployment.AnotherDeploymentInProgress')
+            : (err.message ?? t('general.ErrorOccurred')),
+        );
+      },
     });
   };
 
-  const handlePresetFinish = () => {
+  const handlePresetFinish = (values: PresetFormValues): void => {
     if (!projectId) {
       message.error(t('general.ErrorOccurred'));
       return;
     }
-    presetForm.validateFields().then((values) => {
-      setIsSubmitting(true);
-      commitDeploy({
-        variables: {
-          vfolderId: convertToUUID(values.modelFolderId),
-          input: {
-            projectId,
-            revisionPresetId: values.revisionPresetId,
-            resourceGroup: values.resourceGroup,
-            desiredReplicaCount: 1,
-          },
+    setIsSubmitting(true);
+    commitDeploy({
+      variables: {
+        vfolderId: convertToUUID(values.modelFolderId),
+        input: {
+          projectId,
+          revisionPresetId: values.revisionPresetId,
+          resourceGroup: values.resourceGroup,
+          desiredReplicaCount: 1,
         },
-        onCompleted: (response, errors) => {
-          setIsSubmitting(false);
-          if (errors && errors.length > 0) {
-            const errMsg = errors.map((e) => e.message).join('\n');
-            logger.error(
-              '[DeploymentAddRevisionModal] deployVfolderV2 returned errors',
-              errors,
-            );
-            message.error(errMsg || t('modelStore.DeployFailed'));
-            return;
-          }
-          const newDeploymentId = String(response.deployVfolderV2.deploymentId);
-          message.success(t('modelStore.DeploySuccess'));
-          onRequestClose(true);
-          navigate(`/deployments/${newDeploymentId}`);
-        },
-        onError: (error) => {
-          setIsSubmitting(false);
+      },
+      onCompleted: (response, errors) => {
+        setIsSubmitting(false);
+        if (errors && errors.length > 0) {
+          const errMsg = errors.map((e) => e.message).join('\n');
           logger.error(
-            '[DeploymentAddRevisionModal] deployVfolderV2 failed',
-            error,
+            '[DeploymentAddRevisionModal] deployVfolderV2 returned errors',
+            errors,
           );
-          message.error(error.message || t('modelStore.DeployFailed'));
-        },
-      });
+          message.error(errMsg || t('modelStore.DeployFailed'));
+          return;
+        }
+        const newDeploymentId = response.deployVfolderV2?.deploymentId
+          ? String(response.deployVfolderV2.deploymentId)
+          : undefined;
+        message.success(t('modelStore.DeploySuccess'));
+        onRequestClose(true);
+        if (newDeploymentId) {
+          navigate(`/deployments/${newDeploymentId}`);
+        }
+      },
+      onError: (error) => {
+        setIsSubmitting(false);
+        logger.error(
+          '[DeploymentAddRevisionModal] deployVfolderV2 failed',
+          error,
+        );
+        message.error(error.message || t('modelStore.DeployFailed'));
+      },
     });
   };
 
@@ -1094,16 +1095,14 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
   };
 
   const handleOk = () => {
+    // Let antd's built-in submit flow handle validation routing:
+    // success → `onFinish` (handle*Finish), failure → `onFinishFailed`
+    // (handleFinishFailed). Calling `validateFields()` separately and
+    // swallowing rejections in a `.catch` would silently drop submits
+    // when validation fails — including transient races during the
+    // BAIProjectResourceGroupSelect auto-select.
     const activeForm = effectiveMode === 'preset' ? presetForm : customForm;
-    activeForm
-      .validateFields()
-      .then(() => {
-        activeForm.submit();
-      })
-      .catch(() => {
-        // Validation failed — the form's `onFinishFailed` handler scrolls
-        // to the first errored field.
-      });
+    activeForm.submit();
   };
 
   const okText =
@@ -1187,6 +1186,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
             layout="vertical"
             style={{ marginTop: token.marginXS }}
             onFinish={handlePresetFinish}
+            onFinishFailed={handleFinishFailed}
             initialValues={{
               modelFolderId: defaultModelFolderId,
             }}
@@ -1208,7 +1208,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
                   />
                 </Form.Item>
                 <Form.Item dependencies={['revisionPresetId']} noStyle>
-                  {({ getFieldValue }) => {
+                  {({ getFieldValue }: FormInstance<PresetFormValues>) => {
                     const selectedId = getFieldValue('revisionPresetId');
                     return (
                       <Space.Compact>
@@ -1345,7 +1345,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
           </Form.Item>
 
           <Form.Item dependencies={['runtimeVariantId']} noStyle>
-            {({ getFieldValue }) => {
+            {({ getFieldValue }: FormInstance<FormValues>) => {
               const variantId = getFieldValue('runtimeVariantId');
               const variantName = runtimeVariantNameMap[variantId];
               if (!variantName || variantName === 'custom') return null;
@@ -1376,7 +1376,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
           </Form.Item>
 
           <Form.Item dependencies={['runtimeVariantId']} noStyle>
-            {({ getFieldValue }) => {
+            {({ getFieldValue }: FormInstance<FormValues>) => {
               const variantId = getFieldValue('runtimeVariantId');
               const variantName = runtimeVariantNameMap[variantId];
               if (variantName !== 'custom') {
@@ -1400,7 +1400,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
                     />
                   </Form.Item>
                   <Form.Item dependencies={['customDefinitionMode']} noStyle>
-                    {({ getFieldValue: getField }) =>
+                    {({ getFieldValue: getField }: FormInstance<FormValues>) =>
                       getField('customDefinitionMode') === 'command' ? (
                         <>
                           <Form.Item
@@ -1552,7 +1552,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
                         'mount_ids',
                       ]}
                     >
-                      {({ getFieldValue }) => {
+                      {({ getFieldValue }: FormInstance<FormValues>) => {
                         const modelFolderId = getFieldValue('modelFolderId');
                         const modelFolderIdNoDash = modelFolderId
                           ? String(modelFolderId).replace(/-/g, '')