-
Notifications
You must be signed in to change notification settings - Fork 13k
regression(ABAC): Add missing attribute value in use validation to form #37859
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
200fd4d
fix: Show disclaimer when attribute value removal is not possible
MartinSchoeler d184806
fix: route to rooms tab when viewing rooms with attribute value in use
MartinSchoeler fc10e5d
tests: fix & add tests
MartinSchoeler af912e8
Use named export
tassoevan 0709009
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] beca60e
Merge branch 'develop' into abac/prevent-remove
MartinSchoeler 13bde81
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] 778d461
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] 4328298
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] 78befc6
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] b94414d
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] 855ff8d
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] f32287d
Merge branch 'develop' into abac/prevent-remove
kodiakhq[bot] File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
23 changes: 23 additions & 0 deletions
23
apps/meteor/client/views/admin/ABAC/hooks/useViewRoomsAction.ts
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; | ||
| import { useRouter } from '@rocket.chat/ui-contexts'; | ||
|
|
||
| export const useViewRoomsAction = () => { | ||
| const router = useRouter(); | ||
| return useEffectEvent((key: string) => { | ||
| return router.navigate( | ||
| { | ||
| name: 'admin-ABAC', | ||
| params: { | ||
| tab: 'rooms', | ||
| context: '', | ||
| id: '', | ||
| }, | ||
| search: { | ||
| searchTerm: key, | ||
| type: 'attribute', | ||
| }, | ||
| }, | ||
| { replace: true }, | ||
| ); | ||
| }); | ||
| }; |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.