Merge next into main for v6 Release #1628
Merged
Conversation
This file contains 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
However, use generic type to set depth of recursion
Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
Configure admin-routes and -menu in single "RouteMenu" data-structure
…cope Migrate ContentScope-Module to UserPermissionsModule
Remove role- and domain-fields from CurrentUser
In real applications the UserService will be provided externally, so seperating the concerns make sense.
…ntrol-service Move calculating permissions to AccessControlService
as this can be handled purely by content-scopes
…ation Also rename base class
Remove domains from CurrentUser
The `core-without-import.js` file was originally added to fix a problem with the `next/core-web-vitals` config that caused duplicate `import` plugins. This problem doesn't exist anymore in our current setup, so we may remove the extra file. This also prevents forgetting about adding new rules to both files.
…` and `shouldShowFieldWarning` in `FinalFormContext` to match the corresponding methods in `Field` (#1570) The API in `FinalFormContext` was changed from ```tsx // ❌ export interface FinalFormContext { shouldScrollToField: ({ fieldMeta }: { fieldMeta: FieldMetaState<any> }) => boolean; shouldShowFieldError: ({ fieldMeta }: { fieldMeta: FieldMetaState<any> }) => boolean; shouldShowFieldWarning: ({ fieldMeta }: { fieldMeta: FieldMetaState<any> }) => boolean; } ``` to ```tsx // ✅ export interface FinalFormContext { shouldScrollToField: (fieldMeta: FieldMetaState<any>) => boolean; shouldShowFieldError: (fieldMeta: FieldMetaState<any>) => boolean; shouldShowFieldWarning: (fieldMeta: FieldMetaState<any>) => boolean; } ```
Merge main into next
The sites config was previously assumed to be `Record<string, SiteConfg`. However, as the sites config is solely used in application code, it could be of any shape. Therefore, the `SitesConfigProvider` and `useSitesConfig` are made generic. --------- Co-authored-by: Niko Sams <niko.sams@gmail.com>
Merge main into next
The contentScopes now have to be checked for every permission individually.
thomasdax98
changed the title
thomasdax98
commented
Jan 29, 2024
thomasdax98
changed the title
Merge main into next
johnnyomair
previously approved these changes
Jan 30, 2024
Co-authored-by: Franz Unger <franz.unger@vivid-planet.com> Co-authored-by: Johannes Obermair <48853629+johnnyomair@users.noreply.github.com>
johnnyomair
approved these changes
Jan 30, 2024
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.
Migration Guide: #1629