github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(custom-templates): return parse error

feat/EE-5573/related-changes
Chaim Lev-Ari 2023-10-18 08:30:42 +02:00
parent 3810809444
commit 578f3d34a1
5 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/kubernetes/custom-templates/kube-create-custom-template-view/kube-create-custom-template-view.controller.js
View File

@ -83,7 +83,7 @@ class KubeCreateCustomTemplateViewController {
return; return;
} }
const variables = getTemplateVariables(templateStr); const [variables] = getTemplateVariables(templateStr);
const isValid = !!variables; const isValid = !!variables;

2
app/kubernetes/custom-templates/kube-edit-custom-template-view/kube-edit-custom-template-view.controller.js
View File

@ -112,7 +112,7 @@ class KubeEditCustomTemplateViewController {
return; return;
} }
const variables = getTemplateVariables(templateStr); const [variables] = getTemplateVariables(templateStr);
const isValid = !!variables; const isValid = !!variables;

2
app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateViewController.js
View File

@ -206,7 +206,7 @@ class CreateCustomTemplateViewController {
return; return;
} }
const variables = getTemplateVariables(templateStr); const [variables] = getTemplateVariables(templateStr);
const isValid = !!variables; const isValid = !!variables;

2
app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js
View File

@ -178,7 +178,7 @@ class EditCustomTemplateViewController {
return; return;
} }
const variables = getTemplateVariables(templateStr); const [variables] = getTemplateVariables(templateStr);
const isValid = !!variables; const isValid = !!variables;

39
app/react/portainer/custom-templates/components/utils.ts
View File

@ -4,31 +4,40 @@ import Mustache from 'mustache';
import { VariableDefinition } from './CustomTemplatesVariablesDefinitionField/CustomTemplatesVariablesDefinitionField'; import { VariableDefinition } from './CustomTemplatesVariablesDefinitionField/CustomTemplatesVariablesDefinitionField';
export function getTemplateVariables(templateStr: string) { export function getTemplateVariables(templateStr: string) {
const template = validateAndParse(templateStr); const [template, error] = validateAndParse(templateStr);
if (!template) { if (!template) {
return null; return [null, error] as const;
} }
return template return [
.filter(([type, value]) => type === 'name' && value) template
.map(([, value]) => ({ .filter(([type, value]) => type === 'name' && value)
name: value, .map(([, value]) => ({
label: '', name: value,
defaultValue: '', label: '',
description: '', defaultValue: '',
})); description: '',
})),
null,
] as const;
} }
type TemplateSpans = ReturnType<typeof Mustache.parse>;
function validateAndParse(templateStr: string) { function validateAndParse(
templateStr: string
): readonly [TemplateSpans, null] | readonly [null, string] {
if (!templateStr) { if (!templateStr) {
return []; return [[] as TemplateSpans, null] as const;
} }
try { try {
return Mustache.parse(templateStr); return [Mustache.parse(templateStr), null] as const;
} catch (e) { } catch (e) {
return null; if (!(e instanceof Error)) {
return [null, 'Parse error'] as const;
}
return [null, e.message] as const;
} }
} }