@worksafevictoria/wcl7.5 1.1.0-beta.2 → 1.1.0-beta.21

package/.storybook/main.js

@@ -5,7 +5,8 @@ const config = {
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
-    '@storybook/addon-a11y'
+    '@storybook/addon-a11y',
+    'storybook-addon-deep-controls'
   ],
   framework: {
     name: '@storybook/vue3-vite',

package/.storybook/preview.js

@@ -28,6 +28,11 @@ setup((app) => {
 
 const preview = {
   parameters: {
+    options: {
+      storySort: {
+        method: 'alphabetical'
+      }     
+    },
     actions: { argTypesRegex: '^on[A-Z].*' },
     controls: {
       matchers: {

package/jest.config.js

@@ -1,23 +1,25 @@
 module.exports = {
   testEnvironment: "jsdom",
+  testEnvironmentOptions: {
+    customExportConditions: ["node", "node-addons"],
+  },
   moduleFileExtensions: [
     'js',
     'json',
-    // tell Jest to handle `*.vue` files
     'vue'
   ],
   moduleNameMapper: {
     '\\.(css|less|sass|scss)$': '<rootDir>/src/mock/styleMock.js',
-    '(.*\\.svg)\\?(.*)$': '<rootDir>/src/mock/jest.svgtransformer.js'
+    '(.*\\.(svg))\\?(.*)$': '<rootDir>/src/mock/jest.svgtransformer.js',
+    '\\.(png)$': '<rootDir>/src/mock/jest.fileMock.js'
   },
   transform: {
-    // process `*.vue` files with `vue-jest`
-    '.*\\.(vue)$': '@vue/vue3-jest',
+    '.*\\.vue$': '@vue/vue3-jest',
     '^.+\\.js$': 'babel-jest',
     '.+\\.(svg)$': '<rootDir>/src/mock/jest.svgtransformer.js'
   },
-  transformIgnorePatterns: [],
-  collectCoverage: true,
-  collectCoverageFrom: ['<rootDir>/src/**/*.vue'],
+  transformIgnorePatterns:  ['!node_modules/'],
+  // collectCoverage: true, 
+  collectCoverageFrom: [  '<rootDir>/src/**/*.vue'],
   coverageReporters: ['text-summary', 'html', 'lcov', 'clover']
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.1.0-beta.2",
+  "version": "1.1.0-beta.21",
   "main": "src/index.js",
   "license": "MIT",
   "repository": {
@@ -38,15 +38,18 @@
     "generate-svgs": "svgpack src/assets/icons/* > src/assets/styles/generated-icons.scss"
   },
   "dependencies": {
+    "@formio/vue": "^5.0.0",
     "@fortawesome/fontawesome-free": "^6.4.2",
-    "@storybook/cli": "^7.6.3",
+    "@storybook/cli": "^7.6.20",
     "axios": "^1.6.0",
     "bootstrap": "^5.3.2",
     "bootstrap-vue": "^2.23.1",
-    "bootstrap-vue-next": "^0.15.5",
+    "bootstrap-vue-next": "^0.23.2",
     "date-fns": "^2.30.0",
+    "formiojs": "4.13.13",
+    "storybook-addon-deep-controls": "^0.6.2",
     "vue": "^3.3.4",
-    "vue-formio": "^4.0.8",
+    "vue-google-charts": "^1.1.0",
     "vue-scrollto": "^2.20.0"
   },
   "resolutions": {
@@ -67,8 +70,8 @@
     "@storybook/vue3-vite": "^7.5.1",
     "@vitejs/plugin-vue": "^4.4.0",
     "@vue/eslint-config-prettier": "^8.0.0",
-    "@vue/vue3-jest": "^29.2.6",
     "@vue/test-utils": "^2.4.6",
+    "@vue/vue3-jest": "^29.2.6",
     "babel-jest": "^29.2.6",
     "dotenv-webpack": "^8.1.0",
     "eslint": "^8.49.0",
@@ -82,7 +85,7 @@
     "prettier": "^3.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "sass": "^1.69.5",
+    "sass": "1.77.6",
     "sass-loader": "^13.3.2",
     "semantic-release": "^19.0.3",
     "storybook": "^7.5.1",
@@ -90,9 +93,9 @@
     "stylelint-config-recommended": "^13.0.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-scss": "^5.3.0",
-    "vue-jest": "^3.0.7",
     "vite": "^4.4.11",
     "vite-svg-loader": "^5.1.0",
-    "vitest": "^0.34.6"
+    "vitest": "^0.34.6",
+    "vue-jest": "^3.0.7"
   }
 }

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

@@ -54,7 +54,7 @@
 </template>
 <script>
 import Icon from './../../SubComponents/Icon/index.vue'
-import arrowRight from './../../../assets/icons/right-arrow.svg?raw'
+import arrowRight from './../../../assets/icons/right-arrow.svg?component'
 
 export default {
   name: 'CardGridItemIcon',

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

@@ -67,9 +67,10 @@
             }
           ]"
         >
+        <div>
           <b-card-title
             v-if="cardHeaderTitle !== null && cardHeaderTitle !== undefined"
-            :title-tag="headerTag"
+            :tag="headerTag"
             class="card-grid-item__header"
             :class="{
               [`card-grid-item__header--${headerSize}`]: true,
@@ -99,7 +100,9 @@
             >
             </card-grid-item-icon>
           </b-card-title>
-          <card-grid-item-caret
+        </div>
+          <div>
+            <card-grid-item-caret
             v-if="caretPosition === 'top'"
             :caret="caret"
             :rtl="rtl"
@@ -125,7 +128,10 @@
             :rtl="rtl"
           >
           </card-grid-item-icon>
+
           <span v-if="pillText" class="visually-hidden">{{ pillText }}</span>
+          </div>
+
         </div>
         <b-card-text
           v-if="$slots.cardDescription || description"
@@ -200,7 +206,7 @@ import { BCard, BCardBody, BCardTitle, BCardText } from 'bootstrap-vue-next'
 
 export default {
   name: 'CardGridItem',
-  components: { CardGridItemIcon, CardGridItemCaret, RichText, BCard, BCardBody, BCardTitle, BCardText  },
+  components: {CardGridItemIcon, CardGridItemCaret, RichText, BCard, BCardBody, BCardTitle, BCardText  },
   props: {
     backgroundVariant: {
       type: String,

package/src/components/Global/AppHeader/ModalSearch/index.vue

@@ -17,6 +17,7 @@
       >
       <search
         ref="searchInputBox"
+        :google-search-flag="googleSearchFlag"
         :initial-search-query="searchQuery"
         :page-limit="pageLimit"
         :page-number="pageNumber"
@@ -31,7 +32,7 @@
 </template>
 
 <script>
-import Close from '../../../../assets/icons/close.svg'
+import Close from '../../../../assets/icons/close.svg?url'
 import Search from '../../../SubComponents/Search/index.vue'
 
 export default {
@@ -45,6 +46,10 @@ export default {
     contentParser: {
       type: Function,
       required: true
+    },
+    googleSearchFlag: {
+      type: String,
+      default: 'googlerest'
     }
   },
   data() {

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

@@ -18,45 +18,42 @@ const contentParser = () => {
 export default {
   title: 'Global/AppHeader',
   component: AppHeader,
+  tags: ['autodocs'],
   data() {
     return {
       appHeaderData
     }
   },
   argTypes: {
-    headerMenu: {
-      control: 'object',
-      defaultValue: appHeaderData
-    },
     contentParser: {
-      control: 'function',
-      defaultValue: contentParser,
       table: { disable: true }
-    },
-    isWorkWell: {
-      control: 'boolean',
-      defaultValue: false
-    },
-    authenticated: {
-      control: 'boolean',
-      defaultValue: false
     }
+  },
+  args: {
+    headerMenu: appHeaderData,
+    contentParser: contentParser,
+    isWorkWell: false,
+    authenticated: false,
+    mainContent: 'Some dummy main content required for this example',
+    footerContent: 'Some dummy footer content required for this example'
   }
 }
 
-const DefaultContent = (args, { argTypes }) => ({
+const DefaultContent = (args) => ({
   components: { AppHeader },
-  props: Object.keys(argTypes),
+  setup() {
+    return { args }
+  },
   template: `
   <div>
   <app-header
-  v-bind="$props"
+  v-bind="args"
   />
     <main>
       <div class="container">
         <div class="row">
           <div class="col">
-            {{$props.mainContent}}
+            {{args.mainContent}}
           </div>
         </div>
       </div>
@@ -65,7 +62,7 @@ const DefaultContent = (args, { argTypes }) => ({
       <div class="container">
         <div class="row">
           <div class="col">
-          {{$props.footerContent}}
+          {{args.footerContent}}
           </div>
         </div>
       </div>
@@ -75,8 +72,3 @@ const DefaultContent = (args, { argTypes }) => ({
 })
 
 export const Default = DefaultContent.bind({})
-
-Default.args = {
-  mainContent: 'Some dummy main content required for this example',
-  footerContent: 'Some dummy footer content required for this example'
-}

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

@@ -416,14 +416,14 @@
 
 <script>
 import ModalSearch from './ModalSearch/index.vue'
-import Close from './../../../assets/icons/close.svg'
-import WorkSafeLogo from './../../../assets/icons/AppFooter/worksafe-footer-logo.svg'
-import WorkWellLogo from './../../../assets/icons/AppFooter/logo-workwell-reversed.svg'
-import CaretRight from './../../../assets/icons/caret-right.svg'
-import CaretDown from './../../../assets/icons/caret-down.svg'
-import SearchIcon from './../../../assets/icons/AppHeader/search-32px.svg'
-import CaretLeft from './../../../assets/icons/caret-left.svg'
-import MenuIcon from './../../../assets/icons/AppHeader/menu-32px.svg'
+import Close from './../../../assets/icons/close.svg?component'
+import WorkSafeLogo from './../../../assets/icons/AppFooter/worksafe-footer-logo.svg?url'
+import WorkWellLogo from './../../../assets/icons/AppFooter/logo-workwell-reversed.svg?url'
+import CaretRight from './../../../assets/icons/caret-right.svg?component'
+import CaretDown from './../../../assets/icons/caret-down.svg?component'
+import SearchIcon from './../../../assets/icons/AppHeader/search-32px.svg?component'
+import CaretLeft from './../../../assets/icons/caret-left.svg?component'
+import MenuIcon from './../../../assets/icons/AppHeader/menu-32px.svg?component'
 
 export default {
   components: {
@@ -527,6 +527,7 @@ export default {
       this.windowWidth = window.innerWidth
     },
     firstLevelClick(item, ref) {
+      console.log('in first level click')
       // Reset screen to fix whitespace
       if (window && window.scrollTo && this.screen === 'desktop') {
         window.scrollTo(0, 0)

package/src/components/Global/DirectoryFilters/SingleTaxonomy/index.vue

@@ -159,7 +159,8 @@ export default {
       }
     }
     .modal-body {
-      padding: 32px;
+      padding: 0px 32px 0px;
+      margin-top: 16px;
       fieldset {
         display: flex;
         flex-direction: row;

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

@@ -5,4 +5,10 @@ export default {
     component: GlobalNotice
   }
   
-  export const Default = {}
+  export const Default = {
+    loaders: [
+      () => { 
+        window.localStorage.removeItem('globalModalHidden')
+      }
+    ]
+  }

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

@@ -98,9 +98,7 @@
               >
             </column>
           </row>
-          <template v-if="showSocial && type !== 'hero'">
-            <social-share :rtl="rtl" />
-          </template>
+          <social-share v-show="showSocial && type !== 'hero'" :rtl="rtl" />
         </container>
       </div>
       <!-- Type Default -->
@@ -152,7 +150,7 @@
       </column>
       <!-- No Col needed for type Hero -->
     </row>
-    <social-share v-if="showSocial && type === 'hero'" :rtl="rtl" />
+    <social-share v-show="showSocial && type === 'hero'" :rtl="rtl" />
   </container>
 </template>
 <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/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/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,