Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-07 14:55:27 +02:00
Code Issues Releases Activity

fix(templates): update name validation [EE-5344] (#8760)

Browse source 
Co-authored-by: testa113 <testa113>
This commit is contained in:
Ali 2023-04-21 09:39:55 +12:00 • committed by GitHub
parent 1b470845b8
commit 861a9a5bbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/portainer/components/custom-template-common-fields/customTemplateCommonFields.html
View file

@ -21,7 +21,7 @@
<p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'"></pr-icon> Title is required. </p>
<p class="vertical-center" ng-message="pattern">
<pr-icon icon="'alert-triangle'" mode="'warning'"></pr-icon>
This field must consist of lower case alphanumeric characters, '_' or '-' (e.g. 'my-name', or 'abc-123').
{{ $ctrl.nameRegexError }}
</p>
</div>
</div>

1
app/portainer/components/custom-template-common-fields/index.js
View file

@ -8,5 +8,6 @@ angular.module('portainer.app').component('customTemplateCommonFields', {
showPlatformField: '<',
showTypeField: '<',
nameRegex: '<',
nameRegexError: '<',
},
});

1
app/portainer/views/custom-templates/create-custom-template-view/createCustomTemplateView.html
View file

@ -10,6 +10,7 @@
show-platform-field="true"
show-type-field="true"
name-regex="$ctrl.state.templateNameRegex"
name-regex-error="'This field must consist of lower-case alphanumeric characters, \'_\' or \'-\' (e.g. \'my-name\', or \'abc-123\').'"
></custom-template-common-fields>
<!-- build-method -->

8
app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
View file

@ -5,7 +5,13 @@
<rd-widget>
<rd-widget-body>
<form class="form-horizontal" name="customTemplateForm">
<custom-template-common-fields form-values="$ctrl.formValues" show-platform-field="true" show-type-field="true"></custom-template-common-fields>
<custom-template-common-fields
form-values="$ctrl.formValues"
show-platform-field="true"
show-type-field="true"
name-regex="$ctrl.state.templateNameRegex"
name-regex-error="'This field must consist of lower-case alphanumeric characters, \'_\' or \'-\' (e.g. \'my-name\', or \'abc-123\').'"
></custom-template-common-fields>
<git-form value="$ctrl.formValues" on-change="($ctrl.handleChange)" ng-if="$ctrl.formValues.GitConfig"></git-form>

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

@ -1,6 +1,7 @@
import _ from 'lodash';
import { getFilePreview } from '@/react/portainer/gitops/gitops.service';
import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
import { TEMPLATE_NAME_VALIDATION_REGEX } from '@/constants';
import { AccessControlFormData } from 'Portainer/components/accessControlForm/porAccessControlFormModel';
import { getTemplateVariables, intersectVariables } from '@/react/portainer/custom-templates/components/utils';
@ -26,6 +27,7 @@ class EditCustomTemplateViewController {
templateLoadFailed: false,
templatePreviewFailed: false,
templatePreviewError: '',
templateNameRegex: TEMPLATE_NAME_VALIDATION_REGEX,
};
this.templates = [];