This is an automated email from the ASF dual-hosted git repository. hshpak pushed a commit to branch feat/DATALAB-2958/convey-image-name-in-confirmation-pop-up-for-sharing in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 325568b964a1d531b1f7aac25666a723b30f7d07 Author: Hennadii_Shpak <[email protected]> AuthorDate: Thu Aug 4 15:26:51 2022 +0300 fixed confirmation pop up for sharing --- .../image-detail-dialog/image-detail-dialog.component.ts | 4 ++-- .../share-image/share-image-dialog.component.html | 4 ++-- .../share-image/share-image-dialog.component.scss | 5 +++++ .../exploratory/share-image/share-image-dialog.component.ts | 12 ++++++++---- .../webapp/src/app/resources/images/images.model.ts | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-detail-dialog/image-detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-detail-dialog/image-detail-dialog.component.ts index 61c8ad117..4434932b3 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-detail-dialog/image-detail-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/image-detail-dialog/image-detail-dialog.component.ts @@ -19,7 +19,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material/dialog'; -import {LibraryInfoItem, Library, ModalData} from '../../images'; +import {LibraryInfoItem, Library, ShareModalData} from '../../images'; import {LibraryInfoModalComponent} from '../library-info-modal/library-info-modal.component'; import {caseInsensitiveSortUtil} from '../../../core/util'; @@ -38,7 +38,7 @@ export class ImageDetailDialogComponent implements OnInit { constructor( public dialogRef: MatDialogRef<ImageDetailDialogComponent>, - @Inject(MAT_DIALOG_DATA) public data: ModalData, + @Inject(MAT_DIALOG_DATA) public data: ShareModalData, private dialog: MatDialog, ) { } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html index a6f1d1e2a..c4fb6e340 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html @@ -19,12 +19,12 @@ <div id="dialog-box"> <header class="dialog-header"> - <h4 class="modal-title">Share Image: <span>{{imageName}}</span></h4> + <h4 class="modal-title">Share Image</h4> <button type="button" class="close" (click)="dialogRef.close()">×</button> </header> <section class="content"> <p class="description"> - The image will be shared with all current Regular Users on the project with all the data and code. + The image <span class="image-name">{{imageName}}</span> will be shared with all current Regular Users on the project with all the data and code. </p> <p class="question center"> Do you want proceed? diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.scss index 8f765c333..ab75348ab 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.scss @@ -37,4 +37,9 @@ color: #35afd5; font-size: 14px; text-align: center; + font-weight: 200; +} + +.image-name { + font-weight: 600; } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts index 9d0acbc09..1d855c941 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts @@ -17,10 +17,10 @@ * under the License. */ -import { Component, Inject } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ImagesService } from '../../images/images.service'; -import { ModalData, Toaster_Message } from '../../images'; +import { ShareModalData, Toaster_Message } from '../../images'; import { ToastrService } from 'ngx-toastr'; @Component({ @@ -28,16 +28,20 @@ import { ToastrService } from 'ngx-toastr'; templateUrl: './share-image-dialog.component.html', styleUrls: ['./share-image-dialog.component.scss'] }) -export class ShareImageDialogComponent { +export class ShareImageDialogComponent implements OnInit{ imageName!: string; constructor( public dialogRef: MatDialogRef<ShareImageDialogComponent>, - @Inject(MAT_DIALOG_DATA) public data: ModalData, + @Inject(MAT_DIALOG_DATA) public data: ShareModalData, private imagesService: ImagesService, private toastr: ToastrService, ) { } + ngOnInit() { + this.imageName = this.data.image.name; + } + onShare() { this.dialogRef.close(); this.imagesService.shareImageAllUsers(this.data.image) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.model.ts index e66b8db1a..e89098834 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.model.ts @@ -29,7 +29,7 @@ export interface ShareImageAllUsersParams { endpoint: string; } -export interface ModalData { +export interface ShareModalData { image: ImageModel; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
