Fix loading state, add EntityListLoader props

frontend/src/metabase/entities/containers/EntityListLoader.jsx

@@ -6,6 +6,18 @@ import { connect } from "react-redux";
 import entityType from "./EntityType";
 import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
 
+export type Props = {
+  entityType?: string,
+  loadingAndErrorWrapper: boolean,
+  children: (props: RenderProps) => ?React$Element<any>,
+};
+
+export type RenderProps = {
+  list: ?(any[]),
+  loading: boolean,
+  error: ?any,
+};
+
 @entityType()
 @connect((state, { entityDef }) => ({
   list: entityDef.selectors.getList(state, {}),
@@ -13,17 +25,23 @@ import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
   error: entityDef.selectors.getError(state, {}),
 }))
 export default class EntitiesListLoader extends React.Component {
+  props: Props;
+
   static defaultProps = {
     loadingAndErrorWrapper: true,
   };
+
   componentWillMount() {
+    // $FlowFixMe: provided by @connect
     this.props.fetchList();
   }
   renderChildren = () => {
+    // $FlowFixMe: provided by @connect
     const { children, list, loading, error } = this.props;
     return children({ list, loading, error });
   };
   render() {
+    // $FlowFixMe: provided by @connect
     const { loading, error, loadingAndErrorWrapper } = this.props;
     return loadingAndErrorWrapper ? (
       <LoadingAndErrorWrapper

frontend/src/metabase/lib/entities.js

@@ -177,31 +177,34 @@ export function createEntity(def: EntityDefinition): Entity {
 
     fetchList: createThunkAction(
       FETCH_LIST_ACTION,
-      (query = {}, reload = false) => async (dispatch, getState) => {
-        const statePath = ["entities", entity.name + "_list", "fetch"];
-        try {
-          dispatch(setRequestState({ statePath, state: "LOADING" }));
-          const result = normalize(await entity.api.list(query), [
-            entity.schema,
-          ]);
-          dispatch(setRequestState({ statePath, state: "LOADED" }));
-          return result;
-        } catch (error) {
-          console.error(`${FETCH_LIST_ACTION} failed:`, error);
-          dispatch(setRequestState({ statePath, error }));
-          throw error;
-        }
-      },
-      // (query = {}, reload = false) => (dispatch, getState) =>
-      //   fetchData({
-      //     dispatch,
-      //     getState,
-      //     reload,
-      //     requestStatePath: ["entities", entity.name + "_list"], // FIXME: different path depending on query?
-      //     existingStatePath: ["entities", entity.name + "_list"], // FIXME: different path depending on query?
-      //     getData: async () =>
-      //       normalize(await entity.api.list(query), [entity.schema]),
-      //   }),
+      // (query = {}, reload = false) => async (dispatch, getState) => {
+      //   const statePath = ["entities", entity.name + "_list", "fetch"];
+      //   try {
+      //     dispatch(setRequestState({ statePath, state: "LOADING" }));
+      //     const result = normalize(await entity.api.list(query), [
+      //       entity.schema,
+      //     ]);
+      //     setTimeout(
+      //       () => dispatch(setRequestState({ statePath, state: "LOADED" })),
+      //       10,
+      //     );
+      //     return result;
+      //   } catch (error) {
+      //     console.error(`${FETCH_LIST_ACTION} failed:`, error);
+      //     dispatch(setRequestState({ statePath, error }));
+      //     throw error;
+      //   }
+      // },
+      (query = {}, reload = false) => (dispatch, getState) =>
+        fetchData({
+          dispatch,
+          getState,
+          reload,
+          requestStatePath: ["entities", entity.name + "_list"], // FIXME: different path depending on query?
+          existingStatePath: ["entities", entity.name + "_list"], // FIXME: different path depending on query?
+          getData: async () =>
+            normalize(await entity.api.list(query), [entity.schema]),
+        }),
     ),
   };
 

frontend/test/query_builder/new_question.integ.spec.js

@@ -261,9 +261,18 @@ describe("new question flow", async () => {
         expect(store.getPath()).toBe("/question/new/metric"),
       );
 
+      await eventually(() => {
+        expect(
+          app
+            .find(EntitySearch)
+            .find(SearchGroupingOption)
+            .last()
+            .text(),
+        ).toBe("Creator");
+      });
+
       const entitySearch = app.find(EntitySearch);
       const viewByCreator = entitySearch.find(SearchGroupingOption).last();
-      expect(viewByCreator.text()).toBe("Creator");
       click(viewByCreator);
       expect(store.getPath()).toBe("/question/new/metric?grouping=creator");