Merge pull request #379 from fahad-aot/bugfix/fwf-4035-sidebar-fix-in…

…-preview

bugfix/fwf-4035:Hid sidebar in preview page

forms-flow-nav/src/root.component.js

@@ -4,7 +4,7 @@ import Sidebar from "./sidenav/Sidebar";
 import React, { useRef, useEffect, useState } from "react";
 import "./Navbar.scss";
 import HamburgerMenu from "./sidenav/hamburgerMenu";
-import { StyleServices } from "@formsflow/service";
+import { StyleServices ,HelperServices } from "@formsflow/service"; 
 
 export default function Root(props) {
   const customLogoPath =  StyleServices?.getCSSVariable("--custom-logo-path");
@@ -13,12 +13,19 @@ export default function Root(props) {
   const sidenavRef = useRef(null); 
   const [sidenavHeight, setSidenavHeight] = useState("100%");
   const hasMultitenancyHeader = customLogoPath || customTitle;
+  const [isPreviewRoute,setIsPreviewRoute] = useState(false);
+
   useEffect(() => {
     const headerHeight = headerRef.current?.offsetHeight || 0;
     const totalHeight = `calc(100% - ${headerHeight}px)`;
     setSidenavHeight(totalHeight);
   }, [ hasMultitenancyHeader ]); 
 
+  useEffect(()=>{
+    const location = window.location.pathname;
+    const viewOnlyRoutes = new Set (["view-edit"]);
+    setIsPreviewRoute(() => HelperServices.isViewOnlyRoute(location,viewOnlyRoutes));
+  })
   return (
     <Router>
       {/* <NavBar props={props} /> */}
@@ -38,9 +45,9 @@ export default function Root(props) {
           </div>
         )}
         <HamburgerMenu props={props} />
-        <div className="main-sidenav" ref={sidenavRef}>
+        { !isPreviewRoute && <div className="main-sidenav" ref={sidenavRef}>
           <Sidebar props={props} sidenavHeight={sidenavHeight}/>
-        </div>
+        </div>}
       </>
     </Router>
   );

forms-flow-service/src/constants/constants.ts

@@ -2,4 +2,10 @@ export const DATE_FORMAT =
   (window as any)._env_ && (window as any)._env_.REACT_APP_DATE_FORMAT || "DD-MM-YYYY";
 
 export const TIME_FORMAT =
-(window as any)._env_ && (window as any)._env_.REACT_APP_TIME_FORMAT || "hh:mm:ss A";
+(window as any)._env_ && (window as any)._env_.REACT_APP_TIME_FORMAT || "hh:mm:ss A";
+
+const MULTITENANCY_ENABLED_VARIABLE = (window as any)._env_?.REACT_APP_MULTI_TENANCY_ENABLED || false;
+
+export const MULTITENANCY_ENABLED =
+  MULTITENANCY_ENABLED_VARIABLE === "true" ||
+    MULTITENANCY_ENABLED_VARIABLE === true

forms-flow-service/src/helpers/helperServices.ts

@@ -1,6 +1,5 @@
 import moment from 'moment'
-import { DATE_FORMAT } from '../constants/constants'
-import { TIME_FORMAT } from '../constants/constants'
+import { DATE_FORMAT ,MULTITENANCY_ENABLED ,TIME_FORMAT} from '../constants/constants';
 
 class HelperServices {
   public static getLocalDateAndTime(date: string): any {
@@ -42,8 +41,38 @@ class HelperServices {
   }
 
   public static getMoment(date: any): any {
-    return moment(date)
+    return moment(date);
   }
+
+  //  method to remove tenant key
+  public static removeTenantKeyFromData(
+    value: string,
+    tenantKey: string
+  ): string {
+    if (!value || !tenantKey) {
+      return value;
+    }
+
+    const tenantKeyCheck = new RegExp(`${tenantKey}-`).exec(value)?.[0]
+    const startWithSlash = value.startsWith("/");
+
+    if (
+      MULTITENANCY_ENABLED &&
+      tenantKey &&
+      tenantKeyCheck?.toLowerCase() === `${tenantKey.toLowerCase()}-`
+    ) {
+      return value.replace(
+        `${startWithSlash ? "/" : ""}${tenantKey.toLowerCase()}-`,
+        ""
+      );
+    }
+    return value;
+  }
+
+  public static isViewOnlyRoute(location: string, routes: Set<string>): boolean {
+    return Array.from(routes).some((route) => location.includes(route));
+  }
+
 }
 
 export default HelperServices