diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer.tsx index 50625b628f9c87db34815dcde812734ee54a056a..6f46e6725a90b1373858c9be5abd2943c1f7b81c 100644 --- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer.tsx +++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer.tsx @@ -20,11 +20,12 @@ import Collections, { } from "metabase/entities/collections"; import { openNavbar, closeNavbar } from "metabase/redux/app"; import { logout } from "metabase/auth/actions"; +import { getUserIsAdmin, getUser } from "metabase/selectors/user"; import { getHasOwnDatabase, getHasDataAccess, } from "metabase/new_query/selectors"; -import { getUser } from "metabase/selectors/user"; + import { nonPersonalOrArchivedCollection, currentUserPersonalCollections, @@ -47,6 +48,7 @@ type NavbarModal = "MODAL_NEW_COLLECTION" | null; function mapStateToProps(state: State) { return { currentUser: getUser(state), + isAdmin: getUserIsAdmin(state), hasDataAccess: getHasDataAccess(state), hasOwnDatabase: getHasOwnDatabase(state), bookmarks: getOrderedBookmarks(state), @@ -68,6 +70,7 @@ interface CollectionTreeItem extends Collection { type Props = { isOpen: boolean; + isAdmin: boolean; currentUser: User; bookmarks: BookmarksType; collections: Collection[]; @@ -90,6 +93,7 @@ type Props = { function MainNavbarContainer({ bookmarks, + isAdmin, isOpen, currentUser, hasOwnDatabase, @@ -211,6 +215,7 @@ function MainNavbarContainer({ <MainNavbarView {...props} bookmarks={bookmarks} + isAdmin={isAdmin} isOpen={isOpen} currentUser={currentUser} collections={collectionTree} diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarView.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarView.tsx index 75e1ae138316591eb26075e1f684b63aacb36972..f81d48a6fc3a69bfab774474f99342a3cde3145b 100644 --- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarView.tsx +++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarView.tsx @@ -40,6 +40,7 @@ interface CollectionTreeItem extends Collection { } type Props = { + isAdmin: boolean; isOpen: boolean; currentUser: User; bookmarks: BookmarksType; @@ -65,6 +66,7 @@ const ARCHIVE_URL = "/archive"; const ADD_YOUR_OWN_DATA_URL = "/admin/databases/create"; function MainNavbarView({ + isAdmin, isOpen, currentUser, bookmarks, @@ -147,7 +149,7 @@ function MainNavbarView({ > {t`Browse data`} </BrowseLink> - {!hasOwnDatabase && ( + {!hasOwnDatabase && isAdmin && ( <AddYourOwnDataLink icon="add" url={ADD_YOUR_OWN_DATA_URL}