mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[MNT-24098] fixes for pdf with HTTP (#9155)
* fixes for pdf with https * [ci:force] cleanup code * [ci:force] add missing types * reduce duplicated code
This commit is contained in:
@@ -186,7 +186,11 @@ export class NodesApiService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.createNodeInsideRoot(name || window.crypto.randomUUID(), nodeType, properties, path);
|
return this.createNodeInsideRoot(name || this.randomNodeName(), nodeType, properties, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private randomNodeName(): string {
|
||||||
|
return `node_${Date.now()}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -32,17 +32,18 @@ import {
|
|||||||
SimpleChanges
|
SimpleChanges
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { LogService } from '../../common/services/log.service';
|
|
||||||
import { RenderingQueueServices } from '../services/rendering-queue.services';
|
import { RenderingQueueServices } from '../services/rendering-queue.services';
|
||||||
import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog';
|
import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog';
|
||||||
import { AppConfigService } from '../../app-config/app-config.service';
|
import { AppConfigService } from '../../app-config/app-config.service';
|
||||||
import { PDFDocumentProxy } from 'pdfjs-dist';
|
import { PDFDocumentProxy, OnProgressParameters, PDFDocumentLoadingTask } from 'pdfjs-dist';
|
||||||
import { Subject } from 'rxjs';
|
import { Subject } from 'rxjs';
|
||||||
import { catchError, delay } from 'rxjs/operators';
|
import { catchError, delay } from 'rxjs/operators';
|
||||||
|
|
||||||
declare const pdfjsLib: any;
|
declare const pdfjsLib: any;
|
||||||
declare const pdfjsViewer: any;
|
declare const pdfjsViewer: any;
|
||||||
|
|
||||||
|
export type PdfScaleMode = 'init' | 'page-actual' | 'page-width' | 'page-height' | 'page-fit' | 'auto';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'adf-pdf-viewer',
|
selector: 'adf-pdf-viewer',
|
||||||
templateUrl: './pdf-viewer.component.html',
|
templateUrl: './pdf-viewer.component.html',
|
||||||
@@ -87,14 +88,14 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
|
|||||||
totalPages: number;
|
totalPages: number;
|
||||||
loadingPercent: number;
|
loadingPercent: number;
|
||||||
pdfViewer: any;
|
pdfViewer: any;
|
||||||
currentScaleMode: 'init' | 'page-actual' | 'page-width' | 'page-height' | 'page-fit' | 'auto' = 'init';
|
currentScaleMode: PdfScaleMode = 'init';
|
||||||
|
|
||||||
MAX_AUTO_SCALE: number = 1.25;
|
MAX_AUTO_SCALE: number = 1.25;
|
||||||
DEFAULT_SCALE_DELTA: number = 1.1;
|
DEFAULT_SCALE_DELTA: number = 1.1;
|
||||||
MIN_SCALE: number = 0.25;
|
MIN_SCALE: number = 0.25;
|
||||||
MAX_SCALE: number = 10.0;
|
MAX_SCALE: number = 10.0;
|
||||||
|
|
||||||
loadingTask: any;
|
loadingTask: PDFDocumentLoadingTask;
|
||||||
isPanelDisabled = true;
|
isPanelDisabled = true;
|
||||||
showThumbnails: boolean = false;
|
showThumbnails: boolean = false;
|
||||||
pdfThumbnailsContext: { viewer: any } = { viewer: null };
|
pdfThumbnailsContext: { viewer: any } = { viewer: null };
|
||||||
@@ -118,14 +119,14 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
|
|||||||
constructor(
|
constructor(
|
||||||
private dialog: MatDialog,
|
private dialog: MatDialog,
|
||||||
private renderingQueueServices: RenderingQueueServices,
|
private renderingQueueServices: RenderingQueueServices,
|
||||||
private logService: LogService,
|
|
||||||
private appConfigService: AppConfigService
|
private appConfigService: AppConfigService
|
||||||
) {
|
) {
|
||||||
// needed to preserve "this" context
|
// needed to preserve "this" context
|
||||||
this.onPageChange = this.onPageChange.bind(this);
|
this.onPageChange = this.onPageChange.bind(this);
|
||||||
this.onPagesLoaded = this.onPagesLoaded.bind(this);
|
this.onPagesLoaded = this.onPagesLoaded.bind(this);
|
||||||
this.onPageRendered = this.onPageRendered.bind(this);
|
this.onPageRendered = this.onPageRendered.bind(this);
|
||||||
this.randomPdfId = window.crypto.randomUUID();
|
|
||||||
|
this.randomPdfId = Date.now().toString();
|
||||||
this.pdfjsWorkerDestroy$
|
this.pdfjsWorkerDestroy$
|
||||||
.pipe(
|
.pipe(
|
||||||
catchError(() => null),
|
catchError(() => null),
|
||||||
@@ -200,14 +201,14 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
|
|||||||
this.onPdfPassword(callback, reason);
|
this.onPdfPassword(callback, reason);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.loadingTask.onProgress = (progressData) => {
|
this.loadingTask.onProgress = (progressData: OnProgressParameters) => {
|
||||||
const level = progressData.loaded / progressData.total;
|
const level = progressData.loaded / progressData.total;
|
||||||
this.loadingPercent = Math.round(level * 100);
|
this.loadingPercent = Math.round(level * 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
this.isPanelDisabled = true;
|
this.isPanelDisabled = true;
|
||||||
this.loadingTask.promise
|
this.loadingTask.promise
|
||||||
.then((pdfDocument: PDFDocumentProxy) => {
|
.then((pdfDocument) => {
|
||||||
this.totalPages = pdfDocument.numPages;
|
this.totalPages = pdfDocument.numPages;
|
||||||
this.page = 1;
|
this.page = 1;
|
||||||
this.displayPage = 1;
|
this.displayPage = 1;
|
||||||
@@ -276,10 +277,10 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
|
|||||||
*
|
*
|
||||||
* @param scaleMode - new scale mode
|
* @param scaleMode - new scale mode
|
||||||
*/
|
*/
|
||||||
scalePage(scaleMode) {
|
scalePage(scaleMode: PdfScaleMode) {
|
||||||
this.currentScaleMode = scaleMode;
|
this.currentScaleMode = scaleMode;
|
||||||
|
|
||||||
const viewerContainer = document.getElementById(`${this.randomPdfId}-viewer-main-container`);
|
const viewerContainer = this.getMainContainer();
|
||||||
const documentContainer = this.getDocumentContainer();
|
const documentContainer = this.getDocumentContainer();
|
||||||
|
|
||||||
if (this.pdfViewer && documentContainer) {
|
if (this.pdfViewer && documentContainer) {
|
||||||
@@ -303,32 +304,30 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
|
|||||||
let scale: number;
|
let scale: number;
|
||||||
switch (this.currentScaleMode) {
|
switch (this.currentScaleMode) {
|
||||||
case 'init':
|
case 'init':
|
||||||
|
case 'page-fit': {
|
||||||
scale = this.getUserScaling();
|
scale = this.getUserScaling();
|
||||||
if (!scale) {
|
if (!scale) {
|
||||||
scale = this.autoScaling(pageHeightScale, pageWidthScale);
|
scale = this.autoScaling(pageHeightScale, pageWidthScale);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'page-actual':
|
}
|
||||||
|
case 'page-actual': {
|
||||||
scale = 1;
|
scale = 1;
|
||||||
break;
|
break;
|
||||||
case 'page-width':
|
}
|
||||||
|
case 'page-width': {
|
||||||
scale = pageWidthScale;
|
scale = pageWidthScale;
|
||||||
break;
|
break;
|
||||||
case 'page-height':
|
}
|
||||||
|
case 'page-height': {
|
||||||
scale = pageHeightScale;
|
scale = pageHeightScale;
|
||||||
break;
|
break;
|
||||||
case 'page-fit':
|
|
||||||
scale = this.getUserScaling();
|
|
||||||
if (!scale) {
|
|
||||||
scale = this.autoScaling(pageHeightScale, pageWidthScale);
|
|
||||||
}
|
}
|
||||||
break;
|
case 'auto': {
|
||||||
case 'auto':
|
|
||||||
scale = this.autoScaling(pageHeightScale, pageWidthScale);
|
scale = this.autoScaling(pageHeightScale, pageWidthScale);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
this.logService.error(`pdfViewSetScale: '${scaleMode}' is an unknown zoom value.`);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -348,11 +347,15 @@ export class PdfViewerComponent implements OnChanges, OnDestroy {
|
|||||||
return this.checkPageFitInContainer(scale);
|
return this.checkPageFitInContainer(scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
private getDocumentContainer() {
|
private getMainContainer(): HTMLElement {
|
||||||
|
return document.getElementById(`${this.randomPdfId}-viewer-main-container`);
|
||||||
|
}
|
||||||
|
|
||||||
|
private getDocumentContainer(): HTMLElement {
|
||||||
return document.getElementById(`${this.randomPdfId}-viewer-pdf-viewer`);
|
return document.getElementById(`${this.randomPdfId}-viewer-pdf-viewer`);
|
||||||
}
|
}
|
||||||
|
|
||||||
private getViewer() {
|
private getViewer(): HTMLElement {
|
||||||
return document.getElementById(`${this.randomPdfId}-viewer-viewerPdf`);
|
return document.getElementById(`${this.randomPdfId}-viewer-viewerPdf`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user