From c416f1ef6dde180ce32ca84c223f3d74d0af988f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 25 Feb 2022 13:58:17 +0100
Subject: [PATCH] fix bug to resolve onthefly component within thirdparty
 renderbox

---
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  2 +-
 .../Entity/ThirdPartyRenderBox.vue            | 23 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

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 e50c2a41f..40b59a86a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -1,7 +1,7 @@
 <template>
 
    <a v-if="isDisplayBadge" @click="openModal">
-      <span class="chill-entity" :class="badgeType"> hello
+      <span class="chill-entity" :class="badgeType">
          {{ buttonText }}<span v-if="isDead"> (‡)</span>
       </span>
    </a>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 0149fc5d6..cf785b22d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -41,16 +41,13 @@
                     <li v-if="hasParent">
                         <i class="fa fa-li fa-hand-o-right"></i>
                         <b class="me-2">{{ $t('child_of') }}</b>
-                        <!-- <on-the-fly
-                            :type="thirdparty.parent.type"
-                            :id="thirdparty.parent.id"
-                            :buttonText="thirdparty.parent.text"
-                            :displayBadge="'true' === 'true'"
-                            action="show">
-                        </on-the-fly> -->
-                        <span class="chill-entity badge-thirdparty">
-                            {{ thirdparty.parent.text}}
-                        </span>
+                    <on-the-fly
+                        :type="thirdparty.parent.type"
+                        :id="thirdparty.parent.id"
+                        :buttonText="thirdparty.parent.text"
+                        :displayBadge="'true' === 'true'"
+                        action="show">
+                    </on-the-fly>
                     </li>
                     <!-- TODO hasChildren
                         NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
@@ -105,16 +102,18 @@
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
-// import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 
 export default {
     name: "ThirdPartyRenderBox",
     components: {
-        // OnTheFly,
         AddressRenderBox,
         Confidential,
         BadgeEntity,
     },
+    // To avoid components recursively invoking eachother resolve OnTheFly component here
+    beforeCreate() {
+        this.$options.components.OnTheFly = require('ChillMainAssets/vuejs/OnTheFly/components/OnTheFly').default;
+    },
     i18n: {
         messages: {
             fr: {