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

feat(k8s): better form validation for configuration keys (#4728) (#4733) 

Co-authored-by: Simon Meng <simon.meng@portainer.io>
pull/4868/head
cong meng 2021-02-27 13:53:47 +13:00 committed by GitHub
parent ccf6babc02
commit f2faccdb10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html
View File

@ -53,12 +53,17 @@
<div
class="col-sm-11 small text-warning"
style="margin-top: 5px;"
ng-show="kubernetesConfigurationDataCreationForm['configuration_data_key_' + index].$invalid || $ctrl.state.duplicateKeys[index] !== undefined"
ng-show="
kubernetesConfigurationDataCreationForm['configuration_data_key_' + index].$invalid || $ctrl.state.duplicateKeys[index] !== undefined || $ctrl.state.invalidKeys[index]
"
>
<ng-messages for="kubernetesConfigurationDataCreationForm['configuration_data_key_' + index].$error">
<p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
</ng-messages>
<p ng-if="$ctrl.state.duplicateKeys[index] !== undefined"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This key is already defined.</p>
<p ng-if="$ctrl.state.invalidKeys[index]"
><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This key is invalid. A valid key must consist of alphanumeric characters, '-', '_' or '.'</p
>
</div>
</div>

4
app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationDataController.js
View File

@ -25,7 +25,8 @@ class KubernetesConfigurationDataController {
}
this.state.duplicateKeys = KubernetesFormValidationHelper.getDuplicates(_.map(this.formValues.Data, (data) => data.Key));
this.isValid = Object.keys(this.state.duplicateKeys).length === 0;
this.state.invalidKeys = KubernetesFormValidationHelper.getInvalidKeys(_.map(this.formValues.Data, (data) => data.Key));
this.isValid = Object.keys(this.state.duplicateKeys).length === 0 && Object.keys(this.state.invalidKeys).length === 0;
}
addEntry() {
@ -94,6 +95,7 @@ class KubernetesConfigurationDataController {
$onInit() {
this.state = {
duplicateKeys: {},
invalidKeys: {},
};
}
}

11
app/kubernetes/helpers/formValidationHelper.js
View File

@ -1,6 +1,17 @@
import _ from 'lodash-es';
class KubernetesFormValidationHelper {
static getInvalidKeys(names) {
const res = {};
_.forEach(names, (name, index) => {
const valid = /^[-._a-zA-Z0-9]+$/.test(name);
if (!valid) {
res[index] = true;
}
});
return res;
}
static getDuplicates(names) {
const groupped = _.groupBy(names);
const res = {};