Merge commit 'refs/pull/487/head' of github.com:alchemy-fr/phraseanet…

…-services into w2445
alchemy-fr · Nov 18, 2024 · 60f59a5 · 60f59a5
2 parents 96c29c0 + 63f048e
commit 60f59a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git 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/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
@@ -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
+        }
     }
 }
diff --git 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 \