POLIO-1252: remove "reason" key from front-end

BLSQ · Dec 23, 2024 · d4c21b8 · d4c21b8
1 parent c38404d
commit d4c21b8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 13 deletions.
diff --git a/plugins/polio/api/shared_serializers.py b/plugins/polio/api/shared_serializers.py
@@ -100,7 +100,6 @@ class Meta:
     round: Field = serializers.PrimaryKeyRelatedField(read_only=True, many=False)
     reason_for_delay = ReasonForDelayFieldSerializer()
 
-
     def validate(self, data):
         if data.get("reason_for_delay", None) is None:
             raise serializers.ValidationError("No reason provided")

diff --git a/plugins/polio/js/src/constants/types.ts b/plugins/polio/js/src/constants/types.ts
@@ -4,7 +4,6 @@ import {
     Nullable,
 } from '../../../../../hat/assets/js/apps/Iaso/types/utils';
 import { Profile } from '../../../../../hat/assets/js/apps/Iaso/utils/usersUtils';
-import { ReasonForDelay } from '../domains/Campaigns/Rounds/ReasonForDelayModal/hooks/reasons';
 import { SubActivityFormValues } from '../domains/Campaigns/SubActivities/types';
 
 export type FormatForNFMArgs<T> = {
@@ -252,15 +251,14 @@ export type RoundDateHistoryEntry = {
     previous_ended_at: string; // DATE
     started_at: string; // DATE
     ended_at: string; // DATE
-    reason?: ReasonForDelay;
     reason_for_delay: number; // an id
     user: { first_name: string; last_name: string; username: string };
     created_at: string; // DATE
 };
 
 export type Round = {
     id: number;
-    vaccine_names_extended:string;
+    vaccine_names_extended: string;
     started_at: Nullable<string>;
     ended_at: Nullable<string>;
     mop_up_started_at: Nullable<string>; // date

diff --git a/plugins/polio/js/src/domains/Campaigns/Rounds/ReasonForDelayModal/ReasonForDelayModal.tsx b/plugins/polio/js/src/domains/Campaigns/Rounds/ReasonForDelayModal/ReasonForDelayModal.tsx
@@ -28,8 +28,9 @@ const ReasonForDelayModal: FunctionComponent<Props> = ({
     const { formatMessage } = useSafeIntl();
     const { handleSubmit, resetForm } = useFormikContext();
     const { locale: activeLocale } = useLocale();
-    const { data: reasonsForDelayOptions } =
-        useReasonsDelayOptions(activeLocale);
+    const { data: reasonsForDelayOptions } = useReasonsDelayOptions(
+        activeLocale as 'fr' | 'en',
+    );
     return (
         <ConfirmCancelModal
             id="reasonForDelay-Modal"

diff --git a/plugins/polio/js/src/domains/Campaigns/Rounds/ReasonForDelayModal/hooks/reasons.ts b/plugins/polio/js/src/domains/Campaigns/Rounds/ReasonForDelayModal/hooks/reasons.ts
@@ -32,4 +32,3 @@ export const useReasonsDelayOptions = (
         },
     });
 };
-
diff --git a/plugins/polio/js/src/domains/Campaigns/Rounds/RoundDates/RoundDates.tsx b/plugins/polio/js/src/domains/Campaigns/Rounds/RoundDates/RoundDates.tsx
@@ -45,18 +45,14 @@ export const RoundDates: FunctionComponent<Props> = ({
             initialValues?.rounds?.find(round => round.number === roundNumber)
                 ?.ended_at,
     );
-    const save = (
-        { startDate, endDate, reason, reason_for_delay },
-        helpers,
-    ) => {
+    const save = ({ startDate, endDate, reason_for_delay }, helpers) => {
         setParentFieldValue(`rounds[${roundIndex}]`, {
             ...rounds[roundIndex],
             started_at: startDate,
             ended_at: endDate,
             datelogs: [
                 ...(parentFieldValue?.datelogs ?? []),
                 {
-                    reason,
                     reason_for_delay,
                     previous_started_at: currentStartDate,
                     previous_ended_at: currentEndDate,
@@ -74,7 +70,6 @@ export const RoundDates: FunctionComponent<Props> = ({
         initialValues: {
             startDate: currentStartDate,
             endDate: currentEndDate,
-            reason: null,
             reason_for_delay: null,
         },
         enableReinitialize: true,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,3 @@ export const useReasonsDelayOptions = (
		},
		});
		};