Skip to content

Commit a4e82cf

Browse files
scttcperscttcper
authored
ref(alerts): Remove getDynamicText from alerts pages (#97804)
No longer needed since we don't do screenshot testing
1 parent 45ae8d9 commit a4e82cf

File tree

6 files changed

+62
-107
lines changed

6 files changed

+62
-107
lines changed

‎static/app/views/alerts/list/incidents/row.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {space} from 'sentry/styles/space';
1515
import type {Actor} from 'sentry/types/core';
1616
import type {Organization} from 'sentry/types/organization';
1717
import type {Project} from 'sentry/types/project';
18-
import getDynamicText from 'sentry/utils/getDynamicText';
1918
import type {Incident} from 'sentry/views/alerts/types';
2019
import {IncidentStatus} from 'sentry/views/alerts/types';
2120
import {alertDetailsLink} from 'sentry/views/alerts/utils';
@@ -58,14 +57,11 @@ function AlertListRow({incident, projectsLoaded, projects, organization}: Props)
5857
</FlexCenter>
5958

6059
<NoWrapNumeric>
61-
{getDynamicText({
62-
value: <TimeSince date={incident.dateStarted} unitStyle="extraShort" />,
63-
fixed: '1w ago',
64-
})}
60+
<TimeSince date={incident.dateStarted} unitStyle="extraShort" />
6561
</NoWrapNumeric>
6662
<NoWrapNumeric>
6763
{incident.status === IncidentStatus.CLOSED ? (
68-
<Duration seconds={getDynamicText({value: duration, fixed: 1200})} />
64+
<Duration seconds={duration} />
6965
) : (
7066
<Tag type="warning">{t('Still Active')}</Tag>
7167
)}

‎static/app/views/alerts/rules/issue/details/alertChart.tsx

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {t} from 'sentry/locale';
1212
import {space} from 'sentry/styles/space';
1313
import type {IssueAlertRule, ProjectAlertRuleStats} from 'sentry/types/alerts';
1414
import type {Project} from 'sentry/types/project';
15-
import getDynamicText from 'sentry/utils/getDynamicText';
1615
import {useApiQuery} from 'sentry/utils/queryClient';
1716
import useOrganization from 'sentry/utils/useOrganization';
1817
import RouteError from 'sentry/views/routeError';
@@ -64,44 +63,41 @@ export function IssueAlertDetailsChart({
6463
<ChartHeader>
6564
<HeaderTitleLegend>{t('Alerts Triggered')}</HeaderTitleLegend>
6665
</ChartHeader>
67-
{getDynamicText({
68-
value: isPending ? (
69-
<Placeholder height="200px" />
70-
) : (
71-
<ChartZoom period={period} start={start} end={end} utc={utc} usePageDate>
72-
{zoomRenderProps => (
73-
<AreaChart
74-
{...zoomRenderProps}
75-
isGroupedByDate
76-
showTimeInTooltip
77-
grid={{
78-
left: space(0.25),
79-
right: space(2),
80-
top: space(3),
81-
bottom: 0,
82-
}}
83-
yAxis={{
84-
minInterval: 1,
85-
}}
86-
series={[
87-
{
88-
seriesName: 'Alerts Triggered',
89-
data:
90-
ruleFireHistory?.map(alert => ({
91-
name: alert.date,
92-
value: alert.count,
93-
})) ?? [],
94-
emphasis: {
95-
disabled: true,
96-
},
66+
{isPending ? (
67+
<Placeholder height="200px" />
68+
) : (
69+
<ChartZoom period={period} start={start} end={end} utc={utc} usePageDate>
70+
{zoomRenderProps => (
71+
<AreaChart
72+
{...zoomRenderProps}
73+
isGroupedByDate
74+
showTimeInTooltip
75+
grid={{
76+
left: space(0.25),
77+
right: space(2),
78+
top: space(3),
79+
bottom: 0,
80+
}}
81+
yAxis={{
82+
minInterval: 1,
83+
}}
84+
series={[
85+
{
86+
seriesName: 'Alerts Triggered',
87+
data:
88+
ruleFireHistory?.map(alert => ({
89+
name: alert.date,
90+
value: alert.count,
91+
})) ?? [],
92+
emphasis: {
93+
disabled: true,
9794
},
98-
]}
99-
/>
100-
)}
101-
</ChartZoom>
102-
),
103-
fixed: <Placeholder height="200px" testId="skeleton-ui" />,
104-
})}
95+
},
96+
]}
97+
/>
98+
)}
99+
</ChartZoom>
100+
)}
105101
</StyledPanelBody>
106102
<ChartFooter>
107103
<FooterHeader>{t('Total Alerts')}</FooterHeader>

‎static/app/views/alerts/rules/issue/details/issuesList.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import type {Group} from 'sentry/types/group';
1616
import type {Project} from 'sentry/types/project';
1717
import {getMessage, getTitle} from 'sentry/utils/events';
1818
import type {FeedbackIssue} from 'sentry/utils/feedback/types';
19-
import getDynamicText from 'sentry/utils/getDynamicText';
2019
import {useApiQuery} from 'sentry/utils/queryClient';
2120
import useOrganization from 'sentry/utils/useOrganization';
2221
import {makeFeedbackPathname} from 'sentry/views/userFeedback/pathnames';
@@ -115,15 +114,7 @@ function AlertRuleIssuesList({project, rule, period, start, end, utc, cursor}: P
115114
<Count value={issue.count} />
116115
</AlignRight>
117116
<div>
118-
<StyledDateTime
119-
date={getDynamicText({
120-
value: lastTriggered,
121-
fixed: 'Mar 16, 2020 9:10:13 AM UTC',
122-
})}
123-
year
124-
seconds
125-
timeZone
126-
/>
117+
<StyledDateTime date={lastTriggered} year seconds timeZone />
127118
</div>
128119
</Fragment>
129120
);

‎static/app/views/alerts/rules/metric/details/metricChart.tsx

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import type {Project} from 'sentry/types/project';
4343
import toArray from 'sentry/utils/array/toArray';
4444
import {DiscoverDatasets, SavedQueryDatasets} from 'sentry/utils/discover/types';
4545
import getDuration from 'sentry/utils/duration/getDuration';
46-
import getDynamicText from 'sentry/utils/getDynamicText';
4746
import {shouldShowOnDemandMetricAlertUI} from 'sentry/utils/onDemandMetrics/features';
4847
import {MINUTES_THRESHOLD_TO_DISPLAY_SECONDS} from 'sentry/utils/sessions';
4948
import {capitalize} from 'sentry/utils/string/capitalize';
@@ -419,33 +418,28 @@ export default function MetricChart({
419418
<QueryFilters>{queryFilter}</QueryFilters>
420419
</Tooltip>
421420
</ChartFilters>
422-
{getDynamicText({
423-
value: (
424-
<ChartZoom
425-
start={start}
426-
end={end}
427-
onZoom={zoomArgs => handleZoom(zoomArgs.start, zoomArgs.end)}
428-
>
429-
{zoomRenderProps => (
430-
<AreaChart
431-
{...zoomRenderProps}
432-
{...chartOption}
433-
showTimeInTooltip
434-
minutesThresholdToDisplaySeconds={minutesThresholdToDisplaySeconds}
435-
additionalSeries={additionalSeries}
436-
tooltip={getMetricChartTooltipFormatter({
437-
formattedAggregate,
438-
rule,
439-
interval,
440-
comparisonSeriesName,
441-
theme,
442-
})}
443-
/>
444-
)}
445-
</ChartZoom>
446-
),
447-
fixed: <Placeholder height="200px" testId="skeleton-ui" />,
448-
})}
421+
<ChartZoom
422+
start={start}
423+
end={end}
424+
onZoom={zoomArgs => handleZoom(zoomArgs.start, zoomArgs.end)}
425+
>
426+
{zoomRenderProps => (
427+
<AreaChart
428+
{...zoomRenderProps}
429+
{...chartOption}
430+
showTimeInTooltip
431+
minutesThresholdToDisplaySeconds={minutesThresholdToDisplaySeconds}
432+
additionalSeries={additionalSeries}
433+
tooltip={getMetricChartTooltipFormatter({
434+
formattedAggregate,
435+
rule,
436+
interval,
437+
comparisonSeriesName,
438+
theme,
439+
})}
440+
/>
441+
)}
442+
</ChartZoom>
449443
</StyledPanelBody>
450444
{renderChartActions(
451445
totalDuration,

‎static/app/views/alerts/rules/metric/details/metricHistory.tsx

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {t, tn} from 'sentry/locale';
1313
import {space} from 'sentry/styles/space';
1414
import type {Organization} from 'sentry/types/organization';
1515
import getDuration from 'sentry/utils/duration/getDuration';
16-
import getDynamicText from 'sentry/utils/getDynamicText';
1716
import {capitalize} from 'sentry/utils/string/capitalize';
1817
import useOrganization from 'sentry/utils/useOrganization';
1918
import {COMPARISON_DELTA_OPTIONS} from 'sentry/views/alerts/rules/metric/constants';
@@ -122,22 +121,10 @@ function MetricAlertActivity({organization, incident}: MetricAlertActivityProps)
122121
)}
123122
</Cell>
124123
<Cell>
125-
{activityDuration &&
126-
getDynamicText({
127-
value: <Duration abbreviation seconds={activityDuration / 1000} />,
128-
fixed: '30s',
129-
})}
124+
{activityDuration && <Duration abbreviation seconds={activityDuration / 1000} />}
130125
</Cell>
131126
<Cell>
132-
<StyledDateTime
133-
date={getDynamicText({
134-
value: incident.dateCreated,
135-
fixed: 'Mar 4, 2022 10:44:13 AM UTC',
136-
})}
137-
year
138-
seconds
139-
timeZone
140-
/>
127+
<StyledDateTime date={incident.dateCreated} year seconds timeZone />
141128
</Cell>
142129
</Fragment>
143130
);

‎static/app/views/alerts/rules/metric/details/sidebar.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {IconDiamond, IconMegaphone} from 'sentry/icons';
1515
import {t, tct} from 'sentry/locale';
1616
import {space} from 'sentry/styles/space';
1717
import type {Actor} from 'sentry/types/core';
18-
import getDynamicText from 'sentry/utils/getDynamicText';
1918
import {getSearchFilters, isOnDemandSearchKey} from 'sentry/utils/onDemandMetrics/index';
2019
import {capitalize} from 'sentry/utils/string/capitalize';
2120
import {isChonkTheme} from 'sentry/utils/theme/withChonk';
@@ -258,15 +257,7 @@ export function MetricDetailsSidebar({
258257
/>
259258
<KeyValueTableRow
260259
keyName={t('Date created')}
261-
value={
262-
<DateTime
263-
date={getDynamicText({
264-
value: rule.dateCreated,
265-
fixed: new Date('2021-04-20'),
266-
})}
267-
format="ll"
268-
/>
269-
}
260+
value={<DateTime date={rule.dateCreated} format="ll" />}
270261
/>
271262
{rule.createdBy && (
272263
<KeyValueTableRow

0 commit comments

Comments
 (0)