Merge branch 'development' into 6841-create-paragraph-extractor

huridocs · Oct 11, 2024 · 48a2c92 · 48a2c92
2 parents e2e9768 + 93bad26
commit 48a2c92
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/app/api/csv/csv.ts b/app/api/csv/csv.ts
@@ -58,7 +58,7 @@ const csv = (readStream: Readable, stopOnError = false) => ({
 
   async read() {
     this.reading = true;
-    return csvtojson({ delimiter: DELIMITERS })
+    return csvtojson({ delimiter: DELIMITERS, flatKeys: true })
       .fromStream(readStream)
       .subscribe(async (row: CSVRow, index) => {
         if (!this.reading) {

diff --git a/app/api/csv/specs/__snapshots__/importFile.spec.ts.snap b/app/api/csv/specs/__snapshots__/importFile.spec.ts.snap
@@ -1,11 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`importFile readStream should return a readable stream for the csv file 1`] = `
-"Title , text label  , numeric label, non configured, select_label, not defined type, geolocation_geolocation,auto id, additional tag(s), Multi Select Label, Date label, Language
+"Title , header.with.dots, text label  , numeric label, non configured, select_label, not defined type, geolocation_geolocation,auto id, additional tag(s), Multi Select Label, Date label, Language
 
-title1, text value 1, 1977, ______________, thesauri1   , notType1                 , 1|1,,tag1, multivalue1,03/01/2022,English
-title2, text value 2, 2019, ______________, thesauri2   , notType2                 ,    ,,tag2, multivalue2,01/03/2022,Spanish
-title3, text value 3, 2020, ______________, thesauri2   , notType3                 , 0|0,,tag3, multivalue1|multivalue3,01/01/2022,AnyStringIsGood
+title1, header with dots value 1, text value 1, 1977, ______________, thesauri1   , notType1                 , 1|1,,tag1, multivalue1,03/01/2022,English
+title2, header with dots value 2, text value 2, 2019, ______________, thesauri2   , notType2                 ,    ,,tag2, multivalue2,01/03/2022,Spanish
+title3, header with dots value 3, text value 3, 2020, ______________, thesauri2   , notType3                 , 0|0,,tag3, multivalue1|multivalue3,01/01/2022,AnyStringIsGood
 "
 `;
 

diff --git a/app/api/csv/specs/csvLoader.spec.js b/app/api/csv/specs/csvLoader.spec.js
@@ -169,6 +169,7 @@ describe('csvLoader', () => {
         numeric_label: [{ value: 1977 }],
         select_label: [{ label: 'thesauri1', value: expect.any(String) }],
         text_label: [{ value: 'text value 1' }],
+        header_with_dots: [{ value: 'header with dots value 1' }],
       });
     });
 

diff --git a/app/api/csv/specs/csvLoaderFixtures.ts b/app/api/csv/specs/csvLoaderFixtures.ts
@@ -62,6 +62,11 @@ export default {
           label: 'text label',
           name: templateUtils.safeName('text label'),
         },
+        {
+          type: propertyTypes.text,
+          label: 'header.with. dots',
+          name: templateUtils.safeName('header.with.dots'),
+        },
         {
           type: propertyTypes.numeric,
           label: 'numeric label',

diff --git a/app/api/csv/specs/test.csv b/app/api/csv/specs/test.csv
@@ -1,5 +1,5 @@
-Title , text label  , numeric label, non configured, select_label, not defined type, geolocation_geolocation,auto id, additional tag(s), Multi Select Label, Date label, Language
+Title , header.with.dots, text label  , numeric label, non configured, select_label, not defined type, geolocation_geolocation,auto id, additional tag(s), Multi Select Label, Date label, Language
 
-title1, text value 1, 1977, ______________, thesauri1   , notType1                 , 1|1,,tag1, multivalue1,03/01/2022,English
-title2, text value 2, 2019, ______________, thesauri2   , notType2                 ,    ,,tag2, multivalue2,01/03/2022,Spanish
-title3, text value 3, 2020, ______________, thesauri2   , notType3                 , 0|0,,tag3, multivalue1|multivalue3,01/01/2022,AnyStringIsGood
+title1, header with dots value 1, text value 1, 1977, ______________, thesauri1   , notType1                 , 1|1,,tag1, multivalue1,03/01/2022,English
+title2, header with dots value 2, text value 2, 2019, ______________, thesauri2   , notType2                 ,    ,,tag2, multivalue2,01/03/2022,Spanish
+title3, header with dots value 3, text value 3, 2020, ______________, thesauri2   , notType3                 , 0|0,,tag3, multivalue1|multivalue3,01/01/2022,AnyStringIsGood
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.188.0-rc9",
+  "version": "1.188.0-rc10",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"
@@ -43,7 +43,7 @@
     "hot-e2e": "DATABASE_NAME=uwazi_e2e INDEX_NAME=uwazi_e2e EXTERNAL_SERVICES=true yarn hot",
     "run-e2e": "DATABASE_NAME=uwazi_e2e INDEX_NAME=uwazi_e2e EXTERNAL_SERVICES=true yarn run-production",
     "hot-inspect": "export HOT=true; export BABEL_ENV=debug; yarn run watch-types & yarn dev-server --inspect & yarn run webpack-server",
-    "hot-debug": "export HOT=true; export BABEL_ENV=debug; node --no-experimental-fetch --inspect-brk=9229 server.js",
+    "hot-debug": "export HOT=true; export BABEL_ENV=debug; node --no-experimental-fetch --inspect-brk=9229 server.js & yarn run webpack-server",
     "reindex": "node scripts/run.js ../database/reindex_elastic.js",
     "import-csv": "node --no-experimental-fetch scripts/run.js ../database/import_csv.js",
     "blank-state": "node --no-experimental-fetch scripts/bash.js ./database/blank_state.sh",