diff --git a/ogWebconsole/src/app/components/repositories/convert-image-to-virtual/convert-image-to-virtual.component.ts b/ogWebconsole/src/app/components/repositories/convert-image-to-virtual/convert-image-to-virtual.component.ts index f83c94b..a01c77f 100644 --- a/ogWebconsole/src/app/components/repositories/convert-image-to-virtual/convert-image-to-virtual.component.ts +++ b/ogWebconsole/src/app/components/repositories/convert-image-to-virtual/convert-image-to-virtual.component.ts @@ -48,6 +48,6 @@ export class ConvertImageToVirtualComponent implements OnInit { } close() { - this.dialogRef.close(true); + this.dialogRef.close(false); } } diff --git a/ogWebconsole/src/app/components/repositories/convert-image/convert-image.component.ts b/ogWebconsole/src/app/components/repositories/convert-image/convert-image.component.ts index 671bf9a..a5950f9 100644 --- a/ogWebconsole/src/app/components/repositories/convert-image/convert-image.component.ts +++ b/ogWebconsole/src/app/components/repositories/convert-image/convert-image.component.ts @@ -50,6 +50,6 @@ export class ConvertImageComponent implements OnInit{ } close() { - this.dialogRef.close(true); + this.dialogRef.close(false); } } diff --git a/ogWebconsole/src/app/components/repositories/edit-image/edit-image.component.ts b/ogWebconsole/src/app/components/repositories/edit-image/edit-image.component.ts index 9ed426c..f15c851 100644 --- a/ogWebconsole/src/app/components/repositories/edit-image/edit-image.component.ts +++ b/ogWebconsole/src/app/components/repositories/edit-image/edit-image.component.ts @@ -65,6 +65,6 @@ export class EditImageComponent implements OnInit{ } close() { - this.dialogRef.close(); + this.dialogRef.close(false); } } diff --git a/ogWebconsole/src/app/components/repositories/import-image/import-image.component.ts b/ogWebconsole/src/app/components/repositories/import-image/import-image.component.ts index 93e8bb8..589f2bb 100644 --- a/ogWebconsole/src/app/components/repositories/import-image/import-image.component.ts +++ b/ogWebconsole/src/app/components/repositories/import-image/import-image.component.ts @@ -49,6 +49,6 @@ export class ImportImageComponent implements OnInit { } close() { - this.dialogRef.close(true); + this.dialogRef.close(false); } } diff --git a/ogWebconsole/src/app/components/repositories/repositories.component.ts b/ogWebconsole/src/app/components/repositories/repositories.component.ts index 82b5338..d4803ea 100644 --- a/ogWebconsole/src/app/components/repositories/repositories.component.ts +++ b/ogWebconsole/src/app/components/repositories/repositories.component.ts @@ -84,8 +84,10 @@ export class RepositoriesComponent implements OnInit { width: '600px' }); - dialogRef.afterClosed().subscribe(() => { - this.search(); + dialogRef.afterClosed().subscribe((result) => { + if (result) { + this.search(); + } }); } @@ -108,7 +110,11 @@ export class RepositoriesComponent implements OnInit { this.dialog.open(ManageRepositoryComponent, { width: '600px', data: repository['@id'] - }).afterClosed().subscribe(() => this.search()); + }).afterClosed().subscribe((result) => { + if (result) { + this.search(); + } + }); } deleteRepository(event: MouseEvent,command: any): void { @@ -141,7 +147,9 @@ export class RepositoriesComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - this.search(); + if (result) { + this.search(); + } }); } @@ -155,7 +163,9 @@ export class RepositoriesComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - this.search(); + if (result) { + this.search(); + } }); } diff --git a/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.css b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.css index f0aeae0..05c97d3 100644 --- a/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.css +++ b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.css @@ -7,6 +7,11 @@ box-sizing: border-box; } +::ng-deep .mat-mdc-dialog-content { + height: 100% !important; + max-height: 100vh !important; +} + .header-container { display: flex; align-items: center; diff --git a/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts index 64e083c..8a6e185 100644 --- a/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts +++ b/ogWebconsole/src/app/components/repositories/show-monolitic-images/show-monolitic-images.component.ts @@ -144,7 +144,6 @@ export class ShowMonoliticImagesComponent implements OnInit { showImageInfo(event: MouseEvent, image:any) { event.stopPropagation(); - this.loading = true; this.loadImageAlert(image).subscribe( response => { this.alertMessage = response; @@ -193,7 +192,6 @@ export class ShowMonoliticImagesComponent implements OnInit { } toggleAction(image: any, action:string): void { - this.loading = true; switch (action) { case 'get-aux': this.http.post(`${this.baseUrl}/image-image-repositories/server/${image.uuid}/create-aux-files`, {}).subscribe({