From e15e0611f783f2e58a500dff00b155c47368035f Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Tue, 30 Jan 2024 18:58:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=BB=BB=E4=BD=95=E6=9D=83=E9=99=90=E8=BF=9B=E5=85=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project-management/menuManagement.ts      | 14 +++
 .../project-management/menuManagement.ts      |  6 ++
 .../pure/ms-form-create/comp/jiraKey.vue      | 15 +++
 frontend/src/components/pure/navbar/index.vue |  3 +-
 frontend/src/layout/default-layout.vue        | 12 ++-
 frontend/src/layout/no-permission-layout.vue  | 92 +++++++++++++++++++
 frontend/src/layout/single-logo-layout.vue    | 17 ----
 frontend/src/router/routes/base.ts            |  3 +-
 frontend/src/utils/permission.ts              |  2 +-
 .../menuManagement/components/defectSync.vue  |  4 +
 .../menuManagement/menuManagement.vue         |  2 +-
 .../organization/member/locale/zh-CN.ts       |  2 +-
 .../project/components/userDrawer.vue         |  1 +
 .../organization/project/orgProject.vue       |  6 +-
 .../components/userDrawer.vue                 |  5 +-
 .../organizationAndProject/locale/en-US.ts    |  1 +
 .../organizationAndProject/locale/zh-CN.ts    |  1 +
 17 files changed, 159 insertions(+), 27 deletions(-)
 create mode 100644 frontend/src/layout/no-permission-layout.vue

diff --git a/frontend/src/api/modules/project-management/menuManagement.ts b/frontend/src/api/modules/project-management/menuManagement.ts
index 5333c3de31..621819eb9b 100644
--- a/frontend/src/api/modules/project-management/menuManagement.ts
+++ b/frontend/src/api/modules/project-management/menuManagement.ts
@@ -164,3 +164,17 @@ export function postUpdateEnableFake(data: FakeTableOperationParams) {
 export function getDeleteFake(data: FakeTableOperationParams) {
   return MSR.post<FakeTableListItem[]>({ url: Url.getFakeTableDeleteUrl, data });
 }
+
+// JIRA插件key校验
+export function validateJIRAKey(data: object, pluginId: string) {
+  return MSR.post<FakeTableListItem[]>({ url: `${Url.postValidateJiraKeyUrl}${pluginId}`, data });
+}
+// 缺陷管理-获取同步信息
+export function getBugSyncInfo(projectId: string) {
+  return MSR.get<FakeTableListItem[]>({ url: `${Url.getBugSyncInfoUrl}${projectId}` });
+}
+
+// 用例管理-获取关联需求信息
+export function getCaseRelatedInfo(projectId: string) {
+  return MSR.get<FakeTableListItem[]>({ url: `${Url.getCaseRelatedInfoUrl}${projectId}` });
+}
diff --git a/frontend/src/api/requrls/project-management/menuManagement.ts b/frontend/src/api/requrls/project-management/menuManagement.ts
index 392b928424..37e61057f3 100644
--- a/frontend/src/api/requrls/project-management/menuManagement.ts
+++ b/frontend/src/api/requrls/project-management/menuManagement.ts
@@ -25,3 +25,9 @@ export const postFakeTableAddUrl = '/fake/error/add';
 export const postFakeTableUpdateUrl = '/fake/error/update';
 // 误报规则列表启用或禁用
 export const postFakeTableEnableUrl = '/fake/error/update/enable';
+// JIRAKEY 校验
+export const postValidateJiraKeyUrl = '/project/application/validate/';
+// 缺陷管理-获取同步信息
+export const getBugSyncInfoUrl = '/project/application/bug/sync/info/';
+// 用例管理-获取关联需求信息
+export const getCaseRelatedInfoUrl = '/project/application/case/related/info/';
diff --git a/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue b/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue
index 0e5573c752..a6e90c435c 100644
--- a/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue
+++ b/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue
@@ -4,6 +4,7 @@
     :placeholder="t('project.menu.pleaseInputJiraKey')"
     v-bind="attrs"
     @change="(v: string) => emit('update:modelValue', v)"
+    @blur="handleBlur"
   />
   <div class="flex flex-row items-center gap-[10px] text-[12px] leading-[16px]">
     <span class="text-[var(--color-text-4)]">{{ t('project.menu.howGetJiraKey') }}</span>
@@ -20,6 +21,9 @@
 </template>
 
 <script setup lang="ts">
+  import { Message } from '@arco-design/web-vue';
+
+  import { validateJIRAKey } from '@/api/modules/project-management/menuManagement';
   import { getLogo } from '@/api/modules/setting/serviceIntegration';
   import { useI18n } from '@/hooks/useI18n';
 
@@ -44,6 +48,17 @@
       previewIcon.value = URL.createObjectURL(new Blob([data]));
     });
   });
+  const handleBlur = async () => {
+    const pluginId = sessionStorage.getItem('platformKey') || '';
+    if (pluginId) {
+      try {
+        await validateJIRAKey({ name: '1231' }, pluginId);
+        Message.success('common.validateSuccess');
+      } catch {
+        Message.error('common.validateFaild');
+      }
+    }
+  };
 </script>
 
 <style scoped></style>
diff --git a/frontend/src/components/pure/navbar/index.vue b/frontend/src/components/pure/navbar/index.vue
index 9bbfc750de..6a373ec960 100644
--- a/frontend/src/components/pure/navbar/index.vue
+++ b/frontend/src/components/pure/navbar/index.vue
@@ -34,7 +34,7 @@
       </template>
       <TopMenu />
     </div>
-    <ul v-if="!props.isPreview" class="right-side">
+    <ul v-if="!props.isPreview && !props.hideRight" class="right-side">
       <li>
         <a-tooltip :content="t('settings.navbar.search')">
           <a-button type="secondary">
@@ -142,6 +142,7 @@
     isPreview?: boolean;
     logo?: string;
     name?: string;
+    hideRight?: boolean;
   }>();
 
   const appStore = useAppStore();
diff --git a/frontend/src/layout/default-layout.vue b/frontend/src/layout/default-layout.vue
index 6e9af107ac..a7781d71a7 100644
--- a/frontend/src/layout/default-layout.vue
+++ b/frontend/src/layout/default-layout.vue
@@ -1,7 +1,12 @@
 <template>
   <a-layout class="layout" :class="{ mobile: appStore.hideMenu }">
     <div v-if="navbar" class="layout-navbar z-[100]">
-      <NavBar :is-preview="innerProps.isPreview" :logo="innerLogo" :name="innerName" />
+      <NavBar
+        :is-preview="innerProps.isPreview"
+        :hide-right="innerProps.hideRight"
+        :logo="innerLogo"
+        :name="innerName"
+      />
     </div>
     <slot name="body">
       <a-layout>
@@ -44,7 +49,9 @@
               >
                 <MsBreadCrumb />
                 <a-layout-content>
-                  <PageLayout v-if="!props.isPreview" />
+                  <slot name="page">
+                    <PageLayout v-if="!props.isPreview" />
+                  </slot>
                   <slot></slot>
                 </a-layout-content>
                 <Footer v-if="footer" />
@@ -76,6 +83,7 @@
     logo?: string;
     name?: string;
     singleLogo?: boolean;
+    hideRight?: boolean;
   }
   const props = defineProps<Props>();
 
diff --git a/frontend/src/layout/no-permission-layout.vue b/frontend/src/layout/no-permission-layout.vue
new file mode 100644
index 0000000000..9851a5c3f3
--- /dev/null
+++ b/frontend/src/layout/no-permission-layout.vue
@@ -0,0 +1,92 @@
+<template>
+  <div class="end-item">
+    <DefaultLayout
+      :logo="pageConfig.logoPlatform[0]?.url || defaultPlatformLogo"
+      :name="pageConfig.platformName"
+      class="overflow-hidden"
+      hide-right
+    >
+      <template #page>
+        <div class="page">
+          <div class="content-wrapper">
+            <div class="content">
+              <div class="icon">
+                <div class="icon-svg">
+                  <svg-icon width="232px" height="184px" name="no_resource" />
+                </div>
+                <div class="radius-box"></div>
+              </div>
+              <div class="title">
+                <span>{{ t('common.noProject') }}</span>
+              </div>
+              <slot></slot>
+            </div>
+          </div>
+        </div>
+      </template>
+    </DefaultLayout>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import DefaultLayout from './default-layout.vue';
+
+  import { useI18n } from '@/hooks/useI18n';
+  import useAppStore from '@/store/modules/app';
+
+  const defaultPlatformLogo = `${import.meta.env.BASE_URL}images/MS-full-logo.svg`;
+  const appStore = useAppStore();
+  const pageConfig = ref({ ...appStore.pageConfig });
+
+  const { t } = useI18n();
+</script>
+
+<style lang="less" scoped>
+  .end-item {
+    :deep(.arco-menu-vertical) {
+      .arco-menu-inner {
+        justify-content: end;
+      }
+    }
+  }
+  .page {
+    height: 100vh;
+    background-color: var(--color-text-fff);
+    .content-wrapper {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 100%;
+      background-color: var(--color-text-fff);
+      .content {
+        .icon {
+          position: relative;
+          display: flex;
+          align-items: center;
+          margin-bottom: 40px;
+          height: 218px;
+          flex-direction: column;
+          .icon-svg {
+            z-index: 100;
+          }
+          .radius-box {
+            position: relative;
+            bottom: 83px;
+            width: 355px;
+            height: 117px;
+            flex-shrink: 0;
+            border-radius: 355px;
+            background: linear-gradient(180deg, #ededf1 0%, rgb(255 255 255 / 0%) 100%);
+          }
+        }
+        .title {
+          font-size: 16px;
+          color: var(--color-text-1);
+          .user {
+            margin-left: 16px;
+          }
+        }
+      }
+    }
+  }
+</style>
diff --git a/frontend/src/layout/single-logo-layout.vue b/frontend/src/layout/single-logo-layout.vue
index 79de7b6e99..9d575d31fd 100644
--- a/frontend/src/layout/single-logo-layout.vue
+++ b/frontend/src/layout/single-logo-layout.vue
@@ -18,9 +18,6 @@
               </div>
               <div class="title">
                 <span>{{ props.isProject ? t('common.noProject') : t('common.noResource') }}</span>
-                <span class="user">
-                  {{ adminStr }}
-                </span>
               </div>
               <slot></slot>
             </div>
@@ -34,32 +31,18 @@
 <script setup lang="ts">
   import DefaultLayout from './default-layout.vue';
 
-  import { getAdminByProjectByOrg } from '@/api/modules/setting/organizationAndProject';
   import { useI18n } from '@/hooks/useI18n';
   import useAppStore from '@/store/modules/app';
 
   const defaultPlatformLogo = `${import.meta.env.BASE_URL}images/MS-full-logo.svg`;
   const appStore = useAppStore();
   const pageConfig = ref({ ...appStore.pageConfig });
-  const adminStr = ref<string>('');
 
   const props = defineProps<{
     isProject?: boolean;
   }>();
 
   const { t } = useI18n();
-  const initData = async () => {
-    try {
-      const res = (await getAdminByProjectByOrg(appStore.currentOrgId, '')) || [];
-      adminStr.value = res.map((item) => item.name).join(';');
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log(error);
-    }
-  };
-  onMounted(() => {
-    initData();
-  });
 </script>
 
 <style lang="less" scoped>
diff --git a/frontend/src/router/routes/base.ts b/frontend/src/router/routes/base.ts
index 4002dc33ee..f6ffbbcfb1 100644
--- a/frontend/src/router/routes/base.ts
+++ b/frontend/src/router/routes/base.ts
@@ -4,11 +4,12 @@ import type { RouteRecordRaw } from 'vue-router';
 
 export const DEFAULT_LAYOUT = () => import('@/layout/default-layout.vue');
 export const PAGE_LAYOUT = () => import('@/layout/page-layout.vue');
+export const NO_PERMISSION_LAYOUT = () => import('@/layout/no-permission-layout.vue');
 
 export const INDEX_ROUTE: RouteRecordRaw = {
   path: '/index',
   name: 'metersphereIndex',
-  component: DEFAULT_LAYOUT,
+  component: NO_PERMISSION_LAYOUT,
   meta: {
     hideInMenu: true,
     roles: ['*'],
diff --git a/frontend/src/utils/permission.ts b/frontend/src/utils/permission.ts
index f216ced152..f83b1371d1 100644
--- a/frontend/src/utils/permission.ts
+++ b/frontend/src/utils/permission.ts
@@ -49,7 +49,7 @@ export function hasAnyPermission(permissions: string[], typeList = ['PROJECT', '
 }
 
 function filterProject(role: UserRole, id: string) {
-  return role && role.type === 'PROJECT' && role.scopeId === id;
+  return role && role.type === 'PROJECT' && (role.scopeId === id || role.scopeId === 'global');
 }
 function filterOrganization(role: UserRole, id: string) {
   return role && role.type === 'ORGANIZATION' && (role.scopeId === id || role.scopeId === 'global');
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
index 16ca4a4236..50e6ccbb49 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue
@@ -121,6 +121,10 @@
   import { PoolOption, SelectValue } from '@/models/projectManagement/menuManagement';
   import { MenuEnum } from '@/enums/commonEnum';
 
+  defineOptions({
+    name: 'DefectSync',
+  });
+
   const { t } = useI18n();
   const props = defineProps<{
     visible: boolean;
diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
index 99a8ffe5ee..f785566eb2 100644
--- a/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
+++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/menuManagement.vue
@@ -799,7 +799,7 @@
   };
 
   // 点击展开
-  const handleRowClick = (record: TableData, ev: Event) => {
+  const handleRowClick = (record: TableData) => {
     if (record.module) {
       expandChange(record);
     }
diff --git a/frontend/src/views/setting/organization/member/locale/zh-CN.ts b/frontend/src/views/setting/organization/member/locale/zh-CN.ts
index fdaf47d36a..1febc73cba 100644
--- a/frontend/src/views/setting/organization/member/locale/zh-CN.ts
+++ b/frontend/src/views/setting/organization/member/locale/zh-CN.ts
@@ -1,7 +1,7 @@
 export default {
   'organization.member.addMember': '添加成员',
   'organization.member.updateMember': '更新成员（{name}）',
-  'organization.member.searchMember': '通过名称或邮箱搜索搜索',
+  'organization.member.searchMember': '通过名称或邮箱搜索',
   'organization.member.remove': '移除',
   'organization.member.edit': '编辑',
   'organization.member.batchActionAddProject': '添加至项目',
diff --git a/frontend/src/views/setting/organization/project/components/userDrawer.vue b/frontend/src/views/setting/organization/project/components/userDrawer.vue
index 56212427a1..4246a09e1c 100644
--- a/frontend/src/views/setting/organization/project/components/userDrawer.vue
+++ b/frontend/src/views/setting/organization/project/components/userDrawer.vue
@@ -142,6 +142,7 @@
       }
       Message.success(t('common.removeSuccess'));
       fetchData();
+      emit('requestFetchData');
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(error);
diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue
index feee0de17c..a049cb0be8 100644
--- a/frontend/src/views/setting/organization/project/orgProject.vue
+++ b/frontend/src/views/setting/organization/project/orgProject.vue
@@ -1,6 +1,9 @@
 <template>
   <MsCard simple>
-    <div class="mb-[16px] flex items-center justify-between">
+    <div
+      class="mb-[16px] flex items-center"
+      :class="{ 'justify-between': hasAddPermission, 'justify-end': !hasAddPermission }"
+    >
       <a-button v-permission="['ORGANIZATION_PROJECT:READ+ADD']" type="primary" @click="showAddProject">{{
         t('system.organization.createProject')
       }}</a-button>
@@ -124,6 +127,7 @@
   const { openDeleteModal, openModal } = useModal();
   const appStore = useAppStore();
   const currentOrgId = computed(() => appStore.currentOrgId);
+  const hasAddPermission = computed(() => hasAnyPermission(['ORGANIZATION_PROJECT:READ+ADD']));
   const hasOperationPermission = computed(() =>
     hasAnyPermission([
       'ORGANIZATION_PROJECT:READ+RECOVER',
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
index 04cc6150a3..6c8b54f2dd 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/userDrawer.vue
@@ -33,7 +33,7 @@
         <template #operation="{ record }">
           <MsRemoveButton
             :title="t('system.organization.removeName', { name: record.name })"
-            :sub-title-tip="t('system.organization.removeTip')"
+            :sub-title-tip="props.organizationId ? t('system.organization.removeTip') : t('system.project.removeTip')"
             @ok="handleRemove(record)"
           />
         </template>
@@ -160,10 +160,11 @@
         await deleteUserFromOrgOrProject(props.organizationId, record.id);
       }
       if (props.projectId) {
-        await deleteUserFromOrgOrProject(props.projectId, record.id, true);
+        await deleteUserFromOrgOrProject(props.projectId, record.id, false);
       }
       Message.success(t('common.removeSuccess'));
       fetchData();
+      emit('requestFetchData');
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(error);
diff --git a/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts b/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts
index a57e082679..41c780c389 100644
--- a/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts
+++ b/frontend/src/views/setting/system/organizationAndProject/locale/en-US.ts
@@ -73,4 +73,5 @@ export default {
   'system.project.createTip': 'After the project is enabled, it will be displayed in the project switching list',
   'system.project.affiliatedOrgRequired': 'Affiliated organization cannot be empty',
   'system.project.revokeDeleteToolTip': 'The project will be deleted automatically after 30 days',
+  'system.project.removeTip': "Remove it, and you'll lose access to the project.",
 };
diff --git a/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts b/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
index c180f7b88b..2ed29fb00a 100644
--- a/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/organizationAndProject/locale/zh-CN.ts
@@ -68,4 +68,5 @@ export default {
   'system.project.createTip': '项目启用后，将展示在项目切换列表',
   'system.project.affiliatedOrgRequired': '所属组织不能为空',
   'system.project.revokeDeleteToolTip': '该项目将于30 天后自动删除',
+  'system.project.removeTip': '移除后，将失去项目权限',
 };