feature/IO-3092-imgproxy - Merge release to take care of PR conflicts.

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -56,6 +56,8 @@ import { DateTimeFormat } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import JobWatcherToggleContainer from "../../components/job-watcher-toggle/job-watcher-toggle.container.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -102,6 +104,7 @@ export function JobsDetailPage({
     nextFetchPolicy: "network-only"
   });
   const notification = useNotification();
+  const { scenarioNotificationsOn } = useSocket();
 
   useEffect(() => {
     //form.setFieldsValue(transormJobToForm(job));
@@ -319,7 +322,13 @@ export function JobsDetailPage({
       >
         <PageHeader
           // onBack={() => window.history.back()}
-          title={job.ro_number || t("general.labels.na")}
+
+          title={
+            <Space>
+              {scenarioNotificationsOn && <JobWatcherToggleContainer job={job} />}
+              {job.ro_number || t("general.labels.na")}
+            </Space>
+          }
           extra={menuExtra}
         />
         <JobsDetailHeader job={job} />

client/src/pages/landing/landing.page.jsx

@@ -13,7 +13,6 @@ export default connect(mapStateToProps, null)(LandingPage);
 
 export function LandingPage({ currentUser }) {
   const navigate = useNavigate();
-  console.log("Main");
   useEffect(() => {
     navigate("/manage/jobs");
   }, [currentUser, navigate]);

client/src/pages/manage/manage.page.component.jsx

@@ -1,7 +1,7 @@
 import { FloatButton, Layout, Spin } from "antd";
 
 // import preval from "preval.macro";
-import React, { lazy, Suspense, useContext, useEffect, useState } from "react";
+import React, { lazy, Suspense, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, Route, Routes } from "react-router-dom";
@@ -20,7 +20,7 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import { requestForToken } from "../../firebase/firebase.utils";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
@@ -29,6 +29,7 @@ import WssStatusDisplayComponent from "../../components/wss-status-display/wss-s
 import { selectAlerts } from "../../redux/application/application.selectors.js";
 import { addAlerts } from "../../redux/application/application.actions.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 
 const CardPaymentModalContainer = lazy(
@@ -122,7 +123,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
   const { t } = useTranslation();
   const [chatVisible] = useState(false);
-  const { socket, clientId } = useContext(SocketContext);
+  const { socket, clientId } = useSocket();
   const notification = useNotification();
 
   // State to track displayed alerts
@@ -142,11 +143,11 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
         const fetchedAlerts = await response.json();
         setAlerts(fetchedAlerts);
       } catch (error) {
-        console.error("Error fetching alerts:", error);
+        console.warn("Error fetching alerts:", error.message);
       }
     };
 
-    fetchAlerts();
+    fetchAlerts().catch((err) => `Error fetching Bodyshop Alerts: ${err?.message || ""}`);
   }, [setAlerts]);
 
   // Use useEffect to watch for new alerts
@@ -166,7 +167,6 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
           description: alert.description,
           type: alert.type || "info",
           duration: 0,
-          placement: "bottomRight",
           closable: true,
           onClose: () => {
             // When the notification is closed, update displayed alerts state and localStorage

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -10,23 +10,17 @@ import PaymentsListPaginated from "../../components/payments-list-paginated/paym
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_PAYMENTS_PAGINATED } from "../../graphql/payments.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
-import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
-import { Card } from "antd";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
@@ -60,25 +54,15 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
-    <FeatureWrapperComponent
-      featureName="payments"
-      noauth={
-        <Card>
-          <UpsellComponent upsell={upsellEnum().payments.general} />
-        </Card>
-      }
-      z
-    >
-      <RbacWrapper action="payments:list">
-        <PaymentsListPaginated
-          refetch={refetch}
-          loading={loading}
-          searchParams={searchParams}
-          total={data ? data.payments_aggregate.aggregate.count : 0}
-          payments={data ? data.payments : []}
-        />
-      </RbacWrapper>
-    </FeatureWrapperComponent>
+    <RbacWrapper action="payments:list">
+      <PaymentsListPaginated
+        refetch={refetch}
+        loading={loading}
+        searchParams={searchParams}
+        total={data ? data.payments_aggregate.aggregate.count : 0}
+        payments={data ? data.payments : []}
+      />
+    </RbacWrapper>
   );
 }