feat(discover): Show banner for split decision (#73740)

1. Show banner for split decision
2. Use saved query dataset to decide which actual dataset to query
3. Switching datasets preserves old state and only switches dataset
instead of resetting the whole query when already in a saved query -
it's a better experience if we guess the wrong dataset, the state
remains intact as the switch between datasets
4. Removes references to queryDataset in EventView to keep event dataset
selector agnostic

Author: shruthilayaj

static/app/utils/discover/eventView.spec.tsx

@@ -18,6 +18,7 @@ import {
   DiscoverDatasets,
   DISPLAY_MODE_OPTIONS,
   DisplayModes,
+  SavedQueryDatasets,
 } from 'sentry/utils/discover/types';
 import {AggregationKey, WebVital} from 'sentry/utils/fields';
 import {SpanOperationBreakdownFilter} from 'sentry/views/performance/transactionSummary/filter';
@@ -1694,6 +1695,7 @@ describe('EventView.toNewQuery()', function () {
       environment: ['staging'],
       display: 'releases',
       dataset: DiscoverDatasets.DISCOVER,
+      queryDataset: SavedQueryDatasets.DISCOVER,
     };
 
     expect(output).toEqual(expected);
@@ -1724,6 +1726,7 @@ describe('EventView.toNewQuery()', function () {
       environment: ['staging'],
       display: 'releases',
       dataset: DiscoverDatasets.DISCOVER,
+      queryDataset: SavedQueryDatasets.DISCOVER,
     };
 
     expect(output).toEqual(expected);
@@ -1754,6 +1757,7 @@ describe('EventView.toNewQuery()', function () {
       environment: ['staging'],
       display: 'releases',
       dataset: DiscoverDatasets.DISCOVER,
+      queryDataset: SavedQueryDatasets.DISCOVER,
     };
 
     expect(output).toEqual(expected);

static/app/utils/discover/eventView.tsx

@@ -38,12 +38,12 @@ import {
   DISPLAY_MODE_FALLBACK_OPTIONS,
   DISPLAY_MODE_OPTIONS,
   DisplayModes,
-  SavedQueryDatasets,
   TOP_N,
 } from 'sentry/utils/discover/types';
 import {statsPeriodToDays} from 'sentry/utils/duration/statsPeriodToDays';
 import {decodeList, decodeScalar, decodeSorts} from 'sentry/utils/queryString';
 import {normalizeUrl} from 'sentry/utils/withDomainRequired';
+import {getSavedQueryDatasetFromLocationOrDataset} from 'sentry/views/discover/savedQuery/utils';
 import type {TableColumn, TableColumnSort} from 'sentry/views/discover/table/types';
 import {FieldValueKind} from 'sentry/views/discover/table/types';
 import {decodeColumnOrder} from 'sentry/views/discover/utils';
@@ -258,7 +258,6 @@ export type EventViewOptions = {
   dataset?: DiscoverDatasets;
   expired?: boolean;
   interval?: string;
-  queryDataset?: SavedQueryDatasets;
   utc?: string | boolean | undefined;
   yAxis?: string | string[] | undefined;
 };
@@ -284,7 +283,6 @@ class EventView {
   createdBy: User | undefined;
   additionalConditions: MutableSearch; // This allows views to always add additional conditions to the query to get specific data. It should not show up in the UI unless explicitly called.
   dataset?: DiscoverDatasets;
-  queryDataset?: SavedQueryDatasets;
 
   constructor(props: EventViewOptions) {
     const fields: Field[] = Array.isArray(props.fields) ? props.fields : [];
@@ -329,7 +327,6 @@ class EventView {
     this.environment = environment;
     this.yAxis = props.yAxis;
     this.dataset = props.dataset;
-    this.queryDataset = props.queryDataset;
     this.display = props.display;
     this.topEvents = props.topEvents;
     this.interval = props.interval;
@@ -362,7 +359,6 @@ class EventView {
       createdBy: undefined,
       additionalConditions: new MutableSearch([]),
       dataset: decodeScalar(location.query.dataset) as DiscoverDatasets,
-      queryDataset: decodeScalar(location.query.queryDataset) as SavedQueryDatasets,
     });
   }
 
@@ -454,7 +450,6 @@ class EventView {
       expired: saved.expired,
       additionalConditions: new MutableSearch([]),
       dataset: saved.dataset,
-      queryDataset: saved.queryDataset,
     });
   }
 
@@ -523,9 +518,6 @@ class EventView {
         utc,
         dataset:
           (decodeScalar(location.query.dataset) as DiscoverDatasets) ?? saved.dataset,
-        queryDataset:
-          (decodeScalar(location.query.queryDataset) as SavedQueryDatasets) ??
-          saved.queryDataset,
       });
     }
     return EventView.fromLocation(location);
@@ -546,7 +538,6 @@ class EventView {
       display: DisplayModes.DEFAULT,
       topEvents: '5',
       dataset: DiscoverDatasets.DISCOVER,
-      queryDataset: SavedQueryDatasets.DISCOVER,
     };
     const keys = Object.keys(defaults).filter(key => !omitList.includes(key));
     for (const key of keys) {
@@ -597,7 +588,6 @@ class EventView {
       environment: this.environment,
       yAxis: typeof this.yAxis === 'string' ? [this.yAxis] : this.yAxis,
       dataset: this.dataset,
-      queryDataset: this.queryDataset,
       display: this.display,
       topEvents: this.topEvents,
       interval: this.interval,
@@ -609,6 +599,13 @@ class EventView {
       delete newQuery.query;
     }
 
+    if (this.dataset) {
+      newQuery.queryDataset = getSavedQueryDatasetFromLocationOrDataset(
+        undefined,
+        this.dataset
+      );
+    }
+
     return newQuery;
   }
 
@@ -684,7 +681,6 @@ class EventView {
       query: this.query,
       yAxis: this.yAxis || this.getYAxis(),
       dataset: this.dataset,
-      queryDataset: this.queryDataset,
       display: this.display,
       topEvents: this.topEvents,
       interval: this.interval,
@@ -776,7 +772,6 @@ class EventView {
       environment: this.environment,
       yAxis: this.yAxis,
       dataset: this.dataset,
-      queryDataset: this.queryDataset,
       display: this.display,
       topEvents: this.topEvents,
       interval: this.interval,
@@ -793,6 +788,12 @@ class EventView {
 
     return newEventView;
   }
+  withDataset(dataset?: DiscoverDatasets): EventView {
+    const newEventView = this.clone();
+    newEventView.dataset = dataset;
+
+    return newEventView;
+  }
 
   withColumns(columns: Column[]): EventView {
     const newEventView = this.clone();

static/app/views/discover/eventDetails/index.spec.tsx

@@ -212,19 +212,19 @@ describe('Discover > EventDetails', function () {
     expect(await screen.findByText('Firefox')).toBeInTheDocument();
     expect(screen.getByRole('link', {name: 'Firefox'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=browser%3AFirefox%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=browser%3AFirefox%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
 
     // Get the second link
     expect(screen.getByRole('link', {name: 'test-uuid'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=tags%5Bdevice.uuid%5D%3Atest-uuid%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=tags%5Bdevice.uuid%5D%3Atest-uuid%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
 
     // Get the third link
     expect(screen.getByRole('link', {name: '82ebf297206a'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=release%3A82ebf297206a%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=release%3A82ebf297206a%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
   });
 
@@ -252,19 +252,19 @@ describe('Discover > EventDetails', function () {
     expect(await screen.findByText('Firefox')).toBeInTheDocument();
     expect(screen.getByRole('link', {name: 'Firefox'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/homepage/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=browser%3AFirefox%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/homepage/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=browser%3AFirefox%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
 
     // Get the second link
     expect(screen.getByRole('link', {name: 'test-uuid'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/homepage/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=tags%5Bdevice.uuid%5D%3Atest-uuid%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/homepage/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=tags%5Bdevice.uuid%5D%3Atest-uuid%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
 
     // Get the third link
     expect(screen.getByRole('link', {name: '82ebf297206a'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/homepage/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=release%3A82ebf297206a%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/homepage/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=release%3A82ebf297206a%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
   });
 
@@ -295,18 +295,18 @@ describe('Discover > EventDetails', function () {
     expect(await screen.findByText('Firefox')).toBeInTheDocument();
     expect(screen.getByRole('link', {name: 'Firefox'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=Dumpster%20browser%3AFirefox%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=Dumpster%20browser%3AFirefox%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
 
     // Get the second link
     expect(screen.getByRole('link', {name: 'test-uuid'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=Dumpster%20tags%5Bdevice.uuid%5D%3Atest-uuid%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=Dumpster%20tags%5Bdevice.uuid%5D%3Atest-uuid%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
     // Get the third link
     expect(screen.getByRole('link', {name: '82ebf297206a'})).toHaveAttribute(
       'href',
-      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=Dumpster%20release%3A82ebf297206a%20title%3A%22Oh%20no%20something%20bad%22&queryDataset=discover&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
+      '/organizations/org-slug/discover/results/?field=title&field=event.type&field=project&field=user.display&field=timestamp&name=All%20Events&query=Dumpster%20release%3A82ebf297206a%20title%3A%22Oh%20no%20something%20bad%22&sort=-timestamp&statsPeriod=24h&yAxis=count%28%29'
     );
   });