Merge pull request #1741 from Northeastern-Electric-Racing/#1738-wrong-cr-populating-bug

#1738 - CR correctly auto-populates on WP/Project forms now

Author: RChandler234

src/frontend/src/pages/ProjectDetailPage/ProjectForm/ProjectCreateContainer.tsx

@@ -14,16 +14,13 @@ import { routes } from '../../../utils/routes';
 import { getRequiredLinkTypeNames } from '../../../utils/link.utils';
 import ErrorPage from '../../ErrorPage';
 import LoadingIndicator from '../../../components/LoadingIndicator';
+import { useQuery } from '../../../hooks/utils.hooks';
 
 const ProjectCreateContainer: React.FC = () => {
   const toast = useToast();
   const history = useHistory();
+  const query = useQuery();
 
-  //const links: { linkId: string; url: string; linkTypeName: string }[] = [];
-  //const goals: { bulletId: number; detail: string }[] = [];
-  //const features: { bulletId: number; detail: string }[] = [];
-  //const rules: { bulletId: number; detail: string }[] = [];
-  //const constraints: { bulletId: number; detail: string }[] = [];
   const [projectManagerId, setProjectManagerId] = useState<string | undefined>();
   const [projectLeadId, setProjectLeadId] = useState<string | undefined>();
 
@@ -48,7 +45,7 @@ const ProjectCreateContainer: React.FC = () => {
     teamId: String(),
     carNumber: 0,
     links: [],
-    crId: 0,
+    crId: query.get('crId') || '',
     goals: [],
     features: [],
     constraints: [],
@@ -67,7 +64,7 @@ const ProjectCreateContainer: React.FC = () => {
 
     try {
       const payload: CreateSingleProjectPayload = {
-        crId,
+        crId: Number(crId),
         name,
         carNumber,
         summary,

src/frontend/src/pages/ProjectDetailPage/ProjectForm/ProjectEditContainer.tsx

@@ -14,6 +14,7 @@ import { ProjectFormInput } from './ProjectForm';
 import LoadingIndicator from '../../../components/LoadingIndicator';
 import ErrorPage from '../../ErrorPage';
 import { getRequiredLinkTypeNames } from '../../../utils/link.utils';
+import { useQuery } from '../../../hooks/utils.hooks';
 
 interface ProjectEditContainerProps {
   project: Project;
@@ -22,6 +23,7 @@ interface ProjectEditContainerProps {
 
 const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, exitEditMode }) => {
   const toast = useToast();
+  const query = useQuery();
 
   const { name, budget, summary } = project;
   const [projectManagerId, setProjectManagerId] = useState<string | undefined>(project.projectManager?.userId.toString());
@@ -30,7 +32,6 @@ const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, ex
   const features = bulletsToObject(project.features);
   const constraints = bulletsToObject(project.otherConstraints);
   const rules = rulesToObject(project.rules);
-  const crId = project.changes[0].changeRequestId;
 
   const { mutateAsync, isLoading } = useEditSingleProject(project.wbsNum);
   const {
@@ -74,7 +75,7 @@ const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, ex
     teamId: '',
     carNumber: 0,
     links,
-    crId,
+    crId: query.get('crId') || project.changes[0].changeRequestId.toString(),
     goals,
     features,
     constraints,
@@ -99,7 +100,7 @@ const ProjectEditContainer: React.FC<ProjectEditContainerProps> = ({ project, ex
         summary,
         links,
         projectId: project.id,
-        crId,
+        crId: Number(crId),
         rules,
         goals,
         features,

src/frontend/src/pages/ProjectDetailPage/ProjectForm/ProjectForm.tsx

@@ -24,7 +24,7 @@ export interface ProjectFormInput {
   budget: number;
   summary: string;
   links: LinkCreateArgs[];
-  crId: number;
+  crId: string;
   carNumber: number;
   goals: {
     bulletId: number;

src/frontend/src/pages/WorkPackageForm/WorkPackageForm.tsx

@@ -7,6 +7,7 @@ import LoadingIndicator from '../../components/LoadingIndicator';
 import ErrorPage from '../ErrorPage';
 import { useAllUsers } from '../../hooks/users.hooks';
 import { useSingleProject } from '../../hooks/projects.hooks';
+import { useQuery } from '../../hooks/utils.hooks';
 
 interface WorkPackageFormProps {
   wbsNum: WbsNumber;
@@ -25,6 +26,7 @@ const WorkPackageForm: React.FC<WorkPackageFormProps> = ({ wbsNum, mutateAsync,
     error: projectError
   } = useSingleProject({ ...wbsNum, workPackageNumber: 0 });
   const { data: workPackages, isLoading: wpIsLoading, isError: wpIsError, error: wpError } = useAllWorkPackages();
+  const query = useQuery();
 
   if (wpIsLoading || !workPackages || usersIsLoading || !users || projectIsLoading || !project) return <LoadingIndicator />;
   if (usersIsError) return <ErrorPage message={usersError.message} />;
@@ -43,7 +45,7 @@ const WorkPackageForm: React.FC<WorkPackageFormProps> = ({ wbsNum, mutateAsync,
       ? {
           ...workPackage,
           workPackageId: workPackage.id,
-          crId: workPackage!.changes[0].changeRequestId.toString(),
+          crId: query.get('crId') || workPackage!.changes[0].changeRequestId.toString(),
           stage: workPackage!.stage ?? 'NONE',
           blockedBy: workPackage!.blockedBy.map(wbsPipe),
           expectedActivities: bulletsToObject(workPackage!.expectedActivities),