@solidxai/core-ui 0.1.14-beta.9 → 0.1.15-beta.0

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 (90) hide show
  1. package/dist/components/common/DropzonePlaceholder.d.ts +2 -1
  2. package/dist/components/common/DropzonePlaceholder.d.ts.map +1 -1
  3. package/dist/components/common/DropzonePlaceholder.js +10 -7
  4. package/dist/components/common/DropzonePlaceholder.js.map +1 -1
  5. package/dist/components/common/DropzonePlaceholder.tsx +14 -9
  6. package/dist/components/core/card/CardItem.js +1 -1
  7. package/dist/components/core/card/CardItem.js.map +1 -1
  8. package/dist/components/core/card/CardItem.tsx +1 -1
  9. package/dist/components/core/card/SolidCardView.d.ts.map +1 -1
  10. package/dist/components/core/card/SolidCardView.js +2 -2
  11. package/dist/components/core/card/SolidCardView.js.map +1 -1
  12. package/dist/components/core/card/SolidCardView.tsx +7 -12
  13. package/dist/components/core/common/SolidGlobalSearchElement.d.ts.map +1 -1
  14. package/dist/components/core/common/SolidGlobalSearchElement.js +101 -86
  15. package/dist/components/core/common/SolidGlobalSearchElement.js.map +1 -1
  16. package/dist/components/core/common/SolidGlobalSearchElement.tsx +161 -98
  17. package/dist/components/core/form/SolidFormView.d.ts.map +1 -1
  18. package/dist/components/core/form/SolidFormView.js +96 -72
  19. package/dist/components/core/form/SolidFormView.js.map +1 -1
  20. package/dist/components/core/form/SolidFormView.tsx +39 -17
  21. package/dist/components/core/form/fields/SolidMediaMultipleField.d.ts.map +1 -1
  22. package/dist/components/core/form/fields/SolidMediaMultipleField.js +3 -2
  23. package/dist/components/core/form/fields/SolidMediaMultipleField.js.map +1 -1
  24. package/dist/components/core/form/fields/SolidMediaMultipleField.tsx +3 -1
  25. package/dist/components/core/form/fields/SolidMediaSingleField.d.ts.map +1 -1
  26. package/dist/components/core/form/fields/SolidMediaSingleField.js +3 -2
  27. package/dist/components/core/form/fields/SolidMediaSingleField.js.map +1 -1
  28. package/dist/components/core/form/fields/SolidMediaSingleField.tsx +3 -1
  29. package/dist/components/core/form/fields/relations/SolidRelationManyToManyField.d.ts +1 -0
  30. package/dist/components/core/form/fields/relations/SolidRelationManyToManyField.d.ts.map +1 -1
  31. package/dist/components/core/form/fields/relations/SolidRelationManyToManyField.js +20 -2
  32. package/dist/components/core/form/fields/relations/SolidRelationManyToManyField.js.map +1 -1
  33. package/dist/components/core/form/fields/relations/SolidRelationManyToManyField.tsx +29 -2
  34. package/dist/components/core/form/fields/solidFields.module.css +7 -0
  35. package/dist/components/core/kanban/KanbanCard.js +1 -1
  36. package/dist/components/core/kanban/KanbanCard.js.map +1 -1
  37. package/dist/components/core/kanban/KanbanCard.tsx +1 -1
  38. package/dist/components/core/kanban/SolidKanbanView.d.ts.map +1 -1
  39. package/dist/components/core/kanban/SolidKanbanView.js +7 -1
  40. package/dist/components/core/kanban/SolidKanbanView.js.map +1 -1
  41. package/dist/components/core/kanban/SolidKanbanView.tsx +10 -5
  42. package/dist/components/core/list/SolidListView.d.ts.map +1 -1
  43. package/dist/components/core/list/SolidListView.js +44 -88
  44. package/dist/components/core/list/SolidListView.js.map +1 -1
  45. package/dist/components/core/list/SolidListView.tsx +19 -93
  46. package/dist/components/core/list/SolidListViewColumn.d.ts +2 -1
  47. package/dist/components/core/list/SolidListViewColumn.d.ts.map +1 -1
  48. package/dist/components/core/list/SolidListViewColumn.js +2 -2
  49. package/dist/components/core/list/SolidListViewColumn.js.map +1 -1
  50. package/dist/components/core/list/SolidListViewColumn.tsx +4 -3
  51. package/dist/components/core/list/columns/SolidRelationColumn.d.ts +1 -1
  52. package/dist/components/core/list/columns/SolidRelationColumn.d.ts.map +1 -1
  53. package/dist/components/core/list/columns/SolidRelationColumn.js +2 -2
  54. package/dist/components/core/list/columns/SolidRelationColumn.js.map +1 -1
  55. package/dist/components/core/list/columns/SolidRelationColumn.tsx +2 -2
  56. package/dist/components/core/list/columns/relations/SolidRelationManyToOneColumn.d.ts +2 -2
  57. package/dist/components/core/list/columns/relations/SolidRelationManyToOneColumn.d.ts.map +1 -1
  58. package/dist/components/core/list/columns/relations/SolidRelationManyToOneColumn.js +5 -4
  59. package/dist/components/core/list/columns/relations/SolidRelationManyToOneColumn.js.map +1 -1
  60. package/dist/components/core/list/columns/relations/SolidRelationManyToOneColumn.tsx +5 -4
  61. package/dist/components/core/model/FieldMetaDataForm.d.ts.map +1 -1
  62. package/dist/components/core/model/FieldMetaDataForm.js +147 -97
  63. package/dist/components/core/model/FieldMetaDataForm.js.map +1 -1
  64. package/dist/components/core/model/FieldMetaDataForm.tsx +123 -31
  65. package/dist/components/core/tree/SolidTreeView.d.ts.map +1 -1
  66. package/dist/components/core/tree/SolidTreeView.js +1 -1
  67. package/dist/components/core/tree/SolidTreeView.js.map +1 -1
  68. package/dist/components/core/tree/SolidTreeView.tsx +4 -12
  69. package/dist/components/layout/AdminHeaderActions.js +1 -1
  70. package/dist/components/layout/AdminHeaderActions.js.map +1 -1
  71. package/dist/components/layout/AdminHeaderActions.tsx +1 -1
  72. package/dist/helpers/getAcceptedFileTypes.d.ts +12 -2
  73. package/dist/helpers/getAcceptedFileTypes.d.ts.map +1 -1
  74. package/dist/helpers/getAcceptedFileTypes.js +72 -16
  75. package/dist/helpers/getAcceptedFileTypes.js.map +1 -1
  76. package/dist/helpers/getAcceptedFileTypes.tsx +101 -18
  77. package/dist/helpers/registry.js +2 -1
  78. package/dist/helpers/registry.js.map +1 -1
  79. package/dist/helpers/registry.ts +3 -1
  80. package/dist/index.d.ts +1 -1
  81. package/dist/index.d.ts.map +1 -1
  82. package/dist/index.js.map +1 -1
  83. package/dist/index.ts +1 -2
  84. package/dist/resources/globals.css +259 -109
  85. package/dist/resources/solid-responsive.css +1 -5
  86. package/dist/resources/solid-tailwind-generated.css +1 -1
  87. package/dist/resources/themes/solid-light-modern/theme.css +3 -4
  88. package/dist/types/index.d.ts +2 -4
  89. package/dist/types/solid-core.d.ts +4 -13
  90. package/package.json +1 -1
@@ -85,7 +85,7 @@ import { hasAnyRole } from "../../../helpers/rolesHelper";
85
85
  import SolidChatterLocaleTabView from "../locales/SolidChatterLocaleTabView";
86
86
  import { ERROR_MESSAGES } from "../../../constants/error-messages";
87
87
  import { useLazyGetMcpUrlQuery, useLazyGetSolidSettingsQuery } from "../../../redux/api/solidSettingsApi";
88
- import { getSettingsMap } from "../../../helpers/settingsPayload";
88
+ import { getSettingsMap, resolveRecordClickAction } from "../../../helpers/settingsPayload";
89
89
  import { SolidFormFooter } from "./SolidFormFooter";
90
90
  import { SolidVersionHistory, getWorkflowStatusLabel } from "./SolidVersionHistory";
91
91
  import { appendVersionHistoryPage, SolidWorkflowStatusPill, SolidWorkflowConfirmDialog, useDraftPublishWorkflow } from "./SolidDraftPublishWorkflow";
@@ -99,18 +99,20 @@ import { SolidHeaderRequestStatus } from "../../common/SolidHeaderRequestStatus"
99
99
  var LAYOUT_CLASSNAME_MAPPER = {
100
100
  grid: "flex flex-wrap",
101
101
  formgrid: "flex-wrap",
102
- "col-12": "w-full",
103
- "col-11": "w-[91.666667%]",
104
- "col-10": "w-[83.333333%]",
105
- "col-9": "w-3/4",
106
- "col-8": "w-[66.666667%]",
107
- "col-7": "w-[58.333333%]",
108
- "col-6": "w-1/2",
109
- "col-5": "w-[41.666667%]",
110
- "col-4": "w-1/3",
111
- "col-3": "w-1/4",
112
- "col-2": "w-[16.666667%]",
113
- "col-1": "w-[8.333333%]",
102
+ // Form-view columns render as flex items inside SolidRow, so basis preserves
103
+ // the old PrimeFlex column sizing without depending on width utilities.
104
+ "col-12": "basis-full",
105
+ "col-11": "basis-[91.666667%]",
106
+ "col-10": "basis-[83.333333%]",
107
+ "col-9": "basis-3/4",
108
+ "col-8": "basis-[66.666667%]",
109
+ "col-7": "basis-[58.333333%]",
110
+ "col-6": "basis-1/2",
111
+ "col-5": "basis-[41.666667%]",
112
+ "col-4": "basis-1/3",
113
+ "col-3": "basis-1/4",
114
+ "col-2": "basis-[16.666667%]",
115
+ "col-1": "basis-[8.333333%]",
114
116
  "flex-column": "flex-col",
115
117
  "flex-row": "flex-row",
116
118
  "flex-wrap": "flex-wrap",
@@ -177,7 +179,15 @@ var normalizeLayoutClassName = function (className) {
177
179
  var baseToken = parts[parts.length - 1];
178
180
  var responsivePrefix = parts.length > 1 ? "".concat(parts.slice(0, -1).join(":"), ":") : "";
179
181
  var mappedToken = mapLayoutToken(baseToken);
180
- return mappedToken ? "".concat(responsivePrefix).concat(mappedToken) : token;
182
+ if (!mappedToken)
183
+ return token;
184
+ // A single metadata token like `md:col-6` can expand to multiple classes,
185
+ // so re-apply the responsive prefix to every emitted utility.
186
+ return mappedToken
187
+ .split(/\s+/)
188
+ .filter(Boolean)
189
+ .map(function (mappedClass) { return "".concat(responsivePrefix).concat(mappedClass); })
190
+ .join(" ");
181
191
  })
182
192
  .join(" ");
183
193
  };
@@ -534,46 +544,46 @@ var SolidPage = function (_a) {
534
544
  // });
535
545
  // };
536
546
  var SolidFormView = function (params) {
537
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
538
- var _3 = useSession(), session = _3.data, status = _3.status;
547
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
548
+ var _6 = useSession(), session = _6.data, status = _6.status;
539
549
  var user = session === null || session === void 0 ? void 0 : session.user;
540
550
  var pathname = usePathname();
541
551
  var router = useRouter();
542
552
  var dispatch = useDispatch();
543
553
  var searchParams = useSearchParams();
544
- var _4 = useState(false), redirectToList = _4[0], setRedirectToList = _4[1];
545
- var _5 = useState('en'), selectedLocale = _5[0], setSelectedLocale = _5[1];
546
- var _6 = useState(null), defaultEntityLocaleId = _6[0], setDefaultEntityLocaleId = _6[1];
547
- var _7 = useState(false), isDeleteDialogVisible = _7[0], setDeleteDialogVisible = _7[1];
548
- var _8 = useState(false), isLayoutDialogVisible = _8[0], setLayoutDialogVisible = _8[1];
549
- var _9 = useState([]), actionsAllowed = _9[0], setActionsAllowed = _9[1];
550
- var _10 = useState(params.embeded === true ? "edit" : "view"), viewMode = _10[0], setViewMode = _10[1];
551
- var _11 = useState(false), createMode = _11[0], setCreateMode = _11[1];
552
- var _12 = useState(false), openLightbox = _12[0], setOpenLightbox = _12[1];
553
- var _13 = useState([]), lightboxUrls = _13[0], setLightboxUrls = _13[1];
554
- var _14 = useState(false), isShowChatter = _14[0], setShowChatter = _14[1];
555
- var _15 = useState(360), chatterLocaleWidth = _15[0], setChatterLocaleWidth = _15[1];
556
- var _16 = useState(false), isResizingChatterLocale = _16[0], setIsResizingChatterLocale = _16[1];
557
- var _17 = useState(false), isSubmitting = _17[0], setIsSubmitting = _17[1];
558
- var _18 = useState(false), isMobileViewport = _18[0], setIsMobileViewport = _18[1];
554
+ var _7 = useState(false), redirectToList = _7[0], setRedirectToList = _7[1];
555
+ var _8 = useState('en'), selectedLocale = _8[0], setSelectedLocale = _8[1];
556
+ var _9 = useState(null), defaultEntityLocaleId = _9[0], setDefaultEntityLocaleId = _9[1];
557
+ var _10 = useState(false), isDeleteDialogVisible = _10[0], setDeleteDialogVisible = _10[1];
558
+ var _11 = useState(false), isLayoutDialogVisible = _11[0], setLayoutDialogVisible = _11[1];
559
+ var _12 = useState([]), actionsAllowed = _12[0], setActionsAllowed = _12[1];
560
+ var _13 = useState(params.embeded === true ? "edit" : "view"), viewMode = _13[0], setViewMode = _13[1];
561
+ var _14 = useState(false), createMode = _14[0], setCreateMode = _14[1];
562
+ var _15 = useState(false), openLightbox = _15[0], setOpenLightbox = _15[1];
563
+ var _16 = useState([]), lightboxUrls = _16[0], setLightboxUrls = _16[1];
564
+ var _17 = useState(false), isShowChatter = _17[0], setShowChatter = _17[1];
565
+ var _18 = useState(360), chatterLocaleWidth = _18[0], setChatterLocaleWidth = _18[1];
566
+ var _19 = useState(false), isResizingChatterLocale = _19[0], setIsResizingChatterLocale = _19[1];
567
+ var _20 = useState(false), isSubmitting = _20[0], setIsSubmitting = _20[1];
568
+ var _21 = useState(false), isMobileViewport = _21[0], setIsMobileViewport = _21[1];
559
569
  var solidFormWrapperRef = useRef(null);
560
570
  var embeddedRelationSubmitActionRef = useRef("close");
561
571
  var formikRef = useRef(null);
562
572
  var tabFieldsRef = useRef([]);
563
- var _19 = useState(null), requestedTab = _19[0], setRequestedTab = _19[1];
564
- var _20 = useState(0), requestedTabVersion = _20[0], setRequestedTabVersion = _20[1];
565
- var _21 = useState(""), solidWorkflowFieldValue = _21[0], setSolidWorkflowFieldValue = _21[1];
566
- var _22 = useState(1), defaultTabViewOptionIndex = _22[0], setDefaultTabViewOptionIndex = _22[1];
573
+ var _22 = useState(null), requestedTab = _22[0], setRequestedTab = _22[1];
574
+ var _23 = useState(0), requestedTabVersion = _23[0], setRequestedTabVersion = _23[1];
575
+ var _24 = useState(""), solidWorkflowFieldValue = _24[0], setSolidWorkflowFieldValue = _24[1];
576
+ var _25 = useState(1), defaultTabViewOptionIndex = _25[0], setDefaultTabViewOptionIndex = _25[1];
567
577
  var errorFields = [];
568
578
  var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
569
- var _23 = useState(null), mcpUrl = _23[0], setMcpUrl = _23[1];
579
+ var _26 = useState(null), mcpUrl = _26[0], setMcpUrl = _26[1];
570
580
  var getMcpUrl = useLazyGetMcpUrlQuery()[0];
571
581
  // when rendering the form view we will optionally get action params...
572
582
  // these we can bubble up in the event that is being raised onFormLayoutLoad, onFormDataLoad & onFormLoad
573
583
  var actionName = searchParams.get('actionName');
574
584
  var actionType = searchParams.get('actionType');
575
585
  var actionContext = searchParams.get('actionContext');
576
- var _24 = useLazyGetSolidSettingsQuery(), trigger = _24[0], solidSettingsData = _24[1].data;
586
+ var _27 = useLazyGetSolidSettingsQuery(), trigger = _27[0], solidSettingsData = _27[1].data;
577
587
  var solidSettingsMap = useMemo(function () { return getSettingsMap(solidSettingsData); }, [solidSettingsData]);
578
588
  useEffect(function () {
579
589
  trigger(""); // Fetch settings on mount
@@ -735,27 +745,30 @@ var SolidFormView = function (params) {
735
745
  // }y
736
746
  var entityApi = createSolidEntityApi(params.modelName);
737
747
  var useCreateSolidEntityMutation = entityApi.useCreateSolidEntityMutation, useDeleteSolidEntityMutation = entityApi.useDeleteSolidEntityMutation, useGetSolidEntityByIdQuery = entityApi.useGetSolidEntityByIdQuery, useUpdateSolidEntityMutation = entityApi.useUpdateSolidEntityMutation, usePatchUpdateSolidEntityMutation = entityApi.usePatchUpdateSolidEntityMutation;
738
- var _25 = useCreateSolidEntityMutation(), createEntity = _25[0], _26 = _25[1], isEntityCreateSuccess = _26.isSuccess, isEntityCreateError = _26.isError, entityCreateError = _26.error;
739
- var _27 = useUpdateSolidEntityMutation(), updateEntity = _27[0], _28 = _27[1], isEntityUpdateSuceess = _28.isSuccess, isEntityUpdateError = _28.isError, entityUpdateError = _28.error;
740
- var _29 = useDeleteSolidEntityMutation(), deleteEntity = _29[0], _30 = _29[1], isEntityDeleteSuceess = _30.isSuccess, isEntityDeleteError = _30.isError, entityDeleteError = _30.error;
741
- var _31 = usePatchUpdateSolidEntityMutation(), patchEntity = _31[0], _32 = _31[1], isEntityPatchSuceess = _32.isSuccess, isEntityPatchError = _32.isError, entityPatchError = _32.error;
742
- var _33 = useDraftPublishWorkflow({
748
+ var _28 = useCreateSolidEntityMutation(), createEntity = _28[0], _29 = _28[1], isEntityCreateSuccess = _29.isSuccess, isEntityCreateError = _29.isError, entityCreateError = _29.error;
749
+ var _30 = useUpdateSolidEntityMutation(), updateEntity = _30[0], _31 = _30[1], isEntityUpdateSuceess = _31.isSuccess, isEntityUpdateError = _31.isError, entityUpdateError = _31.error;
750
+ var _32 = useDeleteSolidEntityMutation(), deleteEntity = _32[0], _33 = _32[1], isEntityDeleteSuceess = _33.isSuccess, isEntityDeleteError = _33.isError, entityDeleteError = _33.error;
751
+ var _34 = usePatchUpdateSolidEntityMutation(), patchEntity = _34[0], _35 = _34[1], isEntityPatchSuceess = _35.isSuccess, isEntityPatchError = _35.isError, entityPatchError = _35.error;
752
+ var _36 = useDraftPublishWorkflow({
743
753
  entityApi: entityApi,
744
754
  id: params.id,
745
755
  onWorkflowChange: function () { return refetchSolidFormViewData(); },
746
756
  onEmbeddedFormSave: params.onEmbeddedFormSave,
747
- }), published = _33.published, setPublished = _33.setPublished, confirmVisible = _33.confirmVisible, workflowConfirmAction = _33.workflowConfirmAction, handleDraftPublishWorkFlow = _33.handleDraftPublishWorkFlow, handleConfirmAccept = _33.handleConfirmAccept, handleConfirmReject = _33.handleConfirmReject, isEntityPublishedSuccess = _33.isEntityPublishedSuccess, isEntityUnpublishedSuccess = _33.isEntityUnpublishedSuccess;
757
+ }), published = _36.published, setPublished = _36.setPublished, confirmVisible = _36.confirmVisible, workflowConfirmAction = _36.workflowConfirmAction, handleDraftPublishWorkFlow = _36.handleDraftPublishWorkFlow, handleConfirmAccept = _36.handleConfirmAccept, handleConfirmReject = _36.handleConfirmReject, isEntityPublishedSuccess = _36.isEntityPublishedSuccess, isEntityUnpublishedSuccess = _36.isEntityUnpublishedSuccess;
748
758
  // - - - - - - - - - - - -- - - - - - - - - - - - METADATA here
749
759
  // Get the form view layout & metadata first.
750
760
  var formViewMetaDataQs = qs.stringify(__assign(__assign({}, params), { viewType: 'form', defaultEntityLocaleId: defaultEntityLocaleId }), {
751
761
  encodeValuesOnly: true,
752
762
  });
753
- var _34 = useState({}), formViewMetaData = _34[0], setFormViewMetaData = _34[1];
754
- var _35 = useState(null), formViewLayout = _35[0], setFormViewLayout = _35[1];
755
- var _36 = useGetSolidViewLayoutQuery(formViewMetaDataQs), solidFormViewMetaData = _36.data, solidFormViewMetaDataIsLoading = _36.isLoading;
763
+ var _37 = useState({}), formViewMetaData = _37[0], setFormViewMetaData = _37[1];
764
+ var _38 = useState(null), formViewLayout = _38[0], setFormViewLayout = _38[1];
765
+ var _39 = useGetSolidViewLayoutQuery(formViewMetaDataQs), solidFormViewMetaData = _39.data, solidFormViewMetaDataIsLoading = _39.isLoading;
766
+ var recordClickAction = resolveRecordClickAction(solidSettingsMap, {
767
+ isSystemModule: ((_c = (_b = (_a = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidView) === null || _b === void 0 ? void 0 : _b.module) === null || _c === void 0 ? void 0 : _c.isSystem) === true,
768
+ });
756
769
  var triggerGetSolidViewLayout = useLazyGetSolidViewLayoutQuery()[0];
757
- var entityDisplayName = ((_c = (_b = (_a = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _a === void 0 ? void 0 : _a.solidView) === null || _b === void 0 ? void 0 : _b.model) === null || _c === void 0 ? void 0 : _c.displayName) || params.modelName;
758
- var _37 = useState(true), refreshChatterMessage = _37[0], setRefreshChatterMessage = _37[1];
770
+ var entityDisplayName = ((_f = (_e = (_d = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _d === void 0 ? void 0 : _d.solidView) === null || _e === void 0 ? void 0 : _e.model) === null || _f === void 0 ? void 0 : _f.displayName) || params.modelName;
771
+ var _40 = useState(true), refreshChatterMessage = _40[0], setRefreshChatterMessage = _40[1];
759
772
  useEffect(function () {
760
773
  var _a;
761
774
  if (isEntityCreateSuccess == true ||
@@ -844,18 +857,18 @@ var SolidFormView = function (params) {
844
857
  isEntityPatchError,
845
858
  ]);
846
859
  var onFormikSubmit = function (values) { return __awaiter(void 0, void 0, void 0, function () {
847
- var solidView, solidFieldsMetadata, layoutFieldsObj, formData_1, solidWorkflowField, workflowFieldMetadata, workflowFieldContext, workflowSolidField, result, baseFormPath, queryParams, saveParentRelationField, nextViewMode, result, nextId, queryParams, updatedPath, err_1;
848
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
849
- return __generator(this, function (_m) {
850
- switch (_m.label) {
860
+ var solidView, solidFieldsMetadata, layoutFieldsObj, formData_1, solidWorkflowField, workflowFieldMetadata, workflowFieldContext, workflowSolidField, result, baseFormPath, queryParams, saveParentRelationField, nextViewMode, result, nextId, nextViewMode, queryParams, updatedPath, err_1;
861
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
862
+ return __generator(this, function (_p) {
863
+ switch (_p.label) {
851
864
  case 0:
852
865
  solidView = solidFormViewMetaData.data.solidView;
853
866
  solidFieldsMetadata = solidFormViewMetaData.data.solidFieldsMetadata;
854
867
  layoutFieldsObj = getLayoutFieldsAsObject([formViewLayout]);
855
868
  setIsSubmitting(true);
856
- _m.label = 1;
869
+ _p.label = 1;
857
870
  case 1:
858
- _m.trys.push([1, 7, 8, 9]);
871
+ _p.trys.push([1, 7, 8, 9]);
859
872
  formData_1 = new FormData();
860
873
  // Iterate through the keys in the values object
861
874
  Object.entries(values).forEach(function (_a) {
@@ -910,7 +923,7 @@ var SolidFormView = function (params) {
910
923
  if (!(params.id === 'new')) return [3 /*break*/, 4];
911
924
  return [4 /*yield*/, createEntity(formData_1).unwrap()];
912
925
  case 3:
913
- result = _m.sent();
926
+ result = _p.sent();
914
927
  dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.FORM_SAVED, detail: ERROR_MESSAGES.FORM_SAVED_SUCCESSFULLY }));
915
928
  // if (!params.embeded && result?.data?.id) {
916
929
  // const newPathname = pathname.replace(/new$/, result.data.id);
@@ -935,28 +948,39 @@ var SolidFormView = function (params) {
935
948
  return [2 /*return*/, result];
936
949
  case 4: return [4 /*yield*/, updateEntity({ id: +params.id, data: formData_1 }).unwrap()];
937
950
  case 5:
938
- result = _m.sent();
951
+ result = _p.sent();
952
+ // Keep the current screen in sync with the normalized payload returned by the API
953
+ // so toggling view/edit after save does not continue showing stale pre-save values.
954
+ if (result === null || result === void 0 ? void 0 : result.data) {
955
+ setInitialEntityData(result.data);
956
+ (_l = formikRef.current) === null || _l === void 0 ? void 0 : _l.resetForm({ values: result.data });
957
+ }
939
958
  // const result = await updateEntity({ id: +params.id, data: formData }).unwrap();
940
959
  if (!params.embeded) {
941
960
  dispatch(showToast({ severity: "success", summary: ERROR_MESSAGES.FORM_UPDATE, detail: ERROR_MESSAGES.FORM_UPDATE_SUCCESSFULLY }));
942
961
  if ((result === null || result === void 0 ? void 0 : result.statusCode) === 200) {
943
- nextId = (_l = result === null || result === void 0 ? void 0 : result.data) === null || _l === void 0 ? void 0 : _l.id;
962
+ nextId = (_m = result === null || result === void 0 ? void 0 : result.data) === null || _m === void 0 ? void 0 : _m.id;
963
+ nextViewMode = recordClickAction === "edit" ? "edit" : "view";
964
+ (_o = formikRef.current) === null || _o === void 0 ? void 0 : _o.resetForm({ values: values });
944
965
  if (nextId && String(nextId) !== String(params.id)) {
945
966
  queryParams = new URLSearchParams(searchParams.toString());
946
- queryParams.set("viewMode", "view");
967
+ queryParams.set("viewMode", nextViewMode);
947
968
  updatedPath = pathname.replace(/\/form\/[^/]+/, "/form/".concat(nextId));
948
969
  router.replace("".concat(updatedPath, "?").concat(queryParams.toString()));
949
- setViewMode("view");
970
+ setViewMode(nextViewMode);
950
971
  }
951
972
  else {
952
- updateViewMode("view");
973
+ if (nextViewMode === "view")
974
+ updateViewMode("view");
975
+ else
976
+ setViewMode("edit");
953
977
  }
954
978
  }
955
979
  }
956
980
  return [2 /*return*/, result];
957
981
  case 6: return [3 /*break*/, 9];
958
982
  case 7:
959
- err_1 = _m.sent();
983
+ err_1 = _p.sent();
960
984
  console.error(ERROR_MESSAGES.ENTITY_FAILED, err_1);
961
985
  return [3 /*break*/, 9];
962
986
  case 8:
@@ -1005,7 +1029,7 @@ var SolidFormView = function (params) {
1005
1029
  toPopulateMedia.push(fieldMetadata.name);
1006
1030
  }
1007
1031
  }
1008
- if (((_d = formViewLayout.attrs) === null || _d === void 0 ? void 0 : _d.workflowField) && ((_e = solidFieldsMetadata[formViewLayout.attrs.workflowField]) === null || _e === void 0 ? void 0 : _e.type) === 'relation' && ((_f = solidFieldsMetadata[formViewLayout.attrs.workflowField]) === null || _f === void 0 ? void 0 : _f.relationType) === 'many-to-one') {
1032
+ if (((_g = formViewLayout.attrs) === null || _g === void 0 ? void 0 : _g.workflowField) && ((_h = solidFieldsMetadata[formViewLayout.attrs.workflowField]) === null || _h === void 0 ? void 0 : _h.type) === 'relation' && ((_j = solidFieldsMetadata[formViewLayout.attrs.workflowField]) === null || _j === void 0 ? void 0 : _j.relationType) === 'many-to-one') {
1009
1033
  toPopulate.push(solidFieldsMetadata[formViewLayout.attrs.workflowField].name);
1010
1034
  }
1011
1035
  }
@@ -1014,10 +1038,10 @@ var SolidFormView = function (params) {
1014
1038
  var formViewDataQs = qs.stringify({ populate: toPopulate, populateMedia: toPopulateMedia }, {
1015
1039
  encodeValuesOnly: true,
1016
1040
  });
1017
- var _38 = useState({}), initialEntityData = _38[0], setInitialEntityData = _38[1];
1018
- var _39 = useGetSolidEntityByIdQuery({ id: params.id, qs: formViewDataQs }, {
1041
+ var _41 = useState({}), initialEntityData = _41[0], setInitialEntityData = _41[1];
1042
+ var _42 = useGetSolidEntityByIdQuery({ id: params.id, qs: formViewDataQs }, {
1019
1043
  skip: params.id === 'new'
1020
- }), solidFormViewData = _39.data, solidFormViewDataIsLoading = _39.isLoading, refetchSolidFormViewData = _39.refetch;
1044
+ }), solidFormViewData = _42.data, solidFormViewDataIsLoading = _42.isLoading, refetchSolidFormViewData = _42.refetch;
1021
1045
  useEffect(function () {
1022
1046
  if (params.id !== 'new') {
1023
1047
  refetchSolidFormViewData();
@@ -1036,7 +1060,7 @@ var SolidFormView = function (params) {
1036
1060
  setFormViewMetaData(solidFormViewMetaData);
1037
1061
  }
1038
1062
  }, [solidFormViewMetaData, solidFormViewData]);
1039
- var isDraftPublishWorkflowEnabled = ((_j = (_h = (_g = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _g === void 0 ? void 0 : _g.solidView) === null || _h === void 0 ? void 0 : _h.model) === null || _j === void 0 ? void 0 : _j.draftPublishWorkflow) === true;
1063
+ var isDraftPublishWorkflowEnabled = ((_m = (_l = (_k = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _k === void 0 ? void 0 : _k.solidView) === null || _l === void 0 ? void 0 : _l.model) === null || _m === void 0 ? void 0 : _m.draftPublishWorkflow) === true;
1040
1064
  var currentWorkflowStatusLabel = isDraftPublishWorkflowEnabled && params.id !== 'new'
1041
1065
  ? getWorkflowStatusLabel(solidFormViewData === null || solidFormViewData === void 0 ? void 0 : solidFormViewData.data)
1042
1066
  : null;
@@ -1332,7 +1356,7 @@ var SolidFormView = function (params) {
1332
1356
  }
1333
1357
  var solidField = fieldFactory(fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.type, fieldContext);
1334
1358
  if (!(fieldMetadata === null || fieldMetadata === void 0 ? void 0 : fieldMetadata.type)) {
1335
- var errorMessage = ((_k = formLayoutField === null || formLayoutField === void 0 ? void 0 : formLayoutField.attrs) === null || _k === void 0 ? void 0 : _k.label) ? (_l = formLayoutField === null || formLayoutField === void 0 ? void 0 : formLayoutField.attrs) === null || _l === void 0 ? void 0 : _l.label : formLayoutField.attrs.name;
1359
+ var errorMessage = ((_o = formLayoutField === null || formLayoutField === void 0 ? void 0 : formLayoutField.attrs) === null || _o === void 0 ? void 0 : _o.label) ? (_p = formLayoutField === null || formLayoutField === void 0 ? void 0 : formLayoutField.attrs) === null || _p === void 0 ? void 0 : _p.label : formLayoutField.attrs.name;
1336
1360
  if (!errorFields.includes(errorMessage)) {
1337
1361
  // errorFields.push(errorMessage);
1338
1362
  }
@@ -1590,7 +1614,7 @@ var SolidFormView = function (params) {
1590
1614
  var onDeleteClose = function () {
1591
1615
  setDeleteDialogVisible(false);
1592
1616
  };
1593
- var dynamicHeader = (_m = solidView_1.layout) === null || _m === void 0 ? void 0 : _m.header;
1617
+ var dynamicHeader = (_q = solidView_1.layout) === null || _q === void 0 ? void 0 : _q.header;
1594
1618
  var DynamicHeaderComponent = null;
1595
1619
  if (dynamicHeader) {
1596
1620
  DynamicHeaderComponent = getExtensionComponent(dynamicHeader);
@@ -1618,8 +1642,8 @@ var SolidFormView = function (params) {
1618
1642
  setDefaultTabViewOptionIndex(2);
1619
1643
  }
1620
1644
  };
1621
- var showChatterInfo = Boolean(((_q = (_p = (_o = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _o === void 0 ? void 0 : _o.solidView) === null || _p === void 0 ? void 0 : _p.model) === null || _q === void 0 ? void 0 : _q.draftPublishWorkflow)
1622
- || ((_t = (_s = (_r = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _r === void 0 ? void 0 : _r.solidView) === null || _s === void 0 ? void 0 : _s.model) === null || _t === void 0 ? void 0 : _t.internationalisation));
1645
+ var showChatterInfo = Boolean(((_t = (_s = (_r = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _r === void 0 ? void 0 : _r.solidView) === null || _s === void 0 ? void 0 : _s.model) === null || _t === void 0 ? void 0 : _t.draftPublishWorkflow)
1646
+ || ((_w = (_v = (_u = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _u === void 0 ? void 0 : _u.solidView) === null || _v === void 0 ? void 0 : _v.model) === null || _w === void 0 ? void 0 : _w.internationalisation));
1623
1647
  //en 4 null
1624
1648
  var handleLocaleChangeRedirect = function (locale, defaultEntityLocaleId, viewMode) { return __awaiter(void 0, void 0, void 0, function () {
1625
1649
  var newViewMode, defaultApplicableLocales, matchingLocale, resolvedDefaultEntityLocaleId, freshQuery, freshResponse, freshApplicableLocales, _a, basePath, entityPart, updatedPath, queryParams;
@@ -1688,11 +1712,11 @@ var SolidFormView = function (params) {
1688
1712
  return slide;
1689
1713
  })
1690
1714
  .filter(function (slide) { return !!slide; });
1691
- return (_jsxs("div", { className: "solid-form-wrapper", ref: solidFormWrapperRef, children: [_jsxs("div", { className: "solid-form-section", children: [_jsxs("form", { style: { width: '100%' }, onSubmit: formik.handleSubmit, children: [_jsx(FormikSubmitWatcher, { formik: formik, tabFieldsRef: tabFieldsRef, embeded: params.embeded, searchParams: searchParams, setRequestedTab: setRequestedTab, setRequestedTabVersion: setRequestedTabVersion }), _jsx(SolidFormActionHeader, { formik: formik, formData: solidFormViewData === null || solidFormViewData === void 0 ? void 0 : solidFormViewData.data, params: params, actionsAllowed: actionsAllowed, formViewLayout: formViewLayout, solidView: solidView_1, solidFormViewMetaData: solidFormViewMetaData, initialEntityData: solidFormViewData ? solidFormViewData.data : {}, setDeleteDialogVisible: setDeleteDialogVisible, setLayoutDialogVisible: setLayoutDialogVisible, setRedirectToList: setRedirectToList, viewMode: viewMode, setViewMode: setViewMode, solidWorkflowFieldValue: solidWorkflowFieldValue, setSolidWorkflowFieldValue: setSolidWorkflowFieldValue, draftEnabled: (_w = (_v = (_u = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _u === void 0 ? void 0 : _u.solidView) === null || _v === void 0 ? void 0 : _v.model) === null || _w === void 0 ? void 0 : _w.draftPublishWorkflow, publish: published, internationalisationEnabled: (_z = (_y = (_x = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _x === void 0 ? void 0 : _x.solidView) === null || _y === void 0 ? void 0 : _y.model) === null || _z === void 0 ? void 0 : _z.internationalisation, handleDraftPublishWorkFlow: handleDraftPublishWorkFlow, onStepperUpdate: function () { return setRefreshChatterMessage(true); }, isSubmitting: isSubmitting, setEmbeddedRelationSubmitAction: function (action) {
1715
+ return (_jsxs("div", { className: "solid-form-wrapper", ref: solidFormWrapperRef, children: [_jsxs("div", { className: "solid-form-section", children: [_jsxs("form", { style: { width: '100%' }, onSubmit: formik.handleSubmit, children: [_jsx(FormikSubmitWatcher, { formik: formik, tabFieldsRef: tabFieldsRef, embeded: params.embeded, searchParams: searchParams, setRequestedTab: setRequestedTab, setRequestedTabVersion: setRequestedTabVersion }), _jsx(SolidFormActionHeader, { formik: formik, formData: solidFormViewData === null || solidFormViewData === void 0 ? void 0 : solidFormViewData.data, params: params, actionsAllowed: actionsAllowed, formViewLayout: formViewLayout, solidView: solidView_1, solidFormViewMetaData: solidFormViewMetaData, initialEntityData: solidFormViewData ? solidFormViewData.data : {}, setDeleteDialogVisible: setDeleteDialogVisible, setLayoutDialogVisible: setLayoutDialogVisible, setRedirectToList: setRedirectToList, viewMode: viewMode, setViewMode: setViewMode, solidWorkflowFieldValue: solidWorkflowFieldValue, setSolidWorkflowFieldValue: setSolidWorkflowFieldValue, draftEnabled: (_z = (_y = (_x = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _x === void 0 ? void 0 : _x.solidView) === null || _y === void 0 ? void 0 : _y.model) === null || _z === void 0 ? void 0 : _z.draftPublishWorkflow, publish: published, internationalisationEnabled: (_2 = (_1 = (_0 = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _0 === void 0 ? void 0 : _0.solidView) === null || _1 === void 0 ? void 0 : _1.model) === null || _2 === void 0 ? void 0 : _2.internationalisation, handleDraftPublishWorkFlow: handleDraftPublishWorkFlow, onStepperUpdate: function () { return setRefreshChatterMessage(true); }, isSubmitting: isSubmitting, setEmbeddedRelationSubmitAction: function (action) {
1692
1716
  embeddedRelationSubmitActionRef.current = action;
1693
1717
  },
1694
1718
  // headerRequestStatusLabel={isSubmitting ? "Saving..." : null}
1695
- showMobileOpenChatter: isMobileViewport && !isShowChatter && params.embeded !== true, onMobileOpenChatter: function () { return setShowChatter(true); } }), _jsxs("div", { className: "px-3 py-3 md:p-4 solid-form-content md:pt-1 ".concat(createMode ? 'solid-create-mode-form-content' : 'solid-edit-mode-form-content', " ").concat(params.embeded === true ? 'h-auto' : ''), children: [DynamicHeaderComponent && _jsx(DynamicHeaderComponent, {}), params.id === 'new' && DynamicFormComponentNew ? (_jsx(DynamicFormComponentNew, { params: params })) : params.id !== 'new' && DynamicFormComponentEdit ? (_jsx(DynamicFormComponentEdit, { params: params })) : (renderFormDynamically(formViewMetaData, formViewLayout))] })] }), _jsx(SolidFormFooter, { params: params, internationalisationEnabled: (_2 = (_1 = (_0 = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _0 === void 0 ? void 0 : _0.solidView) === null || _1 === void 0 ? void 0 : _1.model) === null || _2 === void 0 ? void 0 : _2.internationalisation })] }), params.embeded !== true &&
1719
+ showMobileOpenChatter: isMobileViewport && !isShowChatter && params.embeded !== true, onMobileOpenChatter: function () { return setShowChatter(true); } }), _jsxs("div", { className: "px-3 py-3 md:p-4 solid-form-content md:pt-1 ".concat(createMode ? 'solid-create-mode-form-content' : 'solid-edit-mode-form-content', " ").concat(params.embeded === true ? 'h-auto' : ''), children: [DynamicHeaderComponent && _jsx(DynamicHeaderComponent, {}), params.id === 'new' && DynamicFormComponentNew ? (_jsx(DynamicFormComponentNew, { params: params })) : params.id !== 'new' && DynamicFormComponentEdit ? (_jsx(DynamicFormComponentEdit, { params: params })) : (renderFormDynamically(formViewMetaData, formViewLayout))] })] }), _jsx(SolidFormFooter, { params: params, internationalisationEnabled: (_5 = (_4 = (_3 = solidFormViewMetaData === null || solidFormViewMetaData === void 0 ? void 0 : solidFormViewMetaData.data) === null || _3 === void 0 ? void 0 : _3.solidView) === null || _4 === void 0 ? void 0 : _4.model) === null || _5 === void 0 ? void 0 : _5.internationalisation })] }), params.embeded !== true &&
1696
1720
  _jsxs("div", { className: "chatter-section ".concat(isShowChatter === false ? 'collapsed' : 'open'), style: { width: chatterLocaleWidth }, children: [isShowChatter && (_jsx("div", { style: {
1697
1721
  width: 5,
1698
1722
  cursor: 'col-resize',