🚀 Ready to release 6.0.0 (#172)

* Release/5.3.1 (#144) * Update VERSION * Navbar mobile view fix * Update package.json (#145) * Changes to add custom Keycloak relative path (#158) * version changed 6.0.0-alpha -> 6.0.0 --------- Co-authored-by: Sumesh Punakkal Kariyil <[email protected]>
AOT-Technologies · Apr 5, 2024 · c37dc53 · c37dc53
1 parent b1b7ef0
commit c37dc53
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v6.0.0-alpha
+v6.0.0
diff --git a/forms-flow-admin/package-lock.json b/forms-flow-admin/package-lock.json
diff --git a/forms-flow-admin/package.json b/forms-flow-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formsflow/admin",
-  "version": "6.0.0-alpha",
+  "version": "6.0.0",
   "scripts": {
     "start": "webpack serve",
     "start:standalone": "webpack serve --env standalone",

diff --git a/forms-flow-admin/src/endpoints/config.ts b/forms-flow-admin/src/endpoints/config.ts
@@ -5,6 +5,8 @@ declare global {
   }
 export const WEB_BASE_URL = (window._env_ && window._env_.REACT_APP_WEB_BASE_URL) 
 export const KEYCLOAK_URL = (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL) 
-export const KEYCLOAK_URL_AUTH = `${KEYCLOAK_URL}/auth`
+export const KEYCLOAK_URL_HTTP_RELATIVE_PATH = (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL_HTTP_RELATIVE_PATH) || '/auth';
+export const KEYCLOAK_URL_AUTH = `${KEYCLOAK_URL}${KEYCLOAK_URL_HTTP_RELATIVE_PATH}`;
+
 export const KEYCLOAK_URL_REALM = (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL_REALM) 
 export const KEYCLOAK_CLIENT = (window._env_ && window._env_.REACT_APP_KEYCLOAK_CLIENT) 
diff --git a/forms-flow-integration/package-lock.json b/forms-flow-integration/package-lock.json
diff --git a/forms-flow-integration/package.json b/forms-flow-integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formsflow/integration",
-  "version": "6.0.0-alpha",
+  "version": "6.0.0",
   "scripts": {
     "start": "webpack serve",
     "start:standalone": "webpack serve --env standalone",

diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
@@ -322,8 +322,8 @@ const NavBar = React.memo(({ props }) => {
                   {getUserRolePermission(userRoles, STAFF_DESIGNER)
                     ? ENABLE_PROCESSES_MODULE && (
                         <Nav.Link
+                        eventKey="processes"
                           as={Link}
-                          eventKey={"processes"}
                           to={`${baseUrl}processes`}
                           className={`nav-menu-item py-md-3 px-0 mx-2 ${
                             pathname.match(

diff --git a/forms-flow-nav/src/constants/constants.js b/forms-flow-nav/src/constants/constants.js
@@ -84,7 +84,10 @@ export const ENABLE_APPLICATIONS_MODULE =
     ? false
     : true;
 
-export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}/auth`;
+export const KEYCLOAK_URL_HTTP_RELATIVE_PATH =
+    (window._env_ && window._env_.REACT_APP_KEYCLOAK_URL_HTTP_RELATIVE_PATH) || '/auth';
+
+export const KEYCLOAK_AUTH_URL = `${KEYCLOAK_URL}${KEYCLOAK_URL_HTTP_RELATIVE_PATH}`;
 
 export const CLIENT = "formsflow-client";
 export const STAFF_DESIGNER = "formsflow-designer";