@worksafevictoria/wcl7.5 1.1.0-beta.113 → 1.1.0-beta.115

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/Global/AppHeader/ModalSearch/index.vue +14 -16
  3. package/src/components/Global/AppHeaderNew/ModalSearch/index.vue +14 -16
  4. package/src/components/Paragraphs/Directory/HSCP/Records/index.vue +11 -6
  5. package/src/components/Paragraphs/TabulatedData/index.vue +5 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@worksafevictoria/wcl7.5",
3
- "version": "1.1.0-beta.113",
3
+ "version": "1.1.0-beta.115",
4
4
  "main": "src/index.js",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/Global/AppHeader/ModalSearch/index.vue CHANGED
@@ -10,9 +10,7 @@
10
10
  <img class="app-search__close-icon" width="22" height="18" :src="Close" />
11
11
  </button>
12
12
  <form @submit.prevent>
13
- <label
14
- class="app-search__label font-weight-bold"
15
- for="app-search--search-input-box"
13
+ <label class="app-search__label font-weight-bold" for="app-search--search-input-box"
16
14
  >Search WorkSafe</label
17
15
  >
18
16
  <search
@@ -32,40 +30,40 @@
32
30
  </template>
33
31
 
34
32
  <script>
35
- import Close from '../../../../assets/icons/close.svg?url'
36
- import Search from '../../../SubComponents/Search/index.vue'
33
+ import Close from "../../../../assets/icons/close.svg?url";
34
+ import Search from "../../../SubComponents/Search/index.vue";
37
35
 
38
36
  export default {
39
- name: 'ModalSearch',
37
+ name: "ModalSearch",
40
38
  components: { Search },
41
39
  props: {
42
40
  searchQuery: {
43
41
  type: String,
44
- default: ''
42
+ default: "",
45
43
  },
46
44
  contentParser: {
47
45
  type: Function,
48
- required: true
46
+ required: true,
49
47
  },
50
48
  googleSearchFlag: {
51
49
  type: String,
52
- default: 'googlerest'
53
- }
50
+ default: "solar",
51
+ },
54
52
  },
55
53
  data() {
56
54
  return {
57
55
  pageLimit: 20,
58
56
  pageNumber: 1,
59
57
  searchResults: null,
60
- Close
61
- }
58
+ Close,
59
+ };
62
60
  },
63
61
  mounted() {
64
- this.$refs.searchInputBox.$el.querySelector('input').focus()
65
- }
66
- }
62
+ this.$refs.searchInputBox.$el.querySelector("input").focus();
63
+ },
64
+ };
67
65
  </script>
68
66
 
69
67
  <style lang="scss" scoped>
70
- @import './styles';
68
+ @import "./styles";
71
69
  </style>
package/src/components/Global/AppHeaderNew/ModalSearch/index.vue CHANGED
@@ -10,9 +10,7 @@
10
10
  <img class="app-search__close-icon" width="22" height="18" :src="Close" />
11
11
  </button>
12
12
  <form @submit.prevent>
13
- <label
14
- class="app-search__label font-weight-bold"
15
- for="app-search--search-input-box"
13
+ <label class="app-search__label font-weight-bold" for="app-search--search-input-box"
16
14
  >Search WorkSafe</label
17
15
  >
18
16
  <search
@@ -32,40 +30,40 @@
32
30
  </template>
33
31
 
34
32
  <script>
35
- import Close from '../../../../assets/icons/close.svg?url'
36
- import Search from '../../../SubComponents/Search/index.vue'
33
+ import Close from "../../../../assets/icons/close.svg?url";
34
+ import Search from "../../../SubComponents/Search/index.vue";
37
35
 
38
36
  export default {
39
- name: 'ModalSearch',
37
+ name: "ModalSearch",
40
38
  components: { Search },
41
39
  props: {
42
40
  searchQuery: {
43
41
  type: String,
44
- default: ''
42
+ default: "",
45
43
  },
46
44
  contentParser: {
47
45
  type: Function,
48
- required: true
46
+ required: true,
49
47
  },
50
48
  googleSearchFlag: {
51
49
  type: String,
52
- default: 'googlerest'
53
- }
50
+ default: "solar",
51
+ },
54
52
  },
55
53
  data() {
56
54
  return {
57
55
  pageLimit: 20,
58
56
  pageNumber: 1,
59
57
  searchResults: null,
60
- Close
61
- }
58
+ Close,
59
+ };
62
60
  },
63
61
  mounted() {
64
- this.$refs.searchInputBox.$el.querySelector('input').focus()
65
- }
66
- }
62
+ this.$refs.searchInputBox.$el.querySelector("input").focus();
63
+ },
64
+ };
67
65
  </script>
68
66
 
69
67
  <style lang="scss" scoped>
70
- @import './styles';
68
+ @import "./styles";
71
69
  </style>
package/src/components/Paragraphs/Directory/HSCP/Records/index.vue CHANGED
@@ -7,25 +7,25 @@
7
7
  <label class="visually-hidden" for="search-directory">
8
8
  Search by keyword (typed keyword automatically filters below results)
9
9
  </label>
10
- <input type="text" v-model="searchOrg" placeholder="Search organisation" class="search">
10
+ <input type="text" v-model="searchOrg" placeholder="Organisation" class="search">
11
11
  </column>
12
12
  <column xxl="2" xl="3" md="4" sm="6">
13
13
  <label class="visually-hidden" for="search-directory">
14
14
  Search by suburb (typed suburb automatically filters below results)
15
15
  </label>
16
- <input type="text" v-model="searchSub" placeholder="Search suburb" class="search">
16
+ <input type="text" v-model="searchSub" placeholder="Training location" class="search">
17
17
  </column>
18
18
  <!-- Other Filters -->
19
19
  <column xxl="2" xl="3" md="4" sm="6">
20
20
  <select id="filterType" v-model="searchCourse" name="filter" class="selectClass">
21
- <option class="placeholder" value="" disabled hidden selected>Search course type</option>
21
+ <option class="placeholder" value="" disabled hidden selected>Course type</option>
22
22
  <option value="HSR Initial">HSR Initial</option>
23
23
  <option value="HSR Refresher">HSR Refresher</option>
24
24
  </select>
25
25
  </column>
26
26
  <column xxl="2" xl="3" md="4" sm="6">
27
27
  <select id="filterTheme" v-model="searchThemes" name="filter1" class="selectClass">
28
- <option class="placeholder" value="" disabled hidden selected>Search theme</option>
28
+ <option class="placeholder" value="" disabled hidden selected>Theme</option>
29
29
  <option v-for="(opt, i) in themeOptions" :key="i" :value="opt">
30
30
  {{ opt }}
31
31
  </option>
@@ -88,7 +88,7 @@ export default {
88
88
  perPage: 10,
89
89
  page: 0,
90
90
  searchIcon,
91
- hideReset: true,
91
+ hideReset: true
92
92
  }
93
93
  },
94
94
  props: {
@@ -258,7 +258,12 @@ export default {
258
258
  .filter((link) => link.getAttribute('aria-expanded') === 'true')
259
259
  .forEach((link) => link.click())
260
260
 
261
- linksArr[0].focus()
261
+ if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
262
+ // don't set focus
263
+ } else {
264
+ linksArr[0].focus()
265
+ }
266
+
262
267
  }
263
268
 
264
269
  },
package/src/components/Paragraphs/TabulatedData/index.vue CHANGED
@@ -16,6 +16,7 @@
16
16
  :borderless="false"
17
17
  :responsive="!isFluid"
18
18
  :stacked="!isFluid ? 'sm' : false"
19
+ :must-sort="true"
19
20
  >
20
21
  <template #head()="data">
21
22
  <span
@@ -133,6 +134,7 @@ export default {
133
134
  .table td {
134
135
  margin: 1rem;
135
136
  vertical-align: middle;
137
+ padding: 12px;
136
138
  @media screen and (max-width: 540px) {
137
139
  margin: 0.5rem;
138
140
  }
@@ -142,6 +144,8 @@ export default {
142
144
  display: flex;
143
145
  flex-direction: row;
144
146
  flex-wrap: nowrap;
147
+ align-items: center;
148
+ width: 100%;
145
149
  }
146
150
 
147
151
  .rtl {
@@ -150,7 +154,7 @@ export default {
150
154
 
151
155
  .sortImg {
152
156
  vertical-align: middle;
153
- margin-left: 5px;
157
+ margin-left: auto;
154
158
  }
155
159
 
156
160
  .b-table-sortable-column svg {