Added bracketSpacing into prettier (#627)

This commit is contained in:
yuri-sakharov
2025-11-27 13:27:16 +02:00
committed by GitHub
parent 3f623458b3
commit 1129651e6c
10 changed files with 155 additions and 144 deletions

View File

@@ -2,3 +2,4 @@ trailingComma: "es5"
tabWidth: 2 tabWidth: 2
semi: true semi: true
singleQuote: false singleQuote: false
bracketSpacing: true

View File

@@ -7,8 +7,9 @@ import apiService from "./apiService";
function useGetKubectlContexts(options?: UseQueryOptions<KubectlContexts>) { function useGetKubectlContexts(options?: UseQueryOptions<KubectlContexts>) {
return useQuery<KubectlContexts>({ return useQuery<KubectlContexts>({
queryKey: ["k8s", "contexts"], queryKey: ["k8s", "contexts"],
queryFn:() => apiService.fetchWithDefaults<KubectlContexts>("/api/k8s/contexts"), queryFn: () =>
...(options ?? {}) apiService.fetchWithDefaults<KubectlContexts>("/api/k8s/contexts"),
...(options ?? {}),
}); });
} }
@@ -25,8 +26,8 @@ function useGetK8sResource(
apiService.fetchWithDefaults<K8sResource>( apiService.fetchWithDefaults<K8sResource>(
`/api/k8s/${kind}/get?name=${name}&namespace=${namespace}` `/api/k8s/${kind}/get?name=${name}&namespace=${namespace}`
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
// Get list of resources // Get list of resources
@@ -38,8 +39,8 @@ function useGetK8sResourceList(
queryKey: ["k8s", kind, "list"], queryKey: ["k8s", kind, "list"],
queryFn: () => queryFn: () =>
apiService.fetchWithDefaults<K8sResourceList>(`/api/k8s/${kind}/list`), apiService.fetchWithDefaults<K8sResourceList>(`/api/k8s/${kind}/list`),
...(options ?? {})} ...(options ?? {}),
); });
} }
// Get describe text for kubernetes resource // Get describe text for kubernetes resource
@@ -60,6 +61,6 @@ function useGetK8sResourceDescribe(
}, },
} }
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }

View File

@@ -16,8 +16,8 @@ export function useShutdownHelmDashboard(
apiService.fetchWithDefaults("/", { apiService.fetchWithDefaults("/", {
method: "DELETE", method: "DELETE",
}), }),
...(options ?? {})} ...(options ?? {}),
); });
} }
// Gets application status // Gets application status

View File

@@ -16,9 +16,10 @@ export function useGetInstalledReleases(
) { ) {
return useQuery<Release[]>({ return useQuery<Release[]>({
queryKey: ["installedReleases", context], queryKey: ["installedReleases", context],
queryFn: () => apiService.fetchWithDefaults<Release[]>("/api/helm/releases"), queryFn: () =>
...(options ?? {})} apiService.fetchWithDefaults<Release[]>("/api/helm/releases"),
); ...(options ?? {}),
});
} }
export interface ReleaseManifest { export interface ReleaseManifest {
@@ -68,8 +69,8 @@ export function useGetReleaseManifest({
apiService.fetchWithDefaults<ReleaseManifest[]>( apiService.fetchWithDefaults<ReleaseManifest[]>(
`/api/helm/releases/${namespace}/${chartName}/manifests` `/api/helm/releases/${namespace}/${chartName}/manifests`
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
// List of installed k8s resources for this release // List of installed k8s resources for this release
@@ -84,8 +85,8 @@ export function useGetResources(
apiService.fetchWithDefaults<StructuredResources[]>( apiService.fetchWithDefaults<StructuredResources[]>(
`/api/helm/releases/${ns}/${name}/resources?health=true` `/api/helm/releases/${ns}/${name}/resources?health=true`
), ),
...(options ?? {})} ...(options ?? {}),
); });
return { return {
data: data data: data
@@ -124,8 +125,8 @@ export function useGetResourceDescription(
headers: { "Content-Type": "text/plain; charset=utf-8" }, headers: { "Content-Type": "text/plain; charset=utf-8" },
} }
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
export function useGetLatestVersion( export function useGetLatestVersion(
chartName: string, chartName: string,
@@ -137,8 +138,8 @@ export function useGetLatestVersion(
apiService.fetchWithDefaults<ChartVersion[]>( apiService.fetchWithDefaults<ChartVersion[]>(
`/api/helm/repositories/latestver?name=${chartName}` `/api/helm/repositories/latestver?name=${chartName}`
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
export function useGetVersions( export function useGetVersions(
chartName: string, chartName: string,
@@ -150,8 +151,8 @@ export function useGetVersions(
apiService.fetchWithDefaults<LatestChartVersion[]>( apiService.fetchWithDefaults<LatestChartVersion[]>(
`/api/helm/repositories/versions?name=${chartName}` `/api/helm/repositories/versions?name=${chartName}`
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
export function useGetReleaseInfoByType( export function useGetReleaseInfoByType(
@@ -169,8 +170,8 @@ export function useGetReleaseInfoByType(
headers: { "Content-Type": "text/plain; charset=utf-8" }, headers: { "Content-Type": "text/plain; charset=utf-8" },
} }
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
export function useGetDiff( export function useGetDiff(
@@ -186,8 +187,8 @@ export function useGetDiff(
method: "POST", method: "POST",
}); });
}, },
...(options ?? {})} ...(options ?? {}),
); });
} }
// Rollback the release to a previous revision // Rollback the release to a previous revision
@@ -202,7 +203,8 @@ export function useRollbackRelease(
void, void,
unknown, unknown,
{ ns: string; name: string; revision: number } { ns: string; name: string; revision: number }
>({mutationFn:({ ns, name, revision }) => { >({
mutationFn: ({ ns, name, revision }) => {
const formData = new FormData(); const formData = new FormData();
formData.append("revision", revision.toString()); formData.append("revision", revision.toString());
@@ -213,7 +215,9 @@ export function useRollbackRelease(
body: formData, body: formData,
} }
); );
}, ...(options ?? {})}); },
...(options ?? {}),
});
} }
// Run the tests on a release // Run the tests on a release
@@ -229,8 +233,8 @@ export function useTestRelease(
} }
); );
}, },
...(options ?? {})} ...(options ?? {}),
); });
} }
export function useChartReleaseValues({ export function useChartReleaseValues({
@@ -259,8 +263,8 @@ export function useChartReleaseValues({
headers: { "Content-Type": "text/plain; charset=utf-8" }, headers: { "Content-Type": "text/plain; charset=utf-8" },
} }
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }
export const useVersionData = ({ export const useVersionData = ({
@@ -315,7 +319,7 @@ export const useVersionData = ({
return data; return data;
}, },
...(options ?? {}) ...(options ?? {}),
}); });
}; };

View File

@@ -15,7 +15,7 @@ export function useGetRepositories(
queryKey: ["helm", "repositories"], queryKey: ["helm", "repositories"],
queryFn: () => queryFn: () =>
apiService.fetchWithDefaults<HelmRepositories>("/api/helm/repositories"), apiService.fetchWithDefaults<HelmRepositories>("/api/helm/repositories"),
...(options ?? {}) ...(options ?? {}),
}); });
} }
@@ -24,14 +24,17 @@ export function useUpdateRepo(
repo: string, repo: string,
options?: UseMutationOptions<void, unknown, void> options?: UseMutationOptions<void, unknown, void>
) { ) {
return useMutation<void, unknown, void>({ mutationFn:() => { return useMutation<void, unknown, void>({
mutationFn: () => {
return apiService.fetchWithDefaults<void>( return apiService.fetchWithDefaults<void>(
`/api/helm/repositories/${repo}`, `/api/helm/repositories/${repo}`,
{ {
method: "POST", method: "POST",
} }
); );
}, ...(options ?? {})}); },
...(options ?? {}),
});
} }
// Remove repository // Remove repository
@@ -39,14 +42,17 @@ export function useDeleteRepo(
repo: string, repo: string,
options?: UseMutationOptions<void, unknown, void> options?: UseMutationOptions<void, unknown, void>
) { ) {
return useMutation<void, unknown, void>({mutationFn:() => { return useMutation<void, unknown, void>({
mutationFn: () => {
return apiService.fetchWithDefaults<void>( return apiService.fetchWithDefaults<void>(
`/api/helm/repositories/${repo}`, `/api/helm/repositories/${repo}`,
{ {
method: "DELETE", method: "DELETE",
} }
); );
}, ...(options ?? {})}); },
...(options ?? {}),
});
} }
export function useChartRepoValues({ export function useChartRepoValues({
@@ -66,6 +72,5 @@ export function useChartRepoValues({
} }
), ),
enabled: Boolean(version) && Boolean(chart), enabled: Boolean(version) && Boolean(chart),
} });
);
} }

View File

@@ -15,8 +15,8 @@ function useGetDiscoveredScanners(options?: UseQueryOptions<ScannersList>) {
return useQuery<ScannersList>({ return useQuery<ScannersList>({
queryKey: ["scanners"], queryKey: ["scanners"],
queryFn: () => apiService.fetchWithDefaults<ScannersList>("/api/scanners"), queryFn: () => apiService.fetchWithDefaults<ScannersList>("/api/scanners"),
...(options ?? {})} ...(options ?? {}),
); });
} }
// Scan manifests using all applicable scanners // Scan manifests using all applicable scanners
@@ -32,8 +32,8 @@ function useScanManifests(
method: "POST", method: "POST",
body: formData, body: formData,
}), }),
...(options ?? {})} ...(options ?? {}),
); });
} }
// Scan specified k8s resource in cluster // Scan specified k8s resource in cluster
@@ -43,12 +43,12 @@ function useScanK8sResource(
name: string, name: string,
options?: UseQueryOptions<ScanResults> options?: UseQueryOptions<ScanResults>
) { ) {
return useQuery<ScanResults>({queryKey: return useQuery<ScanResults>({
["scanners", "resource", kind, namespace, name], queryKey: ["scanners", "resource", kind, namespace, name],
queryFn: () => queryFn: () =>
apiService.fetchWithDefaults<ScanResults>( apiService.fetchWithDefaults<ScanResults>(
`/api/scanners/resource/${kind}?namespace=${namespace}&name=${name}` `/api/scanners/resource/${kind}?namespace=${namespace}&name=${name}`
), ),
...(options ?? {})} ...(options ?? {}),
); });
} }

View File

@@ -44,7 +44,13 @@ export const useDiffData = ({
chart: string; chart: string;
}) => { }) => {
return useQuery({ return useQuery({
queryKey: [selectedRepo, versionsError, chart, currentVerManifest, selectedVerData], queryKey: [
selectedRepo,
versionsError,
chart,
currentVerManifest,
selectedVerData,
],
queryFn: async () => { queryFn: async () => {
const formData = new FormData(); const formData = new FormData();
formData.append("a", currentVerManifest); formData.append("a", currentVerManifest);
@@ -58,6 +64,5 @@ export const useDiffData = ({
return diff; return diff;
}, },
enabled: Boolean(selectedVerData), enabled: Boolean(selectedVerData),
} });
);
}; };

View File

@@ -130,8 +130,8 @@ export const InstallReleaseChartModal = ({
}); });
// Confirm method (install) // Confirm method (install)
const setReleaseVersionMutation = useMutation( const setReleaseVersionMutation = useMutation({
{mutationKey:[ mutationKey: [
"setVersion", "setVersion",
namespace, namespace,
releaseName, releaseName,
@@ -174,8 +174,7 @@ export const InstallReleaseChartModal = ({
onError: (error) => { onError: (error) => {
setInstallError((error as Error)?.message || "Failed to update"); setInstallError((error as Error)?.message || "Failed to update");
}, },
} });
);
return ( return (
<Modal <Modal

View File

@@ -112,8 +112,8 @@ export const InstallRepoChartModal = ({
}); });
// Confirm method (install) // Confirm method (install)
const setReleaseVersionMutation = useMutation( const setReleaseVersionMutation = useMutation({
{mutationKey:[ mutationKey: [
"setVersion", "setVersion",
namespace, namespace,
releaseName, releaseName,
@@ -142,15 +142,12 @@ export const InstallRepoChartModal = ({
onSuccess: async (response) => { onSuccess: async (response) => {
onClose(); onClose();
navigate( navigate(`/${response.namespace}/${response.name}/installed/revision/1`);
`/${response.namespace}/${response.name}/installed/revision/1`
);
}, },
onError: (error) => { onError: (error) => {
setInstallError((error as Error)?.message || "Failed to update"); setInstallError((error as Error)?.message || "Failed to update");
}, },
} });
);
return ( return (
<Modal <Modal

View File

@@ -458,8 +458,8 @@ const Uninstall = () => {
enabled: isOpen, enabled: isOpen,
}); });
const uninstallMutation = useMutation( const uninstallMutation = useMutation({
{mutationKey:["uninstall", namespace, chart], mutationKey: ["uninstall", namespace, chart],
mutationFn: () => mutationFn: () =>
apiService.fetchWithDefaults( apiService.fetchWithDefaults(
"/api/helm/releases/" + namespace + "/" + chart, "/api/helm/releases/" + namespace + "/" + chart,
@@ -470,8 +470,7 @@ const Uninstall = () => {
onSuccess: () => { onSuccess: () => {
window.location.href = "/"; window.location.href = "/";
}, },
} });
);
const uninstallTitle = ( const uninstallTitle = (
<div className="font-semibold text-lg"> <div className="font-semibold text-lg">
Uninstall <span className="text-red-500">{chart}</span> from namespace{" "} Uninstall <span className="text-red-500">{chart}</span> from namespace{" "}