From a28ab042ad62719539263088ae091a15aa49e2dc Mon Sep 17 00:00:00 2001 From: Benny Joo Date: Wed, 4 Feb 2026 19:50:36 +0900 Subject: [PATCH] refactor: move admin and filter components out of packages/features (#27604) * migrate CreateLicenseKeyForm * refactor * migrate * migrate filters components * fix import --- .../apps/routing-forms/forms/[[...pages]]/Forms.tsx | 4 ++-- .../settings/(admin-layout)/admin/blocklist/page.tsx | 2 +- .../(admin-layout)/admin/organizations/[id]/edit/page.tsx | 7 +++++-- .../settings/(admin-layout)/admin/organizations/page.tsx | 7 +++++-- .../(admin-layout)/admin/workspace-platforms/page.tsx | 7 +++++-- .../(use-page-wrapper)/settings/license-key/new/page.tsx | 6 ++---- .../ee/deployment/components}/CreateLicenseKeyForm.tsx | 2 +- .../admin/components}/BulkDeleteBlocklistEntries.tsx | 0 .../admin/components}/BulkDismissReports.tsx | 0 .../organizations/admin/{ => views}/AdminOrgEditPage.tsx | 0 .../ee/organizations/admin/{ => views}/AdminOrgPage.tsx | 0 .../ee/organizations/admin/views/SystemBlocklistView.tsx | 4 ++-- .../admin/{ => views}/WorkspacePlatformPage.tsx | 0 apps/web/modules/ee/workflows/views/WorkflowsPage.tsx | 4 ++-- .../web/modules}/filters/components/FilterResults.tsx | 0 .../web/modules}/filters/components/TeamsFilter.tsx | 2 +- .../insights/components/filters/OrgTeamsFilter.tsx | 2 +- apps/web/modules/settings/license-key/new/new-view.tsx | 8 +++----- 18 files changed, 30 insertions(+), 25 deletions(-) rename {packages/features/ee/deployment/licensekey => apps/web/modules/ee/deployment/components}/CreateLicenseKeyForm.tsx (99%) rename {packages/features/ee/admin/pages/settings/blocklist => apps/web/modules/ee/organizations/admin/components}/BulkDeleteBlocklistEntries.tsx (100%) rename {packages/features/ee/admin/pages/settings/blocklist => apps/web/modules/ee/organizations/admin/components}/BulkDismissReports.tsx (100%) rename apps/web/modules/ee/organizations/admin/{ => views}/AdminOrgEditPage.tsx (100%) rename apps/web/modules/ee/organizations/admin/{ => views}/AdminOrgPage.tsx (100%) rename packages/features/ee/admin/pages/settings/blocklist.tsx => apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx (98%) rename apps/web/modules/ee/organizations/admin/{ => views}/WorkspacePlatformPage.tsx (100%) rename {packages/features => apps/web/modules}/filters/components/FilterResults.tsx (100%) rename {packages/features => apps/web/modules}/filters/components/TeamsFilter.tsx (98%) diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx index bbb702400c..f9a6b4f80a 100644 --- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx +++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx @@ -8,8 +8,8 @@ import { useFormContext } from "react-hook-form"; import { isFallbackRoute } from "@calcom/app-store/routing-forms/lib/isFallbackRoute"; import type { RoutingFormWithResponseCount } from "@calcom/app-store/routing-forms/types/types"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; -import { FilterResults } from "@calcom/features/filters/components/FilterResults"; -import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter"; +import { FilterResults } from "~/filters/components/FilterResults"; +import { TeamsFilter } from "~/filters/components/TeamsFilter"; import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx index 436fb7ef57..09a3c8bd28 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/blocklist/page.tsx @@ -1,6 +1,6 @@ import { _generateMetadata, getTranslate } from "app/_utils"; -import SystemBlocklistView from "@calcom/features/ee/admin/pages/settings/blocklist"; +import SystemBlocklistView from "~/ee/organizations/admin/views/SystemBlocklistView"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx index 4e5a2368a1..6a94937d92 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/[id]/edit/page.tsx @@ -3,7 +3,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import { z } from "zod"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; -import { OrgForm } from "~/ee/organizations/admin/AdminOrgEditPage"; +import { OrgForm } from "~/ee/organizations/admin/views/AdminOrgEditPage"; import { getOrganizationRepository } from "@calcom/features/ee/organizations/di/OrganizationRepository.container"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; @@ -42,7 +42,10 @@ const Page = async ({ params }: { params: Params }) => { const org = await organizationRepository.adminFindById({ id: input.data.id }); const t = await getTranslate(); return ( - + diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx index 24a387495f..e309a28ecc 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/organizations/page.tsx @@ -2,7 +2,7 @@ import { _generateMetadata } from "app/_utils"; import { getTranslate } from "app/_utils"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; -import AdminOrgTable from "~/ee/organizations/admin/AdminOrgPage"; +import AdminOrgTable from "~/ee/organizations/admin/views/AdminOrgPage"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => @@ -17,7 +17,10 @@ export const generateMetadata = async () => const Page = async () => { const t = await getTranslate(); return ( - + diff --git a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx index 9bc83137e2..22de258fe2 100644 --- a/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/workspace-platforms/page.tsx @@ -1,7 +1,7 @@ import { _generateMetadata, getTranslate } from "app/_utils"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; -import WorkspacePlatformsPage from "~/ee/organizations/admin/WorkspacePlatformPage"; +import WorkspacePlatformsPage from "~/ee/organizations/admin/views/WorkspacePlatformPage"; import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader"; export const generateMetadata = async () => @@ -16,7 +16,10 @@ export const generateMetadata = async () => const Page = async () => { const t = await getTranslate(); return ( - + diff --git a/apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx b/apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx index eb97de9544..254b298514 100644 --- a/apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx +++ b/apps/web/app/(use-page-wrapper)/settings/license-key/new/page.tsx @@ -8,7 +8,7 @@ import type { inferSSRProps } from "@calcom/types/inferSSRProps"; import { buildLegacyCtx } from "@lib/buildLegacyCtx"; import { getServerSideProps } from "@lib/settings/license-key/new/getServerSideProps"; -import CreateANewLicenseKeyForm, { LayoutWrapper } from "~/settings/license-key/new/new-view"; +import SettingsNewView from "~/settings/license-key/new/new-view"; export const generateMetadata = async () => await _generateMetadata( @@ -24,9 +24,7 @@ const getData = withAppDirSsr>(getServe const ServerPage = async ({ params, searchParams }: PageProps) => { await getData(buildLegacyCtx(await headers(), await cookies(), await params, await searchParams)); return ( - - - + ); }; diff --git a/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx b/apps/web/modules/ee/deployment/components/CreateLicenseKeyForm.tsx similarity index 99% rename from packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx rename to apps/web/modules/ee/deployment/components/CreateLicenseKeyForm.tsx index 62a1f2c1e8..844c0b196d 100644 --- a/packages/features/ee/deployment/licensekey/CreateLicenseKeyForm.tsx +++ b/apps/web/modules/ee/deployment/components/CreateLicenseKeyForm.tsx @@ -13,7 +13,7 @@ import { Button } from "@calcom/ui/components/button"; import { Label, TextField, ToggleGroup, Form } from "@calcom/ui/components/form"; import { showToast } from "@calcom/ui/components/toast"; -import { UserPermissionRole } from "../../../../prisma/enums"; +import { UserPermissionRole } from "@calcom/prisma/enums"; export const CreateANewLicenseKeyForm = () => { const session = useSession(); diff --git a/packages/features/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx b/apps/web/modules/ee/organizations/admin/components/BulkDeleteBlocklistEntries.tsx similarity index 100% rename from packages/features/ee/admin/pages/settings/blocklist/BulkDeleteBlocklistEntries.tsx rename to apps/web/modules/ee/organizations/admin/components/BulkDeleteBlocklistEntries.tsx diff --git a/packages/features/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx b/apps/web/modules/ee/organizations/admin/components/BulkDismissReports.tsx similarity index 100% rename from packages/features/ee/admin/pages/settings/blocklist/BulkDismissReports.tsx rename to apps/web/modules/ee/organizations/admin/components/BulkDismissReports.tsx diff --git a/apps/web/modules/ee/organizations/admin/AdminOrgEditPage.tsx b/apps/web/modules/ee/organizations/admin/views/AdminOrgEditPage.tsx similarity index 100% rename from apps/web/modules/ee/organizations/admin/AdminOrgEditPage.tsx rename to apps/web/modules/ee/organizations/admin/views/AdminOrgEditPage.tsx diff --git a/apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx b/apps/web/modules/ee/organizations/admin/views/AdminOrgPage.tsx similarity index 100% rename from apps/web/modules/ee/organizations/admin/AdminOrgPage.tsx rename to apps/web/modules/ee/organizations/admin/views/AdminOrgPage.tsx diff --git a/packages/features/ee/admin/pages/settings/blocklist.tsx b/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx similarity index 98% rename from packages/features/ee/admin/pages/settings/blocklist.tsx rename to apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx index 45313f86aa..6b3f4204c8 100644 --- a/packages/features/ee/admin/pages/settings/blocklist.tsx +++ b/apps/web/modules/ee/organizations/admin/views/SystemBlocklistView.tsx @@ -26,8 +26,8 @@ import { import { ToggleGroup } from "@calcom/ui/components/form"; import { showToast } from "@calcom/ui/components/toast"; -import { BulkDeleteBlocklistEntries } from "./blocklist/BulkDeleteBlocklistEntries"; -import { BulkDismissReports } from "./blocklist/BulkDismissReports"; +import { BulkDeleteBlocklistEntries } from "../components/BulkDeleteBlocklistEntries"; +import { BulkDismissReports } from "../components/BulkDismissReports"; type ViewType = "blocked" | "pending"; diff --git a/apps/web/modules/ee/organizations/admin/WorkspacePlatformPage.tsx b/apps/web/modules/ee/organizations/admin/views/WorkspacePlatformPage.tsx similarity index 100% rename from apps/web/modules/ee/organizations/admin/WorkspacePlatformPage.tsx rename to apps/web/modules/ee/organizations/admin/views/WorkspacePlatformPage.tsx diff --git a/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx b/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx index 67eadcee7f..381b670fce 100644 --- a/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx +++ b/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx @@ -7,8 +7,8 @@ import { useState } from "react"; import LicenseRequired from "~/ee/common/components/LicenseRequired"; import type { WorkflowRepository } from "@calcom/features/ee/workflows/repositories/WorkflowRepository"; -import { FilterResults } from "@calcom/features/filters/components/FilterResults"; -import { TeamsFilter } from "@calcom/features/filters/components/TeamsFilter"; +import { FilterResults } from "~/filters/components/FilterResults"; +import { TeamsFilter } from "~/filters/components/TeamsFilter"; import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; diff --git a/packages/features/filters/components/FilterResults.tsx b/apps/web/modules/filters/components/FilterResults.tsx similarity index 100% rename from packages/features/filters/components/FilterResults.tsx rename to apps/web/modules/filters/components/FilterResults.tsx diff --git a/packages/features/filters/components/TeamsFilter.tsx b/apps/web/modules/filters/components/TeamsFilter.tsx similarity index 98% rename from packages/features/filters/components/TeamsFilter.tsx rename to apps/web/modules/filters/components/TeamsFilter.tsx index 674da6853e..1a8abe294a 100644 --- a/packages/features/filters/components/TeamsFilter.tsx +++ b/apps/web/modules/filters/components/TeamsFilter.tsx @@ -15,7 +15,7 @@ import { Icon } from "@calcom/ui/components/icon"; import { AnimatedPopover } from "@calcom/ui/components/popover"; import { Tooltip } from "@calcom/ui/components/tooltip"; -import { filterQuerySchema } from "../lib/getTeamsFiltersFromQuery"; +import { filterQuerySchema } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery"; function useFilterQuery() { // passthrough allows additional params to not be removed diff --git a/apps/web/modules/insights/components/filters/OrgTeamsFilter.tsx b/apps/web/modules/insights/components/filters/OrgTeamsFilter.tsx index 59a35ed7c8..33b79868f7 100644 --- a/apps/web/modules/insights/components/filters/OrgTeamsFilter.tsx +++ b/apps/web/modules/insights/components/filters/OrgTeamsFilter.tsx @@ -4,7 +4,7 @@ import { useState } from "react"; import { FilterCheckboxField, FilterCheckboxFieldsContainer, -} from "@calcom/features/filters/components/TeamsFilter"; +} from "~/filters/components/TeamsFilter"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; diff --git a/apps/web/modules/settings/license-key/new/new-view.tsx b/apps/web/modules/settings/license-key/new/new-view.tsx index 8af08ea415..b7ca12063b 100644 --- a/apps/web/modules/settings/license-key/new/new-view.tsx +++ b/apps/web/modules/settings/license-key/new/new-view.tsx @@ -1,14 +1,12 @@ "use client"; -import { CreateANewLicenseKeyForm } from "@calcom/features/ee/deployment/licensekey/CreateLicenseKeyForm"; import { WizardLayout } from "@calcom/ui/components/layout"; +import { CreateANewLicenseKeyForm } from "~/ee/deployment/components/CreateLicenseKeyForm"; -export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => { +export default function SettingsNewView() { return ( - {children} + ); }; - -export default CreateANewLicenseKeyForm;