opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-29 23:52:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

PublicDashboards: Show email sharing feature depending on featureEnabled flag (#64555)

Browse Source
This commit is contained in:
juanicabanas
2023-03-09 16:58:29 -03:00
committed by GitHub
parent f9b5dbb473
commit a134b47e01
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/grafana-e2e-selectors/src/selectors/pages.ts
View File

@ -201,6 +201,7 @@ export const Pages = {
NoUpsertPermissionsWarningAlert: 'data-testid public dashboard no upsert permissions alert',
EnableTimeRangeSwitch: 'data-testid public dashboard on off switch for time range',
EmailSharingConfiguration: {
Container: 'data-testid email sharing config container',
ShareType: 'data-testid public dashboard share type',
EmailSharingInput: 'data-testid public dashboard email sharing input',
EmailSharingInviteButton: 'data-testid public dashboard email sharing invite button',

5
public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/ConfigPublicDashboard.tsx
View File

@ -4,9 +4,8 @@ import React, { useContext } from 'react';
import { useForm } from 'react-hook-form';
import { GrafanaTheme2 } from '@grafana/data/src';
import { GrafanaEdition } from '@grafana/data/src/types/config';
import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src';
import { config, reportInteraction } from '@grafana/runtime/src';
import { config, featureEnabled, reportInteraction } from '@grafana/runtime/src';
import {
ClipboardButton,
Field,
@ -55,7 +54,7 @@ const ConfigPublicDashboard = () => {
const hasWritePermissions = contextSrv.hasAccess(AccessControlAction.DashboardsPublicWrite, isOrgAdmin());
const hasEmailSharingEnabled =
config.licenseInfo.edition === GrafanaEdition.Enterprise && !!config.featureToggles.publicDashboardsEmailSharing;
!!config.featureToggles.publicDashboardsEmailSharing && featureEnabled('publicDashboardsEmailSharing');
const dashboardState = useSelector((store) => store.dashboard);
const dashboard = dashboardState.getModel()!;
const dashboardVariables = dashboard.getVariables();

2
public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/EmailSharingConfiguration.tsx
View File

@ -144,7 +144,7 @@ export const EmailSharingConfiguration = () => {
};
return (
<form className={styles.container} onSubmit={handleSubmit(onSubmit)}>
<form data-testid={selectors.Container} className={styles.container} onSubmit={handleSubmit(onSubmit)}>
<Field label="Can view dashboard">
<InputControl
name="shareType"