Skip to content
Snippets Groups Projects
Unverified Commit c9de5ea3 authored by Gustavo Saiani's avatar Gustavo Saiani Committed by GitHub
Browse files

Do not render "Add your own data" button if user does not have permissions to...

Do not render "Add your own data" button if user does not have permissions to create database (#22339)
parent e06f9816
No related branches found
No related tags found
No related merge requests found
......@@ -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}
......
......@@ -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}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment