Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

chore: move modal core components to the UI package (#4794)

Aaryan Khandelwal244986554ce6
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index e0bb66c336..8b66c794dc 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -7,6 +7,7 @@ export * from "./dropdowns";
export * from "./dropdown";
export * from "./form-fields";
export * from "./icons";
+export * from "./modals";
export * from "./progress";
export * from "./spinners";
export * from "./tooltip";
diff --git a/web/core/components/core/modals/alert-modal.tsx b/packages/ui/src/modals/alert-modal.tsx
similarity index 91%
rename from web/core/components/core/modals/alert-modal.tsx
rename to packages/ui/src/modals/alert-modal.tsx
index c8df8787bb..eb32d57ea6 100644
--- a/web/core/components/core/modals/alert-modal.tsx
+++ b/packages/ui/src/modals/alert-modal.tsx
@@ -1,11 +1,12 @@
-"use client";
+import React from "react";
import { AlertTriangle, Info, LucideIcon } from "lucide-react";
-// ui
-import { Button, TButtonVariant } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
+import { Button, TButtonVariant } from "../button";
+import { ModalCore } from "./modal-core";
+// constants
+import { EModalPosition, EModalWidth } from "./constants";
// helpers
-import { cn } from "@/helpers/common.helper";
+import { cn } from "../../helpers";
export type TModalVariant = "danger" | "primary";
diff --git a/packages/ui/src/modals/constants.ts b/packages/ui/src/modals/constants.ts
new file mode 100644
index 0000000000..fd0c828316
--- /dev/null
+++ b/packages/ui/src/modals/constants.ts
@@ -0,0 +1,11 @@
+export enum EModalPosition {
+ TOP = "flex items-center justify-center text-center mx-4 my-10 md:my-20",
+ CENTER = "flex items-end sm:items-center justify-center p-4 min-h-full",
+}
+
+export enum EModalWidth {
+ XL = "sm:max-w-xl",
+ XXL = "sm:max-w-2xl",
+ XXXL = "sm:max-w-3xl",
+ XXXXL = "sm:max-w-4xl",
+}
diff --git a/packages/ui/src/modals/index.ts b/packages/ui/src/modals/index.ts
new file mode 100644
index 0000000000..964864f7bb
--- /dev/null
+++ b/packages/ui/src/modals/index.ts
@@ -0,0 +1,3 @@
+export * from "./alert-modal";
+export * from "./constants";
+export * from "./modal-core";
diff --git a/web/core/components/core/modals/modal-core.tsx b/packages/ui/src/modals/modal-core.tsx
similarity index 82%
rename from web/core/components/core/modals/modal-core.tsx
rename to packages/ui/src/modals/modal-core.tsx
index be1b2ad053..8a342c5aa8 100644
--- a/web/core/components/core/modals/modal-core.tsx
+++ b/packages/ui/src/modals/modal-core.tsx
@@ -1,19 +1,9 @@
-import { Fragment } from "react";
+import React, { Fragment } from "react";
import { Dialog, Transition } from "@headlessui/react";
+// constants
+import { EModalPosition, EModalWidth } from "./constants";
// helpers
-import { cn } from "@/helpers/common.helper";
-
-export enum EModalPosition {
- TOP = "flex items-center justify-center text-center mx-4 my-10 md:my-20",
- CENTER = "flex items-end sm:items-center justify-center p-4 min-h-full",
-}
-
-export enum EModalWidth {
- XL = "sm:max-w-xl",
- XXL = "sm:max-w-2xl",
- XXXL = "sm:max-w-3xl",
- XXXXL = "sm:max-w-4xl",
-}
+import { cn } from "../../helpers";
type Props = {
children: React.ReactNode;
diff --git a/web/core/components/api-token/delete-token-modal.tsx b/web/core/components/api-token/delete-token-modal.tsx
index 2db999b7f8..4e7d15fdff 100644
--- a/web/core/components/api-token/delete-token-modal.tsx
+++ b/web/core/components/api-token/delete-token-modal.tsx
@@ -6,9 +6,7 @@ import { mutate } from "swr";
// types
import { IApiToken } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// fetch-keys
import { API_TOKENS_LIST } from "@/constants/fetch-keys";
// services
diff --git a/web/core/components/api-token/modal/create-token-modal.tsx b/web/core/components/api-token/modal/create-token-modal.tsx
index bf565dd665..62c2456050 100644
--- a/web/core/components/api-token/modal/create-token-modal.tsx
+++ b/web/core/components/api-token/modal/create-token-modal.tsx
@@ -6,10 +6,9 @@ import { mutate } from "swr";
// types
import { IApiToken } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// components
import { CreateApiTokenForm, GeneratedTokenDetails } from "@/components/api-token";
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
// fetch-keys
import { API_TOKENS_LIST } from "@/constants/fetch-keys";
// helpers
diff --git a/web/core/components/core/modals/index.ts b/web/core/components/core/modals/index.ts
index 71068ca177..a95c22114e 100644
--- a/web/core/components/core/modals/index.ts
+++ b/web/core/components/core/modals/index.ts
@@ -1,9 +1,7 @@
-export * from "./alert-modal";
export * from "./bulk-delete-issues-modal";
export * from "./existing-issues-list-modal";
export * from "./gpt-assistant-popover";
export * from "./link-modal";
-export * from "./modal-core";
export * from "./user-image-upload-modal";
export * from "./workspace-image-upload-modal";
export * from "./issue-search-modal-empty-state";
diff --git a/web/core/components/cycles/delete-modal.tsx b/web/core/components/cycles/delete-modal.tsx
index 71e407944f..38217719dc 100644
--- a/web/core/components/cycles/delete-modal.tsx
+++ b/web/core/components/cycles/delete-modal.tsx
@@ -6,9 +6,7 @@ import { useParams, useRouter, useSearchParams } from "next/navigation";
// types
import { ICycle } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// constants
import { CYCLE_DELETED } from "@/constants/event-tracker";
// hooks
diff --git a/web/core/components/cycles/modal.tsx b/web/core/components/cycles/modal.tsx
index 5bb417a3b0..c6f78a2567 100644
--- a/web/core/components/cycles/modal.tsx
+++ b/web/core/components/cycles/modal.tsx
@@ -4,9 +4,8 @@ import React, { useEffect, useState } from "react";
// types
import type { CycleDateCheckData, ICycle, TCycleTabOptions } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { CycleForm } from "@/components/cycles";
// constants
import { CYCLE_CREATED, CYCLE_UPDATED } from "@/constants/event-tracker";
diff --git a/web/core/components/estimates/create/modal.tsx b/web/core/components/estimates/create/modal.tsx
index 0302b1de8a..3eee4fc011 100644
--- a/web/core/components/estimates/create/modal.tsx
+++ b/web/core/components/estimates/create/modal.tsx
@@ -3,10 +3,11 @@
import { FC, useEffect, useMemo, useState } from "react";
import { observer } from "mobx-react";
import { ChevronLeft } from "lucide-react";
+// types
import { IEstimateFormData, TEstimateSystemKeys, TEstimatePointsObject, TEstimateTypeError } from "@plane/types";
-import { Button, TOAST_TYPE, setToast } from "@plane/ui";
+// ui
+import { Button, EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { EstimateCreateStageOne, EstimatePointCreateRoot } from "@/components/estimates";
// hooks
import { useProjectEstimates } from "@/hooks/store";
diff --git a/web/core/components/estimates/delete/modal.tsx b/web/core/components/estimates/delete/modal.tsx
index b7e8df1535..5ad704249f 100644
--- a/web/core/components/estimates/delete/modal.tsx
+++ b/web/core/components/estimates/delete/modal.tsx
@@ -2,9 +2,8 @@
import { FC, useState } from "react";
import { observer } from "mobx-react";
-import { Button, TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
+// ui
+import { Button, EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useEstimate, useProject, useProjectEstimates } from "@/hooks/store";
diff --git a/web/core/components/inbox/modals/create-edit-modal/modal.tsx b/web/core/components/inbox/modals/create-edit-modal/modal.tsx
index 2b6493ec91..5d51477b6b 100644
--- a/web/core/components/inbox/modals/create-edit-modal/modal.tsx
+++ b/web/core/components/inbox/modals/create-edit-modal/modal.tsx
@@ -1,8 +1,9 @@
import { FC } from "react";
// types
import { TIssue } from "@plane/types";
+// ui
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { InboxIssueCreateRoot, InboxIssueEditRoot } from "@/components/inbox/modals/create-edit-modal";
type TInboxIssueCreateEditModalRoot = {
diff --git a/web/core/components/inbox/modals/decline-issue-modal.tsx b/web/core/components/inbox/modals/decline-issue-modal.tsx
index 4ca784ec15..13294201d2 100644
--- a/web/core/components/inbox/modals/decline-issue-modal.tsx
+++ b/web/core/components/inbox/modals/decline-issue-modal.tsx
@@ -1,8 +1,8 @@
import React, { useState } from "react";
// types
import type { TIssue } from "@plane/types";
-// components
-import { AlertModalCore } from "@/components/core";
+// ui
+import { AlertModalCore } from "@plane/ui";
// hooks
import { useProject } from "@/hooks/store";
diff --git a/web/core/components/inbox/modals/delete-issue-modal.tsx b/web/core/components/inbox/modals/delete-issue-modal.tsx
index 5ad88d1c5f..1ab84d8e77 100644
--- a/web/core/components/inbox/modals/delete-issue-modal.tsx
+++ b/web/core/components/inbox/modals/delete-issue-modal.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { observer } from "mobx-react";
// types
import type { TIssue } from "@plane/types";
-// components
-import { AlertModalCore } from "@/components/core";
+// ui
+import { AlertModalCore } from "@plane/ui";
// hooks
import { useProject } from "@/hooks/store";
diff --git a/web/core/components/issues/attachment/delete-attachment-modal.tsx b/web/core/components/issues/attachment/delete-attachment-modal.tsx
index 98687f5387..571e6bcf63 100644
--- a/web/core/components/issues/attachment/delete-attachment-modal.tsx
+++ b/web/core/components/issues/attachment/delete-attachment-modal.tsx
@@ -1,7 +1,8 @@
import { FC, useState } from "react";
+// types
import type { TIssueAttachment } from "@plane/types";
-// components
-import { AlertModalCore } from "@/components/core";
+// ui
+import { AlertModalCore } from "@plane/ui";
// helper
import { getFileName } from "@/helpers/attachment.helper";
// types
diff --git a/web/core/components/issues/delete-issue-modal.tsx b/web/core/components/issues/delete-issue-modal.tsx
index d6fbe1260e..a6a62d8126 100644
--- a/web/core/components/issues/delete-issue-modal.tsx
+++ b/web/core/components/issues/delete-issue-modal.tsx
@@ -4,9 +4,7 @@ import { useEffect, useState } from "react";
// types
import { TIssue } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useIssues, useProject } from "@/hooks/store";
diff --git a/web/core/components/issues/issue-modal/modal.tsx b/web/core/components/issues/issue-modal/modal.tsx
index bfd20cb98a..e6fa19c2c1 100644
--- a/web/core/components/issues/issue-modal/modal.tsx
+++ b/web/core/components/issues/issue-modal/modal.tsx
@@ -6,9 +6,7 @@ import { usePathname } from "next/navigation";
// types
import type { TIssue } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// constants
import { ISSUE_CREATED, ISSUE_UPDATED } from "@/constants/event-tracker";
import { EIssuesStoreType } from "@/constants/issue";
diff --git a/web/core/components/labels/delete-label-modal.tsx b/web/core/components/labels/delete-label-modal.tsx
index c3e3bed3ec..dfad0aeffa 100644
--- a/web/core/components/labels/delete-label-modal.tsx
+++ b/web/core/components/labels/delete-label-modal.tsx
@@ -6,9 +6,7 @@ import { useParams } from "next/navigation";
// types
import type { IIssueLabel } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useLabel } from "@/hooks/store";
diff --git a/web/core/components/modules/delete-module-modal.tsx b/web/core/components/modules/delete-module-modal.tsx
index 32ac29e309..955a234582 100644
--- a/web/core/components/modules/delete-module-modal.tsx
+++ b/web/core/components/modules/delete-module-modal.tsx
@@ -6,9 +6,7 @@ import { useParams, useRouter } from "next/navigation";
// types
import type { IModule } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// constants
import { MODULE_DELETED } from "@/constants/event-tracker";
// hooks
diff --git a/web/core/components/modules/modal.tsx b/web/core/components/modules/modal.tsx
index 463b18188e..667e15da98 100644
--- a/web/core/components/modules/modal.tsx
+++ b/web/core/components/modules/modal.tsx
@@ -6,9 +6,8 @@ import { useForm } from "react-hook-form";
// types
import type { IModule } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { ModuleForm } from "@/components/modules";
// constants
import { MODULE_CREATED, MODULE_UPDATED } from "@/constants/event-tracker";
diff --git a/web/core/components/pages/modals/create-page-modal.tsx b/web/core/components/pages/modals/create-page-modal.tsx
index b98697554b..9a02fda94d 100644
--- a/web/core/components/pages/modals/create-page-modal.tsx
+++ b/web/core/components/pages/modals/create-page-modal.tsx
@@ -2,8 +2,9 @@ import { FC, useEffect, useState } from "react";
import { useRouter } from "next/navigation";
// types
import { TPage } from "@plane/types";
+// ui
+import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { PageForm } from "@/components/pages";
// constants
import { PAGE_CREATED } from "@/constants/event-tracker";
diff --git a/web/core/components/pages/modals/delete-page-modal.tsx b/web/core/components/pages/modals/delete-page-modal.tsx
index ac1b24f064..8cd000cf21 100644
--- a/web/core/components/pages/modals/delete-page-modal.tsx
+++ b/web/core/components/pages/modals/delete-page-modal.tsx
@@ -3,9 +3,7 @@
import React, { useState } from "react";
import { observer } from "mobx-react";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// constants
import { PAGE_DELETED } from "@/constants/event-tracker";
// hooks
diff --git a/web/core/components/project/publish-project/modal.tsx b/web/core/components/project/publish-project/modal.tsx
index 8c2830995f..fff9d532a0 100644
--- a/web/core/components/project/publish-project/modal.tsx
+++ b/web/core/components/project/publish-project/modal.tsx
@@ -8,9 +8,7 @@ import { Check, ExternalLink, Globe2 } from "lucide-react";
// types
import { IProject, TProjectPublishLayouts, TPublishSettings } from "@plane/types";
// ui
-import { Button, Loader, ToggleSwitch, TOAST_TYPE, setToast, CustomSelect } from "@plane/ui";
-// components
-import { EModalWidth, ModalCore } from "@/components/core";
+import { Button, Loader, ToggleSwitch, TOAST_TYPE, setToast, CustomSelect, ModalCore, EModalWidth } from "@plane/ui";
// helpers
import { SPACE_BASE_URL } from "@/helpers/common.helper";
import { copyTextToClipboard } from "@/helpers/string.helper";
diff --git a/web/core/components/states/delete-state-modal.tsx b/web/core/components/states/delete-state-modal.tsx
index 7cdb365976..de66c3b496 100644
--- a/web/core/components/states/delete-state-modal.tsx
+++ b/web/core/components/states/delete-state-modal.tsx
@@ -6,9 +6,7 @@ import { useParams } from "next/navigation";
// types
import type { IState } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// constants
import { STATE_DELETED } from "@/constants/event-tracker";
// hooks
diff --git a/web/core/components/views/delete-view-modal.tsx b/web/core/components/views/delete-view-modal.tsx
index 2093f61515..9824669c5c 100644
--- a/web/core/components/views/delete-view-modal.tsx
+++ b/web/core/components/views/delete-view-modal.tsx
@@ -6,9 +6,7 @@ import { useParams } from "next/navigation";
// types
import { IProjectView } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useProjectView } from "@/hooks/store";
diff --git a/web/core/components/views/modal.tsx b/web/core/components/views/modal.tsx
index 9d44216ccd..d4d65c06b1 100644
--- a/web/core/components/views/modal.tsx
+++ b/web/core/components/views/modal.tsx
@@ -5,9 +5,8 @@ import { observer } from "mobx-react";
// types
import { IProjectView } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { ProjectViewForm } from "@/components/views";
// hooks
import { useProjectView } from "@/hooks/store";
diff --git a/web/core/components/web-hooks/create-webhook-modal.tsx b/web/core/components/web-hooks/create-webhook-modal.tsx
index 31dc0723c1..4d9f8927ef 100644
--- a/web/core/components/web-hooks/create-webhook-modal.tsx
+++ b/web/core/components/web-hooks/create-webhook-modal.tsx
@@ -5,9 +5,7 @@ import { useParams } from "next/navigation";
// types
import { IWebhook, IWorkspace, TWebhookEventTypes } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// helpers
import { csvDownload } from "@/helpers/download.helper";
// components
diff --git a/web/core/components/web-hooks/delete-webhook-modal.tsx b/web/core/components/web-hooks/delete-webhook-modal.tsx
index 6449d1e265..eda3123b39 100644
--- a/web/core/components/web-hooks/delete-webhook-modal.tsx
+++ b/web/core/components/web-hooks/delete-webhook-modal.tsx
@@ -3,9 +3,7 @@
import React, { FC, useState } from "react";
import { useParams, useRouter } from "next/navigation";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// hooks
import { useWebhook } from "@/hooks/store";
diff --git a/web/core/components/workspace/views/delete-view-modal.tsx b/web/core/components/workspace/views/delete-view-modal.tsx
index d726d98378..ac1722177d 100644
--- a/web/core/components/workspace/views/delete-view-modal.tsx
+++ b/web/core/components/workspace/views/delete-view-modal.tsx
@@ -6,9 +6,7 @@ import { useParams } from "next/navigation";
// types
import { IWorkspaceView } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
-// components
-import { AlertModalCore } from "@/components/core";
+import { AlertModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// constants
import { GLOBAL_VIEW_DELETED } from "@/constants/event-tracker";
// hooks
diff --git a/web/core/components/workspace/views/modal.tsx b/web/core/components/workspace/views/modal.tsx
index 2b5eb9dcf4..88fee28398 100644
--- a/web/core/components/workspace/views/modal.tsx
+++ b/web/core/components/workspace/views/modal.tsx
@@ -6,9 +6,8 @@ import { useParams, useRouter } from "next/navigation";
// types
import { IWorkspaceView } from "@plane/types";
// ui
-import { TOAST_TYPE, setToast } from "@plane/ui";
+import { EModalPosition, EModalWidth, ModalCore, TOAST_TYPE, setToast } from "@plane/ui";
// components
-import { EModalPosition, EModalWidth, ModalCore } from "@/components/core";
import { WorkspaceViewForm } from "@/components/workspace";
// constants
import { GLOBAL_VIEW_CREATED, GLOBAL_VIEW_UPDATED } from "@/constants/event-tracker";