#1487: separated interfaces and adjusted ModalContainer values

Author: aarushgarg1110

src/frontend/src/hooks/change-requests.hooks.ts

@@ -111,14 +111,25 @@ export const useCreateStandardChangeRequest = () => {
   );
 };
 
-export interface ChangeRequestPayload {
+export interface CreateActivationChangeRequestPayload {
   submitterId: number;
   wbsNum: WbsNumber;
   projectLeadId: number;
   projectManagerId: number;
   startDate: string;
   confirmDetails: boolean;
+  type: string;
+}
+
+export interface CreateStageGateChangeRequestPayload {
+  submitterId: number;
+  wbsNum: WbsNumber;
   confirmDone: boolean;
+  type: string;
+}
+
+export interface CreateProposeSolutionPayload {
+  submitterId: number;
   crId: number;
   description: string;
   scopeImpact: string;
@@ -131,9 +142,9 @@ export interface ChangeRequestPayload {
  * Custom React Hook to create an activation change request.
  */
 export const useCreateActivationChangeRequest = () => {
-  return useMutation<{ message: string }, Error, ChangeRequestPayload>(
+  return useMutation<{ message: string }, Error, CreateActivationChangeRequestPayload>(
     ['change requests', 'create', 'activation'],
-    async (payload: ChangeRequestPayload) => {
+    async (payload: CreateActivationChangeRequestPayload) => {
       const { data } = await createActivationChangeRequest(
         payload.submitterId,
         payload.wbsNum,
@@ -151,9 +162,9 @@ export const useCreateActivationChangeRequest = () => {
  * Custom React Hook to create a stage gate change request.
  */
 export const useCreateStageGateChangeRequest = () => {
-  return useMutation<{ message: string }, Error, ChangeRequestPayload>(
+  return useMutation<{ message: string }, Error, CreateStageGateChangeRequestPayload>(
     ['change requests', 'create', 'stage gate'],
-    async (payload: ChangeRequestPayload) => {
+    async (payload: CreateStageGateChangeRequestPayload) => {
       const { data } = await createStageGateChangeRequest(payload.submitterId, payload.wbsNum, payload.confirmDone);
       return data;
     }
@@ -165,9 +176,9 @@ export const useCreateStageGateChangeRequest = () => {
  */
 export const useCreateProposeSolution = () => {
   const queryClient = useQueryClient();
-  return useMutation<{ message: string }, Error, ChangeRequestPayload>(
+  return useMutation<{ message: string }, Error, CreateProposeSolutionPayload>(
     ['change requests', 'create', 'propose solution'],
-    async (payload: ChangeRequestPayload) => {
+    async (payload: CreateProposeSolutionPayload) => {
       const { data } = await addProposedSolution(
         payload.submitterId,
         payload.crId,

src/frontend/src/pages/ChangeRequestDetailPage/ProposedSolutionsList.tsx

@@ -48,16 +48,6 @@ const ProposedSolutionsList: React.FC<ProposedSolutionsListProps> = ({ proposedS
         scopeImpact,
         timelineImpact,
         budgetImpact,
-        wbsNum: {
-          carNumber: 0,
-          projectNumber: 0,
-          workPackageNumber: 0
-        },
-        projectLeadId: 0,
-        projectManagerId: 0,
-        startDate: '',
-        confirmDetails: false,
-        confirmDone: false,
         type: ''
       });
     } catch (e) {

src/frontend/src/pages/WorkPackageDetailPage/ActivateWorkPackageModalContainer/ActivateWorkPackageModalContainer.tsx

@@ -6,7 +6,7 @@
 import { useHistory } from 'react-router-dom';
 import { ChangeRequestType, isGuest, WbsNumber } from 'shared';
 import { useAuth } from '../../../hooks/auth.hooks';
-import { ChangeRequestPayload, useCreateActivationChangeRequest } from '../../../hooks/change-requests.hooks';
+import { useCreateActivationChangeRequest } from '../../../hooks/change-requests.hooks';
 import { useAllUsers } from '../../../hooks/users.hooks';
 import { routes } from '../../../utils/routes';
 import ErrorPage from '../../ErrorPage';
@@ -46,17 +46,11 @@ const ActivateWorkPackageModalContainer: React.FC<ActivateWorkPackageModalContai
         submitterId: auth.user?.userId,
         wbsNum,
         type: ChangeRequestType.Activation,
-        projectLeadId: 0,
-        projectManagerId: 0,
-        startDate: '',
-        confirmDetails,
-        confirmDone: false,
-        crId: 0,
-        description: '',
-        scopeImpact: '',
-        timelineImpact: 0,
-        budgetImpact: 0
-      } as ChangeRequestPayload);
+        projectLeadId: projectLeadId || 0,
+        projectManagerId: projectManagerId || 0,
+        startDate: startDate.toISOString(),
+        confirmDetails
+      });
       history.push(routes.CHANGE_REQUESTS);
     } catch (e: unknown) {
       if (e instanceof Error) {

src/frontend/src/pages/WorkPackageDetailPage/StageGateWorkPackageModalContainer/StageGateWorkPackageModalContainer.tsx

@@ -41,16 +41,7 @@ const StageGateWorkPackageModalContainer: React.FC<StageGateWorkPackageModalCont
         submitterId: auth.user?.userId,
         wbsNum,
         type: ChangeRequestType.StageGate,
-        confirmDone,
-        projectLeadId: 0,
-        projectManagerId: 0,
-        startDate: '',
-        confirmDetails: false,
-        crId: 0,
-        description: '',
-        scopeImpact: '',
-        timelineImpact: 0,
-        budgetImpact: 0
+        confirmDone
       });
       history.push(routes.CHANGE_REQUESTS);
     } catch (e: unknown) {