From d856aef4fd2d9c6044926d18cc3e2194bedef36d Mon Sep 17 00:00:00 2001 From: josemi1189 Date: Thu, 14 May 2026 16:41:51 +0200 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20update=20reservoir=20names=20to=20a?= =?UTF-8?q?=20friendlier=20format=20(e.g.=20'Vi=C3=B1uela,=20La'=20to=20'L?= =?UTF-8?q?a=20Vi=C3=B1uela')?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx | 4 ++-- .../pods/embalse-provincia/embalse-provincia.component.tsx | 3 ++- .../embalse/components/reservoir-card-info.component.tsx | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx b/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx index 2e5879e..ee51916 100644 --- a/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx +++ b/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx @@ -1,8 +1,8 @@ -"use client"; import { Card } from "@/common/components/card.component"; import { Lookup } from "@/common/models"; import { generateSlug } from "db-model"; import Link from "next/link"; +import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; export interface Props { nombreCuenca: string; @@ -26,7 +26,7 @@ export const EmbalseCuencaComponent: React.FC = (props) => { href={`/embalse/${generateSlug(name)}`} className="link-accessible" > - {name} + {formatEmbalseDisplayName(name)} ))} diff --git a/front/src/pods/embalse-provincia/embalse-provincia.component.tsx b/front/src/pods/embalse-provincia/embalse-provincia.component.tsx index 6f65f1f..ab140ff 100644 --- a/front/src/pods/embalse-provincia/embalse-provincia.component.tsx +++ b/front/src/pods/embalse-provincia/embalse-provincia.component.tsx @@ -2,6 +2,7 @@ import { Card } from "@/common/components/card.component"; import { Lookup } from "@/common/models"; import Link from "next/link"; import React from "react"; +import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; interface Props { nombreProvincia: string; @@ -21,7 +22,7 @@ export const EmbalseProvincia: React.FC = (props) => {
{embalses.map(({ id, name }) => ( - {name} + {formatEmbalseDisplayName(name)} ))}
diff --git a/front/src/pods/embalse/components/reservoir-card-info.component.tsx b/front/src/pods/embalse/components/reservoir-card-info.component.tsx index ee6dd8a..f0b210c 100644 --- a/front/src/pods/embalse/components/reservoir-card-info.component.tsx +++ b/front/src/pods/embalse/components/reservoir-card-info.component.tsx @@ -1,6 +1,6 @@ import { ReservoirInfo } from "../embalse.vm"; import React from "react"; -import Image from "next/image"; +import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; interface Props { reservoirInfo: ReservoirInfo; @@ -14,7 +14,9 @@ export const ReservoirCardInfo: React.FC = (props) => { className="flex w-full flex-col items-start gap-4" aria-labelledby="discover-title" > -

Descubre el embalse {reservoirInfo?.name}

+

+ Descubre el embalse {formatEmbalseDisplayName(reservoirInfo?.name)} +

{reservoirInfo?.description}

{reservoirInfo?.mainPicture?.url && ( <> From f427ec1ee59f10f0175cfe3c49fb4f4ee496b09c Mon Sep 17 00:00:00 2001 From: josemi1189 Date: Mon, 18 May 2026 11:46:26 +0200 Subject: [PATCH 2/2] refactor: format filtered-list name and move helper to common folder --- front/src/app/embalse/[embalse]/page.tsx | 2 +- .../embalse => common/helpers}/embalse-name.helper.spec.ts | 0 .../{pods/embalse => common/helpers}/embalse-name.helper.ts | 0 front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx | 2 +- .../pods/embalse-provincia/embalse-provincia.component.tsx | 2 +- front/src/pods/embalse-search/components/filtered-list.tsx | 3 ++- .../components/recent-searches/recent-searches.component.tsx | 5 ++++- front/src/pods/embalse/components/reservoir-card-gauge.tsx | 2 +- .../embalse/components/reservoir-card-info.component.tsx | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) rename front/src/{pods/embalse => common/helpers}/embalse-name.helper.spec.ts (100%) rename front/src/{pods/embalse => common/helpers}/embalse-name.helper.ts (100%) diff --git a/front/src/app/embalse/[embalse]/page.tsx b/front/src/app/embalse/[embalse]/page.tsx index 65b0349..7e7e9da 100644 --- a/front/src/app/embalse/[embalse]/page.tsx +++ b/front/src/app/embalse/[embalse]/page.tsx @@ -12,7 +12,7 @@ import { mapEmbalseToReservoirData, mapHistoricalReservoirToViewModel, } from "@/pods/embalse/embalse.mapper"; -import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; export const revalidate = 300; // ISR: regenerar cada 5 minutos diff --git a/front/src/pods/embalse/embalse-name.helper.spec.ts b/front/src/common/helpers/embalse-name.helper.spec.ts similarity index 100% rename from front/src/pods/embalse/embalse-name.helper.spec.ts rename to front/src/common/helpers/embalse-name.helper.spec.ts diff --git a/front/src/pods/embalse/embalse-name.helper.ts b/front/src/common/helpers/embalse-name.helper.ts similarity index 100% rename from front/src/pods/embalse/embalse-name.helper.ts rename to front/src/common/helpers/embalse-name.helper.ts diff --git a/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx b/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx index ee51916..4cb4150 100644 --- a/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx +++ b/front/src/pods/embalse-cuenca/embalse-cuenca.component.tsx @@ -2,7 +2,7 @@ import { Card } from "@/common/components/card.component"; import { Lookup } from "@/common/models"; import { generateSlug } from "db-model"; import Link from "next/link"; -import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; export interface Props { nombreCuenca: string; diff --git a/front/src/pods/embalse-provincia/embalse-provincia.component.tsx b/front/src/pods/embalse-provincia/embalse-provincia.component.tsx index ab140ff..74ed792 100644 --- a/front/src/pods/embalse-provincia/embalse-provincia.component.tsx +++ b/front/src/pods/embalse-provincia/embalse-provincia.component.tsx @@ -2,7 +2,7 @@ import { Card } from "@/common/components/card.component"; import { Lookup } from "@/common/models"; import Link from "next/link"; import React from "react"; -import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; interface Props { nombreProvincia: string; diff --git a/front/src/pods/embalse-search/components/filtered-list.tsx b/front/src/pods/embalse-search/components/filtered-list.tsx index 1c1a096..4256716 100644 --- a/front/src/pods/embalse-search/components/filtered-list.tsx +++ b/front/src/pods/embalse-search/components/filtered-list.tsx @@ -1,6 +1,7 @@ import React from "react"; import { useCombobox } from "downshift"; import { EmbalseSearchModel } from "../embalse-search.vm"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; interface Props { isOpen: boolean; @@ -35,7 +36,7 @@ export const FilteredList: React.FC = (props) => { highlightedIndex === index ? "bg-primary text-white" : "" }`} > - {item.name} + {formatEmbalseDisplayName(item.name)} ))} diff --git a/front/src/pods/embalse-search/components/recent-searches/recent-searches.component.tsx b/front/src/pods/embalse-search/components/recent-searches/recent-searches.component.tsx index b92229e..56490c3 100644 --- a/front/src/pods/embalse-search/components/recent-searches/recent-searches.component.tsx +++ b/front/src/pods/embalse-search/components/recent-searches/recent-searches.component.tsx @@ -1,5 +1,6 @@ import Link from "next/link"; import { EmbalseSearchModel } from "../../embalse-search.vm"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; interface Props { searches: EmbalseSearchModel[]; @@ -14,7 +15,9 @@ export const RecentSearches: React.FC = (props) => {
    {searches.map((item) => (
  • - {item.name} + + {formatEmbalseDisplayName(item.name)} +
    • ))}
diff --git a/front/src/pods/embalse/components/reservoir-card-gauge.tsx b/front/src/pods/embalse/components/reservoir-card-gauge.tsx index 500a2cc..7f7f909 100644 --- a/front/src/pods/embalse/components/reservoir-card-gauge.tsx +++ b/front/src/pods/embalse/components/reservoir-card-gauge.tsx @@ -9,7 +9,7 @@ import { GaugeChart } from "./reservoir-gauge"; import { GaugeLegend } from "./reservoir-gauge/gauge-chart/components/gauge-legend.component"; import { HistoryChart } from "./chart"; import { useIsMobile } from "./useIsMobile"; -import { formatEmbalseDisplayName } from "../embalse-name.helper"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; interface Props { name: string; reservoirData: ReservoirData; diff --git a/front/src/pods/embalse/components/reservoir-card-info.component.tsx b/front/src/pods/embalse/components/reservoir-card-info.component.tsx index f0b210c..121c7e7 100644 --- a/front/src/pods/embalse/components/reservoir-card-info.component.tsx +++ b/front/src/pods/embalse/components/reservoir-card-info.component.tsx @@ -1,6 +1,6 @@ import { ReservoirInfo } from "../embalse.vm"; import React from "react"; -import { formatEmbalseDisplayName } from "@/pods/embalse/embalse-name.helper"; +import { formatEmbalseDisplayName } from "@/common/helpers/embalse-name.helper"; interface Props { reservoirInfo: ReservoirInfo;