zet-lib 1.5.19 → 1.5.21

package/lib/Form.js

@@ -179,9 +179,9 @@ Form.field = (obj) => {
       let imageLinkParent = obj.routeName
       if(bracketsImage>1){
         const matchImage = imageLinkName.match(regex);
-        imageLinkParent = `${matchFile[1]}/${matchFile[2]}`;
+        imageLinkParent = `${matchImage[1] ? matchImage[1] : '' }/${matchImage[2] ? matchImage[2] : ''}`;
       }
-      let stringvalue = value ? value.substring(13) : "";
+      let stringvalue = value ? value.replace(/^[^_]+_/, '') : "";
       let trashicon = stringvalue ? `<img class="tabler-icons icons-filter-danger" src="/assets/icons/trash-filled.svg" onclick="removeimage(this)">`: "";
       displayForm = `${prepend}<input ${tabindex} type="file" accept="image/*" onchange="loadFile(this,'${obj.id}' )" data-width="${obj.width}" class="form-control ${obj.class || ""}" ${id} ${name} ${placeholder}  value="${value}" ${htmlOptions}>
 		<div  id="body${obj.id}" class="isfile"  data-id="${obj.id}" data-table="${obj.routeName}" data-width="${obj.width}"  data-name="${obj.title}" data-filename="${value}" data-required="${obj.required}"> <img class="mb-3" width="${obj.width}" id="file${
@@ -196,9 +196,9 @@ Form.field = (obj) => {
       let fileLinkParent = obj.routeName
       if(bracketsFile>1){
         const matchFile = fileLinkName.match(regex);
-        fileLinkParent = `${matchFile[1]}/${matchFile[2]}`;
+        fileLinkParent = `${matchFile[1]?matchFile[1]:''}/${matchFile[2]?matchFile[2]:''}`;
       }
-      let stringvaluefile = value ? value.substring(13) : "";
+      let stringvaluefile = value ? value.replace(/^[^_]+_/, '') : "";
       let trashiconfile = stringvaluefile? `<img class="tabler-icons icons-filter-danger" src="/assets/icons/trash-filled.svg" onclick="removeimage(this)">`: "";
       displayForm = `${prepend}<input ${tabindex} type="file" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/msword, application/vnd.ms-excel, application/vnd.ms-powerpoint,text/plain, application/pdf,.css,.js,.jpg,.png,.gif" onchange="loadFile(this,'${obj.id}' )"  class="form-control ${
           obj.class || ""}"  ${id} ${name} ${placeholder} value="${value}" ${htmlOptions}>

package/lib/Util.js

@@ -55,7 +55,7 @@ Util.newLines = (n) => Util.newLine.repeat(n);
 // Hashing functions
 Util.hash = (string) => sha256(string);
 Util.hashCompare = (myPlaintextPassword, hash) =>
-  Util.hash(myPlaintextPassword) === hash;
+    Util.hash(myPlaintextPassword) === hash;
 
 // Excel sequence generator - optimized with memoization
 const excelSequenceCache = new Map();
@@ -65,7 +65,7 @@ Util.excelSequence = function () {
   }
 
   const abjads = Array.from({ length: 26 }, (_, i) =>
-    String.fromCharCode(65 + i)
+      String.fromCharCode(65 + i)
   );
   const arr = [...abjads];
   let num = 26;
@@ -90,22 +90,22 @@ const defaultDateFormat = "YYYY-MM-DD";
 const defaultTimeFormat = "YYYY-MM-DD HH:mm:ss";
 
 Util.dateSql = (date, format = defaultDateFormat) =>
-  date && date !== "0000-00-00" ? moment(date).format(format) : "";
+    date && date !== "0000-00-00" ? moment(date).format(format) : "";
 
 Util.dateOriginal = (date) =>
-  date && date !== "0000-00-00" ? moment(date).utc(false) : "";
+    date && date !== "0000-00-00" ? moment(date).utc(false) : "";
 
 Util.dateFormat = (date, format = defaultDateFormat) =>
-  date && date !== "0000-00-00" ? moment(date).format(format) : "";
+    date && date !== "0000-00-00" ? moment(date).format(format) : "";
 
 Util.timePublic = (date) => (date ? moment(date).format("DD MMM YYYY") : "");
 
 Util.timeSql = (date, format = defaultTimeFormat) =>
-  date && date !== "0000-00-00 00:00:00" ? moment(date).format(format) : "";
+    date && date !== "0000-00-00 00:00:00" ? moment(date).format(format) : "";
 
 // Optimized date difference calculation
 Util.dateDiff = (start, end, format = "months") =>
-  start && end ? moment(end).diff(moment(start), format, true) : 0;
+    start && end ? moment(end).diff(moment(start), format, true) : 0;
 
 // Optimized date parsing
 Util.getDate = (date = "") => {
@@ -124,15 +124,15 @@ Util.dateIsBetween = (compare, start, end) => {
   const endDate = moment(end);
 
   return (
-    compareDate.isSame(startDate) ||
-    compareDate.isSame(endDate) ||
-    compareDate.isBetween(startDate, endDate)
+      compareDate.isSame(startDate) ||
+      compareDate.isSame(endDate) ||
+      compareDate.isBetween(startDate, endDate)
   );
 };
 
 // Optimized month and year extraction
 Util.getMonth = (date) =>
-  date?.length > 5 ? new Date(date).getMonth() + 1 : 0;
+    date?.length > 5 ? new Date(date).getMonth() + 1 : 0;
 
 Util.getYear = (date) => Util.dateSql(date)?.slice(0, 4) || "";
 
@@ -149,14 +149,14 @@ Util.calculateDay = function (from, to, holidayInWeek = 0) {
 
   if (holidayInWeek === 1) {
     const days = Util.enumerateDaysBetweenDates(
-      moment(from).format("YYYY-MM-DD"),
-      moment(to).format("YYYY-MM-DD")
+        moment(from).format("YYYY-MM-DD"),
+        moment(to).format("YYYY-MM-DD")
     );
     count = days.filter((item) => moment(item).day() !== 0).length;
   } else if (holidayInWeek === 2) {
     const days = Util.enumerateDaysBetweenDates(
-      moment(from).format("YYYY-MM-DD"),
-      moment(to).format("YYYY-MM-DD")
+        moment(from).format("YYYY-MM-DD"),
+        moment(to).format("YYYY-MM-DD")
     );
     count = days.filter((item) => {
       const day = moment(item).day();
@@ -209,7 +209,7 @@ Util.escapeRegExp = function (str = "") {
 
 Util.validateEmail = function (email) {
   let re =
-    /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+      /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   return re.test(email);
 };
 
@@ -296,13 +296,13 @@ Util.arrayToObject = (array = [], keyField, isInteger = false) => {
   if (array.length) {
     array.forEach(function (item) {
       var name =
-        item[keyField] == null
-          ? "xxxxxx"
-          : item[keyField] == "null"
-          ? "xxxxxx"
-          : isInteger
-          ? item[keyField]
-          : item[keyField] + "";
+          item[keyField] == null
+              ? "xxxxxx"
+              : item[keyField] == "null"
+              ? "xxxxxx"
+              : isInteger
+                  ? item[keyField]
+                  : item[keyField] + "";
       obj[name] = item;
     });
   }
@@ -374,7 +374,7 @@ Util.random = function (length) {
   length = length || 5;
   let text = "";
   const possible =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   for (let i = 0; i < length; i++)
     text += possible.charAt(Math.floor(Math.random() * possible.length));
 
@@ -403,13 +403,13 @@ Util.getFormattedDate = function (date) {
   let day = date.getDate().toString();
   day = day.length > 1 ? day : "0" + day;
   let time =
-    date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+      date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
   return year + "-" + month + "-" + day + " " + time;
 };
 
 Util.uniqueId = function () {
   return (
-    Date.now().toString(36) + Math.random().toString(36).substr(2, 5)
+      Date.now().toString(36) + Math.random().toString(36).substr(2, 5)
   ).toUpperCase();
 };
 
@@ -460,7 +460,7 @@ Util.objectToGridFormat = function (obj = {}, isInteger = false) {
 Util.random = function (length = 5) {
   let text = "";
   const possible =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   for (let i = 0; i < length; i++)
     text += possible.charAt(Math.floor(Math.random() * possible.length));
 
@@ -469,26 +469,26 @@ Util.random = function (length = 5) {
 
 Util.typePrint = {
   register:
-    '{"paper_size":"F4","paper_size_width":"215","paper_size_height":"330","padding_top":"8","padding_right":"8","padding_bottom":"8","padding_left":"8","border":"1","font":"0","font_size":"10","header":"SURAT PERINTAH KERJA","header_font":"0","header_font_size":"26"}',
+      '{"paper_size":"F4","paper_size_width":"215","paper_size_height":"330","padding_top":"8","padding_right":"8","padding_bottom":"8","padding_left":"8","border":"1","font":"0","font_size":"10","header":"SURAT PERINTAH KERJA","header_font":"0","header_font_size":"26"}',
   estimation:
-    '{"paper_size":"F4","paper_size_width":"215","paper_size_height":"330","padding_top":"8","padding_right":"8","padding_bottom":"8","padding_left":"8","border":"1","font":"0","font_size":"12","header":"ESTIMASI BIAYA PERBAIKAN","header_font":"0","header_font_size":"18"}',
+      '{"paper_size":"F4","paper_size_width":"215","paper_size_height":"330","padding_top":"8","padding_right":"8","padding_bottom":"8","padding_left":"8","border":"1","font":"0","font_size":"12","header":"ESTIMASI BIAYA PERBAIKAN","header_font":"0","header_font_size":"18"}',
   invoice:
-    '{"paper_size":"A5","paper_size_width":"148","paper_size_height":"210","padding_top":"8","padding_right":"8","padding_bottom":"8","padding_left":"8","border":"1","font":"0","font_size":"12","header":"INVOICE","header_font":"0","header_font_size":"18"}',
+      '{"paper_size":"A5","paper_size_width":"148","paper_size_height":"210","padding_top":"8","padding_right":"8","padding_bottom":"8","padding_left":"8","border":"1","font":"0","font_size":"12","header":"INVOICE","header_font":"0","header_font_size":"18"}',
   currency: '{"symbol":"Rp","name":"Rupiah","thousand":"."}',
 };
 
 Util.isJson = function (text) {
   if (text) {
     if (
-      /^[\],:{}\s]*$/.test(
-        text
-          .replace(/\\["\\\/bfnrtu]/g, "@")
-          .replace(
-            /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-            "]"
-          )
-          .replace(/(?:^|:|,)(?:\s*\[)+/g, "")
-      )
+        /^[\],:{}\s]*$/.test(
+            text
+                .replace(/\\["\\\/bfnrtu]/g, "@")
+                .replace(
+                    /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+                    "]"
+                )
+                .replace(/(?:^|:|,)(?:\s*\[)+/g, "")
+        )
     ) {
       //the json is ok
       return true;
@@ -526,20 +526,20 @@ Util.getKey = function (obj = {}, field = "") {
 
 Util.camelize = function (text = "") {
   return text.replace(
-    /^([A-Z])|[\s-_]+(\w)/g,
-    function (match, p1, p2, offset) {
-      if (p2) return p2.toUpperCase();
-      return p1.toLowerCase();
-    }
+      /^([A-Z])|[\s-_]+(\w)/g,
+      function (match, p1, p2, offset) {
+        if (p2) return p2.toUpperCase();
+        return p1.toLowerCase();
+      }
   );
 };
 
 Util.decamelize = function (str = "", separator = "_") {
   return str
-    .replace(/([a-z\d])([A-Z])/g, "$1" + separator + "$2")
-    .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, "$1" + separator + "$2")
-    .replace("_", separator)
-    .toLowerCase();
+      .replace(/([a-z\d])([A-Z])/g, "$1" + separator + "$2")
+      .replace(/([A-Z]+)([A-Z][a-z\d]+)/g, "$1" + separator + "$2")
+      .replace("_", separator)
+      .toLowerCase();
 };
 
 /*
@@ -582,9 +582,9 @@ Util.fieldToName = function (str = "") {
 
 Util.capitalizeWord = (string = "") => {
   return string
-    .split(" ")
-    .map((m) => m[0].toUpperCase() + m.substr(1))
-    .join(" ");
+      .split(" ")
+      .map((m) => m[0].toUpperCase() + m.substr(1))
+      .join(" ");
 };
 
 Util.capitalizeFirstLetter = (string = "") => {
@@ -648,7 +648,7 @@ Util.gridSearch = function (visibles, relations, name, value) {
     }
   }
   return (
-    "searchValue.eq(" + index + ').find("' + elm + '").val("' + value + '");'
+      "searchValue.eq(" + index + ').find("' + elm + '").val("' + value + '");'
   );
 };
 
@@ -664,8 +664,8 @@ Util.formatNumber = function (num, thousandSeparator = ".") {
     const parts = strValue.split(",");
     // Format integer part with thousand separators
     const integerPart = parts[0].replace(
-      /\B(?=(\d{3})+(?!\d))/g,
-      thousandSeparator
+        /\B(?=(\d{3})+(?!\d))/g,
+        thousandSeparator
     );
     // If there's a decimal part, add it back
     if (parts.length > 1) {
@@ -749,8 +749,8 @@ Util.fileView = function (dir = "", file = "", attributes = {}) {
   let withIcon = attributes.hasOwnProperty("withIcon") ? true : false;
   let obj = Util.fileExtension(filename);
   let className = attributes.hasOwnProperty("class")
-    ? ` class="${attributes.class}" `
-    : "";
+      ? ` class="${attributes.class}" `
+      : "";
   if (filename.includes("https")) {
     html = `<img src="${file}" ${className}  class="img-responsive">`;
   } else {
@@ -760,14 +760,10 @@ Util.fileView = function (dir = "", file = "", attributes = {}) {
       if (file) {
         if (withIcon) {
           html = `<img class="mb-3 boxy-small" src="/img/${
-            obj.file
-          }" height="45px" width="45px"><a class="text-success" target="_blank" href="${filename}"> ${file.substring(
-            13
-          )}</a>`;
+              obj.file
+          }" height="45px" width="45px"><a class="text-success" target="_blank" href="${filename}"> ${file.replace(/^[^_]+_/,'')}</a>`;
         } else {
-          html = `<a class="text-success" target="_blank" href="${filename}"> ${file.substring(
-            13
-          )}</a>`;
+          html = `<a class="text-success" target="_blank" href="${filename}"> ${file.replace(/^[^_]+_/,'')}</a>`;
         }
       }
     }
@@ -792,9 +788,9 @@ Util.arrayToList = function (arr, array, delimiter, isCount) {
   if (arr) {
     for (var i = 0; i < arr.length; i++) {
       html +=
-        isCount == 1
-          ? i + 1 + ". " + array[arr[i]] + delimiter
-          : " " + array[arr[i]] + delimiter;
+          isCount == 1
+              ? i + 1 + ". " + array[arr[i]] + delimiter
+              : " " + array[arr[i]] + delimiter;
     }
     html = html.slice(0, delimiter.length * -1);
   }
@@ -817,14 +813,14 @@ Util.dropdownHelper = function (data, field, model) {
   let fieldsx = field + "[]";
   let name = field + "[]";
   let myvalue =
-    typeof data[fieldsx] == undefined
-      ? " "
-      : typeof data[fieldsx] == "string"
-      ? '["' + data[fieldsx] + '"]'
-      : JSON.stringify(data[name]);
+      typeof data[fieldsx] == undefined
+          ? " "
+          : typeof data[fieldsx] == "string"
+          ? '["' + data[fieldsx] + '"]'
+          : JSON.stringify(data[name]);
   if (myvalue) {
     let unique =
-      myvalue.indexOf("[") > -1 ? myvalue : !myvalue ? "" : "[" + myvalue + "]";
+        myvalue.indexOf("[") > -1 ? myvalue : !myvalue ? "" : "[" + myvalue + "]";
     unique = JSON.parse(unique);
     data[field] = JSON.stringify(unique.filter(Util.arrayUnique));
     delete data[name];
@@ -840,14 +836,14 @@ Util.dropdownHelper = function (data, field, model) {
 Util.dropdownAdd = function (data, field, model, datas) {
   let name = field + "[]";
   let myvalue =
-    typeof datas == undefined
-      ? " "
-      : typeof datas == "string"
-      ? '["' + datas + '"]'
-      : JSON.stringify(datas);
+      typeof datas == undefined
+          ? " "
+          : typeof datas == "string"
+          ? '["' + datas + '"]'
+          : JSON.stringify(datas);
   if (myvalue) {
     let unique =
-      myvalue.indexOf("[") > -1 ? myvalue : !myvalue ? "" : "[" + myvalue + "]";
+        myvalue.indexOf("[") > -1 ? myvalue : !myvalue ? "" : "[" + myvalue + "]";
     unique = JSON.parse(unique);
     myvalue = JSON.stringify(unique.filter(Util.arrayUnique));
     delete data[name];
@@ -946,7 +942,7 @@ Util.arrayToConcat = function (arr = []) {
 Util.arraySequence = function (arr = [], left = [], right = []) {
   let obj = Util.arrayToObject(arr, "Field");
   let temp = [],
-    stores = [];
+      stores = [];
   for (let i = 0; i < arr.length; i++) {
     if (arr[i].Field == "id") {
       stores.push(arr[i].Field);
@@ -998,10 +994,10 @@ Util.arraySequence = function (arr = [], left = [], right = []) {
 
 Util.isInteger = (value) => {
   return (
-    !isNaN(value) &&
-    (function (x) {
-      return (x | 0) === x;
-    })(parseFloat(value))
+      !isNaN(value) &&
+      (function (x) {
+        return (x | 0) === x;
+      })(parseFloat(value))
   );
 };
 
@@ -1078,8 +1074,8 @@ Util.regexPassword = (lengthMin, lengthMax) => {
   lengthMax = lengthMax || 20;
 
   return new RegExp(
-    "^[a-zA-Z0-9_-]{" + lengthMin + "," + lengthMax + "}$",
-    "i"
+      "^[a-zA-Z0-9_-]{" + lengthMin + "," + lengthMax + "}$",
+      "i"
   );
 };
 
@@ -1093,10 +1089,10 @@ Util.regexCode = (lengthMin, lengthMax) => {
 
 Util.imageProfile = function (image = "") {
   return image
-    ? image.indexOf("http") > -1
-      ? image
-      : "/uploads/zuser/" + image
-    : "/img/user.png";
+      ? image.indexOf("http") > -1
+          ? image
+          : "/uploads/zuser/" + image
+      : "/img/user.png";
 };
 
 /*
@@ -1262,10 +1258,10 @@ Util.array_to_arraypg = (arr = []) => {
 
 Util.userAvatar = (img = "") => {
   return img
-    ? img.includes("http")
-      ? img
-      : `/uploads/user/${img}`
-    : `/img/user.png`;
+      ? img.includes("http")
+          ? img
+          : `/uploads/user/${img}`
+      : `/img/user.png`;
 };
 
 /*
@@ -1306,7 +1302,7 @@ Util.selectParser = (fields = [], MYMODEL = {}) => {
 Util.fieldWithTable = (field, MYMODEL, isWhere = false) => {
   let name = "";
   let joinList =
-    MYMODEL.joins && MYMODEL.joins.list.length > 0 ? MYMODEL.joins.list : [];
+      MYMODEL.joins && MYMODEL.joins.list.length > 0 ? MYMODEL.joins.list : [];
   if (joinList.length > 0) {
     if (joinList.includes(field)) {
       let split = field.split("___");
@@ -1326,8 +1322,8 @@ Util.fieldWithTable = (field, MYMODEL, isWhere = false) => {
 
 Util.tableWithJoin = (MYMODEL) => {
   return MYMODEL.joins && MYMODEL.joins.list.length > 0
-    ? MYMODEL.joins.sql
-    : [];
+      ? MYMODEL.joins.sql
+      : [];
 };
 
 Util.selectMysql = (fields = [], relations = {}) => {
@@ -1383,10 +1379,10 @@ Util.sortArray = (arr, key) => {
 
 Util.cleanString = (str = "") => {
   return str
-    .replaceAll("(", "")
-    .replaceAll(")", "")
-    .replaceAll("%", "")
-    .replaceAll("-", "");
+      .replaceAll("(", "")
+      .replaceAll(")", "")
+      .replaceAll("%", "")
+      .replaceAll("-", "");
 };
 
 Util.encrypt = (str, key) => {
@@ -1444,17 +1440,17 @@ Util.terbilang = (nilai) => {
   } else if (nilai < 1000000000) {
     bagi = Math.floor(nilai / 1000000);
     penyimpanan =
-      Util.terbilang(bagi) + " Juta" + Util.terbilang(nilai % 1000000);
+        Util.terbilang(bagi) + " Juta" + Util.terbilang(nilai % 1000000);
   } else if (nilai < 1000000000000) {
     bagi = Math.floor(nilai / 1000000000);
     penyimpanan =
-      Util.terbilang(bagi) + " Miliar" + Util.terbilang(nilai % 1000000000);
+        Util.terbilang(bagi) + " Miliar" + Util.terbilang(nilai % 1000000000);
   } else if (nilai < 1000000000000000) {
     bagi = Math.floor(nilai / 1000000000000);
     penyimpanan =
-      Util.terbilang(nilai / 1000000000000) +
-      " Triliun" +
-      Util.terbilang(nilai % 1000000000000);
+        Util.terbilang(nilai / 1000000000000) +
+        " Triliun" +
+        Util.terbilang(nilai % 1000000000000);
   }
   return penyimpanan;
 };
@@ -1499,12 +1495,12 @@ Util.tableShowInGrid = (arr, qey, MYMODEL, myCache, companyId) => {
                 value = value ? mywidget[key].fields[value] : "";
               } else if (mywidget[key].name == "relation") {
                 value = value
-                  ? Util.array_id_to_zname(
-                      myCache.get(
-                        `${mywidget[key].table}_${MYMODEL.widgets[qey].table}___${key}_${companyId}`
-                      )
+                    ? Util.array_id_to_zname(
+                        myCache.get(
+                            `${mywidget[key].table}_${MYMODEL.widgets[qey].table}___${key}_${companyId}`
+                        )
                     )[value]
-                  : "";
+                    : "";
               } else {
                 if (Util.isNumeric(value)) {
                   value = Util.formatNumber(value, ".");

package/lib/zRoute.js

@@ -1447,7 +1447,7 @@ zRoute.resetPassword = async (req, res) => {
 zRoute.loginAuth = async (username, fields) => {
   let results = await connection.results({
     table: "zuser",
-    where: { username: username },
+    where: { email: username },
   });
   if (results.length) {
     await connection.update({

package/package.json

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