blixify-ui-web 0.4.237 → 0.4.240

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/lib/components/advanced/infoWindow/index.d.ts.map +1 -1
  2. package/lib/components/advanced/infoWindow/index.js +4 -9
  3. package/lib/components/advanced/infoWindow/index.js.map +1 -1
  4. package/lib/components/data/dataTemplate/index.d.ts.map +1 -1
  5. package/lib/components/data/dataTemplate/index.js +92 -50
  6. package/lib/components/data/dataTemplate/index.js.map +1 -1
  7. package/lib/components/data/updateModule.d.ts +0 -2
  8. package/lib/components/data/updateModule.d.ts.map +1 -1
  9. package/lib/components/data/updateModule.js +9 -10
  10. package/lib/components/data/updateModule.js.map +1 -1
  11. package/lib/components/display/detailList/index.js +1 -1
  12. package/lib/components/display/detailList/index.js.map +1 -1
  13. package/lib/components/display/table/index.d.ts.map +1 -1
  14. package/lib/components/display/table/index.js +3 -3
  15. package/lib/components/display/table/index.js.map +1 -1
  16. package/lib/components/input/datePicker/index.d.ts.map +1 -1
  17. package/lib/components/input/datePicker/index.js +4 -4
  18. package/lib/components/input/datePicker/index.js.map +1 -1
  19. package/lib/components/input/markdown/index.d.ts.map +1 -1
  20. package/lib/components/input/markdown/index.js +59 -6
  21. package/lib/components/input/markdown/index.js.map +1 -1
  22. package/lib/components/input/select/index.d.ts +2 -0
  23. package/lib/components/input/select/index.d.ts.map +1 -1
  24. package/lib/components/input/select/index.js +20 -1
  25. package/lib/components/input/select/index.js.map +1 -1
  26. package/lib/components/input/uploadInput/index.d.ts +1 -1
  27. package/lib/components/input/uploadInput/index.d.ts.map +1 -1
  28. package/lib/components/input/uploadInput/index.js +32 -39
  29. package/lib/components/input/uploadInput/index.js.map +1 -1
  30. package/lib/tail.css +9 -0
  31. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/advanced/infoWindow/index.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EAEZ,YAAY,EAIb,MAAM,OAAO,CAAC;AACf,OAAO,oBAAoB,CAAC;AAE5B,UAAU,KAAK;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EACA,MAAM,GACN,OAAO,GACP,QAAQ,GACR,KAAK,GACL,YAAY,GACZ,cAAc,GACd,WAAW,GACX,SAAS,CAAC;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,UAAW,KAAK,sBA4CtC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/advanced/infoWindow/index.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,EAAY,YAAY,EAAuB,MAAM,OAAO,CAAC;AAC3E,OAAO,oBAAoB,CAAC;AAE5B,UAAU,KAAK;IACb,OAAO,EAAE,YAAY,CAAC;IACtB,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EACA,MAAM,GACN,OAAO,GACP,QAAQ,GACR,KAAK,GACL,YAAY,GACZ,cAAc,GACd,WAAW,GACX,SAAS,CAAC;IACd,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,UAAW,KAAK,sBAqCtC,CAAC"}
@@ -28,28 +28,23 @@ var react_1 = require("@headlessui/react");
28
28
  var react_2 = __importStar(require("react"));
29
29
  require("../../../index.css");
30
30
  var InfoWindow = function (props) {
31
- var buttonRef = (0, react_2.useRef)();
32
31
  var _a = (0, react_2.useState)(false), isHover = _a[0], setIsHover = _a[1];
33
- var _b = (0, react_2.useState)(), btnHeight = _b[0], setBtnHeight = _b[1];
34
32
  (0, react_2.useEffect)(function () {
35
- if (buttonRef.current) {
36
- setBtnHeight(buttonRef.current.offsetHeight);
37
- }
38
33
  if (props.defaultOpen)
39
34
  setIsHover(true);
40
- }, []);
35
+ }, [props.defaultOpen]);
41
36
  var handleHover = function (isHovering) {
42
37
  if (!props.disableOpenOnHover) {
43
38
  setIsHover(isHovering);
44
39
  }
45
40
  };
46
- return (react_2.default.createElement(react_1.Popover, { onMouseEnter: function () { return handleHover(true); }, onMouseLeave: function () { return handleHover(false); }, className: "relative", style: { height: btnHeight } },
41
+ return (react_2.default.createElement(react_1.Popover, { onMouseEnter: function () { return handleHover(true); }, onMouseLeave: function () { return handleHover(false); }, className: "relative inline-block" },
47
42
  react_2.default.createElement(react_2.default.Fragment, null,
48
- react_2.default.createElement(react_1.PopoverButton, { ref: buttonRef, onClick: function () {
43
+ react_2.default.createElement(react_1.PopoverButton, { onClick: function () {
49
44
  if (props.onClick)
50
45
  props.onClick();
51
46
  setIsHover(!isHover);
52
- }, className: "focus:outline-none h-min" }, props.icon),
47
+ }, className: "focus:outline-none" }, props.icon),
53
48
  react_2.default.createElement(react_1.Transition, { show: isHover, as: react_2.Fragment },
54
49
  react_2.default.createElement(react_1.PopoverPanel, { anchor: props.type, className: "flex flex-col z-[51]" }, props.content)))));
55
50
  };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/advanced/infoWindow/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAK2B;AAC3B,6CAMe;AACf,8BAA4B;AAmBrB,IAAM,UAAU,GAAG,UAAC,KAAY;IACrC,IAAM,SAAS,GAAG,IAAA,cAAM,GAAO,CAAC;IAC1B,IAAA,KAAwB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAtC,OAAO,QAAA,EAAE,UAAU,QAAmB,CAAC;IACxC,IAAA,KAA4B,IAAA,gBAAQ,GAAE,EAArC,SAAS,QAAA,EAAE,YAAY,QAAc,CAAC;IAE7C,IAAA,iBAAS,EAAC;QACR,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,KAAK,CAAC,WAAW;YAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAM,WAAW,GAAG,UAAC,UAAmB;QACtC,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC9B,UAAU,CAAC,UAAU,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,8BAAC,eAAO,IACN,YAAY,EAAE,cAAM,OAAA,WAAW,CAAC,IAAI,CAAC,EAAjB,CAAiB,EACrC,YAAY,EAAE,cAAM,OAAA,WAAW,CAAC,KAAK,CAAC,EAAlB,CAAkB,EACtC,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;QAE5B;YACE,8BAAC,qBAAa,IACZ,GAAG,EAAE,SAAS,EACd,OAAO,EAAE;oBACP,IAAI,KAAK,CAAC,OAAO;wBAAE,KAAK,CAAC,OAAO,EAAE,CAAC;oBACnC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC;gBACvB,CAAC,EACD,SAAS,EAAC,0BAA0B,IAEnC,KAAK,CAAC,IAAI,CACG;YAChB,8BAAC,kBAAU,IAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,gBAAQ;gBACrC,8BAAC,oBAAY,IAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAC,sBAAsB,IAC/D,KAAK,CAAC,OAAO,CACD,CACJ,CACZ,CACK,CACX,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,UAAU,cA4CrB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/advanced/infoWindow/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAK2B;AAC3B,6CAA2E;AAC3E,8BAA4B;AAmBrB,IAAM,UAAU,GAAG,UAAC,KAAY;IAC/B,IAAA,KAAwB,IAAA,gBAAQ,EAAC,KAAK,CAAC,EAAtC,OAAO,QAAA,EAAE,UAAU,QAAmB,CAAC;IAE9C,IAAA,iBAAS,EAAC;QACR,IAAI,KAAK,CAAC,WAAW;YAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAExB,IAAM,WAAW,GAAG,UAAC,UAAmB;QACtC,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC9B,UAAU,CAAC,UAAU,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,CACL,8BAAC,eAAO,IACN,YAAY,EAAE,cAAM,OAAA,WAAW,CAAC,IAAI,CAAC,EAAjB,CAAiB,EACrC,YAAY,EAAE,cAAM,OAAA,WAAW,CAAC,KAAK,CAAC,EAAlB,CAAkB,EACtC,SAAS,EAAC,uBAAuB;QAEjC;YACE,8BAAC,qBAAa,IACZ,OAAO,EAAE;oBACP,IAAI,KAAK,CAAC,OAAO;wBAAE,KAAK,CAAC,OAAO,EAAE,CAAC;oBACnC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC;gBACvB,CAAC,EACD,SAAS,EAAC,oBAAoB,IAE7B,KAAK,CAAC,IAAI,CACG;YAChB,8BAAC,kBAAU,IAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,gBAAQ;gBACrC,8BAAC,oBAAY,IAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAC,sBAAsB,IAC/D,KAAK,CAAC,OAAO,CACD,CACJ,CACZ,CACK,CACX,CAAC;AACJ,CAAC,CAAC;AArCW,QAAA,UAAU,cAqCrB"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/data/dataTemplate/index.tsx"],"names":[],"mappings":"AAkCA,OAAO,KASN,MAAM,OAAO,CAAC;AAyEf,OAAO,EACL,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAoB1B,eAAO,MAAM,YAAY,mFAwwRvB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/data/dataTemplate/index.tsx"],"names":[],"mappings":"AAkCA,OAAO,KASN,MAAM,OAAO,CAAC;AAyEf,OAAO,EACL,iBAAiB,EAKlB,MAAM,kBAAkB,CAAC;AAoB1B,eAAO,MAAM,YAAY,mFAozRvB,CAAC"}
@@ -349,6 +349,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
349
349
  var typingTimeout = (0, react_1.useRef)();
350
350
  var mapViewRef = (0, react_1.useRef)();
351
351
  var prevTabPropsRef = (0, react_1.useRef)(selectedTab);
352
+ var lastUploadedDataRef = (0, react_1.useRef)(null);
352
353
  var devSettings = props.devSettings;
353
354
  var serverId = (0, utils_1.parseServerId)(devSettings.server);
354
355
  var viewType = (_s = (_r = props.organise) === null || _r === void 0 ? void 0 : _r.viewId) !== null && _s !== void 0 ? _s : "general";
@@ -1674,39 +1675,23 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
1674
1675
  _a.label = 2;
1675
1676
  case 2: return [3 /*break*/, 5];
1676
1677
  case 3: return [4 /*yield*/, Promise.all(markdownAttribute_1.map(function (eachMarkdown) { return __awaiter(void 0, void 0, void 0, function () {
1677
- var markdownRef, originalIndex, calculatedRefIndex, i, ref_1, refId, fieldId, uploadHandler, updatedMarkdown, error_3;
1678
- var _a, _b, _c, _d, _e, _f;
1679
- return __generator(this, function (_g) {
1680
- switch (_g.label) {
1678
+ var originalIndex, calculatedRefIndex, markdownRef, fieldId, uploadHandler, updatedMarkdown, error_3;
1679
+ var _a, _b;
1680
+ return __generator(this, function (_c) {
1681
+ switch (_c.label) {
1681
1682
  case 0:
1682
- markdownRef = null;
1683
1683
  originalIndex = model.findIndex(function (m) { return m.id === eachMarkdown.id; });
1684
1684
  calculatedRefIndex = (_a = eachMarkdown.refIndex) !== null && _a !== void 0 ? _a : originalIndex;
1685
- for (i = 0; i < formInputRef.length; i++) {
1686
- ref_1 = formInputRef[i];
1687
- if (((_b = ref_1 === null || ref_1 === void 0 ? void 0 : ref_1.current) === null || _b === void 0 ? void 0 : _b.uploadPendingImages) &&
1688
- ((_c = ref_1 === null || ref_1 === void 0 ? void 0 : ref_1.current) === null || _c === void 0 ? void 0 : _c.getPendingImages)) {
1689
- refId = (_e = (_d = ref_1 === null || ref_1 === void 0 ? void 0 : ref_1.current) === null || _d === void 0 ? void 0 : _d.props) === null || _e === void 0 ? void 0 : _e.id;
1690
- if (refId === eachMarkdown.id || (!markdownRef && !refId)) {
1691
- markdownRef = ref_1;
1692
- if (refId === eachMarkdown.id) {
1693
- break;
1694
- }
1695
- }
1696
- }
1697
- }
1698
- if (!markdownRef) {
1699
- markdownRef = formInputRef[calculatedRefIndex];
1700
- }
1701
- if (!((_f = markdownRef === null || markdownRef === void 0 ? void 0 : markdownRef.current) === null || _f === void 0 ? void 0 : _f.uploadPendingImages)) return [3 /*break*/, 4];
1702
- _g.label = 1;
1685
+ markdownRef = formInputRef[calculatedRefIndex];
1686
+ if (!((_b = markdownRef === null || markdownRef === void 0 ? void 0 : markdownRef.current) === null || _b === void 0 ? void 0 : _b.uploadPendingImages)) return [3 /*break*/, 4];
1687
+ _c.label = 1;
1703
1688
  case 1:
1704
- _g.trys.push([1, 3, , 4]);
1689
+ _c.trys.push([1, 3, , 4]);
1705
1690
  fieldId = eachMarkdown.id;
1706
1691
  uploadHandler = createFirebaseUploadHandler_1(props.collectionId, dataId, fieldId);
1707
1692
  return [4 /*yield*/, markdownRef.current.uploadPendingImages(props.collectionId, dataId, fieldId, uploadHandler)];
1708
1693
  case 2:
1709
- _g.sent();
1694
+ _c.sent();
1710
1695
  updatedMarkdown = markdownRef.current.getMarkdown();
1711
1696
  if (objectId) {
1712
1697
  selectedData[objectId][fieldId] = updatedMarkdown;
@@ -1716,7 +1701,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
1716
1701
  }
1717
1702
  return [3 /*break*/, 4];
1718
1703
  case 3:
1719
- error_3 = _g.sent();
1704
+ error_3 = _c.sent();
1720
1705
  return [3 /*break*/, 4];
1721
1706
  case 4: return [2 /*return*/, null];
1722
1707
  }
@@ -1785,7 +1770,9 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
1785
1770
  case 11:
1786
1771
  _a++;
1787
1772
  return [3 /*break*/, 8];
1788
- case 12: return [2 /*return*/, clonedSelectedData];
1773
+ case 12:
1774
+ lastUploadedDataRef.current = clonedSelectedData;
1775
+ return [2 /*return*/, clonedSelectedData];
1789
1776
  }
1790
1777
  });
1791
1778
  }); };
@@ -3214,57 +3201,106 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
3214
3201
  });
3215
3202
  }); };
3216
3203
  var handleSubmit = function (isDraft) { return __awaiter(void 0, void 0, void 0, function () {
3217
- var preComplete, res, err_22;
3204
+ var preComplete, res, updatedMarkdownData_1, uploadedData_2, uploadTypes_1, err_22;
3218
3205
  var _a;
3219
- var _b, _c, _d, _e, _f, _g, _h;
3220
- return __generator(this, function (_j) {
3221
- switch (_j.label) {
3206
+ var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
3207
+ return __generator(this, function (_m) {
3208
+ switch (_m.label) {
3222
3209
  case 0:
3223
- _j.trys.push([0, 9, , 10]);
3210
+ _m.trys.push([0, 9, , 10]);
3224
3211
  setLoading(true);
3225
3212
  setModalVisible(true);
3226
3213
  preComplete = true;
3227
3214
  if (!((_b = props.bareSettings) === null || _b === void 0 ? void 0 : _b.bareUpdateHandlePreComplete)) return [3 /*break*/, 2];
3228
3215
  return [4 /*yield*/, props.bareSettings.bareUpdateHandlePreComplete(selectedData)];
3229
3216
  case 1:
3230
- preComplete = _j.sent();
3231
- _j.label = 2;
3217
+ preComplete = _m.sent();
3218
+ _m.label = 2;
3232
3219
  case 2:
3233
3220
  if (!preComplete)
3234
3221
  throw "Error";
3235
3222
  if (!((_c = props.bareSettings) === null || _c === void 0 ? void 0 : _c.bareUpdateHandleComplete)) return [3 /*break*/, 4];
3236
3223
  return [4 /*yield*/, props.bareSettings.bareUpdateHandleComplete(selectedData)];
3237
3224
  case 3:
3238
- _j.sent();
3225
+ _m.sent();
3239
3226
  return [3 /*break*/, 8];
3240
3227
  case 4: return [4 /*yield*/, handleSubmitData(undefined, undefined, undefined, undefined, undefined, undefined, isDraft)];
3241
3228
  case 5:
3242
- res = _j.sent();
3229
+ res = _m.sent();
3243
3230
  if (!res) return [3 /*break*/, 8];
3244
3231
  if (!((_d = props.bareSettings) === null || _d === void 0 ? void 0 : _d.bareUpdateHandlePostComplete)) return [3 /*break*/, 7];
3245
3232
  return [4 /*yield*/, props.bareSettings.bareUpdateHandlePostComplete(__assign((_a = {}, _a[serverId] = res, _a), selectedData))];
3246
3233
  case 6:
3247
- _j.sent();
3248
- _j.label = 7;
3234
+ _m.sent();
3235
+ _m.label = 7;
3249
3236
  case 7:
3250
3237
  handleCheckOfflineDataLength();
3251
- if (props.onComplete) {
3252
- props.onComplete(res);
3238
+ if (isDraft) {
3239
+ updatedMarkdownData_1 = {};
3240
+ structure.forEach(function (eachAttribute) {
3241
+ var _a, _b;
3242
+ if (eachAttribute.type === "markdown") {
3243
+ var originalIndex = structure.findIndex(function (m) { return m.id === eachAttribute.id; });
3244
+ var refIndex = (_a = eachAttribute.refIndex) !== null && _a !== void 0 ? _a : originalIndex;
3245
+ var ref_1 = modalFormInputRefs[refIndex];
3246
+ if ((_b = ref_1 === null || ref_1 === void 0 ? void 0 : ref_1.current) === null || _b === void 0 ? void 0 : _b.getMarkdown) {
3247
+ updatedMarkdownData_1[eachAttribute.id] =
3248
+ ref_1.current.getMarkdown();
3249
+ }
3250
+ }
3251
+ });
3252
+ uploadedData_2 = lastUploadedDataRef.current;
3253
+ if (uploadedData_2) {
3254
+ uploadTypes_1 = [
3255
+ "image",
3256
+ "file",
3257
+ "multipleImage",
3258
+ "multipleFile",
3259
+ "canvas",
3260
+ ];
3261
+ structure.forEach(function (eachAttribute) {
3262
+ if (uploadTypes_1.includes(eachAttribute.type)) {
3263
+ if (eachAttribute.type === "canvas" &&
3264
+ !eachAttribute.enableImageUpload)
3265
+ return;
3266
+ if (uploadedData_2[eachAttribute.id] !== undefined) {
3267
+ updatedMarkdownData_1[eachAttribute.id] =
3268
+ uploadedData_2[eachAttribute.id];
3269
+ }
3270
+ }
3271
+ });
3272
+ }
3273
+ if (Object.keys(updatedMarkdownData_1).length > 0) {
3274
+ setSelectedData(function (prev) { return (__assign(__assign({}, prev), updatedMarkdownData_1)); });
3275
+ }
3276
+ if (props.id === "new" || !props.id) {
3277
+ (_f = (_e = props.organise) === null || _e === void 0 ? void 0 : _e.handleNavigate) === null || _f === void 0 ? void 0 : _f.call(_e, "update", res, (_g = selectedTab === null || selectedTab === void 0 ? void 0 : selectedTab.id) !== null && _g !== void 0 ? _g : "general");
3278
+ }
3279
+ setNotification({
3280
+ type: true,
3281
+ title: "Draft Saved",
3282
+ msg: "Your changes have been saved",
3283
+ });
3253
3284
  }
3254
3285
  else {
3255
- if (selectedTab) {
3256
- (_f = (_e = props.organise) === null || _e === void 0 ? void 0 : _e.handleNavigate) === null || _f === void 0 ? void 0 : _f.call(_e, "read", res, selectedTab.id);
3286
+ if (props.onComplete) {
3287
+ props.onComplete(res);
3288
+ }
3289
+ else {
3290
+ if (selectedTab) {
3291
+ (_j = (_h = props.organise) === null || _h === void 0 ? void 0 : _h.handleNavigate) === null || _j === void 0 ? void 0 : _j.call(_h, "read", res, selectedTab.id);
3292
+ }
3293
+ else
3294
+ (_l = (_k = props.organise) === null || _k === void 0 ? void 0 : _k.handleNavigate) === null || _l === void 0 ? void 0 : _l.call(_k, "read", res, "general");
3257
3295
  }
3258
- else
3259
- (_h = (_g = props.organise) === null || _g === void 0 ? void 0 : _g.handleNavigate) === null || _h === void 0 ? void 0 : _h.call(_g, "read", res, "general");
3260
3296
  }
3261
- _j.label = 8;
3297
+ _m.label = 8;
3262
3298
  case 8:
3263
3299
  setModalVisible(false);
3264
3300
  setLoading(false);
3265
3301
  return [3 /*break*/, 10];
3266
3302
  case 9:
3267
- err_22 = _j.sent();
3303
+ err_22 = _m.sent();
3268
3304
  setModalVisible(false);
3269
3305
  setLoading(false);
3270
3306
  return [3 /*break*/, 10];
@@ -5339,7 +5375,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
5339
5375
  ? activeTab === tabId
5340
5376
  ? ""
5341
5377
  : "hidden"
5342
- : "") }, renderDataTemplateFormContent(selectedData, filterByTab, modalFormInputRefs, false, false, undefined, undefined, activeTab !== tabId)));
5378
+ : "") }, renderDataTemplateFormContent(selectedData, filterByTab, modalFormInputRefs, false, false, undefined, undefined)));
5343
5379
  }),
5344
5380
  !((_10 = props.bareSettings) === null || _10 === void 0 ? void 0 : _10.bareUpdateComponentAbove) &&
5345
5381
  ((_11 = props.bareSettings) === null || _11 === void 0 ? void 0 : _11.bareUpdateComponent) &&
@@ -5483,7 +5519,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
5483
5519
  //=====================================================================================
5484
5520
  //SECTION: Render Utils
5485
5521
  //=====================================================================================
5486
- var renderDataTemplateFormContent = function (state, model, ref, isObject, isObjectList, modalInput, parentData, markdownReadOnly) {
5522
+ var renderDataTemplateFormContent = function (state, model, ref, isObject, isObjectList, modalInput, parentData) {
5487
5523
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
5488
5524
  return (0, updateModule_1.renderDataTemplateForm)(state, model, ref, {
5489
5525
  handleOnChangeAddress: handleOnChangeAddress,
@@ -5534,7 +5570,7 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
5534
5570
  renderObjectTags: renderObjectTags,
5535
5571
  setSelectedData: setSelectedData,
5536
5572
  flexTableRefs: flexTableRefs,
5537
- }, { signing: signatureSigning, setSigning: setSignatureSigning }, { readOnly: markdownReadOnly ? true : false }, props.onComplete ? true : false, (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareOffline, (_h = (_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareUpdateColumnType) !== null && _h !== void 0 ? _h : "two", (_j = props.bareSettings) === null || _j === void 0 ? void 0 : _j.bareUpdateIndividualComponent, (_k = props.bareSettings) === null || _k === void 0 ? void 0 : _k.bareUpdateMobileView);
5573
+ }, { signing: signatureSigning, setSigning: setSignatureSigning }, props.onComplete ? true : false, (_f = props.bareSettings) === null || _f === void 0 ? void 0 : _f.bareOffline, (_h = (_g = props.bareSettings) === null || _g === void 0 ? void 0 : _g.bareUpdateColumnType) !== null && _h !== void 0 ? _h : "two", (_j = props.bareSettings) === null || _j === void 0 ? void 0 : _j.bareUpdateIndividualComponent, (_k = props.bareSettings) === null || _k === void 0 ? void 0 : _k.bareUpdateMobileView);
5538
5574
  };
5539
5575
  var renderGridAndListData = function (imageTag, type, kanbanGroupId, useColumnName) {
5540
5576
  var _a, _b;
@@ -6059,7 +6095,13 @@ exports.DataTemplate = (0, react_1.forwardRef)(function (props, ref) {
6059
6095
  return -1;
6060
6096
  return a.localeCompare(b);
6061
6097
  })
6062
- : Object.keys(groupedStructures_1);
6098
+ : Object.keys(groupedStructures_1).sort(function (a, b) {
6099
+ if (a === "Others")
6100
+ return 1;
6101
+ if (b === "Others")
6102
+ return -1;
6103
+ return 0;
6104
+ });
6063
6105
  var allTabSections_1 = [];
6064
6106
  sortedTabs.forEach(function (eachTab) {
6065
6107
  if (!allTabSections_1.includes(eachTab)) {