POC - LF- 5100 isLoading and isFetching is not farm independent

packages/webapp/package.json

@@ -43,7 +43,7 @@
     "@mui/x-date-pickers": "^8.0.0",
     "@react-oauth/google": "^0.7.0",
     "@reactour/tour": "^3.1.6",
-    "@reduxjs/toolkit": "^1.9.1",
+    "@reduxjs/toolkit": "1.9.7",
     "@sentry/react": "^6.19.7",
     "@sentry/tracing": "^6.19.7",
     "@turf/boolean-point-in-polygon": "7.2.0",

packages/webapp/src/containers/AddFarm/saga.js

@@ -29,8 +29,6 @@ import { axios, getHeader } from '../saga';
 import { createAction } from '@reduxjs/toolkit';
 import i18n from '../../locales/i18n';
 import { enqueueErrorSnackbar } from '../Snackbar/snackbarSlice';
-import { invalidateTags } from '../../store/api/apiSlice';
-import { FarmLibraryTags, FarmTags } from '../../store/api/apiTags';
 
 const patchRoleUrl = (farm_id, user_id) => `${userFarmUrl}/role/farm/${farm_id}/user/${user_id}`;
 const patchFarmUrl = (farm_id) => `${farmUrl}/owner_operated/${farm_id}`;
@@ -61,9 +59,6 @@ export function* postFarmSaga({ payload: { showFarmNameCharacterLimitExceededErr
     };
     yield call(axios.patch, patchStepUrl(farm_id, user_id), step, getHeader(user_id, farm_id));
 
-    // Clear old farm RTK Query data
-    yield put(invalidateTags([...FarmTags, ...FarmLibraryTags]));
-
     const user = getUserResult?.data;
     yield put(
       postFarmSuccess({

packages/webapp/src/containers/AddSensors/Partners.tsx

@@ -22,9 +22,9 @@ const Partners = ({
 }: {
   setIsEditing: React.Dispatch<React.SetStateAction<boolean>>;
 }) => {
-  const { data: esciData = [], isLoading: esciLoading } = useGetFarmAddonQuery(
-    `?addon_partner_id=${PARTNERS.ESCI.id}`,
-  );
+  const { data: esciData = [], isLoading: esciLoading } = useGetFarmAddonQuery({
+    params: `?addon_partner_id=${PARTNERS.ESCI.id}`,
+  });
 
   const hasActiveConnection = {
     esci: esciData.length > 0,

packages/webapp/src/containers/AddSensors/index.tsx

@@ -45,7 +45,11 @@ const AddSensor = ({ isCompactSideMenu }: AddSensorProps) => {
     const result = await addFarmAddon(values[PARTNER]);
 
     if ('error' in result) {
-      const isInvalidId = 'data' in result.error && result.error.data === 'Organisation not found';
+      const isInvalidId =
+        result.error &&
+        typeof result.error === 'object' &&
+        'data' in result.error &&
+        result.error.data === 'Organisation not found';
       const errorMessage = isInvalidId
         ? t('SENSOR.ESCI.ORGANISATION_ID_ERROR')
         : t('SENSOR.ESCI.ORGANISATION_ID_GENERIC_ERROR');

packages/webapp/src/containers/Profile/FarmSettings/Addons/index.tsx

@@ -28,9 +28,9 @@ const FarmAddons = () => {
   const history = useHistory();
   const routerTabs = useFarmSettingsRouterTabs();
 
-  const { data: esciDataArray = [] } = useGetFarmAddonQuery(
-    `?addon_partner_id=${PARTNERS.ESCI.id}`,
-  );
+  const { data: esciDataArray = [] } = useGetFarmAddonQuery({
+    params: `?addon_partner_id=${PARTNERS.ESCI.id}`,
+  });
 
   const hasActiveConnection = {
     esci: esciDataArray.length > 0,

packages/webapp/src/containers/Profile/FarmSettings/FarmSettingsContext.tsx

@@ -24,9 +24,9 @@ type FarmSettingsContextType = {
 const FarmSettingsContext = createContext<FarmSettingsContextType | undefined>(undefined);
 
 export const FarmSettingsProvider = ({ children }: { children: ReactNode }) => {
-  const { data: esciDataArray = [] } = useGetFarmAddonQuery(
-    `?addon_partner_id=${PARTNERS.ESCI.id}`,
-  );
+  const { data: esciDataArray = [] } = useGetFarmAddonQuery({
+    params: `?addon_partner_id=${PARTNERS.ESCI.id}`,
+  });
 
   const hasActiveConnection = esciDataArray.length > 0;
 

packages/webapp/src/containers/Profile/FarmSettings/MarketDirectory/Consent/index.tsx

@@ -55,8 +55,9 @@ const MarketDirectoryConsent = ({
 
   const savedConsent = marketDirectoryInfo?.[CONSENTED_TO_SHARE] || false;
 
-  const { data: marketDirectoryPartners = [] } =
-    useGetMarketDirectoryPartnersQuery('?filter=country');
+  const { data: marketDirectoryPartners = [] } = useGetMarketDirectoryPartnersQuery({
+    params: '?filter=country',
+  });
   const [updateMarketDirectoryInfo, { isLoading }] = useUpdateMarketDirectoryInfoMutation();
 
   const [isConsentReadonly, setIsConsentReadonly] = useState(savedConsent === true);

packages/webapp/src/containers/SensorReadings/v2/Charts/useFormattedSensorReadings.ts

@@ -93,10 +93,12 @@ function useFormattedSensorReadings({
     data: sensorReadings,
   } = useGetSensorReadingsQuery(
     {
-      esids: sensorIds.join(','),
-      startTime: startDate,
-      endTime: getAdjustedEndTime(endDate),
-      truncPeriod,
+      params: {
+        esids: sensorIds.join(','),
+        startTime: startDate,
+        endTime: getAdjustedEndTime(endDate),
+        truncPeriod,
+      },
     },
     { refetchOnMountOrArgChange: true },
   );

packages/webapp/src/containers/SensorReadings/v2/LatestReadings/useLatestReadings.ts

@@ -61,9 +61,11 @@ function useLatestReading(sensors: Sensor[]): {
     // The "minute" and "second" truncation periods do not guarantee data for every minute or second.
     // Use "minute" here to ensure we get data.
     return triggerGetSensorReadings({
-      esids: sensors.map(({ external_id }) => external_id).join(','),
-      startTime: adjustedStartTime.toISOString(),
-      truncPeriod: 'minute',
+      params: {
+        esids: sensors.map(({ external_id }) => external_id).join(','),
+        startTime: adjustedStartTime.toISOString(),
+        truncPeriod: 'minute',
+      },
     });
   };
 

packages/webapp/src/containers/Task/saga.js

@@ -112,7 +112,7 @@ import {
   getMovementTaskBody,
   getSoilSampleTaskBody,
 } from './sagaUtils';
-import { api } from '../../store/api/apiSlice';
+import { invalidateTags } from '../../store/api/apiSlice';
 
 const taskTypeEndpoint = [
   'cleaning_task',
@@ -692,7 +692,7 @@ export function* createTaskSaga({ payload }) {
         task_translation_key === 'HARVEST_TASK' ? result.data[0] : result.data;
       yield call(getTasksSuccessSaga, { payload: isHarvest ? result.data : [result.data] });
       if (task_translation_key === 'IRRIGATION_TASK') {
-        yield put(api.util.invalidateTags(['IrrigationPrescriptions']));
+        yield put(invalidateTags(['IrrigationPrescriptions'], farm_id));
       }
       if (alreadyCompleted) {
         if (['CLEANING_TASK', 'PEST_CONTROL_TASK'].includes(task_translation_key)) {
@@ -905,7 +905,7 @@ export function* completeTaskSaga({ payload: { task_id, data, returnPath } }) {
       });
 
       if (task_translation_key === 'MOVEMENT_TASK') {
-        yield put(api.util.invalidateTags(['Animals', 'AnimalBatches']));
+        yield put(invalidateTags(['Animals', 'AnimalBatches'], farm_id));
       }
     }
   } catch (e) {
@@ -1096,7 +1096,7 @@ export function* deleteTaskSaga({ payload: data }) {
       }
       yield put(deleteTaskSuccess(result.data));
       if (task_type.task_translation_key === 'IRRIGATION_TASK') {
-        yield put(api.util.invalidateTags(['IrrigationPrescriptions']));
+        yield put(invalidateTags(['IrrigationPrescriptions'], farm_id));
       }
       yield put(enqueueSuccessSnackbar(i18n.t('TASK.DELETE.SUCCESS')));
     }

packages/webapp/src/containers/saga.js

@@ -151,8 +151,7 @@ import {
   onLoadingWatercourseFail,
   onLoadingWatercourseStart,
 } from './watercourseSlice';
-import { api, invalidateTags } from '../store/api/apiSlice';
-import { FarmLibraryTags, FarmTags } from '../store/api/apiTags';
+import { api } from '../store/api/apiSlice';
 import {
   getSoilSampleLocationsSuccess,
   onLoadingSoilSampleLocationFail,
@@ -603,7 +602,7 @@ export function* fetchAllSaga() {
   const { has_consent, user_id, farm_id } = yield select(userFarmSelector);
   if (!has_consent) return history.push('/consent');
 
-  yield put(api.endpoints.getSensors.initiate());
+  yield put(api.endpoints.getSensors.initiate({ farm_id, payload: undefined }));
 
   const isAdmin = yield select(isAdminSelector);
   const adminTasks = [
@@ -629,12 +628,12 @@ export function* fetchAllSaga() {
 
   // Animals
   yield all([
-    put(api.endpoints.getAnimals.initiate()),
-    put(api.endpoints.getAnimalBatches.initiate()),
-    put(api.endpoints.getDefaultAnimalTypes.initiate()),
+    put(api.endpoints.getAnimals.initiate({ farm_id, payload: undefined })),
+    put(api.endpoints.getAnimalBatches.initiate({ farm_id, payload: undefined })),
+    put(api.endpoints.getDefaultAnimalTypes.initiate({ farm_id, payload: undefined })),
     put(api.endpoints.getDefaultAnimalBreeds.initiate()),
-    put(api.endpoints.getCustomAnimalTypes.initiate()),
-    put(api.endpoints.getCustomAnimalBreeds.initiate()),
+    put(api.endpoints.getCustomAnimalTypes.initiate({ farm_id, payload: undefined })),
+    put(api.endpoints.getCustomAnimalBreeds.initiate({ farm_id, payload: undefined })),
     put(api.endpoints.getAnimalSexes.initiate()),
     put(api.endpoints.getAnimalIdentifierTypes.initiate()),
     put(api.endpoints.getAnimalIdentifierColors.initiate()),
@@ -658,7 +657,6 @@ export function* fetchAllSaga() {
 export function* clearOldFarmStateSaga() {
   yield put(resetTasks());
   yield put(resetDateRange());
-  yield put(invalidateTags([...FarmTags, ...FarmLibraryTags]));
 
   // Reset finance loading state
   yield put(setIsFetchingData(true));

packages/webapp/src/hooks/api/useQueries.js

@@ -14,7 +14,9 @@
  */
 
 const useQueries = (queries) => {
-  const result = queries.map((query) => query.hook(query.params));
+  const result = queries.map((query) =>
+    query.hook(query.params ? { params: query.params } : undefined),
+  );
 
   const data = queries.reduce(
     (dataObj, query, index) => ({

packages/webapp/src/hooks/useServiceWorkerListener/useServiceWorkerListener.ts

@@ -14,7 +14,7 @@
  */
 
 import { useEffect, useMemo } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
 import {
   enqueueSuccessSnackbar,
@@ -23,6 +23,7 @@ import {
 import { getTasks } from '../../containers/Task/saga';
 import { getManagementPlans } from '../../containers/saga';
 import { invalidateTags } from '../../store/api/apiSlice';
+import { loginSelector } from '../../containers/userFarmSlice';
 
 type SyncArea =
   | 'tasks.create'
@@ -66,7 +67,7 @@ function resolveAreaFromUrl(method: string, url: string): SyncArea {
 export function useServiceWorkerListener() {
   const dispatch = useDispatch();
   const { t } = useTranslation();
-
+  const { farm_id } = useSelector(loginSelector);
   const syncConfig = useMemo(
     (): Record<SyncArea, SyncConfig> => ({
       'tasks.create': {
@@ -76,7 +77,7 @@ export function useServiceWorkerListener() {
         },
         onSuccess: (response) => {
           if (response?.taskType?.task_translation_key === 'IRRIGATION_TASK') {
-            return invalidateTags(['IrrigationPrescriptions']);
+            return invalidateTags(['IrrigationPrescriptions'], farm_id);
           }
         },
         refresh: () => {
@@ -94,7 +95,7 @@ export function useServiceWorkerListener() {
         onSuccess: (response) => {
           // taskType not returned in the completion API response
           if (response?.animal_movement_task) {
-            return invalidateTags(['Animals', 'AnimalBatches']);
+            return invalidateTags(['Animals', 'AnimalBatches'], farm_id);
           }
         },
         refresh: () => dispatch(getTasks()),
@@ -121,13 +122,13 @@ export function useServiceWorkerListener() {
         },
         onSuccess: (response) => {
           if (response?.taskType?.task_translation_key === 'IRRIGATION_TASK') {
-            return invalidateTags(['IrrigationPrescriptions']);
+            return invalidateTags(['IrrigationPrescriptions'], farm_id);
           }
         },
         refresh: () => dispatch(getTasks()),
       },
     }),
-    [t, dispatch],
+    [t, dispatch, farm_id],
   );
 
   useEffect(() => {