@worksafevictoria/wcl7.5 1.1.0-beta.9 → 1.1.0-beta.91

package/src/components/Paragraphs/BrowseContent/index.vue

@@ -8,6 +8,7 @@
     :columns="columns"
     :show-load-more="showMore && hasMorePages"
     :class="`wcl-browse-content card_group__card--col-${columns}`"
+    :card-browse-content="true"
     @loadMore="() => loadMoreCards(false)"
   >
     <template
@@ -37,244 +38,226 @@
   </card-group>
 </template>
 
-<script>
+<script setup>
 import CardGroup from '../../SubComponents/CardGroup/index.vue'
 import DirectoryFilters from '../../Global/DirectoryFilters/index.vue'
 import Switcher from './switcher.vue'
 
-export default {
-  name: 'BrowseContent',
-  components: {
-    CardGroup,
-    DirectoryFilters,
-    Switcher
+const nuxtApp = useNuxtApp()
+
+const hasMorePages = ref(false)
+const displayedCards = ref([])
+const loading = ref(true)
+const bundleCache = ref({})
+const displayLimit = ref(0)
+const allCards = ref(undefined)
+const filters = ref({
+  taxonomies: [],
+  selected: {},
+  availableBundles: [],
+})
+const props = defineProps({
+  background: {
+    type: String,
+    default: 'grey',
   },
-  props: {
-    background: {
-      type: String,
-      default: 'grey'
-    },
-    title: {
-      type: String,
-      default: ''
-    },
-    titleTag: {
-      type: String,
-      default: 'h2'
-    },
-    bundle: {
-      type: Array,
-      default: () => ['']
-    },
-    columns: {
-      type: Number,
-      default: 0
-    },
-    initialDisplyLimit: {
-      type: Number,
-      default: 0
-    },
-    fetchContent: {
-      type: Function,
-      required: true
-    },
-    fetchFilters: {
-      type: Function,
-      required: false,
-      default: null
-    },
-    enableBundleFilter: {
-      type: Boolean
-    },
-    getBundleAlias: {
-      type: Function,
-      required: false,
-      default: null
-    },
-    showMore: {
-      type: Boolean
-    },
-    type: {
-      type: String,
-      required: true
-    }
+  title: {
+    type: String,
+    default: '',
   },
-  async fetch() {
-    if (this.displayedCards.length === 0) {
-      await this.loadFiltersAndContent()
-    }
+  titleTag: {
+    type: String,
+    default: 'h2',
   },
-  data() {
-    return {
-      hasMorePages: false,
-      displayedCards: [],
-      loading: true,
-      bundleCache: {},
-      displayLimit: 0,
-      allCards: undefined,
-      filters: {
-        taxonomies: [],
-        selected: {},
-        availableBundles: []
-      }
-    }
+  bundle: {
+    type: Array,
+    default: () => [''],
   },
-  fetchOnServer: true,
-  fetchKey: 'ws-browscontent',
-  methods: {
-    async loadFiltersAndContent() {
-      await Promise.all([
-        this.fetchFilters ? this.loadFilters() : Promise.resolve(),
-        this.loadMoreCards(true)
-      ])
-    },
-    init() {
-      this.allCards = {
-        total: 0,
-        cards: []
-      }
-      this.displayLimit = 0
-      this.hasMorePages = false
-      this.displayedCards = []
-      this.bundleCache = {}
-    },
-    async fetchCards(currentDisplayedCards, allCards, addMoreBy, bundles) {
-      const shouldMakeNewFetchCall =
-        currentDisplayedCards.length + addMoreBy > allCards.cards.length
-      if (shouldMakeNewFetchCall) {
-        const cardBundles = await Promise.all(
-          bundles.map((bundle, index) =>
-            this.getBundle(bundle, addMoreBy, index)
-          )
-        )
-        allCards = this.getShuffledCards(cardBundles)
+  columns: {
+    type: Number,
+    default: 0,
+  },
+  initialDisplyLimit: {
+    type: Number,
+    default: 0,
+  },
+  fetchContent: {
+    type: Function,
+    required: true,
+  },
+  fetchFilters: {
+    type: Function,
+    required: false,
+    default: null,
+  },
+  enableBundleFilter: {
+    type: Boolean,
+  },
+  getBundleAlias: {
+    type: Function,
+    required: false,
+    default: null,
+  },
+  showMore: {
+    type: Boolean,
+  },
+  type: {
+    type: String,
+    required: true,
+  },
+})
 
-        if (
-          this.type === 'paragraph--cards_group_latest' ||
-          this.type === 'paragraph--browse_content'
-        ) {
-          allCards.cards = this.sortByDate(allCards.cards)
-        }
-      }
-      return allCards
-    },
-    async loadMoreCards(init) {
-      const attrs = {
-        group: this.$store?.state?.page?.content?.title
-      }
-      if (this.$gtm && !init) {
-        this.$gtm.push({ event: 'custom.interaction.showmore.click', ...attrs })
-      }
-      if (init) {
-        this.init()
-      }
-      this.loading = true
-      const addMoreBy = this.initialDisplyLimit
-      this.displayLimit += addMoreBy
-      const bundles =
-        this.filters.availableBundles.length > 0
-          ? this.filters.availableBundles
-          : this.bundle
-      this.allCards = await this.fetchCards(
-        this.displayedCards,
-        this.allCards,
-        addMoreBy,
-        bundles
-      )
-      this.hasMorePages = this.allCards.total > this.allCards.cards.length
-      this.displayedCards = this.allCards.cards.slice(0, this.displayLimit)
-      this.loading = false
-    },
-    getBundle(bundle, addMoreBy, index) {
-      let start
-      const rows = addMoreBy
-      const cache = (this.bundleCache[bundle] = this.bundleCache[bundle] || {
-        response: {
-          results: [],
-          numFound: 0
-        },
-        qs: {
-          start
-        }
-      })
+await useAsyncData('fetchData', async () => {
+  try {
+    await Promise.all([
+      props.fetchFilters ? loadFilters() : Promise.resolve(),
+      loadMoreCards(true),
+    ])
+  } catch (err) {
+    console.log('🚀 ~ err:', err)
+  }
+})
 
-      if (cache.qs.start === undefined) {
-        start = 0
-      } else if (cache.response.numFound > cache.response.results.length) {
-        start = cache.response.results.length
-      } else {
-        return Promise.resolve(cache.response)
-      }
+function initial() {
+  allCards.value = {
+    total: 0,
+    cards: [],
+  }
+  displayLimit.value = 0
+  hasMorePages.value = false
+  displayedCards.value = []
+  bundleCache.value = {}
+}
+async function fetchCards(currentDisplayedCards, allCards, addMoreBy, bundles) {
+  const shouldMakeNewFetchCall =
+    currentDisplayedCards.length + addMoreBy > allCards.cards.length
+  if (shouldMakeNewFetchCall) {
+    const cardBundles = await Promise.all(
+      bundles.map((bundle, index) => getBundle(bundle, addMoreBy, index)),
+    )
+    allCards = getShuffledCards(cardBundles)
 
-      const qs = {
-        bundle,
-        rows,
-        start
-      }
-      return this.fetchContent(qs, this.filters.selected, index).then(
-        (response) => {
-          cache.qs.start = qs.start
-          cache.response.numFound = response.numFound
-          cache.response.results.push(...response.results)
-          return cache.response
-        }
-      )
+    if (
+      props.type === 'paragraph--cards_group_latest' ||
+      props.type === 'paragraph--browse_content'
+    ) {
+      allCards.cards = sortByDate(allCards.cards)
+    }
+  }
+  return allCards
+}
+
+async function loadMoreCards(init) {
+  const attrs = {
+    group: nuxtApp.$pageStore?.content?.title,
+  }
+  if (nuxtApp.$gtm && !init) {
+    nuxtApp.$gtm.push({ event: 'custom.interaction.showmore.click', ...attrs })
+  }
+  if (init) {
+    initial()
+  }
+  loading.value = true
+  const addMoreBy = props.initialDisplyLimit
+  displayLimit.value += addMoreBy
+  const bundles =
+    filters.value.availableBundles.length > 0
+      ? filters.value.availableBundles
+      : props.bundle
+  allCards.value = await fetchCards(
+    displayedCards.value,
+    allCards.value,
+    addMoreBy,
+    bundles,
+  )
+  hasMorePages.value = allCards.value.total > allCards.value.cards.length
+  displayedCards.value = allCards.value.cards.slice(0, displayLimit.value)
+  loading.value = false
+}
+async function getBundle(bundle, addMoreBy, index) {
+  let start
+  const rows = addMoreBy
+  const cache = (bundleCache.value[bundle] = bundleCache.value[bundle] || {
+    response: {
+      results: [],
+      numFound: 0,
+    },
+    qs: {
+      start,
     },
-    getShuffledCards(cardBundles) {
-      const shuffled = []
-      const bundleWithMostCards = cardBundles.reduce(
-        (a, b) => (a.results.length > b.results.length ? a : b),
-        { results: [] }
-      ).results.length
+  })
+  if (cache.qs.start === undefined) {
+    start = 0
+  } else if (cache.response.numFound > cache.response.results.length) {
+    start = cache.response.results.length
+  } else {
+    return Promise.resolve(cache.response)
+  }
+  const qs = {
+    bundle,
+    rows,
+    start,
+  }
+  let response = await props.fetchContent(qs, filters.value.selected)
+  cache.qs.start = qs.start
+  cache.response.numFound = response.numFound
+  cache.response.results.push(...response.results)
+  return cache.response
+}
+function getShuffledCards(cardBundles) {
+  const shuffled = []
+  const bundleWithMostCards = cardBundles.reduce(
+    (a, b) => (a.results.length > b.results.length ? a : b),
+    { results: [] },
+  ).results.length
 
-      for (let i = 0; i < bundleWithMostCards; i++) {
-        cardBundles.forEach((bundle) => {
-          if (bundle.results[i]) {
-            shuffled.push(bundle.results[i])
-          }
-        })
+  for (let i = 0; i < bundleWithMostCards; i++) {
+    cardBundles.forEach((bundle) => {
+      if (bundle.results[i]) {
+        shuffled.push(bundle.results[i])
       }
+    })
+  }
 
-      const total = cardBundles.reduce((acc, bundle) => {
-        return acc + bundle.numFound
-      }, 0)
+  const total = cardBundles.reduce((acc, bundle) => {
+    return acc + bundle.numFound
+  }, 0)
 
-      return { cards: shuffled, total }
-    },
-    loadFilters() {
-      return this.fetchFilters().then((taxonomies) => {
-        this.filters.taxonomies = taxonomies
-        return Promise.resolve(taxonomies)
-      })
-    },
-    onFilter(filters) {
-      this.bundleCache = {}
-      Object.keys(filters).forEach((filter) => {
-        this.filters.selected[filter] = filters[filter].map((obj) => obj.tid)
-      })
-      this.loadMoreCards(true)
-    },
-    onSwitcher(switchToBundle) {
-      this.filters.selected = {}
-      this.filters.availableBundles.length = 0
-      if (switchToBundle) {
-        this.filters.availableBundles.push(switchToBundle)
-      }
-      this.loadMoreCards(true)
-    },
-    async reset() {
-      this.bundleCache = {}
-      this.filters.selected = {}
-      this.filters.availableBundles.length = 0
-      await this.loadMoreCards(true)
-    },
-    sortByDate(cards) {
-      const sorted = cards.sort((a, b) => {
-        return new Date(b.dateSort) - new Date(a.dateSort)
-      })
-      return sorted
-    }
+  return { cards: shuffled, total }
+}
+function loadFilters() {
+  return props.fetchFilters().then((taxonomies) => {
+    filters.value.taxonomies = taxonomies
+
+    return Promise.resolve(taxonomies)
+  })
+}
+const onFilter = (fltrs) => {
+  bundleCache.value = {}
+  Object.keys(fltrs).forEach((filter) => {
+    filters.values.selected[filter] = fltrs[filter].map((obj) => obj.tid)
+  })
+  loadMoreCards(true)
+}
+const onSwitcher = (switchToBundle) => {
+  filters.value.selected = {}
+  filters.value.availableBundles.length = 0
+  if (switchToBundle) {
+    filters.value.availableBundles.push(switchToBundle)
   }
+  loadMoreCards(true)
+}
+const reset = async () => {
+  bundleCache.value = {}
+  filters.value.selected = {}
+  filters.value.availableBundles.length = 0
+  await loadMoreCards(true)
+}
+function sortByDate(cards) {
+  const sorted = cards.sort((a, b) => {
+    return new Date(b.dateSort) - new Date(a.dateSort)
+  })
+  return sorted
 }
 </script>
 <style lang="scss" scoped>
@@ -283,14 +266,17 @@ export default {
     align-items: flex-end;
     place-content: flex-end;
   }
+
   &.card_group__card--col-4 {
     :deep(.card-grid__column .card-grid-item__description) {
       display: none;
     }
   }
+
   :deep(.card_group__card--blue .card_item__desc p) {
     margin-top: 12px;
   }
+
   :deep(.card_group__card--red .card_item__desc p) {
     margin-top: 12px;
   }

package/src/components/Paragraphs/Calculator/Constants.js

@@ -29,9 +29,9 @@ export const barItems = [
 
 export const cardTitles = {
   weight: {
-    heading: 'Pick a object?',
+    heading: 'Pick an object?',
     subHeading:
-      '<p>Pick a object from the selections or if you know exactly how heavy the object that is being dropped is, enter the weight in input box below</p>',
+      '<p>Pick an object from the selections or if you know exactly how heavy the object that is being dropped is, enter the weight in input box below</p>',
     selectHeading: 'How heavy is the object?',
     selectSubHeading: 'Weight in kilograms, max is 500 kg'
   },

package/src/components/Paragraphs/Calculator/index.stories.js

@@ -12,6 +12,7 @@ import {
 export default {
   title: 'Paragraphs/Calculator',
   component: Calculator,
+  tags: ['autodocs'],
   args: {
     items: barItems,
     titles: cardTitles,