Merge pull request #4116 from Northeastern-Electric-Racing/feature/bom-improvement-pt2

BOM Usability feature merge

Author: chpy04

src/backend/src/prisma/migrations/20260402230143_bom_improvements_pt2/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Material" ADD COLUMN     "isCopied" BOOLEAN NOT NULL DEFAULT false;

src/backend/src/prisma/schema.prisma

@@ -1020,6 +1020,7 @@ model Material {
   linkUrl                String
   notes                  String?
   reimbursementProducts  Reimbursement_Product[]
+  isCopied               Boolean                 @default(false)
 
   @@index([assemblyId])
   @@index([materialTypeId])

src/backend/src/services/boms.services.ts

@@ -204,7 +204,8 @@ export default class BillOfMaterialsService {
             dateCreated: new Date(),
             userCreatedId: user.userId,
             wbsElementId: destinationProject.wbsElementId,
-            assemblyId: null
+            assemblyId: null,
+            isCopied: true
           },
           ...getMaterialQueryArgs(organization.organizationId)
         });

src/backend/src/transformers/material.transformer.ts

@@ -48,7 +48,8 @@ export const materialTransformer = (material: Prisma.MaterialGetPayload<Material
           .filter((p) => p.reimbursementRequest && !p.reimbursementRequest.dateDeleted)
           .map((p) => [p.reimbursementRequest!.reimbursementRequestId, p.reimbursementRequest!])
       ).values()
-    )
+    ),
+    isCopied: material.isCopied
   };
 };
 

src/backend/tests/unmocked/project.test.ts

@@ -52,6 +52,7 @@ describe('Material Tests', () => {
       expect(material.manufacturerName).toEqual('Digikey');
       expect(material.manufacturerPartNumber).toEqual('lalsd');
       expect(material.quantity?.toString()).toEqual('5');
+      expect(material.isCopied).toBe(false);
     });
   });
 
@@ -148,6 +149,9 @@ describe('Material Tests', () => {
       expect(copiedMat1.notes).toBe('Test notes');
 
       expect(copiedMat2.status).toBe('NOT_READY_TO_ORDER');
+
+      expect(copiedMat1.isCopied).toBe(true);
+      expect(copiedMat2.isCopied).toBe(true);
     });
 
     test('Fails when material does not exist', async () => {

src/frontend/src/hooks/bom.hooks.ts

@@ -1,5 +1,5 @@
 import { useMutation, useQuery, useQueryClient } from 'react-query';
-import { Assembly, Manufacturer, Material, MaterialType, Unit, WbsNumber, wbsPipe } from 'shared';
+import { Assembly, Manufacturer, Material, MaterialType, ProjectPreview, Unit, WbsNumber, wbsPipe } from 'shared';
 import { useToast } from '../hooks/toasts.hooks';
 import {
   assignMaterialToAssembly,
@@ -326,3 +326,33 @@ export const useGetMaterialsForWbsElement = (wbsNum: WbsNumber) => {
     return data;
   });
 };
+
+export const useGetMaterialsForCar = (carNumber: number | null, projects: ProjectPreview[]) => {
+  const projectsInCar = projects.filter((p) => p.wbsNum.carNumber === carNumber);
+
+  return useQuery<Material[], Error>(
+    ['materials', 'car', carNumber ?? 'none'],
+    async () => {
+      const results = await Promise.all(
+        projectsInCar.map(async (p) => {
+          const { data } = await getMaterialsForWbsElement({
+            carNumber: p.wbsNum.carNumber,
+            projectNumber: p.wbsNum.projectNumber,
+            workPackageNumber: 0
+          });
+          return data;
+        })
+      );
+
+      const flat = results.flat();
+      const seen = new Set<string>();
+      return flat.filter((material) => {
+        const key = `${material.name.toLowerCase()}-${material.assemblyId ?? 'no-assembly'}`;
+        if (seen.has(key)) return false;
+        seen.add(key);
+        return true;
+      });
+    },
+    { enabled: carNumber !== null && projectsInCar.length > 0 }
+  );
+};

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/BOMTable.tsx

@@ -63,7 +63,8 @@ const BOMTable: React.FC<BOMTableProps> = ({ setHideColumn, assignMaterial, colu
       subtotal: '',
       link: '',
       notes: '',
-      assemblyId: assembly.assemblyId
+      assemblyId: assembly.assemblyId,
+      isCopied: false
     });
 
     assemblyMaterials.forEach((material, indx) => materialsWithAssemblies.push(materialToRow(material, indx)));

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/BOMTableWrapper.tsx

@@ -11,7 +11,8 @@ import { useToast } from '../../../../hooks/toasts.hooks';
 import { useAssignMaterialToAssembly, useDeleteAssembly, useDeleteMaterial } from '../../../../hooks/bom.hooks';
 import LoadingIndicator from '../../../../components/LoadingIndicator';
 import EditMaterialModal from './MaterialForm/EditMaterialModal';
-import { Button, Link, Typography } from '@mui/material';
+import ContentCopyIcon from '@mui/icons-material/ContentCopy';
+import { Button, Link, Tooltip, Typography } from '@mui/material';
 import { bomBaseColDef } from '../../../../utils/bom.utils';
 import NERModal from '../../../../components/NERModal';
 import { renderStatusBOM } from './BOMTableCustomCells';
@@ -300,7 +301,20 @@ const BOMTableWrapper: React.FC<BOMTableWrapperProps> = ({
       type: 'string',
       sortable: false,
       filterable: false,
-      hide: hideColumn[3]
+      hide: hideColumn[3],
+      renderCell: (params) => {
+        const material = materials.find((m) => m.materialId === params.row.materialId);
+        return (
+          <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
+            <Typography variant="body2">{params.value}</Typography>
+            {material?.isCopied && (
+              <Tooltip title="Copied from another BOM">
+                <ContentCopyIcon sx={{ fontSize: 14, color: 'warning.main' }} />
+              </Tooltip>
+            )}
+          </Box>
+        );
+      }
     },
     {
       ...bomBaseColDef,

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/CopyBOM/BOMCopyConfirmModal.tsx

@@ -0,0 +1,39 @@
+import NERModal from '../../../../../components/NERModal';
+import { useCopyMaterialsToProject } from '../../../../../hooks/bom.hooks';
+
+export interface BOMCopyConfirmModalProps {
+  open: boolean;
+  onHide: () => void;
+  onSuccess: () => void;
+  materialIds: string[];
+  sourceProjectName: string;
+  currentProjectName: string;
+  destinationWbsNum: string;
+}
+
+const BOMCopyConfirmModal = ({
+  open,
+  onHide,
+  onSuccess,
+  materialIds,
+  sourceProjectName,
+  currentProjectName,
+  destinationWbsNum
+}: BOMCopyConfirmModalProps) => {
+  const { mutateAsync: copyMaterials } = useCopyMaterialsToProject();
+
+  const handleConfirm = async () => {
+    await copyMaterials({ materialIds, destinationWbsNum });
+    onSuccess();
+    onHide();
+  };
+
+  const message = `Are you sure you want to copy ${materialIds.length} materials from ${sourceProjectName} to ${currentProjectName}?`;
+  return (
+    <NERModal open={open} onHide={onHide} onSubmit={handleConfirm} title="Confirm Copy">
+      <p>{message}</p>
+    </NERModal>
+  );
+};
+
+export default BOMCopyConfirmModal;

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/CopyBOM/CopyBOMModal.tsx

@@ -0,0 +1,59 @@
+import { WbsNumber, wbsPipe } from 'shared';
+import CopyBOMView from './CopyBOMView';
+import { useGetAllCars } from '../../../../../hooks/cars.hooks';
+import { useAllProjects } from '../../../../../hooks/projects.hooks';
+import React, { useState } from 'react';
+import ErrorPage from '../../../../ErrorPage';
+import LoadingIndicator from '../../../../../components/LoadingIndicator';
+import BOMCopyConfirmModal from './BOMCopyConfirmModal';
+
+export interface CopyBOMModalProps {
+  open: boolean;
+  onHide: () => void;
+  destinationWbsNum: WbsNumber;
+  currentProjectName: string;
+}
+
+const CopyBOMModal: React.FC<CopyBOMModalProps> = ({ open, onHide, destinationWbsNum, currentProjectName }) => {
+  const { data: cars, isLoading: isLoadingCars, isError: carsIsError, error: carsError } = useGetAllCars();
+  const { data: projects, isLoading: isLoadingProjects, isError: projectsIsError, error: projectsError } = useAllProjects();
+  const [confirmOpen, setConfirmOpen] = useState(false);
+  const [confirmedMaterialIds, setConfirmedMaterialIds] = useState<string[]>([]);
+  const [confirmedSourceProjectName, setConfirmedSourceProjectName] = useState('');
+
+  if (carsIsError) return <ErrorPage message={carsError?.message} />;
+  if (projectsIsError) return <ErrorPage message={projectsError?.message} />;
+  if (isLoadingCars || !cars || isLoadingProjects || !projects) return <LoadingIndicator />;
+
+  const destinationWbs = wbsPipe(destinationWbsNum);
+
+  return (
+    <>
+      <CopyBOMView
+        open={open}
+        onHide={onHide}
+        cars={cars}
+        projects={projects}
+        onCopy={(materialIds, sourceProjectName) => {
+          setConfirmedMaterialIds(materialIds);
+          setConfirmedSourceProjectName(sourceProjectName);
+          setConfirmOpen(true);
+        }}
+      />
+      <BOMCopyConfirmModal
+        open={confirmOpen}
+        onHide={() => setConfirmOpen(false)}
+        onSuccess={() => {
+          onHide();
+          setConfirmOpen(false);
+        }}
+        materialIds={confirmedMaterialIds}
+        sourceProjectName={confirmedSourceProjectName}
+        currentProjectName={`${wbsPipe(destinationWbsNum)} - ${currentProjectName}`}
+        destinationWbsNum={destinationWbs}
+      />
+    </>
+  );
+};
+
+export default CopyBOMModal;