Merged in release/2025-01-10 (pull request #2039)

Release/2025 01 10

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -1,6 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table } from "antd";
-import React, { useRef, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
@@ -17,8 +17,7 @@ import BillDetailEditReturnComponent from "../bill-detail-edit/bill-detail-edit-
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import UpsellComponent from "../upsell/upsell.component";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
-import { upsellEnum } from "../upsell/upsell.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -61,7 +60,6 @@ export function BillsListTableComponent({
   // const search = queryString.parse(useLocation().search);
   // const selectedBill = search.billid;
   const [searchText, setSearchText] = useState("");
-  const containerRef = useRef(null);
 
   const Templates = TemplateList("bill");
   const bills = billsQuery.data ? billsQuery.data.bills : [];

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

@@ -148,7 +148,7 @@ function Header({
       label: (
         <Space>
           <LockWrapper featureName="bills" bodyshop={bodyshop}>
-            {t(t("menus.header.enterbills"))}
+            {t("menus.header.enterbills")}
           </LockWrapper>
         </Space>
       ),

client/src/components/job-detail-cards/job-detail-cards.component.jsx

@@ -122,7 +122,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext }) {
             </Col>
             {!bodyshop.uselocalmediaserver && (
               <Col {...span}>
-                <JobDetailCardsDocumentsComponent loading={loading} data={data ? data.jobs_by_pk : null} />
+                <JobDetailCardsDocumentsComponent loading={loading} data={data ? data.jobs_by_pk : null} bodyshop={bodyshop} />
               </Col>
             )}
             <Col {...span}>

client/src/components/job-detail-cards/job-detail-cards.documents.component.jsx

@@ -1,12 +1,14 @@
 import { Carousel } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import { GenerateThumbUrl } from "../jobs-documents-gallery/job-documents.utility";
-import CardTemplate from "./job-detail-cards.template.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import CardTemplate from "./job-detail-cards.template.component";
 
-export default function JobDetailCardsDocumentsComponent({ loading, data }) {
+export default function JobDetailCardsDocumentsComponent({ loading, data, bodyshop }) {
   const { t } = useTranslation();
+  const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
 
   if (!data)
     return (
@@ -21,17 +23,19 @@ export default function JobDetailCardsDocumentsComponent({ loading, data }) {
       title={t("jobs.labels.cards.documents")}
       extraLink={`/manage/jobs/${data.id}?tab=documents`}
     >
-      <UpsellComponent disableMask upsell={upsellEnum().media.general}>
+      {!hasMediaAccess && (
-        {data.documents.length > 0 ? (
+        <UpsellComponent disableMask upsell={upsellEnum().media.general}>
-          <Carousel autoplay>
+          {data.documents.length > 0 ? (
-            {data.documents.map((item) => (
+            <Carousel autoplay>
-              <img key={item.id} src={GenerateThumbUrl(item)} alt={item.name} />
+              {data.documents.map((item) => (
-            ))}
+                <img key={item.id} src={GenerateThumbUrl(item)} alt={item.name} />
-          </Carousel>
+              ))}
-        ) : (
+            </Carousel>
-          <div>{t("documents.errors.nodocuments")}</div>
+          ) : (
-        )}
+            <div>{t("documents.errors.nodocuments")}</div>
-      </UpsellComponent>
+          )}
+        </UpsellComponent>
+      )}
     </CardTemplate>
   );
 }

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx

@@ -13,12 +13,12 @@ import { selectScheduleLoad, selectScheduleLoadCalculating } from "../../redux/a
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import { default as BlurWrapper, default as BlurWrapperComponent } from "../feature-wrapper/blur-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
-import UpsellComponent, { upsellEnum, UpsellMaskWrapper } from "../upsell/upsell.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,

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

@@ -20,7 +20,6 @@ import { FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks } from "react-icons/fa
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
 import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
@@ -42,6 +41,7 @@ import JobsDetailTotals from "../../components/jobs-detail-totals/jobs-detail-to
 import JobsDocumentsGalleryContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
 import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
+import LockWrapperComponent from "../../components/lock-wrapper/lock-wrapper.component.jsx";
 import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
 import TaskListContainer from "../../components/task-list/task-list.container.jsx";
@@ -54,9 +54,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormat } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import UndefinedToNull from "../../utils/undefinedtonull";
-import LockWrapperComponent from "../../components/lock-wrapper/lock-wrapper.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -403,7 +401,9 @@ export function JobsDetailPage({
               icon: <BarsOutlined />,
               id: "job-details-lifecycle",
               label: (
-                <LockWrapperComponent featureName="lifecycle" bypass>{t("menus.jobsdetail.lifecycle")}</LockWrapperComponent>
+                <LockWrapperComponent featureName="lifecycle" bypass>
+                  {t("menus.jobsdetail.lifecycle")}
+                </LockWrapperComponent>
               ),
               children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} />
             },
@@ -438,7 +438,11 @@ export function JobsDetailPage({
               key: "audit",
               icon: <HistoryOutlined />,
               id: "job-details-audit",
-              label: <LockWrapperComponent featureName="audit" bypass>{t("jobs.labels.audit")}</LockWrapperComponent>,
+              label: (
+                <LockWrapperComponent featureName="audit" bypass>
+                  {t("jobs.labels.audit")}
+                </LockWrapperComponent>
+              ),
               children: <JobAuditTrail jobId={job.id} />
             },
             {