This is an automated email from the ASF dual-hosted git repository. hshpak pushed a commit to branch feat/DATALAB-2864/delete-one-image in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit eba548f9ee0f78c80f56098945b33fbd795c0ba2 Author: Hennadii_Shpak <[email protected]> AuthorDate: Fri Aug 26 18:07:19 2022 +0300 fixed notification status --- .../image-action-dialog/image-action-dialog.component.html | 7 +++++-- .../image-action-dialog/image-action-dialog.component.scss | 9 ++++++++- .../image-action-dialog/image-action-dialog.component.ts | 2 +- .../resources/webapp/src/app/resources/images/images.config.ts | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.html index 7a2615522..8711f5f51 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.html @@ -37,14 +37,17 @@ <div class="image-name ellipsis">{{imageName}}</div> <div class="status terminated">Terminated</div> </div> + <p *ngIf="data.image.sharingStatus !== 'PRIVATE'" class="shared-warning">!The image is shared with other users.</p> </div> <p class="question center"> Do you want proceed? </p> <div class="text-center m-top-30 m-bott-10"> <button type="button" class="butt mat-raised-button" (click)="dialogRef.close()">No</button> - <button type="button" class="butt butt-success mat-raised-button" - (click)="onYesClick(data.actionType)">Yes + <button + type="button" + class="butt butt-success mat-raised-button" + (click)="onYesClick(data.actionType)">Yes </button> </div> </section> diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.scss index ce4f8ce64..c29a0aaba 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.scss @@ -54,7 +54,7 @@ } .terminate-image-list__wrapper { - margin-bottom: 20px; + margin-bottom: 30px; border-bottom: 1px solid rgba(0,0,0,.08); } @@ -77,3 +77,10 @@ } } } + +.shared-warning { + margin-bottom: 30px; + color: red; + text-align: center; + font-weight: 400; +} diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.ts index b489d6295..83a436d59 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-action-dialog/image-action-dialog.component.ts @@ -73,7 +73,7 @@ export class ImageActionDialogComponent implements OnInit { this.dialogRef.close(); this.imagesService.shareImageAllUsers(imageInfo) .subscribe( - () => this.toastr.success(Toaster_Message.successShare, 'Success!') + () => this.toastr.success(Toaster_Message.successTerminate, 'Success!') ); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.config.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.config.ts index f69302a6c..5c15e2e42 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.config.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.config.ts @@ -50,7 +50,8 @@ export enum Localstorage_Key { } export enum Toaster_Message { - successShare = 'The image has been shared with all current Regular Users on the project!' + successShare = 'The image has been shared with all current Regular Users on the project!', + successTerminate = 'The image has been terminated' } export enum Placeholders { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
