Merge branch 'main' into feature/#140-fix-the-display-of-the-reservoir-capacity-percentage

Author: JuanBerrocal

.github/workflows/deploy-front.yml

@@ -60,13 +60,5 @@ jobs:
         with:
           app-name: ${{ secrets.AZURE_FRONT_APP_NAME }}
           publish-profile: ${{ secrets.AZURE_FRONT_PUBLISH_PROFILE }}
-          images: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
-          restart: true
-
-      # Warm-up: force ISR regeneration so first real user gets data
-      - name: Warm-up (force ISR regeneration)
-        run: |
-          echo "Waiting for App Service to start..."
-          sleep 30
-          curl -s -o /dev/null -w "%{http_code}" https://info-embalse-front-prod-ecguababcfdsepga.westeurope-01.azurewebsites.net/
-          echo " - Warm-up done, ISR regeneration triggered"
+          images: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_SHA_TAG }}
+          restart: true

.github/workflows/deploy-functions.yml

@@ -28,10 +28,20 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      # Build all workspace packages first (db, db-model, arcgis, etc.)
-      # This ensures all internal dependencies generate their dist and type declarations
-      - name: Build all internal packages
-        run: npm run build
+      # Build only the packages needed by Azure Functions (avoids building front/Next.js
+      # which fails under Corepack/Node 22 due to SWC + packageManager conflict)
+      - name: Build internal packages for functions
+        run: |
+          npm run -w db-model build
+          npm run -w arcgis build --if-present
+          npm run -w scraping-cuenca-mediterranea build --if-present
+          npm run -w scraping-cuenca-cantabrico build --if-present
+          npm run -w scraping-cuenca-catalana build --if-present
+          npm run -w scraping-cuenca-duero build --if-present
+          npm run -w scraping-cuenca-jucar build --if-present
+          npm run -w scraping-cuenca-segura build --if-present
+          npm run -w scraping-cuenca-mino-sil build --if-present
+          npm run -w @embalse-info/db build --if-present
 
       # Build ONLY the functions workspace (TypeScript -> dist/)
       # This runs clean + type-check + build
@@ -55,6 +65,13 @@ jobs:
           cp -R packages/db-model deploy/packages/db-model
           cp -R integrations/arcgis deploy/integrations/arcgis
           cp -R integrations/scraping-cuenca-mediterranea deploy/integrations/scraping-cuenca-mediterranea
+          cp -R integrations/scraping-cuenca-cantabrico deploy/integrations/scraping-cuenca-cantabrico
+          cp -R integrations/scraping-cuenca-catalana deploy/integrations/scraping-cuenca-catalana
+          cp -R integrations/scraping-cuenca-duero deploy/integrations/scraping-cuenca-duero
+
+          cp -R integrations/scraping-cuenca-jucar deploy/integrations/scraping-cuenca-jucar
+          cp -R integrations/scraping-cuenca-segura deploy/integrations/scraping-cuenca-segura
+          cp -R integrations/scraping-cuenca-mino-sil deploy/integrations/scraping-cuenca-mino-sil
 
           # Strip devDependencies and rewrite workspace refs to file: paths
           node -e "
@@ -73,7 +90,14 @@ jobs:
             patchPkg('deploy/packages/db/package.json', {
               'arcgis': 'file:../../integrations/arcgis',
               'db-model': 'file:../db-model',
-              'scraping-cuenca-mediterranea': 'file:../../integrations/scraping-cuenca-mediterranea'
+              'scraping-cuenca-mediterranea': 'file:../../integrations/scraping-cuenca-mediterranea',
+              'scraping-cuenca-cantabrico': 'file:../../integrations/scraping-cuenca-cantabrico',
+              'scraping-cuenca-catalana': 'file:../../integrations/scraping-cuenca-catalana',
+              'scraping-cuenca-duero': 'file:../../integrations/scraping-cuenca-duero',
+
+              'scraping-cuenca-jucar': 'file:../../integrations/scraping-cuenca-jucar',
+              'scraping-cuenca-segura': 'file:../../integrations/scraping-cuenca-segura',
+              'scraping-cuenca-mino-sil': 'file:../../integrations/scraping-cuenca-mino-sil'
             });
 
             // arcgis: point db-model to file: path
@@ -86,6 +110,36 @@ jobs:
               'db-model': 'file:../../packages/db-model'
             });
 
+            // scraping-cuenca-cantabrico: point db-model to file: path
+            patchPkg('deploy/integrations/scraping-cuenca-cantabrico/package.json', {
+              'db-model': 'file:../../packages/db-model'
+            });
+
+            // scraping-cuenca-catalana: point db-model to file: path
+            patchPkg('deploy/integrations/scraping-cuenca-catalana/package.json', {
+              'db-model': 'file:../../packages/db-model'
+            });
+
+            // scraping-cuenca-duero: point db-model to file: path
+            patchPkg('deploy/integrations/scraping-cuenca-duero/package.json', {
+              'db-model': 'file:../../packages/db-model'
+            });
+
+            // scraping-cuenca-jucar: point db-model to file: path
+            patchPkg('deploy/integrations/scraping-cuenca-jucar/package.json', {
+              'db-model': 'file:../../packages/db-model'
+            });
+
+            // scraping-cuenca-segura: point db-model to file: path
+            patchPkg('deploy/integrations/scraping-cuenca-segura/package.json', {
+              'db-model': 'file:../../packages/db-model'
+            });
+
+            // scraping-cuenca-mino-sil: point db-model to file: path
+            patchPkg('deploy/integrations/scraping-cuenca-mino-sil/package.json', {
+              'db-model': 'file:../../packages/db-model'
+            });
+
             // db-model: just strip devDeps
             patchPkg('deploy/packages/db-model/package.json');
           "

.gitignore

@@ -8,4 +8,5 @@ __queuestorage__/
 __tablestorage__/
 mongo-data
 .env
-deploy
+deploy
+front/.env.local

README.md

@@ -1,5 +1,19 @@
 # embalse-info
 
+## Configuración del Front
+
+Al ejecutar `npm install` dentro de la carpeta `front`, se creará automáticamente el fichero `.env.local` a partir de `.env.local.example` (si no existe ya).
+
+Una vez creado, debes configurar el token de Content Island:
+
+1. Abre el fichero `front/.env.local`.
+2. Pregunta al equipo de desarrollo cuál es el valor del token de Content Island.
+3. Sustituye el valor `VALUE` en la entrada `CONTENT_ISLAND_ACCESS_TOKEN` por el token proporcionado.
+
+```
+CONTENT_ISLAND_ACCESS_TOKEN=<token proporcionado por el equipo>
+```
+
 ## Pasos para actualizar la semilla de las cuencas
 
 ```bash

front/.env.local

@@ -0,0 +1,6 @@
+MONGODB_CONNECTION_STRING=mongodb://localhost:27017/embalse-info
+
+
+# IMPORTANT: ask the team 
+CONTENT_ISLAND_ACCESS_TOKEN=VALUE
+

front/.env.local.example

@@ -12,17 +12,26 @@ COPY front/package.json ./front/package.json
 COPY packages/db-model/package.json ./packages/db-model/package.json
 
 # 2) Install all dependencies for the monorepo (npm workspaces)
-#    We need dev deps here because Next build typically requires them.
-RUN npm ci
+#    --ignore-scripts: postinstall scripts can't run yet (source not copied)
+RUN npm ci --ignore-scripts
 
 # 3) Now copy the full source code
 COPY . .
 
-# 4) Build the internal dependency used by the front (db-model)
-#    If your workspace name differs, adjust "-w db-model"
+# 4) Remove packageManager field to prevent Corepack (Node 22) from
+#    hijacking yarn calls that Next.js SWC patching makes internally.
+#    Then rebuild native modules (e.g. @tailwindcss/oxide) that were
+#    skipped by --ignore-scripts above.
+#    Finally, install the musl binary for tailwindcss/oxide
+#    (the lock file only has darwin-arm64, not linux-x64-musl).
+RUN node -e "const p='package.json',j=JSON.parse(require('fs').readFileSync(p));delete j.packageManager;require('fs').writeFileSync(p,JSON.stringify(j,null,2))" \
+    && npm rebuild \
+    && cd front && npm install @tailwindcss/oxide-linux-x64-musl --no-save
+
+# 5) Build the internal dependency used by the front (db-model)
 RUN npm run -w db-model build --if-present
 
-# 5) Build Next.js (standalone output will be generated)
+# 6) Build Next.js (standalone output will be generated)
 RUN npm run -w front build
 
 

front/Dockerfile

@@ -4,22 +4,24 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "postinstall": "node scripts/postinstall.js",
     "start": "next dev",
     "build": "next build",
     "start-prod": "node .next/standalone/server.js"
   },
   "dependencies": {
+    "@content-island/api-client": "^0.16.0",
     "@fontsource/nunito-sans": "^5.2.7",
     "@tailwindcss/postcss": "^4.1.17",
     "d3": "^7.9.0",
+    "db-model": "file:../packages/db-model",
     "downshift": "^9.2.0",
+    "mongodb": "^6.12.0",
     "next": "^16.1.6",
     "postcss": "^8.5.6",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
-    "tailwindcss": "^4.1.17",
-    "mongodb": "^6.12.0",
-    "db-model": "file:../packages/db-model"
+    "tailwindcss": "^4.1.17"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

front/package.json

@@ -0,0 +1,15 @@
+import { existsSync, copyFileSync } from "node:fs";
+import { resolve, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const rootDir = resolve(__dirname, "..");
+const envLocalPath = resolve(rootDir, ".env.local");
+const envExamplePath = resolve(rootDir, ".env.local.example");
+
+if (!existsSync(envLocalPath)) {
+  copyFileSync(envExamplePath, envLocalPath);
+  console.log(".env.local created from .env.local.example");
+} else {
+  console.log(".env.local already exists, skipping copy");
+}

front/scripts/postinstall.js

@@ -0,0 +1,48 @@
+import { EmbalsesCuencaPod, getEmbalsesPorCuenca } from "@/pods/embalse-cuenca";
+import { cuencas } from "@/core/constants";
+import { mapLookupListFromApiToViewModel } from "@/common/mappers";
+import { Metadata } from "next";
+
+export const revalidate = 300; // ISR: regenerar cada 5 minutos
+
+interface Props {
+  params: Promise<{ cuenca: string }>;
+}
+
+const getCuencaBySlug = (slug: string) => {
+  return Object.values(cuencas).find((cuenca) => cuenca.slug === slug);
+};
+
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  const { cuenca } = await params;
+  const datosCuenca = getCuencaBySlug(cuenca);
+
+  if (!datosCuenca) {
+    return {};
+  }
+
+  return {
+    title: `Embalses de ${datosCuenca.nombre}`,
+  };
+}
+
+export default async function EmbalseCuencaListadoPage({
+  params,
+}: Props): Promise<React.JSX.Element> {
+  const { cuenca } = await params;
+  const datosCuenca = getCuencaBySlug(cuenca);
+
+  const embalsesPorCuencaDesdeApi = await getEmbalsesPorCuenca(
+    datosCuenca.nombre,
+  );
+  const embalsesPorCuenca = mapLookupListFromApiToViewModel(
+    embalsesPorCuencaDesdeApi,
+  );
+
+  return (
+    <EmbalsesCuencaPod
+      nombreCuenca={datosCuenca.nombre}
+      embalses={embalsesPorCuenca}
+    />
+  );
+}