Fix/136

apps/datahub/src/app/app.component.css

@@ -75,3 +75,11 @@
   background-color: var(--background-alt-blue-france);
   padding: 1.5rem 0;
 }
+.bouton-cartes-gouv {
+  background-color: var(--background-action-high-blue-france) !important;
+  color: var(--text-inverted-blue-france) !important;
+}
+
+.bouton-cartes-gouv:hover {
+  background-color: var(--background-action-high-blue-france-hover) !important;
+}

apps/datahub/src/app/app.component.html

@@ -9,7 +9,7 @@
     [operatorImagePath]="
       'https://data.geopf.fr/annexes/ressources/header/cartes-gouv-logo.svg'
     "
-    [serviceTagline]="'Le service public des cartes et données du territoire'"
+    [serviceTagline]="'Notre territoire commun'"
     [menu]="[]"
   >
     <ng-template #toolsLinksTemplate>
@@ -39,6 +39,14 @@
                 [customClass]="'fr-nav__link'"
                 [iconPosition]="'left'"
               ></dsfr-link>
+              <dsfr-link
+                [link]="'https://cartes.gouv.fr/aide/fr/niveau-de-service/'"
+                [linkTarget]="'_blank'"
+                [label]="'Niveau de service'"
+                [icon]="'fr-icon-rfid-line'"
+                [customClass]="'fr-nav__link'"
+                [iconPosition]="'left'"
+              ></dsfr-link>
               <dsfr-link
                 [link]="'https://cartes.gouv.fr/nous-ecrire'"
                 [linkTarget]="'_blank'"
@@ -87,8 +95,8 @@
               <li style="display: flex">
                 <a
                   style="margin: 16px 24px"
-                  class="fr-btn fr-btn--tertiary"
-                  target="_blank"
+                  class="fr-btn bouton-cartes-gouv"
+                  target="_self"
                   href="https://cartes.gouv.fr/decouvrir"
                   >Découvrir cartes.gouv.fr</a
                 >

apps/datahub/src/app/home/home-header/home-header.component.html

@@ -23,6 +23,15 @@
         [style.opacity]="expandRatio"
         [innerHTML]="'datahub.header.title.html' | translate"
       ></div>
+      <a
+        href="https://cartes.gouv.fr/aide/fr/partenaires/"
+        target="_blank"
+        rel="noopener noreferrer"
+        style="display: inline-block; margin-bottom: 10px"
+      >
+        Découvrez les producteurs partenaires et leur offre
+      </a>
+
       <gn-ui-fuzzy-search
         class="text-[18px] pointer-events-auto"
         style="

apps/datahub/src/app/record/record-apis/record-apis.component.html

@@ -61,12 +61,20 @@
     <div class="flex flex-col px-4 gap-8 container-lg lg:mx-auto">
       <div class="flex flex-wrap justify-between sm:mb-2 ng-star-inserted">
         @if (selectedApiLink?.accessServiceProtocol) {
-          <p class="text-[21px] text-title font-title" translate>
-            {{
-              selectedApiLink?.accessServiceProtocol === 'GPFDL'
-                ? 'record.metadata.api.form.title.gpf'
-                : 'record.metadata.api.form.title'
-            }}
+          <p class="text-[21px] text-title font-title">
+            <span translate>
+              {{
+                selectedApiLink?.accessServiceProtocol === 'GPFDL'
+                  ? 'record.metadata.api.form.title.gpf'
+                  : 'record.metadata.api.form.title'
+              }}
+            </span>
+
+            <ng-container
+              *ngIf="selectedApiLink?.accessServiceProtocol === 'GPFDL'"
+            >
+              {{ selectedApiLink?.name }}
+            </ng-container>
           </p>
         }
         <button

libs/feature/record/src/lib/gpf-api-dl/gpf-api-dl.component.ts

@@ -22,6 +22,7 @@ import { Choice, DropdownSelectorComponent } from '@geonetwork-ui/ui/inputs'
 import { CommonModule } from '@angular/common'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { GpfApiDlListItemComponent } from '../gpf-api-dl-list-item/gpf-api-dl-list-item.component'
+import { de } from 'date-fns/locale'
 
 export interface Label {
   label: string
@@ -90,8 +91,6 @@ export class GpfApiDlComponent implements OnInit, AfterViewInit {
   editionDateFrom$ = new BehaviorSubject<string | null>(null)
   editionDateTo$ = new BehaviorSubject<string | null>(null)
 
-  url =
-    'https://data.geopf.fr/telechargement/capabilities?outputFormat=application/json'
   choices: any
   bucketPromisesZone: Choice[]
   bucketPromisesFormat: Choice[]
@@ -286,23 +285,11 @@ export class GpfApiDlComponent implements OnInit, AfterViewInit {
   }
 
   async getCapabilities() {
-    let page = 0
-    let choicesTest = undefined
-    let pageCount = 1
-
-    while (choicesTest === undefined && pageCount > page) {
-      const response = await this.http
-        .get<any>(this.url.concat(`&limit=200&page=${page}`))
-        .toPromise()
-
-      choicesTest = response.entry.filter(
-        (element: any) => element['id'] === this.apiBaseUrl
-      )[0]
-      page += 1
-      pageCount = response.pagecount + 1
-    }
+    const response = await this.http.get<any>(this.apiBaseUrl).toPromise()
+
+    console.log('helloresponse', response)
 
-    return choicesTest
+    return response
   }
 
   async getFields() {
@@ -324,7 +311,7 @@ export class GpfApiDlComponent implements OnInit, AfterViewInit {
     tempFormat.unshift({ value: 'null', label: 'FORMAT' })
     this.bucketPromisesFormat = tempFormat
 
-    const tempCrs = this.choices.category.map((bucket: TermBucket) => ({
+    const tempCrs = this.choices.categories.map((bucket: TermBucket) => ({
       value: bucket.term,
       label: bucket.label,
     }))
@@ -336,6 +323,7 @@ export class GpfApiDlComponent implements OnInit, AfterViewInit {
       this.choices.editionDateStart,
       this.choices.editionDateEnd,
     ]
+    console.log('this.defaultEditionDate', this.defaultEditionDate)
 
     this.editionDateFrom$.next(this.defaultEditionDate[0])
     this.editionDateTo$.next(this.defaultEditionDate[1])