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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/utility.js +2 -0
  2. package/package.json +1 -1
  3. package/src/components/Common/CardGridItem/index.vue +1 -1
  4. package/src/components/Paragraphs/Directory/HSCP/Records/SingleRecord/index.vue +31 -22
  5. package/src/components/SubComponents/Search/SearchListing/index.vue +7 -2
  6. package/src/components/SubComponents/Search/index.stories.js +2 -1
  7. package/src/components/SubComponents/Search/index.vue +0 -3
package/lib/utility.js CHANGED
@@ -35,6 +35,8 @@ function isGovSite(url) {
35
35
  }
36
36
 
37
37
  function navigateToPath(path, newTab, nuxtRouter) {
38
+ debugger
39
+
38
40
  const url = String(path).startsWith('www.') ? `http://${path}` : path
39
41
  const isAbsolute = isAbsoluteUrl(url)
40
42
  const router = nuxtRouter ? nuxtRouter : this.$router
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@worksafevictoria/wcl7.5",
3
- "version": "1.8.0-beta.4",
3
+ "version": "1.8.0-beta.5",
4
4
  "main": "src/index.js",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/Common/CardGridItem/index.vue CHANGED
@@ -403,7 +403,7 @@ export default {
403
403
  methods: {
404
404
  cardClicked(ev) {
405
405
  debugger;
406
- console.log("cardClicked this.isSelectable :- ", this.isSelectable);
406
+
407
407
  if (this.isSelectable) {
408
408
  this.parentGrid.cardSelected(this, ev);
409
409
  }
package/src/components/Paragraphs/Directory/HSCP/Records/SingleRecord/index.vue CHANGED
@@ -57,70 +57,73 @@
57
57
  <div style="padding-top: 20px;">
58
58
  <hr>
59
59
  </div>
60
- <row >
60
+ <!-- Contacts, if any -->
61
+ <div v-if="validContacts">
62
+ <row >
61
63
  <column >
62
64
  <h4>Contact Information</h4>
63
65
  </column>
64
66
  </row>
65
- <row>
66
- <column sm="2" class="label">
67
+ <row v-if="item.contact1 !== '' || item.contact2 !== ''">
68
+ <column sm="2" class="label" v-if="item.contact1 !== ''">
67
69
  Contact
68
70
  </column>
69
- <column sm="4" class="hscp-additional-records">
71
+ <column sm="4" class="hscp-additional-records" v-if="item.contact1 !== ''">
70
72
  {{item.contact1}}
71
73
  </column>
72
- <column sm="2" class="label">
74
+ <column sm="2" class="label" v-if="item.contact2 !== ''">
73
75
  Contact
74
76
  </column>
75
- <column sm="4" class="hscp-additional-records">
77
+ <column sm="4" class="hscp-additional-records" v-if="item.contact2 !== ''">
76
78
  {{item.contact2}}
77
79
  </column>
78
80
  </row>
79
- <row>
80
- <column sm="2" class="label">
81
+ <row v-if="item.phone1 !== '' || item.phone2 !== ''">
82
+ <column sm="2" class="label" v-if="item.phone1 !== ''">
81
83
  Phone
82
84
  </column>
83
- <column sm="4" class="hscp-additional-records">
85
+ <column sm="4" class="hscp-additional-records" v-if="item.phone1 !== ''">
84
86
  {{item.phone1}}
85
87
  </column>
86
- <column sm="2" class="label">
88
+ <column sm="2" class="label" v-if="item.phone2 !== ''">
87
89
  Phone
88
90
  </column>
89
- <column sm="4" class="hscp-additional-records">
91
+ <column sm="4" class="hscp-additional-records" v-if="item.phone2 !== ''">
90
92
  {{item.phone2}}
91
93
  </column>
92
94
  </row>
93
- <row>
94
- <column sm="2" class="label">
95
+ <row v-if="item.email1 !== '' || item.email2 !== ''">
96
+ <column sm="2" class="label" v-if="item.email1 !== ''">
95
97
  Email
96
98
  </column>
97
- <column sm="4" class="hscp-additional-records">
99
+ <column sm="4" class="hscp-additional-records" v-if="item.email1 !== ''">
98
100
  {{item.email1}}
99
101
  </column>
100
- <column sm="2" class="label">
102
+ <column sm="2" class="label" v-if="item.email2 !== ''">
101
103
  Email
102
104
  </column>
103
- <column sm="4" class="hscp-additional-records">
105
+ <column sm="4" class="hscp-additional-records" v-if="item.email1 !== ''">
104
106
  {{item.email2}}
105
107
  </column>
106
108
  </row>
109
+ </div>
110
+ <div v-if="item.trainingVenues.length">
107
111
  <row class="row-hscp-additional">
108
112
  <column>
109
113
  <h4>Training Venue Locations</h4>
110
114
  </column>
111
115
  </row>
112
116
  <row class="hscp-additional-records">
113
- <column v-if="item.trainingVenues.length" >
117
+ <column >
114
118
  <ul>
115
119
  <li v-for="(venue) in item.trainingVenues.split(',')" :key="venue.id">
116
120
  {{venue}}
117
121
  </li>
118
122
  </ul>
119
123
  </column>
120
- <column v-else-if="!item.trainingVenues.length">
121
- <p>No training venues</p>
122
- </column>
123
124
  </row>
125
+ </div>
126
+
124
127
  <row class="row-hscp-additional">
125
128
  <column>
126
129
  <h4>Training Courses</h4>
@@ -170,6 +173,13 @@ export default {
170
173
  gMapLink() {
171
174
  return `https://google.com/maps?q=${this.item.title}%20${this.item.fullAddress}`
172
175
  },
176
+ validContacts() {
177
+ if (this.item.contact1 === '' && this.item.contact2 === '' && this.item.phone1 === '' && this.item.phone2 === '' && this.item.email1 === '' && this.item.email2 === '') {
178
+ return false
179
+ } else {
180
+ return true
181
+ }
182
+ }
173
183
 
174
184
  },
175
185
  methods: {
@@ -206,12 +216,11 @@ export default {
206
216
  align-content: end;
207
217
  max-width: 20px;
208
218
  padding-right: 0px;
209
- padding-bottom: 10px;
210
219
  float:right;
211
220
  }
212
221
  .paragraph--directory__records--hscp {
213
222
 
214
- padding-bottom: 20px !important;
223
+ padding-bottom: 30px !important;
215
224
 
216
225
  a {
217
226
  color: $black;
package/src/components/SubComponents/Search/SearchListing/index.vue CHANGED
@@ -146,9 +146,11 @@ export default {
146
146
  },
147
147
  onSelectCardTitle(card) {
148
148
  debugger;
149
+ console.log("onSelectCardTitle :- ", card);
150
+
149
151
  navigateToPath.call(
150
152
  this,
151
- card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // open link in current environment
153
+ card?.selectedCard?.link,
152
154
  card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
153
155
  );
154
156
  this.$nextTick(() => this.$emit("selected-title"));
@@ -159,9 +161,12 @@ export default {
159
161
  },
160
162
  onSelectResult(card) {
161
163
  debugger;
164
+ console.log("onSelectResult card:- ", card);
165
+ console.log("onSelectResult card?.selectedCard?.link:- ", card?.selectedCard?.link);
166
+
162
167
  navigateToPath.call(
163
168
  this,
164
- card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // title click is used for search result, but change also included here
169
+ card?.selectedCard?.link, // title click is used for search result, but change also included here
165
170
  card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
166
171
  );
167
172
  this.$nextTick(() => this.$emit("selected"));
package/src/components/SubComponents/Search/index.stories.js CHANGED
@@ -5,7 +5,8 @@ const contentParser = () => {
5
5
  results: [
6
6
  {
7
7
  title: 'Content title 1',
8
- description: 'Content description 2'
8
+ description: 'Content description 2',
9
+ link: '/mental-health'
9
10
  }
10
11
  ],
11
12
  offset: 0,
package/src/components/SubComponents/Search/index.vue CHANGED
@@ -231,9 +231,6 @@ export default {
231
231
  }
232
232
  },
233
233
  onSearch(e) {
234
- debugger;
235
- console.log("this.searchType:- ", this.searchType);
236
-
237
234
  const { path } = this.$route || {};
238
235
 
239
236
  // Home page