Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit a669a60f by Finley Ge Committed by GitHub
Options

fix: collabrator (#4660) 

* fix: inherit permission of orgs

* fix: org members' permission bug
parent 25dc8984
Showing with 26 additions and 22 deletions
packages/service/support/permission/inheritPermission.ts
import { mongoSessionRun } from '../../common/mongo/sessionRun'; import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
import { MongoResourcePermission } from './schema'; import type { RequireOnlyOne } from '@fastgpt/global/common/type/utils';
import type { ClientSession, Model } from 'mongoose';
import type { PerResourceTypeEnum } from '@fastgpt/global/support/permission/constant'; import type { PerResourceTypeEnum } from '@fastgpt/global/support/permission/constant';
import type { PermissionValueType } from '@fastgpt/global/support/permission/type'; import type { PermissionValueType } from '@fastgpt/global/support/permission/type';
import type { ClientSession, Model } from 'mongoose';
import { mongoSessionRun } from '../../common/mongo/sessionRun';
import { getResourceClbsAndGroups } from './controller'; import { getResourceClbsAndGroups } from './controller';
import type { RequireOnlyOne } from '@fastgpt/global/common/type/utils'; import { MongoResourcePermission } from './schema';
import type { ParentIdType } from '@fastgpt/global/common/parentFolder/type';
export type SyncChildrenPermissionResourceType = { export type SyncChildrenPermissionResourceType = {
_id: string; _id: string;
...@@ -193,6 +193,7 @@ export async function syncCollaborators({ ...@@ -193,6 +193,7 @@ export async function syncCollaborators({
resourceType: resourceType, resourceType: resourceType,
tmbId: item.tmbId, tmbId: item.tmbId,
groupId: item.groupId, groupId: item.groupId,
orgId: item.orgId,
permission: item.permission permission: item.permission
})), })),
{ {
......
projects/app/src/components/support/permission/MemberManager/MemberModal.tsx
import Path from '@/components/common/folder/Path';
import { getTeamMembers } from '@/web/support/user/team/api';
import { getGroupList } from '@/web/support/user/team/group/api';
import useOrg from '@/web/support/user/team/org/hooks/useOrg';
import { useUserStore } from '@/web/support/user/useUserStore'; import { useUserStore } from '@/web/support/user/useUserStore';
import { ChevronDownIcon } from '@chakra-ui/icons'; import { ChevronDownIcon } from '@chakra-ui/icons';
import { Box, Button, Flex, Grid, HStack, ModalBody, ModalFooter, Text } from '@chakra-ui/react'; import { Box, Button, Flex, Grid, HStack, ModalBody, ModalFooter, Text } from '@chakra-ui/react';
import {
DEFAULT_ORG_AVATAR,
DEFAULT_TEAM_AVATAR,
DEFAULT_USER_AVATAR
} from '@fastgpt/global/common/system/constants';
import { UpdateClbPermissionProps } from '@fastgpt/global/support/permission/collaborator';
import { MemberGroupListItemType } from '@fastgpt/global/support/permission/memberGroup/type';
import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/constant'; import { DefaultGroupName } from '@fastgpt/global/support/user/team/group/constant';
import { OrgListItemType } from '@fastgpt/global/support/user/team/org/type';
import { TeamMemberItemType } from '@fastgpt/global/support/user/team/type';
import MyAvatar from '@fastgpt/web/components/common/Avatar'; import MyAvatar from '@fastgpt/web/components/common/Avatar';
import MyIcon from '@fastgpt/web/components/common/Icon'; import MyIcon from '@fastgpt/web/components/common/Icon';
import SearchInput from '@fastgpt/web/components/common/Input/SearchInput'; import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
import MyModal from '@fastgpt/web/components/common/MyModal'; import MyModal from '@fastgpt/web/components/common/MyModal';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import { ValueOf } from 'next/dist/shared/lib/constants';
import { useMemo, useRef, useState } from 'react'; import { useMemo, useRef, useState } from 'react';
import PermissionSelect from './PermissionSelect';
import {
DEFAULT_ORG_AVATAR,
DEFAULT_TEAM_AVATAR,
DEFAULT_USER_AVATAR
} from '@fastgpt/global/common/system/constants';
import Path from '@/components/common/folder/Path';
import { OrgListItemType } from '@fastgpt/global/support/user/team/org/type';
import { useContextSelector } from 'use-context-selector'; import { useContextSelector } from 'use-context-selector';
import { CollaboratorContext } from './context'; import { CollaboratorContext } from './context';
import { getTeamMembers } from '@/web/support/user/team/api';
import { getGroupList } from '@/web/support/user/team/group/api';
import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
import MemberItemCard from './MemberItemCard'; import MemberItemCard from './MemberItemCard';
import useOrg from '@/web/support/user/team/org/hooks/useOrg'; import PermissionSelect from './PermissionSelect';
import { TeamMemberItemType } from '@fastgpt/global/support/user/team/type';
import { MemberGroupListItemType } from '@fastgpt/global/support/permission/memberGroup/type';
import { UpdateClbPermissionProps } from '@fastgpt/global/support/permission/collaborator';
import { ValueOf } from 'next/dist/shared/lib/constants';
const HoverBoxStyle = { const HoverBoxStyle = {
bgColor: 'myGray.50', bgColor: 'myGray.50',
...@@ -348,6 +348,9 @@ function MemberModal({ ...@@ -348,6 +348,9 @@ function MemberModal({
const isChecked = !!selectedMemberList.find( const isChecked = !!selectedMemberList.find(
(v) => v.tmbId === member.tmbId (v) => v.tmbId === member.tmbId
); );
const collaborator = collaboratorList?.find(
(v) => v.tmbId === member.tmbId
);
return ( return (
<MemberItemCard <MemberItemCard
avatar={member.avatar} avatar={member.avatar}
...@@ -362,7 +365,7 @@ function MemberModal({ ...@@ -362,7 +365,7 @@ function MemberModal({
}); });
}} }}
isChecked={isChecked} isChecked={isChecked}
permission={member.permission.value} permission={collaborator?.permission.value}
addOnly={addOnly && !!member.permission.value} addOnly={addOnly && !!member.permission.value}
orgs={member.orgs} orgs={member.orgs}
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment