Browse Source

UI: Image service - change parameters order to keep backward compatibility with older version

pull/11548/head
Chantsova Ekaterina 2 years ago
parent
commit
73ae4b3c66
  1. 4
      ui-ngx/src/app/core/http/image.service.ts
  2. 2
      ui-ngx/src/app/shared/components/image/image-gallery.component.ts
  3. 2
      ui-ngx/src/app/shared/components/image/images-datasource.ts

4
ui-ngx/src/app/core/http/image.service.ts

@ -87,8 +87,8 @@ export class ImageService {
imageInfo, defaultHttpOptionsFromConfig(config)); imageInfo, defaultHttpOptionsFromConfig(config));
} }
public getImages(pageLink: PageLink, imageSubType: ResourceSubType = ResourceSubType.IMAGE, public getImages(pageLink: PageLink, includeSystemImages = false,
includeSystemImages = false, config?: RequestConfig): Observable<PageData<ImageResourceInfo>> { imageSubType: ResourceSubType = ResourceSubType.IMAGE, config?: RequestConfig): Observable<PageData<ImageResourceInfo>> {
return this.http.get<PageData<ImageResourceInfo>>( return this.http.get<PageData<ImageResourceInfo>>(
`${IMAGES_URL_PREFIX}${pageLink.toQuery()}&imageSubType=${imageSubType}&includeSystemImages=${includeSystemImages}`, `${IMAGES_URL_PREFIX}${pageLink.toQuery()}&imageSubType=${imageSubType}&includeSystemImages=${includeSystemImages}`,
defaultHttpOptionsFromConfig(config)); defaultHttpOptionsFromConfig(config));

2
ui-ngx/src/app/shared/components/image/image-gallery.component.ts

@ -205,7 +205,7 @@ export class ImageGalleryComponent extends PageComponent implements OnInit, OnDe
property: 'createdTime', property: 'createdTime',
direction: Direction.DESC direction: Direction.DESC
}); });
return this.imageService.getImages(pageLink, this.imageSubType, filter.includeSystemImages); return this.imageService.getImages(pageLink, filter.includeSystemImages, this.imageSubType);
}; };
} }

2
ui-ngx/src/app/shared/components/image/images-datasource.ts

@ -84,7 +84,7 @@ export class ImagesDatasource implements DataSource<ImageResourceInfo> {
} }
fetchEntities(pageLink: PageLink, imageSubType: ResourceSubType, includeSystemImages = false): Observable<PageData<ImageResourceInfo>> { fetchEntities(pageLink: PageLink, imageSubType: ResourceSubType, includeSystemImages = false): Observable<PageData<ImageResourceInfo>> {
return this.imageService.getImages(pageLink, imageSubType, includeSystemImages); return this.imageService.getImages(pageLink, includeSystemImages, imageSubType);
} }
isAllSelected(): Observable<boolean> { isAllSelected(): Observable<boolean> {

Loading…
Cancel
Save