Merge branch 'collections-project-bulk-actions' of...

Merge branch 'collections-project-bulk-actions' of github.com:metabase/metabase into collections-project-bulk-actions

frontend/src/metabase/components/CollectionLanding.jsx

@@ -20,7 +20,7 @@ import CollectionEmptyState from "metabase/components/CollectionEmptyState";
 import EntityMenu from "metabase/components/EntityMenu";
 
 import CollectionListLoader from "metabase/containers/CollectionListLoader";
-import CollectionLoader from "metabase/containers/CollectionItemsLoader";
+import CollectionLoader from "metabase/containers/CollectionLoader";
 import { entityListLoader } from "metabase/entities/containers/EntityListLoader";
 
 import Collections from "metabase/entities/collections";
@@ -79,7 +79,12 @@ const CollectionList = () => {
   );
 };
 
-@connect((state, { collectionId }) => ({ entityQuery: { collectionId } }))
+@connect((state, { collectionId }) => ({
+  entityQuery:
+    collectionId === "root"
+      ? {} // FIXME /api/search doesn't yet support root collection
+      : { collection_id: collectionId },
+}))
 @entityListLoader({
   entityType: "search",
   wrapped: true,
@@ -109,7 +114,7 @@ class DefaultLanding extends React.Component {
         <Box w={2 / 3}>
           <Box>
             <CollectionLoader collectionId={collectionId || "root"}>
-              {({ collection }) => {
+              {({ object: collection }) => {
                 if (list.length === 0) {
                   return <CollectionEmptyState />;
                 }

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

@@ -107,7 +107,7 @@ export const entityListLoader = (ellProps: Props) =>
   (ComposedComponent: any) =>
     // eslint-disable-next-line react/display-name
     (props: Props) => (
-      <EntityListLoader {...ellProps}>
+      <EntityListLoader {...props} {...ellProps}>
         {childProps => <ComposedComponent {...props} {...childProps} />}
       </EntityListLoader>
     );