@worksafevictoria/wcl7.5 1.9.0-beta.4 → 1.9.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.9.0-beta.4",
+  "version": "1.9.0-beta.5",
   "main": "src/index.js",
   "license": "MIT",
   "repository": {

package/src/components/Common/CardGridItem/card-grid-item-caret.vue

@@ -1,73 +1,71 @@
 <template>
   <div
     v-if="caretSrc && loaded"
-    :class="
-      `card-grid-item-caret__container card-grid-item-caret__container--${computedCaret}`
-    "
+    :class="`card-grid-item-caret__container card-grid-item-caret__container--${computedCaret}`"
   >
     <span v-if="caret === 'external'" class="visually-hidden">External link</span>
     <div
       class="tabCaretContainer"
       :class="{
-        tabCaretContainerBottom: isTabbedCard
+        tabCaretContainerBottom: isTabbedCard,
       }"
     >
       <div class="tabCaretText" aria-hidden="true">
         {{ supportText }}
       </div>
-      <icon :glyph="caretSrc" icon-alt="arrow" width="18" float: right
-      :height="caret === 'external' ? 18 : 16" :class=" `item-icon-${ isChev ?
-      'chev' : 'caret'} card-grid-item-caret--${computedCaret}`" />
+      <icon :glyph="caretSrc" icon-alt="Show more" width="18" float: right :height="caret
+      === 'external' ? 18 : 16" :class=" `item-icon-${ isChev ? 'chev' : 'caret'}
+      card-grid-item-caret--${computedCaret}`" />
     </div>
   </div>
 </template>
 
 <script>
-import { getCurrentInstance } from 'vue'
-import Icon from './../../SubComponents/Icon/index.vue'
-import ChevUp from './../../../assets/icons/chev-up.svg?raw'
-import CaretUp from './../../../assets/icons/caret-up.svg?url'
-import ExternalLink from './../../../assets/icons/external-link.svg?raw'
+import { getCurrentInstance } from "vue";
+import Icon from "./../../SubComponents/Icon/index.vue";
+import ChevUp from "./../../../assets/icons/chev-up.svg?raw";
+import CaretUp from "./../../../assets/icons/caret-up.svg?url";
+import ExternalLink from "./../../../assets/icons/external-link.svg?raw";
 
 export default {
-  name: 'CardGridItemCaret',
+  name: "CardGridItemCaret",
   components: { Icon },
   props: {
     caret: {
       type: String,
-      default: null
+      default: null,
     },
     rtl: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
       loaded: false,
-      isChev: false
-    }
+      isChev: false,
+    };
   },
   computed: {
     computedCaret() {
       if (this.rtl) {
-        if (this.caret === 'right') {
-          return 'left'
-        } else if (this.caret === 'left') {
-          return 'right'
+        if (this.caret === "right") {
+          return "left";
+        } else if (this.caret === "left") {
+          return "right";
         }
       }
-      return this.caret
+      return this.caret;
     },
     caretSrc() {
-      if (this.caret === 'external') {
-        return ExternalLink
+      if (this.caret === "external") {
+        return ExternalLink;
       } else if (!this.isChev && this.computedCaret) {
-        return CaretUp
+        return CaretUp;
       } else if (this.isChev && this.computedCaret) {
-        return ChevUp
+        return ChevUp;
       } else {
-        return undefined
+        return undefined;
       }
     },
     //Identify if this is a tabbed card WSV2-374
@@ -75,7 +73,7 @@ export default {
       const instance = getCurrentInstance();
       const parentEl = instance?.parent?.proxy?.$el.parentNode;
 
-      if (parentEl && parentEl.classList.contains('tabbed-card')) {
+      if (parentEl && parentEl.classList.contains("tabbed-card")) {
         return true;
       } else {
         return false;
@@ -83,22 +81,18 @@ export default {
     },
     //If isTabbedCard, then supportive text must be displayed for up and down carets. WSV2-374
     supportText() {
-      if (
-        this.isTabbedCard &&
-        this.computedCaret &&
-        this.computedCaret === 'up'
-      ) {
-        return 'Hide links'
+      if (this.isTabbedCard && this.computedCaret && this.computedCaret === "up") {
+        return "Hide links";
       } else if (
         this.isTabbedCard &&
         this.computedCaret &&
-        this.computedCaret === 'down'
+        this.computedCaret === "down"
       ) {
-        return 'Show links'
+        return "Show links";
       } else {
-        return null
+        return null;
       }
-    }
+    },
   },
   mounted() {
     /* The code below has been removed as part of WSV2-735
@@ -109,13 +103,13 @@ export default {
       .$el['_prevClass'].includes('task-finder-column')
       ? (this.isChev = false)
       : true */
-      
-    this.loaded = true
-  }
-}
+
+    this.loaded = true;
+  },
+};
 </script>
 <style lang="scss" scoped>
-@import '../../../includes/scss/all';
+@import "../../../includes/scss/all";
 .card-grid-item-caret {
   &__container {
     padding-left: 4px;
@@ -149,7 +143,7 @@ export default {
   }
 }
 .tabCaretText {
-  font-style: 'normal';
+  font-style: "normal";
   font-weight: 400;
   font-size: 12px;
   padding-right: 10px;

package/src/components/Common/CardGridItem/card-grid-item-icon.vue

@@ -21,7 +21,7 @@
       }"
       :glyph="glyphSrc"
       :key="computedIconSize"
-      icon-alt="alt"
+      icon-alt="card gid item icon"
       :bordered="iconIsBordered"
       :height="computedIconSize"
       :width="computedIconSize"

package/src/components/Common/CardGridItem/index.vue

@@ -9,10 +9,14 @@
       :class="cardClass"
       :role="buttonRole"
       :aria-checked="
-        buttonRole === 'radio' ? (isSelectable && selected ? 'true' : 'false') : false
+        buttonRole === 'radio' ? (isSelectable && selected ? 'true' : 'false') : undefined
       "
       :aria-expanded="
-        isExpandable ? (isSelectable && selected ? 'true' : 'false') : false
+        buttonRole === 'button' && isExpandable
+          ? isSelectable && selected
+            ? 'true'
+            : 'false'
+          : undefined
       "
       :data-href="link"
       @click="cardClicked($event)"

package/src/components/Containers/Carousel/index.stories.js

@@ -2,8 +2,9 @@ import CarouselComponent from './index.vue'
 import { mockCarouselItems } from '../../../mock/carousel-items'
 
 export default {
-  title: 'Website-Redesign/Carousel',
+  title: 'Containers/Carousel',
   component: CarouselComponent,
+  tags: ['autodocs'],
   data() {
     return {
       mockCarouselItems

package/src/components/Containers/Carousel/index.vue

@@ -1,9 +1,9 @@
 <template>
-    <div>
+  <div>
     <b-carousel
       id="carousel-1"
       v-model="slide"
-      interval=0
+      interval="0"
       controls
       indicators
       keyboard
@@ -13,92 +13,92 @@
       <b-carousel-slide
         v-for="item in filteredCarouselItems"
         :key="item.id"
-        :img-src="getImageURL(item.field_image.field_media_image?.uri?.url)"
-        @click.prevent="handleClick(item.field_link.url)"
+        :img-src="getImageURL(item.imageURL)"
+        :img-alt="item.imageAlt"
+        @click.prevent="handleClick(item.linkURL)"
       >
-      <h4>{{ item.field_title}}</h4>
+      <h4>{{ item.title }}</h4>
       </b-carousel-slide>
     </b-carousel>
   </div>
 </template>
 
 <script>
-import { BCarousel, BCarouselSlide } from 'bootstrap-vue-next'
-import { isAbsoluteUrl, navigateToPath } from '../../../../lib/utility'
+import { BCarousel, BCarouselSlide } from "bootstrap-vue-next"
+import { isAbsoluteUrl, navigateToPath } from "../../../../lib/utility"
 
 export default {
-  name: 'CarouselComponent',
-  data() {
-    return {
-      slide: 0,
-    }
-  },
-  components: {
-      BCarousel,
-      BCarouselSlide
-  },
-  props: {
-    carouselItems: {
-      type: Array,
-      required: true,
-      default: () => [],
-    },
-    storybook: {
-      type: Boolean,
-      default: false
-    }
+name: "CarouselComponent",
+data() {
+  return {
+    slide: 0,
+  }
+},
+components: {
+  BCarousel,
+  BCarouselSlide,
+},
+props: {
+  carouselItems: {
+    type: Array,
+    required: true,
+    default: () => [],
   },
-  computed: {
-    filteredCarouselItems() {
-      
-      var todayDate = new Date()
-      
-      for (var i = 0, length = this.carouselItems.length; i < length; i++) {
-        if (this.carouselItems[i].field_favorite === true) {
+  storybook: {
+    type: Boolean,
+    default: false,
+  }
+},
+computed: {
+  filteredCarouselItems() {
+    
+    var todayDate = new Date();
+    
+    for (var i = 0, length = this.carouselItems.length; i < length; i++) {
+      if (this.carouselItems[i].favourite === true) {
+        this.carouselItems[i].active = 'Yes';
+      } else if (new Date(this.carouselItems[i].dateStart).valueOf() <= todayDate.valueOf()) {
+        if (new Date(this.carouselItems[i].dateEnd).valueOf() >= todayDate.valueOf()) {
           this.carouselItems[i].active = 'Yes'
-        } else if (new Date(this.carouselItems[i].field_date_start).valueOf() <= todayDate.valueOf()) {
-          if (new Date(this.carouselItems[i].field_date_end).valueOf() >= todayDate.valueOf()) {
-            this.carouselItems[i].active = 'Yes'
-          }
         }
       }
-      
-      let filtered = this.carouselItems.filter(e => 
-        e.active === 'Yes');
-      return filtered
     }
-  },
-  methods: {
-
-    handleClick(link) {
-      if (link) {
-        if (isAbsoluteUrl(link)) {
-          navigateToPath(link, true)
+    
+    let filtered = this.carouselItems.filter(e => e.active === "Yes");
+    return filtered;
+  }
+},
+methods: {
+
+  handleClick(link) {
+    if (link) {
+      if (isAbsoluteUrl(link)) {
+        navigateToPath(link, true);
+      } else {
+        if (this.storybook) {
+          alert('This link will go to: ' + link);
         } else {
-          if (this.storybook) {
-            alert('This link will go to: ' + link)
-          } else {
-            this.$router.push({ path: link })
-          }
+          this.$router.push({ path: link });
         }
       }
-    },
-
-    getImageURL(imagePath) {
-      let apiPath = this.$config ? this.$config.public.apiURL : process.env.CONTENT_API_URL;
-      let fullPath = apiPath.concat(imagePath)
-      return fullPath
-    },
-
-    formatDate(date) {
-      return [
-        date.getFullYear(),
-        ('0' + date.getDate()).slice(-2),
-        ('0' + (date.getMonth() + 1)).slice(-2)
-      ].join('-')
     }
+  },
+
+  getImageURL(imagePath) {
+    let apiPath = this.$config ? this.$config.public.apiURL : process.env.CONTENT_API_URL;
+    let fullPath = apiPath.concat(imagePath);
+     return fullPath;
+  },
+
+  formatDate(date) {
+    return [
+      date.getFullYear(),
+      ('0' + date.getDate()).slice(-2),
+      ('0' + (date.getMonth() + 1)).slice(-2)
+    ].join('-');
   }
 }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -137,7 +137,6 @@ export default {
 .carousel-indicators button:active {
   outline: none !important;
   box-shadow: none;
-
 }
 
 .carousel-caption {

package/src/components/Containers/HomepageHeader/index.stories.js

@@ -99,4 +99,4 @@ const DefaultHH = (args) => ({
   template: '<homepage-header v-bind="args" ref="hh" />',
 })
 
-export const Default = DefaultHH.bind({})
+export const Former = DefaultHH.bind({})

package/src/components/Containers/HomepageHeaderNew/index.stories.js

@@ -39,8 +39,9 @@ const headerLinks = [
   }
 
 export default {
-  title: 'Website_Redesign/HomepageHeader',
+  title: 'Containers/HomepageHeader',
   component: HomepageHeader,
+  tags: ['autodocs'],
   argTypes: {
     fetchMenu: {
       control: 'function',
@@ -59,17 +60,4 @@ export default {
   }
 }
 
-const DefaultHH = (args) => ({
-  components: { HomepageHeader },
-  setup() {
-    return { args };
-  },
-  mounted() {
-    setTimeout(() => {
-      this.$refs.hh.renderMenu()
-    })
-  },
-  template: '<homepage-header v-bind="args" ref="hh" />'
-})
-
-export const Default = DefaultHH.bind({})
+export const New = {}

package/src/components/Containers/HomepageHeaderNew/index.vue

@@ -1,5 +1,3 @@
-<!-- When implemented, importing mock values for carousel to be removed.  This was only for testing locally, while values not available from drupal. -->
-
 <template>
   <div class="homepage-header"> 
     <container>
@@ -56,7 +54,6 @@ import earthIcon from './../../../assets/icons/earth.svg?url'
 import CarouselComponent from './../../Containers/Carousel/index.vue'
 import Row from './../../Containers/Row/index.vue'
 import Column from './../../Containers/Column/index.vue'
-// import { mockCarouselItems } from '../../../mock/carousel-items'
 
 export default {
   name: 'HomepageHeader',
@@ -66,7 +63,6 @@ export default {
     CarouselComponent,
     Row,
     Column,
-    // mockCarouselItems
   },
   props: {
     contentParser: {
@@ -76,7 +72,6 @@ export default {
    slideList: {
       type: Array,
       required: true,
-      // default: mockCarouselItems
     },
     isStorybook: {
       type: Boolean,