- update handleBeta

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/App/App.jsx

@@ -22,6 +22,7 @@ import {
 } from "../redux/user/user.selectors";
 import PrivateRoute from "../utils/private-route";
 import "./App.styles.scss";
+import handleBeta from "../utils/handleBeta";
 
 const ResetPassword = lazy(() =>
   import("../pages/reset-password/reset-password.component")
@@ -57,7 +58,6 @@ export function App({
     if (!navigator.onLine) {
       setOnline(false);
     }
-
     checkUserSession();
   }, [checkUserSession, setOnline]);
 
@@ -73,6 +73,7 @@ export function App({
   window.addEventListener("online", function (e) {
     setOnline(true);
   });
+
   useEffect(() => {
     if (currentUser.authorized && bodyshop) {
       client.setAttribute("imexshopid", bodyshop.imexshopid);
@@ -107,6 +108,8 @@ export function App({
       />
     );
 
+  handleBeta();
+
   return (
     <Switch>
       <Suspense fallback={<LoadingSpinner message="ImEX Online" />}>

client/src/components/header/header.component.jsx

@@ -13,7 +13,7 @@ import Icon, {
   FileFilled,
   //GlobalOutlined,
   HomeFilled,
-  ImportOutlined,
+  ImportOutlined, InfoCircleOutlined,
   LineChartOutlined,
   PaperClipOutlined,
   PhoneOutlined,
@@ -26,8 +26,8 @@ import Icon, {
   UserOutlined,
 } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Layout, Menu } from "antd";
-import React from "react";
+import {Layout, Menu, Switch, Tooltip} from "antd";
+import React, {useEffect, useState} from "react";
 import { useTranslation } from "react-i18next";
 import { BsKanban } from "react-icons/bs";
 import {
@@ -52,6 +52,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import {handleBeta, setBeta, checkBeta} from "../../utils/handleBeta";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -102,9 +103,21 @@ function Header({
     {},
     bodyshop && bodyshop.imexshopid
   );
+  const [betaSwitch, setBetaSwitch] = useState(false);
 
   const { t } = useTranslation();
 
+  useEffect(() => {
+    const isBeta = checkBeta();
+    setBetaSwitch(isBeta);
+  }, []);
+
+  const betaSwitchChange = (checked) => {
+    setBeta(checked);
+    setBetaSwitch(checked);
+    handleBeta();
+  }
+
   return (
     <Layout.Header>
       <Menu
@@ -431,6 +444,17 @@ function Header({
             </Menu.Item>
           ))}
         </Menu.SubMenu>
+        <Menu.Item style={{marginLeft: 'auto'}} key="profile">
+          <Tooltip title="A faster more modern ImEX Online is ready for you to try! You can switch back at any time.">
+            <InfoCircleOutlined/>
+            <span style={{marginRight: 8}}>Try the new ImEX Online</span>
+            <Switch
+                checked={betaSwitch}
+                onChange={betaSwitchChange}
+            />
+          </Tooltip>
+        </Menu.Item>
+
       </Menu>
     </Layout.Header>
   );

client/src/components/tech-login/tech-login.component.jsx

@@ -1,8 +1,7 @@
 import { Button, Form, Input } from "antd";
-import React, { useEffect } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { Redirect } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { techLoginStart } from "../../redux/tech/tech.actions";
 import {
@@ -12,6 +11,7 @@ import {
 } from "../../redux/tech/tech.selectors";
 import AlertComponent from "../alert/alert.component";
 import "./tech-login.styles.scss";
+import { Redirect } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
@@ -35,10 +35,6 @@ export function TechLogin({
     techLoginStart(values);
   };
 
-  useEffect(() => {
-    document.title = t("titles.techconsole");
-  }, [t]);
-
   return (
     <div className="tech-login-container">
       {technician ? <Redirect to={`/tech/joblookup`} /> : null}

client/src/pages/tech-job-clock/tech-job-clock.component.jsx

@@ -1,17 +1,10 @@
 import { Divider } from "antd";
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
+import React from "react";
 import TechClockInFormContainer from "../../components/tech-job-clock-in-form/tech-job-clock-in-form.container";
 import TechClockedInList from "../../components/tech-job-clocked-in-list/tech-job-clocked-in-list.component";
 import TechJobStatistics from "../../components/tech-job-statistics/tech-job-statistics.component";
 
 export default function TechClockComponent() {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    document.title = t("titles.techjobclock");
-  }, [t]);
-
   return (
     <div>
       <TechJobStatistics />

client/src/pages/tech-lookup/tech-lookup.container.jsx

@@ -1,16 +1,9 @@
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
+import React from "react";
 import RbacWrapperComponent from "../../components/rbac-wrapper/rbac-wrapper.component";
 import TechLookupJobsDrawer from "../../components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component";
 import TechLookupJobsList from "../../components/tech-lookup-jobs-list/tech-lookup-jobs-list.component";
 
 export default function TechLookupContainer() {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    document.title = t("titles.techjoblookup");
-  }, [t]);
-
   return (
     <div>
       <RbacWrapperComponent action="jobs:list-active">

client/src/pages/tech-shift-clock/tech-shift-clock.component.jsx

@@ -1,14 +1,7 @@
-import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
+import React from "react";
 import TimeTicketShift from "../../components/time-ticket-shift/time-ticket-shift.container";
 
 export default function TechShiftClock() {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    document.title = t("titles.techshiftclock");
-  }, [t]);
-
   return (
     <div>
       <TimeTicketShift isTechConsole />

client/src/translations/en_us/common.json

@@ -2024,7 +2024,7 @@
 				"joblookup": "Job Lookup",
 				"login": "Login",
 				"logout": "Logout",
-				"productionboard": "Production Visual",
+				"productionboard": "Production Board - Visual",
 				"productionlist": "Production List",
 				"shiftclockin": "Shift Clock"
 			}
@@ -2901,7 +2901,7 @@
 			"parts-queue": "Parts Queue | $t(titles.app)",
 			"payments-all": "Payments | $t(titles.app)",
 			"phonebook": "Phonebook | $t(titles.app)",
-			"productionboard": "Production Board - Visual | $t(titles.app)",
+			"productionboard": "Production - Board",
 			"productionlist": "Production Board - List | $t(titles.app)",
 			"profile": "My Profile | $t(titles.app)",
 			"readyjobs": "Ready Jobs | $t(titles.app)",
@@ -2913,10 +2913,6 @@
 			"shop-csi": "CSI Responses | $t(titles.app)",
 			"shop-templates": "Shop Templates | $t(titles.app)",
 			"shop_vendors": "Vendors | $t(titles.app)",
-			"techconsole": "Technician Console | $t(titles.app)",
-			"techjoblookup": "Technician Job Lookup | $t(titles.app)",
-			"techjobclock": "Technician Job Clock | $t(titles.app)",
-			"techshiftclock": "Technician Shift Clock | $t(titles.app)",
 			"temporarydocs": "Temporary Documents | $t(titles.app)",
 			"timetickets": "Time Tickets | $t(titles.app)",
 			"ttapprovals": "",

client/src/translations/es/common.json

@@ -2894,7 +2894,7 @@
 			"jobs-intake": "",
 			"jobsavailable": "Empleos disponibles | $t(titles.app)",
 			"jobsdetail": "Trabajo {{ro_number}} | $t(titles.app)",
-			"jobsdocuments": "Documentos de trabajo {{ro_number}} | $t(titles.app)",
+			"jobsdocuments": "Documentos de trabajo {{ro_number}} | $ t (títulos.app)",
 			"manageroot": "Casa | $t(titles.app)",
 			"owners": "Todos los propietarios | $t(titles.app)",
 			"owners-detail": "",
@@ -2913,10 +2913,6 @@
 			"shop-csi": "",
 			"shop-templates": "",
 			"shop_vendors": "Vendedores | $t(titles.app)",
-			"techconsole": "$t(titles.app)",
-			"techjoblookup": "$t(titles.app)",
-			"techjobclock": "$t(titles.app)",
-			"techshiftclock": "$t(titles.app)",
 			"temporarydocs": "",
 			"timetickets": "",
 			"ttapprovals": "",

client/src/translations/fr/common.json

@@ -2894,7 +2894,7 @@
 			"jobs-intake": "",
 			"jobsavailable": "Emplois disponibles | $t(titles.app)",
 			"jobsdetail": "Travail {{ro_number}} | $t(titles.app)",
-			"jobsdocuments": "Documents de travail {{ro_number}} | $t(titles.app)",
+			"jobsdocuments": "Documents de travail {{ro_number}} | $ t (titres.app)",
 			"manageroot": "Accueil | $t(titles.app)",
 			"owners": "Tous les propriétaires | $t(titles.app)",
 			"owners-detail": "",
@@ -2913,10 +2913,6 @@
 			"shop-csi": "",
 			"shop-templates": "",
 			"shop_vendors": "Vendeurs | $t(titles.app)",
-			"techconsole": "$t(titles.app)",
-			"techjoblookup": "$t(titles.app)",
-			"techjobclock": "$t(titles.app)",
-			"techshiftclock": "$t(titles.app)",
 			"temporarydocs": "",
 			"timetickets": "",
 			"ttapprovals": "",

client/src/utils/handleBeta.js

@@ -0,0 +1,37 @@
+export const BETA_KEY = 'betaSwitchImex';
+
+export const checkBeta = () => {
+    const cookie = document.cookie.split('; ').find(row => row.startsWith(BETA_KEY));
+    return cookie ? cookie.split('=')[1] === 'true' : false;
+}
+
+
+export const setBeta = (value) => {
+    const domain = window.location.hostname.split('.').slice(-2).join('.');
+    document.cookie = `${BETA_KEY}=${value}; path=/; domain=.${domain}`;
+}
+
+export const handleBeta = () => {
+    // If the current host name does not start with beta or test, then we don't need to do anything.
+    if (window.location.hostname.startsWith('localhost')) {
+        console.log('Not on beta or test, so no need to handle beta.');
+        return;
+    }
+
+    const isBeta = checkBeta();
+
+    const currentHostName = window.location.hostname;
+
+    // Beta is enabled, but the current host name does start with beta.
+    if (isBeta && !currentHostName.startsWith('beta')) {
+        const href= `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
+    }
+
+    // Beta is not enabled, but the current host name does start with beta.
+    else if (!isBeta && currentHostName.startsWith('beta')) {
+        const href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
+    }
+}
+export default handleBeta;