improve(Imports de masse): Achats: utiliser le nouveau schema amélior…

…é pour l'affichage de la doc aux utilisateurs (#4926)
betagouv · Jan 23, 2025 · 4ea7b28 · 4ea7b28
1 parent 5a8a134
commit 4ea7b28
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/2024-frontend/src/components/ImportSchemaTable.vue b/2024-frontend/src/components/ImportSchemaTable.vue
@@ -22,9 +22,9 @@ const formatFields = (fields) => {
         component: ImportSchemaTableDescriptionCell,
         title: field.title,
         description: field.description,
-        constraints: field.constraints.enum,
-        multiple: field.constraints.enum_multiple,
-        separator: field.constraints.enum_multiple_seperator,
+        constraints: field.constraints.enum || field.doc_enum,
+        multiple: field.doc_enum_multiple,
+        separator: field.doc_enum_multiple_seperator,
       },
       schemaService.getFieldType(field),
       field.example,

diff --git a/2024-frontend/src/components/ImportSchemaTableDescriptionCell.vue b/2024-frontend/src/components/ImportSchemaTableDescriptionCell.vue
@@ -15,7 +15,7 @@ defineOptions({ inheritAttrs: false })
     </span>
   </p>
   <p v-if="multiple" class="fr-text--sm">
-    Spécifiez plusieurs options en séparant avec un
+    Spécifiez plusieurs options en séparant avec
     <AppCode :content="separator" />
   </p>
 </template>
diff --git a/2024-frontend/src/services/schemas.js b/2024-frontend/src/services/schemas.js
@@ -17,14 +17,15 @@ const getFieldType = (field) => {
     year: "Année (AAAA)",
   }
 
-  if (field.name in types) {
-    return types[field.name]
-  }
-  if (field.constraints && field.constraints.enum) {
-    if (field.constraints.enum_multiple) {
+  if (field.constraints) {
+    if (field.constraints.enum) {
+      return types[`${field.type}_enum`]
+    } else if (field.constraints.pattern && field.doc_enum_multiple) {
       return types[`${field.type}_enum_multiple`]
     }
-    return types[`${field.type}_enum`]
+  }
+  if (field.name in types) {
+    return types[field.name]
   }
   return types[field.type]
 }

diff --git a/2024-frontend/src/views/ImportPurchases/index.vue b/2024-frontend/src/views/ImportPurchases/index.vue
@@ -16,7 +16,8 @@ const router = useRouter()
 
 /* Data */
 const pictoDocument = "/static/images/picto-dsfr/document.svg"
-const url = "https://raw.githubusercontent.com/betagouv/ma-cantine/refs/heads/main/data/schemas/imports/achats.json"
+const schemaUrl =
+  "https://raw.githubusercontent.com/betagouv/ma-cantine/refs/heads/staging/data/schemas/imports/achats.json"
 const ressources = [
   {
     download: "achats_fichier_exemple_ma_cantine.csv",
@@ -121,7 +122,7 @@ const showErrors = (count) => {
     .
   </p>
   <ImportExplanation :ressources="ressources" />
-  <ImportSchemaTable :url="url" />
+  <ImportSchemaTable :url="schemaUrl" />
   <section
     id="file-upload"
     class="fr-px-6w fr-px-xl-9w fr-py-6w fr-background-alt--blue-france fr-mt-4w fr-grid-row fr-grid-row--middle"