blixify-ui-web 0.2.58 → 0.2.60

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

@@ -128,12 +128,13 @@ var readQueryHoc_1 = require("../readQueryHoc");
 var updateModule_1 = require("../updateModule");
 var utils_1 = require("../utils");
 var writeQuery_1 = require("../writeQuery");
+var activityModal_1 = require("./activityModal");
 var dataStateModel_1 = require("./dataStateModel");
 var indexedDb_1 = require("./indexedDb");
 var pagination_1 = require("./pagination");
 var settingsModal_1 = require("./settingsModal");
 exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     var formRef = (0, react_1.createRef)();
     var objectFormRef = (0, react_1.createRef)();
     var listAddressFromRef = (0, react_1.createRef)();
@@ -145,83 +146,87 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var exportCSVEmailInputRef = (0, react_1.createRef)();
     var readQueryHocRef = (0, react_1.useRef)();
     var listRQueryHocRef = (0, react_1.useRef)();
+    var oldCollectionId = (0, react_1.useRef)();
     var typingTimeout = (0, react_1.useRef)();
     var mapViewRef = (0, react_1.useRef)();
-    var _t = (0, react_1.useState)(false), loading = _t[0], setLoading = _t[1];
-    var _u = (0, react_1.useState)(), notification = _u[0], setNotification = _u[1];
+    var _z = (0, react_1.useState)(false), loading = _z[0], setLoading = _z[1];
+    var _0 = (0, react_1.useState)(), notification = _0[0], setNotification = _0[1];
     //INFO : Used by List
-    var _v = (0, react_1.useState)({}), filterSearch = _v[0], setFilterSearch = _v[1];
-    var _w = (0, react_1.useState)({}), filterSearchParams = _w[0], setFilterSearchParams = _w[1];
-    var _x = (0, react_1.useState)({}), filterSelection = _x[0], setFilterSelection = _x[1];
-    var _y = (0, react_1.useState)({}), filterReference = _y[0], setFilterReference = _y[1];
-    var _z = (0, react_1.useState)({}), filterReferenceSearch = _z[0], setFilterReferenceSearch = _z[1];
-    var _0 = (0, react_1.useState)({}), filterReferenceList = _0[0], setFilterReferenceList = _0[1];
-    var _1 = (0, react_1.useState)({
+    var _1 = (0, react_1.useState)({}), filterSearch = _1[0], setFilterSearch = _1[1];
+    var _2 = (0, react_1.useState)({}), filterSearchParams = _2[0], setFilterSearchParams = _2[1];
+    var _3 = (0, react_1.useState)({}), filterSelection = _3[0], setFilterSelection = _3[1];
+    var _4 = (0, react_1.useState)({}), filterReference = _4[0], setFilterReference = _4[1];
+    var _5 = (0, react_1.useState)({}), filterReferenceSearch = _5[0], setFilterReferenceSearch = _5[1];
+    var _6 = (0, react_1.useState)({}), filterReferenceList = _6[0], setFilterReferenceList = _6[1];
+    var _7 = (0, react_1.useState)({
         startDate: undefined,
         endDate: undefined,
-    }), filterReferenceDate = _1[0], setFilterReferenceDate = _1[1];
-    var _2 = (0, react_1.useState)(true), tableLoading = _2[0], setTableLoading = _2[1];
-    var _3 = (0, react_1.useState)(""), cursor = _3[0], setCursor = _3[1];
-    var _4 = (0, react_1.useState)(""), lastCursor = _4[0], setLastCursor = _4[1];
-    var _5 = (0, react_1.useState)([]), tableData = _5[0], setTableData = _5[1];
-    var _6 = (0, react_1.useState)([]), spaceTableData = _6[0], setSpaceTableData = _6[1];
-    var _7 = (0, react_1.useState)(0), size = _7[0], setSize = _7[1];
-    var _8 = (0, react_1.useState)(0), pageIndex = _8[0], setPageIndex = _8[1];
-    var _9 = (0, react_1.useState)([]), selectedIds = _9[0], setSelectedIds = _9[1];
-    var _10 = (0, react_1.useState)(false), selectAll = _10[0], setSelectAll = _10[1];
-    var _11 = (0, react_1.useState)(""), deletePasscode = _11[0], setDeletePasscode = _11[1];
-    var _12 = (0, react_1.useState)(""), deletePasscodeInput = _12[0], setDeletePasscodeInput = _12[1];
-    var _13 = (0, react_1.useState)(""), deleteFeedId = _13[0], setDeleteFeedId = _13[1];
+    }), filterReferenceDate = _7[0], setFilterReferenceDate = _7[1];
+    var _8 = (0, react_1.useState)(true), tableLoading = _8[0], setTableLoading = _8[1];
+    var _9 = (0, react_1.useState)(""), cursor = _9[0], setCursor = _9[1];
+    var _10 = (0, react_1.useState)(""), lastCursor = _10[0], setLastCursor = _10[1];
+    var _11 = (0, react_1.useState)([]), tableData = _11[0], setTableData = _11[1];
+    var _12 = (0, react_1.useState)([]), spaceTableData = _12[0], setSpaceTableData = _12[1];
+    var _13 = (0, react_1.useState)(0), size = _13[0], setSize = _13[1];
+    var _14 = (0, react_1.useState)(0), pageIndex = _14[0], setPageIndex = _14[1];
+    var _15 = (0, react_1.useState)([]), selectedIds = _15[0], setSelectedIds = _15[1];
+    var _16 = (0, react_1.useState)(false), selectAll = _16[0], setSelectAll = _16[1];
+    var _17 = (0, react_1.useState)(""), deletePasscode = _17[0], setDeletePasscode = _17[1];
+    var _18 = (0, react_1.useState)(""), deletePasscodeInput = _18[0], setDeletePasscodeInput = _18[1];
+    var _19 = (0, react_1.useState)(""), deleteFeedId = _19[0], setDeleteFeedId = _19[1];
     //INFO : Used by List Organise
-    var _14 = (0, react_1.useState)(false), sortModal = _14[0], setSortModal = _14[1];
-    var _15 = (0, react_1.useState)(false), filterModal = _15[0], setFilterModal = _15[1];
-    var _16 = (0, react_1.useState)(false), addTabModal = _16[0], setAddTabModal = _16[1];
-    var _17 = (0, react_1.useState)(), selectedTab = _17[0], setSelectedTab = _17[1];
-    var _18 = (0, react_1.useState)("dayGridMonth"), calendarView = _18[0], setCalendarView = _18[1];
-    var _19 = (0, react_1.useState)((0, moment_1.default)().startOf("month").toDate()), calendarTabMonth = _19[0], setCalendarTabMonth = _19[1];
-    var _20 = (0, react_1.useState)(false), queryForm = _20[0], setQueryForm = _20[1];
-    var _21 = (0, react_1.useState)(false), batchUpdateModal = _21[0], setBatchUpdateModal = _21[1];
-    var _22 = (0, react_1.useState)({
+    var _20 = (0, react_1.useState)(false), sortModal = _20[0], setSortModal = _20[1];
+    var _21 = (0, react_1.useState)(false), filterModal = _21[0], setFilterModal = _21[1];
+    var _22 = (0, react_1.useState)(false), addTabModal = _22[0], setAddTabModal = _22[1];
+    var _23 = (0, react_1.useState)(), selectedTab = _23[0], setSelectedTab = _23[1];
+    var _24 = (0, react_1.useState)("dayGridMonth"), calendarView = _24[0], setCalendarView = _24[1];
+    var _25 = (0, react_1.useState)((0, moment_1.default)().startOf("month").toDate()), calendarTabMonth = _25[0], setCalendarTabMonth = _25[1];
+    var _26 = (0, react_1.useState)(false), queryForm = _26[0], setQueryForm = _26[1];
+    var _27 = (0, react_1.useState)(false), batchUpdateModal = _27[0], setBatchUpdateModal = _27[1];
+    var _28 = (0, react_1.useState)({
         columnId: "",
         columnData: {},
-    }), batchUpdateData = _22[0], setBatchUpdateData = _22[1];
+    }), batchUpdateData = _28[0], setBatchUpdateData = _28[1];
+    // INFO: Used by Activity Log
+    var _29 = (0, react_1.useState)(false), activityModal = _29[0], setActivityModal = _29[1];
+    var _30 = (0, react_1.useState)(""), activityId = _30[0], setActivityId = _30[1];
     //INFO : Used by Export
-    var _23 = (0, react_1.useState)(null), csvFile = _23[0], setCSVFile = _23[1];
-    var _24 = (0, react_1.useState)([]), csvFileData = _24[0], setCSVFileData = _24[1];
-    var _25 = (0, react_1.useState)(0), stepCSVIndex = _25[0], setStepCSVIndex = _25[1];
-    var _26 = (0, react_1.useState)({}), listCSVMapAttribute = _26[0], setListCSVMapAttribute = _26[1];
-    var _27 = (0, react_1.useState)({}), listCSVObjAttribute = _27[0], setListCSVObjAttribute = _27[1];
-    var _28 = (0, react_1.useState)([]), csvAPIAttribute = _28[0], setCSVAPIAttribute = _28[1];
-    var _29 = (0, react_1.useState)(((_a = props.devSettings.currentUser) === null || _a === void 0 ? void 0 : _a.userEmail) || ""), exportCSVEmail = _29[0], setExportCSVEmail = _29[1];
-    var _30 = (0, react_1.useState)([]), importTableData = _30[0], setImportTableData = _30[1];
-    var _31 = (0, react_1.useState)([]), queryList = _31[0], setQueryList = _31[1];
-    var _32 = (0, react_1.useState)(-1), queryIndex = _32[0], setQueryIndex = _32[1];
+    var _31 = (0, react_1.useState)(null), csvFile = _31[0], setCSVFile = _31[1];
+    var _32 = (0, react_1.useState)([]), csvFileData = _32[0], setCSVFileData = _32[1];
+    var _33 = (0, react_1.useState)(0), stepCSVIndex = _33[0], setStepCSVIndex = _33[1];
+    var _34 = (0, react_1.useState)({}), listCSVMapAttribute = _34[0], setListCSVMapAttribute = _34[1];
+    var _35 = (0, react_1.useState)({}), listCSVObjAttribute = _35[0], setListCSVObjAttribute = _35[1];
+    var _36 = (0, react_1.useState)([]), csvAPIAttribute = _36[0], setCSVAPIAttribute = _36[1];
+    var _37 = (0, react_1.useState)(((_a = props.devSettings.currentUser) === null || _a === void 0 ? void 0 : _a.userEmail) || ""), exportCSVEmail = _37[0], setExportCSVEmail = _37[1];
+    var _38 = (0, react_1.useState)([]), importTableData = _38[0], setImportTableData = _38[1];
+    var _39 = (0, react_1.useState)([]), queryList = _39[0], setQueryList = _39[1];
+    var _40 = (0, react_1.useState)(-1), queryIndex = _40[0], setQueryIndex = _40[1];
     //INFO : Used by Read
     //INFO : Used by Update
-    var _33 = (0, react_1.useState)(false), modalVisible = _33[0], setModalVisible = _33[1];
-    var _34 = (0, react_1.useState)(false), deleteModal = _34[0], setDeleteModal = _34[1];
-    var _35 = (0, react_1.useState)(false), excelModal = _35[0], setExcelModal = _35[1];
-    var _36 = (0, react_1.useState)(false), exportExcel = _36[0], setExportExcel = _36[1];
-    var _37 = (0, react_1.useState)(false), exportQR = _37[0], setExportQR = _37[1];
-    var _38 = (0, react_1.useState)(false), signatureSigning = _38[0], setSignatureSigning = _38[1];
-    var _39 = (0, react_1.useState)({}), selectedData = _39[0], setSelectedData = _39[1];
-    var _40 = (0, react_1.useState)(""), selectedObjectStructureId = _40[0], setSelectedObjectStructureId = _40[1];
-    var _41 = (0, react_1.useState)(""), selectedObjectId = _41[0], setSelectedObjectId = _41[1];
-    var _42 = (0, react_1.useState)(""), selectedListAddressId = _42[0], setSelectedListAddressId = _42[1];
-    var _43 = (0, react_1.useState)({
+    var _41 = (0, react_1.useState)(false), modalVisible = _41[0], setModalVisible = _41[1];
+    var _42 = (0, react_1.useState)(false), deleteModal = _42[0], setDeleteModal = _42[1];
+    var _43 = (0, react_1.useState)(false), excelModal = _43[0], setExcelModal = _43[1];
+    var _44 = (0, react_1.useState)(false), exportExcel = _44[0], setExportExcel = _44[1];
+    var _45 = (0, react_1.useState)(false), exportQR = _45[0], setExportQR = _45[1];
+    var _46 = (0, react_1.useState)(false), signatureSigning = _46[0], setSignatureSigning = _46[1];
+    var _47 = (0, react_1.useState)({}), selectedData = _47[0], setSelectedData = _47[1];
+    var _48 = (0, react_1.useState)(""), selectedObjectStructureId = _48[0], setSelectedObjectStructureId = _48[1];
+    var _49 = (0, react_1.useState)(""), selectedObjectId = _49[0], setSelectedObjectId = _49[1];
+    var _50 = (0, react_1.useState)(""), selectedListAddressId = _50[0], setSelectedListAddressId = _50[1];
+    var _51 = (0, react_1.useState)({
         lat: 0,
         lng: 0,
         name: "",
-    }), selectedListAddress = _43[0], setSelectedListAddress = _43[1];
-    var _44 = (0, react_1.useState)({}), selectedObjectData = _44[0], setSelectedObjectData = _44[1];
-    var _45 = (0, react_1.useState)(false), referenceLoading = _45[0], setReferenceLoading = _45[1];
-    var _46 = (0, react_1.useState)({}), referencesOptions = _46[0], setReferencesOptions = _46[1];
-    var _47 = (0, react_1.useState)({}), referenceDeleteTableData = _47[0], setReferenceDeleteTableData = _47[1];
-    var _48 = (0, react_1.useState)(0), referenceDeleteIndex = _48[0], setReferenceDeleteIndex = _48[1];
-    var _49 = (0, react_1.useState)({}), referenceModelSchema = _49[0], setReferenceSchema = _49[1];
+    }), selectedListAddress = _51[0], setSelectedListAddress = _51[1];
+    var _52 = (0, react_1.useState)({}), selectedObjectData = _52[0], setSelectedObjectData = _52[1];
+    var _53 = (0, react_1.useState)(false), referenceLoading = _53[0], setReferenceLoading = _53[1];
+    var _54 = (0, react_1.useState)({}), referencesOptions = _54[0], setReferencesOptions = _54[1];
+    var _55 = (0, react_1.useState)({}), referenceDeleteTableData = _55[0], setReferenceDeleteTableData = _55[1];
+    var _56 = (0, react_1.useState)(0), referenceDeleteIndex = _56[0], setReferenceDeleteIndex = _56[1];
+    var _57 = (0, react_1.useState)({}), referenceModelSchema = _57[0], setReferenceSchema = _57[1];
     //INFO : Offline
-    var _50 = (0, react_1.useState)(0), offlineDataLength = _50[0], setOfflineDataLength = _50[1];
-    var _51 = (0, react_1.useState)(false), offlineModal = _51[0], setOfflineModal = _51[1];
+    var _58 = (0, react_1.useState)(0), offlineDataLength = _58[0], setOfflineDataLength = _58[1];
+    var _59 = (0, react_1.useState)(false), offlineModal = _59[0], setOfflineModal = _59[1];
     var devSettings = props.devSettings;
     var serverId = (0, utils_1.parseServerId)(devSettings.server);
     var isFirebaseClient = devSettings.server === "firebase";
@@ -236,9 +241,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     var formColumn = ((_h = props.bareSettings) === null || _h === void 0 ? void 0 : _h.bareUpdateOneColumn)
         ? "grid-cols-2"
         : "grid-cols-4";
+    var isActivityLog = (((_k = (_j = props.edit) === null || _j === void 0 ? void 0 : _j.activityLog) === null || _k === void 0 ? void 0 : _k.enableComments) &&
+        ((_l = props.edit) === null || _l === void 0 ? void 0 : _l.activityLog.commentCollectionId)) ||
+        (((_o = (_m = props.edit) === null || _m === void 0 ? void 0 : _m.activityLog) === null || _o === void 0 ? void 0 : _o.enableLogs) &&
+            ((_p = props.edit) === null || _p === void 0 ? void 0 : _p.activityLog.logsCollectionId));
     //TODO : Code - Pass ...devSettings, search dbEndpoint:
     var writeServerQuery = new writeQuery_1.WriteQuery({
-        dbModule: (_j = props.lib) === null || _j === void 0 ? void 0 : _j.axios,
+        dbModule: (_q = props.lib) === null || _q === void 0 ? void 0 : _q.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -246,7 +255,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var readServerQuery = new readQuery_1.ReadQuery({
-        dbModule: (_k = props.lib) === null || _k === void 0 ? void 0 : _k.axios,
+        dbModule: (_r = props.lib) === null || _r === void 0 ? void 0 : _r.axios,
         dbType: devSettings.server,
         dbCollection: props.collectionId,
         dbEndpoint: devSettings.dbEndpoint,
@@ -254,7 +263,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         dbUserToken: devSettings.dbUserToken,
     });
     var moreButtonPopUp = [
-        ((_l = props.edit) === null || _l === void 0 ? void 0 : _l.allEditable) && !isFirebase
+        ((_s = props.edit) === null || _s === void 0 ? void 0 : _s.allEditable) && !isFirebase
             ? {
                 text: "Import Excel",
                 onClick: function () {
@@ -278,7 +287,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
             },
         },
     ].filter(Boolean);
-    if ((_m = props.organise) === null || _m === void 0 ? void 0 : _m.moreSettings)
+    if ((_t = props.organise) === null || _t === void 0 ? void 0 : _t.moreSettings)
         moreButtonPopUp = moreButtonPopUp.concat(props.organise.moreSettings);
     (0, react_1.useImperativeHandle)(ref, function () { return ({
         handleRefresh: handleRefresh,
@@ -292,6 +301,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         /* eslint-disable */
     }, [props.collectionId]);
     /* eslint-enable */
+    //INFO : Change Data Type & ID Refresh
     (0, react_1.useEffect)(function () {
         switch (props.type) {
             case "read":
@@ -315,6 +325,14 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 break;
         }
     }, [props.type, props.id]);
+    //INFO : Change Collection ID Refresh
+    (0, react_1.useEffect)(function () {
+        if (oldCollectionId.current) {
+            if (listRQueryHocRef.current)
+                listRQueryHocRef.current.handleRefresh();
+        }
+        oldCollectionId.current = props.collectionId;
+    }, [props.collectionId]);
     (0, react_1.useEffect)(function () {
         var _a, _b, _c, _d, _e;
         if (!selectedTab) {
@@ -346,8 +364,8 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         props.collectionId,
         props.id,
         props.localURLEndpoint,
-        (_o = props.organise) === null || _o === void 0 ? void 0 : _o.extendedTabs,
-        (_p = props.organise) === null || _p === void 0 ? void 0 : _p.viewId,
+        (_u = props.organise) === null || _u === void 0 ? void 0 : _u.extendedTabs,
+        (_v = props.organise) === null || _v === void 0 ? void 0 : _v.viewId,
         props.type,
         selectedTab,
     ]);
@@ -565,9 +583,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     var handleGetListData = function (responseData, type, rowId) { return __awaiter(void 0, void 0, void 0, function () {
         var dataList, prettierDataList, dummyPrettierDataList_1, selectedIndex_1, newTableData, newPrettierTableData, isExists;
-        var _a, _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var _a, _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     dataList = [];
                     prettierDataList = [];
@@ -583,10 +601,10 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     });
                     prettierDataList = dummyPrettierDataList_1;
                     return [3 /*break*/, 3];
-                case 1: return [4 /*yield*/, (0, listModule_1.handleListDataBasedOnModel)(responseData.data, props.devSettings, (_b = props.lib) === null || _b === void 0 ? void 0 : _b.axios, props.model, (_c = props.organise) === null || _c === void 0 ? void 0 : _c.handleNavigate, ((_d = props.organise) === null || _d === void 0 ? void 0 : _d.viewId) === "general")];
+                case 1: return [4 /*yield*/, (0, listModule_1.handleListDataBasedOnModel)(responseData.data, props.devSettings, (_b = props.lib) === null || _b === void 0 ? void 0 : _b.axios, props.model, (_c = props.organise) === null || _c === void 0 ? void 0 : _c.handleNavigate, ((_d = props.organise) === null || _d === void 0 ? void 0 : _d.viewId) === "general", setActivityModal, setActivityId, isActivityLog ? (_e = props.edit) === null || _e === void 0 ? void 0 : _e.activityLog : undefined)];
                 case 2:
-                    prettierDataList = _e.sent();
-                    _e.label = 3;
+                    prettierDataList = _f.sent();
+                    _f.label = 3;
                 case 3:
                     responseData.data.map(function (eachData) {
                         if (eachData["_id"]) {
@@ -596,7 +614,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                         return null;
                     });
                     dataList = responseData.data;
-                    _e.label = 4;
+                    _f.label = 4;
                 case 4:
                     if (type === "update" || type === "create") {
                         try {
@@ -1993,19 +2011,19 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     }); };
     var handleSubmit = function () { return __awaiter(void 0, void 0, void 0, function () {
         var preComplete, res, err_14;
-        var _a, _b, _c, _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
-                    _g.trys.push([0, 6, , 7]);
+                    _h.trys.push([0, 6, , 7]);
                     setLoading(true);
                     setModalVisible(true);
                     preComplete = true;
                     if (!((_a = props.bareSettings) === null || _a === void 0 ? void 0 : _a.bareUpdateHandlePreComplete)) return [3 /*break*/, 2];
                     return [4 /*yield*/, props.bareSettings.bareUpdateHandlePreComplete(selectedData)];
                 case 1:
-                    preComplete = _g.sent();
-                    _g.label = 2;
+                    preComplete = _h.sent();
+                    _h.label = 2;
                 case 2:
                     if (!preComplete)
                         throw "Error";
@@ -2014,7 +2032,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     return [3 /*break*/, 5];
                 case 3: return [4 /*yield*/, handleSubmitData()];
                 case 4:
-                    res = _g.sent();
+                    res = _h.sent();
                     if (res) {
                         handleCheckOfflineDataLength();
                         if (props.onComplete) {
@@ -2030,13 +2048,15 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                                 (_f = (_e = props.organise) === null || _e === void 0 ? void 0 : _e.handleNavigate) === null || _f === void 0 ? void 0 : _f.call(_e, "list", "", "general");
                         }
                     }
-                    _g.label = 5;
+                    _h.label = 5;
                 case 5:
                     setModalVisible(false);
                     setLoading(false);
+                    if ((_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareUpdateHandlePostComplete)
+                        props.bareSettings.bareUpdateHandlePostComplete();
                     return [3 /*break*/, 7];
                 case 6:
-                    err_14 = _g.sent();
+                    err_14 = _h.sent();
                     setModalVisible(false);
                     setLoading(false);
                     return [3 /*break*/, 7];
@@ -2980,6 +3000,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
         if (type === "read") {
             return (react_1.default.createElement("div", { className: "flex flex-row mt-3 sm:ml-3 sm:mt-0" },
                 bareActionComponent,
+                isActivityLog && (react_1.default.createElement(button_1.Button, { type: "normal", text: "Log", onClick: function () { return setActivityModal(true); }, className: !bareActionComponent ? "mr-3" : "" })),
                 isEditor && !bareActionComponent && !((_d = props.edit) === null || _d === void 0 ? void 0 : _d.disabledUpdate) && (react_1.default.createElement("div", { className: "w-xs" }, hasNavigation ? (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.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "update", props.id);
@@ -3006,17 +3027,19 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                     } }))));
         }
         else if (type === "list") {
-            return (react_1.default.createElement(react_1.default.Fragment, null, bareActionComponent
-                ? bareActionComponent
-                : ((_g = props.edit) === null || _g === void 0 ? void 0 : _g.allEditable) && (react_1.default.createElement(react_1.default.Fragment, null,
-                    hasNavigation ? (react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", onClick: function () {
-                            var _a, _b;
-                            (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "update", "new");
-                        }, className: isBottom ? "mt-5" : "" })) : (react_1.default.createElement(link_1.Link, { href: "".concat(props.localURLEndpoint, "?data=new&type=update&collection=").concat(props.collectionId), linkType: props.linkType, custom: props.custom },
-                        react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", className: isBottom ? "mt-5" : "" }))),
-                    offlineDataLength > 0 && (react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(solid_1.CloudArrowUpIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", onClick: function () {
-                            handlePopUpModal(true, "offline");
-                        }, className: isBottom ? "mt-5" : "" }))))));
+            return (react_1.default.createElement(react_1.default.Fragment, null,
+                isActivityLog && (react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(HeroIcons.ClockIcon, { className: "h-7 w-7 text-white" }), onClick: function () { return setActivityModal(true); }, background: "bg-primary-500 hover:bg-primary-600" })),
+                bareActionComponent
+                    ? bareActionComponent
+                    : ((_g = props.edit) === null || _g === void 0 ? void 0 : _g.allEditable) && (react_1.default.createElement(react_1.default.Fragment, null,
+                        hasNavigation ? (react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", onClick: function () {
+                                var _a, _b;
+                                (_b = (_a = props.organise) === null || _a === void 0 ? void 0 : _a.handleNavigate) === null || _b === void 0 ? void 0 : _b.call(_a, "update", "new");
+                            }, className: isBottom ? "mt-5" : "" })) : (react_1.default.createElement(link_1.Link, { href: "".concat(props.localURLEndpoint, "?data=new&type=update&collection=").concat(props.collectionId), linkType: props.linkType, custom: props.custom },
+                            react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(outline_1.PlusIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", className: isBottom ? "mt-5" : "" }))),
+                        offlineDataLength > 0 && (react_1.default.createElement(iconButton_1.IconButton, { icon: react_1.default.createElement(solid_1.CloudArrowUpIcon, { className: "h-7 w-7 text-white" }), background: "bg-primary-500 hover:bg-primary-600", onClick: function () {
+                                handlePopUpModal(true, "offline");
+                            }, className: isBottom ? "mt-5" : "" }))))));
         }
         return null;
     };
@@ -4126,7 +4149,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
         renderNotification("root"),
-        ((_r = (_q = props.renderSettings) === null || _q === void 0 ? void 0 : _q.renderLoadingUI) === null || _r === void 0 ? void 0 : _r.call(_q)) && loading ? ((_s = props.renderSettings) === null || _s === void 0 ? void 0 : _s.renderLoadingUI()) : (react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), renderContent: renderModalContent, onClose: function () {
+        ((_x = (_w = props.renderSettings) === null || _w === void 0 ? void 0 : _w.renderLoadingUI) === null || _x === void 0 ? void 0 : _x.call(_w)) && loading ? ((_y = props.renderSettings) === null || _y === void 0 ? void 0 : _y.renderLoadingUI()) : (react_1.default.createElement(modal_1.Modal, { maxWidth: selectedObjectStructureId || excelModal ? "2xl" : undefined, open: modalVisible, title: renderModalTitle(), renderContent: renderModalContent, onClose: function () {
                 var _a, _b;
                 if (loading)
                     return;
@@ -4149,6 +4172,15 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
                 setBatchUpdateData({ columnId: "", columnData: {} });
                 setBatchUpdateModal(false);
             }, notification: react_1.default.createElement(react_1.default.Fragment, null, renderNotification("modal")) }),
+        isActivityLog && (react_1.default.createElement(modal_1.Modal, { open: activityModal, title: "Activity Log", renderContent: function () {
+                var _a, _b;
+                return (react_1.default.createElement(activityModal_1.ActivityModal, { title: props.title && typeof props.title === "string"
+                        ? props.title
+                        : "this collection", devSettings: props.devSettings, collectionId: props.collectionId, dataId: props.type === "read" ? (_a = props.id) !== null && _a !== void 0 ? _a : "" : activityId, activityLog: (_b = props.edit) === null || _b === void 0 ? void 0 : _b.activityLog }));
+            }, maxWidth: "4xl", onClose: function () {
+                setActivityModal(false);
+                setActivityId("");
+            }, notification: react_1.default.createElement(react_1.default.Fragment, null, renderNotification("modal")) })),
         renderContent()));
 });
 //# sourceMappingURL=index.js.map