From f862d0342b041f3a0b053b8577d57c23db035208 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Thu, 8 Sep 2022 15:11:38 +0300 Subject: [PATCH 01/66] added helper to reuse wrong team handling functionality --- .../NotFoundInTeam/WrongTeam.helpers.tsx | 23 +++++++++++++++++++ .../src/pages/incident/Incident.tsx | 19 ++------------- .../src/pages/incidents/Incidents.tsx | 7 ++---- 3 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx b/grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx new file mode 100644 index 00000000..176cbf29 --- /dev/null +++ b/grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx @@ -0,0 +1,23 @@ +interface WrongTeamResponse { + notFound?: boolean; + wrongTeamError?: boolean; + teamToSwitch?: { name: string; id: string }; + wrongTeamNoPermissions?: boolean; +} + +export function getWrongTeamResponseInfo({ response }): WrongTeamResponse { + if (response) { + if (response.status === 404) { + return { notFound: true }; + } else if (response.status === 403 && response.data.error_code === 'wrong_team') { + let res = response.data; + if (res.owner_team) { + return { wrongTeamError: true, teamToSwitch: { name: res.owner_team.name, id: res.owner_team.id } }; + } else { + return { wrongTeamError: true, wrongTeamNoPermissions: true }; + } + } + } + + return { notFound: true }; +} diff --git a/grafana-plugin/src/pages/incident/Incident.tsx b/grafana-plugin/src/pages/incident/Incident.tsx index ca4eb213..ae8c3574 100644 --- a/grafana-plugin/src/pages/incident/Incident.tsx +++ b/grafana-plugin/src/pages/incident/Incident.tsx @@ -27,6 +27,7 @@ import Collapse from 'components/Collapse/Collapse'; import Block from 'components/GBlock/Block'; import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; import PluginLink from 'components/PluginLink/PluginLink'; import SourceCode from 'components/SourceCode/SourceCode'; import Text from 'components/Text/Text'; @@ -98,23 +99,7 @@ class IncidentPage extends React.Component query: { id }, } = this.props; - store.alertGroupStore.getAlert(id).catch((error) => { - if (error.response) { - if (error.response.status === 404) { - this.setState({ notFound: true }); - } else if (error.response.status === 403 && error.response.data.error_code === 'wrong_team') { - let res = error.response.data; - if (res.owner_team) { - this.setState({ wrongTeamError: true, teamToSwitch: { name: res.owner_team.name, id: res.owner_team.id } }); - } else { - this.setState({ wrongTeamError: true, wrongTeamNoPermissions: true }); - } - return; - } - } - - this.setState({ notFound: true }); - }); + store.alertGroupStore.getAlert(id).catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); }; render() { diff --git a/grafana-plugin/src/pages/incidents/Incidents.tsx b/grafana-plugin/src/pages/incidents/Incidents.tsx index e2839858..d24f2f30 100644 --- a/grafana-plugin/src/pages/incidents/Incidents.tsx +++ b/grafana-plugin/src/pages/incidents/Incidents.tsx @@ -3,14 +3,12 @@ import React, { ReactElement, SyntheticEvent } from 'react'; import { AppRootProps } from '@grafana/data'; import { getLocationSrv } from '@grafana/runtime'; import { Button, Icon, Tooltip, VerticalGroup, LoadingPlaceholder, HorizontalGroup } from '@grafana/ui'; -import { capitalCase } from 'change-case'; import cn from 'classnames/bind'; import { get } from 'lodash-es'; import { observer } from 'mobx-react'; import moment from 'moment'; import Emoji from 'react-emoji-render'; -import CardButton from 'components/CardButton/CardButton'; import CursorPagination from 'components/CursorPagination/CursorPagination'; import GTable from 'components/GTable/GTable'; import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; @@ -21,12 +19,11 @@ import { TutorialStep } from 'components/Tutorial/Tutorial.types'; import { IncidentsFiltersType } from 'containers/IncidentsFilters/IncidentFilters.types'; import IncidentsFilters from 'containers/IncidentsFilters/IncidentsFilters'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; -import { MaintenanceIntegration } from 'models/alert_receive_channel'; -import { Alert, Alert as AlertType, AlertAction, IncidentStatus } from 'models/alertgroup/alertgroup.types'; +import { Alert, Alert as AlertType, AlertAction } from 'models/alertgroup/alertgroup.types'; import { User } from 'models/user/user.types'; import { getActionButtons, getIncidentStatusTag, renderRelatedUsers } from 'pages/incident/Incident.helpers'; import { move } from 'state/helpers'; -import { SelectOption, WithStoreProps } from 'state/types'; +import { WithStoreProps } from 'state/types'; import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; From 3e5d9e3fcd77cc4217ed29bf8dc71d1c0512bb61 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 9 Sep 2022 13:59:59 +0300 Subject: [PATCH 02/66] handling for escalation chains for wrong team --- grafana-plugin/src/models/base_store.ts | 8 ++- .../escalation_chain/escalation_chain.ts | 16 ++++- grafana-plugin/src/models/user/user.ts | 4 +- grafana-plugin/src/network/index.ts | 20 +++++++ .../escalation-chains/EscalationChains.tsx | 60 ++++++++++++------- .../src/pages/integrations/Integrations.tsx | 10 ++++ grafana-plugin/src/pages/users/Users.tsx | 44 ++++++++++---- 7 files changed, 122 insertions(+), 40 deletions(-) diff --git a/grafana-plugin/src/models/base_store.ts b/grafana-plugin/src/models/base_store.ts index ab46fe3c..90e6a76e 100644 --- a/grafana-plugin/src/models/base_store.ts +++ b/grafana-plugin/src/models/base_store.ts @@ -13,7 +13,9 @@ export default class BaseStore { this.rootStore = rootStore; } - onApiError(error: any) { + onApiError(error: any, skipErrorHandling: boolean = false) { + if (skipErrorHandling) throw error + if (error.response.status >= 400 && error.response.status < 500) { const payload = error.response.data; const text = @@ -37,10 +39,10 @@ export default class BaseStore { } @action - async getById(id: string) { + async getById(id: string, skipErrorHandling: boolean = false) { return await makeRequest(`${this.path}${id}/`, { method: 'GET', - }).catch(this.onApiError); + }).catch((error) => this.onApiError(error, skipErrorHandling)); } @action diff --git a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts index b0e7a4e7..820473a5 100644 --- a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts +++ b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts @@ -22,6 +22,18 @@ export class EscalationChainStore extends BaseStore { this.path = '/escalation_chains/'; } + @action + async loadItem(id: EscalationChain['id'], skipErrorHandling: boolean = false) { + const escalationChain = await this.getById(id, skipErrorHandling); + + this.items = { + ...this.items, + [id]: escalationChain + } + + return escalationChain + } + @action async updateById(id: EscalationChain['id']) { const response = await this.getById(id); @@ -53,9 +65,9 @@ export class EscalationChainStore extends BaseStore { } @action - async updateItems(query = '') { + async updateItems(query = '', id?: string) { const results = await makeRequest(`${this.path}`, { - params: { search: query }, + params: { search: query, id }, }); this.items = { diff --git a/grafana-plugin/src/models/user/user.ts b/grafana-plugin/src/models/user/user.ts index 2a388913..c1961844 100644 --- a/grafana-plugin/src/models/user/user.ts +++ b/grafana-plugin/src/models/user/user.ts @@ -60,8 +60,8 @@ export class UserStore extends BaseStore { } @action - async loadUser(userPk: User['pk']) { - const user = await this.getById(userPk); + async loadUser(userPk: User['pk'], skipErrorHandling: boolean = false) { + const user = await this.getById(userPk, skipErrorHandling); this.items = { ...this.items, diff --git a/grafana-plugin/src/network/index.ts b/grafana-plugin/src/network/index.ts index aa35fb3b..96882fd1 100644 --- a/grafana-plugin/src/network/index.ts +++ b/grafana-plugin/src/network/index.ts @@ -30,11 +30,31 @@ interface RequestConfig { validateStatus?: (status: number) => boolean; } +const failPaths = [ + 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/users/URPAN2A31CVWQ/', + 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/escalation_chains/FDF7ZQMNKYIQK/', +]; + export const makeRequest = async (path: string, config: RequestConfig) => { const { method = 'GET', params, data, validateStatus } = config; const url = `${API_PROXY_PREFIX}${API_PATH_PREFIX}${path}`; + if (failPaths.includes(url)) { + throw { + response: { + status: 403, + data: { + error_code: 'wrong_team', + owner_team: { + name: 'Rares', + id: '14999718', + }, + }, + }, + }; + } + const response = await instance({ method, url, diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index 42920ba7..375d810c 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -2,17 +2,7 @@ import React from 'react'; import { AppRootProps } from '@grafana/data'; import { getLocationSrv } from '@grafana/runtime'; -import { - Alert, - Button, - EmptySearchResult, - HorizontalGroup, - Icon, - IconButton, - LoadingPlaceholder, - Tooltip, - VerticalGroup, -} from '@grafana/ui'; +import { Button, HorizontalGroup, Icon, IconButton, LoadingPlaceholder, Tooltip, VerticalGroup } from '@grafana/ui'; import cn from 'classnames/bind'; import { debounce } from 'lodash-es'; import { observer } from 'mobx-react'; @@ -21,28 +11,24 @@ import Collapse from 'components/Collapse/Collapse'; import EscalationsFilters from 'components/EscalationsFilters/EscalationsFilters'; import Block from 'components/GBlock/Block'; import GList from 'components/GList/GList'; -import IntegrationsFilters from 'components/IntegrationsFilters/IntegrationsFilters'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; import WithConfirm from 'components/WithConfirm/WithConfirm'; -import AlertReceiveChannelCard from 'containers/AlertReceiveChannelCard/AlertReceiveChannelCard'; import EscalationChainCard from 'containers/EscalationChainCard/EscalationChainCard'; import EscalationChainForm from 'containers/EscalationChainForm/EscalationChainForm'; import EscalationChainSteps from 'containers/EscalationChainSteps/EscalationChainSteps'; -import GSelect from 'containers/GSelect/GSelect'; -import { IntegrationSettingsTab } from 'containers/IntegrationSettings/IntegrationSettings.types'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; -import { AlertReceiveChannel } from 'models/alert_receive_channel'; -import { ChannelFilter } from 'models/channel_filter/channel_filter.types'; import { EscalationChain } from 'models/escalation_chain/escalation_chain.types'; -import { SelectOption, WithStoreProps } from 'state/types'; +import { WithStoreProps } from 'state/types'; import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; import { openWarningNotification } from 'utils'; import styles from './EscalationChains.module.css'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -53,6 +39,11 @@ interface EscalationChainsPageState { showCreateEscalationChainModal: boolean; escalationChainIdToCopy: EscalationChain['id']; selectedEscalationChain: EscalationChain['id']; + + notFound?: boolean; + wrongTeamError?: boolean; + teamToSwitch?: { name: string; id: string }; + wrongTeamNoPermissions?: boolean; } export interface Filters { @@ -66,13 +57,15 @@ class EscalationChainsPage extends React.Component { + parseQueryParams = async () => { const { store, query } = this.props; const { escalationChainsFilters: { searchTerm }, @@ -82,9 +75,14 @@ class EscalationChainsPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); + if (!escalationChain) return; + + escalationChain = escalationChainStore.items[query.id]; if (escalationChain) { selectedEscalationChain = escalationChain.id; } else { @@ -115,7 +113,7 @@ class EscalationChainsPage extends React.Component { const { store } = this.props; - return store.escalationChainStore.updateItems(); + return store.escalationChainStore.updateItems('', this.props.query.id); }; componentDidUpdate() {} @@ -127,8 +125,26 @@ class EscalationChainsPage extends React.Component + ); + } + const { escalationChainStore } = store; const searchResult = escalationChainStore.getSearchResult(escalationChainsFilters.searchTerm); diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index fa331dc5..235b0846 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -26,6 +26,7 @@ import { withMobXProviderContext } from 'state/withStore'; import { openWarningNotification } from 'utils'; import styles from './Integrations.module.css'; +import { convertRelativeToAbsoluteDate } from 'utils/datetime'; const cx = cn.bind(styles); @@ -34,6 +35,11 @@ interface IntegrationsState { showCreateIntegrationModal: boolean; alertReceiveChannelToShowSettings?: AlertReceiveChannel['id']; integrationSettingsTab?: IntegrationSettingsTab; + + notFound?: boolean; + wrongTeamError?: boolean; + teamToSwitch?: { name: string; id: string }; + wrongTeamNoPermissions?: boolean; } interface IntegrationsProps extends WithStoreProps, AppRootProps {} @@ -43,6 +49,9 @@ class Integrations extends React.Component state: IntegrationsState = { integrationsFilters: { searchTerm: '' }, showCreateIntegrationModal: false, + + wrongTeamError: false, + wrongTeamNoPermissions: false, }; alertReceiveChanneltoPoll: { [key: string]: number } = {}; @@ -65,6 +74,7 @@ class Integrations extends React.Component const searchResult = alertReceiveChannelStore.getSearchResult(); let selectedAlertReceiveChannel = store.selectedAlertReceiveChannel; + if (query.id) { const alertReceiveChannelId = searchResult && searchResult.find((res) => res.id === query?.id)?.id; if (alertReceiveChannelId) { diff --git a/grafana-plugin/src/pages/users/Users.tsx b/grafana-plugin/src/pages/users/Users.tsx index a8ab3c5b..01a8a6d9 100644 --- a/grafana-plugin/src/pages/users/Users.tsx +++ b/grafana-plugin/src/pages/users/Users.tsx @@ -14,10 +14,8 @@ import Text from 'components/Text/Text'; import UsersFilters from 'components/UsersFilters/UsersFilters'; import UserSettings from 'containers/UserSettings/UserSettings'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; -import { CrossCircleIcon } from 'icons'; import { getRole } from 'models/user/user.helpers'; -import { User, User as UserType, UserRole } from 'models/user/user.types'; -import { AppFeature } from 'state/features'; +import { User as UserType, UserRole } from 'models/user/user.types'; import { WithStoreProps } from 'state/types'; import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; @@ -25,6 +23,8 @@ import { withMobXProviderContext } from 'state/withStore'; import { getRealFilters, getUserRowClassNameFn } from './Users.helpers'; import styles from './Users.module.css'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -34,29 +34,38 @@ const ITEMS_PER_PAGE = 100; interface UsersState { page: number; + isWrongTeam: boolean; userPkToEdit?: UserType['pk'] | 'new'; usersFilters?: { searchTerm: string; roles?: UserRole[]; }; + + notFound?: boolean; + wrongTeamError?: boolean; + teamToSwitch?: { name: string; id: string }; + wrongTeamNoPermissions?: boolean; } @observer class Users extends React.Component { state: UsersState = { page: 1, + isWrongTeam: false, userPkToEdit: undefined, usersFilters: { searchTerm: '', roles: [UserRole.ADMIN, UserRole.EDITOR, UserRole.VIEWER], }, + + wrongTeamError: false, + wrongTeamNoPermissions: false, }; initialUsersLoaded = false; async componentDidMount() { const { - store, query: { p }, } = this.props; this.setState({ page: p ? Number(p) : 1 }, this.updateUsers); @@ -97,7 +106,9 @@ class Users extends React.Component { } = this.props; if (id) { - await (id === 'me' ? store.userStore.loadCurrentUser() : store.userStore.loadUser(String(id))); + await (id === 'me' ? store.userStore.loadCurrentUser() : store.userStore.loadUser(String(id), true)).catch( + (error) => this.setState({ ...getWrongTeamResponseInfo(error) }) + ); const userPkToEdit = String(id === 'me' ? store.userStore.currentUserPk : id); @@ -108,7 +119,7 @@ class Users extends React.Component { }; render() { - const { usersFilters, userPkToEdit, page } = this.state; + const { usersFilters, userPkToEdit, page, wrongTeamError, teamToSwitch, wrongTeamNoPermissions } = this.state; const { store } = this.props; const { userStore } = store; @@ -131,11 +142,6 @@ class Users extends React.Component { key: 'note', render: this.renderNote, }, - // { - // width: '15%', - // key: 'contacts', - // render: this.renderContacts, - // }, { width: '20%', title: 'Default Notifications', @@ -154,6 +160,7 @@ class Users extends React.Component { render: this.renderButtons, }, ]; + const handleClear = () => this.setState( { usersFilters: { searchTerm: '', roles: [UserRole.ADMIN, UserRole.EDITOR, UserRole.VIEWER] } }, @@ -164,6 +171,21 @@ class Users extends React.Component { const { count, results } = userStore.getSearchResult(); + if (wrongTeamError) { + const currentTeamId = store.userStore.currentUser?.current_team; + const currentTeamName = store.grafanaTeamStore.items[currentTeamId]?.name; + + return ( + + ); + } + return (
From f3edd92a77a2e44408c292715b31e8fdb059574c Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 9 Sep 2022 14:26:17 +0300 Subject: [PATCH 03/66] same for integrations --- .../alert_receive_channel.ts | 12 +++++++ .../escalation_chain/escalation_chain.ts | 2 +- grafana-plugin/src/network/index.ts | 1 + .../src/pages/integrations/Integrations.tsx | 35 ++++++++++++++++--- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts b/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts index 4e3ef3da..57b6f332 100644 --- a/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts +++ b/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts @@ -70,6 +70,18 @@ export class AlertReceiveChannelStore extends BaseStore { ); } + @action + async loadItem(id: AlertReceiveChannel['id'], skipErrorHandling: boolean = false): Promise { + const alertReceiveChannel = await this.getById(id, skipErrorHandling); + + this.items = { + ...this.items, + [id]: alertReceiveChannel + } + + return alertReceiveChannel + } + @action async updateItems(query = '') { const result = await this.getAll(query); diff --git a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts index 820473a5..dde0b3b4 100644 --- a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts +++ b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts @@ -23,7 +23,7 @@ export class EscalationChainStore extends BaseStore { } @action - async loadItem(id: EscalationChain['id'], skipErrorHandling: boolean = false) { + async loadItem(id: EscalationChain['id'], skipErrorHandling: boolean = false): Promise { const escalationChain = await this.getById(id, skipErrorHandling); this.items = { diff --git a/grafana-plugin/src/network/index.ts b/grafana-plugin/src/network/index.ts index 96882fd1..23fbd379 100644 --- a/grafana-plugin/src/network/index.ts +++ b/grafana-plugin/src/network/index.ts @@ -33,6 +33,7 @@ interface RequestConfig { const failPaths = [ 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/users/URPAN2A31CVWQ/', 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/escalation_chains/FDF7ZQMNKYIQK/', + 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/alert_receive_channels/CSPE3C7R4Q38G/', ]; export const makeRequest = async (path: string, config: RequestConfig) => { diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 235b0846..8cfaea82 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -7,6 +7,7 @@ import cn from 'classnames/bind'; import { debounce } from 'lodash-es'; import { observer } from 'mobx-react'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import GList from 'components/GList/GList'; import IntegrationsFilters, { Filters } from 'components/IntegrationsFilters/IntegrationsFilters'; import Text from 'components/Text/Text'; @@ -24,9 +25,9 @@ import { WithStoreProps } from 'state/types'; import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; import { openWarningNotification } from 'utils'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; import styles from './Integrations.module.css'; -import { convertRelativeToAbsoluteDate } from 'utils/datetime'; const cx = cn.bind(styles); @@ -67,7 +68,7 @@ class Integrations extends React.Component getLocationSrv().update({ partial: true, query: { id: alertReceiveChannelId } }); }; - parseQueryParams = () => { + parseQueryParams = async () => { const { store, query } = this.props; const { alertReceiveChannelStore } = store; @@ -76,14 +77,19 @@ class Integrations extends React.Component let selectedAlertReceiveChannel = store.selectedAlertReceiveChannel; if (query.id) { - const alertReceiveChannelId = searchResult && searchResult.find((res) => res.id === query?.id)?.id; - if (alertReceiveChannelId) { - selectedAlertReceiveChannel = alertReceiveChannelId; + let alertReceiveChannel = await alertReceiveChannelStore + .loadItem(query.id, true) + .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); + if (!alertReceiveChannel) return; + + if (alertReceiveChannel.id) { + selectedAlertReceiveChannel = alertReceiveChannel.id; } else { openWarningNotification( `Integration with id=${query?.id} is not found. Please select integration from the list.` ); } + if (query.tab) { this.setState({ integrationSettingsTab: query.tab }); this.setState({ alertReceiveChannelToShowSettings: query.id }); @@ -123,7 +129,26 @@ class Integrations extends React.Component alertReceiveChannelToShowSettings, integrationSettingsTab, showCreateIntegrationModal, + wrongTeamError, + teamToSwitch, + wrongTeamNoPermissions, } = this.state; + + if (wrongTeamError) { + const currentTeamId = store.userStore.currentUser?.current_team; + const currentTeamName = store.grafanaTeamStore.items[currentTeamId]?.name; + + return ( + + ); + } + const { alertReceiveChannelStore } = store; const searchResult = alertReceiveChannelStore.getSearchResult(); From aded7a25cb0a38a93cff0a0a790200ce91d4676d Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 9 Sep 2022 14:51:13 +0300 Subject: [PATCH 04/66] same for schedules --- .../src/models/schedule/schedule.ts | 12 +++++++ .../src/pages/integrations/Integrations.tsx | 3 -- .../src/pages/schedules/Schedules.tsx | 36 ++++++++++++++++--- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/grafana-plugin/src/models/schedule/schedule.ts b/grafana-plugin/src/models/schedule/schedule.ts index 14d02744..c424882a 100644 --- a/grafana-plugin/src/models/schedule/schedule.ts +++ b/grafana-plugin/src/models/schedule/schedule.ts @@ -25,6 +25,18 @@ export class ScheduleStore extends BaseStore { this.path = '/schedules/'; } + @action + async loadItem(id: Schedule['id'], skipErrorHandling: boolean = false): Promise { + const schedule = await this.getById(id, skipErrorHandling); + + this.items = { + ...this.items, + [id]: schedule, + }; + + return schedule; + } + @action async updateScheduleEvents( scheduleId: Schedule['id'], diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 8cfaea82..7d46c7c1 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -121,9 +121,6 @@ class Integrations extends React.Component render() { const { store } = this.props; - const { - integrationsFilters: { searchTerm }, - } = this.state; const { integrationsFilters, alertReceiveChannelToShowSettings, diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index d538a81d..57ff9511 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -43,6 +43,8 @@ import { openErrorNotification } from 'utils'; import { getDatesString } from './Schedules.helpers'; import styles from './Schedules.module.css'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -53,6 +55,11 @@ interface SchedulesPageState { scheduleIdToExport?: Schedule['id']; filters: SchedulesFiltersType; expandedSchedulesKeys: Array; + + notFound?: boolean; + wrongTeamError?: boolean; + teamToSwitch?: { name: string; id: string }; + wrongTeamNoPermissions?: boolean; } @observer @@ -62,6 +69,8 @@ class SchedulesPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); + if (!schedule) return; + const schedules = store.scheduleStore.getSearchResult(); const scheduleId = schedules && schedules.find((res) => res.id === id)?.id; if (scheduleId || id === 'new') { @@ -101,8 +115,23 @@ class SchedulesPage extends React.Component + ); + } const columns = [ { @@ -148,9 +177,6 @@ class SchedulesPage extends React.Component
From 1a778f95c24de310850508d8facd792156ec69a6 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 9 Sep 2022 15:17:28 +0300 Subject: [PATCH 05/66] webhooks also --- .../outgoing_webhook/outgoing_webhook.ts | 12 +++++++ .../outgoing_webhooks/OutgoingWebhooks.tsx | 35 ++++++++++++++++--- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts b/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts index ab70799a..a5e70b59 100644 --- a/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts +++ b/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts @@ -19,6 +19,18 @@ export class OutgoingWebhookStore extends BaseStore { this.path = '/custom_buttons/'; } + @action + async loadItem(id: OutgoingWebhook['id'], skipErrorHandling: boolean = false): Promise { + const outgoingWebhook = await this.getById(id, skipErrorHandling); + + this.items = { + ...this.items, + [id]: outgoingWebhook, + }; + + return outgoingWebhook; + } + @action async updateById(id: OutgoingWebhook['id']) { const response = await this.getById(id); diff --git a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx index 6ced40da..0c427e75 100644 --- a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx +++ b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx @@ -21,6 +21,8 @@ import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; import styles from './OutgoingWebhooks.module.css'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -28,11 +30,18 @@ interface OutgoingWebhooksProps extends WithStoreProps, AppRootProps {} interface OutgoingWebhooksState { outgoingWebhookIdToEdit?: OutgoingWebhook['id'] | 'new'; + notFound?: boolean; + wrongTeamError?: boolean; + teamToSwitch?: { name: string; id: string }; + wrongTeamNoPermissions?: boolean; } @observer class OutgoingWebhooks extends React.Component { - state: OutgoingWebhooksState = {}; + state: OutgoingWebhooksState = { + wrongTeamError: false, + wrongTeamNoPermissions: false, + }; async componentDidMount() { this.update().then(this.parseQueryParams); @@ -44,12 +53,16 @@ class OutgoingWebhooks extends React.Component { + parseQueryParams = async () => { const { store, query: { id }, } = this.props; + await store.outgoingWebhookStore + .loadItem(id, true) + .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); + if (id) { this.setState({ outgoingWebhookIdToEdit: id }); } @@ -57,14 +70,28 @@ class OutgoingWebhooks extends React.Component { const { store } = this.props; - const { selectedAlertReceiveChannel } = store; return store.outgoingWebhookStore.updateItems(); }; render() { const { store } = this.props; - const { outgoingWebhookIdToEdit } = this.state; + const { outgoingWebhookIdToEdit, wrongTeamError, teamToSwitch, wrongTeamNoPermissions } = this.state; + + if (wrongTeamError) { + const currentTeamId = store.userStore.currentUser?.current_team; + const currentTeamName = store.grafanaTeamStore.items[currentTeamId]?.name; + + return ( + + ); + } const webhooks = store.outgoingWebhookStore.getSearchResult(); From ced13786df84671dc4b587a2c6a55b13f6776c4e Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 9 Sep 2022 16:03:11 +0300 Subject: [PATCH 06/66] refactored usage of wrong team display --- .../src/components/NotFoundInTeam/WrongTeamStub.tsx | 7 +++++-- .../alert_receive_channel/alert_receive_channel.ts | 2 +- grafana-plugin/src/models/base_store.ts | 6 +++--- .../src/models/escalation_chain/escalation_chain.ts | 2 +- .../src/models/outgoing_webhook/outgoing_webhook.ts | 2 +- grafana-plugin/src/models/schedule/schedule.ts | 2 +- grafana-plugin/src/models/user/user.ts | 2 +- .../src/pages/escalation-chains/EscalationChains.tsx | 8 ++------ grafana-plugin/src/pages/incident/Incident.tsx | 6 ++---- grafana-plugin/src/pages/integrations/Integrations.tsx | 10 +++------- .../src/pages/outgoing_webhooks/OutgoingWebhooks.tsx | 8 ++------ grafana-plugin/src/pages/schedules/Schedules.tsx | 10 +++------- grafana-plugin/src/pages/users/Users.tsx | 8 ++------ 13 files changed, 27 insertions(+), 46 deletions(-) diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx index c28d8eb8..269c07a8 100644 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx +++ b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx @@ -17,14 +17,17 @@ export interface WrongTeamStubProps { className?: string; objectName: string; pageName: string; - currentTeam?: string; switchToTeam?: { name: string; id: string }; wrongTeamNoPermissions?: boolean; } const WrongTeamStub: FC = (props) => { const store = useStore(); - const { objectName, pageName, currentTeam, switchToTeam, className, wrongTeamNoPermissions } = props; + + const currentTeamId = store.userStore.currentUser?.current_team; + const currentTeam = store.grafanaTeamStore.items[currentTeamId]?.name; + + const { objectName, pageName, switchToTeam, wrongTeamNoPermissions } = props; const onTeamChange = async (teamId: GrafanaTeam['id']) => { await store.userStore.updateCurrentUser({ current_team: teamId }); diff --git a/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts b/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts index 57b6f332..ab8808cf 100644 --- a/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts +++ b/grafana-plugin/src/models/alert_receive_channel/alert_receive_channel.ts @@ -71,7 +71,7 @@ export class AlertReceiveChannelStore extends BaseStore { } @action - async loadItem(id: AlertReceiveChannel['id'], skipErrorHandling: boolean = false): Promise { + async loadItem(id: AlertReceiveChannel['id'], skipErrorHandling = false): Promise { const alertReceiveChannel = await this.getById(id, skipErrorHandling); this.items = { diff --git a/grafana-plugin/src/models/base_store.ts b/grafana-plugin/src/models/base_store.ts index 90e6a76e..56cebb15 100644 --- a/grafana-plugin/src/models/base_store.ts +++ b/grafana-plugin/src/models/base_store.ts @@ -13,8 +13,8 @@ export default class BaseStore { this.rootStore = rootStore; } - onApiError(error: any, skipErrorHandling: boolean = false) { - if (skipErrorHandling) throw error + onApiError(error: any, skipErrorHandling = false) { + if (skipErrorHandling) {throw error} if (error.response.status >= 400 && error.response.status < 500) { const payload = error.response.data; @@ -39,7 +39,7 @@ export default class BaseStore { } @action - async getById(id: string, skipErrorHandling: boolean = false) { + async getById(id: string, skipErrorHandling = false) { return await makeRequest(`${this.path}${id}/`, { method: 'GET', }).catch((error) => this.onApiError(error, skipErrorHandling)); diff --git a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts index dde0b3b4..a64ed47b 100644 --- a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts +++ b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts @@ -23,7 +23,7 @@ export class EscalationChainStore extends BaseStore { } @action - async loadItem(id: EscalationChain['id'], skipErrorHandling: boolean = false): Promise { + async loadItem(id: EscalationChain['id'], skipErrorHandling = false): Promise { const escalationChain = await this.getById(id, skipErrorHandling); this.items = { diff --git a/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts b/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts index a5e70b59..d064fa38 100644 --- a/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts +++ b/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts @@ -20,7 +20,7 @@ export class OutgoingWebhookStore extends BaseStore { } @action - async loadItem(id: OutgoingWebhook['id'], skipErrorHandling: boolean = false): Promise { + async loadItem(id: OutgoingWebhook['id'], skipErrorHandling = false): Promise { const outgoingWebhook = await this.getById(id, skipErrorHandling); this.items = { diff --git a/grafana-plugin/src/models/schedule/schedule.ts b/grafana-plugin/src/models/schedule/schedule.ts index c424882a..a2b66973 100644 --- a/grafana-plugin/src/models/schedule/schedule.ts +++ b/grafana-plugin/src/models/schedule/schedule.ts @@ -26,7 +26,7 @@ export class ScheduleStore extends BaseStore { } @action - async loadItem(id: Schedule['id'], skipErrorHandling: boolean = false): Promise { + async loadItem(id: Schedule['id'], skipErrorHandling = false): Promise { const schedule = await this.getById(id, skipErrorHandling); this.items = { diff --git a/grafana-plugin/src/models/user/user.ts b/grafana-plugin/src/models/user/user.ts index c1961844..22dbd1f7 100644 --- a/grafana-plugin/src/models/user/user.ts +++ b/grafana-plugin/src/models/user/user.ts @@ -60,7 +60,7 @@ export class UserStore extends BaseStore { } @action - async loadUser(userPk: User['pk'], skipErrorHandling: boolean = false) { + async loadUser(userPk: User['pk'], skipErrorHandling = false) { const user = await this.getById(userPk, skipErrorHandling); this.items = { diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index 375d810c..d9cd7458 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -12,6 +12,7 @@ import EscalationsFilters from 'components/EscalationsFilters/EscalationsFilters import Block from 'components/GBlock/Block'; import GList from 'components/GList/GList'; import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; @@ -28,7 +29,6 @@ import { withMobXProviderContext } from 'state/withStore'; import { openWarningNotification } from 'utils'; import styles from './EscalationChains.module.css'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -80,7 +80,7 @@ class EscalationChainsPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!escalationChain) return; + if (!escalationChain) {return;} escalationChain = escalationChainStore.items[query.id]; if (escalationChain) { @@ -131,14 +131,10 @@ class EscalationChainsPage extends React.Component diff --git a/grafana-plugin/src/pages/incident/Incident.tsx b/grafana-plugin/src/pages/incident/Incident.tsx index ae8c3574..407c6004 100644 --- a/grafana-plugin/src/pages/incident/Incident.tsx +++ b/grafana-plugin/src/pages/incident/Incident.tsx @@ -26,8 +26,8 @@ import reactStringReplace from 'react-string-replace'; import Collapse from 'components/Collapse/Collapse'; import Block from 'components/GBlock/Block'; import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import PluginLink from 'components/PluginLink/PluginLink'; import SourceCode from 'components/SourceCode/SourceCode'; import Text from 'components/Text/Text'; @@ -122,8 +122,7 @@ class IncidentPage extends React.Component const { alerts } = store.alertGroupStore; const incident = alerts.get(id); - const currentTeamId = store.userStore.currentUser?.current_team; - const currentTeamName = store.grafanaTeamStore.items[currentTeamId]?.name; + if (notFound) { return (
@@ -147,7 +146,6 @@ class IncidentPage extends React.Component diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 7d46c7c1..08d069d9 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -7,9 +7,10 @@ import cn from 'classnames/bind'; import { debounce } from 'lodash-es'; import { observer } from 'mobx-react'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import GList from 'components/GList/GList'; import IntegrationsFilters, { Filters } from 'components/IntegrationsFilters/IntegrationsFilters'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; @@ -25,7 +26,6 @@ import { WithStoreProps } from 'state/types'; import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; import { openWarningNotification } from 'utils'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; import styles from './Integrations.module.css'; @@ -80,7 +80,7 @@ class Integrations extends React.Component let alertReceiveChannel = await alertReceiveChannelStore .loadItem(query.id, true) .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!alertReceiveChannel) return; + if (!alertReceiveChannel) {return;} if (alertReceiveChannel.id) { selectedAlertReceiveChannel = alertReceiveChannel.id; @@ -132,14 +132,10 @@ class Integrations extends React.Component } = this.state; if (wrongTeamError) { - const currentTeamId = store.userStore.currentUser?.current_team; - const currentTeamName = store.grafanaTeamStore.items[currentTeamId]?.name; - return ( diff --git a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx index 0c427e75..061f5074 100644 --- a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx +++ b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx @@ -7,6 +7,8 @@ import cn from 'classnames/bind'; import { observer } from 'mobx-react'; import GTable from 'components/GTable/GTable'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import WithConfirm from 'components/WithConfirm/WithConfirm'; @@ -21,8 +23,6 @@ import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; import styles from './OutgoingWebhooks.module.css'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -79,14 +79,10 @@ class OutgoingWebhooks extends React.Component diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index 57ff9511..62e3dfef 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -22,6 +22,8 @@ import moment, { Moment } from 'moment-timezone'; import instructionsImage from 'assets/img/events_instructions.png'; import Avatar from 'components/Avatar/Avatar'; import GTable from 'components/GTable/GTable'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import PluginLink from 'components/PluginLink/PluginLink'; import SchedulesFilters from 'components/SchedulesFilters/SchedulesFilters'; import { SchedulesFiltersType } from 'components/SchedulesFilters/SchedulesFilters.types'; @@ -43,8 +45,6 @@ import { openErrorNotification } from 'utils'; import { getDatesString } from './Schedules.helpers'; import styles from './Schedules.module.css'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -93,7 +93,7 @@ class SchedulesPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!schedule) return; + if (!schedule) {return;} const schedules = store.scheduleStore.getSearchResult(); const scheduleId = schedules && schedules.find((res) => res.id === id)?.id; @@ -119,14 +119,10 @@ class SchedulesPage extends React.Component diff --git a/grafana-plugin/src/pages/users/Users.tsx b/grafana-plugin/src/pages/users/Users.tsx index 01a8a6d9..6c9b961f 100644 --- a/grafana-plugin/src/pages/users/Users.tsx +++ b/grafana-plugin/src/pages/users/Users.tsx @@ -9,6 +9,8 @@ import { observer } from 'mobx-react'; import Avatar from 'components/Avatar/Avatar'; import GTable from 'components/GTable/GTable'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; +import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import UsersFilters from 'components/UsersFilters/UsersFilters'; @@ -23,8 +25,6 @@ import { withMobXProviderContext } from 'state/withStore'; import { getRealFilters, getUserRowClassNameFn } from './Users.helpers'; import styles from './Users.module.css'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; const cx = cn.bind(styles); @@ -172,14 +172,10 @@ class Users extends React.Component { const { count, results } = userStore.getSearchResult(); if (wrongTeamError) { - const currentTeamId = store.userStore.currentUser?.current_team; - const currentTeamName = store.grafanaTeamStore.items[currentTeamId]?.name; - return ( From 812ab7b185e6139777749bf8d1c3408357fbb962 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Mon, 12 Sep 2022 10:36:04 +0300 Subject: [PATCH 07/66] added a comment to let it know about re-throwing error --- grafana-plugin/src/models/base_store.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grafana-plugin/src/models/base_store.ts b/grafana-plugin/src/models/base_store.ts index 56cebb15..03115181 100644 --- a/grafana-plugin/src/models/base_store.ts +++ b/grafana-plugin/src/models/base_store.ts @@ -14,7 +14,9 @@ export default class BaseStore { } onApiError(error: any, skipErrorHandling = false) { - if (skipErrorHandling) {throw error} + if (skipErrorHandling) { + throw error; // rethrow error and skip additional handling like showing notification + } if (error.response.status >= 400 && error.response.status < 500) { const payload = error.response.data; From 6f191518df4de1c7528667d57fd3cf1a1927398d Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Mon, 12 Sep 2022 10:44:22 +0300 Subject: [PATCH 08/66] removed unused param --- .../src/models/escalation_chain/escalation_chain.ts | 4 ++-- .../src/pages/escalation-chains/EscalationChains.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts index a64ed47b..c6e19968 100644 --- a/grafana-plugin/src/models/escalation_chain/escalation_chain.ts +++ b/grafana-plugin/src/models/escalation_chain/escalation_chain.ts @@ -65,9 +65,9 @@ export class EscalationChainStore extends BaseStore { } @action - async updateItems(query = '', id?: string) { + async updateItems(query = '') { const results = await makeRequest(`${this.path}`, { - params: { search: query, id }, + params: { search: query }, }); this.items = { diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index d9cd7458..e3949832 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -113,7 +113,7 @@ class EscalationChainsPage extends React.Component { const { store } = this.props; - return store.escalationChainStore.updateItems('', this.props.query.id); + return store.escalationChainStore.updateItems(''); }; componentDidUpdate() {} From e4ae10c678cebfb6c8add82c65f630a46013678e Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 12 Sep 2022 17:26:23 +0300 Subject: [PATCH 09/66] Wrong team error for schedules and custom buttons, add flag to get object from the whole organization --- engine/apps/api/tests/test_custom_button.py | 41 ++++++++++++ engine/apps/api/tests/test_schedules.py | 51 +++++++++++++++ engine/apps/api/views/custom_button.py | 19 +++--- engine/apps/api/views/schedule.py | 69 ++++++++++++--------- 4 files changed, 144 insertions(+), 36 deletions(-) diff --git a/engine/apps/api/tests/test_custom_button.py b/engine/apps/api/tests/test_custom_button.py index 3c358c90..bc91fc60 100644 --- a/engine/apps/api/tests/test_custom_button.py +++ b/engine/apps/api/tests/test_custom_button.py @@ -377,3 +377,44 @@ def test_custom_button_action_permissions( response = client.post(url, format="json", **make_user_auth_headers(user, token)) assert response.status_code == expected_status + + +@pytest.mark.django_db +def test_get_custom_button_from_other_team_with_flag( + make_organization_and_user_with_plugin_token, + make_team, + make_user_auth_headers, + make_custom_action, +): + organization, user, token = make_organization_and_user_with_plugin_token() + + team = make_team(organization) + + custom_button = make_custom_action(organization=organization, team=team) + client = APIClient() + + url = reverse("api-internal:custom_button-detail", kwargs={"pk": custom_button.public_primary_key}) + url = f"{url}?from_organization=true" + + response = client.get(url, format="json", **make_user_auth_headers(user, token)) + assert response.status_code == status.HTTP_200_OK + + +@pytest.mark.django_db +def test_custom_button_from_other_team_without_flag( + make_organization_and_user_with_plugin_token, + make_team, + make_user_auth_headers, + make_custom_action, +): + organization, user, token = make_organization_and_user_with_plugin_token() + + team = make_team(organization) + + custom_button = make_custom_action(organization=organization, team=team) + client = APIClient() + + url = reverse("api-internal:custom_button-detail", kwargs={"pk": custom_button.public_primary_key}) + + response = client.get(url, format="json", **make_user_auth_headers(user, token)) + assert response.status_code == status.HTTP_403_FORBIDDEN diff --git a/engine/apps/api/tests/test_schedules.py b/engine/apps/api/tests/test_schedules.py index ea3a6dc0..7139f2e9 100644 --- a/engine/apps/api/tests/test_schedules.py +++ b/engine/apps/api/tests/test_schedules.py @@ -1401,3 +1401,54 @@ def test_schedule_mention_options_permissions( response = client.get(url, format="json", **make_user_auth_headers(user, token)) assert response.status_code == expected_status + + +@pytest.mark.django_db +def test_get_schedule_from_other_team_with_flag( + make_organization_and_user_with_plugin_token, + make_team, + make_user_auth_headers, + make_schedule, +): + organization, user, token = make_organization_and_user_with_plugin_token() + + team = make_team(organization) + + calendar_schedule = make_schedule( + organization, + schedule_class=OnCallScheduleCalendar, + name="test_calendar_schedule", + team=team, + ) + + client = APIClient() + url = reverse("api-internal:schedule-detail", kwargs={"pk": calendar_schedule.public_primary_key}) + url = f"{url}?from_organization=true" + + response = client.get(url, format="json", **make_user_auth_headers(user, token)) + assert response.status_code == status.HTTP_200_OK + + +@pytest.mark.django_db +def test_get_schedule_from_other_team_without_flag( + make_organization_and_user_with_plugin_token, + make_team, + make_user_auth_headers, + make_schedule, +): + organization, user, token = make_organization_and_user_with_plugin_token() + + team = make_team(organization) + + calendar_schedule = make_schedule( + organization, + schedule_class=OnCallScheduleCalendar, + name="test_calendar_schedule", + team=team, + ) + + client = APIClient() + url = reverse("api-internal:schedule-detail", kwargs={"pk": calendar_schedule.public_primary_key}) + + response = client.get(url, format="json", **make_user_auth_headers(user, token)) + assert response.status_code == status.HTTP_403_FORBIDDEN diff --git a/engine/apps/api/views/custom_button.py b/engine/apps/api/views/custom_button.py index 0a9f1973..8d2a8082 100644 --- a/engine/apps/api/views/custom_button.py +++ b/engine/apps/api/views/custom_button.py @@ -12,11 +12,11 @@ from apps.api.permissions import MODIFY_ACTIONS, READ_ACTIONS, ActionPermission, from apps.api.serializers.custom_button import CustomButtonSerializer from apps.auth_token.auth import PluginAuthentication from common.api_helpers.exceptions import BadRequest -from common.api_helpers.mixins import PublicPrimaryKeyMixin +from common.api_helpers.mixins import PublicPrimaryKeyMixin, TeamFilteringMixin from common.insight_log import EntityEvent, write_resource_insight_log -class CustomButtonView(PublicPrimaryKeyMixin, ModelViewSet): +class CustomButtonView(TeamFilteringMixin, PublicPrimaryKeyMixin, ModelViewSet): authentication_classes = (PluginAuthentication,) permission_classes = (IsAuthenticated, ActionPermission) action_permissions = { @@ -36,7 +36,15 @@ class CustomButtonView(PublicPrimaryKeyMixin, ModelViewSet): return queryset def get_object(self): - # Override this method because we want to get object from organization instead of concrete team. + # get the object from the whole organization if there is a flag `get_from_organization=true` + # otherwise get the object from the current team + get_from_organization = self.request.query_params.get("from_organization", "false") == "true" + if get_from_organization: + return self.get_object_from_organization() + return super().get_object() + + def get_object_from_organization(self): + # use this method to get the object from the whole organization instead of the current team pk = self.kwargs["pk"] organization = self.request.auth.organization @@ -50,9 +58,6 @@ class CustomButtonView(PublicPrimaryKeyMixin, ModelViewSet): return obj - def original_get_object(self): - return super().get_object() - def perform_create(self, serializer): serializer.save() write_resource_insight_log( @@ -85,7 +90,7 @@ class CustomButtonView(PublicPrimaryKeyMixin, ModelViewSet): def action(self, request, pk): alert_group_id = request.query_params.get("alert_group", None) if alert_group_id is not None: - custom_button = self.original_get_object() + custom_button = self.get_object() try: alert_group = AlertGroup.unarchived_objects.get( public_primary_key=alert_group_id, channel=custom_button.alert_receive_channel diff --git a/engine/apps/api/views/schedule.py b/engine/apps/api/views/schedule.py index ece5186c..4bc5764e 100644 --- a/engine/apps/api/views/schedule.py +++ b/engine/apps/api/views/schedule.py @@ -32,6 +32,7 @@ from common.api_helpers.mixins import ( CreateSerializerMixin, PublicPrimaryKeyMixin, ShortSerializerMixin, + TeamFilteringMixin, UpdateSerializerMixin, ) from common.api_helpers.utils import create_engine_url, get_date_range_from_request @@ -43,7 +44,12 @@ EVENTS_FILTER_BY_FINAL = "final" class ScheduleView( - PublicPrimaryKeyMixin, ShortSerializerMixin, CreateSerializerMixin, UpdateSerializerMixin, ModelViewSet + TeamFilteringMixin, + PublicPrimaryKeyMixin, + ShortSerializerMixin, + CreateSerializerMixin, + UpdateSerializerMixin, + ModelViewSet, ): authentication_classes = (PluginAuthentication,) permission_classes = (IsAuthenticated, ActionPermission) @@ -124,28 +130,6 @@ class ScheduleView( queryset = self.serializer_class.setup_eager_loading(queryset) return queryset - def get_object(self): - # Override this method because we want to get object from organization instead of concrete team. - pk = self.kwargs["pk"] - organization = self.request.auth.organization - queryset = organization.oncall_schedules.filter( - public_primary_key=pk, - ) - queryset = self._annotate_queryset(queryset) - - try: - obj = queryset.get() - except ObjectDoesNotExist: - raise NotFound - - # May raise a permission denied - self.check_object_permissions(self.request, obj) - - return obj - - def original_get_object(self): - return super().get_object() - def perform_create(self, serializer): serializer.save() write_resource_insight_log(instance=serializer.instance, author=self.request.user, event=EntityEvent.CREATED) @@ -178,6 +162,33 @@ class ScheduleView( if instance.user_group is not None: update_slack_user_group_for_schedules.apply_async((instance.user_group.pk,)) + def get_object(self): + # get the object from the whole organization if there is a flag `get_from_organization=true` + # otherwise get the object from the current team + get_from_organization = self.request.query_params.get("from_organization", "false") == "true" + if get_from_organization: + return self.get_object_from_organization() + return super().get_object() + + def get_object_from_organization(self): + # use this method to get the object from the whole organization instead of the current team + pk = self.kwargs["pk"] + organization = self.request.auth.organization + queryset = organization.oncall_schedules.filter( + public_primary_key=pk, + ) + queryset = self._annotate_queryset(queryset) + + try: + obj = queryset.get() + except ObjectDoesNotExist: + raise NotFound + + # May raise a permission denied + self.check_object_permissions(self.request, obj) + + return obj + def get_request_timezone(self): user_tz = self.request.query_params.get("user_tz", "UTC") try: @@ -203,7 +214,7 @@ class ScheduleView( with_empty = self.request.query_params.get("with_empty", False) == "true" with_gap = self.request.query_params.get("with_gap", False) == "true" - schedule = self.original_get_object() + schedule = self.get_object() events = schedule.filter_events(user_tz, date, days=1, with_empty=with_empty, with_gap=with_gap) slack_channel = ( @@ -235,7 +246,7 @@ class ScheduleView( raise BadRequest(detail="Invalid type value") resolve_schedule = filter_by is None or filter_by == EVENTS_FILTER_BY_FINAL - schedule = self.original_get_object() + schedule = self.get_object() if filter_by is not None and filter_by != EVENTS_FILTER_BY_FINAL: filter_by = OnCallSchedule.PRIMARY if filter_by == EVENTS_FILTER_BY_ROTATION else OnCallSchedule.OVERRIDES @@ -259,7 +270,7 @@ class ScheduleView( user_tz, _ = self.get_request_timezone() now = timezone.now() starting_date = now.date() - schedule = self.original_get_object() + schedule = self.get_object() events = schedule.final_events(user_tz, starting_date, days=30) users = {u: None for u in schedule.related_users()} @@ -274,7 +285,7 @@ class ScheduleView( @action(detail=True, methods=["get"]) def related_escalation_chains(self, request, pk): """Return escalation chains associated to schedule.""" - schedule = self.original_get_object() + schedule = self.get_object() escalation_chains = EscalationChain.objects.filter(escalation_policies__notify_schedule=schedule).distinct() result = [{"name": e.name, "pk": e.public_primary_key} for e in escalation_chains] @@ -290,7 +301,7 @@ class ScheduleView( @action(detail=True, methods=["post"]) def reload_ical(self, request, pk): - schedule = self.original_get_object() + schedule = self.get_object() schedule.drop_cached_ical() schedule.check_empty_shifts_for_next_week() schedule.check_gaps_for_next_week() @@ -302,7 +313,7 @@ class ScheduleView( @action(detail=True, methods=["get", "post", "delete"]) def export_token(self, request, pk): - schedule = self.original_get_object() + schedule = self.get_object() if self.request.method == "GET": try: From 7d5636291a4c7f61db9c77a824ccf1f467a8dac0 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 12 Sep 2022 17:30:45 +0300 Subject: [PATCH 10/66] Wrong team error for integrations and escalation chains pages --- engine/apps/api/tests/test_team.py | 61 +++++++++---------- .../apps/api/views/alert_receive_channel.py | 2 + engine/apps/api/views/escalation_chain.py | 4 +- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/engine/apps/api/tests/test_team.py b/engine/apps/api/tests/test_team.py index aae7360f..53faeca6 100644 --- a/engine/apps/api/tests/test_team.py +++ b/engine/apps/api/tests/test_team.py @@ -3,6 +3,7 @@ from django.urls import reverse from rest_framework import status from rest_framework.test import APIClient +from apps.schedules.models import OnCallScheduleCalendar from apps.user_management.models import Team from common.constants.role import Role @@ -114,17 +115,16 @@ def test_team_permissions_wrong_team_general( alert_receive_channel = make_alert_receive_channel(organization) alert_group = make_alert_group(alert_receive_channel) - # escalation_chain = make_escalation_chain(organization) - # schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar) - # webhook = make_custom_action(organization) + escalation_chain = make_escalation_chain(organization) + schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar) + webhook = make_custom_action(organization) for endpoint, instance in ( ("alertgroup", alert_group), - # todo: implement team filtering for other resources - # ("alert_receive_channel", alert_receive_channel), - # ("escalation_chain", escalation_chain), - # ("schedule", schedule), - # ("custom_button", webhook), + ("alert_receive_channel", alert_receive_channel), + ("escalation_chain", escalation_chain), + ("schedule", schedule), + ("custom_button", webhook), ): client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) @@ -162,17 +162,16 @@ def test_team_permissions_wrong_team( alert_receive_channel = make_alert_receive_channel(organization, team=team) alert_group = make_alert_group(alert_receive_channel) - # escalation_chain = make_escalation_chain(organization, team=team) - # schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar, team=team) - # webhook = make_custom_action(organization, team=team) + escalation_chain = make_escalation_chain(organization, team=team) + schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar, team=team) + webhook = make_custom_action(organization, team=team) for endpoint, instance in ( ("alertgroup", alert_group), - # todo: implement team filtering for other resources - # ("alert_receive_channel", alert_receive_channel), - # ("escalation_chain", escalation_chain), - # ("schedule", schedule), - # ("custom_button", webhook), + ("alert_receive_channel", alert_receive_channel), + ("escalation_chain", escalation_chain), + ("schedule", schedule), + ("custom_button", webhook), ): client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) @@ -214,17 +213,16 @@ def test_team_permissions_not_in_team( alert_receive_channel = make_alert_receive_channel(organization, team=team) alert_group = make_alert_group(alert_receive_channel) - # escalation_chain = make_escalation_chain(organization, team=team) - # schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar, team=team) - # webhook = make_custom_action(organization, team=team) + escalation_chain = make_escalation_chain(organization, team=team) + schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar, team=team) + webhook = make_custom_action(organization, team=team) for endpoint, instance in ( ("alertgroup", alert_group), - # todo: implement team filtering for other resources - # ("alert_receive_channel", alert_receive_channel), - # ("escalation_chain", escalation_chain), - # ("schedule", schedule), - # ("custom_button", webhook), + ("alert_receive_channel", alert_receive_channel), + ("escalation_chain", escalation_chain), + ("schedule", schedule), + ("custom_button", webhook), ): client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) @@ -262,17 +260,16 @@ def test_team_permissions_right_team( alert_receive_channel = make_alert_receive_channel(organization, team=team) alert_group = make_alert_group(alert_receive_channel) - # escalation_chain = make_escalation_chain(organization, team=team) - # schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar, team=team) - # webhook = make_custom_action(organization, team=team) + escalation_chain = make_escalation_chain(organization, team=team) + schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar, team=team) + webhook = make_custom_action(organization, team=team) for endpoint, instance in ( ("alertgroup", alert_group), - # todo: implement team filtering for other resources - # ("alert_receive_channel", alert_receive_channel), - # ("escalation_chain", escalation_chain), - # ("schedule", schedule), - # ("custom_button", webhook), + ("alert_receive_channel", alert_receive_channel), + ("escalation_chain", escalation_chain), + ("schedule", schedule), + ("custom_button", webhook), ): client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) diff --git a/engine/apps/api/views/alert_receive_channel.py b/engine/apps/api/views/alert_receive_channel.py index 6dce1c56..866620a8 100644 --- a/engine/apps/api/views/alert_receive_channel.py +++ b/engine/apps/api/views/alert_receive_channel.py @@ -22,6 +22,7 @@ from common.api_helpers.mixins import ( FilterSerializerMixin, PreviewTemplateMixin, PublicPrimaryKeyMixin, + TeamFilteringMixin, UpdateSerializerMixin, ) from common.exceptions import TeamCanNotBeChangedError, UnableToSendDemoAlert @@ -58,6 +59,7 @@ class AlertReceiveChannelFilter(filters.FilterSet): class AlertReceiveChannelView( PreviewTemplateMixin, + TeamFilteringMixin, PublicPrimaryKeyMixin, FilterSerializerMixin, UpdateSerializerMixin, diff --git a/engine/apps/api/views/escalation_chain.py b/engine/apps/api/views/escalation_chain.py index f972a992..72c73d3a 100644 --- a/engine/apps/api/views/escalation_chain.py +++ b/engine/apps/api/views/escalation_chain.py @@ -11,11 +11,11 @@ from apps.api.permissions import MODIFY_ACTIONS, READ_ACTIONS, ActionPermission, from apps.api.serializers.escalation_chain import EscalationChainListSerializer, EscalationChainSerializer from apps.auth_token.auth import PluginAuthentication from common.api_helpers.exceptions import BadRequest -from common.api_helpers.mixins import ListSerializerMixin, PublicPrimaryKeyMixin +from common.api_helpers.mixins import ListSerializerMixin, PublicPrimaryKeyMixin, TeamFilteringMixin from common.insight_log import EntityEvent, write_resource_insight_log -class EscalationChainViewSet(PublicPrimaryKeyMixin, ListSerializerMixin, viewsets.ModelViewSet): +class EscalationChainViewSet(TeamFilteringMixin, PublicPrimaryKeyMixin, ListSerializerMixin, viewsets.ModelViewSet): authentication_classes = (PluginAuthentication,) permission_classes = (IsAuthenticated, ActionPermission) From 4ec1727ecf869eb515c22933bfc655939d3926c9 Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Mon, 12 Sep 2022 17:25:46 -0300 Subject: [PATCH 11/66] Fix support for all_day events in schedule filter_events --- engine/apps/schedules/ical_utils.py | 25 +++++++++---------- .../apps/schedules/models/on_call_schedule.py | 15 ++++++++--- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/engine/apps/schedules/ical_utils.py b/engine/apps/schedules/ical_utils.py index 12fb5bd1..09a0b307 100644 --- a/engine/apps/schedules/ical_utils.py +++ b/engine/apps/schedules/ical_utils.py @@ -175,19 +175,18 @@ def get_shifts_dict(calendar, calendar_type, schedule, datetime_start, datetime_ if type(event[ICAL_DATETIME_START].dt) == datetime.date: start = event[ICAL_DATETIME_START].dt end = event[ICAL_DATETIME_END].dt - if start <= date < end: - result_date.append( - { - "start": start, - "end": end, - "users": users, - "missing_users": missing_users, - "priority": priority, - "source": source, - "calendar_type": calendar_type, - "shift_pk": pk, - } - ) + result_date.append( + { + "start": start, + "end": end, + "users": users, + "missing_users": missing_users, + "priority": priority, + "source": source, + "calendar_type": calendar_type, + "shift_pk": pk, + } + ) else: start, end = ical_events.get_start_and_end_with_respect_to_event_type(event) result_datetime.append( diff --git a/engine/apps/schedules/models/on_call_schedule.py b/engine/apps/schedules/models/on_call_schedule.py index 5af43797..b3d72911 100644 --- a/engine/apps/schedules/models/on_call_schedule.py +++ b/engine/apps/schedules/models/on_call_schedule.py @@ -3,6 +3,7 @@ import functools import itertools import icalendar +import pytz from django.apps import apps from django.conf import settings from django.core.validators import MinLengthValidator @@ -254,12 +255,20 @@ class OnCallSchedule(PolymorphicModel): if not events: return [] + def event_start_cmp_key(e): + # all day events: compare using a datetime object at 00:00 + start = e["start"] + if not isinstance(start, datetime.datetime): + start = datetime.datetime.combine(start, datetime.datetime.min.time(), tzinfo=pytz.UTC) + return start + def event_cmp_key(e): """Sorting key criteria for events.""" + start = event_start_cmp_key(e) return ( -e["calendar_type"] if e["calendar_type"] else 0, # overrides: 1, shifts: 0, gaps: None -e["priority_level"] if e["priority_level"] else 0, - e["start"], + start, ) def insort_event(eventlist, e): @@ -314,7 +323,7 @@ class OnCallSchedule(PolymorphicModel): if ev["priority_level"] != current_priority: # update scheduled intervals on priority change # and start from the beginning for the new priority level - resolved.sort(key=lambda e: e["start"]) + resolved.sort(key=event_start_cmp_key) intervals = _merge_intervals(resolved) current_interval_idx = 0 current_priority = ev["priority_level"] @@ -367,7 +376,7 @@ class OnCallSchedule(PolymorphicModel): # TODO: switch to bisect insert on python 3.10 (or consider heapq) insort_event(pending, ev) - resolved.sort(key=lambda e: (e["start"], e["shift"]["pk"])) + resolved.sort(key=lambda e: (event_start_cmp_key(e), e["shift"]["pk"] or "")) return resolved def _merge_events(self, events): From 284fcfe74d29b14329914ac92b62354f12c2ab81 Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Tue, 13 Sep 2022 10:30:34 -0300 Subject: [PATCH 12/66] Refactoring, adding tests --- engine/apps/schedules/ical_utils.py | 4 +-- .../apps/schedules/tests/test_ical_utils.py | 32 ++++++++++++++++++- .../schedules/tests/test_on_call_schedule.py | 32 ++++++++++++++++++- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/engine/apps/schedules/ical_utils.py b/engine/apps/schedules/ical_utils.py index 09a0b307..41af7731 100644 --- a/engine/apps/schedules/ical_utils.py +++ b/engine/apps/schedules/ical_utils.py @@ -134,7 +134,7 @@ def list_of_oncall_shifts_from_ical( continue tmp_result_datetime, tmp_result_date = get_shifts_dict( - calendar, calendar_type, schedule, datetime_start, datetime_end, date, with_empty_shifts + calendar, calendar_type, schedule, datetime_start, datetime_end, with_empty_shifts ) result_datetime.extend(tmp_result_datetime) result_date.extend(tmp_result_date) @@ -161,7 +161,7 @@ def list_of_oncall_shifts_from_ical( return result or None -def get_shifts_dict(calendar, calendar_type, schedule, datetime_start, datetime_end, date, with_empty_shifts=False): +def get_shifts_dict(calendar, calendar_type, schedule, datetime_start, datetime_end, with_empty_shifts=False): events = ical_events.get_events_from_ical_between(calendar, datetime_start, datetime_end) result_datetime = [] result_date = [] diff --git a/engine/apps/schedules/tests/test_ical_utils.py b/engine/apps/schedules/tests/test_ical_utils.py index 38213be8..f6bc2155 100644 --- a/engine/apps/schedules/tests/test_ical_utils.py +++ b/engine/apps/schedules/tests/test_ical_utils.py @@ -1,9 +1,16 @@ +import datetime from uuid import uuid4 import pytest +import pytz from django.utils import timezone -from apps.schedules.ical_utils import list_users_to_notify_from_ical, parse_event_uid, users_in_ical +from apps.schedules.ical_utils import ( + list_of_oncall_shifts_from_ical, + list_users_to_notify_from_ical, + parse_event_uid, + users_in_ical, +) from apps.schedules.models import CustomOnCallShift, OnCallScheduleCalendar from common.constants.role import Role @@ -63,6 +70,29 @@ def test_list_users_to_notify_from_ical_viewers_inclusion( assert set(users_on_call) == {user} +@pytest.mark.django_db +def test_shifts_dict_all_day_middle_event(make_organization, make_schedule, get_ical): + calendar = get_ical("calendar_with_all_day_event.ics") + organization = make_organization() + schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar) + schedule.cached_ical_file_primary = calendar.to_ical() + + day_to_check_iso = "2021-01-27T15:27:14.448059+00:00" + parsed_iso_day_to_check = datetime.datetime.fromisoformat(day_to_check_iso).replace(tzinfo=pytz.UTC) + requested_date = (parsed_iso_day_to_check - timezone.timedelta(days=1)).date() + shifts = list_of_oncall_shifts_from_ical(schedule, requested_date, days=3, with_empty_shifts=True) + assert len(shifts) == 4 + for s in shifts: + start = s["start"].date() if isinstance(s["start"], datetime.datetime) else s["start"] + end = s["end"].date() if isinstance(s["end"], datetime.datetime) else s["end"] + # event started in the given period, or ended in that period, or is happening during the period + assert ( + requested_date <= start <= requested_date + timezone.timedelta(days=3) + or requested_date <= end <= requested_date + timezone.timedelta(days=3) + or start <= requested_date <= end + ) + + def test_parse_event_uid_v1(): uuid = uuid4() event_uid = f"amixr-{uuid}-U1-E2-S1" diff --git a/engine/apps/schedules/tests/test_on_call_schedule.py b/engine/apps/schedules/tests/test_on_call_schedule.py index f46bb4b2..e8da0e67 100644 --- a/engine/apps/schedules/tests/test_on_call_schedule.py +++ b/engine/apps/schedules/tests/test_on_call_schedule.py @@ -1,7 +1,10 @@ +import datetime + import pytest +import pytz from django.utils import timezone -from apps.schedules.models import CustomOnCallShift, OnCallSchedule, OnCallScheduleWeb +from apps.schedules.models import CustomOnCallShift, OnCallSchedule, OnCallScheduleCalendar, OnCallScheduleWeb from common.constants.role import Role @@ -225,6 +228,33 @@ def test_filter_events_include_empty(make_organization, make_user_for_organizati assert events == expected +@pytest.mark.django_db +def test_filter_events_ical_all_day(make_organization, make_user_for_organization, make_schedule, get_ical): + calendar = get_ical("calendar_with_all_day_event.ics") + organization = make_organization() + schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar) + schedule.cached_ical_file_primary = calendar.to_ical() + for u in ("@Bernard Desruisseaux", "@Bob", "@Alex"): + make_user_for_organization(organization, username=u) + + day_to_check_iso = "2021-01-27T15:27:14.448059+00:00" + parsed_iso_day_to_check = datetime.datetime.fromisoformat(day_to_check_iso).replace(tzinfo=pytz.UTC) + start_date = (parsed_iso_day_to_check - timezone.timedelta(days=1)).date() + + events = schedule.final_events("UTC", start_date, days=2) + expected_events = [ + # all_day, users, start + (False, ["@Bernard Desruisseaux"], datetime.datetime(2021, 1, 26, 8, 0, tzinfo=pytz.UTC)), + (True, ["@Alex"], datetime.date(2021, 1, 27)), + (False, ["@Bob"], datetime.datetime(2021, 1, 27, 8, 0, tzinfo=pytz.UTC)), + ] + expected = [{"all_day": all_day, "users": users, "start": start} for all_day, users, start in expected_events] + returned = [ + {"all_day": e["all_day"], "users": [u["display_name"] for u in e["users"]], "start": e["start"]} for e in events + ] + assert returned == expected + + @pytest.mark.django_db def test_final_schedule_events(make_organization, make_user_for_organization, make_on_call_shift, make_schedule): organization = make_organization() From f4501311cc69a2d7cc0d6b8ee9419d2b41b4171c Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Wed, 14 Sep 2022 13:47:40 +0300 Subject: [PATCH 13/66] reset wrong team boolean on query parse --- grafana-plugin/src/network/index.ts | 21 ------------------- .../escalation-chains/EscalationChains.tsx | 13 ++++++++---- .../src/pages/incident/Incident.tsx | 3 ++- .../src/pages/integrations/Integrations.tsx | 11 ++++++---- .../src/pages/schedules/Schedules.tsx | 12 ++++++----- grafana-plugin/src/pages/users/Users.tsx | 2 ++ 6 files changed, 27 insertions(+), 35 deletions(-) diff --git a/grafana-plugin/src/network/index.ts b/grafana-plugin/src/network/index.ts index 23fbd379..aa35fb3b 100644 --- a/grafana-plugin/src/network/index.ts +++ b/grafana-plugin/src/network/index.ts @@ -30,32 +30,11 @@ interface RequestConfig { validateStatus?: (status: number) => boolean; } -const failPaths = [ - 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/users/URPAN2A31CVWQ/', - 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/escalation_chains/FDF7ZQMNKYIQK/', - 'api/plugin-proxy/grafana-oncall-app/api/internal/v1/alert_receive_channels/CSPE3C7R4Q38G/', -]; - export const makeRequest = async (path: string, config: RequestConfig) => { const { method = 'GET', params, data, validateStatus } = config; const url = `${API_PROXY_PREFIX}${API_PATH_PREFIX}${path}`; - if (failPaths.includes(url)) { - throw { - response: { - status: 403, - data: { - error_code: 'wrong_team', - owner_team: { - name: 'Rares', - id: '14999718', - }, - }, - }, - }; - } - const response = await instance({ method, url, diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index e3949832..c50b7886 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -66,13 +66,14 @@ class EscalationChainsPage extends React.Component { + this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + const { store, query } = this.props; + const { escalationChainStore } = store; const { escalationChainsFilters: { searchTerm }, } = this.state; - const { escalationChainStore } = store; - const searchResult = escalationChainStore.getSearchResult(searchTerm); let selectedEscalationChain: EscalationChain['id']; @@ -80,7 +81,9 @@ class EscalationChainsPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!escalationChain) {return;} + if (!escalationChain) { + return; + } escalationChain = escalationChainStore.items[query.id]; if (escalationChain) { @@ -91,9 +94,11 @@ class EscalationChainsPage extends React.Component } update = () => { + this.setState({ wrongTeamError: false }); // reset wrong team error to false + const { store, query: { id }, @@ -118,7 +120,6 @@ class IncidentPage extends React.Component } = this.state; const { alertReceiveChannelStore } = store; - const { alerts } = store.alertGroupStore; const incident = alerts.get(id); diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 08d069d9..c9476ae1 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -69,8 +69,9 @@ class Integrations extends React.Component }; parseQueryParams = async () => { - const { store, query } = this.props; + this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + const { store, query } = this.props; const { alertReceiveChannelStore } = store; const searchResult = alertReceiveChannelStore.getSearchResult(); @@ -80,7 +81,7 @@ class Integrations extends React.Component let alertReceiveChannel = await alertReceiveChannelStore .loadItem(query.id, true) .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!alertReceiveChannel) {return;} + if (!alertReceiveChannel) return; if (alertReceiveChannel.id) { selectedAlertReceiveChannel = alertReceiveChannel.id; @@ -95,9 +96,11 @@ class Integrations extends React.Component this.setState({ alertReceiveChannelToShowSettings: query.id }); } } + if (!selectedAlertReceiveChannel) { selectedAlertReceiveChannel = searchResult[0]?.id; } + this.setSelectedAlertReceiveChannel(selectedAlertReceiveChannel); }; @@ -134,8 +137,8 @@ class Integrations extends React.Component if (wrongTeamError) { return ( diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index 62e3dfef..ffc994c2 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -83,17 +83,19 @@ class SchedulesPage extends React.Component { + parseQueryParams = async () => { + this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + const { store, query: { id }, } = this.props; if (id) { - const schedule = store.scheduleStore + const schedule = await store.scheduleStore .loadItem(id, true) .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!schedule) {return;} + if (!schedule) return; const schedules = store.scheduleStore.getSearchResult(); const scheduleId = schedules && schedules.find((res) => res.id === id)?.id; @@ -121,8 +123,8 @@ class SchedulesPage extends React.Component diff --git a/grafana-plugin/src/pages/users/Users.tsx b/grafana-plugin/src/pages/users/Users.tsx index 6c9b961f..de013008 100644 --- a/grafana-plugin/src/pages/users/Users.tsx +++ b/grafana-plugin/src/pages/users/Users.tsx @@ -100,6 +100,8 @@ class Users extends React.Component { } parseParams = async () => { + this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + const { store, query: { id }, From 89361ba7e651acc7bf9bb806f4f38b2b32532cb5 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Wed, 14 Sep 2022 14:32:14 +0300 Subject: [PATCH 14/66] fix for webhook crash --- .../OutgoingWebhookForm/OutgoingWebhookForm.config.ts | 2 +- .../OutgoingWebhookForm/OutgoingWebhookForm.tsx | 8 ++------ .../src/pages/escalation-chains/EscalationChains.tsx | 6 +++++- .../src/pages/outgoing_webhooks/OutgoingWebhooks.tsx | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts index 76fecf4f..836f1bcf 100644 --- a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts +++ b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.config.ts @@ -34,7 +34,7 @@ export const form: { name: string; fields: FormItem[] } = { }, { name: 'data', - getDisabled: (form_data) => Boolean(form_data.forward_whole_payload), + getDisabled: (form_data) => Boolean(form_data?.forward_whole_payload), type: FormItemType.TextArea, description: 'Available variables: {{ alert_payload }}, {{ alert_group_id }}', extra: { diff --git a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx index 8385d0f8..76891c47 100644 --- a/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx +++ b/grafana-plugin/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx @@ -1,19 +1,15 @@ -import React, { useCallback, useState } from 'react'; +import React, { useCallback } from 'react'; -import { Button, Drawer, Input, Modal } from '@grafana/ui'; +import { Button, Drawer } from '@grafana/ui'; import cn from 'classnames/bind'; -import { get } from 'lodash-es'; import { observer } from 'mobx-react'; -import Emoji from 'react-emoji-render'; import GForm from 'components/GForm/GForm'; -import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; import Text from 'components/Text/Text'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; import { OutgoingWebhook } from 'models/outgoing_webhook/outgoing_webhook.types'; import { useStore } from 'state/useStore'; import { UserAction } from 'state/userAction'; -import { openErrorNotification } from 'utils'; import { form } from './OutgoingWebhookForm.config'; diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index c50b7886..ad713d8d 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -121,7 +121,11 @@ class EscalationChainsPage extends React.Component { + this.setState({ + wrongTeamError: false, + outgoingWebhookIdToEdit: undefined, + }); // reset state on query parse + const { store, query: { id }, From 4dfabb5ead1c71e7e31dbbc71c7e61a9d36cf273 Mon Sep 17 00:00:00 2001 From: "S. M. Mir-Ismaili" Date: Wed, 14 Sep 2022 16:48:32 +0430 Subject: [PATCH 15/66] Increase num of `getPluginSyncStatus` retries to 10 --- grafana-plugin/src/state/rootBaseStore.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-plugin/src/state/rootBaseStore.ts b/grafana-plugin/src/state/rootBaseStore.ts index e68a701b..7cc26416 100644 --- a/grafana-plugin/src/state/rootBaseStore.ts +++ b/grafana-plugin/src/state/rootBaseStore.ts @@ -219,7 +219,7 @@ export class RootBaseStore { this.handleSyncException(e); }); - if (counter >= 5) { + if (counter >= 10) { clearInterval(interval); this.retrySync = true; } From f2072034d55859022a8f0ee06a7d7b55298728f2 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Wed, 14 Sep 2022 16:06:31 +0300 Subject: [PATCH 16/66] linter --- grafana-plugin/src/pages/integrations/Integrations.tsx | 2 +- grafana-plugin/src/pages/schedules/Schedules.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index c9476ae1..47051656 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -81,7 +81,7 @@ class Integrations extends React.Component let alertReceiveChannel = await alertReceiveChannelStore .loadItem(query.id, true) .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!alertReceiveChannel) return; + if (!alertReceiveChannel) {return;} if (alertReceiveChannel.id) { selectedAlertReceiveChannel = alertReceiveChannel.id; diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index ffc994c2..bc268aeb 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -95,7 +95,7 @@ class SchedulesPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!schedule) return; + if (!schedule) {return;} const schedules = store.scheduleStore.getSearchResult(); const scheduleId = schedules && schedules.find((res) => res.id === id)?.id; From 4bcdcfa381ba70aa074e8091fba78f39a253c350 Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 16 Sep 2022 11:52:38 +0300 Subject: [PATCH 17/66] Wrong team error for user page --- engine/apps/api/views/user.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/engine/apps/api/views/user.py b/engine/apps/api/views/user.py index affd0ad9..3062b708 100644 --- a/engine/apps/api/views/user.py +++ b/engine/apps/api/views/user.py @@ -23,6 +23,7 @@ from apps.api.permissions import ( IsAdminOrEditor, IsOwnerOrAdmin, ) +from apps.api.serializers.team import TeamSerializer from apps.api.serializers.user import FilterUserSerializer, UserHiddenFieldsSerializer, UserSerializer from apps.auth_token.auth import ( MobileAppAuthTokenAuthentication, @@ -39,7 +40,7 @@ from apps.telegram.client import TelegramClient from apps.telegram.models import TelegramVerificationCode from apps.twilioapp.phone_manager import PhoneManager from apps.twilioapp.twilio_client import twilio_client -from apps.user_management.models import User +from apps.user_management.models import Team, User from common.api_helpers.exceptions import Conflict from common.api_helpers.mixins import FilterSerializerMixin, PublicPrimaryKeyMixin from common.api_helpers.paginators import HundredPageSizePaginator @@ -230,7 +231,10 @@ class UserView( def retrieve(self, request, *args, **kwargs): context = {"request": self.request, "format": self.format_kwarg, "view": self} - instance = self.get_object() + try: + instance = self.get_object() + except NotFound: + return self.wrong_team_response() if settings.OSS_INSTALLATION and live_settings.GRAFANA_CLOUD_NOTIFICATIONS_ENABLED: from apps.oss_installation.models import CloudConnector, CloudUserIdentity @@ -245,6 +249,26 @@ class UserView( serializer = self.get_serializer(instance, context=context) return Response(serializer.data) + def wrong_team_response(self): + """ + This method returns 403 and {"error_code": "wrong_team", "owner_team": {"name", "id", "email", "avatar_url"}}. + Used in case if a requested instance doesn't belong to user's current_team. + """ + queryset = User.objects.filter(organization=self.request.user.organization).order_by("id") + queryset = self.filter_queryset(queryset) + + try: + queryset.get(public_primary_key=self.kwargs["pk"]) + except ObjectDoesNotExist: + raise NotFound + + general_team = Team(public_primary_key=None, name="General", email=None, avatar_url=None) + + return Response( + data={"error_code": "wrong_team", "owner_team": TeamSerializer(general_team).data}, + status=status.HTTP_403_FORBIDDEN, + ) + def current(self, request): serializer = UserSerializer(self.get_queryset().get(pk=self.request.user.pk)) return Response(serializer.data) From c92faf23c6fa99960b32d7aae6cb20429f429065 Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 16 Sep 2022 11:53:47 +0300 Subject: [PATCH 18/66] Add tests for wrong team for user --- engine/apps/api/tests/test_team.py | 41 +++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/engine/apps/api/tests/test_team.py b/engine/apps/api/tests/test_team.py index 53faeca6..40df30d8 100644 --- a/engine/apps/api/tests/test_team.py +++ b/engine/apps/api/tests/test_team.py @@ -106,12 +106,16 @@ def test_team_permissions_wrong_team_general( user = make_user(organization=organization) _, token = make_token_for_organization(organization) + client = APIClient() + team = make_team(organization) user.teams.add(team) user.current_team = team user.save(update_fields=["current_team"]) + user_from_general_team = make_user(organization=organization) + alert_receive_channel = make_alert_receive_channel(organization) alert_group = make_alert_group(alert_receive_channel) @@ -125,8 +129,8 @@ def test_team_permissions_wrong_team_general( ("escalation_chain", escalation_chain), ("schedule", schedule), ("custom_button", webhook), + ("user", user_from_general_team), ): - client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) response = client.get(url, **make_user_auth_headers(user, token)) @@ -156,9 +160,16 @@ def test_team_permissions_wrong_team( user = make_user(organization=organization) _, token = make_token_for_organization(organization) + client = APIClient() + team = make_team(organization) user.teams.add(team) + another_user = make_user(organization=organization) + another_user.teams.add(team) + another_user.current_team = team + another_user.save(update_fields=["current_team"]) + alert_receive_channel = make_alert_receive_channel(organization, team=team) alert_group = make_alert_group(alert_receive_channel) @@ -173,7 +184,6 @@ def test_team_permissions_wrong_team( ("schedule", schedule), ("custom_button", webhook), ): - client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) response = client.get(url, **make_user_auth_headers(user, token)) @@ -189,6 +199,12 @@ def test_team_permissions_wrong_team( }, } + # Every user belongs to General team + url = reverse(f"api-internal:user-detail", kwargs={"pk": another_user.public_primary_key}) + response = client.get(url, **make_user_auth_headers(user, token)) + + assert response.status_code == status.HTTP_200_OK + @pytest.mark.django_db def test_team_permissions_not_in_team( @@ -208,8 +224,15 @@ def test_team_permissions_not_in_team( user = make_user(organization=organization) _, token = make_token_for_organization(organization) + client = APIClient() + team = make_team(organization) + another_user = make_user(organization=organization) + another_user.teams.add(team) + another_user.current_team = team + another_user.save(update_fields=["current_team"]) + alert_receive_channel = make_alert_receive_channel(organization, team=team) alert_group = make_alert_group(alert_receive_channel) @@ -224,7 +247,6 @@ def test_team_permissions_not_in_team( ("schedule", schedule), ("custom_button", webhook), ): - client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) response = client.get(url, **make_user_auth_headers(user, token)) @@ -232,6 +254,12 @@ def test_team_permissions_not_in_team( assert response.status_code == status.HTTP_403_FORBIDDEN assert response.json() == {"error_code": "wrong_team"} + # Every user belongs to General team + url = reverse(f"api-internal:user-detail", kwargs={"pk": another_user.public_primary_key}) + response = client.get(url, **make_user_auth_headers(user, token)) + + assert response.status_code == status.HTTP_200_OK + @pytest.mark.django_db def test_team_permissions_right_team( @@ -251,12 +279,17 @@ def test_team_permissions_right_team( user = make_user(organization=organization) _, token = make_token_for_organization(organization) + client = APIClient() + team = make_team(organization) user.teams.add(team) user.current_team = team user.save(update_fields=["current_team"]) + another_user = make_user(organization=organization) + another_user.teams.add(team) + alert_receive_channel = make_alert_receive_channel(organization, team=team) alert_group = make_alert_group(alert_receive_channel) @@ -270,8 +303,8 @@ def test_team_permissions_right_team( ("escalation_chain", escalation_chain), ("schedule", schedule), ("custom_button", webhook), + ("user", another_user), ): - client = APIClient() url = reverse(f"api-internal:{endpoint}-detail", kwargs={"pk": instance.public_primary_key}) response = client.get(url, **make_user_auth_headers(user, token)) From d71d8c42c6d361fbfbb453ae7b3665ed17ec1988 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 16 Sep 2022 16:48:05 +0300 Subject: [PATCH 19/66] fetch item with ?from_organization=true --- engine/config_integrations/alertmanager.py | 2 +- engine/config_integrations/grafana_alerting.py | 2 +- .../src/components/Policy/EscalationPolicy.tsx | 16 +++++++--------- .../EscalationChainSteps.tsx | 2 +- .../src/containers/GSelect/GSelect.tsx | 4 +++- grafana-plugin/src/models/base_store.ts | 7 +++++-- .../models/outgoing_webhook/outgoing_webhook.ts | 4 ++-- grafana-plugin/src/models/schedule/schedule.ts | 4 ++-- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/engine/config_integrations/alertmanager.py b/engine/config_integrations/alertmanager.py index bfdcff2e..cc356e26 100644 --- a/engine/config_integrations/alertmanager.py +++ b/engine/config_integrations/alertmanager.py @@ -9,7 +9,7 @@ is_able_to_autoresolve = True is_demo_alert_enabled = True description = """ -Alerts from Grafana Alertmanager are automatically routed to this integration." +Alerts from Grafana Alertmanager are automatically routed to this integration. {% for dict_item in grafana_alerting_entities %}
Click here to open contact point, and diff --git a/engine/config_integrations/grafana_alerting.py b/engine/config_integrations/grafana_alerting.py index e8942b1e..4eac0135 100644 --- a/engine/config_integrations/grafana_alerting.py +++ b/engine/config_integrations/grafana_alerting.py @@ -12,7 +12,7 @@ is_able_to_autoresolve = True is_demo_alert_enabled = True description = """ \ -Alerts from Grafana Alertmanager are automatically routed to this integration." +Alerts from Grafana Alertmanager are automatically routed to this integration. {% for dict_item in grafana_alerting_entities %}
Click here to open contact point, and diff --git a/grafana-plugin/src/components/Policy/EscalationPolicy.tsx b/grafana-plugin/src/components/Policy/EscalationPolicy.tsx index 1d2b5ce1..0a8d609b 100644 --- a/grafana-plugin/src/components/Policy/EscalationPolicy.tsx +++ b/grafana-plugin/src/components/Policy/EscalationPolicy.tsx @@ -14,14 +14,11 @@ import GSelect from 'containers/GSelect/GSelect'; import RemoteSelect from 'containers/RemoteSelect/RemoteSelect'; import UserTooltip from 'containers/UserTooltip/UserTooltip'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; -import { ActionDTO } from 'models/action'; import { prepareEscalationPolicy } from 'models/escalation_policy/escalation_policy.helpers'; import { EscalationPolicy as EscalationPolicyType, EscalationPolicyOption, } from 'models/escalation_policy/escalation_policy.types'; -import { PRIVATE_CHANNEL_NAME } from 'models/slack_channel/slack_channel.config'; -import { User, UserRole } from 'models/user/user.types'; import { WaitDelay } from 'models/wait_delay'; import { SelectOption } from 'state/types'; import { UserAction } from 'state/userAction'; @@ -272,15 +269,15 @@ export class EscalationPolicy extends React.Component - ); @@ -319,6 +316,7 @@ export class EscalationPolicy extends React.Component ); diff --git a/grafana-plugin/src/containers/EscalationChainSteps/EscalationChainSteps.tsx b/grafana-plugin/src/containers/EscalationChainSteps/EscalationChainSteps.tsx index 062b9b8d..8f9174aa 100644 --- a/grafana-plugin/src/containers/EscalationChainSteps/EscalationChainSteps.tsx +++ b/grafana-plugin/src/containers/EscalationChainSteps/EscalationChainSteps.tsx @@ -67,7 +67,7 @@ const EscalationChainSteps = observer((props: EscalationChainStepsProps) => { // const STEP_COLORS = ['#52C41A', '#A0D911', '#FADB14', '#FAAD14', COLOR_RED]; const STEP_COLORS = ['#1A7F4B', '#33cc33', '#ffbf00', '#FF8000', COLOR_RED]; - const { alertReceiveChannelStore, escalationPolicyStore } = store; + const { escalationPolicyStore } = store; const escalationPolicy = escalationPolicyStore.items[escalationPolicyId]; diff --git a/grafana-plugin/src/containers/GSelect/GSelect.tsx b/grafana-plugin/src/containers/GSelect/GSelect.tsx index a41c31ce..07e8c562 100644 --- a/grafana-plugin/src/containers/GSelect/GSelect.tsx +++ b/grafana-plugin/src/containers/GSelect/GSelect.tsx @@ -32,6 +32,7 @@ interface GSelectProps { showWarningIfEmptyValue?: boolean; showError?: boolean; nullItemName?: string; + fromOrganization?: boolean; filterOptions?: (id: any) => boolean; dropdownRender?: (menu: ReactElement) => ReactElement; getOptionLabel?: (item: SelectableValue) => React.ReactNode; @@ -59,6 +60,7 @@ const GSelect = observer((props: GSelectProps) => { showWarningIfEmptyValue = false, getDescription, filterOptions, + fromOrganization, } = props; const store = useStore(); @@ -123,7 +125,7 @@ const GSelect = observer((props: GSelectProps) => { (values as string[]).forEach((value: string) => { if (!isNil(value) && !model.items[value] && model.updateItem) { - model.updateItem(value); + model.updateItem(value, fromOrganization); } }); }, [value]); diff --git a/grafana-plugin/src/models/base_store.ts b/grafana-plugin/src/models/base_store.ts index 03115181..aed5144b 100644 --- a/grafana-plugin/src/models/base_store.ts +++ b/grafana-plugin/src/models/base_store.ts @@ -41,8 +41,11 @@ export default class BaseStore { } @action - async getById(id: string, skipErrorHandling = false) { - return await makeRequest(`${this.path}${id}/`, { + async getById(id: string, skipErrorHandling = false, fromOrganization = false) { + let path = `${this.path}${id}`; + if (fromOrganization) {path = path.concat('?from_organization=true');} + + return await makeRequest(path, { method: 'GET', }).catch((error) => this.onApiError(error, skipErrorHandling)); } diff --git a/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts b/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts index d064fa38..f8a435c7 100644 --- a/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts +++ b/grafana-plugin/src/models/outgoing_webhook/outgoing_webhook.ts @@ -42,8 +42,8 @@ export class OutgoingWebhookStore extends BaseStore { } @action - async updateItem(id: OutgoingWebhook['id']) { - const response = await this.getById(id); + async updateItem(id: OutgoingWebhook['id'], fromOrganization = false) { + const response = await this.getById(id, false, fromOrganization); this.items = { ...this.items, diff --git a/grafana-plugin/src/models/schedule/schedule.ts b/grafana-plugin/src/models/schedule/schedule.ts index a2b66973..3cf0e8d1 100644 --- a/grafana-plugin/src/models/schedule/schedule.ts +++ b/grafana-plugin/src/models/schedule/schedule.ts @@ -76,9 +76,9 @@ export class ScheduleStore extends BaseStore { }; } - async updateItem(id: Schedule['id']) { + async updateItem(id: Schedule['id'], fromOrganization = false) { if (id) { - const item = await this.getById(id); + const item = await this.getById(id, true, fromOrganization); this.items = { ...this.items, From dd77596447960a181dafaefb8062ff9f52bf6a36 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Fri, 16 Sep 2022 17:43:31 +0300 Subject: [PATCH 20/66] handle page refresh when switching teams --- grafana-plugin/src/GrafanaPluginRootPage.tsx | 2 +- .../src/components/PluginLink/PluginLink.tsx | 2 +- .../GrafanaTeamSelect/GrafanaTeamSelect.tsx | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/grafana-plugin/src/GrafanaPluginRootPage.tsx b/grafana-plugin/src/GrafanaPluginRootPage.tsx index 870c1cae..05742afd 100644 --- a/grafana-plugin/src/GrafanaPluginRootPage.tsx +++ b/grafana-plugin/src/GrafanaPluginRootPage.tsx @@ -135,7 +135,7 @@ export const Root = observer((props: AppRootProps) => { return ( - + ); diff --git a/grafana-plugin/src/components/PluginLink/PluginLink.tsx b/grafana-plugin/src/components/PluginLink/PluginLink.tsx index eef5374e..3a218c2e 100644 --- a/grafana-plugin/src/components/PluginLink/PluginLink.tsx +++ b/grafana-plugin/src/components/PluginLink/PluginLink.tsx @@ -11,7 +11,7 @@ interface PluginLinkProps extends LocationUpdate { disabled?: boolean; className?: string; wrap?: boolean; - children: any + children: any; } const cx = cn.bind(styles); diff --git a/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx b/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx index 1ca31a27..de290790 100644 --- a/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx +++ b/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { SelectableValue } from '@grafana/data'; +import { getLocationSrv } from '@grafana/runtime'; import { HorizontalGroup, Icon, IconButton, Label, Tooltip } from '@grafana/ui'; import cn from 'classnames/bind'; import { observer } from 'mobx-react'; @@ -18,11 +19,14 @@ import styles from './GrafanaTeamSelect.module.css'; const cx = cn.bind(styles); -interface GrafanaTeamSelectProps {} +interface GrafanaTeamSelectProps { + currentPage: string; +} const GrafanaTeamSelect = observer((props: GrafanaTeamSelectProps) => { const store = useStore(); + const { currentPage } = props; const { userStore, grafanaTeamStore } = store; const grafanaTeams = grafanaTeamStore.getSearchResult(); const user = userStore.currentUser; @@ -33,7 +37,10 @@ const GrafanaTeamSelect = observer((props: GrafanaTeamSelectProps) => { const onTeamChange = async (teamId: GrafanaTeam['id']) => { await userStore.updateCurrentUser({ current_team: teamId }); - window.location.reload(); + + const queryParams = new URLSearchParams(); + queryParams.set('page', currentPage); + window.location.search = queryParams.toString(); }; return document.getElementsByClassName('page-header__inner')[0] From 98dbca82c74ab889831cdf8a00a2823b7661391e Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Mon, 19 Sep 2022 13:19:56 +0300 Subject: [PATCH 21/66] cleanup --- .../src/components/NotFoundInTeam/WrongTeamStub.module.css | 4 ---- .../src/components/NotFoundInTeam/WrongTeamStub.tsx | 4 ++-- .../src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.module.css b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.module.css index d158a511..70b01cd0 100644 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.module.css +++ b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.module.css @@ -13,7 +13,3 @@ margin-right: 4px; padding-top: 6px; } - -.return-to-list { - margin-top: 32px; -} diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx index 269c07a8..08a104d0 100644 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx +++ b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; -import { Button, VerticalGroup, Icon } from '@grafana/ui'; +import { Button, VerticalGroup } from '@grafana/ui'; import cn from 'classnames/bind'; import PluginLink from 'components/PluginLink/PluginLink'; @@ -60,7 +60,7 @@ const WrongTeamStub: FC = (props) => { Change the team )} - + Or return to the {objectName} list for team {currentTeam} diff --git a/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx b/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx index de290790..05e356c5 100644 --- a/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx +++ b/grafana-plugin/src/containers/GrafanaTeamSelect/GrafanaTeamSelect.tsx @@ -1,13 +1,10 @@ import React from 'react'; -import { SelectableValue } from '@grafana/data'; -import { getLocationSrv } from '@grafana/runtime'; -import { HorizontalGroup, Icon, IconButton, Label, Tooltip } from '@grafana/ui'; +import { Icon, Label, Tooltip } from '@grafana/ui'; import cn from 'classnames/bind'; import { observer } from 'mobx-react'; import ReactDOM from 'react-dom'; -import Avatar from 'components/Avatar/Avatar'; import PluginLink from 'components/PluginLink/PluginLink'; import GSelect from 'containers/GSelect/GSelect'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; From aeb8de96a282f3b95926eae579fff88eeb45c526 Mon Sep 17 00:00:00 2001 From: Julia Date: Tue, 20 Sep 2022 14:47:42 +0300 Subject: [PATCH 22/66] Update comment for wrong_team_response in UserView --- engine/apps/api/views/user.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engine/apps/api/views/user.py b/engine/apps/api/views/user.py index 3062b708..4d63089c 100644 --- a/engine/apps/api/views/user.py +++ b/engine/apps/api/views/user.py @@ -253,6 +253,8 @@ class UserView( """ This method returns 403 and {"error_code": "wrong_team", "owner_team": {"name", "id", "email", "avatar_url"}}. Used in case if a requested instance doesn't belong to user's current_team. + Used instead of TeamFilteringMixin because of m2m teams field (mixin doesn't work correctly with this) + and overridden retrieve method in UserView. """ queryset = User.objects.filter(organization=self.request.user.organization).order_by("id") queryset = self.filter_queryset(queryset) From 1e4353966309fcbf5a25148060325a4c2dda4384 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Tue, 20 Sep 2022 17:24:20 +0300 Subject: [PATCH 23/66] refactored the duplicate code of wrong data state --- .../NotFoundInTeam/WrongTeam.helpers.tsx | 23 -- .../WrongTeamDisplayWrapper.helpers.tsx | 18 ++ ...css => WrongTeamDisplayWrapper.module.css} | 0 ...amStub.tsx => WrongTeamDisplayWrapper.tsx} | 37 ++- grafana-plugin/src/models/base_store.ts | 6 +- .../escalation-chains/EscalationChains.tsx | 177 ++++++------- .../src/pages/incident/Incident.tsx | 161 ++++++------ .../src/pages/integrations/Integrations.tsx | 244 +++++++++--------- .../outgoing_webhooks/OutgoingWebhooks.tsx | 101 ++++---- .../src/pages/schedules/Schedules.tsx | 227 ++++++++-------- grafana-plugin/src/pages/users/Users.tsx | 155 ++++++----- 11 files changed, 546 insertions(+), 603 deletions(-) delete mode 100644 grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx create mode 100644 grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx rename grafana-plugin/src/components/NotFoundInTeam/{WrongTeamStub.module.css => WrongTeamDisplayWrapper.module.css} (100%) rename grafana-plugin/src/components/NotFoundInTeam/{WrongTeamStub.tsx => WrongTeamDisplayWrapper.tsx} (78%) diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx b/grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx deleted file mode 100644 index 176cbf29..00000000 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeam.helpers.tsx +++ /dev/null @@ -1,23 +0,0 @@ -interface WrongTeamResponse { - notFound?: boolean; - wrongTeamError?: boolean; - teamToSwitch?: { name: string; id: string }; - wrongTeamNoPermissions?: boolean; -} - -export function getWrongTeamResponseInfo({ response }): WrongTeamResponse { - if (response) { - if (response.status === 404) { - return { notFound: true }; - } else if (response.status === 403 && response.data.error_code === 'wrong_team') { - let res = response.data; - if (res.owner_team) { - return { wrongTeamError: true, teamToSwitch: { name: res.owner_team.name, id: res.owner_team.id } }; - } else { - return { wrongTeamError: true, wrongTeamNoPermissions: true }; - } - } - } - - return { notFound: true }; -} diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx new file mode 100644 index 00000000..71338188 --- /dev/null +++ b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx @@ -0,0 +1,18 @@ +import { WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; + +export function getWrongTeamResponseInfo({ response }): Partial { + if (response) { + if (response.status === 404) { + return { notFound: true }; + } else if (response.status === 403 && response.data.error_code === 'wrong_team') { + let res = response.data; + if (res.owner_team) { + return { isError: true, switchToTeam: { name: res.owner_team.name, id: res.owner_team.id } }; + } else { + return { isError: true, wrongTeamNoPermissions: true }; + } + } + } + + return { notFound: true }; +} diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.module.css b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.module.css similarity index 100% rename from grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.module.css rename to grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.module.css diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.tsx similarity index 78% rename from grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx rename to grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.tsx index 08a104d0..b940b69b 100644 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamStub.tsx +++ b/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.tsx @@ -1,4 +1,4 @@ -import React, { FC } from 'react'; +import React from 'react'; import { Button, VerticalGroup } from '@grafana/ui'; import cn from 'classnames/bind'; @@ -9,25 +9,40 @@ import { ChangeTeamIcon } from 'icons'; import { GrafanaTeam } from 'models/grafana_team/grafana_team.types'; import { useStore } from 'state/useStore'; -import styles from './WrongTeamStub.module.css'; +import styles from './WrongTeamWrapperDisplay.module.css'; const cx = cn.bind(styles); -export interface WrongTeamStubProps { - className?: string; - objectName: string; - pageName: string; - switchToTeam?: { name: string; id: string }; +export interface WrongTeamData { + notFound?: boolean; + isError?: boolean; wrongTeamNoPermissions?: boolean; + switchToTeam?: { name: string; id: string }; } -const WrongTeamStub: FC = (props) => { +export function initWrongTeamDataState(): Partial { + return { isError: false, wrongTeamNoPermissions: false }; +} + +export default function WrongTeamDisplayWrapper({ + wrongTeamData, + objectName, + pageName, + children, +}: { + wrongTeamData: WrongTeamData; + objectName: string; + pageName: string; + children: any; +}) { + if (!wrongTeamData.isError) return children(); + const store = useStore(); const currentTeamId = store.userStore.currentUser?.current_team; const currentTeam = store.grafanaTeamStore.items[currentTeamId]?.name; - const { objectName, pageName, switchToTeam, wrongTeamNoPermissions } = props; + const { switchToTeam, wrongTeamNoPermissions } = wrongTeamData; const onTeamChange = async (teamId: GrafanaTeam['id']) => { await store.userStore.updateCurrentUser({ current_team: teamId }); @@ -66,6 +81,4 @@ const WrongTeamStub: FC = (props) => {
); -}; - -export default WrongTeamStub; +} diff --git a/grafana-plugin/src/models/base_store.ts b/grafana-plugin/src/models/base_store.ts index aed5144b..f20c4d6b 100644 --- a/grafana-plugin/src/models/base_store.ts +++ b/grafana-plugin/src/models/base_store.ts @@ -42,11 +42,9 @@ export default class BaseStore { @action async getById(id: string, skipErrorHandling = false, fromOrganization = false) { - let path = `${this.path}${id}`; - if (fromOrganization) {path = path.concat('?from_organization=true');} - - return await makeRequest(path, { + return await makeRequest(`${this.path}${id}`, { method: 'GET', + params: { from_organization: fromOrganization }, }).catch((error) => this.onApiError(error, skipErrorHandling)); } diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index ad713d8d..fac11f4b 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -11,8 +11,8 @@ import Collapse from 'components/Collapse/Collapse'; import EscalationsFilters from 'components/EscalationsFilters/EscalationsFilters'; import Block from 'components/GBlock/Block'; import GList from 'components/GList/GList'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; @@ -39,11 +39,7 @@ interface EscalationChainsPageState { showCreateEscalationChainModal: boolean; escalationChainIdToCopy: EscalationChain['id']; selectedEscalationChain: EscalationChain['id']; - - notFound?: boolean; - wrongTeamError?: boolean; - teamToSwitch?: { name: string; id: string }; - wrongTeamNoPermissions?: boolean; + wrongTeamData: WrongTeamData; } export interface Filters { @@ -57,8 +53,7 @@ class EscalationChainsPage extends React.Component { - this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + this.setState({ wrongTeamData: initWrongTeamDataState() }); // reset wrong team error to false on query parse const { store, query } = this.props; const { escalationChainStore } = store; @@ -80,7 +75,8 @@ class EscalationChainsPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); + .catch((error) => this.setState({ wrongTeamData: { ...getWrongTeamResponseInfo(error) } })); + if (!escalationChain) { return; } @@ -134,99 +130,90 @@ class EscalationChainsPage extends React.Component - ); - } - const { escalationChainStore } = store; const searchResult = escalationChainStore.getSearchResult(escalationChainsFilters.searchTerm); return ( - <> -
-
- -
- {!searchResult || searchResult.length ? ( -
-
- - - -
- {searchResult ? ( - - {(item) => } - - ) : ( - - )} -
+ + {() => ( + <> +
+
+
-
{this.renderEscalation()}
+ {!searchResult || searchResult.length ? ( +
+
+ + + +
+ {searchResult ? ( + + {(item) => } + + ) : ( + + )} +
+
+
{this.renderEscalation()}
+
+ ) : ( + + No escalations found, check your filtering and current team. + + + + + } + /> + )}
- ) : ( - - No escalations found, check your filtering and current team. - - - - - } - /> - )} -
- {showCreateEscalationChainModal && ( - { - this.setState({ - showCreateEscalationChainModal: false, - escalationChainIdToCopy: undefined, - }); - }} - onUpdate={this.handleEscalationChainCreate} - /> + {showCreateEscalationChainModal && ( + { + this.setState({ + showCreateEscalationChainModal: false, + escalationChainIdToCopy: undefined, + }); + }} + onUpdate={this.handleEscalationChainCreate} + /> + )} + )} - + ); } diff --git a/grafana-plugin/src/pages/incident/Incident.tsx b/grafana-plugin/src/pages/incident/Incident.tsx index cfb80afc..006f2580 100644 --- a/grafana-plugin/src/pages/incident/Incident.tsx +++ b/grafana-plugin/src/pages/incident/Incident.tsx @@ -26,8 +26,8 @@ import reactStringReplace from 'react-string-replace'; import Collapse from 'components/Collapse/Collapse'; import Block from 'components/GBlock/Block'; import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import SourceCode from 'components/SourceCode/SourceCode'; import Text from 'components/Text/Text'; @@ -62,12 +62,9 @@ interface IncidentPageProps extends WithStoreProps, AppRootProps {} interface IncidentPageState { showIntegrationSettings?: boolean; showAttachIncidentForm?: boolean; - notFound?: boolean; - wrongTeamError?: boolean; - wrongTeamNoPermissions?: boolean; - teamToSwitch?: { name: string; id: string }; timelineFilter: string; resolutionNoteText: string; + wrongTeamData: WrongTeamData; } @observer @@ -75,8 +72,7 @@ class IncidentPage extends React.Component state: IncidentPageState = { timelineFilter: 'all', resolutionNoteText: '', - wrongTeamError: false, - wrongTeamNoPermissions: false, + wrongTeamData: initWrongTeamDataState(), }; componentDidMount() { @@ -94,14 +90,16 @@ class IncidentPage extends React.Component } update = () => { - this.setState({ wrongTeamError: false }); // reset wrong team error to false + this.setState({ wrongTeamData: initWrongTeamDataState() }); // reset wrong team error to false on query parse // reset wrong team error to false const { store, query: { id }, } = this.props; - store.alertGroupStore.getAlert(id).catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); + store.alertGroupStore + .getAlert(id) + .catch((error) => this.setState({ wrongTeamData: { ...getWrongTeamResponseInfo(error) } })); }; render() { @@ -110,50 +108,32 @@ class IncidentPage extends React.Component query: { id, cursor, start, perpage }, } = this.props; - const { - showIntegrationSettings, - showAttachIncidentForm, - notFound, - wrongTeamError, - teamToSwitch, - wrongTeamNoPermissions, - } = this.state; + const { wrongTeamData, showIntegrationSettings, showAttachIncidentForm } = this.state; const { alertReceiveChannelStore } = store; const { alerts } = store.alertGroupStore; const incident = alerts.get(id); - if (notFound) { - return ( -
-
- - 404 - Incident not found - - - - -
-
- ); - } + // if (notFound) { + // return ( + //
+ //
+ // + // 404 + // Incident not found + // + // + // + // + //
+ //
+ // ); + // } - if (wrongTeamError) { - return ( - - ); - } - - if (!incident) { + if (!incident && !wrongTeamData.isError) { return (
@@ -162,48 +142,55 @@ class IncidentPage extends React.Component } return ( - <> -
- {this.renderHeader()} -
-
- - - + + {() => ( + <> +
+ {this.renderHeader()} +
+
+ + + +
+
{this.renderTimeline()}
+
-
{this.renderTimeline()}
-
-
- {showIntegrationSettings && ( - { - alertReceiveChannelStore.updateItem(incident.alert_receive_channel.id); - }} - onUpdateTemplates={() => { - store.alertGroupStore.getAlert(id); - }} - startTab={IntegrationSettingsTab.Templates} - id={incident.alert_receive_channel.id} - onHide={() => - this.setState({ - showIntegrationSettings: undefined, - }) - } - /> + {showIntegrationSettings && ( + { + alertReceiveChannelStore.updateItem(incident.alert_receive_channel.id); + }} + onUpdateTemplates={() => { + store.alertGroupStore.getAlert(id); + }} + startTab={IntegrationSettingsTab.Templates} + id={incident.alert_receive_channel.id} + onHide={() => + this.setState({ + showIntegrationSettings: undefined, + }) + } + /> + )} + {showAttachIncidentForm && ( + { + this.setState({ + showAttachIncidentForm: false, + }); + }} + onUpdate={this.update} + /> + )} + )} - {showAttachIncidentForm && ( - { - this.setState({ - showAttachIncidentForm: false, - }); - }} - onUpdate={this.update} - /> - )} - + ); } diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 47051656..8251143f 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react'; import GList from 'components/GList/GList'; import IntegrationsFilters, { Filters } from 'components/IntegrationsFilters/IntegrationsFilters'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; @@ -36,11 +36,7 @@ interface IntegrationsState { showCreateIntegrationModal: boolean; alertReceiveChannelToShowSettings?: AlertReceiveChannel['id']; integrationSettingsTab?: IntegrationSettingsTab; - - notFound?: boolean; - wrongTeamError?: boolean; - teamToSwitch?: { name: string; id: string }; - wrongTeamNoPermissions?: boolean; + wrongTeamData: WrongTeamData; } interface IntegrationsProps extends WithStoreProps, AppRootProps {} @@ -50,9 +46,7 @@ class Integrations extends React.Component state: IntegrationsState = { integrationsFilters: { searchTerm: '' }, showCreateIntegrationModal: false, - - wrongTeamError: false, - wrongTeamNoPermissions: false, + wrongTeamData: initWrongTeamDataState(), }; alertReceiveChanneltoPoll: { [key: string]: number } = {}; @@ -69,7 +63,7 @@ class Integrations extends React.Component }; parseQueryParams = async () => { - this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + this.setState({ wrongTeamData: initWrongTeamDataState() }); // reset wrong team error to false on query parse // reset wrong team error to false const { store, query } = this.props; const { alertReceiveChannelStore } = store; @@ -80,8 +74,11 @@ class Integrations extends React.Component if (query.id) { let alertReceiveChannel = await alertReceiveChannelStore .loadItem(query.id, true) - .catch((error) => this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!alertReceiveChannel) {return;} + .catch((error) => this.setState({ wrongTeamData: { ...getWrongTeamResponseInfo(error) } })); + + if (!alertReceiveChannel) { + return; + } if (alertReceiveChannel.id) { selectedAlertReceiveChannel = alertReceiveChannel.id; @@ -129,133 +126,124 @@ class Integrations extends React.Component alertReceiveChannelToShowSettings, integrationSettingsTab, showCreateIntegrationModal, - wrongTeamError, - teamToSwitch, - wrongTeamNoPermissions, + wrongTeamData, } = this.state; - if (wrongTeamError) { - return ( - - ); - } - const { alertReceiveChannelStore } = store; const searchResult = alertReceiveChannelStore.getSearchResult(); return ( - <> -
-
- -
- {searchResult?.length ? ( -
-
- - - -
- - {(item) => ( - { - this.setState({ - alertReceiveChannelToShowSettings: item.id, - integrationSettingsTab: IntegrationSettingsTab.Heartbeat, - }); - }} - /> - )} - -
+ + {() => ( + <> +
+
+
-
- { - this.setState({ - alertReceiveChannelToShowSettings: store.selectedAlertReceiveChannel, - integrationSettingsTab, - }); - }} - /*onEditAlertReceiveChannelTemplates={this.getShowAlertReceiveChannelSettingsClickHandler( + {searchResult?.length ? ( +
+
+ + + +
+ + {(item) => ( + { + this.setState({ + alertReceiveChannelToShowSettings: item.id, + integrationSettingsTab: IntegrationSettingsTab.Heartbeat, + }); + }} + /> + )} + +
+
+
+ { + this.setState({ + alertReceiveChannelToShowSettings: store.selectedAlertReceiveChannel, + integrationSettingsTab, + }); + }} + /*onEditAlertReceiveChannelTemplates={this.getShowAlertReceiveChannelSettingsClickHandler( store.selectedAlertReceiveChannel )}*/ + /> +
+
+ ) : searchResult ? ( + + No integrations found. Review your filter and team settings. + + + + + } /> -
+ ) : ( + + )}
- ) : searchResult ? ( - - No integrations found. Review your filter and team settings. - - - - - } - /> - ) : ( - - )} -
- {alertReceiveChannelToShowSettings && ( - { - alertReceiveChannelStore.updateItem(alertReceiveChannelToShowSettings); - }} - startTab={integrationSettingsTab} - id={alertReceiveChannelToShowSettings} - onHide={() => { - this.setState({ - alertReceiveChannelToShowSettings: undefined, - integrationSettingsTab: undefined, - }); - getLocationSrv().update({ partial: true, query: { tab: undefined } }); - }} - /> + {alertReceiveChannelToShowSettings && ( + { + alertReceiveChannelStore.updateItem(alertReceiveChannelToShowSettings); + }} + startTab={integrationSettingsTab} + id={alertReceiveChannelToShowSettings} + onHide={() => { + this.setState({ + alertReceiveChannelToShowSettings: undefined, + integrationSettingsTab: undefined, + }); + getLocationSrv().update({ partial: true, query: { tab: undefined } }); + }} + /> + )} + {showCreateIntegrationModal && ( + { + this.setState({ showCreateIntegrationModal: false }); + }} + onCreate={this.handleCreateNewAlertReceiveChannel} + /> + )} + )} - {showCreateIntegrationModal && ( - { - this.setState({ showCreateIntegrationModal: false }); - }} - onCreate={this.handleCreateNewAlertReceiveChannel} - /> - )} - + ); } diff --git a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx index 94ce682f..ed1221e1 100644 --- a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx +++ b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx @@ -7,17 +7,15 @@ import cn from 'classnames/bind'; import { observer } from 'mobx-react'; import GTable from 'components/GTable/GTable'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import WithConfirm from 'components/WithConfirm/WithConfirm'; -import GSelect from 'containers/GSelect/GSelect'; import OutgoingWebhookForm from 'containers/OutgoingWebhookForm/OutgoingWebhookForm'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; import { ActionDTO } from 'models/action'; import { OutgoingWebhook } from 'models/outgoing_webhook/outgoing_webhook.types'; -import { PRIVATE_CHANNEL_NAME } from 'models/slack_channel/slack_channel.config'; import { WithStoreProps } from 'state/types'; import { UserAction } from 'state/userAction'; import { withMobXProviderContext } from 'state/withStore'; @@ -30,17 +28,13 @@ interface OutgoingWebhooksProps extends WithStoreProps, AppRootProps {} interface OutgoingWebhooksState { outgoingWebhookIdToEdit?: OutgoingWebhook['id'] | 'new'; - notFound?: boolean; - wrongTeamError?: boolean; - teamToSwitch?: { name: string; id: string }; - wrongTeamNoPermissions?: boolean; + wrongTeamData: WrongTeamData; } @observer class OutgoingWebhooks extends React.Component { state: OutgoingWebhooksState = { - wrongTeamError: false, - wrongTeamNoPermissions: false, + wrongTeamData: initWrongTeamDataState(), }; async componentDidMount() { @@ -54,10 +48,10 @@ class OutgoingWebhooks extends React.Component { - this.setState({ - wrongTeamError: false, + this.setState((prevState) => ({ + wrongTeamData: initWrongTeamDataState(), outgoingWebhookIdToEdit: undefined, - }); // reset state on query parse + })); // reset state on query parse const { store, @@ -66,7 +60,7 @@ class OutgoingWebhooks extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); + .catch((error) => this.setState({ wrongTeamData: { ...getWrongTeamResponseInfo(error) } })); if (id) { this.setState({ outgoingWebhookIdToEdit: id }); @@ -81,18 +75,7 @@ class OutgoingWebhooks extends React.Component - ); - } + const { outgoingWebhookIdToEdit, wrongTeamData } = this.state; const webhooks = store.outgoingWebhookStore.getSearchResult(); @@ -115,39 +98,43 @@ class OutgoingWebhooks extends React.Component -
- ( -
- Outgoing Webhooks - - - - - -
+ + {() => ( + <> +
+ ( +
+ Outgoing Webhooks + + + + + +
+ )} + rowKey="id" + columns={columns} + data={webhooks} + /> +
+ {outgoingWebhookIdToEdit && ( + )} - rowKey="id" - columns={columns} - data={webhooks} - /> -
- {outgoingWebhookIdToEdit && ( - + )} - + ); } diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index bc268aeb..5402a3e4 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -22,8 +22,8 @@ import moment, { Moment } from 'moment-timezone'; import instructionsImage from 'assets/img/events_instructions.png'; import Avatar from 'components/Avatar/Avatar'; import GTable from 'components/GTable/GTable'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import SchedulesFilters from 'components/SchedulesFilters/SchedulesFilters'; import { SchedulesFiltersType } from 'components/SchedulesFilters/SchedulesFilters.types'; @@ -55,11 +55,7 @@ interface SchedulesPageState { scheduleIdToExport?: Schedule['id']; filters: SchedulesFiltersType; expandedSchedulesKeys: Array; - - notFound?: boolean; - wrongTeamError?: boolean; - teamToSwitch?: { name: string; id: string }; - wrongTeamNoPermissions?: boolean; + wrongTeamData: WrongTeamData; } @observer @@ -69,8 +65,7 @@ class SchedulesPage extends React.Component { - this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + this.setState({ wrongTeamData: initWrongTeamDataState() }); // reset wrong team error to false on query parse const { store, @@ -94,8 +89,10 @@ class SchedulesPage extends React.Component this.setState({ ...getWrongTeamResponseInfo(error) })); - if (!schedule) {return;} + .catch((error) => this.setState({ wrongTeamData: { ...getWrongTeamResponseInfo(error) } })); + if (!schedule) { + return; + } const schedules = store.scheduleStore.getSearchResult(); const scheduleId = schedules && schedules.find((res) => res.id === id)?.id; @@ -117,20 +114,9 @@ class SchedulesPage extends React.Component - ); - } - const columns = [ { width: '10%', @@ -176,102 +162,107 @@ class SchedulesPage extends React.Component -
-
- - On-call Schedules - - Use this to distribute notifications among team members you specified in the "Notify Users from on-call - schedule" step in escalation chains. - - -
- {!schedules || schedules.length ? ( - ( -
- - - - Your timezone is {timezoneStr} UTC{offset} - - - - - - - -
+ + {() => ( + <> +
+
+ + On-call Schedules + + Use this to distribute notifications among team members you specified in the "Notify Users from + on-call schedule" step in{' '} + escalation chains. + + +
+ {!schedules || schedules.length ? ( + ( +
+ + + + Your timezone is {timezoneStr} UTC{offset} + + + + + + + +
+ )} + rowKey="id" + columns={columns} + data={schedules} + expandable={{ + expandedRowRender: this.renderEvents, + expandRowByClick: true, + onExpand: this.onRowExpand, + expandedRowKeys: expandedSchedulesKeys, + onExpandedRowsChange: this.handleExpandedRowsChange, + }} + /> + ) : ( + + You haven’t added a schedule yet. + + + + + } + /> )} - rowKey="id" - columns={columns} - data={schedules} - expandable={{ - expandedRowRender: this.renderEvents, - expandRowByClick: true, - onExpand: this.onRowExpand, - expandedRowKeys: expandedSchedulesKeys, - onExpandedRowsChange: this.handleExpandedRowsChange, - }} - /> - ) : ( - - You haven’t added a schedule yet. - - - - - } - /> - )} -
- {scheduleIdToEdit && ( - { - this.setState({ scheduleIdToEdit: undefined }); - getLocationSrv().update({ partial: true, query: { id: undefined } }); - }} - /> +
+ {scheduleIdToEdit && ( + { + this.setState({ scheduleIdToEdit: undefined }); + getLocationSrv().update({ partial: true, query: { id: undefined } }); + }} + /> + )} + {scheduleIdToDelete && ( + { + this.setState({ scheduleIdToDelete: undefined }); + }} + /> + )} + {scheduleIdToExport && ( + this.setState({ scheduleIdToExport: undefined })} + > + + + )} + )} - {scheduleIdToDelete && ( - { - this.setState({ scheduleIdToDelete: undefined }); - }} - /> - )} - {scheduleIdToExport && ( - this.setState({ scheduleIdToExport: undefined })} - > - - - )} - + ); } diff --git a/grafana-plugin/src/pages/users/Users.tsx b/grafana-plugin/src/pages/users/Users.tsx index de013008..d971d4b8 100644 --- a/grafana-plugin/src/pages/users/Users.tsx +++ b/grafana-plugin/src/pages/users/Users.tsx @@ -9,8 +9,8 @@ import { observer } from 'mobx-react'; import Avatar from 'components/Avatar/Avatar'; import GTable from 'components/GTable/GTable'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeam.helpers'; -import WrongTeamStub from 'components/NotFoundInTeam/WrongTeamStub'; +import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import UsersFilters from 'components/UsersFilters/UsersFilters'; @@ -41,10 +41,7 @@ interface UsersState { roles?: UserRole[]; }; - notFound?: boolean; - wrongTeamError?: boolean; - teamToSwitch?: { name: string; id: string }; - wrongTeamNoPermissions?: boolean; + wrongTeamData: WrongTeamData; } @observer @@ -58,8 +55,7 @@ class Users extends React.Component { roles: [UserRole.ADMIN, UserRole.EDITOR, UserRole.VIEWER], }, - wrongTeamError: false, - wrongTeamNoPermissions: false, + wrongTeamData: initWrongTeamDataState(), }; initialUsersLoaded = false; @@ -100,7 +96,7 @@ class Users extends React.Component { } parseParams = async () => { - this.setState({ wrongTeamError: false }); // reset wrong team error to false on query parse + this.setState({ wrongTeamData: initWrongTeamDataState() }); // reset wrong team error to false on query parse const { store, @@ -109,7 +105,7 @@ class Users extends React.Component { if (id) { await (id === 'me' ? store.userStore.loadCurrentUser() : store.userStore.loadUser(String(id), true)).catch( - (error) => this.setState({ ...getWrongTeamResponseInfo(error) }) + (error) => this.setState({ wrongTeamData: { ...getWrongTeamResponseInfo(error) } }) ); const userPkToEdit = String(id === 'me' ? store.userStore.currentUserPk : id); @@ -121,7 +117,7 @@ class Users extends React.Component { }; render() { - const { usersFilters, userPkToEdit, page, wrongTeamError, teamToSwitch, wrongTeamNoPermissions } = this.state; + const { usersFilters, userPkToEdit, page, wrongTeamData } = this.state; const { store } = this.props; const { userStore } = store; @@ -173,76 +169,77 @@ class Users extends React.Component { const { count, results } = userStore.getSearchResult(); - if (wrongTeamError) { - return ( - - ); - } - return ( -
-
-
-
-
- Users - - To manage permissions or add users, please visit Grafana user management - -
-
- - - -
- {store.isUserActionAllowed(UserAction.ViewOtherUsers) ? ( - <> -
- - -
+ + {() => ( + <> +
+
+
+
+
+ Users + + To manage permissions or add users, please visit{' '} + Grafana user management + +
+
+ + + +
+ {store.isUserActionAllowed(UserAction.ViewOtherUsers) ? ( + <> +
+ + +
- - - ) : ( - - You don't have enough permissions to view other users because you are not Admin.{' '} - Click here to open your profile - - } - severity="info" - /> - )} -
- {userPkToEdit && } -
+ + + ) : ( + + You don't have enough permissions to view other users because you are not Admin.{' '} + Click here to open your profile + + } + severity="info" + /> + )} +
+ {userPkToEdit && } +
+ + )} + ); } From 6ee247a231dc3b31a67b4a33e3ea4db857b7c924 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Tue, 20 Sep 2022 17:25:46 +0300 Subject: [PATCH 24/66] better naming --- .../WrongTeamDisplayWrapper.helpers.tsx | 2 +- .../WrongTeamDisplayWrapper.module.css | 0 .../WrongTeamDisplayWrapper.tsx | 2 +- .../src/pages/escalation-chains/EscalationChains.tsx | 4 ++-- grafana-plugin/src/pages/incident/Incident.tsx | 4 ++-- grafana-plugin/src/pages/integrations/Integrations.tsx | 4 ++-- .../src/pages/outgoing_webhooks/OutgoingWebhooks.tsx | 4 ++-- grafana-plugin/src/pages/schedules/Schedules.tsx | 4 ++-- grafana-plugin/src/pages/users/Users.tsx | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) rename grafana-plugin/src/components/{NotFoundInTeam => WrongTeamDisplayWrapper}/WrongTeamDisplayWrapper.helpers.tsx (85%) rename grafana-plugin/src/components/{NotFoundInTeam => WrongTeamDisplayWrapper}/WrongTeamDisplayWrapper.module.css (100%) rename grafana-plugin/src/components/{NotFoundInTeam => WrongTeamDisplayWrapper}/WrongTeamDisplayWrapper.tsx (97%) diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers.tsx similarity index 85% rename from grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx rename to grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers.tsx index 71338188..5b72008a 100644 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers.tsx +++ b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers.tsx @@ -1,4 +1,4 @@ -import { WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; +import { WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; export function getWrongTeamResponseInfo({ response }): Partial { if (response) { diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.module.css b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.module.css similarity index 100% rename from grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.module.css rename to grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.module.css diff --git a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.tsx b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx similarity index 97% rename from grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.tsx rename to grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx index b940b69b..6502d360 100644 --- a/grafana-plugin/src/components/NotFoundInTeam/WrongTeamDisplayWrapper.tsx +++ b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx @@ -9,7 +9,7 @@ import { ChangeTeamIcon } from 'icons'; import { GrafanaTeam } from 'models/grafana_team/grafana_team.types'; import { useStore } from 'state/useStore'; -import styles from './WrongTeamWrapperDisplay.module.css'; +import styles from './WrongTeamDisplayWrapper.module.css'; const cx = cn.bind(styles); diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index fac11f4b..e79410b4 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -11,13 +11,13 @@ import Collapse from 'components/Collapse/Collapse'; import EscalationsFilters from 'components/EscalationsFilters/EscalationsFilters'; import Block from 'components/GBlock/Block'; import GList from 'components/GList/GList'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; import WithConfirm from 'components/WithConfirm/WithConfirm'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import EscalationChainCard from 'containers/EscalationChainCard/EscalationChainCard'; import EscalationChainForm from 'containers/EscalationChainForm/EscalationChainForm'; import EscalationChainSteps from 'containers/EscalationChainSteps/EscalationChainSteps'; diff --git a/grafana-plugin/src/pages/incident/Incident.tsx b/grafana-plugin/src/pages/incident/Incident.tsx index 006f2580..0e538a29 100644 --- a/grafana-plugin/src/pages/incident/Incident.tsx +++ b/grafana-plugin/src/pages/incident/Incident.tsx @@ -26,11 +26,11 @@ import reactStringReplace from 'react-string-replace'; import Collapse from 'components/Collapse/Collapse'; import Block from 'components/GBlock/Block'; import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import SourceCode from 'components/SourceCode/SourceCode'; import Text from 'components/Text/Text'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import AttachIncidentForm from 'containers/AttachIncidentForm/AttachIncidentForm'; import IntegrationSettings from 'containers/IntegrationSettings/IntegrationSettings'; import { IntegrationSettingsTab } from 'containers/IntegrationSettings/IntegrationSettings.types'; diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 8251143f..3e7a1b0e 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -9,11 +9,11 @@ import { observer } from 'mobx-react'; import GList from 'components/GList/GList'; import IntegrationsFilters, { Filters } from 'components/IntegrationsFilters/IntegrationsFilters'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import AlertReceiveChannelCard from 'containers/AlertReceiveChannelCard/AlertReceiveChannelCard'; import AlertRules from 'containers/AlertRules/AlertRules'; import CreateAlertReceiveChannelContainer from 'containers/CreateAlertReceiveChannelContainer/CreateAlertReceiveChannelContainer'; diff --git a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx index ed1221e1..2f162d8a 100644 --- a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx +++ b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx @@ -7,11 +7,11 @@ import cn from 'classnames/bind'; import { observer } from 'mobx-react'; import GTable from 'components/GTable/GTable'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import WithConfirm from 'components/WithConfirm/WithConfirm'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import OutgoingWebhookForm from 'containers/OutgoingWebhookForm/OutgoingWebhookForm'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; import { ActionDTO } from 'models/action'; diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index 5402a3e4..084108db 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -22,14 +22,14 @@ import moment, { Moment } from 'moment-timezone'; import instructionsImage from 'assets/img/events_instructions.png'; import Avatar from 'components/Avatar/Avatar'; import GTable from 'components/GTable/GTable'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import SchedulesFilters from 'components/SchedulesFilters/SchedulesFilters'; import { SchedulesFiltersType } from 'components/SchedulesFilters/SchedulesFilters.types'; import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import GSelect from 'containers/GSelect/GSelect'; import ScheduleForm from 'containers/ScheduleForm/ScheduleForm'; import ScheduleICalSettings from 'containers/ScheduleIcalLink/ScheduleIcalLink'; diff --git a/grafana-plugin/src/pages/users/Users.tsx b/grafana-plugin/src/pages/users/Users.tsx index d971d4b8..493428a9 100644 --- a/grafana-plugin/src/pages/users/Users.tsx +++ b/grafana-plugin/src/pages/users/Users.tsx @@ -9,11 +9,11 @@ import { observer } from 'mobx-react'; import Avatar from 'components/Avatar/Avatar'; import GTable from 'components/GTable/GTable'; -import { getWrongTeamResponseInfo } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper.helpers'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/NotFoundInTeam/WrongTeamDisplayWrapper'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import UsersFilters from 'components/UsersFilters/UsersFilters'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import UserSettings from 'containers/UserSettings/UserSettings'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; import { getRole } from 'models/user/user.helpers'; From 05199570c2e6e7ccf6bead841b2c78fa9d78c803 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Tue, 20 Sep 2022 17:27:06 +0300 Subject: [PATCH 25/66] typing for children prop --- .../WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx index 6502d360..15e135e0 100644 --- a/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx +++ b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx @@ -33,7 +33,7 @@ export default function WrongTeamDisplayWrapper({ wrongTeamData: WrongTeamData; objectName: string; pageName: string; - children: any; + children: () => JSX.Element; }) { if (!wrongTeamData.isError) return children(); From 49ea882fcf3e8c1cf010ae1c78a53f8dc4be9f7c Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Wed, 21 Sep 2022 10:55:58 +0300 Subject: [PATCH 26/66] extends base state --- .../WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx | 4 ++++ .../src/pages/escalation-chains/EscalationChains.tsx | 5 ++--- grafana-plugin/src/pages/incident/Incident.tsx | 5 ++--- grafana-plugin/src/pages/integrations/Integrations.tsx | 5 ++--- .../src/pages/outgoing_webhooks/OutgoingWebhooks.tsx | 5 ++--- grafana-plugin/src/pages/schedules/Schedules.tsx | 5 ++--- grafana-plugin/src/pages/users/Users.tsx | 6 ++---- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx index 15e135e0..d427f65a 100644 --- a/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx +++ b/grafana-plugin/src/components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.tsx @@ -13,6 +13,10 @@ import styles from './WrongTeamDisplayWrapper.module.css'; const cx = cn.bind(styles); +export interface PageBaseState { + wrongTeamData: WrongTeamData; +} + export interface WrongTeamData { notFound?: boolean; isError?: boolean; diff --git a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx index e79410b4..bf54b75b 100644 --- a/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx +++ b/grafana-plugin/src/pages/escalation-chains/EscalationChains.tsx @@ -16,7 +16,7 @@ import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; import WithConfirm from 'components/WithConfirm/WithConfirm'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, PageBaseState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import EscalationChainCard from 'containers/EscalationChainCard/EscalationChainCard'; import EscalationChainForm from 'containers/EscalationChainForm/EscalationChainForm'; @@ -34,12 +34,11 @@ const cx = cn.bind(styles); interface EscalationChainsPageProps extends WithStoreProps, AppRootProps {} -interface EscalationChainsPageState { +interface EscalationChainsPageState extends PageBaseState { escalationChainsFilters: { searchTerm: string }; showCreateEscalationChainModal: boolean; escalationChainIdToCopy: EscalationChain['id']; selectedEscalationChain: EscalationChain['id']; - wrongTeamData: WrongTeamData; } export interface Filters { diff --git a/grafana-plugin/src/pages/incident/Incident.tsx b/grafana-plugin/src/pages/incident/Incident.tsx index 0e538a29..2fd4431f 100644 --- a/grafana-plugin/src/pages/incident/Incident.tsx +++ b/grafana-plugin/src/pages/incident/Incident.tsx @@ -29,7 +29,7 @@ import IntegrationLogo from 'components/IntegrationLogo/IntegrationLogo'; import PluginLink from 'components/PluginLink/PluginLink'; import SourceCode from 'components/SourceCode/SourceCode'; import Text from 'components/Text/Text'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, PageBaseState } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import AttachIncidentForm from 'containers/AttachIncidentForm/AttachIncidentForm'; import IntegrationSettings from 'containers/IntegrationSettings/IntegrationSettings'; @@ -59,12 +59,11 @@ const cx = cn.bind(styles); interface IncidentPageProps extends WithStoreProps, AppRootProps {} -interface IncidentPageState { +interface IncidentPageState extends PageBaseState { showIntegrationSettings?: boolean; showAttachIncidentForm?: boolean; timelineFilter: string; resolutionNoteText: string; - wrongTeamData: WrongTeamData; } @observer diff --git a/grafana-plugin/src/pages/integrations/Integrations.tsx b/grafana-plugin/src/pages/integrations/Integrations.tsx index 3e7a1b0e..93073e66 100644 --- a/grafana-plugin/src/pages/integrations/Integrations.tsx +++ b/grafana-plugin/src/pages/integrations/Integrations.tsx @@ -12,7 +12,7 @@ import IntegrationsFilters, { Filters } from 'components/IntegrationsFilters/Int import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, PageBaseState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import AlertReceiveChannelCard from 'containers/AlertReceiveChannelCard/AlertReceiveChannelCard'; import AlertRules from 'containers/AlertRules/AlertRules'; @@ -31,12 +31,11 @@ import styles from './Integrations.module.css'; const cx = cn.bind(styles); -interface IntegrationsState { +interface IntegrationsState extends PageBaseState { integrationsFilters: Filters; showCreateIntegrationModal: boolean; alertReceiveChannelToShowSettings?: AlertReceiveChannel['id']; integrationSettingsTab?: IntegrationSettingsTab; - wrongTeamData: WrongTeamData; } interface IntegrationsProps extends WithStoreProps, AppRootProps {} diff --git a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx index 2f162d8a..7fb3f643 100644 --- a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx +++ b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx @@ -10,7 +10,7 @@ import GTable from 'components/GTable/GTable'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import WithConfirm from 'components/WithConfirm/WithConfirm'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, PageBaseState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import OutgoingWebhookForm from 'containers/OutgoingWebhookForm/OutgoingWebhookForm'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; @@ -26,9 +26,8 @@ const cx = cn.bind(styles); interface OutgoingWebhooksProps extends WithStoreProps, AppRootProps {} -interface OutgoingWebhooksState { +interface OutgoingWebhooksState extends PageBaseState { outgoingWebhookIdToEdit?: OutgoingWebhook['id'] | 'new'; - wrongTeamData: WrongTeamData; } @observer diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index 084108db..de35df6d 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -28,7 +28,7 @@ import { SchedulesFiltersType } from 'components/SchedulesFilters/SchedulesFilte import Text from 'components/Text/Text'; import Tutorial from 'components/Tutorial/Tutorial'; import { TutorialStep } from 'components/Tutorial/Tutorial.types'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, PageBaseState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import GSelect from 'containers/GSelect/GSelect'; import ScheduleForm from 'containers/ScheduleForm/ScheduleForm'; @@ -49,13 +49,12 @@ import styles from './Schedules.module.css'; const cx = cn.bind(styles); interface SchedulesPageProps extends WithStoreProps, AppRootProps {} -interface SchedulesPageState { +interface SchedulesPageState extends PageBaseState { scheduleIdToEdit?: Schedule['id']; scheduleIdToDelete?: Schedule['id']; scheduleIdToExport?: Schedule['id']; filters: SchedulesFiltersType; expandedSchedulesKeys: Array; - wrongTeamData: WrongTeamData; } @observer diff --git a/grafana-plugin/src/pages/users/Users.tsx b/grafana-plugin/src/pages/users/Users.tsx index 493428a9..7878e753 100644 --- a/grafana-plugin/src/pages/users/Users.tsx +++ b/grafana-plugin/src/pages/users/Users.tsx @@ -12,7 +12,7 @@ import GTable from 'components/GTable/GTable'; import PluginLink from 'components/PluginLink/PluginLink'; import Text from 'components/Text/Text'; import UsersFilters from 'components/UsersFilters/UsersFilters'; -import WrongTeamDisplayWrapper, { initWrongTeamDataState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; +import WrongTeamDisplayWrapper, { initWrongTeamDataState, PageBaseState, WrongTeamData } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper'; import { getWrongTeamResponseInfo } from 'components/WrongTeamDisplayWrapper/WrongTeamDisplayWrapper.helpers'; import UserSettings from 'containers/UserSettings/UserSettings'; import { WithPermissionControl } from 'containers/WithPermissionControl/WithPermissionControl'; @@ -32,7 +32,7 @@ interface UsersProps extends WithStoreProps, AppRootProps {} const ITEMS_PER_PAGE = 100; -interface UsersState { +interface UsersState extends PageBaseState { page: number; isWrongTeam: boolean; userPkToEdit?: UserType['pk'] | 'new'; @@ -40,8 +40,6 @@ interface UsersState { searchTerm: string; roles?: UserRole[]; }; - - wrongTeamData: WrongTeamData; } @observer From 9330b891014055672206439ddfb836399d95a6de Mon Sep 17 00:00:00 2001 From: Maxim Mordasov Date: Wed, 21 Sep 2022 13:19:59 +0300 Subject: [PATCH 27/66] Schedules alpha fixes (#541) * schedule alpha major fixes * Fix shift update for web schedules * Fix priority level regex, fix getting shifts without duration * Fix shift update for web schedules * Fix tests for shift update * Fix priority level test * schedule alpha fixes * add final schedule click handler * fix date time picker * fix utc timzeonr time picker * fix utc time data * dont use user timezone on start Co-authored-by: Julia --- engine/apps/api/tests/test_oncall_shift.py | 28 +- engine/apps/schedules/constants.py | 2 +- engine/apps/schedules/ical_utils.py | 25 +- .../schedules/models/custom_on_call_shift.py | 42 ++- .../slack/tests/test_parse_slack_usernames.py | 2 +- grafana-plugin/src/components/Modal/Modal.tsx | 1 + .../src/components/Text/Text.module.scss | 6 + .../TimelineMarks/TimelineMarks.tsx | 2 +- .../src/components/UserGroups/UserGroups.tsx | 19 +- .../UserTimezoneSelect/UserTimezoneSelect.tsx | 71 +++-- .../components/WorkingHours/WorkingHours.tsx | 2 +- .../containers/RemoteSelect/RemoteSelect.tsx | 3 + .../containers/Rotation/Rotation.module.css | 2 +- .../RotationForm/DateTimePicker.tsx | 89 ++++++ .../RotationForm/RotationForm.module.css | 23 +- .../containers/RotationForm/RotationForm.tsx | 260 ++++++++++-------- .../RotationForm/ScheduleOverrideForm.tsx | 112 ++++---- .../src/containers/Rotations/Rotations.tsx | 63 +++-- .../containers/Rotations/ScheduleFinal.tsx | 13 +- .../Rotations/ScheduleOverrides.tsx | 33 ++- .../UsersTimezones/UsersTimezones.tsx | 16 +- .../src/models/schedule/schedule.ts | 2 + .../src/models/schedule/schedule.types.ts | 2 +- grafana-plugin/src/models/user/user.ts | 6 +- .../src/pages/schedule/Schedule.helpers.ts | 28 +- .../src/pages/schedule/Schedule.tsx | 65 ++++- .../src/pages/schedules_NEW/Schedules.tsx | 7 + grafana-plugin/src/state/rootBaseStore.ts | 3 +- 28 files changed, 596 insertions(+), 331 deletions(-) create mode 100644 grafana-plugin/src/containers/RotationForm/DateTimePicker.tsx diff --git a/engine/apps/api/tests/test_oncall_shift.py b/engine/apps/api/tests/test_oncall_shift.py index ddd21498..efa2fb96 100644 --- a/engine/apps/api/tests/test_oncall_shift.py +++ b/engine/apps/api/tests/test_oncall_shift.py @@ -412,8 +412,9 @@ def test_update_old_on_call_shift_with_future_version( token, user1, user2, organization, schedule = on_call_shift_internal_api_setup client = APIClient() - start_date = (timezone.now() - timezone.timedelta(days=3)).replace(microsecond=0) - next_rotation_start_date = start_date + timezone.timedelta(days=5) + now = timezone.now().replace(microsecond=0) + start_date = now - timezone.timedelta(days=3) + next_rotation_start_date = now + timezone.timedelta(days=1) updated_duration = timezone.timedelta(hours=4) title = "Test Shift Rotation" @@ -422,10 +423,11 @@ def test_update_old_on_call_shift_with_future_version( shift_type=CustomOnCallShift.TYPE_ROLLING_USERS_EVENT, schedule=schedule, title=title, - start=start_date, + start=next_rotation_start_date, duration=timezone.timedelta(hours=3), rotation_start=next_rotation_start_date, rolling_users=[{user1.pk: user1.public_primary_key}], + frequency=CustomOnCallShift.FREQUENCY_DAILY, ) old_on_call_shift = make_on_call_shift( schedule.organization, @@ -438,6 +440,7 @@ def test_update_old_on_call_shift_with_future_version( until=next_rotation_start_date, rolling_users=[{user1.pk: user1.public_primary_key}], updated_shift=new_on_call_shift, + frequency=CustomOnCallShift.FREQUENCY_DAILY, ) # update shift_end and priority_level data_to_update = { @@ -445,9 +448,9 @@ def test_update_old_on_call_shift_with_future_version( "priority_level": 2, "shift_start": start_date.strftime("%Y-%m-%dT%H:%M:%SZ"), "shift_end": (start_date + updated_duration).strftime("%Y-%m-%dT%H:%M:%SZ"), - "rotation_start": next_rotation_start_date.strftime("%Y-%m-%dT%H:%M:%SZ"), + "rotation_start": start_date.strftime("%Y-%m-%dT%H:%M:%SZ"), "until": None, - "frequency": None, + "frequency": CustomOnCallShift.FREQUENCY_DAILY, "interval": None, "by_day": None, "rolling_users": [[user1.public_primary_key]], @@ -461,27 +464,28 @@ def test_update_old_on_call_shift_with_future_version( url = reverse("api-internal:oncall_shifts-detail", kwargs={"pk": old_on_call_shift.public_primary_key}) response = client.put(url, data=data_to_update, format="json", **make_user_auth_headers(user1, token)) + response_data = response.json() - next_shift_start_date = timezone.datetime.combine(next_rotation_start_date.date(), start_date.time()).astimezone( - timezone.pytz.UTC - ) + for key in ["shift_start", "shift_end", "rotation_start"]: + data_to_update.pop(key) + response_data.pop(key) expected_payload = data_to_update | { "id": new_on_call_shift.public_primary_key, "type": CustomOnCallShift.TYPE_ROLLING_USERS_EVENT, "schedule": schedule.public_primary_key, "updated_shift": None, - "shift_start": next_shift_start_date.strftime("%Y-%m-%dT%H:%M:%SZ"), - "shift_end": (next_shift_start_date + updated_duration).strftime("%Y-%m-%dT%H:%M:%SZ"), } assert response.status_code == status.HTTP_200_OK assert response.json() == expected_payload - new_on_call_shift.refresh_from_db() - # check if the newest version of shift was changed assert old_on_call_shift.duration != updated_duration assert old_on_call_shift.priority_level != data_to_update["priority_level"] + new_on_call_shift.refresh_from_db() + # check if the newest version of shift was changed + assert new_on_call_shift.start - now < timezone.timedelta(minutes=1) + assert new_on_call_shift.rotation_start - now < timezone.timedelta(minutes=1) assert new_on_call_shift.duration == updated_duration assert new_on_call_shift.priority_level == data_to_update["priority_level"] diff --git a/engine/apps/schedules/constants.py b/engine/apps/schedules/constants.py index 719aa0b2..a2ec8adc 100644 --- a/engine/apps/schedules/constants.py +++ b/engine/apps/schedules/constants.py @@ -9,6 +9,6 @@ ICAL_ATTENDEE = "ATTENDEE" ICAL_UID = "UID" ICAL_RRULE = "RRULE" ICAL_UNTIL = "UNTIL" -RE_PRIORITY = re.compile(r"^\[L(\d)\]") +RE_PRIORITY = re.compile(r"^\[L(\d+)\]") RE_EVENT_UID_V1 = re.compile(r"amixr-([\w\d-]+)-U(\d+)-E(\d+)-S(\d+)") RE_EVENT_UID_V2 = re.compile(r"oncall-([\w\d-]+)-PK([\w\d]+)-U(\d+)-E(\d+)-S(\d+)") diff --git a/engine/apps/schedules/ical_utils.py b/engine/apps/schedules/ical_utils.py index 12fb5bd1..620e4450 100644 --- a/engine/apps/schedules/ical_utils.py +++ b/engine/apps/schedules/ical_utils.py @@ -190,18 +190,19 @@ def get_shifts_dict(calendar, calendar_type, schedule, datetime_start, datetime_ ) else: start, end = ical_events.get_start_and_end_with_respect_to_event_type(event) - result_datetime.append( - { - "start": start.astimezone(pytz.UTC), - "end": end.astimezone(pytz.UTC), - "users": users, - "missing_users": missing_users, - "priority": priority, - "source": source, - "calendar_type": calendar_type, - "shift_pk": pk, - } - ) + if start < end: + result_datetime.append( + { + "start": start.astimezone(pytz.UTC), + "end": end.astimezone(pytz.UTC), + "users": users, + "missing_users": missing_users, + "priority": priority, + "source": source, + "calendar_type": calendar_type, + "shift_pk": pk, + } + ) return result_datetime, result_date diff --git a/engine/apps/schedules/models/custom_on_call_shift.py b/engine/apps/schedules/models/custom_on_call_shift.py index c4558b12..232c824a 100644 --- a/engine/apps/schedules/models/custom_on_call_shift.py +++ b/engine/apps/schedules/models/custom_on_call_shift.py @@ -433,6 +433,34 @@ class CustomOnCallShift(models.Model): return return next_event_dt + def get_last_event_date(self, date): + """Get start date of the last event before the chosen date""" + assert date >= self.start, "Chosen date should be later or equal to initial event start date" + + event_ical = self.generate_ical(self.start) + initial_event = Event.from_ical(event_ical) + # take shift interval, not event interval. For rolling_users shift it is not the same. + interval = self.interval or 1 + if "rrule" in initial_event: + # means that shift has frequency + initial_event["rrule"]["INTERVAL"] = interval + initial_event_start = initial_event["DTSTART"].dt + + last_event = None + # repetitions generate the next event shift according with the recurrence rules + repetitions = UnfoldableCalendar(initial_event).RepeatedEvent( + initial_event, initial_event_start.replace(microsecond=0) + ) + ical_iter = repetitions.__iter__() + for event in ical_iter: + if event.start > date: + break + last_event = event + + last_event_dt = last_event.start if last_event else initial_event_start + + return last_event_dt + @cached_property def event_ical_rules(self): # e.g. {'freq': ['WEEKLY'], 'interval': [2], 'byday': ['MO', 'WE', 'FR'], 'wkst': ['SU']} @@ -498,10 +526,9 @@ class CustomOnCallShift(models.Model): self.rolling_users = result self.save(update_fields=["rolling_users"]) - def get_rotation_user_index(self, date=None): + def get_rotation_user_index(self, date): START_ROTATION_INDEX = 0 - date = timezone.now() if not date else date result = START_ROTATION_INDEX if not self.rolling_users or self.frequency is None: @@ -544,8 +571,9 @@ class CustomOnCallShift(models.Model): return last_shift def create_or_update_last_shift(self, data): + now = timezone.now().replace(microsecond=0) # rotation start date cannot be earlier than now - data["rotation_start"] = max(data["rotation_start"], timezone.now().replace(microsecond=0)) + data["rotation_start"] = max(data["rotation_start"], now) # prepare dict with params of existing instance with last updates and remove unique and m2m fields from it shift_to_update = self.last_updated_shift or self instance_data = model_to_dict(shift_to_update) @@ -557,12 +585,10 @@ class CustomOnCallShift(models.Model): instance_data["schedule"] = self.schedule instance_data["team"] = self.team # set new event start date to keep rotation index - instance_data["start"] = timezone.datetime.combine( - instance_data["rotation_start"].date(), - instance_data["start"].time(), - ).astimezone(pytz.UTC) + if instance_data["start"] == self.start: + instance_data["start"] = self.get_last_event_date(now) # calculate rotation index to keep user rotation order - start_rotation_from_user_index = self.get_rotation_user_index() + (self.start_rotation_from_user_index or 0) + start_rotation_from_user_index = self.get_rotation_user_index(now) + (self.start_rotation_from_user_index or 0) if start_rotation_from_user_index >= len(instance_data["rolling_users"]): start_rotation_from_user_index = 0 instance_data["start_rotation_from_user_index"] = start_rotation_from_user_index diff --git a/engine/apps/slack/tests/test_parse_slack_usernames.py b/engine/apps/slack/tests/test_parse_slack_usernames.py index df43c950..659cc27a 100644 --- a/engine/apps/slack/tests/test_parse_slack_usernames.py +++ b/engine/apps/slack/tests/test_parse_slack_usernames.py @@ -52,5 +52,5 @@ def test_remove_priority_from_username(): assert parse_username_from_string("[L1] bob") == "bob" assert parse_username_from_string(" [L1] bob ") == "bob" assert parse_username_from_string("[L2] bob[L1]") == "bob[L1]" - assert parse_username_from_string("[L27]bob") == "[L27]bob" + assert parse_username_from_string("[L27]bob") == "bob" assert parse_username_from_string("[[L2]] bob[[[L1]") == "[[L2]] bob[[[L1]" diff --git a/grafana-plugin/src/components/Modal/Modal.tsx b/grafana-plugin/src/components/Modal/Modal.tsx index 146a9df8..869a3a25 100644 --- a/grafana-plugin/src/components/Modal/Modal.tsx +++ b/grafana-plugin/src/components/Modal/Modal.tsx @@ -26,6 +26,7 @@ const Modal: FC> = (props) => { return ( = (props) => { {momentsToRender.map((m, i) => { return (
-
{m.moment.format('D MMM')}
+
{m.moment.format('ddd D MMM')}
{m.moments.map((mm, j) => (
diff --git a/grafana-plugin/src/components/UserGroups/UserGroups.tsx b/grafana-plugin/src/components/UserGroups/UserGroups.tsx index 22790683..affdad35 100644 --- a/grafana-plugin/src/components/UserGroups/UserGroups.tsx +++ b/grafana-plugin/src/components/UserGroups/UserGroups.tsx @@ -104,6 +104,16 @@ const UserGroups = (props: UserGroupsProps) => { return (
+ { isMultipleGroups={isMultipleGroups} useDragHandle /> -
); diff --git a/grafana-plugin/src/components/UserTimezoneSelect/UserTimezoneSelect.tsx b/grafana-plugin/src/components/UserTimezoneSelect/UserTimezoneSelect.tsx index 453c578b..37a0704d 100644 --- a/grafana-plugin/src/components/UserTimezoneSelect/UserTimezoneSelect.tsx +++ b/grafana-plugin/src/components/UserTimezoneSelect/UserTimezoneSelect.tsx @@ -23,43 +23,64 @@ const UserTimezoneSelect: FC = (props) => { const { users, value, onChange } = props; const options = useMemo(() => { - return users.reduce((memo, user) => { - let item = memo.find((item) => item.label === user.timezone); + return users + .reduce( + (memo, user) => { + const moment = dayjs().tz(user.timezone); + const utcOffset = moment.utcOffset(); - if (!item) { - item = { - value: user.pk, - label: `${user.timezone} ${getTzOffsetString(dayjs().tz(user.timezone))}`, - imgUrl: user.avatar, - description: user.username, - }; - memo.push(item); - } else { - item.description += ', ' + user.name; - // item.imgUrl = undefined; - } + let item = memo.find((item) => item.utcOffset === utcOffset); - return memo; - }, []); + if (!item) { + item = { + value: user.timezone, + utcOffset, + label: getTzOffsetString(moment), + description: user.username, + }; + memo.push(item); + } else { + item.description += item.description ? ', ' + user.username : user.username; + // item.imgUrl = undefined; + } + + return memo; + }, + [ + { + value: 'UTC', + utcOffset: 0, + label: 'GMT', + description: '', + }, + ] + ) + .sort((a, b) => { + if (b.utcOffset === 0) { + return 1; + } + + if (a.utcOffset > b.utcOffset) { + return 1; + } + if (a.utcOffset < b.utcOffset) { + return -1; + } + + return 0; + }); }, [users]); - const selectValue = useMemo(() => { - const user = users.find((user) => user.timezone === value); - return user?.pk; - }, [value, users]); - const handleChange = useCallback( ({ value }) => { - const user = users.find((user) => user.pk === value); - - onChange(user?.timezone); + onChange(value); }, [users] ); return (
-
); }; diff --git a/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx b/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx index cf25e5dd..39b925f1 100644 --- a/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx +++ b/grafana-plugin/src/components/WorkingHours/WorkingHours.tsx @@ -25,7 +25,7 @@ interface WorkingHoursProps { const cx = cn.bind(styles); const WorkingHours: FC = (props) => { - const { timezone, workingHours, startMoment, duration, className, style } = props; + const { timezone, workingHours = default_working_hours, startMoment, duration, className, style } = props; const endMoment = startMoment.add(duration, 'seconds'); diff --git a/grafana-plugin/src/containers/RemoteSelect/RemoteSelect.tsx b/grafana-plugin/src/containers/RemoteSelect/RemoteSelect.tsx index e7ef6065..d017b149 100644 --- a/grafana-plugin/src/containers/RemoteSelect/RemoteSelect.tsx +++ b/grafana-plugin/src/containers/RemoteSelect/RemoteSelect.tsx @@ -28,6 +28,7 @@ interface RemoteSelectProps { openMenuOnFocus?: boolean; getOptionLabel?: (item: SelectableValue) => React.ReactNode; showError?: boolean; + maxMenuHeight?: number; } const RemoteSelect = inject('store')( @@ -48,6 +49,7 @@ const RemoteSelect = inject('store')( getOptionLabel, openMenuOnFocus = true, showError, + maxMenuHeight, } = props; const [options, setOptions] = useState(); @@ -100,6 +102,7 @@ const RemoteSelect = inject('store')( return ( // @ts-ignore void; + disabled?: boolean; + minMoment?: dayjs.Dayjs; +} + +const toDate = (moment: dayjs.Dayjs, timezone: Timezone) => { + const localMoment = dayjs().tz(timezone).utcOffset() === 0 ? moment : moment.tz(timezone); + + return new Date( + localMoment.get('year'), + localMoment.get('month'), + localMoment.get('date'), + localMoment.get('hour'), + localMoment.get('minute'), + localMoment.get('second') + ); +}; + +const DateTimePicker = (props: UserTooltipProps) => { + const { value: propValue, minMoment, timezone, onChange, disabled } = props; + + const value = useMemo(() => toDate(propValue, timezone), [propValue, timezone]); + + const minDate = useMemo(() => (minMoment ? toDate(minMoment, timezone) : undefined), [minMoment, timezone]); + + const handleDateChange = useCallback( + (newDate: Date) => { + const localMoment = dayjs().tz(timezone).utcOffset() === 0 ? dayjs().utc() : dayjs().tz(timezone); + + const newValue = localMoment + .set('year', newDate.getFullYear()) + .set('month', newDate.getMonth()) + .set('date', newDate.getDate()) + .set('hour', value.getHours()) + .set('minute', value.getMinutes()) + .set('second', value.getSeconds()); + + onChange(newValue); + }, + [value] + ); + + const handleTimeChange = useCallback( + (newMoment: DateTime) => { + const localMoment = dayjs().tz(timezone).utcOffset() === 0 ? dayjs().utc() : dayjs().tz(timezone); + const newDate = newMoment.toDate(); + const newValue = localMoment + .set('year', value.getFullYear()) + .set('month', value.getMonth()) + .set('date', value.getDate()) + .set('hour', newDate.getHours()) + .set('minute', newDate.getMinutes()) + .set('second', newDate.getSeconds()); + + onChange(newValue); + }, + [value] + ); + + return ( + + + + + ); +}; + +export default DateTimePicker; diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.module.css b/grafana-plugin/src/containers/RotationForm/RotationForm.module.css index d603e058..b913ddb3 100644 --- a/grafana-plugin/src/containers/RotationForm/RotationForm.module.css +++ b/grafana-plugin/src/containers/RotationForm/RotationForm.module.css @@ -4,7 +4,8 @@ .draggable { top: 0; - transition: transform 300ms ease; + + /* transition: transform 300ms ease; */ } .header { @@ -31,12 +32,8 @@ pointer-events: none; } -.date-time-picker { - display: block; -} - .inline-switch { - height: 22px; + height: 18px; } .days { @@ -58,3 +55,17 @@ .days .day__selected { background: #3d71d9; } + +.two-fields { + display: flex; + gap: 8px; + align-items: flex-start; +} + +.two-fields > div { + width: 50%; +} + +.content { + margin: 8px 0 16px 0; +} diff --git a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx index 0a814153..a7a2b406 100644 --- a/grafana-plugin/src/containers/RotationForm/RotationForm.tsx +++ b/grafana-plugin/src/containers/RotationForm/RotationForm.tsx @@ -8,9 +8,10 @@ import { Field, Input, Button, - DateTimePicker, Select, InlineSwitch, + DatePickerWithInput, + TimeOfDayPicker, } from '@grafana/ui'; import cn from 'classnames/bind'; import dayjs from 'dayjs'; @@ -36,6 +37,7 @@ import { useStore } from 'state/useStore'; import { getCoords, waitForElement } from 'utils/DOM'; import { useDebouncedCallback } from 'utils/hooks'; +import DateTimePicker from './DateTimePicker'; import { RotationCreateData } from './RotationForm.types'; import styles from './RotationForm.module.css'; @@ -56,6 +58,10 @@ interface RotationFormProps { const cx = cn.bind(styles); +const repeatShiftsEveryOptions = Array.from(Array(31).keys()) + .slice(1) + .map((i) => ({ label: String(i), value: i })); + const RotationForm: FC = observer((props) => { const { onHide, @@ -78,13 +84,17 @@ const RotationForm: FC = observer((props) => { const [repeatEveryValue, setRepeatEveryValue] = useState(1); const [repeatEveryPeriod, setRepeatEveryPeriod] = useState(0); const [selectedDays, setSelectedDays] = useState([]); - const [shiftStart, setShiftStart] = useState(dateTime(shiftMoment.format('YYYY-MM-DD HH:mm:ss'))); - const [shiftEnd, setShiftEnd] = useState(dateTime(shiftMoment.add(1, 'day').format('YYYY-MM-DD HH:mm:ss'))); - const [rotationStart, setRotationStart] = useState(dateTime(shiftMoment.format('YYYY-MM-DD HH:mm:ss'))); + const [shiftStart, setShiftStart] = useState(shiftMoment); + const [shiftEnd, setShiftEnd] = useState(shiftMoment.add(1, 'day')); + const [rotationStart, setRotationStart] = useState(shiftMoment); const [endLess, setEndless] = useState(true); - const [rotationEnd, setRotationEnd] = useState( - dateTime(shiftMoment.add(1, 'month').format('YYYY-MM-DD HH:mm:ss')) - ); + const [rotationEnd, setRotationEnd] = useState(shiftMoment.add(1, 'month')); + + useEffect(() => { + if (rotationStart.isBefore(shiftStart)) { + setRotationStart(shiftStart); + } + }, [rotationStart, shiftStart]); const store = useStore(); @@ -102,7 +112,12 @@ const RotationForm: FC = observer((props) => { // elm.scrollIntoView({ behavior: 'smooth', block: 'end', inline: 'nearest' }); // setOffsetTop(Math.max(coords.top + elm.offsetHeight, 0)); - setOffsetTop(Math.max(coords.top - modal?.offsetHeight - 10, 10)); + const offsetTop = Math.min( + Math.max(coords.top - modal?.offsetHeight - 10, 10), + document.body.offsetHeight - modal?.offsetHeight - 10 + ); + + setOffsetTop(offsetTop); }); } }, [isOpen]); @@ -146,10 +161,10 @@ const RotationForm: FC = observer((props) => { const params = useMemo( () => ({ - rotation_start: getUTCString(rotationStart, currentTimezone), - until: endLess ? null : getUTCString(rotationEnd, currentTimezone), - shift_start: getUTCString(shiftStart, currentTimezone), - shift_end: getUTCString(shiftEnd, currentTimezone), + rotation_start: getUTCString(rotationStart), + until: endLess ? null : getUTCString(rotationEnd), + shift_start: getUTCString(shiftStart), + shift_end: getUTCString(shiftEnd), rolling_users: userGroups, interval: repeatEveryValue, frequency: repeatEveryPeriod, @@ -205,15 +220,15 @@ const RotationForm: FC = observer((props) => { useEffect(() => { if (shift) { - setRotationStart(getDateTime(shift.rotation_start, currentTimezone)); - setRotationEnd(getDateTime(shift.until, currentTimezone)); - setShiftStart(getDateTime(shift.shift_start, currentTimezone)); - setShiftEnd(getDateTime(shift.shift_end, currentTimezone)); + setRotationStart(getDateTime(shift.rotation_start)); + setRotationEnd(shift.until ? getDateTime(shift.until) : getDateTime(shift.shift_start).add(1, 'month')); + setShiftStart(getDateTime(shift.shift_start)); + setShiftEnd(getDateTime(shift.shift_end)); setEndless(!shift.until); setRepeatEveryValue(shift.interval); setRepeatEveryPeriod(shift.frequency); - setSelectedDays(shift.by_day); + setSelectedDays(shift.by_day || []); setUserGroups(shift.rolling_users); } @@ -230,6 +245,8 @@ const RotationForm: FC = observer((props) => { setRepeatEveryValue(option.value); }, []); + const isFormValid = useMemo(() => userGroups.some((group) => group.length), [userGroups]); + const moment = dayjs(); return ( @@ -252,8 +269,8 @@ const RotationForm: FC = observer((props) => { - - + {/* + */} {shiftId !== 'new' && ( @@ -262,116 +279,115 @@ const RotationForm: FC = observer((props) => { - group.length)} - /> {/*
*/} - - - - { - setEndless(false); - }} + } + > + - ) : ( - - )} - - - + + + + Rotation end + + + + } + > + {endLess ? ( +
+ Endless +
+ ) : ( + + )} + +
+ + + + } placeholder="Search..." diff --git a/grafana-plugin/src/containers/Rotations/ScheduleOverrides.tsx b/grafana-plugin/src/containers/Rotations/ScheduleOverrides.tsx index 253c4c46..f6ba5f3b 100644 --- a/grafana-plugin/src/containers/Rotations/ScheduleOverrides.tsx +++ b/grafana-plugin/src/containers/Rotations/ScheduleOverrides.tsx @@ -6,6 +6,7 @@ import dayjs from 'dayjs'; import { observer } from 'mobx-react'; import { CSSTransition, TransitionGroup } from 'react-transition-group'; +import Text from 'components/Text/Text'; import TimelineMarks from 'components/TimelineMarks/TimelineMarks'; import Rotation from 'containers/Rotation/Rotation'; import { RotationCreateData } from 'containers/RotationForm/RotationForm.types'; @@ -69,7 +70,11 @@ class ScheduleOverrides extends Component
-
Overrides
+
+ + Overrides + +
diff --git a/grafana-plugin/src/containers/ScheduleSlot/ScheduleSlot.tsx b/grafana-plugin/src/containers/ScheduleSlot/ScheduleSlot.tsx index 406bef15..374b0e3c 100644 --- a/grafana-plugin/src/containers/ScheduleSlot/ScheduleSlot.tsx +++ b/grafana-plugin/src/containers/ScheduleSlot/ScheduleSlot.tsx @@ -166,8 +166,8 @@ const ScheduleSlotDetails = (props: ScheduleSlotDetailsProps) => { - {dayjs(event.start).tz(user.timezone).format('DD MMM, HH:mm')} - {dayjs(event.end).tz(user.timezone).format('DD MMM, HH:mm')} + {dayjs(event.start).tz(user?.timezone).format('DD MMM, HH:mm')} + {dayjs(event.end).tz(user?.timezone).format('DD MMM, HH:mm')} diff --git a/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.module.css b/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.module.css index 0eab0c54..94166b47 100644 --- a/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.module.css +++ b/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.module.css @@ -2,8 +2,8 @@ border: var(--border-medium); display: flex; flex-direction: column; - border-radius: 2px; - background: var(--primary-background); + background: var(--background-secondary); + border-radius: var(--border-radius); } .header { @@ -11,7 +11,7 @@ } .title { - font-weight: 500; + font-weight: 400; font-size: 19px; line-height: 24px; color: rgba(204, 204, 220, 0.65); @@ -22,7 +22,7 @@ position: absolute; left: 0; width: 1px; - background: #fff; + background: var(--gradient-brandVertical); top: 0; bottom: 0; z-index: 0; @@ -70,6 +70,7 @@ font-size: 12px; line-height: 16px; background: #454952; + color: #ccccdc; border-radius: 8px; text-align: center; transition: opacity 200ms ease, left 200ms ease; @@ -114,7 +115,6 @@ top: -24px; display: flex; font-weight: 400; - font-size: 14px; line-height: 20px; color: rgba(204, 204, 220, 0.65); width: 100%; diff --git a/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx b/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx index 497d4fd4..59b6edaa 100644 --- a/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx +++ b/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx @@ -71,7 +71,11 @@ const UsersTimezones: FC = (props) => {
-
Schedule team and timezones
+
+ + Schedule team and timezones + +
{/* Current schedule users only @@ -98,12 +102,18 @@ const UsersTimezones: FC = (props) => { 'time-mark-text__translated': index > 0, })} > - {mm.format('HH:mm')} + + {mm.format('HH:mm')} +
))}
- 24:00 + + + 24:00 + +
diff --git a/grafana-plugin/src/icons/index.tsx b/grafana-plugin/src/icons/index.tsx index ffc6f75c..ff0afb08 100644 --- a/grafana-plugin/src/icons/index.tsx +++ b/grafana-plugin/src/icons/index.tsx @@ -238,7 +238,7 @@ export const ExpandIcon = (props: IconProps) => { diff --git a/grafana-plugin/src/models/user/user.ts b/grafana-plugin/src/models/user/user.ts index 0570ee98..0079d795 100644 --- a/grafana-plugin/src/models/user/user.ts +++ b/grafana-plugin/src/models/user/user.ts @@ -93,7 +93,7 @@ export class UserStore extends BaseStore { this.items = { ...this.items, - [user.pk]: user, + [user.pk]: { ...user, timezone: getTimezone(user) }, }; } diff --git a/grafana-plugin/src/pages/schedule/Schedule.module.css b/grafana-plugin/src/pages/schedule/Schedule.module.css index 2e5746bd..09d0aa98 100644 --- a/grafana-plugin/src/pages/schedule/Schedule.module.css +++ b/grafana-plugin/src/pages/schedule/Schedule.module.css @@ -5,7 +5,7 @@ margin-top: 24px; --rotations-border: var(--border-medium); - --rotations-background: var(--primary-background); + --rotations-background: var(--background-secondary); } .header { diff --git a/grafana-plugin/src/pages/schedule/Schedule.tsx b/grafana-plugin/src/pages/schedule/Schedule.tsx index bff532ae..8e05ea45 100644 --- a/grafana-plugin/src/pages/schedule/Schedule.tsx +++ b/grafana-plugin/src/pages/schedule/Schedule.tsx @@ -116,7 +116,7 @@ class SchedulePage extends React.Component - + {schedule?.name} {/* -
+ {startMoment.format('DD MMM')} - {startMoment.add(6, 'day').format('DD MMM')} -
+ {/* Date: Fri, 30 Sep 2022 12:25:51 -0300 Subject: [PATCH 54/66] Update slack lookup days when checking for next shift --- .../tasks/notify_ical_schedule_shift.py | 2 +- .../tests/test_notify_ical_schedule_shift.py | 85 ++++++++++++++----- 2 files changed, 64 insertions(+), 23 deletions(-) diff --git a/engine/apps/alerts/tasks/notify_ical_schedule_shift.py b/engine/apps/alerts/tasks/notify_ical_schedule_shift.py index 1a261880..a23f2a4b 100644 --- a/engine/apps/alerts/tasks/notify_ical_schedule_shift.py +++ b/engine/apps/alerts/tasks/notify_ical_schedule_shift.py @@ -308,7 +308,7 @@ def notify_ical_schedule_shift(schedule_pk): new_shifts = sorted(new_shifts, key=lambda shift: shift["start"]) if len(new_shifts) != 0: - days_to_lookup = (new_shifts[-1]["end"].date() - now.date()).days + days_to_lookup = (new_shifts[-1]["end"].date() - now.date()).days + 1 days_to_lookup = max([days_to_lookup, MIN_DAYS_TO_LOOKUP_FOR_THE_END_OF_EVENT]) else: days_to_lookup = MIN_DAYS_TO_LOOKUP_FOR_THE_END_OF_EVENT diff --git a/engine/apps/alerts/tests/test_notify_ical_schedule_shift.py b/engine/apps/alerts/tests/test_notify_ical_schedule_shift.py index d6cb6398..eae19ef3 100644 --- a/engine/apps/alerts/tests/test_notify_ical_schedule_shift.py +++ b/engine/apps/alerts/tests/test_notify_ical_schedule_shift.py @@ -1,4 +1,9 @@ +from datetime import datetime +from unittest.mock import Mock, patch + import pytest +import pytz +from django.utils import timezone from apps.alerts.tasks.notify_ical_schedule_shift import notify_ical_schedule_shift from apps.schedules.models import OnCallScheduleICal @@ -9,32 +14,35 @@ PRODID:-//Google Inc//Google Calendar 70.9054//EN VERSION:2.0 CALSCALE:GREGORIAN METHOD:PUBLISH -X-WR-CALNAME:t -X-WR-TIMEZONE:Asia/Yekaterinburg -BEGIN:VTIMEZONE -TZID:Asia/Yekaterinburg -X-LIC-LOCATION:Asia/Yekaterinburg -BEGIN:STANDARD -TZOFFSETFROM:+0500 -TZOFFSETTO:+0500 -TZNAME:+05 -DTSTART:19700101T000000 -END:STANDARD -END:VTIMEZONE BEGIN:VEVENT -DTSTART;TZID=Asia/Yekaterinburg:20210124T130000 -DTEND;TZID=Asia/Yekaterinburg:20210124T220000 -RRULE:FREQ=DAILY -DTSTAMP:20210127T143634Z -UID:0i0af8p6p8vfampe3r1vkog0jg@google.com -CREATED:20210127T143553Z +DTSTART;VALUE=DATE:20211005 +DTEND;VALUE=DATE:20211012 +RRULE:FREQ=WEEKLY;WKST=SU;INTERVAL=7;BYDAY=WE +DTSTAMP:20210930T125523Z +UID:id1@google.com +CREATED:20210928T202349Z DESCRIPTION: -LAST-MODIFIED:20210127T143553Z +LAST-MODIFIED:20210929T204751Z LOCATION: -SEQUENCE:0 +SEQUENCE:1 STATUS:CONFIRMED -SUMMARY:@Bernard Desruisseaux -TRANSP:OPAQUE +SUMMARY:user1 +TRANSP:TRANSPARENT +END:VEVENT +BEGIN:VEVENT +DTSTART;VALUE=DATE:20210928 +DTEND;VALUE=DATE:20211005 +RRULE:FREQ=WEEKLY;WKST=SU;INTERVAL=7;BYDAY=WE +DTSTAMP:20210930T125523Z +UID:id2@google.com +CREATED:20210928T202331Z +DESCRIPTION: +LAST-MODIFIED:20210929T204744Z +LOCATION: +SEQUENCE:2 +STATUS:CONFIRMED +SUMMARY:user2 +TRANSP:TRANSPARENT END:VEVENT END:VCALENDAR """ @@ -61,3 +69,36 @@ def test_current_overrides_ical_schedule_is_none( # this should not raise notify_ical_schedule_shift(ical_schedule.oncallschedule_ptr_id) + + +@pytest.mark.django_db +def test_next_shift_notification_long_shifts( + make_organization_and_user_with_slack_identities, + make_schedule, + make_user, +): + organization, _, _, _ = make_organization_and_user_with_slack_identities() + make_user(organization=organization, username="user1") + make_user(organization=organization, username="user2") + + ical_schedule = make_schedule( + organization, + schedule_class=OnCallScheduleICal, + name="test_ical_schedule", + channel="channel", + ical_url_primary="url", + prev_ical_file_primary=ICAL_DATA, + cached_ical_file_primary=ICAL_DATA, + prev_ical_file_overrides=None, + cached_ical_file_overrides=None, + ) + + with patch.object(timezone, "datetime", Mock(wraps=timezone.datetime)) as mock_tz_datetime: + mock_tz_datetime.now.return_value = datetime(2021, 9, 29, 12, 0, tzinfo=pytz.UTC) + with patch("apps.slack.slack_client.SlackClientWithErrorHandling.api_call") as mock_slack_api_call: + notify_ical_schedule_shift(ical_schedule.oncallschedule_ptr_id) + + slack_blocks = mock_slack_api_call.call_args_list[0][1]["blocks"] + notification = slack_blocks[0]["text"]["text"] + assert "*New on-call shift:*\nuser2" in notification + assert "*Next on-call shift:*\nuser1" in notification From 7d9d23945201f8869829e9819b72eca8cea453c3 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Fri, 30 Sep 2022 10:14:39 -0600 Subject: [PATCH 55/66] Catch exception for when oncall user is out of sync with slack user --- .../apps/slack/scenarios/resolution_note.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/engine/apps/slack/scenarios/resolution_note.py b/engine/apps/slack/scenarios/resolution_note.py index cec692c6..bf328548 100644 --- a/engine/apps/slack/scenarios/resolution_note.py +++ b/engine/apps/slack/scenarios/resolution_note.py @@ -7,6 +7,7 @@ from django.utils import timezone from apps.slack.scenarios import scenario_step from apps.slack.slack_client.exceptions import SlackAPIException +from apps.user_management.models import User from common.api_helpers.utils import create_engine_url from .step_mixins import CheckAlertIsUnarchivedMixin @@ -107,10 +108,19 @@ class AddToResolutionNoteStep(CheckAlertIsUnarchivedMixin, scenario_step.Scenari channel_id=channel_id, ) alert_group = slack_message.get_alert_group() - author_slack_user_identity = SlackUserIdentity.objects.get( - slack_id=payload["message"]["user"], slack_team_identity=slack_team_identity - ) - author_user = self.organization.users.get(slack_user_identity=author_slack_user_identity) + try: + author_slack_user_identity = SlackUserIdentity.objects.get( + slack_id=payload["message"]["user"], slack_team_identity=slack_team_identity + ) + author_user = self.organization.users.get(slack_user_identity=author_slack_user_identity) + except (SlackUserIdentity.DoesNotExist, User.DoesNotExist): + warning_text = ( + "Unable to add this message to resolution note: could not find corresponding" + "OnCall user for message author: {}".format(payload["message"]["user"]) + ) + self.open_warning_window(payload, warning_text) + return + resolution_note_slack_message = ResolutionNoteSlackMessage( alert_group=alert_group, user=author_user, @@ -121,6 +131,7 @@ class AddToResolutionNoteStep(CheckAlertIsUnarchivedMixin, scenario_step.Scenari ts=message_ts, permalink=permalink, ) + resolution_note_slack_message.added_to_resolution_note = True resolution_note_slack_message.save() resolution_note = resolution_note_slack_message.get_resolution_note() From 6dde87afded03914f83bba9b8a436b8a5c6b1147 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Fri, 30 Sep 2022 10:16:03 -0600 Subject: [PATCH 56/66] Message format --- engine/apps/slack/scenarios/resolution_note.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/apps/slack/scenarios/resolution_note.py b/engine/apps/slack/scenarios/resolution_note.py index bf328548..e989a9d6 100644 --- a/engine/apps/slack/scenarios/resolution_note.py +++ b/engine/apps/slack/scenarios/resolution_note.py @@ -115,7 +115,7 @@ class AddToResolutionNoteStep(CheckAlertIsUnarchivedMixin, scenario_step.Scenari author_user = self.organization.users.get(slack_user_identity=author_slack_user_identity) except (SlackUserIdentity.DoesNotExist, User.DoesNotExist): warning_text = ( - "Unable to add this message to resolution note: could not find corresponding" + "Unable to add this message to resolution note: could not find corresponding " "OnCall user for message author: {}".format(payload["message"]["user"]) ) self.open_warning_window(payload, warning_text) From a1c3ba330d5982597703785c3b5f1d5847d724b4 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Fri, 30 Sep 2022 10:26:47 -0600 Subject: [PATCH 57/66] Format --- engine/apps/slack/scenarios/resolution_note.py | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/apps/slack/scenarios/resolution_note.py b/engine/apps/slack/scenarios/resolution_note.py index e989a9d6..c22a14ad 100644 --- a/engine/apps/slack/scenarios/resolution_note.py +++ b/engine/apps/slack/scenarios/resolution_note.py @@ -120,7 +120,6 @@ class AddToResolutionNoteStep(CheckAlertIsUnarchivedMixin, scenario_step.Scenari ) self.open_warning_window(payload, warning_text) return - resolution_note_slack_message = ResolutionNoteSlackMessage( alert_group=alert_group, user=author_user, From 2bfb834e92f4e7eb02760bcda33daa3f1fff67f3 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Fri, 30 Sep 2022 12:40:22 -0600 Subject: [PATCH 58/66] Update changelog for v1.0.38 --- CHANGELOG.md | 5 +++- grafana-plugin/CHANGELOG.md | 46 +++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1cdd055..d0ead17d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # Change Log -## v1.0.38 (2022-09-22) +## v1.0.38 (2022-09-30) +- Fix exception handling for adding resolution notes when slack and oncall users are out of sync. +- Fix all day events showing as having gaps in slack notifications +- Improve plugin configuration error message readability - Add `telegram` key to `permalinks` property in `AlertGroup` public API response schema ## v1.0.37 (2022-09-21) diff --git a/grafana-plugin/CHANGELOG.md b/grafana-plugin/CHANGELOG.md index ffaeb731..d0ead17d 100644 --- a/grafana-plugin/CHANGELOG.md +++ b/grafana-plugin/CHANGELOG.md @@ -1,67 +1,106 @@ # Change Log +## v1.0.38 (2022-09-30) + +- Fix exception handling for adding resolution notes when slack and oncall users are out of sync. +- Fix all day events showing as having gaps in slack notifications +- Improve plugin configuration error message readability +- Add `telegram` key to `permalinks` property in `AlertGroup` public API response schema + +## v1.0.37 (2022-09-21) + +- Improve API token creation form +- Fix alert group bulk action bugs +- Add `permalinks` property to `AlertGroup` public API response schema +- Scheduling system bug fixes +- Public API bug fixes + +## v1.0.36 (2022-09-12) + +- Alpha web schedules frontend/backend updates +- Bug fixes + ## v1.0.35 (2022-09-07) + - Bug fixes ## v1.0.34 (2022-09-06) + - Fix schedule notification spam ## v1.0.33 (2022-09-06) + - Add raw alert view - Add GitHub star button for OSS installations - Restore alert group search functionality - Bug fixes ## v1.0.32 (2022-09-01) + - Bug fixes ## v1.0.31 (2022-09-01) + - Bump celery version - Fix oss to cloud connection ## v1.0.30 (2022-08-31) + - Bug fix: check user notification policy before access ## v1.0.29 (2022-08-31) + - Add arm64 docker image ## v1.0.28 (2022-08-31) + - Bug fixes ## v1.0.27 (2022-08-30) + - Bug fixes ## v1.0.26 (2022-08-26) + - Insight log's format fixes - Remove UserNotificationPolicy auto-recreating ## v1.0.25 (2022-08-24) + - Bug fixes ## v1.0.24 (2022-08-24) + - Insight logs - Default DATA_UPLOAD_MAX_MEMORY_SIZE to 1mb ## v1.0.23 (2022-08-23) + - Bug fixes ## v1.0.22 (2022-08-16) + - Make STATIC_URL configurable from environment variable ## v1.0.21 (2022-08-12) + - Bug fixes ## v1.0.19 (2022-08-10) + - Bug fixes ## v1.0.15 (2022-08-03) + - Bug fixes ## v1.0.13 (2022-07-27) + - Optimize alert group list view - Fix a bug related to Twilio setup ## v1.0.12 (2022-07-26) + - Update push-notifications dependency - Rework how absolute URLs are built - Fix to show maintenance windows per team @@ -69,15 +108,18 @@ - Internal api to get a schedule final events ## v1.0.10 (2022-07-22) + - Speed-up of alert group web caching - Internal api for OnCall shifts ## v1.0.9 (2022-07-21) + - Frontend bug fixes & improvements - Support regex_replace() in templates - Bring back alert group caching and list view ## v1.0.7 (2022-07-18) + - Backend & frontend bug fixes - Deployment improvements - Reshape webhook payload for outgoing webhooks @@ -85,18 +127,22 @@ - Improve alert group list load speeds and simplify caching system ## v1.0.6 (2022-07-12) + - Manual Incidents enabled for teams - Fix phone notifications for OSS - Public API improvements ## v1.0.5 (2022-07-06) + - Bump Django to 3.2.14 - Fix PagerDuty iCal parsing ## 1.0.4 (2022-06-28) + - Allow Telegram DMs without channel connection. ## 1.0.3 (2022-06-27) + - Fix users public api endpoint. Now it returns users with all roles. - Fix redundant notifications about gaps in schedules. - Frontend fixes. From 5e272f85657009123650be6c76861a6712a956f3 Mon Sep 17 00:00:00 2001 From: Vadim Stepanov Date: Mon, 3 Oct 2022 11:22:02 +0100 Subject: [PATCH 59/66] Fix failing tests due to bug in month calculations (#599) --- .../schedules/models/custom_on_call_shift.py | 11 ++++++- .../tests/test_custom_on_call_shift.py | 32 +++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/engine/apps/schedules/models/custom_on_call_shift.py b/engine/apps/schedules/models/custom_on_call_shift.py index 232c824a..7b24676a 100644 --- a/engine/apps/schedules/models/custom_on_call_shift.py +++ b/engine/apps/schedules/models/custom_on_call_shift.py @@ -5,6 +5,7 @@ from calendar import monthrange from uuid import uuid4 import pytz +from dateutil import relativedelta from django.apps import apps from django.conf import settings from django.core.validators import MinLengthValidator @@ -353,6 +354,13 @@ class CustomOnCallShift(models.Model): ONE_DAY = 1 ONE_HOUR = 1 + def add_months(year, month, months_add): + """ + Utility method for month calculation. E.g. (2022, 12) + 1 month = (2023, 1) + """ + dt = timezone.datetime.min.replace(year=year, month=month) + relativedelta.relativedelta(months=months_add) + return dt.year, dt.month + current_event = Event.from_ical(event_ical) # take shift interval, not event interval. For rolling_users shift it is not the same. interval = self.interval or 1 @@ -385,7 +393,8 @@ class CustomOnCallShift(models.Model): days_for_next_event = DAYS_IN_A_MONTH - current_event_start.day + ONE_DAY # count next event start date with respect to event interval for i in range(1, interval): - next_month_days = monthrange(current_event_start.year, current_event_start.month + i)[1] + year, month = add_months(current_event_start.year, current_event_start.month, i) + next_month_days = monthrange(year, month)[1] days_for_next_event += next_month_days next_event_start = current_event_start + timezone.timedelta(days=days_for_next_event) diff --git a/engine/apps/schedules/tests/test_custom_on_call_shift.py b/engine/apps/schedules/tests/test_custom_on_call_shift.py index dd3cfba6..4dbf6029 100644 --- a/engine/apps/schedules/tests/test_custom_on_call_shift.py +++ b/engine/apps/schedules/tests/test_custom_on_call_shift.py @@ -354,11 +354,11 @@ def test_rolling_users_event_with_interval_monthly( user_2 = make_user_for_organization(organization) schedule = make_schedule(organization, schedule_class=OnCallScheduleCalendar) - start_date = timezone.now().replace(day=1, microsecond=0) - days_for_next_month_1 = monthrange(start_date.year, start_date.month)[1] - days_for_next_month_2 = monthrange(start_date.year, start_date.month + 1)[1] + days_for_next_month_1 - days_for_next_month_3 = monthrange(start_date.year, start_date.month + 2)[1] + days_for_next_month_2 - days_for_next_month_4 = monthrange(start_date.year, start_date.month + 3)[1] + days_for_next_month_3 + start_date = timezone.datetime(year=2022, month=10, day=1, hour=10, minute=30) + days_for_next_month_1 = monthrange(2022, 10)[1] + days_for_next_month_2 = monthrange(2022, 11)[1] + days_for_next_month_1 + days_for_next_month_3 = monthrange(2022, 12)[1] + days_for_next_month_2 + days_for_next_month_4 = monthrange(2023, 1)[1] + days_for_next_month_3 data = { "priority_level": 1, @@ -718,19 +718,19 @@ def test_rolling_users_with_diff_start_and_rotation_start_monthly( user_3 = make_user_for_organization(organization) schedule = make_schedule(organization, schedule_class=OnCallScheduleWeb) - now = timezone.now().replace(day=1, microsecond=0) - days_in_curr_month = monthrange(now.year, now.month)[1] - days_in_next_month = monthrange(now.year, now.month + 1)[1] + start_date = timezone.datetime(year=2022, month=12, day=1, hour=10, minute=30) + days_in_curr_month = monthrange(2022, 12)[1] + days_in_next_month = monthrange(2023, 1)[1] data = { "priority_level": 1, - "start": now, - "week_start": now.weekday(), - "rotation_start": now + timezone.timedelta(days=days_in_curr_month - 1, hours=1), + "start": start_date, + "week_start": start_date.weekday(), + "rotation_start": start_date + timezone.timedelta(days=days_in_curr_month - 1, hours=1), "duration": timezone.timedelta(seconds=1800), "frequency": CustomOnCallShift.FREQUENCY_MONTHLY, "schedule": schedule, - "until": now + timezone.timedelta(days=days_in_curr_month + days_in_next_month + 10, minutes=1), + "until": start_date + timezone.timedelta(days=days_in_curr_month + days_in_next_month + 10, minutes=1), } rolling_users = [[user_1], [user_2], [user_3]] on_call_shift = make_on_call_shift( @@ -738,7 +738,7 @@ def test_rolling_users_with_diff_start_and_rotation_start_monthly( ) on_call_shift.add_rolling_users(rolling_users) - date = now + timezone.timedelta(minutes=5) + date = start_date + timezone.timedelta(minutes=5) # rotation starts from user_2, because user_1 started earlier than rotation start date user_2_on_call_dates = [date + timezone.timedelta(days=days_in_curr_month)] user_3_on_call_dates = [date + timezone.timedelta(days=days_in_curr_month + days_in_next_month)] @@ -774,9 +774,9 @@ def test_rolling_users_with_diff_start_and_rotation_start_monthly_by_monthday( user_3 = make_user_for_organization(organization) schedule = make_schedule(organization, schedule_class=OnCallScheduleWeb) - start_date = timezone.now().replace(day=1, microsecond=0) - days_in_curr_month = monthrange(start_date.year, start_date.month)[1] - days_in_next_month = monthrange(start_date.year, start_date.month + 1)[1] + start_date = timezone.datetime(year=2022, month=12, day=1, hour=10, minute=30) + days_in_curr_month = monthrange(2022, 12)[1] + days_in_next_month = monthrange(2023, 1)[1] data = { "priority_level": 1, From f8314ef9c2852ee0326930a5edae65a6094034d3 Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Mon, 3 Oct 2022 07:37:59 -0300 Subject: [PATCH 60/66] Fix timing issue with schedule tests reusing cached users (#592) Co-authored-by: Vadim Stepanov --- engine/apps/api/tests/test_schedules.py | 17 +++++++++++------ .../schedules/tests/test_on_call_schedule.py | 3 +++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/engine/apps/api/tests/test_schedules.py b/engine/apps/api/tests/test_schedules.py index 7139f2e9..19537391 100644 --- a/engine/apps/api/tests/test_schedules.py +++ b/engine/apps/api/tests/test_schedules.py @@ -10,6 +10,7 @@ from rest_framework.serializers import ValidationError from rest_framework.test import APIClient from apps.alerts.models import EscalationPolicy +from apps.schedules.ical_utils import memoized_users_in_ical from apps.schedules.models import ( CustomOnCallShift, OnCallSchedule, @@ -742,6 +743,8 @@ def test_filter_events_final_schedule( request_date = start_date user_a, user_b, user_c, user_d, user_e = (make_user_for_organization(organization, username=i) for i in "ABCDE") + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() shifts = ( # user, priority, start time (h), duration (hs) @@ -837,7 +840,7 @@ def test_next_shifts_per_user( make_schedule, make_on_call_shift, ): - organization, user, token = make_organization_and_user_with_plugin_token() + organization, admin, token = make_organization_and_user_with_plugin_token() client = APIClient() schedule = make_schedule( @@ -848,6 +851,8 @@ def test_next_shifts_per_user( tomorrow = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0) + timezone.timedelta(days=1) user_a, user_b, user_c, user_d = (make_user_for_organization(organization, username=i) for i in "ABCD") + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() shifts = ( # user, priority, start time (h), duration (hs) @@ -860,16 +865,16 @@ def test_next_shifts_per_user( for user, priority, start_h, duration in shifts: data = { "start": tomorrow + timezone.timedelta(hours=start_h), - "rotation_start": tomorrow, + "rotation_start": tomorrow + timezone.timedelta(hours=start_h), "duration": timezone.timedelta(hours=duration), "priority_level": priority, "frequency": CustomOnCallShift.FREQUENCY_DAILY, "schedule": schedule, } on_call_shift = make_on_call_shift( - organization=organization, shift_type=CustomOnCallShift.TYPE_RECURRENT_EVENT, **data + organization=organization, shift_type=CustomOnCallShift.TYPE_ROLLING_USERS_EVENT, **data ) - on_call_shift.users.add(user) + on_call_shift.add_rolling_users([[user]]) # override in the past: 17-18 / D # won't be listed, but user D will still be included in the response @@ -896,10 +901,10 @@ def test_next_shifts_per_user( ) override.add_rolling_users([[user_c]]) - # final sdhedule: 7-12: B, 15-16: A, 16-17: B, 17-18: C (override), 18-20: C + # final schedule: 7-12: B, 15-16: A, 16-17: B, 17-18: C (override), 18-20: C url = reverse("api-internal:schedule-next-shifts-per-user", kwargs={"pk": schedule.public_primary_key}) - response = client.get(url, format="json", **make_user_auth_headers(user, token)) + response = client.get(url, format="json", **make_user_auth_headers(admin, token)) assert response.status_code == status.HTTP_200_OK expected = { diff --git a/engine/apps/schedules/tests/test_on_call_schedule.py b/engine/apps/schedules/tests/test_on_call_schedule.py index e8da0e67..bb9699e7 100644 --- a/engine/apps/schedules/tests/test_on_call_schedule.py +++ b/engine/apps/schedules/tests/test_on_call_schedule.py @@ -4,6 +4,7 @@ import pytest import pytz from django.utils import timezone +from apps.schedules.ical_utils import memoized_users_in_ical from apps.schedules.models import CustomOnCallShift, OnCallSchedule, OnCallScheduleCalendar, OnCallScheduleWeb from common.constants.role import Role @@ -236,6 +237,8 @@ def test_filter_events_ical_all_day(make_organization, make_user_for_organizatio schedule.cached_ical_file_primary = calendar.to_ical() for u in ("@Bernard Desruisseaux", "@Bob", "@Alex"): make_user_for_organization(organization, username=u) + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() day_to_check_iso = "2021-01-27T15:27:14.448059+00:00" parsed_iso_day_to_check = datetime.datetime.fromisoformat(day_to_check_iso).replace(tzinfo=pytz.UTC) From dd55c5a9f9bbb70b0b21fe58d213d49c3f8bc6d4 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Mon, 3 Oct 2022 15:14:14 +0300 Subject: [PATCH 61/66] schedules fix --- .../src/pages/schedules/Schedules.tsx | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index 230d2c84..cb7b1655 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -85,7 +85,13 @@ class SchedulesPage extends React.Component this.setState({ errorData: { ...getWrongTeamResponseInfo(error) } })); @@ -94,12 +100,13 @@ class SchedulesPage extends React.Component res.id === id)?.id; - if (scheduleId || id === 'new') { - this.setState({ scheduleIdToEdit: id }); - } else { - openErrorNotification(`Schedule with id=${id} is not found. Please select schedule from the list.`); - } + scheduleId = schedules && schedules.find((res) => res.id === id)?.id; + } + + if (scheduleId || isNewSchedule) { + this.setState({ scheduleIdToEdit: id }); + } else { + openErrorNotification(`Schedule with id=${id} is not found. Please select schedule from the list.`); } }; @@ -165,7 +172,7 @@ class SchedulesPage extends React.Component {() => ( <> From c7d02deaf898ed5b798f79be9ae598258ebb3e28 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Mon, 3 Oct 2022 15:19:24 +0300 Subject: [PATCH 62/66] remove unused linter --- grafana-plugin/src/pages/schedules/Schedules.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index cb7b1655..9493d837 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -85,7 +85,7 @@ class SchedulesPage extends React.Component {() => ( <> From 6338e5878398715eda782aa6305bae75f13dd561 Mon Sep 17 00:00:00 2001 From: Rares Mardare Date: Mon, 3 Oct 2022 17:25:13 +0300 Subject: [PATCH 63/66] fix for webhook linter --- .../pages/outgoing_webhooks/OutgoingWebhooks.tsx | 15 ++++++++++----- grafana-plugin/src/pages/schedules/Schedules.tsx | 5 ++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx index 8ddd846c..51d80e98 100644 --- a/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx +++ b/grafana-plugin/src/pages/outgoing_webhooks/OutgoingWebhooks.tsx @@ -60,14 +60,19 @@ class OutgoingWebhooks extends React.Component this.setState({ errorData: { ...getWrongTeamResponseInfo(error) } })); + } - if (outgoingWebhook) { - this.setState({ outgoingWebhookIdToEdit: id }); - } + if (outgoingWebhook || isNewWebhook) { + this.setState({ outgoingWebhookIdToEdit: id }); } }; diff --git a/grafana-plugin/src/pages/schedules/Schedules.tsx b/grafana-plugin/src/pages/schedules/Schedules.tsx index 9493d837..3fb0d618 100644 --- a/grafana-plugin/src/pages/schedules/Schedules.tsx +++ b/grafana-plugin/src/pages/schedules/Schedules.tsx @@ -87,8 +87,8 @@ class SchedulesPage extends React.Component res.id === id)?.id; + scheduleId = schedule.id; } if (scheduleId || isNewSchedule) { From 0ee8f3e42b3833112f70dc5d0b80e5d5a30865f6 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Mon, 3 Oct 2022 11:18:49 -0600 Subject: [PATCH 64/66] Update changelog for v1.0.39 --- CHANGELOG.md | 4 ++++ grafana-plugin/CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0ead17d..ebfa6fb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## v1.0.39 (2022-10-03) + +- Fix issue in v1.0.38 blocking the creation of schedules and webhooks in the UI + ## v1.0.38 (2022-09-30) - Fix exception handling for adding resolution notes when slack and oncall users are out of sync. diff --git a/grafana-plugin/CHANGELOG.md b/grafana-plugin/CHANGELOG.md index d0ead17d..ebfa6fb2 100644 --- a/grafana-plugin/CHANGELOG.md +++ b/grafana-plugin/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## v1.0.39 (2022-10-03) + +- Fix issue in v1.0.38 blocking the creation of schedules and webhooks in the UI + ## v1.0.38 (2022-09-30) - Fix exception handling for adding resolution notes when slack and oncall users are out of sync. From f7c78038074ec03a4e6bb860dbecd5f96e3689b9 Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Mon, 3 Oct 2022 14:27:22 -0300 Subject: [PATCH 65/66] Fix related_users for no-shifts schedule --- engine/apps/schedules/models/on_call_schedule.py | 1 + .../apps/schedules/tests/test_on_call_schedule.py | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/engine/apps/schedules/models/on_call_schedule.py b/engine/apps/schedules/models/on_call_schedule.py index b3d72911..24aa8d0d 100644 --- a/engine/apps/schedules/models/on_call_schedule.py +++ b/engine/apps/schedules/models/on_call_schedule.py @@ -654,6 +654,7 @@ class OnCallScheduleWeb(OnCallSchedule): for g in rolling_groups if g is not None ), + set(), ) return users diff --git a/engine/apps/schedules/tests/test_on_call_schedule.py b/engine/apps/schedules/tests/test_on_call_schedule.py index bb9699e7..a5380a7e 100644 --- a/engine/apps/schedules/tests/test_on_call_schedule.py +++ b/engine/apps/schedules/tests/test_on_call_schedule.py @@ -745,6 +745,19 @@ def test_preview_override_shift(make_organization, make_user_for_organization, m assert schedule._ical_file_overrides == schedule_overrides_ical +@pytest.mark.django_db +def test_schedule_related_users_empty_schedule(make_organization, make_schedule): + organization = make_organization() + schedule = make_schedule( + organization, + schedule_class=OnCallScheduleWeb, + name="test_web_schedule", + ) + + users = schedule.related_users() + assert users == set() + + @pytest.mark.django_db def test_schedule_related_users(make_organization, make_user_for_organization, make_on_call_shift, make_schedule): organization = make_organization() From 2a3fc397db988364a5494e65fd489fa6603ae03d Mon Sep 17 00:00:00 2001 From: Matias Bordese Date: Mon, 3 Oct 2022 15:00:23 -0300 Subject: [PATCH 66/66] Clear users cache before schedule tests logic/asserts --- engine/apps/api/tests/test_schedules.py | 2 ++ engine/apps/schedules/tests/test_on_call_schedule.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/engine/apps/api/tests/test_schedules.py b/engine/apps/api/tests/test_schedules.py index 19537391..13ef0825 100644 --- a/engine/apps/api/tests/test_schedules.py +++ b/engine/apps/api/tests/test_schedules.py @@ -985,6 +985,8 @@ def test_merging_same_shift_events( user_a = make_user_for_organization(organization) user_b = make_user_for_organization(organization) user_c = make_user_for_organization(organization, role=Role.VIEWER) + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() data = { "start": start_date + timezone.timedelta(hours=10), diff --git a/engine/apps/schedules/tests/test_on_call_schedule.py b/engine/apps/schedules/tests/test_on_call_schedule.py index a5380a7e..8bb079f4 100644 --- a/engine/apps/schedules/tests/test_on_call_schedule.py +++ b/engine/apps/schedules/tests/test_on_call_schedule.py @@ -271,6 +271,8 @@ def test_final_schedule_events(make_organization, make_user_for_organization, ma start_date = now - timezone.timedelta(days=7) user_a, user_b, user_c, user_d, user_e = (make_user_for_organization(organization, username=i) for i in "ABCDE") + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() shifts = ( # user, priority, start time (h), duration (hs) @@ -370,6 +372,8 @@ def test_final_schedule_splitting_events( start_date = now - timezone.timedelta(days=7) user_a, user_b, user_c = (make_user_for_organization(organization, username=i) for i in "ABC") + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() shifts = ( # user, priority, start time (h), duration (hs) @@ -437,6 +441,8 @@ def test_final_schedule_splitting_same_time_events( start_date = now - timezone.timedelta(days=7) user_a, user_b, user_c = (make_user_for_organization(organization, username=i) for i in "ABC") + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() shifts = ( # user, priority, start time (h), duration (hs) @@ -771,6 +777,8 @@ def test_schedule_related_users(make_organization, make_user_for_organization, m start_date = now - timezone.timedelta(days=7) user_a, _, _, user_d, user_e = (make_user_for_organization(organization, username=i) for i in "ABCDE") + # clear users pks <-> organization cache (persisting between tests) + memoized_users_in_ical.cache_clear() shifts = ( # user, priority, start time (h), duration (hs)