misc: added error prompt for fetch secrets issue with kms

This commit is contained in:
Sheen Capadngan
2024-07-31 16:31:37 +08:00
parent 9184ec0765
commit e6b6de5e8e
2 changed files with 35 additions and 1 deletions
@@ -1,8 +1,11 @@
/* eslint-disable no-param-reassign */ /* eslint-disable no-param-reassign */
import { useCallback, useMemo } from "react"; import { useCallback, useMemo } from "react";
import { useQueries, useQuery, UseQueryOptions } from "@tanstack/react-query"; import { useQueries, useQuery, UseQueryOptions } from "@tanstack/react-query";
import axios from "axios";
import { createNotification } from "@app/components/notifications";
import { apiRequest } from "@app/config/request"; import { apiRequest } from "@app/config/request";
import { useToggle } from "@app/hooks/useToggle";
import { import {
GetSecretVersionsDTO, GetSecretVersionsDTO,
@@ -113,10 +116,24 @@ export const useGetProjectSecretsAllEnv = ({
envs, envs,
secretPath secretPath
}: TGetProjectSecretsAllEnvDTO) => { }: TGetProjectSecretsAllEnvDTO) => {
const [isErrorHandled, setIsErrorHandled] = useToggle(false);
const secrets = useQueries({ const secrets = useQueries({
queries: envs.map((environment) => ({ queries: envs.map((environment) => ({
queryKey: secretKeys.getProjectSecret({ workspaceId, environment, secretPath }), queryKey: secretKeys.getProjectSecret({ workspaceId, environment, secretPath }),
enabled: Boolean(workspaceId && environment), enabled: Boolean(workspaceId && environment),
onError: (error: unknown) => {
if (axios.isAxiosError(error) && !isErrorHandled) {
const serverResponse = error.response?.data as { message: string };
createNotification({
title: "Error fetching secrets",
type: "error",
text: serverResponse.message
});
setIsErrorHandled.on();
}
},
queryFn: async () => fetchProjectSecrets({ workspaceId, environment, secretPath }), queryFn: async () => fetchProjectSecrets({ workspaceId, environment, secretPath }),
select: (el: SecretV3RawResponse) => select: (el: SecretV3RawResponse) =>
mergePersonalSecrets(el.secrets).reduce<Record<string, SecretV3RawSanitized>>( mergePersonalSecrets(el.secrets).reduce<Record<string, SecretV3RawSanitized>>(
@@ -4,6 +4,7 @@ import { useRouter } from "next/router";
import { subject } from "@casl/ability"; import { subject } from "@casl/ability";
import { faArrowDown, faArrowUp } from "@fortawesome/free-solid-svg-icons"; import { faArrowDown, faArrowUp } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import axios from "axios";
import NavHeader from "@app/components/navigation/NavHeader"; import NavHeader from "@app/components/navigation/NavHeader";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
@@ -93,7 +94,12 @@ export const SecretMainPage = () => {
}, [isWorkspaceLoading, currentWorkspace, environment, router.isReady]); }, [isWorkspaceLoading, currentWorkspace, environment, router.isReady]);
// fetch secrets // fetch secrets
const { data: secrets, isLoading: isSecretsLoading } = useGetProjectSecrets({ const {
data: secrets,
isLoading: isSecretsLoading,
isError: isErrorFetchingSecrets,
error: fetchSecretsError
} = useGetProjectSecrets({
environment, environment,
workspaceId, workspaceId,
secretPath, secretPath,
@@ -102,6 +108,17 @@ export const SecretMainPage = () => {
} }
}); });
if (isErrorFetchingSecrets) {
if (axios.isAxiosError(fetchSecretsError)) {
const serverResponse = fetchSecretsError.response?.data as { message: string };
createNotification({
title: "Error fetching secrets",
type: "error",
text: serverResponse.message
});
}
}
// fetch folders // fetch folders
const { data: folders, isLoading: isFoldersLoading } = useGetProjectFolders({ const { data: folders, isLoading: isFoldersLoading } = useGetProjectFolders({
projectId: workspaceId, projectId: workspaceId,