Merge branch 'main' into feat/cli-login-redirect

frontend/src/hooks/api/auth/index.tsx

@@ -1,7 +1,6 @@
 export {
     useGetAuthToken,
-    useSendMfaToken, 
-    useVerifyMfaToken,
+    useGetCommonPasswords,
     useRevokeAllSessions,
-    useGetCommonPasswords
-} from './queries'
+    useSendMfaToken, 
+    useVerifyMfaToken} from "./queries"

frontend/src/hooks/api/auth/queries.tsx

@@ -1,23 +1,23 @@
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
-import { setAuthToken } from '@app/reactQuery';
+import { apiRequest } from "@app/config/request";
+import { setAuthToken } from "@app/reactQuery";
 
 import {
   GetAuthTokenAPI,
   SendMfaTokenDTO,
   VerifyMfaTokenDTO,
-  VerifyMfaTokenRes} from './types';
+  VerifyMfaTokenRes} from "./types";
 
 const authKeys = {
-  getAuthToken: ['token'] as const,
-  commonPasswords: ['common-passwords'] as const
+  getAuthToken: ["token"] as const,
+  commonPasswords: ["common-passwords"] as const
 };
 
 export const useSendMfaToken = () => {
   return useMutation<{}, {}, SendMfaTokenDTO>({
     mutationFn: async ({ email }) => {
-      const { data } = await apiRequest.post('/api/v2/auth/mfa/send', { email });
+      const { data } = await apiRequest.post("/api/v2/auth/mfa/send", { email });
       return data;
     }
   });
@@ -26,7 +26,7 @@ export const useSendMfaToken = () => {
 export const useVerifyMfaToken = () => {
   return useMutation<VerifyMfaTokenRes, {}, VerifyMfaTokenDTO>({
     mutationFn: async ({ email, mfaCode }) => {
-      const { data } = await apiRequest.post('/api/v2/auth/mfa/verify', {
+      const { data } = await apiRequest.post("/api/v2/auth/mfa/verify", {
         email,
         mfaToken: mfaCode
       });
@@ -38,7 +38,7 @@ export const useVerifyMfaToken = () => {
 // Refresh token is set as cookie when logged in
 // Using that we fetch the auth bearer token needed for auth calls
 const fetchAuthToken = async () => {
-  const { data } = await apiRequest.post<GetAuthTokenAPI>('/api/v1/auth/token', undefined, {
+  const { data } = await apiRequest.post<GetAuthTokenAPI>("/api/v1/auth/token", undefined, {
     withCredentials: true
   });
 
@@ -54,14 +54,14 @@ export const useGetAuthToken = () =>
 export const useRevokeAllSessions = () => {
   return useMutation({
     mutationFn: async () => {
-      const { data } = await apiRequest.delete('/api/v1/auth/sessions');
+      const { data } = await apiRequest.delete("/api/v1/auth/sessions");
       return data;
     }
   });
 }
 
 const fetchCommonPasswords = async () => {
-  const { data } = await apiRequest.get('/api/v1/auth/common-passwords');
+  const { data } = await apiRequest.get("/api/v1/auth/common-passwords");
   return data || [];
 };
 

frontend/src/hooks/api/incidentContacts/index.tsx

@@ -2,4 +2,4 @@ export {
   useAddIncidentContact,
   useDeleteIncidentContact,
   useGetOrgIncidentContact
-} from './queries';
+} from "./queries";

frontend/src/hooks/api/incidentContacts/queries.tsx

@@ -1,11 +1,11 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
-import { AddIncidentContactDTO, DeleteIncidentContactDTO, IncidentContact } from './types';
+import { AddIncidentContactDTO, DeleteIncidentContactDTO, IncidentContact } from "./types";
 
 const incidentContactKeys = {
-  getAllContact: (orgId: string) => ['org-incident-contacts', { orgId }] as const
+  getAllContact: (orgId: string) => ["org-incident-contacts", { orgId }] as const
 };
 
 const fetchOrgIncidentContacts = async (orgId: string) => {

frontend/src/hooks/api/index.tsx

@@ -1,13 +1,13 @@
-export * from './auth';
-export * from './incidentContacts';
-export * from './keys';
-export * from './organization';
-export * from './secretFolders';
-export * from './secrets';
-export * from './secretSnapshots';
-export * from './serviceAccounts';
-export * from './serviceTokens';
-export * from './subscriptions';
-export * from './tags';
-export * from './users';
-export * from './workspace';
+export * from "./auth";
+export * from "./incidentContacts";
+export * from "./keys";
+export * from "./organization";
+export * from "./secretFolders";
+export * from "./secrets";
+export * from "./secretSnapshots";
+export * from "./serviceAccounts";
+export * from "./serviceTokens";
+export * from "./subscriptions";
+export * from "./tags";
+export * from "./users";
+export * from "./workspace";

frontend/src/hooks/api/integrationAuth/index.tsx

@@ -4,4 +4,4 @@ export {
     useGetIntegrationAuthRailwayEnvironments,
     useGetIntegrationAuthRailwayServices,
     useGetIntegrationAuthTeams,
-    useGetIntegrationAuthVercelBranches} from './queries';
+    useGetIntegrationAuthVercelBranches} from "./queries";

frontend/src/hooks/api/integrationAuth/queries.tsx

@@ -8,33 +8,33 @@ import {
     IntegrationAuth,
     Service,
     Team
-} from './types';
+} from "./types";
 
 const integrationAuthKeys = {
-    getIntegrationAuthById: (integrationAuthId: string) => [{ integrationAuthId }, 'integrationAuth'] as const,
-    getIntegrationAuthApps: (integrationAuthId: string, teamId?: string) => [{ integrationAuthId, teamId }, 'integrationAuthApps'] as const,
-    getIntegrationAuthTeams: (integrationAuthId: string) => [{ integrationAuthId }, 'integrationAuthTeams'] as const,
+    getIntegrationAuthById: (integrationAuthId: string) => [{ integrationAuthId }, "integrationAuth"] as const,
+    getIntegrationAuthApps: (integrationAuthId: string, teamId?: string) => [{ integrationAuthId, teamId }, "integrationAuthApps"] as const,
+    getIntegrationAuthTeams: (integrationAuthId: string) => [{ integrationAuthId }, "integrationAuthTeams"] as const,
     getIntegrationAuthVercelBranches: ({
         integrationAuthId,
         appId,
     }: {
         integrationAuthId: string;
         appId: string;
-    }) => [{ integrationAuthId, appId }, 'integrationAuthVercelBranches'] as const,
+    }) => [{ integrationAuthId, appId }, "integrationAuthVercelBranches"] as const,
     getIntegrationAuthRailwayEnvironments: ({
         integrationAuthId,
         appId
     }: {
         integrationAuthId: string;
         appId: string;
-    }) => [{ integrationAuthId, appId }, 'integrationAuthRailwayEnvironments'] as const,
+    }) => [{ integrationAuthId, appId }, "integrationAuthRailwayEnvironments"] as const,
     getIntegrationAuthRailwayServices: ({
         integrationAuthId,
         appId
     }: {
         integrationAuthId: string;
         appId: string;
-    }) => [{ integrationAuthId, appId }, 'integrationAuthRailwayServices'] as const
+    }) => [{ integrationAuthId, appId }, "integrationAuthRailwayServices"] as const
 }
 
 const fetchIntegrationAuthById = async (integrationAuthId: string) => {

frontend/src/hooks/api/keys/index.tsx

@@ -1 +1 @@
-export { useGetUserWsKey, useUploadWsKey } from './queries';
+export { useGetUserWsKey, useUploadWsKey } from "./queries";

frontend/src/hooks/api/keys/queries.tsx

@@ -1,11 +1,11 @@
-import { useMutation, useQuery } from '@tanstack/react-query';
+import { useMutation, useQuery } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
-import { UploadWsKeyDTO, UserWsKeyPair } from './types';
+import { UploadWsKeyDTO, UserWsKeyPair } from "./types";
 
 const encKeyKeys = {
-  getUserWorkspaceKey: (workspaceID: string) => ['workspace-key-pair', { workspaceID }] as const
+  getUserWorkspaceKey: (workspaceID: string) => ["workspace-key-pair", { workspaceID }] as const
 };
 
 const fetchUserWsKey = async (workspaceID: string) => {

frontend/src/hooks/api/organization/index.ts

@@ -1 +1 @@
-export { useGetOrganization, useRenameOrg } from './queries';
+export { useGetOrganization, useRenameOrg } from "./queries";

frontend/src/hooks/api/organization/queries.tsx

@@ -1,15 +1,15 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
-import { Organization, RenameOrgDTO } from './types';
+import { Organization, RenameOrgDTO } from "./types";
 
 const organizationKeys = {
-  getUserOrganization: ['organization'] as const
+  getUserOrganization: ["organization"] as const
 };
 
 const fetchUserOrganization = async () => {
-  const { data } = await apiRequest.get<{ organizations: Organization[] }>('/api/v1/organization');
+  const { data } = await apiRequest.get<{ organizations: Organization[] }>("/api/v1/organization");
 
   return data.organizations;
 };

frontend/src/hooks/api/secretFolders/index.tsx

@@ -1 +1,7 @@
-export { useCreateFolder, useDeleteFolder, useGetProjectFolders, useUpdateFolder } from './queries';
+export {
+  useCreateFolder,
+  useDeleteFolder,
+  useGetProjectFolders,
+  useGetProjectFoldersBatch,
+  useUpdateFolder
+} from "./queries";

frontend/src/hooks/api/secretFolders/queries.tsx

@@ -1,20 +1,41 @@
-import { useCallback } from 'react';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback } from "react";
+import { useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
-import { secretSnapshotKeys } from '../secretSnapshots/queries';
+import { secretSnapshotKeys } from "../secretSnapshots/queries";
 import {
   CreateFolderDTO,
   DeleteFolderDTO,
+  GetProjectFoldersBatchDTO,
   GetProjectFoldersDTO,
   TSecretFolder,
   UpdateFolderDTO
-} from './types';
+} from "./types";
 
 const queryKeys = {
   getSecretFolders: (workspaceId: string, environment: string, parentFolderId?: string) =>
-    ['secret-folders', { workspaceId, environment, parentFolderId }] as const
+    ["secret-folders", { workspaceId, environment, parentFolderId }] as const
+};
+
+const fetchProjectFolders = async (
+  workspaceId: string,
+  environment: string,
+  parentFolderId?: string,
+  parentFolderPath?: string
+) => {
+  const { data } = await apiRequest.get<{ folders: TSecretFolder[]; dir: TSecretFolder[] }>(
+    "/api/v1/folders",
+    {
+      params: {
+        workspaceId,
+        environment,
+        parentFolderId,
+        parentFolderPath
+      }
+    }
+  );
+  return data;
 };
 
 export const useGetProjectFolders = ({
@@ -27,38 +48,45 @@ export const useGetProjectFolders = ({
   useQuery({
     queryKey: queryKeys.getSecretFolders(workspaceId, environment, parentFolderId),
     enabled: Boolean(workspaceId) && Boolean(environment) && !isPaused,
-    queryFn: async () => {
-      const { data } = await apiRequest.get<{ folders: TSecretFolder[]; dir: TSecretFolder[] }>(
-        '/api/v1/folders',
-        {
-          params: {
-            workspaceId,
-            environment,
-            parentFolderId
-          }
-        }
-      );
-      return data;
-    },
+    queryFn: async () => fetchProjectFolders(workspaceId, environment, parentFolderId),
     select: useCallback(
       ({ folders, dir }: { folders: TSecretFolder[]; dir: TSecretFolder[] }) => ({
         dir,
         folders: folders.sort((a, b) =>
-          sortDir === 'asc'
-            ? a?.name?.localeCompare(b?.name || '')
-            : b?.name?.localeCompare(a?.name || '')
+          sortDir === "asc"
+            ? a?.name?.localeCompare(b?.name || "")
+            : b?.name?.localeCompare(a?.name || "")
         )
       }),
       [sortDir]
     )
   });
 
+export const useGetProjectFoldersBatch = ({
+  folders = [],
+  isPaused,
+  parentFolderPath
+}: GetProjectFoldersBatchDTO) =>
+  useQueries({
+    queries: folders.map(({ workspaceId, environment, parentFolderId }) => ({
+      queryKey: queryKeys.getSecretFolders(workspaceId, environment, parentFolderPath),
+      queryFn: async () =>
+        fetchProjectFolders(workspaceId, environment, parentFolderId, parentFolderPath),
+      enabled: Boolean(workspaceId) && Boolean(environment) && !isPaused,
+      select: (data: { folders: TSecretFolder[]; dir: TSecretFolder[] }) => ({
+        environment,
+        folders: data.folders,
+        dir: data.dir
+      })
+    }))
+  });
+
 export const useCreateFolder = () => {
   const queryClient = useQueryClient();
 
   return useMutation<{}, {}, CreateFolderDTO>({
     mutationFn: async (dto) => {
-      const { data } = await apiRequest.post('/api/v1/folders', dto);
+      const { data } = await apiRequest.post("/api/v1/folders", dto);
       return data;
     },
     onSuccess: (_, { workspaceId, environment, parentFolderId }) => {

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

@@ -8,7 +8,13 @@ export type GetProjectFoldersDTO = {
   environment: string;
   parentFolderId?: string;
   isPaused?: boolean;
-  sortDir?: 'asc' | 'desc';
+  sortDir?: "asc" | "desc";
+};
+
+export type GetProjectFoldersBatchDTO = {
+  folders: Omit<GetProjectFoldersDTO, "isPaused" | "sortDir">[];
+  isPaused?: boolean;
+  parentFolderPath?: string;
 };
 
 export type CreateFolderDTO = {

frontend/src/hooks/api/secretSnapshots/index.tsx

@@ -3,4 +3,4 @@ export {
   useGetWorkspaceSecretSnapshots,
   useGetWsSnapshotCount,
   usePerformSecretRollback
-} from './queries';
+} from "./queries";

frontend/src/hooks/api/secretSnapshots/queries.tsx

@@ -1,29 +1,29 @@
 /* eslint-disable no-param-reassign */
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import {
   decryptAssymmetric,
   decryptSymmetric
-} from '@app/components/utilities/cryptography/crypto';
-import { apiRequest } from '@app/config/request';
+} from "@app/components/utilities/cryptography/crypto";
+import { apiRequest } from "@app/config/request";
 
-import { DecryptedSecret } from '../secrets/types';
+import { DecryptedSecret } from "../secrets/types";
 import {
   GetWorkspaceSecretSnapshotsDTO,
   TSecretRollbackDTO,
   TSnapshotSecret,
   TSnapshotSecretProps,
   TWorkspaceSecretSnapshot
-} from './types';
+} from "./types";
 
 export const secretSnapshotKeys = {
   list: (workspaceId: string, env: string, folderId?: string) =>
-    [{ workspaceId, env, folderId }, 'secret-snapshot'] as const,
-  snapshotSecrets: (snapshotId: string) => [{ snapshotId }, 'secret-snapshot'] as const,
+    [{ workspaceId, env, folderId }, "secret-snapshot"] as const,
+  snapshotSecrets: (snapshotId: string) => [{ snapshotId }, "secret-snapshot"] as const,
   count: (workspaceId: string, env: string, folderId?: string) => [
     { workspaceId, env, folderId },
-    'count',
-    'secret-snapshot'
+    "count",
+    "secret-snapshot"
   ]
 };
 
@@ -78,7 +78,7 @@ export const useGetSnapshotSecrets = ({ decryptFileKey, env, snapshotId }: TSnap
     enabled: Boolean(snapshotId && decryptFileKey),
     queryFn: () => fetchSnapshotEncSecrets(snapshotId),
     select: (data) => {
-      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY') as string;
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
       const latestKey = decryptFileKey;
       const key = decryptAssymmetric({
         ciphertext: latestKey.encryptedKey,
@@ -106,7 +106,7 @@ export const useGetSnapshotSecrets = ({ decryptFileKey, env, snapshotId }: TSnap
             key
           });
 
-          const secretComment = '';
+          const secretComment = "";
 
           const decryptedSecret = {
             _id: encSecret.secret,
@@ -117,10 +117,10 @@ export const useGetSnapshotSecrets = ({ decryptFileKey, env, snapshotId }: TSnap
             comment: secretComment,
             createdAt: encSecret.createdAt,
             updatedAt: encSecret.updatedAt,
-            type: 'modified'
+            type: "modified"
           };
 
-          if (encSecret.type === 'personal') {
+          if (encSecret.type === "personal") {
             personalSecrets[decryptedSecret.key] = { id: encSecret.secret, value: secretValue };
           } else {
             sharedSecrets.push(decryptedSecret);
@@ -131,7 +131,7 @@ export const useGetSnapshotSecrets = ({ decryptFileKey, env, snapshotId }: TSnap
         if (personalSecrets?.[val.key]) {
           val.idOverride = personalSecrets[val.key].id;
           val.valueOverride = personalSecrets[val.key].value;
-          val.overrideAction = 'modified';
+          val.overrideAction = "modified";
         }
       });
 
@@ -180,7 +180,7 @@ export const usePerformSecretRollback = () => {
       return data;
     },
     onSuccess: (_, { workspaceId, environment, folderId }) => {
-      queryClient.invalidateQueries([{ workspaceId, environment }, 'secrets']);
+      queryClient.invalidateQueries([{ workspaceId, environment }, "secrets"]);
       queryClient.invalidateQueries(secretSnapshotKeys.list(workspaceId, environment, folderId));
       queryClient.invalidateQueries(secretSnapshotKeys.count(workspaceId, environment, folderId));
     }

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

@@ -1,5 +1,5 @@
-import { UserWsKeyPair } from '../keys/types';
-import { EncryptedSecretVersion } from '../secrets/types';
+import { UserWsKeyPair } from "../keys/types";
+import { EncryptedSecretVersion } from "../secrets/types";
 
 export type TWorkspaceSecretSnapshot = {
   _id: string;
@@ -11,7 +11,7 @@ export type TWorkspaceSecretSnapshot = {
   __v: number;
 };
 
-export type TSnapshotSecret = Omit<TWorkspaceSecretSnapshot, 'secretVersions'> & {
+export type TSnapshotSecret = Omit<TWorkspaceSecretSnapshot, "secretVersions"> & {
   secretVersions: EncryptedSecretVersion[];
   folderVersion: Array<{ name: string; id: string }>;
 };

frontend/src/hooks/api/secrets/index.ts

@@ -3,4 +3,4 @@ export {
   useGetProjectSecrets,
   useGetProjectSecretsByKey,
   useGetSecretVersion
-} from './queries';
+} from "./queries";

frontend/src/hooks/api/secrets/queries.tsx

@@ -1,13 +1,14 @@
 /* eslint-disable no-param-reassign */
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback } from "react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import {
   decryptAssymmetric,
   decryptSymmetric
-} from '@app/components/utilities/cryptography/crypto';
-import { apiRequest } from '@app/config/request';
+} from "@app/components/utilities/cryptography/crypto";
+import { apiRequest } from "@app/config/request";
 
-import { secretSnapshotKeys } from '../secretSnapshots/queries';
+import { secretSnapshotKeys } from "../secretSnapshots/queries";
 import {
   BatchSecretDTO,
   DecryptedSecret,
@@ -15,44 +16,47 @@ import {
   EncryptedSecretVersion,
   GetProjectSecretsDTO,
   GetSecretVersionsDTO
-} from './types';
+} from "./types";
 
 export const secretKeys = {
   // this is also used in secretSnapshot part
   getProjectSecret: (workspaceId: string, env: string | string[], folderId?: string) => [
     { workspaceId, env, folderId },
-    'secrets'
+    "secrets"
   ],
-  getSecretVersion: (secretId: string) => [{ secretId }, 'secret-versions']
+  getSecretVersion: (secretId: string) => [{ secretId }, "secret-versions"]
 };
 
 const fetchProjectEncryptedSecrets = async (
   workspaceId: string,
   env: string | string[],
-  folderId?: string
+  folderId?: string,
+  secretPath?: string
 ) => {
-  if (typeof env === 'string') {
-    const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>('/api/v2/secrets', {
+  if (typeof env === "string") {
+    const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>("/api/v2/secrets", {
       params: {
         environment: env,
         workspaceId,
-        folderId: folderId || undefined
+        folderId: folderId || undefined,
+        secretPath
       }
     });
     return data.secrets;
   }
 
-  if (typeof env === 'object') {
+  if (typeof env === "object") {
     let allEnvData: any = [];
 
     // eslint-disable-next-line no-restricted-syntax
     for (const envPoint of env) {
       // eslint-disable-next-line no-await-in-loop
-      const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>('/api/v2/secrets', {
+      const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>("/api/v2/secrets", {
         params: {
           environment: envPoint,
           workspaceId,
-          folderId
+          folderId,
+          secretPath
         }
       });
       allEnvData = allEnvData.concat(data.secrets);
@@ -77,8 +81,8 @@ export const useGetProjectSecrets = ({
     enabled: Boolean(decryptFileKey && workspaceId && env) && !isPaused,
     queryKey: secretKeys.getProjectSecret(workspaceId, env, folderId),
     queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env, folderId),
-    select: (data) => {
-      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY') as string;
+    select: useCallback((data: EncryptedSecret[]) => {
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
       const latestKey = decryptFileKey;
       const key = decryptAssymmetric({
         ciphertext: latestKey.encryptedKey,
@@ -125,7 +129,7 @@ export const useGetProjectSecrets = ({
           updatedAt: encSecret.updatedAt
         };
 
-        if (encSecret.type === 'personal') {
+        if (encSecret.type === "personal") {
           personalSecrets[`${decryptedSecret.key}-${decryptedSecret.env}`] = {
             id: encSecret._id,
             value: secretValue
@@ -142,26 +146,29 @@ export const useGetProjectSecrets = ({
         if (personalSecrets?.[dupKey]) {
           val.idOverride = personalSecrets[dupKey].id;
           val.valueOverride = personalSecrets[dupKey].value;
-          val.overrideAction = 'modified';
+          val.overrideAction = "modified";
         }
       });
       return { secrets: sharedSecrets };
-    }
+    }, [decryptFileKey])
   });
 
 export const useGetProjectSecretsByKey = ({
   workspaceId,
   env,
   decryptFileKey,
-  isPaused
+  isPaused,
+  folderId,
+  secretPath
 }: GetProjectSecretsDTO) =>
   useQuery({
     // wait for all values to be available
     enabled: Boolean(decryptFileKey && workspaceId && env) && !isPaused,
-    queryKey: secretKeys.getProjectSecret(workspaceId, env),
-    queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env),
-    select: (data) => {
-      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY') as string;
+    // right now secretpath is passed as folderid as only this is used in overview
+    queryKey: secretKeys.getProjectSecret(workspaceId, env, secretPath),
+    queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env, folderId, secretPath),
+    select: useCallback((data: EncryptedSecret[]) => {
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
       const latestKey = decryptFileKey;
       const key = decryptAssymmetric({
         ciphertext: latestKey.encryptedKey,
@@ -210,7 +217,7 @@ export const useGetProjectSecretsByKey = ({
           updatedAt: encSecret.updatedAt
         };
 
-        if (encSecret.type === 'personal') {
+        if (encSecret.type === "personal") {
           personalSecrets[`${decryptedSecret.key}-${decryptedSecret.env}`] = {
             id: encSecret._id,
             value: secretValue
@@ -229,13 +236,13 @@ export const useGetProjectSecretsByKey = ({
           if (personalSecrets?.[dupKey]) {
             val.idOverride = personalSecrets[dupKey].id;
             val.valueOverride = personalSecrets[dupKey].value;
-            val.overrideAction = 'modified';
+            val.overrideAction = "modified";
           }
         });
       });
 
       return { secrets: sharedSecrets, uniqueSecCount: Object.keys(uniqSecKeys).length };
-    }
+    }, [decryptFileKey])
   });
 
 const fetchEncryptedSecretVersion = async (secretId: string, offset: number, limit: number) => {
@@ -256,8 +263,8 @@ export const useGetSecretVersion = (dto: GetSecretVersionsDTO) =>
     enabled: Boolean(dto.secretId && dto.decryptFileKey),
     queryKey: secretKeys.getSecretVersion(dto.secretId),
     queryFn: () => fetchEncryptedSecretVersion(dto.secretId, dto.offset, dto.limit),
-    select: (data) => {
-      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY') as string;
+    select: useCallback((data: EncryptedSecretVersion[]) => {
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
       const latestKey = dto.decryptFileKey;
       const key = decryptAssymmetric({
         ciphertext: latestKey.encryptedKey,
@@ -278,7 +285,7 @@ export const useGetSecretVersion = (dto: GetSecretVersionsDTO) =>
           })
         }))
         .sort((a, b) => b.createdAt.localeCompare(a.createdAt));
-    }
+    }, [])
   });
 
 export const useBatchSecretsOp = () => {
@@ -286,7 +293,7 @@ export const useBatchSecretsOp = () => {
 
   return useMutation<{}, {}, BatchSecretDTO>({
     mutationFn: async (dto) => {
-      const { data } = await apiRequest.post('/api/v2/secrets/batch', dto);
+      const { data } = await apiRequest.post("/api/v2/secrets/batch", dto);
       return data;
     },
     onSuccess: (_, dto) => {

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

@@ -1,11 +1,11 @@
-import type { UserWsKeyPair } from '../keys/types';
-import type { WsTag } from '../tags/types';
+import type { UserWsKeyPair } from "../keys/types";
+import type { WsTag } from "../tags/types";
 
 export type EncryptedSecret = {
   _id: string;
   version: number;
   workspace: string;
-  type: 'shared' | 'personal';
+  type: "shared" | "personal";
   environment: string;
   secretKeyCiphertext: string;
   secretKeyIV: string;
@@ -62,7 +62,7 @@ type SecretTagArg = { _id: string; name: string; slug: string };
 export type UpdateSecretArg = {
   _id: string;
   folderId?: string;
-  type: 'shared' | 'personal';
+  type: "shared" | "personal";
   secretName: string;
   secretKeyCiphertext: string;
   secretKeyIV: string;
@@ -76,7 +76,7 @@ export type UpdateSecretArg = {
   tags: SecretTagArg[];
 };
 
-export type CreateSecretArg = Omit<UpdateSecretArg, '_id'>;
+export type CreateSecretArg = Omit<UpdateSecretArg, "_id">;
 
 export type DeleteSecretArg = { _id: string };
 
@@ -85,9 +85,9 @@ export type BatchSecretDTO = {
   folderId: string;
   environment: string;
   requests: Array<
-    | { method: 'POST'; secret: CreateSecretArg }
-    | { method: 'PATCH'; secret: UpdateSecretArg }
-    | { method: 'DELETE'; secret: DeleteSecretArg }
+    | { method: "POST"; secret: CreateSecretArg }
+    | { method: "PATCH"; secret: UpdateSecretArg }
+    | { method: "DELETE"; secret: DeleteSecretArg }
   >;
 };
 
@@ -96,6 +96,7 @@ export type GetProjectSecretsDTO = {
   env: string | string[];
   decryptFileKey: UserWsKeyPair;
   folderId?: string;
+  secretPath?: string;
   isPaused?: boolean;
   onSuccess?: (data: DecryptedSecret[]) => void;
 };

frontend/src/hooks/api/serverDetails/index.ts

@@ -1 +1 @@
-export { useFetchServerStatus } from './queries'
+export { useFetchServerStatus } from "./queries"

frontend/src/hooks/api/serverDetails/queries.tsx

@@ -1,16 +1,16 @@
-import {useQuery } from '@tanstack/react-query';
+import {useQuery } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
-import { ServerStatus } from './types';
+import { ServerStatus } from "./types";
 
 // cache key
 const serverStatusKeys = {
-  serverStatus: ['serverStatus'] as const
+  serverStatus: ["serverStatus"] as const
 };
 
 const fetchServerStatus = async () => {
-  const {data} = await apiRequest.get<ServerStatus>('/api/status');
+  const {data} = await apiRequest.get<ServerStatus>("/api/status");
   return data;
 };
 

frontend/src/hooks/api/serviceAccounts/index.tsx

@@ -7,4 +7,4 @@ export {
     useGetServiceAccountProjectLevelPermissions,
     useGetServiceAccounts,
     useRenameServiceAccount
-} from './queries';
+} from "./queries";

frontend/src/hooks/api/serviceAccounts/queries.tsx

@@ -1,6 +1,6 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
 import {
     CreateServiceAccountDTO,
@@ -10,12 +10,12 @@ import {
     RenameServiceAccountDTO,
     ServiceAccount,
     ServiceAccountWorkspacePermission
-} from './types';
+} from "./types";
 
 const serviceAccountKeys = {
-    getServiceAccountById: (serviceAccountId: string) => [{ serviceAccountId }, 'service-account'] as const,
-    getServiceAccounts: (organizationID: string) => [{ organizationID }, 'service-accounts'] as const,
-    getServiceAccountProjectLevelPermissions: (serviceAccountId: string) => [{ serviceAccountId }, 'service-account-project-level-permissions'] as const
+    getServiceAccountById: (serviceAccountId: string) => [{ serviceAccountId }, "service-account"] as const,
+    getServiceAccounts: (organizationID: string) => [{ organizationID }, "service-accounts"] as const,
+    getServiceAccountProjectLevelPermissions: (serviceAccountId: string) => [{ serviceAccountId }, "service-account-project-level-permissions"] as const
 }
 
 const fetchServiceAccounts = async (organizationID: string) => {
@@ -54,7 +54,7 @@ export const useCreateServiceAccount = () => {
 
     return useMutation<CreateServiceAccountRes, {}, CreateServiceAccountDTO>({
         mutationFn: async (body) => {
-            const { data } = await apiRequest.post('/api/v2/service-accounts/', body);
+            const { data } = await apiRequest.post("/api/v2/service-accounts/", body);
             return data;
         },
         onSuccess: ({ serviceAccount }) => {

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

@@ -1,4 +1,4 @@
-import { Workspace } from '../workspace/types';
+import { Workspace } from "../workspace/types";
 
 export type ServiceAccount = {
     _id: string;

frontend/src/hooks/api/serviceTokens/index.ts

@@ -1 +1 @@
-export { useCreateServiceToken, useDeleteServiceToken, useGetUserWsServiceTokens } from './queries';
+export { useCreateServiceToken, useDeleteServiceToken, useGetUserWsServiceTokens } from "./queries";

frontend/src/hooks/api/serviceTokens/queries.tsx

@@ -1,16 +1,16 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
 import {
   CreateServiceTokenDTO,
   CreateServiceTokenRes,
   DeleteServiceTokenRes,
   ServiceToken
-} from './types';
+} from "./types";
 
 const serviceTokenKeys = {
-  getAllWorkspaceServiceToken: (workspaceID: string) => [{ workspaceID }, 'service-tokens'] as const
+  getAllWorkspaceServiceToken: (workspaceID: string) => [{ workspaceID }, "service-tokens"] as const
 };
 
 const fetchWorkspaceServiceTokens = async (workspaceID: string) => {
@@ -36,7 +36,7 @@ export const useCreateServiceToken = () => {
 
   return useMutation<CreateServiceTokenRes, {}, CreateServiceTokenDTO>({
     mutationFn: async (body) => {
-      const { data } = await apiRequest.post('/api/v2/service-token/', body);
+      const { data } = await apiRequest.post("/api/v2/service-token/", body);
       data.serviceToken += `.${body.randomBytes}`;
       return data;
     },

frontend/src/hooks/api/subscriptions/index.tsx

@@ -1 +1 @@
-export { useGetOrgSubscription } from './queries';
+export { useGetOrgSubscription } from "./queries";

frontend/src/hooks/api/subscriptions/queries.tsx

@@ -1,13 +1,13 @@
-import { useQuery } from '@tanstack/react-query';
+import { useQuery } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
-import { SubscriptionPlan } from './types';
+import { SubscriptionPlan } from "./types";
 
 // import { Workspace } from './types';
 
 const subscriptionKeys = {
-  getOrgSubsription: (orgID: string) => ['plan', { orgID }] as const
+  getOrgSubsription: (orgID: string) => ["plan", { orgID }] as const
 };
 
 const fetchOrgSubscription = async (orgID: string) => {

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

@@ -1,7 +1,7 @@
 export type SubscriptionPlan = {
   _id: string;
   membersUsed: number;
-  membersLimit: number;
+  memberLimit: number;
   auditLogs: boolean;
   customAlerts: boolean;
   customRateLimits: boolean;
@@ -12,5 +12,5 @@ export type SubscriptionPlan = {
   tier: number;
   workspaceLimit: number;
   workspacesUsed: number;
-  envLimit: number;
+  environmentLimit: number;
 };

frontend/src/hooks/api/tags/index.tsx

@@ -1,3 +1,3 @@
-export { useGetWsTags } from './queries';
-export { useCreateWsTag } from './queries';
-export { useDeleteWsTag } from './queries';
+export { useGetWsTags } from "./queries";
+export { useCreateWsTag } from "./queries";
+export { useDeleteWsTag } from "./queries";

frontend/src/hooks/api/tags/queries.tsx

@@ -1,6 +1,6 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
 import {
   CreateTagDTO,
@@ -8,11 +8,11 @@ import {
   DeleteTagDTO,
   DeleteWsTagRes,
   UserWsTags
-} from './types';
+} from "./types";
 
 
 const workspaceTags = {
-  getWsTags: (workspaceID: string) => ['workspace-tags', { workspaceID }] as const
+  getWsTags: (workspaceID: string) => ["workspace-tags", { workspaceID }] as const
 };
 
 const fetchWsTag = async (workspaceID: string) => {

frontend/src/hooks/api/types.ts

@@ -1,11 +1,11 @@
-export type { GetAuthTokenAPI } from './auth/types';
-export type { IncidentContact } from './incidentContacts/types';
-export type { UserWsKeyPair } from './keys/types';
-export type { Organization } from './organization/types';
-export type { CreateServiceTokenDTO, ServiceToken } from './serviceTokens/types';
-export type { SubscriptionPlan } from './subscriptions/types';
-export type { WsTag } from './tags/types';
-export type { AddUserToWsDTO, AddUserToWsRes, OrgUser, User } from './users/types';
+export type { GetAuthTokenAPI } from "./auth/types";
+export type { IncidentContact } from "./incidentContacts/types";
+export type { UserWsKeyPair } from "./keys/types";
+export type { Organization } from "./organization/types";
+export type { CreateServiceTokenDTO, ServiceToken } from "./serviceTokens/types";
+export type { SubscriptionPlan } from "./subscriptions/types";
+export type { WsTag } from "./tags/types";
+export type { AddUserToWsDTO, AddUserToWsRes, OrgUser, User } from "./users/types";
 export type {
   CreateEnvironmentDTO,
   CreateWorkspaceDTO,
@@ -17,4 +17,4 @@ export type {
   Workspace,
   WorkspaceEnv,
   WorkspaceTag
-} from './workspace/types';
+} from "./workspace/types";

frontend/src/hooks/api/users/index.tsx

@@ -9,4 +9,4 @@ export {
   useLogoutUser,
   useRegisterUserAction,
   useUpdateOrgUserRole
-} from './queries';
+} from "./queries";

frontend/src/hooks/api/users/queries.tsx

@@ -1,13 +1,13 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import {
   decryptAssymmetric,
   encryptAssymmetric
-} from '@app/components/utilities/cryptography/crypto';
-import { apiRequest } from '@app/config/request';
-import { setAuthToken } from '@app/reactQuery';
+} from "@app/components/utilities/cryptography/crypto";
+import { apiRequest } from "@app/config/request";
+import { setAuthToken } from "@app/reactQuery";
 
-import { useUploadWsKey } from '../keys/queries';
+import { useUploadWsKey } from "../keys/queries";
 import {
   AddUserToOrgDTO,
   AddUserToWsDTO,
@@ -16,12 +16,12 @@ import {
   OrgUser,
   UpdateOrgUserRoleDTO,
   User
-} from './types';
+} from "./types";
 
 const userKeys = {
-  getUser: ['user'] as const,
-  userAction: ['user-action'] as const,
-  getOrgUsers: (orgId: string) => [{ orgId }, 'user']
+  getUser: ["user"] as const,
+  userAction: ["user-action"] as const,
+  getOrgUsers: (orgId: string) => [{ orgId }, "user"]
 };
 
 export const fetchUserDetails = async () => {
@@ -33,7 +33,7 @@ export const fetchUserDetails = async () => {
 export const useGetUser = () => useQuery(userKeys.getUser, fetchUserDetails);
 
 const fetchUserAction = async (action: string) => {
-  const { data } = await apiRequest.get<{ userAction: string }>('/api/v1/user-action', {
+  const { data } = await apiRequest.get<{ userAction: string }>("/api/v1/user-action", {
     params: {
       action
     }
@@ -70,7 +70,7 @@ export const useAddUserToWs = () => {
     mutationFn: ({ email, workspaceId }) =>
       apiRequest.post(`/api/v1/workspace/${workspaceId}/invite-signup`, { email }),
     onSuccess: ({ data }, { workspaceId }) => {
-      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY');
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY");
       if (!PRIVATE_KEY) return;
 
       // assymmetrically decrypt symmetric key with local private key
@@ -107,7 +107,7 @@ export const useAddUserToOrg = () => {
   }
 
   return useMutation<Response, {}, AddUserToOrgDTO>({
-    mutationFn: (dto) => apiRequest.post(`/api/v1/invite-org/signup`, dto),
+    mutationFn: (dto) => apiRequest.post("/api/v1/invite-org/signup", dto),
     onSuccess: (_, { organizationId }) => {
       queryClient.invalidateQueries(userKeys.getOrgUsers(organizationId));
     }
@@ -147,7 +147,7 @@ export const useUpdateOrgUserRole = () => {
 export const useRegisterUserAction = () => {
   const queryClient = useQueryClient();
   return useMutation<{}, {}, string>({
-    mutationFn: (action) => apiRequest.post('/api/v1/user-action', { action }),
+    mutationFn: (action) => apiRequest.post("/api/v1/user-action", { action }),
     onSuccess: () => {
       queryClient.invalidateQueries(userKeys.userAction);
     }
@@ -156,14 +156,14 @@ export const useRegisterUserAction = () => {
 
 export const useLogoutUser = () =>
   useMutation({
-    mutationFn: () => apiRequest.post('/api/v1/auth/logout'),
+    mutationFn: () => apiRequest.post("/api/v1/auth/logout"),
     onSuccess: () => {
-      setAuthToken('');
+      setAuthToken("");
       // Delete the cookie by not setting a value; Alternatively clear the local storage
-      localStorage.setItem('publicKey', '');
-      localStorage.setItem('encryptedPrivateKey', '');
-      localStorage.setItem('iv', '');
-      localStorage.setItem('tag', '');
-      localStorage.setItem('PRIVATE_KEY', '');
+      localStorage.setItem("publicKey", "");
+      localStorage.setItem("encryptedPrivateKey", "");
+      localStorage.setItem("iv", "");
+      localStorage.setItem("tag", "");
+      localStorage.setItem("PRIVATE_KEY", "");
     }
   });

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

@@ -1,4 +1,4 @@
-import { UserWsKeyPair } from '../keys/types';
+import { UserWsKeyPair } from "../keys/types";
 
 export type User = {
   createdAt: Date;
@@ -31,8 +31,8 @@ export type OrgUser = {
   };
   inviteEmail: string;
   organization: string;
-  role: 'owner' | 'admin' | 'member';
-  status: 'invited' | 'accepted' | 'verified' | 'completed';
+  role: "owner" | "admin" | "member";
+  status: "invited" | "accepted" | "verified" | "completed";
   deniedPermissions: any[];
 };
 
@@ -42,7 +42,7 @@ export type AddUserToWsDTO = {
 };
 
 export type AddUserToWsRes = {
-  invitee: OrgUser['user'];
+  invitee: OrgUser["user"];
   latestKey: UserWsKeyPair;
 };
 

frontend/src/hooks/api/workspace/index.tsx

@@ -12,4 +12,5 @@ export {
   useNameWorkspaceSecrets,
   useRenameWorkspace,
   useToggleAutoCapitalization,
-  useUpdateWsEnvironment} from './queries';
+  useUpdateWsEnvironment
+} from "./queries";

frontend/src/hooks/api/workspace/queries.tsx

@@ -1,10 +1,10 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
-import { apiRequest } from '@app/config/request';
+import { apiRequest } from "@app/config/request";
 
 import {
   EncryptedSecret
-} from '../secrets/types';
+} from "../secrets/types";
 import {
   CreateEnvironmentDTO,
   CreateWorkspaceDTO,
@@ -17,15 +17,15 @@ import {
   UpdateEnvironmentDTO,
   Workspace,
   WorkspaceEnv
-} from './types';
+} from "./types";
 
 const workspaceKeys = {
-  getWorkspaceById: (workspaceId: string) => [{ workspaceId }, 'workspace'] as const,
-  getWorkspaceSecrets: (workspaceId: string) => [{ workspaceId }, 'workspace-secrets'] as const,
-  getWorkspaceIndexStatus: (workspaceId: string) => [{ workspaceId}, 'workspace-index-status'] as const,
-  getWorkspaceMemberships: (orgId: string) => [{ orgId }, 'workspace-memberships'],
-  getAllUserWorkspace: ['workspaces'] as const,
-  getUserWsEnvironments: (workspaceId: string) => ['workspace-env', { workspaceId }] as const
+  getWorkspaceById: (workspaceId: string) => [{ workspaceId }, "workspace"] as const,
+  getWorkspaceSecrets: (workspaceId: string) => [{ workspaceId }, "workspace-secrets"] as const,
+  getWorkspaceIndexStatus: (workspaceId: string) => [{ workspaceId}, "workspace-index-status"] as const,
+  getWorkspaceMemberships: (orgId: string) => [{ orgId }, "workspace-memberships"],
+  getAllUserWorkspace: ["workspaces"] as const,
+  getUserWsEnvironments: (workspaceId: string) => ["workspace-env", { workspaceId }] as const
 };
 
 const fetchWorkspaceById = async (workspaceId: string) => {
@@ -53,7 +53,7 @@ const fetchWorkspaceSecrets = async (workspaceId: string) => {
 }
 
 const fetchUserWorkspaces = async () => {
-  const { data } = await apiRequest.get<{ workspaces: Workspace[] }>('/api/v1/workspace');
+  const { data } = await apiRequest.get<{ workspaces: Workspace[] }>("/api/v1/workspace");
   return data.workspaces;
 };
 
@@ -134,7 +134,7 @@ export const useCreateWorkspace = () => {
 
   return useMutation<{ data: { workspace: Workspace } }, {}, CreateWorkspaceDTO>({
     mutationFn: async ({ organizationId, workspaceName }) =>
-      apiRequest.post('/api/v1/workspace', { workspaceName, organizationId }),
+      apiRequest.post("/api/v1/workspace", { workspaceName, organizationId }),
     onSuccess: () => {
       queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace);
     }