Merge branch 'master' into PHRAS-2815_generate-cterms-multi-db_4.1

Dockerfile

@@ -86,6 +86,18 @@ COPY grammar /var/alchemy/grammar
 COPY templates-profiler /var/alchemy/templates-profiler
 COPY templates /var/alchemy/templates
 COPY tests /var/alchemy/tests
+RUN mkdir -p /var/alchemy/Phraseanet/logs \
+    && chmod -R 777 /var/alchemy/Phraseanet/logs \
+    && mkdir -p /var/alchemy/Phraseanet/cache \
+    && chmod -R 777 /var/alchemy/Phraseanet/cache \
+    && mkdir -p /var/alchemy/Phraseanet/datas \
+    && chmod -R 777 /var/alchemy/Phraseanet/datas \
+    && mkdir -p /var/alchemy/Phraseanet/tmp \
+    && chmod -R 777 /var/alchemy/Phraseanet/tmp \
+    && mkdir -p /var/alchemy/Phraseanet/www/custom \
+    && chmod -R 777 /var/alchemy/Phraseanet/www/custom \
+    && mkdir -p /var/alchemy/Phraseanet/config \
+    && chmod -R 777 /var/alchemy/Phraseanet/config
 
 # Phraseanet
 FROM php:7.0-fpm-stretch as phraseanet-fpm
@@ -129,6 +141,23 @@ RUN apt-get update \
     && docker-php-source delete \
     && rm -rf /var/lib/apt/lists/*
 
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+    && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
+    && php -r "unlink('composer-setup.php');"
+
+# Node Installation (node + yarn)
+# Reference :
+# https://linuxize.com/post/how-to-install-node-js-on-ubuntu-18.04/
+# https://yarnpkg.com/lang/en/docs/install/#debian-stable
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+    && apt install -y nodejs \
+    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update && apt-get install -y --no-install-recommends yarn \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/
+
 RUN mkdir /entrypoint /var/alchemy \
     && useradd -u 1000 app \
     && mkdir -p /home/app/.composer \
@@ -136,18 +165,6 @@ RUN mkdir /entrypoint /var/alchemy \
 
 COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet
 ADD ./docker/phraseanet/ /
-RUN mkdir -p /var/alchemy/Phraseanet/logs \
-    && chmod -R 777 /var/alchemy/Phraseanet/logs \
-    && mkdir -p /var/alchemy/Phraseanet/cache \
-    && chmod -R 777 /var/alchemy/Phraseanet/cache \
-    && mkdir -p /var/alchemy/Phraseanet/datas \
-    && chmod -R 777 /var/alchemy/Phraseanet/datas \
-    && mkdir -p /var/alchemy/Phraseanet/tmp \
-    && chmod -R 777 /var/alchemy/Phraseanet/tmp \
-    && mkdir -p /var/alchemy/Phraseanet/www/custom \
-    && chmod -R 777 /var/alchemy/Phraseanet/www/custom \
-    && mkdir -p /var/alchemy/Phraseanet/config \
-    && chmod -R 777 /var/alchemy/Phraseanet/config
 WORKDIR /var/alchemy/Phraseanet
 ENTRYPOINT ["/phraseanet-entrypoint.sh"]
 CMD ["/boot.sh"]

README.md

@@ -63,14 +63,12 @@ The docker distribution come with 3 differents containers :
 
 ## How to build
 
-The three images can be built respectively with these commands :
+You can build all the images with the following command at the root directory :
 
-    # nginx server
-    docker build --target phraseanet-nginx -t local/phraseanet-nginx .
+    ./build <TAG>
 
-    # php-fpm application
-    docker build --target phraseanet-fpm -t local/phraseanet-fpm .
-
-    # worker
-    docker build --target phraseanet-worker -t local/phraseanet-worker .
+It will build and tag the following images :
 
+    local/phraseanet-worker:<TAG>
+    local/phraseanet-fpm:<TAG>
+    local/phraseanet-nginx:<TAG>

build.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# nginx server
+docker build --target phraseanet-nginx -t local/phraseanet-nginx:$1 .
+
+# php-fpm application
+docker build --target phraseanet-fpm -t local/phraseanet-fpm:$1 .
+
+# worker
+docker build --target phraseanet-worker -t local/phraseanet-worker:$1 .
+

docker/nginx/boot.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
 
-cat nginx.conf.sample | sed "s/\$MAX_BODY_SIZE/$MAX_BODY_SIZE/g" > /etc/nginx/nginx.conf
+set -xe
+
+cat nginx.conf.sample | sed "s/\$MAX_BODY_SIZE/$MAX_BODY_SIZE/g" > /etc/nginx/conf.d/default.conf
 nginx -g "daemon off;"

docker/nginx/etc/nginx/nginx.conf

@@ -0,0 +1,31 @@
+
+user  app;
+worker_processes  1;
+
+error_log  /var/log/ngnix_error.log info;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+
+}

docker/nginx/nginx.conf.sample

@@ -1,54 +1,9 @@
-user  app;
-worker_processes  auto;
-
-#error_log  /var/log/ngnix_error.log info;
-error_log /dev/stdout info;
-
-pid        /var/run/nginx.pid;
-#daemon off;
-
-events {
-    worker_connections  1024;
-    multi_accept on;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    server_tokens off;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /dev/stdout main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    reset_timedout_connection on;
-
-    proxy_connect_timeout  300s;
-    proxy_send_timeout  300s;
-    proxy_read_timeout  300s;
-    fastcgi_send_timeout 300s;
-    fastcgi_read_timeout 300;
-
-    resolver 127.0.0.11;
-
 upstream backend {
     server phraseanet:9000;
 }
 
 server {
     listen       80;
-        server_name  localhost;
-        error_log    on;
-        access_log   on;
     root         /var/alchemy/Phraseanet/www;
 
     index        index.php;
@@ -82,4 +37,3 @@ http {
         fastcgi_pass backend;
     }
 }
-}

docker/phraseanet/boot.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+set -xe
+
+chown -R app:app /var/alchemy/Phraseanet/config
+chown -R app:app /var/alchemy/Phraseanet/datas
+chown -R app:app /var/alchemy/Phraseanet/tmp
+chown -R app:app /var/alchemy/Phraseanet/www/thumbnails
 FILE=/var/alchemy/Phraseanet/config/configuration.yml
 if [ -f "$FILE" ]; then
     echo "$FILE exist, skip setup."

docker/phraseanet/phraseanet-entrypoint.sh

@@ -5,4 +5,4 @@ set -e
 envsubst < /php.ini.sample > /usr/local/etc/php/php.ini
 envsubst < /php-fpm.conf.sample > /usr/local/etc/php-fpm.conf
 
-docker-php-entrypoint $@
+bash -e docker-php-entrypoint $@

docker/phraseanet/worker-boot.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 
+mkdir /var/alchemy/Phraseanet/tmp/locks && chown -R app:app /var/alchemy/Phraseanet/tmp
 runuser app -c 'php /var/alchemy/Phraseanet/bin/console task-manager:scheduler:run'

lib/Alchemy/Phrasea/Controller/Admin/FieldsController.php

@@ -316,6 +316,7 @@ class FieldsController extends Controller
             ->set_tbranch($data['tbranch'])
             ->set_generate_cterms($data['generate_cterms'])
             ->set_gui_editable($data['gui_editable'])
+            ->set_gui_visible($data['gui_visible'])
             ->set_report($data['report'])
             ->setVocabularyControl(null)
             ->setVocabularyRestricted(false);
@@ -351,7 +352,7 @@ class FieldsController extends Controller
     {
         return [
             'name', 'multi', 'thumbtitle', 'tag', 'business', 'indexable', 'aggregable',
-            'required', 'separator', 'readonly', 'gui_editable', 'type', 'tbranch', 'generate_cterms', 'report',
+            'required', 'separator', 'readonly', 'gui_editable', 'gui_visible' , 'type', 'tbranch', 'generate_cterms', 'report',
             'vocabulary-type', 'vocabulary-restricted', 'dces-element', 'labels'
         ];
     }

lib/Alchemy/Phrasea/Controller/Api/V1Controller.php

@@ -596,6 +596,7 @@ class V1Controller extends Controller
                 'thesaurus_branch' => $databox_field->get_tbranch(),
                 'generate_cterms'  => $databox_field->get_generate_cterms(),
                 'gui_editable'     => $databox_field->get_gui_editable(),
+                'gui_visible'      => $databox_field->get_gui_visible(),
                 'type'             => $databox_field->get_type(),
                 'indexable'        => $databox_field->is_indexable(),
                 'multivalue'       => $databox_field->is_multi(),

lib/Alchemy/Phrasea/Controller/Prod/EditController.php

@@ -77,6 +77,7 @@ class EditController extends Controller
                     'tbranch'              => $meta->get_tbranch(),
                     'generate_cterms'       => $meta->get_generate_cterms(),
                     'gui_editable'         => $meta->get_gui_editable(),
+                    'gui_visible'         => $meta->get_gui_visible(),
                     'maxLength'            => $meta->get_tag()
                         ->getMaxLength(),
                     'minLength'            => $meta->get_tag()

lib/Alchemy/Phrasea/Core/Version.php

@@ -16,7 +16,7 @@ class Version
     /**
      * @var string
      */
-    private $number = '4.1.0-alpha.17a';
+    private $number = '4.1.0-alpha.18a';
 
     /**
      * @var string

lib/Alchemy/Phrasea/Databox/Field/DbalDataboxFieldRepository.php

@@ -38,6 +38,7 @@ final class DbalDataboxFieldRepository implements DataboxFieldRepository
         'label_nl',
         'generate_cterms',
         'gui_editable',
+        'gui_visible',
     ];
 
     /** @var DataboxFieldFactory */

lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php

@@ -48,6 +48,7 @@ class PhraseanetExtension extends \Twig_Extension
             new \Twig_SimpleFunction('border_checker_from_fqcn', array($this, 'getCheckerFromFQCN')),
             new \Twig_SimpleFunction('caption_field', array($this, 'getCaptionField')),
             new \Twig_SimpleFunction('caption_field_label', array($this, 'getCaptionFieldLabel')),
+            new \Twig_SimpleFunction('caption_field_gui_visible', array($this, 'getCaptionFieldGuiVisible')),
             new \Twig_SimpleFunction('caption_field_order', array($this, 'getCaptionFieldOrder')),
 
             new \Twig_SimpleFunction('flag_slugify', array(Flag::class, 'normalizeName')),
@@ -77,6 +78,29 @@ class PhraseanetExtension extends \Twig_Extension
         return '';
     }
 
+    /**
+     * get localized field's gui_visible
+     * @param RecordInterface $record
+     * @param $fieldName
+     * @return string - the name gui_visible
+     */
+    public function getCaptionFieldGuiVisible(RecordInterface $record, $fieldName)
+    {
+        if ($record) {
+            /** @var \appbox $appbox */
+            $appbox = $this->app['phraseanet.appbox'];
+            $databox = $appbox->get_databox($record->getDataboxId());
+            foreach ($databox->get_meta_structure() as $meta) {
+                /** @var \databox_field $meta */
+                if ($meta->get_name() === $fieldName) {
+                    return $meta->get_gui_visible($this->app['locale']);
+                }
+            }
+        }
+
+        return '';
+    }
+
     public function getCaptionField(RecordInterface $record, $field, $value)
     {
         if ($record instanceof ElasticsearchRecord) {

lib/classes/databox.php

@@ -464,6 +464,7 @@ class databox extends base implements ThumbnailedElement
                 ->set_tbranch(isset($field['tbranch']) ? (string) $field['tbranch'] : '')
                 ->set_generate_cterms((isset($field['generate_cterms']) && (string) $field['generate_cterms'] == 1))
                 ->set_gui_editable((isset($field['gui_editable']) && (string) $field['gui_editable'] == 1))
+                ->set_gui_visible((isset($field['gui_editable']) && (string) $field['gui_visible'] == 1))
                 ->set_thumbtitle(isset($field['thumbtitle']) ? (string) $field['thumbtitle'] : (isset($field['thumbTitle']) ? $field['thumbTitle'] : '0'))
                 ->set_report(isset($field['report']) ? (string) $field['report'] : '1')
                 ->save();

lib/classes/databox/field.php

@@ -45,6 +45,7 @@ class databox_field implements cache_cacheableInterface
     protected $tbranch;
     protected $generate_cterms;
     protected $gui_editable;
+    protected $gui_visible;
     protected $separator;
     protected $thumbtitle;
 
@@ -170,6 +171,7 @@ class databox_field implements cache_cacheableInterface
         $this->tbranch = $row['tbranch'];
         $this->generate_cterms = (bool)$row['generate_cterms'];
         $this->gui_editable = (bool)$row['gui_editable'];
+        $this->gui_visible = (bool)$row['gui_visible'];
         $this->VocabularyType = $row['VocabularyControlType'];
         $this->VocabularyRestriction = (bool)$row['RestrictToVocabularyControl'];
 
@@ -312,6 +314,7 @@ class databox_field implements cache_cacheableInterface
           `tbranch` = :tbranch,
           `generate_cterms` = :generate_cterms,
           `gui_editable` = :gui_editable,
+          `gui_visible` = :gui_visible,
           `sorter` = :position,
           `thumbtitle` = :thumbtitle,
           `VocabularyControlType` = :VocabularyControlType,
@@ -337,6 +340,7 @@ class databox_field implements cache_cacheableInterface
             ':tbranch'               => $this->tbranch,
             ':generate_cterms'        => $this->generate_cterms ? '1' : '0',
             ':gui_editable'          => $this->gui_editable ? '1' : '0',
+            ':gui_visible'          => $this->gui_visible ? '1' : '0',
             ':position'              => $this->position,
             ':thumbtitle'            => $this->thumbtitle,
             ':VocabularyControlType' => $this->getVocabularyControl() ? $this->getVocabularyControl()->getType() : null,
@@ -390,6 +394,7 @@ class databox_field implements cache_cacheableInterface
         $meta->setAttribute('tbranch', $this->tbranch);
         $meta->setAttribute('generate_cterms', $this->generate_cterms ? '1' : '0');
         $meta->setAttribute('gui_editable', $this->gui_editable ? '1' : '0');
+        $meta->setAttribute('gui_visible', $this->gui_visible ? '1' : '0');
         if ($this->multi) {
             $meta->setAttribute('separator', $this->separator);
         }
@@ -743,6 +748,17 @@ class databox_field implements cache_cacheableInterface
         return $this;
     }
 
+    /**
+     * @param  boolean       $gui_visible
+     * @return databox_field
+     */
+    public function set_gui_visible($gui_visible)
+    {
+        $this->gui_visible = $gui_visible;
+
+        return $this;
+    }
+
     /**
      *
      * @param  string        $separator
@@ -845,6 +861,15 @@ class databox_field implements cache_cacheableInterface
         return $this->gui_editable;
     }
 
+    /**
+     *
+     * @return boolean
+     */
+    public function get_gui_visible()
+    {
+        return $this->gui_visible;
+    }
+
     /**
      * @param Boolean $all If set to false, returns a one-char separator to use for serialiation
      *
@@ -957,6 +982,7 @@ class databox_field implements cache_cacheableInterface
             'tbranch'               => $this->tbranch,
             'generate_cterms'        => $this->generate_cterms,
             'gui_editable'          => $this->gui_editable,
+            'gui_visible'          => $this->gui_visible,
             'separator'             => $this->separator,
             'required'              => $this->required,
             'report'                => $this->report,
@@ -995,10 +1021,10 @@ class databox_field implements cache_cacheableInterface
         }
 
         $sql = "INSERT INTO metadatas_structure
-        (`id`, `name`, `src`, `readonly`, `gui_editable`, `required`, `indexable`, `type`, `tbranch`, `generate_cterms`,
+        (`id`, `name`, `src`, `readonly`, `gui_editable`,`gui_visible`, `required`, `indexable`, `type`, `tbranch`, `generate_cterms`,
           `thumbtitle`, `multi`, `business`, `aggregable`,
           `report`, `sorter`, `separator`)
-        VALUES (null, :name, '', 0, 1, 0, 1, 'string', '', 1,
+        VALUES (null, :name, '', 0, 1, 1, 0, 1, 'string', '', 1,
           null, 0, 0, 0,
            1, :sorter, '')";
 

lib/conf.d/bases_structure.xml

@@ -2049,6 +2049,14 @@
             <default>1</default>
             <comment></comment>
           </field>
+          <field>
+            <name>gui_visible</name>
+            <type>int(1) unsigned</type>
+            <null></null>
+            <extra></extra>
+            <default>1</default>
+            <comment></comment>
+          </field>
         </fields>
         <indexes>
           <index>

templates/web/admin/fields/templates.html.twig

@@ -197,6 +197,14 @@
                         </label>
                     </td>
                 </tr>
+                <tr>
+                    <td>
+                        <label for="gui_visible" class="checkbox">
+                            <input id="gui_visible" type="checkbox" <%= field.gui_visible ? "checked='checked'" : "" %> />
+                            {% trans %}gui_visible{% endtrans %}
+                        </label>
+                    </td>
+                </tr>
                 <tr>
                     <td colspan="2">
                         <label for="business" class="checkbox">

templates/web/common/macro_caption.html.twig

@@ -1,8 +1,10 @@
 {% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
     <dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
         {% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
+           {% if caption_field_gui_visible(record, name) == 1 %}
                 <dt>{{ caption_field_label(record, name) }}</dt>
                 <dd>{{ caption_field(record, name, value)|e|highlight|linkify|parseColor }}</dd>
+           {% endif %}
         {% endfor %}
     </dl>
     {% if display_exif|default(true) and app.getAuthenticator().user is not none and user_setting('technical_display') == 'group' %}

tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php

@@ -230,6 +230,7 @@ class FieldsTest extends \PhraseanetAuthenticatedWebTestCase
             'vocabulary-type' => 'User',
             'vocabulary-restricted' => true,
             'gui_editable' => true,
+            'gui_visible' => true,
             'generate_cterms' => true,
         ]);
 

www/scripts/models/field.js

@@ -28,6 +28,7 @@ define([
             "tbranch": "",
             "generate_cterms": false,
             "gui_editable": true,
+            "gui_visible": true,
             "separator": "",
             "required": false,
             "report": true,

www/scripts/tests/specs/models.js

@@ -52,6 +52,10 @@ define([
                     this.field.get('gui_editable').should.equal("1");
                 });
 
+                it("should default gui_visible property to '1'", function () {
+                    this.field.get('gui_visible').should.equal("1");
+                });
+
                 it("should default separator property to 'empty'", function () {
                     this.field.get('separator').should.equal("");
                 });

yarn.lock

@@ -5283,10 +5283,14 @@ jquery-simplecolorpicker@^0.3.1:
   resolved "https://registry.yarnpkg.com/jquery-simplecolorpicker/-/jquery-simplecolorpicker-0.3.1.tgz#4f6befd380ab05470f585d5482e5180556e460eb"
   integrity sha1-T2vv04CrBUcPWF1UguUYBVbkYOs=
 
-"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git", "jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e":
+"jquery-treeview@git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e":
+  version "1.4.2"
+  resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
+
+"jquery-treeview@https://github.com/alchemy-fr/jquery-treeview.git":
   version "1.4.2"
   uid "1e9e5a49d2875b878801e904cd08c2d25e85af1e"
-  resolved "git+https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
+  resolved "https://github.com/alchemy-fr/jquery-treeview.git#1e9e5a49d2875b878801e904cd08c2d25e85af1e"
 
 jquery-ui-datepicker-with-i18n@^1.10.4:
   version "1.10.4"