Merge branch 'develop' of https://github.com/AOT-Technologies/forms-f…

…low-ai-micro-front-ends into integration
AOT-Technologies · Feb 6, 2024 · 867160e · 867160e
2 parents 152e7ed + 5e152ac
commit 867160e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git 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>
   );

diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
@@ -171,7 +171,7 @@ const NavBar = React.memo(({ props }) => {
     history.push(baseUrl);
     instance.userLogout();
   };
-  
+
   return (
   <>
    <Helmet>
@@ -204,6 +204,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 ${
@@ -221,6 +222,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 ${
@@ -239,6 +241,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(
@@ -280,6 +283,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 ${
@@ -304,6 +308,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 ${
@@ -324,6 +329,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"

diff --git 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;