From 0a6d18970be11e7fa2107dbd132f6878db0ccaf6 Mon Sep 17 00:00:00 2001
From: gakshita <akshitagoyal1516@gmail.com>
Date: Thu, 8 Aug 2024 00:42:13 +0530
Subject: [PATCH] fix: code structure optimization

---
 .../(projects)/projects/(list)/page.tsx          | 11 ++++++++++-
 web/ce/components/projects/page.tsx              | 16 +++++++++-------
 .../project/create/common-attributes.tsx         |  4 +---
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/web/app/[workspaceSlug]/(projects)/projects/(list)/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(list)/page.tsx
index 020d7085a7..4c9a90b3bf 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(list)/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(list)/page.tsx
@@ -1,2 +1,11 @@
-import ProjectsPage from "@/plane-web/components/projects/page";
+"use client";
+import { useParams } from "next/navigation";
+import { useWorkspace } from "@/hooks/store";
+import ProjectsPageRoot from "@/plane-web/components/projects/page";
+
+const ProjectsPage = () => {
+  const { currentWorkspace } = useWorkspace();
+  const { workspaceSlug } = useParams();
+  return <ProjectsPageRoot currentWorkspace={currentWorkspace} workspaceSlug={workspaceSlug.toString()} />;
+};
 export default ProjectsPage;
diff --git a/web/ce/components/projects/page.tsx b/web/ce/components/projects/page.tsx
index 40e7f30a2a..3c7b618175 100644
--- a/web/ce/components/projects/page.tsx
+++ b/web/ce/components/projects/page.tsx
@@ -2,21 +2,23 @@
 
 import { useCallback } from "react";
 import { observer } from "mobx-react";
-import { useParams } from "next/navigation";
 // types
-import { TProjectAppliedDisplayFilterKeys, TProjectFilters } from "@plane/types";
+import { IWorkspace, TProjectAppliedDisplayFilterKeys, TProjectFilters } from "@plane/types";
 // components
 import { PageHead } from "@/components/core";
 import { ProjectAppliedFiltersList, ProjectCardList } from "@/components/project";
 // helpers
 import { calculateTotalFilters } from "@/helpers/filter.helper";
 // hooks
-import { useProject, useProjectFilter, useWorkspace } from "@/hooks/store";
+import { useProject, useProjectFilter } from "@/hooks/store";
 
-const ProjectsPage = observer(() => {
+type Props = {
+  currentWorkspace: IWorkspace | null;
+  workspaceSlug: string | null;
+};
+const ProjectsPageRoot: React.FC<Props> = observer((props) => {
+  const { currentWorkspace, workspaceSlug } = props;
   // store
-  const { workspaceSlug } = useParams();
-  const { currentWorkspace } = useWorkspace();
   const { totalProjectIds, filteredProjectIds } = useProject();
   const {
     currentWorkspaceFilters,
@@ -81,4 +83,4 @@ const ProjectsPage = observer(() => {
   );
 });
 
-export default ProjectsPage;
+export default ProjectsPageRoot;
diff --git a/web/core/components/project/create/common-attributes.tsx b/web/core/components/project/create/common-attributes.tsx
index 0cae658067..088e367c8b 100644
--- a/web/core/components/project/create/common-attributes.tsx
+++ b/web/core/components/project/create/common-attributes.tsx
@@ -62,9 +62,7 @@ const ProjectCommonAttributes: React.FC<Props> = (props) => {
             />
           )}
         />
-        <span className="text-xs text-red-500">
-          <>{errors?.name?.message}</>
-        </span>
+        <span className="text-xs text-red-500">{errors?.name?.message}</span>
       </div>
       <div className="relative">
         <Controller