dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Image service: default image sub-type value added to requests
This commit is contained in:
Igor Kulikov 2024-09-03 17:41:14 +03:00 committed by GitHub
commit 72fde5fb70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,11 +21,15 @@ import { defaultHttpOptionsFromConfig, defaultHttpUploadOptions, RequestConfig }
import { Observable, of, ReplaySubject } from 'rxjs'; import { Observable, of, ReplaySubject } from 'rxjs';
import { PageData } from '@shared/models/page/page-data'; import { PageData } from '@shared/models/page/page-data';
import { import {
NO_IMAGE_DATA_URI, ImageExportData,
ImageResourceInfo, ImageResourceInfo,
imageResourceType,
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'; } from '@shared/models/resource.models';
import { catchError, map, switchMap } from 'rxjs/operators'; import { catchError, map, switchMap } from 'rxjs/operators';
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; 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) { if (!config) {
config = {}; config = {};
} }
@ -82,8 +87,8 @@ export class ImageService {
imageInfo, defaultHttpOptionsFromConfig(config)); imageInfo, defaultHttpOptionsFromConfig(config));
} }
public getImages(pageLink: PageLink, imageSubType: ResourceSubType, 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
View File

@ -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
View File

@ -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> {