From 96928d9817bd4a1dd2aa7f1896e8f315b52ff499 Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Mon, 18 Nov 2024 15:28:14 +0100 Subject: [PATCH 1/2] fix secret update --- .../api/src/Controller/Admin/WorkspaceSecretCrudController.php | 2 ++ databox/api/src/Entity/Integration/WorkspaceSecret.php | 3 +++ 2 files changed, 5 insertions(+) diff --git a/databox/api/src/Controller/Admin/WorkspaceSecretCrudController.php b/databox/api/src/Controller/Admin/WorkspaceSecretCrudController.php index 57b05136f..d15492fc4 100644 --- a/databox/api/src/Controller/Admin/WorkspaceSecretCrudController.php +++ b/databox/api/src/Controller/Admin/WorkspaceSecretCrudController.php @@ -47,5 +47,7 @@ public function configureFields(string $pageName): iterable ->onlyOnForms(); yield DateTimeField::new('createdAt') ->hideOnForm(); + yield DateTimeField::new('updatedAt') + ->hideOnForm(); } } diff --git a/databox/api/src/Entity/Integration/WorkspaceSecret.php b/databox/api/src/Entity/Integration/WorkspaceSecret.php index 6133b42af..7b6eba227 100644 --- a/databox/api/src/Entity/Integration/WorkspaceSecret.php +++ b/databox/api/src/Entity/Integration/WorkspaceSecret.php @@ -63,5 +63,8 @@ public function getPlainValue(): ?string public function setPlainValue(?string $plainValue): void { $this->plainValue = $plainValue; + if (null !== $plainValue) { + $this->setValue(null); // Make a change to this mapped field trigger Doctrine preUpdate event + } } } From 63f048ea204d5654a999e109db8787d7f358b8ab Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Mon, 18 Nov 2024 15:35:51 +0100 Subject: [PATCH 2/2] PS-731 add ghostscript for imagick pdf support --- databox/api/Dockerfile | 11 ++++++----- infra/docker/dev/Dockerfile | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/databox/api/Dockerfile b/databox/api/Dockerfile index e87b474d9..673b974b8 100644 --- a/databox/api/Dockerfile +++ b/databox/api/Dockerfile @@ -5,15 +5,16 @@ FROM ${REGISTRY_NAMESPACE}php-fpm-base:${BASE_TAG} AS api-php ENV IMAGICK_PHP83_FIX_COMMIT=28f27044e435a2b203e32675e942eb8de620ee58 RUN apk add --no-cache \ - perl \ - freetype \ imagemagick \ + ffmpeg \ + freetype \ + ghostscript \ + libheif \ libjpeg-turbo \ libpng \ - libwebp \ - libheif \ - ffmpeg \ libreoffice \ + libwebp \ + perl \ && apk add --no-cache --virtual build-essentials \ g++ \ make \ diff --git a/infra/docker/dev/Dockerfile b/infra/docker/dev/Dockerfile index 2d9f879f5..72b7a07ed 100644 --- a/infra/docker/dev/Dockerfile +++ b/infra/docker/dev/Dockerfile @@ -10,16 +10,17 @@ RUN apk add --no-cache \ mysql-dev \ postgresql-dev \ zlib \ - ffmpeg \ - libreoffice \ imagemagick \ rabbitmq-c-dev \ bash \ + ffmpeg \ freetype \ g++ \ gettext \ + ghostscript \ libjpeg-turbo \ libpng \ + libreoffice \ libwebp \ linux-headers \ make \