From a45453629c7e10883152a3cc32624d229fce39d6 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Wed, 3 Jul 2024 18:32:21 +0800
Subject: [PATCH] misc: addressed main page ui/ux concerns

---
 frontend/src/views/SecretMainPage/SecretMainPage.tsx          | 3 +--
 .../views/SecretMainPage/components/ActionBar/ActionBar.tsx   | 2 +-
 .../SecretMainPage/components/SecretListView/SecretItem.tsx   | 4 ++--
 frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx  | 3 ++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/SecretMainPage/SecretMainPage.tsx b/frontend/src/views/SecretMainPage/SecretMainPage.tsx
index 122135c03..79bc72855 100644
--- a/frontend/src/views/SecretMainPage/SecretMainPage.tsx
+++ b/frontend/src/views/SecretMainPage/SecretMainPage.tsx
@@ -53,13 +53,12 @@ export const SecretMainPage = () => {
   const { currentWorkspace, isLoading: isWorkspaceLoading } = useWorkspace();
   const router = useRouter();
   const { permission } = useProjectPermission();
-  
 
   const [isVisible, setIsVisible] = useState(false);
   const [sortDir, setSortDir] = useState<SortDir>(SortDir.ASC);
   const [filter, setFilter] = useState<Filter>({
     tags: {},
-    searchFilter: ""
+    searchFilter: (router.query.searchFilter as string) || ""
   });
 
   const [snapshotId, setSnapshotId] = useState<string | null>(null);
diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
index 0056c4a3b..627d27539 100644
--- a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
+++ b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
@@ -334,7 +334,7 @@ export const ActionBar = ({
                 className="h-10"
                 isDisabled={!isAllowed}
               >
-                {`${snapshotCount} ${snapshotCount === 1 ? "Commit" : "Commits"}`}
+                {`${snapshotCount} ${snapshotCount === 1 ? "Snapshot" : "Snapshots"}`}
               </Button>
             )}
           </ProjectPermissionCan>
diff --git a/frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx b/frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx
index 3726f3057..6d45d3da0 100644
--- a/frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx
@@ -250,7 +250,7 @@ export const SecretItem = memo(
                 />
               </div>
               <div
-                className="flex flex-grow items-center border-x border-mineshaft-600 py-1 pl-4 pr-2"
+                className="flex w-80 flex-grow items-center border-x border-mineshaft-600 py-1 pl-4 pr-2"
                 tabIndex={0}
                 role="button"
               >
@@ -498,7 +498,7 @@ export const SecretItem = memo(
                 {!isDirty ? (
                   <motion.div
                     key="options"
-                    className="flex h-10 flex-shrink-0 items-center space-x-4 px-3"
+                    className="flex h-10 flex-shrink-0 items-center space-x-4 px-[0.64rem]"
                     initial={{ x: 0, opacity: 0 }}
                     animate={{ x: 0, opacity: 1 }}
                     exit={{ x: 10, opacity: 0 }}
diff --git a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
index 09a16e407..73cc88555 100644
--- a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
+++ b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx
@@ -425,7 +425,8 @@ export const SecretOverviewPage = () => {
         });
       }
     }
-    const query: Record<string, string> = { ...router.query, env: slug };
+
+    const query: Record<string, string> = { ...router.query, env: slug, searchFilter };
     const envIndex = visibleEnvs.findIndex((el) => slug === el.slug);
     if (envIndex !== -1) {
       router.push({