feat: Collection admins (#5273 #5273
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tommoor
commented
Apr 29, 2023
| allow(User, "delete", Collection, (user, collection) => { | ||
| allow( | ||
| User, | ||
| ["updateDocument", "createDocument", "deleteDocument"], |
There was a problem hiding this comment.
Note: All these new policies, separated from "read", "update" of collection itself.
| @@ -148,6 +148,21 @@ router.post("collections.info", auth(), async (ctx: APIContext) => { | |||
| }; | |||
| }); | |||
|
|
|||
| router.post("collections.documents", auth(), async (ctx: APIContext) => { | |||
There was a problem hiding this comment.
New endpoint for getting the collection structure, it will no longer be returned from collections.info and requires the "readDocument" permission which admins do not have by default.
| @@ -8,7 +8,9 @@ const DocumentsSortParamsSchema = z.object({ | |||
| /** Specifies the attributes by which documents will be sorted in the list */ | |||
| sort: z | |||
| .string() | |||
| .refine((val) => ["createdAt", "updatedAt", "index", "title"].includes(val)) | |||
| .refine((val) => | |||
| ["createdAt", "updatedAt", "publishedAt", "index", "title"].includes(val) | |||
There was a problem hiding this comment.
Unrelated bug I found, publishedAt is a valid sort option that was missing
| @@ -293,6 +293,10 @@ class WebsocketProvider extends React.Component<Props> { | |||
| collections.add(event); | |||
| }); | |||
|
|
|||
| this.socket.on("collections.update", (event: PartialWithId<Collection>) => { | |||
There was a problem hiding this comment.
collections.update now includes the entire model
| children: React.ReactNode; | ||
| }; | ||
|
|
||
| function DocumentsLoader({ collection, enabled, children }: Props) { |
There was a problem hiding this comment.
Move to suspense if we ever get to React 18 🤷
| return ( | ||
| this.documents.length === 0 && | ||
| this.store.rootStore.documents.inCollection(this.id).length === 0 | ||
| ); | ||
| } | ||
|
|
||
| 8000 | @computed | |
| get documentIds(): string[] { |
| } | ||
|
|
||
| return undefined; | ||
| return CollectionUser.findOrCreate({ |
There was a problem hiding this comment.
Creating a collection now always adds yourself with admin permissions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR separates the permission for creating and editing documents in a collection from the ability to manage the collection (manage users/groups, change title, change sort order etc). As part of this it also separates viewing the collection's details from it's contents… this has a couple of really nice benefits:
A follow up here will be to create UI for admins to view and manage collections in settings.
closes #3454
related #835