Merge pull request #3963 from Northeastern-Electric-Racing/new-project-diff

Fix Diff for New Project Change Requests

Author: chpy04

src/backend/src/transformers/change-requests.transformer.ts

@@ -8,8 +8,8 @@ import {
   WbsElementStatus,
   WorkPackageProposedChanges,
   WorkPackageStage,
-  isProjectWbs,
-  BudgetChangeRequest
+  BudgetChangeRequest,
+  isWorkPackageWbs
 } from 'shared';
 import { wbsNumOf } from '../utils/utils.js';
 import { calculateChangeRequestStatus, convertCRScopeWhyType } from '../utils/change-requests.utils.js';
@@ -132,7 +132,7 @@ const changeRequestTransformer = (
   const status = calculateChangeRequestStatus(changeRequest);
 
   const wbsName = changeRequest.wbsElement
-    ? isProjectWbs(changeRequest.wbsElement)
+    ? !isWorkPackageWbs(changeRequest.wbsElement)
       ? changeRequest.wbsElement?.name
       : `${changeRequest.wbsElement?.workPackage?.project.wbsElement.name} - ${changeRequest.wbsElement?.name}`
     : undefined;

src/frontend/src/pages/ChangeRequestDetailPage/DiffSection/DiffSection.tsx

@@ -1,11 +1,13 @@
 import { Box } from '@mui/system';
 import InfoBlock from '../../../components/InfoBlock';
-import { StandardChangeRequest } from 'shared';
+import { isProjectWbs, StandardChangeRequest } from 'shared';
 import ProjectDiffSection from './ProjectDiffSection';
 import WorkPackageDiffSection from './WorkPackageDiffSection';
 import LoadingIndicator from '../../../components/LoadingIndicator';
 import DiffSectionEdit from './DiffSectionEdit';
 import { getChangesForWorkPackage } from '../../../utils/diff-page.utils';
+import NewProjectDiffSection from './NewProjectDiffSection';
+
 interface DiffSectionProps {
   changeRequest: StandardChangeRequest;
 }
@@ -18,7 +20,11 @@ const DiffSection: React.FC<DiffSectionProps> = ({ changeRequest }) => {
       <InfoBlock title={`Proposed Changes`} />
       {wbsNum ? (
         projectProposedChanges ? (
-          <ProjectDiffSection projectProposedChanges={projectProposedChanges} wbsNum={wbsNum} />
+          isProjectWbs(wbsNum) ? (
+            <ProjectDiffSection projectProposedChanges={projectProposedChanges} wbsNum={wbsNum} />
+          ) : (
+            <NewProjectDiffSection projectProposedChanges={projectProposedChanges} />
+          )
         ) : workPackageProposedChanges ? (
           wbsNum.workPackageNumber === 0 ? (
             <DiffSectionEdit collections={[getChangesForWorkPackage(undefined, workPackageProposedChanges)]} />

src/frontend/src/pages/ChangeRequestDetailPage/DiffSection/NewProjectDiffSection.tsx

@@ -0,0 +1,16 @@
+import { ProjectProposedChanges } from 'shared';
+import DiffSectionEdit from './DiffSectionEdit';
+import { ComparableCollection, getChangesForProject } from '../../../utils/diff-page.utils';
+import { useEffect, useState } from 'react';
+
+const NewProjectDiffSection = ({ projectProposedChanges }: { projectProposedChanges: ProjectProposedChanges }) => {
+  const [collections, setCollections] = useState<ComparableCollection[]>([]);
+
+  useEffect(() => {
+    setCollections(getChangesForProject(projectProposedChanges, undefined));
+  }, [projectProposedChanges, setCollections]);
+
+  return <DiffSectionEdit collections={collections} />;
+};
+
+export default NewProjectDiffSection;

src/frontend/src/pages/ChangeRequestDetailPage/DiffSection/ProjectDiffSection.tsx

@@ -18,7 +18,7 @@ const ProjectDiffSection = ({
 
   useEffect(() => {
     if (originalProject) {
-      setCollections(getChangesForProject(originalProject, projectProposedChanges));
+      setCollections(getChangesForProject(projectProposedChanges, originalProject));
     }
   }, [originalProject, projectProposedChanges, setCollections]);
 

src/frontend/src/utils/diff-page.utils.ts

@@ -199,25 +199,25 @@ export const getWbsChanges = (
 };
 
 export const getChangesForProject = (
-  originalProject: Project,
-  proposedChanges: ProjectProposedChanges
+  proposedChanges: ProjectProposedChanges,
+  originalProject?: Project
 ): ComparableCollection[] => {
   const projectLines: ComparableLine[] = [...getWbsChanges(originalProject, proposedChanges)];
 
   projectLines.push(
     genChange(
       'Summary',
-      originalProject.summary !== proposedChanges.summary,
-      originalProject.summary,
+      originalProject?.summary !== proposedChanges.summary,
+      originalProject ? originalProject.summary : '',
       proposedChanges.summary
     )
   );
 
   projectLines.push(
     genChange(
       'Budget',
-      originalProject.budget !== proposedChanges.budget,
-      `$${originalProject.budget}`,
+      originalProject?.budget !== proposedChanges.budget,
+      originalProject ? `$${originalProject.budget}` : '',
       `$${proposedChanges.budget}`
     )
   );
@@ -226,9 +226,11 @@ export const getChangesForProject = (
     genListChange(
       'Teams',
       '',
-      originalProject.teams
-        .map((team) => ({ ...team, value: team.teamName }))
-        .sort((a, b) => a.teamName.localeCompare(b.teamName)),
+      originalProject
+        ? originalProject.teams
+            .map((team) => ({ ...team, value: team.teamName }))
+            .sort((a, b) => a.teamName.localeCompare(b.teamName))
+        : [],
       proposedChanges.teams
         .map((team) => ({ ...team, value: team.teamName }))
         .sort((a, b) => a.teamName.localeCompare(b.teamName)),
@@ -238,7 +240,7 @@ export const getChangesForProject = (
 
   const workPackageCollections: ComparableCollection[] = [];
 
-  originalProject.workPackages.forEach((workPackage) => {
+  originalProject?.workPackages.forEach((workPackage) => {
     const newWorkPackage = proposedChanges.workPackageProposedChanges.find((wp) => wp.name === workPackage.name); // TODO ideally do this based on something unique, maybe add a reference to original wbsElementid or something this also just doesnt work if the name has changed so... I dont see another way to identify them though
     if (newWorkPackage) {
       const workPackageLines = getChangesForWorkPackage(workPackage, newWorkPackage);
@@ -253,7 +255,7 @@ export const getChangesForProject = (
     workPackageCollections.push(getChangesForWorkPackage(undefined, wp));
   });
 
-  return [{ label: originalProject.name, lines: projectLines }, ...workPackageCollections];
+  return [{ label: originalProject ? originalProject.name : '', lines: projectLines }, ...workPackageCollections];
 };
 
 export const getChangesForWorkPackage = (