@websy/websy-designs 2.0.1 → 2.1.0

package/dist/server/helpers/v1/pgHelper.js

@@ -134,16 +134,8 @@ class PGHelper {
     const placeholders = []
     const values = []
     Object.values(data).forEach(d => {
-      if (d === null) {
-        // return d
-      }
-      else {
-        if (typeof d === 'string') { 
-          d = d.replace(/'/g, `''`)
-        }
-        values.push(d)
-        placeholders.push(`$${values.length}`)        
-      }
+      values.push(this.prepareWriteValue(d))
+      placeholders.push(`$${values.length}${Array.isArray(d) ? '::text[]' : ''}`)
     })    
     sql += `
       ${placeholders.join(',')}
@@ -261,11 +253,8 @@ class PGHelper {
     let updateValues = []
     for (let key in data) {
       if (this.updateIgnores.indexOf(key) === -1) {
-        if (typeof data[key] === 'string') {
-          data[key] = data[key].replace(/''/gm, `'`).replace(/'/gm, `''`).replace(/\\\\/gm, '\\')
-        }
-        updateValues.push((data[key] === null ? data[key] : data[key]))
-        updates.push(`${key} = $${updateValues.length}`)
+        updateValues.push(this.prepareWriteValue(data[key]))
+        updates.push(`${key} = $${updateValues.length}${Array.isArray(data[key]) ? '::text[]' : ''}`)
       }      
     }
     if (process.env.CREATE_USER_FIELD && process.env.USERID_FIELD && user) {
@@ -308,11 +297,8 @@ class PGHelper {
         let updates = []
         for (let key in row) {
           if (this.updateIgnores.indexOf(key) === -1) {
-            if (typeof row[key] === 'string') {
-              row[key] = row[key].replace(/''/gm, `'`).replace(/'/gm, `''`).replace(/\\\\/gm, '\\')
-            }
-            allValues.push((row[key] === null ? row[key] : `'${row[key]}'`))
-            updates.push(`${key} = $${allValues.length}`)
+            allValues.push(this.prepareWriteValue(row[key]))
+            updates.push(`${key} = $${allValues.length}${Array.isArray(row[key]) ? '::text[]' : ''}`)
           }      
         }          
         allValues.push(id)
@@ -326,16 +312,8 @@ class PGHelper {
         delete row[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id']    
         const placeholders = []        
         Object.values(row).forEach(d => {
-          if (d === null) {
-            // return d
-          }
-          else {
-            if (typeof d === 'string') { 
-              d = d.replace(/'/g, `''`)
-            }
-            allValues.push(d)
-            placeholders.push(`$${allValues.length}`)        
-          }
+          allValues.push(this.prepareWriteValue(d))
+          placeholders.push(`$${allValues.length}${Array.isArray(d) ? '::text[]' : ''}`)
         })                  
         sql = `
           INSERT INTO ${entity} (${Object.keys(row).join(',')})
@@ -411,6 +389,34 @@ class PGHelper {
       return { where: `${(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id'} = $${startCount + 1}`, values: [id] }
     }
   }
+  prepareWriteValue (value) {
+    if (Array.isArray(value)) {
+      return value.map(v => this.prepareWriteValue(v))
+    }
+    return value
+  }
+  prepareResponseRows (rows = []) {
+    return rows.map(row => {
+      const output = {}
+      for (let key in row) {
+        output[key] = this.prepareResponseValue(row[key])
+      }
+      return output
+    })
+  }
+  prepareResponseValue (value) {
+    if (Array.isArray(value)) {
+      return value.map(v => this.prepareResponseValue(v))
+    }
+    if (value && value.constructor === Object) {
+      const output = {}
+      for (let key in value) {
+        output[key] = this.prepareResponseValue(value[key])
+      }
+      return output
+    }
+    return value
+  }
   checkTables () {
     this.createContentTable().then(() => {
       this.createTranslationTable().then(() => {
@@ -494,16 +500,21 @@ class PGHelper {
     })
   }
   execute (query, values) {     
+    console.log('query')
+    console.log(query)
+    console.log(values)
     return new Promise((resolve, reject) => {      
       const params = [query]
       if (values && values.length > 0) {
         params.push(values)
       }
       if (query !== null) {
-        this.client.query(...params).then(queryResponse => {                    					
+        this.client.query(...params).then(queryResponse => {          
+          console.log('queryResponse.rows')                    					
+          console.log(queryResponse.rows)                    					
           resolve({
             rowCount: queryResponse.rowCount,
-            rows: queryResponse.rows
+            rows: this.prepareResponseRows(queryResponse.rows)
           })
         }, err => {
           if (err) {              

package/dist/websy-designs-es6.debug.js

@@ -2293,7 +2293,7 @@ class WebsyForm {
     }
     for (let key in d) {      
       this.options.fields.forEach(f => {        
-        if (f.field === key && d[key]) {
+        if (f.field === key && typeof d[key] !== 'undefined') {
           this.setValue(key, d[key])
         //   f.value = d[key]
         //   const el = document.getElementById(`${this.elementId}_input_${f.field}`)

package/dist/websy-designs-es6.js

@@ -2298,7 +2298,7 @@ var WebsyForm = /*#__PURE__*/function () {
       }
       var _loop = function _loop(key) {
         _this16.options.fields.forEach(function (f) {
-          if (f.field === key && d[key]) {
+          if (f.field === key && typeof d[key] !== 'undefined') {
             _this16.setValue(key, d[key]);
             //   f.value = d[key]
             //   const el = document.getElementById(`${this.elementId}_input_${f.field}`)