From 9de4ee62329af1211fa32c607dd92e604da550d3 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 9 Aug 2025 13:29:34 +0200 Subject: [PATCH] Revert move tag ids from config.ts to tag-ids.mjs --- apps/api/src/app/order/order.service.ts | 4 ++-- apps/api/src/app/portfolio/portfolio.service.ts | 11 ++++++----- apps/api/src/app/user/user.service.ts | 2 +- apps/api/src/services/demo/demo.service.ts | 4 ++-- libs/common/src/lib/config.ts | 5 +++++ libs/common/src/lib/tag-ids.mjs | 6 ------ .../activities-table/activities-table.component.ts | 6 ++++-- prisma/seed.mts | 9 ++------- 8 files changed, 22 insertions(+), 25 deletions(-) diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 12004605b..fd50f5e74 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -9,7 +9,8 @@ import { DATA_GATHERING_QUEUE_PRIORITY_HIGH, GATHER_ASSET_PROFILE_PROCESS_JOB_NAME, GATHER_ASSET_PROFILE_PROCESS_JOB_OPTIONS, - ghostfolioPrefix + ghostfolioPrefix, + TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/config'; import { getAssetProfileIdentifier } from '@ghostfolio/common/helper'; import { @@ -17,7 +18,6 @@ import { EnhancedSymbolProfile, Filter } from '@ghostfolio/common/interfaces'; -import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { OrderWithAccount } from '@ghostfolio/common/types'; import { Injectable } from '@nestjs/common'; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 914e3d557..784661e20 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -30,7 +30,12 @@ import { getAnnualizedPerformancePercent, getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper'; -import { DEFAULT_CURRENCY, UNKNOWN_KEY } from '@ghostfolio/common/config'; +import { + DEFAULT_CURRENCY, + TAG_ID_EMERGENCY_FUND, + TAG_ID_EXCLUDE_FROM_ANALYSIS, + UNKNOWN_KEY +} from '@ghostfolio/common/config'; import { DATE_FORMAT, getSum, parseDate } from '@ghostfolio/common/helper'; import { AccountsResponse, @@ -48,10 +53,6 @@ import { UserSettings } from '@ghostfolio/common/interfaces'; import { TimelinePosition } from '@ghostfolio/common/models'; -import { - TAG_ID_EMERGENCY_FUND, - TAG_ID_EXCLUDE_FROM_ANALYSIS -} from '@ghostfolio/common/tag-ids.mjs'; import { AccountWithValue, DateRange, diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index babc2c8d2..405c4c0b0 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -28,6 +28,7 @@ import { DEFAULT_LANGUAGE_CODE, PROPERTY_IS_READ_ONLY_MODE, PROPERTY_SYSTEM_MESSAGE, + TAG_ID_EXCLUDE_FROM_ANALYSIS, locale } from '@ghostfolio/common/config'; import { @@ -40,7 +41,6 @@ import { hasRole, permissions } from '@ghostfolio/common/permissions'; -import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { UserWithSettings } from '@ghostfolio/common/types'; import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type'; diff --git a/apps/api/src/services/demo/demo.service.ts b/apps/api/src/services/demo/demo.service.ts index 27c747654..8f3658736 100644 --- a/apps/api/src/services/demo/demo.service.ts +++ b/apps/api/src/services/demo/demo.service.ts @@ -2,9 +2,9 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; import { PropertyService } from '@ghostfolio/api/services/property/property.service'; import { PROPERTY_DEMO_ACCOUNT_ID, - PROPERTY_DEMO_USER_ID + PROPERTY_DEMO_USER_ID, + TAG_ID_DEMO } from '@ghostfolio/common/config'; -import { TAG_ID_DEMO } from '@ghostfolio/common/tag-ids.mjs'; import { Injectable } from '@nestjs/common'; import { v4 as uuidv4 } from 'uuid'; diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.ts index 532eb87f4..169ab80c1 100644 --- a/libs/common/src/lib/config.ts +++ b/libs/common/src/lib/config.ts @@ -201,4 +201,9 @@ export const SUPPORTED_LANGUAGE_CODES = [ 'zh' ]; +export const TAG_ID_EMERGENCY_FUND = '4452656d-9fa4-4bd0-ba38-70492e31d180'; +export const TAG_ID_EXCLUDE_FROM_ANALYSIS = + 'f2e868af-8333-459f-b161-cbc6544c24bd'; +export const TAG_ID_DEMO = 'efa08cb3-9b9d-4974-ac68-db13a19c4874'; + export const UNKNOWN_KEY = 'UNKNOWN'; diff --git a/libs/common/src/lib/tag-ids.mjs b/libs/common/src/lib/tag-ids.mjs index 7939ac0ca..e69de29bb 100644 --- a/libs/common/src/lib/tag-ids.mjs +++ b/libs/common/src/lib/tag-ids.mjs @@ -1,6 +0,0 @@ -export const TAG_ID_EMERGENCY_FUND = '4452656d-9fa4-4bd0-ba38-70492e31d180'; - -export const TAG_ID_EXCLUDE_FROM_ANALYSIS = - 'f2e868af-8333-459f-b161-cbc6544c24bd'; - -export const TAG_ID_DEMO = 'efa08cb3-9b9d-4974-ac68-db13a19c4874'; diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index 7899ec47b..b38af615e 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -2,10 +2,12 @@ import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interf import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/confirmation-dialog/confirmation-dialog.type'; import { NotificationService } from '@ghostfolio/client/core/notification/notification.service'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; -import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config'; +import { + DEFAULT_PAGE_SIZE, + TAG_ID_EXCLUDE_FROM_ANALYSIS +} from '@ghostfolio/common/config'; import { getLocale } from '@ghostfolio/common/helper'; import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces'; -import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { OrderWithAccount } from '@ghostfolio/common/types'; import { SelectionModel } from '@angular/cdk/collections'; diff --git a/prisma/seed.mts b/prisma/seed.mts index a9b4a0c95..18389aab1 100644 --- a/prisma/seed.mts +++ b/prisma/seed.mts @@ -1,21 +1,16 @@ import { PrismaClient } from '@prisma/client'; -import { - TAG_ID_EMERGENCY_FUND, - TAG_ID_EXCLUDE_FROM_ANALYSIS -} from '../libs/common/src/lib/tag-ids.mjs'; - const prisma = new PrismaClient(); async function main() { await prisma.tag.createMany({ data: [ { - id: TAG_ID_EMERGENCY_FUND, + id: '4452656d-9fa4-4bd0-ba38-70492e31d180', name: 'EMERGENCY_FUND' }, { - id: TAG_ID_EXCLUDE_FROM_ANALYSIS, + id: 'f2e868af-8333-459f-b161-cbc6544c24bd', name: 'EXCLUDE_FROM_ANALYSIS' } ],