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.

[WEB-1949] chore: delete workspace components restructuring. (#5123)

Prateek Shourya56331a7b5502
diff --git a/packages/ui/src/collapsible/collapsible.tsx b/packages/ui/src/collapsible/collapsible.tsx
index 6c08563f0a..a069be3ed5 100644
--- a/packages/ui/src/collapsible/collapsible.tsx
+++ b/packages/ui/src/collapsible/collapsible.tsx
@@ -4,6 +4,7 @@ import { Disclosure, Transition } from "@headlessui/react";
export type TCollapsibleProps = {
title: string | React.ReactNode;
children: React.ReactNode;
+ className?: string;
buttonClassName?: string;
isOpen?: boolean;
onToggle?: () => void;
@@ -11,7 +12,7 @@ export type TCollapsibleProps = {
};
export const Collapsible: FC<TCollapsibleProps> = (props) => {
- const { title, children, buttonClassName, isOpen, onToggle, defaultOpen } = props;
+ const { title, children, className, buttonClassName, isOpen, onToggle, defaultOpen } = props;
// state
const [localIsOpen, setLocalIsOpen] = useState<boolean>(isOpen || defaultOpen ? true : false);
@@ -31,7 +32,7 @@ export const Collapsible: FC<TCollapsibleProps> = (props) => {
}, [isOpen, onToggle]);
return (
- <Disclosure>
+ <Disclosure as="div" className={className}>
<Disclosure.Button className={buttonClassName} onClick={handleOnClick}>
{title}
</Disclosure.Button>
diff --git a/packages/ui/src/modals/alert-modal.tsx b/packages/ui/src/modals/alert-modal.tsx
index eb32d57ea6..eeef2861f2 100644
--- a/packages/ui/src/modals/alert-modal.tsx
+++ b/packages/ui/src/modals/alert-modal.tsx
@@ -13,7 +13,7 @@ export type TModalVariant = "danger" | "primary";
type Props = {
content: React.ReactNode | string;
handleClose: () => void;
- handleSubmit: () => Promise<void>;
+ handleSubmit: () => void;
hideIcon?: boolean;
isSubmitting: boolean;
isOpen: boolean;
diff --git a/web/ce/components/workspace/delete-workspace-section.tsx b/web/ce/components/workspace/delete-workspace-section.tsx
new file mode 100644
index 0000000000..bf212bb596
--- /dev/null
+++ b/web/ce/components/workspace/delete-workspace-section.tsx
@@ -0,0 +1,58 @@
+import { FC, useState } from "react";
+import { observer } from "mobx-react";
+import { ChevronDown, ChevronUp } from "lucide-react";
+// types
+import { IWorkspace } from "@plane/types";
+// ui
+import { Button, Collapsible } from "@plane/ui";
+// components
+import { DeleteWorkspaceModal } from "@/components/workspace";
+
+type TDeleteWorkspace = {
+ workspace: IWorkspace | null;
+};
+
+export const DeleteWorkspaceSection: FC<TDeleteWorkspace> = observer((props) => {
+ const { workspace } = props;
+ // states
+ const [isOpen, setIsOpen] = useState(false);
+ const [deleteWorkspaceModal, setDeleteWorkspaceModal] = useState(false);
+
+ return (
+ <>
+ <DeleteWorkspaceModal
+ data={workspace}
+ isOpen={deleteWorkspaceModal}
+ onClose={() => setDeleteWorkspaceModal(false)}
+ />
+ <div className="border-t border-custom-border-100">
+ <div className="w-full">
+ <Collapsible
+ isOpen={isOpen}
+ onToggle={() => setIsOpen(!isOpen)}
+ className="w-full"
+ buttonClassName="flex w-full items-center justify-between py-4"
+ title={
+ <>
+ <span className="text-lg tracking-tight">Delete Workspace</span>
+ {isOpen ? <ChevronUp className="h-5 w-5" /> : <ChevronDown className="h-5 w-5" />}
+ </>
+ }
+ >
+ <div className="flex flex-col gap-4">
+ <span className="text-base tracking-tight">
+ When deleting a workspace, all of the data and resources within that workspace will be permanently
+ removed and cannot be recovered.
+ </span>
+ <div>
+ <Button variant="danger" onClick={() => setDeleteWorkspaceModal(true)}>
+ Delete my workspace
+ </Button>
+ </div>
+ </div>
+ </Collapsible>
+ </div>
+ </div>
+ </>
+ );
+});
diff --git a/web/ce/components/workspace/index.ts b/web/ce/components/workspace/index.ts
index 6ac6285f43..94a1669475 100644
--- a/web/ce/components/workspace/index.ts
+++ b/web/ce/components/workspace/index.ts
@@ -1,3 +1,4 @@
export * from "./edition-badge";
export * from "./upgrade-badge";
export * from "./billing";
+export * from "./delete-workspace-section";
diff --git a/web/core/components/workspace/settings/workspace-details.tsx b/web/core/components/workspace/settings/workspace-details.tsx
index ca28c6816b..e758f78576 100644
--- a/web/core/components/workspace/settings/workspace-details.tsx
+++ b/web/core/components/workspace/settings/workspace-details.tsx
@@ -3,15 +3,13 @@
import { useEffect, useState, FC } from "react";
import { observer } from "mobx-react";
import { Controller, useForm } from "react-hook-form";
-import { ChevronDown, ChevronUp, Pencil } from "lucide-react";
-import { Disclosure, Transition } from "@headlessui/react";
+import { Pencil } from "lucide-react";
import { IWorkspace } from "@plane/types";
// ui
import { Button, CustomSelect, Input, TOAST_TYPE, setToast } from "@plane/ui";
// components
import { LogoSpinner } from "@/components/common";
import { WorkspaceImageUploadModal } from "@/components/core";
-import { DeleteWorkspaceModal } from "@/components/workspace";
// constants
import { WORKSPACE_UPDATED } from "@/constants/event-tracker";
import { EUserWorkspaceRoles, ORGANIZATION_SIZE } from "@/constants/workspace";
@@ -19,9 +17,10 @@ import { EUserWorkspaceRoles, ORGANIZATION_SIZE } from "@/constants/workspace";
import { copyUrlToClipboard } from "@/helpers/string.helper";
// hooks
import { useEventTracker, useUser, useWorkspace } from "@/hooks/store";
+// plane web components
+import { DeleteWorkspaceSection } from "@/plane-web/components/workspace";
// services
import { FileService } from "@/services/file.service";
-// types
const defaultValues: Partial<IWorkspace> = {
name: "",
@@ -36,7 +35,6 @@ const fileService = new FileService();
export const WorkspaceDetails: FC = observer(() => {
// states
const [isLoading, setIsLoading] = useState(false);
- const [deleteWorkspaceModal, setDeleteWorkspaceModal] = useState(false);
const [isImageRemoving, setIsImageRemoving] = useState(false);
const [isImageUploadModalOpen, setIsImageUploadModalOpen] = useState(false);
// store hooks
@@ -154,11 +152,6 @@ export const WorkspaceDetails: FC = observer(() => {
return (
<>
- <DeleteWorkspaceModal
- data={currentWorkspace}
- isOpen={deleteWorkspaceModal}
- onClose={() => setDeleteWorkspaceModal(false)}
- />
<Controller
control={control}
name="logo"
@@ -308,44 +301,7 @@ export const WorkspaceDetails: FC = observer(() => {
</div>
)}
</div>
- {isAdmin && (
- <Disclosure as="div" className="border-t border-custom-border-100">
- {({ open }) => (
- <div className="w-full">
- <Disclosure.Button as="button" type="button" className="flex w-full items-center justify-between py-4">
- <span className="text-lg tracking-tight">Delete Workspace</span>
- {/* <Icon iconName={open ? "expand_less" : "expand_more"} className="!text-2xl" /> */}
- {open ? <ChevronUp className="h-5 w-5" /> : <ChevronDown className="h-5 w-5" />}
- </Disclosure.Button>
-
- <Transition
- show={open}
- enter="transition duration-100 ease-out"
- enterFrom="transform opacity-0"
- enterTo="transform opacity-100"
- leave="transition duration-75 ease-out"
- leaveFrom="transform opacity-100"
- leaveTo="transform opacity-0"
- >
- <Disclosure.Panel>
- <div className="flex flex-col gap-8">
- <span className="text-sm tracking-tight">
- The danger zone of the workspace delete page is a critical area that requires careful
- consideration and attention. When deleting a workspace, all of the data and resources within
- that workspace will be permanently removed and cannot be recovered.
- </span>
- <div>
- <Button variant="danger" onClick={() => setDeleteWorkspaceModal(true)}>
- Delete my workspace
- </Button>
- </div>
- </div>
- </Disclosure.Panel>
- </Transition>
- </div>
- )}
- </Disclosure>
- )}
+ {isAdmin && <DeleteWorkspaceSection workspace={currentWorkspace} />}
</div>
</>
);
diff --git a/web/ee/components/workspace/delete-workspace-section.tsx b/web/ee/components/workspace/delete-workspace-section.tsx
new file mode 100644
index 0000000000..9b2628048e
--- /dev/null
+++ b/web/ee/components/workspace/delete-workspace-section.tsx
@@ -0,0 +1 @@
+export * from "ce/components/workspace/delete-workspace-section";
diff --git a/web/ee/components/workspace/index.ts b/web/ee/components/workspace/index.ts
index 6ac6285f43..94a1669475 100644
--- a/web/ee/components/workspace/index.ts
+++ b/web/ee/components/workspace/index.ts
@@ -1,3 +1,4 @@
export * from "./edition-badge";
export * from "./upgrade-badge";
export * from "./billing";
+export * from "./delete-workspace-section";