Open source personal finance application
fix: optimize categories store computed, improve store sync and logger
Ilya Komichevdadc86ebd012
diff --git a/app/components/categories/useCategoriesStore.ts b/app/components/categories/useCategoriesStore.tsindex ea544461..f4b64a85 100644--- a/app/components/categories/useCategoriesStore.ts+++ b/app/components/categories/useCategoriesStore.ts@@ -71,9 +71,15 @@ export const useCategoriesStore = defineStore('categories', (): CategoriesStore.sort((a, b) => compareCategoriesByParentAndName(items.value[a]!, items.value[b]!, items.value))})- const usedCategoryIds = computed(() =>- new Set(Object.values(trnsStore.items ?? {}).map(trn => trn.categoryId)),- )+ const usedCategoryIds = computed(() => {+ const ids = new Set<string>()+ const trns = trnsStore.items+ if (trns) {+ for (const id in trns)+ ids.add(trns[id]!.categoryId)+ }+ return ids+ })const categoriesForBeParent = computed(() => {if (!hasItems.value)diff --git a/app/composables/useStoreSync.ts b/app/composables/useStoreSync.tsindex 37781156..988da319 100644--- a/app/composables/useStoreSync.ts+++ b/app/composables/useStoreSync.ts@@ -173,23 +173,28 @@ function getT() {return _t}-export function showErrorToast(key: string, params?: Record<string, unknown>) {+const emoByType = {+ error: errorEmo,+ success: successEmo,+ warning: warningEmo,+} as const++type ToastType = keyof typeof emoByType++export function showToast(type: ToastType, key: string, params?: Record<string, unknown>) {const toast = getToast()const t = getT()- const id = toast.add({ color: 'error', description: t ? t(key, params ?? {}) : key, title: random(errorEmo) })- return id+ return toast.add({ color: type, description: t ? t(key, params ?? {}) : key, title: random(emoByType[type]) })+}++export function showErrorToast(key: string, params?: Record<string, unknown>) {+ return showToast('error', key, params)}export function showSuccessToast(key: string, params?: Record<string, unknown>) {- const toast = getToast()- const t = getT()- const id = toast.add({ color: 'success', description: t ? t(key, params ?? {}) : key, title: random(successEmo) })- return id+ return showToast('success', key, params)}export function showWarningToast(key: string, params?: Record<string, unknown>) {- const toast = getToast()- const t = getT()- const id = toast.add({ color: 'warning', description: t ? t(key, params ?? {}) : key, title: random(warningEmo) })- return id+ return showToast('warning', key, params)}diff --git a/app/utils/logger.ts b/app/utils/logger.tsindex 9a2a2109..36a29715 100644--- a/app/utils/logger.ts+++ b/app/utils/logger.ts@@ -2,5 +2,6 @@ export function createLogger(prefix: string, isDev = import.meta.dev) {return {error: (...args: unknown[]) => console.error(`[${prefix}]`, ...args),log: isDev ? (...args: unknown[]) => console.log(`[${prefix}]`, ...args) : () => {},+ warn: (...args: unknown[]) => console.warn(`[${prefix}]`, ...args),}}