Fix/chart-link-cluster-mode (#474)

This commit is contained in:
Nir Parisian
2023-10-02 19:10:04 +03:00
committed by GitHub
parent 88ea89a5ba
commit c251e6c697
19 changed files with 157 additions and 170 deletions

View File

@@ -5,7 +5,7 @@ import useAlertError from "../../hooks/useAlertError";
import useCustomSearchParams from "../../hooks/useCustomSearchParams";
import { useAppContext } from "../../context/AppContext";
import { useQueryClient } from "@tanstack/react-query";
import { useNavigate, useParams } from "react-router-dom";
import { useNavigate } from "react-router-dom";
import apiService from "../../API/apiService";
interface FormKeys {
@@ -27,7 +27,6 @@ function AddRepositoryModal({ isOpen, onClose }: AddRepositoryModalProps) {
const { searchParamsObject } = useCustomSearchParams();
const { repo_url, repo_name } = searchParamsObject;
const { setSelectedRepo } = useAppContext();
const { context } = useParams();
const navigate = useNavigate();
const queryClient = useQueryClient();
@@ -45,10 +44,11 @@ function AddRepositoryModal({ isOpen, onClose }: AddRepositoryModalProps) {
setIsLoading(true);
apiService.fetchWithDefaults<void>("/api/helm/repositories", {
method: "POST",
body,
})
apiService
.fetchWithDefaults<void>("/api/helm/repositories", {
method: "POST",
body,
})
.then(() => {
setIsLoading(false);
onClose();
@@ -57,7 +57,7 @@ function AddRepositoryModal({ isOpen, onClose }: AddRepositoryModalProps) {
queryKey: ["helm", "repositories"],
});
setSelectedRepo(formData.name || "");
navigate(`/${context}/repository/${formData.name}`, {
navigate(`/repository/${formData.name}`, {
replace: true,
});
})

View File

@@ -1,5 +1,4 @@
import { useParams } from "react-router-dom";
import useAlertError from "../../../hooks/useAlertError";
import { useMemo, useState } from "react";
import {
useChartReleaseValues,
@@ -19,6 +18,7 @@ import { useChartRepoValues } from "../../../API/repositories";
import { useDiffData } from "../../../API/shared";
import { InstallChartModalProps } from "../../../data/types";
import { DefinedValues } from "./DefinedValues";
import apiService from "../../../API/apiService";
export const InstallReleaseChartModal = ({
isOpen,
@@ -30,7 +30,6 @@ export const InstallReleaseChartModal = ({
latestRevision,
}: InstallChartModalProps) => {
const navigate = useNavigateWithSearchParams();
const { setShowErrorModal } = useAlertError();
const [userValues, setUserValues] = useState<string>();
const [installError, setInstallError] = useState("");
@@ -150,35 +149,23 @@ export const InstallReleaseChartModal = ({
formData.append("version", selectedVersion || "");
formData.append("values", userValues || releaseValues || ""); // if userValues is empty, we use the release values
const res = await fetch(
// Todo: Change to BASE_URL from env
const data = await apiService.fetchWithDefaults(
`/api/helm/releases/${
namespace ? namespace : "default"
}${`/${releaseName}`}`,
{
method: "post",
body: formData,
headers: {
"X-Kubecontext": selectedCluster as string,
},
}
);
if (!res.ok) {
setShowErrorModal({
title: "Failed to upgrade the chart",
msg: String(await res.text()),
});
}
return res.json();
return data;
},
{
onSuccess: async (response) => {
onClose();
setSelectedVersionData({ version: "", urls: [] }); //cleanup
navigate(
`/${selectedCluster}/${
`/${
namespace ? namespace : "default"
}/${releaseName}/installed/revision/${response.version}`
);

View File

@@ -1,5 +1,4 @@
import { useParams } from "react-router-dom";
import useAlertError from "../../../hooks/useAlertError";
import { useMemo, useState } from "react";
import { useGetVersions, useVersionData } from "../../../API/releases";
import Modal, { ModalButtonStyle } from "../Modal";
@@ -13,6 +12,7 @@ import { isNewerVersion, isNoneEmptyArray } from "../../../utils";
import { useDiffData } from "../../../API/shared";
import { InstallChartModalProps } from "../../../data/types";
import { DefinedValues } from "./DefinedValues";
import apiService from "../../../API/apiService";
export const InstallRepoChartModal = ({
isOpen,
@@ -22,7 +22,6 @@ export const InstallRepoChartModal = ({
latestVersion,
}: InstallChartModalProps) => {
const navigate = useNavigateWithSearchParams();
const { setShowErrorModal } = useAlertError();
const [userValues, setUserValues] = useState("");
const [installError, setInstallError] = useState("");
@@ -130,32 +129,20 @@ export const InstallRepoChartModal = ({
formData.append("version", selectedVersion || "");
formData.append("values", userValues);
formData.append("name", releaseName || "");
const res = await fetch(
// Todo: Change to BASE_URL from env
const data = await apiService.fetchWithDefaults(
`/api/helm/releases/${namespace ? namespace : "default"}`,
{
method: "post",
body: formData,
headers: {
"X-Kubecontext": selectedCluster as string,
},
}
);
if (!res.ok) {
setShowErrorModal({
title: "Failed to install the chart",
msg: String(await res.text()),
});
}
return res.json();
return data;
},
{
onSuccess: async (response) => {
onClose();
navigate(
`/${selectedCluster}/${response.namespace}/${response.name}/installed/revision/1`
`/${response.namespace}/${response.name}/installed/revision/1`
);
},
onError: (error) => {