npm - @solidstarters/solid-core-ui - Versions diffs - 1.1.72 → 1.1.74 - Mend

@solidstarters/solid-core-ui 1.1.72 → 1.1.74

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 (58) hide show

package/dist/components/common/SolidBreadcrumb.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidBreadcrumb.d.ts","sourceRoot":"","sources":["../../../src/components/common/SolidBreadcrumb.tsx"],"names":[],"mappings":"AAYA,UAAU,KAAK;IACb,qBAAqB,CAAC,EAAE,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB;AAED,eAAO,MAAM,eAAe,UAAW,KAAK,~~4CAqF3C~~,CAAC"}
1	+ {"version":3,"file":"SolidBreadcrumb.d.ts","sourceRoot":"","sources":["../../../src/components/common/SolidBreadcrumb.tsx"],"names":[],"mappings":"AAYA,UAAU,KAAK;IACb,qBAAqB,CAAC,EAAE,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,GAAG,CAAC;CACzB;AAED,eAAO,MAAM,eAAe,UAAW,KAAK,4CAuF3C,CAAC"}

package/dist/components/common/SolidBreadcrumb.js CHANGED Viewed

@@ -33,8 +33,10 @@ export var SolidBreadcrumb = function (props) {
     var queryUserKeyField = searchParams.get("userKeyField");
     useEffect(function () {
         if (segments.length === 6 && segments[4] === "form" && userKeyFieldValue && !queryUserKeyField) {
-            var newUrl = "".concat(pathname, "?userKeyField=").concat(encodeURIComponent(userKeyFieldValue));
-            router.replace(newUrl, { scroll: false });
+            var params = new URLSearchParams(searchParams.toString());
+            params.set("userKeyField", userKeyFieldValue);
+            var newUrl = "".concat(pathname, "?").concat(params.toString());
+            router.push(newUrl, { scroll: false });
         }
     }, [pathname, userKeyFieldValue, queryUserKeyField, router]);
     var _c = useState(null), fromView = _c[0], setFromView = _c[1];
@@ -72,7 +74,7 @@ export var SolidBreadcrumb = function (props) {
         }
         if (segments.length === 6 && segments[4] === "form") {
             breadcrumbItems.push({
-                label: queryUserKeyField || segments[5],
+                label: queryUserKeyField ? decodeURIComponent(queryUserKeyField) : segments[5],
             });
         }
     }

package/dist/components/common/SolidBreadcrumb.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidBreadcrumb.js","sourceRoot":"","sources":["../../../src/components/common/SolidBreadcrumb.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;AAEb,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAY5C,MAAM,CAAC,IAAM,eAAe,GAAG,UAAC,KAAY;;IAClC,IAAA,qBAAqB,GAAwB,KAAK,sBAA7B,EAAE,iBAAiB,GAAK,KAAK,kBAAV,CAAW;IAC3D,IAAM,aAAa,GAAG,MAAA,MAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,0CAAE,SAAS,0CAAE,KAAK,CAAC;IACpE,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,IAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,IAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,iBAAiB,GAAkB,IAAI,CAAC;IAE5C,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY,EAAE;QAC/B,IAAM,gBAAgB,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CAAC;QACzD,IAAI,gBAAgB,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,gBAAgB,CAAC,MAAK,SAAS,EAAE;YAC3E,iBAAiB,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;SACzD;KACF;IAED,IAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAE3D,SAAS,CAAC;QACR,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,iBAAiB,IAAI,CAAC,iBAAiB,EAAE;YAC9F,IAAM,MAAM,GAAG,~~UAAG~~,QAAQ,~~2BAAiB~~,~~kBAAkB~~,CAAC,iBAAiB,CAAC,CAAE,CAAC;~~YACnF~~,MAAM,CAAC,~~OAAO~~,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;~~SAC3C~~;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvD,IAAA,KAA0B,QAAQ,CAA2B,IAAI,CAAC,EAAjE,QAAQ,QAAA,EAAE,WAAW,QAA4C,CAAC;IAEzE,SAAS,CAAC;QACR,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YACjC,IAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACtD,OAAO,CAAC,GAAG,CAAC,yCAAyC,EAAE,UAAU,CAAC,CAAC;YACnE,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,QAAQ,EAAE;gBACpD,WAAW,CAAC,UAAU,CAAC,CAAC;aACzB;SACF;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAI,eAAe,GAAqB,EAAE,CAAC;IAE3C,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;QAC7E,IAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAClD,IAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAEjD,eAAe,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,sBAAe,QAAQ,CAAC,CAAC,CAAC,UAAO;SACxC,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;YACxB,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnD,IAAM,IAAI,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,MAAM,CAAC;gBAChC,eAAe,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM;oBAC5C,IAAI,EAAE,sBAAe,QAAQ,CAAC,CAAC,CAAC,cAAI,QAAQ,CAAC,CAAC,CAAC,cAAI,IAAI,CAAE;iBAC1D,CAAC,CAAC;aACJ;iBAAM;gBACL,eAAe,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,sBAAe,QAAQ,CAAC,CAAC,CAAC,cAAI,QAAQ,CAAC,CAAC,CAAC,CAAE;iBAClD,CAAC,CAAC;aACJ;SACF;QAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE;YACnD,eAAe,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,iBAAiB,~~IAAI~~,QAAQ,CAAC,CAAC,CAAC;~~aACxC~~,CAAC,CAAC;SACJ;KACF;IAED,IAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,YAC1C,KAAK,EAAE,IAAI,CAAC,KAAK,IACd,CAAC,IAAI,CAAC,IAAI;QACX,CAAC,CAAC;YACE,QAAQ,EAAE,cAAM,OAAA,CACd,KAAC,IAAI,IAAC,IAAI,EAAE,IAAI,CAAC,IAAK,YACpB,YAAG,SAAS,EAAC,0BAA0B,YAAE,IAAI,CAAC,KAAK,GAAK,GACnD,CACR,EAJe,CAIf;SACF;QACH,CAAC,CAAC,EAAE,CAAC,EACP,EAX0C,CAW1C,CAAC,CAAC;IAEJ,OAAO,KAAC,UAAU,IAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,kBAAkB,GAAG,CAAC;AACnE,CAAC,CAAC"}
1	+ {"version":3,"file":"SolidBreadcrumb.js","sourceRoot":"","sources":["../../../src/components/common/SolidBreadcrumb.tsx"],"names":[],"mappings":"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"}

package/dist/components/common/SolidBreadcrumb.tsx CHANGED Viewed

@@ -36,8 +36,10 @@ export const SolidBreadcrumb = (props: Props) => {
   useEffect(() => {
     if (segments.length === 6 && segments[4] === "form" && userKeyFieldValue && !queryUserKeyField) {
-      const newUrl = `${pathname}?userKeyField=${encodeURIComponent(userKeyFieldValue)}`;
-      router.replace(newUrl, { scroll: false });
+      const params = new URLSearchParams(searchParams.toString());
+      params.set("userKeyField", userKeyFieldValue);
+      const newUrl = `${pathname}?${params.toString()}`;
+      router.push(newUrl, { scroll: false });
     }
   }, [pathname, userKeyFieldValue, queryUserKeyField, router]);
@@ -81,7 +83,7 @@ export const SolidBreadcrumb = (props: Props) => {
     if (segments.length === 6 && segments[4] === "form") {
       breadcrumbItems.push({
-        label: queryUserKeyField || segments[5],
+        label: queryUserKeyField ? decodeURIComponent(queryUserKeyField) : segments[5],
       });
     }
   }

package/dist/components/core/common/SolidCreateButton.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
-export declare const SolidCreateButton: ({ url }: any) => import("react/jsx-runtime").JSX.Element;
+export declare const SolidCreateButton: ({ url, title }: any) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=SolidCreateButton.d.ts.map

package/dist/components/core/common/SolidCreateButton.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidCreateButton.d.ts","sourceRoot":"","sources":["../../../../src/components/core/common/SolidCreateButton.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB,~~YAAa~~,GAAG,~~4CAc7C~~,CAAA"}
1	+ {"version":3,"file":"SolidCreateButton.d.ts","sourceRoot":"","sources":["../../../../src/components/core/common/SolidCreateButton.tsx"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB,mBAAoB,GAAG,4CAWpD,CAAA"}

package/dist/components/core/common/SolidCreateButton.js CHANGED Viewed

@@ -1,13 +1,12 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import Link from 'next/link';
-import { usePathname, useRouter } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 import { Button } from 'primereact/button';
 export var SolidCreateButton = function (_a) {
-    var url = _a.url;
-    var router = useRouter();
+    var url = _a.url, title = _a.title;
     var pathName = usePathname();
     var createPath = url ? url : pathName.split('/').slice(0, -1).join('/') + '/form/new';
-    return (_jsx("div", { children: _jsx(Link, { href: createPath, children: _jsx(Button, { type: "button", icon: "pi pi-plus", label: "Add", size: 'small' }) }) }));
+    return (_jsx("div", { children: _jsx(Link, { href: createPath, children: _jsx(Button, { type: "button", icon: "pi pi-plus", label: "Add ".concat(title ? title : ''), size: 'small' }) }) }));
 };
 //# sourceMappingURL=SolidCreateButton.js.map

package/dist/components/core/common/SolidCreateButton.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidCreateButton.js","sourceRoot":"","sources":["../../../../src/components/core/common/SolidCreateButton.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,~~SAAS,EAAE,~~MAAM,iBAAiB,CAAC;~~AACzD~~,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAAC,~~EAAY~~;~~QAAV~~,GAAG,SAAA~~;IACnC~~,~~IAAM~~,~~MAAM~~,~~GAAG,SAAS,EAAE,CAAC~~;~~IAC3B~~,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;~~IAE~~/B,IAAM,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;~~IAGxF~~,OAAO,CACH,wBACI,KAAC,IAAI,IAAC,IAAI,EAAE,UAAU,~~YACpB~~,KAAC,MAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,~~EAAC~~,KAAK,~~EAAC~~,IAAI,EAAC,OAAO,GAAU,~~GACrE~~,GACL,CACT,CAAA;AACL,CAAC,CAAA"}
1	+ {"version":3,"file":"SolidCreateButton.js","sourceRoot":"","sources":["../../../../src/components/core/common/SolidCreateButton.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AACb,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAAC,EAAmB;QAAjB,GAAG,SAAA,EAAE,KAAK,WAAA;IAC1C,IAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAM,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;IAExF,OAAO,CACH,wBACI,KAAC,IAAI,IAAC,IAAI,EAAE,UAAU,YAClB,KAAC,MAAM,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,EAAE,cAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAE,EAAE,IAAI,EAAC,OAAO,GAAU,GAC/F,GACL,CACT,CAAA;AACL,CAAC,CAAA"}

package/dist/components/core/common/SolidCreateButton.tsx CHANGED Viewed

@@ -1,19 +1,16 @@
 'use client';
 import Link from 'next/link';
-import { usePathname, useRouter } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 import { Button } from 'primereact/button';
-export const SolidCreateButton = ({ url }: any) => {
-    const router = useRouter();
+export const SolidCreateButton = ({ url, title }: any) => {
     const pathName = usePathname();
     const createPath = url ? url : pathName.split('/').slice(0, -1).join('/') + '/form/new';
     return (
         <div>
             <Link href={createPath}>
-              <Button type="button" icon="pi pi-plus" label="Add" size='small'></Button>
+                <Button type="button" icon="pi pi-plus" label={`Add ${title ? title : ''}`} size='small'></Button>
             </Link>
         </div>
     )

package/dist/components/core/form/SolidFormActionHeader.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export declare const SolidFormActionHeader: ({ formik, params, actionsAllowed, formViewLayout, solidView, solidFormViewMetaData, initialEntityData, setDeleteDialogVisible, setLayoutDialogVisible, setRedirectToList, viewMode, setViewMode }: any) => import("react/jsx-runtime").JSX.Element;
2	+ //# sourceMappingURL=SolidFormActionHeader.d.ts.map

package/dist/components/core/form/SolidFormActionHeader.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"SolidFormActionHeader.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormActionHeader.tsx"],"names":[],"mappings":"AASA,eAAO,MAAM,qBAAqB,sMAAuM,GAAG,4CA8M3O,CAAA"}

package/dist/components/core/form/SolidFormActionHeader.js ADDED Viewed

@@ -0,0 +1,66 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { BackButton } from "../../../components/common/BackButton";
+import { SolidCancelButton } from "../../../components/common/CancelButton";
+import { SolidFormHeader } from "../../../components/common/SolidFormHeader";
+import { createPermission, deletePermission, updatePermission } from "../../../helpers/permissions";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { Button } from "primereact/button";
+import { OverlayPanel } from "primereact/overlaypanel";
+import { useRef } from "react";
+export var SolidFormActionHeader = function (_a) {
+    var formik = _a.formik, params = _a.params, actionsAllowed = _a.actionsAllowed, formViewLayout = _a.formViewLayout, solidView = _a.solidView, solidFormViewMetaData = _a.solidFormViewMetaData, initialEntityData = _a.initialEntityData, setDeleteDialogVisible = _a.setDeleteDialogVisible, setLayoutDialogVisible = _a.setLayoutDialogVisible, setRedirectToList = _a.setRedirectToList, viewMode = _a.viewMode, setViewMode = _a.setViewMode;
+    var router = useRouter();
+    var pathname = usePathname();
+    var searchParams = useSearchParams();
+    var op = useRef(null);
+    var createHeaderTitle = "Create ".concat(solidView.model.displayName);
+    var editHeaderTitle = "Edit ".concat(solidView.model.displayName);
+    var updateViewMode = function (newMode) {
+        setViewMode(newMode);
+        var params = new URLSearchParams(searchParams.toString());
+        params.set("viewMode", newMode);
+        router.push("".concat(pathname, "?").concat(params.toString()), { scroll: false });
+    };
+    var FormActionDropdown = function () {
+        return (_jsxs("div", { children: [_jsx(Button, { outlined: true, severity: "secondary", type: "button", icon: 'pi pi-cog', size: "small", className: "surface-card p-0", style: {
+                        height: 33.06,
+                        width: 33.06
+                    }, onClick: function (e) {
+                        // @ts-ignore
+                        return op.current.toggle(e);
+                    } }), _jsx(OverlayPanel, { ref: op, className: "solid-custom-overlay", children: _jsxs("div", { className: "flex flex-column gap-1 p-1", children: [params.embeded !== true &&
+                                params.id !== "new" &&
+                                actionsAllowed.includes("".concat(deletePermission(params.modelName))) &&
+                                !formViewLayout.attrs.readonly &&
+                                _jsx(Button, { text: true, type: "button", className: "w-8rem text-left gap-2", label: "Delete", size: "small", iconPos: "left", severity: "danger", icon: 'pi pi-trash', onClick: function () { return setDeleteDialogVisible(true); } }), _jsx(Button, { text: true, type: "button", className: "w-8rem text-left gap-2 purple-200", label: "Layout", size: "small", iconPos: "left", severity: "contrast", icon: 'pi pi-objects-column', onClick: function () { return setLayoutDialogVisible(true); } })] }) })] }));
+    };
+    return (_jsxs(_Fragment, { children: [_jsx("div", { className: "solid-form-header", children: params.id === "new" ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex align-items-center gap-3", children: [params.embeded !== true && _jsx(BackButton, {}), _jsxs("div", { className: "form-wrapper-title", children: [" ", createHeaderTitle] })] }), _jsxs("div", { className: "gap-3 flex", children: [params.embeded !== true &&
+                                    actionsAllowed.includes("".concat(createPermission(params.modelName))) &&
+                                    !formViewLayout.attrs.readonly &&
+                                    formik.dirty &&
+                                    _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", type: "submit" }) }), params.embeded == true &&
+                                    actionsAllowed.includes("".concat(createPermission(params.modelName))) &&
+                                    !formViewLayout.attrs.readonly &&
+                                    formik.dirty &&
+                                    _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", onClick: function () {
+                                                setRedirectToList(false);
+                                            }, type: "submit" }) }), params.embeded == true &&
+                                    _jsx(Button, { outlined: true, size: "small", type: "button", label: "Close", onClick: function () { return params.handlePopupClose(); }, className: 'bg-primary-reverse' }), params.embeded !== true &&
+                                    _jsx(SolidCancelButton, {}), _jsx(FormActionDropdown, {})] })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex align-items-center gap-3", children: [params.embeded !== true && _jsx(BackButton, {}), _jsxs("div", { className: "form-wrapper-title", children: [" ", editHeaderTitle] })] }), _jsxs("div", { className: "gap-3 flex", children: [params.embeded !== true && viewMode === "view" &&
+                                    _jsx("div", { children: _jsx(Button, { label: "Edit", size: "small", onClick: function () { return updateViewMode("edit"); }, type: "button" }) }), params.embeded !== true &&
+                                    actionsAllowed.includes("".concat(updatePermission(params.modelName))) &&
+                                    !formViewLayout.attrs.readonly &&
+                                    formik.dirty &&
+                                    _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", type: "submit" }) }), params.embeded == true &&
+                                    actionsAllowed.includes("".concat(updatePermission(params.modelName))) &&
+                                    !formViewLayout.attrs.readonly &&
+                                    formik.dirty &&
+                                    _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", type: "submit" }) }), params.embeded == true &&
+                                    actionsAllowed.includes("".concat(deletePermission(params.modelName))) &&
+                                    !formViewLayout.attrs.readonly &&
+                                    _jsx("div", { children: _jsx(Button, { size: "small", type: "button", label: "Delete", severity: "danger", onClick: function () { return setDeleteDialogVisible(true); } }) }), params.embeded == true &&
+                                    _jsx(Button, { outlined: true, size: "small", type: "button", label: "Close", onClick: function () { return params.handlePopupClose(); }, className: 'bg-primary-reverse' }), params.embeded !== true &&
+                                    _jsx(SolidCancelButton, {}), _jsx(FormActionDropdown, {})] })] })) }), params.embeded !== true &&
+                _jsx(SolidFormHeader, { solidFormViewMetaData: solidFormViewMetaData, initialEntityData: initialEntityData, modelName: params.modelName, id: params.id })] }));
+};
+//# sourceMappingURL=SolidFormActionHeader.js.map

package/dist/components/core/form/SolidFormActionHeader.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"SolidFormActionHeader.js","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormActionHeader.tsx"],"names":[],"mappings":"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"}

package/dist/components/core/form/SolidFormActionHeader.tsx ADDED Viewed

@@ -0,0 +1,216 @@
+import { BackButton } from "@/components/common/BackButton";
+import { SolidCancelButton } from "@/components/common/CancelButton";
+import { SolidFormHeader } from "@/components/common/SolidFormHeader";
+import { createPermission, deletePermission, updatePermission } from "@/helpers/permissions";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { Button } from "primereact/button";
+import { OverlayPanel } from "primereact/overlaypanel";
+import { useRef } from "react";
+export const SolidFormActionHeader = ({ formik, params, actionsAllowed, formViewLayout, solidView, solidFormViewMetaData, initialEntityData, setDeleteDialogVisible, setLayoutDialogVisible, setRedirectToList, viewMode, setViewMode }: any) => {
+    const router = useRouter();
+    const pathname = usePathname();
+    const searchParams = useSearchParams();
+    const op = useRef(null);
+    const createHeaderTitle = `Create ${solidView.model.displayName}`;
+    const editHeaderTitle = `Edit ${solidView.model.displayName}`;
+    const updateViewMode = (newMode: "view" | "edit") => {
+        setViewMode(newMode);
+        const params = new URLSearchParams(searchParams.toString());
+        params.set("viewMode", newMode);
+        router.push(`${pathname}?${params.toString()}`, { scroll: false });
+    };
+    const FormActionDropdown = () => {
+        return (
+            <div>
+                <Button
+                    outlined
+                    severity="secondary"
+                    type="button"
+                    icon={'pi pi-cog'}
+                    size="small"
+                    className="surface-card p-0"
+                    style={{
+                        height: 33.06,
+                        width: 33.06
+                    }}
+                    onClick={(e) =>
+                        // @ts-ignore
+                        op.current.toggle(e)
+                    }
+                />
+                <OverlayPanel ref={op} className="solid-custom-overlay">
+                    <div className="flex flex-column gap-1 p-1">
+                        {/* <Button
+                            text
+                            type="button"
+                            className="w-8rem text-left gap-2 text-color"
+                            label="Duplicate"
+                            size="small"
+                            iconPos="left"
+                            icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
+                                <path d="M6 11.9997C5.63333 11.9997 5.31944 11.8691 5.05833 11.608C4.79722 11.3469 4.66667 11.033 4.66667 10.6663V2.66634C4.66667 2.29967 4.79722 1.98579 5.05833 1.72467C5.31944 1.46356 5.63333 1.33301 6 1.33301H12C12.3667 1.33301 12.6806 1.46356 12.9417 1.72467C13.2028 1.98579 13.3333 2.29967 13.3333 2.66634V10.6663C13.3333 11.033 13.2028 11.3469 12.9417 11.608C12.6806 11.8691 12.3667 11.9997 12 11.9997H6ZM6 10.6663H12V2.66634H6V10.6663ZM3.33333 14.6663C2.96667 14.6663 2.65278 14.5358 2.39167 14.2747C2.13056 14.0136 2 13.6997 2 13.333V3.99967H3.33333V13.333H10.6667V14.6663H3.33333Z" fill="black" fill-opacity="0.88" />
+                            </svg>}
+                        /> */}
+                        {params.embeded !== true &&
+                            params.id !== "new" &&
+                            actionsAllowed.includes(`${deletePermission(params.modelName)}`) &&
+                            !formViewLayout.attrs.readonly &&
+                            <Button
+                                text
+                                type="button"
+                                className="w-8rem text-left gap-2"
+                                label="Delete"
+                                size="small"
+                                iconPos="left"
+                                severity="danger"
+                                icon={'pi pi-trash'}
+                                onClick={() => setDeleteDialogVisible(true)}
+                            />
+                        }
+                        <Button
+                            text
+                            type="button"
+                            className="w-8rem text-left gap-2 purple-200"
+                            label="Layout"
+                            size="small"
+                            iconPos="left"
+                            severity="contrast"
+                            icon={'pi pi-objects-column'}
+                            onClick={() => setLayoutDialogVisible(true)}
+                        />
+                    </div>
+                </OverlayPanel>
+            </div>
+        )
+    }
+    return (
+        <>
+            <div className="solid-form-header">
+                {params.id === "new" ? (
+                    <>
+                        <div className="flex align-items-center gap-3">
+                            {params.embeded !== true && <BackButton />}
+                            <div className="form-wrapper-title"> {createHeaderTitle}</div>
+                        </div>
+                        <div className="gap-3 flex">
+                            {params.embeded !== true &&
+                                actionsAllowed.includes(`${createPermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                formik.dirty &&
+                                <div>
+                                    <Button
+                                        label="Save"
+                                        size="small"
+                                        type="submit"
+                                    />
+                                </div>
+                            }
+                            {params.embeded == true &&
+                                actionsAllowed.includes(`${createPermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                formik.dirty &&
+                                <div>
+                                    <Button
+                                        label="Save"
+                                        size="small"
+                                        onClick={() => {
+                                            setRedirectToList(false);
+                                        }}
+                                        type="submit"
+                                    />
+                                </div>
+                            }
+                            {params.embeded == true &&
+                                <Button outlined size="small" type="button" label="Close" onClick={() => params.handlePopupClose()} className='bg-primary-reverse' />
+                            }
+                            {params.embeded !== true &&
+                                <SolidCancelButton />
+                            }
+                            <FormActionDropdown />
+                        </div>
+                    </>
+                ) : (
+                    <>
+                        <div className="flex align-items-center gap-3">
+                            {params.embeded !== true && <BackButton />}
+                            <div className="form-wrapper-title"> {editHeaderTitle}</div>
+                        </div>
+                        <div className="gap-3 flex">
+                            {params.embeded !== true && viewMode === "view" &&
+                                <div>
+                                    <Button
+                                        label="Edit"
+                                        size="small"
+                                        onClick={() => updateViewMode("edit")}
+                                        type="button"
+                                    />
+                                </div>
+                            }
+                            {params.embeded !== true &&
+                                actionsAllowed.includes(`${updatePermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                formik.dirty &&
+                                <div>
+                                    <Button
+                                        label="Save"
+                                        size="small"
+                                        type="submit"
+                                    />
+                                </div>
+                            }
+                            {/* Inline */}
+                            {params.embeded == true &&
+                                actionsAllowed.includes(`${updatePermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                formik.dirty &&
+                                <div>
+                                    <Button
+                                        label="Save"
+                                        size="small"
+                                        type="submit"
+                                    />
+                                </div>
+                            }
+                            {params.embeded == true &&
+                                actionsAllowed.includes(`${deletePermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                <div>
+                                    <Button
+                                        size="small"
+                                        type="button"
+                                        label="Delete"
+                                        severity="danger"
+                                        onClick={() => setDeleteDialogVisible(true)}
+                                    />
+                                </div>
+                            }
+                            {params.embeded == true &&
+                                <Button outlined size="small" type="button" label="Close" onClick={() => params.handlePopupClose()} className='bg-primary-reverse' />
+                            }
+                            {params.embeded !== true &&
+                                <SolidCancelButton />
+                            }
+                            <FormActionDropdown />
+                        </div>
+                    </>
+                )}
+            </div>
+            {params.embeded !== true &&
+                <SolidFormHeader
+                    solidFormViewMetaData={solidFormViewMetaData}
+                    initialEntityData={initialEntityData}
+                    modelName={params.modelName}
+                    id={params.id}
+                />
+            }
+        </>
+    )
+}

package/dist/components/core/form/SolidFormView.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SolidFormView.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormView.tsx"],"names":[],"mappings":"AAUA,OAAO,yBAAyB,CAAC;AAuCjC,OAAO,uCAAuC,CAAC;AAC/C,OAAO,gDAAgD,CAAC;~~AAGxD~~,MAAM,MAAM,kBAAkB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,mBAAmB,CAAC,EAAE,GAAG,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;CACtB,CAAC;AAgSF,QAAA,MAAM,aAAa,WAAY,kBAAkB,~~4CAu+BhD~~,CAAC;AAEF,eAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"SolidFormView.d.ts","sourceRoot":"","sources":["../../../../src/components/core/form/SolidFormView.tsx"],"names":[],"mappings":"AAUA,OAAO,yBAAyB,CAAC;AAuCjC,OAAO,uCAAuC,CAAC;AAC/C,OAAO,gDAAgD,CAAC;AAIxD,MAAM,MAAM,kBAAkB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,mBAAmB,CAAC,EAAE,GAAG,CAAA;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;CACtB,CAAC;AAgSF,QAAA,MAAM,aAAa,WAAY,kBAAkB,4CAuwBhD,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/components/core/form/SolidFormView.js CHANGED Viewed

@@ -46,8 +46,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { SolidCancelButton } from "../../../components/common/CancelButton";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createPermission, deletePermission, updatePermission } from "../../../helpers/permissions";
 import { createSolidEntityApi } from "../../../redux/api/solidEntityApi";
 import { useGetSolidViewLayoutQuery } from "../../../redux/api/solidViewApi";
@@ -77,13 +76,10 @@ import { SolidSelectionDynamicField } from "./fields/SolidSelectionDynamicField"
 import { SolidSelectionStaticField } from "./fields/SolidSelectionStaticField";
 import { SolidShortTextField } from "./fields/SolidShortTextField";
 import { SolidTimeField } from "./fields/SolidTimeField";
-import { BackButton } from "../../../components/common/BackButton";
-import { OverlayPanel } from "primereact/overlaypanel";
 import { getExtensionComponent, getExtensionFunction } from "../../../helpers/registry";
 import { SolidPasswordField } from "./fields/SolidPasswordField";
 import { SolidEmailField } from "./fields/SolidEmailField";
 import { Panel } from "primereact/panel";
-import { SolidFormHeader } from "../../../components/common/SolidFormHeader";
 import { SolidFormUserViewLayout } from "./SolidFormUserViewLayout";
 import Lightbox from "yet-another-react-lightbox";
 import Counter from "yet-another-react-lightbox/plugins/counter";
@@ -91,6 +87,7 @@ import Download from "yet-another-react-lightbox/plugins/download";
 import "yet-another-react-lightbox/styles.css";
 import "yet-another-react-lightbox/plugins/counter.css";
 import { SolidChatter } from "../chatter/SolidChatter";
+import { SolidFormActionHeader } from "./SolidFormActionHeader";
 var getLayoutFields = function (node) {
     var fields = [];
     if (node.type === "field") {
@@ -315,7 +312,6 @@ var SolidFormView = function (params) {
     var router = useRouter();
     var toast = useRef(null);
     var searchParams = useSearchParams();
-    var viewModeFromURL = searchParams.get("viewMode");
     var _b = useState(false), redirectToList = _b[0], setRedirectToList = _b[1];
     var _c = useState(false), isDeleteDialogVisible = _c[0], setDeleteDialogVisible = _c[1];
     var _d = useState(false), isLayoutDialogVisible = _d[0], setLayoutDialogVisible = _d[1];
@@ -328,16 +324,19 @@ var SolidFormView = function (params) {
     var triggerCheckIfPermissionExists = useLazyCheckIfPermissionExistsQuery()[0];
     var op = useRef(null);
     useEffect(function () {
-        if (viewModeFromURL === "edit" || viewModeFromURL === "view") {
-            setViewMode(viewModeFromURL);
+        var mode = searchParams.get('viewMode');
+        if (params.id === 'new') {
+            setViewMode('edit');
+            return;
         }
-        else {
-            setViewMode("view"); // Default to 'view' if not present
+        // Set the viewMode based on the URL
+        if (mode === 'view' || mode === 'edit') {
+            setViewMode(mode);
         }
-        if (params.id === 'new') {
-            setViewMode("edit");
+        else {
+            setViewMode('view'); // Default to 'view' if no valid mode is provided
         }
-    }, [viewModeFromURL]);
+    }, [searchParams, params.id]);
     // function that updates view mode
     var updateViewMode = function (newMode) {
         setViewMode(newMode);
@@ -446,18 +445,6 @@ var SolidFormView = function (params) {
         isEntityDeleteError,
         isEntityUpdateError
     ]);
-    var showError = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var errors, errorMessages;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, formik.validateForm()];
-                case 1:
-                    errors = _a.sent();
-                    errorMessages = Object.values(errors);
-                    return [2 /*return*/];
-            }
-        });
-    }); };
     var showToast = function (severity, summary, detail) {
         var _a;
         (_a = toast.current) === null || _a === void 0 ? void 0 : _a.show({
@@ -687,8 +674,6 @@ var SolidFormView = function (params) {
         // Initialize formik...
         var solidView_1 = solidFormViewMetaData.data.solidView;
         var solidFieldsMetadata_1 = solidFormViewMetaData.data.solidFieldsMetadata;
-        var createHeaderTitle = "Create ".concat(solidView_1.model.displayName);
-        var editHeaderTitle = "Edit ".concat(solidView_1.model.displayName);
         var validationSchema = {};
         var initialValues = {};
         for (var i = 0; i < (layoutFields === null || layoutFields === void 0 ? void 0 : layoutFields.length); i++) {
@@ -901,19 +886,6 @@ var SolidFormView = function (params) {
         var onDeleteClose_1 = function () {
             setDeleteDialogVisible(false);
         };
-        var formActionDropdown = function () {
-            return (_jsxs("div", { children: [_jsx(Button, { outlined: true, severity: "secondary", type: "button", icon: 'pi pi-cog', size: "small", className: "surface-card p-0", style: {
-                            height: 33.06,
-                            width: 33.06
-                        }, onClick: function (e) {
-                            // @ts-ignore
-                            return op.current.toggle(e);
-                        } }), _jsx(OverlayPanel, { ref: op, className: "solid-custom-overlay", children: _jsxs("div", { className: "flex flex-column gap-1 p-1", children: [params.embeded !== true &&
-                                    params.id !== "new" &&
-                                    actionsAllowed.includes("".concat(deletePermission(params.modelName))) &&
-                                    !formViewLayout.attrs.readonly &&
-                                    _jsx(Button, { text: true, type: "button", className: "w-8rem text-left gap-2", label: "Delete", size: "small", iconPos: "left", severity: "danger", icon: 'pi pi-trash', onClick: function () { return setDeleteDialogVisible(true); } }), _jsx(Button, { text: true, type: "button", className: "w-8rem text-left gap-2 purple-200", label: "Layout", size: "small", iconPos: "left", severity: "contrast", icon: 'pi pi-objects-column', onClick: function () { return setLayoutDialogVisible(true); } })] }) })] }));
-        };
         // TODO: This was simply to demonstrate how we can use dynamic components, we will remove this and use it in a more sensible way in the layout.
         // TODO: to demonstrated this you can simply add the below to the layout of the book form view.
         // TODO: "header": "BookFormViewDynamicComponent",
@@ -922,42 +894,7 @@ var SolidFormView = function (params) {
         if (dynamicHeader) {
             DynamicHeaderComponent = getExtensionComponent(dynamicHeader);
         }
-        return (_jsxs("div", { className: "solid-form-wrapper", children: [_jsx(Toast, { ref: toast }), _jsxs("div", { className: "solid-form-section", style: { borderRight: params.embeded !== true ? '1px solid var(--primary-light-color' : '' }, children: [_jsxs("form", { style: { width: '100%' }, onSubmit: formik.handleSubmit, children: [_jsx("div", { className: "solid-form-header", children: params.id === "new" ? (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex align-items-center gap-3", children: [params.embeded !== true && _jsx(BackButton, {}), _jsxs("div", { className: "form-wrapper-title", children: [" ", createHeaderTitle] })] }), _jsxs("div", { className: "gap-3 flex", children: [params.embeded !== true &&
-                                                        actionsAllowed.includes("".concat(createPermission(params.modelName))) &&
-                                                        !formViewLayout.attrs.readonly &&
-                                                        formik.dirty &&
-                                                        _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", onClick: function () { return showError(); }, type: "submit" }) }), params.embeded == true &&
-                                                        actionsAllowed.includes("".concat(createPermission(params.modelName))) &&
-                                                        !formViewLayout.attrs.readonly &&
-                                                        formik.dirty &&
-                                                        _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", onClick: function () {
-                                                                    setRedirectToList(false);
-                                                                    showError();
-                                                                }, type: "submit" }) }), params.embeded == true &&
-                                                        _jsx(Button, { outlined: true, size: "small", type: "button", label: "Close", onClick: function () { return params.handlePopupClose(); }, className: 'bg-primary-reverse' }), params.embeded !== true &&
-                                                        _jsx(SolidCancelButton, {}), formActionDropdown()] })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "flex align-items-center gap-3", children: [params.embeded !== true && _jsx(BackButton, {}), _jsxs("div", { className: "form-wrapper-title", children: [" ", editHeaderTitle] })] }), _jsxs("div", { className: "gap-3 flex", children: [params.embeded !== true && viewMode === "view" &&
-                                                        _jsx("div", { children: _jsx(Button, { label: "Edit", size: "small", onClick: function () { return updateViewMode("edit"); }, type: "button" }) }), params.embeded !== true &&
-                                                        actionsAllowed.includes("".concat(updatePermission(params.modelName))) &&
-                                                        !formViewLayout.attrs.readonly &&
-                                                        formik.dirty &&
-                                                        _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", onClick: function () { return showError(); }, type: "submit" }) }), params.embeded == true &&
-                                                        actionsAllowed.includes("".concat(updatePermission(params.modelName))) &&
-                                                        !formViewLayout.attrs.readonly &&
-                                                        formik.dirty &&
-                                                        _jsx("div", { children: _jsx(Button, { label: "Save", size: "small", onClick: function () { return showError(); }, type: "submit" }) }), params.embeded == true &&
-                                                        actionsAllowed.includes("".concat(deletePermission(params.modelName))) &&
-                                                        !formViewLayout.attrs.readonly &&
-                                                        _jsx("div", { children: _jsx(Button, { size: "small", type: "button", label: "Delete", severity: "danger", onClick: function () { return setDeleteDialogVisible(true); } }) }), params.embeded == true &&
-                                                        _jsx(Button, { outlined: true, size: "small", type: "button", label: "Close", onClick: function () { return params.handlePopupClose(); }, className: 'bg-primary-reverse' }), params.embeded !== true &&
-                                                        _jsx(SolidCancelButton, {}), formActionDropdown()] })] })) }), params.embeded !== true &&
-                                    // <div className="solid-form-stepper">
-                                    _jsx(SolidFormHeader
-                                    // solidFormViewMetaData={solidFormViewMetaData?.data?.solidView?.model}
-                                    , {
-                                        // solidFormViewMetaData={solidFormViewMetaData?.data?.solidView?.model}
-                                        solidFormViewMetaData: solidFormViewMetaData, initialEntityData: initialEntityData, modelName: params.modelName, id: params.id })
-                                // </div>
-                                , _jsxs("div", { className: "p-4 solid-form-content", children: [DynamicHeaderComponent && _jsx(DynamicHeaderComponent, {}), renderFormDynamically(formViewMetaData)] })] }), params.embeded !== true && isShowChatter === true &&
+        return (_jsxs("div", { className: "solid-form-wrapper", children: [_jsx(Toast, { ref: toast }), _jsxs("div", { className: "solid-form-section", style: { borderRight: params.embeded !== true ? '1px solid var(--primary-light-color' : '' }, children: [_jsxs("form", { style: { width: '100%' }, onSubmit: formik.handleSubmit, children: [_jsx(SolidFormActionHeader, { formik: formik, params: params, actionsAllowed: actionsAllowed, formViewLayout: formViewLayout, solidView: solidView_1, solidFormViewMetaData: solidFormViewMetaData, initialEntityData: initialEntityData, setDeleteDialogVisible: setDeleteDialogVisible, setLayoutDialogVisible: setLayoutDialogVisible, setRedirectToList: setRedirectToList, viewMode: viewMode, setViewMode: setViewMode }), _jsxs("div", { className: "p-4 solid-form-content", children: [DynamicHeaderComponent && _jsx(DynamicHeaderComponent, {}), renderFormDynamically(formViewMetaData)] })] }), params.embeded !== true && isShowChatter === true &&
                             _jsx(Button, { icon: "pi pi-chevron-right", size: "small", text: true, className: "chatter-collapse-btn", style: { width: 30 }, onClick: function () { return setShowChatter(false); } })] }), params.embeded !== true &&
                     _jsx("div", { className: "chatter-section ".concat(isShowChatter === false ? 'collapsed' : ''), children: isShowChatter === false ?
                             _jsxs("div", { className: "flex flex-column gap-2 justify-content-center p-2", children: [_jsx("div", { className: "chatter-collapsed-content", children: "Chatter/Audit Trail" }), _jsx(Button, { icon: "pi pi-chevron-left", size: "small", className: "px-0", style: { width: 30 }, onClick: function () { setShowChatter(true); setRefreshChatterMessage(true); } })] })