code refactor

mayswind · Feb 4, 2025 · 00f62fd · 00f62fd
1 parent 833e767
commit 00f62fd
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 98 deletions.
diff --git a/src/stores/transactionCategory.ts b/src/stores/transactionCategory.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { defineStore } from 'pinia';
 
 import type { BeforeResolveFunction } from '@/core/base.ts';
@@ -13,6 +13,7 @@ import {
 } from '@/models/transaction_category.ts';
 
 import { isEquals } from '@/lib/common.ts';
+import { getFirstAvailableCategoryId } from '@/lib/category.ts';
 import services, { type ApiResponsePromise } from '@/lib/services.ts';
 import logger from '@/lib/logger.ts';
 
@@ -21,6 +22,33 @@ export const useTransactionCategoriesStore = defineStore('transactionCategories'
     const allTransactionCategoriesMap = ref<Record<string, TransactionCategory>>({});
     const transactionCategoryListStateInvalid = ref<boolean>(true);
 
+    const hasAvailableExpenseCategories = computed<boolean>(() => {
+        if (!allTransactionCategories.value || !allTransactionCategories.value[CategoryType.Expense] || !allTransactionCategories.value[CategoryType.Expense].length) {
+            return false;
+        }
+
+        const firstAvailableCategoryId = getFirstAvailableCategoryId(allTransactionCategories.value[CategoryType.Expense]);
+        return firstAvailableCategoryId !== '';
+    });
+
+    const hasAvailableIncomeCategories = computed<boolean>(() => {
+        if (!allTransactionCategories.value || !allTransactionCategories.value[CategoryType.Income] || !allTransactionCategories.value[CategoryType.Income].length) {
+            return false;
+        }
+
+        const firstAvailableCategoryId = getFirstAvailableCategoryId(allTransactionCategories.value[CategoryType.Income]);
+        return firstAvailableCategoryId !== '';
+    });
+
+    const hasAvailableTransferCategories = computed<boolean>(() => {
+        if (!allTransactionCategories.value || !allTransactionCategories.value[CategoryType.Transfer] || !allTransactionCategories.value[CategoryType.Transfer].length) {
+            return false;
+        }
+
+        const firstAvailableCategoryId = getFirstAvailableCategoryId(allTransactionCategories.value[CategoryType.Transfer]);
+        return firstAvailableCategoryId !== '';
+    });
+
     function loadTransactionCategoryList(allCategories: Record<number, TransactionCategory[]>): void {
         allTransactionCategories.value = allCategories;
         allTransactionCategoriesMap.value = {};
@@ -496,6 +524,10 @@ export const useTransactionCategoriesStore = defineStore('transactionCategories'
         allTransactionCategories,
         allTransactionCategoriesMap,
         transactionCategoryListStateInvalid,
+        // computed states
+        hasAvailableExpenseCategories,
+        hasAvailableIncomeCategories,
+        hasAvailableTransferCategories,
         // functions
         updateTransactionCategoryListInvalidState,
         resetTransactionCategories,

diff --git a/src/views/base/transactions/TransactionEditPageBase.ts b/src/views/base/transactions/TransactionEditPageBase.ts
@@ -11,7 +11,6 @@ import { useTransactionsStore } from '@/stores/transaction.ts';
 import { useExchangeRatesStore } from '@/stores/exchangeRates.ts';
 
 import type { LocalizedTimezoneInfo } from '@/core/timezone.ts';
-import { CategoryType } from '@/core/category.ts';
 import { TransactionType } from '@/core/transaction.ts';
 import { TemplateType } from '@/core/template.ts';
 import { TRANSACTION_MAX_PICTURE_COUNT } from '@/consts/transaction.ts';
@@ -33,10 +32,6 @@ import {
     getCurrentUnixTime
 } from '@/lib/datetime.ts';
 
-import {
-    getFirstAvailableCategoryId
-} from '@/lib/category.ts';
-
 export enum TransactionEditPageType {
     Transaction = 'transaction',
     Template = 'template'
@@ -103,6 +98,10 @@ export function useTransactionEditPageBase(type: TransactionEditPageType, initMo
     const allTags = computed<TransactionTag[]>(() => transactionTagsStore.allTransactionTags);
     const allTagsMap = computed<Record<string, TransactionTag>>(() => transactionTagsStore.allTransactionTagsMap);
 
+    const hasAvailableExpenseCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableExpenseCategories);
+    const hasAvailableIncomeCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableIncomeCategories);
+    const hasAvailableTransferCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableTransferCategories);
+
     const canAddTransactionPicture = computed<boolean>(() => {
         if (type !== TransactionEditPageType.Transaction || (mode.value !== TransactionEditPageMode.Add && mode.value !== TransactionEditPageMode.Edit)) {
             return false;
@@ -194,33 +193,6 @@ export function useTransactionEditPageBase(type: TransactionEditPageType, initMo
         return tt('Transfer In Amount') + ` (${amountRate})`;
     });
 
-    const hasAvailableExpenseCategories = computed<boolean>(() => {
-        if (!allCategories.value || !allCategories.value[CategoryType.Expense] || !allCategories.value[CategoryType.Expense].length) {
-            return false;
-        }
-
-        const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Expense]);
-        return firstAvailableCategoryId !== '';
-    });
-
-    const hasAvailableIncomeCategories = computed<boolean>(() => {
-        if (!allCategories.value || !allCategories.value[CategoryType.Income] || !allCategories.value[CategoryType.Income].length) {
-            return false;
-        }
-
-        const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Income]);
-        return firstAvailableCategoryId !== '';
-    });
-
-    const hasAvailableTransferCategories = computed<boolean>(() => {
-        if (!allCategories.value || !allCategories.value[CategoryType.Transfer] || !allCategories.value[CategoryType.Transfer].length) {
-            return false;
-        }
-
-        const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Transfer]);
-        return firstAvailableCategoryId !== '';
-    });
-
     const sourceAccountName = computed<string>(() => {
         if (transaction.value.sourceAccountId) {
             return Account.findAccountNameById(allAccounts.value, transaction.value.sourceAccountId) || '';
@@ -422,16 +394,16 @@ export function useTransactionEditPageBase(type: TransactionEditPageType, initMo
         allCategoriesMap,
         allTags,
         allTagsMap,
+        hasAvailableExpenseCategories,
+        hasAvailableIncomeCategories,
+        hasAvailableTransferCategories,
         canAddTransactionPicture,
         title,
         saveButtonTitle,
         cancelButtonTitle,
         sourceAmountName,
         sourceAccountTitle,
         transferInAmountTitle,
-        hasAvailableExpenseCategories,
-        hasAvailableIncomeCategories,
-        hasAvailableTransferCategories,
         sourceAccountName,
         destinationAccountName,
         sourceAccountCurrency,

diff --git a/src/views/desktop/transactions/list/dialogs/BatchReplaceDialog.vue b/src/views/desktop/transactions/list/dialogs/BatchReplaceDialog.vue
@@ -188,8 +188,7 @@ import type { TransactionTag } from '@/models/transaction_tag.ts';
 
 import {
     getTransactionPrimaryCategoryName,
-    getTransactionSecondaryCategoryName,
-    getFirstAvailableCategoryId
+    getTransactionSecondaryCategoryName
 } from '@/lib/category.ts';
 
 import {
@@ -233,32 +232,9 @@ const allVisibleCategorizedAccounts = computed<CategorizedAccountWithDisplayBala
 const allCategories = computed<Record<number, TransactionCategory[]>>(() => transactionCategoriesStore.allTransactionCategories);
 const allTags = computed<TransactionTag[]>(() => transactionTagsStore.allTransactionTags);
 
-const hasAvailableExpenseCategories = computed<boolean>(() => {
-    if (!allCategories.value || !allCategories.value[CategoryType.Expense] || !allCategories.value[CategoryType.Expense].length) {
-        return false;
-    }
-
-    const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Expense]);
-    return firstAvailableCategoryId !== '';
-});
-
-const hasAvailableIncomeCategories = computed<boolean>(() => {
-    if (!allCategories.value || !allCategories.value[CategoryType.Income] || !allCategories.value[CategoryType.Income].length) {
-        return false;
-    }
-
-    const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Income]);
-    return firstAvailableCategoryId !== '';
-});
-
-const hasAvailableTransferCategories = computed<boolean>(() => {
-    if (!allCategories.value || !allCategories.value[CategoryType.Transfer] || !allCategories.value[CategoryType.Transfer].length) {
-        return false;
-    }
-
-    const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Transfer]);
-    return firstAvailableCategoryId !== '';
-});
+const hasAvailableExpenseCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableExpenseCategories);
+const hasAvailableIncomeCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableIncomeCategories);
+const hasAvailableTransferCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableTransferCategories);
 
 function getAccountDisplayName(accountId?: string): string {
     if (accountId) {

diff --git a/src/views/desktop/transactions/list/dialogs/EditDialog.vue b/src/views/desktop/transactions/list/dialogs/EditDialog.vue
@@ -497,16 +497,16 @@ const {
     allCategoriesMap,
     allTags,
     allTagsMap,
+    hasAvailableExpenseCategories,
+    hasAvailableIncomeCategories,
+    hasAvailableTransferCategories,
     canAddTransactionPicture,
     title,
     saveButtonTitle,
     cancelButtonTitle,
     sourceAmountName,
     sourceAccountTitle,
     transferInAmountTitle,
-    hasAvailableExpenseCategories,
-    hasAvailableIncomeCategories,
-    hasAvailableTransferCategories,
     sourceAccountName,
     destinationAccountName,
     sourceAccountCurrency,

diff --git a/src/views/desktop/transactions/list/dialogs/ImportDialog.vue b/src/views/desktop/transactions/list/dialogs/ImportDialog.vue
@@ -646,8 +646,7 @@ import {
 } from '@/lib/datetime.ts';
 import {
     getTransactionPrimaryCategoryName,
-    getTransactionSecondaryCategoryName,
-    getFirstAvailableCategoryId
+    getTransactionSecondaryCategoryName
 } from '@/lib/category.ts';
 
 import {
@@ -805,32 +804,9 @@ const allCategoriesMap = computed<Record<string, TransactionCategory>>(() => tra
 const allTags = computed<TransactionTag[]>(() => transactionTagsStore.allTransactionTags);
 const allTagsMap = computed<Record<string, TransactionTag>>(() => transactionTagsStore.allTransactionTagsMap);
 
-const hasAvailableExpenseCategories = computed<boolean>(() => {
-    if (!allCategories.value || !allCategories.value[CategoryType.Expense] || !allCategories.value[CategoryType.Expense].length) {
-        return false;
-    }
-
-    const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Expense]);
-    return firstAvailableCategoryId !== '';
-});
-
-const hasAvailableIncomeCategories = computed<boolean>(() => {
-    if (!allCategories.value || !allCategories.value[CategoryType.Income] || !allCategories.value[CategoryType.Income].length) {
-        return false;
-    }
-
-    const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Income]);
-    return firstAvailableCategoryId !== '';
-});
-
-const hasAvailableTransferCategories = computed<boolean>(() => {
-    if (!allCategories.value || !allCategories.value[CategoryType.Transfer] || !allCategories.value[CategoryType.Transfer].length) {
-        return false;
-    }
-
-    const firstAvailableCategoryId = getFirstAvailableCategoryId(allCategories.value[CategoryType.Transfer]);
-    return firstAvailableCategoryId !== '';
-});
+const hasAvailableExpenseCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableExpenseCategories);
+const hasAvailableIncomeCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableIncomeCategories);
+const hasAvailableTransferCategories = computed<boolean>(() => transactionCategoriesStore.hasAvailableTransferCategories);
 
 const supportedImportFileExtensions = computed<string | undefined>(() => {
     if (allFileSubTypes.value && allFileSubTypes.value.length) {

diff --git a/src/views/mobile/transactions/EditPage.vue b/src/views/mobile/transactions/EditPage.vue
@@ -514,15 +514,15 @@ const {
     allCategoriesMap,
     allTags,
     allTagsMap,
+    hasAvailableExpenseCategories,
+    hasAvailableIncomeCategories,
+    hasAvailableTransferCategories,
     canAddTransactionPicture,
     title,
     saveButtonTitle,
     sourceAmountName,
     sourceAccountTitle,
     transferInAmountTitle,
-    hasAvailableExpenseCategories,
-    hasAvailableIncomeCategories,
-    hasAvailableTransferCategories,
     sourceAccountName,
     destinationAccountName,
     sourceAccountCurrency,