Open source personal finance application
refactor: show trns with Transfer category in Transfer tab
Ilya Komichev350a89165ea6
diff --git a/app/components/categories/useCategoriesStore.ts b/app/components/categories/useCategoriesStore.tsindex 7f5adf3c..6b5205e5 100644--- a/app/components/categories/useCategoriesStore.ts+++ b/app/components/categories/useCategoriesStore.ts@@ -60,6 +60,7 @@ export const useCategoriesStore = defineStore('categories', (): CategoriesStorereturn false})+const transferCategoriesIds = computed(() => getTransferCategoriesIds(items.value))const categoriesIds = computed(() => {@@ -99,7 +100,7 @@ export const useCategoriesStore = defineStore('categories', (): CategoriesStorereturn []const filteredCategories = Object.keys(items.value)- .filter(id => items.value[id].showInQuickSelector)+ .filter(id => items.value[id]?.showInQuickSelector).map(id => ({ id, ...items.value[id] }))return filteredCategoriesdiff --git a/app/components/trnForm/main/AmountTransfer.vue b/app/components/trnForm/main/AmountTransfer.vueindex b4de9e33..580da9b7 100644--- a/app/components/trnForm/main/AmountTransfer.vue+++ b/app/components/trnForm/main/AmountTransfer.vue@@ -20,15 +20,7 @@ const trnsFormStore = useTrnsFormStore()const walletsStore = useWalletsStore()const { t } = useI18n()-const items = ref<- Record<- MoneyTypeSlug,- {- amountsIdx: 1 | 2- transferType: TransferType- }- >->({+const items = ref<Record<MoneyTypeSlug, { amountsIdx: 1 | 2, transferType: TransferType }>>({expense: {amountsIdx: 1,transferType: 0,@@ -74,7 +66,7 @@ watch(<div class="flex items-center gap-2 whitespace-nowrap"><div:class="getStyles('item', ['link', 'rounded'])"- class=" flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm text-1/70 lg:min-h-[42px]"+ class=" text-1/70 flex min-h-[44px] w-1/2 grow items-center px-3 py-2 text-sm lg:min-h-[42px]">{{ t(slug) }}</div>diff --git a/app/components/trns/Item.vue b/app/components/trns/Item.vueindex ea4062f5..85585980 100644--- a/app/components/trns/Item.vue+++ b/app/components/trns/Item.vue@@ -1,6 +1,8 @@<script setup lang="ts">import type { TrnItemFull } from '~/components/trns/types'+import { TrnType } from '~/components/trns/types'+const props = defineProps<{alt?: booleandate?: string@@ -33,7 +35,7 @@ const emit = defineEmits<{<template v-if="alt"><divv-if="date"- class="min-w-10 truncate text-2xs leading-none"+ class="text-2xs min-w-10 truncate leading-none">{{ date }}</div>@@ -47,7 +49,7 @@ const emit = defineEmits<{:color="props.trnItem.category?.color"size="16"/>- <div class="flex items-center gap-2 text-xs leading-none text-2">+ <div class="text-2 flex items-center gap-2 text-xs leading-none">{{ trnItem.category.name }}</div></div>@@ -56,9 +58,10 @@ const emit = defineEmits<{<div class="grid grow gap-1"><divv-if="!alt"- class="grid grow gap-0.5 text-3"+ class="text-3 grid grow gap-0.5"><CategoriesName+ v-if="trnItem.type !== TrnType.Transfer":category="trnItem.category":parentCategory="trnItem.categoryParent"isShowDots@@ -69,7 +72,7 @@ const emit = defineEmits<{v-if="trnItem.wallet"class="flex items-center gap-2">- <div class="text-xs leading-none text-4">+ <div class="text-4 text-xs leading-none">{{ trnItem.wallet.name }}</div></div>diff --git a/app/components/trns/List.vue b/app/components/trns/List.vueindex b5ced05a..4d874868 100644--- a/app/components/trns/List.vue+++ b/app/components/trns/List.vue@@ -1,17 +1,18 @@<script setup lang="ts">-import type { MoneyTypeNumber } from '~/components/stat/types'-import type { TrnId, TrnType } from '~/components/trns/types'+import type { TrnId, TrnsViewType } from '~/components/trns/types'import useAmount from '~/components/amount/useAmount'+import { useCategoriesStore } from '~/components/categories/useCategoriesStore'import { useCurrenciesStore } from '~/components/currencies/useCurrenciesStore'import { useDateFormats } from '~/components/date/useDateFormats'import { getStartOf } from '~/components/date/utils'+import { TrnType } from '~/components/trns/types'import { useTrnsStore } from '~/components/trns/useTrnsStore'const props = withDefaults(defineProps<{alt?: boolean- initTrnType?: TrnType | MoneyTypeNumber | undefined+ initTrnType?: TrnsViewTypeisHideDates?: booleanisShowDates?: booleanisShowExpense?: boolean@@ -36,15 +37,24 @@ const emit = defineEmits<{}>()const currenciesStore = useCurrenciesStore()+const categoriesStore = useCategoriesStore()const trnsStore = useTrnsStore()const { getTotalOfTrnsIds } = useAmount()const { t } = useI18n()const { formatDate } = useDateFormats()const isShowWithDesc = ref(false)-const filterBy = ref(props.initTrnType)+const filterBy = ref<TrnsViewType>(props.initTrnType)const pageNumber = ref(1)-const typeFilters = computed(() => {+type TypeFilter = {+ count: number+ isShow: boolean+ name: string+ slug: TrnsViewType | 'all'+ type: TrnType | undefined+}++const typeFilters = computed<TypeFilter[]>(() => {const all = {count: props.trnsIds.length,isShow: true,@@ -54,57 +64,61 @@ const typeFilters = computed(() => {}const transfers = {- count: props.trnsIds.filter(id => trnsStore.items[id].type === 2).length,+ count: props.trnsIds.filter(id => trnsStore.items[id]?.type === TrnType.Transfer).length,isShow: props.isShowTransfers,name: t('transfer.titleMoney'),slug: 'transfer',- type: 2,+ type: TrnType.Transfer,}const expense = {- count: props.trnsIds.filter(id => trnsStore.items[id].type === 0).length,+ count: props.trnsIds.filter(id => trnsStore.items[id].type === TrnType.Expense).length,isShow: props.isShowExpense,name: t('money.expense'),slug: 'expense',- type: 0,+ type: TrnType.Expense,}const income = {- count: props.trnsIds.filter(id => trnsStore.items[id].type === 1).length,+ count: props.trnsIds.filter(id => trnsStore.items[id].type === TrnType.Income).length,isShow: props.isShowIncome,name: t('money.income'),slug: 'income',- type: 1,+ type: TrnType.Income,}return [all, expense, income, transfers].filter(item => item.isShow)})+const selectedTypeFilter = computed(() => {+ return typeFilters.value.find(item => item.slug === filterBy.value)+})+const isTrnsWithDesc = computed(() => {let ids = props.trnsIds ?? []if (filterBy.value !== 'all') {- const typeFilter = typeFilters.value.find(item => item.slug === filterBy.value)-- ids = props.trnsIds.filter(id => trnsStore.items[id].type === typeFilter.type)+ ids = props.trnsIds.filter(id => trnsStore.items[id].type === selectedTypeFilter.value?.type)}- return (ids).some(- id => trnsStore.items[id].desc,- )+ return (ids).some(id => trnsStore.items[id]?.desc)})const selectedIds = computed(() => {let ids = props.trnsIds ?? []if (filterBy.value !== 'all') {- ids = props.trnsIds.filter(id => trnsStore.items[id].type === typeFilters.value.find(item => item.slug === filterBy.value)?.type)+ ids = props.trnsIds.filter((id) => {+ if (filterBy.value === 'transfer') {+ return trnsStore.items[id]?.type === selectedTypeFilter.value?.type || categoriesStore.transferCategoriesIds.includes(trnsStore.items[id]?.categoryId)+ }++ return trnsStore.items[id]?.type === selectedTypeFilter.value?.type+ })}if (isShowWithDesc.value && isTrnsWithDesc.value) {- ids = ids.filter(- id => trnsStore.items[id].desc,- )+ ids = ids.filter(id => trnsStore.items[id].desc)}return ids@@ -114,7 +128,7 @@ const paginatedTrnsIds = computed(() => selectedIds.value.slice(0, pageNumber.vaconst isShowedAllTrns = computed(() => paginatedTrnsIds.value.length === selectedIds.value.length)-function setFilterBy(type: TrnType | undefined) {+function setFilterBy(type: TrnsViewType | 'all') {if (filterBy.value === type) {filterBy.value = 'all'return@@ -123,24 +137,20 @@ function setFilterBy(type: TrnType | undefined) {filterBy.value = type ?? 'all'}-const groupedTrns = computed(() => {- return paginatedTrnsIds.value.reduce(- (acc, trnId) => {- if (!trnsStore.items?.[trnId]) {- return acc- }- const date = getStartOf(new Date(trnsStore.items[trnId].date), 'day').getTime()- if (!acc[date]) {- acc[date] = [trnId]- }- else {- acc[date].push(trnId)- }+const groupedTrns = computed(() => paginatedTrnsIds.value+ .reduce((acc, trnId) => {+ if (!trnsStore.items?.[trnId]) {return acc- },- {} as Record<string, TrnId[]>,- )-})+ }+ const date = getStartOf(new Date(trnsStore.items[trnId]?.date), 'day').getTime()+ if (!acc[date]) {+ acc[date] = [trnId]+ }+ else {+ acc[date].push(trnId)+ }+ return acc+ }, {} as Record<string, TrnId[]>))</script><template>@@ -199,7 +209,7 @@ const groupedTrns = computed(() => {<!-- Group Sum --><divv-if="isShowGroupSum && paginatedTrnsIds.length > 1"- class="border-b border-item-5 pb-2 pr-3"+ class="border-item-5 border-b pb-2 pr-3"><Amountv-if="getTotalOfTrnsIds(paginatedTrnsIds).income !== 0"@@ -242,7 +252,7 @@ const groupedTrns = computed(() => {<divv-for="(groupTrnsIds, date) in groupedTrns":key="date"- class="overflow-hidden rounded-lg bg-item-9"+ class="bg-item-9 overflow-hidden rounded-lg"><div:class="{ 'border-item-5': isShowGroupSum && groupTrnsIds.length > 1 }"@@ -301,7 +311,7 @@ const groupedTrns = computed(() => {class="flex-center pt-1"><div- class="flex-center rounded-full bg-item-5 px-5 py-2 text-sm text-2 hocus:bg-item-6"+ class="flex-center bg-item-5 text-2 hocus:bg-item-6 rounded-full px-5 py-2 text-sm"@click="pageNumber = ++pageNumber">{{ t("trns.more") }} {{ paginatedTrnsIds.length }} /diff --git a/app/components/trns/types.ts b/app/components/trns/types.tsindex a53c0eef..f72d8717 100644--- a/app/components/trns/types.ts+++ b/app/components/trns/types.ts@@ -9,6 +9,8 @@ export enum TrnType {Transfer,}+export type TrnsViewType = 'all' | 'expense' | 'income' | 'transfer'+export enum TransferType {Expense,Income,diff --git a/app/components/trns/useTrnsStore.ts b/app/components/trns/useTrnsStore.tsindex d0f92bbb..282392ba 100644--- a/app/components/trns/useTrnsStore.ts+++ b/app/components/trns/useTrnsStore.ts@@ -61,11 +61,8 @@ export const useTrnsStore = defineStore('trns', () => {return (Object.keys(items.value).sort((a, b) => items.value[b].date - items.value[a].date)- .find(- trnId =>- !categoriesStore.transferCategoriesIds.includes(- items.value[trnId].categoryId,- ) && items.value[trnId].type !== 2,+ .find(trnId =>+ !categoriesStore.transferCategoriesIds.includes(items.value[trnId].categoryId) && items.value[trnId]?.type !== 2,) ?? false)})