From a5543ac75b6bca880c70443e2fd867b4d1676a07 Mon Sep 17 00:00:00 2001
From: abilpraju-aot <abil.raju@aot-technologies.com>
Date: Wed, 24 Jan 2024 12:57:47 +0530
Subject: [PATCH 1/3] removed default submit call of form

---
 forms-flow-admin/src/components/roles/roles.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/forms-flow-admin/src/components/roles/roles.tsx b/forms-flow-admin/src/components/roles/roles.tsx
index abb6f245..eb86e468 100644
--- a/forms-flow-admin/src/components/roles/roles.tsx
+++ b/forms-flow-admin/src/components/roles/roles.tsx
@@ -294,7 +294,6 @@ const Roles = React.memo((props: any) => {
   const showCreateModal = () => (
     <div data-testid="create-role-modal">
       <Modal show={showRoleModal} onHide={handleCloseRoleModal}>
-        <Form>
           <Modal.Header closeButton>
             <Modal.Title>{t("Create Role")}</Modal.Title>
           </Modal.Header>
@@ -345,14 +344,12 @@ const Roles = React.memo((props: any) => {
               {t("Create")}
             </Button>
           </Modal.Footer>
-        </Form>
       </Modal>
     </div>
   );
   const showEditModal = () => (
     <div data-testid="edit-role-modal">
       <Modal show={showEditRoleModal} onHide={handleCloseEditRoleModal}>
-        <Form>
           <Modal.Header closeButton>
             <Modal.Title>{t("Edit Role")}</Modal.Title>
           </Modal.Header>
@@ -402,7 +399,6 @@ const Roles = React.memo((props: any) => {
               {t("Save")}
             </Button>
           </Modal.Footer>
-        </Form>
       </Modal>
     </div>
   );

From f4b46cf26ea584a0e049e28ddee7167b581059e7 Mon Sep 17 00:00:00 2001
From: Alex Antony <83585487+Josephalexantony-aot@users.noreply.github.com>
Date: Thu, 1 Feb 2024 21:44:15 -0800
Subject: [PATCH 2/3] Added Essential color variables for modeler file. (#141)

---
 forms-flow-theme/src/global.scss | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss
index 33595f8d..eb05edfc 100644
--- a/forms-flow-theme/src/global.scss
+++ b/forms-flow-theme/src/global.scss
@@ -33,13 +33,16 @@
   --color-danger-ltr: #f85757;
   --color-danger-ltst: #ff9e9e;
   --color-hr: #00000080;
+  --color-help: #008599;
+  --color-text-shadow: #ffffff66;
+  --color-box-shadow: #00000033;
 
   --light-gray: #d3d3d3;
   --color-gray-100: #f8f9fa;
   --color-gray-200: #eeeeee;
-  --color-gray-300: #ddd;
-  --color-gray-400: #ccc;
-  --color-gray-500: #adb5bd;
+  --color-gray-300: #dddddd;
+  --color-gray-400: #cccccc;
+  --color-gray-500: #aaaaaa;;
   --color-gray-600: #909090;
   --color-gray-700: #585e64;
   --color-gray-800: #3c3c3c;

From 5e152acde169aa78e90102080766389469c5478f Mon Sep 17 00:00:00 2001
From: shuhaib s <95394061+shuhaib-aot@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:05:56 +0530
Subject: [PATCH 3/3] Fixed navbar collaps toggle on nav option select (#142)

---
 forms-flow-nav/src/Navbar.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
index 4b9df7b3..c036a630 100644
--- a/forms-flow-nav/src/Navbar.jsx
+++ b/forms-flow-nav/src/Navbar.jsx
@@ -160,7 +160,7 @@ const NavBar = React.memo(({ props }) => {
     history.push(baseUrl);
     instance.userLogout();
   };
-  
+ 
   return (
   <>
    <Helmet>
@@ -193,6 +193,7 @@ const NavBar = React.memo(({ props }) => {
                 >
                   {ENABLE_FORMS_MODULE && (
                     <Nav.Link
+                      eventKey="form"
                       as={Link}
                       to={`${baseUrl}form`}
                       className={`nav-menu-item py-md-3 px-0 mx-2 ${
@@ -210,6 +211,7 @@ const NavBar = React.memo(({ props }) => {
 
                   {getUserRolePermission(userRoles, ADMIN_ROLE) ? (
                     <Nav.Link 
+                    eventKey={"admin"}
                       as={Link}
                       to={`${baseUrl}admin/dashboard`}
                       className={`nav-menu-item py-md-3 px-0 mx-2 ${
@@ -228,6 +230,7 @@ const NavBar = React.memo(({ props }) => {
                     ? ENABLE_PROCESSES_MODULE && (
                         <Nav.Link
                           as={Link}
+                          eventKey={"processes"}
                           to={`${baseUrl}processes`}
                           className={`nav-menu-item py-md-3 px-0 mx-2 ${
                             pathname.match(
@@ -249,6 +252,7 @@ const NavBar = React.memo(({ props }) => {
                       getUserRolePermission(userRoles, CLIENT)
                       ? ENABLE_APPLICATIONS_MODULE && (
                           <Nav.Link
+                          eventKey="application"
                             as={Link}
                             to={`${baseUrl}application`}
                             className={`nav-menu-item py-md-3 px-0 mx-2 ${
@@ -273,6 +277,7 @@ const NavBar = React.memo(({ props }) => {
                   {getUserRolePermission(userRoles, STAFF_REVIEWER)
                     ? ENABLE_TASKS_MODULE && (
                         <Nav.Link
+                        eventKey={"task"}
                           as={Link}
                           to={`${baseUrl}task`}
                           className={`nav-menu-item py-md-3 px-0 mx-2 ${
@@ -293,6 +298,7 @@ const NavBar = React.memo(({ props }) => {
                   {getUserRolePermission(userRoles, STAFF_REVIEWER)
                     ? ENABLE_DASHBOARDS_MODULE && (
                         <Nav.Link
+                         eventKey={"metrics"}
                           as={Link}
                           to={`${baseUrl}metrics`}
                           data-testid="dashboards-nav-link"