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
The following commit(s) were added to refs/heads/feature/projects by this push:
new 763565f [DLAB-631]: added endpoint validation extention
763565f is described below
commit 763565fdffa3b153aa3c95a1dd87bd8cb2506fb6
Author: Andriana Kovalyshyn <[email protected]>
AuthorDate: Wed May 29 12:21:16 2019 +0300
[DLAB-631]: added endpoint validation extention
---
.../project/project-form/project-form.component.ts | 7 ++++---
.../install-libraries/install-libraries.component.ts | 11 ++---------
.../src/app/resources/scheduler/scheduler.component.html | 2 +-
.../src/app/resources/scheduler/scheduler.component.scss | 3 +++
.../webapp/src/app/shared/navbar/navbar.component.scss | 10 ++++++++--
5 files changed, 18 insertions(+), 15 deletions(-)
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 7d8ea68..9cdc780 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
@@ -31,6 +31,7 @@
styleUrls: ['./project-form.component.scss']
})
export class ProjectFormComponent implements OnInit {
+ namePattern = '[-_a-zA-Z0-9]+';
public projectForm: FormGroup;
public groupsList: any = [];
@@ -91,9 +92,9 @@ export class ProjectFormComponent implements OnInit {
private initFormModel(): void {
this.projectForm = this._fb.group({
- 'name': ['', Validators.required],
- 'endpoints': [[]],
- 'tag': ['', Validators.required],
+ 'name': ['', Validators.compose([Validators.required,
Validators.pattern(this.namePattern)])],
+ 'endpoints': [[], Validators.required],
+ 'tag': ['',Validators.compose([Validators.required,
Validators.pattern(this.namePattern)])],
'groups': [[], Validators.required]
});
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 8075eee..a41e691 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -18,18 +18,11 @@
*/
-import {debounceTime} from 'rxjs/operators';
-import { Component,
- OnInit,
- ViewChild,
- Output,
- EventEmitter,
- ViewEncapsulation,
- ChangeDetectorRef,
- Inject } from '@angular/core';
+import { Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectorRef,
Inject } from '@angular/core';
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { FormControl } from '@angular/forms';
import { ToastrService } from 'ngx-toastr';
+import { debounceTime } from 'rxjs/operators';
import { InstallLibrariesModel } from './install-libraries.model';
import { LibrariesInstallationService} from '../../../core/services';
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
index e3e7c6b..bedb7ac 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-<div modalClass="scheduler-dialog" id="dialog-box">
+<div class="scheduler-dialog" id="dialog-box">
<header class="dialog-header">
<h4 class="modal-title">Scheduler
<span *ngIf="destination">for
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss
index e698b24..87fa93e 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.scss
@@ -44,6 +44,7 @@
.enable-schedule {
display: flex;
margin-bottom: 10px;
+ justify-content: space-between;
.idle {
display: flex;
width: 50%;
@@ -171,6 +172,8 @@
.mat-button-toggle-standalone {
box-shadow: none;
margin: 2px;
+ border: none;
+ color: #607D8B;
&.mat-button-toggle-checked {
background-color: rgba(77, 184, 218, 0.62);
color: #ffffff;
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index 2f036fe..ac83142 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -134,7 +134,7 @@ a.nav-item {
outline: none;
i {
vertical-align: middle;
- padding-left: 12px;
+ padding-left: 8px;
}
&:not(.has-children):hover {
background: none !important;
@@ -161,7 +161,7 @@ a.nav-item {
transition: all .45s ease-in-out;
i {
vertical-align: middle;
- padding-left: 12px;
+ padding-left: 8px;
}
&:hover {
background: none !important;
@@ -228,3 +228,9 @@ a.nav-item {
-o-transform: translateY(-4px) translateX(6px) rotate(-45deg);
transform: translateY(-4px) translateX(6px) rotate(-45deg);
}
+
+mat-sidenav-content {
+ &.mat-drawer-content {
+ transition: all 0.35s ease-out;
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
