[pull] main from calcom:main

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({

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,
       }}
     />
   );

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,

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 (
     <div className={classNames(view === "calendar" && "-mb-8")}>
@@ -100,6 +95,6 @@ function BookingsContent({ status, permissions, bookingsV3Enabled, bookingAuditE
           bookingsV3Enabled={bookingsV3Enabled}
         />
       )}
-          </div>
+    </div>
   );
 }