Merge pull request #11 from actiontech/fix/modify-rejected-order

[fix]: Order creator is unable to modify SQL statements.
actiontech · Oct 20, 2023 · a8c9f39 · a8c9f39
2 parents 0b60f95 + 01402c8
commit a8c9f39
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/packages/base/src/page/Project/Detail/index.tsx b/packages/base/src/page/Project/Detail/index.tsx
@@ -77,7 +77,10 @@ const ProjectDetail: React.FC = () => {
   /* FITRUE_isCE */
 
   return (
-    <EmptyBox if={projectDetailFetched} defaultNode={<HeaderProgress />}>
+    <EmptyBox
+      if={projectDetailFetched || !nextProjectID}
+      defaultNode={<HeaderProgress />}
+    >
       {/* IFTRUE_isEE */}
       {renderProjectDetail()}
       {/* FITRUE_isEE */}

diff --git a/packages/base/src/page/Project/index.tsx b/packages/base/src/page/Project/index.tsx
@@ -1,4 +1,4 @@
-import { BasicButton, PageHeader } from '@actiontech/shared';
+import { BasicButton, EmptyBox, PageHeader } from '@actiontech/shared';
 import { TableRefreshButton } from '@actiontech/shared/lib/components/ActiontechTable';
 import { Space } from 'antd5';
 import { useTranslation } from 'react-i18next';
@@ -10,9 +10,11 @@ import { updateProjectModalStatus } from '../../store/project';
 import { ModalName } from '../../data/ModalName';
 import ProjectManageModal from './Modal';
 import { ProjectListStyledWrapper } from './style';
+import { useCurrentUser } from '@actiontech/shared/lib/global';
 
 const Project: React.FC = () => {
   const { t } = useTranslation();
+  const { isAdmin } = useCurrentUser();
 
   const dispatch = useDispatch();
 
@@ -39,9 +41,11 @@ const Project: React.FC = () => {
           </Space>
         }
         extra={
-          <BasicButton type="primary" onClick={createProject}>
-            {t('dmsProject.createProject.modalTitle')}
-          </BasicButton>
+          <EmptyBox if={isAdmin}>
+            <BasicButton type="primary" onClick={createProject}>
+              {t('dmsProject.createProject.modalTitle')}
+            </BasicButton>
+          </EmptyBox>
         }
       />
       <ProjectList />

diff --git a/packages/sqle/src/page/Order/Detail/RejectReason/index.tsx b/packages/sqle/src/page/Order/Detail/RejectReason/index.tsx
@@ -7,7 +7,8 @@ import { RejectReasonProps } from './index.type';
 const RejectReason: React.FC<RejectReasonProps> = ({
   stepInfo,
   currentUsername,
-  openModifySqlModal
+  openModifySqlModal,
+  createOrderUserName
 }) => {
   const { t } = useTranslation();
   return (
@@ -28,11 +29,11 @@ const RejectReason: React.FC<RejectReasonProps> = ({
       </div>
 
       <EmptyBox
-        if={currentUsername === stepInfo.operation_user_name}
+        if={currentUsername === createOrderUserName}
         defaultNode={
           <div className="wait-operator-modify-sql">
             {t('order.operator.waitModifySql', {
-              username: stepInfo.operation_user_name
+              username: createOrderUserName
             })}
           </div>
         }

diff --git a/packages/sqle/src/page/Order/Detail/RejectReason/index.type.ts b/packages/sqle/src/page/Order/Detail/RejectReason/index.type.ts
@@ -4,4 +4,5 @@ export type RejectReasonProps = {
   stepInfo: IWorkflowStepResV2;
   currentUsername: string;
   openModifySqlModal: () => void;
+  createOrderUserName: string;
 };
diff --git a/packages/sqle/src/page/Order/Detail/index.tsx b/packages/sqle/src/page/Order/Detail/index.tsx
@@ -130,6 +130,7 @@ const OrderDetail: React.FC = () => {
                 stepInfo={currentRejectedStep!}
                 currentUsername={username}
                 openModifySqlModal={openModifySqlModal}
+                createOrderUserName={orderInfo?.create_user_name ?? ''}
               />
             </EmptyBox>