Skip to content

Port: Fix pdf preview to future #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: future
Choose a base branch
from
Open

Port: Fix pdf preview to future #630

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 55 additions & 26 deletions src/Moryx.Media.Web/src/app/components/variant-overview/variant-overview.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, OnInit, signal, viewChild, ViewChild } from '@angular/core';
import { Component, OnDestroy, OnInit, signal, viewChild, ViewChild } from '@angular/core';
import { VariantDescriptor } from '../../api/models';
import { ContentDescriptorModel } from '../../api/models/content-descriptor-model';
import { HttpErrorResponse } from '@angular/common/http';
Expand Down Expand Up @@ -31,22 +31,22 @@ import { NgxDocViewerModule } from 'ngx-doc-viewer';
selector: 'app-variant-overview',
templateUrl: './variant-overview.component.html',
styleUrls: ['./variant-overview.component.scss'],
imports: [
MatSidenavModule,
MatToolbarModule,
MatIconModule,
RouterLink,
MatMenuModule,
MatListModule,
imports: [
MatSidenavModule,
MatToolbarModule,
MatIconModule,
RouterLink,
MatMenuModule,
MatListModule,
MatTooltip, MatButtonModule,
NgxDocViewerModule,
CommonModule,
TranslateModule,
NgxDocViewerModule,
CommonModule,
TranslateModule,
MatProgressSpinnerModule
]
})
export class VariantOverviewComponent implements OnInit {
mediaImage = signal(environment.assets + 'assets/media-toolbar.webp');
export class VariantOverviewComponent implements OnInit, OnDestroy {
mediaImage = signal(environment.assets + "assets/media-toolbar.webp");
content = signal<ContentDescriptorModel | undefined>(undefined);
selectedVariant = signal<VariantDescriptor | undefined>(undefined);
// 0: no picture loaded, 1: picture loading, 2: picture loaded
Expand All @@ -56,13 +56,14 @@ export class VariantOverviewComponent implements OnInit {
previews = signal<Map<string, string | ArrayBuffer | null>>( new Map());
bigPictureIsPdf = signal(false);
defaultPictureUrl = signal(environment.assets + 'assets/no_preview.jpg');

downloadPictureUrl: string | null | ArrayBuffer = '';
TranslationConstants = TranslationConstants;
menuTopLeftPosition = signal<{ x: string, y: string }>({ x: '0', y: '0' });
timeoutHandler: ReturnType<typeof setTimeout> | undefined;
trigger = viewChild.required(MatMenuTrigger);

private pdfObjectUrl?: string;
private previewObjectUrls = new Map<string, string>();

constructor(
public dialog: MatDialog,
Expand All @@ -89,6 +90,15 @@ export class VariantOverviewComponent implements OnInit {
}
}

ngOnDestroy(): void {
if (this.pdfObjectUrl) {
URL.revokeObjectURL(this.pdfObjectUrl);
this.pdfObjectUrl = undefined;
}
this.previewObjectUrls.forEach((u) => URL.revokeObjectURL(u));
this.previewObjectUrls.clear();
}

onContext(event: MouseEvent, variant: VariantDescriptor) {
event.preventDefault();
event.stopPropagation();
Expand All @@ -115,6 +125,9 @@ export class VariantOverviewComponent implements OnInit {
}

loadPreviews(): void {
this.previewObjectUrls.forEach((u) => URL.revokeObjectURL(u));
this.previewObjectUrls.clear();

const content = this.content();
if (
content !== undefined &&
Expand All @@ -138,13 +151,13 @@ export class VariantOverviewComponent implements OnInit {
.getPicture(variantName, contentId, true)
.subscribe((data) => {
if (data !== null) {
let downloadedFile = new Blob([data], { type: data.type });
const reader = new FileReader();
reader.readAsDataURL(downloadedFile);
reader.onload = (_event) => {
let url = reader.result;
this.setMapItem(variantName, url);
};
const blob = new Blob([data], { type: data.type });
const old = this.previewObjectUrls.get(variantName);
if (old) URL.revokeObjectURL(old);

const url = URL.createObjectURL(blob);
this.previewObjectUrls.set(variantName, url);
this.setMapItem(variantName, url);
}
});
} else {
Expand All @@ -160,6 +173,12 @@ export class VariantOverviewComponent implements OnInit {
}

onSelect(variant: VariantDescriptor) {
if (this.pdfObjectUrl) {
URL.revokeObjectURL(this.pdfObjectUrl);
this.pdfObjectUrl = undefined;
this.pdfUrl.update((_) => undefined);
}

if (this.selectedVariant()?.name !== variant.name) {
this.selectedVariant.update(_ => variant);
this.bigPictureLoadingState.update(_ => 1);
Expand Down Expand Up @@ -193,7 +212,11 @@ export class VariantOverviewComponent implements OnInit {
typeof variant.mimeType === 'string' &&
variant.mimeType.includes('application/pdf')
) {
this.pdfUrl.update(_ => this.downloadPictureUrl as string);
if (this.pdfObjectUrl) {
URL.revokeObjectURL(this.pdfObjectUrl);
}
this.pdfObjectUrl = URL.createObjectURL(bigPicture);
this.pdfUrl.update((_) => this.pdfObjectUrl);
} else {
this.bigPictureUrl.update(_ => this.defaultPictureUrl());
}
Expand Down Expand Up @@ -351,9 +374,15 @@ export class VariantOverviewComponent implements OnInit {
this.previews.update(map =>{
map.delete(selectedVariant.name!);
return map;
})
this.bigPictureUrl.update(_ => '');
this.bigPictureLoadingState.update(_ => 0);
});
this.bigPictureUrl.update((_) => "");
this.bigPictureLoadingState.update((_) => 0);

if (this.pdfObjectUrl) {
URL.revokeObjectURL(this.pdfObjectUrl);
this.pdfObjectUrl = undefined;
this.pdfUrl.update((_) => undefined);
}
}
});
}
Expand Down
Loading