#4116 requested changes

Author: wavehassman

src/backend/src/prisma/migrations/20260303225351_bom_improvements/migration.sql

@@ -86,6 +86,3 @@ BEGIN
     );
   END LOOP;
 END $$;
-
--- AlterTable
-ALTER TABLE "Material" ADD COLUMN "isCopied" BOOLEAN NOT NULL DEFAULT false;

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;

…BOM/MaterialForm/BOMCopyConfirmModal.tsx …iner/BOM/CopyBOM/BOMCopyConfirmModal.tsxsrc/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/BOMCopyConfirmModal.tsx renamed to src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/CopyBOM/BOMCopyConfirmModal.tsx src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/BOMCopyConfirmModal.tsx renamed to src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/CopyBOM/BOMCopyConfirmModal.tsx

@@ -20,21 +20,12 @@ const BOMCopyConfirmModal = ({
   currentProjectName,
   destinationWbsNum
 }: BOMCopyConfirmModalProps) => {
-  const copyMaterials = useCopyMaterialsToProject();
+  const { mutateAsync: copyMaterials } = useCopyMaterialsToProject();
 
-  const handleConfirm = () => {
-    copyMaterials.mutate(
-      {
-        materialIds,
-        destinationWbsNum
-      },
-      {
-        onSuccess: () => {
-          onSuccess();
-          onHide();
-        }
-      }
-    );
+  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}?`;

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

@@ -5,7 +5,7 @@ import { useAllProjects } from '../../../../../hooks/projects.hooks';
 import React, { useState } from 'react';
 import ErrorPage from '../../../../ErrorPage';
 import LoadingIndicator from '../../../../../components/LoadingIndicator';
-import BOMCopyConfirmModal from '../MaterialForm/BOMCopyConfirmModal';
+import BOMCopyConfirmModal from './BOMCopyConfirmModal';
 
 export interface CopyBOMModalProps {
   open: boolean;
@@ -21,9 +21,9 @@ const CopyBOMModal: React.FC<CopyBOMModalProps> = ({ open, onHide, destinationWb
   const [confirmedMaterialIds, setConfirmedMaterialIds] = useState<string[]>([]);
   const [confirmedSourceProjectName, setConfirmedSourceProjectName] = useState('');
 
-  if (isLoadingCars || !cars || isLoadingProjects || !projects) return <LoadingIndicator />;
   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);
 

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Typography } from '@mui/material';
 import { DataGrid, GridColDef } from '@mui/x-data-grid';
 import { useState } from 'react';
@@ -35,17 +35,17 @@ const CopyBOMProjectSection: React.FC<CopyBOMProjectSectionProps> = ({ selectedP
     error: assembliesError
   } = useGetAssembliesForWbsElement(selectedProject.wbsNum);
 
-  React.useEffect(() => {
+  useEffect(() => {
     if (materials) {
       const allIds = materials.map((m) => m.materialId);
       setSelectedMaterialIds(allIds);
       onSelectionChange(allIds);
     }
   }, [materials, onSelectionChange]);
 
-  if (isLoadingMaterials || isLoadingAssemblies || !materials || !assemblies) return <LoadingIndicator />;
   if (isErrorMaterials) return <ErrorPage message={materialsError?.message} />;
   if (isErrorAssemblies) return <ErrorPage message={assembliesError?.message} />;
+  if (isLoadingMaterials || isLoadingAssemblies || !materials || !assemblies) return <LoadingIndicator />;
 
   const rows = materials.map((m) => ({
     id: m.materialId,

…terialForm/SelectMaterialToCopyModal.tsx …OM/CopyBOM/SelectMaterialToCopyModal.tsxsrc/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/SelectMaterialToCopyModal.tsx renamed to src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/CopyBOM/SelectMaterialToCopyModal.tsx src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/SelectMaterialToCopyModal.tsx renamed to src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/CopyBOM/SelectMaterialToCopyModal.tsx

@@ -118,7 +118,7 @@ const SelectMaterialToCopyModal: React.FC<SelectMaterialToCopyModalProps> = ({ o
 
   // Selecting from the search bar auto-populates the project and material dropdowns
   const handleSearchSelect = useCallback(
-    (_: React.SyntheticEvent, value: AutocompleteOption | null) => {
+    (_, value: AutocompleteOption | null) => {
       if (!value) return;
       const material = (carMaterials ?? []).find((m) => m.materialId === value.id) ?? null;
       if (!material) return;

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/BOM/MaterialForm/MaterialFormView.tsx

@@ -27,7 +27,7 @@ import { displayEnum } from '../../../../../utils/pipes';
 import { MaterialStatus } from 'shared';
 import React, { useState } from 'react';
 import { AddCircle } from '@mui/icons-material';
-import SelectMaterialToCopyModal from './SelectMaterialToCopyModal';
+import SelectMaterialToCopyModal from '../CopyBOM/SelectMaterialToCopyModal';
 
 export interface MaterialFormViewProps {
   submitText: 'Add' | 'Edit';