@worksafevictoria/wcl7.5 1.8.0-beta.2 → 1.8.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.8.0-beta.2",
+  "version": "1.8.0-beta.4",
   "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/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
@@ -158,6 +158,7 @@ export default {
       }
     },
     onSelectResult(card) {
+      debugger;
       navigateToPath.call(
         this,
         card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // title click is used for search result, but change also included here

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

@@ -6,7 +6,6 @@
       </div>
     </template>
     <template v-else>
-      ELSE :- searchType :- {{ searchType }}
       <b-input-group>
         <label class="visually-hidden" for="site-search"
           >Search by keyword (Typed keyword automatically filters below results)</label
@@ -18,8 +17,8 @@
           aria-label="searchbar"
           autocomplete="off"
           trim
-          @update="searchType !== 'googlerest' ? onChange : () => {}"
-          @keyup.enter="searchType === 'googlerest' ? onChange : () => {}"
+          @update="onChange"
+          @keyup.enter="onChange"
         ></b-form-input>
         <template #append>
           <b-button size="sm" class="search-button" @click="onSearch"
@@ -28,7 +27,6 @@
           /></b-button>
         </template>
       </b-input-group>
-      searchType:- {{ searchType }} <br />
       <search-listing
         v-if="loadSearchList && (searchResults || isLoading)"
         :class="{
@@ -44,15 +42,12 @@
         :offset="searchResults && searchResults.offset"
         :page-limit="pageLimit"
         :content-parser="contentParser"
-        :is-selectable="searchType === 'googlerest' ? false : true"
-        :is-card-title-selectable="searchType === 'googlerest' ? true : false"
         @selected="$emit('selected')"
         @pageChanged="pageChanged"
       />
     </template>
   </div>
 </template>
-
 <script>
 import axios from "axios";
 import searchIcon from "../../../assets/icons/search.svg?url";