@worksafevictoria/wcl7.5 1.1.0-beta.4 → 1.1.0-beta.40

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

@@ -47,63 +47,70 @@ export default {
   components: {
     CardGroup,
     DirectoryFilters,
-    Switcher
+    Switcher,
   },
   props: {
     background: {
       type: String,
-      default: 'grey'
+      default: 'grey',
     },
     title: {
       type: String,
-      default: ''
+      default: '',
     },
     titleTag: {
       type: String,
-      default: 'h2'
+      default: 'h2',
     },
     bundle: {
       type: Array,
-      default: () => ['']
+      default: () => [''],
     },
     columns: {
       type: Number,
-      default: 0
+      default: 0,
     },
     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,
     },
     showMore: {
-      type: Boolean
+      type: Boolean,
     },
     type: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
-  async fetch() {
+  // Temp use of mounted to replace fetch
+  async mounted() {
     if (this.displayedCards.length === 0) {
       await this.loadFiltersAndContent()
     }
   },
+  // TODO useAsyncData <script setup>
+  // async fetch() {
+  //   if (this.displayedCards.length === 0) {
+  //     await this.loadFiltersAndContent()
+  //   }
+  // },
   data() {
     return {
       hasMorePages: false,
@@ -115,8 +122,8 @@ export default {
       filters: {
         taxonomies: [],
         selected: {},
-        availableBundles: []
-      }
+        availableBundles: [],
+      },
     }
   },
   fetchOnServer: true,
@@ -125,13 +132,13 @@ export default {
     async loadFiltersAndContent() {
       await Promise.all([
         this.fetchFilters ? this.loadFilters() : Promise.resolve(),
-        this.loadMoreCards(true)
+        this.loadMoreCards(true),
       ])
     },
     init() {
       this.allCards = {
         total: 0,
-        cards: []
+        cards: [],
       }
       this.displayLimit = 0
       this.hasMorePages = false
@@ -144,8 +151,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)
 
@@ -159,8 +166,12 @@ export default {
       return allCards
     },
     async loadMoreCards(init) {
+      // Preference pinia
       const attrs = {
-        group: this.$store?.state?.page?.content?.title
+        group: this.$pinia?.state?.value?.page?.content?.title
+          ? this.$pinia?.state?.value?.page?.content?.title
+          : this.$store?.state?.page?.content?.title,
+        // group: this.$store?.state?.page?.content?.title ? this.$store?.state?.page?.content?.title : this.$pinia?.state?.page?.content?.title
       }
       if (this.$gtm && !init) {
         this.$gtm.push({ event: 'custom.interaction.showmore.click', ...attrs })
@@ -179,7 +190,7 @@ export default {
         this.displayedCards,
         this.allCards,
         addMoreBy,
-        bundles
+        bundles,
       )
       this.hasMorePages = this.allCards.total > this.allCards.cards.length
       this.displayedCards = this.allCards.cards.slice(0, this.displayLimit)
@@ -191,11 +202,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) {
@@ -209,7 +220,7 @@ export default {
       const qs = {
         bundle,
         rows,
-        start
+        start,
       }
       return this.fetchContent(qs, this.filters.selected, index).then(
         (response) => {
@@ -217,14 +228,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++) {
@@ -273,8 +284,8 @@ export default {
         return new Date(b.dateSort) - new Date(a.dateSort)
       })
       return sorted
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -283,14 +294,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,

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

@@ -30,9 +30,9 @@
   </div>
 </template>
 <script>
-import Container from '../../../../Containers/Container'
-import Row from '../../../../Containers/Row'
-import Column from '../../../../Containers/Column'
+import Container from '../../../../Containers/Container/index.vue'
+import Row from '../../../../Containers/Row/index.vue'
+import Column from '../../../../Containers/Column/index.vue'
 import { format } from 'date-fns'
 
 export default {

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

@@ -38,9 +38,9 @@
   </div>
 </template>
 <script>
-import Container from '../../../../Containers/Container'
-import Row from '../../../../Containers/Row'
-import Column from '../../../../Containers/Column'
+import Container from '../../../../Containers/Container/index.vue'
+import Row from '../../../../Containers/Row/index.vue'
+import Column from '../../../../Containers/Column/index.vue'
 import { calcDistance } from './distance'
 
 export default {

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

@@ -19,8 +19,8 @@
   </div>
 </template>
 <script>
-import RecordDetails from './recordDetails'
-import RecordContent from './recordContent'
+import RecordDetails from './recordDetails.vue'
+import RecordContent from './recordContent.vue'
 export default {
   components: {
     RecordDetails,

package/src/components/Paragraphs/Directory/Records/PRS/recordContent.vue

@@ -32,9 +32,9 @@
   </container>
 </template>
 <script>
-import Container from '../../../../Containers/Container'
-import Row from '../../../../Containers/Row'
-import Column from '../../../../Containers/Column'
+import Container from '../../../../Containers/Container/index.vue'
+import Row from '../../../../Containers/Row/index.vue'
+import Column from '../../../../Containers/Column/index.vue'
 import { format } from 'date-fns'
 
 export default {

package/src/components/Paragraphs/Directory/Records/PRS/recordDetails.vue

@@ -23,9 +23,9 @@
   </container>
 </template>
 <script>
-import Container from '../../../../Containers/Container'
-import Row from '../../../../Containers/Row'
-import Column from '../../../../Containers/Column'
+import Container from '../../../../Containers/Container/index.vue'
+import Row from '../../../../Containers/Row/index.vue'
+import Column from '../../../../Containers/Column/index.vue'
 import { format } from 'date-fns'
 
 export default {

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

@@ -13,9 +13,9 @@
   </div>
 </template>
 <script>
-import PrsRecord from './PRS'
-import IspRecord from './ISP'
-import CjRecord from './CJ'
+import PrsRecord from './PRS/index.vue'
+import IspRecord from './ISP/index.vue'
+import CjRecord from './CJ/index.vue'
 
 export default {
   components: {

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

@@ -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,
@@ -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
@@ -204,8 +214,8 @@ export default {
           this.$delete(this.qs, 'lat')
           this.$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,7 +262,7 @@ export default {
       } else {
         return {
           sort: 'record_title',
-          order: 'asc'
+          order: 'asc',
         }
       }
     },
@@ -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({})