fix: kids-first#2991 studi page flash when loading new data

francisl · Mar 23, 2021 · 39f1fe9 · 39f1fe9
1 parent 0592909
commit 39f1fe9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/pages/studies/SidebarFilters.tsx b/src/pages/studies/SidebarFilters.tsx
@@ -62,7 +62,7 @@ const SidebarFilters: FC<SidebarData> = (sidebarData) => {
   const mappingData = sidebarData.studiesMappingResults;
   const data = sidebarData.studiesResults;
 
-  if (mappingData.loadingMapping || !mappingData.extendedMapping || data.loading || !data.data) {
+  if (mappingData?.loadingMapping || !mappingData?.extendedMapping || data.loading || !data.data) {
     return null;
   }
 

diff --git a/src/pages/studies/studies.tsx b/src/pages/studies/studies.tsx
@@ -10,10 +10,30 @@ import { Layout } from 'antd';
 
 import styles from './studies.module.scss';
 
+let previousData: any | null = null;
+let previousMappingData: any | null = null;
+
 const Studies: FC = () => {
   const { filters } = useFilters();
-  const studiesResults = useGetStudiesPageData({ sqon: filters });
-  const studiesMappingResults = useGetExtendedMappings('study');
+  let studiesResults = useGetStudiesPageData({ sqon: filters });
+  let studiesMappingResults = useGetExtendedMappings('study');
+
+  if (studiesResults.loading || studiesMappingResults.loadingMapping) {
+    if (!studiesResults.data && previousData) {
+      studiesResults = previousData;
+    }
+
+    if (!studiesMappingResults.extendedMapping && previousMappingData) {
+      studiesMappingResults = previousMappingData;
+    }
+  }
+
+  if (studiesResults.data) {
+    previousData = studiesResults;
+  }
+  if (studiesMappingResults) {
+    previousMappingData = studiesMappingResults;
+  }
 
   return (
     <Layout className={styles.layout}>