You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/08/29 11:42:18 UTC
[incubator-dlab] branch DLAB-981 updated: [DLAB-1005]: prevent
special characters on project name creation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-981
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-981 by this push:
new efb3f2f [DLAB-1005]: prevent special characters on project name creation
efb3f2f is described below
commit efb3f2f4d69a8961c79480c9b0986b8076b88571
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Aug 29 14:42:01 2019 +0300
[DLAB-1005]: prevent special characters on project name creation
---
.../administration/project/project-form/project-form.component.html | 4 +---
.../app/administration/project/project-form/project-form.component.ts | 4 ++--
.../src/main/resources/webapp/src/app/core/util/patterns.ts | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 004bd15..81c23f8 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -70,9 +70,7 @@
&& !projectForm?.controls.name.hasError('duplication')
&& !projectForm?.controls.name.hasError('limit')
&& projectForm?.controls.name.dirty">
- Project name can only
- contain letters, numbers, hyphens and '_' but can not end with special
- characters
+ Project name can only contain letters and numbers
</span>
<span class="error" *ngIf="projectForm?.controls.name.hasError('limit')">
Project name cannot be longer than {{ DICTIONARY.max_project_name_length}} characters
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index 091d946..5d38b00 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -128,9 +128,9 @@ export class ProjectFormComponent implements OnInit {
private initFormModel(): void {
this.projectForm = this._fb.group({
'key': ['', Validators.required],
- 'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern), this.checkDuplication.bind(this), this.providerMaxLength.bind(this)])],
+ 'name': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.projectName), this.checkDuplication.bind(this), this.providerMaxLength.bind(this)])],
'endpoints': [[], Validators.required],
- 'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.namePattern)])],
+ 'tag': ['', Validators.compose([Validators.required, Validators.pattern(PATTERNS.projectName)])],
'groups': [[], Validators.required]
});
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
index 0d54fef..2ea34be 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
@@ -19,7 +19,7 @@
export const PATTERNS = {
namePattern: '[-_a-zA-Z0-9]*[_-]*[a-zA-Z0-9]+',
- // noDoubleDush: '(([-_A-Za-z0-9])(?!\2))+',
+ projectName: '[a-zA-Z0-9]+',
delimitersRegex: '/[-_]?/g',
url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]+',
nodeCountPattern: '^[1-9]\\d*$',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org