@worksafevictoria/wcl7.5 1.2.0 → 1.2.1

package/src/components/SubComponents/ResourceGroup/index.vue

@@ -1,119 +1,122 @@
 <template>
-  <card-grid
-    :title="title"
-    :title-tag="titleTag"
-    :cards="displayedCards"
-    :rtl="rtl"
-    :force-lg-columns-per-row="columns"
-    :force-md-columns-per-row="columns"
-    :force-sm-columns-per-row="columns"
-    :is-selectable="false"
-    :row-spacing="'large'"
-    :class="[`card_group--${background}`, `card_group--${cardResourseType}`]"
-    :background-variant="background"
-    @selected="selectedCard"
-  >
-    <template
-      v-if="enableBundleFilter && bundle.length > 1"
-      v-slot:gridHeaderRight
+  <div>
+    <card-grid
+      :title="title"
+      :title-tag="titleTag"
+      :cards="displayedCards"
+      :rtl="rtl"
+      :force-lg-columns-per-row="columns"
+      :force-md-columns-per-row="columns"
+      :force-sm-columns-per-row="columns"
+      :is-selectable="false"
+      :row-spacing="'large'"
+      :class="[`card_group--${background}`, `card_group--${cardResourseType}`]"
+      :background-variant="background"
+      @selected="selectedCard"
     >
-      <switcher
-        v-if="enableBundleFilter"
-        :options="bundle"
-        class="card_group__switcher"
-        :get-option-alias="getBundleAlias"
-        @switched="onSwitcher"
-        @reset="onSwitcher"
-      />
-    </template>
-
-    <template v-if="filters.taxonomies.length > 0" v-slot:gridPreContent>
-      <directory-filters
-        class="card_group__filter"
-        :filters="filters"
-        :results="allCards.total"
-        :is-filtering="loader"
-        @onFilter="onFilter"
-        @onReset="reset"
-      />
-    </template>
-
-    <template v-slot:cardItem="{ card }">
-      <card-grid-item
-        v-if="card"
-        :show-divider="false"
-        :header-size="'large'"
-        class="card_group__card"
-        :class="{
-          [`card_group__card--${card.colour}`]: card.pillText,
-          [`card_group__card--none`]: !card.pillText,
-          [`card_group__card--${cardResourseType}`]: 'card_group__card--resourse-group'
-        }"
-        :card-header-title="card.title"
-        :caret="getCaret(card)"
-        :description="card.description"
-        :card-padding="'none'"
-        :caret-position="'bottom'"
-        :rtl="card.rtl"
-        :border-type="background === 'white' ? 'thick' : 'none'"
-        :pill-text="card.pillText"
-        :link="card.link ? card.link : false"
-        :taxonomies="{
-          industry: card.industry,
-          topic: card.topic,
-          language: card.language
-        }"
+      <template
+        v-if="enableBundleFilter && bundle.length > 1"
+        v-slot:gridHeaderRight
       >
-        <template v-slot:cardTop>
-          <card-top :card="card" :resource-type="cardResourseType" />
-        </template>
+        <switcher
+          v-if="enableBundleFilter"
+          :options="bundle"
+          class="card_group__switcher"
+          :get-option-alias="getBundleAlias"
+          @switched="onSwitcher"
+          @reset="onSwitcher"
+        />
+      </template>
 
-        <template v-slot:cardDescription>
-          <card-body :card="card" :resource-type="cardResourseType" />
-        </template>
+      <template v-if="filters.taxonomies.length > 0" v-slot:gridPreContent>
+        <directory-filters
+          class="card_group__filter"
+          :filters="filters"
+          :results="allCards.total"
+          :is-filtering="loader"
+          @onFilter="onFilter"
+          @onReset="reset"
+        />
+      </template>
 
-        <!-- footer - download button -->
-        <template
-          v-if="cardResourseType === 'resource-group'"
-          v-slot:cardFooter
+      <template v-slot:cardItem="{ card }">
+        <card-grid-item
+          v-if="card"
+          :show-divider="false"
+          :header-size="'large'"
+          class="card_group__card"
+          :class="{
+            [`card_group__card--${card.colour}`]: card.pillText,
+            [`card_group__card--none`]: !card.pillText,
+            [`card_group__card--${cardResourseType}`]:
+              'card_group__card--resourse-group',
+          }"
+          :card-header-title="card.title"
+          :caret="getCaret(card)"
+          :description="card.description"
+          :card-padding="'none'"
+          :caret-position="'bottom'"
+          :rtl="card.rtl"
+          :border-type="background === 'white' ? 'thick' : 'none'"
+          :pill-text="card.pillText"
+          :link="card.link ? card.link : false"
+          :taxonomies="{
+            industry: card.industry,
+            topic: card.topic,
+            language: card.language,
+          }"
         >
-          <card-footer :card="card" :resource-type="cardResourseType" />
-        </template>
-      </card-grid-item>
-    </template>
+          <template v-slot:cardTop>
+            <card-top :card="card" :resource-type="cardResourseType" />
+          </template>
+
+          <template v-slot:cardDescription>
+            <card-body :card="card" :resource-type="cardResourseType" />
+          </template>
 
-    <template
-      v-if="
-        loader ||
+          <!-- footer - download button -->
+          <template
+            v-if="cardResourseType === 'resource-group'"
+            v-slot:cardFooter
+          >
+            <card-footer :card="card" :resource-type="cardResourseType" />
+          </template>
+        </card-grid-item>
+      </template>
+
+      <template
+        v-if="
+          loader ||
           (displayedCards.length === 0 && !loader) ||
           $slots.cardGroupFooter ||
           (!loader && showLoadMore && hasMorePages)
-      "
-      v-slot:cardGridFooter
-    >
-      <column v-if="loader" sm="12">
-        <strong>Loading... </strong>
-        <b-spinner class="float-right"></b-spinner>
-      </column>
-      <column v-if="displayedCards.length === 0 && !loading" sm="12">
-        <strong>{{ emptyCardsText }}</strong>
-      </column>
-      <column v-if="$slots.cardGroupFooter" sm="12">
-        <slot name="cardGroupFooter"></slot>
-      </column>
-      <column v-if="!loader && showLoadMore" sm="12" class="text-center">
-        <cta-button
-          type="dark"
-          :focus-outline="'light'"
-          :text-only="true"
-          :is-centred="true"
-          :class="'card_group__loadmore mb-0'"
-          @clicked="handleLoadMore"
-          >Load more</cta-button
-        >
-      </column>
-    </template>
-  </card-grid>
+        "
+        v-slot:cardGridFooter
+      >
+        <column v-if="loader" sm="12">
+          <strong>Loading... </strong>
+          <b-spinner class="float-right"></b-spinner>
+        </column>
+        <column v-if="displayedCards.length === 0 && !loading" sm="12">
+          <strong>{{ emptyCardsText }}</strong>
+        </column>
+        <column v-if="$slots.cardGroupFooter" sm="12">
+          <slot name="cardGroupFooter"></slot>
+        </column>
+        <column v-if="!loader && showLoadMore" sm="12" class="text-center">
+          <cta-button
+            type="dark"
+            :focus-outline="'light'"
+            :text-only="true"
+            :is-centred="true"
+            :class="'card_group__loadmore mb-0'"
+            @clicked="handleLoadMore"
+            >Load more</cta-button
+          >
+        </column>
+      </template>
+    </card-grid>
+  </div>
 </template>
 
 <script>
@@ -129,7 +132,7 @@ import Switcher from './switcher.vue'
 import {
   isAbsoluteUrl,
   navigateToPath,
-  isGovSite
+  isGovSite,
 } from './../../../../lib/utility'
 import { BSpinner } from 'bootstrap-vue-next'
 
@@ -145,80 +148,92 @@ export default {
     CtaButton,
     DirectoryFilters,
     Switcher,
-    BSpinner
+    BSpinner,
   },
   props: {
     background: {
       type: String,
-      default: 'white'
+      default: 'white',
     },
     title: {
       type: String,
-      default: ''
+      default: '',
     },
     titleTag: {
       type: String,
-      default: 'h2'
+      default: 'h2',
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     bundle: {
       type: Array,
-      default: () => ['']
+      default: () => [''],
     },
     columns: {
       type: Number,
-      default: 3
+      default: 3,
     },
     initialDisplyLimit: {
       type: Number,
-      default: 0
+      default: 0,
     },
     fetchContent: {
       type: Function,
-      required: true
+      required: true,
     },
     fetchFilters: {
       type: Function,
       required: false,
-      default: null
+      default: null,
     },
     enableBundleFilter: {
-      type: Boolean
+      type: Boolean,
     },
     getBundleAlias: {
       type: Function,
       required: false,
-      default: null
+      default: null,
     },
     type: {
       type: String,
-      required: true
+      required: true,
     },
     resourceType: {
       type: String,
-      default: 'resource-group'
+      default: 'resource-group',
     },
     showLoadMore: {
       type: Boolean,
-      default: false
+      default: false,
     },
     emptyCardsText: {
       type: String,
-      default: 'No results returned'
+      default: 'No results returned',
     },
     loading: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
-  async fetch() {
+  // Temp use of mounted to replace fetch
+  async mounted() {
     if (this.displayedCards.length === 0) {
+      console.log(
+        '🚀 ~ mounted ~ this.displayedCards.length:',
+        this.displayedCards.length,
+      )
       await this.loadFiltersAndContent()
     }
   },
+  // TODO useAsyncData <script setup>
+  // async fetch() {
+  //   if (this.displayedCards.length === 0) {
+  //     await this.loadFiltersAndContent()
+  //   }
+  // },
+
   data() {
     return {
       loader: this.loading,
@@ -231,8 +246,8 @@ export default {
       filters: {
         taxonomies: [],
         selected: {},
-        availableBundles: []
-      }
+        availableBundles: [],
+      },
     }
   },
   computed: {
@@ -241,7 +256,7 @@ export default {
         return this.rtl
       }
       return this.displayedCards.every((card) => this.rtl || card.rtl)
-    }
+    },
   },
   fetchOnServer: true,
   fetchKey: 'wcl-card-group',
@@ -249,13 +264,17 @@ export default {
     async loadFiltersAndContent() {
       await Promise.all([
         this.fetchFilters ? this.loadFilters() : Promise.resolve(),
-        this.loadMoreCards(true)
+        this.loadMoreCards(true),
       ])
+      console.log(
+        '🚀 ~ loadFiltersAndContent ~ this.fetchFilters:',
+        this.fetchFilters,
+      )
     },
     init() {
       this.allCards = {
         total: 0,
-        cards: []
+        cards: [],
       }
       this.displayLimit = 0
       this.hasMorePages = false
@@ -269,8 +288,8 @@ export default {
       if (shouldMakeNewFetchCall) {
         const cardBundles = await Promise.all(
           bundles.map((bundle, index) =>
-            this.getBundle(bundle, addMoreBy, index)
-          )
+            this.getBundle(bundle, addMoreBy, index),
+          ),
         )
 
         allCards = this.getShuffledCards(cardBundles)
@@ -288,7 +307,7 @@ export default {
     },
     async loadMoreCards(init) {
       const attrs = {
-        group: this.$store?.state?.page?.content?.title
+        group: this.$store?.state?.page?.content?.title,
       }
       if (this.$gtm && !init) {
         this.$gtm.push({ event: 'custom.interaction.showmore.click', ...attrs })
@@ -307,7 +326,7 @@ export default {
         this.displayedCards,
         this.allCards,
         addMoreBy,
-        bundles
+        bundles,
       )
 
       this.hasMorePages = this.allCards.total > this.allCards.cards.length
@@ -321,11 +340,11 @@ export default {
       const cache = (this.bundleCache[bundle] = this.bundleCache[bundle] || {
         response: {
           results: [],
-          numFound: 0
+          numFound: 0,
         },
         qs: {
-          start
-        }
+          start,
+        },
       })
 
       if (cache.qs.start === undefined) {
@@ -339,7 +358,7 @@ export default {
       const qs = {
         bundle,
         rows,
-        start
+        start,
       }
       return this.fetchContent(qs, this.filters.selected, index).then(
         (response) => {
@@ -347,14 +366,14 @@ export default {
           cache.response.numFound = response.numFound
           cache.response.results.push(...response.results)
           return cache.response
-        }
+        },
       )
     },
     getShuffledCards(cardBundles) {
       const shuffled = []
       const bundleWithMostCards = cardBundles.reduce(
         (a, b) => (a.results.length > b.results.length ? a : b),
-        { results: [] }
+        { results: [] },
       ).results.length
 
       for (let i = 0; i < bundleWithMostCards; i++) {
@@ -373,6 +392,7 @@ export default {
     },
     loadFilters() {
       return this.fetchFilters().then((taxonomies) => {
+        console.log('🚀 ~ returnthis.fetchFilters ~ taxonomies:', taxonomies)
         this.filters.taxonomies = taxonomies
         return Promise.resolve(taxonomies)
       })
@@ -425,31 +445,31 @@ export default {
           navigateToPath.call(
             this,
             card?.selectedCard?.link,
-            card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+            card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
           )
         }
       } else {
         navigateToPath.call(
           this,
           card?.selectedCard?.link,
-          card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+          card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
         )
       }
     },
     focussed(ev) {
       const path = ev.path || (ev.composedPath && ev.composedPath())
       const theTabbedCards = path.find(
-        (el) => el['_prevClass'] === 'tabbed-cards'
+        (el) => el['_prevClass'] === 'tabbed-cards',
       )
       if (ev.shiftKey && theTabbedCards) {
         ev.preventDefault()
-        let selectedTabbedCards = theTabbedCards.getElementsByClassName(
-          'isSelected'
-        )
+        let selectedTabbedCards =
+          theTabbedCards.getElementsByClassName('isSelected')
         let selectedCard = selectedTabbedCards[0].getElementsByTagName('button')
-        let thePrevLGItem = ev.target?.parentElement?.parentElement?.previousSibling?.getElementsByTagName(
-          'button'
-        )
+        let thePrevLGItem =
+          ev.target?.parentElement?.parentElement?.previousSibling?.getElementsByTagName(
+            'button',
+          )
         if (thePrevLGItem) {
           thePrevLGItem[0].focus()
         } else {
@@ -457,15 +477,16 @@ export default {
         }
       } else if (!ev.shiftKey && theTabbedCards) {
         ev.preventDefault()
-        let selectedTabbedCards = theTabbedCards.getElementsByClassName(
-          'isSelected'
-        )
-        let nextTabbedCard = selectedTabbedCards[0]?.parentElement?.nextSibling?.getElementsByTagName(
-          'button'
-        )
-        let theNextLGItem = ev.target?.parentElement?.parentElement?.nextSibling?.getElementsByTagName(
-          'button'
-        )
+        let selectedTabbedCards =
+          theTabbedCards.getElementsByClassName('isSelected')
+        let nextTabbedCard =
+          selectedTabbedCards[0]?.parentElement?.nextSibling?.getElementsByTagName(
+            'button',
+          )
+        let theNextLGItem =
+          ev.target?.parentElement?.parentElement?.nextSibling?.getElementsByTagName(
+            'button',
+          )
         if (theNextLGItem) {
           theNextLGItem[0].focus()
         } else if (nextTabbedCard) {
@@ -489,7 +510,7 @@ export default {
           'button:not([disabled]):not([tabindex="-1"])',
           'input:not([disabled]):not([tabindex="-1"])',
           'select:not([disabled]):not([tabindex="-1"])',
-          '[tabindex]:not([disabled]):not([tabindex="-1"])'
+          '[tabindex]:not([disabled]):not([tabindex="-1"])',
           /* add custom queries here */
         ].join(','),
         queryResult = Array.prototype.filter.call(
@@ -501,7 +522,7 @@ export default {
               elem.offsetHeight > 0 ||
               elem === activeElem
             )
-          }
+          },
         ),
         indexedList = queryResult
           .slice()
@@ -515,20 +536,20 @@ export default {
               ? a.tabIndex < b.tabIndex
                 ? -1
                 : b.tabIndex < a.tabIndex
-                ? 1
-                : 0
+                  ? 1
+                  : 0
               : a.tabIndex != 0
-              ? -1
-              : b.tabIndex != 0
-              ? 1
-              : 0
+                ? -1
+                : b.tabIndex != 0
+                  ? 1
+                  : 0
           }),
         focusable = [].concat(
           indexedList,
           queryResult.filter((elem) => {
             /* filter out all indexes above 0 */
             return elem.tabIndex == 0 || elem.tabIndex == -1 ? true : false
-          })
+          }),
         )
 
       /* if reverse is true return the previous focusable element
@@ -537,8 +558,8 @@ export default {
         ? focusable[focusable.indexOf(activeElem) - 1] ||
             focusable[focusable.length - 1]
         : focusable[focusable.indexOf(activeElem) + 1] || focusable[0]
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -551,6 +572,7 @@ $borderRadius: 8px;
     &--resource-list {
       :deep(.section-group__content) {
         display: flex;
+
         > .row {
           flex: 0 0 70%;
         }
@@ -558,6 +580,7 @@ $borderRadius: 8px;
     }
   }
 }
+
 .card_group {
   &--resource-list {
     :deep(.card-body) {
@@ -566,6 +589,7 @@ $borderRadius: 8px;
     }
   }
 }
+
 .card_group__card--resource-group {
   :deep(.card-body) {
     padding-left: $cardTextPadding !important;

package/vite.config.js

@@ -1,24 +1,36 @@
 import { fileURLToPath, URL } from 'node:url'
 import svgLoader from 'vite-svg-loader'
-import { defineConfig } from 'vite'
+import { defineConfig, loadEnv } from 'vite'
 import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    vue(), svgLoader()
-  ],
-  resolve: {
-    alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
+export default defineConfig(({ command, mode }) => {
+  // Load env file based on `mode` in the current working directory.
+  // Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
+  const env = loadEnv(mode, process.cwd(), '')
+
+  return{
+    css: {
+      preprocessorOptions: {
+        scss: {
+          api: 'modern-compiler', // or "modern", "legacy"
+        },
+      },
+    },
+    plugins: [
+      vue(), svgLoader()
+    ],
+    resolve: {
+      alias: {
+        '@': fileURLToPath(new URL('./src', import.meta.url))
+      }
+    },
+    define: {
+      SHOW_COOKIE: JSON.stringify(env.SHOW_COOKIE),
+      'process.env.CONTENT_API_URL': `"${process.env.CONTENT_API_URL}"`,
+      'process.env.IS_STORYBOOK': `"${process.env.IS_STORYBOOK}"`,
+      'process.env.CARETAKER': `"${process.env.CARETAKER}"`,
+      'process.env.GOOGLE__URL': `"${process.env.GOOGLE__URL}"`
     }
-  },
-  define: {
-     'process.env.SHOW_COOKIE': `"${process.env.SHOW_COOKIE}"`,
-    'process.env.CONTENT_API_URL': `"${process.env.CONTENT_API_URL}"`,
-    'process.env.IS_STORYBOOK': `"${process.env.IS_STORYBOOK}"`,
-    'process.env.CARETAKER': `"${process.env.CARETAKER}"`,
-    'process.env.SHOW_GLOBAL_NOTICE': `"${process.env.SHOW_GLOBAL_NOTICE}"`,
-    'process.env.GOOGLE__URL': `"${process.env.GOOGLE__URL}"`
   }
 })