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.

refactor: enhance workspace and project wrapper modularity (#6207)

Prateek Shourya4507802abab2
diff --git a/packages/ui/src/modals/constants.ts b/packages/ui/src/modals/constants.ts
index fe72ef7aea..e1eccd9412 100644
--- a/packages/ui/src/modals/constants.ts
+++ b/packages/ui/src/modals/constants.ts
@@ -13,4 +13,5 @@ export enum EModalWidth {
XXXXL = "sm:max-w-4xl",
VXL = "sm:max-w-5xl",
VIXL = "sm:max-w-6xl",
+ VIIXL = "sm:max-w-7xl",
}
diff --git a/web/app/[workspaceSlug]/(projects)/layout.tsx b/web/app/[workspaceSlug]/(projects)/layout.tsx
index f8fe0f8f9e..340ec57d0d 100644
--- a/web/app/[workspaceSlug]/(projects)/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/layout.tsx
@@ -1,8 +1,9 @@
"use client";
import { CommandPalette } from "@/components/command-palette";
-import { WorkspaceAuthWrapper } from "@/layouts/auth-layout";
import { AuthenticationWrapper } from "@/lib/wrappers";
+// plane web components
+import { WorkspaceAuthWrapper } from "@/plane-web/layouts/workspace-wrapper";
import { AppSidebar } from "./sidebar";
export default function WorkspaceLayout({ children }: { children: React.ReactNode }) {
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/layout.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/layout.tsx
index fc2ec0075f..cdd4f70807 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/layout.tsx
@@ -1,8 +1,8 @@
"use client";
import { ReactNode } from "react";
-// layouts
-import { ProjectAuthWrapper } from "@/layouts/auth-layout";
+// plane web layouts
+import { ProjectAuthWrapper } from "@/plane-web/layouts/project-wrapper";
const ProjectDetailLayout = ({ children }: { children: ReactNode }) => (
<ProjectAuthWrapper>{children}</ProjectAuthWrapper>
diff --git a/web/ce/layouts/project-wrapper.tsx b/web/ce/layouts/project-wrapper.tsx
new file mode 100644
index 0000000000..a922321099
--- /dev/null
+++ b/web/ce/layouts/project-wrapper.tsx
@@ -0,0 +1,15 @@
+import { FC } from "react";
+import { observer } from "mobx-react";
+// layouts
+import { ProjectAuthWrapper as CoreProjectAuthWrapper } from "@/layouts/auth-layout";
+
+export type IProjectAuthWrapper = {
+ children: React.ReactNode;
+};
+
+export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
+ // props
+ const { children } = props;
+
+ return <CoreProjectAuthWrapper>{children}</CoreProjectAuthWrapper>;
+});
diff --git a/web/ce/layouts/workspace-wrapper.tsx b/web/ce/layouts/workspace-wrapper.tsx
new file mode 100644
index 0000000000..fcde83e7f3
--- /dev/null
+++ b/web/ce/layouts/workspace-wrapper.tsx
@@ -0,0 +1,15 @@
+import { FC } from "react";
+import { observer } from "mobx-react";
+// layouts
+import { WorkspaceAuthWrapper as CoreWorkspaceAuthWrapper } from "@/layouts/auth-layout";
+
+export type IWorkspaceAuthWrapper = {
+ children: React.ReactNode;
+};
+
+export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props) => {
+ // props
+ const { children } = props;
+
+ return <CoreWorkspaceAuthWrapper>{children}</CoreWorkspaceAuthWrapper>;
+});
diff --git a/web/core/components/workspace/settings/invitations-list-item.tsx b/web/core/components/workspace/settings/invitations-list-item.tsx
index 09ca653f34..bbbbcd2670 100644
--- a/web/core/components/workspace/settings/invitations-list-item.tsx
+++ b/web/core/components/workspace/settings/invitations-list-item.tsx
@@ -120,11 +120,11 @@ export const WorkspaceInvitationsListItem: FC<Props> = observer((props) => {
updateMemberInvitation(workspaceSlug.toString(), invitationDetails.id, {
role: value,
- }).catch(() => {
+ }).catch((error) => {
setToast({
type: TOAST_TYPE.ERROR,
title: "Error!",
- message: "An error occurred while updating member role. Please try again.",
+ message: error?.error || "An error occurred while updating member role. Please try again.",
});
});
}}
diff --git a/web/core/layouts/auth-layout/project-wrapper.tsx b/web/core/layouts/auth-layout/project-wrapper.tsx
index 4cca052573..dcba2a8fef 100644
--- a/web/core/layouts/auth-layout/project-wrapper.tsx
+++ b/web/core/layouts/auth-layout/project-wrapper.tsx
@@ -34,12 +34,14 @@ import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/u
interface IProjectAuthWrapper {
children: ReactNode;
+ isLoading?: boolean;
}
export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
- const { children } = props;
- // store
- // const { fetchInboxes } = useInbox();
+ const { children, isLoading: isParentLoading = false } = props;
+ // router
+ const { workspaceSlug, projectId } = useParams();
+ // store hooks
const { toggleCreateProjectModal } = useCommandPalette();
const { setTrackElement } = useEventTracker();
const { fetchUserProjectInfo, allowPermissions, projectUserInfo } = useUserPermissions();
@@ -54,14 +56,20 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
const { fetchProjectStates, fetchProjectStateTransitions } = useProjectState();
const { fetchProjectLabels } = useLabel();
const { getProjectEstimates } = useProjectEstimates();
- // router
- const { workspaceSlug, projectId } = useParams();
-
+ // derived values
+ const projectExists = projectId ? getProjectById(projectId.toString()) : null;
const projectMemberInfo = projectUserInfo?.[workspaceSlug?.toString()]?.[projectId?.toString()];
+ const hasPermissionToCurrentProject = allowPermissions(
+ [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
+ EUserPermissionsLevel.PROJECT,
+ workspaceSlug.toString(),
+ projectId?.toString()
+ );
// Initialize module timeline chart
useEffect(() => {
initGantt();
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
useSWR(
@@ -143,17 +151,8 @@ export const ProjectAuthWrapper: FC<IProjectAuthWrapper> = observer((props) => {
{ revalidateIfStale: false, revalidateOnFocus: false }
);
- // derived values
- const projectExists = projectId ? getProjectById(projectId.toString()) : null;
- const hasPermissionToCurrentProject = allowPermissions(
- [EUserPermissions.ADMIN, EUserPermissions.MEMBER, EUserPermissions.GUEST],
- EUserPermissionsLevel.PROJECT,
- workspaceSlug.toString(),
- projectId?.toString()
- );
-
// check if the project member apis is loading
- if (!projectMemberInfo && projectId && hasPermissionToCurrentProject === null)
+ if (isParentLoading || (!projectMemberInfo && projectId && hasPermissionToCurrentProject === null))
return (
<div className="grid h-screen place-items-center bg-custom-background-100 p-4">
<div className="flex flex-col items-center gap-3 text-center">
diff --git a/web/core/layouts/auth-layout/workspace-wrapper.tsx b/web/core/layouts/auth-layout/workspace-wrapper.tsx
index 2dd658704e..ab39dd7614 100644
--- a/web/core/layouts/auth-layout/workspace-wrapper.tsx
+++ b/web/core/layouts/auth-layout/workspace-wrapper.tsx
@@ -8,11 +8,12 @@ import { useParams } from "next/navigation";
import { useTheme } from "next-themes";
import useSWR from "swr";
import useSWRImmutable from "swr/immutable";
-
+// ui
import { LogOut } from "lucide-react";
-// hooks
import { Button, setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
+// components
import { LogoSpinner } from "@/components/common";
+// hooks
import { useMember, useProject, useUser, useUserPermissions, useWorkspace } from "@/hooks/store";
import { useFavorite } from "@/hooks/store/use-favorite";
import { usePlatformOS } from "@/hooks/use-platform-os";
@@ -25,12 +26,13 @@ import PlaneBlackLogo from "@/public/plane-logos/black-horizontal-with-blue-logo
import PlaneWhiteLogo from "@/public/plane-logos/white-horizontal-with-blue-logo.png";
import WorkSpaceNotAvailable from "@/public/workspace/workspace-not-available.png";
-export interface IWorkspaceAuthWrapper {
+interface IWorkspaceAuthWrapper {
children: ReactNode;
+ isLoading?: boolean;
}
export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props) => {
- const { children } = props;
+ const { children, isLoading: isParentLoading = false } = props;
// router params
const { workspaceSlug } = useParams();
// next themes
@@ -51,11 +53,11 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
[EUserPermissions.ADMIN, EUserPermissions.MEMBER],
EUserPermissionsLevel.WORKSPACE
);
-
const planeLogo = resolvedTheme === "dark" ? PlaneWhiteLogo : PlaneBlackLogo;
const allWorkspaces = workspaces ? Object.values(workspaces) : undefined;
const currentWorkspace =
(allWorkspaces && allWorkspaces.find((workspace) => workspace?.slug === workspaceSlug)) || undefined;
+ const currentWorkspaceInfo = workspaceSlug && workspaceInfoBySlug(workspaceSlug.toString());
// fetching user workspace information
useSWR(
@@ -116,11 +118,8 @@ export const WorkspaceAuthWrapper: FC<IWorkspaceAuthWrapper> = observer((props)
);
};
- // derived values
- const currentWorkspaceInfo = workspaceSlug && workspaceInfoBySlug(workspaceSlug.toString());
-
// if list of workspaces are not there then we have to render the spinner
- if (allWorkspaces === undefined || loader || isDBInitializing) {
+ if (isParentLoading || allWorkspaces === undefined || loader || isDBInitializing) {
return (
<div className="grid h-screen place-items-center bg-custom-background-100 p-4">
<div className="flex flex-col items-center gap-3 text-center">
diff --git a/web/ee/layouts/project-wrapper.tsx b/web/ee/layouts/project-wrapper.tsx
new file mode 100644
index 0000000000..911665c978
--- /dev/null
+++ b/web/ee/layouts/project-wrapper.tsx
@@ -0,0 +1 @@
+export * from "ce/layouts/project-wrapper";
diff --git a/web/ee/layouts/workspace-wrapper.tsx b/web/ee/layouts/workspace-wrapper.tsx
new file mode 100644
index 0000000000..186266fc1a
--- /dev/null
+++ b/web/ee/layouts/workspace-wrapper.tsx
@@ -0,0 +1 @@
+export * from "ce/layouts/workspace-wrapper";