Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-08-05 16:57:21 +07:00
29 changed files with 495 additions and 168 deletions
+4 -3
View File
@@ -54,13 +54,14 @@ export const useGetProjectSecrets = ({
env,
decryptFileKey,
isPaused,
folderId
folderId,
secretPath
}: GetProjectSecretsDTO) =>
useQuery({
// wait for all values to be available
enabled: Boolean(decryptFileKey && workspaceId && env) && !isPaused,
queryKey: secretKeys.getProjectSecret(workspaceId, env, folderId),
queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env, folderId),
queryKey: secretKeys.getProjectSecret(workspaceId, env, folderId || secretPath),
queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env, folderId, secretPath),
select: useCallback(
(data: EncryptedSecret[]) => {
const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;