diff --git a/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.helpers.tsx b/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.helpers.tsx index 983597c3..0f05c0d8 100644 --- a/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.helpers.tsx +++ b/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.helpers.tsx @@ -5,7 +5,7 @@ import { Team } from 'models/team/team.types'; import { SlackError } from './DefaultPageLayout.types'; -export function getSlackMessage(slackError: SlackError, team: Team) { +export function getSlackMessage(slackError: SlackError, team: Team, hasLiveSettingsFeature: boolean) { if (slackError === SlackError.WRONG_WORKSPACE) { return ( <> @@ -30,8 +30,12 @@ export function getSlackMessage(slackError: SlackError, team: Team) { return ( <> An error has occurred with Slack authentication.{' '} - Check ENV variables related to Slack and try again - please. + {hasLiveSettingsFeature && ( + <> + Check ENV variables related to Slack and try + again please. + + )} ); } diff --git a/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.tsx b/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.tsx index 95d6d253..d40b3a26 100644 --- a/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.tsx +++ b/grafana-plugin/src/containers/DefaultPageLayout/DefaultPageLayout.tsx @@ -9,6 +9,7 @@ import { observer } from 'mobx-react'; import PluginLink from 'components/PluginLink/PluginLink'; import { getIfChatOpsConnected } from 'containers/DefaultPageLayout/helper'; +import { AppFeature } from 'state/features'; import { useStore } from 'state/useStore'; import { UserAction } from 'state/userAction'; import { GRAFANA_LICENSE_OSS } from 'utils/consts'; @@ -79,7 +80,11 @@ const DefaultPageLayout: FC = observer((props) => { // @ts-ignore title="Slack integration warning" > - {getSlackMessage(showSlackInstallAlert, store.teamStore.currentTeam)} + {getSlackMessage( + showSlackInstallAlert, + store.teamStore.currentTeam, + store.hasFeature(AppFeature.LiveSettings) + )} )} {currentTeam?.banner.title != null && !getItem(currentTeam?.banner.title) && ( diff --git a/grafana-plugin/src/containers/UserSettings/parts/tabs/TelegramInfo/TelegramInfo.tsx b/grafana-plugin/src/containers/UserSettings/parts/tabs/TelegramInfo/TelegramInfo.tsx index f0750886..3c186429 100644 --- a/grafana-plugin/src/containers/UserSettings/parts/tabs/TelegramInfo/TelegramInfo.tsx +++ b/grafana-plugin/src/containers/UserSettings/parts/tabs/TelegramInfo/TelegramInfo.tsx @@ -95,9 +95,11 @@ const TelegramInfo = observer((_props: TelegramInfoProps) => { - - - + {store.hasFeature(AppFeature.LiveSettings) && ( + + + + )} )}