@worksafevictoria/wcl7.5 1.5.0 → 1.6.0

package/src/components/SubComponents/FormInstance/tests/scale.test.js

@@ -29,15 +29,15 @@ describe(`Form ${testComponent} parser`, () => {
             { checked: false, id: 0, label: '', value: 2 },
             { checked: true, id: 0, label: '', value: 3 },
             { checked: false, id: 0, label: '', value: 4 },
-            { checked: false, id: 0, label: '', value: 5 }
-          ]
-        }
-      ])
+            { checked: false, id: 0, label: '', value: 5 },
+          ],
+        },
+      ]),
     )
   })
 
-  it(`should return a submission value`, () => {
-    const submission = FormTestUtils.handleSubmission(json, 3)
+  it(`should return a submission value`, async () => {
+    const submission = await FormTestUtils.handleSubmission(json, 3)
     expect(submission).toEqual({ scale1: 3 })
   })
 })

package/src/components/SubComponents/FormInstance/tests/url.test.js

@@ -20,26 +20,29 @@ describe(`Form ${testComponent} parser`, () => {
           labelPosition: 'top',
           mask: false,
           type: 'url',
-          validate: { maxLength: 255, required: false }
-        }
-      ])
+          validate: { maxLength: 255, required: false },
+        },
+      ]),
     )
   })
 
-  it(`should return a submission value with prefix`, () => {
-    const submission = FormTestUtils.handleSubmission(
+  it(`should return a submission value with prefix`, async () => {
+    const submission = await FormTestUtils.handleSubmission(
       json,
-      'https://www.google.com'
+      'https://www.google.com',
     )
     expect(submission).toEqual({
-      url1: 'https://www.google.com'
+      url1: 'https://www.google.com',
     })
   })
 
-  it(`should return a submission value without prefix`, () => {
-    const submission = FormTestUtils.handleSubmission(json, 'www.google.com')
+  it(`should return a submission value without prefix`, async () => {
+    const submission = await FormTestUtils.handleSubmission(
+      json,
+      'www.google.com',
+    )
     expect(submission).toEqual({
-      url1: 'http://www.google.com'
+      url1: 'http://www.google.com',
     })
   })
 })

package/src/components/SubComponents/Pagination/index.vue

@@ -52,37 +52,37 @@ import CtaButton from '../../SubComponents/CtaButton/index.vue'
 
 export default {
   components: {
-    CtaButton
+    CtaButton,
   },
   props: {
     ariaLabel: {
       type: String,
-      required: true
+      required: true,
     },
     rows: {
       type: Number,
-      required: true
+      required: true,
     },
     offset: {
       type: Number,
-      required: true
+      required: true,
     },
     total: {
       type: Number,
-      required: true
+      required: true,
     },
     align: {
       type: String,
-      default: 'start'
+      default: 'start',
     },
     maxPages: {
       type: Number,
-      default: 5
-    }
+      default: 5,
+    },
   },
   data() {
     return {
-      currentPage: 1
+      currentPage: 1,
     }
   },
   computed: {
@@ -91,27 +91,28 @@ export default {
         this.total,
         this.currentPage,
         this.rows,
-        this.maxPages
+        this.maxPages,
       )
       return currentPaginationSnapshot
     },
     information() {
       const totalPages = this.pagination.totalPages
       return `${totalPages} pages of results`
-    }
+    },
   },
   watch: {
     offset() {
       if (this.offset === 0 && this.total > 0) {
         this.currentPage = 1
       }
-    }
+    },
   },
   mounted() {
     if (this.offset === 0) {
       this.currentPage = 1
     } else {
-      this.currentPage = this.offset / this.rows + 1
+      // this.currentPage = this.offset / this.rows + 1
+      this.currentPage = this.offset
     }
   },
   methods: {
@@ -119,23 +120,23 @@ export default {
       if (this.currentPage !== currentPage) {
         this.currentPage = currentPage
         this.$emit('pageClicked', {
-          ...this.pagination
+          ...this.pagination,
         })
       }
     },
     next(el) {
       this.currentPage += 1
       this.$emit('next', {
-        ...this.pagination
+        ...this.pagination,
       })
     },
     previous() {
       this.currentPage -= 1
       this.$emit('prev', {
-        ...this.pagination
+        ...this.pagination,
       })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

package/src/components/SubComponents/ResourceGroup/index.vue

@@ -438,7 +438,11 @@ 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)

package/src/components/SubComponents/Search/SearchListing/index.vue

@@ -45,7 +45,7 @@
           :taxonomies="{
             industry: card.industry,
             topic: card.topic,
-            language: card.language
+            language: card.language,
           }"
           :is-card-title-selectable="isCardTitleSelectable"
         />
@@ -94,44 +94,44 @@ export default {
   props: {
     isTypeahead: {
       type: Boolean,
-      required: false
+      required: false,
     },
     pageLimit: {
       type: Number,
       required: false,
-      default: 20
+      default: 20,
     },
     numFound: {
       type: Number,
       required: false,
-      default: 0
+      default: 0,
     },
     query: {
       type: String,
       required: false,
-      default: ''
+      default: '',
     },
     results: {
       type: Array,
-      default: () => []
+      default: () => [],
     },
     offset: {
       type: Number,
       required: false,
-      default: 0
+      default: 0,
     },
     isLoading: {
       type: Boolean,
-      required: false
+      required: false,
     },
     suggestion: {
       type: String,
-      default: null
+      default: null,
     },
     isCardTitleSelectable: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   methods: {
     onClickItem(event, item, index) {
@@ -146,8 +146,8 @@ export default {
     onSelectCardTitle(card) {
       navigateToPath.call(
         this,
-        card?.selectedCard?.link,
-        card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+        card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // open link in current environment
+        card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
       )
       this.$nextTick(() => this.$emit('selected-title'))
 
@@ -158,8 +158,8 @@ export default {
     onSelectResult(card) {
       navigateToPath.call(
         this,
-        card?.selectedCard?.link,
-        card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+        card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // title click is used for search result, but change also included here
+        card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
       )
       this.$nextTick(() => this.$emit('selected'))
 
@@ -173,8 +173,8 @@ export default {
           this.$route?.path === '/'
             ? 'Homepage'
             : this.$route?.path === '/search'
-            ? 'Search Page'
-            : this.$route?.path,
+              ? 'Search Page'
+              : this.$route?.path,
         label: this.query,
         results: this.results.length,
         clickText: card.selectedCard.title,
@@ -183,7 +183,7 @@ export default {
         targetElement: card.ev.target,
         industry: card?.selectedCard?.industry,
         topic: card?.selectedCard?.topic,
-        language: card?.selectedCard?.language
+        language: card?.selectedCard?.language,
       }
       this.$gtm.push({ event: 'custom.search.site.result', ...attrs })
     },
@@ -191,8 +191,8 @@ export default {
       if (this.$nuxt) {
         this.$router.push('/search?q=' + this.query)
       }
-    }
-  }
+    },
+  },
 }
 </script>
 

package/src/components/SubComponents/Search/index.vue

@@ -33,7 +33,7 @@
         v-if="loadSearchList && (searchResults || isLoading)"
         :class="{
           [`wcl-search__typeahead`]: isTypeahead,
-          [`wcl-search__modal`]: isTypeahead
+          [`wcl-search__modal`]: isTypeahead,
         }"
         :is-loading="isLoading"
         :is-typeahead="isTypeahead"
@@ -63,28 +63,28 @@ export default {
   props: {
     pageLimit: {
       type: Number,
-      required: true
+      required: true,
     },
     contentParser: {
       type: Function,
-      required: true
+      required: true,
     },
     isTypeahead: {
       type: Boolean,
-      required: true
+      required: true,
     },
     initialSearchQuery: {
       type: String,
-      default: ''
+      default: '',
     },
     googleSearchFlag: {
       type: String,
-      default: 'solar'
+      default: 'solar',
     },
     visibleSearchList: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -95,16 +95,16 @@ export default {
       field_language: '8671',
       searchType: this.googleSearchFlag,
       googleSearchScript: false,
-      loadSearchList: this.visibleSearchList
+      loadSearchList: this.visibleSearchList,
     }
   },
   computed: {
     searchClass() {
       return {
         'wcl-search': true,
-        'wcl-search__google': this.searchType !== 'solar'
+        'wcl-search__google': this.searchType !== 'solar',
       }
-    }
+    },
   },
   mounted() {
     if (this.searchType === 'google') {
@@ -134,9 +134,9 @@ export default {
               key: apiKey,
               cx: searchEngineId,
               q: query,
-              start: start
-            }
-          }
+              start: start,
+            },
+          },
         )
         return response
       } catch (error) {
@@ -156,7 +156,7 @@ export default {
         apiKey,
         searchEngineId,
         searchQuery,
-        start
+        start,
       )
       let items = []
       let suggest = response?.data?.spelling?.correctedQuery || ''
@@ -165,7 +165,7 @@ export default {
           apiKey,
           searchEngineId,
           response?.data?.spelling?.correctedQuery,
-          start
+          start,
         )
         items = response?.data?.items
       } else if (response?.data?.items) {
@@ -181,7 +181,7 @@ export default {
           // Return the modified item with the updated title
           return {
             ...item,
-            title: modifiedTitle
+            title: modifiedTitle,
           }
         })
 
@@ -190,7 +190,7 @@ export default {
           numFound: Number(totalResults),
           query: this.searchQuery,
           results: modifiedResults,
-          suggestion: suggest
+          suggestion: suggest,
         }
       } else {
         this.searchResults = {
@@ -198,7 +198,7 @@ export default {
           numFound: 0,
           query: this.searchQuery ?? '',
           results: [],
-          suggestion: suggest
+          suggestion: suggest,
         }
       }
       this.$emit('loading', false)
@@ -214,10 +214,10 @@ export default {
             this.$route?.path === '/'
               ? 'Homepage'
               : this.$route?.path === '/search'
-              ? 'Search Page'
-              : this.$route?.path,
+                ? 'Search Page'
+                : this.$route?.path,
           label: this.searchQuery,
-          results: this.searchResults.numFound
+          results: this.searchResults.numFound,
         }
         if (this.$gtm) {
           this.$gtm.push({ event: 'custom.search.site.submit', ...attrs })
@@ -291,7 +291,7 @@ export default {
           query: searchQuery,
           start: pageNr > 1 ? (pageNr - 1) * pageLimit : 0,
           rows: pageLimit,
-          field_language: this.field_language
+          field_language: this.field_language,
         }).then((res) => {
           if (res.numFound) {
             this.searchResults = {
@@ -299,7 +299,7 @@ export default {
               numFound: Number(res.numFound),
               query: searchQuery,
               results: res.results,
-              suggestion: null
+              suggestion: null,
             }
           } else {
             this.searchResults = {
@@ -307,7 +307,7 @@ export default {
               numFound: 0,
               query: this.searchQuery ?? '',
               results: [],
-              suggestion: null
+              suggestion: null,
             }
           }
           this.$emit('loading', false)
@@ -322,10 +322,10 @@ export default {
                 this.$route?.path === '/'
                   ? 'Homepage'
                   : this.$route?.path === '/search'
-                  ? 'Search Page'
-                  : this.$route?.path,
+                    ? 'Search Page'
+                    : this.$route?.path,
               label: this.searchQuery,
-              results: this.searchResults.numFound
+              results: this.searchResults.numFound,
             }
             if (this.$gtm) {
               this.$gtm.push({ event: 'custom.search.site.submit', ...attrs })
@@ -340,7 +340,9 @@ export default {
       if (this.googleSearchScript === false) {
         const script = document.createElement('script')
         script.async = true
-        script.src = process.env.GOOGLE__URL
+        script.src = this.$config
+          ? this.$config.public.googleSearch
+          : process.env.GOOGLE__URL
         document.head.appendChild(script)
         this.googleSearchScript = true
 
@@ -386,8 +388,8 @@ export default {
 
         this.setupPaginationEvent()
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -454,8 +456,8 @@ export default {
       display: none;
     }
   }
-    // Google Search styling
-    &.wcl-search__google {
+  // Google Search styling
+  &.wcl-search__google {
     :deep(form.gsc-search-box) {
       position: relative;
       display: -ms-flexbox;