Merged in feature/IO-3096-GlobalNotifications (pull request #2212)

IO-3096-GlobalNotifications - Adjust splits

client/src/App/App.jsx

@@ -48,8 +48,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
   const { t } = useTranslation();
   const navigate = useNavigate();
 
-  const scenarioNotificationsOn = client?.getTreatment("Realtime_Notifications_UI") === "on";
-
   useEffect(() => {
     if (!navigator.onLine) {
       setOnline(false);
@@ -203,12 +201,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
             path="/manage/*"
             element={
               <ErrorBoundary>
-                <SocketProvider
-                  bodyshop={bodyshop}
-                  navigate={navigate}
-                  currentUser={currentUser}
-                  scenarioNotificationsOn={scenarioNotificationsOn}
-                >
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
                 </SocketProvider>
               </ErrorBoundary>
@@ -220,12 +213,7 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
             path="/tech/*"
             element={
               <ErrorBoundary>
-                <SocketProvider
-                  bodyshop={bodyshop}
-                  navigate={navigate}
-                  currentUser={currentUser}
-                  scenarioNotificationsOn={scenarioNotificationsOn}
-                >
+                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
                   <PrivateRoute isAuthorized={currentUser.authorized} />
                 </SocketProvider>
               </ErrorBoundary>

client/src/contexts/SocketIO/useSocket.jsx

@@ -14,6 +14,7 @@ import {
 } from "../../graphql/notifications.queries.js";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const SocketContext = createContext(null);
 
@@ -25,11 +26,10 @@ const INITIAL_NOTIFICATIONS = 10;
  * @param bodyshop
  * @param navigate
  * @param currentUser
- * @param scenarioNotificationsOn
  * @returns {JSX.Element}
  * @constructor
  */
-const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNotificationsOn }) => {
+const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   const socketRef = useRef(null);
   const [clientId, setClientId] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
@@ -37,6 +37,14 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
   const userAssociationId = bodyshop?.associations?.[0]?.id;
   const { t } = useTranslation();
 
+  const {
+    treatments: { Realtime_Notifications_UI }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Realtime_Notifications_UI"],
+    splitKey: bodyshop?.imexshopid
+  });
+
   const [markNotificationRead] = useMutation(MARK_NOTIFICATION_READ, {
     update: (cache, { data: { update_notifications } }) => {
       const timestamp = new Date().toISOString();
@@ -209,7 +217,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
 
       const handleNotification = (data) => {
         // Scenario Notifications have been disabled, bail.
-        if (!scenarioNotificationsOn) {
+        if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
 
@@ -329,7 +337,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
 
       const handleSyncNotificationRead = ({ notificationId, timestamp }) => {
         // Scenario Notifications have been disabled, bail.
-        if (!scenarioNotificationsOn) {
+        if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
 
@@ -371,7 +379,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
 
       const handleSyncAllNotificationsRead = ({ timestamp }) => {
         // Scenario Notifications have been disabled, bail.
-        if (!scenarioNotificationsOn) {
+        if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
 
@@ -462,7 +470,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
     markAllNotificationsRead,
     navigate,
     currentUser,
-    scenarioNotificationsOn,
+    Realtime_Notifications_UI,
     t
   ]);
 
@@ -474,7 +482,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser, scenarioNot
         isConnected,
         markNotificationRead,
         markAllNotificationsRead,
-        scenarioNotificationsOn
+        scenarioNotificationsOn: Realtime_Notifications_UI?.treatment === "on"
       }}
     >
       {children}