Merge pull request #4139 from LiteFarmOrg/LF-5265-old-farms-note-data-persists-after-switching-farms-to-a-newly-invited-farm

LF-5265 Old farm's note data persists after switching farms to a newly invited farm

Author: SayakaOno

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

@@ -28,7 +28,7 @@ import {
   spotlightLoading,
 } from '../showedSpotlightSlice';
 import { createAction } from '@reduxjs/toolkit';
-import { axios, getHeader } from '../saga';
+import { axios, clearOldFarmStateSaga, getHeader } from '../saga';
 import history from '../../history';
 import { startInvitationFlowOnChooseFarmScreen } from './chooseFarmFlowSlice';
 
@@ -57,6 +57,7 @@ export function* patchUserFarmStatusWithIDTokenSaga({ payload: userFarm }) {
     const header = getHeader(user_id, farm_id);
     const result = yield call(axios.patch, patchUserFarmStatusWithIdTokenUrl(farm_id), {}, header);
     const { user: resUserFarm } = result.data;
+    yield call(clearOldFarmStateSaga);
     yield put(acceptInvitationSuccess(resUserFarm));
     yield put(startInvitationFlowOnChooseFarmScreen(resUserFarm.farm_id));
     history.push('/consent');

packages/webapp/src/containers/saga.js

@@ -690,9 +690,14 @@ export function* selectFarmAndFetchAllSaga({ payload: farm }) {
   try {
     yield call(selectFarmSaga, { payload: farm });
     const userFarm = yield select(userFarmSelector);
-    if (!userFarm.has_consent) return history.push('/consent');
-    history.push({ pathname: '/' });
     yield call(clearOldFarmStateSaga);
+    if (!userFarm.has_consent) {
+      // has_consent is derived in the userFarmSelector from DB has_consent && consent_version === CONSENT_VERSION
+      // Reachable when CONSENT_VERSION was bumped and the user hasn't re-accepted, or when an admin has changed the user's role (userFarmController.updateRole resets has_consent but leaves status='Active')
+      // Status 'Invited' farms do not use selectFarmAndFetchAllSaga, but instead use patchUserFarmStatusWithIdTokenUrl
+      return history.push('/consent');
+    }
+    history.push({ pathname: '/' });
     yield call(fetchAllSaga);
   } catch (e) {
     console.error('failed to fetch farm info', e);