From d61968b1e5d7856fbc5e6f67c8d2da217f3cacac Mon Sep 17 00:00:00 2001
From: Stephanie Smith <stephiescastle@users.noreply.github.com>
Date: Thu, 5 Sep 2024 21:32:10 -0700
Subject: [PATCH] fixing /home/ prefix, Search filter behavior tweaks (#602)

* fixing final instance of unfiltered links to account for /home/ prefix

* clean up

* tweaks to filter behavior for EDU, adding target audience to event search cards

* fixing a regression in SearchFilterGroup
---
 .../src/components/BaseButton/BaseButton.vue  | 21 ++++++++--------
 .../BlockLinkCard/BlockLinkCard.vue           |  8 +++++-
 .../SearchFilterGroup/SearchFilterGroup.vue   | 25 +++++++++++++------
 .../SearchResultCard/SearchResultCard.vue     |  7 +++++-
 .../SearchResultGridItem.vue                  |  7 +++++-
 .../SearchResultsList/SearchResultsList.vue   |  6 +++++
 packages/vue/src/interfaces.ts                |  6 +++--
 7 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/packages/vue/src/components/BaseButton/BaseButton.vue b/packages/vue/src/components/BaseButton/BaseButton.vue
index ba4ea95e..9530c03e 100644
--- a/packages/vue/src/components/BaseButton/BaseButton.vue
+++ b/packages/vue/src/components/BaseButton/BaseButton.vue
@@ -65,16 +65,6 @@ export default defineComponent({
         return 'button'
       }
     },
-    // necessary for valid html
-    // must account for <a>, <nuxt-link>, and <button> use-cases
-    theHref(): string | undefined {
-      if (this.tag === 'nuxt-link') {
-        return this.to as string
-      } else if (this.tag === 'a') {
-        return this.href
-      }
-      return undefined
-    },
     computedTo() {
       let toValue = this.to
       // filter out unnecessary `/home/` prefix from wagtail default site urlPaths
@@ -83,6 +73,17 @@ export default defineComponent({
       }
       return toValue
     },
+    // necessary for valid html
+    // must account for <a>, <nuxt-link>, and <button> use-cases
+    theHref(): string | undefined {
+      let href = undefined
+      if (this.computedTo && typeof this.computedTo === 'string') {
+        href = this.computedTo
+      } else if (this.tag === 'a') {
+        href = this.href
+      }
+      return href
+    },
     variantClass(): string {
       let classes = variants[this.variant]
       if (!this.$slots.default && this.$slots.icon) {
diff --git a/packages/vue/src/components/BlockLinkCard/BlockLinkCard.vue b/packages/vue/src/components/BlockLinkCard/BlockLinkCard.vue
index 24a62404..9d42bfcb 100644
--- a/packages/vue/src/components/BlockLinkCard/BlockLinkCard.vue
+++ b/packages/vue/src/components/BlockLinkCard/BlockLinkCard.vue
@@ -96,9 +96,15 @@
       >
         {{ theItem.title }}
       </component>
+      <p
+        v-if="(theItem as EventCardObject).targetAudience"
+        :class="{ 'mt-2': !large, 'mt-4': large }"
+      >
+        <strong>Target Audience:</strong> {{ (theItem as EventCardObject).targetAudience }}
+      </p>
       <p
         v-if="theItem.date && !themeStore.isEdu"
-        class="text-gray-mid-dark mt-2"
+        class="text-gray-mid-dark"
         :class="{ 'mt-2': !large, 'mt-4': large }"
       >
         {{ theItem.date }}
diff --git a/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue b/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue
index 157a3888..9f695655 100644
--- a/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue
+++ b/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue
@@ -1,11 +1,6 @@
 <template>
   <div
-    v-if="
-      typeof groupKey !== 'undefined' &&
-      typeof buckets !== 'undefined' &&
-      bucketsLength >= 1 &&
-      !hideFilterGroups.includes(groupKey)
-    "
+    v-if="showFilterGroup"
     :id="`filterGroup_${groupKey}`"
     class="border-gray-light-mid col-span-3 pb-4 mb-4 border-b"
   >
@@ -13,7 +8,10 @@
     <legend class="md:mb-3 text-body-md mb-2 font-bold leading-normal tracking-wide">
       {{ groupTitle }}
     </legend>
-    <div class="buckets">
+    <div
+      v-if="buckets?.length"
+      class="buckets"
+    >
       <div
         v-for="(bucket, index) in buckets"
         :key="bucket.key"
@@ -43,6 +41,7 @@
         </div>
       </div>
     </div>
+    <div v-else><span class="text-sm text-gray-mid-dark">No matching filters</span></div>
     <!--
       TODO: this logic could probably cleaner. It flows in the opposite way of the loop
       for making checkboxes above.
@@ -116,6 +115,18 @@ export default {
     },
     bucketsLength() {
       return this.buckets.length
+    },
+    showFilterGroup() {
+      if (this.themeStore.isEdu) {
+        return this.groupTitle && !this.hideFilterGroups.includes(this.groupKey)
+      } else {
+        return (
+          typeof this.groupKey !== 'undefined' &&
+          typeof this.buckets !== 'undefined' &&
+          this.bucketsLength >= 1 &&
+          !this.hideFilterGroups.includes(this.groupKey)
+        )
+      }
     }
   },
   watch: {
diff --git a/packages/vue/src/components/SearchResultCard/SearchResultCard.vue b/packages/vue/src/components/SearchResultCard/SearchResultCard.vue
index 6cc52df8..543d70c9 100644
--- a/packages/vue/src/components/SearchResultCard/SearchResultCard.vue
+++ b/packages/vue/src/components/SearchResultCard/SearchResultCard.vue
@@ -24,7 +24,8 @@
           ongoing,
           primarySubject,
           gradeLevels,
-          time
+          time,
+          targetAudience
         }
       }"
       show-calendar-chip
@@ -343,6 +344,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    targetAudience: {
+      type: String,
+      default: undefined
+    },
     primarySubject: {
       type: Object as PropType<PrimarySubjectObject>,
       default: undefined
diff --git a/packages/vue/src/components/SearchResultGridItem/SearchResultGridItem.vue b/packages/vue/src/components/SearchResultGridItem/SearchResultGridItem.vue
index 6a8a81df..ea2d2b85 100644
--- a/packages/vue/src/components/SearchResultGridItem/SearchResultGridItem.vue
+++ b/packages/vue/src/components/SearchResultGridItem/SearchResultGridItem.vue
@@ -21,7 +21,8 @@
           ongoing,
           primarySubject,
           gradeLevels,
-          time
+          time,
+          targetAudience
         }
       }"
       :heading-level="headingLevel"
@@ -174,6 +175,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    targetAudience: {
+      type: String,
+      default: undefined
+    },
     location: {
       type: String,
       default: undefined
diff --git a/packages/vue/src/components/SearchResultsList/SearchResultsList.vue b/packages/vue/src/components/SearchResultsList/SearchResultsList.vue
index cc5a6485..19dd6afa 100644
--- a/packages/vue/src/components/SearchResultsList/SearchResultsList.vue
+++ b/packages/vue/src/components/SearchResultsList/SearchResultsList.vue
@@ -30,6 +30,7 @@
           :end-time="page.endTime"
           :event-type="page.eventType"
           :ongoing="page.ongoing"
+          :target-audience="page.targetAudience"
           :location="page.location"
           :primary-subject="page.primarySubject as unknown as PrimarySubjectObject"
           :grade-levels="page.gradeLevels as unknown as GradeLevelsObject[]"
@@ -55,6 +56,7 @@
           :end-time="page.endTime"
           :event-type="page.eventType"
           :ongoing="page.ongoing"
+          :target-audience="page.targetAudience"
           :location="page.location"
           :primary-subject="page.primarySubject as unknown as PrimarySubjectObject"
           :grade-levels="page.gradeLevels as unknown as GradeLevelsObject[]"
@@ -216,6 +218,10 @@ export default defineComponent({
                 handle === 'edu_events_edueventpage'
                   ? page._source.edu_events_edueventpage__ongoing
                   : undefined
+              page.targetAudience =
+                handle === 'edu_events_edueventpage'
+                  ? page._source.edu_events_edueventpage__target_audience
+                  : undefined
               // edu resources
               page.gradeLevels = gradeLevels
               page.time = time
diff --git a/packages/vue/src/interfaces.ts b/packages/vue/src/interfaces.ts
index b3ab059c..7fc3cdaa 100644
--- a/packages/vue/src/interfaces.ts
+++ b/packages/vue/src/interfaces.ts
@@ -93,8 +93,9 @@ export interface ElasticSearchPage {
   eventType?: string
   ongoing?: boolean
   primarySubject?: string
-  gradeLevels: string
-  time: string
+  gradeLevels?: string
+  time?: string
+  targetAudience?: string
 }
 
 export interface FormOption {
@@ -136,6 +137,7 @@ export interface EventCardObject extends Card {
   locationName?: string
   location?: string
   locationLink?: string
+  targetAudience?: string
 }
 
 export interface PrimarySubjectObject {