Merge pull request #44 from inclusion-numerique/dev

Fix axios-retry@3.9.1 TS error

apps/cli/package.json

@@ -17,8 +17,8 @@
     "@commander-js/extra-typings": "^10.0.3",
     "@sde/cdk": "*",
     "@sde/web": "*",
-    "axios": "^1.3.4",
-    "axios-retry": "^3.4.0",
+    "axios": "1.6.0",
+    "axios-retry": "3.9.0",
     "commander": "^10.0.0",
     "csv-parse": "^5.3.6",
     "csv-stringify": "^6.4.4",

apps/web/.gitignore

@@ -1,3 +1,6 @@
 public/dsfr
 build-storybook.log
 dist/
+/public/robots.txt
+/public/sitemap.xml
+/public/sitemap*.xml

apps/web/next-sitemap.config.js

@@ -1,9 +1,6 @@
 /** @type {import('next-sitemap').IConfig} */
 
-import { getServerUrl } from '@sde/web/utils/baseUrl';
-
 module.exports = {
-  // siteUrl: 'https://solutionsdelus.gouv.fr',
-  siteUrl: getServerUrl(),
+  siteUrl: 'https://solutionsdelus.gouv.fr',
   generateRobotsTxt: true,
 };

apps/web/package.json

@@ -46,7 +46,7 @@
     "@trpc/client": "^10.43.0",
     "@trpc/react-query": "^10.43.0",
     "@trpc/server": "^10.43.0",
-    "axios": "^1.3.4",
+    "axios": "1.6.0",
     "chart.js": "^4.4.0",
     "client-only": "^0.0.1",
     "copy": "^0.3.2",

apps/web/src/app/(public)/PublicFooter.tsx

@@ -126,7 +126,7 @@ const PublicFooter = () => (
           <li className="fr-footer__bottom-item">
             <a
               className="fr-footer__bottom-link"
-              href="https://github.com/inclusion-numerique/projets-territoires"
+              href="https://github.com/inclusion-numerique/solutions-elus"
               target="_blank"
               rel="noreferrer"
               title="Code source"

apps/web/src/app/(public)/projets/[slug]/Localization.tsx

@@ -12,7 +12,7 @@ const Localization = ({
   className,
 }: {
   project: ProjectItem
-  collectiviteUrl?: string;
+  collectiviteUrl: string | null
   className?: string
 }) => (
   <div className={className ?? ''}>
@@ -21,7 +21,7 @@ const Localization = ({
     ) : null}
     <div className={`fr-p-6v ${styles.bloc}`}>
       <h2 className="fr-mb-0 fr-text-title--blue-france">Le territoire</h2>
-      {project.localization.echelon === 'commune' ?
+      {(project.localization.echelon === 'commune' && collectiviteUrl) ?
         (
           <p className="fr-mt-6v fr-mb-0 fr-text--bold">
             <a href={collectiviteUrl} target="_blank">

apps/web/src/app/(public)/projets/[slug]/Project.tsx

@@ -13,7 +13,7 @@ import Quotes from './Quotes'
 import styles from './Project.module.css'
 import SocialNetworks from './SocialNetworks'
 
-const Project = ({ project, collectiviteUrl }: { project: ProjectItem, collectiviteUrl?: string }) => {
+const Project = ({ project, collectiviteUrl }: { project: ProjectItem, collectiviteUrl: string | null }) => {
   const coverPicture = (
     <picture>
       <img

apps/web/src/app/(public)/projets/[slug]/Quote.tsx

@@ -1,5 +1,5 @@
 import { getProjectFilePath } from '@sde/web/project/project'
-import Image from 'next/image'
+import Image from 'next/legacy/image'
 import React from 'react'
 import { textToParagraphs } from '@sde/web/utils/textParser'
 import styles from './Quote.module.css'

apps/web/src/app/(public)/projets/[slug]/page.tsx

@@ -61,25 +61,26 @@ type Localization = {
 
 const getCollectiviteUrl = async (localization: Localization) => {
   const res = await fetch(`https://api.collectivite.fr/api/commune/search/${encodeURIComponent(localization.label)}`)
-  const data = await res.json()
+  const data: Collectivite[] = await res.json()
 
-  const sameName = data.filter((item: Collectivite) => item.city.toLowerCase() === localization.label.toLowerCase())
-  const target = sameName.find((item: Collectivite) => 
-    item.zip_code ? item.zip_code.startsWith(localization.department || '') : true
-  )
-  const slug = target.slug_alias || target.slug || ""
+  const sameName = data.filter(item => item.city.toLowerCase() === localization.label.toLowerCase())
+  const target = sameName.find(item => {
+    if (item.region === "Corse") return localization.regionName ? item.region === localization.regionName : true
+    return localization.department ? item.zip_code.startsWith(localization.department) : true
+  })
+  const slug = target?.slug_alias || target?.slug
 
-  return `https://collectivite.fr/${slug}`;
+  if (slug) return `https://collectivite.fr/${slug}`;
+  return null
 };
 
 const ProjectPage = async ({ params }: { params: { slug: string } }) => {
   const project = await getProject(params.slug)
   if (!project) {
     notFound()
-    return {}
   }
-  const collectiviteUrl = project.localization.echelon === 'commune' ?
-    await getCollectiviteUrl(project.localization) : ""
+
+  const collectiviteUrl = await getCollectiviteUrl(project.localization)
 
   return (
     <div className="fr-container">

packages/config/package.json

@@ -12,7 +12,7 @@
     "node": "^18.16"
   },
   "dependencies": {
-    "axios": "^1.3.4",
+    "axios": "1.6.0",
     "dotenv": "^16.0.3",
     "dotenv-cli": "^7.1.0",
     "nanoid": "^3.3.6"