@worksafevictoria/wcl7.5 1.8.0-beta.3 → 1.8.0-beta.5

package/lib/utility.js

@@ -35,6 +35,8 @@ function isGovSite(url) {
 }
 
 function navigateToPath(path, newTab, nuxtRouter) {
+  debugger
+
   const url = String(path).startsWith('www.') ? `http://${path}` : path
   const isAbsolute = isAbsoluteUrl(url)
   const router = nuxtRouter ? nuxtRouter : this.$router

package/package.json

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

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

@@ -239,6 +239,7 @@ export default {
     },
     cardSelected(selectedCard, ev) {
       debugger;
+      console.log("cardSelected selectedCard :- ", selectedCard);
       this.clearCards();
       selectedCard.selected = !!!selectedCard.selected;
       const selectedCardModelIndex = this.getChildIndex(selectedCard);

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

@@ -403,7 +403,7 @@ export default {
   methods: {
     cardClicked(ev) {
       debugger;
-      console.log("cardClicked this.isSelectable :- ", this.isSelectable);
+
       if (this.isSelectable) {
         this.parentGrid.cardSelected(this, ev);
       }

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

@@ -57,70 +57,73 @@
       <div style="padding-top: 20px;">
         <hr>
       </div>
-      <row >
+      <!-- Contacts, if any -->
+      <div v-if="validContacts">
+        <row >
         <column >
           <h4>Contact Information</h4>
         </column>
       </row>
-      <row>
-        <column sm="2" class="label">
+      <row v-if="item.contact1 !== '' || item.contact2 !== ''">
+        <column sm="2" class="label" v-if="item.contact1 !== ''">
           Contact
         </column>
-        <column sm="4" class="hscp-additional-records">
+        <column sm="4" class="hscp-additional-records" v-if="item.contact1 !== ''">
           {{item.contact1}}
         </column>
-        <column sm="2" class="label">
+        <column sm="2" class="label" v-if="item.contact2 !== ''">
           Contact
         </column>
-        <column sm="4" class="hscp-additional-records">
+        <column sm="4" class="hscp-additional-records" v-if="item.contact2 !== ''">
           {{item.contact2}}
         </column>
       </row>
-      <row>
-        <column sm="2" class="label">
+      <row v-if="item.phone1 !== '' || item.phone2 !== ''">
+        <column sm="2" class="label" v-if="item.phone1 !== ''">
           Phone
         </column>
-        <column sm="4" class="hscp-additional-records">
+        <column sm="4" class="hscp-additional-records" v-if="item.phone1 !== ''">
           {{item.phone1}}
         </column>
-        <column sm="2" class="label">
+        <column sm="2" class="label" v-if="item.phone2 !== ''">
           Phone
         </column>
-        <column sm="4" class="hscp-additional-records">
+        <column sm="4" class="hscp-additional-records" v-if="item.phone2 !== ''">
           {{item.phone2}}
         </column>
       </row>
-      <row>
-        <column sm="2" class="label">
+      <row v-if="item.email1 !== '' || item.email2 !== ''">
+        <column sm="2" class="label" v-if="item.email1 !== ''">
           Email
         </column>
-        <column sm="4" class="hscp-additional-records">
+        <column sm="4" class="hscp-additional-records" v-if="item.email1 !== ''">
           {{item.email1}}
         </column>
-        <column sm="2" class="label">
+        <column sm="2" class="label" v-if="item.email2 !== ''">
           Email
         </column>
-        <column sm="4" class="hscp-additional-records">
+        <column sm="4" class="hscp-additional-records" v-if="item.email1 !== ''">
           {{item.email2}}
         </column>
       </row>
+      </div>
+     <div v-if="item.trainingVenues.length">
       <row class="row-hscp-additional">
         <column>
           <h4>Training Venue Locations</h4>
         </column>
       </row>
       <row class="hscp-additional-records">
-        <column v-if="item.trainingVenues.length" >
+        <column  >
           <ul>
             <li v-for="(venue) in item.trainingVenues.split(',')" :key="venue.id">
               {{venue}}
             </li>
           </ul> 
         </column>
-        <column v-else-if="!item.trainingVenues.length">
-          <p>No training venues</p>
-        </column>
       </row>
+     </div>
+      
       <row class="row-hscp-additional">
         <column>
           <h4>Training Courses</h4>
@@ -170,6 +173,13 @@ export default {
     gMapLink() {
       return `https://google.com/maps?q=${this.item.title}%20${this.item.fullAddress}`
     },
+    validContacts() {
+      if (this.item.contact1 === '' && this.item.contact2 === '' && this.item.phone1 === '' && this.item.phone2 === '' && this.item.email1 === '' && this.item.email2 === '') {
+        return false
+      } else {
+        return true
+      }
+    }
 
   },
   methods: {
@@ -206,12 +216,11 @@ export default {
   align-content: end;
   max-width: 20px;
   padding-right: 0px;
-  padding-bottom: 10px;
   float:right;
 }
 .paragraph--directory__records--hscp {
 
-  padding-bottom: 20px !important;
+  padding-bottom: 30px !important;
   
   a {
         color: $black;

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

@@ -236,7 +236,7 @@ export default {
     },
     
     reset() {
-      this.collapseOrgs('')
+      this.collapseOrgs('No')
       this.hideReset = true
       this.searchOrg = ''
       this.searchCourse = ''
@@ -249,7 +249,7 @@ export default {
 
       if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
           // don't set focus
-          this.collapseOrgs('')
+          // don't collapseOrgs
         } else {
           // set focus to top element - used instead of scrollTo
           this.collapseOrgs('Yes')
@@ -257,6 +257,7 @@ export default {
     },
 
     collapseOrgs(focusLink) {
+      // called by pageChanged and reset.  pageChanged called by filter and by pagination links
       const aLinks = document.getElementsByName('titleLink')
       // Convert nodelist to array
       let linksArr = Array.from(aLinks)
@@ -265,9 +266,9 @@ export default {
           .filter((link) => link.getAttribute('aria-expanded') === 'true')
           .forEach((link) => link.click())
 
-          if (focusLink === 'Yes') {
-            linksArr[0].focus()
-          }
+        if (focusLink === 'Yes') {
+          linksArr[0].focus()
+        }
       }
 
     },

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

@@ -18,14 +18,14 @@
       :force-lg-columns-per-row="1"
       :force-md-columns-per-row="1"
       :cards="results"
-      :is-selectable="isSelectable"
+      :is-selectable="true"
       :size="'full'"
       :row-spacing="'none'"
       :no-padding-top="true"
       @selected="onSelectResult"
-      @selected-title="onSelectCardTitle"
     >
       <template v-slot:cardItem="{ card }">
+        <span class="d-none">card.link :- {{ card.link }}</span>
         <card-grid-item
           :header-size="isTypeahead ? 'medium' : 'large'"
           :card-header-title="card.title"
@@ -38,13 +38,13 @@
               ? truncate(card.description, 144)
               : card.htmlSnippet || ''
           "
+          :link="card.link ? card.link : false"
           :strip-description-html="true"
           :taxonomies="{
             industry: card.industry,
             topic: card.topic,
             language: card.language,
           }"
-          :is-card-title-selectable="isCardTitleSelectable"
         />
       </template>
       <template
@@ -146,9 +146,11 @@ export default {
     },
     onSelectCardTitle(card) {
       debugger;
+      console.log("onSelectCardTitle :- ", card);
+
       navigateToPath.call(
         this,
-        card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // open link in current environment
+        card?.selectedCard?.link,
         card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
       );
       this.$nextTick(() => this.$emit("selected-title"));
@@ -158,9 +160,13 @@ export default {
       }
     },
     onSelectResult(card) {
+      debugger;
+      console.log("onSelectResult card:- ", card);
+      console.log("onSelectResult card?.selectedCard?.link:- ", card?.selectedCard?.link);
+
       navigateToPath.call(
         this,
-        card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // title click is used for search result, but change also included here
+        card?.selectedCard?.link, // 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"));

package/src/components/SubComponents/Search/index.stories.js

@@ -5,7 +5,8 @@ const contentParser = () => {
     results: [
       {
         title: 'Content title 1',
-        description: 'Content description 2'
+        description: 'Content description 2',
+        link: '/mental-health'
       }
     ],
     offset: 0,

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

@@ -42,8 +42,6 @@
         :offset="searchResults && searchResults.offset"
         :page-limit="pageLimit"
         :content-parser="contentParser"
-        :is-selectable="true"
-        :is-card-title-selectable="true"
         @selected="$emit('selected')"
         @pageChanged="pageChanged"
       />
@@ -233,9 +231,6 @@ export default {
       }
     },
     onSearch(e) {
-      debugger;
-      console.log("this.searchType:- ", this.searchType);
-
       const { path } = this.$route || {};
 
       // Home page