Remove organization from Application type

src/components/Contexts/FormContext.test.tsx

@@ -16,7 +16,6 @@ import {
   REOPEN_APP,
   RejectAppResp,
   ReopenAppResp,
-  ReviewAppResp,
 } from "../../graphql";
 
 const baseApplication: Omit<Application, "questionnaireData"> = {
@@ -35,10 +34,6 @@ const baseApplication: Omit<Application, "questionnaireData"> = {
     applicantName: "",
     applicantEmail: "",
   },
-  organization: {
-    _id: "",
-    name: "",
-  },
   programName: "",
   studyAbbreviation: "",
   conditional: false,
@@ -885,7 +880,8 @@ describe("reopenForm Tests", () => {
         data: {
           reopenApplication: {
             _id: "mock-reopen-id",
-          } as ReviewAppResp["reviewApplication"],
+            status: "In Progress",
+          } as ReopenAppResp["reopenApplication"],
         },
       },
     };

src/components/Contexts/FormContext.tsx

@@ -185,7 +185,6 @@ export const FormProvider: FC<ProviderProps> = ({ children, id }: ProviderProps)
         ...newState.data,
         _id: d.saveApplication["_id"],
         applicant: d?.saveApplication?.applicant,
-        organization: d?.saveApplication?.organization,
       };
     }
 

src/config/InitialValues.ts

@@ -1,7 +1,6 @@
 export const InitialApplication: Omit<Application, "questionnaireData"> = {
   _id: "new",
   applicant: null,
-  organization: null,
   status: "New",
   createdAt: "",
   updatedAt: "",

src/content/questionnaire/Contexts/QuestionnaireContext.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import { ListApplicationsResp } from "../../../graphql";
 
 const QuestionnaireContext = React.createContext<{
   /**
@@ -8,7 +9,9 @@ const QuestionnaireContext = React.createContext<{
   /**
    * Action performed when 'Review' button is clicked
    */
-  handleOnReviewClick?: (application: Omit<Application, "questionnaireData">) => void;
+  handleOnReviewClick?: (
+    application: ListApplicationsResp["listApplications"]["applications"][number]
+  ) => void;
 }>({});
 
 export default QuestionnaireContext;

src/graphql/getApplication.ts

@@ -21,10 +21,6 @@ export const query = gql`
         applicantID
         applicantName
       }
-      organization {
-        _id
-        name
-      }
       programName
       studyAbbreviation
       questionnaireData

src/graphql/listApplications.ts

@@ -38,6 +38,6 @@ export type Input = {
 export type Response = {
   listApplications: {
     total: number;
-    applications: Omit<Application, "questionnaireData" | "organization">[];
+    applications: Omit<Application, "questionnaireData">[];
   };
 };

src/graphql/reviewApplication.ts

@@ -14,8 +14,5 @@ export type Input = {
 };
 
 export type Response = {
-  reviewApplication: Pick<
-    Application,
-    "_id" | "status" | "createdAt" | "updatedAt" | "history" | "applicant"
-  >;
+  reviewApplication: Pick<Application, "_id" | "status">;
 };

src/graphql/saveApplication.ts

@@ -22,10 +22,6 @@ export const mutation = gql`
         applicantID
         applicantName
       }
-      organization {
-        _id
-        name
-      }
     }
   }
 `;

src/types/Application.d.ts

@@ -9,7 +9,6 @@ type Application = {
   ORCID: string;
   // Applicant Details
   applicant: Applicant;
-  organization: Pick<Organization, "_id" | "name">;
   PI: string; // Principal Investigator's full name "<first name> <last name>"
   controlledAccess: boolean;
   openAccess: boolean;

src/utils/formModeUtils.test.ts

@@ -28,10 +28,6 @@ describe("getFormMode tests based on provided requirements", () => {
     _id: "submission-123",
     questionnaireData: InitialQuestionnaire,
     status: "New",
-    organization: {
-      _id: baseUser.organization.orgID,
-      name: baseUser.organization.orgName,
-    },
     applicant: {
       applicantID: baseUser._id,
       applicantName: baseUser.firstName,