fixup! fix(dref-translation): add enforce selected langauge in useLazyRequest

Author: shreeyash07

app/src/components/domain/GoMultiFileInput/index.tsx

@@ -62,6 +62,7 @@ type Props<T extends NameType> = Omit<RawFileInputProps<T>, 'multiple' | 'value'
     withoutPreview?: boolean;
     error?: React.ReactNode;
     description?: React.ReactNode;
+    useCurrentLanguageForMutation?: boolean;
 }
 
 function GoMultiFileInput<T extends NameType>(props: Props<T>) {
@@ -85,6 +86,7 @@ function GoMultiFileInput<T extends NameType>(props: Props<T>) {
         withoutPreview,
         error,
         description,
+        useCurrentLanguageForMutation = false,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -97,7 +99,7 @@ function GoMultiFileInput<T extends NameType>(props: Props<T>) {
         formData: true,
         url,
         method: 'POST',
-        useCurrentLanguageForMutation: true,
+        useCurrentLanguageForMutation,
         body: (body: { files: File[] }) => {
             const formData = new FormData();
 

app/src/components/domain/GoSingleFileInput/index.tsx

@@ -45,6 +45,7 @@ type Props<T extends NameType> = Omit<RawFileInputProps<T>, 'multiple' | 'value'
     description?: React.ReactNode;
     onSuccess?: () => void;
     withoutStatus?: boolean;
+    useCurrentLanguageForMutation?: boolean;
 }
 
 function GoSingleFileInput<T extends NameType>(props: Props<T>) {
@@ -72,6 +73,7 @@ function GoSingleFileInput<T extends NameType>(props: Props<T>) {
         requestBody,
         onSuccess,
         withoutStatus,
+        useCurrentLanguageForMutation = false,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -88,7 +90,7 @@ function GoSingleFileInput<T extends NameType>(props: Props<T>) {
         // FIXME: fix typing in server (low priority)
         // the server generated type for response and body is the same
         body: (body) => body as never,
-        useCurrentLanguageForMutation: true,
+        useCurrentLanguageForMutation,
         onSuccess: (response) => {
             const { id, file } = response;
             onChange(id, name);

app/src/components/domain/ImageWithCaptionInput/index.tsx

@@ -39,6 +39,7 @@ interface Props<N> {
     icons?: React.ReactNode;
     actions?: React.ReactNode;
     disabled?: boolean;
+    useCurrentLanguageForMutation?: boolean;
 }
 
 // FIXME: Move this to components
@@ -57,6 +58,7 @@ function ImageWithCaptionInput<const N extends string | number>(props: Props<N>)
         icons,
         actions,
         disabled,
+        useCurrentLanguageForMutation,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -111,6 +113,7 @@ function ImageWithCaptionInput<const N extends string | number>(props: Props<N>)
                     />
                 ) : undefined}
                 clearable
+                useCurrentLanguageForMutation={useCurrentLanguageForMutation}
             >
                 {label}
             </GoSingleFileInput>

app/src/components/domain/MultiImageWithCaptionInput/index.tsx

@@ -47,6 +47,7 @@ interface Props<N> {
     actions?: React.ReactNode;
     readOnly?: boolean;
     disabled?: boolean;
+    useCurrentLanguageForMutation?: boolean;
 }
 
 // FIXME: Move this to components
@@ -65,6 +66,7 @@ function MultiImageWithCaptionInput<const N extends string | number>(props: Prop
         actions,
         readOnly,
         disabled,
+        useCurrentLanguageForMutation = false,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -143,6 +145,7 @@ function MultiImageWithCaptionInput<const N extends string | number>(props: Prop
                 withoutPreview
                 readOnly={readOnly}
                 disabled={disabled}
+                useCurrentLanguageForMutation={useCurrentLanguageForMutation}
             >
                 {label}
             </GoMultiFileInput>

app/src/utils/restRequest/go.ts

@@ -192,6 +192,8 @@ export const processGoOptions: GoContextInterface['transformOptions'] = (
         } else {
             defaultHeaders['Accept-Language'] = 'en';
         }
+    } else {
+        defaultHeaders['Accept-Language'] = currentLanguage ?? 'en';
     }
 
     if (formData) {

app/src/views/DrefApplicationForm/Actions/index.tsx

@@ -410,6 +410,7 @@ function Actions(props: Props) {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 disabled={disabled}
                                 clearable
+                                useCurrentLanguageForMutation
                             >
                                 {strings.drefFormAssessmentReportUploadButtonLabel}
                             </GoSingleFileInput>

app/src/views/DrefApplicationForm/EventDetail/index.tsx

@@ -513,6 +513,7 @@ function EventDetail(props: Props) {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 error={getErrorObject(error?.images_file)}
                                 disabled={disabled || readOnly}
+                                useCurrentLanguageForMutation
                             />
                         </InputSection>
                     </>
@@ -601,6 +602,7 @@ function EventDetail(props: Props) {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 clearable
                                 disabled={disabled}
+                                useCurrentLanguageForMutation
                             >
                                 {strings.drefFormUploadSupportingDocumentButton}
                             </GoSingleFileInput>

app/src/views/DrefApplicationForm/Operation/index.tsx

@@ -390,6 +390,7 @@ function Operation(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             clearable
                             disabled={disabled}
+                            useCurrentLanguageForMutation
                         >
                             {strings.drefFormUploadTargetingDocumentButtonLabel}
                         </GoSingleFileInput>
@@ -725,6 +726,7 @@ function Operation(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             error={error?.budget_file}
                             disabled={disabled}
+                            useCurrentLanguageForMutation
                             clearable
                             description={(
                                 <Link
@@ -1068,6 +1070,7 @@ function Operation(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             clearable
                             disabled={disabled}
+                            useCurrentLanguageForMutation
                         >
                             {strings.drefFormUploadSupportingDocumentButtonLabel}
                         </GoSingleFileInput>

app/src/views/DrefApplicationForm/Overview/index.tsx

@@ -447,6 +447,7 @@ function Overview(props: Props) {
                                 setFileIdToUrlMap={setFileIdToUrlMap}
                                 clearable
                                 disabled={disabled}
+                                useCurrentLanguageForMutation
                             >
                                 {strings.drefFormOverviewUploadDocumentButtonLabel}
                             </GoSingleFileInput>
@@ -546,6 +547,7 @@ function Overview(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             label={strings.drefFormUploadAnImageLabel}
                             disabled={disabled}
+                            useCurrentLanguageForMutation
                         />
                     </InputSection>
                 )}
@@ -567,6 +569,7 @@ function Overview(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             label={strings.drefFormUploadAnImageLabel}
                             disabled={disabled}
+                            useCurrentLanguageForMutation
                         />
                     </InputSection>
                 )}

app/src/views/DrefFinalReportForm/EventDetail/index.tsx

@@ -261,6 +261,7 @@ function EventDetail(props: Props) {
                             error={getErrorObject(error?.images_file)}
                             readOnly={readOnly}
                             disabled={disabled}
+                            useCurrentLanguageForMutation
                         />
                     </InputSection>
                 )}