From 9ff58fe0c393e78de30f21fcdd60d53ae5175120 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 16 Sep 2021 16:12:32 +0200
Subject: [PATCH] Address: replace variable entity.type by entity.name

---
 .../Resources/public/vuejs/Address/App.vue                | 2 +-
 .../public/vuejs/Address/components/AddAddress.vue        | 8 ++++----
 .../public/vuejs/Address/components/ShowAddressPane.vue   | 4 ++--
 .../Resources/public/vuejs/Address/index.js               | 2 +-
 .../AccompanyingCourse/components/ButtonLocation.vue      | 2 +-
 .../AccompanyingCourse/components/CourseLocation.vue      | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 1cde88830..21b4ce5ef 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,6 +1,6 @@
 <template>
    <add-address
-      v-bind:key="context.entity.type"
+      v-bind:key="context.entity.name"
       v-bind:context="context"
       v-bind:options="options"
       v-bind:addressChanged="submitAddress"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 57ee15a06..3ab9fe12e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -437,7 +437,7 @@ export default {
          if ('newPostcode' in payload) {
 
             let postcodeBody = payload.newPostcode;
-            if (this.context.entity.type === 'person') {
+            if (this.context.entity.name === 'person') {
                postcodeBody = Object.assign(postcodeBody, {'origin': 3});
             }
             return postPostalCode(postcodeBody)
@@ -459,7 +459,7 @@ export default {
                this.flag.loading = false;
                this.flag.success = true;
                resolve({
-                  entity: this.context.entity.type,
+                  entity: this.context.entity.name,
                   entityId: this.context.entity.id,
                   addressId: this.entity.address.address_id
                   }
@@ -505,7 +505,7 @@ export default {
                   this.flag.loading = false;
                   this.flag.success = true;
                   return resolve({
-                     entity: this.context.entity.type,
+                     entity: this.context.entity.name,
                      entityId: this.context.entity.id,
                      addressId: this.entity.address.address_id
                   });
@@ -523,7 +523,7 @@ export default {
       submitNewAddress()
       {
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             addressId: this.entity.address.address_id
          };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
index 25811f7be..4e9e59874 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowAddressPane.vue
@@ -82,10 +82,10 @@ export default {
          }
       },
       getValidFromDateText() {
-         return (this.context.entity.type === 'household') ? 'move_date' : 'validFrom';
+         return (this.context.entity.name === 'household') ? 'move_date' : 'validFrom';
       },
       getSuccessText() {
-         switch (this.context.entity.type) {
+         switch (this.context.entity.name) {
             /*
             case 'household':
                return (this.context.edit) ? 'household_address_edit_success' : 'household_address_move_success';
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
index 5443601e1..a4d933cdd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js
@@ -15,7 +15,7 @@ containers.forEach((container) => {
                 addAddress: {
                     context: {
                         entity: {
-                            type: container.dataset.targetEntityName,
+                            name: container.dataset.targetEntityName,
                             id: container.dataset.targetEntityId
                         },
                         edit: container.dataset.mode === 'edit',  //boolean
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index f4f2f1c78..86f9cb4f8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -54,7 +54,7 @@ export default {
       assignAddress() {
         //console.log('assignAddress id', this.person.current_household_address);
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             locationStatusTo: 'person',
             personId: this.person.id
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index 8538db3bc..d19449253 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -119,7 +119,7 @@ export default {
       initAddressContext() {
          let context = {
             entity: {
-               type: this.accompanyingCourse.type,
+               name: this.accompanyingCourse.type,
                id: this.accompanyingCourse.id
             },
             edit: false,
@@ -134,7 +134,7 @@ export default {
       removeAddress() {
         //console.log('remove address');
          let payload = {
-            entity: this.context.entity.type,
+            entity: this.context.entity.name,
             entityId: this.context.entity.id,
             locationStatusTo: 'none'
          };