Fix "Our analytics" is initially suggested only to admins when saving items (#15999)

* Fix 'Our collection' is suggested only to admins

* Fix permission test

* Fix test according to new collections behavior

frontend/src/metabase/entities/collections.js

@@ -8,17 +8,37 @@ import { createSelector } from "reselect";
 
 import { GET } from "metabase/lib/api";
 
-import {
-  getUser,
-  getUserDefaultCollectionId,
-  getUserPersonalCollectionId,
-} from "metabase/selectors/user";
+import { getUser, getUserPersonalCollectionId } from "metabase/selectors/user";
 
 import { t } from "ttag";
 
 const listCollectionsTree = GET("/api/collection/tree");
 const listCollections = GET("/api/collection");
 
+export const ROOT_COLLECTION = {
+  id: "root",
+  name: t`Our analytics`,
+  location: "",
+  path: [],
+};
+
+export const PERSONAL_COLLECTION = {
+  id: undefined, // to be filled in by getExpandedCollectionsById
+  name: t`My personal collection`,
+  location: "/",
+  path: [ROOT_COLLECTION.id],
+  can_write: true,
+};
+
+// fake collection for admins that contains all other user's collections
+export const PERSONAL_COLLECTIONS = {
+  id: "personal", // placeholder id
+  name: t`All personal collections`,
+  location: "/",
+  path: [ROOT_COLLECTION.id],
+  can_write: false,
+};
+
 const Collections = createEntity({
   name: "collections",
   path: "/api/collection",
@@ -86,7 +106,8 @@ const Collections = createEntity({
         (state, { params }) => (params ? params.collectionId : undefined),
         (state, { location }) =>
           location && location.query ? location.query.collectionId : undefined,
-        getUserDefaultCollectionId,
+        () => ROOT_COLLECTION.id,
+        getUserPersonalCollectionId,
       ],
       (collections, ...collectionIds) => {
         for (const collectionId of collectionIds) {
@@ -169,31 +190,6 @@ export const getCollectionType = (collectionId: string, state: {}) =>
     ? "other"
     : null;
 
-export const ROOT_COLLECTION = {
-  id: "root",
-  name: t`Our analytics`,
-  location: "",
-  path: [],
-};
-
-// the user's personal collection
-export const PERSONAL_COLLECTION = {
-  id: undefined, // to be filled in by getExpandedCollectionsById
-  name: t`My personal collection`,
-  location: "/",
-  path: ["root"],
-  can_write: true,
-};
-
-// fake collection for admins that contains all other user's collections
-export const PERSONAL_COLLECTIONS = {
-  id: "personal", // placeholder id
-  name: t`All personal collections`,
-  location: "/",
-  path: ["root"],
-  can_write: false,
-};
-
 type UserId = number;
 
 // a "real" collection

frontend/src/metabase/selectors/user.js

@@ -16,9 +16,3 @@ export const getUserPersonalCollectionId = createSelector(
   [getUser],
   user => (user && user.personal_collection_id) || null,
 );
-
-export const getUserDefaultCollectionId = createSelector(
-  [getUser, getUserIsAdmin, getUserPersonalCollectionId],
-  (user, isAdmin, personalCollectionId) =>
-    isAdmin ? null : personalCollectionId,
-);

frontend/test/metabase/scenarios/collections/permissions.cy.spec.js

@@ -654,6 +654,17 @@ describe("collection permissions", () => {
       });
     });
   });
+
+  it("should offer to save items to 'Our analytics' if user has a 'curate' access to it", () => {
+    cy.signIn("normal");
+
+    cy.visit("/question/new");
+    cy.findByText("Native query").click();
+    cy.get(".ace_content").type("select * from people");
+    cy.findByText("Save").click();
+
+    cy.get(".AdminSelect").findByText("Our analytics");
+  });
 });
 
 function clickRevert(event_name, index = 0) {

frontend/test/metabase/scenarios/native/native.cy.spec.js

@@ -229,7 +229,6 @@ describe("scenarios > question > native", () => {
     cy.findByText("Simple question").click();
     popover().within(() => {
       cy.findByText("Saved Questions").click();
-      cy.findByText("Robert Tableton's Personal Collection").click();
       cy.findByText(QUESTION).click();
     });