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 729e9beb295dd39d4ac1b11a30e7ee0e65d6bb03 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Mon May 27 13:54:28 2019 +0300 [DLAB-631]: changed project model --- .../app/administration/project/project-data.service.ts | 9 ++------- .../project/project-form/project-form.component.html | 8 ++++---- .../project/project-form/project-form.component.ts | 18 +++++++++--------- .../app/administration/project/project-list/data.ts | 16 ---------------- .../app/administration/project/project.component.ts | 8 ++++---- 5 files changed, 19 insertions(+), 40 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts index 0cfb386..1df5a18 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts @@ -18,13 +18,11 @@ */ import { Injectable } from '@angular/core'; -import { of as observableOf, Observable, BehaviorSubject } from 'rxjs'; +import { BehaviorSubject } from 'rxjs'; import { ProjectService } from '../../core/services'; import { Project } from './project.component'; -import { data } from './project-list/data'; - @Injectable() export class ProjectDataService { @@ -43,10 +41,7 @@ export class ProjectDataService { } private getProjectsList() { - this._projects.next(data.projects); - - this.projectService.getProjectsList().subscribe( - (response: any) => this._projects.next(response)); + (response: Project[]) => this._projects.next(response)); } } \ No newline at end of file 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 94bccdb..cef71f2 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 @@ -28,20 +28,20 @@ <div class="control-group"> <label class="label">Project name</label> <div class="control"> - <input type="text" formControlName="project_name" placeholder="Enter project name" + <input type="text" formControlName="name" placeholder="Enter project name" (blur)="generateProjectTag($event)"> </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 }"> + <input type="text" formControlName="tag" placeholder="dlab-{ project name }"> </div> </div> <div class="control-group"> <div class="selector-wrapper"> <mat-form-field> - <mat-select multiple formControlName="endpoints_list" placeholder="Select endpoints"> + <mat-select multiple formControlName="endpoints" placeholder="Select endpoints"> <mat-option class="multiple-select" disabled> <a class="select ani" (click)="selectOptions(list, 'all')"> <i class="material-icons">playlist_add_check</i> All @@ -79,7 +79,7 @@ <div class="control-group"> <div class="selector-wrapper"> <mat-form-field> - <mat-select multiple formControlName="users_group" placeholder="Select user groups"> + <mat-select multiple formControlName="groups" placeholder="Select user groups"> <mat-option class="multiple-select" disabled> <a class="select ani" (click)="selectOptions(groupsList, 'users_group', 'all')"> <i class="material-icons">playlist_add_check</i> All 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 3cb5a9b..75d9fc7 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 @@ -71,7 +71,7 @@ export class ProjectFormComponent implements OnInit { public generateProjectTag($event) { let user_tag = `dlab-${ $event.target.value }`; - this.projectForm.controls.project_tag.setValue(user_tag.toLowerCase()); + this.projectForm.controls.tag.setValue(user_tag.toLowerCase()); } public selectOptions(list, key, select?) { @@ -81,20 +81,20 @@ export class ProjectFormComponent implements OnInit { private initFormModel(): void { this.projectForm = this._fb.group({ - 'project_name': ['', Validators.required], - 'endpoints_list': [[], Validators.required], - 'project_tag': ['', Validators.required], - 'users_group': [[], Validators.required] + 'name': ['', Validators.required], + 'endpoints': [[]], + 'tag': ['', Validators.required], + 'groups': [[], Validators.required] }); } public editSpecificProject(item: Project) { this.projectForm = this._fb.group({ - 'project_name': [item.project_name, Validators.required], - 'endpoints_list': [item.endpoints_list,Validators.required], - 'project_tag': [item.project_tag, Validators.required], - 'users_list': [item.users_list, Validators.required] + 'name': [item.name, Validators.required], + 'endpoints': [item.endpoints], + 'tag': [item.tag, Validators.required], + 'groups': [item.groups, Validators.required] }); } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts deleted file mode 100644 index bef6b72..0000000 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/data.ts +++ /dev/null @@ -1,16 +0,0 @@ -export const data = { - projects: [ - { - 'project_name': 'Test-project-1', - 'endpoint_name': 'test-endpoint', - 'project_tag': 'dlab-test-project-1', - 'users_list': ['[email protected]', '[email protected]'] - }, - { - 'project_name': 'Test-project-2', - 'endpoint_name': 'test-endpoint', - 'project_tag': 'dlab-test-project-1', - 'users_list': ['[email protected]', '[email protected]'] - } - ] -} \ No newline at end of file diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts index 2d31681..2158fdf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts @@ -25,10 +25,10 @@ import { ProjectDataService } from './project-data.service'; import { NotificationDialogComponent } from '../../shared/modal-dialog/notification-dialog'; export interface Project { - project_name: string; - endpoints_list: string[]; - project_tag: string; - users_list: string[]; + name: string; + endpoints: string[]; + tag: string; + groups: string[]; } @Component({ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
