@worksafevictoria/wcl7.5 1.1.0-beta.8 → 1.1.0-beta.80

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

@@ -26,9 +26,9 @@
       <div v-else class="paragraph--directory__loading-container">
         <loading />
       </div>
-      <div v-if="showPagination" align="center">
+      <div v-if="showPagination" align-items="center">
         <pagination
-          align="center"
+          align-items="center"
           aria-label="Page navigation to load more records"
           :rows="qs.rows"
           :offset="qs.start"
@@ -39,7 +39,7 @@
           @pageClicked="loadByPageNumber($event)"
         />
       </div>
-      <div v-if="noResultsFound" align="center">
+      <div v-if="noResultsFound" align-items="center">
         <div>
           <p>No records found, please try a different search.</p>
         </div>
@@ -49,10 +49,10 @@
 </template>
 <script>
 import { DIR_CONFIG } from './constants'
-import DirectoryFilters from '../../Global/DirectoryFilters'
-import Records from './Records/'
-import Pagination from '../../SubComponents/Pagination'
-import Loading from '../../SubComponents/Loading'
+import DirectoryFilters from '../../Global/DirectoryFilters/index.vue'
+import Records from './Records/index.vue'
+import Pagination from '../../SubComponents/Pagination/index.vue'
+import Loading from '../../SubComponents/Loading/index.vue'
 import SectionGroup from '../../Containers/SectionGroup/index.vue'
 
 export default {
@@ -62,30 +62,40 @@ export default {
     Records,
     Pagination,
     Loading,
-    SectionGroup
+    SectionGroup,
   },
   props: {
     options: {
       type: Object,
-      default: () => {}
+      default: () => {},
     },
     fetchFilters: {
       type: Function,
-      required: true
+      required: true,
     },
     fetchRecords: {
       type: Function,
-      required: true
-    }
+      required: true,
+    },
   },
-  async fetch() {
+  // Temp use of mounted to replace fetch
+  async mounted() {
     await this.loadFilters(
-      this.DIR_CONFIG[this.options.field_directory_type].taxonomies
+      this.DIR_CONFIG[this.options.field_directory_type].taxonomies,
     )
     this.loadSortOptions(
-      this.DIR_CONFIG[this.options.field_directory_type].sorting
+      this.DIR_CONFIG[this.options.field_directory_type].sorting,
     )
   },
+  // TODO useAsyncData <script setup>
+  // async fetch() {
+  //   await this.loadFilters(
+  //     this.DIR_CONFIG[this.options.field_directory_type].taxonomies
+  //   )
+  //   this.loadSortOptions(
+  //     this.DIR_CONFIG[this.options.field_directory_type].sorting
+  //   )
+  // },
   fetchOnServer: true,
   fetchKey: 'ws-directory',
   data() {
@@ -93,25 +103,25 @@ export default {
       DIR_CONFIG,
       filters: {
         taxonomies: [],
-        sorting: []
+        sorting: [],
       },
       selectedFilters: {},
       qs: {
         record_type: this.options.field_directory_type,
         rows: this.options.field_directory_rows,
         start: 0,
-        ...this.defaultSortOrderOption(this.options.field_directory_type)
+        ...this.defaultSortOrderOption(this.options.field_directory_type),
       },
       records: [],
       total: 0,
-      loading: true
+      loading: true,
     }
   },
   computed: {
     apiUrl() {
       return Object.keys(this.qs)
         .map(
-          (k) => `${encodeURIComponent(k)}=${encodeURIComponent(this.qs[k])}`
+          (k) => `${encodeURIComponent(k)}=${encodeURIComponent(this.qs[k])}`,
         )
         .join('&')
     },
@@ -137,7 +147,7 @@ export default {
       return this.qs.lat && this.qs.lon
         ? { lat: this.qs.lat, lng: this.qs.lon }
         : false
-    }
+    },
   },
   watch: {
     apiUrl: {
@@ -145,7 +155,7 @@ export default {
       deep: false,
       handler() {
         this.getData()
-      }
+      },
     },
     selectedFilters: {
       immediate: false,
@@ -159,9 +169,9 @@ export default {
         // Check for search
         //
         if (this.selectedFilters.query) {
-          this.$set(this.qs, 'query', this.selectedFilters.query)
+          this.qs['query'] = this.selectedFilters.query
         } else {
-          this.$delete(this.qs, 'query')
+          delete this.qs['query']
         }
         //
         // Sort by Date and AZ
@@ -171,7 +181,7 @@ export default {
           this.qs.order = this.selectedFilters.sorting.order.value
         } else {
           const sortOrderDefaults = this.defaultSortOrderOption(
-            this.qs.record_type
+            this.qs.record_type,
           )
           this.qs.sort = sortOrderDefaults.sort
           this.qs.order = sortOrderDefaults.order
@@ -183,7 +193,7 @@ export default {
           Object.keys(this.selectedFilters.filters).forEach((filterName) => {
             if (Array.isArray(this.selectedFilters.filters[filterName])) {
               if (this.selectedFilters.filters[filterName]) {
-                this.$set(this.qs, filterName, [])
+                this.qs[filterName] = []
                 this.selectedFilters.filters[filterName].forEach((item) => {
                   if (item.tid) {
                     this.qs[filterName].push(item.tid)
@@ -198,14 +208,14 @@ export default {
         //
         if (this.selectedFilters.location?.location) {
           this.qs.sort = 'distance'
-          this.$set(this.qs, 'lat', this.selectedFilters.location.location.lat)
-          this.$set(this.qs, 'lon', this.selectedFilters.location.location.lng)
+          this.qs['lat'] = this.selectedFilters.location.location.lat
+          this.qs['lon'] = this.selectedFilters.location.location.lng
         } else {
-          this.$delete(this.qs, 'lat')
-          this.$delete(this.qs, 'lon')
+          delete this.qs['lat']
+          delete this.qs['lon']
         }
-      }
-    }
+      },
+    },
   },
   methods: {
     async getData() {
@@ -223,25 +233,25 @@ export default {
           const taxonomies = await this.fetchFilters(
             taxonomy.id,
             taxonomy.record_id,
-            taxonomy.name
+            taxonomy.name,
           )
           this.filters.taxonomies.push(taxonomies)
           return Promise.resolve(taxonomies)
-        })
+        }),
       )
     },
     loadSortOptions(sortingList) {
       let opts = {
         name: 'order',
         title: 'Sort by',
-        terms: []
+        terms: [],
       }
       sortingList.forEach((sortOption) => {
         opts.terms.push({
           title: sortOption.label,
           value: sortOption.order,
           field: sortOption.field,
-          parent: sortOption.type
+          parent: sortOption.type,
         })
       })
       this.filters.sorting.push(opts)
@@ -252,23 +262,23 @@ export default {
       } else {
         return {
           sort: 'record_title',
-          order: 'asc'
+          order: 'asc',
         }
       }
     },
     updateFilters(opts) {
-      this.$set(this.selectedFilters, 'filters', opts)
+      this.selectedFilters['filters'] = opts
     },
     updateSort(opts) {
-      this.$set(this.selectedFilters, 'sorting', opts)
+      this.selectedFilters['sorting'] = opts
     },
     updateSearch(opts) {
-      this.$set(this.selectedFilters, 'query', opts)
+      this.selectedFilters['query'] = opts
     },
     updateLocation(opts) {
       this.filters.sorting[0].terms[0].title = 'Nearest'
       this.filters.sorting[0].terms[1].title = 'Farthest'
-      this.$set(this.selectedFilters, 'location', opts)
+      this.selectedFilters['location'] = opts
     },
     loadMore() {
       this.qs.start += this.qs.rows
@@ -301,14 +311,14 @@ export default {
 
         window.scrollTo({
           top,
-          behavior: 'smooth'
+          behavior: 'smooth',
         })
       }
     },
     resetSortLabels() {
       this.filters.sorting = []
       this.loadSortOptions(
-        this.DIR_CONFIG[this.options.field_directory_type].sorting
+        this.DIR_CONFIG[this.options.field_directory_type].sorting,
       )
     },
     resetSearchFilters() {
@@ -317,15 +327,16 @@ export default {
         record_type: this.options.field_directory_type,
         rows: this.options.field_directory_rows,
         start: 0,
-        ...this.defaultSortOrderOption(this.options.field_directory_type)
+        ...this.defaultSortOrderOption(this.options.field_directory_type),
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../includes/scss/all';
+
 .paragraph--directory {
   &__loading-container {
     min-height: 250px;

package/src/components/Paragraphs/ListGroup/Link/list-link.stories.js

@@ -4,68 +4,64 @@ import { storyData, storyDataAr } from './../Constants'
 export default {
   title: 'Paragraphs/ListGroup',
   component: ListGroup,
+  tags: ['autodocs'],
   argTypes: {
-    darkBackground: {
-      control: 'boolean',
-      defaultValue: false
-    },
-    items: {
-      control: 'object',
-      defaultValue: storyData.links
-    },
-    rtlItems: {
-      control: 'object',
-      defaultValue: storyDataAr.links
-    },
-    rtl: {
-      control: 'boolean',
-      defaultValue: false
-    },
-    titleTag: {
-      control: 'text',
-      defaultValue: 'h3'
-    },
-    showListItemNavigationArrow: {
-      control: 'boolean',
-      defaultValue: true
+    list: {
+      table: {
+        disable: true
+      }
     },
-    showLargeSpacing: {
-      control: 'boolean',
-      defaultValue: false
+    title: {
+      table: {
+        disable: true
+      }
     },
-    list: {
+    role: {
       table: {
         disable: true
       }
     },
-    showListLink: {
-      control: 'boolean',
-      defaultValue: true
+    subHeading: {
+      table: {
+        disable: true
+      }
     },
-    title: {
+    footerHeading: {
       table: {
         disable: true
       }
     }
+  },
+  args: {
+    darkBackground: false,
+    items: storyData.links,
+    rtlItems: storyDataAr.links,
+    rtl: false,
+    titleTag: 'h3',
+    showListItemNavigationArrow: true,
+    showLargeSpacing: false,
+    showListLink: true
   }
 }
 
-const Template = (args, { argTypes }) => ({
+const Template = (args) => ({
   components: { ListGroup },
+  setup() {
+    return { args };
+  },
   data() {
     return {
       storyData,
       storyDataAr
     }
   },
-  props: Object.keys(argTypes),
   template: `<list-group
-    v-bind="$props"
-    :list="rtl ? rtlItems : items"
-    :title="(rtl ? storyDataAr.title : storyData.title)"
-    :sub-heading="(rtl ? storyDataAr.subHeading : storyData.subHeading)"
-    :footer-heading="(rtl ? storyDataAr.footer : storyDataAr.footer)"
-    :show-list-link="showListLink"  />`
+    v-bind="args"
+    :list="args.rtl ? args.rtlItems : args.items"
+    :title="(args.rtl ? storyDataAr.title : storyData.title)"
+    :sub-heading="(args.rtl ? storyDataAr.subHeading : storyData.subHeading)"
+    :footer-heading="(args.rtl ? storyDataAr.footer : storyDataAr.footer)"
+    :show-list-link="args.showListLink" />`
 })
 
 export const Link = Template.bind({})

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

@@ -48,7 +48,7 @@
         :taxonomies="{
           industry: card.industry,
           topic: card.topic,
-          language: card.language
+          language: card.language,
         }"
       />
     </template>
@@ -69,7 +69,7 @@ import RichText from './../../Paragraphs/RichText/index.vue'
 import {
   isAbsoluteUrl,
   navigateToPath,
-  isGovSite
+  isGovSite,
 } from './../../../../lib/utility'
 
 export default {
@@ -80,48 +80,48 @@ export default {
       type: Array,
       default() {
         return []
-      }
+      },
     },
     role: {
       type: String,
-      default: 'button'
+      default: 'button',
     },
     darkBackground: {
       type: Boolean,
-      default: false
+      default: false,
     },
     title: {
       type: String,
-      default: ''
+      default: '',
     },
     titleTag: {
       type: String,
-      default: 'h3'
+      default: 'h3',
     },
     subHeading: {
       type: String,
-      default: null
+      default: null,
     },
     footerHeading: {
       type: String,
-      default: null
+      default: null,
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showListItemNavigationArrow: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showLargeSpacing: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showListLink: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   methods: {
     getCaret(card) {
@@ -136,39 +136,49 @@ export default {
     },
     selectedCard(card) {
       // Some custom logic for gov caretaker logic
-      if (process.env.CARETAKER && process.env.CARETAKER === 'true') {
+      if (
+        (this.$config
+          ? this.$config.public.caretaker
+          : process.env.CARETAKER) === 'true'
+      ) {
         if (!isGovSite(card?.selectedCard?.link)) {
-          this.$store.commit('page/SET_CARETAKER_REF', 'list-group')
-          this.$root.$emit('caretaker-open', card?.selectedCard?.link)
+          // this.$store.commit('page/SET_CARETAKER_REF', 'list-group')
+          // this.$root.$emit('caretaker-open', card?.selectedCard?.link)
+          if (this.$pageStore) {
+            this.$pageStore.caretaker.referrer = 'list-group'
+          }
+          if (this.$bus) {
+            this.$bus.$emit('caretaker-open', card?.selectedCard?.link)
+          }
         } else {
           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 {
@@ -176,22 +186,25 @@ 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) {
           nextTabbedCard[0].focus()
         } else {
           let nextFocus = this.focusNextElement()
-          this.$root.$emit('last-focus-out')
+          if (this.$bus) {
+            this.$bus.$emit('last-focus-out')
+          }
           nextFocus.focus()
         }
       } else {
@@ -208,7 +221,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(
@@ -220,7 +233,7 @@ export default {
               elem.offsetHeight > 0 ||
               elem === activeElem
             )
-          }
+          },
         ),
         indexedList = queryResult
           .slice()
@@ -234,20 +247,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
@@ -256,8 +269,8 @@ export default {
         ? focusable[focusable.indexOf(activeElem) - 1] ||
             focusable[focusable.length - 1]
         : focusable[focusable.indexOf(activeElem) + 1] || focusable[0]
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>