From 53d13938ff31f987ab2e0f7295e11cbaab110b6f Mon Sep 17 00:00:00 2001
From: Aina Sitraka <35221835+aynsix@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:42:44 +0300
Subject: [PATCH 1/2] PHRAS-4090:Prod - expose-cli - publication - publication
 description is Nok (#4536)

* fix expose publication description

* fix submit twice on expose cli
---
 .../web/prod/WorkZone/ExposeEdit.html.twig    | 16 +++---
 .../web/prod/WorkZone/ExposeNew.html.twig     | 52 +++++++++++--------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/templates/web/prod/WorkZone/ExposeEdit.html.twig b/templates/web/prod/WorkZone/ExposeEdit.html.twig
index 5d5043fade..edb9388c28 100644
--- a/templates/web/prod/WorkZone/ExposeEdit.html.twig
+++ b/templates/web/prod/WorkZone/ExposeEdit.html.twig
@@ -28,22 +28,22 @@
             <form id="publication-data-form-edit" >
                 <div class="edit-publication-block">
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Name' | trans }}</label>
-                        <input type="text" value="{{ publication.title }}" name="title" class="publication-field"/>
+                        <label for="expose-edit-title">{{ 'prod:expose:publication:Name' | trans }}</label>
+                        <input id="expose-edit-title" type="text" value="{{ publication.title }}" name="title" class="publication-field"/>
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Slug' | trans }}</label>
+                        <label for="slug-field">{{ 'prod:expose:publication:Slug' | trans }}</label>
                         <input type="text" data-actual-slug="{{ publication.slug }}" value="{{ publication.slug }}" name="slug" class="publication-field" id="slug-field"/>
                         <input type="button" class="slug-availability" style="height: 31px;" value="{{ 'prod:expose:publication:check slug' | trans }}">
                         <img class="expose-slug-ok" src="/assets/common/images/icons/ok.png" style="height: 32px;display:none;" >
                         <img class="expose-slug-nok" src="/assets/common/images/icons/red-cross.png" style="height: 32px;display:none;">
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Description' | trans }}</label>
+                        <label for="description">{{ 'prod:expose:publication:Description' | trans }}</label>
                         <textarea class="publication-field description-field-edit" name="description" id="description" cols="250" rows="5" style="width: 530px;">{{ publication.description }}</textarea>
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
+                        <label for="publication_parent_edit">{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
                         <div id="publication-list-data" class="ui-widget publication_parent_wrapper" style="margin-top: 10px;margin-left: 2px;">
                             {% if publication.parent.id %}
                                 {% set parentId =  publication.parent.id %}
@@ -60,7 +60,7 @@
 
                     {% if publication.capabilities.operator %}
                         <div class="ui-widget profile-wrapper hide">
-                            <label>{{ 'prod:expose:publication:Profile' | trans }}</label>
+                            <label for="profile-field">{{ 'prod:expose:publication:Profile' | trans }}</label>
                             {% set nbProfile =  publication.profile|length %}
 
                             <select id="profile-field" name="profile" tabindex="-1" aria-hidden="true"
@@ -150,7 +150,7 @@
                 </div>
             </form>
 
-            <form name="publication-json" id="publication-json" class="text-center">
+            <form autofocus name="publication-json" id="publication-json" class="text-center">
                 <div id="advancedSettingBlock">
 {#                    <h4 class="toggleSetting">{{ 'prod:expose:publication:Advanced setting' | trans }}</h4>#}
                     <div id="advancedSettingInner" class="hidden">
@@ -397,9 +397,9 @@
                     success: function (data) {
                         if (data.success) {
                             publicationEdit.find("#pub-success").removeClass("hidden").html(data.message);
-                            document.getElementById("publication-data-form-edit").reset();
                             setTimeout(function(){
                                     $('#DIALOG-expose-edit').dialog('close');
+                                    publicationEdit.find("#pub-success").addClass("hidden");
                                 }
                                 , 2000
                             );
diff --git a/templates/web/prod/WorkZone/ExposeNew.html.twig b/templates/web/prod/WorkZone/ExposeNew.html.twig
index f28fb035a3..159f8229a8 100644
--- a/templates/web/prod/WorkZone/ExposeNew.html.twig
+++ b/templates/web/prod/WorkZone/ExposeNew.html.twig
@@ -4,22 +4,22 @@
             <form id="publication-data-form" >
                 <div class="edit-publication-block">
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Name' | trans }}</label>
-                        <input type="text" value="" name="title" class="publication-field"/>
+                        <label for="expose-add-title">{{ 'prod:expose:publication:Name' | trans }}</label>
+                        <input id="expose-add-title" type="text" value="" name="title" class="publication-field"/>
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Slug' | trans }}</label>
+                        <label for="new-slug-field">{{ 'prod:expose:publication:Slug' | trans }}</label>
                         <input type="text" value="" name="slug" class="publication-field" id="new-slug-field"/>
                         <input type="button" class="new-slug-availability" style="height: 31px;" value="{{ 'prod:expose:publication:check slug' | trans }}">
                         <img class="new-expose-slug-ok" src="/assets/common/images/icons/ok.png" style="height: 32px;display:none;" >
                         <img class="new-expose-slug-nok" src="/assets/common/images/icons/red-cross.png" style="height: 32px;display:none;">
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Description' | trans }}</label>
+                        <label for="description-new">{{ 'prod:expose:publication:Description' | trans }}</label>
                         <textarea name="description" class="publication-field description-field-new" id="description-new" cols="250" rows="5" style="width: 530px;"></textarea>
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
+                        <label for="publication_parent">{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
                         <div id="publication-list-data" class="ui-widget publication_parent_wrapper" style="margin-top: 10px;margin-left: 2px;">
                             <select id="publication_parent" name="parent">
                                 <option value="">{{ 'prod:expose:publication:Search a parent publication' | trans }}</option>
@@ -27,46 +27,50 @@
                         </div>
                     </div>
                     <div class="ui-widget profile-wrapper hide">
-                        <label>{{ 'prod:expose:publication:Profile' | trans }} </label>
+                        <label for="profile-field">{{ 'prod:expose:publication:Profile' | trans }} </label>
                         <select id="profile-field" name="profile" tabindex="-1" aria-hidden="true"
                                 class="publication-field">
                             <option value="">{{ 'prod:expose:publication:Select Profile' | trans }}</option>
                         </select>
                     </div>
                     <div class="ui-widget">
-                        <label>{{ 'prod:expose:publication:Enabled' | trans }}</label>
-                        <label class="switch">
+                        <label for="enabled_combobox">{{ 'prod:expose:publication:Enabled' | trans }}</label>
+                        <span class="switch">
                             <input id="enabled_combobox" type="checkbox" class="publication-field" name="enabled">
                             <span class="slider round"></span>
-                        </label>
+                        </span>
                     </div>
                     <div class="ui-widget available-wrapper">
                         <label>{{ 'prod:expose:publication:Available (leave blank for permanet publication)' | trans }}</label>
                         <div class="available-widget">
-                            <label>{{ 'prod:expose:publication:From' | trans }}</label>
-                            <input type="text" autocomplete="off" value="" name="beginsAt" class="new-use-datepicker publication-field"/>
+                            <label for="beginsAt">
+                                {{ 'prod:expose:publication:From' | trans }}
+                                <input type="text" autocomplete="off" value="" id="beginsAt" name="beginsAt" class="new-use-datepicker publication-field"/>
+                            </label>
                         </div>
                         <div class="available-widget">
-                            <label>{{ 'prod:expose:publication:To' | trans }} </label>
-                            <input type="text" autocomplete="off" value="" name="expiresAt" class="new-use-datepicker publication-field"/>
+                            <label for="expiresAt">
+                                {{ 'prod:expose:publication:To' | trans }}
+                                <input type="text" autocomplete="off" value="" id="expiresAt" name="expiresAt" class="new-use-datepicker publication-field"/>
+                            </label>
                         </div>
                     </div>
                     <div class="ui-widget">
                         <label>{{ 'prod:expose:publication:Publicly listing' | trans }}</label>
-                        <label class="switch">
+                        <label for="publication_publiclyListed" class="switch">
                             <input id="publication_publiclyListed" type="checkbox" class="publication-field" name="publiclyListed">
                             <span class="slider round"></span>
                         </label>
                     </div>
                     <div class="ui-widget access-wrapper available-wrapper">
-                        <label>{{ 'prod:expose:publication:Access rules' | trans }}</label>
+                        <label for="publication_securityMethod">{{ 'prod:expose:publication:Access rules' | trans }}</label>
                         <div class="available-widget">
-                        <select id="publication_securityMethod" name="securityMethod" tabindex="-1" aria-hidden="true"
-                                class="publication-field">
-                            <option value="">{{ 'prod:expose:publication:Open access' | trans }}</option>
-                            <option value="password">{{ 'prod:expose:publication:Password' | trans }}</option>
-                            <option value="authentication">{{ 'prod:expose:publication:Users' | trans }}</option>
-                        </select>
+                            <select id="publication_securityMethod" name="securityMethod" tabindex="-1" aria-hidden="true"
+                                    class="publication-field">
+                                <option value="">{{ 'prod:expose:publication:Open access' | trans }}</option>
+                                <option value="password">{{ 'prod:expose:publication:Password' | trans }}</option>
+                                <option value="authentication">{{ 'prod:expose:publication:Users' | trans }}</option>
+                            </select>
                         </div>
                         <div class="available-widget ui-widget securityOptions_wrapper visibility-hidden">
                             <input class="publication-field" type="text" name="password" placeholder="Password"
@@ -105,7 +109,7 @@
                 </div>
             </form>
 
-            <form name="publication-json" id="publication-json" class="text-center">
+            <form autofocus name="publication-json" id="publication-json" class="text-center">
                 <div id="advancedSettingBlock">
 {#                    <h4 class="toggleSetting">{{ 'prod:expose:publication:Advanced setting' | trans }}</h4>#}
                     <div id="advancedSettingInner" class="hidden">
@@ -394,9 +398,11 @@
                 success: function (data) {
                     if (data.success) {
                         $("#DIALOG-expose-add #pub-success").removeClass("hidden").html(data.message + ": " + data.link);
-                        document.getElementById("publication-data-form").reset();
+
                         setTimeout(function(){
+                                document.getElementById("publication-data-form").reset();
                                 $('#DIALOG-expose-add').dialog('close');
+                                $("#DIALOG-expose-add #pub-success").addClass("hidden");
                             }
                             , 2000
                         );

From 73ce7b6af0fde922d0f0bf7d7750a607380cf36f Mon Sep 17 00:00:00 2001
From: Gaspard Jacobson <52928254+gjacobjn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:41:51 +0200
Subject: [PATCH 2/2] Fix for phraseanet-saml-sp image build in Dockerfile
 (#4543)

* Fix for phraseanet-saml-sp image build in Dockerfile

* resolve 'as' case warn

PHRAS-4097 resolve 'as' case warn
---
 Dockerfile | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f6133a69fb..bf7a1ef828 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM alchemyfr/phraseanet-base:1.0.0 as builder
+FROM alchemyfr/phraseanet-base:1.0.0 AS builder
 
 COPY --from=composer:2.1.6 /usr/bin/composer /usr/bin/composer
 
@@ -72,7 +72,7 @@ CMD []
 # Phraseanet install and setup application image
 #########################################################################
 
-FROM alchemyfr/phraseanet-base:1.0.0 as phraseanet-setup
+FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-setup
 
 COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
 ADD ./docker/phraseanet/root /
@@ -85,7 +85,7 @@ CMD []
 # Phraseanet web application image
 #########################################################################
 
-FROM alchemyfr/phraseanet-base:1.0.0 as phraseanet-fpm
+FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-fpm
 
 COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
 ADD ./docker/phraseanet/root /
@@ -97,7 +97,7 @@ CMD ["php-fpm", "-F"]
 # Phraseanet worker application image
 #########################################################################
 
-FROM alchemyfr/phraseanet-base:1.0.0 as phraseanet-worker
+FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-worker
 
 COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
 ADD ./docker/phraseanet/root /
@@ -123,7 +123,7 @@ CMD ["/bin/bash", "bin/run-worker.sh"]
 # phraseanet-nginx
 #########################################################################
 
-FROM nginx:1.17.8-alpine as phraseanet-nginx
+FROM nginx:1.17.8-alpine AS phraseanet-nginx
 RUN adduser --uid 1000 --disabled-password app
 RUN apk add --update apache2-utils \
     && rm -rf /var/cache/apk/*
@@ -139,10 +139,8 @@ HEALTHCHECK CMD wget --spider http://127.0.0.1/login || nginx -s reload || exit
 # phraseanet adapted simplesaml service provider 
 #########################################################################
 
-FROM alchemyfr/phraseanet-base:1.0.0 as phraseanet-saml-sp
-RUN adduser --uid 1000 --disabled-password app
-RUN echo "deb http://archive.debian.org/debian stretch main non-free" > /etc/apt/sources.list \
-    && apt-get update \
+FROM alchemyfr/phraseanet-base:1.0.0 AS phraseanet-saml-sp
+RUN apt-get update \
     && apt-get install -y \
         apt-transport-https \
         ca-certificates \
@@ -159,15 +157,10 @@ RUN echo "deb http://archive.debian.org/debian stretch main non-free" > /etc/apt
         gettext \
         mcrypt \
         libldap2-dev \
-    && curl -Ls https://github.com/simplesamlphp/simplesamlphp/releases/download/simplesamlphp-1.10.0/simplesamlphp-1.10.0.tar.gz | tar xzvf - -C /var/www/ \
-    && docker-php-ext-install zip mbstring pdo_mysql gettext mcrypt \
-    && pecl install \
-        redis-5.3.7 \
-    && docker-php-ext-enable redis \
-    && pecl clear-cache \
-    && docker-php-source delete
+    && curl -Ls https://github.com/simplesamlphp/simplesamlphp/releases/download/simplesamlphp-1.10.0/simplesamlphp-1.10.0.tar.gz | tar xzvf - -C /var/www/
 ADD ./docker/phraseanet/saml-sp/root /
 ENTRYPOINT ["/bootstrap/entrypoint.sh"]
 CMD ["/bootstrap/bin/start-servers.sh"]
-HEALTHCHECK CMD wget --spider http://127.0.0.1/ || nginx -s reload || exit 
+HEALTHCHECK CMD wget --spider http://127.0.0.1/ || nginx -s reload || exit
+