🐛 don't return anything if the query hasn't finished loading yet (#153)

teamleadercrm · Dec 2, 2019 · b4b0d19 · b4b0d19
1 parent 76641a0
commit b4b0d19
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/store/entities/selectors.ts b/src/store/entities/selectors.ts
@@ -49,6 +49,12 @@ export const mergeEntitiesIntoPaths = (entities: EntitiesState, paths: string[],
 
 export const selectMergedEntities = (state: State, { key }: { key: string }) => {
   const { ids, data } = state.queries[key];
+
+  // Query hasn't finished loading yet
+  if (!ids && !data) {
+    return null;
+  }
+
   const { domain, options } = decodeQueryCacheKey(key);
 
   const include = options && options.include;