Merge branch 'rome/release/2024-01-26' into rome/test

.circleci/config.yml

@@ -182,6 +182,25 @@ jobs:
           to: "s3://rome-online-test/"
       - jira/notify 
 
+  rome-app-beta-build:
+    docker:
+      - image: cimg/node:18.18.2
+    resource_class: large
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://rome-online-production-beta/"
+      - jira/notify      
 
   test-hasura-migrate:
     docker:
@@ -233,6 +252,49 @@ jobs:
           to: "s3://imex-online-test/"
       - jira/notify
 
+  test-app-beta-build:
+    docker:
+      - image: cimg/node:18.18.2
+    resource_class: large
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:test
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://imex-online-test-beta/"
+      - jira/notify
+
+  rome-test-app-beta-build:
+    docker:
+      - image: cimg/node:18.18.2
+    resource_class: large
+    working_directory: ~/repo/client
+
+    steps:
+      - checkout:
+          path: ~/repo
+
+      - run:
+          name: Install Dependencies
+          command: npm i
+
+      - run: npm run build:test
+
+      - aws-s3/sync:
+          from: build
+          to: "s3://rome-online-test-beta/"
+      - jira/notify
+
+
   admin-app-build:
     docker:
       - image: cimg/node:16.15.0
@@ -274,6 +336,14 @@ workflows:
           filters:
             branches:
               only: master
+      - app-beta-build:
+          filters:
+            branches:
+              only: master-beta
+      - rome-app-beta-build:
+          filters:
+            branches:
+              only: rome/master-beta
       - hasura-migrate:
           secret: ${HASURA_PROD_SECRET}
           filters:
@@ -296,6 +366,14 @@ workflows:
           filters:
             branches:
               only: test
+      - rome-test-app-beta-build:
+          filters:
+            branches:
+              only: rome/test-beta
+      - test-app-beta-build:
+          filters:
+            branches:
+              only: test-beta
       - test-hasura-migrate:
           secret: ${HASURA_TEST_SECRET}
           filters:

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

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