Merge branch 'feature/IO-3255-simplified-part-management' into feature/IO-3255-parts-management-review1

client/src/components/jobs-change-status/jobs-change-status.component.jsx

@@ -8,19 +8,20 @@ import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
-  jobRO: selectJobReadOnly
+  jobRO: selectJobReadOnly,
+  isPartsEntry: selectIsPartsEntry
 });
 const mapDispatchToProps = (dispatch) => ({
   insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
-export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
+export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail, isPartsEntry }) {
   const { t } = useTranslation();
 
   const [availableStatuses, setAvailableStatuses] = useState([]);
@@ -45,25 +46,43 @@ export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
       });
   };
 
+  // Updates available statuses based on job and bodyshop context
   useEffect(() => {
-    //Figure out what scenario were in, populate accodingly
-    if (job && bodyshop) {
-      if (bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status)) {
-        setAvailableStatuses(bodyshop.md_ro_statuses.pre_production_statuses);
-      } else if (bodyshop.md_ro_statuses.production_statuses.includes(job.status)) {
-        setAvailableStatuses(bodyshop.md_ro_statuses.production_statuses);
-      } else if (bodyshop.md_ro_statuses.post_production_statuses.includes(job.status)) {
-        setAvailableStatuses(
-          bodyshop.md_ro_statuses.post_production_statuses.filter(
-            (s) => s !== bodyshop.md_ro_statuses.default_invoiced && s !== bodyshop.md_ro_statuses.default_exported
-          )
-        );
-      } else {
-        console.log("Status didn't match any restrictions. Allowing all status changes.");
-        setAvailableStatuses(bodyshop.md_ro_statuses.statuses);
-      }
+    if (!job || !bodyshop) return;
+
+    const { md_ro_statuses } = bodyshop;
+    const {
+      parts_statuses,
+      pre_production_statuses,
+      production_statuses,
+      post_production_statuses,
+      statuses,
+      default_invoiced,
+      default_exported
+    } = md_ro_statuses;
+
+    if (isPartsEntry) {
+      // Set parts-specific statuses for parts entry scenario
+      setAvailableStatuses(parts_statuses);
+      return;
     }
-  }, [job, setAvailableStatuses, bodyshop]);
+
+    // Handle non-parts entry scenarios based on job status
+    if (pre_production_statuses.includes(job.status)) {
+      setAvailableStatuses(pre_production_statuses);
+    } else if (production_statuses.includes(job.status)) {
+      setAvailableStatuses(production_statuses);
+    } else if (post_production_statuses.includes(job.status)) {
+      // Filter out invoiced and exported statuses for post-production
+      setAvailableStatuses(
+        post_production_statuses.filter((status) => status !== default_invoiced && status !== default_exported)
+      );
+    } else {
+      // Default to all statuses if no specific restrictions apply
+      console.log("Status didn't match any restrictions. Allowing all status changes.");
+      setAvailableStatuses(statuses);
+    }
+  }, [job, bodyshop, isPartsEntry, setAvailableStatuses]);
 
   const statusMenu = {
     items: [

client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx

@@ -96,13 +96,15 @@ export function SimplifiedPartsJobsListComponent({
       key: "status",
 
       ellipsis: true,
-      sorter: search?.search ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses) : true,
+      sorter: search?.search
+        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.parts_active_statuses)
+        : true,
       sortOrder: sortcolumn === "status" && sortorder,
       render: (text, record) => {
         return record.status || t("general.labels.na");
       },
       filteredValue: filter?.status || null,
-      filters: bodyshop.md_ro_statuses.statuses.map((s) => {
+      filters: bodyshop.md_ro_statuses.parts_statuses.map((s) => {
         return { text: s, value: [s] };
       }),
       onFilter: (value, record) => value.includes(record.status)

server/integrations/partsManagement/defaultNewShop.json

@@ -35,6 +35,11 @@
     "headerMargin": "135"
   },
   "md_ro_statuses": {
+    "parts_statuses": [
+      "Open",
+      "In Progress",
+      "Completed"
+    ],
     "statuses": [
       "Open",
       "Scheduled",
@@ -54,6 +59,10 @@
       "Void"
     ],
     "default_void": "Void",
+    "parts_active_statuses": [
+      "Open",
+      "In Progress"
+    ],
     "active_statuses": [
       "Open",
       "Scheduled",

server/integrations/partsManagement/endpoints/vehicleDamageEstimateAddRq.js

@@ -14,7 +14,7 @@ const {
 } = require("../partsManagement.queries");
 
 // Defaults
-const FALLBACK_DEFAULT_ORDER_STATUS = "OPEN";
+const FALLBACK_DEFAULT_ORDER_STATUS = "Open";
 
 /**
  * Fetches the default order status for a bodyshop.
@@ -81,7 +81,8 @@ const extractJobData = (rq) => {
     scheduled_in: ev.RepairEvent?.RequestedPickUpDateTime || null,
     scheduled_completion: ev.RepairEvent?.TargetCompletionDateTime || null,
     clm_no: ci.ClaimNum || null,
-    status: ci.ClaimStatus || null,
+    //     status: ci.ClaimStatus || null, Proper, setting it default for now
+    status: FALLBACK_DEFAULT_ORDER_STATUS,
     policy_no: ci.PolicyInfo?.PolicyInfo?.PolicyNum || ci.PolicyInfo?.PolicyNum || null,
     ded_amt: parseFloat(ci.PolicyInfo?.CoverageInfo?.Coverage?.DeductibleInfo?.DeductibleAmt || 0)
   };