From c226201debf3093e4b60025f886fde84cae4f223 Mon Sep 17 00:00:00 2001
From: nikkikapadia <nikki.kapadia@sentry.io>
Date: Fri, 18 Jul 2025 10:51:41 -0400
Subject: [PATCH 1/4] lock down tranactions tab completely

---
 static/app/components/core/tabs/item.tsx      |  3 ++
 static/app/components/core/tabs/tabList.tsx   | 40 ++++++++++++-------
 .../savedQuery/datasetSelectorTabs.tsx        | 33 ++++++++++++++-
 .../app/views/discover/savedQuery/index.tsx   | 36 +++++++++++++++--
 4 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/static/app/components/core/tabs/item.tsx b/static/app/components/core/tabs/item.tsx
index 7e2944c5488118..4efc79788670aa 100644
--- a/static/app/components/core/tabs/item.tsx
+++ b/static/app/components/core/tabs/item.tsx
@@ -2,11 +2,14 @@ import {Item as _Item} from '@react-stately/collections';
 import type {ItemProps} from '@react-types/shared';
 import type {LocationDescriptor} from 'history';
 
+import type {TooltipProps} from 'sentry/components/core/tooltip';
+
 export interface TabListItemProps extends ItemProps<any> {
   key: string | number;
   disabled?: boolean;
   hidden?: boolean;
   to?: LocationDescriptor;
+  tooltip?: TooltipProps;
 }
 
 export const TabListItem = _Item as (props: TabListItemProps) => React.JSX.Element;
diff --git a/static/app/components/core/tabs/tabList.tsx b/static/app/components/core/tabs/tabList.tsx
index 07d07b538c3aa8..9af1fd7d83f1eb 100644
--- a/static/app/components/core/tabs/tabList.tsx
+++ b/static/app/components/core/tabs/tabList.tsx
@@ -11,6 +11,7 @@ import type {Node, Orientation} from '@react-types/shared';
 
 import type {SelectOption} from 'sentry/components/core/compactSelect';
 import {CompactSelect} from 'sentry/components/core/compactSelect';
+import {Tooltip} from 'sentry/components/core/tooltip';
 import DropdownButton from 'sentry/components/dropdownButton';
 import {IconEllipsis} from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -221,6 +222,7 @@ function BaseTabList({
         value: key,
         label: item.props.children,
         disabled: item.props.disabled,
+        tooltip: item.props.tooltip,
         textValue: item.textValue,
       };
     });
@@ -235,20 +237,30 @@ function BaseTabList({
         ref={tabListRef}
         variant={variant}
       >
-        {[...state.collection].map(item => (
-          <Tab
-            key={item.key}
-            item={item}
-            state={state}
-            orientation={orientation}
-            size={size}
-            overflowing={orientation === 'horizontal' && overflowTabs.includes(item.key)}
-            ref={element => {
-              tabItemsRef.current[item.key] = element;
-            }}
-            variant={variant}
-          />
-        ))}
+        {[...state.collection].map(item => {
+          const rendered = item.props.tooltip ? (
+            <Tooltip {...item.props.tooltip}>{item.rendered}</Tooltip>
+          ) : (
+            item.rendered
+          );
+
+          return (
+            <Tab
+              key={item.key}
+              item={{...item, rendered}}
+              state={state}
+              orientation={orientation}
+              size={size}
+              overflowing={
+                orientation === 'horizontal' && overflowTabs.includes(item.key)
+              }
+              ref={element => {
+                tabItemsRef.current[item.key] = element;
+              }}
+              variant={variant}
+            />
+          );
+        })}
       </TabListWrap>
 
       {orientation === 'horizontal' && overflowMenuItems.length > 0 && (
diff --git a/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx b/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
index 085a62093412c6..a152b64346a9ca 100644
--- a/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
+++ b/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
@@ -1,6 +1,7 @@
+import {Link} from 'sentry/components/core/link';
 import {TabList} from 'sentry/components/core/tabs';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {t} from 'sentry/locale';
+import {t, tct} from 'sentry/locale';
 import type {SavedQuery} from 'sentry/types/organization';
 import type EventView from 'sentry/utils/discover/eventView';
 import {
@@ -20,6 +21,7 @@ import {
   getDatasetFromLocationOrSavedQueryDataset,
   getSavedQueryDataset,
 } from 'sentry/views/discover/savedQuery/utils';
+import {getExploreUrl} from 'sentry/views/explore/utils';
 
 export const DATASET_PARAM = 'queryDataset';
 
@@ -107,6 +109,15 @@ export function DatasetSelectorTabs(props: Props) {
 
   const value = getSavedQueryDataset(organization, location, savedQuery, splitDecision);
 
+  const deprecatingTransactionsDataset = organization.features.includes(
+    'discover-saved-queries-deprecation'
+  );
+
+  const tracesUrl = getExploreUrl({
+    organization,
+    query: 'is_transaction:true',
+  });
+
   const options = [
     {
       value: SavedQueryDatasets.ERRORS,
@@ -115,6 +126,18 @@ export function DatasetSelectorTabs(props: Props) {
     {
       value: SavedQueryDatasets.TRANSACTIONS,
       label: DATASET_LABEL_MAP[SavedQueryDatasets.TRANSACTIONS],
+      disabled: deprecatingTransactionsDataset,
+      tooltip: deprecatingTransactionsDataset
+        ? {
+            title: tct(
+              'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please browse and save any transaction related queries from [traces:Explore\u2192Traces]',
+              {
+                traces: <Link to={tracesUrl} />,
+              }
+            ),
+            isHoverable: true,
+          }
+        : undefined,
     },
   ];
 
@@ -153,7 +176,13 @@ export function DatasetSelectorTabs(props: Props) {
     >
       <TabList hideBorder>
         {options.map(option => (
-          <TabList.Item key={option.value}>{option.label}</TabList.Item>
+          <TabList.Item
+            key={option.value}
+            disabled={option.disabled}
+            tooltip={option.tooltip}
+          >
+            {option.label}
+          </TabList.Item>
         ))}
       </TabList>
     </Layout.HeaderTabs>
diff --git a/static/app/views/discover/savedQuery/index.tsx b/static/app/views/discover/savedQuery/index.tsx
index 8b0450c64e77f6..a19313380c7288 100644
--- a/static/app/views/discover/savedQuery/index.tsx
+++ b/static/app/views/discover/savedQuery/index.tsx
@@ -393,19 +393,46 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
 
   renderButtonSave(disabled: boolean) {
     const {isNewQuery, isEditingQuery} = this.state;
+    const {organization, savedQuery, location} = this.props;
+
+    const currentDataset = getDatasetFromLocationOrSavedQueryDataset(
+      location,
+      savedQuery?.queryDataset
+    );
+
+    const deprecatingTransactionsDataset =
+      currentDataset === DiscoverDatasets.TRANSACTIONS &&
+      organization.features.includes('discover-saved-queries-deprecation');
 
     if (!isNewQuery && !isEditingQuery) {
       return null;
     }
     // Existing query with edits, show save and save as.
     if (!isNewQuery && isEditingQuery) {
+      const tracesUrl = getExploreUrl({
+        organization,
+        query: 'is_transaction:true',
+      });
+
       return (
         <Fragment>
           <Button
             onClick={this.handleUpdateQuery}
             data-test-id="discover2-savedquery-button-update"
-            disabled={disabled}
+            disabled={disabled || deprecatingTransactionsDataset}
             size="sm"
+            tooltipProps={{
+              isHoverable: true,
+            }}
+            title={
+              deprecatingTransactionsDataset &&
+              tct(
+                'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please save any transaction related queries from [traces:Explore\u2192Traces]',
+                {
+                  traces: <Link to={tracesUrl} />,
+                }
+              )
+            }
           >
             <IconUpdate />
             {t('Save Changes')}
@@ -622,7 +649,7 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
       savedQuery?.queryDataset
     );
 
-    const deprecatingAddToDashboard =
+    const deprecatingTransactionsDataset =
       currentDataset === DiscoverDatasets.TRANSACTIONS &&
       organization.features.includes('discover-saved-queries-deprecation');
 
@@ -637,9 +664,10 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
       contextMenuItems.push({
         key: 'add-to-dashboard',
         label: t('Add to Dashboard'),
-        disabled: deprecatingAddToDashboard,
+        disabled: deprecatingTransactionsDataset,
+        tooltipOptions: {isHoverable: true},
         tooltip:
-          deprecatingAddToDashboard &&
+          deprecatingTransactionsDataset &&
           tct(
             'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please save any transaction related queries from [traces:Explore\u2192Traces]',
             {

From f07c59e268656cc9964196dc0c4da8987fe4113b Mon Sep 17 00:00:00 2001
From: nikkikapadia <nikki.kapadia@sentry.io>
Date: Fri, 18 Jul 2025 11:59:04 -0400
Subject: [PATCH 2/4] add test for deprecation

---
 .../savedQuery/datasetSelectorTabs.spec.tsx   | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/static/app/views/discover/savedQuery/datasetSelectorTabs.spec.tsx b/static/app/views/discover/savedQuery/datasetSelectorTabs.spec.tsx
index ded36ee898d402..7c9f35a9e89491 100644
--- a/static/app/views/discover/savedQuery/datasetSelectorTabs.spec.tsx
+++ b/static/app/views/discover/savedQuery/datasetSelectorTabs.spec.tsx
@@ -23,7 +23,7 @@ const EVENT_VIEW_CONSTRUCTOR_PROPS: EventViewOptions = {
 };
 
 describe('Discover DatasetSelector', function () {
-  const {router} = initializeOrg({
+  const {router, organization} = initializeOrg({
     organization: {features: ['performance-view']},
   });
 
@@ -121,4 +121,35 @@ describe('Discover DatasetSelector', function () {
       })
     );
   });
+
+  it('disables transactions dataset if org has deprecation feature', function () {
+    const eventView = new EventView({
+      ...EVENT_VIEW_CONSTRUCTOR_PROPS,
+      dataset: DiscoverDatasets.ERRORS,
+      id: '1',
+    });
+
+    const org = {
+      ...organization,
+      features: [...organization.features, 'discover-saved-queries-deprecation'],
+    };
+
+    render(
+      <DatasetSelectorTabs
+        isHomepage={false}
+        savedQuery={undefined}
+        eventView={eventView}
+      />,
+      {
+        router,
+        organization: org,
+        deprecatedRouterMocks: true,
+      }
+    );
+
+    expect(screen.getByRole('tab', {name: 'Transactions'})).toHaveAttribute(
+      'aria-disabled',
+      'true'
+    );
+  });
 });

From a079f9e05d4f28802d2b154c78ab4b5fecf3de92 Mon Sep 17 00:00:00 2001
From: nikkikapadia <nikki.kapadia@sentry.io>
Date: Mon, 21 Jul 2025 14:15:17 -0400
Subject: [PATCH 3/4] address comments

---
 static/app/components/core/tabs/tab.tsx       | 25 ++++++++++++
 static/app/components/core/tabs/tabList.tsx   | 40 +++++++------------
 .../savedQuery/datasetSelectorTabs.tsx        | 11 ++---
 .../app/views/discover/savedQuery/index.tsx   | 26 +++---------
 .../app/views/discover/savedQuery/utils.tsx   | 12 +++++-
 5 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/static/app/components/core/tabs/tab.tsx b/static/app/components/core/tabs/tab.tsx
index 609d91aab70d9e..a28ac945695978 100644
--- a/static/app/components/core/tabs/tab.tsx
+++ b/static/app/components/core/tabs/tab.tsx
@@ -9,6 +9,7 @@ import type {Node, Orientation} from '@react-types/shared';
 
 import InteractionStateLayer from 'sentry/components/core/interactionStateLayer';
 import {Link} from 'sentry/components/core/link';
+import {Tooltip, type TooltipProps} from 'sentry/components/core/tooltip';
 import {space} from 'sentry/styles/space';
 import {isChonkTheme, withChonk} from 'sentry/utils/theme/withChonk';
 
@@ -33,6 +34,7 @@ interface TabProps extends AriaTabProps {
   state: TabListState<any>;
   as?: React.ElementType;
   ref?: React.Ref<HTMLLIElement>;
+  tooltipProps?: TooltipProps;
   variant?: BaseTabProps['variant'];
 }
 
@@ -156,6 +158,7 @@ export function Tab({
   variant,
   size,
   as = 'li',
+  tooltipProps,
 }: TabProps) {
   const objectRef = useObjectRef(ref);
 
@@ -167,6 +170,28 @@ export function Tab({
 
   const {tabProps, isSelected} = useTab({key, isDisabled: hidden}, state, objectRef);
 
+  if (tooltipProps) {
+    return (
+      <Tooltip {...tooltipProps}>
+        <BaseTab
+          tabProps={tabProps}
+          isSelected={isSelected}
+          to={to}
+          hidden={hidden}
+          disabled={disabled}
+          orientation={orientation}
+          overflowing={overflowing}
+          ref={objectRef}
+          variant={variant}
+          as={as}
+          size={size}
+        >
+          {rendered}
+        </BaseTab>
+      </Tooltip>
+    );
+  }
+
   return (
     <BaseTab
       tabProps={tabProps}
diff --git a/static/app/components/core/tabs/tabList.tsx b/static/app/components/core/tabs/tabList.tsx
index 9af1fd7d83f1eb..294fc4f7336467 100644
--- a/static/app/components/core/tabs/tabList.tsx
+++ b/static/app/components/core/tabs/tabList.tsx
@@ -11,7 +11,6 @@ import type {Node, Orientation} from '@react-types/shared';
 
 import type {SelectOption} from 'sentry/components/core/compactSelect';
 import {CompactSelect} from 'sentry/components/core/compactSelect';
-import {Tooltip} from 'sentry/components/core/tooltip';
 import DropdownButton from 'sentry/components/dropdownButton';
 import {IconEllipsis} from 'sentry/icons';
 import {t} from 'sentry/locale';
@@ -237,30 +236,21 @@ function BaseTabList({
         ref={tabListRef}
         variant={variant}
       >
-        {[...state.collection].map(item => {
-          const rendered = item.props.tooltip ? (
-            <Tooltip {...item.props.tooltip}>{item.rendered}</Tooltip>
-          ) : (
-            item.rendered
-          );
-
-          return (
-            <Tab
-              key={item.key}
-              item={{...item, rendered}}
-              state={state}
-              orientation={orientation}
-              size={size}
-              overflowing={
-                orientation === 'horizontal' && overflowTabs.includes(item.key)
-              }
-              ref={element => {
-                tabItemsRef.current[item.key] = element;
-              }}
-              variant={variant}
-            />
-          );
-        })}
+        {[...state.collection].map(item => (
+          <Tab
+            key={item.key}
+            item={item}
+            state={state}
+            orientation={orientation}
+            size={size}
+            overflowing={orientation === 'horizontal' && overflowTabs.includes(item.key)}
+            tooltipProps={item.props.tooltip}
+            ref={element => {
+              tabItemsRef.current[item.key] = element;
+            }}
+            variant={variant}
+          />
+        ))}
       </TabListWrap>
 
       {orientation === 'horizontal' && overflowMenuItems.length > 0 && (
diff --git a/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx b/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
index a152b64346a9ca..2a33add1469320 100644
--- a/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
+++ b/static/app/views/discover/savedQuery/datasetSelectorTabs.tsx
@@ -1,7 +1,6 @@
-import {Link} from 'sentry/components/core/link';
 import {TabList} from 'sentry/components/core/tabs';
 import * as Layout from 'sentry/components/layouts/thirds';
-import {t, tct} from 'sentry/locale';
+import {t} from 'sentry/locale';
 import type {SavedQuery} from 'sentry/types/organization';
 import type EventView from 'sentry/utils/discover/eventView';
 import {
@@ -20,6 +19,7 @@ import useOrganization from 'sentry/utils/useOrganization';
 import {
   getDatasetFromLocationOrSavedQueryDataset,
   getSavedQueryDataset,
+  getTransactionDeprecationMessage,
 } from 'sentry/views/discover/savedQuery/utils';
 import {getExploreUrl} from 'sentry/views/explore/utils';
 
@@ -129,12 +129,7 @@ export function DatasetSelectorTabs(props: Props) {
       disabled: deprecatingTransactionsDataset,
       tooltip: deprecatingTransactionsDataset
         ? {
-            title: tct(
-              'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please browse and save any transaction related queries from [traces:Explore\u2192Traces]',
-              {
-                traces: <Link to={tracesUrl} />,
-              }
-            ),
+            title: getTransactionDeprecationMessage(tracesUrl),
             isHoverable: true,
           }
         : undefined,
diff --git a/static/app/views/discover/savedQuery/index.tsx b/static/app/views/discover/savedQuery/index.tsx
index a19313380c7288..7c4961a096d1ee 100644
--- a/static/app/views/discover/savedQuery/index.tsx
+++ b/static/app/views/discover/savedQuery/index.tsx
@@ -16,7 +16,6 @@ import {ButtonBar} from 'sentry/components/core/button/buttonBar';
 import {LinkButton} from 'sentry/components/core/button/linkButton';
 import {Input} from 'sentry/components/core/input';
 import {Flex} from 'sentry/components/core/layout';
-import {Link} from 'sentry/components/core/link';
 import {Tooltip} from 'sentry/components/core/tooltip';
 import {CreateAlertFromViewButton} from 'sentry/components/createAlertButton';
 import type {MenuItemProps} from 'sentry/components/dropdownMenu';
@@ -24,7 +23,7 @@ import {DropdownMenu} from 'sentry/components/dropdownMenu';
 import {Hovercard} from 'sentry/components/hovercard';
 import {Overlay, PositionWrapper} from 'sentry/components/overlay';
 import {IconBookmark, IconDelete, IconEllipsis, IconStar} from 'sentry/icons';
-import {t, tct} from 'sentry/locale';
+import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import type {InjectedRouter} from 'sentry/types/legacyReactRouter';
 import type {Organization, SavedQuery} from 'sentry/types/organization';
@@ -52,6 +51,7 @@ import {deprecateTransactionAlerts} from 'sentry/views/insights/common/utils/has
 import {
   getDatasetFromLocationOrSavedQueryDataset,
   getSavedQueryDataset,
+  getTransactionDeprecationMessage,
   handleCreateQuery,
   handleDeleteQuery,
   handleResetHomepageQuery,
@@ -374,12 +374,7 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
           !organization.features.includes('discover-saved-queries-deprecation')
         }
         isHoverable
-        title={tct(
-          'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please save any transaction related queries from [traces:Explore\u2192Traces]',
-          {
-            traces: <Link to={tracesUrl} />,
-          }
-        )}
+        title={getTransactionDeprecationMessage(tracesUrl)}
       >
         <SaveAsDropdown
           queryName={queryName}
@@ -426,12 +421,7 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
             }}
             title={
               deprecatingTransactionsDataset &&
-              tct(
-                'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please save any transaction related queries from [traces:Explore\u2192Traces]',
-                {
-                  traces: <Link to={tracesUrl} />,
-                }
-              )
+              getTransactionDeprecationMessage(tracesUrl)
             }
           >
             <IconUpdate />
@@ -667,13 +657,7 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
         disabled: deprecatingTransactionsDataset,
         tooltipOptions: {isHoverable: true},
         tooltip:
-          deprecatingTransactionsDataset &&
-          tct(
-            'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please save any transaction related queries from [traces:Explore\u2192Traces]',
-            {
-              traces: <Link to={tracesUrl} />,
-            }
-          ),
+          deprecatingTransactionsDataset && getTransactionDeprecationMessage(tracesUrl),
         onAction: () => {
           handleAddQueryToDashboard({
             organization,
diff --git a/static/app/views/discover/savedQuery/utils.tsx b/static/app/views/discover/savedQuery/utils.tsx
index 78bf44dbd990b9..4107d3a6bd8646 100644
--- a/static/app/views/discover/savedQuery/utils.tsx
+++ b/static/app/views/discover/savedQuery/utils.tsx
@@ -11,7 +11,8 @@ import {
 } from 'sentry/actionCreators/discoverSavedQueries';
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import type {Client} from 'sentry/api';
-import {t} from 'sentry/locale';
+import {Link} from 'sentry/components/core/link';
+import {t, tct} from 'sentry/locale';
 import type {NewQuery, Organization, SavedQuery} from 'sentry/types/organization';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import type {SaveQueryEventParameters} from 'sentry/utils/analytics/discoverAnalyticsEvents';
@@ -347,3 +348,12 @@ export function getSavedQueryDatasetFromLocationOrDataset(
       return undefined;
   }
 }
+
+export function getTransactionDeprecationMessage(tracesUrl: string) {
+  return tct(
+    'Discover\u2192Transactions is going to be merged into Explore\u2192Traces soon. Please save any transaction related queries from [traces:Explore\u2192Traces]',
+    {
+      traces: <Link to={tracesUrl} />,
+    }
+  );
+}

From 199b1675eea458208ce8be8892568fcbca549ba5 Mon Sep 17 00:00:00 2001
From: nikkikapadia <nikki.kapadia@sentry.io>
Date: Mon, 21 Jul 2025 14:24:05 -0400
Subject: [PATCH 4/4] fix cursor deprecated tooltip props comment

---
 .../app/views/discover/savedQuery/index.tsx   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/static/app/views/discover/savedQuery/index.tsx b/static/app/views/discover/savedQuery/index.tsx
index 7c4961a096d1ee..a5ec30b560fdee 100644
--- a/static/app/views/discover/savedQuery/index.tsx
+++ b/static/app/views/discover/savedQuery/index.tsx
@@ -411,22 +411,23 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
 
       return (
         <Fragment>
-          <Button
-            onClick={this.handleUpdateQuery}
-            data-test-id="discover2-savedquery-button-update"
-            disabled={disabled || deprecatingTransactionsDataset}
-            size="sm"
-            tooltipProps={{
-              isHoverable: true,
-            }}
+          <Tooltip
             title={
               deprecatingTransactionsDataset &&
               getTransactionDeprecationMessage(tracesUrl)
             }
+            isHoverable
           >
-            <IconUpdate />
-            {t('Save Changes')}
-          </Button>
+            <Button
+              onClick={this.handleUpdateQuery}
+              data-test-id="discover2-savedquery-button-update"
+              disabled={disabled || deprecatingTransactionsDataset}
+              size="sm"
+            >
+              <IconUpdate />
+              {t('Save Changes')}
+            </Button>
+          </Tooltip>
           {this.renderButtonSaveAs(disabled)}
         </Fragment>
       );