refactor: move admin and filter components out of packages/features (#27604)
* migrate CreateLicenseKeyForm * refactor * migrate * migrate filters components * fix import
This commit is contained in:
1 parent
5804cc4fb0
commit
a28ab042ad
18 files changed
+30
-25
No files matched your search
@@ -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";
|
||||
|
||||
@@ -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 () =>
|
||||
|
||||
+5
-2
@@ -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 (
|
||||
<SettingsHeader title={`${t("editing_org")}: ${org.name}`} description={t("admin_orgs_edit_description")}>
|
||||
<SettingsHeader
|
||||
title={`${t("editing_org")}: ${org.name}`}
|
||||
description={t("admin_orgs_edit_description")}
|
||||
>
|
||||
<LicenseRequired>
|
||||
<OrgForm org={org} />
|
||||
</LicenseRequired>
|
||||
|
||||
+5
-2
@@ -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 (
|
||||
<SettingsHeader title={t("organizations")} description={t("orgs_page_description")}>
|
||||
<SettingsHeader
|
||||
title={t("organizations")}
|
||||
description={t("orgs_page_description")}
|
||||
>
|
||||
<LicenseRequired>
|
||||
<AdminOrgTable />
|
||||
</LicenseRequired>
|
||||
|
||||
+5
-2
@@ -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 (
|
||||
<SettingsHeader title={t("workspace_platforms")} description={t("workspace_platforms_description")}>
|
||||
<SettingsHeader
|
||||
title={t("workspace_platforms")}
|
||||
description={t("workspace_platforms_description")}
|
||||
>
|
||||
<LicenseRequired>
|
||||
<WorkspacePlatformsPage />
|
||||
</LicenseRequired>
|
||||
|
||||
@@ -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<inferSSRProps<typeof getServerSideProps>>(getServe
|
||||
const ServerPage = async ({ params, searchParams }: PageProps) => {
|
||||
await getData(buildLegacyCtx(await headers(), await cookies(), await params, await searchParams));
|
||||
return (
|
||||
<LayoutWrapper>
|
||||
<CreateANewLicenseKeyForm />
|
||||
</LayoutWrapper>
|
||||
<SettingsNewView />
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -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();
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2
-2
@@ -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";
|
||||
|
||||
File renamed without changes.
@@ -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";
|
||||
|
||||
File renamed without changes.
+1
-1
@@ -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
|
||||
@@ -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";
|
||||
|
||||
@@ -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 (
|
||||
<WizardLayout currentStep={1} maxSteps={2}>
|
||||
{children}
|
||||
<CreateANewLicenseKeyForm />
|
||||
</WizardLayout>
|
||||
);
|
||||
};
|
||||
|
||||
export default CreateANewLicenseKeyForm;
|
||||
Reference in new issue
Block a user