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

package/src/components/Global/SocialShare/index.vue

@@ -98,7 +98,7 @@
 <script>
 import emailIcon from '../../../assets/icons/SocialShare/email-white.svg?url'
 import facebookIcon from '../../../assets/icons/SocialShare/facebook-white.svg?url'
-import twitterIcon from '../../../assets/icons/SocialShare/twitter-white.svg?url'
+import twitterIcon from '../../../assets/icons/SocialShare/x-icon-white.svg?url'
 import officeFilePdfIcon from '../../../assets/icons/SocialShare/office-file-pdf.svg?url'
 import { BButton, BButtonGroup } from 'bootstrap-vue-next'
 
@@ -137,7 +137,8 @@ export default {
         }
     },
     mounted() {
-        if (process.client) {
+      let winHref = window.location.href
+          if (winHref.toLowerCase().includes("worksafe")) {
             this.url = window.location.href;
         }
     },

package/src/components/Global/Strip/index.stories.js

@@ -9,23 +9,7 @@ const stripContentFull =
   export default {
     title: 'Global/Strip',
     component: Strip,
-    argTypes: {
-      stripHeading: {
-        control: 'text'
-      },
-      stripContent: {
-        control: 'text'
-      },
-      rtl: {
-        control: 'boolean'
-      },
-      type: {
-        control: 'text'
-      },
-      mini: {
-        control: 'boolean'
-      }
-    }
+    tags: ['autodocs'],
   }
   
   export const MiniAlertStrip = {

package/src/components/Global/Strip/index.vue

@@ -12,7 +12,7 @@
       @dismissed="handleDismissed()"
     >
       <div
-        :role="mini ? 'link' : false"
+        :role="mini ? 'link' : null"
         :class="type + '-strip__inner-wrap'"
         :tabindex="mini ? 0 : false"
         :style="mini ? 'cursor: pointer;' : false"
@@ -331,11 +331,15 @@ export default {
 
       a {
         color: $black;
-
-        &:focus {
+        text-decoration: none;
+      }
+      a:hover {   
           text-decoration: underline;
         }
-      }
+      a:focus {
+          text-decoration: underline;
+        }
+    
     }
     &__icon {
       &--caret {

package/src/components/Paragraphs/Accordion/AccordionItem/index.vue

@@ -6,15 +6,15 @@
       class="accordion-item"
       :class="{
         rtl: rtl,
-        '--with-pre-heading': preHeading && showPreHeading
+        '--with-pre-heading': preHeading && showPreHeading,
       }"
     >
       <a
-        :id="'accordion' + _uid ? _uid : ''"
+        :id="'accordion' + $.uid ? $.uid : ''"
         role="button"
         :aria-expanded="showAccordion ? 'true' : 'false'"
         class="accordion-item__title"
-        :aria-controls="'sect' + _uid ? _uid : ''"
+        :aria-controls="'sect' + $.uid ? $.uid : ''"
         tabindex="0"
         @click.prevent="toggleAccordion"
         @keypress.enter="toggleAccordion"
@@ -33,7 +33,7 @@
           :icon-alt="'collapse'"
           :glyph="CaretUp"
           :class="{
-            '--with-pre-heading': preHeading && showPreHeading
+            '--with-pre-heading': preHeading && showPreHeading,
           }"
         />
         <icon
@@ -44,17 +44,17 @@
           :icon-alt="'expand'"
           :glyph="CaretDown"
           :class="{
-            '--with-pre-heading': preHeading && showPreHeading
+            '--with-pre-heading': preHeading && showPreHeading,
           }"
         />
       </a>
       <b-card-body v-if="content">
         <div
           v-show="showAccordion"
-          :id="'sect' + _uid ? _uid : ''"
+          :id="'sect' + $.uid ? $.uid : ''"
           class="accordion-item__content"
           role="region"
-          :aria-labelledby="'accordion' + _uid ? _uid : ''"
+          :aria-labelledby="'accordion' + $.uid ? $.uid : ''"
         >
           <rich-text :content="content" />
         </div>
@@ -76,42 +76,42 @@ export default {
     RichText,
     Icon,
     BCard,
-    BCardBody
+    BCardBody,
   },
   props: {
     title: {
       type: String,
-      default: 'Item'
+      default: 'Item',
     },
     preHeading: {
       type: String,
-      default: 'PRE-HEADING'
+      default: 'PRE-HEADING',
     },
     content: {
       type: String,
-      default: null
+      default: null,
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     open: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showPreHeading: {
       type: Boolean,
-      default: false
+      default: false,
     },
     meta: {
       type: Array,
-      default: () => []
-    }
+      default: () => [],
+    },
   },
   data: () => ({
     showAccordion: false,
     CaretDown,
-    CaretUp
+    CaretUp,
   }),
   mounted() {
     this.$nextTick(() => {
@@ -122,12 +122,16 @@ export default {
     toggleAccordion() {
       this.showAccordion = !this.showAccordion
       if (this.showAccordion) {
-        this.$root.$emit('accordionItemOpen', this.meta)
+        if (this.$bus) {
+          this.$bus.$emit('accordionItemOpen', this.meta) // this.$root.$emit('accordionItemOpen', this.meta)
+        }
       } else {
-        this.$root.$emit('accordionItemClose', this.meta)
+        if (this.$bus) {
+          this.$bus.$emit('accordionItemClose', this.meta) // this.$root.$emit('accordionItemClose', this.meta)
+        }
       }
-    }
-  }
+    },
+  },
 }
 </script>
 

package/src/components/Paragraphs/Accordion/StepperItem/index.vue

@@ -5,15 +5,15 @@
       v-if="title"
       class="accordion-stepper"
       :class="{
-        rtl: rtl
+        rtl: rtl,
       }"
     >
       <div>
         <button
-          :id="'accordion' + _uid ? _uid : ''"
+          :id="'accordion' + $.uid ? $.uid : ''"
           :aria-expanded="showAccordion ? 'true' : 'false'"
           class="accordion-stepper__title"
-          :aria-controls="'sect' + _uid ? _uid : ''"
+          :aria-controls="'sect' + $.uid ? $.uid : ''"
           @click="toggleAccordion"
         >
           <div
@@ -25,13 +25,9 @@
           </div>
 
           <div class="accordion-stepper__titleText">
-            <rich-text
-            :tag="'h3'"
-            :tag-class="'card-title'"
-            :content="title"
-          />
+            <rich-text :tag="'h3'" :tag-class="'card-title'" :content="title" />
           </div>
-          
+
           <div class="stepper-icon__wrapper">
             <icon
               v-show="showAccordion && content"
@@ -54,10 +50,10 @@
         <b-card-body v-if="content">
           <div
             v-show="showAccordion"
-            :id="'sect' + _uid ? _uid : ''"
+            :id="'sect' + $.uid ? $.uid : ''"
             class="accordion-stepper__content"
             role="region"
-            :aria-labelledby="'accordion' + _uid ? _uid : ''"
+            :aria-labelledby="'accordion' + $.uid ? $.uid : ''"
           >
             <rich-text :content="content" />
           </div>
@@ -80,42 +76,42 @@ export default {
     RichText,
     Icon,
     BCard,
-    BCardBody
+    BCardBody,
   },
   props: {
     title: {
       type: String,
-      default: 'Item'
+      default: 'Item',
     },
     content: {
       type: String,
-      default: null
+      default: null,
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     open: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showPreHeading: {
       type: Boolean,
-      default: false
+      default: false,
     },
     number: {
       type: Number,
-      default: null
+      default: null,
     },
     isWorkWell: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data: () => ({
     showAccordion: false,
     CaretDown,
-    CaretUp
+    CaretUp,
   }),
   mounted() {
     this.$nextTick(() => {
@@ -125,8 +121,8 @@ export default {
   methods: {
     toggleAccordion() {
       this.showAccordion = !this.showAccordion
-    }
-  }
+    },
+  },
 }
 </script>
 

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

@@ -30,6 +30,7 @@ const mockAccordionItems = [
 export default {
   title: 'Paragraphs/Accordion',
   component: Accordion,
+  tags: ['autodocs'],
   argTypes: {
     titleTag: {
       control: 'select',

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

@@ -10,11 +10,11 @@
     <ol class="accordion-list">
       <li
         v-for="(item, index) in accordionList"
-        :key="_uid ? _uid : '' + index"
+        :key="$.uid ? $.uid : '' + index"
         :class="{
           workwell: isWorkwell,
           rtl: rtl || item.field_rtl,
-          stepper: isStepper
+          stepper: isStepper,
         }"
         class="accordion"
       >
@@ -55,51 +55,51 @@ export default {
   props: {
     titleTag: {
       type: String,
-      default: 'h2'
+      default: 'h2',
     },
     title: {
       type: String,
-      default: null
+      default: null,
     },
     isStepper: {
       type: Boolean,
-      default: false
+      default: false,
     },
     showPreHeading: {
       type: Boolean,
-      default: false
+      default: false,
     },
     isWorkwell: {
       type: Boolean,
-      default: false
+      default: false,
     },
     accordionList: {
       type: Array,
-      default: null
+      default: null,
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     size: {
       type: String,
-      default: 'content'
+      default: 'content',
     },
     option: {
       type: String,
-      default: 'open-first'
-    }
+      default: 'open-first',
+    },
   },
   data: () => ({
     OPEN_ALL: 'open-all',
     CLOSE_ALL: 'close-all',
     OPEN_FIRST: 'open-first',
-    accordionOption: null
+    accordionOption: null,
   }),
   computed: {
     isPDF() {
       return typeof this.$isPDF === 'function' ? this.$isPDF() : false
-    }
+    },
   },
   mounted() {
     if (this.option) {
@@ -121,8 +121,8 @@ export default {
     },
     hasContent(item) {
       return item?.field_rich_text?.value
-    }
-  }
+    },
+  },
 }
 </script>
 

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

@@ -3,6 +3,7 @@ import Breakout from './index.vue'
 export default {
   title: 'Paragraphs/Breakout',
   component: Breakout,
+  tags: ['autodocs'],
   argTypes: {
     headingTag: {
       control: 'select',

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

@@ -5,6 +5,7 @@ const bundleContent = ['news', 'page']
 export default {
   title: 'Paragraphs/BrowseContent',
   component: { BrowseContent },
+  tags: ['autodocs'],
   argTypes: {
     background: {
       control: 'select',

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
@@ -47,63 +48,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 +123,8 @@ export default {
       filters: {
         taxonomies: [],
         selected: {},
-        availableBundles: []
-      }
+        availableBundles: [],
+      },
     }
   },
   fetchOnServer: true,
@@ -125,13 +133,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 +152,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)
 
@@ -160,7 +168,7 @@ export default {
     },
     async loadMoreCards(init) {
       const attrs = {
-        group: this.$store?.state?.page?.content?.title
+        group: this.$pageStore?.content?.title,
       }
       if (this.$gtm && !init) {
         this.$gtm.push({ event: 'custom.interaction.showmore.click', ...attrs })
@@ -179,7 +187,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 +199,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 +217,7 @@ export default {
       const qs = {
         bundle,
         rows,
-        start
+        start,
       }
       return this.fetchContent(qs, this.filters.selected, index).then(
         (response) => {
@@ -217,14 +225,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 +281,8 @@ export default {
         return new Date(b.dateSort) - new Date(a.dateSort)
       })
       return sorted
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -283,14 +291,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,