mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Share: Add invite user to the sharing menu (#97067)
Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com>
This commit is contained in:
parent
8c03caad88
commit
7bdf521ba3
@ -206,6 +206,9 @@ export const versionedPages = {
|
|||||||
shareSnapshot: {
|
shareSnapshot: {
|
||||||
'11.2.0': 'data-testid new share button share snapshot',
|
'11.2.0': 'data-testid new share button share snapshot',
|
||||||
},
|
},
|
||||||
|
inviteUser: {
|
||||||
|
'11.5.0': 'data-testid new share button invite user',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
NewExportButton: {
|
NewExportButton: {
|
||||||
|
@ -31,15 +31,17 @@ describe('ShareMenu', () => {
|
|||||||
Object.defineProperty(contextSrv, 'isSignedIn', {
|
Object.defineProperty(contextSrv, 'isSignedIn', {
|
||||||
value: true,
|
value: true,
|
||||||
});
|
});
|
||||||
grantUserPermissions([AccessControlAction.SnapshotsCreate]);
|
grantUserPermissions([AccessControlAction.SnapshotsCreate, AccessControlAction.OrgUsersAdd]);
|
||||||
|
|
||||||
config.publicDashboardsEnabled = true;
|
config.publicDashboardsEnabled = true;
|
||||||
config.snapshotEnabled = true;
|
config.snapshotEnabled = true;
|
||||||
|
config.externalUserMngLinkUrl = 'http://localhost:3000';
|
||||||
setup({ meta: { canEdit: true } });
|
setup({ meta: { canEdit: true } });
|
||||||
|
|
||||||
expect(await screen.findByTestId(selector.shareInternally)).toBeInTheDocument();
|
expect(await screen.findByTestId(selector.shareInternally)).toBeInTheDocument();
|
||||||
expect(await screen.findByTestId(selector.shareExternally)).toBeInTheDocument();
|
expect(await screen.findByTestId(selector.shareExternally)).toBeInTheDocument();
|
||||||
expect(await screen.findByTestId(selector.shareSnapshot)).toBeInTheDocument();
|
expect(await screen.findByTestId(selector.shareSnapshot)).toBeInTheDocument();
|
||||||
|
expect(await screen.findByTestId(selector.inviteUser)).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not share externally when public dashboard is disabled', async () => {
|
it('should not share externally when public dashboard is disabled', async () => {
|
||||||
@ -49,6 +51,24 @@ describe('ShareMenu', () => {
|
|||||||
expect(screen.queryByTestId(selector.shareExternally)).not.toBeInTheDocument();
|
expect(screen.queryByTestId(selector.shareExternally)).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should not render invite user when user does not have access', async () => {
|
||||||
|
Object.defineProperty(contextSrv, 'isSignedIn', {
|
||||||
|
value: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(await screen.queryByTestId(selector.inviteUser)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should not render invite user when externalUserMngLinkUrl is not provided', async () => {
|
||||||
|
Object.defineProperty(contextSrv, 'isSignedIn', {
|
||||||
|
value: true,
|
||||||
|
});
|
||||||
|
grantUserPermissions([AccessControlAction.OrgUsersAdd]);
|
||||||
|
config.externalUserMngLinkUrl = '';
|
||||||
|
|
||||||
|
expect(await screen.queryByTestId(selector.inviteUser)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
describe('ShareSnapshot', () => {
|
describe('ShareSnapshot', () => {
|
||||||
it('should not share snapshot when user is not signed in', async () => {
|
it('should not share snapshot when user is not signed in', async () => {
|
||||||
config.snapshotEnabled = true;
|
config.snapshotEnabled = true;
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
|
import { css } from '@emotion/css';
|
||||||
import { useCallback } from 'react';
|
import { useCallback } from 'react';
|
||||||
|
import * as React from 'react';
|
||||||
|
|
||||||
|
import { GrafanaTheme2 } from '@grafana/data';
|
||||||
import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
|
import { selectors as e2eSelectors } from '@grafana/e2e-selectors';
|
||||||
import { config, locationService } from '@grafana/runtime';
|
import { config, locationService } from '@grafana/runtime';
|
||||||
import { VizPanel } from '@grafana/scenes';
|
import { VizPanel } from '@grafana/scenes';
|
||||||
import { IconName, Menu } from '@grafana/ui';
|
import { Icon, IconName, Menu, useStyles2 } from '@grafana/ui';
|
||||||
import { contextSrv } from 'app/core/core';
|
import { contextSrv } from 'app/core/core';
|
||||||
import { t } from 'app/core/internationalization';
|
import { t } from 'app/core/internationalization';
|
||||||
import { AccessControlAction } from 'app/types';
|
import { AccessControlAction } from 'app/types';
|
||||||
@ -23,6 +26,9 @@ export interface ShareDrawerMenuItem {
|
|||||||
icon: IconName;
|
icon: IconName;
|
||||||
renderCondition: boolean;
|
renderCondition: boolean;
|
||||||
onClick: (d: DashboardScene) => void;
|
onClick: (d: DashboardScene) => void;
|
||||||
|
renderDividerAbove?: boolean;
|
||||||
|
component?: React.ComponentType;
|
||||||
|
className?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
let customShareDrawerItems: ShareDrawerMenuItem[] = [];
|
let customShareDrawerItems: ShareDrawerMenuItem[] = [];
|
||||||
@ -36,6 +42,7 @@ export function resetDashboardShareDrawerItems() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function ShareMenu({ dashboard, panel }: { dashboard: DashboardScene; panel?: VizPanel }) {
|
export default function ShareMenu({ dashboard, panel }: { dashboard: DashboardScene; panel?: VizPanel }) {
|
||||||
|
const styles = useStyles2(getStyles);
|
||||||
const onMenuItemClick = (shareView: string) => {
|
const onMenuItemClick = (shareView: string) => {
|
||||||
locationService.partial({ shareView });
|
locationService.partial({ shareView });
|
||||||
};
|
};
|
||||||
@ -63,8 +70,6 @@ export default function ShareMenu({ dashboard, panel }: { dashboard: DashboardSc
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
customShareDrawerItems.forEach((d) => menuItems.push(d));
|
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
shareId: shareDashboardType.snapshot,
|
shareId: shareDashboardType.snapshot,
|
||||||
testId: newShareButtonSelector.shareSnapshot,
|
testId: newShareButtonSelector.shareSnapshot,
|
||||||
@ -79,8 +84,24 @@ export default function ShareMenu({ dashboard, panel }: { dashboard: DashboardSc
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
customShareDrawerItems.forEach((d) => menuItems.push(d));
|
||||||
|
|
||||||
|
menuItems.push({
|
||||||
|
shareId: shareDashboardType.inviteUser,
|
||||||
|
testId: newShareButtonSelector.inviteUser,
|
||||||
|
icon: 'add-user',
|
||||||
|
label: t('share-dashboard.menu.invite-user-title', 'Invite new member'),
|
||||||
|
renderCondition: !!config.externalUserMngLinkUrl && contextSrv.hasPermission(AccessControlAction.OrgUsersAdd),
|
||||||
|
onClick: () => {
|
||||||
|
window.open(config.externalUserMngLinkUrl, '_blank');
|
||||||
|
},
|
||||||
|
renderDividerAbove: true,
|
||||||
|
component: () => <Icon name="external-link-alt" className={styles.inviteUserItemIcon} />,
|
||||||
|
className: styles.inviteUserItem,
|
||||||
|
});
|
||||||
|
|
||||||
return menuItems.filter((item) => item.renderCondition);
|
return menuItems.filter((item) => item.renderCondition);
|
||||||
}, [panel]);
|
}, [panel, styles]);
|
||||||
|
|
||||||
const onClick = (item: ShareDrawerMenuItem) => {
|
const onClick = (item: ShareDrawerMenuItem) => {
|
||||||
DashboardInteractions.sharingCategoryClicked({
|
DashboardInteractions.sharingCategoryClicked({
|
||||||
@ -94,15 +115,33 @@ export default function ShareMenu({ dashboard, panel }: { dashboard: DashboardSc
|
|||||||
return (
|
return (
|
||||||
<Menu data-testid={newShareButtonSelector.container}>
|
<Menu data-testid={newShareButtonSelector.container}>
|
||||||
{buildMenuItems().map((item) => (
|
{buildMenuItems().map((item) => (
|
||||||
<Menu.Item
|
<React.Fragment key={item.shareId}>
|
||||||
key={item.shareId}
|
{item.renderDividerAbove && <Menu.Divider />}
|
||||||
testId={item.testId}
|
<Menu.Item
|
||||||
label={item.label}
|
testId={item.testId}
|
||||||
icon={item.icon}
|
label={item.label}
|
||||||
description={item.description}
|
icon={item.icon}
|
||||||
onClick={() => onClick(item)}
|
description={item.description}
|
||||||
/>
|
component={item.component}
|
||||||
|
className={item.className}
|
||||||
|
onClick={() => onClick(item)}
|
||||||
|
/>
|
||||||
|
</React.Fragment>
|
||||||
))}
|
))}
|
||||||
</Menu>
|
</Menu>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getStyles = (theme: GrafanaTheme2) => {
|
||||||
|
return {
|
||||||
|
inviteUserItem: css({
|
||||||
|
display: 'flex',
|
||||||
|
justifyContent: 'start',
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'center',
|
||||||
|
}),
|
||||||
|
inviteUserItemIcon: css({
|
||||||
|
color: theme.colors.text.link,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
};
|
||||||
|
@ -180,4 +180,5 @@ export const shareDashboardType: {
|
|||||||
pdf: 'pdf',
|
pdf: 'pdf',
|
||||||
report: 'report',
|
report: 'report',
|
||||||
publicDashboard: 'public_dashboard',
|
publicDashboard: 'public_dashboard',
|
||||||
|
inviteUser: 'invite_user',
|
||||||
};
|
};
|
||||||
|
@ -2919,6 +2919,7 @@
|
|||||||
"share-dashboard": {
|
"share-dashboard": {
|
||||||
"menu": {
|
"menu": {
|
||||||
"export-json-title": "Export as JSON",
|
"export-json-title": "Export as JSON",
|
||||||
|
"invite-user-title": "Invite new member",
|
||||||
"share-externally-title": "Share externally",
|
"share-externally-title": "Share externally",
|
||||||
"share-internally-title": "Share internally",
|
"share-internally-title": "Share internally",
|
||||||
"share-snapshot-title": "Share snapshot"
|
"share-snapshot-title": "Share snapshot"
|
||||||
|
@ -2919,6 +2919,7 @@
|
|||||||
"share-dashboard": {
|
"share-dashboard": {
|
||||||
"menu": {
|
"menu": {
|
||||||
"export-json-title": "Ēχpőřŧ äş ĴŜØŃ",
|
"export-json-title": "Ēχpőřŧ äş ĴŜØŃ",
|
||||||
|
"invite-user-title": "Ĩʼnvįŧę ʼnęŵ męmþęř",
|
||||||
"share-externally-title": "Ŝĥäřę ęχŧęřʼnäľľy",
|
"share-externally-title": "Ŝĥäřę ęχŧęřʼnäľľy",
|
||||||
"share-internally-title": "Ŝĥäřę įʼnŧęřʼnäľľy",
|
"share-internally-title": "Ŝĥäřę įʼnŧęřʼnäľľy",
|
||||||
"share-snapshot-title": "Ŝĥäřę şʼnäpşĥőŧ"
|
"share-snapshot-title": "Ŝĥäřę şʼnäpşĥőŧ"
|
||||||
|
Loading…
Reference in New Issue
Block a user