Release v3.10.0

Fix search query for user-groups

Closes #368

See merge request Chill-Projet/chill-bundles!806

.changes/v3.10.0.md

@@ -0,0 +1,6 @@
+## v3.10.0 - 2025-03-17
+### Feature
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
+### Fixed
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   

CHANGELOG.md

@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v3.10.0 - 2025-03-17
+### Feature
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
+### Fixed
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   
+
 ## v3.9.2 - 2025-02-27
 ### Fixed
 * Use fetchResults method to fetch all social issues instead of only the first page   

assets/translator.ts

@@ -1,5 +1,5 @@
 // @ts-ignore Cannot find module (when used within an app)
-import { trans, getLocale, setLocale, setLocaleFallbacks } from "@symfony/ux-translator";
+import { trans, setLocale, setLocaleFallbacks } from "@symfony/ux-translator";
 
 setLocaleFallbacks({"en": "fr", "nl": "fr", "fr": "en"});
 setLocale('fr');

package.json

@@ -11,6 +11,7 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -68,14 +68,23 @@
                             socialActionsSelected.length)
                     "
                 >
-                    <check-social-action
-                        v-for="action in socialActionsList"
-                        :key="action.id"
-                        :action="action"
-                        :selection="socialActionsSelected"
-                        @updateSelected="updateActionsSelected"
+                    <div
+                        id="actionsList"
+                        v-for="group in socialActionsList"
+                        :key="group.issue"
                     >
-                    </check-social-action>
+                        <span class="badge bg-chill-l-gray text-dark">{{
+                            group.issue
+                        }}</span>
+                        <check-social-action
+                            v-for="action in group.actions"
+                            :key="action.id"
+                            :action="action"
+                            :selection="socialActionsSelected"
+                            @updateSelected="updateActionsSelected"
+                        >
+                        </check-social-action>
+                    </div>
                 </template>
 
                 <span
@@ -249,7 +258,23 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "ChillMainAssets/module/bootstrap/shared";
+@import "ChillPersonAssets/chill/scss/mixins";
+@import "ChillMainAssets/chill/scss/chill_variables";
+
 span.multiselect__single {
     display: none !important;
 }
+
+#actionsList {
+    border-radius: 0.5rem;
+    padding: 1rem;
+    margin: 0.5rem;
+    background-color: whitesmoke;
+}
+
+span.badge {
+    margin-bottom: 0.5rem;
+    @include badge_social($social-issue-color);
+}
 </style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -10,7 +10,9 @@
                 :value="action"
             />
             <label class="form-check-label" :for="action.id">
-                <span class="badge bg-light text-dark">{{ action.text }}</span>
+                <span class="badge bg-light text-dark" :title="action.text">{{
+                    action.text
+                }}</span>
             </label>
         </div>
     </span>
@@ -43,5 +45,9 @@ span.badge {
     font-size: 95%;
     margin-bottom: 5px;
     margin-right: 1em;
+    max-width: 100%; /* Adjust as needed */
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 </style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -124,9 +124,19 @@ const store = createStore({
         );
     },
     socialActionsListSorted(state) {
-      return [...state.socialActionsList].sort(
-        (a, b) => a.ordering - b.ordering,
-      );
+      return [...state.socialActionsList]
+        .sort((a, b) => a.ordering - b.ordering)
+        .reduce((acc, action) => {
+          const issueText = action.issue?.text || "Uncategorized";
+          // Find if the group for the issue already exists
+          let group = acc.find((item) => item.issue === issueText);
+          if (!group) {
+            group = { issue: issueText, actions: [] };
+            acc.push(group);
+          }
+          group.actions.push(action);
+          return acc;
+        }, []);
     },
   },
   mutations: {

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue

@@ -96,13 +96,13 @@
         </div>
     </div>
     <FullCalendar :options="calendarOptions" ref="calendarRef">
-        <template v-slot:eventContent="arg: EventApi">
+        <template v-slot:eventContent="{ arg }: {arg: { event: EventApi }}">
             <span :class="eventClasses(arg.event)">
                 <b v-if="arg.event.extendedProps.is === 'remote'">{{
                     arg.event.title
                 }}</b>
                 <b v-else-if="arg.event.extendedProps.is === 'range'"
-                    >{{ arg.timeText }} -
+                    >{{ arg.event.startStr }} -
                     {{ arg.event.extendedProps.locationName }}</b
                 >
                 <b v-else-if="arg.event.extendedProps.is === 'local'">{{

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue

@@ -92,8 +92,7 @@
             >
                 <button
                     :disabled="
-                        userSignatureZone === null ||
-                        userSignatureZone?.index < 1
+                        isFirstSignatureZone
                     "
                     class="btn btn-light btn-sm"
                     @click="turnSignature(-1)"
@@ -103,7 +102,7 @@
                 <span>|</span>
                 <button
                     :disabled="
-                        userSignatureZone?.index >= signature.zones.length - 1
+                        isLastSignatureZone
                     "
                     class="btn btn-light btn-sm"
                     @click="turnSignature(1)"
@@ -200,10 +199,7 @@
                 class="col-4 d-xl-none text-center turnSignature p-0"
             >
                 <button
-                    :disabled="
-                        userSignatureZone === null ||
-                        userSignatureZone?.index < 1
-                    "
+                    :disabled="!hasSignatureZoneSelected"
                     class="btn btn-light btn-sm"
                     @click="turnSignature(-1)"
                 >
@@ -212,7 +208,7 @@
                 <span>|</span>
                 <button
                     :disabled="
-                        userSignatureZone?.index >= signature.zones.length - 1
+                        isLastSignatureZone
                     "
                     class="btn btn-light btn-sm"
                     @click="turnSignature(1)"
@@ -226,8 +222,7 @@
             >
                 <button
                     :disabled="
-                        userSignatureZone === null ||
-                        userSignatureZone?.index < 1
+                        isFirstSignatureZone
                     "
                     class="btn btn-light btn-sm"
                     @click="turnSignature(-1)"
@@ -236,9 +231,7 @@
                 </button>
                 <span>|</span>
                 <button
-                    :disabled="
-                        userSignatureZone?.index >= signature.zones.length - 1
-                    "
+                    :disabled="isLastSignatureZone"
                     class="btn btn-light btn-sm"
                     @click="turnSignature(1)"
                 >
@@ -333,7 +326,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, Ref, reactive } from "vue";
+import {ref, Ref, reactive, computed} from "vue";
 import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
 import {
@@ -433,6 +426,14 @@ const $toast = useToast();
 
 const signature = window.signature;
 
+const isFirstSignatureZone = () => userSignatureZone.value?.index ? userSignatureZone.value.index < 1 : false
+const isLastSignatureZone = () => userSignatureZone.value?.index ? userSignatureZone.value.index >= signature.zones.length - 1 : false
+
+/**
+ * Return true if the user has selected a user zone (existing on the doc or created by the user)
+ */
+const hasSignatureZoneSelected = computed<boolean>(() => userSignatureZone.value !== null);
+
 const setZoomLevel = async (zoomLevel: string) => {
     zoom.value = Number.parseFloat(zoomLevel);
     await resetPages();

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue

@@ -3,8 +3,9 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { reactive } from "vue";
 import HistoryButtonList from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue";
 import {
-    StoredObject,
+    StoredObject, StoredObjectVersion,
     StoredObjectVersionWithPointInTime,
+    StoredObjectPointInTime
 } from "./../../../types";
 
 interface HistoryButtonListConfig {
@@ -28,6 +29,8 @@ const open = () => {
     state.opened = true;
 };
 
+const onRestoreVersion = (payload : { newVersion: StoredObjectVersionWithPointInTime }) => emit('restoreVersion', payload)
+
 defineExpose({ open });
 </script>
 <template>
@@ -43,7 +46,7 @@ defineExpose({ open });
                     :can-edit="canEdit"
                     :stored-object="storedObject"
                     @restore-version="
-                        (payload) => emit('restoreVersion', payload)
+                        onRestoreVersion
                     "
                 ></history-button-list>
             </template>

src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php

@@ -63,7 +63,6 @@ abstract class AbstractCRUDController extends AbstractController
             parent::getSubscribedServices(),
             [
                 'chill_main.paginator_factory' => PaginatorFactory::class,
-                ManagerRegistry::class => ManagerRegistry::class,
                 'translator' => TranslatorInterface::class,
                 AuthorizationHelper::class => AuthorizationHelper::class,
                 EventDispatcherInterface::class => EventDispatcherInterface::class,
@@ -213,7 +212,7 @@ abstract class AbstractCRUDController extends AbstractController
 
     protected function getManagerRegistry(): ManagerRegistry
     {
-        return $this->container->get(ManagerRegistry::class);
+        return $this->container->get('doctrine');
     }
 
     /**
@@ -226,7 +225,7 @@ abstract class AbstractCRUDController extends AbstractController
 
     protected function getValidator(): ValidatorInterface
     {
-        return $this->get('validator');
+        return $this->container->get('validator');
     }
 
     /**

src/Bundle/ChillMainBundle/Repository/UserGroupRepository.php

@@ -75,8 +75,8 @@ final class UserGroupRepository implements UserGroupRepositoryInterface, LocaleA
             ->setWhereClauses('
                 ug.active AND (
                 SIMILARITY(LOWER(UNACCENT(?)), ug.label->>?) > 0.15
-                OR ug.label->>? LIKE \'%\' || LOWER(UNACCENT(?)) || \'%\')
-            ', [$pattern, $lang, $pattern, $lang]);
+                OR LOWER(UNACCENT(ug.label->>?)) LIKE \'%\' || LOWER(UNACCENT(?)) || \'%\')
+            ', [$pattern, $lang, $lang, $pattern]);
 
         return $query;
     }

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

@@ -12,10 +12,6 @@ function loadDynamicPicker(element) {
   let apps = element.querySelectorAll('[data-module="pick-dynamic"]');
 
   apps.forEach(function (el) {
-    let suggested;
-    let as_id;
-    let submit_on_adding_new_entity;
-    let label;
     const isMultiple = parseInt(el.dataset.multiple) === 1,
       uniqId = el.dataset.uniqid,
       input = element.querySelector(
@@ -26,12 +22,12 @@ function loadDynamicPicker(element) {
         ? JSON.parse(input.value)
         : input.value === "[]" || input.value === ""
           ? null
-          : [JSON.parse(input.value)];
-    suggested = JSON.parse(el.dataset.suggested);
-    as_id = parseInt(el.dataset.asId) === 1;
-    submit_on_adding_new_entity =
-      parseInt(el.dataset.submitOnAddingNewEntity) === 1;
-    label = el.dataset.label;
+          : [JSON.parse(input.value)],
+      suggested = JSON.parse(el.dataset.suggested),
+      as_id = parseInt(el.dataset.asId) === 1,
+      submit_on_adding_new_entity =
+        parseInt(el.dataset.submitOnAddingNewEntity) === 1,
+      label = el.dataset.label;
 
     if (!isMultiple) {
       if (input.value === "[]") {

src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue

@@ -45,6 +45,9 @@ const onPickGenericDoc = ({
 }) => {
     emit("pickGenericDoc", { genericDoc });
 };
+
+const onRemoveAttachment = (payload: { attachment: WorkflowAttachment }) => { emit('removeAttachment', payload) };
+
 </script>
 
 <template>
@@ -56,7 +59,7 @@ const onPickGenericDoc = ({
     ></pick-generic-doc-modal>
     <attachment-list
         :attachments="props.attachments"
-        @removeAttachment="(payload) => emit('removeAttachment', payload)"
+        @removeAttachment="onRemoveAttachment"
     ></attachment-list>
     <ul class="record_actions">
         <li>

src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue

@@ -72,6 +72,10 @@ const placeTrans = (str: string): string => {
     }
 };
 
+const onPickDocument = (payload: { genericDoc: GenericDocForAccompanyingPeriod }) => emit('pickGenericDoc', payload);
+
+const onRemoveGenericDoc = (payload: {genericDoc: GenericDocForAccompanyingPeriod}) => emit('removeGenericDoc', payload);
+
 const filteredDocuments = computed<GenericDocForAccompanyingPeriod[]>(() => {
     if (false === loaded.value) {
         return [];
@@ -245,9 +249,9 @@ const filteredDocuments = computed<GenericDocForAccompanyingPeriod[]>(() => {
                 :accompanying-period-id="accompanyingPeriodId"
                 :genericDoc="g"
                 :is-picked="isPicked(g)"
-                @pickGenericDoc="(payload) => emit('pickGenericDoc', payload)"
+                @pickGenericDoc="onPickDocument"
                 @removeGenericDoc="
-                    (payload) => emit('removeGenericDoc', payload)
+                    onRemoveGenericDoc
                 "
             ></pick-generic-doc-item>
         </div>

src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php

@@ -68,8 +68,8 @@ class AddressReferenceBEFromBestAddress
         $csv->setDelimiter(',');
         $csv->setHeaderOffset(0);
 
-        $stmt = Statement::create()
-            ->process($csv);
+        $stmt = new Statement();
+        $stmt = $stmt->process($csv);
 
         foreach ($stmt as $record) {
             $this->baseImporter->importAddress(

src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php

@@ -55,32 +55,32 @@ class AddressReferenceFromBAN
 
         $csv = Reader::createFromStream($csvDecompressed);
         $csv->setDelimiter(';')->setHeaderOffset(0);
-        $stmt = Statement::create()
-            ->process($csv, [
-                'id',
-                'id_fantoir',
-                'numero',
-                'rep',
-                'nom_voie',
-                'code_postal',
-                'code_insee',
-                'nom_commune',
-                'code_insee_ancienne_commune',
-                'nom_ancienne_commune',
-                'x',
-                'y',
-                'lon',
-                'lat',
-                'type_position',
-                'alias',
-                'nom_ld',
-                'libelle_acheminement',
-                'nom_afnor',
-                'source_position',
-                'source_nom_voie',
-                'certification_commune',
-                'cad_parcelles',
-            ]);
+        $stmt = new Statement();
+        $stmt = $stmt->process($csv, [
+            'id',
+            'id_fantoir',
+            'numero',
+            'rep',
+            'nom_voie',
+            'code_postal',
+            'code_insee',
+            'nom_commune',
+            'code_insee_ancienne_commune',
+            'nom_ancienne_commune',
+            'x',
+            'y',
+            'lon',
+            'lat',
+            'type_position',
+            'alias',
+            'nom_ld',
+            'libelle_acheminement',
+            'nom_afnor',
+            'source_position',
+            'source_nom_voie',
+            'certification_commune',
+            'cad_parcelles',
+        ]);
 
         foreach ($stmt as $record) {
             $this->baseImporter->importAddress(

src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php

@@ -43,17 +43,17 @@ class AddressReferenceFromBano
 
         $csv = Reader::createFromStream($file);
         $csv->setDelimiter(',');
-        $stmt = Statement::create()
-            ->process($csv, [
-                'refId',
-                'streetNumber',
-                'street',
-                'postcode',
-                'city',
-                '_o',
-                'lat',
-                'lon',
-            ]);
+        $stmt = new Statement();
+        $stmt = $stmt->process($csv, [
+            'refId',
+            'streetNumber',
+            'street',
+            'postcode',
+            'city',
+            '_o',
+            'lat',
+            'lon',
+        ]);
 
         foreach ($stmt as $record) {
             $this->baseImporter->importAddress(

src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php

@@ -54,7 +54,8 @@ class AddressReferenceLU
 
     private function process_address(Reader $csv, ?string $sendAddressReportToEmail = null): void
     {
-        $stmt = Statement::create()->process($csv);
+        $stmt = new Statement();
+        $stmt = $stmt->process($csv);
         foreach ($stmt as $record) {
             $this->addressBaseImporter->importAddress(
                 $record['id_geoportail'],
@@ -74,7 +75,8 @@ class AddressReferenceLU
 
     private function process_postal_code(Reader $csv): void
     {
-        $stmt = Statement::create()->process($csv);
+        $stmt = new Statement();
+        $stmt = $stmt->process($csv);
         $arr_postal_codes = [];
         foreach ($stmt as $record) {
             if (false === \array_key_exists($record['code_postal'], $arr_postal_codes)) {