chore: merge with main

annuaire-entreprises-data-gouv-fr · Jun 11, 2024 · 5334b96 · 5334b96
2 parents 619a5d8 + b2cfbfc
commit 5334b96
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 6 deletions.
diff --git a/clients/api-entreprise/client.ts b/clients/api-entreprise/client.ts
@@ -30,7 +30,8 @@ export default async function clientAPIEntreprise<T, U>(
     logInfoInSentry(
       new Information({
         name: 'NoRecipientSiretForAgent',
-        message: `Fallback on Dinum siret for domain : ${callerInfos.domain}`,
+        message: 'Fallback on Dinum siret',
+        context: { domain: callerInfos.domain },
       })
     );
   }

diff --git a/clients/open-data-soft/clients/journal-officiel-associations/index.ts b/clients/open-data-soft/clients/journal-officiel-associations/index.ts
@@ -1,6 +1,7 @@
 import routes from '#clients/routes';
 import { stubClient } from '#clients/stub-client-with-snaphots';
 import { IAnnoncesAssociation } from '#models/annonces';
+import constants from '#models/constants';
 import { IdRna, Siren, formatDateLong } from '#utils/helpers';
 import { getFiscalYear } from '#utils/helpers/formatting/format-fiscal-year';
 import odsClient from '../..';
@@ -65,7 +66,10 @@ type IDCAField = {
 const clientJOAFE = async (idRna: string): Promise<IAnnoncesAssociation> => {
   const searchUrl = `${routes.journalOfficielAssociations.ods.search}&q=numero_rna=${idRna}&refine.source=joafe&sort=dateparution`;
   const metaDataUrl = routes.journalOfficielAssociations.ods.metadata;
-  const response = await odsClient({ url: searchUrl }, metaDataUrl);
+  const response = await odsClient(
+    { url: searchUrl, config: { timeout: constants.timeout.L } },
+    metaDataUrl
+  );
 
   return {
     annonces: response.records.map(

diff --git a/clients/open-data-soft/index.ts b/clients/open-data-soft/index.ts
@@ -1,3 +1,4 @@
+import constants from '#models/constants';
 import { IDefaultRequestConfig, httpGet } from '#utils/network';
 import { IODSMetadata, IODSResponse } from './types';
 
@@ -8,9 +9,13 @@ const odsClient = async (
   search: { url: string; config?: IDefaultRequestConfig },
   metaDataUrl: string
 ): Promise<any> => {
+  const timeout = constants.timeout.XXL;
   const [response, responseMetaData] = await Promise.all([
-    httpGet<IODSResponse>(search.url, search.config),
-    httpGet<IODSMetadata>(metaDataUrl),
+    httpGet<IODSResponse>(search.url, {
+      timeout,
+      ...search.config,
+    }),
+    httpGet<IODSMetadata>(metaDataUrl, { timeout }),
   ]);
 
   const results = response || [];

diff --git a/components/footer/index.tsx b/components/footer/index.tsx
@@ -392,6 +392,16 @@ const Footer = () => (
                 Historique des changements
               </a>
             </li>
+            <li className="fr-footer__bottom-item">
+              <a
+                className="fr-footer__bottom-link"
+                target="_blank"
+                rel="noreferrer noopener"
+                href="https://github.com/annuaire-entreprises-data-gouv-fr"
+              >
+                Code source
+              </a>
+            </li>
           </ul>
           <div className="fr-footer__bottom-copy">
             <p>

diff --git a/components/map/map-etablissement.tsx b/components/map/map-etablissement.tsx
@@ -33,6 +33,11 @@ export function MapEtablissement({
       center: coords,
       zoom,
       minZoom: 3,
+      attributionControl: {
+        compact: true,
+        customAttribution:
+          '<a href="https://maplibre.org/" target="_blank">MapLibre</a> <a href="https://www.openmaptiles.org/" target="_blank">© OpenMapTiles</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">© Contributeurs OpenStreetMap</a>',
+      },
     });
 
     const popup = new maplibregl.Popup({ offset: 30 }).setHTML(

diff --git a/components/map/map-results.tsx b/components/map/map-results.tsx
@@ -33,6 +33,11 @@ export default function MapWithResults({
       center: [2, 47],
       zoom: 4.5,
       minZoom: 3,
+      attributionControl: {
+        compact: true,
+        customAttribution:
+          '<a href="https://maplibre.org/" target="_blank">MapLibre</a> <a href="https://www.openmaptiles.org/" target="_blank">© OpenMapTiles</a> <a href="https://www.openstreetmap.org/copyright" target="_blank">© Contributeurs OpenStreetMap</a>',
+      },
     });
 
     results.results.forEach((result) => {

diff --git a/components/search-results/map/index.tsx b/components/search-results/map/index.tsx
@@ -13,7 +13,7 @@ const SearchResultsMap: React.FC<{
   results: ISearchResults;
   searchFilterParams?: IParams;
 }> = ({ results, searchTerm = '', searchFilterParams = {} }) => {
-  const height = 'calc(100vh - 260px)';
+  const height = 'calc(100vh - 265px)';
 
   if (searchTerm && results.notEnoughParams) {
     return (

diff --git a/components/title-section/tabs/tab-link.tsx b/components/title-section/tabs/tab-link.tsx
@@ -30,7 +30,9 @@ export default function TabLink({
       rel={noFollow ? 'nofollow' : ''}
       style={{ width }}
       scroll={false}
-      onClick={() => window.dispatchEvent(new Event('runloadbar'))}
+      onClick={() =>
+        active ? null : window.dispatchEvent(new Event('runloadbar'))
+      }
       prefetch={false}
     >
       {active ? label : <h2>{label}</h2>}

diff --git a/models/exceptions.ts b/models/exceptions.ts
@@ -23,6 +23,7 @@ type IExceptionArgument = {
     referrer?: string;
     browser?: string;
     digest?: string;
+    domain?: string;
   };
 };