Merge branch 'master' into fufeck_feat_update-multi-numeros

BaseAdresseNationale · Oct 22, 2024 · 70f8ce5 · 70f8ce5
2 parents 69dadc9 + be365c4
commit 70f8ce5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/components/bal/voies-list.tsx b/components/bal/voies-list.tsx
@@ -193,8 +193,8 @@ function VoiesList({
                     : null
                 }
                 comment={
-                  voie.commentedNumeros.length > 0 ? (
-                    <CommentsContent comments={voie.commentedNumeros} />
+                  voie.comments.length > 0 ? (
+                    <CommentsContent comments={voie.comments} />
                   ) : null
                 }
                 warning={

diff --git a/components/comments-content.tsx b/components/comments-content.tsx
@@ -1,14 +1,10 @@
 import { Pane, Text } from "evergreen-ui";
+import { uniqueId } from "lodash";
 
 const COMMENTS_LIMIT = 10;
 
 interface CommentsContentProps {
-  comments: {
-    id: string;
-    numero: number;
-    suffixe: string;
-    comment: string;
-  }[];
+  comments: string[];
 }
 
 function CommentsContent({ comments }: CommentsContentProps) {
@@ -23,18 +19,15 @@ function CommentsContent({ comments }: CommentsContentProps) {
           Commentaire{`${comments.length > 0 ? "s" : ""}`} :
         </Text>
       </Pane>
-      {filteredComments.map(({ id, numero, suffixe, comment }) => (
+      {filteredComments.map((comment) => (
         <Pane
           color="white"
-          key={id}
+          key={uniqueId()}
           whiteSpace="nowrap"
           overflow="hidden"
           textOverflow="ellipsis"
         >
-          <Text color="white">
-            • {numero}
-            {suffixe} : {comment}
-          </Text>
+          <Text color="white">{comment}</Text>
         </Pane>
       ))}
       {nbComments > COMMENTS_LIMIT && (

diff --git a/components/header.tsx b/components/header.tsx
@@ -56,7 +56,7 @@ function Header() {
 
             <Button
               is="a"
-              href={PEERTUBE_LINK}
+              href={`${PEERTUBE_LINK}/w/p/4kx66AESyPc6Er47sgBeFX`}
               target="_blank"
               appearance="minimal"
               marginRight="12px"

diff --git a/components/new/alert-published-bal/alert-puslished-bal-moissoneur.tsx b/components/new/alert-published-bal/alert-puslished-bal-moissoneur.tsx
@@ -17,8 +17,7 @@ function AlertPublishedBALMoissoneur({
     const loadOrganization = async () => {
       if (revision.context.extras.sourceId) {
         const sourceId: string = revision.context.extras.sourceId;
-        const id: string[] = sourceId.split("-");
-        const dataset: Dataset = await DataGouvService.findDataset(id[1]);
+        const dataset: Dataset = await DataGouvService.findDataset(sourceId);
 
         setOrganization(dataset.organization);
       }

diff --git a/lib/openapi/models/ExtendedVoieDTO.ts b/lib/openapi/models/ExtendedVoieDTO.ts
@@ -18,13 +18,13 @@ export type ExtendedVoieDTO = {
     typeNumerotation: ExtendedVoieDTO.typeNumerotation;
     centroid: Record<string, any>;
     trace: Record<string, any>;
+    bbox: Array<string>;
     baseLocale: BaseLocale;
     numeros: Array<Numero>;
     nbNumeros: number;
     nbNumerosCertifies: number;
     isAllCertified: boolean;
-    commentedNumeros: Array<string>;
-    bbox: Record<string, any>;
+    comments: Array<string>;
 };
 
 export namespace ExtendedVoieDTO {

diff --git a/lib/openapi/models/Voie.ts b/lib/openapi/models/Voie.ts
@@ -18,6 +18,7 @@ export type Voie = {
     typeNumerotation: Voie.typeNumerotation;
     centroid: Record<string, any>;
     trace: Record<string, any>;
+    bbox: Array<string>;
     baseLocale: BaseLocale;
     numeros: Array<Numero>;
 };