Cleaning out Incident word from frontend (#704)
**What this PR does**: **Which issue(s) this PR fixes**: **Checklist** - [ ] Tests updated - [ ] Documentation added - [x] `CHANGELOG.md` updated
This commit is contained in:
Yulia Shanyrova
GitHub
parent
a121f84a89
commit
21691d64dc
8 changed files with 18 additions and 13 deletions
|
|
@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
|
||||
### Fixed
|
||||
|
||||
- Cleaning of the name "Incident" ([704](https://github.com/grafana/oncall/pull/704))
|
||||
- Alert Group/Alert Groups naming polishing. All the names should be with capital letters
|
||||
- Design polishing ([1290](https://github.com/grafana/oncall/pull/1290))
|
||||
- Not showing contact details in User tooltip if User does not have edit/admin access
|
||||
- Updated slack link account to redirect back to user profile instead of chatops
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ const AlertTemplatesForm = (props: AlertTemplatesFormProps) => {
|
|||
<div className={cx('web-title-message')}>
|
||||
<Text type="secondary" size="small">
|
||||
Please note that after changing the web title template new alert groups will be searchable by
|
||||
new title. Alert groups created before the template was changed will be still searchable by old
|
||||
new title. Alert Groups created before the template was changed will be still searchable by old
|
||||
title only.
|
||||
</Text>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ const AlertReceiveChannelCard = observer((props: AlertReceiveChannelCardProps) =
|
|||
>
|
||||
<b>{alertReceiveChannelCounter?.alerts_count}</b> alert
|
||||
{alertReceiveChannelCounter?.alerts_count === 1 ? '' : 's'} in{' '}
|
||||
<b>{alertReceiveChannelCounter?.alert_groups_count}</b> alert group
|
||||
<b>{alertReceiveChannelCounter?.alert_groups_count}</b> Alert Group
|
||||
{alertReceiveChannelCounter?.alert_groups_count === 1 ? '' : 's'}
|
||||
</PluginLink>
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ const IncidentMatcher = observer((props: IncidentMatcherProps) => {
|
|||
<div className={cx('columns')}>
|
||||
<div className={cx('incident-list')}>
|
||||
<Text.Title className={cx('title')} level={5}>
|
||||
Matching Incidents
|
||||
Matching Alert Groups
|
||||
</Text.Title>
|
||||
{isLoading ? (
|
||||
<LoadingPlaceholder text="Loading..." />
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ class IncidentPage extends React.Component<IncidentPageProps, IncidentPageState>
|
|||
if (!incident && !isNotFoundError && !isWrongTeamError) {
|
||||
return (
|
||||
<div className={cx('root')}>
|
||||
<LoadingPlaceholder text="Loading alert group..." />
|
||||
<LoadingPlaceholder text="Loading Alert Group..." />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -139,10 +139,10 @@ class IncidentPage extends React.Component<IncidentPageProps, IncidentPageState>
|
|||
<div className={cx('not-found')}>
|
||||
<VerticalGroup spacing="lg" align="center">
|
||||
<Text.Title level={1}>404</Text.Title>
|
||||
<Text.Title level={4}>Incident not found</Text.Title>
|
||||
<Text.Title level={4}>Alert group not found</Text.Title>
|
||||
<PluginLink query={{ page: 'incidents', cursor, start, perpage }}>
|
||||
<Button variant="secondary" icon="arrow-left" size="md">
|
||||
Go to incidents page
|
||||
Go to Alert Groups page
|
||||
</Button>
|
||||
</PluginLink>
|
||||
</VerticalGroup>
|
||||
|
|
@ -250,7 +250,7 @@ class IncidentPage extends React.Component<IncidentPageProps, IncidentPageState>
|
|||
<IconButton
|
||||
name="share-alt"
|
||||
onClick={this.showAttachIncidentForm}
|
||||
tooltip="Attach to another alert group"
|
||||
tooltip="Attach to another Alert Group"
|
||||
className={cx('title-icon')}
|
||||
/>
|
||||
)}
|
||||
|
|
@ -395,7 +395,10 @@ class IncidentPage extends React.Component<IncidentPageProps, IncidentPageState>
|
|||
</li>
|
||||
))}
|
||||
</ul>
|
||||
<Field label="Leave a resolution note" description="Will also show up in the thread of incident in Slack">
|
||||
<Field
|
||||
label="Leave a resolution note"
|
||||
description="Will also show up in the thread of the Alert Group in Slack"
|
||||
>
|
||||
<TextArea
|
||||
value={resolutionNoteText}
|
||||
onChange={(e: any) => this.setState({ resolutionNoteText: e.target.value })}
|
||||
|
|
|
|||
|
|
@ -242,8 +242,8 @@ class Incidents extends React.Component<IncidentsPageProps, IncidentsPageState>
|
|||
)}
|
||||
<Text type="secondary">
|
||||
{hasSelected
|
||||
? `${selectedIncidentIds.length} alert group${selectedIncidentIds.length > 1 ? 's' : ''} selected`
|
||||
: 'No alert groups selected'}
|
||||
? `${selectedIncidentIds.length} Alert Group${selectedIncidentIds.length > 1 ? 's' : ''} selected`
|
||||
: 'No Alert Groups selected'}
|
||||
</Text>
|
||||
</HorizontalGroup>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ class SettingsPage extends React.Component<SettingsPageProps, SettingsPageState>
|
|||
<div className={cx('settings')}>
|
||||
<Field
|
||||
loading={!teamStore.currentTeam}
|
||||
label="Require resolution note when resolve incident"
|
||||
description={`Once user clicks "Resolve" for an incident they are require to fill a resolution note about the incident`}
|
||||
label="Require a resolution note when resolving Alert Groups"
|
||||
description={`Once user clicks "Resolve" for an Alert Group, they will be required to fill in a resolution note about the Alert Group`}
|
||||
>
|
||||
<WithPermissionControl userAction={UserActions.OtherSettingsWrite}>
|
||||
<Switch
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
"includes": [
|
||||
{
|
||||
"type": "page",
|
||||
"name": "Incidents",
|
||||
"name": "Alert Groups",
|
||||
"path": "/a/grafana-oncall-app/incidents",
|
||||
"role": "Viewer",
|
||||
"action": "grafana-oncall-app.alert-groups:read",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue