blixify-ui-web 0.1.166 → 0.1.167

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

@@ -16,7 +16,7 @@ interface Organise {
     onChangeSort?: (value: Sort) => void;
     onChangeFilter?: (value: any) => void;
     onChangeTabs?: (value: ExtendedTabs[]) => void;
-    debugOnChangeType?: (type: string, selectedId?: string) => void;
+    handleNavigate?: (type: string, selectedId?: string, viewId?: string) => void;
     renderReferenceLabelOptions?: (spaceId?: string, includeReference?: boolean, type?: string) => Option[];
     renderReferenceSpaceOptions?: () => Option[];
 }

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,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,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,qBAywGxC"}
+{"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,qBAiwGxC"}

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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     var formRef = (0, react_1.createRef)();
     var objectFormRef = (0, react_1.createRef)();
     var modalFormInputRefs = props.model.map(function () { return (0, react_1.createRef)(); });
@@ -149,64 +149,64 @@ function DataTemplate(props) {
     var limit = props.limit ? props.limit : 10;
     var readQueryHocRef = (0, react_1.useRef)();
     var typingTimeout = (0, react_1.useRef)();
-    var _o = (0, react_1.useState)(false), loading = _o[0], setLoading = _o[1];
-    var _p = (0, react_1.useState)(), notification = _p[0], setNotification = _p[1];
+    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];
     //INFO : Used by List
-    var _q = (0, react_1.useState)(""), filterSearch = _q[0], setFilterSearch = _q[1];
-    var _r = (0, react_1.useState)(""), filterSearchParams = _r[0], setFilterSearchParams = _r[1];
-    var _s = (0, react_1.useState)(""), filterSelection = _s[0], setFilterSelection = _s[1];
-    var _t = (0, react_1.useState)(""), filterReference = _t[0], setFilterReference = _t[1];
-    var _u = (0, react_1.useState)(""), filterReferenceSearch = _u[0], setFilterReferenceSearch = _u[1];
-    var _v = (0, react_1.useState)([]), filterReferenceList = _v[0], setFilterReferenceList = _v[1];
-    var _w = (0, react_1.useState)({
+    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)({
         startDate: undefined,
         endDate: undefined,
-    }), filterReferenceDate = _w[0], setFilterReferenceDate = _w[1];
-    var _x = (0, react_1.useState)(true), tableLoading = _x[0], setTableLoading = _x[1];
-    var _y = (0, react_1.useState)(""), cursor = _y[0], setCursor = _y[1];
-    var _z = (0, react_1.useState)(""), lastCursor = _z[0], setLastCursor = _z[1];
-    var _0 = (0, react_1.useState)([]), tableData = _0[0], setTableData = _0[1];
-    var _1 = (0, react_1.useState)([]), spaceTableData = _1[0], setSpaceTableData = _1[1];
-    var _2 = (0, react_1.useState)(0), size = _2[0], setSize = _2[1];
-    var _3 = (0, react_1.useState)(0), pageIndex = _3[0], setPageIndex = _3[1];
-    var _4 = (0, react_1.useState)([]), selectedIds = _4[0], setSelectedIds = _4[1];
-    var _5 = (0, react_1.useState)(false), selectAll = _5[0], setSelectAll = _5[1];
-    var _6 = (0, react_1.useState)(""), deletePasscode = _6[0], setDeletePasscode = _6[1];
-    var _7 = (0, react_1.useState)(""), deletePasscodeInput = _7[0], setDeletePasscodeInput = _7[1];
+    }), 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];
     //INFO : Used by List Organise
-    var _8 = (0, react_1.useState)(false), sortModal = _8[0], setSortModal = _8[1];
-    var _9 = (0, react_1.useState)(false), filterModal = _9[0], setFilterModal = _9[1];
-    var _10 = (0, react_1.useState)(false), addTabModal = _10[0], setAddTabModal = _10[1];
-    var _11 = (0, react_1.useState)(false), queryForm = _11[0], setQueryForm = _11[1];
-    var _12 = (0, react_1.useState)(false), batchUpdateModal = _12[0], setBatchUpdateModal = _12[1];
-    var _13 = (0, react_1.useState)({
+    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)({
         columnId: "",
         columnData: {},
-    }), batchUpdateData = _13[0], setBatchUpdateData = _13[1];
+    }), batchUpdateData = _16[0], setBatchUpdateData = _16[1];
     //INFO : Used by Export
-    var _14 = (0, react_1.useState)(null), csvFile = _14[0], setCSVFile = _14[1];
-    var _15 = (0, react_1.useState)([]), csvFileData = _15[0], setCSVFileData = _15[1];
-    var _16 = (0, react_1.useState)(0), stepCSVIndex = _16[0], setStepCSVIndex = _16[1];
-    var _17 = (0, react_1.useState)({}), listCSVMapAttribute = _17[0], setListCSVMapAttribute = _17[1];
-    var _18 = (0, react_1.useState)({}), listCSVObjAttribute = _18[0], setListCSVObjAttribute = _18[1];
-    var _19 = (0, react_1.useState)([]), csvAPIAttribute = _19[0], setCSVAPIAttribute = _19[1];
-    var _20 = (0, react_1.useState)([]), importTableData = _20[0], setImportTableData = _20[1];
-    var _21 = (0, react_1.useState)(""), exportLink = _21[0], setExportLink = _21[1];
-    var _22 = (0, react_1.useState)([]), queryList = _22[0], setQueryList = _22[1];
-    var _23 = (0, react_1.useState)(-1), queryIndex = _23[0], setQueryIndex = _23[1];
+    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];
     //INFO : Used by Read
     //INFO : Used by Update
-    var _24 = (0, react_1.useState)(false), modalVisible = _24[0], setModalVisible = _24[1];
-    var _25 = (0, react_1.useState)(false), deleteModal = _25[0], setDeleteModal = _25[1];
-    var _26 = (0, react_1.useState)(false), excelModal = _26[0], setExcelModal = _26[1];
-    var _27 = (0, react_1.useState)(false), exportExcel = _27[0], setExportExcel = _27[1];
-    var _28 = (0, react_1.useState)({}), selectedData = _28[0], setSelectedData = _28[1];
-    var _29 = (0, react_1.useState)(""), selectedObjectStructureId = _29[0], setSelectedObjectStructureId = _29[1];
-    var _30 = (0, react_1.useState)(""), selectedObjectId = _30[0], setSelectedObjectId = _30[1];
-    var _31 = (0, react_1.useState)({}), selectedObjectData = _31[0], setSelectedObjectData = _31[1];
-    var _32 = (0, react_1.useState)(false), referenceLoading = _32[0], setReferenceLoading = _32[1];
-    var _33 = (0, react_1.useState)({}), referencesOptions = _33[0], setReferencesOptions = _33[1];
-    var _34 = (0, react_1.useState)({}), referenceModelSchema = _34[0], setReferenceSchema = _34[1];
+    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 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;
@@ -217,15 +217,17 @@ function DataTemplate(props) {
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
     });
-    var debug = ((_e = props.organise) === null || _e === void 0 ? void 0 : _e.debugOnChangeType) ? true : false;
+    var debug = ((_e = props.organise) === null || _e === void 0 ? void 0 : _e.handleNavigate) ? true : false;
     var moreButtonPopUp = [
-        {
-            text: "Import Excel",
-            onClick: function () {
-                setExcelModal(true);
-                setModalVisible(true);
-            },
-        },
+        ((_f = props.edit) === null || _f === void 0 ? void 0 : _f.allEditable)
+            ? {
+                text: "Import Excel",
+                onClick: function () {
+                    setExcelModal(true);
+                    setModalVisible(true);
+                },
+            }
+            : null,
         {
             text: "Export Excel",
             onClick: function () {
@@ -233,8 +235,8 @@ function DataTemplate(props) {
                 setModalVisible(true);
             },
         },
-    ];
-    if ((_f = props.organise) === null || _f === void 0 ? void 0 : _f.moreSettings)
+    ].filter(Boolean);
+    if ((_g = props.organise) === null || _g === void 0 ? void 0 : _g.moreSettings)
         moreButtonPopUp = moreButtonPopUp.concat(props.organise.moreSettings);
     (0, react_1.useEffect)(function () {
         switch (props.type) {
@@ -291,7 +293,7 @@ function DataTemplate(props) {
         }
     };
     var handleGetListData = function (responseData, type, rowId) { return __awaiter(_this, void 0, void 0, function () {
-        var dataList, prettierDataList, selectedIndex_1;
+        var dataList, prettierDataList, selectedIndex_1, newTableData;
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return __generator(this, function (_m) {
             switch (_m.label) {
@@ -299,7 +301,7 @@ function DataTemplate(props) {
                     dataList = [];
                     prettierDataList = [];
                     if (!responseData) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, display_1.handleListDataBasedOnModel)(responseData.data, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios, props.model, (_e = (_d = props.devSettings) === null || _d === void 0 ? void 0 : _d.imageEndpoint) !== null && _e !== void 0 ? _e : "", props.localURLEndpoint, props.collectionId, (_g = (_f = props.devSettings) === null || _f === void 0 ? void 0 : _f.dbEndpoint) !== null && _g !== void 0 ? _g : "", (_h = props.devSettings.organisationMembers) !== null && _h !== void 0 ? _h : [], handleNavigate, (_j = props.devSettings) === null || _j === void 0 ? void 0 : _j.bucketName, ((_k = props.organise) === null || _k === void 0 ? void 0 : _k.viewId) === "general", (_l = props.organise) === null || _l === void 0 ? void 0 : _l.debugOnChangeType)];
+                    return [4 /*yield*/, (0, display_1.handleListDataBasedOnModel)(responseData.data, (_b = (_a = props.devSettings) === null || _a === void 0 ? void 0 : _a.server) !== null && _b !== void 0 ? _b : "mongoServer", (_c = props.lib) === null || _c === void 0 ? void 0 : _c.axios, props.model, (_e = (_d = props.devSettings) === null || _d === void 0 ? void 0 : _d.imageEndpoint) !== null && _e !== void 0 ? _e : "", (_g = (_f = props.devSettings) === null || _f === void 0 ? void 0 : _f.dbEndpoint) !== null && _g !== void 0 ? _g : "", (_h = props.devSettings.organisationMembers) !== null && _h !== void 0 ? _h : [], (_j = props.organise) === null || _j === void 0 ? void 0 : _j.handleNavigate, (_k = props.devSettings) === null || _k === void 0 ? void 0 : _k.bucketName, ((_l = props.organise) === null || _l === void 0 ? void 0 : _l.viewId) === "general")];
                 case 1:
                     prettierDataList = _m.sent();
                     responseData.data.map(function (eachData) {
@@ -342,7 +344,11 @@ function DataTemplate(props) {
                             setSize(responseData.count);
                         }
                         else {
-                            setTableData(filterSearchParams ? dataList : dataList.concat(tableData));
+                            newTableData = filterSearchParams
+                                ? dataList
+                                : tableData.concat(dataList);
+                            setTableData(newTableData);
+                            setSize(newTableData.length);
                             setSpaceTableData(filterSearchParams
                                 ? dataList
                                 : spaceTableData.concat(prettierDataList));
@@ -375,6 +381,8 @@ function DataTemplate(props) {
         setTableData([]);
         setSpaceTableData([]);
         setPageIndex(0);
+        setCursor("");
+        setLastCursor("");
         setTableLoading(true);
     };
     var handleNameSearch = function (e) {
@@ -402,10 +410,8 @@ function DataTemplate(props) {
         setModalVisible(false);
         setLoading(false);
         if (props.type === "update" || props.type === "read") {
-            if ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType)
-                props.organise.debugOnChangeType("list", "");
-            else
-                handleNavigate();
+            if ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate)
+                props.organise.handleNavigate("list", "");
         }
         else {
             console.log("Data Retrieval Error - " + err.message);
@@ -909,11 +915,11 @@ function DataTemplate(props) {
     }); };
     var handleRemoveSelectedData = function () { return __awaiter(_this, void 0, void 0, function () {
         var selectedId, res, err_7;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
-                    _b.trys.push([0, 4, , 5]);
+                    _d.trys.push([0, 4, , 5]);
                     selectedId = props.id;
                     if (!selectedId) return [3 /*break*/, 3];
                     setLoading(true);
@@ -921,16 +927,18 @@ function DataTemplate(props) {
                     setDeleteModal(true);
                     return [4 /*yield*/, handleRemoveImage((_a = devSettings.bucketName) !== null && _a !== void 0 ? _a : "")];
                 case 1:
-                    _b.sent();
+                    _d.sent();
                     return [4 /*yield*/, writeServerQuery.call("delete", { id: selectedId })];
                 case 2:
-                    res = _b.sent();
-                    if (res)
-                        handleNavigate("".concat(props.localURLEndpoint, "?type=list&collection=").concat(props.collectionId, "&data=r"));
-                    _b.label = 3;
+                    res = _d.sent();
+                    if (res) {
+                        handleRefresh();
+                        (_c = (_b = props.organise) === null || _b === void 0 ? void 0 : _b.handleNavigate) === null || _c === void 0 ? void 0 : _c.call(_b, "list", "", "general");
+                    }
+                    _d.label = 3;
                 case 3: return [3 /*break*/, 5];
                 case 4:
-                    err_7 = _b.sent();
+                    err_7 = _d.sent();
                     setDeleteModal(false);
                     return [3 /*break*/, 5];
                 case 5:
@@ -998,7 +1006,7 @@ function DataTemplate(props) {
                         data: dataToSubmit_1,
                         query: [
                             {
-                                queryId: "_id",
+                                queryId: serverId,
                                 type: "in",
                                 value: selectedIds,
                             },
@@ -1033,7 +1041,7 @@ function DataTemplate(props) {
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    _c.trys.push([0, 11, , 12]);
+                    _c.trys.push([0, 14, , 15]);
                     selectedId = "";
                     if (type === "update")
                         selectedId = rowId !== null && rowId !== void 0 ? rowId : "";
@@ -1086,7 +1094,7 @@ function DataTemplate(props) {
                     res = _c.sent();
                     _c.label = 5;
                 case 5:
-                    if (!(type === "update" || type === "create")) return [3 /*break*/, 10];
+                    if (!(type === "update" || type === "create")) return [3 /*break*/, 11];
                     if (!res) return [3 /*break*/, 10];
                     if (!(type === "update")) return [3 /*break*/, 8];
                     if (!columnId) return [3 /*break*/, 7];
@@ -1107,8 +1115,25 @@ function DataTemplate(props) {
                 case 9:
                     _c.sent();
                     _c.label = 10;
-                case 10: return [2 /*return*/, res];
+                case 10: return [3 /*break*/, 13];
                 case 11:
+                    // INFO - ON NORMAL UPDATE AND CREATE
+                    createSelectedData_1[serverId] = id;
+                    return [4 /*yield*/, handleGetListData({ data: [createSelectedData_1] }, selectedId === "new" ? "create" : "update", id)];
+                case 12:
+                    _c.sent();
+                    setNotification({
+                        type: true,
+                        title: props.id === "new"
+                            ? "Created Successfully"
+                            : "Updated Successfully",
+                        msg: props.id === "new"
+                            ? "Data sucessfully created"
+                            : "Data sucessfully updated",
+                    });
+                    _c.label = 13;
+                case 13: return [2 /*return*/, res];
+                case 14:
                     err_9 = _c.sent();
                     if (err_9.response && err_9.response.status === 400) {
                         setNotification({
@@ -1117,23 +1142,23 @@ function DataTemplate(props) {
                             msg: err_9.response.data.err,
                         });
                     }
-                    return [3 /*break*/, 12];
-                case 12: return [2 /*return*/];
+                    return [3 /*break*/, 15];
+                case 15: return [2 /*return*/];
             }
         });
     }); };
     var handleSubmit = function () { return __awaiter(_this, void 0, void 0, function () {
         var res, err_10;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    _b.trys.push([0, 2, , 3]);
+                    _c.trys.push([0, 2, , 3]);
                     setLoading(true);
                     setModalVisible(true);
                     return [4 /*yield*/, handleSubmitData()];
                 case 1:
-                    res = _b.sent();
+                    res = _c.sent();
                     setModalVisible(false);
                     setLoading(false);
                     if (res) {
@@ -1141,17 +1166,12 @@ function DataTemplate(props) {
                             props.onComplete();
                         }
                         else {
-                            if (((_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType) && props.id !== "new") {
-                                props.organise.debugOnChangeType("list", "");
-                            }
-                            else
-                                handleNavigate("".concat(props.localURLEndpoint, "?type=list&collection=").concat(props.collectionId) +
-                                    (props.id === "new" ? "&data=r" : ""));
+                            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "list", "", "general");
                         }
                     }
                     return [3 /*break*/, 3];
                 case 2:
-                    err_10 = _b.sent();
+                    err_10 = _c.sent();
                     setModalVisible(false);
                     setLoading(false);
                     return [3 /*break*/, 3];
@@ -1624,25 +1644,9 @@ function DataTemplate(props) {
             setImportTableData([]);
         }
     };
-    var handleNavigate = function (link) {
-        var _a, _b, _c;
-        var href = link !== null && link !== void 0 ? link : "".concat(props.localURLEndpoint, "?type=list&collection=").concat(props.collectionId);
-        if ((_a = props.lib) === null || _a === void 0 ? void 0 : _a.navigateNext) {
-            props.lib.navigateNext.push(href);
-        }
-        else if ((_b = props.lib) === null || _b === void 0 ? void 0 : _b.navigate) {
-            (_c = props.lib) === null || _c === void 0 ? void 0 : _c.navigate(href);
-        }
-        else if (window) {
-            window.location.replace(href);
-        }
-    };
     var handleBreadcrumbNavigate = function () {
-        var _a;
-        if ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType)
-            props.organise.debugOnChangeType("list", "");
-        else
-            handleNavigate();
+        var _a, _b;
+        (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "list", "", "general");
     };
     //=====================================================================================
     //SECTION: Render CSV
@@ -1783,7 +1787,14 @@ function DataTemplate(props) {
             return pageIndex === 0 ? undefined : pageIndex * limit;
         }
         else {
-            return lastCursor ? undefined : lastCursor;
+            var selectedModel = props.model.find(function (eachModel) { var _a, _b; return eachModel.id === ((_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.sort) === null || _b === void 0 ? void 0 : _b.sortId); });
+            var cursor_1 = lastCursor;
+            switch (selectedModel === null || selectedModel === void 0 ? void 0 : selectedModel.type) {
+                case "date":
+                    cursor_1 = (0, moment_1.default)(cursor_1._seconds * 1000).toDate();
+                    break;
+            }
+            return lastCursor ? cursor_1 : undefined;
         }
     };
     var renderObjectTags = function (id) {
@@ -1915,7 +1926,8 @@ function DataTemplate(props) {
                                 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) {
-                            handleSelectListObjectData(id, eachListObject.id);
+                            if (id)
+                                handleSelectListObjectData(id, eachListObject.id);
                         } })))))));
             }
             else {
@@ -1924,7 +1936,7 @@ function DataTemplate(props) {
         });
     };
     var renderContent = function () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         var viewType = (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.viewId) !== null && _b !== void 0 ? _b : "general";
         var tabs = [
             {
@@ -2003,17 +2015,18 @@ function DataTemplate(props) {
                                 ((_g = props.edit) === null || _g === void 0 ? void 0 : _g.deleteBtn) && isEditor && (react_1.default.createElement("div", { className: "flex flex-col sm:flex-row" },
                                     react_1.default.createElement("div", { className: "w-full mt-5 ml-0 sm:mt-0 sm:ml-3" }, debug ? (react_1.default.createElement(button_1.Button, { text: "Update", className: "w-full", type: "normal", onClick: function () {
                                             var _a, _b;
-                                            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType) === null || _b === void 0 ? void 0 : _b.call(_a, "update", props.id);
+                                            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "update", props.id);
                                         } })) : (react_1.default.createElement(link_1.Link, { className: "w-full", href: "".concat(props.localURLEndpoint, "?data=").concat(props.id, "&type=update&collection=").concat(props.collectionId, "&view=general"), linkType: props.linkType, custom: props.custom },
                                         react_1.default.createElement(button_1.Button, { text: "Update", className: "w-full", type: "normal" })))),
                                     react_1.default.createElement(button_1.Button, { text: "Delete", className: "mt-3 ml-0 sm:mt-0 sm:ml-3", type: "danger", onClick: function () {
                                             setDeleteModal(true);
                                         } }))))),
                         react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) {
+                                var _a, _b;
                                 if (id === "blixify_new_tab")
                                     handlePopUpModal(true, id);
                                 else
-                                    handleNavigate("".concat(props.localURLEndpoint, "?data=").concat(props.id, "&type=").concat(props.type, "&collection=").concat(props.collectionId, "&view=").concat(id));
+                                    (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, props.type, props.id, id);
                             } }),
                         renderTabContent(tabs, props.type, viewType)))));
             case "update":
@@ -2057,19 +2070,6 @@ function DataTemplate(props) {
                             }); } }))));
             case "list":
                 return (react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(readQueryHoc_1.ReadQueryHoc, { ref: readQueryHocRef, database: {
-                            dbModule: dbModule,
-                            dbType: devSettings.server,
-                            dbCollection: props.collectionId,
-                            dbEndpoint: devSettings.dbEndpoint,
-                            dbAPIToken: devSettings.dbAPIToken,
-                        }, cond: {
-                            type: "list",
-                            query: renderSearchFilterConditions(),
-                            cursor: renderCursor(),
-                            sort: (_k = (_j = props.organise) === null || _j === void 0 ? void 0 : _j.sort) !== null && _k !== void 0 ? _k : undefined,
-                            limit: limit,
-                        }, onChangeData: handleGetListData, onError: handleGetItemError }),
                     react_1.default.createElement("div", { className: "flex flex-col py-2 md:items-center md:flex-row" },
                         react_1.default.createElement("div", { className: "flex flex-col" },
                             react_1.default.createElement("p", { className: "text-xl font-medium" }, props.title),
@@ -2083,26 +2083,27 @@ function DataTemplate(props) {
                             react_1.default.createElement(iconButton_1.IconButton, { className: "bg-primary-100 mr-2", icon: react_1.default.createElement(outline_1.FunnelIcon, { className: "h-7 w-7 text-primary-500" }), onClick: function () {
                                     handlePopUpModal(true, "filter");
                                 } }),
-                            ((_l = props.organise) === null || _l === void 0 ? void 0 : _l.debugOnChangeType) ? (react_1.default.createElement(button_1.Button, { text: "Add", type: "normal", onClick: function () {
+                            ((_j = props.edit) === null || _j === void 0 ? void 0 : _j.allEditable) && (react_1.default.createElement(react_1.default.Fragment, null, ((_k = props.organise) === null || _k === void 0 ? void 0 : _k.handleNavigate) ? (react_1.default.createElement(button_1.Button, { text: "Add", type: "normal", onClick: function () {
                                     var _a, _b;
-                                    (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType) === null || _b === void 0 ? void 0 : _b.call(_a, "update", "new");
+                                    (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "update", "new");
                                 } })) : (react_1.default.createElement(link_1.Link, { className: "mr-2", href: "".concat(props.localURLEndpoint, "?data=new&type=update&collection=").concat(props.collectionId), linkType: props.linkType, custom: props.custom },
-                                react_1.default.createElement(button_1.Button, { text: "Add", type: "normal" }))),
+                                react_1.default.createElement(button_1.Button, { text: "Add", type: "normal" }))))),
                             react_1.default.createElement(popUp_1.PopUp, { ctaComp: react_1.default.createElement(iconButton_1.IconButton, { className: "bg-primary-100", icon: react_1.default.createElement(solid_1.EllipsisVerticalIcon, { className: "h-7 w-7 text-primary-500" }) }), renderComp: react_1.default.createElement("div", { className: "shadow-lg" }, moreButtonPopUp.map(function (eachPopup) { return (
                                 //TODO: Crash on Next Js
                                 // <Menu.Item>
-                                react_1.default.createElement("span", { className: "block w-40 py-3 text-sm text-center text-gray-700 cursor-pointer hover:bg-gray-100", onClick: eachPopup.onClick }, eachPopup.text)
+                                react_1.default.createElement("span", { className: "block w-40 py-3 text-sm text-center text-gray-700 cursor-pointer hover:bg-gray-100", onClick: eachPopup === null || eachPopup === void 0 ? void 0 : eachPopup.onClick }, eachPopup === null || eachPopup === void 0 ? void 0 : eachPopup.text)
                                 // </Menu.Item>
                                 ); })), lib: {
-                                    Menu: (_m = props === null || props === void 0 ? void 0 : props.lib) === null || _m === void 0 ? void 0 : _m.Menu,
-                                    Transition: (_o = props === null || props === void 0 ? void 0 : props.lib) === null || _o === void 0 ? void 0 : _o.Transition,
+                                    Menu: (_l = props === null || props === void 0 ? void 0 : props.lib) === null || _l === void 0 ? void 0 : _l.Menu,
+                                    Transition: (_m = props === null || props === void 0 ? void 0 : props.lib) === null || _m === void 0 ? void 0 : _m.Transition,
                                 } }))),
                     react_1.default.createElement(tabs_1.Tabs, { tabs: tabs, selectedId: viewType, linkType: props.linkType, custom: props.custom, onClick: function (id) {
+                            var _a, _b;
                             if (id === "blixify_new_tab") {
                                 handlePopUpModal(true, id);
                             }
                             else {
-                                handleNavigate("".concat(props.localURLEndpoint, "?data=").concat(props.id, "&type=").concat(props.type, "&collection=").concat(props.collectionId, "&view=").concat(id));
+                                (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, props.type, props.id, id);
                             }
                         } }),
                     renderTabContent(tabs, props.type, viewType)));
@@ -2380,11 +2381,8 @@ function DataTemplate(props) {
                         !selectAll && (react_1.default.createElement(textButton_1.TextButton, { className: "text-sm", text: "Update", onClick: function () {
                                 setBatchUpdateModal(true);
                             } }))), handleSelectAll: handleSelectAllPages, handleSelectedIds: handleSelectIds, header: renderTableHeader(), pageIndex: pageIndex, onClickRow: function (id) {
-                        var _a;
-                        if ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType)
-                            props.organise.debugOnChangeType("read", id);
-                        else
-                            handleNavigate("".concat(props.localURLEndpoint, "?data=").concat(id, "&type=read&collection=").concat(props.collectionId, "&view=general"));
+                        var _a, _b;
+                        (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "read", id, "general");
                     }, linkType: props.linkType, custom: props.custom, newTabUrl: "".concat(props.localURLEndpoint, "?data="), addNewTabUrl: "&type=read&collection=".concat(props.collectionId, "&view=general"), handleUpdatePageIndex: handlePagination, className: "mt-5", lib: { axios: (_a = props.lib) === null || _a === void 0 ? void 0 : _a.axios }, devSettings: {
                         schemaEndpoint: devSettings.schemaEndpoint,
                         server: devSettings.server,
@@ -2433,21 +2431,15 @@ function DataTemplate(props) {
             else if (selectedTabData.viewType === "list") {
                 return (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(list_1.List, { paginationType: devSettings.server === "mongoServer" ? "page" : "cursor", list: renderGridAndListData(selectedTabData.viewImage, "list"), size: size, limit: limit, cursor: cursor, loading: tableLoading, pageIndex: pageIndex, onClickRow: function (id) {
-                            var _a;
-                            if ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType)
-                                props.organise.debugOnChangeType("read", id);
-                            else
-                                handleNavigate("".concat(props.localURLEndpoint, "?data=").concat(id, "&type=read&collection=").concat(props.collectionId, "&view=general"));
+                            var _a, _b;
+                            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "read", id, "general");
                         }, linkType: props.linkType, custom: props.custom, newTabUrl: "".concat(props.localURLEndpoint, "?data="), addNewTabUrl: "&type=read&collection=".concat(props.collectionId, "&view=general"), handleUpdatePageIndex: handlePagination, className: "mt-5" })));
             }
             else if (selectedTabData.viewType === "grid") {
                 return (react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(grid_1.Grid, { paginationType: devSettings.server === "mongoServer" ? "page" : "cursor", data: renderGridAndListData(selectedTabData.viewImage, "grid"), size: size, limit: limit, cursor: cursor, loading: tableLoading, pageIndex: pageIndex, onClickData: function (id) {
-                            var _a;
-                            if ((_a = props.organise) === null || _a === void 0 ? void 0 : _a.debugOnChangeType)
-                                props.organise.debugOnChangeType("read", id);
-                            else
-                                handleNavigate("".concat(props.localURLEndpoint, "?data=").concat(id, "&type=read&collection=").concat(props.collectionId, "&view=general"));
+                            var _a, _b;
+                            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "read", id, "general");
                         }, linkType: props.linkType, custom: props.custom, newTabUrl: "".concat(props.localURLEndpoint, "?data="), addNewTabUrl: "&type=read&collection=".concat(props.collectionId, "&view=general"), handleUpdatePageIndex: handlePagination, className: "mt-5" })));
             }
             else if (selectedTabData.renderComp) {
@@ -2688,20 +2680,33 @@ 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: (_g = props.lib) === null || _g === void 0 ? void 0 : _g.Dialog, Transition: (_h = props.lib) === null || _h === void 0 ? void 0 : _h.Transition }, renderContent: renderModalContent, onClose: function () {
+        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 () {
                 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: (_j = props.lib) === null || _j === void 0 ? void 0 : _j.Dialog, Transition: (_k = props.lib) === null || _k === void 0 ? void 0 : _k.Transition }, renderContent: renderDeleteModalContent, onClose: function () {
+        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 () {
                 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: (_l = props.lib) === null || _l === void 0 ? void 0 : _l.Dialog, Transition: (_m = props.lib) === null || _m === void 0 ? void 0 : _m.Transition }, renderContent: renderBatchUpdateModalContent, onClose: function () {
+        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 () {
                 setBatchUpdateData({ columnId: "", columnData: {} });
                 setBatchUpdateModal(false);
             }, notification: react_1.default.createElement(react_1.default.Fragment, null, renderNotification("modal")) }),
+        react_1.default.createElement(readQueryHoc_1.ReadQueryHoc, { ref: readQueryHocRef, database: {
+                dbModule: dbModule,
+                dbType: devSettings.server,
+                dbCollection: props.collectionId,
+                dbEndpoint: devSettings.dbEndpoint,
+                dbAPIToken: devSettings.dbAPIToken,
+            }, cond: {
+                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,
+                limit: limit,
+            }, onChangeData: handleGetListData, onError: handleGetItemError }),
         renderContent()));
 }
 exports.DataTemplate = DataTemplate;