zet-lib 1.3.22 → 1.3.24

package/lib/connection.js

@@ -353,6 +353,26 @@ connection.constraintList = (table, schema = 'public') => {
        WHERE nsp.nspname = '${schema}' AND rel.relname = '${table}'; `
 }
 
+//find foreign key
+connection.foreignKeyList = (table) => {
+  return `SELECT
+    tc.table_schema, 
+    tc.constraint_name, 
+    tc.table_name, 
+    kcu.column_name, 
+    ccu.table_schema AS foreign_table_schema,
+    ccu.table_name AS foreign_table_name,
+    ccu.column_name AS foreign_column_name 
+FROM information_schema.table_constraints AS tc 
+JOIN information_schema.key_column_usage AS kcu
+    ON tc.constraint_name = kcu.constraint_name
+    AND tc.table_schema = kcu.table_schema
+JOIN information_schema.constraint_column_usage AS ccu
+    ON ccu.constraint_name = tc.constraint_name
+WHERE tc.constraint_type = 'FOREIGN KEY'
+    AND tc.table_name='${table}';`
+}
+
 var toNumber = function (num) {
   num = num + ''
   var t = replaceAll(num, '.', '')

package/lib/views/generator.ejs

@@ -91,10 +91,6 @@
                     <form id="formfields" method="post" action="/generator/fields">
                         <div id="divtablist" class="row"></div>
                         <div id="contentfields"></div>
-                        <div id="divjoinmodules">
-                            <h4>Join Modules</h4>
-                            <div class="row" id="joinlist"></div>
-                        </div>
                         <% if(lock==0) {%>
                             <div class="text-center mt-4">
                                 <button class="btn btn-danger btn-reset text-white mr-2" type="button"><i
@@ -109,7 +105,7 @@
                                 <!-- Basic dropdown -->
                                 <button class="btn btn-warning m-0 px-3 waves-effect waves-light mr-2"
                                     data-toggle="modal" data-target="#modal_joins" type="button"><i
-                                        class="fas fa-dice"></i> Join Module</button>
+                                        class="fas fa-dice"></i> Join Modules</button>
                                 <button class="btn m-0 px-3 waves-effect waves-light mr-2" data-toggle="modal"
                                     data-target="#modal_container" type="button"><i class="fa fa-plus"></i> Add
                                     Container</button>
@@ -120,13 +116,26 @@
                                     type="button"><i class="fa fa-paper-plane"></i> Save & Generate</button>
                             </div>
                             <%}%>
-
                     </form>
                     <!-- Default form reply -->
                 </div>
             </div>
             <!--/Generator-->
 
+            <div class="card mb-4 wow fadeIn card-script">
+                <div class="card-header font-weight-bold">
+                    <span> Join Modules</span>
+                </div>
+                <div class="card-body">
+                    <div id="divjoinmodules">
+                        <form id="formjoin">
+                            <div class="row" id="joinlist"></div>
+                        </form>
+                    </div>
+                    <hr>
+
+                </div>
+            </div>
 
             <!-- Card -->
             <div class="card mb-4 wow fadeIn card-script" style="display: none">
@@ -304,16 +313,12 @@
             </div>
         </div>
         <!--/.Card-->
-
     </div>
     </div>
     <!--Grid row-->
 </section>
 <!--Section: Post-->
 
-
-
-
 <!-- Modal -->
 <div class="modal fade" id="add_table" tabindex="-1" aria-labelledby="add_table" aria-hidden="true">
     <div class="modal-dialog">
@@ -445,7 +450,6 @@
 </div>
 
 
-
 <div class="modal fade" id="modal_tab" tabindex="-1" aria-labelledby="modal_setting" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -473,7 +477,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalLabel">Import zfield File</h5>
+                <h5 class="modal-title">Import zfield File</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i>
                 </button>
             </div>
@@ -501,7 +505,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalLabel">Add Container</h5>
+                <h5 class="modal-title">Add Container</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i>
                 </button>
             </div>
@@ -534,8 +538,9 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="exampleModalLabel">Join Module</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i>
+                <h5 class="modal-title">Join Module</h5>
+                <button type="button" class="close" id="closejoin" data-dismiss="modal" aria-label="Close"><i
+                        class="fa fa-times"></i>
                 </button>
             </div>
             <div class="modal-body">

package/lib/views/generatorjs.ejs

@@ -270,7 +270,7 @@
       let html = ``
       let time = new Date().getTime()
       let col_md = `col-md-${12 / columncount}`
-      container_time = `container_${time}`
+      let container_time = `container_${time}`
       html += `<li class="container-nav"><i class="fa fa-arrows icon-float"></i><div class="row  mt-1 mb-1">`
       for (let i = 1; i <= columncount; i++) {
         html += `<div class="${col_md}" style="background-color: rgba(0,0,0,.03)" ><ol class="divboxlittle container-box"><li><i data-container="${container_time}" data-id="${i}" data-split="${columncount}" data-column="ONE_COLUMN" class="fa fa-plus-circle fa-2x add-container text-success"></i></li></ol> </div>`
@@ -406,6 +406,7 @@
           approvers: approvers,
           knowings: knowings,
           others: JSON.stringify(others),
+          joins: $('#formjoin').serializeArray(),
         },
         function (data) {
           if (data.status == 0) {
@@ -815,26 +816,6 @@
         })
       })
     }
-    /* let myobj = {}
-     let isContainer = Object.keys(obj).length ? true : false;
-     if(isContainer) {
-         for(let key in obj) {
-             let arr = obj[key] || [];
-             if(arr.length) {
-                 arr.forEach(function (item) {
-                     if(Array.isArray(item)) {
-                         let length = item.length;
-                         if(isEmpty(item)) {
-                             obj[key].splice(0,1);
-                         }
-                         console.log(length)
-                     }
-                 })
-             }
-         }
-     }
-     console.log(JSON.stringify(obj))*/
-
     others = obj
     return obj
   }
@@ -877,10 +858,11 @@
         )
       }
     })
+
     $("#modal-joins-save").on("click", function (e) {
       let table_join = $('#select_module_joins').val();
       let table = $('#table').val()
-      if (table == route) {
+      if (table == table_join) {
         toastr.error("Your selected module is equal with current module");
         return;
       }
@@ -894,6 +876,7 @@
           toastrForm(dt);
           if (dt.status == 1) {
             $("#joinlist").html(dt.html);
+            $("#closejoin").click();
           }
         }
       )
@@ -937,9 +920,7 @@
           table_join: table_join
         },
         function (dt) {
-          if (dt.status == 1) {
-            location.href = '';
-          }
+          location.reload();
         }
       )
     }

package/lib/zGeneratorRouter.js

@@ -266,6 +266,7 @@ router.post('/save_and_generate', csrfProtection, async (req, res) => {
     if (nots.includes(req.body.table)) {
       return res.json(Util.flashError('Table is locked'))
     }
+    //console.log(JSON.stringify(req.body))
     const json = await generate(req, res)
     res.json(json)
   } catch (e) {
@@ -417,7 +418,6 @@ const generate = async (req, res) => {
       //console.log(JSON.stringify(filesKey.modelObj))
       //check if has chains here
       MYMODEL = filesKey.modelObj
-
       //delete/clean zgrid after changes
       await connection.delete({
         table: 'zgrid',
@@ -502,7 +502,7 @@ const generate = async (req, res) => {
         fs.writeFileSync(`${dirRoot}/models/${filesKey.filename}`, newModel)
       }
       //check model if it has select relation in concat
-      await scanning(MYMODEL)
+      await scanning(MYMODEL, result)
     }
     //generate views
     let DIR_VIEW = `${dirRoot}/views/${table}`
@@ -661,6 +661,113 @@ router.post('/savetabs', async (req, res) => {
   res.send(json)
 })
 
+const buildJoin = async (MYMODEL, result) => {
+  let joins = result.joins || {}
+  let table = MYMODEL.table
+  let table_joins = []
+  let join_list = []
+
+  if (result.joins && Object.keys(joins).length > 0) {
+    let newDataObj = {}
+    for (let key in joins) {
+      //find relation
+      //sql.push(` LEFT JOIN ${key} ON ${key}.id = ${table}.${key}_id `)
+      let THEIR_MODEL = require(`${dirRoot}/models/${key}`)
+      //console.log(THEIR_MODEL)
+      let arr = joins[key] || []
+      table_joins.push(key)
+      if (arr.length > 0) {
+        arr.map((item) => {
+          //console.log(item)
+          //console.log(typeof item)
+          const originKey = key.replace(`${key}___`, '')
+          newDataObj[item.key] = item.value
+          MYMODEL.keys.push(item.key)
+          MYMODEL.keysExcel.push(item.key)
+          MYMODEL.labels[item.key] = item.value
+          MYMODEL.fields[item.key] = THEIR_MODEL.fields[originKey]
+          MYMODEL.options[item.key] = THEIR_MODEL.options[originKey]
+          MYMODEL.grids.invisibles.push(item.key)
+          MYMODEL.datas[item.key] = THEIR_MODEL.datas[originKey]
+          //MYMODEL.widgets[item.key] = THEIR_MODEL.widgets[originKey];
+          join_list.push(item.key)
+        })
+      }
+    }
+
+    let sql = []
+    //get all foreign key
+    let rows = await connection.query(connection.foreignKeyList(table))
+    let foreign_table_name = {}
+    let foreignTables = []
+    rows.map((row) => {
+      foreignTables.push(row.foreign_table_name)
+      foreign_table_name[row.foreign_table_name] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table}.${row.column_name} `
+    })
+
+    //step by step
+    let table_steps = []
+    table_joins.map((item) => {
+      if (foreignTables.includes(item)) {
+        sql.push(foreign_table_name[item])
+        table_steps.push(item)
+      }
+    })
+
+    if (table_steps.length > 0) {
+      for (let table_steps_item of table_steps) {
+        let rows = await connection.query(connection.foreignKeyList(table_steps_item))
+        let foreign_table_name = {}
+        let foreignTables = []
+        rows.map((row) => {
+          foreignTables.push(row.foreign_table_name)
+          foreign_table_name[row.foreign_table_name] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table_steps_item}.${row.column_name} `
+        })
+        console.log(foreignTables)
+        table_joins.map((item) => {
+          if (!table_steps.includes(item)) {
+            if (foreignTables.includes(item)) {
+              sql.push(foreign_table_name[item])
+              table_steps.push(item)
+            }
+          }
+        })
+      }
+    }
+
+    if (table_steps.length > 0) {
+      for (let table_steps_item of table_steps) {
+        let rows = await connection.query(connection.foreignKeyList(table_steps_item))
+        let foreign_table_name = {}
+        let foreignTables = []
+        rows.map((row) => {
+          foreignTables.push(row.foreign_table_name)
+          foreign_table_name[row.foreign_table_name] = ` LEFT JOIN ${row.foreign_table_name} ON ${row.foreign_table_name}.id = ${table_steps_item}.${row.column_name} `
+        })
+        console.log(foreignTables)
+        table_joins.map((item) => {
+          if (!table_steps.includes(item)) {
+            if (foreignTables.includes(item)) {
+              sql.push(foreign_table_name[item])
+              table_steps.push(item)
+            }
+          }
+        })
+      }
+    }
+
+    //add join
+    let JOINS_DATA = {}
+    JOINS_DATA.tables = table_joins
+    JOINS_DATA.list = join_list
+    JOINS_DATA.data = joins
+    JOINS_DATA.sql = sql
+
+    MYMODEL.joins = JOINS_DATA
+  }
+  return MYMODEL
+}
+
 const columnLR = (items, dataName) => {
   return `<div class="col-md-6"><ol class="mydragable divboxlittle" data-name="${dataName}">${items}</ol></div>`
 }
@@ -1015,6 +1122,7 @@ router.post('/load-form', async (req, res) => {
   res.json(json)
 })
 
+//save to table zfields
 var saveToZFields = async (body) => {
   const table = body.table
   let is_approval = body.is_approval
@@ -1049,13 +1157,38 @@ var saveToZFields = async (body) => {
     others: body.others,
   }
 
-  await connection.update({
+  let joinsTables = {}
+  let bodyJoins = body.joins || []
+  let bodyJoinsObj = {}
+  if (bodyJoins.length > 0) {
+    bodyJoins.map((item) => {
+      bodyJoinsObj[item.name] = item.value
+    })
+  }
+  for (let key in bodyJoinsObj) {
+    if (key.includes('joins_checks___')) {
+      let tablekeys = key.split('___')
+      let keyName = key.replace('joins_checks___', '')
+      if (!joinsTables[tablekeys[1]]) {
+        joinsTables[tablekeys[1]] = []
+      }
+      joinsTables[tablekeys[1]].push({ key: keyName, value: bodyJoinsObj[`joins_labels___${keyName}`] })
+    }
+  }
+  //console.log(joinsTables);
+  if (Object.keys(joinsTables).length > 0) {
+    data.joins = JSON.stringify(joinsTables)
+  }
+
+  let result = await connection.update({
     table: 'zfields',
     data: data,
     where: {
       table: table,
     },
   })
+
+  return result
 }
 
 //drop down chains effect
@@ -1193,16 +1326,15 @@ router.post('/import', async (req, res) => {
 /*
 Scanning relation id to name
  */
-const scanning = async (MYMODEL) => {
+const scanning = async (MYMODEL, result) => {
   //let MYMODEL = require(`${dirRoot}/models/${table}`);
-  //console.log(JSON.stringify(MYMODEL))
   let table = MYMODEL.table
   const widgets = MYMODEL.widgets
   const not_scanning = ['created_by', 'updated_by']
   const concat_bracket = /(?<=\().+?(?=\))/g
   let changeWidgets = {}
   let changes = []
-  for (let key in widgets) {
+  /*for (let key in widgets) {
     if (widgets[key].name == 'relation' || widgets[key].name == 'dropdown_multi' || widgets[key].name == 'typeahead') {
       if (!Util.in_array(key, not_scanning)) {
         let fields = widgets[key].fields
@@ -1237,7 +1369,7 @@ const scanning = async (MYMODEL) => {
         }
       }
     }
-  }
+  }*/
 
   if (changes.length) {
     //rewrite model
@@ -1249,6 +1381,18 @@ const scanning = async (MYMODEL) => {
     fs.writeFileSync(`${dirRoot}/models/${MYMODEL.table}.js`, newModel)
   }
 
+  //check if has join
+  //build join
+  //console.log(JSON.stringify(MYMODEL))
+  MYMODEL = await buildJoin(MYMODEL, result)
+  //console.log(JSON.stringify(MYMODEL))
+
+  let newModel = `module.exports = {  ${Util.newLine}`
+  newModel += zRoute.buildFileModel(MYMODEL)
+  newModel += `${Util.newLine}`
+  newModel += `}`
+  fs.writeFileSync(`${dirRoot}/models/${MYMODEL.table}.js`, newModel)
+
   //return MYMODEL;
 }
 
@@ -1405,8 +1549,8 @@ router.post('/joins', async (req, res) => {
       },
     })
     let resultJoins = result.joins || {}
-    resultJoins[table_join] = {}
-    await connection.update({
+    resultJoins[table_join] = []
+    let myzfield = await connection.update({
       table: 'zfields',
       data: {
         joins: JSON.stringify(resultJoins),
@@ -1416,7 +1560,7 @@ router.post('/joins', async (req, res) => {
       },
     })
     jsonNotif.json = resultJoins
-    html = await joinHTML(resultJoins)
+    html = await joinHTML(resultJoins, myzfield)
   } catch (e) {
     console.log(e)
     jsonNotif = Util.flashError(e + '')
@@ -1428,6 +1572,8 @@ router.post('/joins', async (req, res) => {
 async function loadJoins(table) {
   let html = ''
   try {
+    /*  let sql = `select ${table}.* from ${table}  `;
+    console.log(sql)*/
     let result = await connection.result({
       table: 'zfields',
       where: {
@@ -1435,7 +1581,7 @@ async function loadJoins(table) {
       },
     })
     let joinsObj = result.joins || {}
-    html = await joinHTML(joinsObj)
+    html = await joinHTML(joinsObj, result)
   } catch (e) {
     console.log(e)
     html = e + ''
@@ -1443,7 +1589,7 @@ async function loadJoins(table) {
   return html
 }
 
-async function joinHTML(json) {
+async function joinHTML(json, myzfield) {
   let html = ``
   try {
     let zfields = await connection.results({
@@ -1452,8 +1598,8 @@ async function joinHTML(json) {
     let zfieldsObj = Util.arrayToObject(zfields, 'table')
     for (let key in json) {
       html += `<div class="joinContainer col-md-4">`
-      html += `<h5>${zfieldsObj[key].name} <button class="btn btn-danger" onclick="removeJoins('${key}')"><i class="fa fa-trash "></i> </button></h5>`
-      html += fieldHTML(zfieldsObj[key])
+      html += `<h5>${zfieldsObj[key].name} <button type="button" class="btn btn-danger" onclick="removeJoins('${key}')"><i class="fa fa-trash "></i> </button></h5>`
+      html += fieldHTML(zfieldsObj[key], myzfield)
       html += `</div>`
     }
   } catch (e) {
@@ -1462,17 +1608,29 @@ async function joinHTML(json) {
   return html
 }
 
-function fieldHTML(obj) {
+function fieldHTML(obj, myzfield) {
   let html = ``
   try {
     let labels = obj.labels
     let table = obj.table
+    let myzfieldJoins = myzfield.joins || {}
     for (let key in labels) {
+      let mylabel = labels[key]
+      let selected = ''
+      if (myzfieldJoins[table]) {
+        let arr = myzfieldJoins[table] || []
+        arr.map((item) => {
+          if (item.key == `${table}___${key}`) {
+            selected = ` checked `
+            mylabel = item.value
+          }
+        })
+      }
       html += `<div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text"><input type="checkbox" name=""></span>
+                                        <span class="input-group-text"><input type="checkbox" ${selected} name="joins_checks___${table}___${key}"></span>
                                         <span class="input-group-text">${key}</span>
-                                        <input type="text" class="form-control" name="joins[${table}][${key}]" id="joins___${table}___${key}" value="${labels[key]}">
+                                        <input type="text" class="form-control" name="joins_labels___${table}___${key}" id="joins___${table}___${key}" value="${mylabel}">
                                     </div>
                                 </div>`
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.3.22",
+  "version": "1.3.24",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"