blixify-ui-web 0.1.172 → 0.1.174

package/lib/components/data/dataTemplate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/data/dataTemplate/index.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAMN,MAAM,OAAO,CAAC;AAkBf,OAAO,EAAE,MAAM,EAAU,MAAM,oBAAoB,CAAC;AAKpD,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAavD,OAAO,EAAS,IAAI,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAmB,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEpE,UAAU,QAAQ;IAChB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,EAAE,CAAC;IACpC,YAAY,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,EAAE,CAAC;IACvD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAC/C,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9E,2BAA2B,CAAC,EAAE,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,IAAI,CAAC,EAAE,MAAM,KACV,MAAM,EAAE,CAAC;IACd,2BAA2B,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;CAC9C;AAED,UAAU,IAAI;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,KAAM,SAAQ,SAAS;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,IAAI,EAAE,GAAG,CAAC;QACV,MAAM,EAAE,GAAG,CAAC;QACZ,UAAU,EAAE,GAAG,CAAC;QAChB,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB,CAAC;IACF,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACzB;AAoCD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,qBAgzGxC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/data/dataTemplate/index.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAMN,MAAM,OAAO,CAAC;AAkBf,OAAO,EAAE,MAAM,EAAU,MAAM,oBAAoB,CAAC;AAKpD,OAAO,EAAQ,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAavD,OAAO,EAAS,IAAI,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAmB,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAEpE,UAAU,QAAQ;IAChB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,EAAE,CAAC;IACpC,YAAY,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,EAAE,CAAC;IACvD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAC/C,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9E,2BAA2B,CAAC,EAAE,CAC5B,OAAO,CAAC,EAAE,MAAM,EAChB,gBAAgB,CAAC,EAAE,OAAO,EAC1B,IAAI,CAAC,EAAE,MAAM,KACV,MAAM,EAAE,CAAC;IACd,2BAA2B,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;CAC9C;AAED,UAAU,IAAI;IACZ,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,KAAM,SAAQ,SAAS;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,QAAQ,CAAC,EAAE,GAAG,CAAC;QACf,YAAY,CAAC,EAAE,GAAG,CAAC;QACnB,IAAI,EAAE,GAAG,CAAC;QACV,MAAM,EAAE,GAAG,CAAC;QACZ,UAAU,EAAE,GAAG,CAAC;QAChB,UAAU,CAAC,EAAE,GAAG,CAAC;KAClB,CAAC;IACF,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACzB;AAoCD,wBAAgB,YAAY,CAAC,KAAK,EAAE,KAAK,qBAq3GxC"}

package/lib/components/data/dataTemplate/index.js

@@ -139,7 +139,7 @@ var queryTableHeader = [
 ];
 function DataTemplate(props) {
     var _this = this;
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     var formRef = (0, react_1.createRef)();
     var objectFormRef = (0, react_1.createRef)();
     var modalFormInputRefs = props.model.map(function () { return (0, react_1.createRef)(); });
@@ -150,64 +150,64 @@ function DataTemplate(props) {
     var readQueryHocRef = (0, react_1.useRef)();
     var listRQueryHocRef = (0, react_1.useRef)();
     var typingTimeout = (0, react_1.useRef)();
-    var _r = (0, react_1.useState)(false), loading = _r[0], setLoading = _r[1];
-    var _s = (0, react_1.useState)(), notification = _s[0], setNotification = _s[1];
+    var _s = (0, react_1.useState)(false), loading = _s[0], setLoading = _s[1];
+    var _t = (0, react_1.useState)(), notification = _t[0], setNotification = _t[1];
     //INFO : Used by List
-    var _t = (0, react_1.useState)(""), filterSearch = _t[0], setFilterSearch = _t[1];
-    var _u = (0, react_1.useState)(""), filterSearchParams = _u[0], setFilterSearchParams = _u[1];
-    var _v = (0, react_1.useState)(""), filterSelection = _v[0], setFilterSelection = _v[1];
-    var _w = (0, react_1.useState)(""), filterReference = _w[0], setFilterReference = _w[1];
-    var _x = (0, react_1.useState)(""), filterReferenceSearch = _x[0], setFilterReferenceSearch = _x[1];
-    var _y = (0, react_1.useState)([]), filterReferenceList = _y[0], setFilterReferenceList = _y[1];
-    var _z = (0, react_1.useState)({
+    var _u = (0, react_1.useState)(""), filterSearch = _u[0], setFilterSearch = _u[1];
+    var _v = (0, react_1.useState)(""), filterSearchParams = _v[0], setFilterSearchParams = _v[1];
+    var _w = (0, react_1.useState)(""), filterSelection = _w[0], setFilterSelection = _w[1];
+    var _x = (0, react_1.useState)(""), filterReference = _x[0], setFilterReference = _x[1];
+    var _y = (0, react_1.useState)(""), filterReferenceSearch = _y[0], setFilterReferenceSearch = _y[1];
+    var _z = (0, react_1.useState)([]), filterReferenceList = _z[0], setFilterReferenceList = _z[1];
+    var _0 = (0, react_1.useState)({
         startDate: undefined,
         endDate: undefined,
-    }), filterReferenceDate = _z[0], setFilterReferenceDate = _z[1];
-    var _0 = (0, react_1.useState)(true), tableLoading = _0[0], setTableLoading = _0[1];
-    var _1 = (0, react_1.useState)(""), cursor = _1[0], setCursor = _1[1];
-    var _2 = (0, react_1.useState)(""), lastCursor = _2[0], setLastCursor = _2[1];
-    var _3 = (0, react_1.useState)([]), tableData = _3[0], setTableData = _3[1];
-    var _4 = (0, react_1.useState)([]), spaceTableData = _4[0], setSpaceTableData = _4[1];
-    var _5 = (0, react_1.useState)(0), size = _5[0], setSize = _5[1];
-    var _6 = (0, react_1.useState)(0), pageIndex = _6[0], setPageIndex = _6[1];
-    var _7 = (0, react_1.useState)([]), selectedIds = _7[0], setSelectedIds = _7[1];
-    var _8 = (0, react_1.useState)(false), selectAll = _8[0], setSelectAll = _8[1];
-    var _9 = (0, react_1.useState)(""), deletePasscode = _9[0], setDeletePasscode = _9[1];
-    var _10 = (0, react_1.useState)(""), deletePasscodeInput = _10[0], setDeletePasscodeInput = _10[1];
+    }), filterReferenceDate = _0[0], setFilterReferenceDate = _0[1];
+    var _1 = (0, react_1.useState)(true), tableLoading = _1[0], setTableLoading = _1[1];
+    var _2 = (0, react_1.useState)(""), cursor = _2[0], setCursor = _2[1];
+    var _3 = (0, react_1.useState)(""), lastCursor = _3[0], setLastCursor = _3[1];
+    var _4 = (0, react_1.useState)([]), tableData = _4[0], setTableData = _4[1];
+    var _5 = (0, react_1.useState)([]), spaceTableData = _5[0], setSpaceTableData = _5[1];
+    var _6 = (0, react_1.useState)(0), size = _6[0], setSize = _6[1];
+    var _7 = (0, react_1.useState)(0), pageIndex = _7[0], setPageIndex = _7[1];
+    var _8 = (0, react_1.useState)([]), selectedIds = _8[0], setSelectedIds = _8[1];
+    var _9 = (0, react_1.useState)(false), selectAll = _9[0], setSelectAll = _9[1];
+    var _10 = (0, react_1.useState)(""), deletePasscode = _10[0], setDeletePasscode = _10[1];
+    var _11 = (0, react_1.useState)(""), deletePasscodeInput = _11[0], setDeletePasscodeInput = _11[1];
     //INFO : Used by List Organise
-    var _11 = (0, react_1.useState)(false), sortModal = _11[0], setSortModal = _11[1];
-    var _12 = (0, react_1.useState)(false), filterModal = _12[0], setFilterModal = _12[1];
-    var _13 = (0, react_1.useState)(false), addTabModal = _13[0], setAddTabModal = _13[1];
-    var _14 = (0, react_1.useState)(false), queryForm = _14[0], setQueryForm = _14[1];
-    var _15 = (0, react_1.useState)(false), batchUpdateModal = _15[0], setBatchUpdateModal = _15[1];
-    var _16 = (0, react_1.useState)({
+    var _12 = (0, react_1.useState)(false), sortModal = _12[0], setSortModal = _12[1];
+    var _13 = (0, react_1.useState)(false), filterModal = _13[0], setFilterModal = _13[1];
+    var _14 = (0, react_1.useState)(false), addTabModal = _14[0], setAddTabModal = _14[1];
+    var _15 = (0, react_1.useState)(false), queryForm = _15[0], setQueryForm = _15[1];
+    var _16 = (0, react_1.useState)(false), batchUpdateModal = _16[0], setBatchUpdateModal = _16[1];
+    var _17 = (0, react_1.useState)({
         columnId: "",
         columnData: {},
-    }), batchUpdateData = _16[0], setBatchUpdateData = _16[1];
+    }), batchUpdateData = _17[0], setBatchUpdateData = _17[1];
     //INFO : Used by Export
-    var _17 = (0, react_1.useState)(null), csvFile = _17[0], setCSVFile = _17[1];
-    var _18 = (0, react_1.useState)([]), csvFileData = _18[0], setCSVFileData = _18[1];
-    var _19 = (0, react_1.useState)(0), stepCSVIndex = _19[0], setStepCSVIndex = _19[1];
-    var _20 = (0, react_1.useState)({}), listCSVMapAttribute = _20[0], setListCSVMapAttribute = _20[1];
-    var _21 = (0, react_1.useState)({}), listCSVObjAttribute = _21[0], setListCSVObjAttribute = _21[1];
-    var _22 = (0, react_1.useState)([]), csvAPIAttribute = _22[0], setCSVAPIAttribute = _22[1];
-    var _23 = (0, react_1.useState)([]), importTableData = _23[0], setImportTableData = _23[1];
-    var _24 = (0, react_1.useState)(""), exportLink = _24[0], setExportLink = _24[1];
-    var _25 = (0, react_1.useState)([]), queryList = _25[0], setQueryList = _25[1];
-    var _26 = (0, react_1.useState)(-1), queryIndex = _26[0], setQueryIndex = _26[1];
+    var _18 = (0, react_1.useState)(null), csvFile = _18[0], setCSVFile = _18[1];
+    var _19 = (0, react_1.useState)([]), csvFileData = _19[0], setCSVFileData = _19[1];
+    var _20 = (0, react_1.useState)(0), stepCSVIndex = _20[0], setStepCSVIndex = _20[1];
+    var _21 = (0, react_1.useState)({}), listCSVMapAttribute = _21[0], setListCSVMapAttribute = _21[1];
+    var _22 = (0, react_1.useState)({}), listCSVObjAttribute = _22[0], setListCSVObjAttribute = _22[1];
+    var _23 = (0, react_1.useState)([]), csvAPIAttribute = _23[0], setCSVAPIAttribute = _23[1];
+    var _24 = (0, react_1.useState)([]), importTableData = _24[0], setImportTableData = _24[1];
+    var _25 = (0, react_1.useState)(""), exportLink = _25[0], setExportLink = _25[1];
+    var _26 = (0, react_1.useState)([]), queryList = _26[0], setQueryList = _26[1];
+    var _27 = (0, react_1.useState)(-1), queryIndex = _27[0], setQueryIndex = _27[1];
     //INFO : Used by Read
     //INFO : Used by Update
-    var _27 = (0, react_1.useState)(false), modalVisible = _27[0], setModalVisible = _27[1];
-    var _28 = (0, react_1.useState)(false), deleteModal = _28[0], setDeleteModal = _28[1];
-    var _29 = (0, react_1.useState)(false), excelModal = _29[0], setExcelModal = _29[1];
-    var _30 = (0, react_1.useState)(false), exportExcel = _30[0], setExportExcel = _30[1];
-    var _31 = (0, react_1.useState)({}), selectedData = _31[0], setSelectedData = _31[1];
-    var _32 = (0, react_1.useState)(""), selectedObjectStructureId = _32[0], setSelectedObjectStructureId = _32[1];
-    var _33 = (0, react_1.useState)(""), selectedObjectId = _33[0], setSelectedObjectId = _33[1];
-    var _34 = (0, react_1.useState)({}), selectedObjectData = _34[0], setSelectedObjectData = _34[1];
-    var _35 = (0, react_1.useState)(false), referenceLoading = _35[0], setReferenceLoading = _35[1];
-    var _36 = (0, react_1.useState)({}), referencesOptions = _36[0], setReferencesOptions = _36[1];
-    var _37 = (0, react_1.useState)({}), referenceModelSchema = _37[0], setReferenceSchema = _37[1];
+    var _28 = (0, react_1.useState)(false), modalVisible = _28[0], setModalVisible = _28[1];
+    var _29 = (0, react_1.useState)(false), deleteModal = _29[0], setDeleteModal = _29[1];
+    var _30 = (0, react_1.useState)(false), excelModal = _30[0], setExcelModal = _30[1];
+    var _31 = (0, react_1.useState)(false), exportExcel = _31[0], setExportExcel = _31[1];
+    var _32 = (0, react_1.useState)({}), selectedData = _32[0], setSelectedData = _32[1];
+    var _33 = (0, react_1.useState)(""), selectedObjectStructureId = _33[0], setSelectedObjectStructureId = _33[1];
+    var _34 = (0, react_1.useState)(""), selectedObjectId = _34[0], setSelectedObjectId = _34[1];
+    var _35 = (0, react_1.useState)({}), selectedObjectData = _35[0], setSelectedObjectData = _35[1];
+    var _36 = (0, react_1.useState)(false), referenceLoading = _36[0], setReferenceLoading = _36[1];
+    var _37 = (0, react_1.useState)({}), referencesOptions = _37[0], setReferencesOptions = _37[1];
+    var _38 = (0, react_1.useState)({}), referenceModelSchema = _38[0], setReferenceSchema = _38[1];
     var devSettings = props.devSettings;
     var serverId = devSettings.server === "mongoServer" ? "_id" : "id";
     var isEditor = ((_a = props.edit) === null || _a === void 0 ? void 0 : _a.allEditable) ? true : false;
@@ -219,8 +219,9 @@ function DataTemplate(props) {
         dbEndpoint: devSettings.dbEndpoint,
     });
     var debug = ((_e = props.organise) === null || _e === void 0 ? void 0 : _e.handleNavigate) ? true : false;
+    var showId = (_f = props.space) === null || _f === void 0 ? void 0 : _f.showId;
     var moreButtonPopUp = [
-        ((_f = props.edit) === null || _f === void 0 ? void 0 : _f.allEditable)
+        ((_g = props.edit) === null || _g === void 0 ? void 0 : _g.allEditable)
             ? {
                 text: "Import Excel",
                 onClick: function () {
@@ -237,7 +238,7 @@ function DataTemplate(props) {
             },
         },
     ].filter(Boolean);
-    if ((_g = props.organise) === null || _g === void 0 ? void 0 : _g.moreSettings)
+    if ((_h = props.organise) === null || _h === void 0 ? void 0 : _h.moreSettings)
         moreButtonPopUp = moreButtonPopUp.concat(props.organise.moreSettings);
     (0, react_1.useEffect)(function () {
         switch (props.type) {
@@ -350,7 +351,7 @@ function DataTemplate(props) {
                             if (filterSearchParams)
                                 newTableData = dataList;
                             else {
-                                isExists = tableData.find(function (eachData) { return eachData.id === dataList[0].id; });
+                                isExists = tableData.find(function (eachData) { var _a; return eachData.id === ((_a = dataList === null || dataList === void 0 ? void 0 : dataList[0]) === null || _a === void 0 ? void 0 : _a.id); });
                                 newTableData = isExists ? dataList : tableData.concat(dataList);
                             }
                             setTableData(newTableData);
@@ -488,16 +489,28 @@ function DataTemplate(props) {
         handlePopUpModal(false);
     };
     //TODO: Bug, try to solve clicking List Object too fast
-    var handleSelectListObjectData = function (id, structureId) {
+    var handleSelectListObjectData = function (id, structureId, objectIndex) {
+        var _a;
         var filterObjectModel = props.model.find(function (eachModel) {
             return eachModel.id === structureId;
         });
         if ((filterObjectModel === null || filterObjectModel === void 0 ? void 0 : filterObjectModel.type) === "listObject") {
             var selectedObjectListData = selectedData[structureId].find(function (eachData) { return eachData.id === id; });
-            setSelectedObjectId(id);
-            setSelectedObjectStructureId(structureId);
-            setSelectedObjectData(selectedObjectListData);
-            setModalVisible(true);
+            if (selectedObjectListData) {
+                setSelectedObjectId(id);
+                setSelectedObjectStructureId(structureId);
+                setSelectedObjectData(selectedObjectListData);
+                setModalVisible(true);
+            }
+            else {
+                var selectedObjectListData_1 = (_a = selectedData === null || selectedData === void 0 ? void 0 : selectedData[structureId]) === null || _a === void 0 ? void 0 : _a[objectIndex !== null && objectIndex !== void 0 ? objectIndex : 0];
+                if (selectedObjectListData_1) {
+                    setSelectedObjectId(selectedObjectListData_1.id);
+                    setSelectedObjectStructureId(structureId);
+                    setSelectedObjectData(selectedObjectListData_1);
+                    setModalVisible(true);
+                }
+            }
         }
     };
     //=====================================================================================
@@ -1072,7 +1085,7 @@ function DataTemplate(props) {
                 case 1:
                     createSelectedData_1 = _c.sent();
                     uniqueDataStructure = props.model.filter(function (eachStructure) {
-                        return eachStructure.unique;
+                        return eachStructure.unique && eachStructure.id !== "id";
                     });
                     uniqueColumnId = uniqueDataStructure.length > 0 ? uniqueDataStructure[0].id : undefined;
                     res = "";
@@ -1269,7 +1282,7 @@ function DataTemplate(props) {
     var handleOnChangeFile = function (e) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         clonedData[e.target.id] =
             e.target.files.length > 0 ? e.target.files[0] : undefined;
         handleUpdateChangeData(clonedData);
@@ -1277,7 +1290,7 @@ function DataTemplate(props) {
     var handleOnChangeFiles = function (id, value, action) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         var previousData = clonedData[id] && clonedData[id]["data"] ? clonedData[id]["data"] : [];
         var previousUploadData = clonedData[id] && clonedData[id]["upload"]
             ? clonedData[id]["upload"]
@@ -1326,35 +1339,35 @@ function DataTemplate(props) {
     var handleOnChangeAddress = function (id, address) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         clonedData[id] = address;
         handleUpdateChangeData(clonedData);
     };
     var handleOnChangeText = function (e) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         clonedData[e.target.id] = e.target.value;
         handleUpdateChangeData(clonedData);
     };
     var handleOnChangeSelect = function (id, value) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         clonedData[id] = value;
         handleUpdateChangeData(clonedData);
     };
     var handleOnChangeDate = function (id, value) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         clonedData[id] = value;
         handleUpdateChangeData(clonedData);
     };
     var handleOnChangeMarkdown = function (id, value) {
         var _a, _b;
         var _c = handleOnChangeData(), data = _c.data, model = _c.model;
-        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
+        var clonedData = (0, display_1.handleClonedDataAttribute)(data, model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
         clonedData[id] = value;
         handleUpdateChangeData(clonedData);
     };
@@ -1830,8 +1843,10 @@ function DataTemplate(props) {
         var _a;
         var detailList = [];
         var _loop_2 = function (eachKey, eachValue) {
-            if (eachKey !== "id" &&
-                eachKey !== "_id" &&
+            var showIdCondition = showId
+                ? true
+                : eachKey !== "id" && eachKey !== "_id";
+            if (showIdCondition &&
                 eachKey !== "baseUpdatedAt" &&
                 eachKey !== "baseDraft") {
                 var filterModel = props.model.find(function (eachAttribute) {
@@ -1851,15 +1866,19 @@ function DataTemplate(props) {
     };
     var renderListObject = function (type) {
         var _a, _b;
+        var listElement = [];
         var isListObject = props.model.filter(function (eachAttribute) { return eachAttribute.type === "listObject"; });
         var list = {};
-        var clonedSelectedData = (0, display_1.handleClonedDataAttribute)(selectedData, props.model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer");
-        return isListObject.map(function (eachListObject) {
-            var _a;
+        var clonedSelectedData = (0, display_1.handleClonedDataAttribute)(selectedData, props.model, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", false, showId ? true : false);
+        isListObject.map(function (eachListObject) {
+            var _a, _b;
             if (clonedSelectedData[eachListObject.id] &&
                 Array.isArray(clonedSelectedData[eachListObject.id])) {
+                var checkIdExists_1 = (_a = eachListObject === null || eachListObject === void 0 ? void 0 : eachListObject.objectData) === null || _a === void 0 ? void 0 : _a.some(function (eachAttribute) {
+                    return eachAttribute.id === "id";
+                });
                 clonedSelectedData[eachListObject.id].map(function (eachObject) {
-                    var _a;
+                    var _a, _b;
                     var eachNewList = {
                         id: "",
                         title: "",
@@ -1894,44 +1913,53 @@ function DataTemplate(props) {
                                     if (referencesOptions[eachListObject.id + "." + model.id]) {
                                         var selectedReferences = referencesOptions[eachListObject.id + "." + model.id].find(function (eachOption) { return eachOption.key === eachValue; });
                                         eachNewList[eachKey] =
-                                            (model === null || model === void 0 ? void 0 : model.name) +
-                                                " : " +
-                                                (eachValue ? (_a = selectedReferences === null || selectedReferences === void 0 ? void 0 : selectedReferences.label) !== null && _a !== void 0 ? _a : " - " : " ");
+                                            (model === null || model === void 0 ? void 0 : model.name) === "id"
+                                                ? (model === null || model === void 0 ? void 0 : model.name) +
+                                                    " : " +
+                                                    (eachValue ? (_a = selectedReferences === null || selectedReferences === void 0 ? void 0 : selectedReferences.label) !== null && _a !== void 0 ? _a : " - " : " ")
+                                                : eachValue
+                                                    ? (_b = selectedReferences === null || selectedReferences === void 0 ? void 0 : selectedReferences.label) !== null && _b !== void 0 ? _b : " - "
+                                                    : " ";
                                     }
                                     break;
                                 case "date":
+                                    var timeStamp = (props.devSettings.server === "fbServer" ||
+                                        props.devSettings.server === "firebase") &&
+                                        (eachValue === null || eachValue === void 0 ? void 0 : eachValue["_seconds"])
+                                        ? (eachValue === null || eachValue === void 0 ? void 0 : eachValue["_seconds"]) * 1000
+                                        : eachValue;
                                     eachNewList[eachKey] =
                                         (model === null || model === void 0 ? void 0 : model.name) +
                                             " : " +
-                                            (0, display_1.renderEachRowDataBasedOnDataType)(eachValue);
+                                            (0, moment_1.default)(timeStamp).format("DD/MM/YYYY h:mm a");
                                     break;
                                 case "address":
                                 case "object":
                                     break;
                                 default:
-                                    if (eachKey === "id" && typeof eachValue === "string") {
+                                    if (eachKey === "id" && typeof eachValue === "string")
                                         eachNewList[eachKey] = eachValue;
-                                    }
-                                    else {
+                                    else
                                         eachNewList[eachKey] = (model === null || model === void 0 ? void 0 : model.name) + " : " + eachValue;
-                                    }
                                     break;
                             }
                         }
                     };
-                    for (var _i = 0, _b = Object.entries(eachObject); _i < _b.length; _i++) {
-                        var _c = _b[_i], eachKey = _c[0], eachValue = _c[1];
+                    for (var _i = 0, _c = Object.entries(eachObject); _i < _c.length; _i++) {
+                        var _d = _c[_i], eachKey = _d[0], eachValue = _d[1];
                         _loop_3(eachKey, eachValue);
                     }
-                    if (list[eachListObject.id]) {
-                        list[eachListObject.id].push(eachNewList);
+                    if (!checkIdExists_1) {
+                        delete eachNewList["id"];
+                        delete eachNewList["_id"];
                     }
-                    else {
+                    if (list === null || list === void 0 ? void 0 : list[eachListObject.id])
+                        list[eachListObject.id].push(eachNewList);
+                    else
                         list[eachListObject.id] = [eachNewList];
-                    }
                     return null;
                 });
-                return (react_1.default.createElement(react_1.default.Fragment, null, !list[eachListObject.id] && type === "update" ? (react_1.default.createElement("button", { type: "button", className: "relative block w-full p-12 mt-5 text-center border-2 border-gray-300 border-dashed rounded-lg", onClick: function () {
+                listElement.push(react_1.default.createElement(react_1.default.Fragment, null, !list[eachListObject.id] && type === "update" ? (react_1.default.createElement("button", { type: "button", className: "relative block w-full p-12 mt-5 text-center border-2 border-gray-300 border-dashed rounded-lg", onClick: function () {
                         setSelectedObjectStructureId(eachListObject.id);
                         handlePopUpModal(true);
                     } },
@@ -1945,15 +1973,13 @@ function DataTemplate(props) {
                                 setSelectedObjectStructureId(eachListObject.id);
                                 handlePopUpModal(true);
                             } }))),
-                    react_1.default.createElement(list_1.List, { className: "mt-5", list: (_a = list[eachListObject.id]) !== null && _a !== void 0 ? _a : [], loading: false, onClickRow: function (id) {
-                            if (id)
-                                handleSelectListObjectData(id, eachListObject.id);
+                    react_1.default.createElement(list_1.List, { className: "mt-5", list: (_b = list[eachListObject.id]) !== null && _b !== void 0 ? _b : [], showId: checkIdExists_1, loading: false, onClickRow: function (id, index) {
+                            handleSelectListObjectData(id, eachListObject.id, index);
                         } })))))));
             }
-            else {
-                return react_1.default.createElement(react_1.default.Fragment, null);
-            }
+            return null;
         });
+        return listElement;
     };
     var renderContent = function () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
@@ -2314,6 +2340,7 @@ function DataTemplate(props) {
             isObjectList: isObjectList,
             lib: { axios: (_a = props.lib) === null || _a === void 0 ? void 0 : _a.axios },
             type: props.type,
+            showId: showId,
         }, {
             dbModule: dbModule,
             server: (_b = devSettings.server) !== null && _b !== void 0 ? _b : "mongoServer",
@@ -2393,7 +2420,7 @@ function DataTemplate(props) {
         });
         if (viewType === "general") {
             if (dataType === "list") {
-                return (react_1.default.createElement(table_1.Table, { paginationType: devSettings.server === "mongoServer" ? "page" : "cursor", data: tableData, space: props.space, spaceData: spaceTableData, size: size, limit: limit, cursor: cursor, loading: tableLoading, checkbox: isEditor ? true : false, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", multiActionButton: react_1.default.createElement("div", { className: "flex flex-row space-x-3" },
+                return (react_1.default.createElement(table_1.Table, { showId: showId, paginationType: devSettings.server === "mongoServer" ? "page" : "cursor", data: tableData, space: props.space, spaceData: spaceTableData, size: size, limit: limit, cursor: cursor, loading: tableLoading, checkbox: isEditor ? true : false, selectAll: selectAll, selectedIds: selectedIds, selectAllText: selectAll ? "from filter" : "", multiActionButton: react_1.default.createElement("div", { className: "flex flex-row space-x-3" },
                         react_1.default.createElement(textButton_1.TextButton, { className: "text-sm text-red-500 hover:text-red-600", text: "Delete", onClick: function () {
                                 handleGenerateDeletePasscode();
                                 setDeleteModal(true);
@@ -2585,10 +2612,16 @@ function DataTemplate(props) {
                                 var _a;
                                 return __generator(this, function (_b) {
                                     switch (_b.label) {
-                                        case 0: return [4 /*yield*/, ((_a = objectFormRef.current) === null || _a === void 0 ? void 0 : _a.handleSubmit())];
+                                        case 0:
+                                            if (!(props.type === "update")) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, ((_a = objectFormRef.current) === null || _a === void 0 ? void 0 : _a.handleSubmit())];
                                         case 1:
                                             _b.sent();
-                                            return [2 /*return*/];
+                                            return [3 /*break*/, 3];
+                                        case 2:
+                                            handlePopUpModal(false);
+                                            _b.label = 3;
+                                        case 3: return [2 /*return*/];
                                     }
                                 });
                             }); } }))));
@@ -2700,17 +2733,17 @@ function DataTemplate(props) {
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
         renderNotification("root"),
-        react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), lib: { Dialog: (_h = props.lib) === null || _h === void 0 ? void 0 : _h.Dialog, Transition: (_j = props.lib) === null || _j === void 0 ? void 0 : _j.Transition }, renderContent: renderModalContent, onClose: function () {
+        react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), lib: { Dialog: (_j = props.lib) === null || _j === void 0 ? void 0 : _j.Dialog, Transition: (_k = props.lib) === null || _k === void 0 ? void 0 : _k.Transition }, renderContent: renderModalContent, onClose: function () {
                 if (queryForm)
                     handleViewQuery(-1);
                 else
                     handlePopUpModal(false);
             }, notification: react_1.default.createElement(react_1.default.Fragment, null, renderNotification("modal")) }),
-        react_1.default.createElement(modal_1.Modal, { open: deleteModal, lib: { Dialog: (_k = props.lib) === null || _k === void 0 ? void 0 : _k.Dialog, Transition: (_l = props.lib) === null || _l === void 0 ? void 0 : _l.Transition }, renderContent: renderDeleteModalContent, onClose: function () {
+        react_1.default.createElement(modal_1.Modal, { open: deleteModal, lib: { Dialog: (_l = props.lib) === null || _l === void 0 ? void 0 : _l.Dialog, Transition: (_m = props.lib) === null || _m === void 0 ? void 0 : _m.Transition }, renderContent: renderDeleteModalContent, onClose: function () {
                 setDeletePasscodeInput("");
                 setDeleteModal(!deleteModal);
             }, notification: react_1.default.createElement(react_1.default.Fragment, null, renderNotification("modal")) }),
-        react_1.default.createElement(modal_1.Modal, { open: batchUpdateModal, lib: { Dialog: (_m = props.lib) === null || _m === void 0 ? void 0 : _m.Dialog, Transition: (_o = props.lib) === null || _o === void 0 ? void 0 : _o.Transition }, renderContent: renderBatchUpdateModalContent, onClose: function () {
+        react_1.default.createElement(modal_1.Modal, { open: batchUpdateModal, lib: { Dialog: (_o = props.lib) === null || _o === void 0 ? void 0 : _o.Dialog, Transition: (_p = props.lib) === null || _p === void 0 ? void 0 : _p.Transition }, renderContent: renderBatchUpdateModalContent, onClose: function () {
                 setBatchUpdateData({ columnId: "", columnData: {} });
                 setBatchUpdateModal(false);
             }, notification: react_1.default.createElement(react_1.default.Fragment, null, renderNotification("modal")) }),
@@ -2724,7 +2757,7 @@ function DataTemplate(props) {
                 type: "list",
                 query: renderSearchFilterConditions(),
                 cursor: renderCursor(),
-                sort: (_q = (_p = props.organise) === null || _p === void 0 ? void 0 : _p.sort) !== null && _q !== void 0 ? _q : undefined,
+                sort: (_r = (_q = props.organise) === null || _q === void 0 ? void 0 : _q.sort) !== null && _r !== void 0 ? _r : undefined,
                 limit: limit,
             }, onChangeData: handleGetListData, onError: handleGetItemError }),
         renderContent()));