* feat: remove dropdown from app-store and redirect to new-app-install-flow * removed extra code * fix: account select loading issue * removed getPaymentCredential (unused) * fix: only redirect after the app has been added to all the event-types * remove overflowIndicatorStyles * refactor getUserAdminTeams * send teamId instead of id * seperate locations component * for conferencing apps skip select account page * refactor InstallAppButtonChild * installing conferencing apps shows locations dropdown in configure step * send location data to the handler * send location data to the handler * add the newly installed to the locations dropdown (prefillLocation) * fix: type errors * fix: handle es-lint errors * fix: app is added again on submit * only add app if not already added * fix: type erros * filter out managed events for now * fix: show installed count badge * remove 2 toast message * feat: added tests for conferencing apps * fix: loading indicator * Update apps/web/pages/apps/installation/[[...step]].tsx Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> * Update apps/web/pages/apps/installation/[[...step]].tsx Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> * move `getUserAdminTeams` to `UserRepository` * fix: zoom and jelly not redirecting to the new app install flow * fix: typo * add `installableOnTeams` prop * split `configureStepCard` into smaller components * fix: step count * fix: show loading indicator until the new page is loaded * fix: organizer_default_conferencing_app not visible in a team * Introduce QueryClient to app card tests * fix: typo * add installableOnTeams prop * fix: tests * seated events shouldn't have multiple locations #15174 * fix: o365 callback * fix: office365_video not redirecting to event-types step * Revert "fix: o365 callback" This reverts commit bba841035ea34f8c31201b64c77221b8d8c3e626. * add TEAM_SELECT_STEP * add apps to orgs and their sub-teams initial commit * undo team select step * small ui fix * fix: wrong step numbers * fix: dont allow app installation without cretendialId * fix: don't show acme team as it cannot have any events * refactor useAddAppMutation * removed console.log * added comment * added comment * move locationOptions from getServerSideProps a trpc query * fix: failing tests * Update conferencingApps.e2e.ts * refactor useAddAppMutation * refactor useAddAppMutation 2 * fix: test failing * fix: unit test * Revert "fix: unit test" This reverts commit 6d74032211d094478c6d7cf9aedbce696dfb768d. * fix: failing test * Increase test timeout for conferencing app tests * fix: write separate tests for each conferencing app to prevent hitting 6000 ms timeout * improved tests naming * fix: correct message and translation key #15657 * fix: write separate tests for each analytics app to prevent hitting 6000 ms timeout * fix: analytics apps test * attempt to fix failing tests * fix typo * refactor * update: replace text-gray with text-stuble - works with light mode too * update: use userRepository.getUserAdminTeams * Merge branch 'main' into feat/org-team-app-install-2 * fix: after merge conflict from app router migration * remove consoles --------- Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
139 lines
4.3 KiB
TypeScript
139 lines
4.3 KiB
TypeScript
import type { UseMutationOptions } from "@tanstack/react-query";
|
|
import { useMutation } from "@tanstack/react-query";
|
|
import { usePathname } from "next/navigation";
|
|
|
|
import type { IntegrationOAuthCallbackState } from "@calcom/app-store/types";
|
|
import { WEBAPP_URL } from "@calcom/lib/constants";
|
|
import type { App } from "@calcom/types/App";
|
|
|
|
function gotoUrl(url: string, newTab?: boolean) {
|
|
if (newTab) {
|
|
window.open(url, "_blank");
|
|
return;
|
|
}
|
|
window.location.href = url;
|
|
}
|
|
|
|
type CustomUseMutationOptions =
|
|
| Omit<UseMutationOptions<unknown, unknown, unknown, unknown>, "mutationKey" | "mutationFn" | "onSuccess">
|
|
| undefined;
|
|
|
|
type AddAppMutationData = { setupPending: boolean } | void;
|
|
export type UseAddAppMutationOptions = CustomUseMutationOptions & {
|
|
onSuccess?: (data: AddAppMutationData) => void;
|
|
installGoogleVideo?: boolean;
|
|
returnTo?: string;
|
|
};
|
|
|
|
function useAddAppMutation(_type: App["type"] | null, options?: UseAddAppMutationOptions) {
|
|
const pathname = usePathname();
|
|
const onErrorReturnTo = `${WEBAPP_URL}${pathname}`;
|
|
|
|
const mutation = useMutation<
|
|
AddAppMutationData,
|
|
Error,
|
|
| {
|
|
type?: App["type"];
|
|
variant?: string;
|
|
slug?: string;
|
|
teamId?: number;
|
|
returnTo?: string;
|
|
defaultInstall?: boolean;
|
|
}
|
|
| ""
|
|
>({
|
|
...options,
|
|
mutationFn: async (variables) => {
|
|
let type: string | null | undefined;
|
|
const teamId = variables && variables.teamId ? variables.teamId : undefined;
|
|
const defaultInstall = variables && variables.defaultInstall ? variables.defaultInstall : undefined;
|
|
const returnTo = options?.returnTo
|
|
? options.returnTo
|
|
: variables && variables.returnTo
|
|
? variables.returnTo
|
|
: undefined;
|
|
if (variables === "") {
|
|
type = _type;
|
|
} else {
|
|
type = variables.type;
|
|
}
|
|
if (type?.endsWith("_other_calendar")) {
|
|
type = type.split("_other_calendar")[0];
|
|
}
|
|
|
|
if (options?.installGoogleVideo && type !== "google_calendar")
|
|
throw new Error("Could not install Google Meet");
|
|
|
|
const state: IntegrationOAuthCallbackState = {
|
|
onErrorReturnTo,
|
|
fromApp: true,
|
|
...(teamId && { teamId }),
|
|
...(type === "google_calendar" && { installGoogleVideo: options?.installGoogleVideo }),
|
|
...(returnTo && { returnTo }),
|
|
...(defaultInstall && { defaultInstall }),
|
|
};
|
|
|
|
const stateStr = JSON.stringify(state);
|
|
const searchParams = generateSearchParamString({
|
|
stateStr,
|
|
teamId,
|
|
returnTo,
|
|
});
|
|
|
|
const res = await fetch(`/api/integrations/${type}/add${searchParams}`);
|
|
|
|
if (!res.ok) {
|
|
const errorBody = await res.json();
|
|
throw new Error(errorBody.message || "Something went wrong");
|
|
}
|
|
|
|
const json = await res.json();
|
|
const externalUrl = /https?:\/\//.test(json?.url) && !json?.url?.startsWith(window.location.origin);
|
|
|
|
// Check first that the URL is absolute, then check that it is of different origin from the current.
|
|
if (externalUrl) {
|
|
// TODO: For Omni installation to authenticate and come back to the page where installation was initiated, some changes need to be done in all apps' add callbacks
|
|
gotoUrl(json.url, json.newTab);
|
|
return { setupPending: !json.newTab };
|
|
} else if (json.url) {
|
|
gotoUrl(json.url, json.newTab);
|
|
return {
|
|
setupPending:
|
|
json?.url?.endsWith("/setup") || json?.url?.includes("/apps/installation/event-types"),
|
|
};
|
|
} else if (returnTo) {
|
|
gotoUrl(returnTo, false);
|
|
return { setupPending: true };
|
|
} else {
|
|
return { setupPending: false };
|
|
}
|
|
},
|
|
});
|
|
|
|
return mutation;
|
|
}
|
|
|
|
export default useAddAppMutation;
|
|
const generateSearchParamString = ({
|
|
stateStr,
|
|
teamId,
|
|
returnTo,
|
|
}: {
|
|
stateStr: string;
|
|
teamId?: number;
|
|
returnTo?: string;
|
|
}) => {
|
|
const url = new URL("https://example.com"); // Base URL can be anything since we only care about the search params
|
|
|
|
url.searchParams.append("state", stateStr);
|
|
if (teamId !== undefined) {
|
|
url.searchParams.append("teamId", teamId.toString());
|
|
}
|
|
if (returnTo) {
|
|
url.searchParams.append("returnTo", returnTo);
|
|
}
|
|
|
|
// Return the search string part of the URL
|
|
return url.search;
|
|
};
|