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 c60b1fb05fc4ce9929fe89f83d93f500c127e0e5 Author: Andriana Kovalyshyn <[email protected]> AuthorDate: Tue May 28 16:45:19 2019 +0300 [DLAB-642]: added endpoint creation form --- .../management/endpoints/endpoints.component.html | 10 ++++++++-- .../management/endpoints/endpoints.component.ts | 11 ++++++----- .../webapp/src/app/administration/management/index.ts | 5 ++++- .../app/administration/management/management.component.html | 5 ++++- .../src/app/administration/management/management.component.ts | 6 ++++++ 5 files changed, 28 insertions(+), 9 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 4d0cec0..774cea9 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 @@ -33,9 +33,15 @@ </div> </div> <div class="control-group"> - <label class="label">Description</label> + <label class="label">Endpoint url</label> <div class="control"> - <textarea formControlName="description" placeholder="Leave description"></textarea> + <input type="text" formControlName="url" placeholder="Enter endpoint url"> + </div> + </div> + <div class="control-group"> + <label class="label">Account</label> + <div class="control"> + <input type="text" formControlName="account" placeholder="Enter account"> </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 7e14965..23dbc36 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 @@ -27,7 +27,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; styleUrls: ['./endpoints.component.scss'] }) export class EndpointsComponent implements OnInit { - public createAMIForm: FormGroup; + public createEndpointForm: FormGroup; namePattern = '[-_a-zA-Z0-9]+'; constructor( @@ -37,17 +37,18 @@ export class EndpointsComponent implements OnInit { ) { } ngOnInit() { - + this.initFormModel(); } public assignChanges(data) { - console.log('Create', data); + console.log('Create', data); } private initFormModel(): void { - this.createAMIForm = this._fb.group({ + this.createEndpointForm = this._fb.group({ name: ['', Validators.required], - description: [''] + url: ['', Validators.required], + account: ['', Validators.required] }); } } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts index e3bbb00..f5146e4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts @@ -42,6 +42,7 @@ import { GroupNameValidationDirective } from './manage-roles-groups/group-name-v import { DirectivesModule } from '../../core/directives'; import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; +import { EndpointsComponent } from './endpoints/endpoints.component'; import { ManageRolesGroupsComponent, ConfirmDeleteUserAccountDialogComponent } from './manage-roles-groups/manage-roles-groups.component'; import { ProjectModule } from '../project'; @@ -74,7 +75,8 @@ export * from './management.component'; ConfirmActionDialogComponent, ConfirmDeleteUserAccountDialogComponent, SsnMonitorComponent, - ManageRolesGroupsComponent + ManageRolesGroupsComponent, + EndpointsComponent ], entryComponents: [ ConfirmationDialogComponent, @@ -82,6 +84,7 @@ export * from './management.component'; ConfirmDeleteUserAccountDialogComponent, BackupDilogComponent, SsnMonitorComponent, + EndpointsComponent, ManageEnvironmentComponent], exports: [ManagementComponent] }) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html index a3125ab..fb159c2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html @@ -19,7 +19,10 @@ <div class="sub-nav base-retreat"> <div *ngIf="healthStatus?.admin" class="admin-group"> - <button mat-raised-button class="butt ssn" (click)="openManageRolesDialog()"> + <button mat-raised-button class="butt ssn" (click)="showEndpointsDialog()"> + <i class="material-icons"></i>Endpoints + </button> + <button mat-raised-button class="butt ssn" (click)="openManageRolesDialog()"> <i class="material-icons"></i>Manage roles </button> <button mat-raised-button class="butt ssn" (click)="openSsnMonitorDialog()"> diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts index 4f4b189..09f4975 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts @@ -37,6 +37,7 @@ import { HTTP_STATUS_CODES } from '../../core/util'; import { BackupDilogComponent } from './backup-dilog/backup-dilog.component'; import { SsnMonitorComponent } from './ssn-monitor/ssn-monitor.component'; import { ManageEnvironmentComponent } from './manage-environment/manage-environment-dilog.component'; +import { EndpointsComponent } from './endpoints/endpoints.component'; @Component({ selector: 'environments-management', @@ -109,6 +110,11 @@ export class ManagementComponent implements OnInit, OnDestroy { .afterClosed().subscribe(() => this.buildGrid()); } + showEndpointsDialog() { + this.dialog.open(EndpointsComponent, { panelClass: 'modal-sm' }) + .afterClosed().subscribe(() => this.buildGrid()); + } + getActiveUsersList() { return this.healthStatusService.getActiveUsers(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
