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: org CRUD #3380

Merged
merged 12 commits into from
Dec 30, 2024
Merged

feat: org CRUD #3380

merged 12 commits into from
Dec 30, 2024

Conversation

I-Info
Copy link
Contributor

@I-Info I-Info commented Dec 12, 2024

No description provided.

@c121914yu c121914yu force-pushed the v4.8.16-dev branch 3 times, most recently from 215a588 to bfac393 Compare December 16, 2024 05:49
@I-Info I-Info force-pushed the dev branch 2 times, most recently from 11219b1 to 44d0894 Compare December 18, 2024 06:08
@I-Info I-Info marked this pull request as draft December 18, 2024 06:12
@I-Info I-Info changed the title feat: add org schema feat: org CRUD Dec 24, 2024
@I-Info I-Info marked this pull request as ready for review December 24, 2024 08:28
@c121914yu c121914yu changed the base branch from v4.8.16-dev to org December 26, 2024 03:19
@I-Info I-Info force-pushed the dev branch 2 times, most recently from 50327fb to 7f7d93e Compare December 26, 2024 03:46
c121914yu
c121914yu reviewed Dec 26, 2024
View reviewed changes
packages/global/common/error/code/team.ts Outdated Show resolved Hide resolved
packages/global/support/permission/type.d.ts Outdated Show resolved Hide resolved
packages/global/support/user/team/org/constant.ts Outdated Show resolved Hide resolved
packages/global/support/user/team/org/constant.ts Outdated Show resolved Hide resolved
packages/global/support/user/team/org/api.d.ts Outdated Show resolved Hide resolved
projects/app/src/components/support/permission/MemberManager/AddMemberModal.tsx Outdated Show resolved Hide resolved
projects/app/src/components/support/permission/MemberManager/MemberListCard.tsx Outdated Show resolved Hide resolved
projects/app/src/components/support/permission/MemberManager/context.tsx Show resolved Hide resolved
projects/app/src/pages/account/team/components/OrgManage/OrgInfoModal.tsx
}
});

useEffect(() => {
Copy link
Collaborator

Choose a reason for hiding this comment

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

直接加到前面的 defaultValues 里

Copy link
Collaborator

Choose a reason for hiding this comment

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

这个别忘了

Copy link
Contributor Author

Choose a reason for hiding this comment

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

感觉不行，这个orgInfoModal是控制开关而不会销毁，default 后面不会生效了

projects/app/src/pages/account/team/components/OrgManage/index.tsx Outdated Show resolved Hide resolved
@c121914yu c121914yu changed the base branch from org to v4.8.18-dev December 30, 2024 03:55
@c121914yu c121914yu merged commit 4407c15 into labring:v4.8.18-dev Dec 30, 2024
3 checks passed
@I-Info I-Info deleted the dev branch December 30, 2024 06:11
c121914yu pushed a commit that referenced this pull request Dec 31, 2024
@I-Info @c121914yu
feat: org CRUD (#3380)
57bdaa3 
* feat: add org schema

* feat: org manage UI

* feat: OrgInfoModal

* feat: org tree view

* feat: org management

* fix: init root org

* feat: org permission for app

* feat: org support for dataset

* fix: disable org role control

* styles: opt type signatures

* fix: remove unused permission

* feat: delete org collaborator
c121914yu pushed a commit that referenced this pull request Jan 2, 2025
@I-Info @c121914yu
feat: org CRUD (#3380)
321c598 
* feat: add org schema

* feat: org manage UI

* feat: OrgInfoModal

* feat: org tree view

* feat: org management

* fix: init root org

* feat: org permission for app

* feat: org support for dataset

* fix: disable org role control

* styles: opt type signatures

* fix: remove unused permission

* feat: delete org collaborator
c121914yu pushed a commit that referenced this pull request Jan 5, 2025
@I-Info @c121914yu
feat: org CRUD (#3380)
c45f69a 
* feat: add org schema

* feat: org manage UI

* feat: OrgInfoModal

* feat: org tree view

* feat: org management

* fix: init root org

* feat: org permission for app

* feat: org support for dataset

* fix: disable org role control

* styles: opt type signatures

* fix: remove unused permission

* feat: delete org collaborator
c121914yu pushed a commit that referenced this pull request Jan 6, 2025
@I-Info @c121914yu
feat: org CRUD (#3380)
1fc77a1 
* feat: add org schema

* feat: org manage UI

* feat: OrgInfoModal

* feat: org tree view

* feat: org management

* fix: init root org

* feat: org permission for app

* feat: org support for dataset

* fix: disable org role control

* styles: opt type signatures

* fix: remove unused permission

* feat: delete org collaborator
c121914yu added a commit that referenced this pull request Jan 11, 2025
@c121914yu @I-Info
@FinleyGe @newfish-cmyk @Jiangween
V4.8.18 feature (#3565)
10d8c56 
* feat: org CRUD (#3380)

* feat: add org schema

* feat: org manage UI

* feat: OrgInfoModal

* feat: org tree view

* feat: org management

* fix: init root org

* feat: org permission for app

* feat: org support for dataset

* fix: disable org role control

* styles: opt type signatures

* fix: remove unused permission

* feat: delete org collaborator

* perf: Team org ui (#3499)

* perf: org ui

* perf: org ui

* feat: org auth for app & dataset (#3498)

* feat: auth org resource permission

* feat: org auth support for app & dataset

* perf: org permission check (#3500)

* i18n (#3501)

* name

* i18n

* feat: support dataset changeOwner (#3483)

* feat: support dataset changeOwner

* chore: update dataset change owner api

* feat: permission manage UI for org (#3503)

* perf: password check;perf: image upload check;perf: sso login check (#3509)

* perf: password check

* perf: image upload check

* perf: sso login check

* force show update notification modal & fix login page text (#3512)

* fix login page English text

* update notification modal

* perf: notify account (#3515)

* perf(plugin): improve searXNG empty result handling and documentation (#3507)

* perf(plugin): improve searXNG empty result handling and documentation

* 修改了文档和代码部分无搜索的结果的反馈

* refactor: org pathId (#3516)

* optimize payment process (#3517)

* feat: support wecom sso (#3518)

* feat: support wecom sso

* chore: remove unused wecom js-sdk dependency

* fix qrcode script (#3520)

* fix qrcode script

* i18n

* perf: full text collection and search code;perf: rename function (#3519)

* perf: full text collection and search code

* perf: rename function

* perf: notify modal

* remove invalid code

* perf: sso login

* perf: pay process

* 4.8.18 test (#3524)

* perf: remove local token

* perf: index

* perf: file encoding;perf: leave team code;@c121914yu perf: full text search code (#3528)

* perf: text encoding

* perf: leave team code

* perf: full text search code

* fix: http status

* perf: embedding search and vector avatar

* perf: async read file (#3531)

* refactor: team permission  manager (#3535)

* perf: classify org, group and member

* refactor: team per manager

* fix: missing functions

* 4.8.18 test (#3543)

* perf: login check

* doc

* perf: llm model config

* perf: team clb config

* fix: MemberModal UI (#3553)

* fix: adapt MemberModal title and icon

* fix: adapt member modal

* fix: search input placeholder

* fix: add button text

* perf: org permission (#3556)

* docs:用户答疑的官方文档补充 (#3540)

* docs:用户答疑的官方文档补充

* 问题回答的内容修补

* share link random avatar (#3541)

* share link random avatar

* fix

* delete unused code

* share page avatar (#3558)

* feat: init 4818

* share page avatar

* feat: tmp upgrade code (#3559)

* feat: tmp upgrade code

* fulltext search test

* update action

* full text tmp code (#3561)

* full text tmp code

* fix: init

* fix: init

* remove tmp code

* remove tmp code

* 4818-alpha

* 4.8.18 test (#3562)

* full text tmp code

* fix: init

* upgrade code

* account log

* account log

* perf: dockerfile

* upgrade code

* chore: update docs app template submission (#3564)

---------

Co-authored-by: a.e. <[email protected]>
Co-authored-by: Finley Ge <[email protected]>
Co-authored-by: heheer <[email protected]>
Co-authored-by: Jiangween <[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
@I-Info @c121914yu