Skip to content

Commit b417684

Browse files
authored
fix(logs): Prevent progressive loading UI from rendering (#89898)
The UI here shouldn't be showing the progressive loading indicator. Instead it should display the normal confidence footer. To separate these two, I just pass down the dataset and make sure if it's not an explore dataset, we show the original footer.
1 parent a767ac1 commit b417684

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

static/app/views/explore/charts/index.spec.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import {OrganizationFixture} from 'sentry-fixture/organization';
33
import {render, screen} from 'sentry-test/reactTestingLibrary';
44

55
import {DurationUnit} from 'sentry/utils/discover/fields';
6+
import {DiscoverDatasets} from 'sentry/utils/discover/types';
67
import {ExploreCharts} from 'sentry/views/explore/charts';
78
import {defaultVisualizes} from 'sentry/views/explore/contexts/pageParamsContext/visualizes';
89
import {SAMPLING_MODE} from 'sentry/views/explore/hooks/useProgressiveQuery';
@@ -31,6 +32,7 @@ describe('ExploreCharts', () => {
3132
timeseriesResult={mockTimeseriesResult}
3233
visualizes={defaultVisualizes()}
3334
setVisualizes={() => {}}
35+
dataset={DiscoverDatasets.SPANS_EAP}
3436
/>,
3537
{
3638
organization: OrganizationFixture({
@@ -52,6 +54,7 @@ describe('ExploreCharts', () => {
5254
visualizes={defaultVisualizes()}
5355
setVisualizes={() => {}}
5456
samplingMode={SAMPLING_MODE.BEST_EFFORT}
57+
dataset={DiscoverDatasets.SPANS_EAP}
5558
/>
5659
);
5760

static/app/views/explore/charts/index.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import type {Confidence} from 'sentry/types/organization';
1111
import {defined} from 'sentry/utils';
1212
import {dedupeArray} from 'sentry/utils/dedupeArray';
1313
import {parseFunction, prettifyParsedFunction} from 'sentry/utils/discover/fields';
14+
import type {DiscoverDatasets} from 'sentry/utils/discover/types';
1415
import {isTimeSeriesOther} from 'sentry/utils/timeSeries/isTimeSeriesOther';
1516
import useOrganization from 'sentry/utils/useOrganization';
1617
import usePrevious from 'sentry/utils/usePrevious';
@@ -37,6 +38,7 @@ import type {useSortedTimeSeries} from 'sentry/views/insights/common/queries/use
3738
interface ExploreChartsProps {
3839
canUsePreviousResults: boolean;
3940
confidences: Confidence[];
41+
dataset: DiscoverDatasets;
4042
query: string;
4143
setVisualizes: (visualizes: Visualize[]) => void;
4244
timeseriesResult: ReturnType<typeof useSortedTimeSeries>;
@@ -71,6 +73,7 @@ export function ExploreCharts({
7173
setVisualizes,
7274
hideContextMenu,
7375
samplingMode,
76+
dataset,
7477
}: ExploreChartsProps) {
7578
const theme = useTheme();
7679
const organization = useOrganization();
@@ -208,6 +211,7 @@ export function ExploreCharts({
208211
confidence={undefined}
209212
topEvents={undefined}
210213
dataScanned={undefined}
214+
dataset={dataset}
211215
/>
212216
)
213217
}
@@ -329,6 +333,7 @@ export function ExploreCharts({
329333
}
330334
dataScanned={chartInfo.dataScanned}
331335
samplingMode={samplingMode}
336+
dataset={dataset}
332337
/>
333338
}
334339
/>

static/app/views/explore/charts/widgetExtrapolationFooter.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {tct} from 'sentry/locale';
77
import {space} from 'sentry/styles/space';
88
import type {Confidence} from 'sentry/types/organization';
99
import {defined} from 'sentry/utils';
10+
import {DiscoverDatasets} from 'sentry/utils/discover/types';
1011
import useOrganization from 'sentry/utils/useOrganization';
1112
import {ConfidenceFooter} from 'sentry/views/explore/charts/confidenceFooter';
1213
import {
@@ -21,16 +22,21 @@ export function WidgetExtrapolationFooter({
2122
topEvents,
2223
dataScanned,
2324
samplingMode,
25+
dataset,
2426
}: {
2527
confidence: Confidence | undefined;
2628
dataScanned: 'full' | 'partial' | undefined;
29+
dataset: DiscoverDatasets;
2730
isSampled: boolean | null;
2831
sampleCount: number;
2932
topEvents: number | undefined;
3033
samplingMode?: SamplingMode;
3134
}) {
3235
const organization = useOrganization();
33-
if (!organization.features.includes('visibility-explore-progressive-loading')) {
36+
if (
37+
!organization.features.includes('visibility-explore-progressive-loading') ||
38+
![DiscoverDatasets.SPANS_EAP, DiscoverDatasets.SPANS_EAP_RPC].includes(dataset)
39+
) {
3440
return (
3541
<ConfidenceFooter
3642
sampleCount={sampleCount}

static/app/views/explore/logs/logsTab.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ export function LogsTabContent({
179179
setVisualizes={setVisualizes}
180180
// TODO: we do not support log alerts nor adding to dashboards yet
181181
hideContextMenu
182+
dataset={DiscoverDatasets.OURLOGS}
182183
/>
183184
</LogsItemContainer>
184185
</Feature>

static/app/views/explore/multiQueryMode/queryVisualizations/chart.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {t} from 'sentry/locale';
1313
import {defined} from 'sentry/utils';
1414
import {trackAnalytics} from 'sentry/utils/analytics';
1515
import {parseFunction, prettifyParsedFunction} from 'sentry/utils/discover/fields';
16+
import {DiscoverDatasets} from 'sentry/utils/discover/types';
1617
import {isTimeSeriesOther} from 'sentry/utils/timeSeries/isTimeSeriesOther';
1718
import useOrganization from 'sentry/utils/useOrganization';
1819
import usePageFilters from 'sentry/utils/usePageFilters';
@@ -183,6 +184,7 @@ export function MultiQueryModeChart({
183184
confidence={undefined}
184185
topEvents={undefined}
185186
dataScanned={undefined}
187+
dataset={DiscoverDatasets.SPANS_EAP}
186188
/>
187189
)
188190
}
@@ -344,6 +346,7 @@ export function MultiQueryModeChart({
344346
topEvents={isTopN ? numSeries : undefined}
345347
dataScanned={dataScanned}
346348
samplingMode={samplingMode}
349+
dataset={DiscoverDatasets.SPANS_EAP}
347350
/>
348351
}
349352
/>

static/app/views/explore/spans/spansTab.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import type {PageFilters} from 'sentry/types/core';
2424
import type {Project} from 'sentry/types/project';
2525
import {defined} from 'sentry/utils';
2626
import {dedupeArray} from 'sentry/utils/dedupeArray';
27+
import {DiscoverDatasets} from 'sentry/utils/discover/types';
2728
import {
2829
type AggregationKey,
2930
ALLOWED_EXPLORE_VISUALIZE_AGGREGATES,
@@ -320,6 +321,7 @@ export function SpansTabContentImpl({
320321
visualizes={visualizes}
321322
setVisualizes={setVisualizes}
322323
samplingMode={timeseriesSamplingMode}
324+
dataset={DiscoverDatasets.SPANS_EAP}
323325
/>
324326
<ExploreTables
325327
aggregatesTableResult={aggregatesTableResult}

0 commit comments

Comments
 (0)