Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(member-group): Team #2616

Merged
merged 12 commits into from
Sep 13, 2024
Merged

feat(member-group): Team #2616

merged 12 commits into from
Sep 13, 2024

Conversation

FinleyGe
Copy link
Contributor

@FinleyGe FinleyGe commented Sep 4, 2024

  • feat: member-group schema define
  • feat(fe): create group
  • feat: add group edit modal
  • feat(fe): add avatar group component
  • feat: edit group fix: permission select menu style
  • feat: bio-mode support for select-member component
  • fix: avatar group key unique
  • feat: group manage
  • feat: divide member into group and clbs
  • feat: finish team permission

member group for team.

@FinleyGe FinleyGe changed the title feat(member gropp): Team feat(member-group): Team Sep 4, 2024
@FinleyGe FinleyGe force-pushed the member-group branch 2 times, most recently from 8dce4f6 to a4d0f6e Compare September 10, 2024 06:16
c121914yu
c121914yu reviewed Sep 12, 2024
View reviewed changes
packages/service/support/permission/schema.ts Outdated Show resolved Hide resolved
packages/service/support/user/team/controller.ts Outdated Show resolved Hide resolved
packages/service/support/user/team/controller.ts Outdated Show resolved Hide resolved
projects/app/src/components/support/permission/MemberManager/PermissionSelect.tsx Outdated Show resolved Hide resolved
...s/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx Outdated Show resolved Hide resolved
...s/app/src/components/support/user/team/TeamManageModal/components/PermissionManage/index.tsx Outdated Show resolved Hide resolved
projects/app/src/components/support/user/team/TeamManageModal/components/SelectMember.tsx Outdated Show resolved Hide resolved
@FinleyGe FinleyGe marked this pull request as ready for review September 12, 2024 07:25
@c121914yu
Copy link
Collaborator

🤖 Generated by deploy action

👀 Visit Preview

@c121914yu c121914yu changed the base branch from main to 4.8.11 September 13, 2024 02:46
@c121914yu c121914yu changed the base branch from 4.8.11 to team-group September 13, 2024 05:45
@FinleyGe FinleyGe force-pushed the member-group branch 4 times, most recently from 5e8ba2e to c7d163d Compare September 13, 2024 09:21
c121914yu
c121914yu reviewed Sep 13, 2024
View reviewed changes
packages/service/support/permission/controller.ts Outdated
return MongoResourcePermission.find(
{
resourceId,
resourceType: resourceType,
teamId: teamId
teamId: teamId,
groupId: null
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为啥要加个 null，，undefined 岂不是找不到了

@c121914yu c121914yu merged commit 41f9ce4 into labring:team-group Sep 13, 2024
3 checks passed
c121914yu pushed a commit that referenced this pull request Sep 13, 2024
@FinleyGe @c121914yu
feat(member-group): Team (#2616)
e194eea 
* feat: member-group schema define

* feat(fe): create group

* feat: add group edit modal

* feat(fe): add avatar group component

* feat: edit group
fix: permission select menu style

* feat: bio-mode support for select-member component

* fix: avatar group key unique

* feat: group manage

* feat: divide member into group and clbs

* feat: finish team permission

* chore: adjust

* fix: get clbs
c121914yu pushed a commit that referenced this pull request Oct 9, 2024
@FinleyGe @c121914yu
feat(member-group): Team (#2616)
1b56bd4 
* feat: member-group schema define

* feat(fe): create group

* feat: add group edit modal

* feat(fe): add avatar group component

* feat: edit group
fix: permission select menu style

* feat: bio-mode support for select-member component

* fix: avatar group key unique

* feat: group manage

* feat: divide member into group and clbs

* feat: finish team permission

* chore: adjust

* fix: get clbs
c121914yu pushed a commit that referenced this pull request Oct 9, 2024
@FinleyGe @c121914yu
feat(member-group): Team (#2616)
6ef80d7 
* feat: member-group schema define

* feat(fe): create group

* feat: add group edit modal

* feat(fe): add avatar group component

* feat: edit group
fix: permission select menu style

* feat: bio-mode support for select-member component

* fix: avatar group key unique

* feat: group manage

* feat: divide member into group and clbs

* feat: finish team permission

* chore: adjust

* fix: get clbs
c121914yu added a commit that referenced this pull request Oct 9, 2024
@c121914yu @FinleyGe
Team group (#2864)
3a4b4a8 
* feat(member-group): Team (#2616)

* feat: member-group schema define

* feat(fe): create group

* feat: add group edit modal

* feat(fe): add avatar group component

* feat: edit group
fix: permission select menu style

* feat: bio-mode support for select-member component

* fix: avatar group key unique

* feat: group manage

* feat: divide member into group and clbs

* feat: finish team permission

* chore: adjust

* fix: get clbs

* perf: groups code

* pref: member group for team (#2706)

* chore: fe adjust
fix: remove the member from groups when removing from team
feat: change the groups avatar when updating the team's avatar

* chore: DefaultGroupName as a constant string ''

* fix: create default group when create team for root

* feat: comment

* feat: 4811 init

* pref: member group for team (#2732)

* chore: default group name

* feat: get default group when get by tmbid

* feat(fe): adjust

* member ui

* fix: delete group (#2736)

* perf: init4811

* pref: member group (#2818)

* fix: update clb per then refetch clb list

* fix: calculate group permission

* feat(fe): group tag

* refactor(fe): team and group manage

* feat: manage group member

* feat: add group transfer owner modal

* feat: group manage member

* chore: adjust the file structure

* pref: member group

* chore: adjust fe style

* fix: ts error

* chore: fe adjust

* chore: fe adjust

* chore: adjust

* chore: adjust the code

* perf: i18n and schema name

* pref: member-group (#2862)

* feat: group list ordered by updateTime

* fix: transfer ownership of group when deleting member

* fix: i18n fix

* feat: can not set member as admin/owner when user is not active

* fix: GroupInfoModal hover input do not change color

* fix(fe): searchinput do not scroll

* perf: team group ui

* doc

* remove enum

---------

Co-authored-by: Finley Ge <[email protected]>
shilin66 pushed a commit to shilin66/FastGPT that referenced this pull request Oct 12, 2024
@c121914yu @FinleyGe @shilin66
Team group (labring#2864)
afc9009 
* feat(member-group): Team (labring#2616)

* feat: member-group schema define

* feat(fe): create group

* feat: add group edit modal

* feat(fe): add avatar group component

* feat: edit group
fix: permission select menu style

* feat: bio-mode support for select-member component

* fix: avatar group key unique

* feat: group manage

* feat: divide member into group and clbs

* feat: finish team permission

* chore: adjust

* fix: get clbs

* perf: groups code

* pref: member group for team (labring#2706)

* chore: fe adjust
fix: remove the member from groups when removing from team
feat: change the groups avatar when updating the team's avatar

* chore: DefaultGroupName as a constant string ''

* fix: create default group when create team for root

* feat: comment

* feat: 4811 init

* pref: member group for team (labring#2732)

* chore: default group name

* feat: get default group when get by tmbid

* feat(fe): adjust

* member ui

* fix: delete group (labring#2736)

* perf: init4811

* pref: member group (labring#2818)

* fix: update clb per then refetch clb list

* fix: calculate group permission

* feat(fe): group tag

* refactor(fe): team and group manage

* feat: manage group member

* feat: add group transfer owner modal

* feat: group manage member

* chore: adjust the file structure

* pref: member group

* chore: adjust fe style

* fix: ts error

* chore: fe adjust

* chore: fe adjust

* chore: adjust

* chore: adjust the code

* perf: i18n and schema name

* pref: member-group (labring#2862)

* feat: group list ordered by updateTime

* fix: transfer ownership of group when deleting member

* fix: i18n fix

* feat: can not set member as admin/owner when user is not active

* fix: GroupInfoModal hover input do not change color

* fix(fe): searchinput do not scroll

* perf: team group ui

* doc

* remove enum

---------

Co-authored-by: Finley Ge <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c121914yu c121914yu c121914yu approved these changes

Assignees
No one assigned
Labels
size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FinleyGe @c121914yu