fix: recoil default

SocialGouv · Oct 4, 2023 · b501c61 · b501c61
1 parent a1c0b72
commit b501c61
Show file tree

Hide file tree

Showing 13 changed files with 179 additions and 102 deletions.
diff --git a/dashboard/src/app.js b/dashboard/src/app.js
@@ -195,8 +195,10 @@ export default function ContextedApp() {
   const [recoilKey, setRecoilKey] = useState(0);
   return (
     <RecoilRoot key={recoilKey}>
-      <RecoilNexus />
-      <App resetRecoil={() => setRecoilKey((k) => k + 1)} />
+      <React.Suspense fallback={<div>CHAAARGEMENT</div>}>
+        <RecoilNexus />
+        <App resetRecoil={() => setRecoilKey((k) => k + 1)} />
+      </React.Suspense>
     </RecoilRoot>
   );
 }
diff --git a/dashboard/src/components/DataLoader.js b/dashboard/src/components/DataLoader.js
diff --git a/dashboard/src/recoil/actions.js b/dashboard/src/recoil/actions.js
@@ -1,4 +1,4 @@
-import { setCacheItem } from '../services/dataManagement';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
 import { atom, selector } from 'recoil';
 import { organisationState } from './auth';
 import { looseUuidRegex } from '../utils';
@@ -8,7 +8,13 @@ import { capture } from '../services/sentry';
 const collectionName = 'action';
 export const actionsState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'action/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('action', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/comments.js b/dashboard/src/recoil/comments.js
@@ -1,13 +1,19 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector } from 'recoil';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'comment';
 export const commentsState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'comment/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('comment', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/groups.ts b/dashboard/src/recoil/groups.ts
@@ -1,12 +1,18 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom, selectorFamily } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector, selectorFamily } from 'recoil';
 import type { GroupInstance } from '../types/group';
 import type { UUIDV4 } from '../types/uuid';
 
 const collectionName = 'group';
 export const groupsState = atom<GroupInstance[]>({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'group/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('group', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/passages.js b/dashboard/src/recoil/passages.js
@@ -1,13 +1,19 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector } from 'recoil';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'passage';
 export const passagesState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'passage/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('passage', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/persons.ts b/dashboard/src/recoil/persons.ts
@@ -1,4 +1,4 @@
-import { setCacheItem } from '../services/dataManagement';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
 import { atom, selector, useRecoilValue } from 'recoil';
 import { organisationState } from './auth';
 import { toast } from 'react-toastify';
@@ -9,7 +9,13 @@ import type { PredefinedField, CustomField } from '../types/field';
 const collectionName = 'person';
 export const personsState = atom<PersonInstance[]>({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'person/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('person', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/places.js b/dashboard/src/recoil/places.js
@@ -1,13 +1,19 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector } from 'recoil';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'place';
 export const placesState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'place/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('place', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/relPersonPlace.js b/dashboard/src/recoil/relPersonPlace.js
@@ -1,13 +1,19 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector } from 'recoil';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'relPersonPlace';
 export const relsPersonPlaceState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'relPersonPlace/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('relPersonPlace', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/rencontres.js b/dashboard/src/recoil/rencontres.js
@@ -1,13 +1,19 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector } from 'recoil';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'rencontre';
 export const rencontresState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'rencontre/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('rencontre', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/reports.js b/dashboard/src/recoil/reports.js
@@ -1,4 +1,4 @@
-import { setCacheItem } from '../services/dataManagement';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
 import { atom, selector } from 'recoil';
 import { capture } from '../services/sentry';
 import { organisationState } from './auth';
@@ -8,7 +8,13 @@ import { toast } from 'react-toastify';
 const collectionName = 'report';
 export const reportsState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'report/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('report', []);
+      return cache;
+    },
+  }),
   effects: [
     ({ onSet }) =>
       onSet(async (newValue) => {

diff --git a/dashboard/src/recoil/territory.js b/dashboard/src/recoil/territory.js
@@ -1,13 +1,19 @@
-import { setCacheItem } from '../services/dataManagement';
-import { atom } from 'recoil';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
+import { atom, selector } from 'recoil';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'territory';
 export const territoriesState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'territory/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('territory', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });
 

diff --git a/dashboard/src/recoil/territoryObservations.js b/dashboard/src/recoil/territoryObservations.js
@@ -1,14 +1,20 @@
 import { organisationState } from './auth';
 import { atom, selector } from 'recoil';
-import { setCacheItem } from '../services/dataManagement';
+import { getCacheItemDefaultValue, setCacheItem } from '../services/dataManagement';
 import { looseUuidRegex } from '../utils';
 import { toast } from 'react-toastify';
 import { capture } from '../services/sentry';
 
 const collectionName = 'territory-observation';
 export const territoryObservationsState = atom({
   key: collectionName,
-  default: [],
+  default: selector({
+    key: 'territory-observation/default',
+    get: async () => {
+      const cache = await getCacheItemDefaultValue('territory-observation', []);
+      return cache;
+    },
+  }),
   effects: [({ onSet }) => onSet(async (newValue) => setCacheItem(collectionName, newValue))],
 });