Merge pull request #66 from ali1k/v1.3.7

upgraded fast-csv functions

Author: ali1k

package.json

@@ -30,7 +30,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "animate.css": "^3.7.0",
-    "async": "^2.6.1",
+    "async": "^3.1.0",
     "body-parser": "^1.18.3",
     "camelcase": "^5.0.0",
     "chroma-js": "^2.0.2",
@@ -45,9 +45,9 @@
     "es5-shim": "^4.5.12",
     "es6-shim": "^0.35.3",
     "express": "^4.16.3",
-    "express-fileupload": "^1.0.0",
+    "express-fileupload": "^1.1.6",
     "express-state": "^1.4.0",
-    "fast-csv": "^2.4.1",
+    "fast-csv": "^3.4.0",
     "flashtext.js": "^1.0.5",
     "fluxible": "^1.4.0",
     "fluxible-addons-react": "^0.2.15",
@@ -59,11 +59,11 @@
     "json2csv": "^4.2.1",
     "json3": "^3.3.2",
     "leaflet": "^1.3.4",
-    "log4js": "^4.1.0",
+    "log4js": "^6.1.0",
     "moment": "^2.22.2",
     "nodemailer": "^6.0.0",
     "nodemailer-smtp-transport": "^2.7.4",
-    "npm": "^6.4.0",
+    "npm": "^6.13.2",
     "passport": "^0.4.0",
     "passport-local": "^1.0.0",
     "password-hash": "^1.2.2",
@@ -81,8 +81,8 @@
     "recharts": "^1.3.1",
     "request-promise": "^4.2.2",
     "semantic-ui-css": "^2.4.1",
-    "semantic-ui-react": "^0.85.0",
-    "serialize-javascript": "^1.5.0",
+    "semantic-ui-react": "^0.88.1",
+    "serialize-javascript": "^2.1.1",
     "serve-favicon": "^2.5.0",
     "simplify-js": "^1.2.3",
     "superagent": "^5.0.2",

plugins/import/CSVMapper.js

@@ -161,7 +161,7 @@ class CSVMapper {
             PREFIX r: <${resourcePrefix}>
             PREFIX v: <${vocabPrefix}>
         `;
-        let options_select = [];
+        let options_select = ['"Not Applicable"'];
         let customMappings = columns.map((item, itemc)=> {
             if(item.trim()){
                 options_select.push(`"""${camelCase(item)}"""`);
@@ -176,8 +176,8 @@ class CSVMapper {
                      rdfs:label "mapping configurations for ${filePath}" ;
                      ldr:delimiter """${delimiter}""";
                      ldr:entityType v:Entity ;
-                     ldr:idColumn """${camelCase(columns[0])}""";
-                     ldr:skippedColumns """${camelCase(columns[0])}""";
+                     ldr:idColumn """Not Applicable""";
+                     ldr:skippedColumns """Not Applicable""";
                      ldr:customMappings r:${cmRND};
                      ldr:resourcePrefix <${resourcePrefix}>;
                      ldr:vocabPrefix <${vocabPrefix}>;

services/import.js

@@ -74,7 +74,7 @@ export default {
                 callback(null, {rows: rows, total: 0});
             }
             let rows = [];
-            let csvStream = csv(options)
+            let csvStream = csv.parse(options)
                 .on('data', function(data){
                     counter++;
                     //to limi the number of rows returned
@@ -206,7 +206,7 @@ export default {
                     callback(null, {output: ''});
                 }
                 let graphArr = [];
-                let csvStream = csv(options)
+                let csvStream = csv.parse(options)
                     .on('data', function(data){
                         counter++;
                         if(counter === 1){
@@ -230,7 +230,7 @@ export default {
                             if(!prop.trim()){
                                 continue;
                             }
-                            if(contextOptions['idColumn'] && prop.toLowerCase() === contextOptions['idColumn'].toLowerCase()){
+                            if(contextOptions['idColumn'] && camelCase(prop).toLowerCase() === contextOptions['idColumn'].toLowerCase()){
                                 tmpObj['@id'] = validUrl.isUri(data[prop].toString()) ? data[prop] : 'r:' + encodeURIComponent(camelCase(data[prop]));
                             }
                             if(contextOptions['skippedColumns'].indexOf(camelCase(prop)) === -1){
@@ -242,8 +242,8 @@ export default {
                             }
                         }
                         //add a random ID if no ID column is specified
-                        if(!contextOptions['idColumn'] ){
-                            tmpObj['@id'] = 'r:' + counter+ '_' + Math.round(+new Date() / 1000);
+                        if(!contextOptions['idColumn'] || contextOptions['idColumn']==='Not Applicable'){
+                            tmpObj['@id'] = 'r:' + counter+ '-' + Math.floor(Math.random() * 10000000);
                         }
                         graphArr.push(tmpObj);
                         //console.log(data);