Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion static/app/views/dashboards/widgetCard/widgetFrame.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import styled from '@emotion/styled';

import {Badge} from '@sentry/scraps/badge';
import {Button, LinkButton} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';
import {Tooltip} from '@sentry/scraps/tooltip';

import {DropdownMenu, type MenuItemProps} from 'sentry/components/dropdownMenu';
Expand Down Expand Up @@ -150,7 +151,15 @@ export function WidgetFrame(props: WidgetFrameProps) {
)}
</Fragment>
}
Visualization={props.error ? <Widget.WidgetError error={error} /> : props.children}
Visualization={
props.error ? (
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
) : (
props.children
)
}
noVisualizationPadding={props.noVisualizationPadding}
/>
);
Expand Down
14 changes: 10 additions & 4 deletions static/app/views/dashboards/widgets/widget/widget.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,11 @@ function InsightsLineChart() {
</Button>
</Widget.WidgetToolbar>
}
Visualization={<Widget.WidgetError error={error} />}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
}
/>
);
}
Expand All @@ -260,9 +264,11 @@ function InsightsLineChart() {
<Widget
Title={Title}
Visualization={
<Widget.WidgetError
error={'No data! This is unusual, consider contacting support'}
/>
<Container position="absolute" inset={0}>
<Widget.WidgetError
error={'No data! This is unusual, consider contacting support'}
/>
</Container>
}
/>
);
Expand Down
18 changes: 13 additions & 5 deletions static/app/views/dashboards/widgets/widget/widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Fragment} from 'react';
import {css} from '@emotion/react';
import styled from '@emotion/styled';

import {Flex} from '@sentry/scraps/layout';
import {Container, Flex} from '@sentry/scraps/layout';

import ErrorBoundary from 'sentry/components/errorBoundary';
import {defined} from 'sentry/utils';
Expand Down Expand Up @@ -85,17 +85,25 @@ function WidgetLayout(props: Widget) {
{props.Visualization && (
<VisualizationWrapper noPadding={props.noVisualizationPadding}>
<ErrorBoundary
customComponent={({error}) => {
return <WidgetError error={error ?? undefined} />;
}}
customComponent={({error}) => (
<Container position="absolute" inset={0}>
<WidgetError error={error ?? undefined} />
</Container>
)}
>
{props.Visualization}
</ErrorBoundary>
</VisualizationWrapper>
)}

{props.Footer && (
<FooterWrapper noPadding={props.noFooterPadding}>{props.Footer}</FooterWrapper>
<FooterWrapper noPadding={props.noFooterPadding}>
<ErrorBoundary
customComponent={({error}) => <WidgetError error={error ?? undefined} />}
>
{props.Footer}
</ErrorBoundary>
</FooterWrapper>
)}
</Frame>
);
Expand Down
7 changes: 2 additions & 5 deletions static/app/views/dashboards/widgets/widget/widgetError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@ export function WidgetError({error}: WidgetErrorProps) {
);
}

const Panel = styled('div')<{height?: string}>`
container-type: size;
const Panel = styled('div')`
container-type: inline-size;
container-name: error-panel;

position: absolute;
inset: 0;

padding: ${p => p.theme.space.lg} ${p => p.theme.space.xl};

display: flex;
Expand Down
14 changes: 12 additions & 2 deletions static/app/views/explore/components/chart/chartVisualization.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import {useMemo} from 'react';
import {useTheme} from '@emotion/react';
import styled from '@emotion/styled';

import {Container} from '@sentry/scraps/layout';

import {TransparentLoadingMask} from 'sentry/components/charts/transparentLoadingMask';
import type {ChartXRangeSelectionProps} from 'sentry/components/charts/useChartXRangeSelection';
import {t} from 'sentry/locale';
Expand Down Expand Up @@ -94,14 +96,22 @@ export function ChartVisualization({
}

if (chartInfo.timeseriesResult.error) {
return <Widget.WidgetError error={chartInfo.timeseriesResult.error} />;
return (
<Container position="absolute" inset={0}>
<Widget.WidgetError error={chartInfo.timeseriesResult.error} />
</Container>
);
}

if (plottables.length === 0) {
// This happens when the `/events-stats/` endpoint returns a blank
// response. This is a rare error condition that happens when
// proxying to RPC. Adding explicit handling with a "better" message
return <Widget.WidgetError error={t('No data')} />;
return (
<Container position="absolute" inset={0}>
<Widget.WidgetError error={t('No data')} />
</Container>
);
}

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type {Theme} from '@emotion/react';
import {useTheme} from '@emotion/react';

import {Button} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';

import {openInsightChartModal} from 'sentry/actionCreators/modal';
import {usePageFilters} from 'sentry/components/pageFilters/usePageFilters';
Expand Down Expand Up @@ -186,7 +187,11 @@ export function InsightsTimeSeriesWidget(props: InsightsTimeSeriesWidgetProps) {
<ChartContainer height={props.height}>
<Widget
Title={Title}
Visualization={<Widget.WidgetError error={props.error} />}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={props.error} />
</Container>
}
/>
</ChartContainer>
);
Expand All @@ -199,7 +204,11 @@ export function InsightsTimeSeriesWidget(props: InsightsTimeSeriesWidgetProps) {
<ChartContainer height={props.height}>
<Widget
Title={Title}
Visualization={<Widget.WidgetError error={MISSING_DATA_MESSAGE} />}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={MISSING_DATA_MESSAGE} />
</Container>
}
/>
</ChartContainer>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {useTheme} from '@emotion/react';

import {Button} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';

import {openInsightChartModal} from 'sentry/actionCreators/modal';
import {BarChart} from 'sentry/components/charts/barChart';
Expand Down Expand Up @@ -131,7 +132,14 @@ export function DeviceClassBreakdownBarChart({
if (error) {
return (
<ChartContainer height={chartHeight}>
<Widget Title={Title} Visualization={<Widget.WidgetError error={error} />} />
<Widget
Title={Title}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
}
/>
</ChartContainer>
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {useTheme} from '@emotion/react';

import {Button} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';

import {openInsightChartModal} from 'sentry/actionCreators/modal';
import {BarChart} from 'sentry/components/charts/barChart';
Expand Down Expand Up @@ -96,7 +97,14 @@ export function ScreensBarChart({
if (error) {
return (
<ChartContainer height={chartHeight}>
<Widget Title={Title} Visualization={<Widget.WidgetError error={error} />} />
<Widget
Title={Title}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
}
/>
</ChartContainer>
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type React from 'react';

import {Container} from '@sentry/scraps/layout';

import {Widget} from 'sentry/views/dashboards/widgets/widget/widget';
import {WidgetEmptyStateWarning} from 'sentry/views/performance/landing/widgets/components/selectableList';

Expand All @@ -26,7 +28,11 @@ export function WidgetVisualizationStates<T extends WidgetVisualization>({
return <VisualizationType.LoadingPlaceholder />;
}
if (error) {
return <Widget.WidgetError error={error} />;
return (
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
);
}
if (isEmpty) {
return emptyMessage ? emptyMessage : <WidgetEmptyStateWarning />;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Button} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';

import {shouldFetchPreviousPeriod} from 'sentry/components/charts/utils';
import {normalizeDateTimeParams} from 'sentry/components/pageFilters/parse';
Expand Down Expand Up @@ -155,7 +156,11 @@ export function ProjectApdexScoreCard(props: Props) {
</Button>
</Widget.WidgetToolbar>
}
Visualization={<Widget.WidgetError error={error} />}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
}
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Button} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';

import {getInterval, shouldFetchPreviousPeriod} from 'sentry/components/charts/utils';
import {normalizeDateTimeParams} from 'sentry/components/pageFilters/parse';
Expand Down Expand Up @@ -182,7 +183,11 @@ export function ProjectStabilityScoreCard(props: Props) {
</Button>
</Widget.WidgetToolbar>
}
Visualization={<Widget.WidgetError error={error} />}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
}
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {Button} from '@sentry/scraps/button';
import {Container} from '@sentry/scraps/layout';

import {shouldFetchPreviousPeriod} from 'sentry/components/charts/utils';
import {normalizeDateTimeParams} from 'sentry/components/pageFilters/parse';
Expand Down Expand Up @@ -195,7 +196,11 @@ export function ProjectVelocityScoreCard(props: Props) {
</Button>
</Widget.WidgetToolbar>
}
Visualization={<Widget.WidgetError error={error} />}
Visualization={
<Container position="absolute" inset={0}>
<Widget.WidgetError error={error} />
</Container>
}
/>
);
}
Expand Down
Loading