AAE-34641 apply PR remarks, rename function, create ViewerType

This commit is contained in:
Tomasz Nastaly 2025-05-12 14:48:56 +02:00
parent 80f1bc063e
commit f8001a9c68
No known key found for this signature in database
GPG Key ID: 173905A29EEF5CFD
2 changed files with 10 additions and 8 deletions

View File

@ -15,7 +15,7 @@
</div>
<div
[hidden]="viewerType === 'media' || viewerType === 'pdf' || viewerType === 'image' ? (isLoading || !isContentReady) : isLoading"
*ngIf="viewerType === 'media' || viewerType === 'pdf' || viewerType === 'image' ? (!isLoading && isContentReady) : !isLoading"
class="adf-viewer-render-main"
>
<div class="adf-viewer-render-layout-content adf-viewer__fullscreen-container">

View File

@ -29,6 +29,8 @@ import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component';
import { TxtViewerComponent } from '../txt-viewer/txt-viewer.component';
import { UnknownFormatComponent } from '../unknown-format/unknown-format.component';
type ViewerType = 'media' | 'image' | 'pdf' | 'unknown';
@Component({
selector: 'adf-viewer-render',
standalone: true,
@ -141,7 +143,7 @@ export class ViewerRenderComponent implements OnChanges, OnInit {
extensionsSupportedByTemplates: string[] = [];
extension: string;
internalFileName: string;
viewerType: string = 'unknown';
viewerType: ViewerType = 'unknown';
isContentReady = false;
/**
@ -185,25 +187,25 @@ export class ViewerRenderComponent implements OnChanges, OnInit {
}
ngOnChanges() {
this.checkIsLoaded();
this.updateLoadingState();
if (this.blobFile) {
this.setUpBlobData();
this.checkIsLoaded();
} else if (this.urlFile) {
this.setUpUrlFile();
this.checkIsLoaded();
}
this.updateLoadingState();
}
private checkIsLoaded() {
private updateLoadingState() {
this.isContentReady = !(this.viewerType === 'media' || this.viewerType === 'pdf' || this.viewerType === 'image');
this.isLoading = !this.blobFile && !this.urlFile;
}
private setUpBlobData() {
this.internalFileName = this.fileName;
this.viewerType = this.viewUtilService.getViewerTypeByMimeType(this.blobFile.type);
this.viewerType = this.viewUtilService.getViewerTypeByMimeType(this.blobFile.type) as ViewerType;
this.extensionChange.emit(this.blobFile.type);
this.scrollTop();
@ -212,7 +214,7 @@ export class ViewerRenderComponent implements OnChanges, OnInit {
private setUpUrlFile() {
this.internalFileName = this.fileName ? this.fileName : this.viewUtilService.getFilenameFromUrl(this.urlFile);
this.extension = this.viewUtilService.getFileExtension(this.internalFileName);
this.viewerType = this.viewUtilService.getViewerType(this.extension, this.mimeType, this.extensionsSupportedByTemplates);
this.viewerType = this.viewUtilService.getViewerType(this.extension, this.mimeType, this.extensionsSupportedByTemplates) as ViewerType;
this.extensionChange.emit(this.extension);
this.scrollTop();