Merge branch 'master' into 456-doc-generation-active-status

.changes/unreleased/Fixed-20251119-161233.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Hide the display of inactive user groups in the api
-time: 2025-11-19T16:12:33.803084517+01:00
-custom:
-    Issue: "471"
-    SchemaChange: No schema change

.changes/unreleased/UX-20251103-161910.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Display whether doc generation template is active or not in admin and order templates alphabetically
+time: 2025-11-03T16:19:10.051947925+01:00
+custom:
+    Issue: "456"
+    SchemaChange: No schema change

composer.json

@@ -7,13 +7,6 @@
         "chill",
         "social worker"
     ],
-    "repositories": [{
-        "type": "path",
-        "url": "./packages/ChillZimbraBundle",
-        "options": {
-            "symlink": true
-        }
-    }],
     "require": {
         "php": "^8.2",
         "ext-dom": "*",
@@ -21,7 +14,6 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "chill-project/chill-zimbra-bundle": "@dev",
         "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",

config/bundles.php

@@ -37,5 +37,4 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
     loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
-    Chill\ZimbraBundle\ChillZimbraBundle::class => ['all' => true],
 ];

package.json

@@ -11,7 +11,6 @@
     "@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",

packages/ChillZimbraBundle/composer.json

@@ -1,22 +0,0 @@
-{
-    "name": "chill-project/chill-zimbra-bundle",
-    "description": "Provide connection between Zimbra agenda and Chill",
-    "minimum-stability": "stable",
-    "license": "AGPL-3.0",
-    "type": "library",
-    "keywords": [
-        "chill",
-        "social worker"
-    ],
-    "require": {
-        "chill-project/chill-bundles": "dev-master@dev",
-        "zimbra-api/soap-api": "^3.2.2",
-        "psr/http-client": "^1.0",
-        "nyholm/psr7": "^1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Chill\\ZimbraBundle\\": "src/"
-        }
-    }
-}

packages/ChillZimbraBundle/src/ChillZimbraBundle.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Chill\ZimbraBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class ChillZimbraBundle extends Bundle
-{
-
-}

packages/ChillZimbraBundle/src/DependencyInjection/ChillZimbraExtension.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Chill\ZimbraBundle\DependencyInjection;
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-
-class ChillZimbraExtension extends Extension
-{
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        $loader->load('services.yaml');
-    }
-
-}

packages/ChillZimbraBundle/src/config/services.yaml

@@ -1,8 +0,0 @@
-services:
-    _defaults:
-        autoconfigure: true
-        autowire: true
-
-    Chill\ZimbraBundle\Command\:
-        resource: '../Command'
-        tags: ['console.command']

src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php

@@ -87,7 +87,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang')
+        return $query->addSelect('REPLACE(JSON_EXTRACT(e.name, :lang), \' \', \'~\') AS HIDDEN name_lang')
             ->setParameter('lang', $request->getLocale())
             ->addOrderBy('name_lang', 'ASC');
     }

src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig

@@ -25,12 +25,24 @@
                             <div class="item-bloc">
                                 <div class="item-row">
                                     <div class="item-col" style="flex-basis:100%;">
-                                        <h2>{{ entity.name|localize_translatable_string }}</h2>
+                                        <h2>{{ entity.name|localize_translatable_string }} </h2>
+                                        <p style="margin-left: 1rem;"><span class="badge bg-chill-gray">
+                                            {% if entity.active %}
+                                                {{ 'admin.active'|trans }}
+                                            {% else %}
+                                                {{ 'admin.not active'|trans }}
+                                            {% endif %}
+                                        </span></p>
                                     </div>
                                 </div>
                                 <div class="item-row">
                                     <p><span class="badge bg-chill-green-dark">{{ contextManager.getContextByKey(entity.context).name|trans }}</span></p>
                                 </div>
+{#                                <div class="item-row">#}
+{#                                    <div class="item-col" style="flex-basis:100%;">#}
+{##}
+{#                                    </div>#}
+{#                                </div>#}
                                 <div class="item-row">
                                     <div class="item-col"></div>
                                     <ul class="record_actions item-col flex-shrink-1">

src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml

@@ -49,3 +49,7 @@ crud:
 
 
 Template file: Fichier modèle
+
+admin:
+    active: Actif
+    not active: Non-actif

src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php

@@ -12,12 +12,5 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
-use Symfony\Component\HttpFoundation\Request;
 
-class UserGroupApiController extends ApiController
-{
-    protected function customizeQuery(string $action, Request $request, $query): void
-    {
-        $query->andWhere('e.active = TRUE');
-    }
-}
+class UserGroupApiController extends ApiController {}

symfony.lock

@@ -2,9 +2,6 @@
     "champs-libres/wopi-bundle": {
         "version": "dev-master"
     },
-    "chill-project/chill-zimbra-bundle": {
-        "version": "dev-472-zimbra-connector"
-    },
     "doctrine/annotations": {
         "version": "1.14",
         "recipe": {