From b5f867cc66af6c70c875bc1abf4dbc545916063b Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sun, 13 Feb 2022 20:09:12 +0100 Subject: [PATCH] feat: convert some helpers to typescript --- src/helpers/color/colorFromHex.ts | 2 +- src/helpers/getListTitle.ts | 4 +++- src/helpers/replaceAll.ts | 2 +- src/helpers/saveCollapsedBucketState.ts | 6 ++++-- src/helpers/savedFilter.ts | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/helpers/color/colorFromHex.ts b/src/helpers/color/colorFromHex.ts index 75ebb1757..ac95be7e5 100644 --- a/src/helpers/color/colorFromHex.ts +++ b/src/helpers/color/colorFromHex.ts @@ -4,7 +4,7 @@ * @param color * @returns {string} */ -export const colorFromHex = color => { +export function colorFromHex(color) { if (color.substring(0, 1) === '#') { color = color.substring(1, 7) } diff --git a/src/helpers/getListTitle.ts b/src/helpers/getListTitle.ts index a7917f03f..fc24d2911 100644 --- a/src/helpers/getListTitle.ts +++ b/src/helpers/getListTitle.ts @@ -1,6 +1,8 @@ import {i18n} from '@/i18n' -export const getListTitle = (l) => { +import ListModal from '@/modals/list' + +export function getListTitle(l: ListModal) { if (l.id === -1) { return i18n.global.t('list.pseudo.favorites.title') } diff --git a/src/helpers/replaceAll.ts b/src/helpers/replaceAll.ts index 07fb01634..17e3136af 100644 --- a/src/helpers/replaceAll.ts +++ b/src/helpers/replaceAll.ts @@ -8,7 +8,7 @@ * @param replace * @returns {*} */ -export const replaceAll = (str, search, replace) => { +export const replaceAll = (str: string, search: string, replace: string) => { const esc = search.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') const reg = new RegExp(esc, 'ig') return str.replace(reg, replace) diff --git a/src/helpers/saveCollapsedBucketState.ts b/src/helpers/saveCollapsedBucketState.ts index df44a8802..ea4c50c04 100644 --- a/src/helpers/saveCollapsedBucketState.ts +++ b/src/helpers/saveCollapsedBucketState.ts @@ -1,3 +1,5 @@ +import ListModel from '@/models/list' + const key = 'collapsedBuckets' const getAllState = () => { @@ -9,7 +11,7 @@ const getAllState = () => { return JSON.parse(saved) } -export const saveCollapsedBucketState = (listId, collapsedBuckets) => { +export const saveCollapsedBucketState = (listId: ListModel['id'], collapsedBuckets) => { const state = getAllState() state[listId] = collapsedBuckets for (const bucketId in state[listId]) { @@ -20,7 +22,7 @@ export const saveCollapsedBucketState = (listId, collapsedBuckets) => { localStorage.setItem(key, JSON.stringify(state)) } -export const getCollapsedBucketState = listId => { +export const getCollapsedBucketState = (listId : ListModel['id']) => { const state = getAllState() if (typeof state[listId] !== 'undefined') { return state[listId] diff --git a/src/helpers/savedFilter.ts b/src/helpers/savedFilter.ts index 93e1f7a7c..0cb3cd9de 100644 --- a/src/helpers/savedFilter.ts +++ b/src/helpers/savedFilter.ts @@ -1,5 +1,6 @@ +import ListModel from '@/models/list' -export function getSavedFilterIdFromListId(listId) { +export function getSavedFilterIdFromListId(listId: ListModel['id']) { let filterId = listId * -1 - 1 // FilterIds from listIds are always positive if (filterId < 0) {