hydrate other text

Enterprise-CMCS · Nov 13, 2024 · 441fd08 · 441fd08
1 parent bc7acf6
commit 441fd08
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/services/app-api/utils/types/reportContext.ts b/services/app-api/utils/types/reportContext.ts
@@ -31,7 +31,7 @@ export interface ReportMetadataShape extends ReportKeys {
   programIsPCCM?: Choice[];
   previousRevisions: string[];
   planTypeIncludedInProgram?: Choice[];
-  otherPlanType?: string;
+  "planTypeIncludedInProgram-otherText"?: string;
   novMcparRelease?: boolean;
 }
 

diff --git a/services/app-api/utils/types/reports.ts b/services/app-api/utils/types/reports.ts
@@ -191,7 +191,7 @@ export interface NAAARReportMetadata extends ReportMetadata {
   reportingPeriodEndDate: number;
   dueDate: number;
   planTypeIncludedInProgram: Choice[];
-  otherPlanType?: string;
+  "planTypeIncludedInProgram-otherText"?: string;
 }
 
 // HELPER FUNCTIONS

diff --git a/services/app-api/utils/validation/schemas.ts b/services/app-api/utils/validation/schemas.ts
@@ -20,5 +20,5 @@ export const metadataValidationSchema = yup.object().shape({
   completionStatus: yup.mixed(),
   copyFieldDataSourceId: yup.string(),
   planTypeIncludedInProgram: radio(),
-  otherPlanType: textOptional(),
+  "planTypeIncludedInProgram-otherText": textOptional(),
 });
diff --git a/services/ui-src/src/components/modals/AddEditReportModal.tsx b/services/ui-src/src/components/modals/AddEditReportModal.tsx
@@ -148,7 +148,6 @@ export const AddEditReportModal = ({
       formData["reportingPeriodEndDate"]
     );
     const planTypeIncludedInProgram = formData["planTypeIncludedInProgram"];
-    const otherPlanType = formData["planTypeIncludedInProgram-otherText"];
 
     return {
       metadata: {
@@ -159,7 +158,8 @@ export const AddEditReportModal = ({
         lastAlteredBy: full_name,
         copyFieldDataSourceId: copyFieldDataSourceId?.value,
         planTypeIncludedInProgram,
-        otherPlanType,
+        "planTypeIncludedInProgram-otherText":
+          formData["planTypeIncludedInProgram-otherText"],
         locked: false,
         submissionCount: 0,
         previousRevisions: [],

diff --git a/services/ui-src/src/components/pages/Dashboard/DashboardPage.tsx b/services/ui-src/src/components/pages/Dashboard/DashboardPage.tsx
@@ -156,7 +156,8 @@ export const DashboardPage = ({ reportType }: Props) => {
           copyFieldDataSourceId,
           programIsPCCM: report?.programIsPCCM,
           planTypeIncludedInProgram: report?.planTypeIncludedInProgram,
-          otherPlanType: report?.otherPlanType,
+          "planTypeIncludedInProgram-otherText":
+            report?.["planTypeIncludedInProgram-otherText"],
         },
         state: report.state,
         id: report.id,

diff --git a/services/ui-src/src/types/reportContext.ts b/services/ui-src/src/types/reportContext.ts
@@ -31,7 +31,7 @@ export interface ReportMetadataShape extends ReportKeys {
   programIsPCCM?: Choice[];
   previousRevisions: string[];
   planTypeIncludedInProgram?: Choice[];
-  otherPlanType?: string;
+  "planTypeIncludedInProgram-otherText"?: string;
   novMcparRelease?: boolean;
 }
 

diff --git a/services/ui-src/src/types/reports.ts b/services/ui-src/src/types/reports.ts
@@ -192,7 +192,7 @@ export interface NAAARReportMetadata extends ReportMetadata {
   reportingPeriodEndDate: number;
   dueDate: number;
   planTypeIncludedInProgram: Choice[];
-  otherPlanType?: string;
+  "planTypeIncludedInProgram-otherText"?: string;
 }
 
 // HELPER FUNCTIONS