Add filter imports and minor improvements to allSecretImports logic

frontend/src/hooks/api/secretImports/types.ts

@@ -1,5 +1,4 @@
 import { SecretV3Raw } from "../secrets/types";
-import { WsTag } from "../types";
 import { WorkspaceEnv } from "../workspace/types";
 
 export type TSecretImport = {
@@ -92,7 +91,7 @@ export type TDeleteSecretImportDTO = {
   path?: string;
 };
 
-export type SecretImportData = {
+export type TSecretImportMultiEnvData = {
   currentEnv: string;
   environment: string;
   secretPath: string;
@@ -104,7 +103,15 @@ export type SecretImportData = {
     key: string;
     value: string;
     secretValueHidden: boolean;
-    tags?: WsTag[];
+    tags?: {
+      id: string;
+      slug: string;
+      color?: string;
+      projectId: string;
+      createdAt: string;
+      updatedAt: string;
+      __v: number;
+    }[];
     comment?: string;
     createdAt: string;
     updatedAt: string;

frontend/src/hooks/utils/secrets-overview.tsx

@@ -1,8 +1,7 @@
 import { useCallback, useMemo } from "react";
 
 import { DashboardProjectSecretsOverview } from "@app/hooks/api/dashboard/types";
-
-import { SecretImportData } from "../api/secretImports/types";
+import { TSecretImportMultiEnvData } from "@app/hooks/api/secretImports/types";
 
 type FolderNameAndDescription = {
   name: string;
@@ -99,31 +98,28 @@ export const useSecretOverview = (secrets: DashboardProjectSecretsOverview["secr
   return { secKeys, getSecretByKey, getEnvSecretKeyCount };
 };
 
-export const useSecretImportOverview = (secretImports: SecretImportData[][] | undefined) => {
+export const useSecretImportOverview = (secretImports: TSecretImportMultiEnvData[] | undefined) => {
   const uniqueEnvSecretPaths = useMemo(() => {
-    const uniqueMap: Record<string, SecretImportData[]> = {};
+    const uniqueMap = new Map<string, TSecretImportMultiEnvData>();
     secretImports?.forEach((importData) => {
-      importData?.forEach((envImport) => {
-        if (envImport) {
-          const key = `${envImport.environment}-${envImport.secretPath}`;
-          const existing = uniqueMap[key];
-          uniqueMap[key] = existing ? [...existing, envImport] : [envImport];
+      if (importData) {
+        const key = `${importData.environment}-${importData.secretPath}`;
+        if (!uniqueMap.has(key)) {
+          uniqueMap.set(key, importData);
         }
-      });
+      }
     });
-    return uniqueMap;
+    return Array.from(uniqueMap.values());
   }, [secretImports]);
 
   const isSecretImportPresent = useCallback(
     (sourceEnv: string, targetEnv: string, secretPath: string) => {
       return (
-        secretImports?.some((importData) =>
-          importData?.some(
-            (envImport) =>
-              envImport?.currentEnv === sourceEnv &&
-              envImport?.environment === targetEnv &&
-              envImport?.secretPath === secretPath
-          )
+        secretImports?.some(
+          (importData) =>
+            importData?.currentEnv === sourceEnv &&
+            importData?.environment === targetEnv &&
+            importData?.secretPath === secretPath
         ) ?? false
       );
     },