-
Notifications
You must be signed in to change notification settings - Fork 13.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: update Permissions for right nav #19051
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
9c552da
draft pr
AAfghahi 6b1f983
finished styling
AAfghahi 9c7fc73
add filter
eschutho 88502e8
added testing
AAfghahi 7d2f133
added tests
AAfghahi 9d84651
added permissions tests
AAfghahi 24550ec
Empty-Commit
AAfghahi 9d373d1
new test
AAfghahi a0f9d14
Update superset-frontend/src/views/components/MenuRight.tsx
AAfghahi 1a64b74
revisions
AAfghahi f5cea78
Merge branch 'ch36353_upload_menus' of ssh://github.com/preset-io/sup…
AAfghahi 75e6ee7
added to CRUD view
AAfghahi 0d2ec22
Merge branch 'master' into ch36353_upload_menus
AAfghahi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,12 +16,20 @@ | |
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
import React, { Fragment, useState } from 'react'; | ||
import React, { Fragment, useState, useEffect } from 'react'; | ||
import rison from 'rison'; | ||
import { MainNav as Menu } from 'src/components/Menu'; | ||
import { t, styled, css, SupersetTheme } from '@superset-ui/core'; | ||
import { | ||
t, | ||
styled, | ||
css, | ||
SupersetTheme, | ||
SupersetClient, | ||
} from '@superset-ui/core'; | ||
import { Tooltip } from 'src/components/Tooltip'; | ||
import { Link } from 'react-router-dom'; | ||
import Icons from 'src/components/Icons'; | ||
import findPermission from 'src/dashboard/util/findPermission'; | ||
import findPermission, { isUserAdmin } from 'src/dashboard/util/findPermission'; | ||
import { useSelector } from 'react-redux'; | ||
import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes'; | ||
import LanguagePicker from './LanguagePicker'; | ||
|
@@ -45,6 +53,15 @@ const StyledI = styled.div` | |
color: ${({ theme }) => theme.colors.primary.dark1}; | ||
`; | ||
|
||
const styledDisabled = (theme: SupersetTheme) => css` | ||
color: ${theme.colors.grayscale.base}; | ||
backgroundColor: ${theme.colors.grayscale.light2}}; | ||
.ant-menu-item:hover { | ||
color: ${theme.colors.grayscale.base}; | ||
cursor: default; | ||
} | ||
`; | ||
|
||
const StyledDiv = styled.div<{ align: string }>` | ||
display: flex; | ||
flex-direction: row; | ||
|
@@ -69,9 +86,11 @@ const RightMenu = ({ | |
navbarRight, | ||
isFrontendRoute, | ||
}: RightMenuProps) => { | ||
const { roles } = useSelector<any, UserWithPermissionsAndRoles>( | ||
const user = useSelector<any, UserWithPermissionsAndRoles>( | ||
state => state.user, | ||
); | ||
|
||
const { roles } = user; | ||
const { | ||
CSV_EXTENSIONS, | ||
COLUMNAR_EXTENSIONS, | ||
|
@@ -96,6 +115,9 @@ const RightMenu = ({ | |
|
||
const canUpload = canUploadCSV || canUploadColumnar || canUploadExcel; | ||
const showActionDropdown = canSql || canChart || canDashboard; | ||
const [allowUploads, setAllowUploads] = useState<boolean>(false); | ||
const isAdmin = isUserAdmin(user); | ||
const showUploads = allowUploads || isAdmin; | ||
const dropdownItems: MenuObjectProps[] = [ | ||
{ | ||
label: t('Data'), | ||
|
@@ -115,19 +137,19 @@ const RightMenu = ({ | |
label: t('Upload CSV to database'), | ||
name: 'Upload a CSV', | ||
url: '/csvtodatabaseview/form', | ||
perm: canUploadCSV, | ||
perm: CSV_EXTENSIONS && showUploads, | ||
}, | ||
{ | ||
label: t('Upload columnar file to database'), | ||
name: 'Upload a Columnar file', | ||
url: '/columnartodatabaseview/form', | ||
perm: canUploadColumnar, | ||
perm: COLUMNAR_EXTENSIONS && showUploads, | ||
}, | ||
{ | ||
label: t('Upload Excel file to database'), | ||
name: 'Upload Excel', | ||
url: '/exceltodatabaseview/form', | ||
perm: canUploadExcel, | ||
perm: EXCEL_EXTENSIONS && showUploads, | ||
}, | ||
], | ||
}, | ||
|
@@ -154,6 +176,21 @@ const RightMenu = ({ | |
}, | ||
]; | ||
|
||
const hasFileUploadEnabled = () => { | ||
const payload = { | ||
filters: [ | ||
{ col: 'allow_file_upload', opr: 'upload_is_enabled', value: true }, | ||
], | ||
}; | ||
SupersetClient.get({ | ||
endpoint: `/api/v1/database/?q=${rison.encode(payload)}`, | ||
}).then(({ json }: Record<string, any>) => { | ||
setAllowUploads(json.count >= 1); | ||
}); | ||
}; | ||
|
||
useEffect(() => hasFileUploadEnabled(), []); | ||
|
||
const menuIconAndLabel = (menu: MenuObjectProps) => ( | ||
<> | ||
<i data-test={`menu-item-${menu.label}`} className={`fa ${menu.icon}`} /> | ||
|
@@ -175,14 +212,47 @@ const RightMenu = ({ | |
setShowModal(false); | ||
}; | ||
|
||
const isDisabled = isAdmin && !allowUploads; | ||
|
||
const tooltipText = t( | ||
"Enable 'Allow data upload' in any database's settings", | ||
); | ||
|
||
const buildMenuItem = (item: Record<string, any>) => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. awesome! so glad you split this out |
||
const disabledText = isDisabled && item.url; | ||
return disabledText ? ( | ||
<Menu.Item key={item.name} css={styledDisabled}> | ||
<Tooltip placement="top" title={tooltipText}> | ||
{item.label} | ||
</Tooltip> | ||
</Menu.Item> | ||
) : ( | ||
<Menu.Item key={item.name}> | ||
{item.url ? <a href={item.url}> {item.label} </a> : item.label} | ||
</Menu.Item> | ||
); | ||
}; | ||
|
||
const onMenuOpen = (openKeys: string[]) => { | ||
if (openKeys.length) { | ||
return hasFileUploadEnabled(); | ||
} | ||
return null; | ||
}; | ||
|
||
return ( | ||
<StyledDiv align={align}> | ||
<DatabaseModal | ||
onHide={handleOnHideModal} | ||
show={showModal} | ||
dbEngine={engine} | ||
/> | ||
<Menu selectable={false} mode="horizontal" onClick={handleMenuSelection}> | ||
<Menu | ||
selectable={false} | ||
mode="horizontal" | ||
onClick={handleMenuSelection} | ||
onOpenChange={onMenuOpen} | ||
> | ||
{!navbarRight.user_is_anonymous && showActionDropdown && ( | ||
<SubMenu | ||
data-test="new-dropdown" | ||
|
@@ -203,13 +273,7 @@ const RightMenu = ({ | |
typeof item !== 'string' && item.name && item.perm ? ( | ||
<Fragment key={item.name}> | ||
{idx === 2 && <Menu.Divider />} | ||
<Menu.Item key={item.name}> | ||
{item.url ? ( | ||
<a href={item.url}> {item.label} </a> | ||
) : ( | ||
item.label | ||
)} | ||
</Menu.Item> | ||
{buildMenuItem(item)} | ||
</Fragment> | ||
) : null, | ||
)} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice like the dual perms checking!