This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f2737820882462a695aa1189ee8f0a33d3cc2e53 Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Tue May 28 17:39:09 2019 +0300 [DLAB-642]: added endpoint validation; general classes fixes --- .../administration/management/endpoints/endpoints.component.html | 9 +++++++++ .../administration/management/endpoints/endpoints.component.ts | 7 ++++--- .../src/main/resources/webapp/src/app/login/login.component.html | 2 +- .../computational-resource-create-dialog.component.html | 1 - services/self-service/src/main/resources/webapp/src/styles.scss | 7 +++++-- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html index 774cea9..c6c663b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html @@ -30,18 +30,27 @@ <label class="label">Name</label> <div class="control"> <input type="text" formControlName="name" placeholder="Enter endpoint name"> + <span class="error" *ngIf="!createEndpointForm?.controls.name.valid && createEndpointForm.controls.name.touched"> + Endpoint name can only contain letters, numbers, hyphens and '_' but can not end with special characters + </span> </div> </div> <div class="control-group"> <label class="label">Endpoint url</label> <div class="control"> <input type="text" formControlName="url" placeholder="Enter endpoint url"> + <span class="error" *ngIf="!createEndpointForm?.controls.url.valid && createEndpointForm.controls.url.touched"> + Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special characters + </span> </div> </div> <div class="control-group"> <label class="label">Account</label> <div class="control"> <input type="text" formControlName="account" placeholder="Enter account"> + <span class="error" *ngIf="!createEndpointForm?.controls.account.valid && createEndpointForm.controls.account.touched"> + Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special characters + </span> </div> </div> </form> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts index caad7c8..9ad5b97 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.ts @@ -39,6 +39,7 @@ export class EndpointsComponent implements OnInit { public createEndpointForm: FormGroup; namePattern = '[-_a-zA-Z0-9]+'; endpoints: Endpoint[] = []; + constructor( @Inject(MAT_DIALOG_DATA) public data: any, public toastr: ToastrService, @@ -61,9 +62,9 @@ export class EndpointsComponent implements OnInit { private initFormModel(): void { this.createEndpointForm = this._fb.group({ - name: ['', Validators.required], - url: ['', Validators.required], - account: ['', Validators.required] + name: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + url: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])], + account: ['', Validators.compose([Validators.required, Validators.pattern(this.namePattern)])] }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.component.html b/services/self-service/src/main/resources/webapp/src/app/login/login.component.html index c518b3f..f54a02c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/login/login.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/login/login.component.html @@ -34,7 +34,7 @@ <input type="password" class="input-with-icon" placeholder="Password" name="password" [(ngModel)]="model.password" #password="ngModel" required /> </div> - <div *ngIf="error" class="warning-alert"><span class="material-icons">priority_high</span>{{ error }}</div> + <div *ngIf="failed" class="warning-alert"><span class="material-icons">priority_high</span>{{ error }}</div> <div class="form-group" [ngClass]="{'flex': DICTIONARY.cloud_provider === 'azure'}"> <button mat-raised-button [disabled]="loading || !username.valid || !password.valid" (click)="login_btnClick();" diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html index 0ffd41c..bfe0b74 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html @@ -60,7 +60,6 @@ </div> </div> - </div> <div class="col"> <div class="control-group" *ngIf="model.selectedImage?.image"> diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss index 58269fa..c4ad580 100644 --- a/services/self-service/src/main/resources/webapp/src/styles.scss +++ b/services/self-service/src/main/resources/webapp/src/styles.scss @@ -119,11 +119,14 @@ mat-chip.mat-chip strong { .terminated, .terminating, -.failed, -.error { +.failed { color: #f1696e; } +.error { + color: #f1696e; + font-size: 12px; +} .not-allowed { cursor: not-allowed !important; user-select: none; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org