Skip to content

Commit f5bb734

Browse files
authored
fix: platform onboarding (calcom#23581)
* fix: platform onboarding * chore: better function naming * fix: implement PR feedback
1 parent e33560e commit f5bb734

3 files changed

Lines changed: 53 additions & 10 deletions

File tree

apps/web/components/settings/platform/hooks/useGetUserAttributes.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ import { useCheckTeamBilling } from "@calcom/web/lib/hooks/settings/platform/bil
33
import { usePlatformMe } from "./usePlatformMe";
44

55
export const useGetUserAttributes = () => {
6-
const { data: platformUser, isLoading: isPlatformUserLoading } = usePlatformMe();
7-
const { data: userBillingData, isFetching: isUserBillingDataLoading } = useCheckTeamBilling(
8-
platformUser?.organizationId,
9-
platformUser?.organization?.isPlatform ?? false
10-
);
6+
const {
7+
data: platformUser,
8+
isLoading: isPlatformUserLoading,
9+
refetch: refetchPlatformUser,
10+
} = usePlatformMe();
11+
const {
12+
data: userBillingData,
13+
isFetching: isUserBillingDataLoading,
14+
refetch: refetchTeamBilling,
15+
} = useCheckTeamBilling(platformUser?.organizationId, platformUser?.organization?.isPlatform ?? false);
1116
const isPlatformUser = platformUser?.organization?.isPlatform ?? false;
1217
const isPaidUser = userBillingData?.valid;
1318
const userOrgId = platformUser?.organizationId;
@@ -19,5 +24,7 @@ export const useGetUserAttributes = () => {
1924
isPaidUser,
2025
userBillingData,
2126
userOrgId,
27+
refetchTeamBilling,
28+
refetchPlatformUser,
2229
};
2330
};
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { useEffect } from "react";
2+
3+
export function useExternalRedirectHandler(callback: (referrer: string) => void) {
4+
useEffect(() => {
5+
const referrer = document.referrer;
6+
const isExternal = referrer && !referrer.includes(window.location.hostname);
7+
8+
if (isExternal) {
9+
callback(referrer);
10+
}
11+
}, [callback]);
12+
}

apps/web/modules/settings/platform/platform-view.tsx

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
"use client";
22

33
import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
4-
import { useState, useEffect } from "react";
4+
import { usePathname } from "next/navigation";
5+
import { useState, useEffect, useCallback } from "react";
56

67
import Shell from "@calcom/features/shell/Shell";
78
import { useLocale } from "@calcom/lib/hooks/useLocale";
89
import { showToast } from "@calcom/ui/components/toast";
910

11+
import { useExternalRedirectHandler } from "@lib/hooks/settings/platform/billing/useExternalRedirectHandler";
1012
import { useDeleteOAuthClient } from "@lib/hooks/settings/platform/oauth-clients/useDeleteOAuthClient";
1113
import { useOAuthClients } from "@lib/hooks/settings/platform/oauth-clients/useOAuthClients";
1214

@@ -20,13 +22,22 @@ const queryClient = new QueryClient();
2022

2123
export default function Platform() {
2224
const { t } = useLocale();
23-
const [initialClientId, setInitialClientId] = useState("");
24-
const [initialClientName, setInitialClientName] = useState("");
25+
const [_initialClientId, setInitialClientId] = useState("");
26+
const [_initialClientName, setInitialClientName] = useState("");
27+
const pathname = usePathname();
2528

2629
const { data, isLoading: isOAuthClientLoading, refetch: refetchClients } = useOAuthClients();
2730

28-
const { isUserLoading, isUserBillingDataLoading, isPlatformUser, isPaidUser, userBillingData, userOrgId } =
29-
useGetUserAttributes();
31+
const {
32+
isUserLoading,
33+
isUserBillingDataLoading,
34+
isPlatformUser,
35+
isPaidUser,
36+
userBillingData,
37+
userOrgId,
38+
refetchTeamBilling,
39+
refetchPlatformUser,
40+
} = useGetUserAttributes();
3041

3142
const { mutateAsync, isPending: isDeleting } = useDeleteOAuthClient({
3243
onSuccess: () => {
@@ -39,11 +50,24 @@ export default function Platform() {
3950
await mutateAsync({ id: id });
4051
};
4152

53+
const refetchBillingState = useCallback(() => {
54+
refetchTeamBilling();
55+
refetchPlatformUser();
56+
}, [refetchTeamBilling, refetchPlatformUser]);
57+
4258
useEffect(() => {
4359
setInitialClientId(data[0]?.id);
4460
setInitialClientName(data[0]?.name);
4561
}, [data]);
4662

63+
useEffect(() => {
64+
refetchBillingState();
65+
}, [pathname, refetchTeamBilling, refetchPlatformUser, refetchBillingState]);
66+
67+
useExternalRedirectHandler(() => {
68+
refetchBillingState();
69+
});
70+
4771
if (isUserLoading || isOAuthClientLoading) return <div className="m-5">{t("loading")}</div>;
4872

4973
if (isUserBillingDataLoading && !userBillingData) {

0 commit comments

Comments
 (0)