tweak(lesmis): RN-1441: Upgrade React Query to V4 (#5873)

* upgrade * Update yarn.lock
beyondessential · Sep 10, 2024 · 7834a55 · 7834a55
1 parent 72329be
commit 7834a55
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 22 deletions.
diff --git a/packages/lesmis/package.json b/packages/lesmis/package.json
@@ -28,6 +28,8 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@material-ui/styles": "^4.9.10",
+    "@tanstack/react-query": "4.36.1",
+    "@tanstack/react-query-devtools": "4.36.1",
     "@tupaia/access-policy": "workspace:*",
     "@tupaia/admin-panel": "workspace:*",
     "@tupaia/ui-chart-components": "workspace:*",
@@ -49,7 +51,6 @@
     "react-hook-form": "^6.15.1",
     "react-leaflet": "^3.2.1",
     "react-password-strength-bar": "^0.3.3",
-    "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/lesmis/src/AppProviders.jsx b/packages/lesmis/src/AppProviders.jsx
@@ -4,7 +4,7 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { QueryClient, QueryClientProvider } from 'react-query';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { MuiThemeProvider, StylesProvider } from '@material-ui/core/styles';
 import { ThemeProvider } from 'styled-components';
 import CssBaseline from '@material-ui/core/CssBaseline';

diff --git a/packages/lesmis/src/api/mutations/useLogin.js b/packages/lesmis/src/api/mutations/useLogin.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 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 '../api';
 import { useUser } from '../queries';

diff --git a/packages/lesmis/src/api/mutations/useLogout.js b/packages/lesmis/src/api/mutations/useLogout.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { post } from '../api';
 import { useHomeUrl } from '../../utils/useHomeUrl';
 

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

diff --git a/packages/lesmis/src/api/mutations/useUpdateFavouriteDashboardItem.js b/packages/lesmis/src/api/mutations/useUpdateFavouriteDashboardItem.js
@@ -2,7 +2,7 @@
  * Tupaia
  *  Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd
  */
-import { useMutation, useQueryClient } from 'react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { post } from '../api';
 
 const updateExistingDashboardData = async (queryClient, { entityCode }) => {

diff --git a/packages/lesmis/src/api/queries/useDashboardData.js b/packages/lesmis/src/api/queries/useDashboardData.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { QUERY_OPTIONS } from './constants';
 

diff --git a/packages/lesmis/src/api/queries/useDashboardReportData.js b/packages/lesmis/src/api/queries/useDashboardReportData.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { useDashboardData } from './useDashboardData';
 import { combineQueries } from './utils';

diff --git a/packages/lesmis/src/api/queries/useEmailVerification.js b/packages/lesmis/src/api/queries/useEmailVerification.js
@@ -2,7 +2,7 @@
  * Tupaia
  *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { useUrlSearchParams } from '../../utils/useUrlSearchParams';
 import { get } from '../api';
 

diff --git a/packages/lesmis/src/api/queries/useEntitiesData.js b/packages/lesmis/src/api/queries/useEntitiesData.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import keyBy from 'lodash.keyby';
 import { get } from '../api';
 import { PROJECT_CODE } from '../../constants';

diff --git a/packages/lesmis/src/api/queries/useEntityData.js b/packages/lesmis/src/api/queries/useEntityData.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { get } from '../api';
 import { useValidatedQuery } from './useValidatedQuery';
 

diff --git a/packages/lesmis/src/api/queries/useMapOverlayReportData.js b/packages/lesmis/src/api/queries/useMapOverlayReportData.js
@@ -5,7 +5,7 @@
  */
 
 import { useState, useEffect, useCallback } from 'react';
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import camelCase from 'camelcase';
 import {
   autoAssignColors,

diff --git a/packages/lesmis/src/api/queries/useMapOverlaysData.js b/packages/lesmis/src/api/queries/useMapOverlaysData.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import camelCase from 'camelcase';
 import { get } from '../api';
 import { useEntitiesData } from './useEntitiesData';

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

diff --git a/packages/lesmis/src/api/queries/useVitalsData.js b/packages/lesmis/src/api/queries/useVitalsData.js
@@ -3,7 +3,7 @@
  * Copyright (c) 2017 - 2020 Beyond Essential Systems Pty Ltd
  *
  */
-import { useQuery } from 'react-query';
+import { useQuery } from '@tanstack/react-query';
 import { utcMoment } from '@tupaia/utils';
 import { post } from '../api';
 import { useProjectEntitiesData } from './useEntitiesData';

diff --git a/packages/lesmis/src/components/DashboardExportModal/DashboardExportModal.jsx b/packages/lesmis/src/components/DashboardExportModal/DashboardExportModal.jsx
@@ -3,7 +3,7 @@
  *  Copyright (c) 2017 - 2022 Beyond Essential Systems Pty Ltd
  */
 import React, { useState } from 'react';
-import { useIsFetching } from 'react-query';
+import { useIsFetching } from '@tanstack/react-query';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import DownloadIcon from '@material-ui/icons/GetApp';

diff --git a/packages/lesmis/src/components/LocaleMenu.jsx b/packages/lesmis/src/components/LocaleMenu.jsx
@@ -4,7 +4,7 @@
  *
  */
 import React, { useState } from 'react';
-import { useQueryClient } from 'react-query';
+import { useQueryClient } from '@tanstack/react-query';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import { generatePath, useNavigate, useLocation } from 'react-router-dom';

diff --git a/packages/lesmis/src/main.jsx b/packages/lesmis/src/main.jsx
@@ -4,7 +4,7 @@
  */
 import React from 'react';
 import { render as renderReactApp } from 'react-dom';
-import { ReactQueryDevtools } from 'react-query/devtools';
+import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { EnvBanner } from '@tupaia/ui-components';
 import { App } from './App';
 import { AppProviders } from './AppProviders';
@@ -21,4 +21,3 @@ const render = () => {
 };
 
 render(App);
-
diff --git a/packages/lesmis/src/views/AdminPanel/api/useUpdateSurveyResponseStatus.js b/packages/lesmis/src/views/AdminPanel/api/useUpdateSurveyResponseStatus.js
@@ -2,7 +2,7 @@
  * Tupaia
  *  Copyright (c) 2017 - 2021 Beyond Essential Systems Pty Ltd
  */
-import { useMutation } from 'react-query';
+import { useMutation } from '@tanstack/react-query';
 
 export const useApproveSurveyResponseStatus = api =>
   useMutation(id => api.post(`surveyResponse/${id}/resubmit`, {}, { approval_status: 'approved' }));

diff --git a/packages/lesmis/src/views/DashboardView.jsx b/packages/lesmis/src/views/DashboardView.jsx
@@ -6,7 +6,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { useIsFetching } from 'react-query';
+import { useIsFetching } from '@tanstack/react-query';
 import { Select } from '@tupaia/ui-components';
 import MuiBox from '@material-ui/core/Box';
 import { VitalsView } from './VitalsView';

diff --git a/yarn.lock b/yarn.lock