From e986b25fee9b29970e36e05fadd9295c7982edf4 Mon Sep 17 00:00:00 2001 From: Pav0l Date: Tue, 17 Sep 2019 14:00:51 +0200 Subject: [PATCH] Fetch changeRequests only for Admin users --- src/components/App/App.js | 8 ++++++-- yarn.lock | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/App/App.js b/src/components/App/App.js index adb3836b..221a0035 100644 --- a/src/components/App/App.js +++ b/src/components/App/App.js @@ -49,8 +49,12 @@ function App() { data: undefined, cleanedData: undefined }); + + // fetch changeRequests only for admin users + if (user.isAdmin) { + loadChangeRequest(); + } loadFarmers(); - loadChangeRequest(); setNeedsUpdate(false); } }, [user, needsUpdate]); @@ -64,7 +68,7 @@ function App() { }); }) .catch(error => { - toast.error(error.message) + toast.error(error.message); }); }; diff --git a/yarn.lock b/yarn.lock index cb989641..7eb1bcd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6636,6 +6636,11 @@ mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: dependencies: minimist "0.0.8" +moment@^2.24.0: + version "2.24.0" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" + integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"