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 9422992 [DLAB-631]: replaced key uploading dialog component
9422992 is described below
commit 942299288cecf75e20f3d9bcaf5e88c03ad602f8
Author: Andriana Kovalyshyn <[email protected]>
AuthorDate: Thu May 30 16:07:14 2019 +0300
[DLAB-631]: replaced key uploading dialog component
---
.../management-grid/management-grid.component.html | 4 +--
.../shared/modal-dialog/key-upload-dialog/index.ts | 1 +
.../key-upload-dialog.component.html | 13 ++++----
.../key-upload-dialog.component.ts | 38 ++++++++--------------
.../src/app/shared/navbar/navbar.component.html | 4 +--
5 files changed, 25 insertions(+), 35 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 8694e96..4998f46 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -154,7 +154,7 @@
</tr>
</table>
</ng-template>
-
+<!--
<key-upload-dialog #keyReuploadDialog [primaryUploading]="false"
(checkInfrastructureCreationProgress)="buildGrid()"
(generateUserKey)="generateUserKey()">
-</key-upload-dialog>
\ No newline at end of file
+</key-upload-dialog> -->
\ No newline at end of file
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
index 58093d8..9d165c5 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
@@ -29,6 +29,7 @@ export * from './key-upload-dialog.component';
@NgModule({
imports: [CommonModule, ModalModule, MaterialModule],
declarations: [UploadKeyDialogComponent],
+ entryComponents: [UploadKeyDialogComponent],
exports: [UploadKeyDialogComponent]
})
export class UploadKeyDialogModule {}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
index 10eb2d6..ed41792 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
@@ -17,14 +17,14 @@
~ under the License.
-->
-<modal-dialog #bindDialog modalClass="modal-sm">
- <modal-header>
+<div id="dialog-box" class="modal-sm">
+ <header class="dialog-header">
<h4 class="modal-title">
<span *ngIf="primaryUploading">Create initial infrastructure</span>
<span *ngIf="!primaryUploading">Reupload key</span>
</h4>
- </modal-header>
- <modal-content>
+ </header>
+ <div class="dialog-content">
<div class="content-box">
<form (submit)="uploadUserAccessKey_btnClick($event)" novalidate>
<div class="row-wrap upload-key">
@@ -60,6 +60,5 @@
</div>
</form>
</div>
- </modal-content>
- <modal-footer></modal-footer>
-</modal-dialog>
+ </div>
+</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
index ba4f7a4..34ca908 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
@@ -17,8 +17,9 @@
* under the License.
*/
-import { Component, OnInit, EventEmitter, Input, Output, ViewChild } from
'@angular/core';
+import { Component, OnInit, EventEmitter, Input, Output, ViewChild, Inject }
from '@angular/core';
import { ToastrService } from 'ngx-toastr';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { KeyUploadDialogModel } from './key-upload.model';
import { UserAccessKeyService } from '../../../core/services';
@@ -33,12 +34,13 @@ export class UploadKeyDialogComponent implements OnInit {
model: KeyUploadDialogModel;
@Input() primaryUploading: boolean = true;
- @ViewChild('bindDialog') bindDialog;
@ViewChild('userAccessKeyUploadControl') userAccessKeyUploadControl;
@Output() checkInfrastructureCreationProgress: EventEmitter<{}> = new
EventEmitter();
@Output() generateUserKey: EventEmitter<{}> = new EventEmitter();
constructor(
+ @Inject(MAT_DIALOG_DATA) public data: any,
+ public dialogRef: MatDialogRef<UploadKeyDialogComponent>,
private userAccessKeyService: UserAccessKeyService,
public toastr: ToastrService
) {
@@ -46,7 +48,15 @@ export class UploadKeyDialogComponent implements OnInit {
}
ngOnInit() {
- this.bindDialog.onClosing = () => this.resetDialog();
+ this.model = new KeyUploadDialogModel(null,
+ response => {
+ if (response.status === HTTP_STATUS_CODES.OK) {
+ this.close();
+ this.checkInfrastructureCreationProgress.emit();
+ }
+ },
+ error => this.toastr.error(error.message, 'Oops!'),
+ this.userAccessKeyService);
}
public uploadUserAccessKey_onChange($event) {
@@ -66,27 +76,7 @@ export class UploadKeyDialogComponent implements OnInit {
return false;
}
- public open(params) {
- if (!this.bindDialog.isOpened) {
- this.model = new KeyUploadDialogModel(null,
- response => {
- if (response.status === HTTP_STATUS_CODES.OK) {
- this.close();
- this.checkInfrastructureCreationProgress.emit();
- }
- },
- error => this.toastr.error(error.message, 'Oops!'),
- this.userAccessKeyService);
- this.bindDialog.open(params);
- }
- }
-
public close() {
- if (this.bindDialog.isOpened)
- this.bindDialog.close();
- }
-
- private resetDialog(): void {
- this.userAccessKeyUploadControl.nativeElement.value = '';
+ this.dialogRef.close();
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 4bd0eaa..bb3c059 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -118,5 +118,5 @@
</mat-sidenav-content>
</mat-sidenav-container>
-<key-upload-dialog #keyUploadModal (generateUserKey)="generateUserKey($event)"
- (checkInfrastructureCreationProgress)="checkCreationProgress($event)"
[primaryUploading]="true"></key-upload-dialog>
+<!-- <key-upload-dialog #keyUploadModal
(generateUserKey)="generateUserKey($event)"
+ (checkInfrastructureCreationProgress)="checkCreationProgress($event)"
[primaryUploading]="true"></key-upload-dialog> -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
