From fa531a6f0537ad1528f7cf25cc5fd5b5bee27c8b Mon Sep 17 00:00:00 2001 From: Maxim Mordasov Date: Tue, 2 Jan 2024 16:36:36 +0300 Subject: [PATCH] fix isChatOpsConfigured fn --- .../IntegrationTemplatesList.config.ts | 2 +- grafana-plugin/src/containers/UserSettings/parts/index.tsx | 5 ++--- grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx | 6 +++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/grafana-plugin/src/containers/IntegrationContainers/IntegrationTemplatesList.config.ts b/grafana-plugin/src/containers/IntegrationContainers/IntegrationTemplatesList.config.ts index 163bb44914..0b5c6bdd82 100644 --- a/grafana-plugin/src/containers/IntegrationContainers/IntegrationTemplatesList.config.ts +++ b/grafana-plugin/src/containers/IntegrationContainers/IntegrationTemplatesList.config.ts @@ -3,7 +3,7 @@ import { AppFeature } from 'state/features'; import { TemplateBlock, commonTemplatesToRender } from './IntegrationCommonTemplatesList.config'; -let additionalTemplatesToRender: TemplateBlock[] = [ +const additionalTemplatesToRender: TemplateBlock[] = [ { name: 'MS Teams', contents: [ diff --git a/grafana-plugin/src/containers/UserSettings/parts/index.tsx b/grafana-plugin/src/containers/UserSettings/parts/index.tsx index 4dc84aaf7f..0517470dca 100644 --- a/grafana-plugin/src/containers/UserSettings/parts/index.tsx +++ b/grafana-plugin/src/containers/UserSettings/parts/index.tsx @@ -8,6 +8,8 @@ import Block from 'components/GBlock/Block'; import MobileAppConnection from 'containers/MobileAppConnection/MobileAppConnection'; import { UserSettingsTab } from 'containers/UserSettings/UserSettings.types'; import { SlackTab } from 'containers/UserSettings/parts/tabs//SlackTab/SlackTab'; +import CloudPhoneSettings from 'containers/UserSettings/parts/tabs/CloudPhoneSettings/CloudPhoneSettings'; +import MSTeamsInfo from 'containers/UserSettings/parts/tabs/MSTeamsInfo/MSTeamsInfo'; import { NotificationSettingsTab } from 'containers/UserSettings/parts/tabs/NotificationSettingsTab'; import PhoneVerification from 'containers/UserSettings/parts/tabs/PhoneVerification/PhoneVerification'; import TelegramInfo from 'containers/UserSettings/parts/tabs/TelegramInfo/TelegramInfo'; @@ -16,9 +18,6 @@ import { User } from 'models/user/user.types'; import { AppFeature } from 'state/features'; import { useStore } from 'state/useStore'; -import CloudPhoneSettings from './tabs/CloudPhoneSettings/CloudPhoneSettings'; -import MSTeamsInfo from './tabs/MSTeamsInfo/MSTeamsInfo'; - import styles from 'containers/UserSettings/parts/index.module.css'; const cx = cn.bind(styles); diff --git a/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx b/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx index 7024492c6f..08ec2f869b 100644 --- a/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx +++ b/grafana-plugin/src/pages/settings/tabs/ChatOps/ChatOps.tsx @@ -85,7 +85,11 @@ class ChatOpsPage extends React.Component { isChatOpsConfigured(): boolean { const { store } = this.props; - return store.hasFeature(AppFeature.Slack) || store.hasFeature(AppFeature.Telegram); + return ( + store.hasFeature(AppFeature.Slack) || + store.hasFeature(AppFeature.Telegram) || + store.hasFeature(AppFeature.MsTeams) + ); } handleChatopsTabChange(tab: ChatOpsTab) {