Merge remote-tracking branch 'origin/master' into track-address-reference-update

src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js

@@ -18,12 +18,13 @@ function loadDynamicPicker(element) {
             isMultiple = parseInt(el.dataset.multiple) === 1,
             uniqId = el.dataset.uniqid,
             input = element.querySelector('[data-input-uniqid="'+ el.dataset.uniqid +'"]'),
+            // the "picked" will always be an array, even if multiple is false
             picked = isMultiple ?
                 JSON.parse(input.value) : (
                     (input.value === '[]' || input.value === '') ?
                         null : [ JSON.parse(input.value) ]
                 )
-        ;
+            suggested = JSON.parse(el.dataset.suggested)
 
         if (!isMultiple) {
             if (input.value === '[]'){
@@ -37,6 +38,7 @@ function loadDynamicPicker(element) {
                 ':types="types" ' +
                 ':picked="picked" ' +
                 ':uniqid="uniqid" ' +
+                ':suggested="notPickedSuggested" ' +
                 '@addNewEntity="addNewEntity" ' +
                 '@removeEntity="removeEntity"></pick-entity>',
             components: {
@@ -48,16 +50,27 @@ function loadDynamicPicker(element) {
                     types: JSON.parse(el.dataset.types),
                     picked: picked === null ? [] : picked,
                     uniqid: el.dataset.uniqid,
+                    suggested: suggested
                 }
             },
+            computed: {
+              notPickedSuggested() {
+                const pickedIds = new Set();
+                for (const p of this.picked) {
+                  pickedIds.add(`${p.type}${p.id}`);
+                }
+                return this.suggested.filter(e => !pickedIds.has(`${e.type}${e.id}`))
+              }
+            },
             methods: {
-                addNewEntity(entity) {
+                addNewEntity({entity}) {
                     if (this.multiple) {
                         if (!this.picked.some(el => {
                             return el.type === entity.type && el.id === entity.id;
                         })) {
                             this.picked.push(entity);
                             input.value = JSON.stringify(this.picked);
+                            console.log(entity)
                         }
                     } else {
                         if (!this.picked.some(el => {
@@ -69,9 +82,16 @@ function loadDynamicPicker(element) {
                         }
                     }
                 },
-                removeEntity(entity) {
+                removeEntity({entity}) {
+                    if (-1 === this.suggested.findIndex(e => e.type === entity.type && e.id === entity.id)) {
+                      this.suggested.push(entity);
+                    }
                     this.picked = this.picked.filter(e => !(e.type === entity.type && e.id === entity.id));
-                    input.value = JSON.stringify(this.picked);
+                    if (this.multiple) {
+                      input.value = JSON.stringify(this.picked);
+                    } else {
+                      input.value = "";
+                    }
                 },
             }
         })

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue

@@ -17,6 +17,9 @@
             </add-persons>
         </li>
     </ul>
+    <ul class="list-suggest add-items inline">
+      <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)"><span>{{ s.text }}</span></li>
+    </ul>
 </template>
 
 <script>
@@ -49,6 +52,10 @@ export default {
           // display picked entities.
           type: Boolean,
           default: true,
+        },
+        suggested: {
+          type: Array,
+          default: []
         }
     },
     emits: ['addNewEntity', 'removeEntity'],
@@ -61,55 +68,58 @@ export default {
         };
     },
     computed: {
-        addPersonsOptions() {
-            return {
-                uniq: !this.multiple,
-                type: this.types,
-                priority: null,
-                button: {
-                    size: 'btn-sm',
-                    class: 'btn-submit',
-                },
-            };
-        },
-        translatedListOfTypes() {
-            let trans = [];
-            this.types.forEach(t => {
-                if (this.$props.multiple) {
-                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
-                } else {
-                    trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
-                }
-            })
+      addPersonsOptions() {
+          return {
+              uniq: !this.multiple,
+              type: this.types,
+              priority: null,
+              button: {
+                  size: 'btn-sm',
+                  class: 'btn-submit',
+              },
+          };
+      },
+      translatedListOfTypes() {
+          let trans = [];
+          this.types.forEach(t => {
+              if (this.$props.multiple) {
+                  trans.push(appMessages.fr.pick_entity[t].toLowerCase());
+              } else {
+                  trans.push(appMessages.fr.pick_entity[t + '_one'].toLowerCase());
+              }
+          })
 
-            if (this.$props.multiple) {
-                return appMessages.fr.pick_entity.modal_title + trans.join(', ');
-            } else {
-                return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
-            }
-        },
-        listClasses() {
-            return {
-                'list-suggest': true,
-                'remove-items': this.$props.removableIfSet,
-            };
-        },
+          if (this.$props.multiple) {
+              return appMessages.fr.pick_entity.modal_title + trans.join(', ');
+          } else {
+              return appMessages.fr.pick_entity.modal_title_one + trans.join(', ');
+          }
+      },
+      listClasses() {
+          return {
+              'list-suggest': true,
+              'remove-items': this.$props.removableIfSet,
+          };
+      },
     },
     methods: {
-        addNewEntity({ selected, modal }) {
-            selected.forEach((item) => {
-                    this.$emit('addNewEntity', item.result);
-                }, this
-            );
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        removeEntity(entity) {
-            if (!this.$props.removableIfSet) {
-                return;
-            }
-            this.$emit('removeEntity', entity);
-        }
+      addNewSuggested(entity) {
+        this.$emit('addNewEntity', {entity: entity});
+      },
+      addNewEntity({ selected, modal }) {
+          selected.forEach((item) => {
+              this.$emit('addNewEntity', { entity: item.result});
+            }, this
+          );
+          this.$refs.addPersons.resetSearch(); // to cast child method
+          modal.showModal = false;
+      },
+      removeEntity(entity) {
+          if (!this.$props.removableIfSet) {
+              return;
+          }
+          this.$emit('removeEntity',{ entity: entity });
+      }
     },
 }
 </script>

src/Bundle/ChillMainBundle/Resources/views/Form/bootstrap5/bootstrap_5_horizontal_layout.html.twig

@@ -68,7 +68,8 @@
                         {{- form_errors(form) -}}
                     </div>
                 {% else %}
-                    <div class="col-sm">
+                    <div class="col-12 clear">{{- form_label(form) -}}</div>
+                    <div class="col-sm-12">
                         {{- form_widget(form, widget_attr) -}}
                         {{- form_help(form) -}}
                         {{- form_errors(form) -}}

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -18,43 +18,48 @@
 
 {% block form_row %}
 {% apply spaceless %}
-    {% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
     <div class="mb-2">
         <div class="row">
-            <div class="{% apply spaceless %}
-                {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
-                    col-sm-12
-                {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
-                    col-sm-2 col-md-4 clear
-                {% else %}
-                    col-sm-4 clear
+            {% if form.vars.fullWidth is not defined or form.vars.fullWidth == false %}
+                <div class="{% apply spaceless %}
+                    {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %}
+                        col-sm-12
+                    {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
+                        col-sm-2 col-md-4 clear
+                    {% else %}
+                        col-sm-4 clear
+                    {% endif %}
+                {% endapply %}">
+                {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
+                    {{ form_label(form) }}
                 {% endif %}
-            {% endapply %}">
-            {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %}
-                {{ form_label(form) }}
+                </div>
+                <div class="{% apply spaceless %}
+                    {% if attr.class is defined and 'cf-title' in attr.class  %}
+                        col-sm-12
+                    {% elseif attr.class is defined and 'cf-fields' in attr.class %}
+                        col-sm-12 parent
+                    {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
+                        col-sm-2 col-md-8 multiple-cf-inline
+                    {% else %}
+                        col-sm-8
+                    {% endif %}
+                {% endapply %}">
+                    {{ form_widget(form) }}
+                    {{ form_errors(form) }}
+                </div>
+            {% else %}
+                <div class="col-12 clear">{{ form_label(form) }}</div>
+                <div class="col-12">{{ form_widget(form) }}</div>
             {% endif %}
-            </div>
-            <div class="{% apply spaceless %}
-                {% if attr.class is defined and 'cf-title' in attr.class  %}
-                    col-sm-12
-                {% elseif attr.class is defined and 'cf-fields' in attr.class %}
-                    col-sm-12 parent
-                {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %}
-                    col-sm-2 col-md-8 multiple-cf-inline
-                {% else %}
-                    col-sm-8
-                {% endif %}
-            {% endapply %}">
-                {{ form_widget(form)  }}
-                {{ form_errors(form) }}
-            </div>
         </div>
     </div>
-    {% else %}
-        {{ form_widget(form)  }}
-    {% endif %}
 {% endapply %}
 {% endblock form_row %}
+{#
+    The block 'form_row' above may be removed !
+    Read this note: https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/502#note_1311993084
+#}
 
 {% block choice_widget_expanded %}
 {% apply spaceless %}
@@ -200,7 +205,6 @@
 
 
 {% block private_comment_row %}
-    {{ form_label(form) }}
     {{ form_row(form) }}
 {% endblock %}
 
@@ -211,7 +215,6 @@
 {% endblock %}
 
 {% block comment_row %}
-    {{ form_label(form) }}
     {{ form_row(form) }}
 {% endblock %}
 
@@ -249,7 +252,11 @@
 
 {% block pick_entity_dynamic_widget %}
     <input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value|escape('html_attr') }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}"/>
-    <div data-module="pick-dynamic" data-types="{{ form.vars['types']|json_encode }}" data-multiple="{{ form.vars['multiple'] }}" data-uniqid="{{ form.vars['uniqid'] }}"></div>
+    <div data-module="pick-dynamic"
+         data-types="{{ form.vars['types']|json_encode }}"
+         data-multiple="{{ form.vars['multiple'] }}"
+         data-uniqid="{{ form.vars['uniqid'] }}"
+         data-suggested="{{ form.vars['suggested']|json_encode|escape('html_attr') }}"></div>
 {% endblock %}
 
 {% block pick_postal_code_widget %}
@@ -269,4 +276,4 @@
             {{ form_errors(form.fixedDate) }}
         </div>
     </div>
-{% endblock %}
+{% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig

@@ -66,6 +66,7 @@
         {{ form_row(transition_form.future_dest_users) }}
 
         {{ form_row(transition_form.future_dest_emails) }}
+        {{ form_errors(transition_form.future_dest_users) }}
     </div>
 
     <p>{{ form_label(transition_form.comment) }}</p>