Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

fix(edge/templates): fix issues with git templates [EE-6357] (#10679)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-12-04 08:46:44 +02:00 • committed by GitHub
parent 974378c9b5
commit 2a18c9f215
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 201 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/react/edge/templates/custom-templates/CreateView/CreateTemplateForm.tsx
View file

@ -7,9 +7,12 @@ import { useCreateTemplateMutation } from '@/react/portainer/templates/custom-te
import { Platform } from '@/react/portainer/templates/types';
import { useFetchTemplateFile } from '@/react/portainer/templates/app-templates/queries/useFetchTemplateFile';
import { getDefaultEdgeTemplateSettings } from '@/react/portainer/templates/custom-templates/types';
import { useSaveCredentialsIfRequired } from '@/react/portainer/account/git-credentials/queries/useCreateGitCredentialsMutation';
import { editor } from '@@/BoxSelector/common-options/build-methods';
import { toGitRequest } from '../common/git';
import { InnerForm } from './InnerForm';
import { FormValues } from './types';
import { useValidation } from './useValidation';
@ -19,6 +22,8 @@ export function CreateTemplateForm() {
const mutation = useCreateTemplateMutation();
const validation = useValidation();
const { appTemplateId, type } = useParams();
const { saveCredentials, isLoading: isSaveCredentialsLoading } =
useSaveCredentialsIfRequired();
const fileContentQuery = useFetchTemplateFile(appTemplateId);
@ -58,13 +63,19 @@ export function CreateTemplateForm() {
validationSchema={validation}
validateOnMount
>
<InnerForm isLoading={mutation.isLoading} />
<InnerForm isLoading={mutation.isLoading || isSaveCredentialsLoading} />
</Formik>
);
function handleSubmit(values: FormValues) {
async function handleSubmit(values: FormValues) {
const credentialId = await saveCredentials(values.Git);
mutation.mutate(
{ ...values, EdgeTemplate: true },
{
...values,
EdgeTemplate: true,
Git: toGitRequest(values.Git, credentialId),
},
{
onSuccess() {
notifySuccess('Success', 'Template created');

22
app/react/edge/templates/custom-templates/CreateView/InnerForm.tsx
View file

@ -42,7 +42,7 @@ export function InnerForm({ isLoading }: { isLoading: boolean }) {
usePreventExit(
initialValues.FileContent,
values.FileContent,
values.Method === editor.value && !isSubmitting
values.Method === editor.value && !isSubmitting && !isLoading
);
const isGit = values.Method === git.value;
@ -108,16 +108,7 @@ export function InnerForm({ isLoading }: { isLoading: boolean }) {
/>
)}
{isTemplateVariablesEnabled && (
<CustomTemplatesVariablesDefinitionField
value={values.Variables}
onChange={(values) => setFieldValue('Variables', values)}
isVariablesNamesFromParent={values.Method === editor.value}
errors={errors.Variables}
/>
)}
{values.Method === git.value && (
{isGit && (
<GitForm
value={values.Git}
onChange={(newValues) =>
@ -130,6 +121,15 @@ export function InnerForm({ isLoading }: { isLoading: boolean }) {
/>
)}
{isTemplateVariablesEnabled && (
<CustomTemplatesVariablesDefinitionField
value={values.Variables}
onChange={(values) => setFieldValue('Variables', values)}
isVariablesNamesFromParent={values.Method === editor.value}
errors={errors.Variables}
/>
)}
{values.EdgeSettings && (
<EdgeSettingsFieldset
setValues={(edgeSetValues) =>