From ee9bb5cae19df9309e647c82514ea94fdad3b74b Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Fri, 30 Aug 2024 00:19:01 +0530
Subject: [PATCH 1/3] fix: remove 'Add Project' button from archives route and
 remove it from the dropdown in header

---
 web/core/components/project/dropdowns/filters/root.tsx | 9 ---------
 web/core/components/project/header.tsx                 | 2 +-
 web/core/components/project/root.tsx                   | 6 ++++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/web/core/components/project/dropdowns/filters/root.tsx b/web/core/components/project/dropdowns/filters/root.tsx
index 89f76471d1b..c7788ba969a 100644
--- a/web/core/components/project/dropdowns/filters/root.tsx
+++ b/web/core/components/project/dropdowns/filters/root.tsx
@@ -51,15 +51,6 @@ export const ProjectFiltersSelection: React.FC<Props> = observer((props) => {
             }
             title="My projects"
           />
-          <FilterOption
-            isChecked={!!displayFilters.archived_projects}
-            onClick={() =>
-              handleDisplayFiltersUpdate({
-                archived_projects: !displayFilters.archived_projects,
-              })
-            }
-            title="Archived"
-          />
         </div>
 
         {/* access */}
diff --git a/web/core/components/project/header.tsx b/web/core/components/project/header.tsx
index 5593ddb10ba..4c78030b38b 100644
--- a/web/core/components/project/header.tsx
+++ b/web/core/components/project/header.tsx
@@ -177,7 +177,7 @@ export const ProjectsBaseHeader = observer(() => {
             />
           </FiltersDropdown>
         </div>
-        {isAuthorizedUser && (
+        {isAuthorizedUser && !isArchived && (
           <Button
             size="sm"
             onClick={() => {
diff --git a/web/core/components/project/root.tsx b/web/core/components/project/root.tsx
index ad649b5de6f..31c7276500c 100644
--- a/web/core/components/project/root.tsx
+++ b/web/core/components/project/root.tsx
@@ -69,11 +69,13 @@ const Root = observer(() => {
       <PageHead title={pageTitle} />
       <div className="flex h-full w-full flex-col">
         {(calculateTotalFilters(currentWorkspaceFilters ?? {}) !== 0 ||
-          currentWorkspaceAppliedDisplayFilters?.length !== 0) && (
+          (currentWorkspaceAppliedDisplayFilters?.length !== 0 &&
+            !(currentWorkspaceAppliedDisplayFilters?.length==1 && 
+              !(currentWorkspaceAppliedDisplayFilters?.indexOf("archived_projects")===-1)))) && (
           <div className="border-b border-custom-border-200 px-5 py-3">
             <ProjectAppliedFiltersList
               appliedFilters={currentWorkspaceFilters ?? {}}
-              appliedDisplayFilters={currentWorkspaceAppliedDisplayFilters ?? []}
+              appliedDisplayFilters={currentWorkspaceAppliedDisplayFilters?.filter(filter => filter !== "archived_projects") ?? []}
               handleClearAllFilters={handleClearAllFilters}
               handleRemoveFilter={handleRemoveFilter}
               handleRemoveDisplayFilter={handleRemoveDisplayFilter}

From 965b9ac09ecfcfb6f6cce52111af547d06664175 Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Fri, 30 Aug 2024 13:30:46 +0530
Subject: [PATCH 2/3] Improved Code Logic

---
 web/core/components/project/root.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/core/components/project/root.tsx b/web/core/components/project/root.tsx
index 31c7276500c..dd7db2199c9 100644
--- a/web/core/components/project/root.tsx
+++ b/web/core/components/project/root.tsx
@@ -30,6 +30,10 @@ const Root = observer(() => {
   // derived values
   const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Projects` : undefined;
 
+  const allowedDisplayFilters = currentWorkspaceAppliedDisplayFilters?.filter(
+    (filter) => filter !== "archived_projects"
+  ) ?? [];
+
   const handleRemoveFilter = useCallback(
     (key: keyof TProjectFilters, value: string | null) => {
       if (!workspaceSlug) return;
@@ -64,18 +68,17 @@ const Root = observer(() => {
       updateDisplayFilters(workspaceSlug.toString(), { archived_projects: false });
     }
   }, [pathname]);
+
   return (
     <>
       <PageHead title={pageTitle} />
       <div className="flex h-full w-full flex-col">
         {(calculateTotalFilters(currentWorkspaceFilters ?? {}) !== 0 ||
-          (currentWorkspaceAppliedDisplayFilters?.length !== 0 &&
-            !(currentWorkspaceAppliedDisplayFilters?.length==1 && 
-              !(currentWorkspaceAppliedDisplayFilters?.indexOf("archived_projects")===-1)))) && (
+          (allowedDisplayFilters.length>0)) && (
           <div className="border-b border-custom-border-200 px-5 py-3">
             <ProjectAppliedFiltersList
               appliedFilters={currentWorkspaceFilters ?? {}}
-              appliedDisplayFilters={currentWorkspaceAppliedDisplayFilters?.filter(filter => filter !== "archived_projects") ?? []}
+              appliedDisplayFilters={allowedDisplayFilters}
               handleClearAllFilters={handleClearAllFilters}
               handleRemoveFilter={handleRemoveFilter}
               handleRemoveDisplayFilter={handleRemoveDisplayFilter}

From a72513154fef50412637b40cbbccf9889bce8b40 Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Fri, 30 Aug 2024 14:38:59 +0530
Subject: [PATCH 3/3] Fixed Clear All Button and UI Fixes

---
 web/core/components/project/card-list.tsx |  2 +-
 web/core/components/project/root.tsx      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/core/components/project/card-list.tsx b/web/core/components/project/card-list.tsx
index ee5fabd987a..d307dd9305b 100644
--- a/web/core/components/project/card-list.tsx
+++ b/web/core/components/project/card-list.tsx
@@ -45,7 +45,7 @@ export const ProjectCardList = observer(() => {
           <p className="whitespace-pre-line text-base text-custom-text-400">
             {searchQuery.trim() === ""
               ? "Remove the filters to see all projects"
-              : "No projects detected with the matching\ncriteria. Create a new project instead"}
+              : "No projects detected with the matching criteria.\nCreate a new project instead"}
           </p>
         </div>
       </div>
diff --git a/web/core/components/project/root.tsx b/web/core/components/project/root.tsx
index dd7db2199c9..744b248de10 100644
--- a/web/core/components/project/root.tsx
+++ b/web/core/components/project/root.tsx
@@ -30,6 +30,8 @@ const Root = observer(() => {
   // derived values
   const pageTitle = currentWorkspace?.name ? `${currentWorkspace?.name} - Projects` : undefined;
 
+  const isArchived = pathname.includes("/archives");
+
   const allowedDisplayFilters = currentWorkspaceAppliedDisplayFilters?.filter(
     (filter) => filter !== "archived_projects"
   ) ?? [];
@@ -59,14 +61,12 @@ const Root = observer(() => {
     if (!workspaceSlug) return;
     clearAllFilters(workspaceSlug.toString());
     clearAllAppliedDisplayFilters(workspaceSlug.toString());
+    if (isArchived) updateDisplayFilters(workspaceSlug.toString(), { archived_projects: true });
   }, [clearAllFilters, clearAllAppliedDisplayFilters, workspaceSlug]);
 
   useEffect(() => {
-    if (pathname.includes("/archives")) {
-      updateDisplayFilters(workspaceSlug.toString(), { archived_projects: true });
-    } else {
-      updateDisplayFilters(workspaceSlug.toString(), { archived_projects: false });
-    }
+    isArchived ? updateDisplayFilters(workspaceSlug.toString(), { archived_projects: true }) :
+    updateDisplayFilters(workspaceSlug.toString(), { archived_projects: false });
   }, [pathname]);
 
   return (