From 1c3f6c7c1ea90f8711e1598899412f709da80a90 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 14 Feb 2022 11:12:37 +0100
Subject: [PATCH] AddPersons: allow creation of person or thirdparty depending
 on allowed types

---
 CHANGELOG.md                                         |  2 +-
 .../public/vuejs/OnTheFly/components/Create.vue      |  7 +++----
 .../public/vuejs/OnTheFly/components/OnTheFly.vue    | 12 ++++++++++--
 .../Resources/public/vuejs/OnTheFly/i18n.js          |  8 ++++++--
 .../public/vuejs/_components/AddPersons.vue          |  1 +
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0c8b626c..949ce823e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to
 ## Unreleased
 * AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
 * [person]: AddPersons: allow creation of person or thirdparty only (no users) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
-
+* [person]: AddPersons: allow creation of person or thirdparty depending on allowed types (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422)
 
 <!-- write down unreleased development here -->
 * fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index 24f69a9fe..fcb51a462 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -1,6 +1,6 @@
 <template>
    <ul class="nav nav-tabs">
-      <li class="nav-item">
+      <li v-if="allowedTypes.includes('person')" class="nav-item">
          <a class="nav-link" :class="{ active: isActive('person') }">
             <label for="person">
                <input type="radio" name="person" id="person" v-model="radioType" value="person">
@@ -8,7 +8,7 @@
             </label>
          </a>
       </li>
-      <li class="nav-item">
+      <li v-if="allowedTypes.includes('thirdparty')" class="nav-item">
          <a class="nav-link" :class="{ active: isActive('thirdparty') }">
             <label for="thirdparty">
                <input type="radio" name="thirdparty" id="thirdparty" v-model="radioType" value="thirdparty">
@@ -38,11 +38,10 @@
 <script>
 import OnTheFlyPerson from 'ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue';
 import OnTheFlyThirdparty from 'ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue';
-import { postPerson } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 
 export default {
    name: "OnTheFlyCreate",
-   props: ['action'],
+   props: ['action', 'allowedTypes'],
    components: {
       OnTheFlyPerson,
       OnTheFlyThirdparty
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 7b06776ba..72c51c6e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -54,6 +54,7 @@
          <template v-slot:body v-else>
             <on-the-fly-create
                :action="action"
+               :allowedTypes="allowedTypes"
                ref="castNew">
             </on-the-fly-create>
          </template>
@@ -90,7 +91,7 @@ export default {
       OnTheFlyThirdparty,
       OnTheFlyCreate
    },
-   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent'],
+   props: ['type', 'id', 'action', 'buttonText', 'displayBadge', 'isDead', 'parent', 'allowedTypes'],
    emits: ['saveFormOnTheFly'],
    data() {
       return {
@@ -129,6 +130,13 @@ export default {
                return 'action.create';
          }
       },
+      titleCreate() {
+         return this.allowedTypes.every(t => t === 'person')
+            ? 'onthefly.create.title.person'
+            : this.allowedTypes.every(t => t === 'thirdparty')
+               ? 'onthefly.create.title.thirdparty'
+               : 'onthefly.create.title.default'
+      },
       titleModal() {
          switch (this.action) {
             case 'show':
@@ -136,7 +144,7 @@ export default {
             case 'edit':
                return 'onthefly.edit.' + this.type;
             case 'create':
-               return 'onthefly.create.title';
+               return this.titleCreate;
          }
       },
       titleMessage() {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
index c619ef96b..4ee284959 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/i18n.js
@@ -9,11 +9,15 @@ const ontheflyMessages = {
             },
             edit: {
                 person: "Modifier un usager",
-                thirdparty: "Modifier un tiers"
+                thirdparty: "Modifier un tiers",
             },
             create: {
                 button: "Créer \"{q}\"",
-                title: "Création d'un nouvel usager ou d'un tiers professionnel",
+                title: {
+                    default: "Création d'un nouvel usager ou d'un tiers professionnel",
+                    person: "Création d'un nouvel usager",
+                    thirdparty: "Création d'un nouveau tiers professionnel",
+                },
                 person: "un nouvel usager",
                 thirdparty: "un nouveau tiers professionnel"
             },
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 1301e1948..d978933b6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -64,6 +64,7 @@
                   <on-the-fly
                      v-if="queryLength >= 3 && (options.type.includes('person') || options.type.includes('thirdparty'))"
                      :buttonText="$t('onthefly.create.button', {q: query})"
+                     :allowedTypes="options.type"
                      action="create"
                      @saveFormOnTheFly="saveFormOnTheFly"
                      ref="onTheFly">