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

fix(edge-stacks): various custom template issues [BE-11414] (#189)

Browse source
This commit is contained in:
Ali 2024-12-09 17:48:34 +13:00 • committed by GitHub
parent 16a1825990
commit 97e7a3c5e2
24 changed files with 749 additions and 374 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/react/edge/edge-stacks/CreateView/TemplateFieldset/types.ts
View file

@ -1,4 +1,5 @@
import { VariablesFieldValue } from '@/react/portainer/custom-templates/components/CustomTemplatesVariablesField';
import { EnvVarsValue } from '@/react/portainer/templates/app-templates/DeployFormWidget/EnvVarsFieldset';
export type SelectedTemplateValue =
| { templateId: number; type: 'custom' }
@ -7,5 +8,5 @@ export type SelectedTemplateValue =
export type Values = {
variables: VariablesFieldValue;
envVars: Record<string, string>;
envVars: EnvVarsValue;
} & SelectedTemplateValue;

8
app/react/edge/edge-stacks/CreateView/TemplateFieldset/validation.tsx
View file

@ -9,14 +9,14 @@ import { Values } from './types';
export function templateFieldsetValidation({
customVariablesDefinitions,
envVarDefinitions,
appTemplateVariablesDefinitions,
}: {
customVariablesDefinitions: VariableDefinition[];
envVarDefinitions: Array<TemplateEnv>;
customVariablesDefinitions: Array<VariableDefinition>;
appTemplateVariablesDefinitions: Array<TemplateEnv>;
}): SchemaOf<Values> {
return object({
type: mixed<'app' | 'custom'>().oneOf(['custom', 'app']).optional(),
envVars: envVarsFieldsetValidation(envVarDefinitions)
envVars: envVarsFieldsetValidation(appTemplateVariablesDefinitions)
.optional()
.when('type', {
is: 'app',