Merge main to dev

This commit is contained in:
Matias Bordese 2023-06-22 12:14:54 -03:00
commit 2739db0394
2 changed files with 10 additions and 4 deletions

View file

@ -61,6 +61,7 @@ import { MaintenanceType } from 'models/maintenance/maintenance.types';
import { INTEGRATION_TEMPLATES_LIST } from 'pages/integration_2/Integration2.config';
import IntegrationHelper from 'pages/integration_2/Integration2.helper';
import styles from 'pages/integration_2/Integration2.module.scss';
import { AppFeature } from 'state/features';
import { PageProps, SelectOption, WithStoreProps } from 'state/types';
import { useStore } from 'state/useStore';
import { withMobXProviderContext } from 'state/withStore';
@ -119,9 +120,15 @@ class Integration2 extends React.Component<Integration2Props, Integration2State>
} = this.props;
const {
store: { alertReceiveChannelStore },
store,
store: { alertReceiveChannelStore, telegramChannelStore },
} = this.props;
if (store.hasFeature(AppFeature.Telegram)) {
// workaround until we get the whole telegram data in response
telegramChannelStore.updateItems();
}
if (query?.template) {
this.openEditTemplateModal(query.template, query.routeId && query.routeId);
}

View file

@ -2,9 +2,8 @@ apiVersion: v2
name: oncall
description: Developer-friendly incident response with brilliant Slack integration
type: application
# version and appVersion are handled by CI, no need to change them manually
version: 1.2.41
appVersion: v1.2.41
version: 1.2.44
appVersion: v1.2.44
dependencies:
- name: cert-manager
version: v1.8.0