Skip to content

Commit 63b9235

Browse files
uwlauwla
committed
style: eslint fixes
1 parent f3d13fc commit 63b9235

30 files changed

+229
-231
lines changed

‎eslint.config.js‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,7 @@ import globals from "globals"
55
import typescriptEslint from "typescript-eslint"
66

77
export default typescriptEslint.config(
8-
{
9-
ignores: [
10-
"*.d.ts",
11-
"**/coverage",
12-
"**/dist",
13-
"assets/",
14-
"src/dev.ts",
15-
],
16-
},
8+
{ ignores: ["*.d.ts", "**/coverage", "**/dist", "assets/", "src/dev.ts"] },
179
{
1810
extends: [
1911
eslint.configs.recommended,
@@ -44,4 +36,4 @@ export default typescriptEslint.config(
4436
},
4537
},
4638
eslintConfigPrettier
47-
)
39+
)

‎src/components/ActionButtons/ActionButtons.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ import { defineComponent } from "vue"
22

33
export default defineComponent({
44
name: "VdtActionButtons",
5-
methods: {
6-
triggerAction(action: string) {
7-
this.$emit("userEvent", { action: action, data: this.data })
8-
},
9-
},
105
props: {
116
actions: {
127
type: Array as () => string[],
@@ -18,4 +13,9 @@ export default defineComponent({
1813
},
1914
data: Object,
2015
},
16+
methods: {
17+
triggerAction(action: string) {
18+
this.$emit("userEvent", { action: action, data: this.data })
19+
},
20+
},
2121
})

‎src/components/DataTable.ts‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ export default defineComponent({
154154
if (key !== "" && value[key]) {
155155
index = value[key]
156156
}
157-
return { ...(value as Object), _key: index }
157+
return { ...(value as object), _key: index }
158158
})
159159

160160
if (isNullable(search)) {
@@ -172,7 +172,7 @@ export default defineComponent({
172172
* The data after sorting it by the desirable columns
173173
*/
174174
dataSorted() {
175-
var { dataFiltered: data, columnsBeingSorted } = this
175+
const { dataFiltered: data, columnsBeingSorted } = this
176176

177177
// do not sort if there is no rows or no data to sort
178178
if (columnsBeingSorted.length === 0 || data.length === 0) {
@@ -201,7 +201,7 @@ export default defineComponent({
201201
const { dataFiltered, currentPerPage, currentPage } = this
202202
if (
203203
dataFiltered.length === 0 ||
204-
(currentPerPage as Number | String) === "*"
204+
(currentPerPage as number | string) === "*"
205205
) {
206206
return 0
207207
}
@@ -213,7 +213,7 @@ export default defineComponent({
213213
*/
214214
lastEntry() {
215215
const { currentPerPage } = this
216-
if ((currentPerPage as Number | String) === "*") {
216+
if ((currentPerPage as number | string) === "*") {
217217
return this.filteredEntries
218218
}
219219
return Math.min(
@@ -258,7 +258,7 @@ export default defineComponent({
258258
filteredEntries,
259259
totalEntries,
260260
]
261-
if ((currentPerPage as Number | String) === "*") {
261+
if ((currentPerPage as number | string) === "*") {
262262
return infoAllText
263263
}
264264
const searchValues = [":first", ":last", ":filtered", ":total"]
@@ -281,7 +281,7 @@ export default defineComponent({
281281
*/
282282
numberOfPages() {
283283
const { currentPerPage } = this
284-
if ((currentPerPage as Number | String) === "*") return 1
284+
if ((currentPerPage as number | string) === "*") return 1
285285
return Math.max(
286286
Math.ceil(this.filteredEntries / this.currentPerPage),
287287
1
@@ -454,6 +454,23 @@ export default defineComponent({
454454
},
455455
},
456456

457+
watch: {
458+
columns: { handler: "parseColumnProps", deep: true, immediate: true },
459+
columnKeys: {
460+
handler: "parseColumnProps",
461+
deep: true,
462+
immediate: true,
463+
},
464+
columnsBeingSorted: {
465+
handler: "updateData",
466+
deep: false,
467+
immediate: false,
468+
},
469+
text: { handler: "parseTextProps", deep: true, immediate: true },
470+
lang: { handler: "parseTextProps" },
471+
perPageSizes: { handler: "setDefaults" },
472+
},
473+
457474
mounted() {
458475
this.setDefaults()
459476
this.updateData()
@@ -554,7 +571,7 @@ export default defineComponent({
554571
if (this.sortingMode === "single") {
555572
// mark other columns as not being sorted
556573
// skipping the current column
557-
for (let col of this.sortableColumns as Column[]) {
574+
for (const col of this.sortableColumns as Column[]) {
558575
if (col.id !== column.id) {
559576
col.sortingMode = SORTING_MODE.NONE
560577
col.sortingIndex = -1
@@ -664,7 +681,7 @@ export default defineComponent({
664681
// update current per page so that
665682
// the user will see the same first
666683
// rows that were being displayed
667-
if ((this.currentPerPage as Number | String) === "*") {
684+
if ((this.currentPerPage as number | string) === "*") {
668685
newCurrentPage = 1
669686
} else {
670687
newCurrentPage = Math.floor(previousFirstEntry / newPerPage) + 1
@@ -713,7 +730,7 @@ export default defineComponent({
713730
* @returns string
714731
*/
715732
getSortQuery() {
716-
let { columnsBeingSorted } = this
733+
const { columnsBeingSorted } = this
717734

718735
// nothing being sorted
719736
if (columnsBeingSorted.length == 0) return ""
@@ -729,21 +746,4 @@ export default defineComponent({
729746
return searchQueryUri
730747
},
731748
},
732-
733-
watch: {
734-
columns: { handler: "parseColumnProps", deep: true, immediate: true },
735-
columnKeys: {
736-
handler: "parseColumnProps",
737-
deep: true,
738-
immediate: true,
739-
},
740-
columnsBeingSorted: {
741-
handler: "updateData",
742-
deep: false,
743-
immediate: false,
744-
},
745-
text: { handler: "parseTextProps", deep: true, immediate: true },
746-
lang: { handler: "parseTextProps" },
747-
perPageSizes: { handler: "setDefaults" },
748-
},
749749
})

‎src/components/ExportData/ExportData.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,31 @@ import { defineComponent } from "vue"
44

55
export default defineComponent({
66
name: "VdtExportData",
7+
props: {
8+
data: Array,
9+
allowedExports: Array,
10+
downloadButtonText: String,
11+
downloadFileName: String,
12+
downloadText: String,
13+
},
714
setup() {
815
return { selectedExport: "" }
916
},
17+
watch: {
18+
allowedExports: {
19+
handler(value) {
20+
this.selectedExport = value[0]
21+
},
22+
immediate: true,
23+
},
24+
},
1025
methods: {
1126
download() {
1227
if (this.selectedExport === "pdf") {
1328
return this.downloadPdf()
1429
}
1530
exportFromJSON({
16-
data: this.data as Object,
31+
data: this.data as object,
1732
fileName: this.downloadFileName,
1833
exportType: this.selectedExport as ExportType,
1934
})
@@ -33,19 +48,4 @@ export default defineComponent({
3348
})
3449
},
3550
},
36-
props: {
37-
data: Array,
38-
allowedExports: Array,
39-
downloadButtonText: String,
40-
downloadFileName: String,
41-
downloadText: String,
42-
},
43-
watch: {
44-
allowedExports: {
45-
handler(value) {
46-
this.selectedExport = value[0]
47-
},
48-
immediate: true,
49-
},
50-
},
5151
})

‎src/components/ExportData/ExportData.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<template>
22
<div
3-
class="vdt-export"
43
ref="el"
4+
class="vdt-export"
55
>
66
<span>{{ downloadText }}</span>
77
<select
8-
class="vdt-input"
98
v-model="selectedExport"
9+
class="vdt-input"
1010
>
1111
<option
1212
v-for="(exportType, i) in allowedExports"

‎src/components/Pagination/Pagination.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ import { defineComponent } from "vue"
22

33
export default defineComponent({
44
name: "VdtPagination",
5-
setup() {
6-
return { pageToGo: 1 }
7-
},
8-
methods: {
9-
setCurrentPage(page: any) {
10-
this.$emit("set-page", Number(page))
11-
},
12-
},
135
props: {
146
paginationSearchButtonText: String,
157
paginationSearchText: String,
@@ -23,6 +15,9 @@ export default defineComponent({
2315
nextPage: Number,
2416
pagination: Array,
2517
},
18+
setup() {
19+
return { pageToGo: 1 }
20+
},
2621
watch: {
2722
currentPage(value) {
2823
this.pageToGo = value
@@ -37,4 +32,9 @@ export default defineComponent({
3732
return value
3833
},
3934
},
35+
methods: {
36+
setCurrentPage(page: any) {
37+
this.$emit("set-page", Number(page))
38+
},
39+
},
4040
})

‎src/components/Pagination/Pagination.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@keyup.enter="setCurrentPage(pageToGo)"
1212
/>
1313
<button
14-
@click="setCurrentPage(pageToGo)"
1514
class="vdt-btn vdt-btn-primary"
15+
@click="setCurrentPage(pageToGo)"
1616
>
1717
{{ paginationSearchButtonText }}
1818
</button>
@@ -43,8 +43,8 @@
4343
</li>
4444
<li
4545
class="vdt-page-item"
46-
@click="setCurrentPage(nextPage)"
4746
:class="{ disabled: isLastPage }"
47+
@click="setCurrentPage(nextPage)"
4848
>
4949
<span class="vdt-page-link">
5050
{{ nextButtonText }}

‎src/components/PerPage/PerPage.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ import { defineComponent } from "vue"
22

33
export default defineComponent({
44
name: "VdtPerPage",
5+
props: {
6+
perPageText: { type: String, required: true },
7+
perPageAllText: { type: String, required: true },
8+
currentPerPage: { type: [Number, String], required: true },
9+
perPageSizes: { type: Array, required: true },
10+
},
511
computed: {
612
textBeforeOptions() {
713
return (this.perPageText.split(":entries")[0] || "").trim()
@@ -15,10 +21,4 @@ export default defineComponent({
1521
return string !== ""
1622
},
1723
},
18-
props: {
19-
perPageText: { type: String, required: true },
20-
perPageAllText: { type: String, required: true },
21-
currentPerPage: { type: [Number, String], required: true },
22-
perPageSizes: { type: Array, required: true },
23-
},
2424
})

‎src/components/PerPage/PerPage.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div class="vdt-perpage">
33
<span>{{ textBeforeOptions }}</span>
44
<select
5-
@input="$emit('set-per-page')"
65
:value="currentPerPage"
6+
@input="$emit('set-per-page')"
77
>
88
<option
99
v-for="(val, i) in perPageSizes"

‎src/components/Table/Table.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ import { defineComponent } from "vue"
22

33
export default defineComponent({
44
name: "VdtTable",
5-
methods: {
6-
// Propagate upwards an event from a user custom component
7-
emitUserEvent(payload: any) {
8-
this.$emit("user-event", payload)
9-
},
10-
},
115
props: {
126
tableClass: String,
137
columns: Array as () => any,
@@ -23,4 +17,10 @@ export default defineComponent({
2317
sortingIconComponent: [Object, String],
2418
sortingIndexComponent: [Object, String],
2519
},
20+
methods: {
21+
// Propagate upwards an event from a user custom component
22+
emitUserEvent(payload: any) {
23+
this.$emit("user-event", payload)
24+
},
25+
},
2626
})

0 commit comments

Comments
 (0)