-
- {children}
-
diff --git a/web/layouts/app-layout-legacy/app-header.tsx b/web/layouts/app-layout-legacy/app-header.tsx
deleted file mode 100644
index f9ae83497..000000000
--- a/web/layouts/app-layout-legacy/app-header.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-// next imports
-import { useRouter } from "next/router";
-import Link from "next/link";
-// icons
-import { Menu } from "lucide-react";
-// ui components
-import { Tooltip } from "@plane/ui";
-// hooks
-import useProjectDetails from "hooks/use-project-details";
-
-type Props = {
- breadcrumbs?: JSX.Element;
- left?: JSX.Element;
- right?: JSX.Element;
- setToggleSidebar: React.Dispatch>;
- noHeader: boolean;
-};
-
-const { NEXT_PUBLIC_DEPLOY_URL } = process.env;
-let plane_deploy_url = NEXT_PUBLIC_DEPLOY_URL;
-
-if (typeof window !== "undefined" && !plane_deploy_url) {
- plane_deploy_url = window.location.protocol + "//" + window.location.host + "/spaces";
-}
-
-const Header: React.FC = ({ breadcrumbs, left, right, setToggleSidebar, noHeader }) => {
- const { projectDetails } = useProjectDetails();
-
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
-
- return (
- >;
-}
-
-const Sidebar: React.FC = observer(({ toggleSidebar, setToggleSidebar }) => {
- const { theme: themeStore } = useMobxStore();
-
- return (
-
- );
-});
-
-export default Sidebar;
diff --git a/web/layouts/app-layout-legacy/layout.tsx b/web/layouts/app-layout-legacy/layout.tsx
deleted file mode 100644
index 90eef899c..000000000
--- a/web/layouts/app-layout-legacy/layout.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export const AppLayoutLegacy = () => <>;
diff --git a/web/layouts/auth-layout-legacy/index.ts b/web/layouts/auth-layout-legacy/index.ts
deleted file mode 100644
index 608e96606..000000000
--- a/web/layouts/auth-layout-legacy/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./project-authorization-wrapper";
-export * from "./workspace-authorization-wrapper";
-export * from "./user-authorization-wrapper";
diff --git a/web/layouts/auth-layout-legacy/project-authorization-wrapper.tsx b/web/layouts/auth-layout-legacy/project-authorization-wrapper.tsx
deleted file mode 100644
index 69f33b509..000000000
--- a/web/layouts/auth-layout-legacy/project-authorization-wrapper.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { useState } from "react";
-
-import Link from "next/link";
-import { useRouter } from "next/router";
-
-// contexts
-import { useProjectMyMembership, ProjectMemberProvider } from "contexts/project-member.context";
-// layouts
-import AppHeader from "layouts/app-layout-legacy/app-header";
-import AppSidebar from "layouts/app-layout-legacy/app-sidebar";
-// components
-import { NotAuthorizedView, JoinProject } from "components/auth-screens";
-import { CommandPalette } from "components/command-palette";
-// ui
-import { Button, LayersIcon, Spinner } from "@plane/ui";
-import { EmptyState } from "components/common";
-// images
-import emptyProject from "public/empty-state/project.svg";
-
-type Props = {
- children: React.ReactNode;
- noHeader?: boolean;
- bg?: "primary" | "secondary";
- breadcrumbs?: JSX.Element;
- left?: JSX.Element;
- right?: JSX.Element;
-};
-
-export const ProjectAuthorizationWrapper: React.FC = (props) => (
-
-
-);
-
-const ProjectAuthorizationWrapped: React.FC = ({
- children,
- noHeader = false,
- bg = "primary",
- breadcrumbs,
- left,
- right,
-}) => {
- const [toggleSidebar, setToggleSidebar] = useState(false);
-
- const router = useRouter();
- const { workspaceSlug, projectId } = router.query;
-
- const { loading, error, memberRole: memberType } = useProjectMyMembership();
-
- const settingsLayout = router.pathname.includes("/settings");
-
- return (
- <>
- = ({ children }) => {
- const router = useRouter();
-
- const { data: currentUser, error } = useSWR(CURRENT_USER, () => userService.currentUser());
-
- if (!currentUser && !error) {
- return (
- = ({
- children,
- noHeader = false,
- bg = "primary",
- breadcrumbs,
- left,
- right,
-}) => {
- const [toggleSidebar, setToggleSidebar] = useState(false);
-
- const router = useRouter();
- const { workspaceSlug } = router.query;
-
- const { data: workspaceMemberMe, error } = useSWR(
- workspaceSlug ? WORKSPACE_MEMBERS_ME(workspaceSlug as string) : null,
- workspaceSlug ? () => workspaceService.workspaceMemberMe(workspaceSlug.toString()) : null
- );
-
- if (!workspaceMemberMe && !error)
- return (
-
-
-
-
- );
-};
diff --git a/web/layouts/profile-layout.tsx b/web/layouts/profile-layout.tsx
deleted file mode 100644
index e7ee873a5..000000000
--- a/web/layouts/profile-layout.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useRouter } from "next/router";
-// hooks
-import { useWorkspaceMyMembership } from "contexts/workspace-member.context";
-// layouts
-import { WorkspaceAuthorizationLayout } from "layouts/auth-layout-legacy";
-// components
-import { ProfileNavbar, ProfileSidebar } from "components/profile";
-// ui
-import { Breadcrumbs, BreadcrumbItem } from "@plane/ui";
-
-type Props = {
- children: React.ReactNode;
- className?: string;
-};
-
-export const ProfileAuthWrapper = (props: Props) => {
- const router = useRouter();
- return (
- router.back()}>
-
- );
-};
-
-const ProfileLayout: React.FC = ({ children, className }) => {
- const { memberRole } = useWorkspaceMyMembership();
-
- return (
- = ({ children, className }) => {
+ const router = useRouter();
+ const { workspaceSlug } = router.query;
+
+ const { data: memberDetails } = useSWR(
+ workspaceSlug ? WORKSPACE_MEMBERS_ME(workspaceSlug.toString()) : null,
+ workspaceSlug ? () => workspaceService.workspaceMemberMe(workspaceSlug.toString()) : null
+ );
+
+ const isAuthorized = memberDetails?.role === 20 || memberDetails?.role === 15 || memberDetails?.role === 10;
+
+ return (
+ = (props) => {
- const { children, header } = props;
+ const { children } = props;
return (
- <>
-
-
-
-
-
-
-
+ = (props) => {
- const { children, header } = props;
+ const { children } = props;
return (
- <>
-
-
-
-
-
+ router.back()}>
-
- );
-};
-
-export default MyIssuesPage;
diff --git a/web/pages/[workspaceSlug]/me/profile/activity.tsx b/web/pages/[workspaceSlug]/me/profile/activity.tsx
index 5298da83f..85117d975 100644
--- a/web/pages/[workspaceSlug]/me/profile/activity.tsx
+++ b/web/pages/[workspaceSlug]/me/profile/activity.tsx
@@ -4,7 +4,8 @@ import Link from "next/link";
// services
import { UserService } from "services/user.service";
// layouts
-import { WorkspaceSettingLayout } from "layouts/setting-layout/workspace-setting-layout";
+import { WorkspaceSettingLayout } from "layouts/setting-layout";
+import { AppLayout } from "layouts/app-layout";
// components
import { ActivityIcon, ActivityMessage } from "components/core";
import { RichReadOnlyEditor } from "@plane/rich-text-editor";
@@ -30,160 +31,164 @@ const ProfileActivity = () => {
);
return (
-
-
-
- );
-};
-
-export default Header;
diff --git a/web/layouts/app-layout-legacy/app-sidebar.tsx b/web/layouts/app-layout-legacy/app-sidebar.tsx
deleted file mode 100644
index 1db9dc983..000000000
--- a/web/layouts/app-layout-legacy/app-sidebar.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import dynamic from "next/dynamic";
-// components
-import { WorkspaceHelpSection, WorkspaceSidebarDropdown, WorkspaceSidebarMenu } from "components/workspace";
-
-const WorkspaceSidebarQuickAction = dynamic<{}>(
- () => import("components/workspace/sidebar-quick-action").then((mod) => mod.WorkspaceSidebarQuickAction),
- {
- ssr: false,
- }
-);
-
-import { ProjectSidebarList } from "components/project";
-// mobx store
-import { useMobxStore } from "lib/mobx/store-provider";
-import { observer } from "mobx-react-lite";
-
-export interface SidebarProps {
- toggleSidebar: boolean;
- setToggleSidebar: React.Dispatch
-
-
-
-
- )}
-
-
-
-
-
- {breadcrumbs}
-
- {projectDetails && projectDetails?.is_deployed && (
-
-
-
-
-
- radio_button_checked
-
- Public
-
- open_in_new
-
- {left}
- {right}
-
-
-
- }>
- Go to issues
-
-
-
- }
- type="project"
- />
- ) : (
-
-
- )}
-
-
- );
-};
diff --git a/web/layouts/auth-layout-legacy/user-authorization-wrapper.tsx b/web/layouts/auth-layout-legacy/user-authorization-wrapper.tsx
deleted file mode 100644
index 33e414e28..000000000
--- a/web/layouts/auth-layout-legacy/user-authorization-wrapper.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useRouter } from "next/router";
-
-import useSWR from "swr";
-
-// services
-import { UserService } from "services/user.service";
-// ui
-import { Spinner } from "@plane/ui";
-// fetch-keys
-import { CURRENT_USER } from "constants/fetch-keys";
-
-type Props = {
- children: React.ReactNode;
-};
-
-// services
-const userService = new UserService();
-
-export const UserAuthorizationLayout: React.FC
-
- ) : error?.status === 401 || error?.status === 403 ? (
-
-
- Loading your project...
-
- {
- const e = new KeyboardEvent("keydown", {
- key: "p",
- });
- document.dispatchEvent(e);
- },
- }}
- />
-
- ) : settingsLayout && (memberType?.isGuest || memberType?.isViewer) ? (
-
-
- );
- }
-
- if (error) {
- const redirectTo = router.asPath;
-
- router.push(`/?next=${redirectTo}`);
- return null;
- }
-
- return <>{children};
-};
diff --git a/web/layouts/auth-layout-legacy/workspace-authorization-wrapper.tsx b/web/layouts/auth-layout-legacy/workspace-authorization-wrapper.tsx
deleted file mode 100644
index 0f8b7a3d4..000000000
--- a/web/layouts/auth-layout-legacy/workspace-authorization-wrapper.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import { useState } from "react";
-import Link from "next/link";
-import { useRouter } from "next/router";
-import useSWR from "swr";
-// services
-import { WorkspaceService } from "services/workspace.service";
-// contexts
-import { WorkspaceMemberProvider } from "contexts/workspace-member.context";
-// layouts
-import AppSidebar from "layouts/app-layout-legacy/app-sidebar";
-import AppHeader from "layouts/app-layout-legacy/app-header";
-import { UserAuthorizationLayout } from "./user-authorization-wrapper";
-// components
-import { Button, LayersIcon, Spinner } from "@plane/ui";
-import { NotAuthorizedView, NotAWorkspaceMember } from "components/auth-screens";
-import { CommandPalette } from "components/command-palette";
-// fetch-keys
-import { WORKSPACE_MEMBERS_ME } from "constants/fetch-keys";
-
-type Props = {
- children: React.ReactNode;
- noHeader?: boolean;
- bg?: "primary" | "secondary";
- breadcrumbs?: JSX.Element;
- left?: JSX.Element;
- right?: JSX.Element;
-};
-
-const workspaceService = new WorkspaceService();
-
-export const WorkspaceAuthorizationLayout: React.FC
-
-
-
- );
-
- if (error?.status === 401 || error?.status === 403) return
-
- Loading your workspace...
-
-
- );
- }
-
- const settingsLayout = router.pathname.includes("/settings");
- const memberType = {
- isOwner: workspaceMemberMe?.role === 20,
- isMember: workspaceMemberMe?.role === 15,
- isViewer: workspaceMemberMe?.role === 10,
- isGuest: workspaceMemberMe?.role === 5,
- };
-
- return (
- No such workspace exists. Create one?
-
-
-
-
-
-
- }
- type="workspace"
- />
- ) : (
-
-
- )}
-
-
-
- {children}
-
-
- );
-};
diff --git a/web/layouts/profile-layout/index.ts b/web/layouts/profile-layout/index.ts
new file mode 100644
index 000000000..eec9d1e67
--- /dev/null
+++ b/web/layouts/profile-layout/index.ts
@@ -0,0 +1 @@
+export * from "./layout";
diff --git a/web/layouts/profile-layout/layout.tsx b/web/layouts/profile-layout/layout.tsx
new file mode 100644
index 000000000..c7e379167
--- /dev/null
+++ b/web/layouts/profile-layout/layout.tsx
@@ -0,0 +1,44 @@
+import useSWR from "swr";
+import { useRouter } from "next/router";
+// services
+import { WorkspaceService } from "services/workspace.service";
+// components
+import { ProfileNavbar, ProfileSidebar } from "components/profile";
+// constants
+import { WORKSPACE_MEMBERS_ME } from "constants/fetch-keys";
+
+type Props = {
+ children: React.ReactNode;
+ className?: string;
+};
+
+// services
+const workspaceService = new WorkspaceService();
+
+export const ProfileAuthWrapper: React.FC
-
- {children}
- ) : (
-
- You do not have the permission to access this page.
-
- )}
-
+
+ );
+};
diff --git a/web/layouts/setting-layout/index.ts b/web/layouts/setting-layout/index.ts
new file mode 100644
index 000000000..32a12e160
--- /dev/null
+++ b/web/layouts/setting-layout/index.ts
@@ -0,0 +1,2 @@
+export * from "./project-setting-layout";
+export * from "./workspace-setting-layout";
diff --git a/web/layouts/setting-layout/project-setting-layout/layout.tsx b/web/layouts/setting-layout/project-setting-layout/layout.tsx
index b34f599ae..7a0bee0eb 100644
--- a/web/layouts/setting-layout/project-setting-layout/layout.tsx
+++ b/web/layouts/setting-layout/project-setting-layout/layout.tsx
@@ -1,40 +1,20 @@
import { FC, ReactNode } from "react";
-// layouts
-import { UserAuthWrapper, ProjectAuthWrapper, WorkspaceAuthWrapper } from "layouts/auth-layout";
// components
-import { AppSidebar } from "layouts/app-layout";
import { ProjectSettingsSidebar } from "./sidebar";
export interface IProjectSettingLayout {
children: ReactNode;
- header: ReactNode;
}
export const ProjectSettingLayout: FC
+
+ {children}
+ ) : (
+
+ You do not have the permission to access this page.
+
+ )}
+
-
- {header}
-
-
-
-
-
-
-
-
- {children}
-
+
);
};
diff --git a/web/layouts/setting-layout/workspace-setting-layout/layout.tsx b/web/layouts/setting-layout/workspace-setting-layout/layout.tsx
index 74c09b05f..a584c26c1 100644
--- a/web/layouts/setting-layout/workspace-setting-layout/layout.tsx
+++ b/web/layouts/setting-layout/workspace-setting-layout/layout.tsx
@@ -1,38 +1,20 @@
import { FC, ReactNode } from "react";
-// layouts
-import { UserAuthWrapper, WorkspaceAuthWrapper } from "layouts/auth-layout";
// components
-import { AppSidebar } from "layouts/app-layout";
import { WorkspaceSettingsSidebar } from "./sidebar";
export interface IWorkspaceSettingLayout {
children: ReactNode;
- header: ReactNode;
}
export const WorkspaceSettingLayout: FC
+
+ {children}
+
-
- {header}
-
-
-
-
-
-
-
-
- {children}
-
+
);
};
diff --git a/web/pages/[workspaceSlug]/me/my-issues.tsx b/web/pages/[workspaceSlug]/me/my-issues.tsx
deleted file mode 100644
index 09036471f..000000000
--- a/web/pages/[workspaceSlug]/me/my-issues.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import React, { useEffect } from "react";
-
-import { useRouter } from "next/router";
-
-// icons
-import { Plus } from "lucide-react";
-// layouts
-import { WorkspaceAuthorizationLayout } from "layouts/auth-layout-legacy";
-// hooks
-import useMyIssuesFilters from "hooks/my-issues/use-my-issues-filter";
-// components
-import { MyIssuesView, MyIssuesViewOptions } from "components/issues";
-// ui
-import { Breadcrumbs, BreadcrumbItem, Button } from "@plane/ui";
-// types
-import type { NextPage } from "next";
-import useUser from "hooks/use-user";
-
-const MyIssuesPage: NextPage = () => {
- const router = useRouter();
- const { workspaceSlug } = router.query;
-
- const { user } = useUser();
-
- const { filters, setFilters } = useMyIssuesFilters(workspaceSlug?.toString());
-
- const tabsList = [
- {
- key: "assigned",
- label: "Assigned",
- selected: (filters?.assignees ?? []).length > 0,
- onClick: () => {
- setFilters({
- assignees: [user?.id ?? ""],
- created_by: null,
- subscriber: null,
- });
- },
- },
- {
- key: "created",
- label: "Created",
- selected: (filters?.created_by ?? []).length > 0,
- onClick: () => {
- setFilters({
- assignees: null,
- created_by: [user?.id ?? ""],
- subscriber: null,
- });
- },
- },
- {
- key: "subscribed",
- label: "Subscribed",
- selected: (filters?.subscriber ?? []).length > 0,
- onClick: () => {
- setFilters({
- assignees: null,
- created_by: null,
- subscriber: [user?.id ?? ""],
- });
- },
- },
- ];
-
- useEffect(() => {
- if (!filters || !user) return;
-
- if (!filters.assignees && !filters.created_by && !filters.subscriber) {
- setFilters({
- assignees: [user.id],
- });
- return;
- }
- }, [filters, setFilters, user]);
-
- return (
-
+
+ {children}
+
-
- }
- >
-
-
-
-
-
- {tabsList.map((tab) => (
-
- ))}
-
-
-
- Activity
-
-
-
- {userActivity.results.map((activityItem: any) => {
- if (activityItem.field === "comment") {
- return (
-
-
- -- <> ---+ + ) : ( +-- - ) : ( -- {activityItem.field ? ( - activityItem.new_value === "restore" ? ( -- - ); - } - })} - -
+ if ("field" in activityItem && activityItem.field !== "updated_by") { + return ( + - +
+-+ <> +-+-+++ {activityItem.field ? ( + activityItem.new_value === "restore" ? ( ++ ) : ( + + ) + ) : activityItem.actor_detail.avatar && + activityItem.actor_detail.avatar !== "" ? ( + ) : ( -
- ) - ) : activityItem.actor_detail.avatar && activityItem.actor_detail.avatar !== "" ? ( - - {activityItem.actor_detail.display_name?.charAt(0)} -- )} ++ {activityItem.actor_detail.display_name?.charAt(0)} ++ )} +-- {activityItem.field === "archived_at" && activityItem.new_value !== "restore" ? ( - Plane - ) : activityItem.actor_detail.is_bot ? ( - - {activityItem.actor_detail.first_name} Bot - - ) : ( - - {activityItem.actor_detail.display_name} - - )}{" "} - {message} {timeAgo(activityItem.created_at)} +- + ++-+ {activityItem.field === "archived_at" && activityItem.new_value !== "restore" ? ( + Plane + ) : activityItem.actor_detail.is_bot ? ( + + {activityItem.actor_detail.first_name} Bot + + ) : ( + + {activityItem.actor_detail.display_name} + + )}{" "} + {message}{" "} + {timeAgo(activityItem.created_at)} +- - )} - + + ); + } + })} + +- - - - + + )} + + ); }; diff --git a/web/pages/[workspaceSlug]/me/profile/index.tsx b/web/pages/[workspaceSlug]/me/profile/index.tsx index 9e2e16570..ffcfdcdee 100644 --- a/web/pages/[workspaceSlug]/me/profile/index.tsx +++ b/web/pages/[workspaceSlug]/me/profile/index.tsx @@ -9,7 +9,8 @@ import { UserService } from "services/user.service"; import useUserAuth from "hooks/use-user-auth"; import useToast from "hooks/use-toast"; // layouts -import { WorkspaceSettingLayout } from "layouts/setting-layout/workspace-setting-layout"; +import { AppLayout } from "layouts/app-layout"; +import { WorkspaceSettingLayout } from "layouts/setting-layout"; // components import { ImagePickerPopover, ImageUploadModal } from "components/core"; import { WorkspaceSettingHeader } from "components/headers"; @@ -143,252 +144,254 @@ const Profile: NextPage = () => { })); return ( -+ + + + }> - setIsImageUploadModalOpen(false)} - isRemoving={isRemoving} - handleDelete={() => handleDelete(myProfile?.avatar, true)} - onSuccess={(url) => { - setValue("avatar", url); - handleSubmit(onSubmit)(); - setIsImageUploadModalOpen(false); - }} - value={watch("avatar") !== "" ? watch("avatar") : undefined} - userImage - /> - {myProfile ? ( - - +
-
-
- {activityItem.field ? (
- activityItem.new_value === "restore" && (
-
+ {userActivity ? (
+
+
- {activityItem.actor_detail.display_name?.charAt(0)}
-
- )}
+
+
+ Activity
+
+
-
+ {userActivity.results.map((activityItem: any) => {
+ if (activityItem.field === "comment") {
+ return (
+
+
+
- );
- }
+ );
+ }
- const message =
- activityItem.verb === "created" &&
- activityItem.field !== "cycles" &&
- activityItem.field !== "modules" &&
- activityItem.field !== "attachment" &&
- activityItem.field !== "link" &&
- activityItem.field !== "estimate" ? (
-
- created{" "}
-
-
- this issue.
+ {activityItem.field ? (
+ activityItem.new_value === "restore" && (
+
-
+ {activityItem.actor_detail.display_name?.charAt(0)}
+
+ )}
-
-
-
-
-
-
-
-
- {activityItem.actor_detail.is_bot
- ? activityItem.actor_detail.first_name + " Bot"
- : activityItem.actor_detail.display_name}
-
- - Commented {timeAgo(activityItem.created_at)} -
+ + +
-
+
+
+
+ {activityItem.actor_detail.is_bot
+ ? activityItem.actor_detail.first_name + " Bot"
+ : activityItem.actor_detail.display_name}
+
+ + Commented {timeAgo(activityItem.created_at)} +
+
+