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/05/24 13:56:51 UTC
[incubator-dlab] 01/04: project creation form fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 40b2ab9729254570d1504319a9ad25b54c3dd76f
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri May 24 16:52:26 2019 +0300
project creation form fixes
---
.../project-form/project-form.component.html | 72 ++++++++++------------
.../project-form/project-form.component.scss | 6 ++
.../project/project-form/project-form.component.ts | 6 +-
3 files changed, 45 insertions(+), 39 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 a579ace..098f41e 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
@@ -24,48 +24,44 @@
<section class="inner-step mat-reset">
<div class="form-block">
- <div class="control-group">
- <label class="label">Project name</label>
- <div class="control">
- <input type="text" formControlName="project_name" placeholder="Enter project name"
- (blur)="generateProjectTag($event)">
- </div>
- </div>
- <!-- <div class="control-group">
- <label class="label">Endpoint name</label>
- <div class="control">
- <input type="text" formControlName="endpoints_list" placeholder="Enter endpoint name">
+ <div>
+ <div class="control-group">
+ <label class="label">Project name</label>
+ <div class="control">
+ <input type="text" formControlName="project_name" placeholder="Enter project name"
+ (blur)="generateProjectTag($event)">
+ </div>
</div>
- </div> -->
- <div class="control-group">
- <div class="selector-wrapper">
- <mat-form-field>
- <mat-select multiple formControlName="endpoints_list" placeholder="Select endpoint name">
- <mat-option class="multiple-select" disabled>
- <a class="select ani" (click)="selectOptions(list, 'all')">
- <i class="material-icons">playlist_add_check</i> All
- </a>
- <a class="deselect ani" (click)="selectOptions(list)">
- <i class="material-icons">clear</i> None
- </a>
- </mat-option>
- <mat-option *ngFor="let group of endpointsList" [value]="group">
- {{ group }}
- </mat-option>
- </mat-select>
- <button class="caret">
- <i class="material-icons">keyboard_arrow_down</i>
- </button>
- </mat-form-field>
+ <div class="control-group">
+ <label class="label">Project tag</label>
+ <div class="control">
+ <input type="text" formControlName="project_tag" placeholder="dlab-{ project name }">
</div>
</div>
-
- <div class="control-group">
- <label class="label">Project tag</label>
- <div class="control">
- <input type="text" formControlName="project_tag" placeholder="dlab-{ project name }">
+ <div class="control-group">
+ <div class="selector-wrapper">
+ <mat-form-field>
+ <mat-select multiple formControlName="endpoints_list" placeholder="Select endpoint name">
+ <mat-option class="multiple-select" disabled>
+ <a class="select ani" (click)="selectOptions(list, 'all')">
+ <i class="material-icons">playlist_add_check</i> All
+ </a>
+ <a class="deselect ani" (click)="selectOptions(list)">
+ <i class="material-icons">clear</i> None
+ </a>
+ </mat-option>
+ <mat-option *ngFor="let group of endpointsList" [value]="group">
+ {{ group }}
+ </mat-option>
+ </mat-select>
+ <button class="caret">
+ <i class="material-icons">keyboard_arrow_down</i>
+ </button>
+ </mat-form-field>
+ </div>
</div>
</div>
+
<div class="text-center m-bott-10">
<button mat-raised-button type="button" class="butt" (click)="reset()">Clear</button>
<button mat-raised-button type="button" class="butt next" matStepperNext>Next<i
@@ -78,7 +74,7 @@
<mat-step>
<ng-template matStepLabel>Users</ng-template>
<div class="inner-step mat-reset">
- <div class="form-block">
+ <div class="form-block split">
<div class="control-group">
<div class="selector-wrapper">
<mat-form-field>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
index 8686a65..849c41c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
@@ -22,4 +22,10 @@
.next {
margin-left: 25px;
}
+ &.split {
+ flex-direction: column;
+ display: flex;
+ justify-content: space-between;
+ height: 210px;
+ }
}
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 f1f936f..583a634 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
@@ -17,7 +17,7 @@
* under the License.
*/
- import { Component, OnInit } from '@angular/core';
+ import { Component, OnInit, Input } from '@angular/core';
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ToastrService } from 'ngx-toastr';
@@ -35,6 +35,8 @@ export class ProjectFormComponent implements OnInit {
public groupsList: any = [];
public endpointsList: any = [];
+ @Input() item: any;
+
constructor(
public toastr: ToastrService,
private _fb: FormBuilder,
@@ -47,6 +49,8 @@ export class ProjectFormComponent implements OnInit {
this.initFormModel();
this.getGroupsData();
this.getEndpointsData();
+
+ this.item && this.editSpecificProject(this.item);
}
public createProject(data) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org