Fix: Restructured frontend

frontend/src/views/SecretMainPage/SecretMainPage.tsx

@@ -104,7 +104,7 @@ export const SecretMainPage = () => {
     }
   });
   // fetch folders
-  const { data: folderData, isLoading: isFoldersLoading } = useGetProjectFolders({
+  const { data: folders, isLoading: isFoldersLoading } = useGetProjectFolders({
     projectId: workspaceId,
     environment,
     path: secretPath
@@ -163,9 +163,7 @@ export const SecretMainPage = () => {
     isPaused: !canDoReadRollback
   });
 
-  const isNotEmtpy = Boolean(
-    secrets?.length || folderData?.folders?.length || secretImports?.length
-  );
+  const isNotEmtpy = Boolean(secrets?.length || folders?.length || secretImports?.length);
 
   const handleSortToggle = () =>
     setSortDir((state) => (state === SortDir.ASC ? SortDir.DESC : SortDir.ASC));
@@ -294,7 +292,7 @@ export const SecretMainPage = () => {
                   />
                 )}
                 <FolderListView
-                  folders={folderData?.folders}
+                  folders={folders}
                   environment={environment}
                   workspaceId={workspaceId}
                   secretPath={secretPath}
@@ -314,7 +312,7 @@ export const SecretMainPage = () => {
                     isProtectedBranch={isProtectedBranch}
                   />
                 )}
-                {!canReadSecret && folderData?.folders?.length === 0 && <PermissionDeniedBanner />}
+                {!canReadSecret && folders?.length === 0 && <PermissionDeniedBanner />}
               </div>
             </div>
             <CreateSecretForm
@@ -354,7 +352,7 @@ export const SecretMainPage = () => {
             workspaceId={workspaceId}
             secretPath={secretPath}
             secrets={secrets}
-            folders={folderData?.folders}
+            folders={folders}
             snapshotCount={snapshotCount}
             onGoBack={handleResetSnapshot}
             onClickListSnapshot={() => handlePopUpToggle("snapshots", true)}

frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx

@@ -55,6 +55,7 @@ import {
   useCreateSecretV3,
   useDeleteSecretV3,
   useGetFoldersByEnv,
+  useGetImportedFoldersByEnv,
   useGetProjectSecretsAllEnv,
   useGetUserWsKey,
   useUpdateSecretV3
@@ -125,12 +126,17 @@ export const SecretOverviewPage = () => {
     secretPath,
     decryptFileKey: latestFileKey!
   });
-  const { folders, folderNames, isFolderPresentInEnv, isImportedFolderPresentInEnv } =
-    useGetFoldersByEnv({
-      projectId: workspaceId,
-      path: secretPath,
-      environments: userAvailableEnvs.map(({ slug }) => slug)
-    });
+  const { folders, folderNames, isFolderPresentInEnv } = useGetFoldersByEnv({
+    projectId: workspaceId,
+    path: secretPath,
+    environments: userAvailableEnvs.map(({ slug }) => slug)
+  });
+
+  const { isImportedFolderPresentInEnv } = useGetImportedFoldersByEnv({
+    projectId: workspaceId,
+    path: secretPath,
+    environments: userAvailableEnvs.map(({ slug }) => slug)
+  });
 
   const { mutateAsync: createSecretV3 } = useCreateSecretV3();
   const { mutateAsync: updateSecretV3 } = useUpdateSecretV3();