Merge branch 'develop' into rest-api-improvements

unicef · Feb 21, 2025 · 6e9ab1b · 6e9ab1b
2 parents 7b04a54 + f5cf549
commit 6e9ab1b
Show file tree

Hide file tree

Showing 250 changed files with 4,000 additions and 4,024 deletions.
diff --git a/src/frontend/src/apollo/client.ts b/src/frontend/src/apollo/client.ts
@@ -139,7 +139,10 @@ const link = ApolloLink.from([
   validationErrorMiddleware,
   errorLink,
   redirectLink,
-  createUploadLink({ uri: GRAPHQL_URL }),
+  //adding this to mock in jest tests
+  typeof createUploadLink === 'function'
+    ? createUploadLink({ uri: GRAPHQL_URL })
+    : () => void 0,
 ]);
 let client;
 

diff --git a/src/frontend/src/components/accountability/Communication/CommunicationDetails.tsx b/src/frontend/src/components/accountability/Communication/CommunicationDetails.tsx
@@ -1,4 +1,4 @@
-import {  Grid2 as Grid, Typography } from '@mui/material';
+import { Grid2 as Grid, Typography } from '@mui/material';
 import { useTranslation } from 'react-i18next';
 import { AccountabilityCommunicationMessageQuery } from '@generated/graphql';
 import { useBaseUrl } from '@hooks/useBaseUrl';
@@ -10,12 +10,13 @@ import { OverviewContainer } from '@core/OverviewContainer';
 import { Title } from '@core/Title';
 import { UniversalMoment } from '@core/UniversalMoment';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface CommunicationDetailsProps {
   message: AccountabilityCommunicationMessageQuery['accountabilityCommunicationMessage'];
 }
 
-export function CommunicationDetails({
+function CommunicationDetails({
   message,
 }: CommunicationDetailsProps): ReactElement {
   const { t } = useTranslation();
@@ -69,3 +70,5 @@ export function CommunicationDetails({
     </ContainerColumnWithBorder>
   );
 }
+
+export default withErrorBoundary(CommunicationDetails, 'CommunicationDetails');
diff --git a/src/frontend/src/components/accountability/Communication/CommunicationMessageDetails.tsx b/src/frontend/src/components/accountability/Communication/CommunicationMessageDetails.tsx
@@ -7,6 +7,7 @@ import { OverviewContainer } from '@core/OverviewContainer';
 import { Title } from '@core/Title';
 import { UniversalMoment } from '@core/UniversalMoment';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 const StyledBox = styled(Paper)`
   display: flex;
@@ -19,12 +20,12 @@ interface CommunicationMessageDetailsProps {
   message: AccountabilityCommunicationMessageQuery['accountabilityCommunicationMessage'];
 }
 
-export const CommunicationMessageDetails = ({
+const CommunicationMessageDetails = ({
   message,
 }: CommunicationMessageDetailsProps): ReactElement => {
   const { t } = useTranslation();
   return (
-    <Grid size={{ xs:8 }} data-cy="communication-message-details">
+    <Grid size={{ xs: 8 }} data-cy="communication-message-details">
       <Box p={5}>
         <StyledBox>
           <Title>
@@ -57,3 +58,8 @@ export const CommunicationMessageDetails = ({
     </Grid>
   );
 };
+
+export default withErrorBoundary(
+  CommunicationMessageDetails,
+  'CommunicationMessageDetails',
+);
diff --git a/.../accountability/Communication/LookUpsCommunication/LookUpSelectionTablesCommunication.tsx b/.../accountability/Communication/LookUpsCommunication/LookUpSelectionTablesCommunication.tsx
@@ -1,11 +1,11 @@
 import { HouseholdChoiceDataQuery } from '@generated/graphql';
 import { hasPermissions, PERMISSIONS } from '../../../../config/permissions';
-import { LookUpHouseholdTableCommunication } from '@containers/tables/Communication/LookUpHouseholdTableCommunication/LookUpHouseholdTableCommunication';
-import { LookUpRegistrationDataImportTableCommunication } from '@containers/tables/Communication/LookUpRegistrationDataImportTableCommunication';
-import { LookUpTargetPopulationTableCommunication } from '@containers/tables/Communication/LookUpTargetPopulationTableCommunication';
+import LookUpHouseholdTableCommunication from '@containers/tables/Communication/LookUpHouseholdTableCommunication/LookUpHouseholdTableCommunication';
 import { usePermissions } from '@hooks/usePermissions';
 import { CommunicationTabsValues } from '@utils/constants';
 import { ReactElement } from 'react';
+import LookUpTargetPopulationTableCommunication from '@containers/tables/Communication/LookUpTargetPopulationTableCommunication/LookUpTargetPopulationTableCommunication';
+import LookUpRegistrationDataImportTableCommunication from '@containers/tables/Communication/LookUpRegistrationDataImportTableCommunication/LookUpRegistrationDataImportTableCommunication';
 
 interface LookUpSelectionTablesCommunicationProps {
   selectedTab: number;

diff --git a/src/frontend/src/components/accountability/Feedback/FeedbackDetails/FeedbackDetails.tsx b/src/frontend/src/components/accountability/Feedback/FeedbackDetails/FeedbackDetails.tsx
@@ -11,14 +11,15 @@ import { UniversalMoment } from '@core/UniversalMoment';
 import { useBaseUrl } from '@hooks/useBaseUrl';
 import { useProgramContext } from 'src/programContext';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface FeedbackDetailsProps {
   feedback: FeedbackQuery['feedback'];
   canViewHouseholdDetails: boolean;
   canViewIndividualDetails: boolean;
 }
 
-export function FeedbackDetails({
+function FeedbackDetails({
   feedback,
   canViewHouseholdDetails,
   canViewIndividualDetails,
@@ -169,3 +170,5 @@ export function FeedbackDetails({
     </Grid>
   );
 }
+
+export default withErrorBoundary(FeedbackDetails, 'FeedbackDetails');
diff --git a/src/frontend/src/components/accountability/Feedback/FeedbackDetails/index.ts b/src/frontend/src/components/accountability/Feedback/FeedbackDetails/index.ts
diff --git a/src/frontend/src/components/accountability/Feedback/FeedbackDetailsToolbar.tsx b/src/frontend/src/components/accountability/Feedback/FeedbackDetailsToolbar.tsx
@@ -10,13 +10,14 @@ import { ButtonTooltip } from '@core/ButtonTooltip';
 import { useProgramContext } from '../../../programContext';
 import { AdminButton } from '@core/AdminButton';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface FeedbackDetailsToolbarProps {
   feedback: FeedbackQuery['feedback'];
   canEdit: boolean;
 }
 
-export function FeedbackDetailsToolbar({
+function FeedbackDetailsToolbar({
   feedback,
   canEdit,
 }: FeedbackDetailsToolbarProps): ReactElement {
@@ -90,3 +91,8 @@ export function FeedbackDetailsToolbar({
     </PageHeader>
   );
 }
+
+export default withErrorBoundary(
+  FeedbackDetailsToolbar,
+  'FeedbackDetailsToolbar',
+);
diff --git a/src/frontend/src/components/accountability/Feedback/FeedbackTable/FeedbackFilters.tsx b/src/frontend/src/components/accountability/Feedback/FeedbackTable/FeedbackFilters.tsx
@@ -12,6 +12,7 @@ import { SearchTextField } from '@core/SearchTextField';
 import { SelectFilter } from '@core/SelectFilter';
 import { ProgramAutocomplete } from '@shared/autocompletes/ProgramAutocomplete';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface FeedbackFiltersProps {
   setFilter: (filter) => void;
@@ -20,7 +21,7 @@ interface FeedbackFiltersProps {
   setAppliedFilter: (filter) => void;
   filter;
 }
-export const FeedbackFilters = ({
+const FeedbackFilters = ({
   setFilter,
   initialFilter,
   appliedFilter,
@@ -108,7 +109,7 @@ export const FeedbackFilters = ({
             additionalVariables={{ isFeedbackCreator: true }}
           />
         </Grid>
-        {!isAllPrograms && <Grid size={{ xs:3 }} />}
+        {!isAllPrograms && <Grid size={{ xs: 3 }} />}
         <Grid size={{ xs: 3 }}>
           <DatePickerFilter
             topLabel={t('Creation Date')}
@@ -147,3 +148,5 @@ export const FeedbackFilters = ({
     </FiltersSection>
   );
 };
+
+export default withErrorBoundary(FeedbackFilters, 'FeedbackFilters');
diff --git a/.../src/components/accountability/Feedback/HouseholdQuestionnaire/HouseholdQuestionnaire.tsx b/.../src/components/accountability/Feedback/HouseholdQuestionnaire/HouseholdQuestionnaire.tsx
@@ -6,12 +6,13 @@ import { ContentLink } from '@core/ContentLink';
 import { useBaseUrl } from '@hooks/useBaseUrl';
 import { useProgramContext } from 'src/programContext';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface HouseholdQuestionnaireProps {
   values;
 }
 
-export function HouseholdQuestionnaire({
+function HouseholdQuestionnaire({
   values,
 }: HouseholdQuestionnaireProps): ReactElement {
   const { baseUrl } = useBaseUrl();
@@ -122,3 +123,8 @@ export function HouseholdQuestionnaire({
     </Grid>
   );
 }
+
+export default withErrorBoundary(
+  HouseholdQuestionnaire,
+  'HouseholdQuestionnaire',
+);
diff --git a/src/frontend/src/components/accountability/Feedback/HouseholdQuestionnaire/index.ts b/src/frontend/src/components/accountability/Feedback/HouseholdQuestionnaire/index.ts
diff --git a/...c/components/accountability/Feedback/IndividualQuestionnnaire/IndividualQuestionnaire.tsx b/...c/components/accountability/Feedback/IndividualQuestionnnaire/IndividualQuestionnaire.tsx
@@ -6,12 +6,13 @@ import { FormikCheckboxField } from '@shared/Formik/FormikCheckboxField';
 import { ContentLink } from '@core/ContentLink';
 import { useProgramContext } from 'src/programContext';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface IndividualQuestionnaireProps {
   values;
 }
 
-export const IndividualQuestionnaire = ({
+const IndividualQuestionnaire = ({
   values,
 }: IndividualQuestionnaireProps): ReactElement => {
   const { t } = useTranslation();
@@ -70,3 +71,8 @@ export const IndividualQuestionnaire = ({
     </Grid>
   );
 };
+
+export default withErrorBoundary(
+  IndividualQuestionnaire,
+  'IndividualQuestionnaire',
+);
diff --git a/src/frontend/src/components/accountability/Feedback/IndividualQuestionnnaire/index.ts b/src/frontend/src/components/accountability/Feedback/IndividualQuestionnnaire/index.ts
diff --git a/src/frontend/src/components/accountability/Feedback/LinkedGrievance/LinkedGrievance.tsx b/src/frontend/src/components/accountability/Feedback/LinkedGrievance/LinkedGrievance.tsx
@@ -9,14 +9,13 @@ import { Title } from '@core/Title';
 import { getGrievanceDetailsPath } from '../../../grievances/utils/createGrievanceUtils';
 import { useBaseUrl } from '@hooks/useBaseUrl';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface LinkedGrievanceProps {
   feedback: FeedbackQuery['feedback'];
 }
 
-export function LinkedGrievance({
-  feedback,
-}: LinkedGrievanceProps): ReactElement {
+function LinkedGrievance({ feedback }: LinkedGrievanceProps): ReactElement {
   const { t } = useTranslation();
   const { baseUrl } = useBaseUrl();
   const grievanceDetailsPath = getGrievanceDetailsPath(
@@ -45,3 +44,4 @@ export function LinkedGrievance({
     </Grid>
   );
 }
+export default withErrorBoundary(LinkedGrievance, 'LinkedGrievance');
diff --git a/src/frontend/src/components/accountability/Feedback/LinkedGrievance/index.ts b/src/frontend/src/components/accountability/Feedback/LinkedGrievance/index.ts
diff --git a/src/frontend/src/components/accountability/Feedback/Messages/Messages.tsx b/src/frontend/src/components/accountability/Feedback/Messages/Messages.tsx
@@ -17,6 +17,7 @@ import { OverviewContainerColumn } from '@core/OverviewContainerColumn';
 import { Title } from '@core/Title';
 import { UniversalMoment } from '@core/UniversalMoment';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 const Name = styled.span`
   font-size: 16px;
@@ -40,10 +41,7 @@ interface MessagesProps {
   canAddMessage: boolean;
 }
 
-export function Messages({
-  messages,
-  canAddMessage,
-}: MessagesProps): ReactElement {
+function Messages({ messages, canAddMessage }: MessagesProps): ReactElement {
   const { t } = useTranslation();
   const { data: meData, loading: meLoading } = useMeQuery({
     fetchPolicy: 'cache-and-network',
@@ -63,10 +61,10 @@ export function Messages({
     noteId: string,
   ): ReactElement => (
     <Grid container key={noteId}>
-      <Grid size={{ xs:2 }}>
+      <Grid size={{ xs: 2 }}>
         <Avatar alt={`${name} picture`} src="/static/images/avatar/1.jpg" />
       </Grid>
-      <Grid size={{ xs:10 }}>
+      <Grid size={{ xs: 10 }}>
         <Grid size={{ xs: 12 }}>
           <Box display="flex" justifyContent="space-between">
             <Name>{name}</Name>
@@ -104,7 +102,7 @@ export function Messages({
   const myName = `${meData.me.firstName || meData.me.email}`;
 
   return (
-    <Grid size={{ xs:8 }}>
+    <Grid size={{ xs: 8 }}>
       <Box p={3}>
         <Formik
           initialValues={initialValues}
@@ -130,10 +128,10 @@ export function Messages({
                 {mappedMessages}
                 {canAddMessage && (
                   <Grid container>
-                    <Grid size={{ xs:2 }}>
+                    <Grid size={{ xs: 2 }}>
                       <Avatar src={myName} alt={myName} />
                     </Grid>
-                    <Grid size={{ xs:10 }}>
+                    <Grid size={{ xs: 10 }}>
                       <Grid size={{ xs: 12 }}>
                         <Box display="flex" justifyContent="space-between">
                           <Name>{renderUserName(meData.me)}</Name>
@@ -178,3 +176,5 @@ export function Messages({
     </Grid>
   );
 }
+
+export default withErrorBoundary(Messages, 'Messages');
diff --git a/src/frontend/src/components/accountability/Feedback/Messages/index.ts b/src/frontend/src/components/accountability/Feedback/Messages/index.ts
diff --git a/...d/src/components/accountability/Surveys/LookUpsSurveys/LookUpProgrammesFiltersSurveys.tsx b/...d/src/components/accountability/Surveys/LookUpsSurveys/LookUpProgrammesFiltersSurveys.tsx
@@ -11,6 +11,7 @@ import { SearchTextField } from '@core/SearchTextField';
 import { SelectFilter } from '@core/SelectFilter';
 import { useProgramContext } from 'src/programContext';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface LookUpProgrammesFiltersSurveysProps {
   filter;
@@ -20,7 +21,7 @@ interface LookUpProgrammesFiltersSurveysProps {
   appliedFilter;
   setAppliedFilter: (filter) => void;
 }
-export function LookUpProgrammesFiltersSurveys({
+function LookUpProgrammesFiltersSurveys({
   filter,
   choicesData,
   setFilter,
@@ -181,3 +182,8 @@ export function LookUpProgrammesFiltersSurveys({
     </FiltersSection>
   );
 }
+
+export default withErrorBoundary(
+  LookUpProgrammesFiltersSurveys,
+  'LookUpProgrammesFiltersSurveys',
+);
diff --git a/src/frontend/src/components/accountability/Surveys/LookUpsSurveys/LookUpSelectionSurveys.tsx b/src/frontend/src/components/accountability/Surveys/LookUpsSurveys/LookUpSelectionSurveys.tsx
@@ -6,9 +6,10 @@ import styled from 'styled-components';
 import { useProgrammeChoiceDataQuery } from '@generated/graphql';
 import { SurveyTabsValues } from '@utils/constants';
 import { getFilterFromQueryParams } from '@utils/utils';
-import { LookUpProgrammesFiltersSurveys } from './LookUpProgrammesFiltersSurveys';
-import { LookUpSelectionTablesSurveys } from './LookUpSelectionTablesSurveys';
-import { LookUpTargetPopulationFiltersSurveys } from './LookUpTargetPopulationFiltersSurveys';
+import LookUpProgrammesFiltersSurveys from './LookUpProgrammesFiltersSurveys';
+import LookUpSelectionTablesSurveys from './LookUpSelectionTablesSurveys';
+import LookUpTargetPopulationFiltersSurveys from './LookUpTargetPopulationFiltersSurveys';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 const surveysTabs = ['Programme', 'Target Population'];
 
@@ -157,3 +158,8 @@ export function LookUpSelectionSurveys({
     </Box>
   );
 }
+
+export default withErrorBoundary(
+  LookUpSelectionSurveys,
+  'LookUpSelectionSurveys',
+);
diff --git a/...end/src/components/accountability/Surveys/LookUpsSurveys/LookUpSelectionTablesSurveys.tsx b/...end/src/components/accountability/Surveys/LookUpsSurveys/LookUpSelectionTablesSurveys.tsx
@@ -5,6 +5,7 @@ import { LookUpTargetPopulationTableSurveys } from '@containers/tables/Surveys/L
 import { usePermissions } from '@hooks/usePermissions';
 import { SurveyTabsValues } from '@utils/constants';
 import { ReactElement } from 'react';
+import withErrorBoundary from '@components/core/withErrorBoundary';
 
 interface LookUpSelectionTablesSurveysProps {
   selectedTab: number;
@@ -16,7 +17,7 @@ interface LookUpSelectionTablesSurveysProps {
   onValueChange;
   handleChange;
 }
-export function LookUpSelectionTablesSurveys({
+function LookUpSelectionTablesSurveys({
   selectedTab,
   choicesData,
   values,
@@ -61,3 +62,8 @@ export function LookUpSelectionTablesSurveys({
     </>
   );
 }
+
+export default withErrorBoundary(
+  LookUpSelectionTablesSurveys,
+  'LookUpSelectionTablesSurveys',
+);