From 57bf54f790be91a9df69c5a37b192289b6fd2596 Mon Sep 17 00:00:00 2001 From: panteliselef Date: Fri, 10 Nov 2023 14:45:03 +0200 Subject: [PATCH] chore(clerk-js,clerk-react): Replace useCoreOrganization with useOrganization this also include useOrganizationList --- .changeset/fifty-seals-impress.md | 2 ++ .../CreateOrganizationForm.tsx | 6 +++--- .../OrganizationList/OrganizationListPage.tsx | 11 ++++++----- .../OrganizationList/UserInvitationList.tsx | 5 +++-- .../OrganizationList/UserMembershipList.tsx | 8 ++++---- .../OrganizationList/UserSuggestionList.tsx | 4 ++-- .../components/OrganizationList/utils.ts | 4 ++-- .../ActionConfirmationPage.tsx | 8 ++++---- .../OrganizationProfile/ActiveMembersList.tsx | 5 ++--- .../OrganizationProfile/AddDomainPage.tsx | 5 +++-- .../OrganizationProfile/DomainList.tsx | 4 ++-- .../OrganizationProfile/InviteMembersForm.tsx | 4 ++-- .../OrganizationProfile/InviteMembersPage.tsx | 6 ++++-- .../OrganizationProfile/InvitedMembersList.tsx | 4 ++-- .../OrganizationProfile/MembershipWidget.tsx | 6 ++++-- .../OrganizationProfile/OrganizationMembers.tsx | 6 ++++-- .../OrganizationProfile/OrganizationProfile.tsx | 6 +++--- .../OrganizationProfileNavbar.tsx | 5 +++-- .../OrganizationProfile/OrganizationSettings.tsx | 10 ++++++---- .../OrganizationProfile/ProfileSettingsPage.tsx | 4 ++-- .../OrganizationProfile/RemoveDomainPage.tsx | 7 ++++--- .../OrganizationProfile/RequestToJoinList.tsx | 6 +++--- .../OrganizationProfile/VerifiedDomainPage.tsx | 5 +++-- .../OrganizationProfile/VerifyDomainPage.tsx | 5 +++-- .../OrganizationSwitcherPopover.tsx | 16 +++++----------- .../OrganizationSwitcherTrigger.tsx | 15 +++++---------- .../UserInvitationSuggestionList.tsx | 8 ++++---- .../OrganizationSwitcher/UserMembershipList.tsx | 8 ++++---- .../components/OrganizationSwitcher/utils.ts | 5 ++--- .../contexts/CoreClerkContextWrapper.tsx | 7 +++---- .../contexts/CoreOrganizationContext.tsx | 6 ------ .../clerk-js/src/ui-retheme/contexts/index.ts | 1 - .../hooks/__tests__/useCoreOrganization.test.tsx | 14 ++++---------- .../__tests__/useCoreOrganizationList.test.tsx | 13 ++++++------- .../src/ui-retheme/hooks/useFetchRoles.ts | 5 +++-- .../react/src/contexts/OrganizationContext.tsx | 2 +- packages/react/src/hooks/index.ts | 4 +--- packages/react/src/hooks/useOrganization.ts | 1 - packages/react/src/hooks/useOrganizationList.ts | 1 - 39 files changed, 114 insertions(+), 128 deletions(-) create mode 100644 .changeset/fifty-seals-impress.md delete mode 100644 packages/clerk-js/src/ui-retheme/contexts/CoreOrganizationContext.tsx delete mode 100644 packages/react/src/hooks/useOrganization.ts delete mode 100644 packages/react/src/hooks/useOrganizationList.ts diff --git a/.changeset/fifty-seals-impress.md b/.changeset/fifty-seals-impress.md new file mode 100644 index 00000000000..a845151cc84 --- /dev/null +++ b/.changeset/fifty-seals-impress.md @@ -0,0 +1,2 @@ +--- +--- diff --git a/packages/clerk-js/src/ui-retheme/components/CreateOrganization/CreateOrganizationForm.tsx b/packages/clerk-js/src/ui-retheme/components/CreateOrganization/CreateOrganizationForm.tsx index c5cbfceef8a..6ad0557d02d 100644 --- a/packages/clerk-js/src/ui-retheme/components/CreateOrganization/CreateOrganizationForm.tsx +++ b/packages/clerk-js/src/ui-retheme/components/CreateOrganization/CreateOrganizationForm.tsx @@ -1,8 +1,8 @@ +import { useOrganization, useOrganizationList } from '@clerk/shared/react'; import type { OrganizationResource } from '@clerk/types'; import React from 'react'; import { useWizard, Wizard } from '../../common'; -import { useCoreOrganization, useCoreOrganizationList } from '../../contexts'; import { Icon } from '../../customizables'; import { ContentPage, Form, FormButtonContainer, IconButton, SuccessPage, useCardState } from '../../elements'; import { QuestionMark, Upload } from '../../icons'; @@ -30,8 +30,8 @@ export const CreateOrganizationForm = (props: CreateOrganizationFormProps) => { const wizard = useWizard({ onNextStep: () => card.setError(undefined) }); const lastCreatedOrganizationRef = React.useRef(null); - const { createOrganization, isLoaded, setActive } = useCoreOrganizationList(); - const { organization } = useCoreOrganization(); + const { createOrganization, isLoaded, setActive } = useOrganizationList(); + const { organization } = useOrganization(); const [file, setFile] = React.useState(); const nameField = useFormControl('name', '', { diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationList/OrganizationListPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationList/OrganizationListPage.tsx index 509eb62abd4..c94da2f10af 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationList/OrganizationListPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationList/OrganizationListPage.tsx @@ -1,6 +1,7 @@ +import { useOrganizationList } from '@clerk/shared/react'; import { useState } from 'react'; -import { useCoreOrganizationList, useEnvironment, useOrganizationListContext } from '../../contexts'; +import { useEnvironment, useOrganizationListContext } from '../../contexts'; import { Box, Button, Col, descriptors, Flex, localizationKeys, Spinner } from '../../customizables'; import { Card, CardAlert, Divider, Header, useCardState, withCardStateProvider } from '../../elements'; import { useInView } from '../../hooks'; @@ -11,8 +12,8 @@ import { MembershipPreview, PersonalAccountPreview } from './UserMembershipList' import { SuggestionPreview } from './UserSuggestionList'; import { organizationListParams } from './utils'; -const useCoreOrganizationListInView = () => { - const { userMemberships, userInvitations, userSuggestions } = useCoreOrganizationList(organizationListParams); +const useOrganizationListInView = () => { + const { userMemberships, userInvitations, userSuggestions } = useOrganizationList(organizationListParams); const { ref } = useInView({ threshold: 0, @@ -40,7 +41,7 @@ const useCoreOrganizationListInView = () => { export const OrganizationListPage = withCardStateProvider(() => { const card = useCardState(); - const { userMemberships, userSuggestions, userInvitations } = useCoreOrganizationListInView(); + const { userMemberships, userSuggestions, userInvitations } = useOrganizationListInView(); const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading; const hasAnyData = !!(userMemberships?.count || userInvitations?.count || userSuggestions?.count); @@ -117,7 +118,7 @@ const OrganizationListFlows = ({ showListInitially }: { showListInitially: boole const OrganizationListPageList = (props: { onCreateOrganizationClick: () => void }) => { const environment = useEnvironment(); - const { ref, userMemberships, userSuggestions, userInvitations } = useCoreOrganizationListInView(); + const { ref, userMemberships, userSuggestions, userInvitations } = useOrganizationListInView(); const { hidePersonal } = useOrganizationListContext(); const isLoading = userMemberships?.isLoading || userInvitations?.isLoading || userSuggestions?.isLoading; diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserInvitationList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserInvitationList.tsx index 5fc91c5f526..def987a0f85 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserInvitationList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserInvitationList.tsx @@ -1,7 +1,8 @@ +import { useOrganizationList } from '@clerk/shared/react'; import type { OrganizationResource, UserOrganizationInvitationResource } from '@clerk/types'; import { useState } from 'react'; -import { useCoreClerk, useCoreOrganizationList } from '../../contexts'; +import { useCoreClerk } from '../../contexts'; import { localizationKeys } from '../../customizables'; import { useCardState, withCardStateProvider } from '../../elements'; import { handleError } from '../../utils'; @@ -26,7 +27,7 @@ export const InvitationPreview = withCardStateProvider((props: UserOrganizationI const card = useCardState(); const { getOrganization } = useCoreClerk(); const [acceptedOrganization, setAcceptedOrganization] = useState(null); - const { userInvitations } = useCoreOrganizationList({ + const { userInvitations } = useOrganizationList({ userInvitations: organizationListParams.userInvitations, }); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserMembershipList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserMembershipList.tsx index 9f3666050ab..b834713d398 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserMembershipList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserMembershipList.tsx @@ -1,7 +1,7 @@ -import { useUser } from '@clerk/shared/react'; +import { useOrganizationList, useUser } from '@clerk/shared/react'; import type { OrganizationResource } from '@clerk/types'; -import { useCoreOrganizationList, useOrganizationListContext } from '../../contexts'; +import { useOrganizationListContext } from '../../contexts'; import { OrganizationPreview, PersonalWorkspacePreview, useCardState, withCardStateProvider } from '../../elements'; import { localizationKeys } from '../../localization'; import { OrganizationListPreviewButton, sharedMainIdentifierSx } from './shared'; @@ -9,7 +9,7 @@ import { OrganizationListPreviewButton, sharedMainIdentifierSx } from './shared' export const MembershipPreview = withCardStateProvider((props: { organization: OrganizationResource }) => { const card = useCardState(); const { navigateAfterSelectOrganization } = useOrganizationListContext(); - const { isLoaded, setActive } = useCoreOrganizationList(); + const { isLoaded, setActive } = useOrganizationList(); if (!isLoaded) { return null; @@ -36,7 +36,7 @@ export const MembershipPreview = withCardStateProvider((props: { organization: O export const PersonalAccountPreview = withCardStateProvider(() => { const card = useCardState(); const { hidePersonal, navigateAfterSelectPersonal } = useOrganizationListContext(); - const { isLoaded, setActive } = useCoreOrganizationList(); + const { isLoaded, setActive } = useOrganizationList(); const { user } = useUser(); if (!user) { diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserSuggestionList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserSuggestionList.tsx index 3c8af375e7e..60538034560 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserSuggestionList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationList/UserSuggestionList.tsx @@ -1,6 +1,6 @@ +import { useOrganizationList } from '@clerk/shared/react'; import type { OrganizationSuggestionResource } from '@clerk/types'; -import { useCoreOrganizationList } from '../../contexts'; import { localizationKeys, Text } from '../../customizables'; import { useCardState, withCardStateProvider } from '../../elements'; import { handleError } from '../../utils'; @@ -10,7 +10,7 @@ import { organizationListParams } from './utils'; export const AcceptRejectInvitationButtons = (props: OrganizationSuggestionResource) => { const card = useCardState(); - const { userSuggestions } = useCoreOrganizationList({ + const { userSuggestions } = useOrganizationList({ userSuggestions: organizationListParams.userSuggestions, }); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationList/utils.ts b/packages/clerk-js/src/ui-retheme/components/OrganizationList/utils.ts index 6382e00c60c..0fd0d468fd3 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationList/utils.ts +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationList/utils.ts @@ -1,4 +1,4 @@ -import type { useCoreOrganizationList } from '../../contexts'; +import type { useOrganizationList } from '@clerk/shared/react'; export const organizationListParams = { userMemberships: { @@ -11,4 +11,4 @@ export const organizationListParams = { infinite: true, status: ['pending', 'accepted'], }, -} satisfies Parameters[0]; +} satisfies Parameters[0]; diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActionConfirmationPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActionConfirmationPage.tsx index 357c1675092..3742cdd4185 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActionConfirmationPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActionConfirmationPage.tsx @@ -1,7 +1,7 @@ -import { useUser } from '@clerk/shared/react'; +import { useOrganization, useUser } from '@clerk/shared/react'; import { useWizard, Wizard } from '../../common'; -import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts'; +import { useOrganizationProfileContext } from '../../contexts'; import type { LocalizationKey } from '../../customizables'; import { localizationKeys, Text } from '../../customizables'; import { @@ -19,7 +19,7 @@ import { OrganizationProfileBreadcrumbs } from './OrganizationProfileNavbar'; export const LeaveOrganizationPage = () => { const card = useCardState(); const { navigateAfterLeaveOrganization } = useOrganizationProfileContext(); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { user } = useUser(); if (!organization || !user) { @@ -52,7 +52,7 @@ export const LeaveOrganizationPage = () => { export const DeleteOrganizationPage = () => { const card = useCardState(); const { navigateAfterLeaveOrganization } = useOrganizationProfileContext(); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); if (!organization) { return null; diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActiveMembersList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActiveMembersList.tsx index 8a56a1a6cef..71d886ea690 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActiveMembersList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ActiveMembersList.tsx @@ -1,8 +1,7 @@ -import { useUser } from '@clerk/shared/react'; +import { useOrganization, useUser } from '@clerk/shared/react'; import type { OrganizationMembershipResource } from '@clerk/types'; import { Gate } from '../../common/Gate'; -import { useCoreOrganization } from '../../contexts'; import { Badge, localizationKeys, Td, Text } from '../../customizables'; import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements'; import { useFetchRoles, useLocalizeCustomRoles } from '../../hooks/useFetchRoles'; @@ -18,7 +17,7 @@ const membershipsParams = { export const ActiveMembersList = () => { const card = useCardState(); - const { organization, memberships } = useCoreOrganization(membershipsParams); + const { organization, memberships } = useOrganization(membershipsParams); const { options, isLoading: loadingRoles } = useFetchRoles(); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/AddDomainPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/AddDomainPage.tsx index af8c2b502b0..076d450893c 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/AddDomainPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/AddDomainPage.tsx @@ -1,6 +1,7 @@ +import { useOrganization } from '@clerk/shared/react'; import React from 'react'; -import { useCoreOrganization, useEnvironment } from '../../contexts'; +import { useEnvironment } from '../../contexts'; import { localizationKeys } from '../../customizables'; import { ContentPage, Form, FormButtons, useCardState, withCardStateProvider } from '../../elements'; import { useRouter } from '../../router'; @@ -13,7 +14,7 @@ export const AddDomainPage = withCardStateProvider(() => { const subtitle = localizationKeys('organizationProfile.createDomainPage.subtitle'); const breadcrumbTitle = localizationKeys('organizationProfile.profilePage.domainSection.title'); const card = useCardState(); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { navigate } = useRouter(); const nameField = useFormControl('name', '', { diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/DomainList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/DomainList.tsx index b782829b782..88dfa396867 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/DomainList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/DomainList.tsx @@ -1,3 +1,4 @@ +import { useOrganization } from '@clerk/shared/react'; import type { GetDomainsParams, OrganizationDomainResource, @@ -8,7 +9,6 @@ import React, { useMemo } from 'react'; import { stripOrigin, toURL, trimLeadingSlash } from '../../../utils'; import { useGate, withGate } from '../../common'; -import { useCoreOrganization } from '../../contexts'; import type { LocalizationKey } from '../../customizables'; import { Box, Col, localizationKeys, Spinner } from '../../customizables'; import { ArrowBlockButton, BlockWithTrailingComponent, ThreeDotsMenu } from '../../elements'; @@ -81,7 +81,7 @@ const DomainListDotMenu = ({ export const DomainList = withGate( (props: DomainListProps) => { const { verificationStatus, enrollmentMode, redirectSubPath, fallback, ...rest } = props; - const { organization, domains } = useCoreOrganization({ + const { organization, domains } = useOrganization({ domains: { infinite: true, ...rest, diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersForm.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersForm.tsx index dfd49f3fae9..bb71fcbfeb2 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersForm.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersForm.tsx @@ -1,9 +1,9 @@ import { isClerkAPIResponseError } from '@clerk/shared/error'; +import { useOrganization } from '@clerk/shared/react'; import type { ClerkAPIError, MembershipRole } from '@clerk/types'; import type { FormEvent } from 'react'; import { useState } from 'react'; -import { useCoreOrganization } from '../../contexts'; import { Flex, Text } from '../../customizables'; import { Form, FormButtonContainer, TagInput, useCardState } from '../../elements'; import { useFetchRoles } from '../../hooks/useFetchRoles'; @@ -25,7 +25,7 @@ type InviteMembersFormProps = { export const InviteMembersForm = (props: InviteMembersFormProps) => { const { navigate } = useRouter(); const { onSuccess, onReset = () => navigate('..'), resetButtonLabel } = props; - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const card = useCardState(); const { t, locale } = useLocalizations(); const [isValidUnsubmittedEmail, setIsValidUnsubmittedEmail] = useState(false); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersPage.tsx index 4d442d65a93..7e42fd45430 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InviteMembersPage.tsx @@ -1,6 +1,8 @@ +import { useOrganization } from '@clerk/shared/react'; + import { runIfFunctionOrReturn } from '../../../utils'; import { useWizard, Wizard } from '../../common'; -import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts'; +import { useOrganizationProfileContext } from '../../contexts'; import { descriptors, Flex, localizationKeys, Text } from '../../customizables'; import { ContentPage, IconCircle, SuccessPage, useCardState, withCardStateProvider } from '../../elements'; import { Email } from '../../icons'; @@ -13,7 +15,7 @@ export const InviteMembersPage = withCardStateProvider(() => { const subtitle = localizationKeys('organizationProfile.invitePage.subtitle'); const card = useCardState(); const wizard = useWizard({ onNextStep: () => card.setError(undefined) }); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); //@ts-expect-error const { __unstable_manageBillingUrl, __unstable_manageBillingMembersLimit } = useOrganizationProfileContext(); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InvitedMembersList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InvitedMembersList.tsx index 4aed87c4968..b55948e3198 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InvitedMembersList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/InvitedMembersList.tsx @@ -1,6 +1,6 @@ +import { useOrganization } from '@clerk/shared/react'; import type { OrganizationInvitationResource } from '@clerk/types'; -import { useCoreOrganization } from '../../contexts'; import { localizationKeys, Td, Text } from '../../customizables'; import { ThreeDotsMenu, useCardState, UserPreview } from '../../elements'; import { useLocalizeCustomRoles } from '../../hooks/useFetchRoles'; @@ -16,7 +16,7 @@ const invitationsParams = { export const InvitedMembersList = () => { const card = useCardState(); - const { organization, invitations } = useCoreOrganization(invitationsParams); + const { organization, invitations } = useOrganization(invitationsParams); if (!organization) { return null; diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/MembershipWidget.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/MembershipWidget.tsx index 8926d9adf1f..7bc0c7ae60c 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/MembershipWidget.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/MembershipWidget.tsx @@ -1,10 +1,12 @@ +import { useOrganization } from '@clerk/shared/react'; + import { useRouter } from '../../../ui/router'; import { runIfFunctionOrReturn } from '../../../utils'; -import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts'; +import { useOrganizationProfileContext } from '../../contexts'; import { Col, Flex, Link, Text } from '../../customizables'; export const MembershipWidget = () => { - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); //@ts-expect-error const { __unstable_manageBillingUrl, __unstable_manageBillingLabel, __unstable_manageBillingMembersLimit } = useOrganizationProfileContext(); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationMembers.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationMembers.tsx index c25477d9db8..2859288dfda 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationMembers.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationMembers.tsx @@ -1,5 +1,7 @@ +import { useOrganization } from '@clerk/shared/react'; + import { NotificationCountBadge, useGate } from '../../common'; -import { useCoreOrganization, useEnvironment, useOrganizationProfileContext } from '../../contexts'; +import { useEnvironment, useOrganizationProfileContext } from '../../contexts'; import { Col, descriptors, Flex, localizationKeys } from '../../customizables'; import { CardAlert, @@ -23,7 +25,7 @@ export const OrganizationMembers = withCardStateProvider(() => { const card = useCardState(); const { isAuthorizedUser: canManageMemberships } = useGate({ permission: 'org:sys_memberships:manage' }); const isDomainsEnabled = organizationSettings?.domains?.enabled; - const { membershipRequests } = useCoreOrganization({ + const { membershipRequests } = useOrganization({ membershipRequests: isDomainsEnabled || undefined, }); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfile.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfile.tsx index 425bd5a9a64..a0f332f4f9a 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfile.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfile.tsx @@ -1,8 +1,9 @@ +import { useOrganization } from '@clerk/shared/react'; import type { OrganizationProfileProps } from '@clerk/types'; import React from 'react'; import { withOrganizationsEnabledGuard, withRedirectToHomeOrganizationGuard } from '../../common'; -import { ComponentContext, useCoreOrganization, withCoreUserGuard } from '../../contexts'; +import { ComponentContext, withCoreUserGuard } from '../../contexts'; import { Flow } from '../../customizables'; import { ProfileCard, withCardStateProvider } from '../../elements'; import { Route, Switch } from '../../router'; @@ -11,8 +12,7 @@ import { OrganizationProfileNavbar } from './OrganizationProfileNavbar'; import { OrganizationProfileRoutes } from './OrganizationProfileRoutes'; const _OrganizationProfile = (_: OrganizationProfileProps) => { - // TODO: Should this be a guard HOC? - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); if (!organization) { return null; diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx index 7832af2bce0..328efa7f701 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationProfileNavbar.tsx @@ -1,13 +1,14 @@ +import { useOrganization } from '@clerk/shared/react'; import React from 'react'; -import { useCoreOrganization, useOrganizationProfileContext } from '../../contexts'; +import { useOrganizationProfileContext } from '../../contexts'; import { Breadcrumbs, NavBar, NavbarContextProvider, OrganizationPreview } from '../../elements'; import type { PropsOfComponent } from '../../styledSystem'; export const OrganizationProfileNavbar = ( props: React.PropsWithChildren, 'contentRef'>>, ) => { - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { pages } = useOrganizationProfileContext(); if (!organization) { diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationSettings.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationSettings.tsx index faca9fa90c3..4af15717685 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationSettings.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/OrganizationSettings.tsx @@ -1,5 +1,7 @@ +import { useOrganization } from '@clerk/shared/react'; + import { AddBlockButton, BlockButton, Gate, useGate } from '../../common'; -import { useCoreOrganization, useEnvironment } from '../../contexts'; +import { useEnvironment } from '../../contexts'; import { Col, descriptors, Flex, Icon, localizationKeys } from '../../customizables'; import { Header, IconButton, NavbarMenuButtonRow, OrganizationPreview, ProfileSection } from '../../elements'; import { Times } from '../../icons'; @@ -36,7 +38,7 @@ export const OrganizationSettings = () => { }; const OrganizationProfileSection = () => { - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { navigate } = useRouter(); if (!organization) { @@ -67,7 +69,7 @@ const OrganizationProfileSection = () => { const OrganizationDomainsSection = () => { const { organizationSettings } = useEnvironment(); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { navigate } = useRouter(); @@ -97,7 +99,7 @@ const OrganizationDomainsSection = () => { }; const OrganizationDangerSection = () => { - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { navigate } = useRouter(); const { isAuthorizedUser: canDeleteOrganization } = useGate({ permission: 'org:sys_profile:delete' }); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ProfileSettingsPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ProfileSettingsPage.tsx index 966ce440e19..d08e68572b9 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ProfileSettingsPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/ProfileSettingsPage.tsx @@ -1,8 +1,8 @@ +import { useOrganization } from '@clerk/shared/react'; import React from 'react'; import { isDefaultImage } from '../../../utils'; import { useWizard, Wizard } from '../../common'; -import { useCoreOrganization } from '../../contexts'; import { localizationKeys } from '../../customizables'; import { ContentPage, Form, FormButtons, SuccessPage, useCardState, withCardStateProvider } from '../../elements'; import { handleError, useFormControl } from '../../utils'; @@ -14,7 +14,7 @@ export const ProfileSettingsPage = withCardStateProvider(() => { const subtitle = localizationKeys('organizationProfile.profilePage.subtitle'); const card = useCardState(); const [avatarChanged, setAvatarChanged] = React.useState(false); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const wizard = useWizard({ onNextStep: () => card.setError(undefined) }); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RemoveDomainPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RemoveDomainPage.tsx index 4da8c1a2c03..27e14a327a2 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RemoveDomainPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RemoveDomainPage.tsx @@ -1,8 +1,9 @@ +import { useOrganization } from '@clerk/shared/react'; import type { OrganizationDomainResource } from '@clerk/types'; import React from 'react'; import { RemoveResourcePage } from '../../common'; -import { useCoreOrganization, useEnvironment } from '../../contexts'; +import { useEnvironment } from '../../contexts'; import { Flex, Spinner } from '../../customizables'; import { useFetch } from '../../hooks'; import { localizationKeys } from '../../localization'; @@ -11,7 +12,7 @@ import { OrganizationProfileBreadcrumbs } from './OrganizationProfileNavbar'; export const RemoveDomainPage = () => { const { organizationSettings } = useEnvironment(); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { params } = useRouter(); const ref = React.useRef(); @@ -27,7 +28,7 @@ export const RemoveDomainPage = () => { }, ); - const { domains } = useCoreOrganization({ + const { domains } = useOrganization({ domains: { infinite: true, }, diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RequestToJoinList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RequestToJoinList.tsx index 709cbd7043a..f24f7c7b7b3 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RequestToJoinList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/RequestToJoinList.tsx @@ -1,6 +1,6 @@ +import { useOrganization } from '@clerk/shared/react'; import type { OrganizationMembershipRequestResource } from '@clerk/types'; -import { useCoreOrganization } from '../../contexts'; import { Button, Flex, localizationKeys, Td } from '../../customizables'; import { useCardState, UserPreview, withCardStateProvider } from '../../elements'; import { handleError } from '../../utils'; @@ -15,7 +15,7 @@ const membershipRequestsParams = { export const RequestToJoinList = () => { const card = useCardState(); - const { organization, membershipRequests } = useCoreOrganization(membershipRequestsParams); + const { organization, membershipRequests } = useOrganization(membershipRequestsParams); if (!organization) { return null; @@ -50,7 +50,7 @@ const RequestRow = withCardStateProvider( (props: { request: OrganizationMembershipRequestResource; onError: ReturnType['setError'] }) => { const { request, onError } = props; const card = useCardState(); - const { membership, membershipRequests } = useCoreOrganization(membershipRequestsParams); + const { membership, membershipRequests } = useOrganization(membershipRequestsParams); const onAccept = () => { if (!membership || !membershipRequests) { diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifiedDomainPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifiedDomainPage.tsx index 2dc351302bf..d58c01b695d 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifiedDomainPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifiedDomainPage.tsx @@ -1,3 +1,4 @@ +import { useOrganization } from '@clerk/shared/react'; import type { OrganizationDomainResource, OrganizationEnrollmentMode, @@ -5,7 +6,7 @@ import type { } from '@clerk/types'; import { CalloutWithAction, useGate } from '../../common'; -import { useCoreOrganization, useEnvironment } from '../../contexts'; +import { useEnvironment } from '../../contexts'; import type { LocalizationKey } from '../../customizables'; import { Col, Flex, localizationKeys, Spinner, Text } from '../../customizables'; import { @@ -99,7 +100,7 @@ export const VerifiedDomainPage = withCardStateProvider(() => { const card = useCardState(); const { organizationSettings } = useEnvironment(); - const { membership, organization, domains } = useCoreOrganization({ + const { membership, organization, domains } = useOrganization({ domains: { infinite: true, }, diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifyDomainPage.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifyDomainPage.tsx index 5429b09f532..cc80625a449 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifyDomainPage.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationProfile/VerifyDomainPage.tsx @@ -1,7 +1,8 @@ +import { useOrganization } from '@clerk/shared/react'; import React, { useRef } from 'react'; import { useWizard, Wizard } from '../../common'; -import { useCoreOrganization, useEnvironment } from '../../contexts'; +import { useEnvironment } from '../../contexts'; import { Button, descriptors, Flex, localizationKeys, Spinner } from '../../customizables'; import type { VerificationCodeCardProps } from '../../elements'; import { @@ -22,7 +23,7 @@ import { OrganizationProfileBreadcrumbs } from './OrganizationProfileNavbar'; export const VerifyDomainPage = withCardStateProvider(() => { const card = useCardState(); const { organizationSettings } = useEnvironment(); - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { params, navigate } = useRouter(); const [success, setSuccess] = React.useState(false); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx index 3cd744d880e..4a2848ac8b7 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx @@ -1,16 +1,10 @@ -import { useUser } from '@clerk/shared/react'; +import { useOrganization, useOrganizationList, useUser } from '@clerk/shared/react'; import type { OrganizationResource } from '@clerk/types'; import React from 'react'; import { runIfFunctionOrReturn } from '../../../utils'; import { NotificationCountBadge, withGate } from '../../common'; -import { - useCoreClerk, - useCoreOrganization, - useCoreOrganizationList, - useEnvironment, - useOrganizationSwitcherContext, -} from '../../contexts'; +import { useCoreClerk, useEnvironment, useOrganizationSwitcherContext } from '../../contexts'; import { descriptors, localizationKeys } from '../../customizables'; import { Action, @@ -33,8 +27,8 @@ export const OrganizationSwitcherPopover = React.forwardRef { - const { userInvitations, userSuggestions } = useCoreOrganizationList(organizationListParams); + const { userInvitations, userSuggestions } = useOrganizationList(organizationListParams); const { ref } = useInView({ threshold: 0, @@ -37,7 +37,7 @@ const useFetchInvitations = () => { const AcceptRejectSuggestionButtons = (props: OrganizationSuggestionResource) => { const card = useCardState(); - const { userSuggestions } = useCoreOrganizationList({ + const { userSuggestions } = useOrganizationList({ userSuggestions: organizationListParams.userSuggestions, }); @@ -74,7 +74,7 @@ const AcceptRejectSuggestionButtons = (props: OrganizationSuggestionResource) => const AcceptRejectInvitationButtons = (props: UserOrganizationInvitationResource) => { const card = useCardState(); - const { userInvitations } = useCoreOrganizationList({ + const { userInvitations } = useOrganizationList({ userInvitations: organizationListParams.userInvitations, }); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/UserMembershipList.tsx b/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/UserMembershipList.tsx index d82d3c6bf55..48b634d2813 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/UserMembershipList.tsx +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/UserMembershipList.tsx @@ -1,8 +1,8 @@ -import { useUser } from '@clerk/shared/react'; +import { useOrganization, useOrganizationList, useUser } from '@clerk/shared/react'; import type { OrganizationResource } from '@clerk/types'; import React from 'react'; -import { useCoreOrganization, useCoreOrganizationList, useOrganizationSwitcherContext } from '../../contexts'; +import { useOrganizationSwitcherContext } from '../../contexts'; import { Box, descriptors, localizationKeys } from '../../customizables'; import { OrganizationPreview, PersonalWorkspacePreview, PreviewButton } from '../../elements'; import { SwitchArrows } from '../../icons'; @@ -16,8 +16,8 @@ export const UserMembershipList = (props: UserMembershipListProps) => { const { onPersonalWorkspaceClick, onOrganizationClick } = props; const { hidePersonal } = useOrganizationSwitcherContext(); - const { organization: currentOrg } = useCoreOrganization(); - const { organizationList } = useCoreOrganizationList(); + const { organization: currentOrg } = useOrganization(); + const { organizationList } = useOrganizationList(); const { user } = useUser(); const otherOrgs = (organizationList || []).map(e => e.organization).filter(o => o.id !== currentOrg?.id); diff --git a/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/utils.ts b/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/utils.ts index 38c62349587..345d6825d00 100644 --- a/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/utils.ts +++ b/packages/clerk-js/src/ui-retheme/components/OrganizationSwitcher/utils.ts @@ -1,7 +1,6 @@ +import type { useOrganizationList } from '@clerk/shared/react'; import type { ClerkPaginatedResponse } from '@clerk/types'; -import type { useCoreOrganizationList } from '../../contexts'; - export const organizationListParams = { userMemberships: { infinite: true, @@ -13,7 +12,7 @@ export const organizationListParams = { infinite: true, status: ['pending', 'accepted'], }, -} satisfies Parameters[0]; +} satisfies Parameters[0]; export const populateCacheUpdateItem = ( updatedItem: T, diff --git a/packages/clerk-js/src/ui-retheme/contexts/CoreClerkContextWrapper.tsx b/packages/clerk-js/src/ui-retheme/contexts/CoreClerkContextWrapper.tsx index 6aab0dbc119..10085f51248 100644 --- a/packages/clerk-js/src/ui-retheme/contexts/CoreClerkContextWrapper.tsx +++ b/packages/clerk-js/src/ui-retheme/contexts/CoreClerkContextWrapper.tsx @@ -1,10 +1,9 @@ -import { SessionContext } from '@clerk/shared/react'; +import { OrganizationProvider ,SessionContext} from '@clerk/shared/react'; import type { Clerk, LoadedClerk, Resources } from '@clerk/types'; import React from 'react'; import { CoreClerkContext } from './CoreClerkContext'; import { CoreClientContext } from './CoreClientContext'; -import { CoreOrganizationProvider } from './CoreOrganizationContext'; import { CoreUserContext } from './CoreUserContext'; import { assertClerkSingletonExists } from './utils'; @@ -52,12 +51,12 @@ export function CoreClerkContextWrapper(props: CoreClerkContextWrapperProps): JS - {props.children} - + diff --git a/packages/clerk-js/src/ui-retheme/contexts/CoreOrganizationContext.tsx b/packages/clerk-js/src/ui-retheme/contexts/CoreOrganizationContext.tsx deleted file mode 100644 index 5f093f521f8..00000000000 --- a/packages/clerk-js/src/ui-retheme/contexts/CoreOrganizationContext.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import { OrganizationProvider, useOrganization, useOrganizationList, useOrganizations } from '@clerk/shared/react'; - -export const CoreOrganizationProvider = OrganizationProvider; -export const useCoreOrganization = useOrganization; -export const useCoreOrganizationList = useOrganizationList; -export const useCoreOrganizations = useOrganizations; diff --git a/packages/clerk-js/src/ui-retheme/contexts/index.ts b/packages/clerk-js/src/ui-retheme/contexts/index.ts index 5a112f7cbdc..98305c394a5 100644 --- a/packages/clerk-js/src/ui-retheme/contexts/index.ts +++ b/packages/clerk-js/src/ui-retheme/contexts/index.ts @@ -1,6 +1,5 @@ export * from './CoreClerkContext'; export * from './CoreUserContext'; -export * from './CoreOrganizationContext'; export * from './ClerkUIComponentsContext'; export * from './EnvironmentContext'; export * from './OptionsContext'; diff --git a/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganization.test.tsx b/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganization.test.tsx index 1d6403d8104..528c3f991a7 100644 --- a/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganization.test.tsx +++ b/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganization.test.tsx @@ -1,3 +1,4 @@ +import { useOrganization } from '@clerk/shared/react'; import { describe } from '@jest/globals'; import { act, bindCreateFixtures, renderHook, waitFor } from '../../../testUtils'; @@ -6,12 +7,11 @@ import { createFakeOrganizationMembershipRequest, } from '../../components/OrganizationProfile/__tests__/utils'; import { createFakeUserOrganizationMembership } from '../../components/OrganizationSwitcher/__tests__/utlis'; -import { useCoreOrganization } from '../../contexts'; const { createFixtures } = bindCreateFixtures('OrganizationProfile'); const defaultRenderer = () => - useCoreOrganization({ + useOrganization({ domains: { pageSize: 2, }, @@ -45,7 +45,7 @@ describe('useOrganization', () => { }); }); - const { result } = renderHook(useCoreOrganization, { wrapper }); + const { result } = renderHook(() => useOrganization(), { wrapper }); expect(result.current.isLoaded).toBe(true); expect(result.current.organization).toBeDefined(); @@ -57,9 +57,6 @@ describe('useOrganization', () => { }), ); - expect(result.current.invitationList).not.toBeDefined(); - expect(result.current.membershipList).not.toBeDefined(); - expect(result.current.memberships).toEqual(expect.objectContaining(undefinedPaginatedResource)); expect(result.current.domains).toEqual(expect.objectContaining(undefinedPaginatedResource)); expect(result.current.membershipRequests).toEqual(expect.objectContaining(undefinedPaginatedResource)); @@ -73,14 +70,11 @@ describe('useOrganization', () => { }); }); - const { result } = renderHook(useCoreOrganization, { wrapper }); + const { result } = renderHook(() => useOrganization(), { wrapper }); expect(result.current.isLoaded).toBe(true); expect(result.current.organization).toBeNull(); - expect(result.current.invitationList).toBeNull(); - expect(result.current.membershipList).toBeNull(); - expect(result.current.memberships).toBeNull(); expect(result.current.domains).toBeNull(); expect(result.current.membershipRequests).toBeNull(); diff --git a/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganizationList.test.tsx b/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganizationList.test.tsx index 381fb568e69..a590aa8a469 100644 --- a/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganizationList.test.tsx +++ b/packages/clerk-js/src/ui-retheme/hooks/__tests__/useCoreOrganizationList.test.tsx @@ -1,3 +1,4 @@ +import { useOrganizationList } from '@clerk/shared/react'; import { describe } from '@jest/globals'; import { act, bindCreateFixtures, renderHook, waitFor } from '../../../testUtils'; @@ -6,12 +7,11 @@ import { createFakeUserOrganizationMembership, createFakeUserOrganizationSuggestion, } from '../../components/OrganizationSwitcher/__tests__/utlis'; -import { useCoreOrganizationList } from '../../contexts'; const { createFixtures } = bindCreateFixtures('OrganizationSwitcher'); const defaultRenderer = () => - useCoreOrganizationList({ + useOrganizationList({ userMemberships: { pageSize: 2, }, @@ -33,8 +33,7 @@ describe('useOrganizationList', () => { }); }); - const { result } = renderHook(useCoreOrganizationList, { wrapper }); - + const { result } = renderHook(() => useOrganizationList(), { wrapper }); expect(result.current.isLoaded).toBe(true); expect(result.current.setActive).toBeDefined(); expect(result.current.createOrganization).toBeDefined(); @@ -222,7 +221,7 @@ describe('useOrganizationList', () => { ); const { result } = renderHook( () => - useCoreOrganizationList({ + useOrganizationList({ userMemberships: { pageSize: 2, infinite: true, @@ -444,7 +443,7 @@ describe('useOrganizationList', () => { ); const { result } = renderHook( () => - useCoreOrganizationList({ + useOrganizationList({ userInvitations: { pageSize: 2, infinite: true, @@ -634,7 +633,7 @@ describe('useOrganizationList', () => { ); const { result } = renderHook( () => - useCoreOrganizationList({ + useOrganizationList({ userSuggestions: { pageSize: 2, infinite: true, diff --git a/packages/clerk-js/src/ui-retheme/hooks/useFetchRoles.ts b/packages/clerk-js/src/ui-retheme/hooks/useFetchRoles.ts index cbe0f32499f..b685c4337d8 100644 --- a/packages/clerk-js/src/ui-retheme/hooks/useFetchRoles.ts +++ b/packages/clerk-js/src/ui-retheme/hooks/useFetchRoles.ts @@ -1,4 +1,5 @@ -import { useCoreOrganization } from '../contexts'; +import { useOrganization } from '@clerk/shared/react'; + import { useLocalizations } from '../localization'; import { customRoleLocalizationKey, roleLocalizationKey } from '../utils'; import { useFetch } from './useFetch'; @@ -11,7 +12,7 @@ const getRolesParams = { pageSize: 20, }; export const useFetchRoles = () => { - const { organization } = useCoreOrganization(); + const { organization } = useOrganization(); const { data, status } = useFetch(organization?.getRoles, getRolesParams); return { diff --git a/packages/react/src/contexts/OrganizationContext.tsx b/packages/react/src/contexts/OrganizationContext.tsx index f6f820acfa1..099dc09105a 100644 --- a/packages/react/src/contexts/OrganizationContext.tsx +++ b/packages/react/src/contexts/OrganizationContext.tsx @@ -1 +1 @@ -export { OrganizationProvider, OrganizationContext, useOrganizationContext } from '@clerk/shared/react'; +export { OrganizationProvider, useOrganizationContext } from '@clerk/shared/react'; diff --git a/packages/react/src/hooks/index.ts b/packages/react/src/hooks/index.ts index 52d6f34a6e4..feae53f443c 100644 --- a/packages/react/src/hooks/index.ts +++ b/packages/react/src/hooks/index.ts @@ -1,8 +1,6 @@ export { useAuth } from './useAuth'; export { useClerk } from './useClerk'; export { useEmailLink } from './useEmailLink'; -export { useOrganization } from './useOrganization'; -export { useOrganizationList } from './useOrganizationList'; export { useSignIn } from './useSignIn'; export { useSignUp } from './useSignUp'; -export { useSessionList, useUser, useSession } from '@clerk/shared/react'; +export { useOrganization, useOrganizationList, useSessionList, useUser, useSession } from '@clerk/shared/react'; diff --git a/packages/react/src/hooks/useOrganization.ts b/packages/react/src/hooks/useOrganization.ts deleted file mode 100644 index 0cf70872ecb..00000000000 --- a/packages/react/src/hooks/useOrganization.ts +++ /dev/null @@ -1 +0,0 @@ -export { useOrganization } from '@clerk/shared/react'; diff --git a/packages/react/src/hooks/useOrganizationList.ts b/packages/react/src/hooks/useOrganizationList.ts deleted file mode 100644 index 905ba6b1e57..00000000000 --- a/packages/react/src/hooks/useOrganizationList.ts +++ /dev/null @@ -1 +0,0 @@ -export { useOrganizationList } from '@clerk/shared/react';