From 3f62795663870a2ce962521dc5a5ae766fba769d Mon Sep 17 00:00:00 2001 From: uwla Date: Tue, 25 Feb 2025 09:33:18 -0300 Subject: [PATCH] fix: eslint fixes --- eslint.config.js | 3 ++- src/components/DataTable.ts | 17 ++++++++++------- src/components/Table/Table.ts | 6 +++--- src/components/Table/Table.vue | 2 +- src/types.d.ts | 2 +- src/utils.ts | 7 ++++--- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 582b800..d3c220b 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -12,6 +12,7 @@ export default typescriptEslint.config( "**/dist", "assets/", "src/dev.ts", + "tests/**/*", ], }, { @@ -28,7 +29,7 @@ export default typescriptEslint.config( parserOptions: { parser: typescriptEslint.parser }, }, rules: { - "@typescript-eslint/no-explicit-any": "off", // Allow the use of `any` + "@typescript-eslint/no-explicit-any": "warn", // Allow the use of `any` "@typescript-eslint/no-unused-vars": [ "error", { diff --git a/src/components/DataTable.ts b/src/components/DataTable.ts index 2f82ab2..d2b1cfc 100644 --- a/src/components/DataTable.ts +++ b/src/components/DataTable.ts @@ -77,7 +77,7 @@ export default defineComponent({ data: () => { return reactive({ - dataFetched: [] as Column[], + dataFetched: [] as Data, dataFetchedLinks: [] as any[], currentPage: 1, currentPerPage: 10, @@ -182,7 +182,10 @@ export default defineComponent({ return data } - return sortDataByColumns(data as Data, columnsBeingSorted) + return sortDataByColumns( + data as unknown as Data, + columnsBeingSorted + ) }, /** @@ -532,7 +535,7 @@ export default defineComponent({ /** * Indicates if a page is valid */ - isValidPage(page: any): boolean { + isValidPage(page: number | string): boolean { return ( typeof page === "number" && page <= this.numberOfPages && @@ -586,7 +589,7 @@ export default defineComponent({ // so, mark it as sorted in ascending mode if (column.sortingMode === SORTING_MODE.NONE) { column.sortingMode = SORTING_MODE.ASC - this.columnsBeingSorted = [column] as any + this.columnsBeingSorted = [column] return } @@ -594,7 +597,7 @@ export default defineComponent({ // so, mark it as sorted in descending mode if (column.sortingMode === SORTING_MODE.ASC) { column.sortingMode = SORTING_MODE.DESC - this.columnsBeingSorted = [column] as any + this.columnsBeingSorted = [column] return } @@ -654,11 +657,11 @@ export default defineComponent({ /** * Set the current page being displayed */ - setPage(value: any) { + setPage(value: number | string) { if (!this.isValidPage(value)) { return } - this.currentPage = value + this.currentPage = Number(value) this.updateData() }, diff --git a/src/components/Table/Table.ts b/src/components/Table/Table.ts index e374070..28830e6 100644 --- a/src/components/Table/Table.ts +++ b/src/components/Table/Table.ts @@ -4,10 +4,10 @@ export default defineComponent({ name: "VdtTable", props: { tableClass: String, - columns: Array as () => any, + columns: Array as () => any[], data: Array, - dataDisplayed: Array as () => any, - dataFiltered: Array as () => any, + dataDisplayed: Array as () => any[], + dataFiltered: Array as () => any[], emptyTableText: String, footerComponent: [Object, String], isEmpty: Boolean, diff --git a/src/components/Table/Table.vue b/src/components/Table/Table.vue index dbd5e0b..3e9c263 100644 --- a/src/components/Table/Table.vue +++ b/src/components/Table/Table.vue @@ -71,7 +71,7 @@ export type Translation = Record -export type Cell = { [key: string]: any } +export type Cell = { [key: string]: [String, Number, Array, Object] } export type Data = Cell[] diff --git a/src/utils.ts b/src/utils.ts index 02d400a..c8e9543 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -21,10 +21,10 @@ export function toTitleCase(str: string): string { export function stringReplaceFromArray( target: string, searchValues: string[], - replacements: any[] + replacements: (string | number)[] ): string { for (let i = 0; i < searchValues.length; i++) { - target = target.replace(searchValues[i], replacements[i]) + target = target.replace(searchValues[i], "" + replacements[i]) } return target } @@ -147,7 +147,8 @@ export function searchStringColumn( search: string, key: string ): boolean { - return (data[key] || "").toLowerCase().includes(search.toLowerCase()) + return ((data[key] || "") as unknown as string) + .toLowerCase().includes(search.toLowerCase()) } // Performs search on numeric values