Merge pull request #11548 from ChantsovaEkaterina/improvement/image-service-default-subtype

Image service: default image sub-type value added to requests

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

@@ -21,11 +21,15 @@ import { defaultHttpOptionsFromConfig, defaultHttpUploadOptions, RequestConfig }
 import { Observable, of, ReplaySubject } from 'rxjs';
 import { PageData } from '@shared/models/page/page-data';
 import {
-  NO_IMAGE_DATA_URI,
+  ImageExportData,
   ImageResourceInfo,
-  imageResourceType,
   ImageResourceType,
-  IMAGES_URL_PREFIX, isImageResourceUrl, ImageExportData, removeTbImagePrefix, ResourceSubType
+  imageResourceType,
+  IMAGES_URL_PREFIX,
+  isImageResourceUrl,
+  NO_IMAGE_DATA_URI,
+  removeTbImagePrefix,
+  ResourceSubType
 } from '@shared/models/resource.models';
 import { catchError, map, switchMap } from 'rxjs/operators';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
@@ -46,7 +50,8 @@ export class ImageService {
   ) {
   }
 
-  public uploadImage(file: File, title: string, imageSubType: ResourceSubType, config?: RequestConfig): Observable<ImageResourceInfo> {
+  public uploadImage(file: File, title: string, imageSubType: ResourceSubType = ResourceSubType.IMAGE,
+                     config?: RequestConfig): Observable<ImageResourceInfo> {
     if (!config) {
       config = {};
     }
@@ -82,8 +87,8 @@ export class ImageService {
       imageInfo, defaultHttpOptionsFromConfig(config));
   }
 
-  public getImages(pageLink: PageLink, imageSubType: ResourceSubType,
-                   includeSystemImages = false, config?: RequestConfig): Observable<PageData<ImageResourceInfo>> {
+  public getImages(pageLink: PageLink, includeSystemImages = false,
+                   imageSubType: ResourceSubType = ResourceSubType.IMAGE, config?: RequestConfig): Observable<PageData<ImageResourceInfo>> {
     return this.http.get<PageData<ImageResourceInfo>>(
       `${IMAGES_URL_PREFIX}${pageLink.toQuery()}&imageSubType=${imageSubType}&includeSystemImages=${includeSystemImages}`,
       defaultHttpOptionsFromConfig(config));

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',
         direction: Direction.DESC
       });
-      return this.imageService.getImages(pageLink, this.imageSubType, filter.includeSystemImages);
+      return this.imageService.getImages(pageLink, filter.includeSystemImages, this.imageSubType);
     };
   }
 

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>> {
-    return this.imageService.getImages(pageLink, imageSubType, includeSystemImages);
+    return this.imageService.getImages(pageLink, includeSystemImages, imageSubType);
   }
 
   isAllSelected(): Observable<boolean> {