Merge branch 'master' into issue321_layout_improvements_actionForm

CHANGELOG.md

@@ -12,6 +12,16 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* AddAddress: optimize loading: wait for the user finish typing;
+* UserPicker: fix bug with deprecated role
+* docgen: add base context + tests
+* docgen: add age for person
+* [household menu] fix filiation order https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/265
+
+## Test releases
+
+### test release 2021-12-14
+
 * [asideactivity] creation of aside activity category fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/262)
 * [vendee/person] fix typo "situation professionelle" => "situation professionnelle"
 * [main] add availableForUsers condition from locationType in the location API endpoint (champs-libres/departement-de-la-vendee/accent-suivi-developpement#248)
@@ -24,8 +34,6 @@ and this project adheres to
 * [acompanyingCourse] add initial comment on Resume page
 * [person] create button full width (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/330)
 
-## Test releases
-
 ### test release 2021-12-11
 
 * [main] add order field to civility

src/Bundle/ChillDocGeneratorBundle/Service/Context/BaseContextData.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\Service\Context;
+
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\User;
+use DateTimeImmutable;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+class BaseContextData
+{
+    private NormalizerInterface $normalizer;
+
+    private Security $security;
+
+    public function __construct(Security $security, NormalizerInterface $normalizer)
+    {
+        $this->security = $security;
+        $this->normalizer = $normalizer;
+    }
+
+    public function getData(): array
+    {
+        $data = [];
+        $user = $this->security->getUser();
+
+        $data['creator'] = $this->normalizer->normalize(
+            $user instanceof User ? $user : null,
+            'docgen',
+            ['docgen:expects' => User::class, 'groups' => ['docgen:read']]
+        );
+        $data['createdAt'] = $this->normalizer->normalize(new DateTimeImmutable(), 'docgen', [
+            'docgen:expects' => DateTimeImmutable::class, 'groups' => ['docgen:read'],
+        ]);
+        $data['location'] = $this->normalizer->normalize(
+            $user instanceof User ? $user->getCurrentLocation() : null,
+            'docgen',
+            ['docgen:expects' => Location::class, 'groups' => ['docgen:read']]
+        );
+
+        return $data;
+    }
+}

src/Bundle/ChillDocGeneratorBundle/config/services.yaml

@@ -34,6 +34,11 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\DocGeneratorBundle\Service\Context\:
+        resource: "../Service/Context/"
+        autowire: true
+        autoconfigure: true
+
     Chill\DocGeneratorBundle\GeneratorDriver\:
         resource: "../GeneratorDriver/"
         autowire: true

src/Bundle/ChillDocGeneratorBundle/tests/Service/Context/BaseContextDataTest.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\DocGeneratorBundle\tests\Service\Context;
+
+use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
+use Chill\MainBundle\Entity\User;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ * @coversNothing
+ */
+final class BaseContextDataTest extends KernelTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+        self::bootKernel();
+    }
+
+    public function testGenerateNoContext()
+    {
+        $context = $this->buildBaseContext();
+
+        $actual = $context->getData();
+
+        $this->assertIsArray($actual);
+        $this->assertArrayHasKey('creator', $actual);
+        $this->assertArrayHasKey('createdAt', $actual);
+        $this->assertArrayHasKey('location', $actual);
+    }
+
+    public function testGenerateWithUser()
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn(new User());
+
+        $context = $this->buildBaseContext($security->reveal());
+
+        $actual = $context->getData();
+
+        $this->assertIsArray($actual);
+        $this->assertArrayHasKey('creator', $actual);
+        $this->assertArrayHasKey('createdAt', $actual);
+        $this->assertArrayHasKey('location', $actual);
+    }
+
+    private function buildBaseContext(
+        ?Security $security = null,
+        ?NormalizerInterface $normalizer = null
+    ): BaseContextData {
+        return new BaseContextData(
+            $security ?? self::$container->get(Security::class),
+            $normalizer ?? self::$container->get(NormalizerInterface::class)
+        );
+    }
+}

src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js

@@ -34,9 +34,6 @@ var download = (button) => {
         key, url
         ;
 
-    console.log('keyData', keyData);
-    console.log('ivData', ivData);
-
     button.textContent = labelPreparing;
 
     window.fetch(urlGenerator)
@@ -48,36 +45,25 @@ var download = (button) => {
             }
         })
         .then(data => {
-            url = data.url;
+            return window.fetch(data.url);
-
-            if (keyData.length > 0) {
-                return window.crypto.subtle.importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt']);
-            }
-            return Promise.resolve(undefined);
         })
-        .then(nKey => {
+        .then(response => {
-            key = nKey;
+            if (response.ok) {
-
+                return response.arrayBuffer();
-            return window.fetch(url);
-        })
-        .then(r => {
-            console.log('r', r);
-            if (r.ok) {
-                return r.arrayBuffer();
-            } else {
-                throw new Error(r.status + r.statusText);
             }
+            throw new Error(response.status + response.statusText);
         })
         .then(buffer => {
-            console.log('buffer', buffer);
+            if (keyData.alg !== undefined) {
-            if (keyData.length > 0) {
+                return window.crypto.subtle
-                return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
+                    .importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt'])
+                    .then(key => {
+                        return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
+                    });
             }
-
             return Promise.resolve(buffer);
         })
         .then(decrypted => {
-            console.log('decrypted', decrypted);
             var
                 blob = new Blob([decrypted], { type: mimeType }),
                 url = window.URL.createObjectURL(blob)
@@ -96,7 +82,6 @@ var download = (button) => {
             button.click();
         })
         .catch(error => {
-            console.log(error);
             button.textContent = "";
             button.appendChild(document.createTextNode("error while handling decrypted file"));
         })

src/Bundle/ChillMainBundle/Controller/LocationApiController.php

@@ -25,10 +25,10 @@ class LocationApiController extends ApiController
             ->leftJoin('e.locationType', 'lt')
             ->andWhere(
                 $query->expr()->andX(
-                $query->expr()->eq('e.availableForUsers', "'TRUE'"),
+                    $query->expr()->eq('e.availableForUsers', "'TRUE'"),
-                $query->expr()->eq('lt.availableForUsers', "'TRUE'"),
+                    $query->expr()->eq('lt.availableForUsers', "'TRUE'"),
-                $query->expr()->eq('e.active', "'TRUE'"),
+                    $query->expr()->eq('e.active', "'TRUE'"),
-            )
+                )
             );
     }
 }

src/Bundle/ChillMainBundle/Entity/Location.php

@@ -40,7 +40,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
     /**
      * @ORM\ManyToOne(targetEntity=Address::class, cascade={"persist"})
      * @ORM\JoinColumn(nullable=true)
-     * @Serializer\Groups({"read", "write"})
+     * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?Address $address = null;
 
@@ -72,26 +72,26 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity=LocationType::class)
      * @ORM\JoinColumn(nullable=false)
-     * @Serializer\Groups({"read", "write"})
+     * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?LocationType $locationType = null;
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
-     * @Serializer\Groups({"read", "write"})
+     * @Serializer\Groups({"read", "write", "docgen:read"})
      */
     private ?string $name = null;
 
     /**
      * @ORM\Column(type="string", length=64, nullable=true)
-     * @Serializer\Groups({"read", "write"})
+     * @Serializer\Groups({"read", "write", "docgen:read"})
      * @Assert\Regex(pattern="/^([\+{1}])([0-9\s*]{4,20})$/")
      * @PhonenumberConstraint(type="any")
      */
@@ -99,7 +99,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="string", length=64, nullable=true)
-     * @Serializer\Groups({"read", "write"})
+     * @Serializer\Groups({"read", "write", "docgen:read"})
      * @Assert\Regex(pattern="/^([\+{1}])([0-9\s*]{4,20})$/")
      * @PhonenumberConstraint(type="any")
      */

src/Bundle/ChillMainBundle/Entity/LocationType.php

@@ -71,13 +71,14 @@ class LocationType
      * @ORM\Id
      * @ORM\GeneratedValue
      * @ORM\Column(type="integer")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({"read"})
+     * @Serializer\Groups({"read", "docgen:read"})
+     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $title = [];
 

src/Bundle/ChillMainBundle/Form/Type/UserPickerType.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserACLAwareRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\Entity\UserRender;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\Options;
@@ -47,16 +48,20 @@ class UserPickerType extends AbstractType
 
     protected UserRepository $userRepository;
 
+    private UserRender $userRender;
+
     public function __construct(
         AuthorizationHelper $authorizationHelper,
         TokenStorageInterface $tokenStorage,
         UserRepository $userRepository,
-        UserACLAwareRepositoryInterface $userACLAwareRepository
+        UserACLAwareRepositoryInterface $userACLAwareRepository,
+        UserRender $userRender
     ) {
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
         $this->userRepository = $userRepository;
         $this->userACLAwareRepository = $userACLAwareRepository;
+        $this->userRender = $userRender;
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -74,14 +79,19 @@ class UserPickerType extends AbstractType
             ->setAllowedTypes('having_permissions_group_flag', ['string', 'null'])
             ->setDefault('class', User::class)
             ->setDefault('placeholder', 'Choose an user')
-            ->setDefault('choice_label', static function (User $u) {
+            ->setDefault('choice_label', function (User $u) {
-                return $u->getUsername();
+                return $this->userRender->renderString($u, []);
             })
             ->setDefault('scope', null)
             ->setAllowedTypes('scope', [Scope::class, 'array', 'null'])
             ->setNormalizer('choices', function (Options $options) {
+                if ($options['role'] instanceof Role) {
+                    $role = $options['role']->getRole();
+                } else {
+                    $role = $options['role'];
+                }
                 $users = $this->userACLAwareRepository
-                    ->findUsersByReachedACL($options['role']->getRole(), $options['center'], $options['scope'], true);
+                    ->findUsersByReachedACL($role, $options['center'], $options['scope'], true);
 
                 if (null !== $options['having_permissions_group_flag']) {
                     return $this->userRepository

src/Bundle/ChillPersonBundle/Menu/HouseholdMenuBuilder.php

@@ -57,7 +57,7 @@ class HouseholdMenuBuilder implements LocalMenuBuilderInterface
             'routeParameters' => [
                 'household_id' => $household->getId(),
             ], ])
-            ->setExtras(['order' => 40]);
+            ->setExtras(['order' => 15]);
     }
 
     public static function getMenuIds(): array

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js

@@ -3,44 +3,54 @@
 */
 const parametersToString = ({ query, options }) => {
    let types ='';
-   options.type.forEach(function(type) { 
+   options.type.forEach(function(type) {
       types += '&type[]=' + type;
-   }); 
+   });
    return 'q=' + query + types;
 };
 
-/* 
+/*
 * Endpoint chill_person_search
 * method GET, get a list of persons
-* 
+*
 *  @query string - the query to search for
+*  @deprecated
 */
-const searchPersons =  ({ query, options }) => {
+const searchPersons =  ({ query, options }, signal) => {
+  console.err('deprecated');
    let queryStr = parametersToString({ query, options });
    let url = `/fr/search.json?name=person_regular&${queryStr}`;
-   return fetch(url)
+   let fetchOpts = {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json;charset=utf-8'
+      },
+      signal,
+   };
+
+    return fetch(url, fetchOpts)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
-/* 
+/*
 * Endpoint v.2 chill_main_search_global
 * method GET, get a list of persons and thirdparty
-* 
+*
-*  NOTE: this is a temporary WIP endpoint, return inconsistent random results
+* @param query string - the query to search for
-*  @query string - the query to search for
+*
 */
-const searchPersons_2 =  ({ query, options }) => {
+const searchEntities =  ({ query, options }, signal) => {
    let queryStr = parametersToString({ query, options });
    let url = `/api/1.0/search.json?${queryStr}`;
    return fetch(url)
       .then(response => {
          if (response.ok) { return response.json(); }
-         throw Error('Error with request resource response'); 
+         throw Error('Error with request resource response');
       });
 };
 
 
-export { searchPersons, searchPersons_2 };
+export { searchPersons, searchEntities };

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue

@@ -90,7 +90,7 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal';
 import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 import PersonSuggestion from './AddPersons/PersonSuggestion';
-import { searchPersons, searchPersons_2 } from 'ChillPersonAssets/vuejs/_api/AddPersons';
+import { searchEntities } from 'ChillPersonAssets/vuejs/_api/AddPersons';
 import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 import { postThirdparty } from "ChillThirdPartyAssets/vuejs/_api/OnTheFly";
 
@@ -115,6 +115,8 @@ export default {
          },
          search: {
             query: "",
+            previousQuery: "",
+            currentSearchQueryController: null,
             suggested: [],
             selected: [],
             priorSuggestion: {}
@@ -189,16 +191,24 @@ export default {
       },
       setQuery(query) {
          this.search.query = query;
-         if (query.length >= 3) {
+
-            searchPersons_2({ query, options: this.options })
+         setTimeout(function() {
-               .then(suggested => new Promise((resolve, reject) => {
+            if (query === "") {
-                  //console.log('suggested', suggested);
+              this.loadSuggestions([]);
-                  this.loadSuggestions(suggested.results);
+              return;
-                  resolve();
+            }
-            }));
+            if (query === this.search.query) {
-         } else {
+              if (this.currentSearchQueryController !== undefined) {
-            this.loadSuggestions([]);
+                this.currentSearchQueryController.abort()
-         }
+              }
+              this.currentSearchQueryController = new AbortController();
+              searchEntities({ query, options: this.options }, this.currentSearchQueryController)
+                  .then(suggested => new Promise((resolve, reject) => {
+                    this.loadSuggestions(suggested.results);
+                    resolve();
+                  }));
+            }
+         }.bind(this), query.length > 3 ? 300 : 700);
       },
       loadSuggestions(suggested) {
          this.search.suggested = suggested;

src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php

@@ -74,7 +74,7 @@ class PersonDocGenNormalizer implements
         $data = [
             'type' => 'person',
             'isNull' => false,
-            'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expect' => Civility::class])),
+            'civility' => $this->normalizer->normalize($person->getCivility(), $format, array_merge($context, ['docgen:expects' => Civility::class])),
             'firstname' => $person->getFirstName(),
             'lastname' => $person->getLastName(),
             'altNames' => implode(
@@ -87,6 +87,7 @@ class PersonDocGenNormalizer implements
                 )
             ),
             'text' => $this->personRender->renderString($person, []),
+            'age' => (int) $person->getAge(),
             'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $dateContext),
             'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $dateContext),
             'gender' => $this->translator->trans($person->getGender()),

src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php

@@ -15,6 +15,7 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
+use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
@@ -38,6 +39,8 @@ class AccompanyingPeriodContext implements
     DocGeneratorContextWithAdminFormInterface,
     DocGeneratorContextWithPublicFormInterface
 {
+    private BaseContextData $baseContextData;
+
     private DocumentCategoryRepository $documentCategoryRepository;
 
     private EntityManagerInterface $em;
@@ -56,7 +59,8 @@ class AccompanyingPeriodContext implements
         TranslatableStringHelperInterface $translatableStringHelper,
         EntityManagerInterface $em,
         PersonRender $personRender,
-        TranslatorInterface $translator
+        TranslatorInterface $translator,
+        BaseContextData $baseContextData
     ) {
         $this->documentCategoryRepository = $documentCategoryRepository;
         $this->normalizer = $normalizer;
@@ -64,12 +68,11 @@ class AccompanyingPeriodContext implements
         $this->em = $em;
         $this->personRender = $personRender;
         $this->translator = $translator;
+        $this->baseContextData = $baseContextData;
     }
 
     public function adminFormReverseTransform(array $data): array
     {
-        dump($data);
-
         if (array_key_exists('category', $data)) {
             $data['category'] = [
                 'idInsideBundle' => $data['category']->getIdInsideBundle(),
@@ -171,6 +174,7 @@ class AccompanyingPeriodContext implements
         $options = $template->getOptions();
 
         $data = [];
+        $data = array_merge($data, $this->baseContextData->getData());
         $data['course'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
 
         foreach (['mainPerson', 'person1', 'person2'] as $k) {

src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php

@@ -56,6 +56,7 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
         'placeOfBirth' => '',
         'memo' => '',
         'numberOfChildren' => '',
+        'age' => '@ignored',
     ];
 
     private NormalizerInterface $normalizer;

src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php

@@ -406,10 +406,8 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * Get email.
-     *
-     * @return string|null
      */
-    public function getEmail()
+    public function getEmail(): ?string
     {
         return $this->email;
     }