zet-lib 1.3.21 → 1.3.22

package/lib/views/generatorjs.ejs

@@ -927,4 +927,21 @@
       }
     )
   }
+
+  function removeJoins(table_join) {
+    if (window.confirm('Sure to delete ?')) {
+      ajaxPost(
+        '/<%- routeName%>/remove-joins',
+        {
+          table: $('#table').val(),
+          table_join: table_join
+        },
+        function (dt) {
+          if (dt.status == 1) {
+            location.href = '';
+          }
+        }
+      )
+    }
+  }
 </script>

package/lib/zGeneratorRouter.js

@@ -1344,112 +1344,142 @@ const viewsMini = async () => {
   return notifyObj
 }
 
-router.post('/load-joins', async(req,res) => {
-    let jsonNotif = Util.jsonSuccess("Success")
-    let html = '';
-    try {
-        let body = req.body;
-        console.log(body)
-        let table = body.table;
-        html = await loadJoins(table)
-        jsonNotif.html=html;
-    } catch (e) {
-        console.log(e)
-    }
-    res.json(jsonNotif)
+router.post('/load-joins', async (req, res) => {
+  let jsonNotif = Util.jsonSuccess('Success')
+  let html = ''
+  try {
+    let body = req.body
+    console.log(body)
+    let table = body.table
+    html = await loadJoins(table)
+    jsonNotif.html = html
+  } catch (e) {
+    console.log(e)
+  }
+  res.json(jsonNotif)
 })
 
-router.post('/joins', async(req,res) => {
-    let jsonNotif = Util.jsonSuccess("Success")
-    let html = '';
-    try {
-        let body = req.body;
-        console.log(body)
-        let table = body.table;
-        let table_join = body.table_join;
-        let result = await connection.result({
-            table:"zfields",
-            where : {
-                table:table
-            }
-        })
-        let joinsObj = result.joins || {}
-        joinsObj[table] = {}
-        await connection.update({
-            table: 'zfields',
-            data: {
-                joins:JSON.stringify(joinsObj)
-            },
-            where: {
-                table: table
-            },
-        })
-        jsonNotif.json=joinsObj
-        html = await joinHTML(joinsObj)
-    } catch (e) {
-        console.log(e)
-        jsonNotif = Util.flashError(e+'')
-    }
-    jsonNotif.html = html;
-    res.json(jsonNotif)
+router.post('/remove-joins', async (req, res) => {
+  let jsonNotif = Util.jsonSuccess('Success')
+  let html = ''
+  try {
+    let body = req.body
+    console.log(body)
+    let table = body.table
+    let table_join = body.table_join
+    let result = await connection.result({
+      table: 'zfields',
+      where: {
+        table: table,
+      },
+    })
+    let resultJoins = result.joins || {}
+    delete resultJoins[table_join]
+    await connection.update({
+      table: 'zfields',
+      data: {
+        joins: JSON.stringify(resultJoins),
+      },
+      where: {
+        table: table,
+      },
+    })
+  } catch (e) {
+    console.log(e)
+  }
+  res.json(jsonNotif)
+})
+
+router.post('/joins', async (req, res) => {
+  let jsonNotif = Util.jsonSuccess('Success')
+  let html = ''
+  try {
+    let body = req.body
+    console.log(body)
+    let table = body.table
+    let table_join = body.table_join
+    let result = await connection.result({
+      table: 'zfields',
+      where: {
+        table: table,
+      },
+    })
+    let resultJoins = result.joins || {}
+    resultJoins[table_join] = {}
+    await connection.update({
+      table: 'zfields',
+      data: {
+        joins: JSON.stringify(resultJoins),
+      },
+      where: {
+        table: table,
+      },
+    })
+    jsonNotif.json = resultJoins
+    html = await joinHTML(resultJoins)
+  } catch (e) {
+    console.log(e)
+    jsonNotif = Util.flashError(e + '')
+  }
+  jsonNotif.html = html
+  res.json(jsonNotif)
 })
 
 async function loadJoins(table) {
-    let html = '';
-    try {
-        let result = await connection.result({
-            table:"zfields",
-            where : {
-                table:table
-            }
-        })
-        let joinsObj = result.joins || {}
-        html = await joinHTML(joinsObj)
-    } catch (e) {
-        console.log(e)
-        html = e + '';
-    }
-    return html;
+  let html = ''
+  try {
+    let result = await connection.result({
+      table: 'zfields',
+      where: {
+        table: table,
+      },
+    })
+    let joinsObj = result.joins || {}
+    html = await joinHTML(joinsObj)
+  } catch (e) {
+    console.log(e)
+    html = e + ''
+  }
+  return html
 }
 
 async function joinHTML(json) {
-    let html = ``
-    try {
-        let zfields = await connection.results({
-            table:"zfields"
-        })
-        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="window.confirm('Sure to delete ?')"><i class="fa fa-trash "></i> </button></h5>`
-            html += fieldHTML(zfieldsObj[key]);
-            html += `</div>`
-        }
-    } catch (e) {
-        html = e+'';
+  let html = ``
+  try {
+    let zfields = await connection.results({
+      table: 'zfields',
+    })
+    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 += `</div>`
     }
-    return html;
+  } catch (e) {
+    html = e + ''
+  }
+  return html
 }
 
 function fieldHTML(obj) {
-    let html = ``
-    try {
-         let labels = obj.labels;
-         let table = obj.table;
-         for(let key in labels) {
-             html += `<div class="input-group">
+  let html = ``
+  try {
+    let labels = obj.labels
+    let table = obj.table
+    for (let key in labels) {
+      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">${key}</span>
                                         <input type="text" class="form-control" name="joins[${table}][${key}]" id="joins___${table}___${key}" value="${labels[key]}">
                                     </div>
                                 </div>`
-         }
-    } catch (e) {
-        html = e+'';
     }
-    return html;
+  } catch (e) {
+    html = e + ''
+  }
+  return html
 }
 
-
 module.exports = router

package/package.json

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