fix(FR-2825): standardize activate/deactivate confirmations to Popconfirm

Resolves #7259(FR-2825)

## Summary
- Replaced `modal.confirm` with `popConfirm` action prop in `BAINameActionCell` for keypair activate/deactivate actions in `UserCredentialList.tsx`
- Replaced `modal.confirm` with `popConfirm` action prop for resource group activate/deactivate toggle in `ResourceGroupList.tsx`
- Replaced `modal.confirm` with `Popconfirm` wrapper for deployment revision deploy action in `DeploymentRevisionHistoryTab.tsx` (both table action and drawer button)
- Removed unused `modal` destructuring and `App` imports where no longer needed
- Did NOT touch any delete/purge actions (those are FR-2819 scope)

Author: claude

react/src/components/DeploymentRevisionHistoryTab.tsx

@@ -14,7 +14,7 @@ import { useSetBAINotification } from '../hooks/useBAINotification';
 import { useBAISettingUserState } from '../hooks/useBAISetting';
 import DeploymentRevisionDetailDrawer from './DeploymentRevisionDetailDrawer';
 import { LoadingOutlined, PlayCircleOutlined } from '@ant-design/icons';
-import { App, Button, Typography, theme } from 'antd';
+import { Button, Popconfirm, theme, Typography } from 'antd';
 import {
   type BAIColumnType,
   BAIFetchKeyButton,
@@ -101,7 +101,6 @@ const DeploymentRevisionHistoryTab: React.FC<
   'use memo';
   const { t } = useTranslation();
   const { token } = theme.useToken();
-  const { modal } = App.useApp();
   const { logger } = useBAILogger();
   const { upsertNotification } = useSetBAINotification();
   const [isPending, startTransition] = useTransition();
@@ -299,63 +298,45 @@ const DeploymentRevisionHistoryTab: React.FC<
   };
 
   const handleRollback = (revision: RevisionNode): Promise<boolean> => {
-    return new Promise<boolean>((resolveOuter) => {
-      modal.confirm({
-        title: t('deployment.Deploy'),
-        content: t('deployment.DeployConfirm', {
-          revisionNumber: revision.revisionNumber,
-        }),
-        okText: t('deployment.Deploy'),
-        okButtonProps: {
-          danger: true,
+    return new Promise<boolean>((resolve) => {
+      setRollingBackRevisionId(revision.id);
+      commitActivate({
+        variables: {
+          input: {
+            deploymentId: toLocalId(deployment.id),
+            revisionId: toLocalId(revision.id),
+          },
         },
-        onCancel: () => resolveOuter(false),
-        onOk: () => {
-          return new Promise<void>((resolve) => {
-            setRollingBackRevisionId(revision.id);
-            commitActivate({
-              variables: {
-                input: {
-                  deploymentId: toLocalId(deployment.id),
-                  revisionId: toLocalId(revision.id),
-                },
-              },
-              onCompleted: (_res, errors) => {
-                setRollingBackRevisionId(null);
-                if (errors && errors.length > 0) {
-                  logger.error(errors[0]);
-                  upsertNotification({
-                    open: true,
-                    message: errors[0]?.message || t('general.ErrorOccurred'),
-                    type: 'error',
-                  });
-                  resolveOuter(false);
-                  resolve();
-                  return;
-                }
-                upsertNotification({
-                  open: true,
-                  message: t('deployment.DeploySuccess', {
-                    revisionNumber: revision.revisionNumber,
-                  }),
-                });
-                handleRefresh();
-                resolveOuter(true);
-                resolve();
-              },
-              onError: (error) => {
-                setRollingBackRevisionId(null);
-                logger.error(error);
-                upsertNotification({
-                  open: true,
-                  message: error?.message || t('general.ErrorOccurred'),
-                  type: 'error',
-                });
-                resolveOuter(false);
-                resolve();
-              },
+        onCompleted: (_res, errors) => {
+          setRollingBackRevisionId(null);
+          if (errors && errors.length > 0) {
+            logger.error(errors[0]);
+            upsertNotification({
+              open: true,
+              message: errors[0]?.message || t('general.ErrorOccurred'),
+              type: 'error',
             });
+            resolve(false);
+            return;
+          }
+          upsertNotification({
+            open: true,
+            message: t('deployment.DeploySuccess', {
+              revisionNumber: revision.revisionNumber,
+            }),
+          });
+          handleRefresh();
+          resolve(true);
+        },
+        onError: (error) => {
+          setRollingBackRevisionId(null);
+          logger.error(error);
+          upsertNotification({
+            open: true,
+            message: error?.message || t('general.ErrorOccurred'),
+            type: 'error',
           });
+          resolve(false);
         },
       });
     });
@@ -432,8 +413,19 @@ const DeploymentRevisionHistoryTab: React.FC<
                 icon: <PlayCircleOutlined />,
                 disabled: isDeployDisabled,
                 disabledReason: deployDisabledReason,
-                onClick: () => {
-                  void handleRollback(record);
+                popConfirm: {
+                  title: t('deployment.Deploy'),
+                  description: t('deployment.DeployConfirm', {
+                    revisionNumber: record.revisionNumber,
+                  }),
+                  okText: t('deployment.Deploy'),
+                  cancelText: t('button.Cancel'),
+                  okButtonProps: {
+                    danger: true,
+                  },
+                  onConfirm: () => {
+                    void handleRollback(record);
+                  },
                 },
               },
             ]}
@@ -616,22 +608,32 @@ const DeploymentRevisionHistoryTab: React.FC<
           onClose={() => setDrawerRevision(null)}
           extra={
             drawerRevision ? (
-              <Button
-                type="primary"
-                icon={<PlayCircleOutlined />}
-                disabled={
-                  drawerRevision.status === 'current' ||
-                  drawerRevision.status === 'deploying' ||
-                  isDeploymentDestroying ||
-                  !!rollingBackRevisionId
-                }
-                onClick={async () => {
+              <Popconfirm
+                title={t('deployment.Deploy')}
+                description={t('deployment.DeployConfirm', {
+                  revisionNumber: drawerRevision.frgmt.revisionNumber,
+                })}
+                okText={t('deployment.Deploy')}
+                cancelText={t('button.Cancel')}
+                okButtonProps={{ danger: true }}
+                onConfirm={async () => {
                   const success = await handleRollback(drawerRevision.frgmt);
                   if (success) setDrawerRevision(null);
                 }}
               >
-                {t('deployment.Deploy')}
-              </Button>
+                <Button
+                  type="primary"
+                  icon={<PlayCircleOutlined />}
+                  disabled={
+                    drawerRevision.status === 'current' ||
+                    drawerRevision.status === 'deploying' ||
+                    isDeploymentDestroying ||
+                    !!rollingBackRevisionId
+                  }
+                >
+                  {t('deployment.Deploy')}
+                </Button>
+              </Popconfirm>
             ) : undefined
           }
         />

react/src/components/ResourceGroupList.tsx

@@ -57,7 +57,7 @@ type ResourceGroup = NonNullable<
 const ResourceGroupList: React.FC = () => {
   const { t } = useTranslation();
   const { token } = theme.useToken();
-  const { message, modal } = App.useApp();
+  const { message } = App.useApp();
   const [activeType, setActiveType] = useState<'active' | 'inactive'>('active');
   const [openCreateModal, { toggle: toggleOpenCreateModal }] = useToggle(false);
   const [openInfoModal, { toggle: toggleOpenInfoModal }] = useToggle(false);
@@ -153,61 +153,59 @@ const ResourceGroupList: React.FC = () => {
                 : t('resourceGroup.Activate'),
               icon: record.is_active ? <BanIcon /> : <UndoIcon />,
               type: record.is_active ? 'danger' : 'default',
-              onClick: () => {
-                modal.confirm({
-                  title: record.is_active
-                    ? t('resourceGroup.DeactivateResourceGroup')
-                    : t('resourceGroup.ActivateResourceGroup'),
-                  content: record?.name,
-                  okType: record.is_active ? 'danger' : 'primary',
-                  okText: record.is_active
-                    ? t('resourceGroup.Deactivate')
-                    : t('resourceGroup.Activate'),
-                  onOk: () => {
-                    return new Promise<void>((resolve) => {
-                      commitUpdateResourceGroup({
-                        variables: {
-                          name: record.name ?? '',
-                          input: {
-                            is_active: !record.is_active,
-                          },
+              popConfirm: {
+                title: record.is_active
+                  ? t('resourceGroup.DeactivateResourceGroup')
+                  : t('resourceGroup.ActivateResourceGroup'),
+                description: record?.name,
+                okButtonProps: {
+                  danger: !!record.is_active,
+                },
+                okText: record.is_active
+                  ? t('resourceGroup.Deactivate')
+                  : t('resourceGroup.Activate'),
+                cancelText: t('button.Cancel'),
+                onConfirm: () => {
+                  return new Promise<void>((resolve) => {
+                    commitUpdateResourceGroup({
+                      variables: {
+                        name: record.name ?? '',
+                        input: {
+                          is_active: !record.is_active,
                         },
-                        onCompleted: (
-                          { modify_scaling_group: res },
-                          errors,
-                        ) => {
-                          if (!res?.ok) {
-                            message.error(res?.msg);
-                            resolve();
-                            return;
-                          }
-                          if (errors && errors.length > 0) {
-                            const errorMsgList = _.map(
-                              errors,
-                              (error: PayloadError) => error.message,
-                            );
-                            for (const error of errorMsgList) {
-                              message.error(error);
-                            }
-                            resolve();
-                            return;
-                          }
-                          message.success(
-                            t('resourceGroup.ResourceGroupModified'),
-                          );
-                          startRefetchTransition(() => {
-                            updateFetchKey();
-                          });
+                      },
+                      onCompleted: ({ modify_scaling_group: res }, errors) => {
+                        if (!res?.ok) {
+                          message.error(res?.msg);
                           resolve();
-                        },
-                        onError: (err) => {
-                          message.error(err.message);
+                          return;
+                        }
+                        if (errors && errors.length > 0) {
+                          const errorMsgList = _.map(
+                            errors,
+                            (error: PayloadError) => error.message,
+                          );
+                          for (const error of errorMsgList) {
+                            message.error(error);
+                          }
                           resolve();
-                        },
-                      });
+                          return;
+                        }
+                        message.success(
+                          t('resourceGroup.ResourceGroupModified'),
+                        );
+                        startRefetchTransition(() => {
+                          updateFetchKey();
+                        });
+                        resolve();
+                      },
+                      onError: (err) => {
+                        message.error(err.message);
+                        resolve();
+                      },
                     });
-                  },
-                });
+                  });
+                },
               },
             },
             {