diff --git a/src/lib/category.ts b/src/lib/category.ts index 7c2a61fa..6ce2ddeb 100644 --- a/src/lib/category.ts +++ b/src/lib/category.ts @@ -189,7 +189,7 @@ export function allTransactionCategoriesWithVisibleCount(allTransactionCategorie } } - ret[categoryType] = { + ret[`${categoryType}`] = { type: categoryType, allCategories: allCategories, allVisibleCategoryCount: allVisibleCategoryCount, @@ -374,7 +374,7 @@ export function getLastShowingId(categories: TransactionCategory[], showHidden: return null; } -export function containsAnyAvailableCategory(allTransactionCategories: Record, showHidden: boolean): boolean { +export function containsAnyAvailableCategory(allTransactionCategories: Record, showHidden: boolean): boolean { for (const categoryType of values(allTransactionCategories)) { if (showHidden) { if (categoryType.allCategories && categoryType.allCategories.length > 0) { @@ -390,7 +390,7 @@ export function containsAnyAvailableCategory(allTransactionCategories: Record, showHidden: boolean): Record { +export function containsAvailableCategory(allTransactionCategories: Record, showHidden: boolean): Record { const result: Record = {}; for (const [type, categoryType] of entries(allTransactionCategories)) { diff --git a/src/locales/helpers.ts b/src/locales/helpers.ts index 8828d8b6..b2f75048 100644 --- a/src/locales/helpers.ts +++ b/src/locales/helpers.ts @@ -2,7 +2,7 @@ import { useI18n as useVueI18n } from 'vue-i18n'; import moment from 'moment-timezone'; import 'moment-timezone/moment-timezone-utils'; -import type { PartialRecord, NameValue, TypeAndName, TypeAndDisplayName, LocalizedSwitchOption } from '@/core/base.ts'; +import type { NameValue, TypeAndName, TypeAndDisplayName, LocalizedSwitchOption } from '@/core/base.ts'; import { type LanguageInfo, @@ -1341,8 +1341,8 @@ export function useI18n() { return ret; } - function getAllTransactionDefaultCategories(categoryType: 0 | CategoryType, locale: string): PartialRecord { - const allCategories: PartialRecord = {}; + function getAllTransactionDefaultCategories(categoryType: 0 | CategoryType, locale: string): Record { + const allCategories: Record = {}; const categoryTypes: CategoryType[] = []; if (categoryType === 0) { @@ -1386,7 +1386,7 @@ export function useI18n() { categories.push(submitCategory); } - allCategories[categoryType] = categories; + allCategories[`${categoryType}`] = categories; } return allCategories; diff --git a/src/views/base/SignupPageBase.ts b/src/views/base/SignupPageBase.ts index 796a866c..4d7f8da6 100644 --- a/src/views/base/SignupPageBase.ts +++ b/src/views/base/SignupPageBase.ts @@ -93,7 +93,7 @@ export function useSignupPageBase() { const inputIsEmpty = computed(() => !!inputEmptyProblemMessage.value); const inputIsInvalid = computed(() => !!inputInvalidProblemMessage.value); - function getCategoryTypeName(categoryType: CategoryType): string { + function getCategoryTypeName(categoryType: number): string { switch (categoryType) { case CategoryType.Income: return tt('Income Categories'); diff --git a/src/views/base/settings/CategoryFilterSettingPageBase.ts b/src/views/base/settings/CategoryFilterSettingPageBase.ts index 1293ca19..0130a2da 100644 --- a/src/views/base/settings/CategoryFilterSettingPageBase.ts +++ b/src/views/base/settings/CategoryFilterSettingPageBase.ts @@ -56,7 +56,7 @@ export function useCategoryFilterSettingPageBase(type?: CategoryFilterType, allo } }); - const allTransactionCategories = computed>(() => allTransactionCategoriesWithVisibleCount(transactionCategoriesStore.allTransactionCategories, allowCategoryTypes)); + const allTransactionCategories = computed>(() => allTransactionCategoriesWithVisibleCount(transactionCategoriesStore.allTransactionCategories, allowCategoryTypes)); const hasAnyAvailableCategory = computed(() => containsAnyAvailableCategory(allTransactionCategories.value, true)); const hasAnyVisibleCategory = computed(() => containsAnyAvailableCategory(allTransactionCategories.value, showHidden.value)); const hasAvailableCategory = computed>(() => containsAvailableCategory(allTransactionCategories.value, showHidden.value)); @@ -65,7 +65,7 @@ export function useCategoryFilterSettingPageBase(type?: CategoryFilterType, allo return !filterCategoryIds[category.id]; } - function getCategoryTypeName(categoryType: CategoryType): string { + function getCategoryTypeName(categoryType: number): string { switch (categoryType) { case CategoryType.Income: return tt('Income Categories'); diff --git a/src/views/desktop/SignupPage.vue b/src/views/desktop/SignupPage.vue index 1d53cd50..77bc3c40 100644 --- a/src/views/desktop/SignupPage.vue +++ b/src/views/desktop/SignupPage.vue @@ -139,7 +139,7 @@
-

{{ getCategoryTypeName(categoryType) }}

+

{{ getCategoryTypeName(parseInt(categoryType)) }}

@@ -220,8 +220,8 @@ import { useSignupPageBase } from '@/views/base/SignupPageBase.ts'; import { useRootStore } from '@/stores/index.ts'; -import type { PartialRecord, TypeAndDisplayName } from '@/core/base.ts'; -import { type LocalizedPresetCategory, CategoryType } from '@/core/category.ts'; +import type { TypeAndDisplayName } from '@/core/base.ts'; +import { type LocalizedPresetCategory } from '@/core/category.ts'; import { ThemeType } from '@/core/theme.ts'; import { APPLICATION_LOGO_PATH } from '@/consts/asset.ts'; @@ -262,7 +262,7 @@ const finalResultMessage = ref(null); const navigateToHomePage = ref(false); const allWeekDays = computed(() => getAllWeekDays()); -const allPresetCategories = computed>(() => getAllTransactionDefaultCategories(0, currentLocale.value)); +const allPresetCategories = computed>(() => getAllTransactionDefaultCategories(0, currentLocale.value)); const isDarkMode = computed(() => theme.global.name.value === ThemeType.Dark); const allSteps = computed(() => { diff --git a/src/views/desktop/categories/list/dialogs/PresetDialog.vue b/src/views/desktop/categories/list/dialogs/PresetDialog.vue index c32eb9f2..89895331 100644 --- a/src/views/desktop/categories/list/dialogs/PresetDialog.vue +++ b/src/views/desktop/categories/list/dialogs/PresetDialog.vue @@ -9,7 +9,7 @@