impaktapps-ui-builder 0.0.382460 → 1.0.1

package/dist/impaktapps-ui-builder.es.js

@@ -50,15 +50,15 @@ const PageMasterUiSchema = (theme) => {
   var _a;
   const uiSchema = {
     type: "HorizontalLayout",
-    heading: "Page Master",
+    heading: "Page",
     elements: [
       {
         type: "WrapperLayout",
         config: {
-          main: {},
-          wrapperStyle: {
-            marginLeft: theme.spacing(2),
-            backgroundColor: theme.palette.background.default
+          main: {
+            label: "Basic Details",
+            isAccordion: true,
+            gap: "8px"
           }
         },
         elements: [
@@ -69,9 +69,9 @@ const PageMasterUiSchema = (theme) => {
               widget: "InputField"
             },
             config: {
-              layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+              layout: { xs: 6, sm: 6, md: 4, lg: 3 },
               main: {
-                label: "Name",
+                label: "Page Name",
                 options: [],
                 color: "secondary",
                 errorMessage: "Name should be start with 'page_'",
@@ -80,26 +80,6 @@ const PageMasterUiSchema = (theme) => {
               }
             }
           },
-          {
-            type: "Control",
-            scope: "#/properties/template",
-            options: {
-              widget: "SelectInputField"
-            },
-            config: {
-              layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-              main: {
-                label: "Template",
-                options: [
-                  { const: "template1", title: "template1" },
-                  { const: "template2", title: "template2" },
-                  { const: "template3", title: "template3" }
-                ],
-                color: "secondary",
-                required: true
-              }
-            }
-          },
           {
             type: "Control",
             scope: "#/properties/label",
@@ -107,9 +87,9 @@ const PageMasterUiSchema = (theme) => {
               widget: "InputField"
             },
             config: {
-              layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+              layout: { xs: 6, sm: 6, md: 4, lg: 3 },
               main: {
-                label: "Label",
+                label: "Page Heading",
                 options: [],
                 color: "secondary",
                 required: true
@@ -120,7 +100,7 @@ const PageMasterUiSchema = (theme) => {
             type: "Control",
             scope: "#/properties/EmptyBox",
             config: {
-              layout: { xs: 6, sm: 6, md: 0, lg: 0 }
+              layout: { xs: 0, sm: 0, md: 4, lg: 6 }
             },
             options: {
               widget: "EmptyBox"
@@ -131,11 +111,27 @@ const PageMasterUiSchema = (theme) => {
       {
         type: "TabLayout",
         config: {
+          layout: 12,
           main: {
-            tabLabels: ["Components", "Events"],
-            divider: true
+            tabLabels: ["Page Components", "Page Events"]
+          },
+          style: {
+            TabPanelStyle: {
+              padding: 0
+            }
+          },
+          TabsStyle: {
+            borderTop: `1px solid ${theme.palette.common.black}29`,
+            marginBottom: "3px",
+            paddingBottom: "4px",
+            boxShadow: "0px 3px 4px #afafaf80",
+            "& .MuiTabs-indicator": {
+              bottom: "6px"
+            }
           },
-          defaultStyle: true
+          TabContainerStyle: {
+            marginTop: "-16px"
+          }
         },
         elements: [
           {
@@ -159,12 +155,18 @@ const PageMasterUiSchema = (theme) => {
                           main: {
                             onClick: "onAddClickHandler",
                             size: "small",
-                            icon: "AddIcon",
-                            iconLabel: "Add New",
+                            icon: "TableAddIcon",
+                            iconLabel: "Add",
                             styleDefault: true
                           },
                           style: {
-                            mt: "6px"
+                            mt: "6px",
+                            color: "inherit",
+                            fill: "inherit",
+                            "&:hover": {
+                              color: "inherit",
+                              fill: "inherit"
+                            }
                           }
                         }
                       }
@@ -180,12 +182,19 @@ const PageMasterUiSchema = (theme) => {
                           main: {
                             onClick: "copyPasteElement",
                             size: "small",
-                            icon: "PasteIcon",
+                            icon: "TablePaste",
                             iconLabel: "Paste",
-                            styleDefault: true
+                            styleDefault: true,
+                            title: ""
                           },
                           style: {
-                            mt: "6px"
+                            mt: "6px",
+                            color: "inherit",
+                            fill: "inherit",
+                            "&:hover": {
+                              color: "inherit",
+                              fill: "inherit"
+                            }
                           }
                         }
                       }
@@ -200,16 +209,21 @@ const PageMasterUiSchema = (theme) => {
             elements: [
               {
                 accessorKey: "name",
-                header: "Name"
+                header: "Name",
+                size: 300,
+                type: "string"
               },
               {
                 accessorKey: "type",
-                header: "Type"
+                header: "Type",
+                size: 300,
+                type: "string"
               },
               {
                 header: "Edit",
                 field: "Reject_Records",
-                flex: 1,
+                size: 150,
+                type: "action",
                 widget: {
                   type: "Control",
                   scope: "#/properties/RejectButton",
@@ -218,13 +232,15 @@ const PageMasterUiSchema = (theme) => {
                   },
                   config: {
                     main: {
-                      icon: "EditIcon",
-                      color: "primary",
+                      icon: "TableEditIcon",
                       onClick: "Edit_Components",
                       tooltipMessage: "Edit This Record"
                     },
                     style: {
-                      color: theme.palette.primary.main
+                      fill: theme.palette.primary.main,
+                      "& :hover": {
+                        fill: theme.palette.primary.dark
+                      }
                     }
                   }
                 }
@@ -232,7 +248,8 @@ const PageMasterUiSchema = (theme) => {
               {
                 header: "Delete",
                 field: "Reject_Records",
-                flex: 1,
+                size: 150,
+                type: "action",
                 widget: {
                   type: "Control",
                   scope: "#/properties/RejectButton",
@@ -241,10 +258,15 @@ const PageMasterUiSchema = (theme) => {
                   },
                   config: {
                     main: {
-                      icon: "RejectIcon",
-                      color: "error",
+                      icon: "Bin",
                       onClick: "deletePopUpComponent",
                       tooltipMessage: "Reject This Record"
+                    },
+                    style: {
+                      fill: theme.palette.primary.main,
+                      "& :hover": {
+                        fill: theme.palette.primary.dark
+                      }
                     }
                   }
                 }
@@ -291,12 +313,18 @@ const PageMasterUiSchema = (theme) => {
                           main: {
                             onClick: "eventAddHandler",
                             size: "small",
-                            icon: "AddIcon",
-                            iconLabel: "Add New",
+                            icon: "TableAddIcon",
+                            iconLabel: "Add",
                             styleDefault: true
                           },
                           style: {
-                            mt: "6px"
+                            mt: "6px",
+                            color: "inherit",
+                            fill: "inherit",
+                            "&:hover": {
+                              color: "inherit",
+                              fill: "inherit"
+                            }
                           }
                         }
                       }
@@ -312,12 +340,18 @@ const PageMasterUiSchema = (theme) => {
                           main: {
                             onClick: "copyPasteElement",
                             size: "small",
-                            icon: "PasteIcon",
+                            icon: "TablePaste",
                             iconLabel: "Paste",
                             styleDefault: true
                           },
                           style: {
-                            mt: "6px"
+                            mt: "6px",
+                            color: "inherit",
+                            fill: "inherit",
+                            "&:hover": {
+                              color: "inherit",
+                              fill: "inherit"
+                            }
                           }
                         }
                       }
@@ -332,15 +366,21 @@ const PageMasterUiSchema = (theme) => {
             elements: [
               {
                 accessorKey: "eventType",
-                header: "Event Type"
+                header: "Event's Type",
+                size: 300,
+                type: "string"
               },
               {
                 accessorKey: "Handler",
-                header: "Handler"
+                header: "Handler",
+                size: 200,
+                type: "string"
               },
               {
                 accessorKey: "Edit_Approve_Records",
-                header: "Edit Widget",
+                header: "Edit",
+                type: "action",
+                size: 150,
                 widget: {
                   type: "Control",
                   scope: "#/properties/Edit_Records",
@@ -349,14 +389,16 @@ const PageMasterUiSchema = (theme) => {
                   },
                   config: {
                     main: {
-                      color: "info",
                       size: "small",
-                      icon: "EditIcon",
+                      icon: "TableEditIcon",
                       tooltipMessage: "Edit This Record",
                       onClick: "editEvent"
                     },
                     style: {
-                      color: theme.palette.primary.main
+                      fill: theme.palette.primary.main,
+                      "& :hover": {
+                        fill: theme.palette.primary.dark
+                      }
                     }
                   }
                 }
@@ -364,6 +406,8 @@ const PageMasterUiSchema = (theme) => {
               {
                 accessorKey: "Reject_Records",
                 header: "Delete",
+                type: "action",
+                size: 150,
                 widget: {
                   type: "Control",
                   scope: "#/properties/RejectButton",
@@ -372,10 +416,15 @@ const PageMasterUiSchema = (theme) => {
                   },
                   config: {
                     main: {
-                      icon: "RejectIcon",
-                      color: "error",
+                      icon: "Bin",
                       tooltipMessage: "Reject This Record",
                       onClick: "deletePopUpEvent"
+                    },
+                    style: {
+                      fill: theme.palette.primary.main,
+                      "& :hover": {
+                        fill: theme.palette.primary.dark
+                      }
                     }
                   }
                 }
@@ -383,7 +432,8 @@ const PageMasterUiSchema = (theme) => {
               {
                 header: "Copy",
                 field: "Copy_Event",
-                flex: 1,
+                type: "action",
+                size: 150,
                 widget: {
                   type: "Control",
                   scope: "#/properties/Copy_Event",
@@ -404,79 +454,49 @@ const PageMasterUiSchema = (theme) => {
         ]
       },
       {
-        type: "HorizontalLayout",
+        scope: "#/properties/Remarks Container",
+        type: "WrapperLayout",
         config: {
-          layout: { xs: 12, sm: 9 }
+          layout: 12,
+          main: {
+            divider: false,
+            rowSpacing: 0,
+            gap: 0
+          },
+          componentsBoxStyle: {
+            padding: "8px 8px 8px 24px"
+          }
         },
         elements: [
           {
             type: "Control",
-            scope: "#/properties/RemoveItemButton",
-            options: {
-              widget: "IconButton"
-            },
-            config: {
-              layout: { xs: 1, sm: 1 },
-              main: {
-                onClick: "RemoveItemButton",
-                size: "large",
-                icon: "RejectIcon",
-                styleDefault: true
-              },
-              style: {
-                marginLeft: "-5px"
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/copiedElementDetails",
+            scope: "#/properties/btn",
             options: {
-              widget: "Box"
+              widget: "Button"
             },
             config: {
-              layout: { xs: 6, sm: 6 },
+              layout: { xs: 4, sm: 2.5, md: 2, lg: 1.5 },
               main: {
-                heading: "No element copied"
-              },
-              style: {
-                color: "#535557",
-                marginLeft: "-30px",
-                fontSize: "12px",
-                marginTop: "4px"
+                name: "Save",
+                variant: "contained",
+                type: "text",
+                onClick: "saveHandler",
+                size: "medium"
               }
             }
           },
           {
             type: "Control",
             scope: "#/properties/EmptyBox",
+            config: {
+              layout: { xs: 8, sm: 9.5, md: 10, lg: 10.5 }
+            },
             options: {
               widget: "EmptyBox"
-            },
-            config: {
-              layout: { xs: 1, sm: 5 }
             }
           }
         ]
       },
-      {
-        type: "Control",
-        scope: "#/properties/btn",
-        options: {
-          widget: "Button"
-        },
-        config: {
-          layout: { xs: 4, sm: 2 },
-          main: {
-            name: "Save",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "saveHandler",
-            size: "medium"
-          }
-        }
-      },
       {
         type: "Control",
         scope: "#/properties/popUpPageMasterComponent",
@@ -503,17 +523,19 @@ const PageMasterUiSchema = (theme) => {
               widget: "Box"
             },
             config: {
-              layout: 12,
+              layout: 11,
               main: {
-                heading: "Are you sure you want to delete ?"
+                heading: "Are you sure you want to delete this Component ?"
               },
               style: {
-                marginTop: "-20px",
                 fontSize: "20px",
                 "&.MuiTypography-root": {
-                  padding: "10px 30px 20px 30px",
+                  padding: "0px 20px",
                   textAlign: "center",
-                  lineHeight: "1"
+                  lineHeight: "1.2",
+                  fontWeight: "normal",
+                  fontSize: "18px",
+                  marginBottom: theme.spacing(5)
                 }
               }
             }
@@ -521,7 +543,7 @@ const PageMasterUiSchema = (theme) => {
           {
             type: "WrapperLayout",
             config: {
-              layout: 12,
+              layout: 11,
               main: {}
             },
             elements: [
@@ -535,15 +557,15 @@ const PageMasterUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "No",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
-                    color: "info",
                     type: "text",
                     onClick: "deletePopUpComponent",
                     size: "large"
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     left: 0,
                     width: "50%",
@@ -571,7 +593,6 @@ const PageMasterUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "Yes",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
                     color: "error",
                     type: "text",
@@ -580,6 +601,8 @@ const PageMasterUiSchema = (theme) => {
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     right: 0,
                     width: "50%",
@@ -626,17 +649,19 @@ const PageMasterUiSchema = (theme) => {
               widget: "Box"
             },
             config: {
-              layout: 12,
+              layout: 11,
               main: {
-                heading: "Are you sure you want to delete ?"
+                heading: "Are you sure you want to delete this Event ?"
               },
               style: {
-                marginTop: "-20px",
                 fontSize: "20px",
                 "&.MuiTypography-root": {
-                  padding: "10px 30px 20px 30px",
+                  padding: "0px 20px",
                   textAlign: "center",
-                  lineHeight: "1"
+                  lineHeight: "1.2",
+                  fontWeight: "normal",
+                  fontSize: "18px",
+                  marginBottom: theme.spacing(5)
                 }
               }
             }
@@ -644,7 +669,7 @@ const PageMasterUiSchema = (theme) => {
           {
             type: "WrapperLayout",
             config: {
-              layout: 12,
+              layout: 11,
               main: {}
             },
             elements: [
@@ -658,15 +683,15 @@ const PageMasterUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "No",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
-                    color: "info",
                     type: "text",
                     onClick: "deletePopUpEvent",
                     size: "large"
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     left: 0,
                     width: "50%",
@@ -694,7 +719,6 @@ const PageMasterUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "Yes",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
                     color: "error",
                     type: "text",
@@ -703,6 +727,8 @@ const PageMasterUiSchema = (theme) => {
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     right: 0,
                     width: "50%",
@@ -740,8 +766,7 @@ const PageMasterUiSchema = (theme) => {
           style: {
             flexDirection: "row",
             position: "absolute",
-            bottom: 0,
-            marginBottom: "-8px",
+            bottom: 10,
             height: "fit-content",
             overflow: "hidden",
             zIndex: 1e3,
@@ -761,75 +786,16 @@ const PageMasterUiSchema = (theme) => {
               },
               style: {
                 color: ((_a = theme == null ? void 0 : theme.palette) == null ? void 0 : _a.text.disabled) || "#AFAFAF",
-                fontSize: "12px",
+                fontSize: "11px",
                 textAlign: "center",
-                lineHeight: 2,
+                lineHeight: 0,
                 width: "fit-content",
                 left: "50%",
                 position: "relative",
-                margin: 0,
+                margin: "revert",
                 flexGrow: 1,
                 height: 0,
-                transform: "translate(-50%,0%)"
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/backIcon",
-            options: {
-              widget: "Box"
-            },
-            config: {
-              main: {
-                iconName: "PrevIcon",
-                onClick: "backHandler",
-                width: "fit-content"
-              },
-              style: {
-                fill: theme.palette.primary.main,
-                width: 20,
-                height: 0,
-                margin: 0,
-                top: 0,
-                right: { xs: "12px", sm: "84px" },
-                position: "absolute",
-                fontSize: "12px",
-                cursor: "pointer",
-                ":hover": {
-                  fill: theme.palette.primary.dark
-                }
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/text",
-            options: {
-              widget: "Box"
-            },
-            config: {
-              main: {
-                heading: "Previous Page",
-                onClick: "backHandler"
-              },
-              style: {
-                display: { xs: "none", sm: "flex" },
-                textAlign: "left",
-                lineHeight: 1,
-                height: 0,
-                width: "fit-content",
-                color: theme.palette.primary.main,
-                fontSize: "12px",
-                cursor: "pointer",
-                marginLeft: "2px",
-                marginRight: 0,
-                top: 3,
-                right: "12px",
-                position: "absolute",
-                ":hover": {
-                  color: theme.palette.primary.dark
-                }
+                transform: "translate(-50%, 0%)"
               }
             }
           }
@@ -6284,44 +6250,51 @@ const ComponentSchema = {
   properties: {
     type: {
       oneOf: [
-        { title: "AadharcardText", const: "AadharcardText" },
+        { title: "Masked Aadhar Card", const: "AadharcardText" },
         { title: "Array", const: "Array" },
         { title: "Button", const: "Button" },
-        { title: "Card", const: "card" },
-        { title: "CheckBox", const: "CheckBox" },
+        { title: "Data Card", const: "card" },
+        { title: "Check Box", const: "CheckBox" },
         { title: "Container", const: "WrapperSection" },
-        { title: "DataGrid", const: "DataGrid" },
+        { title: "Data Grid", const: "DataGrid" },
         { title: "Date", const: "Date" },
-        { title: "DateTime", const: "DateTime" },
-        { title: "Download File", const: "DownloadFile" },
+        { title: "Time Stamp", const: "DateTime" },
+        { title: "Download", const: "DownloadFile" },
         { title: "Empty Box", const: "EmptyBox" },
-        { title: "File", const: "FileInput" },
+        { title: "File Handler", const: "FileInput" },
         { title: "Graph", const: "Graph" },
         { title: "Input Slider", const: "InputSlider" },
         { title: "Label", const: "Box" },
-        { title: "LeaderBoard", const: "LeaderBoard" },
-        { title: "MultipleSelect", const: "MultipleSelect" },
-        { title: "PanCardText", const: "PanCardText" },
-        { title: "Popup Container", const: "PopUp" },
-        { title: "ProgressBar", const: "ProgressBar" },
-        { title: "ProgressBar Card", const: "ProgressBarCard" },
-        { title: "Select", const: "Select" },
+        { title: "Leaderboard", const: "LeaderBoard" },
+        { title: "Multi-Select Dropdown", const: "MultipleSelect" },
+        { title: "Pan Card Masked", const: "PanCardText" },
+        { title: "Pop Up", const: "PopUp" },
+        { title: "Progress Bar", const: "ProgressBar" },
+        { title: "Progress Bar Card", const: "ProgressBarCard" },
+        { title: "Dropdown", const: "Select" },
         { title: "Slider", const: "Slider" },
-        { title: "SpeedoMeter", const: "SpeedoMeter" },
+        { title: "Speedometer", const: "SpeedoMeter" },
         { title: "Stepper Container", const: "Stepper" },
         { title: "Radio", const: "Radio" },
         { title: "Rank", const: "Rank" },
         { title: "Rank Card", const: "RankCard" },
-        { title: "Runner Boy Progress Bar", const: "RunnerBoyProgressBar" },
+        { title: "Runner Boy", const: "RunnerBoyProgressBar" },
         { title: "Table", const: "Table" },
         { title: "Tabs", const: "TabSection" },
         { title: "Text", const: "Text" },
         { title: "Text Area", const: "TextArea" },
         { title: "Timer", const: "Timer" },
-        { title: "Upload File", const: "UploadFile" },
-        { title: "TreeMap", const: "TreeMap" },
-        { title: "ColumnGroup", const: "ColumnGroup" },
-        { title: "Thought of the Day", const: "Thought" }
+        { title: "Upload", const: "UploadFile" },
+        { title: "Tree ", const: "TreeMap" },
+        { title: "Column Group", const: "ColumnGroup" },
+        { title: "Thought of the day", const: "Thought" }
+      ]
+    },
+    elementType: {
+      oneOf: [
+        { title: "Table Action Element", const: "action" },
+        { title: "Table Header Element", const: "tableHeader" },
+        { title: "Table Element", const: "element" }
       ]
     },
     columnFormat: {
@@ -6475,23 +6448,20 @@ const ComponentSchema = {
       }
     },
     filteringOptions: {
-      type: "array",
-      items: {
-        oneOf: [
-          { const: "fuzzy", title: "Fuzzy" },
-          { const: "contains", title: "Contain" },
-          { const: "startsWith", title: "Starts with" },
-          { const: "endsWith", title: "Ends with" },
-          { const: "equals", title: "Equals" },
-          { const: "notEquals", title: "Not Equals" },
-          { const: "between", title: "Between" },
-          { const: "betweenInclusive", title: "Between inclusive" },
-          { const: "greaterThan", title: "Greater than" },
-          { const: "greaterThanOrEqualTo", title: "Greater than or equal to" },
-          { const: "lessThan", title: "Less than" },
-          { const: "lessThanOrEqualTo", title: "Less than or equal to" }
-        ]
-      }
+      oneOf: [
+        { const: "fuzzy", title: "Fuzzy" },
+        { const: "contains", title: "Contain" },
+        { const: "startsWith", title: "Starts with" },
+        { const: "endsWith", title: "Ends with" },
+        { const: "equals", title: "Equals" },
+        { const: "notEquals", title: "Not Equals" },
+        { const: "between", title: "Between" },
+        { const: "betweenInclusive", title: "Between inclusive" },
+        { const: "greaterThan", title: "Greater than" },
+        { const: "greaterThanOrEqualTo", title: "Greater than or equal to" },
+        { const: "lessThan", title: "Less than" },
+        { const: "lessThanOrEqualTo", title: "Less than or equal to" }
+      ]
     },
     legendLabels: {
       type: "array",
@@ -6607,6 +6577,9 @@ const ComponentSchema = {
         { title: "Info", const: "info" }
       ]
     },
+    pageName: {
+      path: []
+    },
     name: {
       type: "string"
     },
@@ -6621,39 +6594,38 @@ const componentBasicUiSchema = (theme) => {
   var _a;
   const uiSchema = {
     type: "HorizontalLayout",
-    heading: "Component",
+    heading: "Page-Component",
     elements: [
-      {
-        type: "Control",
-        scope: "#/properties/pageName",
-        options: {
-          widget: "Box"
-        },
-        config: {
-          layout: 12,
-          main: {
-            heading: " "
-          },
-          style: {
-            marginLeft: theme.spacing(3),
-            width: "auto",
-            fontSize: "12px",
-            color: "gray"
-          }
-        }
-      },
       {
         type: "TabLayout",
         config: {
           main: {
             tabLabels: ["Core"],
-            defaultStyle: true,
             id: `component`
+          },
+          style: {
+            TabPanelStyle: {
+              padding: 0
+            }
+          },
+          TabsStyle: {
+            marginBottom: "3px",
+            paddingBottom: "4px",
+            boxShadow: "0px 3px 4px #afafaf80",
+            "& .MuiTabs-indicator": {
+              bottom: "6px"
+            }
           }
         },
         elements: [
           {
-            type: "HorizontalLayout",
+            type: "WrapperLayout",
+            config: {
+              main: {
+                label: " ",
+                gap: "8px"
+              }
+            },
             elements: [
               {
                 type: "Control",
@@ -6662,12 +6634,22 @@ const componentBasicUiSchema = (theme) => {
                   widget: "SelectInputField"
                 },
                 config: {
-                  layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+                  layout: { xs: 6, sm: 6, md: 4, lg: 3 },
                   main: {
                     label: "Type"
                   }
                 }
               },
+              {
+                type: "Control",
+                scope: "#/properties/proc",
+                config: {
+                  layout: { xs: 6, sm: 0, md: 0, lg: 0 }
+                },
+                options: {
+                  widget: "EmptyBox"
+                }
+              },
               {
                 type: "Control",
                 scope: "#/properties/name",
@@ -6675,11 +6657,9 @@ const componentBasicUiSchema = (theme) => {
                   widget: "InputField"
                 },
                 config: {
-                  layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+                  layout: { xs: 12, sm: 6, md: 4, lg: 3 },
                   main: {
-                    label: "Name",
-                    options: [],
-                    color: "secondary",
+                    label: "Component ID",
                     required: true
                   }
                 }
@@ -6691,7 +6671,7 @@ const componentBasicUiSchema = (theme) => {
                   widget: "InputField"
                 },
                 config: {
-                  layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+                  layout: { xs: 6, sm: 6, md: 4, lg: 3 },
                   main: {
                     label: "Label",
                     options: [],
@@ -6700,34 +6680,11 @@ const componentBasicUiSchema = (theme) => {
                   }
                 }
               },
-              {
-                type: "Control",
-                scope: "#/properties/columnFormat",
-                options: {
-                  widget: "SelectInputField"
-                },
-                config: {
-                  layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                  main: {
-                    label: "Column Format"
-                  }
-                }
-              },
-              {
-                type: "Control",
-                scope: "#/properties/proc",
-                config: {
-                  layout: { xs: 0, sm: 0, md: 4, lg: 4 }
-                },
-                options: {
-                  widget: "EmptyBox"
-                }
-              },
               {
                 type: "Control",
                 scope: "#/properties/proc",
                 config: {
-                  layout: { xs: 0, sm: 0, md: 4, lg: 4 }
+                  layout: { xs: 6, sm: 6, md: 0, lg: 3 }
                 },
                 options: {
                   widget: "EmptyBox"
@@ -6789,97 +6746,59 @@ const componentBasicUiSchema = (theme) => {
         ]
       },
       {
-        type: "HorizontalLayout",
+        type: "WrapperLayout",
         config: {
-          layout: { xs: 12, sm: 6 }
+          main: {
+            gap: "8px"
+          }
         },
         elements: [
           {
             type: "Control",
-            scope: "#/properties/RemoveItemButton",
+            scope: "#/properties/btn",
             options: {
-              widget: "IconButton"
+              widget: "Button"
             },
             config: {
-              layout: { xs: 1, sm: 1 },
+              layout: { xs: 4, sm: 2.5, md: 2, lg: 1.5 },
               main: {
-                onClick: "RemoveItemButton",
-                size: "large",
-                icon: "RejectIcon",
-                styleDefault: true
-              },
-              style: {
-                marginLeft: "-10px"
+                name: "Ok",
+                variant: "contained",
+                type: "text",
+                onClick: "okHandler",
+                size: "medium"
               }
             }
           },
           {
             type: "Control",
-            scope: "#/properties/copiedElementDetails",
+            scope: "#/properties/btnSubmit",
             options: {
-              widget: "Box"
+              widget: "Button"
             },
             config: {
-              layout: { xs: 6, sm: 6 },
+              layout: { xs: 4, sm: 2.5, md: 2, lg: 1.5 },
               main: {
-                heading: "No element copied"
-              },
-              style: {
-                color: "#535557",
-                marginLeft: "-10px",
-                fontSize: "12px",
-                marginTop: "4px"
+                name: "Save & Exit",
+                variant: "contained",
+                type: "text",
+                onClick: "saveHandler",
+                size: "medium"
               }
             }
           },
           {
             type: "Control",
             scope: "#/properties/EmptyBox",
+            config: {
+              layout: { xs: 4, sm: 7, md: 8, lg: 9 }
+            },
             options: {
               widget: "EmptyBox"
-            },
-            config: {
-              layout: { xs: 1, sm: 5 }
             }
           }
         ]
       },
-      {
-        type: "Control",
-        scope: "#/properties/btn",
-        options: {
-          widget: "Button"
-        },
-        config: {
-          layout: { xs: 4, sm: 2 },
-          main: {
-            name: "Ok",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "okHandler",
-            size: "medium"
-          }
-        }
-      },
-      {
-        type: "Control",
-        scope: "#/properties/btnSubmit",
-        options: {
-          widget: "Button"
-        },
-        config: {
-          layout: { xs: 4, sm: 2 },
-          main: {
-            name: "Save & Exit",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "saveHandler",
-            size: "medium"
-          }
-        }
-      },
       {
         type: "Control",
         scope: "#/properties/popUpComponentSection",
@@ -6906,17 +6825,18 @@ const componentBasicUiSchema = (theme) => {
               widget: "Box"
             },
             config: {
-              layout: 12,
+              layout: 11,
               main: {
-                heading: "Are you sure you want to delete ?"
+                heading: "Are you sure you want to delete this Component ?"
               },
               style: {
-                marginTop: "-20px",
-                fontSize: "20px",
                 "&.MuiTypography-root": {
-                  padding: "10px 30px 20px 30px",
+                  padding: "0px 20px",
                   textAlign: "center",
-                  lineHeight: "1"
+                  lineHeight: "1.2",
+                  fontWeight: "normal",
+                  fontSize: "18px",
+                  marginBottom: theme.spacing(5)
                 }
               }
             }
@@ -6924,7 +6844,7 @@ const componentBasicUiSchema = (theme) => {
           {
             type: "WrapperLayout",
             config: {
-              layout: 12,
+              layout: 11,
               main: {}
             },
             elements: [
@@ -6938,15 +6858,15 @@ const componentBasicUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "No",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
-                    color: "info",
                     type: "text",
                     onClick: "deletePopUpComponent",
                     size: "large"
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     left: 0,
                     width: "50%",
@@ -6974,7 +6894,6 @@ const componentBasicUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "Yes",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
                     color: "error",
                     type: "text",
@@ -6983,6 +6902,8 @@ const componentBasicUiSchema = (theme) => {
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     right: 0,
                     width: "50%",
@@ -7029,17 +6950,19 @@ const componentBasicUiSchema = (theme) => {
               widget: "Box"
             },
             config: {
-              layout: 12,
+              layout: 11,
               main: {
-                heading: "Are you sure you want to delete ?"
+                heading: "Are you sure you want to delete this Event ?"
               },
               style: {
-                marginTop: "-20px",
                 fontSize: "20px",
                 "&.MuiTypography-root": {
-                  padding: "10px 30px 20px 30px",
+                  padding: "0px 20px",
                   textAlign: "center",
-                  lineHeight: "1"
+                  lineHeight: "1.2",
+                  fontWeight: "normal",
+                  fontSize: "18px",
+                  marginBottom: theme.spacing(5)
                 }
               }
             }
@@ -7047,7 +6970,7 @@ const componentBasicUiSchema = (theme) => {
           {
             type: "WrapperLayout",
             config: {
-              layout: 12,
+              layout: 11,
               main: {}
             },
             elements: [
@@ -7061,15 +6984,15 @@ const componentBasicUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "No",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
-                    color: "info",
                     type: "text",
                     onClick: "deletePopUpEvent",
                     size: "large"
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     left: 0,
                     width: "50%",
@@ -7097,7 +7020,6 @@ const componentBasicUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "Yes",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
                     color: "error",
                     type: "text",
@@ -7106,6 +7028,8 @@ const componentBasicUiSchema = (theme) => {
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     right: 0,
                     width: "50%",
@@ -7128,47 +7052,25 @@ const componentBasicUiSchema = (theme) => {
       },
       {
         type: "Control",
-        scope: "#/properties/EmptyBox",
-        options: {
-          widget: "EmptyBox"
-        },
-        config: {
-          layout: { xs: 4, sm: 8 }
-        }
-      },
-      {
-        type: "Control",
-        scope: "#/properties/btn",
-        options: {
-          widget: "Button"
-        },
-        config: {
-          layout: { xs: 4, sm: 2 },
-          main: {
-            name: "Ok",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "okHandler",
-            size: "medium"
-          }
-        }
-      },
-      {
-        type: "Control",
-        scope: "#/properties/btnSubmit",
+        scope: "#/properties/pageName",
         options: {
-          widget: "Button"
+          widget: "Breadcrumb"
         },
         config: {
-          layout: { xs: 4, sm: 2 },
+          layout: 12,
           main: {
-            name: "Save & Exit",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "saveHandler",
-            size: "medium"
+            onNavigatePopupNo: "onNavigatePopupNo",
+            onNavigatePopupYes: "onNavigatePopupYes"
+          },
+          style: {
+            paddingLeft: theme.spacing(3),
+            color: theme.palette.grey[600],
+            fontSize: "10px",
+            position: "fixed",
+            bottom: "24px",
+            borderBottom: `1px solid ${theme.palette.common.black}29`,
+            borderTop: `1px solid ${theme.palette.common.black}29`,
+            backgroundColor: theme.palette.background.default
           }
         }
       },
@@ -7189,8 +7091,7 @@ const componentBasicUiSchema = (theme) => {
           style: {
             flexDirection: "row",
             position: "absolute",
-            bottom: 0,
-            marginBottom: "-8px",
+            bottom: 10,
             height: "fit-content",
             overflow: "hidden",
             zIndex: 1e3,
@@ -7210,75 +7111,16 @@ const componentBasicUiSchema = (theme) => {
               },
               style: {
                 color: ((_a = theme == null ? void 0 : theme.palette) == null ? void 0 : _a.text.disabled) || "#AFAFAF",
-                fontSize: "12px",
+                fontSize: "11px",
                 textAlign: "center",
-                lineHeight: 2,
+                lineHeight: 0,
                 width: "fit-content",
                 left: "50%",
                 position: "relative",
-                margin: 0,
+                margin: "revert",
                 flexGrow: 1,
                 height: 0,
-                transform: "translate(-50%,0%)"
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/backIcon",
-            options: {
-              widget: "Box"
-            },
-            config: {
-              main: {
-                iconName: "PrevIcon",
-                onClick: "backHandler",
-                width: "fit-content"
-              },
-              style: {
-                fill: theme.palette.primary.main,
-                width: 20,
-                height: 0,
-                margin: 0,
-                top: 0,
-                right: { xs: "12px", sm: "84px" },
-                position: "absolute",
-                fontSize: "12px",
-                cursor: "pointer",
-                ":hover": {
-                  fill: theme.palette.primary.dark
-                }
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/text",
-            options: {
-              widget: "Box"
-            },
-            config: {
-              main: {
-                heading: "Previous Page",
-                onClick: "backHandler"
-              },
-              style: {
-                display: { xs: "none", sm: "flex" },
-                textAlign: "left",
-                lineHeight: 1,
-                height: 0,
-                width: "fit-content",
-                color: theme.palette.primary.main,
-                fontSize: "12px",
-                cursor: "pointer",
-                marginLeft: "2px",
-                marginRight: 0,
-                top: 3,
-                right: "12px",
-                position: "absolute",
-                ":hover": {
-                  color: theme.palette.primary.dark
-                }
+                transform: "translate(-50%, 0%)"
               }
             }
           }
@@ -7289,7 +7131,13 @@ const componentBasicUiSchema = (theme) => {
   return uiSchema;
 };
 const CoreSection = {
-  type: "HorizontalLayout",
+  type: "WrapperLayout",
+  config: {
+    main: {
+      label: " ",
+      gap: "8px"
+    }
+  },
   elements: [
     {
       type: "Control",
@@ -7298,7 +7146,7 @@ const CoreSection = {
         widget: "SelectInputField"
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
         main: {
           label: "Type",
           type: "text"
@@ -7307,40 +7155,39 @@ const CoreSection = {
     },
     {
       type: "Control",
-      scope: "#/properties/name",
-      options: {
-        widget: "InputField"
-      },
+      scope: "#/properties/proc",
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-        main: {
-          label: "Name"
-        }
+        layout: { xs: 6, sm: 0, md: 0, lg: 0 }
+      },
+      options: {
+        widget: "EmptyBox"
       }
     },
     {
       type: "Control",
-      scope: "#/properties/label",
+      scope: "#/properties/name",
       options: {
         widget: "InputField"
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+        layout: { xs: 12, sm: 6, md: 4, lg: 3 },
         main: {
-          label: "Label"
+          label: "Component ID",
+          required: true
         }
       }
     },
     {
       type: "Control",
-      scope: "#/properties/columnFormat",
+      scope: "#/properties/label",
       options: {
-        widget: "SelectInputField"
+        widget: "InputField"
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
         main: {
-          label: "Column Format"
+          label: "Label",
+          required: true
         }
       }
     },
@@ -7348,17 +7195,7 @@ const CoreSection = {
       type: "Control",
       scope: "#/properties/proc",
       config: {
-        layout: { xs: 0, sm: 0, md: 4, lg: 4 }
-      },
-      options: {
-        widget: "EmptyBox"
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/proc",
-      config: {
-        layout: { xs: 0, sm: 0, md: 4, lg: 4 }
+        layout: { xs: 6, sm: 6, md: 0, lg: 3 }
       },
       options: {
         widget: "EmptyBox"
@@ -7441,15 +7278,20 @@ const EventSection = (theme) => {
                     },
                     config: {
                       main: {
-                        color: "info",
                         onClick: "eventAddHandler",
                         size: "small",
-                        icon: "AddIcon",
-                        iconLabel: "Add New",
+                        icon: "TableAddIcon",
+                        iconLabel: "Add",
                         styleDefault: true
                       },
                       style: {
-                        mt: "6px"
+                        mt: "6px",
+                        color: "inherit",
+                        fill: "inherit",
+                        "&:hover": {
+                          color: "inherit",
+                          fill: "inherit"
+                        }
                       }
                     }
                   }
@@ -7465,12 +7307,18 @@ const EventSection = (theme) => {
                       main: {
                         onClick: "copyPasteElement",
                         size: "small",
-                        icon: "PasteIcon",
+                        icon: "TablePaste",
                         iconLabel: "Paste",
                         styleDefault: true
                       },
                       style: {
-                        mt: "6px"
+                        mt: "6px",
+                        color: "inherit",
+                        fill: "inherit",
+                        "&:hover": {
+                          color: "inherit",
+                          fill: "inherit"
+                        }
                       }
                     }
                   }
@@ -7485,15 +7333,21 @@ const EventSection = (theme) => {
         elements: [
           {
             accessorKey: "eventType",
-            header: "Event Type"
+            header: "Event's Type",
+            type: "string",
+            size: 300
           },
           {
             accessorKey: "Handler",
-            header: "Handler"
+            header: "Handler",
+            type: "string",
+            size: 200
           },
           {
             accessorKey: "Edit_Approve_Records",
-            header: "Edit Widget",
+            header: "Edit",
+            size: 150,
+            type: "action",
             widget: {
               type: "Control",
               scope: "#/properties/Edit_Records",
@@ -7502,14 +7356,16 @@ const EventSection = (theme) => {
               },
               config: {
                 main: {
-                  color: "info",
                   size: "small",
-                  icon: "EditIcon",
+                  icon: "TableEditIcon",
                   tooltipMessage: "Edit This Record",
                   onClick: "eventEditHandler"
                 },
                 style: {
-                  color: theme.palette.primary.main
+                  fill: theme.palette.primary.main,
+                  "& :hover": {
+                    fill: theme.palette.primary.dark
+                  }
                 }
               }
             }
@@ -7517,6 +7373,8 @@ const EventSection = (theme) => {
           {
             accessorKey: "Reject_Records",
             header: "Delete",
+            size: 150,
+            type: "action",
             widget: {
               type: "Control",
               scope: "#/properties/RejectButton",
@@ -7526,10 +7384,15 @@ const EventSection = (theme) => {
               },
               config: {
                 main: {
-                  icon: "RejectIcon",
-                  color: "error",
+                  icon: "Bin",
                   tooltipMessage: "Reject This Record",
                   onClick: "deletePopUpEvent"
+                },
+                style: {
+                  fill: theme.palette.primary.main,
+                  "& :hover": {
+                    fill: theme.palette.primary.dark
+                  }
                 }
               }
             }
@@ -7537,7 +7400,8 @@ const EventSection = (theme) => {
           {
             header: "Copy",
             field: "Copy_Event",
-            flex: 1,
+            size: 150,
+            type: "action",
             widget: {
               type: "Control",
               scope: "#/properties/Copy_Event",
@@ -7587,7 +7451,7 @@ const emptyBox$1 = (scope, layout) => {
 const cardLayout = {
   type: "Control",
   scope: "#/properties/cardLayout",
-  layout: 11.5,
+  layout: 12,
   options: {
     detail: {
       type: "HorizontalLayout",
@@ -7630,34 +7494,46 @@ const getArrayControl = (parentScope, childScope, childLabel) => {
   return {
     type: "Control",
     scope: `#/properties/${parentScope}`,
-    layout: 12,
     options: {
-      "elementLabelProp": childScope,
-      detail: {
-        type: "HorizontalLayout",
-        elements: [
-          {
-            type: "Control",
-            scope: `#/properties/${childScope}`,
-            options: {
-              widget: "InputField"
-            },
-            config: {
-              layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-              main: {
-                label: childLabel || "Labels for Tab"
-              }
-            }
-          },
-          emptyBox$1("ArrayControlEmpty1", { xs: 6, sm: 6, md: 4, lg: 4 }),
-          emptyBox$1("ArrayControlEmpty2", { xs: 0, sm: 0, md: 4, lg: 4 })
-        ]
+      widget: "Array"
+    },
+    config: {
+      layout: 12,
+      main: {
+        label: childLabel,
+        childElementLabel: childLabel
+      },
+      style: {
+        marginLeft: "-24px",
+        marginBottom: "24px !important",
+        labelStyle: {
+          marginLeft: "24px"
+        },
+        detailsStyle: {
+          marginLeft: "24px"
+        }
       }
-    }
+    },
+    elements: [
+      {
+        type: "Control",
+        scope: `#/properties/${childScope}`,
+        options: {
+          widget: "InputField"
+        },
+        config: {
+          layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+          main: {
+            label: childLabel || "Labels for Tab"
+          }
+        }
+      },
+      emptyBox$1("ArrayControlEmpty1", { xs: 6, sm: 6, md: 8, lg: 8 })
+    ]
   };
 };
 const sizeHolder = getArrayControl("sizeHolder", "keyName", "Component Name");
-sizeHolder.options.detail.elements[1] = {
+sizeHolder.elements[1] = {
   type: "Control",
   scope: `#/properties/value`,
   options: {
@@ -7670,7 +7546,7 @@ sizeHolder.options.detail.elements[1] = {
     }
   }
 };
-sizeHolder.options.detail.elements[2] = emptyBox$1("sizeHolderempty");
+sizeHolder.elements[2] = emptyBox$1("sizeHolderempty");
 const getInputField = (scope, label) => {
   return {
     type: "Control",
@@ -7679,7 +7555,7 @@ const getInputField = (scope, label) => {
       widget: "InputField"
     },
     config: {
-      layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+      layout: { xs: 6, sm: 6, md: 4, lg: 3 },
       main: {
         label
       }
@@ -7694,7 +7570,7 @@ const getRadioInputField = (scope, label, options) => {
       widget: "RadioInputField"
     },
     config: {
-      layout: { xs: 12, sm: 6, md: 4, lg: 4 },
+      layout: { xs: 12, sm: 6, md: 4, lg: 3 },
       main: {
         label,
         options
@@ -7709,17 +7585,7 @@ const buildWrapper = (label, elements) => {
       main: {
         label: label || "Details",
         isAccordion: true
-      },
-      wrapperStyle: {
-        marginTop: "-6px",
-        marginBottom: "-8px",
-        marginLeft: "-34px",
-        width: "108%"
-      },
-      componentsBoxStyle: {
-        marginLeft: "12px"
-      },
-      defaultStyle: true
+      }
     },
     elements: elements || []
   };
@@ -7733,18 +7599,8 @@ const getTextArea = (scope, heading, hideButton, layout) => {
     },
     config: {
       layout: layout || 12,
-      style: {
-        containerStyle: {
-          borderRadius: "20px"
-        },
-        headerContainerStyle: {},
-        textAreaStyle: {
-          borderRadius: "20px",
-          padding: "20px"
-        }
-      },
       main: {
-        heading,
+        label: heading,
         minRows: 8,
         hideButton,
         enableCodeEditor: true
@@ -7760,7 +7616,7 @@ const getSelectField = (scope, label, options) => {
       widget: "SelectInputField"
     },
     config: {
-      layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+      layout: { xs: 6, sm: 6, md: 4, lg: 3 },
       main: {
         label,
         type: "text"
@@ -7776,7 +7632,7 @@ const getMultiSelectField = (scope, label) => {
       widget: "MultipleSelect"
     },
     config: {
-      layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+      layout: { xs: 6, sm: 6, md: 4, lg: 3 },
       main: {
         multiple: true,
         label,
@@ -7785,12 +7641,18 @@ const getMultiSelectField = (scope, label) => {
     }
   };
 };
-const GraphSection = {
+const BaseSection = {
   type: "WrapperLayout",
+  config: {
+    main: {
+      label: " ",
+      gap: "8px"
+    }
+  },
   elements: []
 };
 const buildPropertiesSection = function(type) {
-  let uiSchema = _.cloneDeep(GraphSection);
+  let uiSchema = _.cloneDeep(BaseSection);
   switch (type) {
     case "TreeMap":
       uiSchema.elements = [
@@ -7845,7 +7707,7 @@ const buildPropertiesSection = function(type) {
     case "Text":
       uiSchema.elements = [
         getInputField("placeholder", "Placeholder"),
-        emptyBox$1("TextEmpty1", { xs: 6, sm: 6, md: 4, lg: 4 }),
+        getRadioInputField("multiline", "Multiline", ["YES", "NO"]),
         emptyBox$1("TextEmpty1", { xs: 0, sm: 0, md: 4, lg: 4 }),
         getArrayControl("InputFormatingAndMasking", "formatElement", "Format Element")
       ];
@@ -7854,7 +7716,8 @@ const buildPropertiesSection = function(type) {
       uiSchema.elements = [
         getInputField("placeholder", "Placeholder"),
         getRadioInputField("enableCodeEditor", "Enable Code Editor", ["YES", "NO"]),
-        getInputField("codeEditorLanguage", "Enter Code Language")
+        getInputField("codeEditorLanguage", "Enter Code Language"),
+        emptyBox$1("TextEmpty1", { xs: 0, sm: 0, md: 0, lg: 3 })
       ];
       break;
     case "SpeedoMeter":
@@ -7934,7 +7797,7 @@ const buildPropertiesSection = function(type) {
         getInputField("xAxisValue", "X-AxisValue"),
         getRadioInputField("bottomAxisAngle", "Bottom Axis Angled", ["YES", "No"]),
         getInputField("leftMargin", "Left Margin"),
-        emptyBox$1("GraphEmpty1", { xs: 6, sm: 0, md: 8, lg: 8 }),
+        emptyBox$1("GraphEmpty1", { xs: 6, sm: 0, md: 8, lg: 6 }),
         getArrayControl("legendLabels", "label"),
         getArrayControl("pieArcColors", "color")
       ];
@@ -8015,7 +7878,13 @@ const buildPropertiesSection = function(type) {
   return uiSchema;
 };
 const StyleSection = {
-  type: "HorizontalLayout",
+  type: "WrapperLayout",
+  config: {
+    main: {
+      label: " ",
+      gap: "8px"
+    }
+  },
   elements: [
     {
       type: "Control",
@@ -8031,14 +7900,7 @@ const StyleSection = {
           lg: 12
         },
         style: {
-          containerStyle: {
-            borderRadius: "20px"
-          },
-          headerContainerStyle: {},
-          textAreaStyle: {
-            borderRadius: "20px",
-            padding: "20px"
-          }
+          "& .MuiFormLabel-root:not(.MuiInputLabel-shrink)": {}
         },
         main: {
           heading: "JSON Style",
@@ -8072,15 +7934,20 @@ const TableSection = (theme) => {
                     },
                     config: {
                       main: {
-                        color: "info",
                         onClick: "widgetAddClickHandler",
                         size: "small",
-                        icon: "AddIcon",
-                        iconLabel: "Add New",
+                        icon: "TableAddIcon",
+                        iconLabel: "Add",
                         styleDefault: true
                       },
                       style: {
-                        mt: "6px"
+                        mt: "6px",
+                        color: "inherit",
+                        fill: "inherit",
+                        "&:hover": {
+                          color: "inherit",
+                          fill: "inherit"
+                        }
                       }
                     }
                   }
@@ -8096,12 +7963,18 @@ const TableSection = (theme) => {
                       main: {
                         onClick: "copyPasteElement",
                         size: "small",
-                        icon: "PasteIcon",
+                        icon: "TablePaste",
                         iconLabel: "Paste",
                         styleDefault: true
                       },
                       style: {
-                        mt: "6px"
+                        mt: "6px",
+                        color: "inherit",
+                        fill: "inherit",
+                        "&:hover": {
+                          color: "inherit",
+                          fill: "inherit"
+                        }
                       }
                     }
                   }
@@ -8116,16 +7989,21 @@ const TableSection = (theme) => {
         elements: [
           {
             accessorKey: "name",
-            header: "Name"
+            header: "Name",
+            type: "string",
+            size: 300
           },
           {
             accessorKey: "type",
-            header: "Type"
+            header: "Type",
+            type: "string",
+            size: 200
           },
           {
             header: "Edit Record",
             field: "Reject_Records",
-            flex: 1,
+            size: 150,
+            type: "action",
             widget: {
               type: "Control",
               scope: "#/properties/RejectButton",
@@ -8134,13 +8012,16 @@ const TableSection = (theme) => {
               },
               config: {
                 main: {
-                  icon: "EditIcon",
-                  color: "primary",
+                  icon: "TableEditIcon",
+                  size: "small",
                   onClick: "editComponents",
                   tooltipMessage: "Reject This Record"
                 },
                 style: {
-                  color: theme.palette.primary.main
+                  fill: theme.palette.primary.main,
+                  "& :hover": {
+                    fill: theme.palette.primary.dark
+                  }
                 }
               }
             }
@@ -8148,7 +8029,8 @@ const TableSection = (theme) => {
           {
             header: "Delete",
             field: "Reject_Records",
-            flex: 1,
+            size: 150,
+            type: "action",
             widget: {
               type: "Control",
               scope: "#/properties/RejectButton",
@@ -8157,10 +8039,15 @@ const TableSection = (theme) => {
               },
               config: {
                 main: {
-                  icon: "RejectIcon",
-                  color: "error",
+                  icon: "Bin",
                   onClick: "deletePopUpComponent",
                   tooltipMessage: "Reject This Record"
+                },
+                style: {
+                  fill: theme.palette.primary.main,
+                  "& :hover": {
+                    fill: theme.palette.primary.dark
+                  }
                 }
               }
             }
@@ -8168,7 +8055,8 @@ const TableSection = (theme) => {
           {
             header: "Copy",
             field: "Copy_Component",
-            flex: 1,
+            size: 150,
+            type: "action",
             widget: {
               type: "Control",
               scope: "#/properties/Copy_Component",
@@ -8192,60 +8080,86 @@ const TableSection = (theme) => {
   return uiSchema;
 };
 const ValueTab = {
-  type: "HorizontalLayout",
+  type: "WrapperLayout",
+  config: {
+    main: {
+      label: " ",
+      gap: "8px"
+    }
+  },
   elements: [
     {
       type: "Control",
       scope: "#/properties/value",
-      layout: 12,
       options: {
-        detail: {
-          type: "HorizontalLayout",
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/label",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Label"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/value",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Value"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/emptyBox",
-              options: {
-                widget: "EmptyBox"
-              },
-              config: {
-                layout: { xs: 0, sm: 0, md: 4, lg: 4 }
-              }
+        widget: "Array"
+      },
+      config: {
+        layout: 12,
+        main: {
+          label: "Value",
+          childElementLabel: "Value"
+        },
+        style: {
+          marginLeft: "-24px",
+          marginBottom: "24px !important",
+          labelStyle: {
+            marginLeft: "24px"
+          },
+          detailsStyle: {
+            marginLeft: "24px"
+          }
+        }
+      },
+      elements: [
+        {
+          type: "Control",
+          scope: "#/properties/label",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Label"
             }
-          ]
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/value",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Value"
+            }
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/emptyBox",
+          options: {
+            widget: "EmptyBox"
+          },
+          config: {
+            layout: { xs: 0, sm: 0, md: 4, lg: 4 }
+          }
         }
-      }
+      ]
     }
   ]
 };
 const ValidationSection = {
-  type: "HorizontalLayout",
+  type: "WrapperLayout",
+  config: {
+    main: {
+      label: " ",
+      gap: "8px"
+    }
+  },
   elements: [
     {
       type: "Control",
@@ -8329,7 +8243,12 @@ const createLayoutFormat = (config2) => {
       lg: 12
     };
   }
-  let data = {};
+  let data = {
+    xs: 12,
+    sm: 12,
+    md: 6,
+    lg: 6
+  };
   config2.map((e) => {
     data[e.key || "xs"] = +e.value || 5.5;
   });
@@ -8395,7 +8314,7 @@ const getFormdataFromSessionStorage = (path) => {
   }
   return returnValue || pageFormdata;
 };
-async function saveHandler(store2, service2, submitHandler, pageName) {
+async function saveHandler(store2, service2, submitHandler) {
   var _a, _b;
   (_a = store2.searchParams) == null ? void 0 : _a.get("id");
   const path = (_b = store2.searchParams) == null ? void 0 : _b.get("path");
@@ -8404,7 +8323,7 @@ async function saveHandler(store2, service2, submitHandler, pageName) {
   if (_.isEmpty(store2.ctx.core.errors)) {
     try {
       const saveReturn = await submitHandler(store2, service2, config2);
-      navigateHandler(store2, true, pageName ? `/${pageName}?id=${saveReturn.id}` : "/PageMasterRecords");
+      navigateHandler(store2, true, "/PageMasterRecords");
     } catch (err) {
       navigateHandler(store2, false);
     }
@@ -8445,53 +8364,138 @@ function okHandler(store2) {
   }
 }
 const sectionLabels = {
-  Select: ["Core", "Properties", "Value", "Event", "Style", "Validation"],
-  MultipleSelect: ["Core", "Properties", "Value", "Event", "Style", "Validation"],
-  Table: ["Core", "Components", "Properties", "Event", "Style", "Validation"],
-  LeaderBoard: ["Core", "Components", "Properties", "Event", "Style", "Validation"],
+  Select: ["Core", "Properties", "Value", "Events", "Style", "Validation"],
+  MultipleSelect: ["Core", "Properties", "Value", "Events", "Style", "Validation"],
+  Table: ["Core", "Components", "Properties", "Events", "Style", "Validation"],
+  LeaderBoard: ["Core", "Components", "Properties", "Events", "Style", "Validation"],
   WrapperSection: ["Core", "Components", "Properties", "Style", "Validation"],
   TabSection: ["Core", "Components", "Properties", "Style", "Validation"],
-  SpeedoMeter: ["Core", "Properties", "Event", "Style", "Validation"],
-  card: ["Core", "Properties", "Event", "Style", "Validation"],
-  UploadFile: ["Core", "Event", "Style", "Validation"],
-  Graph: ["Core", "Properties", "Event", "Style", "Validation"],
-  DownloadFile: ["Core", "Event", "Style", "Validation"],
-  Box: ["Core", "Event", "Style", "Validation"],
-  Properties: ["Core", "Properties", "Event", "Style", "Validation"],
-  ProgressBarCard: ["Core", "Properties", "Event", "Style", "Validation"],
-  RankCard: ["Core", "Properties", "Event", "Style", "Validation"],
-  Slider: ["Core", "Components", "Event", "Style", "Validation"],
-  Timer: ["Core", "Event", "Style", "Validation"],
-  Rank: ["Core", "Event", "Style", "Validation"],
-  Button: ["Core", "Properties", "Event", "Style", "Validation"],
+  SpeedoMeter: ["Core", "Properties", "Events", "Style", "Validation"],
+  card: ["Core", "Properties", "Events", "Style", "Validation"],
+  UploadFile: ["Core", "Events", "Style", "Validation"],
+  Graph: ["Core", "Properties", "Events", "Style", "Validation"],
+  DownloadFile: ["Core", "Events", "Style", "Validation"],
+  Box: ["Core", "Events", "Style", "Validation"],
+  Properties: ["Core", "Properties", "Events", "Style", "Validation"],
+  ProgressBarCard: ["Core", "Properties", "Events", "Style", "Validation"],
+  RankCard: ["Core", "Properties", "Events", "Style", "Validation"],
+  Slider: ["Core", "Components", "Events", "Style", "Validation"],
+  Timer: ["Core", "Events", "Style", "Validation"],
+  Rank: ["Core", "Events", "Style", "Validation"],
+  Button: ["Core", "Properties", "Events", "Style", "Validation"],
   Array: ["Core", "Components", "Validation"],
-  Radio: ["Core", "Properties", "Event", "Style", "Validation"],
-  Text: ["Core", "Properties", "Event", "Style", "Validation"],
-  TextArea: ["Core", "Properties", "Event", "Style", "Validation"],
+  Radio: ["Core", "Properties", "Events", "Style", "Validation"],
+  Text: ["Core", "Properties", "Events", "Style", "Validation"],
+  TextArea: ["Core", "Properties", "Events", "Style", "Validation"],
   PopUp: ["Core", "Components", "Properties", "Style"],
-  Stepper: ["Core", "Components", "Properties", "Event", "Style"],
-  DataGrid: ["Core", "Components", "Properties", "Event", "Style"],
-  InputSlider: ["Core", "Properties", "Event", "Style", "Validation"],
-  TreeMap: ["Core", "Components", "Properties", "Event", "Style"],
+  Stepper: ["Core", "Components", "Properties", "Events", "Style"],
+  DataGrid: ["Core", "Components", "Properties", "Events", "Style"],
+  InputSlider: ["Core", "Properties", "Events", "Style", "Validation"],
+  TreeMap: ["Core", "Components", "Properties", "Events", "Style"],
   ColumnGroup: ["Core", "Components"],
-  Thought: ["Core", "Properties", "Event", "Style", "Validation"]
+  Thought: ["Core", "Properties", "Events", "Style", "Validation"]
 };
 function refreshPage(type, store2) {
-  var _a;
+  var _a, _b;
   const UiSchema = _.cloneDeep(componentBasicUiSchema(store2.theme.myTheme));
+  const currentConfig = JSON.parse(sessionStorage.getItem("pageFormdata"));
   if (type) {
     const sectionUiSchema = {
       Core: CoreSection,
       Value: ValueTab,
       Style: StyleSection,
-      Event: EventSection(store2.theme.myTheme),
+      Events: EventSection(store2.theme.myTheme),
       Components: TableSection(store2.theme.myTheme),
       Properties: buildPropertiesSection(type),
       Validation: ValidationSection
     };
     const elements = (_a = sectionLabels[type]) == null ? void 0 : _a.map((e) => sectionUiSchema[e]);
-    UiSchema.elements[1].config.main.tabLabels = sectionLabels[type] || ["Core", "Style", "Event", "Validation"];
-    UiSchema.elements[1].elements = elements || [CoreSection, StyleSection, EventSection(store2.theme.myTheme), ValidationSection];
+    UiSchema.elements[0].config.main.tabLabels = sectionLabels[type] || ["Core", "Style", "Events", "Validation"];
+    UiSchema.elements[0].elements = elements || [CoreSection, StyleSection, EventSection(store2.theme.myTheme), ValidationSection];
+  }
+  const path = (_b = store2.searchParams) == null ? void 0 : _b.get("path");
+  const lastDotIndex = path.lastIndexOf(".");
+  const parentPath = path.slice(0, lastDotIndex);
+  const parentObj = _.get(currentConfig, parentPath);
+  if ((parentObj == null ? void 0 : parentObj.type) === "Table") {
+    UiSchema.elements[0].elements[0].elements[4] = {
+      type: "Control",
+      scope: "#/properties/columnFormat",
+      options: {
+        widget: "SelectInputField"
+      },
+      config: {
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        main: {
+          label: "Column Format"
+        }
+      }
+    };
+    UiSchema.elements[0].elements[0].elements[6] = {
+      type: "Control",
+      scope: "#/properties/filteringOptions",
+      options: {
+        widget: "SelectInputField"
+      },
+      config: {
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        main: {
+          label: "Filter Mode",
+          multiple: true
+        }
+      }
+    };
+    UiSchema.elements[0].elements[0].elements[5] = {
+      type: "Control",
+      scope: "#/properties/enableFilter",
+      options: {
+        widget: "RadioInputField"
+      },
+      config: {
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        main: {
+          label: "Enable Filter",
+          options: ["Yes", "No"]
+        }
+      }
+    }, UiSchema.elements[0].elements[0].elements[7] = {
+      type: "Control",
+      scope: "#/properties/enableSorting",
+      options: {
+        widget: "RadioInputField"
+      },
+      config: {
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        main: {
+          label: "Enable Sorting",
+          options: ["Yes", "No"]
+        }
+      }
+    }, UiSchema.elements[0].elements[0].elements[8] = {
+      type: "Control",
+      scope: "#/properties/columnKey",
+      config: {
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        main: {
+          label: "Column Key"
+        }
+      },
+      options: {
+        widget: "InputField"
+      }
+    }, UiSchema.elements[0].elements[0].elements[9] = {
+      type: "Control",
+      scope: "#/properties/elementType",
+      options: {
+        widget: "SelectInputField"
+      },
+      config: {
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
+        main: {
+          label: "Element Type"
+        }
+      }
+    };
   }
   if (sessionStorage.getItem("copiedConfig")) {
     this.ElementPathSetter(UiSchema);
@@ -8514,14 +8518,38 @@ var Component = (store2, dynamicData2, submitHandler, service2) => {
       return getFormdataFromSessionStorage(path);
     },
     getSchema: function() {
+      var _a, _b, _c;
       const schema2 = _.cloneDeep(ComponentSchema);
       if (sessionStorage.getItem("copiedConfig")) {
         schema2.properties.RemoveItemButton.disabled = false;
       }
+      const config2 = JSON.parse(sessionStorage.getItem("pageFormdata"));
+      const path = (_a = store2.searchParams) == null ? void 0 : _a.get("path");
+      const id = (_b = store2.searchParams) == null ? void 0 : _b.get("id");
+      let pathArray = [{ label: (_c = config2.name) != null ? _c : "NewPage", path: `/PageMaster${id ? `?id=${id}` : ""}` }];
+      if (path) {
+        const pathArrayAll = path.split(".");
+        const arr = [];
+        pathArrayAll.map((e, i) => {
+          if (i === 0) {
+            arr.push(e);
+            return;
+          }
+          arr.push(`${arr[i - 1]}.${e}`);
+        });
+        arr.map((e) => {
+          const data = _.get(config2, e);
+          pathArray.push({
+            label: (data == null ? void 0 : data.name) || (data == null ? void 0 : data.eventType) || "NewComponent",
+            path: `/Component?path=${e}${id ? `&id=${id}` : ""}`
+          });
+        });
+      }
+      schema2.properties.pageName.path = pathArray;
       return schema2;
     },
     okHandler: () => okHandler(store2),
-    saveHandler: async () => await saveHandler(store2, service2, submitHandler, "PageMaster"),
+    saveHandler: async () => await saveHandler(store2, service2, submitHandler),
     onChange: function() {
       var _a, _b, _c, _d;
       if (((_a = store2 == null ? void 0 : store2.formData) == null ? void 0 : _a.type) !== ((_b = store2 == null ? void 0 : store2.newData) == null ? void 0 : _b.type) && ((_c = store2 == null ? void 0 : store2.newData) == null ? void 0 : _c.type) !== void 0) {
@@ -8630,6 +8658,10 @@ var Component = (store2, dynamicData2, submitHandler, service2) => {
       const copiedFormData = getFormdataFromSessionStorage(copiedElementPath);
       this.ElementPathSetter(uiSchema, copiedFormData);
       sessionStorage.setItem("copiedConfig", JSON.stringify(copiedFormData));
+      store2.setNotify({
+        SuccessMessage: `${elementType} Copied Successfully`,
+        Success: true
+      });
       store2.setSchema(schema2);
       store2.setUiSchema(uiSchema);
     },
@@ -8643,20 +8675,27 @@ var Component = (store2, dynamicData2, submitHandler, service2) => {
         return;
       }
       const pastedElementParentPath = (_a = store2.searchParams) == null ? void 0 : _a.get("path");
+      if (!Array.isArray(store2.formData.elements)) {
+        store2.formData.elements = [];
+      }
+      if (!Array.isArray(store2.formData.events)) {
+        store2.formData.events = [];
+      }
+      saveFormdataInSessionStorage(store2.ctx.core.data, pastedElementParentPath);
       const formData = getFormdataFromSessionStorage(pastedElementParentPath);
       const insertElementIndex = elementType === "Component" ? formData.elements.length : formData.events.length;
       const pastedElementPath = this.elementPathHandler(pastedElementParentPath, insertElementIndex, elementType);
       const copiedConfig = JSON.parse(sessionStorage.getItem("copiedConfig"));
       const notificationMessages = {
-        Event: " The event cannot be integrated into the component section.",
-        Component: "The component cannot be integrated into the event section."
+        Events: " The Events cannot be integrated into the component section.",
+        Component: "The component cannot be integrated into the Events section."
       };
       if (copiedConfig.Handler && elementType === "Component") {
         store2.setNotify({
-          FailMessage: notificationMessages.Event,
+          FailMessage: notificationMessages.Events,
           Fail: true
         });
-      } else if (copiedConfig.name && elementType === "Event") {
+      } else if (copiedConfig.name && elementType === "Events") {
         store2.setNotify({
           FailMessage: notificationMessages.Component,
           Fail: true
@@ -8682,8 +8721,33 @@ var Component = (store2, dynamicData2, submitHandler, service2) => {
       return parentPath ? `${parentPath}.events[${rowId}]` : `events[${rowId}]`;
     },
     ElementPathSetter: function(uiSchema, copiedFormData) {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
       const formData = copiedFormData || JSON.parse(sessionStorage.getItem("copiedConfig"));
-      uiSchema.elements[2].elements[1].config.main.heading = `Copied Path: ${formData.pageName}`;
+      if ((_f = (_e = (_d = (_c = (_b = (_a = uiSchema == null ? void 0 : uiSchema.elements) == null ? void 0 : _a[1]) == null ? void 0 : _b.elements) == null ? void 0 : _c[0]) == null ? void 0 : _d.config) == null ? void 0 : _e.main) == null ? void 0 : _f.headerIcons) {
+        uiSchema.elements[1].elements[0].config.main.headerIcons.elements[1].widget.config.main.tooltipMessage = `Copied Component: ${formData.name}`;
+      } else if ((_n = (_m = (_l = (_k = (_j = (_i = (_h = (_g = uiSchema == null ? void 0 : uiSchema.elements) == null ? void 0 : _g[0]) == null ? void 0 : _h.elements) == null ? void 0 : _i[1]) == null ? void 0 : _j.elements) == null ? void 0 : _k[0]) == null ? void 0 : _l.config) == null ? void 0 : _m.main) == null ? void 0 : _n.headerIcons) {
+        uiSchema.elements[0].elements[1].elements[0].config.main.headerIcons.elements[1].widget.config.main.tooltipMessage = `Copied Component: ${formData.name}`;
+      }
+      if ((_t = (_s = (_r = (_q = (_p = (_o = uiSchema == null ? void 0 : uiSchema.elements) == null ? void 0 : _o[1]) == null ? void 0 : _p.elements) == null ? void 0 : _q[1]) == null ? void 0 : _r.config) == null ? void 0 : _s.main) == null ? void 0 : _t.headerIcons) {
+        uiSchema.elements[1].elements[1].config.main.headerIcons.elements[1].widget.config.main.tooltipMessage = `Copied Event: ${formData.eventType}`;
+      } else if ((_z = (_y = (_x = (_w = (_v = (_u = uiSchema == null ? void 0 : uiSchema.elements) == null ? void 0 : _u[0]) == null ? void 0 : _v.elements) == null ? void 0 : _w[1]) == null ? void 0 : _x.config) == null ? void 0 : _y.main) == null ? void 0 : _z.headerIcons) {
+        uiSchema.elements[0].elements[1].config.main.headerIcons.elements[1].widget.config.main.tooltipMessage = `Copied Component: ${formData.eventType}`;
+      }
+    },
+    onNavigatePopupYes: function() {
+      try {
+        store2.navigate(sessionStorage.getItem("pendingNavigatePath"));
+        store2.updateDialog(`pageNamepopup`);
+      } catch (e) {
+        store2.updateDialog(`pageNamepopup`);
+        store2.setNotify({
+          FailMessage: "Couldn't navigate page",
+          Fail: true
+        });
+      }
+    },
+    onNavigatePopupNo: function() {
+      store2.updateDialog(`pageNamepopup`);
     }
   };
 };
@@ -8834,18 +8898,18 @@ const EventSchema = {
     eventType: {
       type: "string",
       oneOf: [
-        { title: "Click Event", const: "onClick" },
-        { title: "Load Event", const: "onLoad" },
-        { title: "Change Event", const: "onChange" },
-        { title: "Mount Event", const: "onMount" },
+        { title: "Click", const: "onClick" },
+        { title: "Load", const: "onLoad" },
+        { title: "Change", const: "onChange" },
+        { title: "Mount", const: "onMount" },
         { title: "Success", const: "Success" },
-        { title: "onStart", const: "onStart" },
-        { title: "Cell Renderer", const: "onCellRenderer" },
-        { title: "File Upload Event", const: "onUpload" },
-        { title: "Back Event", const: "onBack" },
-        { title: "Next Event", const: "onNext" },
-        { title: "onRowMovement", const: "onRowMovement" },
-        { title: "File Download Event", const: "onDownload" },
+        { title: "Start", const: "onStart" },
+        { title: "Cell Render", const: "onCellRenderer" },
+        { title: "Upload", const: "onUpload" },
+        { title: "Back", const: "onBack" },
+        { title: "Next", const: "onNext" },
+        { title: "Row Movement", const: "onRowMovement" },
+        { title: "Download", const: "onDownload" },
         { title: "Fail", const: "Fail" }
       ]
     },
@@ -8853,7 +8917,7 @@ const EventSchema = {
       type: "string",
       oneOf: [
         { title: "Custom", const: "custom" },
-        { title: "Api", const: "api" },
+        { title: "API", const: "api" },
         { title: "Inbuilt Function", const: "inBuiltFunction" },
         { title: "Refresh", const: "refresh" }
       ]
@@ -8882,6 +8946,9 @@ const EventSchema = {
     },
     RemoveItemButton: {
       disabled: true
+    },
+    pageName: {
+      path: [{ label: "defaultLabel", path: "defaultPath" }]
     }
   },
   required: ["eventType", "Handler"]
@@ -8890,39 +8957,38 @@ const EventUiSchema = (theme) => {
   var _a;
   const uiSchema = {
     type: "HorizontalLayout",
-    heading: "Component",
+    heading: "Page-Events",
     elements: [
-      {
-        type: "Control",
-        scope: "#/properties/pageName",
-        options: {
-          widget: "Box"
-        },
-        config: {
-          layout: 12,
-          main: {
-            heading: " "
-          },
-          style: {
-            marginLeft: theme.spacing(3),
-            width: "auto",
-            fontSize: "12px",
-            color: "gray"
-          }
-        }
-      },
       {
         type: "TabLayout",
         config: {
           main: {
-            tabLabels: ["Core", "Response Event"],
-            defaultStyle: true,
+            tabLabels: ["Core", "Response Events"],
             id: "event"
+          },
+          style: {
+            TabPanelStyle: {
+              padding: 0
+            }
+          },
+          TabsStyle: {
+            marginBottom: "3px",
+            paddingBottom: "4px",
+            boxShadow: "0px 3px 4px #afafaf80",
+            "& .MuiTabs-indicator": {
+              bottom: "6px"
+            }
           }
         },
         elements: [
           {
-            type: "HorizontalLayout",
+            type: "WrapperLayout",
+            config: {
+              main: {
+                label: " ",
+                gap: "8px"
+              }
+            },
             elements: [
               {
                 type: "Control",
@@ -8931,9 +8997,9 @@ const EventUiSchema = (theme) => {
                   widget: "SelectInputField"
                 },
                 config: {
-                  layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+                  layout: { xs: 6, sm: 6, md: 4, lg: 3 },
                   main: {
-                    label: "Event Type",
+                    label: "Event's Type",
                     type: "text"
                   }
                 }
@@ -8946,7 +9012,7 @@ const EventUiSchema = (theme) => {
                   widget: "EmptyBox"
                 },
                 config: {
-                  layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+                  layout: { xs: 0, sm: 0, md: 4, lg: 6 }
                 }
               }
             ]
@@ -8972,12 +9038,18 @@ const EventUiSchema = (theme) => {
                           main: {
                             onClick: "addEvent",
                             size: "small",
-                            icon: "AddIcon",
-                            iconLabel: "Add New",
+                            icon: "TableAddIcon",
+                            iconLabel: "Add",
                             styleDefault: true
                           },
                           style: {
-                            mt: "6px"
+                            mt: "6px",
+                            color: "inherit",
+                            fill: "inherit",
+                            "&:hover": {
+                              color: "inherit",
+                              fill: "inherit"
+                            }
                           }
                         }
                       }
@@ -8993,12 +9065,18 @@ const EventUiSchema = (theme) => {
                           main: {
                             onClick: "copyPasteElement",
                             size: "small",
-                            icon: "PasteIcon",
+                            icon: "TablePaste",
                             iconLabel: "Paste",
                             styleDefault: true
                           },
                           style: {
-                            mt: "6px"
+                            mt: "6px",
+                            color: "inherit",
+                            fill: "inherit",
+                            "&:hover": {
+                              color: "inherit",
+                              fill: "inherit"
+                            }
                           }
                         }
                       }
@@ -9013,15 +9091,21 @@ const EventUiSchema = (theme) => {
             elements: [
               {
                 accessorKey: "eventType",
-                header: "Event Type"
+                header: "Event's Type",
+                size: 300,
+                type: "string"
               },
               {
                 accessorKey: "Handler",
-                header: "Handler"
+                header: "Handler",
+                size: 200,
+                type: "string"
               },
               {
                 accessorKey: "Edit_Approve_Records",
-                header: "Edit Widget",
+                header: "Edit",
+                type: "action",
+                size: 150,
                 widget: {
                   type: "Control",
                   scope: "#/properties/Edit_Records",
@@ -9030,14 +9114,16 @@ const EventUiSchema = (theme) => {
                   },
                   config: {
                     main: {
-                      color: "info",
                       size: "small",
-                      icon: "EditIcon",
+                      icon: "TableEditIcon",
                       tooltipMessage: "Edit This Record",
                       onClick: "editEvent"
                     },
                     style: {
-                      color: theme.palette.primary.main
+                      fill: theme.palette.primary.main,
+                      "& :hover": {
+                        fill: theme.palette.primary.dark
+                      }
                     }
                   }
                 }
@@ -9045,6 +9131,8 @@ const EventUiSchema = (theme) => {
               {
                 accessorKey: "Reject_Records",
                 header: "Delete",
+                type: "action",
+                size: 150,
                 widget: {
                   type: "Control",
                   scope: "#/properties/RejectButton",
@@ -9053,10 +9141,15 @@ const EventUiSchema = (theme) => {
                   },
                   config: {
                     main: {
-                      icon: "RejectIcon",
-                      color: "error",
+                      icon: "Bin",
                       tooltipMessage: "Reject This Record",
                       onClick: "deletePopUpEvent"
+                    },
+                    style: {
+                      fill: theme.palette.primary.main,
+                      "& :hover": {
+                        fill: theme.palette.primary.dark
+                      }
                     }
                   }
                 }
@@ -9064,7 +9157,8 @@ const EventUiSchema = (theme) => {
               {
                 header: "Copy",
                 field: "Copy_Event",
-                flex: 1,
+                type: "action",
+                size: 150,
                 widget: {
                   type: "Control",
                   scope: "#/properties/Copy_Event",
@@ -9085,103 +9179,59 @@ const EventUiSchema = (theme) => {
         ]
       },
       {
-        type: "HorizontalLayout",
+        type: "WrapperLayout",
         config: {
-          layout: { xs: 12, sm: 6 }
+          main: {
+            gap: "8px"
+          }
         },
         elements: [
           {
             type: "Control",
-            scope: "#/properties/RemoveItemButton",
+            scope: "#/properties/btn",
             options: {
-              widget: "IconButton"
+              widget: "Button"
             },
             config: {
-              layout: { xs: 1, sm: 1 },
+              layout: { xs: 4, sm: 2.5, md: 2, lg: 1.5 },
               main: {
-                onClick: "RemoveItemButton",
-                size: "large",
-                icon: "RejectIcon",
-                styleDefault: true
-              },
-              style: {
-                marginLeft: "-10px"
+                name: "Ok",
+                variant: "contained",
+                type: "text",
+                onClick: "okHandler",
+                size: "medium"
               }
             }
           },
           {
             type: "Control",
-            scope: "#/properties/copiedElementDetails",
+            scope: "#/properties/btnSubmit",
             options: {
-              widget: "Box"
+              widget: "Button"
             },
             config: {
-              layout: { xs: 6, sm: 6 },
+              layout: { xs: 4, sm: 2.5, md: 2, lg: 1.5 },
               main: {
-                heading: "No element copied"
-              },
-              style: {
-                color: "#535557",
-                marginLeft: "-10px",
-                fontSize: "12px",
-                marginTop: "4px"
+                name: "Save & Exit",
+                variant: "contained",
+                type: "text",
+                onClick: "saveHandler",
+                size: "medium"
               }
             }
           },
           {
             type: "Control",
             scope: "#/properties/EmptyBox",
+            config: {
+              layout: { xs: 4, sm: 7, md: 8, lg: 9 }
+            },
             options: {
               widget: "EmptyBox"
-            },
-            config: {
-              layout: { xs: 1, sm: 5 }
             }
           }
         ]
       },
-      {
-        type: "Control",
-        scope: "#/properties/btn",
-        options: {
-          widget: "Button"
-        },
-        config: {
-          layout: { xs: 4, sm: 2 },
-          main: {
-            name: "Ok",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "okHandler",
-            size: "medium"
-          },
-          style: {
-            float: "right"
-          }
-        }
-      },
-      {
-        type: "Control",
-        scope: "#/properties/btnSubmit",
-        options: {
-          widget: "Button"
-        },
-        config: {
-          layout: { xs: 4, sm: 2 },
-          main: {
-            name: "Save & Exit",
-            startIcon: "ApproveIcon",
-            variant: "contained",
-            type: "text",
-            onClick: "saveHandler",
-            size: "medium"
-          },
-          style: {
-            float: "right"
-          }
-        }
-      },
       {
         type: "Control",
         scope: "#/properties/popUpEvent",
@@ -9208,17 +9258,19 @@ const EventUiSchema = (theme) => {
               widget: "Box"
             },
             config: {
-              layout: 12,
+              layout: 11,
               main: {
-                heading: "Are you sure you want to delete ?"
+                heading: "Are you sure you want to delete this Event ?"
               },
               style: {
-                marginTop: "-20px",
                 fontSize: "20px",
                 "&.MuiTypography-root": {
-                  padding: "10px 30px 20px 30px",
+                  padding: "0px 20px",
                   textAlign: "center",
-                  lineHeight: "1"
+                  lineHeight: "1.2",
+                  fontWeight: "normal",
+                  fontSize: "18px",
+                  marginBottom: theme.spacing(5)
                 }
               }
             }
@@ -9226,7 +9278,7 @@ const EventUiSchema = (theme) => {
           {
             type: "WrapperLayout",
             config: {
-              layout: 12,
+              layout: 11,
               main: {}
             },
             elements: [
@@ -9242,13 +9294,14 @@ const EventUiSchema = (theme) => {
                     name: "No",
                     startIcon: "ApproveIcon",
                     variant: "contained",
-                    color: "info",
                     type: "text",
                     onClick: "deletePopUpEvent",
                     size: "large"
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     left: 0,
                     width: "50%",
@@ -9276,7 +9329,6 @@ const EventUiSchema = (theme) => {
                   layout: 6,
                   main: {
                     name: "Yes",
-                    startIcon: "ApproveIcon",
                     variant: "contained",
                     color: "error",
                     type: "text",
@@ -9285,6 +9337,8 @@ const EventUiSchema = (theme) => {
                   },
                   style: {
                     position: "absolute",
+                    padding: "8px 0px",
+                    fontSize: "16px",
                     bottom: 0,
                     right: 0,
                     width: "50%",
@@ -9305,6 +9359,30 @@ const EventUiSchema = (theme) => {
           }
         ]
       },
+      {
+        type: "Control",
+        scope: "#/properties/pageName",
+        options: {
+          widget: "Breadcrumb"
+        },
+        config: {
+          layout: 12,
+          main: {
+            onNavigatePopupNo: "onNavigatePopupNo",
+            onNavigatePopupYes: "onNavigatePopupYes"
+          },
+          style: {
+            paddingLeft: theme.spacing(3),
+            color: theme.palette.grey[600],
+            fontSize: "10px",
+            position: "fixed",
+            bottom: "24px",
+            borderBottom: `1px solid ${theme.palette.common.black}29`,
+            borderTop: `1px solid ${theme.palette.common.black}29`,
+            backgroundColor: theme.palette.background.default
+          }
+        }
+      },
       {
         type: "Control",
         scope: "#/properties/notify",
@@ -9322,8 +9400,7 @@ const EventUiSchema = (theme) => {
           style: {
             flexDirection: "row",
             position: "absolute",
-            bottom: 0,
-            marginBottom: "-8px",
+            bottom: 10,
             height: "fit-content",
             overflow: "hidden",
             zIndex: 1e3,
@@ -9343,75 +9420,16 @@ const EventUiSchema = (theme) => {
               },
               style: {
                 color: ((_a = theme == null ? void 0 : theme.palette) == null ? void 0 : _a.text.disabled) || "#AFAFAF",
-                fontSize: "12px",
+                fontSize: "11px",
                 textAlign: "center",
-                lineHeight: 2,
+                lineHeight: 0,
                 width: "fit-content",
                 left: "50%",
                 position: "relative",
-                margin: 0,
+                margin: "revert",
                 flexGrow: 1,
                 height: 0,
-                transform: "translate(-50%,0%)"
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/backIcon",
-            options: {
-              widget: "Box"
-            },
-            config: {
-              main: {
-                iconName: "PrevIcon",
-                onClick: "backHandler",
-                width: "fit-content"
-              },
-              style: {
-                fill: theme.palette.primary.main,
-                width: 20,
-                height: 0,
-                margin: 0,
-                top: 0,
-                right: { xs: "12px", sm: "84px" },
-                position: "absolute",
-                fontSize: "12px",
-                cursor: "pointer",
-                ":hover": {
-                  fill: theme.palette.primary.dark
-                }
-              }
-            }
-          },
-          {
-            type: "Control",
-            scope: "#/properties/text",
-            options: {
-              widget: "Box"
-            },
-            config: {
-              main: {
-                heading: "Previous Page",
-                onClick: "backHandler"
-              },
-              style: {
-                display: { xs: "none", sm: "flex" },
-                textAlign: "left",
-                lineHeight: 1,
-                height: 0,
-                width: "fit-content",
-                color: theme.palette.primary.main,
-                fontSize: "12px",
-                cursor: "pointer",
-                marginLeft: "2px",
-                marginRight: 0,
-                top: 3,
-                right: "12px",
-                position: "absolute",
-                ":hover": {
-                  color: theme.palette.primary.dark
-                }
+                transform: "translate(-50%, 0%)"
               }
             }
           }
@@ -9431,7 +9449,7 @@ const APISection = {
         widget: "SelectInputField"
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
         main: {
           label: "Method",
           type: "text"
@@ -9445,7 +9463,7 @@ const APISection = {
         widget: "InputField"
       },
       config: {
-        layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+        layout: { xs: 6, sm: 6, md: 4, lg: 3 },
         main: {
           label: "Path",
           type: "text",
@@ -9461,116 +9479,132 @@ const APISection = {
         widget: "EmptyBox"
       },
       config: {
-        layout: { xs: 0, sm: 0, md: 4, lg: 4 }
+        layout: { xs: 0, sm: 0, md: 4, lg: 6 }
       }
     },
     {
       type: "Control",
-      scope: "#/properties/emptyBox",
+      scope: "#/properties/headers",
       options: {
-        widget: "EmptyBox"
+        widget: "Array"
       },
       config: {
-        layout: { xs: 0, sm: 0, md: 4, lg: 4 }
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/headers",
-      layout: 11.5,
-      options: {
-        "elementLabelProp": "key",
-        detail: {
-          type: "HorizontalLayout",
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/key",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Key"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/value",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Value"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/emptyBox",
-              options: {
-                widget: "EmptyBox"
-              },
-              config: {
-                layout: { xs: 0, sm: 0, md: 4, lg: 4 }
-              }
+        layout: 12,
+        main: {
+          label: "Headers",
+          childElementLabel: "Headers"
+        },
+        style: {
+          marginLeft: "-24px",
+          marginBottom: "24px !important",
+          labelStyle: {
+            marginLeft: "24px"
+          },
+          detailsStyle: {
+            marginLeft: "24px"
+          }
+        }
+      },
+      elements: [
+        {
+          type: "Control",
+          scope: "#/properties/key",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Key"
             }
-          ]
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/value",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Value"
+            }
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/emptyBox",
+          options: {
+            widget: "EmptyBox"
+          },
+          config: {
+            layout: { xs: 0, sm: 0, md: 4, lg: 4 }
+          }
         }
-      }
+      ]
     },
     {
       type: "Control",
       scope: "#/properties/body",
-      layout: 11.5,
       options: {
-        "elementLabelProp": "key",
-        detail: {
-          type: "HorizontalLayout",
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/key",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Key"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/value",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 6, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Value"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/emptyBox",
-              options: {
-                widget: "EmptyBox"
-              },
-              config: {
-                layout: { xs: 0, sm: 0, md: 4, lg: 4 }
-              }
+        widget: "Array"
+      },
+      config: {
+        layout: 12,
+        main: {
+          label: "Body",
+          childElementLabel: "Body"
+        },
+        style: {
+          marginLeft: "-24px",
+          marginBottom: "24px !important",
+          labelStyle: {
+            marginLeft: "24px"
+          },
+          detailsStyle: {
+            marginLeft: "24px"
+          }
+        }
+      },
+      elements: [
+        {
+          type: "Control",
+          scope: "#/properties/key",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Key"
             }
-          ]
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/value",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Value"
+            }
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/emptyBox",
+          options: {
+            widget: "EmptyBox"
+          },
+          config: {
+            layout: { xs: 0, sm: 0, md: 4, lg: 4 }
+          }
         }
-      }
+      ]
     },
     getTextArea("apiBody", "Transformer", true, 12)
   ]
@@ -9581,116 +9615,134 @@ const refreshSectionUiSchema = {
     {
       type: "Control",
       scope: "#/properties/refreshElements",
-      layout: 11.5,
       options: {
-        detail: {
-          type: "HorizontalLayout",
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/value",
-              options: {
-                widget: "InputField"
-              },
-              config: {
-                layout: { xs: 12, sm: 6, md: 4, lg: 4 },
-                main: {
-                  label: "Value"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/emptyBox",
-              options: {
-                widget: "EmptyBox"
-              },
-              config: {
-                layout: { xs: 0, sm: 6, md: 4, lg: 4 },
-                main: {}
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/emptyBox",
-              options: {
-                widget: "EmptyBox"
-              },
-              config: {
-                layout: { xs: 0, sm: 0, md: 4, lg: 4 },
-                main: {}
-              }
+        widget: "Array"
+      },
+      config: {
+        layout: 12,
+        main: {
+          label: "Refresh Elements",
+          childElementLabel: "Refresh Elements"
+        },
+        style: {
+          marginLeft: "-24px",
+          marginBottom: "24px !important",
+          labelStyle: {
+            marginLeft: "24px"
+          },
+          detailsStyle: {
+            marginLeft: "24px"
+          }
+        }
+      },
+      elements: [
+        {
+          type: "Control",
+          scope: "#/properties/value",
+          options: {
+            widget: "InputField"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 4, lg: 4 },
+            main: {
+              label: "Value"
             }
-          ]
+          }
+        },
+        {
+          type: "Control",
+          scope: "#/properties/emptyBox",
+          options: {
+            widget: "EmptyBox"
+          },
+          config: {
+            layout: { xs: 6, sm: 6, md: 8, lg: 8 },
+            main: {}
+          }
         }
-      }
+      ]
     }
   ]
 };
-var emptyBox = {
-  type: "Control",
-  scope: "#/properties/emptyBox",
-  options: {
-    widget: "EmptyBox"
-  },
-  config: {
-    layout: { xs: 0, sm: 4, md: 4, lg: 4 },
-    main: {},
-    style: {}
-  }
-};
 var event = (store2, dynamicData2, submitHandler, service2, functionsName) => {
   return {
     setPage: async function() {
       const formdata = await this.getFormData();
       store2.setFormdata(formdata);
       const schema2 = await this.getSchema();
+      console.log("SettingSchema>>", schema2);
       store2.setSchema(schema2);
       this.refreshPage(formdata.Handler, store2);
     },
     refreshPage: (handlerType, store22) => {
+      var _a, _b, _c;
       const uiSchema = _.cloneDeep(EventUiSchema(store22.theme.myTheme));
       const schema2 = _.cloneDeep(EventSchema);
       if (handlerType) {
         if (handlerType === "custom") {
-          uiSchema.elements[1].elements[0].elements[2] = getRadioInputField("isSync", "Run in Sync", ["Yes", "No"]);
-          uiSchema.elements[1].elements[0].elements[3] = {
+          uiSchema.elements[0].elements[0].elements[2] = getRadioInputField(
+            "isSync",
+            "Run in Sync",
+            ["Yes", "No"]
+          );
+          uiSchema.elements[0].elements[0].elements[3] = {
             type: "Control",
             scope: "#/properties/emptyBox",
             options: {
               widget: "EmptyBox"
             },
             config: {
-              layout: { xs: 0, sm: 6, md: 0, lg: 0 },
+              layout: { xs: 6, sm: 6, md: 0, lg: 3 },
               main: {},
               style: {}
             }
           };
-          uiSchema.elements[1].elements[0].elements[4] = getTextArea("eventCode", "Write Custom Code", false);
+          uiSchema.elements[0].elements[0].elements[4] = getTextArea(
+            "eventCode",
+            "Write Custom Code",
+            false
+          );
           schema2.required = ["eventType", "Handler", "eventCode"];
         } else if (handlerType === "api") {
-          uiSchema.elements[1].elements[0].elements[2] = emptyBox;
-          uiSchema.elements[1].elements[0].elements[3] = APISection;
+          uiSchema.elements[0].elements[0].elements[2] = emptyBox$1("emptyBox", {
+            xs: 0,
+            sm: 0,
+            md: 4,
+            lg: 6
+          });
+          uiSchema.elements[0].elements[0].elements[3] = APISection;
           schema2.required = ["eventType", "Handler", "method", "path"];
         } else if (handlerType === "inBuiltFunction") {
-          uiSchema.elements[1].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name");
-          uiSchema.elements[1].elements[0].elements[3] = {
+          uiSchema.elements[0].elements[0].elements[2] = getSelectField(
+            "inBuiltFunctionType",
+            "Function Name"
+          );
+          uiSchema.elements[0].elements[0].elements[3] = {
             type: "Control",
             scope: "#/properties/emptyBox",
             options: {
               widget: "EmptyBox"
             },
             config: {
-              layout: { xs: 6, sm: 6, md: 0, lg: 0 },
+              layout: { xs: 6, sm: 6, md: 0, lg: 3 },
               main: {},
               style: {}
             }
           };
-          uiSchema.elements[1].elements[0].elements[4] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true);
+          uiSchema.elements[0].elements[0].elements[4] = getTextArea(
+            "funcParametersCode",
+            "Write Custom Code for Functions Parameter",
+            true
+          );
           schema2.required = ["eventType", "Handler", "inBuiltFunctionType"];
         } else if (handlerType === "refresh") {
-          uiSchema.elements[1].elements[0].elements[2] = emptyBox;
-          uiSchema.elements[1].elements[0].elements[3] = refreshSectionUiSchema;
+          uiSchema.elements[0].elements[0].elements[2] = emptyBox$1("emptyBox", {
+            xs: 0,
+            sm: 0,
+            md: 4,
+            lg: 6
+          });
+          uiSchema.elements[0].elements[0].elements[3] = refreshSectionUiSchema;
           schema2.properties.refreshElements.required = ["value"];
           schema2.properties.refreshElements.items.required = ["value"];
           schema2.required = ["eventType", "Handler", "refreshElements"];
@@ -9703,9 +9755,34 @@ var event = (store2, dynamicData2, submitHandler, service2, functionsName) => {
         ];
       }
       if (sessionStorage.getItem("copiedConfig")) {
-        Component(store22, dynamicData2, submitHandler, service2).ElementPathSetter(uiSchema);
+        Component(store22, dynamicData2, submitHandler, service2).ElementPathSetter(
+          uiSchema
+        );
         schema2.properties.RemoveItemButton.disabled = false;
       }
+      const config2 = JSON.parse(sessionStorage.getItem("pageFormdata"));
+      const path = (_a = store22.searchParams) == null ? void 0 : _a.get("path");
+      const id = (_b = store22.searchParams) == null ? void 0 : _b.get("id");
+      let pathArray = [{ label: (_c = config2.name) != null ? _c : "NewPage", path: `/PageMaster${id ? `?id=${id}` : ""}` }];
+      if (path) {
+        const pathArrayAll = path.split(".");
+        const arr = [];
+        pathArrayAll.map((e, i) => {
+          if (i === 0) {
+            arr.push(e);
+            return;
+          }
+          arr.push(`${arr[i - 1]}.${e}`);
+        });
+        arr.map((e) => {
+          const data = _.get(config2, e);
+          pathArray.push({
+            label: (data == null ? void 0 : data.name) || (data == null ? void 0 : data.eventType) || "NewComponent",
+            path: (data == null ? void 0 : data.eventType) ? `/ComponentEvents?path=${e}${id ? `&id=${id}` : ""}` : `/Component?path=${e}${id ? `&id=${id}` : ""}`
+          });
+        });
+      }
+      schema2.properties.pageName.path = pathArray;
       store22.setSchema(schema2);
       store22.setUiSchema(uiSchema);
     },
@@ -9714,18 +9791,45 @@ var event = (store2, dynamicData2, submitHandler, service2, functionsName) => {
       return EventUiSchema;
     },
     getSchema: () => {
+      var _a, _b, _c;
       const schema2 = _.cloneDeep(EventSchema);
       if (sessionStorage.getItem("copiedConfig")) {
         schema2.properties.RemoveItemButton.disabled = false;
       }
+      const config2 = JSON.parse(sessionStorage.getItem("pageFormdata"));
+      const path = (_a = store2.searchParams) == null ? void 0 : _a.get("path");
+      const id = (_b = store2.searchParams) == null ? void 0 : _b.get("id");
+      let pathArray = [{ label: (_c = config2.name) != null ? _c : "NewPage", path: `/PageMaster${id ? `?id=${id}` : ""}` }];
+      if (path) {
+        const pathArrayAll = path.split(".");
+        const arr = [];
+        pathArrayAll.map((e, i) => {
+          if (i === 0) {
+            arr.push(e);
+            return;
+          }
+          arr.push(`${arr[i - 1]}.${e}`);
+        });
+        arr.map((e) => {
+          const data = _.get(config2, e);
+          pathArray.push({
+            label: (data == null ? void 0 : data.name) || (data == null ? void 0 : data.eventType) || "NewComponent",
+            path: (data == null ? void 0 : data.eventType) ? `/ComponentEvents?path=${e}${id ? `&id=${id}` : ""}` : `/Component?path=${e}${id ? `&id=${id}` : ""}`
+          });
+        });
+      }
+      schema2.properties.pageName.path = _.cloneDeep(pathArray);
       return schema2;
     },
     okHandler: () => okHandler(store2),
-    saveHandler: async () => await saveHandler(store2, service2, submitHandler, "PageMaster"),
+    saveHandler: async () => await saveHandler(store2, service2, submitHandler),
     onChange: function() {
       var _a, _b, _c;
       if (((_a = store2 == null ? void 0 : store2.formData) == null ? void 0 : _a.Handler) !== ((_b = store2 == null ? void 0 : store2.newData) == null ? void 0 : _b.Handler) && ((_c = store2 == null ? void 0 : store2.newData) == null ? void 0 : _c.Handler) !== void 0) {
-        this.refreshPage(store2.newData.Handler || store2.formdata.Handler, store2);
+        this.refreshPage(
+          store2.newData.Handler || store2.formdata.Handler,
+          store2
+        );
       }
     },
     addEvent: function() {
@@ -9751,7 +9855,9 @@ var event = (store2, dynamicData2, submitHandler, service2, functionsName) => {
       this.setPage();
     },
     deleteEvent: async function() {
-      await Component(store2, dynamicData2, submitHandler, service2).deleteEvent(false);
+      await Component(store2, dynamicData2, submitHandler, service2).deleteEvent(
+        false
+      );
       store2.updateDialog("popUpEvent");
     },
     backHandler: function() {
@@ -9763,10 +9869,30 @@ var event = (store2, dynamicData2, submitHandler, service2, functionsName) => {
       store2.updateDialog("popUpEvent");
     },
     copyPasteElement: function() {
-      Component(store2, dynamicData2, submitHandler, service2).copyPasteElement(store2, this.setPage.bind(this));
+      Component(store2, dynamicData2, submitHandler, service2).copyPasteElement(
+        store2,
+        this.setPage.bind(this)
+      );
     },
     RemoveItemButton: function() {
-      Component(store2, dynamicData2, submitHandler, service2).RemoveItemButton(store2);
+      Component(store2, dynamicData2, submitHandler, service2).RemoveItemButton(
+        store2
+      );
+    },
+    onNavigatePopupYes: function() {
+      try {
+        store2.navigate(sessionStorage.getItem("pendingNavigatePath"));
+        store2.updateDialog(`pageNamepopup`);
+      } catch (e) {
+        store2.updateDialog(`pageNamepopup`);
+        store2.setNotify({
+          FailMessage: "Couldn't navigate page",
+          Fail: true
+        });
+      }
+    },
+    onNavigatePopupNo: function() {
+      store2.updateDialog(`pageNamepopup`);
     }
   };
 };
@@ -9937,37 +10063,42 @@ function executeCustomHandler(params) {
   }
 }
 function mergeFormdata(handlerResponse, componentName, eventConfig, store2, service2, formDataHolder) {
-  if (eventConfig.type === "Select" && (handlerResponse == null ? void 0 : handlerResponse.data) && !_.isEmpty(handlerResponse == null ? void 0 : handlerResponse.data)) {
-    store2.setSchema((pre) => {
-      var _a;
-      return {
-        ...pre,
-        properties: {
-          ...pre.properties,
-          [componentName]: {
-            ...(_a = pre.properties) == null ? void 0 : _a[componentName],
-            oneOf: handlerResponse.data
+  var _a, _b, _c;
+  if (eventConfig.type === "Select" && (handlerResponse == null ? void 0 : handlerResponse.data)) {
+    if (!_.isEmpty(handlerResponse == null ? void 0 : handlerResponse.data)) {
+      store2.setSchema((pre) => {
+        var _a2;
+        return {
+          ...pre,
+          properties: {
+            ...pre.properties,
+            [componentName]: {
+              ...(_a2 = pre.properties) == null ? void 0 : _a2[componentName],
+              oneOf: handlerResponse.data
+            }
           }
-        }
-      };
-    });
-  } else if (eventConfig.type === "MultipleSelect" && (handlerResponse == null ? void 0 : handlerResponse.data) && !_.isEmpty(handlerResponse == null ? void 0 : handlerResponse.data)) {
-    store2.setSchema((pre) => {
-      var _a;
-      return {
-        ...pre,
-        properties: {
-          ...pre.properties,
-          [componentName]: {
-            ...(_a = pre.properties) == null ? void 0 : _a[componentName],
-            type: "array",
-            items: {
-              oneOf: handlerResponse == null ? void 0 : handlerResponse.data
+        };
+      });
+    }
+  } else if (eventConfig.type === "MultipleSelect" && (handlerResponse == null ? void 0 : handlerResponse.data)) {
+    if (!_.isEmpty(handlerResponse == null ? void 0 : handlerResponse.data)) {
+      store2.setSchema((pre) => {
+        var _a2;
+        return {
+          ...pre,
+          properties: {
+            ...pre.properties,
+            [componentName]: {
+              ...(_a2 = pre.properties) == null ? void 0 : _a2[componentName],
+              type: "array",
+              items: {
+                oneOf: handlerResponse == null ? void 0 : handlerResponse.data
+              }
             }
           }
-        }
-      };
-    });
+        };
+      });
+    }
   } else if (eventConfig.type === "page") {
     if (!(_.isEmpty(handlerResponse == null ? void 0 : handlerResponse.data) && (handlerResponse == null ? void 0 : handlerResponse.data))) {
       store2.newData = {
@@ -9978,6 +10109,14 @@ function mergeFormdata(handlerResponse, componentName, eventConfig, store2, serv
         return { ...pre, ...handlerResponse == null ? void 0 : handlerResponse.data };
       });
     }
+  } else if (eventConfig.type === "Table" && eventConfig.lazyLoading) {
+    if (handlerResponse && (handlerResponse == null ? void 0 : handlerResponse.data)) {
+      formDataHolder[componentName] = (_a = handlerResponse.data) == null ? void 0 : _a.data;
+      formDataHolder[`${componentName}_RowCount`] = (_c = (_b = handlerResponse.data) == null ? void 0 : _b.meta) == null ? void 0 : _c.totalRowCount;
+      store2.setFormdata((pre) => {
+        return { ...pre, ...formDataHolder };
+      });
+    }
   } else {
     if (handlerResponse) {
       formDataHolder[componentName] = handlerResponse.data;
@@ -10113,13 +10252,7 @@ const extractEvents = (eventConfig) => {
   return eventGroups;
 };
 var service = (funcParams) => {
-  eventGroups = {};
   const formDataHolder = {};
-  if (pageData) {
-    if (!lodash.exports.isEmpty(pageData) && typeof pageData === "object") {
-      eventGroups = extractEvents(pageData == null ? void 0 : pageData.config);
-    }
-  }
   let executeEventsParameters = {
     config: {},
     componentName: "",
@@ -10135,19 +10268,12 @@ var service = (funcParams) => {
   return {
     setPage: async function() {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+      funcParams.store.setAdditionalErrors([]);
       funcParams.store.setFormdata({});
+      funcParams.store.setSchema({ type: "object", properties: {} });
       funcParams.store.newData = {};
-      const pageBasicDetailString = sessionStorage.getItem("pagemasterMetaData");
-      if (pageBasicDetailString) {
-        pageData = JSON.parse(pageBasicDetailString);
-      } else {
-        pageData = await funcParams.pageDataProvider();
-        sessionStorage.setItem("pagemasterMetaData", JSON.stringify({
-          schema: pageData == null ? void 0 : pageData.schema,
-          uiSchema: pageData == null ? void 0 : pageData.uiSchema,
-          config: pageData == null ? void 0 : pageData.config
-        }));
-      }
+      eventGroups = {};
+      pageData = await funcParams.pageDataProvider();
       const config2 = pageData == null ? void 0 : pageData.config;
       const uiSchema = pageData == null ? void 0 : pageData.uiSchema;
       const event2 = new CustomEvent("pageNameChanged", {
@@ -10185,7 +10311,7 @@ var service = (funcParams) => {
                 },
                 style: {
                   color: ((_d = (_c = theme == null ? void 0 : theme.palette) == null ? void 0 : _c.text) == null ? void 0 : _d.disabled) || "#AFAFAF",
-                  fontSize: "12px",
+                  fontSize: "11px",
                   textAlign: "center",
                   lineHeight: 2,
                   width: "fit-content",
@@ -10222,7 +10348,7 @@ var service = (funcParams) => {
                   ":hover": {
                     fill: (_h = (_g = theme == null ? void 0 : theme.palette) == null ? void 0 : _g.primary) == null ? void 0 : _h.dark
                   },
-                  marginRight: "13px"
+                  marginRight: "20px"
                 }
               }
             },
@@ -10244,7 +10370,7 @@ var service = (funcParams) => {
                   height: 0,
                   width: "fit-content",
                   color: (_j = (_i = theme == null ? void 0 : theme.palette) == null ? void 0 : _i.primary) == null ? void 0 : _j.main,
-                  fontSize: "14px",
+                  fontSize: "12px",
                   cursor: "pointer",
                   marginLeft: "2px",
                   top: 3,
@@ -10261,7 +10387,9 @@ var service = (funcParams) => {
         }
       );
       const schema2 = (_m = pageData == null ? void 0 : pageData.schema) != null ? _m : { type: "object", properties: {} };
-      eventGroups = extractEvents(config2);
+      const newEventGroups = extractEvents(config2);
+      console.log("newEventGroups", newEventGroups, eventGroups);
+      eventGroups = newEventGroups;
       executeEventsParameters = {
         config: {},
         componentName: "",
@@ -10271,7 +10399,7 @@ var service = (funcParams) => {
         service: funcParams.service,
         functionsProvider: funcParams.functionsProvider,
         serviceHolder: this,
-        eventGroups,
+        eventGroups: newEventGroups,
         formDataHolder
       };
       await executeRefreshHandler({
@@ -10282,8 +10410,8 @@ var service = (funcParams) => {
         userValue: funcParams.userValue,
         service: funcParams.service,
         serviceHolder: this,
-        eventGroups,
-        formDataHolder
+        eventGroups: newEventGroups,
+        formDataHolder: {}
       });
       funcParams.store.setSchema(
         (pre) => {
@@ -10298,11 +10426,11 @@ var service = (funcParams) => {
       funcParams.store.setUiSchema(uiSchema);
     },
     onCellRenderer: (cellParams) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       if (eventGroups.onCellRenderer) {
         let finalResponse = {};
         const path = ((_a = funcParams.dynamicData) == null ? void 0 : _a.tableButtonPath) || ((_c = (_b = funcParams == null ? void 0 : funcParams.dynamicData) == null ? void 0 : _b.path) == null ? void 0 : _c.split(".")[0]);
-        for (const eventConfig of eventGroups == null ? void 0 : eventGroups.onCellRenderer[path]) {
+        for (const eventConfig of (_d = eventGroups == null ? void 0 : eventGroups.onCellRenderer) == null ? void 0 : _d[path]) {
           executeEventsParameters.store.functionParameters = cellParams;
           finalResponse = executeEvents({
             ...executeEventsParameters,
@@ -10357,7 +10485,7 @@ var service = (funcParams) => {
           { key: "searchValue", value: param.serachValue },
           { key: "currentValue", value: param.currentValue }
         ];
-        const response = await this.callExecuteEvents(param, apiBody);
+        const response = await this.callExecuteEvents(param, apiBody, "onLoad");
         return response == null ? void 0 : response.data;
       }
     },
@@ -10906,6 +11034,9 @@ const buildTextField = (config2, componentScope2) => {
   if (config2.style) {
     inputField.config.style = JSON.parse(config2.style);
   }
+  if (config2.multiline) {
+    inputField.config.main.multiline = config2.multiline === "YES" ? true : false;
+  }
   if (config2.InputFormatingAndMasking) {
     inputField.config.main.formatStrArray = config2.InputFormatingAndMasking.map((e) => e.formatElement);
   }
@@ -11018,6 +11149,7 @@ var Table = {
     main: {
       onMount: "onMount",
       enableExpandAll: true,
+      headerIcons: {},
       allRowData: [],
       downloadAllData: false,
       columns: {
@@ -11199,7 +11331,8 @@ function Card(theme) {
       wrapperStyle: {
         position: "relative",
         top: "50%",
-        transform: "translateY(-50%)"
+        transform: "translateY(-50%)",
+        marginBottom: 0
       },
       componentsBoxStyle: {
         boxShadow: "0px 2px 4px rgba(0, 0, 0, 0.1)",
@@ -11238,7 +11371,8 @@ function Card(theme) {
                 gap: 0
               },
               wrapperStyle: {
-                background: "transparent"
+                background: "transparent",
+                marginBottom: 0
               },
               componentsBoxStyle: {
                 flexDirection: "column",
@@ -11259,7 +11393,8 @@ function Card(theme) {
                     gap: 0
                   },
                   wrapperStyle: {
-                    background: "transparent"
+                    background: "transparent",
+                    marginBottom: 0
                   },
                   componentsBoxStyle: {
                     flexDirection: "row",
@@ -11292,6 +11427,7 @@ function Card(theme) {
                         justifyContent: "flex-start",
                         width: "auto",
                         margin: "-8px",
+                        marginLeft: "-24px",
                         height: 0
                       }
                     },
@@ -11316,7 +11452,7 @@ function Card(theme) {
                         width: "auto",
                         margin: "-8px",
                         position: "absolute",
-                        left: "8px"
+                        left: "24px"
                       }
                     },
                     options: {
@@ -11340,8 +11476,7 @@ function Card(theme) {
                     background: "inherit",
                     width: "calc(100%+8px)",
                     margin: "-8px",
-                    marginTop: "12px",
-                    lineHeight: "1"
+                    marginTop: { xs: "16px", md: "20px" }
                   },
                   layout: 12
                 },
@@ -11367,6 +11502,7 @@ function Card(theme) {
               justifyContent: "end"
             },
             imageStyle: {
+              width: "unset",
               fontSize: "none",
               padding: "4px",
               margin: "0px 0px 0px 8px",
@@ -11741,6 +11877,18 @@ const buildRadio = (config2, componentScope2) => {
   }
   return Radio;
 };
+var emptyBox = {
+  type: "Control",
+  scope: "#/properties/emptyBox",
+  options: {
+    widget: "EmptyBox"
+  },
+  config: {
+    layout: { xs: 0, sm: 4, md: 4, lg: 4 },
+    main: {},
+    style: {}
+  }
+};
 const buildEmptyBox = (config2, componentScope2) => {
   const EmptyBox = _.cloneDeep(emptyBox);
   if (config2.layout) {
@@ -11772,6 +11920,7 @@ const TextField = {
     "widget": "InputField"
   },
   config: {
+    layout: { xs: 12, sm: 6, md: 4, lg: 4 },
     main: {
       label: "Adhaar Card",
       formatStrArray: ["9", "9", "9", "9", " ", "9", "9", "9", "9", " ", "X9", "X9", "X9", "X9"],
@@ -11800,6 +11949,7 @@ const PanField = {
     "widget": "InputField"
   },
   config: {
+    layout: { xs: 12, sm: 6, md: 4, lg: 4 },
     main: {
       label: "Pan Card",
       placeholder: "AAAAA0000A",
@@ -12378,41 +12528,49 @@ const buildUiSchema = (config2, store2) => {
       });
     } else if (config2.type == "Table") {
       const sizeMap = {};
-      const filterMap = {};
       if (config2.sizeHolder) {
         config2.sizeHolder.map((e, i) => {
           sizeMap[e.keyName] = e.value;
         });
       }
-      if (config2.enableColumnFilter) {
-        config2.enableColumnFilter.map((e) => {
-          filterMap[e.keyName] = true;
-        });
-      }
-      elements.elements = config2.elements.map((cellElem, elemInd) => {
-        var _a, _b;
+      const tableHeaderElements = [];
+      const tableActionElement = [];
+      const rowElements = [];
+      config2.elements.filter((cellElem, elemInd) => {
+        const commonProperties = {
+          accessorKey: cellElem.name,
+          type: cellElem.columnFormat,
+          header: cellElem.label || cellElem.name,
+          size: sizeMap[cellElem.name] || 180,
+          enableColumnFilter: cellElem.enableFilter === "No" ? false : true,
+          columnFilterModeOptions: cellElem.filteringOptions,
+          enableSorting: cellElem.enableSorting === "No" ? false : true,
+          columnKey: cellElem.columnKey
+        };
         if (cellElem.type) {
-          return {
-            accessorKey: cellElem.name,
-            header: cellElem.label || cellElem.name,
-            size: sizeMap[cellElem.name] || 180,
-            type: cellElem.columnFormat,
+          if (cellElem.elementType == "action") {
+            const actionElem = buildUiSchema(cellElem, store2);
+            tableActionElement.push(actionElem);
+            return false;
+          }
+          if (cellElem.elementType == "tableHeader") {
+            const headerElem = buildUiSchema(cellElem, store2);
+            tableHeaderElements.push({ widget: headerElem });
+            return false;
+          }
+          const tableElem = {
             widget: cellElem.type != "ColumnGroup" ? buildUiSchema(cellElem, store2) : void 0,
             elements: cellElem.type == "ColumnGroup" ? cellElem.elements.map((childCellElem) => buildUiSchema(childCellElem, store2)) : [],
-            enableColumnFilter: Object.keys(filterMap).length === 0 ? true : (_a = filterMap[cellElem.name]) != null ? _a : false,
-            columnFilterModeOptions: config2.filteringOptions
+            ...commonProperties
           };
+          rowElements.push(tableElem);
         } else {
-          return {
-            accessorKey: cellElem.name,
-            type: cellElem.columnFormat,
-            header: cellElem.label || cellElem.name,
-            size: sizeMap[cellElem.name] || 180,
-            enableColumnFilter: Object.keys(filterMap).length === 0 ? true : (_b = filterMap[cellElem.name]) != null ? _b : false,
-            columnFilterModeOptions: config2.filteringOptions
-          };
+          rowElements.push({ ...commonProperties });
         }
       });
+      elements.elements = rowElements;
+      elements.config.action = tableActionElement;
+      elements.config.main.headerIcons.elements = tableHeaderElements;
     } else if (config2.type == "Array") {
       elements.options.detail.elements = config2.elements.map((e, elemInd) => {
         return buildUiSchema(e, store2);