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

chore: no need for useCompatSearchParams #16902

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apps/web/components/AppListCard.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
"use client";

import { usePathname, useRouter } from "next/navigation";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import type { ReactNode } from "react";
import { useEffect, useRef, useState } from "react";
import { z } from "zod";

import type { CredentialOwner } from "@calcom/app-store/types";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
import { AppListCard as AppListCardComponent } from "@calcom/ui";

Expand Down Expand Up @@ -43,7 +42,7 @@ export default function AppListCard(props: AppListCardProps) {
const router = useRouter();
const [highlight, setHighlight] = useState(shouldHighlight && hl === slug);
const timeoutRef = useRef<NodeJS.Timeout | null>(null);
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const pathname = usePathname();

useEffect(() => {
Expand Down
5 changes: 2 additions & 3 deletions apps/web/components/apps/AppPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Link from "next/link";
import { useRouter } from "next/navigation";
import { useRouter, useSearchParams } from "next/navigation";
import type { IframeHTMLAttributes } from "react";
import React, { useEffect, useState } from "react";

Expand All @@ -11,7 +11,6 @@ import { AppOnboardingSteps } from "@calcom/lib/apps/appOnboardingSteps";
import { getAppOnboardingUrl } from "@calcom/lib/apps/getAppOnboardingUrl";
import classNames from "@calcom/lib/classNames";
import { APP_NAME, COMPANY_NAME, SUPPORT_MAIL_ADDRESS, WEBAPP_URL } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import type { App as AppType } from "@calcom/types/App";
Expand Down Expand Up @@ -76,7 +75,7 @@ export const AppPage = ({
}: AppPageProps) => {
const { t, i18n } = useLocale();
const router = useRouter();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();

const hasDescriptionItems = descriptionItems && descriptionItems.length > 0;

Expand Down
6 changes: 2 additions & 4 deletions apps/web/lib/hooks/useIsBookingPage.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { usePathname } from "next/navigation";

import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { usePathname, useSearchParams } from "next/navigation";

export default function useIsBookingPage(): boolean {
const pathname = usePathname();
const isBookingPage = ["/booking/", "/cancel", "/reschedule"].some((route) => pathname?.startsWith(route));

const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const userParam = Boolean(searchParams?.get("user"));
const teamParam = Boolean(searchParams?.get("team"));

Expand Down
6 changes: 2 additions & 4 deletions apps/web/lib/hooks/useRouterQuery.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { usePathname, useRouter } from "next/navigation";
import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { useCallback } from "react";

import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

export default function useRouterQuery<T extends string>(name: T) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const pathname = usePathname();
const router = useRouter();

Expand Down
4 changes: 2 additions & 2 deletions apps/web/lib/hooks/useToggleQuery.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useSearchParams } from "next/navigation";

export function useToggleQuery(name: string) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();

return {
isOn: searchParams?.get(name) === "1",
Expand Down
5 changes: 2 additions & 3 deletions apps/web/modules/apps/[slug]/setup/setup-view.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
"use client";

import { useSession } from "next-auth/react";
import { useRouter } from "next/navigation";
import { useRouter, useSearchParams } from "next/navigation";

import { AppSetupPage } from "@calcom/app-store/_pages/setup";
import type { getServerSideProps } from "@calcom/app-store/_pages/setup/_getServerSideProps";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
import { HeadSeo } from "@calcom/ui";

export type PageProps = inferSSRProps<typeof getServerSideProps>;

export default function SetupInformation(props: PageProps) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const router = useRouter();
const slug = searchParams?.get("slug") as string;
const { status } = useSession();
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/apps/categories/[category]/category-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

import type { InferGetStaticPropsType } from "next";
import Link from "next/link";
import { useSearchParams } from "next/navigation";

import Shell from "@calcom/features/shell/Shell";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { AppCard, SkeletonText } from "@calcom/ui";

import type { getStaticProps } from "@lib/apps/categories/[category]/getStaticProps";

export type PageProps = InferGetStaticPropsType<typeof getStaticProps>;
export default function Apps({ apps }: PageProps) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { t, isLocaleReady } = useLocale();
const category = searchParams?.get("category");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"use client";

import { useSearchParams } from "next/navigation";
import { useReducer } from "react";

import getAppCategoryTitle from "@calcom/app-store/_utils/getAppCategoryTitle";
import DisconnectIntegrationModal from "@calcom/features/apps/components/DisconnectIntegrationModal";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { AppCategories } from "@calcom/prisma/enums";
import { trpc } from "@calcom/trpc/react";
Expand Down Expand Up @@ -112,7 +112,7 @@ type ModalState = {
export type PageProps = inferSSRProps<typeof getServerSideProps>;

export default function InstalledApps(props: PageProps) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { t } = useLocale();
const category = searchParams?.get("category") as querySchemaType["category"];
const categoryList: AppCategories[] = Object.values(AppCategories).filter((category) => {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/login-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { SAMLLogin } from "@calcom/features/auth/SAMLLogin";
import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
import { HOSTED_CAL_FEATURES, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLastUsed, LastUsed } from "@calcom/lib/hooks/useLastUsed";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
Expand Down Expand Up @@ -51,7 +51,7 @@ export default function Login({
totpEmail,
}: // eslint-disable-next-line @typescript-eslint/ban-types
PageProps & WithNonceProps<{}>) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { t } = useLocale();
const router = useRouter();
const formSchema = z
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/oauth2/authorize-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useRouter } from "next/navigation";
import { useState, useEffect } from "react";

import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
import { Avatar, Button, Icon, Select } from "@calcom/ui";
Expand All @@ -16,7 +16,7 @@ export default function Authorize() {
const { status } = useSession();

const router = useRouter();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();

const client_id = (searchParams?.get("client_id") as string) || "";
const state = searchParams?.get("state") as string;
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/platform/authorize-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useRouter } from "next/navigation";

import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
import { Avatar, Button, Icon } from "@calcom/ui";
Expand All @@ -14,7 +14,7 @@ export default function Authorize() {
const { t } = useLocale();
const router = useRouter();

const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const queryString = searchParams?.toString();

// const { isLoading, error, data: client } = useOAuthClient(queryString);
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/saml-idp/saml-idp-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import { signIn } from "next-auth/react";
import { useEffect } from "react";

import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";


// To handle the IdP initiated login flow callback
export default function SamlIdp() {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();

useEffect(() => {
const code = searchParams?.get("code");
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/setup-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useState } from "react";

import AdminAppsList from "@calcom/features/apps/AdminAppsList";
import { APP_NAME } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
import { WizardForm } from "@calcom/ui";
Expand All @@ -18,7 +18,7 @@ import type { getServerSideProps } from "@server/lib/setup/getServerSideProps";

function useSetStep() {
const router = useRouter();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const pathname = usePathname();
const setStep = (newStep = 1) => {
const _searchParams = new URLSearchParams(searchParams ?? undefined);
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/sso/provider-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { signIn } from "next-auth/react";
import { useRouter } from "next/navigation";
import { useEffect } from "react";

import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";


import type { inferSSRProps } from "@lib/types/inferSSRProps";

Expand All @@ -13,7 +13,7 @@ import type { getServerSideProps } from "@server/lib/auth/sso/[provider]/getServ
export type SSOProviderPageProps = inferSSRProps<typeof getServerSideProps>;

export default function Provider(props: SSOProviderPageProps) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const router = useRouter();

useEffect(() => {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/auth/verify-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import z from "zod";

import { classNames } from "@calcom/lib";
import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { trpc } from "@calcom/trpc/react";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
Expand Down Expand Up @@ -118,7 +118,7 @@ const MailOpenIcon = () => (
);

export default function Verify(props: PageProps) {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const pathname = usePathname();
const router = useRouter();
const routerQuery = useRouterQuery();
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/availability/[schedule]/schedule-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useState } from "react";

import { AvailabilitySettings } from "@calcom/atoms/monorepo";
import { withErrorFromUnknown } from "@calcom/lib/getClientErrorFromUnknown";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
import type { ScheduleRepository } from "@calcom/lib/server/repository/schedule";
Expand All @@ -23,7 +23,7 @@ export const AvailabilitySettingsWebWrapper = ({
scheduleFetched: scheduleProp,
travelSchedules: travelSchedulesProp,
}: PageProps) => {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { t } = useLocale();
const router = useRouter();
const utils = trpc.useUtils();
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/availability/availability-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { BulkEditDefaultForEventsModal } from "@calcom/features/eventtypes/compo
import { NewScheduleButton, ScheduleListItem } from "@calcom/features/schedules";
import Shell from "@calcom/features/shell/Shell";
import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { HttpError } from "@calcom/lib/http-error";
import type { OrganizationRepository } from "@calcom/lib/server/repository/organization";
Expand Down Expand Up @@ -177,7 +177,7 @@ type PageProps = {

export default function AvailabilityPage({ currentOrg }: PageProps) {
const { t } = useLocale();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const router = useRouter();
const pathname = usePathname();
const me = useMeQuery();
Expand Down
4 changes: 2 additions & 2 deletions apps/web/modules/bookings/views/bookings-single-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
formatToLocalizedTimezone,
} from "@calcom/lib/date-fns";
import useGetBrandingColours from "@calcom/lib/getBrandColours";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import useTheme from "@calcom/lib/hooks/useTheme";
Expand Down Expand Up @@ -108,7 +108,7 @@ export default function Success(props: PageProps) {
const router = useRouter();
const routerQuery = useRouterQuery();
const pathname = usePathname();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { eventType, bookingInfo, requiresLoginToUpdate, orgSlug, rescheduledToUid } = props;

const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Shell from "@calcom/features/shell/Shell";
import { parseEventTypeColor } from "@calcom/lib";
import { APP_NAME } from "@calcom/lib/constants";
import { WEBSITE_URL } from "@calcom/lib/constants";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
import { useGetTheme } from "@calcom/lib/hooks/useTheme";
Expand Down Expand Up @@ -243,7 +243,7 @@ export const InfiniteEventTypeList = ({
const { t } = useLocale();
const router = useRouter();
const pathname = usePathname();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const [parent] = useAutoAnimate<HTMLUListElement>();
const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
const [deleteDialogTypeId, setDeleteDialogTypeId] = useState(0);
Expand Down Expand Up @@ -850,7 +850,7 @@ const InfiniteScrollMain = ({
eventTypeGroups: GetUserEventGroupsResponse["eventTypeGroups"] | undefined;
profiles: GetUserEventGroupsResponse["profiles"] | undefined;
}) => {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { data } = useTypedQuery(querySchema);

if (status === "error") {
Expand Down Expand Up @@ -890,7 +890,7 @@ const EventTypesPage: React.FC & {
getLayout?: AppProps["Component"]["getLayout"];
} = () => {
const { t } = useLocale();
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const { open } = useIntercom();
const { data: user } = useMeQuery();
// eslint-disable-next-line @typescript-eslint/no-unused-vars
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import { useRouter } from "next/navigation";

import AddNewTeamMembers from "@calcom/features/ee/teams/components/AddNewTeamMembers";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { WizardLayout } from "@calcom/ui";

export const LayoutWrapper = (page: React.ReactElement) => {
// eslint-disable-next-line react-hooks/rules-of-hooks
const router = useRouter();
// eslint-disable-next-line react-hooks/rules-of-hooks
const query = useCompatSearchParams();
const query = useSearchParams();

return (
<WizardLayout
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";

import Shell from "@calcom/features/shell/Shell";
import { ErrorCode } from "@calcom/lib/errorCodes";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";

import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
import { showToast } from "@calcom/ui";

Expand All @@ -16,7 +16,7 @@ import type { FormValues } from "@components/settings/platform/oauth-clients/oau
import { OAuthClientForm } from "@components/settings/platform/oauth-clients/oauth-client-form";

export default function CreateOAuthClient() {
const searchParams = useCompatSearchParams();
const searchParams = useSearchParams();
const router = useRouter();
const clientId = searchParams?.get("clientId") || "";

Expand Down
Loading
Loading