merge: dev -> rn-249 (#5895)

* tweak(centralServer): RN-1351: Handle bad DHIS2 sync requests (#5887) Throw an error and register bad requests on dhis sync queue * tweak(datatrakWeb): RN-1438: Upgrade React Query to V4 (#5868) * Bumping react-query * Update render.tsx * fixing Reports.test.tsx * navigation bug fix * removed logging * tweak(adminPanel): RN-1439: Upgrade React Query to V4 (#5875) * bumping to v4 * Update yarn.lock * tweak(psss): RN-1442: Upgrade React Query to V4 (#5874) * upgrade * Update yarn.lock * tweak(lesmis): RN-1441: Upgrade React Query to V4 (#5873) * upgrade * Update yarn.lock * tweak(tupaiaWeb): RN-1440: Upgrade React Query to V4 (#5870) * Bumping react-query * Bumping react-query to v4 * Update render.tsx * GitAction fix * fixing Reports.test.tsx * navigation bug fix * review update * removed logging * Update yarn.lock * Update yarn.lock * Update VerifyEmailPage.tsx * Update useReportPreview.js * fix(adminPanel): Miscellaneous Bug fixes (Tiny) (#5891) * bugfix * update * updates * tweak(tupaiaWeb): RN-1437: Download files visual restyle (#5889) * Common download files component * PR fix --------- Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com>
beyondessential · Sep 12, 2024 · ab1ec2a · ab1ec2a
1 parent f0d30e7
commit ab1ec2a
Show file tree

Hide file tree

Showing 157 changed files with 445 additions and 621 deletions.
diff --git a/packages/admin-panel/package.json b/packages/admin-panel/package.json
@@ -31,6 +31,8 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.47",
     "@material-ui/styles": "^4.9.10",
+    "@tanstack/react-query": "4.36.1",
+    "@tanstack/react-query-devtools": "4.36.1",
     "@tupaia/access-policy": "workspace:*",
     "@tupaia/types": "workspace:*",
     "@tupaia/ui-chart-components": "workspace:*",
@@ -64,7 +66,6 @@
     "react-hook-form": "^6.8.3",
     "react-icons": "^2.2.7",
     "react-password-strength-bar": "^0.3.2",
-    "react-query": "^3.19.0",
     "react-redux": "^5.0.6",
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",

diff --git a/packages/admin-panel/src/VizBuilderApp/api/mutations/useExportDashboardVisualisation.js b/packages/admin-panel/src/VizBuilderApp/api/mutations/useExportDashboardVisualisation.js
@@ -1,9 +1,9 @@
 /**
  * Tupaia
- * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { download } from '../api';
 
 export const useExportDashboardVisualisation = config =>

diff --git a/packages/admin-panel/src/VizBuilderApp/api/mutations/useExportMapOverlayVisualisation.js b/packages/admin-panel/src/VizBuilderApp/api/mutations/useExportMapOverlayVisualisation.js
@@ -1,9 +1,9 @@
 /**
  * Tupaia
- * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { download } from '../api';
 
 export const useExportMapOverlayVisualisation = config =>

diff --git a/packages/admin-panel/src/VizBuilderApp/api/mutations/useSaveDashboardVisualisation.js b/packages/admin-panel/src/VizBuilderApp/api/mutations/useSaveDashboardVisualisation.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- * Copyright (c) 2017 - 20211Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  *
  */
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { post, put } from '../api';
 
 export const useSaveDashboardVisualisation = config =>

diff --git a/packages/admin-panel/src/VizBuilderApp/api/mutations/useSaveMapOverlayVisualisation.js b/packages/admin-panel/src/VizBuilderApp/api/mutations/useSaveMapOverlayVisualisation.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- * Copyright (c) 2017 - 20211Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  *
  */
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { post, put } from '../api';
 
 export const useSaveMapOverlayVisualisation = config =>

diff --git a/packages/admin-panel/src/VizBuilderApp/api/mutations/useUploadTestData.js b/packages/admin-panel/src/VizBuilderApp/api/mutations/useUploadTestData.js
@@ -1,13 +1,13 @@
 /**
  * Tupaia
- * Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { upload } from '../api';
 
 // Must match the file name expected by the back-end
 const FILE_NAME = 'testData';
 
 export const useUploadTestData = () =>
-  useMutation('uploadTestData', file => upload('uploadTestData', {}, FILE_NAME, file));
+  useMutation(['uploadTestData'], file => upload('uploadTestData', {}, FILE_NAME, file));
diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useCountries.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useCountries.js
@@ -1,8 +1,8 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useDashboardVisualisation.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useDashboardVisualisation.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useEntities.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useEntities.js
@@ -1,8 +1,8 @@
 /**
  * Tupaia
- * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { stringifyQuery } from '@tupaia/utils';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useLocations.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useLocations.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 import { useEffect } from 'react';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import debounce from 'lodash.debounce';
 
 import { get } from '../api';

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useMapOverlayVisualisation.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useMapOverlayVisualisation.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useMapOverlays.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useMapOverlays.js
@@ -1,13 +1,13 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 
 export const useMapOverlays = () =>
-  useQuery('mapOverlays', () => get('mapOverlays'), {
+  useQuery(['mapOverlays'], () => get('mapOverlays'), {
     ...DEFAULT_REACT_QUERY_OPTIONS,
   });
diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useProject.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useProject.js
@@ -2,7 +2,7 @@
  * Tupaia
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 
 import { stringifyQuery } from '@tupaia/utils';
 

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useProjects.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useProjects.js
@@ -1,8 +1,8 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 
 import { stringifyQuery } from '@tupaia/utils';
 
@@ -11,7 +11,7 @@ import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 
 export const useProjects = columns =>
   useQuery(
-    'projects',
+    ['projects'],
     async () => {
       const defaultColumns = ['project.code', 'entity.name'];
       const endpoint = stringifyQuery(undefined, 'projects', {

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useReportPreview.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useReportPreview.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
  */
 import moment from 'moment';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { post } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useSearchPermissionGroups.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useSearchPermissionGroups.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 import { stringifyQuery } from '@tupaia/utils';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 

diff --git a/packages/admin-panel/src/VizBuilderApp/api/queries/useSearchTransformSchemas.js b/packages/admin-panel/src/VizBuilderApp/api/queries/useSearchTransformSchemas.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 import { stringifyQuery } from '@tupaia/utils';
-import { useQuery, QueryClient } from 'react-query';
+import { useQuery, QueryClient } from '@tanstack/react-query';
 import { get } from '../api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../constants';
 

diff --git a/packages/admin-panel/src/api/mutations/useEditSurveyResponse.js b/packages/admin-panel/src/api/mutations/useEditSurveyResponse.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useApiContext } from '../../utilities/ApiProvider';
 
 export const useEditSurveyResponse = (surveyResponseId, updatedSurveyResponse) => {

diff --git a/packages/admin-panel/src/api/mutations/useLogin.js b/packages/admin-panel/src/api/mutations/useLogin.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { post } from '../../VizBuilderApp/api';
 

diff --git a/packages/admin-panel/src/api/mutations/useLogout.js b/packages/admin-panel/src/api/mutations/useLogout.js
@@ -3,13 +3,13 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { post } from '../../VizBuilderApp/api';
 
 export const useLogout = onSuccess => {
   const queryClient = useQueryClient();
 
-  return useMutation('logout', () => post('logout'), {
+  return useMutation(['logout'], () => post('logout'), {
     onSuccess: () => {
       queryClient.invalidateQueries();
       if (onSuccess) onSuccess();

diff --git a/packages/admin-panel/src/api/mutations/useOneTimeLogin.js b/packages/admin-panel/src/api/mutations/useOneTimeLogin.js
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { post } from '../../VizBuilderApp/api';
 
 export const useOneTimeLogin = () => {

diff --git a/packages/admin-panel/src/api/mutations/useRequestResetPassword.js b/packages/admin-panel/src/api/mutations/useRequestResetPassword.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { post } from '../../VizBuilderApp/api';
 
 export const useRequestResetPassword = () => {

diff --git a/packages/admin-panel/src/api/mutations/useResetPassword.js b/packages/admin-panel/src/api/mutations/useResetPassword.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import { post } from '../../VizBuilderApp/api';
 import { PASSWORD_RESET_TOKEN_PARAM } from '../../authentication';

diff --git a/packages/admin-panel/src/api/mutations/useUpdateProfile.js b/packages/admin-panel/src/api/mutations/useUpdateProfile.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { put } from '../../VizBuilderApp/api';
 
 export const useUpdateProfile = () => {

diff --git a/packages/admin-panel/src/api/queries/useResourceDetails.js b/packages/admin-panel/src/api/queries/useResourceDetails.js
@@ -1,8 +1,8 @@
 /**
  * Tupaia
- * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../../VizBuilderApp/api/api';
 
 export const useItemDetails = (params, parent) => {

diff --git a/packages/admin-panel/src/api/queries/useSurveyResponses.js b/packages/admin-panel/src/api/queries/useSurveyResponses.js
@@ -1,8 +1,8 @@
 /**
  * Tupaia
- * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ * Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../../VizBuilderApp/api/api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../../VizBuilderApp/api/constants';
 

diff --git a/packages/admin-panel/src/api/queries/useUser.js b/packages/admin-panel/src/api/queries/useUser.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../../VizBuilderApp/api';
 
 export const useUser = () => {

diff --git a/packages/admin-panel/src/dataTables/query/useDataTablePreview.js b/packages/admin-panel/src/dataTables/query/useDataTablePreview.js
@@ -1,8 +1,8 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { post } from '../../VizBuilderApp/api/api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../../VizBuilderApp/api/constants';
 

diff --git a/packages/admin-panel/src/dataTables/query/useExternalDatabaseConnections.js b/packages/admin-panel/src/dataTables/query/useExternalDatabaseConnections.js
@@ -1,8 +1,8 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../../VizBuilderApp/api/api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../../VizBuilderApp/api/constants';
 

diff --git a/packages/admin-panel/src/dataTables/query/useFetchDataTableBuiltInParams.js b/packages/admin-panel/src/dataTables/query/useFetchDataTableBuiltInParams.js
@@ -1,8 +1,8 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../../VizBuilderApp/api/api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../../VizBuilderApp/api/constants';
 

diff --git a/packages/admin-panel/src/main.jsx b/packages/admin-panel/src/main.jsx
@@ -1,9 +1,9 @@
 /*
  * Tupaia
- *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
+ *  Copyright (c) 2017 - 2024 Beyond Essential Systems Pty Ltd
  */
 import React, { lazy, Suspense } from 'react';
-import { QueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
 import { render as renderReactApp } from 'react-dom';
 import styled, { ThemeProvider } from 'styled-components';

diff --git a/packages/admin-panel/src/pages/resources/PermissionGroupsViewerPage.jsx b/packages/admin-panel/src/pages/resources/PermissionGroupsViewerPage.jsx
@@ -5,7 +5,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { HorizontalTree } from '@tupaia/ui-components';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { PageHeader, PageBody } from '../../widgets';
 import { LogsModal } from '../../logsTable';
 import { get } from '../../VizBuilderApp/api';

diff --git a/packages/admin-panel/src/surveyResponse/useGetExistingData.js b/packages/admin-panel/src/surveyResponse/useGetExistingData.js
@@ -4,7 +4,7 @@
  * Tupaia
  * Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../VizBuilderApp/api/api';
 import { DEFAULT_REACT_QUERY_OPTIONS } from '../VizBuilderApp/api/constants';
 

diff --git a/packages/admin-panel/src/surveys/useSuggestSurveyCode.js b/packages/admin-panel/src/surveys/useSuggestSurveyCode.js
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2023 Beyond Essential Systems Pty Ltd
  */
 
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 
 /**
  * @param {TupaiaApi} api