fix: 1.3-beta版本，超级管理员(admin）账户无法修改分类和添加子分类，页面显示无权限操作 (#164)

Author: scarqin

frontend/packages/common/src/components/aoplatform/WithPermission.tsx

@@ -1,8 +1,8 @@
+import { PERMISSION_DEFINITION } from '@common/const/permissions'
+import { $t } from '@common/locales'
 import { Button, Tooltip, Upload } from 'antd'
 import { ReactElement, cloneElement, useEffect, useMemo, useState } from 'react'
 import { useGlobalContext } from '../../contexts/GlobalStateContext'
-import { PERMISSION_DEFINITION } from '@common/const/permissions'
-import { $t } from '@common/locales'
 
 type WithPermissionProps = {
   access?: string | string[]

frontend/packages/common/src/utils/permission.ts

@@ -18,7 +18,11 @@ export const checkAccess: (access: AccessDataType, accessData: Map<string, strin
   if (accLevel === 'team') {
     accessSet = new Set(Array.from(accessSet).concat(accessData?.get('team') || []))
   }
-  return accessSet!.size > 0 ? hasIntersection(neededBackendAccessArr, accessSet) : false
+  if (!accessSet!.size) {
+    return false
+  }
+  const hasAccess = hasIntersection(neededBackendAccessArr, accessSet)
+  return hasAccess
 }
 
 const hasIntersection = (arr1: string[], set1: Set<string>) => {

frontend/packages/core/src/App.tsx

@@ -151,15 +151,15 @@ function App() {
         form={{ validateMessages }}
       >
         <PluginEventHubProvider>
-          <AppAntd className="h-full" message={{ maxCount: 1 }}>
-            <PluginSlotHubProvider>
-              <GlobalProvider>
+          <GlobalProvider>
+            <AppAntd className="h-full" message={{ maxCount: 1 }}>
+              <PluginSlotHubProvider>
                 <BreadcrumbProvider>
                   <RenderRoutes />
                 </BreadcrumbProvider>
-              </GlobalProvider>
-            </PluginSlotHubProvider>
-          </AppAntd>
+              </PluginSlotHubProvider>
+            </AppAntd>
+          </GlobalProvider>
         </PluginEventHubProvider>
       </ConfigProvider>
     </StyleProvider>

frontend/packages/core/src/pages/common/ServiceCategory.tsx

@@ -28,7 +28,7 @@ export default function ServiceCategory() {
   const { accessData } = useGlobalContext()
   const [loading, setLoading] = useState<boolean>(false)
 
-  const onDrop: TreeProps['onDrop'] = info => {
+  const onDrop: TreeProps['onDrop'] = (info) => {
     const dropKey = info.node.key
     const dragKey = info.dragNode.key
     const dropPos = info.node.pos.split('-')
@@ -59,7 +59,7 @@ export default function ServiceCategory() {
 
     if (!info.dropToGap) {
       // Drop on the content
-      loop(data, dropKey, item => {
+      loop(data, dropKey, (item) => {
         item.children = item.children || []
         // where to insert. New item was inserted to the start of the array in this example, but can be anywhere
         item.children.unshift(dragObj)
@@ -129,9 +129,9 @@ export default function ServiceCategory() {
   const treeData = useMemo(() => {
     setExpandedKeys([])
     const loop = (data: CategorizesType[]): DataNode[] =>
-      data?.map(item => {
+      data?.map((item) => {
         if (item.children) {
-          setExpandedKeys(prev => [...prev, item.id])
+          setExpandedKeys((prev) => [...prev, item.id])
           return {
             title: (
               <TreeWithMore stopClick={false} dropdownMenu={dropdownMenu(item as CategorizesType)}>
@@ -169,40 +169,22 @@ export default function ServiceCategory() {
     return !checkAccess(permission, accessData)
   }
 
-  const openModal = (
-    type: 'addCate' | 'addChildCate' | 'renameCate' | 'delete',
-    entity?: CategorizesType
-  ) => {
+  const openModal = (type: 'addCate' | 'addChildCate' | 'renameCate' | 'delete', entity?: CategorizesType) => {
     let title: string = ''
     let content: string | React.ReactNode = ''
     switch (type) {
-      case 'addCate':
+      case 'addCate': {
         title = $t('添加分类')
-        content = (
-          <ServiceHubCategoryConfig WithPermission={WithPermission} ref={addRef} type={type} />
-        )
+        content = <ServiceHubCategoryConfig ref={addRef} type={type} />
         break
+      }
       case 'addChildCate':
         title = $t('添加子分类')
-        content = (
-          <ServiceHubCategoryConfig
-            WithPermission={WithPermission}
-            ref={addChildRef}
-            type={type}
-            entity={entity}
-          />
-        )
+        content = <ServiceHubCategoryConfig ref={addChildRef} type={type} entity={entity} />
         break
       case 'renameCate':
         title = $t('重命名分类')
-        content = (
-          <ServiceHubCategoryConfig
-            WithPermission={WithPermission}
-            ref={renameRef}
-            type={type}
-            entity={entity}
-          />
-        )
+        content = <ServiceHubCategoryConfig ref={renameRef} type={type} entity={entity} />
         break
       case 'delete':
         title = $t('删除')
@@ -215,19 +197,19 @@ export default function ServiceCategory() {
       onOk: () => {
         switch (type) {
           case 'addCate':
-            return addRef.current?.save().then(res => {
+            return addRef.current?.save().then((res) => {
               if (res === true) getCategoryList()
             })
           case 'addChildCate':
-            return addChildRef.current?.save().then(res => {
+            return addChildRef.current?.save().then((res) => {
               if (res === true) getCategoryList()
             })
           case 'renameCate':
-            return renameRef.current?.save().then(res => {
+            return renameRef.current?.save().then((res) => {
               if (res === true) getCategoryList()
             })
           case 'delete':
-            return deleteCate(entity!).then(res => {
+            return deleteCate(entity!).then((res) => {
               if (res === true) getCategoryList()
             })
         }
@@ -249,7 +231,7 @@ export default function ServiceCategory() {
         method: 'DELETE',
         eoParams: { catalogue: entity.id }
       })
-        .then(response => {
+        .then((response) => {
           const { code, msg } = response
           if (code === STATUS_CODE.SUCCESS) {
             message.success(msg || $t(RESPONSE_TIPS.success))
@@ -259,14 +241,14 @@ export default function ServiceCategory() {
             reject(msg || $t(RESPONSE_TIPS.error))
           }
         })
-        .catch(errorInfo => reject(errorInfo))
+        .catch((errorInfo) => reject(errorInfo))
     })
   }
 
   const sortCategories = (newData: CategorizesType[]) => {
     setLoading(true)
     fetchData<BasicResponse<null>>('catalogue/sort', { method: 'PUT', eoBody: newData })
-      .then(response => {
+      .then((response) => {
         const { code, msg } = response
         if (code === STATUS_CODE.SUCCESS) {
           getCategoryList()
@@ -288,7 +270,7 @@ export default function ServiceCategory() {
     fetchData<BasicResponse<{ catalogues: CategorizesType[]; tags: EntityItem[] }>>('catalogues', {
       method: 'GET'
     })
-      .then(response => {
+      .then((response) => {
         const { code, data, msg } = response
         if (code === STATUS_CODE.SUCCESS) {
           setGData(data.catalogues)
@@ -308,11 +290,7 @@ export default function ServiceCategory() {
 
   return (
     <div className="border border-solid border-BORDER p-[20px] rounded-[10px] ">
-      <Spin
-        indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />}
-        spinning={loading}
-        className=""
-      >
+      <Spin indicator={<LoadingOutlined style={{ fontSize: 24 }} spin />} spinning={loading} className="">
         <Tree
           showIcon
           draggable