From 7282f8a604672a1eb403d8fa0e706e5a19a138c6 Mon Sep 17 00:00:00 2001 From: atrincas Date: Mon, 2 Dec 2024 12:53:34 +0100 Subject: [PATCH] Moved CARBON_REVENUES_TO_COVER enum --- .../src/containers/projects/custom-project/details/index.tsx | 2 +- client/src/containers/projects/custom-project/mock-data.ts | 2 +- shared/entities/carbon-revenues-to-cover.enum.ts | 5 ----- shared/entities/custom-project.entity.ts | 5 +++++ 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 shared/entities/carbon-revenues-to-cover.enum.ts diff --git a/client/src/containers/projects/custom-project/details/index.tsx b/client/src/containers/projects/custom-project/details/index.tsx index 8764facc..2bfbd5e6 100644 --- a/client/src/containers/projects/custom-project/details/index.tsx +++ b/client/src/containers/projects/custom-project/details/index.tsx @@ -1,7 +1,7 @@ import { FC } from "react"; import { ACTIVITY } from "@shared/entities/activity.enum"; -import { CARBON_REVENUES_TO_COVER } from "@shared/entities/carbon-revenues-to-cover.enum"; +import { CARBON_REVENUES_TO_COVER } from "@shared/entities/custom-project.entity"; import { ECOSYSTEM } from "@shared/entities/ecosystem.enum"; import DetailItem from "@/containers/projects/custom-project/details/detail-item"; diff --git a/client/src/containers/projects/custom-project/mock-data.ts b/client/src/containers/projects/custom-project/mock-data.ts index d830592a..4031ac51 100644 --- a/client/src/containers/projects/custom-project/mock-data.ts +++ b/client/src/containers/projects/custom-project/mock-data.ts @@ -2,7 +2,7 @@ import { ACTIVITY, RESTORATION_ACTIVITY_SUBTYPE, } from "@shared/entities/activity.enum"; -import { CARBON_REVENUES_TO_COVER } from "@shared/entities/carbon-revenues-to-cover.enum"; +import { CARBON_REVENUES_TO_COVER } from "@shared/entities/custom-project.entity"; import { ECOSYSTEM } from "@shared/entities/ecosystem.enum"; // TODO: tooltip info will go to constants/tooltip-info.ts diff --git a/shared/entities/carbon-revenues-to-cover.enum.ts b/shared/entities/carbon-revenues-to-cover.enum.ts deleted file mode 100644 index d9fb520b..00000000 --- a/shared/entities/carbon-revenues-to-cover.enum.ts +++ /dev/null @@ -1,5 +0,0 @@ -// TODO: Replace to custom-project.entity.ts when import from @api are removed -export enum CARBON_REVENUES_TO_COVER { - OPEX = "Opex", - CAPEX_AND_OPEX = "Capex and Opex", -} diff --git a/shared/entities/custom-project.entity.ts b/shared/entities/custom-project.entity.ts index 270873dd..b0c16b42 100644 --- a/shared/entities/custom-project.entity.ts +++ b/shared/entities/custom-project.entity.ts @@ -16,6 +16,11 @@ import { type CustomProjectOutput } from "@shared/dtos/custom-projects/custom-pr * to other entities that (i.e User) */ +export enum CARBON_REVENUES_TO_COVER { + OPEX = "Opex", + CAPEX_AND_OPEX = "Capex and Opex", +} + @Entity({ name: "custom_projects" }) export class CustomProject { @PrimaryGeneratedColumn("uuid")