Subpath related changes (#543)

divyav-aot · ann-aot · divyav-aot · web-flow · commit 767dac59706f · 2025-04-21T20:00:30.000-04:00
* added date time and network status in sidebar (#62) added date time and network status in sidebar (#62) * datetime style change, and refresh token issue during background fixed (#64) datetime style change, and refresh token issue during background fixed (#64) * Rsbc/7.0.0 subpath (#68) * new branch - rsbc/7.0.0-subpath added in git actions * Apply APP_BASE_ROUTE as optional sub-path for formsflow (#65) * Apply APP_BASE_ROUTE as optional sub-path for formsflow * VERSION updated to v7.0.0-rsbc-v0.3.5 * Add APP_BASE_ROUTE on logos * Add APP_BASE_ROUTE to silent-check-ssot.html path * Refactor APP_BASE_ROUTE * VERSION updated to v7.0.0-rsbc-v0.3.5-subpath --------- Co-authored-by: aurelio-aot <aurelio.pascual.jr@gmail.com> Co-authored-by: divyav-aot <divyav-aot@github> * VERSION updated to v7.0.0-rsbc-v0.3.6-subpath --------- Co-authored-by: divyav-aot <divyav-aot@github> Co-authored-by: Divya Viswanath <79858022+divyav-aot@users.noreply.github.com> Co-authored-by: aurelio-aot <aurelio.pascual.jr@gmail.com> --------- Co-authored-by: Ann Mary Jacob <77353155+ann-aot@users.noreply.github.com> Co-authored-by: divyav-aot <divyav-aot@github> Co-authored-by: aurelio-aot <aurelio.pascual.jr@gmail.com>
diff --git a/.github/workflows/forms-flow-admin-cd.yml b/.github/workflows/forms-flow-admin-cd.yml
@@ -7,6 +7,7 @@ on:
       - develop
       - release/*
       - rsbc/7.0.0
+      - rsbc/7.0.0-subpath
     paths:
       - "forms-flow-admin/**"
       - "VERSION"
diff --git a/.github/workflows/forms-flow-component-cd.yml b/.github/workflows/forms-flow-component-cd.yml
@@ -8,6 +8,7 @@ on:
       - FWF-3440-Design-System-MF
       - release/*
       - rsbc/7.0.0
+      - rsbc/7.0.0-subpath
     paths:
       - "forms-flow-components/**"
       - "VERSION"
diff --git a/.github/workflows/forms-flow-integration-cd.yml b/.github/workflows/forms-flow-integration-cd.yml
@@ -7,6 +7,7 @@ on:
       - develop
       - release/*
       - rsbc/7.0.0
+      - rsbc/7.0.0-subpath
     paths:
       - "forms-flow-integration/**"
       - "VERSION"
diff --git a/.github/workflows/forms-flow-microfrontend-cd.yml b/.github/workflows/forms-flow-microfrontend-cd.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - rsbc/7.0.0
+      - rsbc/7.0.0-subpath
 
 defaults:
   run:
diff --git a/.github/workflows/forms-flow-nav.cd.yml b/.github/workflows/forms-flow-nav.cd.yml
@@ -7,6 +7,7 @@ on:
       - develop
       - release/*
       - rsbc/7.0.0
+      - rsbc/7.0.0-subpath
     paths:
       - "forms-flow-nav/**"
       - "VERSION"
diff --git a/.github/workflows/forms-flow-rsbcservice.yml b/.github/workflows/forms-flow-rsbcservice.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - rsbc/7.0.0
+      - rsbc/7.0.0-subpath
     paths:
       - "forms-flow-rsbcservice/**"
       - "VERSION"
diff --git a/.github/workflows/forms-flow-service.yml b/.github/workflows/forms-flow-service.yml
@@ -6,7 +6,8 @@ on:
       - main
       - develop
       - release/*
-      - rsbc/7.0.0      
+      - rsbc/7.0.0
+      - rsbc/7.0.0-subpath   
     paths:
       - "forms-flow-service/**"
       - "VERSION"
diff --git a/.github/workflows/forms-flow-theme.yml b/.github/workflows/forms-flow-theme.yml
@@ -6,7 +6,8 @@ on:
       - main
       - develop
       - release/*
-      - rsbc/7.0.0      
+      - rsbc/7.0.0
+      - rsbc/7.0.0-subpath     
     paths:
       - "forms-flow-theme/**"
       - "VERSION"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v7.0.0-rsbc-v0.3.4
+v7.0.0-rsbc-v0.3.6-subpath
diff --git a/forms-flow-admin/src/constants/index.ts b/forms-flow-admin/src/constants/index.ts
@@ -14,8 +14,9 @@ export const KEYCLOAK_ENABLE_CLIENT_AUTH =
   KEYCLOAK_ENABLE_CLIENT_AUTH_VARIABLE === true
     ? true
     : false;
-
-export const BASE_ROUTE = MULTITENANCY_ENABLED ? "/tenant/:tenantId/" : "/";
+const baseRoute = window._env_ && window._env_.REACT_APP_BASE_ROUTE;
+export const APP_BASE_ROUTE = baseRoute ? "/" + baseRoute : "";
+export const BASE_ROUTE = MULTITENANCY_ENABLED ? "/tenant/:tenantId/" : `${APP_BASE_ROUTE}/`;
 
 export const ADMIN_ROLE = "formsflow-admin";
 
diff --git a/forms-flow-admin/src/index.tsx b/forms-flow-admin/src/index.tsx
@@ -9,7 +9,7 @@ import {
   KEYCLOAK_CLIENT,
 } from "./endpoints/config";
 import Footer from "./components/footer";
-import { BASE_ROUTE, MULTITENANCY_ENABLED } from "./constants";
+import { BASE_ROUTE, MULTITENANCY_ENABLED, APP_BASE_ROUTE } from "./constants";
 import AdminDashboard from "./components/dashboard";
 import RoleManagement from "./components/roles";
 import UserManagement from "./components/users";
@@ -27,7 +27,7 @@ const Admin = React.memo(({ props }: any) => {
   const [dashboardCount, setDashboardCount] = React.useState();
   const [roleCount, setRoleCount] = React.useState();
   const [userCount, setUserCount] = React.useState();
-  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantId}/` : "/";
+  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantId}/` : `${APP_BASE_ROUTE}/`;
   const userRoles = JSON.parse(
     StorageService.get(StorageService.User.USER_ROLE)
   );
@@ -76,11 +76,11 @@ const Admin = React.memo(({ props }: any) => {
   
   React.useEffect(()=>{
     const restricted = 
-    (location === '/admin/dashboard' && !isDashboardManager) ||
-    (location === '/admin/roles' && !isRoleManager) ||
-    (location === '/admin/users' && !isUserManager) ||
+    (location === `${APP_BASE_ROUTE}/admin/dashboard` && !isDashboardManager) ||
+    (location === `${APP_BASE_ROUTE}/admin/roles` && !isRoleManager) ||
+    (location === `${APP_BASE_ROUTE}/admin/users` && !isUserManager) ||
     (!(isDashboardManager ||isRoleManager ||isUserManager));
-    setIsAccessRestricted(restricted);
+     setIsAccessRestricted(restricted);
   },[location,userRoles]);
   return (
     <>
diff --git a/forms-flow-integration/src/constants/index.ts b/forms-flow-integration/src/constants/index.ts
@@ -16,8 +16,9 @@ export const KEYCLOAK_ENABLE_CLIENT_AUTH =
   KEYCLOAK_ENABLE_CLIENT_AUTH_VARIABLE === true
     ? true
     : false;
-
-export const BASE_ROUTE = MULTITENANCY_ENABLED ? "/tenant/:tenantId/" : "/";
+const baseRoute = window._env_ && window._env_.REACT_APP_BASE_ROUTE;
+export const APP_BASE_ROUTE = baseRoute ? "/" + baseRoute : "";
+export const BASE_ROUTE = MULTITENANCY_ENABLED ? "/tenant/:tenantId/" : `${APP_BASE_ROUTE}/`;
 
 export const ADMIN_ROLE = "formsflow-admin";
 export const DESIGNER_ROLE = "formsflow-designer";
diff --git a/forms-flow-integration/src/index.tsx b/forms-flow-integration/src/index.tsx
@@ -9,7 +9,7 @@ import {
   KEYCLOAK_CLIENT,
 } from "./endpoints/config";
 import Footer from "./components/Footer";
-import { BASE_ROUTE, MULTITENANCY_ENABLED, ENABLE_INTEGRATION_PREMIUM } from "./constants";
+import { BASE_ROUTE, MULTITENANCY_ENABLED, APP_BASE_ROUTE, ENABLE_INTEGRATION_PREMIUM } from "./constants";
 import Recipes from "./components/Recipes";
 import ConnectedApps from "./components/ConnectedApps";
 import PremiumSubscription from "./components/PremiumSubscription";
@@ -31,8 +31,8 @@ const Integration = React.memo(({ props }: any) => {
   const [page, setPage] = React.useState("Recipes");
   const [isDesigner, setIsDesigner] = React.useState(false);
   const [integrationCheckLoading, setIntegrationCheckLoading] = useState(true);
-
-  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantId}/` : "/";
+  
+  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantId}/` : `${APP_BASE_ROUTE}/`;
 
   React.useEffect(() => {
     publish("ES_ROUTE", { pathname: `${baseUrl}integration` });
diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
@@ -10,6 +10,7 @@ import {
   APPLICATION_NAME,
   STAFF_DESIGNER,
   MULTITENANCY_ENABLED,
+  APP_BASE_ROUTE,
   ADMIN_ROLE,
   ENABLE_FORMS_MODULE,
   ENABLE_PROCESSES_MODULE,
@@ -104,7 +105,7 @@ const NavBar = React.memo(({ props }) => {
   const showApplications = setShowApplications(userDetail?.groups);
   const tenantKey = tenant?.tenantId;
   const formTenant = form?.tenantKey;
-  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : "/";
+  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : `${APP_BASE_ROUTE}/`;
   const navbarRef = useRef(null);
 const isCreateSubmissions = userRoles?.includes("create_submissions");
 const isViewSubmissions = userRoles?.includes("view_submissions");
@@ -157,7 +158,7 @@ const isUserManager = userRoles?.includes("manage_users");
 
   const [loginUrl, setLoginUrl] = useState(baseUrl);
 
-  const logoPath = MULTITENANCY_ENABLED ? tenantLogo : defaultLogoPath;
+  const logoPath = MULTITENANCY_ENABLED ? tenantLogo : APP_BASE_ROUTE + defaultLogoPath;
   
 
   const getAppName = useMemo(
diff --git a/forms-flow-nav/src/constants/constants.js b/forms-flow-nav/src/constants/constants.js
@@ -44,8 +44,9 @@ export const MULTITENANCY_ENABLED =
     MULTITENANCY_ENABLED_VARIABLE === true
     ? true
     : false;
-
-export const BASE_ROUTE = MULTITENANCY_ENABLED ? "/tenant/:tenantId/" : "/";
+const baseRoute = window._env_ && window._env_.REACT_APP_BASE_ROUTE;
+export const APP_BASE_ROUTE = baseRoute ? "/" + baseRoute : "";
+export const BASE_ROUTE = MULTITENANCY_ENABLED ? "/tenant/:tenantId/" : `${APP_BASE_ROUTE}/`;
 
 export const Keycloak_Tenant_Client = "forms-flow-web";
 
diff --git a/forms-flow-nav/src/sidenav/Sidebar.jsx b/forms-flow-nav/src/sidenav/Sidebar.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import {
   APPLICATION_NAME,
   MULTITENANCY_ENABLED,
+  APP_BASE_ROUTE,
   ENABLE_FORMS_MODULE,
   ENABLE_PROCESSES_MODULE,
   ENABLE_DASHBOARDS_MODULE,
@@ -45,7 +46,7 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
   const currentLocation = useLocation();
 
   // const [activeLink, setActiveLink] = useState("");
-  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : "/";
+  const baseUrl = MULTITENANCY_ENABLED ? `/tenant/${tenantKey}/` : `${APP_BASE_ROUTE}/`;
   // const defaultLogoPath =
   //   document.documentElement.style.getPropertyValue("--navbar-logo-path") ||
   //   "/logo.svg";
@@ -188,7 +189,7 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
     
     const activeSection =
     sections.find((section) =>
-      section.supportedRoutes.some((exp) => currentLocation.pathname.includes(exp))
+      section.supportedRoutes.some((exp) => currentLocation.pathname.endsWith(exp))
     ) || { key: "0" }; // Default to key "0" if no match
   
     setActiveKey(activeSection.key);
@@ -243,7 +244,7 @@ const Sidebar = React.memo(({ props, sidenavHeight="100%" }) => {
           <img
             width="160"
             height="auto"
-            src="/RoadsafteyLogo.png"
+            src={APP_BASE_ROUTE + "/RoadsafteyLogo.png"}
             alt="applicationName"
           />
         ) : (
diff --git a/forms-flow-nav/src/sidenav/hamburgerMenu.jsx b/forms-flow-nav/src/sidenav/hamburgerMenu.jsx
@@ -10,12 +10,12 @@ import Sidebar from "./Sidebar";
 // import hamburger from "./hamburger.svg";
 // import closebutton from "./closebutton.svg";
 import { HamburgerIcon, CloseIcon, ApplicationLogo } from "@formsflow/components";
-import { APPLICATION_NAME } from "../constants/constants";
+import { APPLICATION_NAME, APP_BASE_ROUTE } from "../constants/constants";
 function HamburgerMenu({ props }) {
   const [show, setShow] = useState(false);
   const handleClose = () => setShow(false);
   const handleShow = () => setShow(true);
-
+  
   return (
     <Navbar expand="lg" className="bg-body-tertiary custom-navbar">
       <Container>
@@ -34,7 +34,7 @@ function HamburgerMenu({ props }) {
             <img
               width="160"
               height="auto"
-              src="/RoadsafteyLogo.png"
+              src= {APP_BASE_ROUTE + "/RoadsafteyLogo.png"}
               alt="applicationName"
             />
           ) : (
diff --git a/forms-flow-service/src/constants/constants.ts b/forms-flow-service/src/constants/constants.ts
@@ -4,6 +4,9 @@ export const DATE_FORMAT =
 export const TIME_FORMAT =
 (window as any)._env_ && (window as any)._env_.REACT_APP_TIME_FORMAT || "HH:mm:ss";
 
+const baseRoute = (window as any)._env_ && (window as any)._env_.REACT_APP_BASE_ROUTE;
+export const APP_BASE_ROUTE = baseRoute ? "/" + baseRoute : "";
+
 const MULTITENANCY_ENABLED_VARIABLE = (window as any)._env_?.REACT_APP_MULTI_TENANCY_ENABLED || false;
 
 export const MULTITENANCY_ENABLED =
diff --git a/forms-flow-service/src/keycloak/KeycloakService.ts b/forms-flow-service/src/keycloak/KeycloakService.ts
@@ -7,6 +7,7 @@ import StorageService from "../storage/storageService";
 import HelperServices from "../helpers/helperServices";
 import {
   APPLICATION_NAME,
+  APP_BASE_ROUTE
 } from "../constants/constants";
 
   class KeycloakService {
@@ -36,7 +37,7 @@ import {
      */
     private keycloakInitConfig: KeycloakInitOptions = {
       onLoad: "check-sso",
-      silentCheckSsoRedirectUri: `${window.location.origin}/silent-check-sso.html`,
+      silentCheckSsoRedirectUri: `${window.location.origin}${APP_BASE_ROUTE}/silent-check-sso.html`,
       pkceMethod: "S256",
       checkLoginIframe: false,
       scope: "openid offline_access"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-v7.0.0-rsbc-v0.3.4`
	`1`	`+v7.0.0-rsbc-v0.3.6-subpath`