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.

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

feat(clerk-js): Use Gate in OrganizationSettings #1850

Merged
merged 2 commits into from
Oct 13, 2023
Merged

Conversation

panteliselef
Copy link
Member

@panteliselef panteliselef commented Oct 10, 2023

Description

This PR replaces the role based check with permission based checks inside the OrganizationSettings component

Checklist

  • npm test runs as expected.
  • npm run build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Packages affected

  • @clerk/clerk-js
  • @clerk/clerk-react
  • @clerk/nextjs
  • @clerk/remix
  • @clerk/types
  • @clerk/themes
  • @clerk/localizations
  • @clerk/clerk-expo
  • @clerk/backend
  • @clerk/clerk-sdk-node
  • @clerk/shared
  • @clerk/fastify
  • @clerk/chrome-extension
  • gatsby-plugin-clerk
  • build/tooling/chore

@panteliselef panteliselef self-assigned this Oct 10, 2023
@panteliselef panteliselef requested a review from a team as a code owner October 10, 2023 08:15
@changeset-bot
Copy link

changeset-bot bot commented Oct 10, 2023

🦋 Changeset detected

Latest commit: 41e7308

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@clerk/clerk-js Patch
@clerk/chrome-extension Patch
@clerk/clerk-expo Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@@ -131,10 +133,11 @@ const OrganizationDangerSection = () => {
colorScheme='danger'
textVariant='buttonExtraSmallBold'
onClick={() => navigate('leave')}
isDisabled={isAdmin && !hasMoreThanOneAdmin}
// TODO: rewrite to check if user has all clerk permissions and there are more than 1 admins
isDisabled={!!canDeleteOrganization && !hasMoreThanOneAdmin}
Copy link
Member

Choose a reason for hiding this comment

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

We can drop the hasMoreThanOneAdmin check and rely on the BE in order to allow or block this action. It's good enough for now to keep it disabled if setting is not enabled or the user doesn't have the proper permission

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct, this is a leftover, will update it asap

@panteliselef panteliselef force-pushed the ORG-249-settings branch 2 times, most recently from 7746694 to 9b424bc Compare October 13, 2023 08:15
@panteliselef panteliselef added this pull request to the merge queue Oct 13, 2023
Merged via the queue into main with commit e1e5d37 Oct 13, 2023
11 of 12 checks passed
@panteliselef panteliselef deleted the ORG-249-settings branch October 13, 2023 11:55
@clerk-cookie clerk-cookie mentioned this pull request Oct 13, 2023
@clerk-cookie
Copy link
Collaborator

This PR has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@clerk clerk locked as resolved and limited conversation to collaborators Oct 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants