Skip to content

LF-5100 - Switch from invalidateTags() to resetApiState() when switching farms #3988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Duncan-Brain wants to merge 6 commits into
base: integration
Choose a base branch
from
+212 −145
Open

LF-5100 - Switch from invalidateTags() to resetApiState() when switching farms #3988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07baf0e
Separate out library API and makle constants file
Duncan-Brain Dec 31, 2025
1094f27
Update import statements
Duncan-Brain Dec 31, 2025
b7277b0
Use resetApiState instead of invalidate tags
Duncan-Brain Dec 31, 2025
f6493fa
Use shortcut for invalidate tags with typings
Duncan-Brain Dec 31, 2025
d28495e
Update new api references to libraryApi
Duncan-Brain Mar 2, 2026
1631dc8
Merge branch 'integration' into rtk-upgrade/bug-invalidate-tags
Duncan-Brain Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/webapp/src/components/Animals/RemoveAnimalsModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { ReactComponent as WarningIcon } from '../../../assets/images/warning.sv
import { ReactComponent as CheckIcon } from '../../../assets/images/check-circle.svg';
import { useTranslation } from 'react-i18next';
import { getLocalDateInYYYYDDMM } from '../../../util/date';
import { useGetAnimalRemovalReasonsQuery } from '../../../store/api/apiSlice';
import { useGetAnimalRemovalReasonsQuery } from '../../../store/api/libraryApiSlice';
import type { AnimalRemovalReasonKeys } from '../../../store/api/types';

const REASON = 'reason';
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/src/components/Task/MovementTask/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import ReactSelect from '../../Form/ReactSelect';
import Input, { getInputErrors } from '../../Form/Input';
import { hookFormMaxCharsValidation } from '../../Form/hookformValidationUtils';
import styles from './styles.module.scss';
import { useGetAnimalMovementPurposesQuery } from '../../../store/api/apiSlice';
import { useGetAnimalMovementPurposesQuery } from '../../../store/api/libraryApiSlice';
import { AnimalMovementPurpose } from '../../../store/api/types';

type PureMovementTaskProps = UseFormReturn & {
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/src/components/Task/SoilAmendmentTask/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
useGetSoilAmendmentMethodsQuery,
useGetSoilAmendmentPurposesQuery,
useGetSoilAmendmentFertiliserTypesQuery,
} from '../../../store/api/apiSlice';
} from '../../../store/api/libraryApiSlice';
import ReactSelect from '../../Form/ReactSelect';
import Input, { getInputErrors } from '../../Form/Input';
import { hookFormMaxCharsValidation } from '../../Form/hookformValidationUtils';
Expand Down
5 changes: 2 additions & 3 deletions packages/webapp/src/containers/AddFarm/saga.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ 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';
import { resetApiState } from '../../store/api/apiSlice';

const patchRoleUrl = (farm_id, user_id) => `${userFarmUrl}/role/farm/${farm_id}/user/${user_id}`;
const patchFarmUrl = (farm_id) => `${farmUrl}/owner_operated/${farm_id}`;
Expand Down Expand Up @@ -62,7 +61,7 @@ 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]));
yield put(resetApiState());

const user = getUserResult?.data;
yield put(
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/src/containers/Animals/AddAnimals/AddAnimalDetails/usePopulateDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
DetailsFields,
} from '../types';
import { AnimalOrBatchKeys } from '../../types';
import { useGetAnimalUsesQuery } from '../../../../store/api/apiSlice';
import { useGetAnimalUsesQuery } from '../../../../store/api/libraryApiSlice';
import { parseUniqueDefaultId } from '../../../../util/animal';

export const usePopulateDetails = (
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/src/containers/Animals/AddAnimals/AddAnimalSummary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ import { useHistory } from 'react-router-dom';
import { AddAnimalsSummaryCard } from '../../../../components/Animals/AddAnimalsSummaryCard';
import { ANIMALS_INVENTORY_URL } from '../../../../util/siteMapConstants';
import {
useGetAnimalSexesQuery,
useGetCustomAnimalBreedsQuery,
useGetCustomAnimalTypesQuery,
useGetDefaultAnimalBreedsQuery,
useGetDefaultAnimalTypesQuery,
} from '../../../../store/api/apiSlice';
import {
useGetAnimalSexesQuery,
useGetDefaultAnimalBreedsQuery,
} from '../../../../store/api/libraryApiSlice';
import useQueries from '../../../../hooks/api/useQueries';
import { formatDBAnimalsToSummary, formatDBBatchesToSummary } from '../../AddAnimals/utils';
import { Animal, AnimalBatch } from '../../../../store/api/types';
Expand Down
7 changes: 2 additions & 5 deletions packages/webapp/src/containers/Animals/AddAnimals/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,8 @@ import { ContextForm, Variant } from '../../../components/Form/ContextForm/';
import AddAnimalBasics, { animalBasicsDefaultValues } from './AddAnimalBasics';
import AddAnimalDetails from './AddAnimalDetails';
import AddAnimalSummary from './AddAnimalSummary';
import {
useAddAnimalBatchesMutation,
useAddAnimalsMutation,
useGetAnimalOriginsQuery,
} from '../../../store/api/apiSlice';
import { useAddAnimalBatchesMutation, useAddAnimalsMutation } from '../../../store/api/apiSlice';
import { useGetAnimalOriginsQuery } from '../../../store/api/libraryApiSlice';
import { Animal, AnimalBatch } from '../../../store/api/types';
import { enqueueErrorSnackbar, enqueueSuccessSnackbar } from '../../Snackbar/snackbarSlice';
import { formatAnimalDetailsToDBStructure, formatBatchDetailsToDBStructure } from './utils';
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/src/containers/Animals/AddAnimals/useAnimalOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
import {
useGetDefaultAnimalTypesQuery,
useGetCustomAnimalTypesQuery,
useGetDefaultAnimalBreedsQuery,
useGetCustomAnimalBreedsQuery,
} from '../../../store/api/apiSlice';
import {
useGetDefaultAnimalBreedsQuery,
useGetAnimalSexesQuery,
useGetAnimalIdentifierTypesQuery,
useGetAnimalIdentifierColorsQuery,
useGetAnimalOriginsQuery,
useGetAnimalUsesQuery,
} from '../../../store/api/apiSlice';
} from '../../../store/api/libraryApiSlice';
import { useTranslation } from 'react-i18next';
import { generateUniqueAnimalId } from '../../../util/animal';
import { ANIMAL_ID_PREFIX } from '../types';
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/src/containers/Animals/Inventory/useAnimalInventory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ import {
useGetAnimalBatchesQuery,
useGetCustomAnimalBreedsQuery,
useGetCustomAnimalTypesQuery,
useGetDefaultAnimalBreedsQuery,
useGetDefaultAnimalTypesQuery,
useGetAnimalSexesQuery,
} from '../../../store/api/apiSlice';
import {
useGetDefaultAnimalBreedsQuery,
useGetAnimalSexesQuery,
} from '../../../store/api/libraryApiSlice';
import useQueries from '../../../hooks/api/useQueries';
import {
Animal,
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/src/containers/Animals/SingleAnimalView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ import FixedHeaderContainer from '../../../components/Animals/FixedHeaderContain
import { addNullstoMissingFields } from './utils';
import { useInitialAnimalData } from './useInitialAnimalData';
import {
useGetAnimalOriginsQuery,
useUpdateAnimalsMutation,
useUpdateAnimalBatchesMutation,
useGetCustomAnimalBreedsQuery,
useGetCustomAnimalTypesQuery,
useGetDefaultAnimalBreedsQuery,
useGetDefaultAnimalTypesQuery,
} from '../../../store/api/apiSlice';
import {
useGetAnimalOriginsQuery,
useGetDefaultAnimalBreedsQuery,
} from '../../../store/api/libraryApiSlice';
import { locationsSelector } from '../../locationSlice';
import {
formatAnimalDetailsToDBStructure,
Expand Down
6 changes: 4 additions & 2 deletions packages/webapp/src/containers/Filter/Animals/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ import { FilterType, type ComponentFilter } from '../../../components/Filter/typ
import {
useGetDefaultAnimalTypesQuery,
useGetCustomAnimalTypesQuery,
useGetDefaultAnimalBreedsQuery,
useGetCustomAnimalBreedsQuery,
useGetAnimalSexesQuery,
} from '../../../store/api/apiSlice';
import {
useGetDefaultAnimalBreedsQuery,
useGetAnimalSexesQuery,
} from '../../../store/api/libraryApiSlice';
import { generateUniqueAnimalId } from '../../../util/animal';
import { useVisibleBreeds } from './useVisibleBreeds';
import { locationsSelector } from '../../locationSlice';
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/src/containers/Filter/ProductInventory/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
import FilterGroup from '../../../components/Filter/FilterGroup';
import type { ReduxFilterEntity, ContainerOnChangeCallback, FilterState } from '../types';
import { FilterType, type ComponentFilter } from '../../../components/Filter/types';
import { useGetSoilAmendmentFertiliserTypesQuery } from '../../../store/api/apiSlice';
import { useGetSoilAmendmentFertiliserTypesQuery } from '../../../store/api/libraryApiSlice';
import { InventoryFilterKeys } from './types';
import { sortFilterOptions } from '../../../components/Filter/utils';

Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/src/containers/ProductInventory/ProductForm/SoilAmendmentProductForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/
import { shallowEqual, useSelector } from 'react-redux';
import { useTranslation } from 'react-i18next';
import { useGetSoilAmendmentFertiliserTypesQuery } from '../../../store/api/apiSlice';
import { useGetSoilAmendmentFertiliserTypesQuery } from '../../../store/api/libraryApiSlice';
import PureSoilAmendmentProductForm from '../../../components/ProductInventory/ProductForm/PureSoilAmendmentProductForm';
import { userFarmSelector } from '../../userFarmSlice';
import { certifierSurveySelector } from '../../OrganicCertifierSurvey/slice';
Expand Down
8 changes: 4 additions & 4 deletions packages/webapp/src/containers/Task/saga.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ import {
getMovementTaskBody,
getSoilSampleTaskBody,
} from './sagaUtils';
import { api } from '../../store/api/apiSlice';
Copy link
Collaborator Author

@Duncan-Brain Duncan-Brain Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw that this could be using the function someone created instead of the whole api.

import { invalidateTags } from '../../store/api/apiSlice';

const taskTypeEndpoint = [
'cleaning_task',
Expand Down Expand Up @@ -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']));
}
if (alreadyCompleted) {
if (['CLEANING_TASK', 'PEST_CONTROL_TASK'].includes(task_translation_key)) {
Expand Down Expand Up @@ -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']));
}
}
} catch (e) {
Expand Down Expand Up @@ -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']));
}
yield put(enqueueSuccessSnackbar(i18n.t('TASK.DELETE.SUCCESS')));
}
Expand Down
28 changes: 14 additions & 14 deletions packages/webapp/src/containers/saga.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ import {
onLoadingWatercourseFail,
onLoadingWatercourseStart,
} from './watercourseSlice';
import { api, invalidateTags } from '../store/api/apiSlice';
import { FarmLibraryTags, FarmTags } from '../store/api/apiTags';
import { api, resetApiState } from '../store/api/apiSlice';
import {
getSoilSampleLocationsSuccess,
onLoadingSoilSampleLocationFail,
} from './soilSampleLocationSlice';
import { getFieldWorkTypes } from './Task/FieldWorkTask/saga';
import { getIrrigationTaskTypes } from './Task/IrrigationTaskTypes/saga';
import { libraryApi } from '../store/api/libraryApiSlice';

const logUserInfoUrl = () => `${url}/userLog`;
const getCropsByFarmIdUrl = (farm_id) => `${url}/crop/farm/${farm_id}`;
Expand Down Expand Up @@ -617,10 +617,10 @@ export function* fetchAllSaga() {
call(getAllUserFarmsByFarmIDSaga),
put(getFieldWorkTypes()),
put(getIrrigationTaskTypes()),
put(api.endpoints.getSoilAmendmentMethods.initiate()),
put(api.endpoints.getSoilAmendmentPurposes.initiate()),
put(api.endpoints.getSoilAmendmentFertiliserTypes.initiate()),
put(api.endpoints.getAnimalMovementPurposes.initiate()),
put(libraryApi.endpoints.getSoilAmendmentMethods.initiate()),
put(libraryApi.endpoints.getSoilAmendmentPurposes.initiate()),
put(libraryApi.endpoints.getSoilAmendmentFertiliserTypes.initiate()),
put(libraryApi.endpoints.getAnimalMovementPurposes.initiate()),
];

yield all(isAdmin ? [...tasks, ...adminTasks] : tasks);
Expand All @@ -632,15 +632,15 @@ export function* fetchAllSaga() {
put(api.endpoints.getAnimals.initiate()),
put(api.endpoints.getAnimalBatches.initiate()),
put(api.endpoints.getDefaultAnimalTypes.initiate()),
put(api.endpoints.getDefaultAnimalBreeds.initiate()),
put(libraryApi.endpoints.getDefaultAnimalBreeds.initiate()),
put(api.endpoints.getCustomAnimalTypes.initiate()),
put(api.endpoints.getCustomAnimalBreeds.initiate()),
put(api.endpoints.getAnimalSexes.initiate()),
put(api.endpoints.getAnimalIdentifierTypes.initiate()),
put(api.endpoints.getAnimalIdentifierColors.initiate()),
put(api.endpoints.getAnimalMovementPurposes.initiate()),
put(api.endpoints.getAnimalOrigins.initiate()),
put(api.endpoints.getAnimalUses.initiate()),
put(libraryApi.endpoints.getAnimalSexes.initiate()),
put(libraryApi.endpoints.getAnimalIdentifierTypes.initiate()),
put(libraryApi.endpoints.getAnimalIdentifierColors.initiate()),
put(libraryApi.endpoints.getAnimalMovementPurposes.initiate()),
put(libraryApi.endpoints.getAnimalOrigins.initiate()),
put(libraryApi.endpoints.getAnimalUses.initiate()),
]);

const {
Expand All @@ -658,7 +658,7 @@ export function* fetchAllSaga() {
export function* clearOldFarmStateSaga() {
yield put(resetTasks());
yield put(resetDateRange());
yield put(invalidateTags([...FarmTags, ...FarmLibraryTags]));
yield put(resetApiState());

// Reset finance loading state
yield put(setIsFetchingData(true));
Expand Down
Loading