From a4a01a0fa8253254e8c7ab848aeca2cf7ccb4f1f Mon Sep 17 00:00:00 2001 From: Romit <85230081+romitg2@users.noreply.github.com> Date: Tue, 5 May 2026 15:03:00 +0530 Subject: [PATCH] cleanup(attributes): remove entrypoints (#29034) * refactor: remove attributes and segments entrypoints * fix: restore segment entrypoints * cleanup --- .../(settings-layout)/SettingsLayoutAppDirClient.tsx | 9 --------- .../settings/(settings-layout)/layout.tsx | 1 - .../bookings/components/BookingListContainer.tsx | 4 ++-- apps/web/modules/bookings/views/bookings-view.tsx | 11 +++-------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx index 965c3692d73bc9..6accd70e51ee29 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx @@ -265,7 +265,6 @@ interface SettingsPermissions { canViewRoles?: boolean; canViewOrganizationBilling?: boolean; canUpdateOrganization?: boolean; - canViewAttributes?: boolean; } const useTabs = ({ @@ -296,14 +295,6 @@ const useTabs = ({ (child) => permissions?.canUpdateOrganization || !organizationAdminKeys.includes(child.name) ); - if (permissions?.canViewAttributes) { - newArray.splice(4, 0, { - name: "attributes", - href: "/settings/organizations/attributes", - trackingMetadata: { section: "organization", page: "attributes" }, - }); - } - // Add delegation-credential menu item only if feature flag is enabled if (isDelegationCredentialEnabled) { newArray.push({ diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx index b231c5bb57b60f..15580e147fc939 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx @@ -20,7 +20,6 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) { canViewRoles: false, canViewOrganizationBilling: false, canUpdateOrganization: false, - canViewAttributes: false, }} /> ); diff --git a/apps/web/modules/bookings/components/BookingListContainer.tsx b/apps/web/modules/bookings/components/BookingListContainer.tsx index edbe1b0e802bec..908bd8d7e9812e 100644 --- a/apps/web/modules/bookings/components/BookingListContainer.tsx +++ b/apps/web/modules/bookings/components/BookingListContainer.tsx @@ -1,8 +1,6 @@ "use client"; import dayjs from "@calcom/dayjs"; -import { useDataTable } from "~/data-table/hooks/useDataTable"; -import { useDisplayedFilterCount } from "~/data-table/hooks/useDisplayedFilterCount"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; @@ -21,6 +19,8 @@ import { useBookingStatusTab } from "~/bookings/hooks/useBookingStatusTab"; import { useFacetedUniqueValues } from "~/bookings/hooks/useFacetedUniqueValues"; import { useListAutoSelector } from "~/bookings/hooks/useListAutoSelector"; import { DataTableFilters, DataTableSegment } from "~/data-table/components"; +import { useDataTable } from "~/data-table/hooks/useDataTable"; +import { useDisplayedFilterCount } from "~/data-table/hooks/useDisplayedFilterCount"; import { BookingDetailsSheetStoreProvider, useBookingDetailsSheetStore, diff --git a/apps/web/modules/bookings/views/bookings-view.tsx b/apps/web/modules/bookings/views/bookings-view.tsx index c7c7db4efd9794..a2eed44955477f 100644 --- a/apps/web/modules/bookings/views/bookings-view.tsx +++ b/apps/web/modules/bookings/views/bookings-view.tsx @@ -1,13 +1,13 @@ "use client"; import { ColumnFilterType, type SystemFilterSegment } from "@calcom/features/data-table"; -import { DataTableProvider } from "~/data-table/DataTableProvider"; -import { useSegments } from "~/data-table/hooks/useSegments"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import classNames from "@calcom/ui/classNames"; import dynamic from "next/dynamic"; import { usePathname, useRouter } from "next/navigation"; import { useCallback, useMemo } from "react"; +import { DataTableProvider } from "~/data-table/DataTableProvider"; +import { useSegments } from "~/data-table/hooks/useSegments"; import { BookingListContainer } from "../components/BookingListContainer"; import { useActiveFiltersValidator } from "../hooks/useActiveFiltersValidator"; import { useBookingsView } from "../hooks/useBookingsView"; @@ -77,11 +77,6 @@ export default function Bookings(props: BookingsProps) { function BookingsContent({ status, permissions, bookingsV3Enabled, bookingAuditEnabled }: BookingsProps) { const [view] = useBookingsView({ bookingsV3Enabled }); - const router = useRouter(); - const handleOptInSuccess = useCallback(() => { - router.refresh(); - }, [router]); - const optInBanner = null; return (