centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes after review and change incident word

Browse source
This commit is contained in:
Yulia Shanyrova 2022-10-26 14:13:26 +02:00
parent 68afc87a0e
commit f2a780c4fa
5 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grafana-plugin/src/containers/SlackInstructions/SlackInstructions.tsx
View file

@ -23,7 +23,7 @@ const SlackInstructions: FC<SlackInstructionsProps> = observer((props) => {
<Block bordered withBackground className={cx('slack-infoblock')}>
<VerticalGroup align="center" spacing="lg">
<SlackNewIcon />
<Text>You can manage incidents in your Slack workspace. </Text>
<Text>You can manage alert groups in your Slack workspace. </Text>
<Text>Before start you need to connect your Slack bot to Grafana OnCall.</Text>
<Text type="secondary">
For bot creating instructions and additional information please read{' '}

2
grafana-plugin/src/containers/UserSettings/parts/tabs/SlackTab/SlackTab.tsx
View file

@ -25,7 +25,7 @@ export const SlackTab = () => {
<VerticalGroup align="center" spacing="lg">
<SlackNewIcon />
<Text>
Personal Slack connection will allow you to manage incidents in your connected team Internal Slack
Personal Slack connection will allow you to manage alert grouops in your connected team Internal Slack
workspace.
</Text>
<Text>To setup personal Slack click the button below, choose workspace and click Allow.</Text>

2
grafana-plugin/src/containers/UserSettings/parts/tabs/TelegramInfo/TelegramInfo.tsx
View file

@ -82,7 +82,7 @@ const TelegramInfo = observer((props: TelegramInfoProps) => {
<Block bordered withBackground className={cx('telegram-infoblock')}>
<VerticalGroup align="center" spacing="lg">
<TelegramColorIcon />
<Text>You can manage incidents in your team Telegram channel or from personal direct messages. </Text>
<Text>You can manage alert groups in your team Telegram channel or from personal direct messages. </Text>
<Text>
To connect channel setup Telegram environment first, which includes connection to your bot and host URL.

24
grafana-plugin/src/pages/chat-ops/parts/tabs/SlackSettings/SlackSettings.tsx
View file

@ -36,8 +36,9 @@ class SlackSettings extends Component<SlackProps, SlackState> {
};
componentDidMount() {
this.getSlackLiveSettings();
this.update();
this.getSlackLiveSettings().then(() => {
this.update();
});
}
handleOpenSlackInstructions = () => {
@ -54,14 +55,14 @@ class SlackSettings extends Component<SlackProps, SlackState> {
getSlackLiveSettings = async () => {
const { store } = this.props;
const slackClientOAUTH = await store.globalSettingStore.getGlobalSettingItemByName('SLACK_CLIENT_OAUTH_ID');
const slackClientOAUTHSecret = await store.globalSettingStore.getGlobalSettingItemByName(
'SLACK_CLIENT_OAUTH_SECRET'
const results = await store.globalSettingStore.getAll();
const slackClientOAUTH = results.find((element: { name: string }) => element.name === 'SLACK_CLIENT_OAUTH_ID');
const slackClientOAUTHSecret = results.find(
(element: { name: string }) => element.name === 'SLACK_CLIENT_OAUTH_SECRET'
);
const slackRedirectHost = await store.globalSettingStore.getGlobalSettingItemByName(
'SLACK_INSTALL_RETURN_REDIRECT_HOST'
);
const slackSigningSecret = await store.globalSettingStore.getGlobalSettingItemByName('SLACK_SIGNING_SECRET');
const slackRedirectHost = results.find((element: { name: string }) => element.name === 'SLACK_CLIENT_OAUTH_ID');
const slackSigningSecret = results.find((element: { name: string }) => element.name === 'SLACK_SIGNING_SECRET');
if (
slackClientOAUTH?.error ||
@ -221,6 +222,7 @@ class SlackSettings extends Component<SlackProps, SlackState> {
const { store } = this.props;
const { showENVVariablesButton } = this.state;
const isLiveSettingAvailable = store.hasFeature(AppFeature.LiveSettings) && showENVVariablesButton;
return (
<VerticalGroup spacing="lg">
<Text.Title level={2}>Connect Slack workspace</Text.Title>
@ -230,11 +232,11 @@ class SlackSettings extends Component<SlackProps, SlackState> {
<SlackNewIcon />
</div>
<Text className={cx('infoblock-text')}>
Slack connection will allow you to manage incidents in your team Slack workspace.
Slack connection will allow you to manage alert groups in your team Slack workspace.
</Text>
<Text className={cx('infoblock-text')}>
After a basic workspace connection your team members need to connect their personal Slack accounts in
order to be allowed to manage incidents.
order to be allowed to manage alert groups.
</Text>
{isLiveSettingAvailable && (
<Text type="secondary" className={cx('infoblock-text')}>

6
grafana-plugin/src/pages/chat-ops/parts/tabs/TelegramSettings/TelegramSettings.tsx
View file

@ -57,7 +57,7 @@ class TelegramSettings extends Component<TelegramProps, TelegramState> {
<TelegramColorIcon />
</div>
<Text className={cx('infoblock-text')}>
You can manage incidents in your team Telegram channel or from personal direct messages.{' '}
You can manage alert groups in your team Telegram channel or from personal direct messages.{' '}
</Text>
<Text className={cx('infoblock-text')}>
@ -92,7 +92,7 @@ class TelegramSettings extends Component<TelegramProps, TelegramState> {
<TelegramColorIcon />
</div>
<Text className={cx('infoblock-text')}>
You can manage incidents in your team Telegram channel or from personal direct messages.{' '}
You can manage alert groups in your team Telegram channel or from personal direct messages.{' '}
</Text>
<Text type="secondary" className={cx('infoblock-text')}>
More details in{' '}
@ -109,7 +109,7 @@ class TelegramSettings extends Component<TelegramProps, TelegramState> {
<li>discuss alerts in comments</li>
<li>notifications to users accounts will be served as links to the main channel</li>
</ul>
Make sure your team connects Telegram in their OnCall user profiles too or they cannot manage incidents.
Make sure your team connects Telegram in their OnCall user profiles too or they cannot manage alert groups.
</Text>
<HorizontalGroup>
<TelegramIntegrationButton size="md" onUpdate={this.update} />