fixing link logic in HomepageTeaserBlock (#704)

* fixing link logic in HomepageTeaserBlock * fixing a missed operator
nasa-jpl · Nov 21, 2024 · 2735223 · 2735223
1 parent 5295a4a
commit 2735223
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/.changeset/slimy-hairs-rush.md b/.changeset/slimy-hairs-rush.md
@@ -0,0 +1,5 @@
+---
+"@explorer-1/vue": patch
+---
+
+Fixing link logic in HomepageTeaserBlock
diff --git a/packages/vue/src/components/HomepageTeaserBlock/HomepageTeaserBlock.vue b/packages/vue/src/components/HomepageTeaserBlock/HomepageTeaserBlock.vue
@@ -33,14 +33,14 @@
             class="lg:pr-14"
             :text="data.paragraph"
           />
-          <template v-if="data.link && theLink">
+          <template v-if="data.link || theExternalLink">
             <BaseLink
               variant="primary"
               class="mt-5"
               link-class="inline-block"
               caret-wrapper-class="py-2"
-              :href="theLink"
-              :to="data.link.page ? data.link.page.url : null"
+              :href="theExternalLink"
+              :to="data.link.page ? data.link.page.url : undefined"
               external-target-blank
             >
               {{ data.link.text }}
@@ -60,13 +60,13 @@
               v-if="theCard.image"
               class="relative h-auto"
             >
-              <template v-if="theCard.link && theLink">
+              <template v-if="theCard.link || theCardExternalLink">
                 <BaseLink
                   variant="none"
                   link-class="block"
                   :aria-label="theCard.link.text || 'Learn more'"
-                  :href="theLink"
-                  :to="theCard.link.page ? theCard.link.page.url : null"
+                  :href="theCardExternalLink"
+                  :to="theCard.link.page?.url || undefined"
                   external-target-blank
                 >
                   <HomepageTeaserBlockCardImage :data="theCard" />
@@ -87,14 +87,14 @@
                 {{ theCard.description }}
               </p>
 
-              <template v-if="theCard.link && theLink">
+              <template v-if="theCard.link || theCardExternalLink">
                 <BaseLink
                   variant="primary"
                   class="mt-3"
                   link-class="inline-block"
                   caret-wrapper-class="py-2"
-                  :href="theLink"
-                  :to="theCard.link.page ? theCard.link.page.url : null"
+                  :href="theCardExternalLink"
+                  :to="theCard.link.page ? theCard.link.page.url : undefined"
                   external-target-blank
                 >
                   {{ theCard.link.text }}
@@ -135,20 +135,23 @@ export default defineComponent({
     }
   },
   computed: {
-    theCard(): object | null {
-      if (this.data.card && this.data.card.length > 0) {
-        return this.data.card[0]
+    theCard(): object | undefined {
+      if (this.data?.card && this.data.card.length > 0) {
+        return this.data?.card[0]
       }
-      return null
+      return undefined
     },
     hasCoverImage(): boolean {
       if (this.data.coverImage && this.data.coverImage.src) {
         return true
       }
       return false
     },
-    theLink() {
-      return mixinGetExternalLink(this.data.link) || undefined
+    theExternalLink() {
+      return mixinGetExternalLink(this.data?.link) || undefined
+    },
+    theCardExternalLink() {
+      return mixinGetExternalLink(this.theCard?.link) || undefined
     },
     theSrcSet() {
       return this.data.coverImage

diff --git a/packages/vue/src/utils/mixins.ts b/packages/vue/src/utils/mixins.ts
@@ -217,9 +217,9 @@ export const mixinGetSrcSet = (srcSetObject: Partial<ImageObject>): string => {
 }
 // Use with RelatedLinkBlock to retrieve the external link to use with an href prop
 export const mixinGetExternalLink = (link: RelatedLinkObject): string | undefined => {
-  if (link.externalLink) {
+  if (link?.externalLink) {
     return link.externalLink
-  } else if (link.document) {
+  } else if (link?.document) {
     return link.document.url
   }
   return undefined