Skip to content

Commit 79c6ee3

Browse files
shruthilayajshruthilayaj
authored
fix(starfish): Primary release can be undefined, check for it (#59993)
Prevents crashing entire page if no releases turn up.
1 parent bf29277 commit 79c6ee3

File tree

3 files changed

+71
-47
lines changed

3 files changed

+71
-47
lines changed

‎static/app/views/starfish/queries/useReleases.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@ export function useReleases(searchTerm?: string) {
7575
};
7676
}
7777

78-
export function useReleaseSelection() {
78+
export function useReleaseSelection(): {
79+
isLoading: boolean;
80+
primaryRelease: string | undefined;
81+
secondaryRelease: string | undefined;
82+
} {
7983
const location = useLocation();
8084

8185
const {data: releases, isLoading} = useReleases();

‎static/app/views/starfish/views/screens/index.tsx‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,15 @@ export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
278278
series: Object.values(
279279
transformedReleaseEvents[YAXIS_COLUMNS[yAxes[0]]]
280280
),
281-
subtitle: t(
282-
'%s v. %s',
283-
formatVersionAndCenterTruncate(primaryRelease, 12),
284-
secondaryRelease
285-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
286-
: ''
287-
),
281+
subtitle: primaryRelease
282+
? t(
283+
'%s v. %s',
284+
formatVersionAndCenterTruncate(primaryRelease, 12),
285+
secondaryRelease
286+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
287+
: ''
288+
)
289+
: '',
288290
},
289291
]}
290292
chartHeight={chartHeight ?? 180}
@@ -309,13 +311,15 @@ export function ScreensView({yAxes, additionalFilters, chartHeight}: Props) {
309311
series: Object.values(
310312
transformedReleaseEvents[YAXIS_COLUMNS[yAxes[1]]]
311313
),
312-
subtitle: t(
313-
'%s v. %s',
314-
formatVersionAndCenterTruncate(primaryRelease, 12),
315-
secondaryRelease
316-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
317-
: ''
318-
),
314+
subtitle: primaryRelease
315+
? t(
316+
'%s v. %s',
317+
formatVersionAndCenterTruncate(primaryRelease, 12),
318+
secondaryRelease
319+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
320+
: ''
321+
)
322+
: '',
319323
},
320324
]}
321325
chartHeight={chartHeight ?? 180}

‎static/app/views/starfish/views/screens/screenLoadSpans/charts.tsx‎

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,15 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
207207
yAxis: YAXIS_COLUMNS[yAxes[0]],
208208
series: Object.values(transformedEvents[YAXIS_COLUMNS[yAxes[0]]]),
209209
xAxisLabel: ['high', 'medium', 'low', 'Unknown'],
210-
subtitle: t(
211-
'%s v. %s',
212-
formatVersionAndCenterTruncate(primaryRelease, 12),
213-
secondaryRelease
214-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
215-
: ''
216-
),
210+
subtitle: primaryRelease
211+
? t(
212+
'%s v. %s',
213+
formatVersionAndCenterTruncate(primaryRelease, 12),
214+
secondaryRelease
215+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
216+
: ''
217+
)
218+
: '',
217219
},
218220
]}
219221
chartKey="spansChart"
@@ -224,13 +226,17 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
224226
<ChartsContainerItem key="xyz">
225227
<MiniChartPanel
226228
title={t('Average TTID')}
227-
subtitle={t(
228-
'%s v. %s',
229-
formatVersionAndCenterTruncate(primaryRelease, 12),
230-
secondaryRelease
231-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
229+
subtitle={
230+
primaryRelease
231+
? t(
232+
'%s v. %s',
233+
formatVersionAndCenterTruncate(primaryRelease, 12),
234+
secondaryRelease
235+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
236+
: ''
237+
)
232238
: ''
233-
)}
239+
}
234240
>
235241
<Chart
236242
height={80}
@@ -270,13 +276,15 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
270276
yAxis: YAXIS_COLUMNS[yAxes[1]],
271277
series: Object.values(transformedEvents[YAXIS_COLUMNS[yAxes[1]]]),
272278
xAxisLabel: ['high', 'medium', 'low', 'Unknown'],
273-
subtitle: t(
274-
'%s v. %s',
275-
formatVersionAndCenterTruncate(primaryRelease, 12),
276-
secondaryRelease
277-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
278-
: ''
279-
),
279+
subtitle: primaryRelease
280+
? t(
281+
'%s v. %s',
282+
formatVersionAndCenterTruncate(primaryRelease, 12),
283+
secondaryRelease
284+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
285+
: ''
286+
)
287+
: '',
280288
},
281289
]}
282290
chartKey="spansChart"
@@ -287,13 +295,17 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
287295
<ChartsContainerItem key="xyz">
288296
<MiniChartPanel
289297
title={t('Average TTFD')}
290-
subtitle={t(
291-
'%s v. %s',
292-
formatVersionAndCenterTruncate(primaryRelease, 12),
293-
secondaryRelease
294-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
298+
subtitle={
299+
primaryRelease
300+
? t(
301+
'%s v. %s',
302+
formatVersionAndCenterTruncate(primaryRelease, 12),
303+
secondaryRelease
304+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
305+
: ''
306+
)
295307
: ''
296-
)}
308+
}
297309
>
298310
<Chart
299311
height={80}
@@ -328,13 +340,17 @@ export function ScreenCharts({yAxes, additionalFilters}: Props) {
328340
<ChartsContainerItem key="xyz">
329341
<MiniChartPanel
330342
title={CHART_TITLES[YAxis.COUNT]}
331-
subtitle={t(
332-
'%s v. %s',
333-
formatVersionAndCenterTruncate(primaryRelease, 12),
334-
secondaryRelease
335-
? formatVersionAndCenterTruncate(secondaryRelease, 12)
343+
subtitle={
344+
primaryRelease
345+
? t(
346+
'%s v. %s',
347+
formatVersionAndCenterTruncate(primaryRelease, 12),
348+
secondaryRelease
349+
? formatVersionAndCenterTruncate(secondaryRelease, 12)
350+
: ''
351+
)
336352
: ''
337-
)}
353+
}
338354
>
339355
<Chart
340356
data={Object.values(transformedReleaseSeries[YAXIS_COLUMNS[yAxes[2]]])}

0 commit comments

Comments
 (0)