Move pdfjs on build and directly fetch file

OpenSlides · Sep 12, 2024 · ed4e1b1 · ed4e1b1
1 parent 088dffb
commit ed4e1b1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 59 deletions.
diff --git a/client/angular.json b/client/angular.json
@@ -39,6 +39,11 @@
                                 "glob": "**/*",
                                 "input": "node_modules/cm-chessboard/assets/",
                                 "output": "/chess/"
+                            },
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/pdfjs-dist/legacy/build/",
+                                "output": "/pdfjs/"
                             }
                         ],
                         "styles": ["src/styles.scss"],

diff --git a/client/ngsw-config.json b/client/ngsw-config.json
@@ -1,7 +1,6 @@
 {
     "$schema": "./node_modules/@angular/service-worker/config/schema.json",
     "index": "/index.html",
-    "version": 2,
     "assetGroups": [
         {
             "name": "app",

diff --git a/...ojector/modules/slides/components/mediafile-slide/components/mediafile-slide.component.ts b/...ojector/modules/slides/components/mediafile-slide/components/mediafile-slide.component.ts
@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { IMAGE_MIMETYPES, PDF_MIMETYPES } from 'src/app/site/pages/meetings/pages/mediafiles';
 
 import { BaseSlideComponent } from '../../../base/base-slide-component';
-import { SlideMediafileService } from '../../../services/slide-mediafile.service';
 import { MediafileSlideData } from '../mediafile-slide-data';
 
 @Component({
@@ -12,13 +11,7 @@ import { MediafileSlideData } from '../mediafile-slide-data';
 })
 export class MediafileSlideComponent extends BaseSlideComponent<MediafileSlideData> {
     public get url(): string {
-        if (this.projector && this.projector.id) {
-            const url = this.slideMediafileService.getMediafileSync(this.projector.id, this.data.data.id);
-
-            return url?.data || ``;
-        }
-
-        return ``;
+        return `/system/media/get/${this.data.data.id}`;
     }
 
     public get scroll(): number {
@@ -45,11 +38,8 @@ export class MediafileSlideComponent extends BaseSlideComponent<MediafileSlideDa
         return this.data.options[`fullscreen`] ?? true;
     }
 
-    public constructor(private slideMediafileService: SlideMediafileService) {
+    public constructor() {
         super();
-        (window as any).pdfWorkerSrc = new URL(
-            `pdfjs-dist/legacy/build/pdf.worker.min.mjs`,
-            import.meta.url
-        ).toString();
+        (window as any).pdfWorkerSrc = new URL(`pdfjs/pdf.worker.min.mjs`, import.meta.url).toString();
     }
 }
diff --git a/.../site/pages/meetings/modules/projector/modules/slides/services/slide-mediafile.service.ts b/.../site/pages/meetings/modules/projector/modules/slides/services/slide-mediafile.service.ts
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -16,6 +16,10 @@ http {
         index  index.html index.htm;
         include /etc/nginx/mime.types;
 
+        types {
+            application/javascript js mjs;
+        }
+
         client_max_body_size 100M;
 
         gzip on;