From b08af3d9959068e2658f62c60ee753889f147044 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Tue, 21 Jan 2025 14:04:55 +0700
Subject: [PATCH] EQMS-1414 Fix pod print issues (#7739)
Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
dev/base-image/print.Dockerfile | 4 ++++
packages/presentation/src/components/PDFViewer.svelte | 2 +-
plugins/print-resources/package.json | 1 +
plugins/print-resources/src/components/PrintToPDF.svelte | 3 +++
services/print/pod-print/Dockerfile | 4 ++++
5 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dev/base-image/print.Dockerfile b/dev/base-image/print.Dockerfile
index d077652b13..95deef3851 100644
--- a/dev/base-image/print.Dockerfile
+++ b/dev/base-image/print.Dockerfile
@@ -1,5 +1,9 @@
FROM hardcoreeng/base
+# Chromium hangs when usging LD_PRELOAD and MALLOC_CONF
+ENV LD_PRELOAD=
+ENV MALLOC_CONF=
+
# We don't need the standalone Chromium
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
# Set executable path for puppeteer
diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte
index fcfe753c57..450ae4ae0b 100644
--- a/packages/presentation/src/components/PDFViewer.svelte
+++ b/packages/presentation/src/components/PDFViewer.svelte
@@ -103,7 +103,7 @@
{#await srcRef then src}
{#if !isLoading}
- {#if src === ''}
+ {#if src === '' || src === undefined}
<div class="centered">
<Label label={presentation.string.FailedToPreview} />
</div>
diff --git a/plugins/print-resources/package.json b/plugins/print-resources/package.json
index b126ffffbe..80d3f8af39 100644
--- a/plugins/print-resources/package.json
+++ b/plugins/print-resources/package.json
@@ -38,6 +38,7 @@
},
"dependencies": {
"svelte": "^4.2.19",
+ "@hcengineering/analytics": "^0.6.0",
"@hcengineering/platform": "^0.6.11",
"@hcengineering/core": "^0.6.32",
"@hcengineering/presentation": "^0.6.3",
diff --git a/plugins/print-resources/src/components/PrintToPDF.svelte b/plugins/print-resources/src/components/PrintToPDF.svelte
index 1fb710b552..ff4b331557 100644
--- a/plugins/print-resources/src/components/PrintToPDF.svelte
+++ b/plugins/print-resources/src/components/PrintToPDF.svelte
@@ -4,6 +4,7 @@
-->
<script lang="ts">
+ import { Analytics } from '@hcengineering/analytics'
import { Doc, type Blob, type Ref } from '@hcengineering/core'
import presentation, { PDFViewer, createQuery, getClient } from '@hcengineering/presentation'
import guest, { PublicLink, createPublicLink } from '@hcengineering/guest'
@@ -55,6 +56,7 @@
isLoading = false
},
(err) => {
+ Analytics.handleError(err)
console.error(err)
isLoading = false
}
@@ -65,6 +67,7 @@
}
},
(err) => {
+ Analytics.handleError(err)
console.error(err)
isLoading = false
}
diff --git a/services/print/pod-print/Dockerfile b/services/print/pod-print/Dockerfile
index 47adea67a1..716908ea3b 100644
--- a/services/print/pod-print/Dockerfile
+++ b/services/print/pod-print/Dockerfile
@@ -3,4 +3,8 @@ FROM hardcoreeng/print-base:v20250113a
WORKDIR /usr/src/app
COPY bundle/bundle.js ./
+# Chromium hangs when usging LD_PRELOAD and MALLOC_CONF
+ENV LD_PRELOAD=
+ENV MALLOC_CONF=
+
CMD [ "dumb-init", "node", "bundle.js" ]