impaktapps-ui-builder 0.0.382-alpha.553 → 0.0.382-alpha.57

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

@@ -36,555 +36,396 @@ const PageMasterSchema = {
   },
   required: ["label", "name"]
 };
-const PageMasterUiSchema = {
-  type: "HorizontalLayout",
-  elements: [
-    {
-      type: "WrapperLayout",
-      config: {
-        main: {
-          rowSpacing: 1,
-          header: true
-        },
-        defaultStyle: true
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/pageMaster",
-          options: {
-            widget: "Box"
+const PageMasterUiSchema = (theme) => {
+  var _a;
+  const uiSchema = {
+    type: "HorizontalLayout",
+    heading: "Page Master",
+    elements: [
+      {
+        type: "WrapperLayout",
+        config: {
+          main: {},
+          wrapperStyle: {
+            backgroundColor: theme.palette.background.default
           },
-          config: {
-            layout: 8,
-            main: {
-              heading: "Page Master"
-            }
-          }
+          defaultStyle: true
         },
-        {
-          type: "Control",
-          scope: "#/properties/Back_Button",
-          options: {
-            widget: "IconButton"
-          },
-          config: {
-            layout: 3,
-            main: {
-              icon: "BackIcon",
-              styleDefault: true,
-              size: "small",
-              onClick: "backHandler",
-              tooltipMessage: "Back"
+        elements: [
+          {
+            type: "Control",
+            scope: "#/properties/name",
+            options: {
+              widget: "InputField"
             },
-            style: {
-              float: "right"
+            config: {
+              layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+              main: {
+                label: "Name",
+                options: [],
+                color: "secondary",
+                errorMessage: "Name should be start with 'page_'",
+                helperText: 'Name should be start with "page_"',
+                required: true
+              }
             }
-          }
-        }
-      ]
-    },
-    {
-      type: "WrapperLayout",
-      config: {
-        main: {
-          label: "Page Template",
-          divider: true
-        },
-        defaultStyle: true
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/name",
-          options: {
-            widget: "InputField"
           },
-          config: {
-            layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
-            main: {
-              label: "Name",
-              options: [],
-              color: "secondary",
-              errorMessage: "Name should be start with 'page_'",
-              helperText: 'Name should be start with "page_"',
-              required: true
+          {
+            type: "Control",
+            scope: "#/properties/label",
+            options: {
+              widget: "InputField"
+            },
+            config: {
+              layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+              main: {
+                label: "Label",
+                options: [],
+                color: "secondary",
+                required: true
+              }
             }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/label",
-          options: {
-            widget: "InputField"
           },
-          config: {
-            layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
-            main: {
-              label: "Label",
-              options: [],
-              color: "secondary",
-              required: true
-            }
-          }
-        }
-      ]
-    },
-    {
-      type: "TabLayout",
-      config: {
-        main: {
-          tabLabels: ["Components", "events"],
-          divider: true
-        },
-        defaultStyle: true
-      },
-      elements: [
-        {
-          type: "WrapperLayout",
-          config: {
-            main: {
-              divider: true
+          {
+            type: "Control",
+            scope: "#/properties/emptyBox",
+            options: {
+              widget: "EmptyBox"
             },
-            wrapperStyle: {
-              border: "1px solid gray"
+            config: {
+              layout: { xs: 0, sm: 4 }
             }
           },
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/heading",
-              options: {
-                widget: "Box"
-              },
-              config: {
-                layout: 8,
-                main: {
-                  heading: "Components Table"
-                },
-                style: {
-                  fontFamily: "Roboto",
-                  fontWeight: "500",
-                  paddingLeft: "-10px",
-                  fontSize: "20px"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/AddButton",
-              options: {
-                widget: "IconButton"
+          {
+            type: "TabLayout",
+            config: {
+              main: {
+                tabLabels: ["Components", "events"],
+                divider: true
               },
-              config: {
-                layout: 3,
-                main: {
-                  icon: "AddIcon",
-                  styleDefault: true,
-                  size: "small",
-                  onClick: "onAddClickHandler",
-                  tooltipMessage: "Add New"
-                },
-                style: {
-                  float: "right"
-                }
-              }
+              defaultStyle: true
             },
-            {
-              type: "Control",
-              scope: "#/properties/elements",
-              options: {
-                widget: "Table"
-              },
-              config: {
-                main: {
-                  disableAction: true,
-                  disableSelection: true,
-                  enableDrag: true
-                }
-              },
-              elements: [
-                {
-                  accessorKey: "name",
-                  header: "Name"
-                },
-                {
-                  accessorKey: "type",
-                  header: "Type"
+            elements: [
+              {
+                type: "Control",
+                scope: "#/properties/elements",
+                options: {
+                  widget: "Table"
                 },
-                {
-                  header: "Edit",
-                  field: "Reject_Records",
-                  flex: 1,
-                  widget: {
-                    type: "Control",
-                    scope: "#/properties/RejectButton",
-                    options: {
-                      widget: "IconButton"
+                config: {
+                  main: {
+                    headerIcons: {
+                      elements: [
+                        {
+                          widget: {
+                            type: "Control",
+                            scope: "#/properties/New_Record",
+                            options: {
+                              widget: "IconButton"
+                            },
+                            config: {
+                              main: {
+                                onClick: "onAddClickHandler",
+                                size: "small",
+                                icon: "AddIcon",
+                                iconLabel: "Add New",
+                                styleDefault: true
+                              },
+                              style: {
+                                mt: "6px"
+                              }
+                            }
+                          }
+                        }
+                      ]
                     },
-                    config: {
-                      main: {
-                        icon: "EditIcon",
-                        color: "primary",
-                        onClick: "Edit_Components",
-                        tooltipMessage: "Edit This Record"
-                      }
-                    }
+                    disableAction: true,
+                    disableSelection: true,
+                    enableDrag: true
                   }
                 },
-                {
-                  header: "Delete",
-                  field: "Reject_Records",
-                  flex: 1,
-                  widget: {
-                    type: "Control",
-                    scope: "#/properties/RejectButton",
-                    options: {
-                      widget: "IconButton"
-                    },
-                    config: {
-                      main: {
-                        icon: "RejectIcon",
-                        color: "error",
-                        onClick: "deletePopUpComponent",
-                        tooltipMessage: "Reject This Record"
+                elements: [
+                  {
+                    accessorKey: "name",
+                    header: "Name"
+                  },
+                  {
+                    accessorKey: "type",
+                    header: "Type"
+                  },
+                  {
+                    header: "Edit",
+                    field: "Reject_Records",
+                    flex: 1,
+                    widget: {
+                      type: "Control",
+                      scope: "#/properties/RejectButton",
+                      options: {
+                        widget: "IconButton"
+                      },
+                      config: {
+                        main: {
+                          icon: "EditIcon",
+                          onClick: "Edit_Components",
+                          tooltipMessage: "Edit This Record"
+                        }
+                      }
+                    }
+                  },
+                  {
+                    header: "Delete",
+                    field: "Reject_Records",
+                    flex: 1,
+                    widget: {
+                      type: "Control",
+                      scope: "#/properties/RejectButton",
+                      options: {
+                        widget: "IconButton"
+                      },
+                      config: {
+                        main: {
+                          icon: "RejectIcon",
+                          color: "error",
+                          onClick: "Delete_Components",
+                          tooltipMessage: "Reject This Record"
+                        }
                       }
                     }
                   }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          type: "WrapperLayout",
-          config: {
-            main: {
-              divider: true
-            },
-            wrapperStyle: {
-              border: "1px solid gray"
-            }
-          },
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/heading",
-              options: {
-                widget: "Box"
-              },
-              config: {
-                layout: 8,
-                main: {
-                  heading: "Event Table"
-                },
-                style: {
-                  fontFamily: "Roboto",
-                  fontWeight: "500",
-                  paddingLeft: "-10px",
-                  fontSize: "20px"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/AddButton",
-              options: {
-                widget: "IconButton"
+                ]
               },
-              config: {
-                layout: 3,
-                main: {
-                  icon: "AddIcon",
-                  styleDefault: true,
-                  size: "small",
-                  onClick: "eventAddHandler",
-                  tooltipMessage: "Back"
-                },
-                style: {
-                  float: "right"
-                }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/events",
-              options: {
-                widget: "Table"
-              },
-              config: {
-                main: {
-                  disableAction: true,
-                  disableSelection: true,
-                  enableDrag: true
-                }
-              },
-              elements: [
-                {
-                  accessorKey: "eventType",
-                  header: "Event Type"
-                },
-                {
-                  accessorKey: "Handler",
-                  header: "Handler"
+              {
+                type: "Control",
+                scope: "#/properties/events",
+                options: {
+                  widget: "Table"
                 },
-                {
-                  accessorKey: "Edit_Approve_Records",
-                  header: "Edit Widget",
-                  widget: {
-                    type: "Control",
-                    scope: "#/properties/Edit_Records",
-                    options: {
-                      widget: "IconButton"
+                config: {
+                  main: {
+                    headerIcons: {
+                      elements: [
+                        {
+                          widget: {
+                            type: "Control",
+                            scope: "#/properties/New_Record",
+                            options: {
+                              widget: "IconButton"
+                            },
+                            config: {
+                              main: {
+                                onClick: "eventAddHandler",
+                                size: "small",
+                                icon: "AddIcon",
+                                iconLabel: "Add New",
+                                styleDefault: true
+                              },
+                              style: {
+                                mt: "6px"
+                              }
+                            }
+                          }
+                        }
+                      ]
                     },
-                    config: {
-                      main: {
-                        color: "info",
-                        size: "small",
-                        icon: "EditIcon",
-                        tooltipMessage: "Edit This Record",
-                        onClick: "editEvent"
+                    disableAction: true,
+                    disableSelection: true,
+                    enableDrag: true
+                  }
+                },
+                elements: [
+                  {
+                    accessorKey: "eventType",
+                    header: "Event Type"
+                  },
+                  {
+                    accessorKey: "Handler",
+                    header: "Handler"
+                  },
+                  {
+                    accessorKey: "Edit_Approve_Records",
+                    header: "Edit Widget",
+                    widget: {
+                      type: "Control",
+                      scope: "#/properties/Edit_Records",
+                      options: {
+                        widget: "IconButton"
                       },
-                      style: {
-                        color: "#3949ab"
+                      config: {
+                        main: {
+                          size: "small",
+                          icon: "EditIcon",
+                          tooltipMessage: "Edit This Record",
+                          onClick: "editEvent"
+                        },
+                        style: {
+                          color: "#3949ab"
+                        }
                       }
                     }
-                  }
-                },
-                {
-                  accessorKey: "Reject_Records",
-                  header: "Delete",
-                  widget: {
-                    type: "Control",
-                    scope: "#/properties/RejectButton",
-                    options: {
-                      widget: "IconButton"
-                    },
-                    config: {
-                      main: {
-                        icon: "RejectIcon",
-                        color: "error",
-                        tooltipMessage: "Reject This Record",
-                        onClick: "deletePopUpEvent"
+                  },
+                  {
+                    accessorKey: "Reject_Records",
+                    header: "Delete",
+                    widget: {
+                      type: "Control",
+                      scope: "#/properties/RejectButton",
+                      options: {
+                        widget: "IconButton"
+                      },
+                      config: {
+                        main: {
+                          icon: "RejectIcon",
+                          color: "error",
+                          tooltipMessage: "Reject This Record",
+                          onClick: "deleteEvent"
+                        }
                       }
                     }
                   }
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/popUpPageMasterEvent",
-      options: {
-        widget: "PopUp"
-      },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 12,
-          lg: 12
-        },
-        main: {}
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/label",
-          options: {
-            widget: "Box"
+                ]
+              }
+            ]
           },
-          config: {
-            layout: 12,
-            main: {
-              heading: "Are you sure you want to delete ?"
+          {
+            type: "Control",
+            scope: "#/properties/btn",
+            options: {
+              widget: "Button"
             },
-            style: {
-              marginTop: "-40px"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/EmptyBox",
-          options: {
-            widget: "EmptyBox"
-          },
-          config: {
-            main: {},
-            layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/ConfirmDeleteEventButton",
-          options: {
-            widget: "Button"
-          },
-          config: {
-            layout: 3,
-            main: {
-              name: "Yes",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deleteEvent",
-              size: "small"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/CancelDeleteEventButton",
-          options: {
-            widget: "Button"
-          },
-          config: {
-            layout: 3,
-            main: {
-              name: "No",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deletePopUpEvent",
-              size: "small"
+            config: {
+              layout: 11.9,
+              main: {
+                name: "Save",
+                startIcon: "ApproveIcon",
+                variant: "contained",
+                type: "text",
+                onClick: "saveHandler",
+                size: "medium"
+              },
+              style: {
+                width: { xs: "90%", sm: "90%", md: "20%", lg: "10%" },
+                float: "right"
+              }
             }
           }
-        }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/popUpPageMasterComponent",
-      options: {
-        widget: "PopUp"
+        ]
       },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 12,
-          lg: 12
+      {
+        type: "Control",
+        scope: "#/properties/notify",
+        options: {
+          widget: "Notify"
         },
-        main: {}
+        layout: 6
       },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/label",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: 12,
-            main: {
-              heading: "Are you sure you want to delete ?"
-            },
-            style: {
-              marginTop: "-40px"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/EmptyBox",
-          options: {
-            widget: "EmptyBox"
-          },
-          config: {
-            main: {},
-            layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 }
+      {
+        type: "HorizontalLayout",
+        config: {
+          layout: 12,
+          style: {
+            position: "absolute",
+            bottom: 5,
+            overflow: "hidden"
           }
         },
-        {
-          type: "Control",
-          scope: "#/properties/ConfirmDeleteCompButton",
-          options: {
-            widget: "Button"
-          },
-          config: {
-            layout: 3,
-            main: {
-              name: "Yes",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "Delete_Components",
-              size: "small"
+        elements: [
+          {
+            type: "Control",
+            scope: "#/properties/FooterText",
+            options: {
+              widget: "Box"
+            },
+            config: {
+              layout: 9.5,
+              main: {
+                heading: "Copywriter@ACT21.IO"
+              },
+              style: {
+                color: ((_a = theme == null ? void 0 : theme.palette) == null ? void 0 : _a.text.disabled) || "#AFAFAF",
+                fontSize: "12px",
+                textAlign: "center"
+              }
             }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/CancelDeleteCompButton",
-          options: {
-            widget: "Button"
           },
-          config: {
-            layout: 3,
-            main: {
-              name: "No",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deletePopUpComponent",
-              size: "small"
-            }
+          {
+            type: "HorizontalLayout",
+            config: {
+              layout: 2.5,
+              style: {}
+            },
+            elements: [
+              {
+                type: "Control",
+                scope: "#/properties/EmptyBox",
+                options: {
+                  widget: "EmptyBox"
+                },
+                config: {
+                  layout: 6,
+                  style: {
+                    flexGrow: 1
+                  }
+                }
+              },
+              {
+                type: "Control",
+                scope: "#/properties/backIcon",
+                options: {
+                  widget: "Box"
+                },
+                config: {
+                  layout: 1,
+                  main: {
+                    iconName: "PrevIcon",
+                    onClick: "backHandler"
+                  },
+                  style: {
+                    fill: theme.palette.primary.main,
+                    width: 20,
+                    height: 20,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    marginRight: "-8px",
+                    cursor: "pointer",
+                    ":hover": {
+                      fill: theme.palette.primary.dark
+                    }
+                  }
+                }
+              },
+              {
+                type: "Control",
+                scope: "#/properties/text",
+                options: {
+                  widget: "Box"
+                },
+                config: {
+                  layout: 5,
+                  main: {
+                    heading: "Previous Page",
+                    onClick: "backHandler"
+                  },
+                  style: {
+                    width: "fit-content",
+                    color: theme.palette.primary.main,
+                    fontSize: "12px",
+                    cursor: "pointer",
+                    marginLeft: "2px",
+                    marginRight: 0,
+                    ":hover": {
+                      color: theme.palette.primary.dark
+                    }
+                  }
+                }
+              }
+            ]
           }
-        }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/btn",
-      options: {
-        widget: "EmptyBox"
-      },
-      config: {
-        layout: { xs: 0, sm: 0, md: 8, lg: 7 }
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/btn",
-      options: {
-        widget: "Button"
-      },
-      config: {
-        layout: 11.7,
-        main: {
-          name: "Save",
-          startIcon: "ApproveIcon",
-          variant: "contained",
-          color: "info",
-          type: "text",
-          onClick: "saveHandler",
-          size: "small"
-        },
-        style: {
-          marginBottom: "8px",
-          width: { xs: "100%", sm: "100%", md: "25%", lg: "20%" },
-          float: "right"
-        }
+        ]
       }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/notify",
-      options: {
-        widget: "Notify"
-      },
-      layout: 6
-    }
-  ]
+    ]
+  };
+  return uiSchema;
 };
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var lodash = { exports: {} };
@@ -6318,451 +6159,303 @@ const ComponentSchema = {
   },
   required: ["name"]
 };
-const componentBasicUiSchema = {
-  type: "HorizontalLayout",
-  elements: [
-    {
-      type: "WrapperLayout",
-      config: {
-        main: {
-          rowSpacing: 1,
-          header: true
-        },
-        defaultStyle: true
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/Component",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: { xs: 12, sm: 12, md: 2 },
-            main: {
-              heading: "Component"
-            },
-            style: {
-              "float": "left"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/pageName",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: { xs: 7, sm: 7, md: 9 },
-            main: {
-              heading: " "
-            },
-            style: {
-              float: "right",
-              width: "auto",
-              fontSize: "12px",
-              color: "gray",
-              paddingTop: "10px"
-            }
+const componentBasicUiSchema = (theme) => {
+  var _a;
+  const uiSchema = {
+    type: "HorizontalLayout",
+    heading: "Component",
+    elements: [
+      {
+        type: "TabLayout",
+        config: {
+          main: {
+            tabLabels: ["Core"],
+            defaultStyle: true,
+            id: `component`
           }
         },
-        {
-          type: "Control",
-          scope: "#/properties/Back_Button",
-          options: {
-            widget: "IconButton"
-          },
-          config: {
-            layout: { xs: 2, sm: 2, md: 0.5 },
-            main: {
-              icon: "BackIcon",
-              styleDefault: true,
-              size: "small",
-              onClick: "backHandler",
-              tooltipMessage: "Back"
-            },
-            style: {
-              float: "right"
-            }
-          }
-        }
-      ]
-    },
-    {
-      type: "TabLayout",
-      config: {
-        main: {
-          tabLabels: ["Core"],
-          defaultStyle: true,
-          id: `component`
-        }
-      },
-      elements: [
-        {
-          type: "HorizontalLayout",
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/type",
-              options: {
-                widget: "SelectInputField"
-              },
-              config: {
-                layout: { xs: 12, sm: 12, md: 6, lg: 6 },
-                main: {
-                  label: "Type"
+        elements: [
+          {
+            type: "HorizontalLayout",
+            elements: [
+              {
+                type: "Control",
+                scope: "#/properties/type",
+                options: {
+                  widget: "SelectInputField"
+                },
+                config: {
+                  layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                  main: {
+                    label: "Type"
+                  }
                 }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/name",
-              options: {
-                widget: "InputField"
               },
-              config: {
-                layout: {
-                  xs: 12,
-                  sm: 12,
-                  md: 6,
-                  lg: 6
+              {
+                type: "Control",
+                scope: "#/properties/name",
+                options: {
+                  widget: "InputField"
                 },
-                main: {
-                  label: "Name",
-                  options: [],
-                  color: "secondary",
-                  required: true
+                config: {
+                  layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                  main: {
+                    label: "Name",
+                    options: [],
+                    color: "secondary",
+                    required: true
+                  }
                 }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/label",
-              options: {
-                widget: "InputField"
               },
-              config: {
-                layout: {
-                  xs: 12,
-                  sm: 12,
-                  md: 6,
-                  lg: 6
+              {
+                type: "Control",
+                scope: "#/properties/label",
+                options: {
+                  widget: "InputField"
                 },
-                main: {
-                  label: "Label",
-                  options: [],
-                  color: "secondary",
-                  required: true
+                config: {
+                  layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                  main: {
+                    label: "Label",
+                    options: [],
+                    color: "secondary",
+                    required: true
+                  }
                 }
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/proc",
-              config: {
-                layout: { xs: 11, sm: 11, md: 6, lg: 6 }
               },
-              options: {
-                widget: "EmptyBox"
-              }
-            },
-            {
-              type: "Control",
-              scope: "#/properties/layout",
-              layout: 11.5,
-              options: {
-                detail: {
-                  type: "HorizontalLayout",
-                  elements: [
-                    {
-                      type: "Control",
-                      scope: "#/properties/key",
-                      options: {
-                        widget: "SelectInputField"
+              {
+                type: "Control",
+                scope: "#/properties/layout",
+                layout: 12,
+                options: {
+                  detail: {
+                    type: "HorizontalLayout",
+                    elements: [
+                      {
+                        type: "Control",
+                        scope: "#/properties/key",
+                        options: {
+                          widget: "SelectInputField"
+                        },
+                        config: {
+                          layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                          main: {
+                            label: "Screen Size"
+                          }
+                        }
                       },
-                      config: {
-                        layout: {
-                          xs: 11,
-                          sm: 11,
-                          md: 5.5,
-                          lg: 5.5
+                      {
+                        type: "Control",
+                        scope: "#/properties/value",
+                        options: {
+                          widget: "InputField"
                         },
-                        main: {
-                          label: "Screen Size"
+                        config: {
+                          layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                          main: {
+                            label: "Value",
+                            type: "number",
+                            helperText: "Number should be in range of 0 to 12",
+                            errorMessage: "Number Can't be greater than 12 and can't be less than 0."
+                          }
                         }
-                      }
-                    },
-                    {
-                      type: "Control",
-                      scope: "#/properties/value",
-                      options: {
-                        widget: "InputField"
                       },
-                      config: {
-                        layout: {
-                          xs: 11,
-                          sm: 11,
-                          md: 5.5,
-                          lg: 5.5
+                      {
+                        type: "Control",
+                        scope: "#/properties/emptyBox",
+                        options: {
+                          widget: "EmptyBox"
                         },
-                        main: {
-                          label: "Value",
-                          type: "number",
-                          helperText: "Number should be in range of 0 to 12",
-                          errorMessage: "Number Can't be greater than 12 and can't be less than 0."
+                        config: {
+                          layout: { xs: 0, sm: 4 }
                         }
                       }
-                    }
-                  ]
+                    ]
+                  }
                 }
               }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/popUpComponentSection",
-      options: {
-        widget: "PopUp"
-      },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 12,
-          lg: 12
-        },
-        main: {}
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/label",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: 12,
-            main: {
-              heading: "Are you sure you want to delete ?"
-            },
-            style: {
-              marginTop: "-40px"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/EmptyBox",
-          options: {
-            widget: "EmptyBox"
-          },
-          config: {
-            main: {},
-            layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/ConfirmDeleteCompButton",
-          options: {
-            widget: "Button"
-          },
-          config: {
-            layout: 3,
-            main: {
-              name: "Yes",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deleteComponents",
-              size: "small"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/CancelDeleteCompButton",
-          options: {
-            widget: "Button"
-          },
-          config: {
-            layout: 3,
-            main: {
-              name: "No",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deletePopUpComponent",
-              size: "small"
-            }
+            ]
           }
-        }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/popUpEventSection",
-      options: {
-        widget: "PopUp"
+        ]
       },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 12,
-          lg: 12
+      {
+        type: "Control",
+        scope: "#/properties/EmptyBox",
+        options: {
+          widget: "EmptyBox"
         },
-        main: {}
+        config: {
+          layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+        }
       },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/label",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: 12,
-            main: {
-              heading: "Are you sure you want to delete ?"
-            },
-            style: {
-              marginTop: "-40px"
-            }
-          }
+      {
+        type: "Control",
+        scope: "#/properties/EmptyBox",
+        options: {
+          widget: "EmptyBox"
         },
-        {
-          type: "Control",
-          scope: "#/properties/EmptyBox",
-          options: {
-            widget: "EmptyBox"
-          },
-          config: {
-            main: {},
-            layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 }
-          }
+        config: {
+          layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+        }
+      },
+      {
+        type: "Control",
+        scope: "#/properties/btn",
+        options: {
+          widget: "Button"
         },
-        {
-          type: "Control",
-          scope: "#/properties/ConfirmDeleteEventButton",
-          options: {
-            widget: "Button"
+        config: {
+          layout: 1.8,
+          main: {
+            name: "Ok",
+            startIcon: "ApproveIcon",
+            variant: "contained",
+            type: "text",
+            onClick: "okHandler",
+            size: "medium"
           },
-          config: {
-            layout: 3,
-            main: {
-              name: "Yes",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deleteEvent",
-              size: "small"
-            }
+          style: {
+            float: "right"
           }
+        }
+      },
+      {
+        type: "Control",
+        scope: "#/properties/btnSubmit",
+        options: {
+          widget: "Button"
         },
-        {
-          type: "Control",
-          scope: "#/properties/CancelDeleteEventButton",
-          options: {
-            widget: "Button"
+        config: {
+          layout: 1.8,
+          main: {
+            name: "Save & Exit",
+            startIcon: "ApproveIcon",
+            variant: "contained",
+            type: "text",
+            onClick: "saveHandler",
+            size: "medium"
           },
-          config: {
-            layout: 3,
-            main: {
-              name: "No",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deletePopUpEvent",
-              size: "small"
-            }
+          style: {
+            float: "right"
           }
         }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/proc",
-      config: {
-        layout: { xs: 11, sm: 11, md: 6, lg: 6 }
-      },
-      options: {
-        widget: "EmptyBox"
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/btn",
-      options: {
-        widget: "Button"
       },
-      config: {
-        layout: {
-          xs: 11,
-          sm: 11,
-          md: 2.5,
-          lg: 2.5
-        },
-        main: {
-          name: "Ok",
-          startIcon: "ApproveIcon",
-          variant: "contained",
-          color: "info",
-          type: "text",
-          onClick: "okHandler",
-          size: "small"
+      {
+        type: "Control",
+        scope: "#/properties/notify",
+        options: {
+          widget: "Notify"
         },
-        style: {
-          marginBottom: "8px",
-          float: "right"
-        }
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/btnSubmit",
-      options: {
-        widget: "Button"
+        layout: 6
       },
-      config: {
-        layout: {
-          xs: 11,
-          sm: 11,
-          md: 2.5,
-          lg: 2.5
-        },
-        main: {
-          name: "Save & Exit",
-          startIcon: "ApproveIcon",
-          variant: "contained",
-          color: "info",
-          type: "text",
-          onClick: "saveHandler",
-          size: "small"
+      {
+        type: "HorizontalLayout",
+        config: {
+          layout: 12,
+          style: {
+            position: "absolute",
+            bottom: 5,
+            overflow: "hidden"
+          }
         },
-        style: {
-          marginBottom: "8px",
-          float: "right"
-        }
+        elements: [
+          {
+            type: "Control",
+            scope: "#/properties/FooterText",
+            options: {
+              widget: "Box"
+            },
+            config: {
+              layout: 9.5,
+              main: {
+                heading: "Copywriter@ACT21.IO"
+              },
+              style: {
+                color: ((_a = theme == null ? void 0 : theme.palette) == null ? void 0 : _a.text.disabled) || "#AFAFAF",
+                fontSize: "12px",
+                textAlign: "center"
+              }
+            }
+          },
+          {
+            type: "HorizontalLayout",
+            config: {
+              layout: 2.5,
+              style: {}
+            },
+            elements: [
+              {
+                type: "Control",
+                scope: "#/properties/EmptyBox",
+                options: {
+                  widget: "EmptyBox"
+                },
+                config: {
+                  layout: 6,
+                  style: {
+                    flexGrow: 1
+                  }
+                }
+              },
+              {
+                type: "Control",
+                scope: "#/properties/backIcon",
+                options: {
+                  widget: "Box"
+                },
+                config: {
+                  layout: 1,
+                  main: {
+                    iconName: "PrevIcon",
+                    onClick: "backHandler"
+                  },
+                  style: {
+                    fill: theme.palette.primary.main,
+                    width: 20,
+                    height: 20,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    marginRight: "-8px",
+                    cursor: "pointer",
+                    ":hover": {
+                      fill: theme.palette.primary.dark
+                    }
+                  }
+                }
+              },
+              {
+                type: "Control",
+                scope: "#/properties/text",
+                options: {
+                  widget: "Box"
+                },
+                config: {
+                  layout: 5,
+                  main: {
+                    heading: "Previous Page",
+                    onClick: "backHandler"
+                  },
+                  style: {
+                    width: "fit-content",
+                    color: theme.palette.primary.main,
+                    fontSize: "12px",
+                    cursor: "pointer",
+                    marginLeft: "2px",
+                    marginRight: 0,
+                    ":hover": {
+                      color: theme.palette.primary.dark
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        ]
       }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/notify",
-      options: {
-        widget: "Notify"
-      },
-      layout: 6
-    }
-  ]
+    ]
+  };
+  return uiSchema;
 };
 const CoreSection = {
   type: "HorizontalLayout",
@@ -6774,7 +6467,7 @@ const CoreSection = {
         widget: "SelectInputField"
       },
       config: {
-        layout: { xs: 12, sm: 12, md: 6, lg: 6 },
+        layout: { xs: 11, sm: 4, md: 4, lg: 4 },
         main: {
           label: "Type",
           type: "text"
@@ -6788,12 +6481,7 @@ const CoreSection = {
         widget: "InputField"
       },
       config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 6,
-          lg: 6
-        },
+        layout: { xs: 11, sm: 4, md: 4, lg: 4 },
         main: {
           label: "Name"
         }
@@ -6806,31 +6494,16 @@ const CoreSection = {
         widget: "InputField"
       },
       config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 6,
-          lg: 6
-        },
+        layout: { xs: 11, sm: 4, md: 4, lg: 4 },
         main: {
           label: "Label"
         }
       }
     },
-    {
-      type: "Control",
-      scope: "#/properties/proc",
-      config: {
-        layout: { xs: 11, sm: 11, md: 6, lg: 6 }
-      },
-      options: {
-        widget: "EmptyBox"
-      }
-    },
     {
       type: "Control",
       scope: "#/properties/layout",
-      layout: 11.5,
+      layout: 12,
       options: {
         "elementLabelProp": "key",
         detail: {
@@ -6843,12 +6516,7 @@ const CoreSection = {
                 widget: "SelectInputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Screen Size"
                 }
@@ -6861,12 +6529,7 @@ const CoreSection = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Value",
                   type: "number",
@@ -6874,6 +6537,16 @@ const CoreSection = {
                   errorMessage: "Number Can't be greater than 12 and can't be less than 0."
                 }
               }
+            },
+            {
+              type: "Control",
+              scope: "#/properties/emptyBox",
+              options: {
+                widget: "EmptyBox"
+              },
+              config: {
+                layout: { xs: 0, sm: 4 }
+              }
             }
           ]
         }
@@ -6885,121 +6558,95 @@ const EventSection = {
   type: "HorizontalLayout",
   elements: [
     {
-      type: "WrapperLayout",
+      type: "Control",
+      scope: "#/properties/events",
+      options: {
+        widget: "Table"
+      },
       config: {
         main: {
-          divider: true
-        },
-        wrapperStyle: {
-          border: "1px solid gray"
+          headerIcons: {
+            elements: [
+              {
+                widget: {
+                  type: "Control",
+                  scope: "#/properties/New_Record",
+                  options: {
+                    widget: "IconButton"
+                  },
+                  config: {
+                    main: {
+                      color: "info",
+                      onClick: "eventAddHandler",
+                      size: "small",
+                      icon: "AddIcon",
+                      iconLabel: "Add New",
+                      styleDefault: true
+                    },
+                    style: {
+                      mt: "6px"
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          disableAction: true,
+          disableSelection: true,
+          enableDrag: true
         }
       },
       elements: [
         {
-          type: "Control",
-          scope: "#/properties/programType",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: 8,
-            main: {
-              heading: "Event Table"
-            },
-            style: {
-              fontFamily: "Roboto",
-              fontWeight: "500",
-              paddingLeft: "-10px",
-              fontSize: "20px"
-            }
-          }
+          accessorKey: "eventType",
+          header: "Event Type"
         },
         {
-          type: "Control",
-          scope: "#/properties/Back_Button",
-          options: {
-            widget: "IconButton"
-          },
-          config: {
-            layout: 3,
-            main: {
-              icon: "AddIcon",
-              styleDefault: true,
-              size: "small",
-              onClick: "eventAddHandler",
-              tooltipMessage: "Back"
+          accessorKey: "Handler",
+          header: "Handler"
+        },
+        {
+          accessorKey: "Edit_Approve_Records",
+          header: "Edit Widget",
+          widget: {
+            type: "Control",
+            scope: "#/properties/Edit_Records",
+            options: {
+              widget: "IconButton"
             },
-            style: {
-              float: "right"
+            config: {
+              main: {
+                color: "info",
+                size: "small",
+                icon: "EditIcon",
+                tooltipMessage: "Edit This Record",
+                onClick: "eventEditHandler"
+              },
+              style: {
+                color: "#3949ab"
+              }
             }
           }
         },
         {
-          type: "Control",
-          scope: "#/properties/events",
-          options: {
-            widget: "Table"
-          },
-          config: {
-            main: {
-              disableAction: true,
-              disableSelection: true,
-              enableDrag: true
-            }
-          },
-          elements: [
-            {
-              accessorKey: "eventType",
-              header: "Event Type"
-            },
-            {
-              accessorKey: "Handler",
-              header: "Handler"
-            },
-            {
-              accessorKey: "Edit_Approve_Records",
-              header: "Edit Widget",
-              widget: {
-                type: "Control",
-                scope: "#/properties/Edit_Records",
-                options: {
-                  widget: "IconButton"
-                },
-                config: {
-                  main: {
-                    color: "info",
-                    size: "small",
-                    icon: "EditIcon",
-                    tooltipMessage: "Edit This Record",
-                    onClick: "eventEditHandler"
-                  },
-                  style: {
-                    color: "#3949ab"
-                  }
-                }
-              }
+          accessorKey: "Reject_Records",
+          header: "Delete",
+          widget: {
+            type: "Control",
+            scope: "#/properties/RejectButton",
+            accessorKeyName: "Reject_Records",
+            options: {
+              widget: "IconButton"
             },
-            {
-              accessorKey: "Reject_Records",
-              header: "Delete",
-              widget: {
-                type: "Control",
-                scope: "#/properties/RejectButton",
-                accessorKeyName: "Reject_Records",
-                options: {
-                  widget: "IconButton"
-                },
-                config: {
-                  main: {
-                    icon: "RejectIcon",
-                    color: "error",
-                    tooltipMessage: "Reject This Record",
-                    onClick: "deletePopUpEvent"
-                  }
-                }
+            config: {
+              main: {
+                icon: "RejectIcon",
+                color: "error",
+                tooltipMessage: "Reject This Record",
+                onClick: "deleteEvent"
               }
             }
-          ]
+          }
         }
       ]
     }
@@ -7012,12 +6659,7 @@ const EmptyBox = {
     widget: "EmptyBox"
   },
   config: {
-    layout: {
-      xs: 11,
-      sm: 11,
-      md: 5.5,
-      lg: 5.5
-    },
+    layout: { xs: 0, sm: 4, md: 4, lg: 4 },
     main: {}
   }
 };
@@ -7036,12 +6678,7 @@ const cardLayout = {
             widget: "SelectInputField"
           },
           config: {
-            layout: {
-              xs: 11,
-              sm: 11,
-              md: 5.5,
-              lg: 5.5
-            },
+            layout: { xs: 11, sm: 4, md: 4, lg: 4 },
             main: {
               label: "Screen Size"
             }
@@ -7054,12 +6691,7 @@ const cardLayout = {
             widget: "InputField"
           },
           config: {
-            layout: {
-              xs: 11,
-              sm: 11,
-              md: 5.5,
-              lg: 5.5
-            },
+            layout: { xs: 11, sm: 4, md: 4, lg: 4 },
             main: {
               label: "Value",
               type: "number",
@@ -7067,7 +6699,8 @@ const cardLayout = {
               errorMessage: "Number Can't be greater than 12 and can't be less than 0."
             }
           }
-        }
+        },
+        EmptyBox
       ]
     }
   }
@@ -7089,17 +6722,13 @@ const getArrayControl = (parentScope, childScope, childLabel) => {
               widget: "InputField"
             },
             config: {
-              layout: {
-                xs: 11,
-                sm: 11,
-                md: 5.5,
-                lg: 5.5
-              },
+              layout: { xs: 11, sm: 4, md: 4, lg: 4 },
               main: {
                 label: childLabel || "Labels for Tab"
               }
             }
           },
+          EmptyBox,
           EmptyBox
         ]
       }
@@ -7114,12 +6743,7 @@ sizeHolder.options.detail.elements[1] = {
     widget: "InputField"
   },
   config: {
-    layout: {
-      xs: 11,
-      sm: 11,
-      md: 5.5,
-      lg: 5.5
-    },
+    layout: { xs: 11, sm: 4, md: 4, lg: 4 },
     main: {
       label: "Size"
     }
@@ -7133,12 +6757,7 @@ const getInputField = (scope, label) => {
       widget: "InputField"
     },
     config: {
-      layout: {
-        xs: 11,
-        sm: 11,
-        md: 5.5,
-        lg: 5.5
-      },
+      layout: { xs: 11, sm: 4, md: 4, lg: 4 },
       main: {
         label
       }
@@ -7153,12 +6772,7 @@ const getRadioInputField = (scope, label, options) => {
       widget: "RadioInputField"
     },
     config: {
-      layout: {
-        xs: 11,
-        sm: 11,
-        md: 5.5,
-        lg: 5.5
-      },
+      layout: { xs: 11, sm: 4, md: 4, lg: 4 },
       main: {
         label,
         options
@@ -7201,7 +6815,7 @@ const getSelectField = (scope, label, options) => {
       widget: "SelectInputField"
     },
     config: {
-      layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
+      layout: { xs: 11, sm: 4, md: 4, lg: 4 },
       main: {
         label,
         type: "text"
@@ -7222,6 +6836,8 @@ const buildPropertiesSection = function(type) {
         getInputField("elevation", "Card Elevation"),
         getInputField("height", "Grid height"),
         getInputField("justifyContent", "justifyContent"),
+        EmptyBox,
+        EmptyBox,
         cardLayout
       ];
       break;
@@ -7232,6 +6848,7 @@ const buildPropertiesSection = function(type) {
         getInputField("resetText", "Reset Text"),
         getInputField("completeText", "Complete Text"),
         getSelectField("orientation", "Orientation Type"),
+        EmptyBox,
         getArrayControl("sectionLabels", "label")
       ];
       break;
@@ -7247,12 +6864,14 @@ const buildPropertiesSection = function(type) {
       uiSchema.elements = [
         getInputField("placeholder", "Placeholder"),
         EmptyBox,
+        EmptyBox,
         getArrayControl("InputFormatingAndMasking", "formatElement", "Format Element")
       ];
       break;
     case "TextArea":
       uiSchema.elements = [
         getInputField("placeholder", "Placeholder"),
+        EmptyBox,
         EmptyBox
       ];
       break;
@@ -7262,7 +6881,8 @@ const buildPropertiesSection = function(type) {
         getInputField("heading", "Container Heading"),
         getInputField("heading", "Container Heading"),
         getInputField("speedoCaption", "Speedometer Caption"),
-        getInputField("width", "Speedometer Width")
+        getInputField("width", "Speedometer Width"),
+        EmptyBox
       ];
       break;
     case "RankCard":
@@ -7270,7 +6890,9 @@ const buildPropertiesSection = function(type) {
         getInputField("rank", "Rank"),
         getInputField("image", "Image Url"),
         getInputField("title", "Card Title"),
-        getInputField("description", "Card Description")
+        getInputField("description", "Card Description"),
+        EmptyBox,
+        EmptyBox
       ];
       break;
     case "LeaderBoard":
@@ -7279,6 +6901,8 @@ const buildPropertiesSection = function(type) {
         getInputField("firstImage", "First Image url"),
         getInputField("secondImage", "Second Image url"),
         getInputField("thirdImage", "Third Image url"),
+        EmptyBox,
+        EmptyBox,
         getTextArea("functionCode", "Write Compare Code", false)
       ];
       break;
@@ -7294,7 +6918,9 @@ const buildPropertiesSection = function(type) {
         getInputField("heading", "Heading"),
         getInputField("bottomLabel_1", "First BottomLabel"),
         getInputField("bottomLabel_2", "Second BottomLabel"),
-        getInputField("bottomLabel_3", "Third BottomLabel")
+        getInputField("bottomLabel_3", "Third BottomLabel"),
+        EmptyBox,
+        EmptyBox
       ];
       break;
     case "card":
@@ -7328,7 +6954,7 @@ const buildPropertiesSection = function(type) {
       ];
       break;
     case "WrapperSection":
-      uiSchema.elements = [getRadioInputField("divider", "Divider", ["YES", "No"]), EmptyBox];
+      uiSchema.elements = [getRadioInputField("divider", "Divider", ["YES", "No"]), getRadioInputField("isAccordion", "Accordion", ["YES", "No"]), EmptyBox];
       break;
     case "TabSection":
       uiSchema.elements = [
@@ -7356,12 +6982,14 @@ const buildPropertiesSection = function(type) {
     case "Select":
       uiSchema.elements = [
         getRadioInputField("lazyLoading", "Lazy Loading", ["YES", "NO"]),
-        getRadioInputField("freeSolo", "FreeSolo", ["YES", "NO"])
+        getRadioInputField("freeSolo", "FreeSolo", ["YES", "NO"]),
+        EmptyBox
       ];
       break;
     case "MultipleSelect":
       uiSchema.elements = [
         getRadioInputField("lazyLoading", "Lazy Loading", ["YES", "NO"]),
+        EmptyBox,
         EmptyBox
       ];
       break;
@@ -7407,116 +7035,92 @@ const TableSection = {
   type: "HorizontalLayout",
   elements: [
     {
-      type: "WrapperLayout",
+      type: "Control",
+      scope: "#/properties/elements",
+      options: {
+        widget: "Table"
+      },
       config: {
-        main: {},
-        wrapperStyle: {
-          border: "1px solid gray"
+        main: {
+          headerIcons: {
+            elements: [
+              {
+                widget: {
+                  type: "Control",
+                  scope: "#/properties/New_Record",
+                  options: {
+                    widget: "IconButton"
+                  },
+                  config: {
+                    main: {
+                      color: "info",
+                      onClick: "widgetAddClickHandler",
+                      size: "small",
+                      icon: "AddIcon",
+                      iconLabel: "Add New",
+                      styleDefault: true
+                    },
+                    style: {
+                      mt: "6px"
+                    }
+                  }
+                }
+              }
+            ]
+          },
+          disableAction: true,
+          disableSelection: true,
+          enableDrag: true
         }
       },
       elements: [
         {
-          type: "Control",
-          scope: "#/properties/programType",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: 8,
-            main: {
-              heading: "Components Table"
-            },
-            style: {
-              fontFamily: "Roboto",
-              fontWeight: "500",
-              paddingLeft: "-10px",
-              fontSize: "20px"
-            }
-          }
+          accessorKey: "name",
+          header: "Name"
         },
         {
-          type: "Control",
-          scope: "#/properties/Back_Button",
-          options: {
-            widget: "IconButton"
-          },
-          config: {
-            layout: 3,
-            main: {
-              icon: "AddIcon",
-              styleDefault: true,
-              size: "small",
-              onClick: "widgetAddClickHandler",
-              tooltipMessage: "Add New"
+          accessorKey: "type",
+          header: "Type"
+        },
+        {
+          header: "Edit Record",
+          field: "Reject_Records",
+          flex: 1,
+          widget: {
+            type: "Control",
+            scope: "#/properties/RejectButton",
+            options: {
+              widget: "IconButton"
             },
-            style: {
-              float: "right"
+            config: {
+              main: {
+                icon: "EditIcon",
+                color: "primary",
+                onClick: "editComponents",
+                tooltipMessage: "Reject This Record"
+              }
             }
           }
         },
         {
-          type: "Control",
-          scope: "#/properties/elements",
-          options: {
-            widget: "Table"
-          },
-          config: {
-            main: {
-              disableAction: true,
-              disableSelection: true,
-              enableDrag: true
-            }
-          },
-          elements: [
-            {
-              accessorKey: "name",
-              header: "Name"
-            },
-            {
-              accessorKey: "type",
-              header: "Type"
-            },
-            {
-              header: "Edit Record",
-              field: "Reject_Records",
-              flex: 1,
-              widget: {
-                type: "Control",
-                scope: "#/properties/RejectButton",
-                options: {
-                  widget: "IconButton"
-                },
-                config: {
-                  main: {
-                    icon: "EditIcon",
-                    color: "primary",
-                    onClick: "editComponents",
-                    tooltipMessage: "Reject This Record"
-                  }
-                }
-              }
+          header: "Delete",
+          field: "Reject_Records",
+          flex: 1,
+          widget: {
+            type: "Control",
+            scope: "#/properties/RejectButton",
+            options: {
+              widget: "IconButton"
             },
-            {
-              header: "Delete",
-              field: "Reject_Records",
-              flex: 1,
-              widget: {
-                type: "Control",
-                scope: "#/properties/RejectButton",
-                options: {
-                  widget: "IconButton"
-                },
-                config: {
-                  main: {
-                    icon: "RejectIcon",
-                    color: "error",
-                    onClick: "deletePopUpComponent",
-                    tooltipMessage: "Reject This Record"
-                  }
-                }
+            config: {
+              main: {
+                icon: "RejectIcon",
+                color: "error",
+                onClick: "deleteComponents",
+                tooltipMessage: "Reject This Record"
               }
             }
-          ]
+          }
         }
       ]
     }
@@ -7540,12 +7144,7 @@ const ValueTab = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Label"
                 }
@@ -7558,16 +7157,21 @@ const ValueTab = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Value"
                 }
               }
+            },
+            {
+              type: "Control",
+              scope: "#/properties/emptyBox",
+              options: {
+                widget: "EmptyBox"
+              },
+              config: {
+                layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+              }
             }
           ]
         }
@@ -7594,12 +7198,7 @@ const ValidationSection = {
                 widget: "SelectInputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Validation Type"
                 }
@@ -7612,16 +7211,21 @@ const ValidationSection = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Validation Value"
                 }
               }
+            },
+            {
+              type: "Control",
+              scope: "#/properties/emptyBox",
+              options: {
+                widget: "EmptyBox"
+              },
+              config: {
+                layout: { xs: 0, sm: 4 }
+              }
             }
           ]
         }
@@ -7803,7 +7407,7 @@ const sectionLabels = {
 };
 const refreshPage = (type, store2) => {
   var _a;
-  const UiSchema = _.cloneDeep(componentBasicUiSchema);
+  const UiSchema = _.cloneDeep(componentBasicUiSchema(store2.theme.myTheme));
   if (type) {
     const sectionUiSchema = {
       Core: CoreSection,
@@ -7815,8 +7419,8 @@ const refreshPage = (type, store2) => {
       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, ValidationSection];
+    UiSchema.elements[0].config.main.tabLabels = sectionLabels[type] || ["Core", "style", "Event", "Validation"];
+    UiSchema.elements[0].elements = elements || [CoreSection, StyleSection, EventSection, ValidationSection];
   }
   store2.setUiSchema(UiSchema);
 };
@@ -7862,30 +7466,22 @@ var Component = (store2, dynamicData2, submitHandler, service2) => {
         store2.navigate(`/Component?path=${`elements[${rowId}]`}&id=${id}`);
       }
     },
-    deleteComponents: function(shouldUpdateDialog = true) {
+    deleteComponents: function() {
       var _a;
       const path = (_a = store2.searchParams) == null ? void 0 : _a.get("path");
-      const rowId = localStorage.getItem("rowId");
+      const rowId = dynamicData2.path.split(".")[1];
       store2.formData.elements.splice(rowId, 1);
       const response2 = saveFormdataInLocalStorage(store2.ctx.core.data, path);
       const data2 = path ? _.get(response2, path) : response2;
       store2.setFormdata(data2);
-      if (shouldUpdateDialog) {
-        store2.updateDialog("popUpComponentSection");
-      }
-      localStorage.removeItem("rowId");
     },
-    deleteEvent: function(shouldUpdateDialog = true) {
+    deleteEvent: function() {
       var _a;
       const path = (_a = store2.searchParams) == null ? void 0 : _a.get("path");
-      const rowId = localStorage.getItem("rowId");
+      const rowId = dynamicData2.path.split(".")[1];
       store2.formData.events.splice(rowId, 1);
       const response2 = saveFormdataInLocalStorage(store2.ctx.core.data, path);
       store2.setFormdata(_.get(response2, path));
-      if (shouldUpdateDialog) {
-        store2.updateDialog("popUpEventSection");
-      }
-      localStorage.removeItem("rowId");
     },
     widgetAddClickHandler: function() {
       var _a;
@@ -7921,16 +7517,6 @@ var Component = (store2, dynamicData2, submitHandler, service2) => {
     },
     backHandler: function() {
       store2.navigate(-1);
-    },
-    deletePopUpComponent: function() {
-      const rowId = dynamicData2.path.split(".")[1];
-      localStorage.setItem("rowId", rowId);
-      store2.updateDialog("popUpComponentSection");
-    },
-    deletePopUpEvent: function() {
-      const rowId = dynamicData2.path.split(".")[1];
-      localStorage.setItem("rowId", rowId);
-      store2.updateDialog("popUpEventSection");
     }
   };
 };
@@ -7956,7 +7542,7 @@ var pageMaster = (funcParams) => {
       return config;
     },
     getUiSchema: function() {
-      return PageMasterUiSchema;
+      return PageMasterUiSchema(store2.theme.myTheme);
     },
     getSchema: () => {
       return PageMasterSchema;
@@ -7978,10 +7564,7 @@ var pageMaster = (funcParams) => {
     },
     saveHandler: async () => await saveHandler(store2, service2, submitHandler),
     Edit_Components: Component(store2, dynamicData2, submitHandler, service2).editComponents,
-    Delete_Components: async function() {
-      await Component(store2, dynamicData2, submitHandler, service2).deleteComponents(false);
-      store2.updateDialog("popUpPageMasterComponent");
-    },
+    Delete_Components: Component(store2, dynamicData2, submitHandler, service2).deleteComponents,
     eventAddHandler: function() {
       var _a;
       const id = (_a = store2.searchParams) == null ? void 0 : _a.get("id");
@@ -8001,22 +7584,10 @@ var pageMaster = (funcParams) => {
       store2.navigate(`/ComponentEvents?path=${finalPath}&id=${id}`);
     },
     deleteEvent: function() {
-      const rowId = localStorage.getItem("rowId");
+      const rowId = dynamicData2.path.split(".")[1];
       store2.formData.events.splice(rowId, 1);
       const response2 = saveFormdataInLocalStorage(store2.ctx.core.data);
       store2.setFormdata(response2);
-      store2.updateDialog("popUpPageMasterEvent");
-      localStorage.removeItem("rowId");
-    },
-    deletePopUpComponent: function() {
-      const rowId = dynamicData2.path.split(".")[1];
-      localStorage.setItem("rowId", rowId);
-      store2.updateDialog("popUpPageMasterComponent");
-    },
-    deletePopUpEvent: function() {
-      const rowId = dynamicData2.path.split(".")[1];
-      localStorage.setItem("rowId", rowId);
-      store2.updateDialog("popUpPageMasterEvent");
     }
   };
 };
@@ -8106,385 +7677,335 @@ const EventSchema = {
   },
   required: ["eventType", "Handler"]
 };
-const EventUiSchema = {
-  type: "HorizontalLayout",
-  elements: [
-    {
-      type: "WrapperLayout",
-      config: {
-        main: {
-          rowSpacing: 1,
-          header: true
-        },
-        defaultStyle: true
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/Component",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: { xs: 12, sm: 12, md: 2 },
-            main: {
-              heading: "Component"
-            },
-            style: {
-              "float": "left"
-            }
-          }
-        },
-        {
-          type: "Control",
-          scope: "#/properties/pageName",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: { xs: 7, sm: 7, md: 9 },
-            main: {
-              heading: " "
-            },
-            style: {
-              float: "right",
-              width: "auto",
-              fontSize: "12px",
-              color: "gray",
-              paddingTop: "10px"
-            }
+const EventUiSchema = (theme) => {
+  var _a;
+  const uiSchema = {
+    type: "HorizontalLayout",
+    heading: "Component",
+    elements: [
+      {
+        type: "TabLayout",
+        config: {
+          main: {
+            tabLabels: ["Core", "Response Event"],
+            defaultStyle: true,
+            id: "event"
           }
         },
-        {
-          type: "Control",
-          scope: "#/properties/Back_Button",
-          options: {
-            widget: "IconButton"
-          },
-          config: {
-            layout: { xs: 2, sm: 2, md: 0.5 },
-            main: {
-              icon: "BackIcon",
-              styleDefault: true,
-              size: "small",
-              onClick: "backHandler",
-              tooltipMessage: "Back"
-            },
-            style: {
-              float: "right"
-            }
-          }
-        }
-      ]
-    },
-    {
-      type: "TabLayout",
-      config: {
-        main: {
-          tabLabels: ["Core", "Response Event"],
-          defaultStyle: true,
-          id: "event"
-        }
-      },
-      elements: [
-        {
-          type: "HorizontalLayout",
-          elements: [
-            {
-              type: "Control",
-              scope: `#/properties/eventType`,
-              options: {
-                widget: "SelectInputField"
+        elements: [
+          {
+            type: "HorizontalLayout",
+            elements: [
+              {
+                type: "Control",
+                scope: `#/properties/eventType`,
+                options: {
+                  widget: "SelectInputField"
+                },
+                config: {
+                  layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                  main: {
+                    label: "Event Type",
+                    type: "text"
+                  }
+                }
               },
-              config: {
-                layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
-                main: {
-                  label: "Event Type",
-                  type: "text"
+              {
+                type: "Control",
+                scope: `#/properties/Handler`,
+                options: {
+                  widget: "SelectInputField"
+                },
+                config: {
+                  layout: { xs: 11, sm: 4, md: 4, lg: 4 },
+                  main: {
+                    label: "Handler",
+                    type: "text"
+                  }
                 }
-              }
-            },
-            getSelectField("Handler", "Handler")
-          ]
-        },
-        {
-          type: "WrapperLayout",
-          config: {
-            main: {
-              divider: true
-            },
-            wrapperStyle: {
-              border: "1px solid gray"
-            }
-          },
-          elements: [
-            {
-              type: "Control",
-              scope: "#/properties/heading",
-              options: {
-                widget: "Box"
               },
-              config: {
-                layout: 8,
-                main: {
-                  heading: "Response Event"
+              {
+                type: "Control",
+                scope: "#/properties/emptyBox",
+                options: {
+                  widget: "EmptyBox"
                 },
-                style: {
-                  fontFamily: "Roboto",
-                  fontWeight: "500",
-                  paddingLeft: "-10px",
-                  fontSize: "20px"
+                config: {
+                  layout: { xs: 0, sm: 4 }
                 }
               }
+            ]
+          },
+          {
+            type: "Control",
+            scope: "#/properties/events",
+            options: {
+              widget: "Table"
             },
-            {
-              type: "Control",
-              scope: "#/properties/AddButton",
-              options: {
-                widget: "IconButton"
-              },
-              config: {
-                layout: 3,
-                main: {
-                  icon: "AddIcon",
-                  styleDefault: true,
-                  size: "small",
-                  onClick: "addEvent",
-                  tooltipMessage: "Back"
+            config: {
+              main: {
+                headerIcons: {
+                  elements: [
+                    {
+                      widget: {
+                        type: "Control",
+                        scope: "#/properties/New_Record",
+                        options: {
+                          widget: "IconButton"
+                        },
+                        config: {
+                          main: {
+                            onClick: "addEvent",
+                            size: "small",
+                            icon: "AddIcon",
+                            iconLabel: "Add New",
+                            styleDefault: true
+                          },
+                          style: {
+                            mt: "6px"
+                          }
+                        }
+                      }
+                    }
+                  ]
                 },
-                style: {
-                  float: "right"
-                }
+                disableAction: true,
+                disableSelection: true,
+                enableDrag: true
               }
             },
-            {
-              type: "Control",
-              scope: "#/properties/events",
-              options: {
-                widget: "Table"
+            elements: [
+              {
+                accessorKey: "eventType",
+                header: "Event Type"
               },
-              config: {
-                main: {
-                  disableAction: true,
-                  disableSelection: true,
-                  enableDrag: true
-                }
+              {
+                accessorKey: "Handler",
+                header: "Handler"
               },
-              elements: [
-                {
-                  accessorKey: "eventType",
-                  header: "Event Type"
-                },
-                {
-                  accessorKey: "Handler",
-                  header: "Handler"
-                },
-                {
-                  accessorKey: "Edit_Approve_Records",
-                  header: "Edit Widget",
-                  widget: {
-                    type: "Control",
-                    scope: "#/properties/Edit_Records",
-                    options: {
-                      widget: "IconButton"
+              {
+                accessorKey: "Edit_Approve_Records",
+                header: "Edit Widget",
+                widget: {
+                  type: "Control",
+                  scope: "#/properties/Edit_Records",
+                  options: {
+                    widget: "IconButton"
+                  },
+                  config: {
+                    main: {
+                      size: "small",
+                      icon: "EditIcon",
+                      tooltipMessage: "Edit This Record",
+                      onClick: "editEvent"
                     },
-                    config: {
-                      main: {
-                        color: "info",
-                        size: "small",
-                        icon: "EditIcon",
-                        tooltipMessage: "Edit This Record",
-                        onClick: "editEvent"
-                      },
-                      style: {
-                        color: "#3949ab"
-                      }
+                    style: {
+                      color: "#3949ab"
                     }
                   }
-                },
-                {
-                  accessorKey: "Reject_Records",
-                  header: "Delete",
-                  widget: {
-                    type: "Control",
-                    scope: "#/properties/RejectButton",
-                    options: {
-                      widget: "IconButton"
-                    },
-                    config: {
-                      main: {
-                        icon: "RejectIcon",
-                        color: "error",
-                        tooltipMessage: "Reject This Record",
-                        onClick: "deletePopUpEvent"
-                      }
+                }
+              },
+              {
+                accessorKey: "Reject_Records",
+                header: "Delete",
+                widget: {
+                  type: "Control",
+                  scope: "#/properties/RejectButton",
+                  options: {
+                    widget: "IconButton"
+                  },
+                  config: {
+                    main: {
+                      icon: "RejectIcon",
+                      color: "error",
+                      tooltipMessage: "Reject This Record",
+                      onClick: "deleteEvent"
                     }
                   }
                 }
-              ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/popUpEvent",
-      options: {
-        widget: "PopUp"
-      },
-      config: {
-        layout: {
-          xs: 12,
-          sm: 12,
-          md: 12,
-          lg: 12
-        },
-        main: {}
-      },
-      elements: [
-        {
-          type: "Control",
-          scope: "#/properties/label",
-          options: {
-            widget: "Box"
-          },
-          config: {
-            layout: 12,
-            main: {
-              heading: "Are you sure you want to delete ?"
-            },
-            style: {
-              marginTop: "-40px"
-            }
+              }
+            ]
           }
+        ]
+      },
+      {
+        type: "Control",
+        scope: "#/properties/EmptyBox",
+        options: {
+          widget: "EmptyBox"
         },
-        {
-          type: "Control",
-          scope: "#/properties/EmptyBox",
-          options: {
-            widget: "EmptyBox"
-          },
-          config: {
-            main: {},
-            layout: { xs: 11, sm: 5.5, md: 5.5, lg: 5.5 }
-          }
+        config: {
+          layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+        }
+      },
+      {
+        type: "Control",
+        scope: "#/properties/EmptyBox",
+        options: {
+          widget: "EmptyBox"
         },
-        {
-          type: "Control",
-          scope: "#/properties/ConfirmDeleteEventButton",
-          options: {
-            widget: "Button"
-          },
-          config: {
-            layout: 3,
-            main: {
-              name: "Yes",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deleteEvent",
-              size: "small"
-            }
-          }
+        config: {
+          layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+        }
+      },
+      {
+        type: "Control",
+        scope: "#/properties/btn",
+        options: {
+          widget: "Button"
         },
-        {
-          type: "Control",
-          scope: "#/properties/CancelDeleteEventButton",
-          options: {
-            widget: "Button"
+        config: {
+          layout: 1.8,
+          main: {
+            name: "Ok",
+            startIcon: "ApproveIcon",
+            variant: "contained",
+            type: "text",
+            onClick: "okHandler",
+            size: "medium"
           },
-          config: {
-            layout: 3,
-            main: {
-              name: "No",
-              startIcon: "ApproveIcon",
-              variant: "contained",
-              color: "info",
-              type: "text",
-              onClick: "deletePopUpEvent",
-              size: "small"
-            }
+          style: {
+            float: "right"
           }
         }
-      ]
-    },
-    {
-      type: "Control",
-      scope: "#/properties/proc",
-      config: {
-        layout: { xs: 11, sm: 11, md: 6, lg: 6 }
-      },
-      options: {
-        widget: "EmptyBox"
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/btn",
-      options: {
-        widget: "Button"
       },
-      config: {
-        layout: {
-          xs: 11,
-          sm: 11,
-          md: 2.5,
-          lg: 2.5
-        },
-        main: {
-          name: "Ok",
-          startIcon: "ApproveIcon",
-          variant: "contained",
-          color: "info",
-          type: "text",
-          onClick: "okHandler",
-          size: "small"
+      {
+        type: "Control",
+        scope: "#/properties/btnSubmit",
+        options: {
+          widget: "Button"
         },
-        style: {
-          marginBottom: "8px",
-          float: "right"
+        config: {
+          layout: 1.8,
+          main: {
+            name: "Save & Exit",
+            startIcon: "ApproveIcon",
+            variant: "contained",
+            type: "text",
+            onClick: "saveHandler",
+            size: "medium"
+          },
+          style: {
+            float: "right"
+          }
         }
-      }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/btnSubmit",
-      options: {
-        widget: "Button"
       },
-      config: {
-        layout: {
-          xs: 11,
-          sm: 11,
-          md: 2.5,
-          lg: 2.5
+      {
+        type: "Control",
+        scope: "#/properties/notify",
+        options: {
+          widget: "Notify"
         },
-        main: {
-          name: "Save & Exit",
-          startIcon: "ApproveIcon",
-          variant: "contained",
-          color: "info",
-          type: "text",
-          onClick: "saveHandler",
-          size: "small"
+        layout: 6
+      },
+      {
+        type: "HorizontalLayout",
+        config: {
+          layout: 12,
+          style: {
+            position: "absolute",
+            bottom: 5,
+            overflow: "hidden"
+          }
         },
-        style: {
-          marginBottom: "8px",
-          float: "right"
-        }
+        elements: [
+          {
+            type: "Control",
+            scope: "#/properties/FooterText",
+            options: {
+              widget: "Box"
+            },
+            config: {
+              layout: 9.5,
+              main: {
+                heading: "Copywriter@ACT21.IO"
+              },
+              style: {
+                color: ((_a = theme == null ? void 0 : theme.palette) == null ? void 0 : _a.text.disabled) || "#AFAFAF",
+                fontSize: "12px",
+                textAlign: "center"
+              }
+            }
+          },
+          {
+            type: "HorizontalLayout",
+            config: {
+              layout: 2.5,
+              style: {}
+            },
+            elements: [
+              {
+                type: "Control",
+                scope: "#/properties/EmptyBox",
+                options: {
+                  widget: "EmptyBox"
+                },
+                config: {
+                  layout: 6,
+                  style: {
+                    flexGrow: 1
+                  }
+                }
+              },
+              {
+                type: "Control",
+                scope: "#/properties/backIcon",
+                options: {
+                  widget: "Box"
+                },
+                config: {
+                  layout: 1,
+                  main: {
+                    iconName: "PrevIcon",
+                    onClick: "backHandler"
+                  },
+                  style: {
+                    fill: theme.palette.primary.main,
+                    width: 20,
+                    height: 20,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    marginRight: "-8px",
+                    cursor: "pointer",
+                    ":hover": {
+                      fill: theme.palette.primary.dark
+                    }
+                  }
+                }
+              },
+              {
+                type: "Control",
+                scope: "#/properties/text",
+                options: {
+                  widget: "Box"
+                },
+                config: {
+                  layout: 5,
+                  main: {
+                    heading: "Previous Page",
+                    onClick: "backHandler"
+                  },
+                  style: {
+                    width: "fit-content",
+                    color: theme.palette.primary.main,
+                    fontSize: "12px",
+                    cursor: "pointer",
+                    marginLeft: "2px",
+                    marginRight: 0,
+                    ":hover": {
+                      color: theme.palette.primary.dark
+                    }
+                  }
+                }
+              }
+            ]
+          }
+        ]
       }
-    },
-    {
-      type: "Control",
-      scope: "#/properties/notify",
-      options: {
-        widget: "Notify"
-      },
-      layout: 6
-    }
-  ]
+    ]
+  };
+  return uiSchema;
 };
 const APISection = {
   type: "HorizontalLayout",
@@ -8496,7 +8017,7 @@ const APISection = {
         widget: "SelectInputField"
       },
       config: {
-        layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
+        layout: { xs: 11, sm: 4, md: 4, lg: 4 },
         main: {
           label: "Method",
           type: "text"
@@ -8510,7 +8031,7 @@ const APISection = {
         widget: "InputField"
       },
       config: {
-        layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
+        layout: { xs: 11, sm: 4, md: 4, lg: 4 },
         main: {
           label: "Path",
           type: "text",
@@ -8519,6 +8040,26 @@ const APISection = {
         }
       }
     },
+    {
+      type: "Control",
+      scope: "#/properties/emptyBox",
+      options: {
+        widget: "EmptyBox"
+      },
+      config: {
+        layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+      }
+    },
+    {
+      type: "Control",
+      scope: "#/properties/emptyBox",
+      options: {
+        widget: "EmptyBox"
+      },
+      config: {
+        layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+      }
+    },
     {
       type: "Control",
       scope: "#/properties/headers",
@@ -8535,12 +8076,7 @@ const APISection = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Key"
                 }
@@ -8553,16 +8089,21 @@ const APISection = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Value"
                 }
               }
+            },
+            {
+              type: "Control",
+              scope: "#/properties/emptyBox",
+              options: {
+                widget: "EmptyBox"
+              },
+              config: {
+                layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+              }
             }
           ]
         }
@@ -8584,12 +8125,7 @@ const APISection = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Key"
                 }
@@ -8602,16 +8138,21 @@ const APISection = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Value"
                 }
               }
+            },
+            {
+              type: "Control",
+              scope: "#/properties/emptyBox",
+              options: {
+                widget: "EmptyBox"
+              },
+              config: {
+                layout: { xs: 0, sm: 4, md: 4, lg: 4 }
+              }
             }
           ]
         }
@@ -8638,12 +8179,7 @@ const refreshSectionUiSchema = {
                 widget: "InputField"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 11, sm: 4, md: 4, lg: 4 },
                 main: {
                   label: "Value"
                 }
@@ -8656,12 +8192,7 @@ const refreshSectionUiSchema = {
                 widget: "EmptyBox"
               },
               config: {
-                layout: {
-                  xs: 11,
-                  sm: 11,
-                  md: 5.5,
-                  lg: 5.5
-                },
+                layout: { xs: 0, sm: 4, md: 4, lg: 4 },
                 main: {}
               }
             }
@@ -8681,21 +8212,21 @@ var event = (store2, dynamicData2, submitHandler, service2) => {
       this.refreshPage(formdata.Handler, store2);
     },
     refreshPage: (handlerType, store22) => {
-      const uiSchema = _.cloneDeep(EventUiSchema);
+      const uiSchema = _.cloneDeep(EventUiSchema(store22.theme.myTheme));
       const schema2 = _.cloneDeep(EventSchema);
       if (handlerType) {
         if (handlerType === "custom") {
-          uiSchema.elements[1].elements[0].elements[2] = getTextArea("eventCode", "Write Custom Code", false);
+          uiSchema.elements[0].elements[0].elements[3] = getTextArea("eventCode", "Write Custom Code", false);
           schema2.required = ["eventType", "Handler", "eventCode"];
         } else if (handlerType === "api") {
-          uiSchema.elements[1].elements[0].elements[2] = APISection;
+          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] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, { xs: 12, sm: 12, md: 6 });
+          uiSchema.elements[0].elements[0].elements[2] = getSelectField("inBuiltFunctionType", "Function Name");
+          uiSchema.elements[0].elements[0].elements[3] = getTextArea("funcParametersCode", "Write Custom Code for Functions Parameter", true, 12);
           schema2.required = ["eventType", "Handler", "inBuiltFunctionType"];
         } else if (handlerType === "refresh") {
-          uiSchema.elements[1].elements[0].elements[2] = refreshSectionUiSchema;
+          uiSchema.elements[0].elements[0].elements[3] = refreshSectionUiSchema;
           schema2.properties.refreshElements.required = ["value"];
           schema2.properties.refreshElements.items.required = ["value"];
           schema2.required = ["eventType", "Handler", "refreshElements"];
@@ -8705,8 +8236,8 @@ var event = (store2, dynamicData2, submitHandler, service2) => {
       store22.setUiSchema(uiSchema);
     },
     getFormData: Component(store2, dynamicData2, submitHandler, service2).getFormdata,
-    getUiSchema: function() {
-      return EventUiSchema;
+    getUiSchema: async function() {
+      return await EventUiSchema(store2.theme.myTheme);
     },
     getSchema: () => {
       return EventSchema;
@@ -8741,17 +8272,9 @@ var event = (store2, dynamicData2, submitHandler, service2) => {
       store2.setSearchParams(store2.searchParams);
       this.setPage();
     },
-    deleteEvent: async function() {
-      await Component(store2, dynamicData2, submitHandler, service2).deleteEvent(false);
-      store2.updateDialog("popUpEvent");
-    },
+    deleteEvent: Component(store2, dynamicData2, submitHandler, service2).deleteEvent,
     backHandler: function() {
       store2.navigate(-1);
-    },
-    deletePopUpEvent: function() {
-      const rowId = dynamicData2.path.split(".")[1];
-      localStorage.setItem("rowId", rowId);
-      store2.updateDialog("popUpEvent");
     }
   };
 };
@@ -8820,6 +8343,7 @@ async function executeEventsHandler(params2) {
   } else if (params2.config.Handler === "refresh") {
     return await executeRefreshHandler(params2);
   } else if (params2.config.Handler === "mergeFormdata") {
+    console.log("params : ", params2);
     const result = await mergeFormdata(
       params2.parentEventOutput,
       params2.componentName,
@@ -8905,13 +8429,16 @@ async function mergeFormdata(handlerResponse, componentName, eventConfig, store2
       };
     });
   } else if (eventConfig.type === "page") {
+    console.log("console1 : ", handlerResponse);
     if (!(_.isEmpty(handlerResponse == null ? void 0 : handlerResponse.data) && (handlerResponse == null ? void 0 : handlerResponse.data))) {
+      console.log("console2 : ", handlerResponse);
       store2.setFormdata((pre) => {
         return { ...pre, ...handlerResponse == null ? void 0 : handlerResponse.data };
       });
     }
   } else {
     if (handlerResponse) {
+      console.log("console3 : ", handlerResponse);
       store2.setFormdata((pre) => {
         return { ...pre, [componentName]: eventConfig.lazyLoading ? handlerResponse.data.data : handlerResponse.data };
       });
@@ -9057,9 +8584,7 @@ var service = (funcParams) => {
   };
   return {
     setPage: async function() {
-      funcParams.store.setFormdata((prev) => {
-        return {};
-      });
+      funcParams.store.setFormdata({});
       executeEventsParameters = {
         config: {},
         componentName: "",
@@ -9080,12 +8605,6 @@ var service = (funcParams) => {
       );
       funcParams.uiSchema.elements.push(notifyUiSchema);
       funcParams.store.setUiSchema(funcParams.uiSchema);
-      const simulateDelay = async (time) => {
-        return new Promise((resolve) => {
-          return setTimeout(resolve, time);
-        });
-      };
-      await simulateDelay(3e3);
       await executeRefreshHandler({
         config: {},
         componentName: "",
@@ -9184,6 +8703,9 @@ var service = (funcParams) => {
         functionParameters == null ? void 0 : functionParameters.handleNext();
       }
     },
+    backHandler: () => {
+      funcParams.store.navigate(-1);
+    },
     onReset: async function(functionParameters) {
       var _a, _b;
       const path = ((_a = funcParams.dynamicData) == null ? void 0 : _a.tableButtonPath) || funcParams.dynamicData.path.split(".")[0];
@@ -9642,62 +9164,7 @@ const BarGraph = {
     widget: "Graph"
   },
   config: {
-    main: {
-      header: "Bar Graph",
-      bottomLabel: "Name of Employe",
-      numTicks: 6,
-      leftLabel: "Value in lakhs",
-      axisLeft: true,
-      axisBottom: true,
-      hideTicks: false,
-      hideLeftAxisLine: false,
-      hideBottomAxisLine: false,
-      bottomAxisWidth: "10px",
-      legend: {
-        labelColor: "green",
-        legendTitle: "",
-        direction: "row",
-        align: "none"
-      }
-    },
-    style: {
-      containerStyle: {
-        width: "100%",
-        height: 300
-      },
-      headerStyle: {},
-      tooltipStyle: {},
-      labelStyle: {
-        margin: { left: 80, bottom: 20 },
-        leftLabelOffset: 50,
-        bottomLabelOffset: 10
-      },
-      barStyle: {
-        color: {
-          firstBarColor: "#6c5efb",
-          secondBarColor: "#3f51b5"
-        }
-      },
-      legendStyle: {
-        legend: {
-          lineHeight: "0.9em",
-          fontSize: "8px",
-          fontFamily: "arial",
-          padding: "10px 10px",
-          width: "30%",
-          display: "flex",
-          justifyContent: "center",
-          border: "1px solid rgba(255, 255, 255, 0.3)",
-          borderRadius: " 8px",
-          marginRight: "auto"
-        },
-        legendTitle: {
-          fontSize: "10px",
-          marginBottom: "10px",
-          fontWeight: "100"
-        }
-      }
-    }
+    main: {}
   }
 };
 const PieGraph = {
@@ -9708,35 +9175,7 @@ const PieGraph = {
   },
   config: {
     main: {
-      header: "Incentive Branch category wise",
-      type: "PieGraph",
-      bottomLabel: "Name of Employe",
-      leftLabel: "Value",
-      axisLeft: true,
-      axisBottom: true,
-      legendAvailable: true,
-      legend: {
-        labelColor: "green",
-        legendTitle: "Branches",
-        direction: "row",
-        align: "right"
-      }
-    },
-    style: {
-      containerStyle: {
-        height: "340"
-      },
-      headerStyle: {},
-      tooltipStyle: {
-        backgroundColor: "black",
-        width: "80px"
-      },
-      labelStyle: {},
-      legendStyle: {
-        legend: {},
-        legendTitle: {}
-      },
-      pieStyle: {}
+      type: "PieGraph"
     }
   }
 };
@@ -9784,30 +9223,7 @@ const HorizontalBarGraph = {
   },
   config: {
     main: {
-      header: " ",
-      type: "HorizontalBarGraph",
-      bottomLabel: " ",
-      leftLabel: "Value",
-      axisLeft: false,
-      axisBottom: true,
-      hideBottomTicks: false,
-      hideLeftTicks: false,
-      hideLeftAxisLine: true,
-      hideBottomAxisLine: false,
-      bottomAxisWidth: "10px"
-    },
-    style: {
-      containerStyle: {
-        width: "100%"
-      },
-      headerStyle: {},
-      tooltipStyle: {},
-      labelStyle: {
-        margin: { top: 10, left: 180, right: 40, bottom: 40 }
-      },
-      barStyle: {
-        color: "#6c5efb"
-      }
+      type: "HorizontalBarGraph"
     }
   }
 };
@@ -9826,7 +9242,11 @@ const buildHorizontalBarGraph = (config, componentScope) => {
     horizontalBarGraph.config.containerStyle.background = config.containerBackground;
   }
   if (config.height) {
-    horizontalBarGraph.config.style.containerStyle.height = config.height;
+    horizontalBarGraph.config.style = {
+      containerStyle: {
+        height: config.height
+      }
+    };
   }
   if (config.bottomLabel) {
     horizontalBarGraph.config.main.bottomLabel = config.bottomLabel;
@@ -9935,7 +9355,11 @@ const buildPieGraph = (config, componentScope) => {
     pieGraph.config.layout = createLayoutFormat(config.layout);
   }
   if (config.height) {
-    pieGraph.config.style.containerStyle.height = config.height;
+    pieGraph.config.style = {
+      containerStyle: {
+        height: config.height
+      }
+    };
   }
   if (config.legendHide) {
     pieGraph.config.main.legendAvailabe = config.legendHide === "YES" ? false : true;
@@ -9946,7 +9370,11 @@ const buildPieGraph = (config, componentScope) => {
     pieGraph.config.main.tooltipDataKey = flatObjectValueInArray(config.legendLabels);
   }
   if (config.pieArcColors) {
-    pieGraph.config.style.pieStyle.colorRange = flatObjectValueInArray(config.pieArcColors);
+    pieGraph.config.style = {
+      pieStyle: {
+        colorRange: flatObjectValueInArray(config.pieArcColors)
+      }
+    };
   }
   return pieGraph;
 };
@@ -9956,16 +9384,13 @@ const buildStackbarGraph = (config, componentScope) => {
     barGraph.config.layout = createLayoutFormat(config.layout);
   }
   if (config.legendHide) {
-    barGraph.config.main.legendAvailable = false;
+    barGraph.config.main.legendAvailable = config.legendHide;
   }
   barGraph.config.main.type = config.graphType;
   barGraph.config.main.header = config.heading;
   if (config.barColor) {
     barGraph.config.barStyle.color = config.barColor;
   }
-  if (config.containerBackground) {
-    barGraph.config.containerStyle.background = config.containerBackground;
-  }
   if (config.height) {
     barGraph.config.style.containerStyle.height = config.height;
   }
@@ -9975,7 +9400,6 @@ const buildStackbarGraph = (config, componentScope) => {
   if (config.leftLabel) {
     barGraph.config.main.leftLabel = config.leftLabel;
   }
-  barGraph.scope = componentScope;
   return barGraph;
 };
 var RunnerBoyProgressBar = {
@@ -10029,8 +9453,10 @@ var WrapperSection = {
 };
 const buildWrapperSection = (config, componentScope) => {
   const wrapper = _.cloneDeep(WrapperSection);
+  wrapper.scope = componentScope;
   wrapper.config.main.label = config.label;
   wrapper.config.main.divider = config.divider === "YES" ? true : false;
+  wrapper.config.main.isAccordion = config.isAccordion === "YES" ? true : false;
   if (config.style) {
     wrapper.config.style = JSON.parse(config.style);
   }
@@ -10046,12 +9472,7 @@ var TextInputField = {
     widget: "InputField"
   },
   config: {
-    layout: {
-      xs: 11,
-      sm: 11,
-      md: 5.5,
-      lg: 5.5
-    },
+    layout: { xs: 11, sm: 4, md: 4, lg: 4 },
     main: {
       label: ""
     },
@@ -10084,12 +9505,7 @@ var SelectInputField = {
     widget: "SelectInputField"
   },
   config: {
-    "layout": {
-      "xs": 11,
-      "sm": 11,
-      "md": 5.5,
-      "lg": 5.5
-    },
+    layout: { xs: 11, sm: 4, md: 4, lg: 4 },
     main: {
       label: "",
       type: "text",
@@ -10378,16 +9794,14 @@ var Card = {
     main: {
       rowSpacing: 0.5
     },
-    style: {
-      wrapperStyle: {
-        position: "relative",
-        color: "white",
-        height: { xs: "120px", md: "160px" },
-        width: "100%",
-        textAlign: "left",
-        background: "#3f51b5",
-        borderRadius: "20px"
-      }
+    componentsBoxStyle: {
+      position: "relative",
+      color: "white",
+      height: { xs: "120px", md: "160px" },
+      width: "100%",
+      textAlign: "left",
+      background: "#3f51b5",
+      borderRadius: "20px"
     },
     layout: { xs: 12, sm: 12, md: 6, lg: 6 }
   },
@@ -10499,12 +9913,7 @@ var DateInputField = {
     widget: "DateInputField"
   },
   config: {
-    layout: {
-      xs: 11,
-      sm: 11,
-      md: 5.5,
-      lg: 5.5
-    },
+    layout: { xs: 11, sm: 4, md: 4, lg: 4 },
     main: {
       label: "",
       type: "date"
@@ -10621,7 +10030,7 @@ var MultipleSelect = {
     widget: "MultipleSelect"
   },
   config: {
-    layout: { xs: 11, sm: 11, md: 5.5, lg: 5.5 },
+    layout: { xs: 11, sm: 4, md: 4, lg: 4 },
     main: {
       label: "",
       type: "text",
@@ -10652,6 +10061,7 @@ const buildBasicUiSchema = (config) => {
   return {
     "type": "HorizontalLayout",
     pageName: `${config.name}`,
+    heading: `${config.label}`,
     "elements": []
   };
 };
@@ -10808,7 +10218,7 @@ var emptyBox = {
     widget: "EmptyBox"
   },
   config: {
-    layout: { xs: 12, sm: 12, md: 5.5, lg: 5.5 },
+    layout: { xs: 0, sm: 4, md: 4, lg: 4 },
     main: {},
     style: {}
   }
@@ -11187,7 +10597,7 @@ const buildUiSchema = (config) => {
       elements = RunnerBoyProgressbar(config, componentScope);
       break;
     case "WrapperSection":
-      elements = buildWrapperSection(config);
+      elements = buildWrapperSection(config, componentScope);
       break;
     case "Text":
       elements = buildTextField(config, componentScope);
@@ -11238,7 +10648,7 @@ const buildUiSchema = (config) => {
       switch (config.graphType) {
         case "BarGraph":
         case "StackBarGraph":
-          elements = buildStackbarGraph(config, componentScope);
+          elements = buildStackbarGraph(config);
           break;
         case "LineGraph":
           elements = buildLineGraph(config, componentScope);