feat(FR-2891): move resource group to deployment-level metadata and refine deployment detail UI

Author: agatha197

data/schema.graphql

@@ -158,10 +158,10 @@ input AddRevisionInput
   """
   revisionPresetId: UUID = null
   deploymentId: ID!
-  clusterConfig: ClusterConfigInput!
-  resourceConfig: ResourceConfigInput!
-  image: ImageInput!
-  modelRuntimeConfig: ModelRuntimeConfigInput!
+  clusterConfig: ClusterConfigInput = null
+  resourceConfig: ResourceConfigInput = null
+  image: ImageInput = null
+  modelRuntimeConfig: ModelRuntimeConfigInput = null
   modelMountConfig: ModelMountConfigInput!
 
   """
@@ -9380,6 +9380,7 @@ input ModelDeploymentMetadataInput
 {
   projectId: ID!
   domainName: String!
+  resourceGroup: String!
   name: String = null
   tags: [String!] = null
 }
@@ -14893,8 +14894,6 @@ type ResourceConfig
 input ResourceConfigInput
   @join__type(graph: STRAWBERRY)
 {
-  resourceGroup: ResourceGroupInput!
-
   """Added in 26.1.0. Resources allocated for the deployment."""
   resourceSlots: ResourceSlotInput!
 
@@ -14998,13 +14997,6 @@ input ResourceGroupFilter
   NOT: [ResourceGroupFilter!] = null
 }
 
-"""Added in 25.19.0. """
-input ResourceGroupInput
-  @join__type(graph: STRAWBERRY)
-{
-  name: String!
-}
-
 """Added in 26.2.0. Metadata for a resource group."""
 type ResourceGroupMetadata
   @join__type(graph: STRAWBERRY)
@@ -20590,4 +20582,4 @@ input WebhookSpecInput
   @join__type(graph: STRAWBERRY)
 {
   url: String!
-}
+}

react/src/components/DeploymentAddRevisionModal.tsx

@@ -3,7 +3,6 @@
  Copyright (c) 2015-2026 Lablup Inc. All rights reserved.
  */
 import { DeploymentAddRevisionModalAddMutation } from '../__generated__/DeploymentAddRevisionModalAddMutation.graphql';
-import { DeploymentAddRevisionModalDeployMutation } from '../__generated__/DeploymentAddRevisionModalDeployMutation.graphql';
 import { DeploymentAddRevisionModalImageNameQuery } from '../__generated__/DeploymentAddRevisionModalImageNameQuery.graphql';
 import type { DeploymentAddRevisionModalPresetTransferFragment$key } from '../__generated__/DeploymentAddRevisionModalPresetTransferFragment.graphql';
 import type { DeploymentAddRevisionModalQuery } from '../__generated__/DeploymentAddRevisionModalQuery.graphql';
@@ -17,9 +16,7 @@ import {
   mergeExtraArgs,
   reverseMapExtraArgs,
 } from '../helper/runtimeExtraArgsParser';
-import { useWebUINavigate } from '../hooks';
 import { useBAISettingUserState } from '../hooks/useBAISetting';
-import { useCurrentProjectValue } from '../hooks/useCurrentProject';
 import { useModelStoreProject } from '../hooks/useModelStoreProject';
 import {
   buildArgsSchemaKeySet,
@@ -70,7 +67,6 @@ import {
   BAIFlex,
   BAIModal,
   BAIModalProps,
-  BAIProjectResourceGroupSelect,
   BAIProjectVfolderSelect,
   BAIRuntimeVariantSelect,
   convertToUUID,
@@ -118,7 +114,6 @@ export type FormValues = ImageEnvironmentFormInput &
 
 export type PresetFormValues = {
   revisionPresetId: string;
-  resourceGroup: string;
   modelFolderId: string;
 };
 
@@ -187,9 +182,7 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
   const { t } = useTranslation();
   const { token } = theme.useToken();
   const { message } = App.useApp();
-  const navigate = useWebUINavigate();
   const relayEnvironment = useRelayEnvironment();
-  const { id: projectId, name: projectName } = useCurrentProjectValue();
   // The model folder picker scopes to the MODEL_STORE project, not the
   // deployment's own project — model cards live in the domain-wide model
   // store regardless of which project owns the deployment.
@@ -206,8 +199,8 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
   const [presetForm] = Form.useForm<PresetFormValues>();
   const [isSubmitting, setIsSubmitting] = useState(false);
   // FR-2862 feedback: hoist `autoActivate` from the Custom body into the
-  // modal so it can be rendered in the modal footer (visible only in Custom
-  // mode, since Preset mode always auto-activates server-side).
+  // modal so it can be rendered in the modal footer. Both modes forward
+  // the value via `AddRevisionOptions.autoActivate` on `addModelRevision`.
   const [autoActivate, setAutoActivate] = useState(true);
 
   const [mode, setMode] = useBAISettingUserState(
@@ -463,20 +456,6 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
     `,
   );
 
-  const [commitDeploy] = useMutation<DeploymentAddRevisionModalDeployMutation>(
-    graphql`
-      mutation DeploymentAddRevisionModalDeployMutation(
-        $vfolderId: UUID!
-        $input: DeployVFolderV2Input!
-      ) {
-        deployVfolderV2(vfolderId: $vfolderId, input: $input) {
-          deploymentId
-          deploymentName
-        }
-      }
-    `,
-  );
-
   // Build a Custom-form prefill object from a preset's transfer-fragment ref.
   // `image canonicalName` is fetched async because
   // `ImageEnvironmentSelectFormItems` matches the form's `environments.version`
@@ -575,16 +554,12 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
 
     if (effectiveMode === 'preset' && next === 'custom') {
       // Carry the currently selected preset (if any) into the Custom form.
-      // Also carry the resource group / model folder the user picked in
-      // Preset mode (spec (d)).
+      // Also carry the model folder the user picked in Preset mode (spec (d)).
       const presetValues = presetForm.getFieldsValue();
       let prefill: Partial<FormValues> = {};
       if (selectedPresetFrgmt) {
         prefill = await buildPrefillFromPreset(selectedPresetFrgmt);
       }
-      if (presetValues.resourceGroup) {
-        prefill.resourceGroup = presetValues.resourceGroup;
-      }
       if (presetValues.modelFolderId) {
         prefill.modelFolderId = presetValues.modelFolderId;
       }
@@ -977,7 +952,6 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
             size: values.cluster_size,
           },
           resourceConfig: {
-            resourceGroup: { name: values.resourceGroup },
             resourceSlots: { entries: slotEntries },
             resourceOpts:
               optsEntries.length > 0 ? { entries: optsEntries } : null,
@@ -1031,48 +1005,59 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
   };
 
   const handlePresetFinish = (values: PresetFormValues): void => {
-    if (!projectId) {
-      message.error(t('general.ErrorOccurred'));
-      return;
-    }
     setIsSubmitting(true);
-    commitDeploy({
+    // Preset mode adds a revision to the current deployment using the
+    // selected `revisionPresetId`. Cluster / resource / image / runtime
+    // configs are derived server-side from the preset; the client only
+    // forwards the user-picked model folder via `modelMountConfig` and the
+    // `autoActivate` option.
+    commitAdd({
       variables: {
-        vfolderId: convertToUUID(values.modelFolderId),
         input: {
-          projectId,
+          deploymentId: toLocalId(deploymentId) ?? deploymentId,
           revisionPresetId: values.revisionPresetId,
-          resourceGroup: values.resourceGroup,
-          desiredReplicaCount: 1,
+          modelMountConfig: {
+            vfolderId: convertToUUID(values.modelFolderId),
+            mountDestination: '/models',
+          },
+          options: { autoActivate },
         },
       },
-      onCompleted: (response, errors) => {
+      onCompleted: (_, errors) => {
         setIsSubmitting(false);
         if (errors && errors.length > 0) {
-          const errMsg = errors.map((e) => e.message).join('\n');
+          const err = errors[0];
+          const isInProgress = err?.message?.includes(
+            'Another deployment is already in progress',
+          );
           logger.error(
-            '[DeploymentAddRevisionModal] deployVfolderV2 returned errors',
+            '[DeploymentAddRevisionModal] addModelRevision (preset) returned errors',
             errors,
           );
-          message.error(errMsg || t('modelStore.DeployFailed'));
+          message.error(
+            isInProgress
+              ? t('deployment.AnotherDeploymentInProgress')
+              : (err?.message ?? t('general.ErrorOccurred')),
+          );
           return;
         }
-        const newDeploymentId = response.deployVfolderV2?.deploymentId
-          ? String(response.deployVfolderV2.deploymentId)
-          : undefined;
-        message.success(t('modelStore.DeploySuccess'));
+        presetForm.resetFields();
         onRequestClose(true);
-        if (newDeploymentId) {
-          navigate(`/deployments/${newDeploymentId}`);
-        }
       },
       onError: (error) => {
         setIsSubmitting(false);
+        const isInProgress = error.message?.includes(
+          'Another deployment is already in progress',
+        );
         logger.error(
-          '[DeploymentAddRevisionModal] deployVfolderV2 failed',
+          '[DeploymentAddRevisionModal] addModelRevision (preset) failed',
           error,
         );
-        message.error(error.message || t('modelStore.DeployFailed'));
+        message.error(
+          isInProgress
+            ? t('deployment.AnotherDeploymentInProgress')
+            : (error.message ?? t('general.ErrorOccurred')),
+        );
       },
     });
   };
@@ -1099,16 +1084,13 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
     // 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.
+    // when validation fails — including transient races during
+    // hidden-picker auto-select flows.
     const activeForm = effectiveMode === 'preset' ? presetForm : customForm;
     activeForm.submit();
   };
 
-  const okText =
-    effectiveMode === 'preset'
-      ? t('modelStore.Deploy')
-      : t('deployment.AddRevision');
+  const okText = t('deployment.AddRevision');
 
   return (
     <BAIModal
@@ -1137,18 +1119,15 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
       width={720}
       footer={
         <BAIFlex direction="row" align="center" justify="between" gap="sm">
-          {effectiveMode === 'custom' ? (
-            <Checkbox
-              checked={autoActivate}
-              onChange={(e: CheckboxChangeEvent) =>
-                setAutoActivate(e.target.checked)
-              }
-            >
-              {t('deployment.AutoActivate')}
-            </Checkbox>
-          ) : (
-            <span />
-          )}
+          <Checkbox
+            checked={autoActivate}
+            onChange={(e: CheckboxChangeEvent) =>
+              setAutoActivate(e.target.checked)
+            }
+            disabled={effectiveMode === 'preset' && hasNoPresets}
+          >
+            {t('deployment.AutoActivate')}
+          </Checkbox>
           <BAIFlex direction="row" align="center" gap="xs">
             <Button onClick={() => onRequestClose()}>
               {t('button.Cancel')}
@@ -1233,19 +1212,6 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
               </BAIFlex>
             </Form.Item>
 
-            <Form.Item
-              name="resourceGroup"
-              label={t('modelStore.ResourceGroup')}
-              tooltip={t('modelStore.ResourceGroupTooltip')}
-              rules={[{ required: true }]}
-            >
-              <BAIProjectResourceGroupSelect
-                projectName={projectName ?? ''}
-                autoSelectDefault
-                style={{ width: '100%' }}
-              />
-            </Form.Item>
-
             <Form.Item
               name="modelFolderId"
               label={t('deployment.ModelFolder')}
@@ -1281,6 +1247,13 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
             commandInterval: 10,
             commandMaxWaitTime: 15,
             environ: [],
+            // Resource group is hidden in the UI — pre-fill from the
+            // deployment's current revision so new revisions reuse the
+            // same RG. If there is no current revision (first-revision
+            // flow) the hidden picker inside ResourceAllocationFormItems
+            // falls back to its `autoSelectFirstResourceGroup` default.
+            resourceGroup:
+              currentRevision?.resourceConfig?.resourceGroupName ?? undefined,
           })}
         >
           {currentRevision ? (
@@ -1531,9 +1504,19 @@ const DeploymentAddRevisionModal: React.FC<DeploymentAddRevisionModalProps> = ({
             {t('deployment.step.ClusterAndResources')}
           </SectionHeader>
           <Suspense fallback={<Skeleton active paragraph={{ rows: 4 }} />}>
+            {/*
+              hideResourceGroupFormItem: the resource group selector is
+              hidden from the UI — revisions inherit the deployment's RG and
+              `AddRevisionInput.resourceConfig` no longer accepts a resource
+              group. The form value is still tracked (prefilled from
+              `currentRevision` or auto-selected) so that
+              `ResourcePresetSelect` can filter allocatable presets by the
+              same RG the deployment runs in.
+            */}
             <ResourceAllocationFormItems
               enableResourcePresets
               autoSelectFirstResourceGroup
+              hideResourceGroupFormItem
             />
           </Suspense>