From 10d94b809c220f60827a933cfd90a4d31dfd6033 Mon Sep 17 00:00:00 2001
From: "l.mauser" <l.mauser@wimadev.de>
Date: Mon, 13 Feb 2023 12:40:13 +0100
Subject: [PATCH 1/7] fix(richtext): add support for nested texts

---
 components/Elements/Link.vue            | 15 ++++++++++-----
 components/Elements/RichTextElement.vue | 19 ++++++++++++-------
 components/Elements/Text.vue            | 11 -----------
 plugins/1.setupRemoteApi.server.ts      |  2 +-
 4 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 components/Elements/Text.vue

diff --git a/components/Elements/Link.vue b/components/Elements/Link.vue
index a4129e9..3bc4fe7 100644
--- a/components/Elements/Link.vue
+++ b/components/Elements/Link.vue
@@ -1,8 +1,10 @@
 <template>
-  <span>
-    <NuxtLink class="underline" to="/">{{
-      richTextElement.data.data["lt_text"]
-    }}</NuxtLink>
+  <span class="bg-green-700 bg-opacity-30">
+    <NuxtLink class="underline" to="/">
+      <ElementsRichText />
+
+      {{ richTextElement.data.data["lt_text"] }}</NuxtLink
+    >
   </span>
 </template>
 
@@ -15,5 +17,8 @@ interface RichTextLink {
   data: Link;
 }
 
-defineProps<{ richTextElement: RichTextLink }>();
+const props = defineProps<{ richTextElement: RichTextLink }>();
+
+console.log("link ");
+console.log(props.richTextElement);
 </script>
diff --git a/components/Elements/RichTextElement.vue b/components/Elements/RichTextElement.vue
index 11f0791..1f9ef84 100644
--- a/components/Elements/RichTextElement.vue
+++ b/components/Elements/RichTextElement.vue
@@ -1,10 +1,15 @@
 <template>
-  <component
-    :is="richtTextElementComponent"
-    class=""
-    :rich-text-element="richTextElement"
-    :richtext="richTextElement.content"
-  />
+  <span class="border bg-red-800 bg-opacity-20">
+    <component
+      :is="richtTextElementComponent"
+      v-if="Array.isArray(richTextElement.content)"
+      class=""
+      :rich-text-element="richTextElement"
+      :richtext="richTextElement.content"
+    />
+    <span v-else>{{ richTextElement.content }}</span>
+    <!--  -->
+  </span>
 </template>
 
 <script lang="ts" setup>
@@ -15,7 +20,7 @@ const props = defineProps<{ richTextElement: RichTextElement }>();
 const richtTextElementComponent = computed(() => {
   switch (props.richTextElement.type) {
     case "text":
-      return resolveComponent("ElementsText");
+      return resolveComponent("ElementsRichText");
     case "link":
       return resolveComponent("ElementsLink");
     case "block":
diff --git a/components/Elements/Text.vue b/components/Elements/Text.vue
deleted file mode 100644
index 204585e..0000000
--- a/components/Elements/Text.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <span>{{ richTextElement.content }}</span>
-</template>
-<script setup lang="ts">
-interface RichTextText {
-  type: "text";
-  content: string;
-  data: Record<string, any>;
-}
-defineProps<{ richTextElement: RichTextText }>();
-</script>
diff --git a/plugins/1.setupRemoteApi.server.ts b/plugins/1.setupRemoteApi.server.ts
index b9c1398..86c4316 100644
--- a/plugins/1.setupRemoteApi.server.ts
+++ b/plugins/1.setupRemoteApi.server.ts
@@ -32,7 +32,7 @@ export default defineNuxtPlugin(() => {
       appConfig.logLevel ||
       LogLevel.NONE,
     enableEventStream:
-      runtimeConfig.private["enableEventStream"] ||
+      !!runtimeConfig.private["enableEventStream"] ||
       appConfig.enableEventStream ||
       false,
   };

From 050afa4fe971acdccb18d3c87406c0efc6c73702 Mon Sep 17 00:00:00 2001
From: "l.mauser" <l.mauser@wimadev.de>
Date: Mon, 13 Feb 2023 16:15:53 +0100
Subject: [PATCH 2/7] fix(link): internal and external links in richtext

---
 components/Elements/Link.vue | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/components/Elements/Link.vue b/components/Elements/Link.vue
index 3bc4fe7..009cda5 100644
--- a/components/Elements/Link.vue
+++ b/components/Elements/Link.vue
@@ -1,16 +1,28 @@
 <template>
   <span class="bg-green-700 bg-opacity-30">
-    <NuxtLink class="underline" to="/">
-      <ElementsRichText />
-
-      {{ richTextElement.data.data["lt_text"] }}</NuxtLink
+    <NuxtLink
+      v-if="richTextElement.data.template === 'internal_link'"
+      class="underline"
+      :to="internalLinkRoute"
+    >
+      <ElementsRichText :richtext="richTextElement.content" />
+    </NuxtLink>
+    <a
+      v-else
+      :href="richTextElement.data.data['lt_url']"
+      :target="richTextElement.data.data['lt_link_behavior']?.identifier"
+      class="underline"
     >
+      <ElementsRichText :richtext="richTextElement.content"
+    /></a>
   </span>
 </template>
 
 <script setup lang="ts">
 import { RichTextElement, Link } from "fsxa-api";
 
+const { navigationData } = useNavigationData();
+
 interface RichTextLink {
   type: "link";
   content: RichTextElement[];
@@ -19,6 +31,12 @@ interface RichTextLink {
 
 const props = defineProps<{ richTextElement: RichTextLink }>();
 
-console.log("link ");
-console.log(props.richTextElement);
+const internalLinkRoute = computed(() => {
+  const referenceId: string =
+    props.richTextElement.data.data["lt_link"]?.referenceId;
+  if (!referenceId) return "";
+  const target = navigationData.value?.idMap[referenceId];
+  if (target) return target.seoRoute;
+  return "";
+});
 </script>

From 30a61ff5a651f82a77979c6301665102d732b011 Mon Sep 17 00:00:00 2001
From: "l.mauser" <l.mauser@wimadev.de>
Date: Mon, 13 Feb 2023 16:29:48 +0100
Subject: [PATCH 3/7] fix(richtextelement): add styling capabilities

---
 components/Elements/Link.vue            |  2 +-
 components/Elements/RichTextElement.vue | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/components/Elements/Link.vue b/components/Elements/Link.vue
index 009cda5..85b93bf 100644
--- a/components/Elements/Link.vue
+++ b/components/Elements/Link.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="bg-green-700 bg-opacity-30">
+  <span>
     <NuxtLink
       v-if="richTextElement.data.template === 'internal_link'"
       class="underline"
diff --git a/components/Elements/RichTextElement.vue b/components/Elements/RichTextElement.vue
index a365911..07711b0 100644
--- a/components/Elements/RichTextElement.vue
+++ b/components/Elements/RichTextElement.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="border bg-red-800 bg-opacity-20">
+  <span :class="richTextElementClasses">
     <component
       :is="richtTextElementComponent"
       v-if="Array.isArray(richTextElement.content)"
@@ -14,6 +14,7 @@
 
 <script lang="ts" setup>
 import { RichTextElement } from "fsxa-api";
+
 // TODO: remove all data any types
 const props = defineProps<{ richTextElement: RichTextElement }>();
 
@@ -31,4 +32,20 @@ const richtTextElementComponent = computed(() => {
       return resolveComponent("ElementsUnknownRichtextElement");
   }
 });
+
+const richTextElementClasses = computed(() => {
+  const fsStyle = (props.richTextElement.data as Record<string, unknown>)[
+    "data-fs-style"
+  ];
+  console.log(fsStyle);
+
+  switch (fsStyle) {
+    case "format.span_yellow_text":
+      return "text-yellow-500";
+    case "format.standard":
+      return "";
+    default:
+      return "";
+  }
+});
 </script>

From 4835a2d8de3e68093022224f8aefe7e59a98cdb2 Mon Sep 17 00:00:00 2001
From: "l.mauser" <l.mauser@wimadev.de>
Date: Mon, 13 Feb 2023 16:31:14 +0100
Subject: [PATCH 4/7] style(richtextelement): remove logs

---
 components/Elements/RichTextElement.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/components/Elements/RichTextElement.vue b/components/Elements/RichTextElement.vue
index 07711b0..8a55dcc 100644
--- a/components/Elements/RichTextElement.vue
+++ b/components/Elements/RichTextElement.vue
@@ -37,8 +37,6 @@ const richTextElementClasses = computed(() => {
   const fsStyle = (props.richTextElement.data as Record<string, unknown>)[
     "data-fs-style"
   ];
-  console.log(fsStyle);
-
   switch (fsStyle) {
     case "format.span_yellow_text":
       return "text-yellow-500";

From 135839b8c0acaa01b4f31dd12a547887a9279390 Mon Sep 17 00:00:00 2001
From: "l.mauser" <l.mauser@wimadev.de>
Date: Mon, 13 Feb 2023 16:34:12 +0100
Subject: [PATCH 5/7] fix(renderconfig): remove text element

---
 tests/testutils/renderConfig.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/testutils/renderConfig.ts b/tests/testutils/renderConfig.ts
index 76add8b..c8a8872 100644
--- a/tests/testutils/renderConfig.ts
+++ b/tests/testutils/renderConfig.ts
@@ -27,7 +27,6 @@ import RichText from "../../components/Elements/RichText.vue";
 import RichTextElement from "../../components/Elements/RichTextElement.vue";
 import Button from "../../components/Elements/Button.vue";
 import Link from "../../components/Elements/Link.vue";
-import Text from "../../components/Elements/Text.vue";
 
 import InternalLink from "../../components/InternalLink.vue";
 
@@ -58,7 +57,6 @@ export const renderConfig = {
       ElementsRichTextElement: RichTextElement,
       ElementsButton: Button,
       ElementsLink: Link,
-      ElementsText: Text,
 
       NuxtLayout: DefaultLayout,
 

From 1ea8825d2d9c8db3ce14121d983ea6401f786f14 Mon Sep 17 00:00:00 2001
From: "l.mauser" <l.mauser@wimadev.de>
Date: Mon, 13 Feb 2023 16:42:14 +0100
Subject: [PATCH 6/7] docs(richtext): update docs

---
 components/Elements/RichTextElement.vue |  3 ---
 docs/modules/ROOT/pages/Richtext.adoc   | 34 +++++++++++++++++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/components/Elements/RichTextElement.vue b/components/Elements/RichTextElement.vue
index 8a55dcc..e15a8df 100644
--- a/components/Elements/RichTextElement.vue
+++ b/components/Elements/RichTextElement.vue
@@ -8,14 +8,11 @@
       :richtext="richTextElement.content"
     />
     <span v-else>{{ richTextElement.content }}</span>
-    <!--  -->
   </span>
 </template>
 
 <script lang="ts" setup>
 import { RichTextElement } from "fsxa-api";
-
-// TODO: remove all data any types
 const props = defineProps<{ richTextElement: RichTextElement }>();
 
 const richtTextElementComponent = computed(() => {
diff --git a/docs/modules/ROOT/pages/Richtext.adoc b/docs/modules/ROOT/pages/Richtext.adoc
index ff98cdc..6ca9650 100644
--- a/docs/modules/ROOT/pages/Richtext.adoc
+++ b/docs/modules/ROOT/pages/Richtext.adoc
@@ -32,12 +32,16 @@ RichtextElement.vue
 [source,xml]
 ----
 <template>
-  <component
-    :is="richtTextElementComponent"
-    class=""
-    :rich-text-element="richTextElement"
-    :richtext="richTextElement.content"
-  />
+  <span :class="richTextElementClasses">
+    <component
+      :is="richtTextElementComponent"
+      v-if="Array.isArray(richTextElement.content)"
+      class=""
+      :rich-text-element="richTextElement"
+      :richtext="richTextElement.content"
+    />
+    <span v-else>{{ richTextElement.content }}</span>
+  </span>
 </template>
 
 <script setup lang="ts">
@@ -49,9 +53,24 @@ const richtTextElementComponent = computed(() => {
     case "customRichtextElement":
       return resolveComponent("ElementsCustomRichtextComponent");
     default:
-      return resolveComponent("unknown");
+      return resolveComponent("ElementsUnknownRichtextElement");
   }
 });
+
+const richTextElementClasses = computed(() => {
+  const fsStyle = (props.richTextElement.data as Record<string, unknown>)[
+    "data-fs-style"
+  ];
+  switch (fsStyle) {
+    case "format.span_yellow_text":
+      return "text-yellow-500";
+    case "format.standard":
+      return "";
+    default:
+      return "";
+  }
+});
+
 // ...
 </script>
 
@@ -73,7 +92,6 @@ Clicking on it will show you further information about the missing component.
 
 image:RichText/RichTextInfoWindow.png[RichText Info Window]
 
-And finally, clicking the content tab in the info window will reveal all of the data that will be passed into your component.
 
 [source,json]
 ----

From ff73ccd89eab84c8ef07369e6905c4684d8cd765 Mon Sep 17 00:00:00 2001
From: Lukas Mauser <l.mauser@wimadev.de>
Date: Tue, 14 Feb 2023 09:28:34 +0100
Subject: [PATCH 7/7] Update components/Elements/Link.vue

Co-authored-by: Jonas Scholz <Jonas.Scholz@bbscholz.de>
---
 components/Elements/Link.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/Elements/Link.vue b/components/Elements/Link.vue
index 85b93bf..805a139 100644
--- a/components/Elements/Link.vue
+++ b/components/Elements/Link.vue
@@ -35,8 +35,9 @@ const internalLinkRoute = computed(() => {
   const referenceId: string =
     props.richTextElement.data.data["lt_link"]?.referenceId;
   if (!referenceId) return "";
+
   const target = navigationData.value?.idMap[referenceId];
-  if (target) return target.seoRoute;
-  return "";
+
+  return target?.seoRoute ?? "";
 });
 </script>