This is an automated email from the ASF dual-hosted git repository. hshpak pushed a commit to branch fix/circular-dependency in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 46f3949e76d378874ac5c3a77332af7150a3c9eb Author: Hennadii_Shpak <[email protected]> AuthorDate: Mon Sep 5 10:17:13 2022 +0300 fixed warning, circular dependency --- .../webapp/src/app/core/services/image-page-resolve.guard.ts | 6 +++--- .../webapp/src/app/resources/images/images.component.scss | 2 +- .../webapp/src/app/resources/images/images.component.ts | 3 ++- .../webapp/src/app/resources/images/images.service.ts | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/image-page-resolve.guard.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/image-page-resolve.guard.ts index cadeeb7cb..bf643e851 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/image-page-resolve.guard.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/image-page-resolve.guard.ts @@ -2,9 +2,9 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router'; import { Observable, of } from 'rxjs'; -import { ImagesService } from '../../resources/images/images.service'; import { ProjectImagesInfo } from '../../resources/images'; import { switchMap, take } from 'rxjs/operators'; +import { UserImagesPageService } from './user-images-page.service'; @Injectable({ providedIn: 'root' @@ -12,11 +12,11 @@ import { switchMap, take } from 'rxjs/operators'; export class ImagePageResolveGuard implements Resolve<ProjectImagesInfo> { constructor( private router: Router, - private imagesService: ImagesService + private userImagesPageService: UserImagesPageService ) {} resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<ProjectImagesInfo> { - return this.imagesService.getImagePageInfo().pipe( + return this.userImagesPageService.getFilterImagePage().pipe( switchMap((imagePageData: ProjectImagesInfo) => of(imagePageData)), take(1) ); diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss index 84d758538..a0587b7b2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss @@ -90,7 +90,7 @@ .action-button__share { display: flex; - align-items: start; + align-items: flex-start; width: 100%; padding: 10px 15px; background-color: transparent; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts index 0fcd3c225..a27af583a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts @@ -259,7 +259,8 @@ export class ImagesComponent implements OnInit, OnDestroy { private getUserImagePageInfo(): void { this.route.data.pipe( map(data => data['projectList']), - tap(({projectImagesInfos}) => this.getProjectList(projectImagesInfos)) + tap((response) => this.imagesService.initImagePageInfo(response)), + tap(({projectImagesInfos}) => this.getProjectList(projectImagesInfos)), ).subscribe(); } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts index 95667ecdc..b58d610d4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts @@ -203,11 +203,7 @@ export class ImagesService { return callbackList[actionType]; } - private isImageShared(image: ImageModel): boolean { - return image.sharingStatus !== SharedStatus.private; - } - - private initImagePageInfo(imagePageInfo: ProjectImagesInfo): void { + initImagePageInfo(imagePageInfo: ProjectImagesInfo): void { this.getImagePageData(imagePageInfo.projectImagesInfos); this.getDropdownDataList(imagePageInfo.filterData); this.setFilterFormValue(imagePageInfo.imageFilter); @@ -215,6 +211,10 @@ export class ImagesService { this.checkIsPageFiltered(); } + private isImageShared(image: ImageModel): boolean { + return image.sharingStatus !== SharedStatus.private; + } + private checkColumnState(acc: FilteredColumnList, fieldItem: FilterFormItemType): FilteredColumnList { const [ fieldName, fieldValue ] = fieldItem; let isColumnFiltered: boolean; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
