Merge branch 'master' into nikki/discover-split-self-hosted

Author: nikkikapadia

migrations_lockfile.txt

@@ -21,7 +21,7 @@ nodestore: 0001_squashed_0002_nodestore_no_dictfield
 
 replays: 0001_squashed_0005_drop_replay_index
 
-sentry: 0911_split_discover_dataset_dashboards_self_hosted
+sentry: 0912_split_discover_dataset_dashboards_self_hosted
 
 social_auth: 0001_squashed_0002_default_auto_field
 

src/sentry/migrations/0911_increase_email_model_email_field_length.py

@@ -0,0 +1,39 @@
+# Generated by Django 5.2.1 on 2025-05-21 23:05
+
+from django.db import migrations, models
+
+import sentry.db.models.fields.citext
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0910_make_organizationmemberteam_is_active_default"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="email",
+            name="email",
+            field=sentry.db.models.fields.citext.CIEmailField(max_length=200, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="useremail",
+            name="email",
+            field=models.EmailField(max_length=200),
+        ),
+    ]

src/sentry/migrations/0911_split_discover_dataset_dashboards_self_hosted.py renamed to src/sentry/migrations/0912_split_discover_dataset_dashboards_self_hosted.py

@@ -22,7 +22,7 @@ class Email(Model):
     __relocation_dependencies__ = {"sentry.User"}
     __relocation_custom_ordinal__ = ["email"]
 
-    email = CIEmailField(_("email address"), unique=True, max_length=75)
+    email = CIEmailField(_("email address"), unique=True, max_length=200)
     date_added = models.DateTimeField(default=timezone.now)
 
     class Meta:

src/sentry/users/models/email.py

@@ -59,7 +59,7 @@ class UserEmail(ControlOutboxProducingModel):
     __relocation_custom_ordinal__ = ["user", "email"]
 
     user = FlexibleForeignKey(settings.AUTH_USER_MODEL, related_name="emails")
-    email = models.EmailField(_("email address"), max_length=75)
+    email = models.EmailField(_("email address"), max_length=200)
     validation_hash = models.CharField(max_length=32, default=get_secure_token)
     date_hash_added = models.DateTimeField(default=timezone.now)
     is_verified = models.BooleanField(

src/sentry/users/models/useremail.py

@@ -36,6 +36,7 @@ interface SearchQueryBuilderContextData {
   filterKeys: TagCollection;
   focusOverride: FocusOverride | null;
   getFieldDefinition: (key: string, kind?: FieldKind) => FieldDefinition | null;
+  getSuggestedFilterKey: (key: string) => string | null;
   getTagValues: (tag: Tag, query: string) => Promise<string[]>;
   handleSearch: (query: string) => void;
   parseQuery: (query: string) => ParseResult | null;
@@ -78,6 +79,7 @@ export function SearchQueryBuilderProvider({
   filterKeys,
   filterKeyMenuWidth = 360,
   filterKeySections,
+  getSuggestedFilterKey,
   getTagValues,
   onSearch,
   placeholder,
@@ -139,6 +141,7 @@ export function SearchQueryBuilderProvider({
       filterKeySections: filterKeySections ?? [],
       filterKeyMenuWidth,
       filterKeys,
+      getSuggestedFilterKey: getSuggestedFilterKey ?? ((key: string) => key),
       getTagValues,
       getFieldDefinition: fieldDefinitionGetter,
       dispatch,
@@ -160,6 +163,7 @@ export function SearchQueryBuilderProvider({
     filterKeySections,
     filterKeyMenuWidth,
     filterKeys,
+    getSuggestedFilterKey,
     getTagValues,
     fieldDefinitionGetter,
     dispatch,

static/app/components/searchQueryBuilder/context.tsx

@@ -90,8 +90,8 @@ const FILTER_KEYS: TagCollection = {
     key: 'tags[foo,string]',
     name: 'foo',
   },
-  'tags[bar,string]': {
-    key: 'tags[bar,string]',
+  'tags[bar,number]': {
+    key: 'tags[bar,number]',
     name: 'bar',
   },
 };
@@ -3458,4 +3458,90 @@ describe('SearchQueryBuilder', function () {
       expect(option).toHaveTextContent('bar');
     });
   });
+
+  describe('autocomplete using suggestions', function () {
+    function getSuggestedFilterKey(key: string) {
+      if (key === 'foo') {
+        return 'tags[foo,string]';
+      }
+
+      if (key === 'bar') {
+        return 'tags[bar,number]';
+      }
+
+      return key;
+    }
+
+    it('replace string key with suggestion when autocompleting', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(getLastInput());
+      await userEvent.keyboard('foo:');
+      await userEvent.keyboard('{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[foo,string]'})
+      ).toHaveTextContent('foo');
+    });
+
+    it('replace number key with suggestion when autocompleting', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(getLastInput());
+      await userEvent.keyboard('bar:');
+      await userEvent.keyboard('{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[bar,number]'})
+      ).toHaveTextContent('bar');
+    });
+
+    it('replaces string key with suggestion on enter', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          initialQuery="browser.name:firefox"
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(
+        screen.getByRole('button', {name: 'Edit key for filter: browser.name'})
+      );
+      await userEvent.keyboard('foo{Enter}{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[foo,string]'})
+      ).toHaveTextContent('foo');
+    });
+
+    it('replaces number key with suggestion on enter', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          initialQuery="browser.name:firefox"
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(
+        screen.getByRole('button', {name: 'Edit key for filter: browser.name'})
+      );
+      await userEvent.keyboard('bar{Enter}{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[bar,number]'})
+      ).toHaveTextContent('bar');
+    });
+  });
 });

static/app/components/searchQueryBuilder/index.spec.tsx

@@ -81,6 +81,13 @@ export interface SearchQueryBuilderProps {
    * will only render a warning if the value is truthy
    */
   getFilterTokenWarning?: (key: string) => React.ReactNode;
+  /**
+   * This is used when a user types in a search key and submits the token.
+   * The submission happens when the user types a colon or presses enter.
+   * When this happens, this function is used to map the user input to a
+   * known column.
+   */
+  getSuggestedFilterKey?: (key: string) => string | null;
   /**
    * Allows for customization of the invalid token messages.
    */

static/app/components/searchQueryBuilder/index.tsx

@@ -33,7 +33,7 @@ export function FilterKeyCombobox({token, onCommit, item}: KeyComboboxProps) {
     inputValue,
     includeSuggestions: false,
   });
-  const {dispatch, getFieldDefinition} = useSearchQueryBuilder();
+  const {dispatch, getFieldDefinition, getSuggestedFilterKey} = useSearchQueryBuilder();
 
   const currentFilterValueType = getFilterValueType(
     token,
@@ -88,6 +88,13 @@ export function FilterKeyCombobox({token, onCommit, item}: KeyComboboxProps) {
     [handleSelectKey]
   );
 
+  const onValueCommited = useCallback(
+    (keyName: string) => {
+      handleSelectKey(getSuggestedFilterKey(keyName) ?? keyName);
+    },
+    [handleSelectKey, getSuggestedFilterKey]
+  );
+
   const onCustomValueBlurred = useCallback(() => {
     onCommit();
   }, [onCommit]);
@@ -103,7 +110,7 @@ export function FilterKeyCombobox({token, onCommit, item}: KeyComboboxProps) {
         items={sortedFilterKeys}
         placeholder={getKeyLabel(token.key)}
         onOptionSelected={onOptionSelected}
-        onCustomValueCommitted={handleSelectKey}
+        onCustomValueCommitted={onValueCommited}
         onCustomValueBlurred={onCustomValueBlurred}
         onExit={onExit}
         inputValue={inputValue}

static/app/components/searchQueryBuilder/tokens/filter/filterKeyCombobox.tsx

@@ -254,6 +254,7 @@ function SearchQueryBuilderInputInternal({
     filterKeys,
     dispatch,
     getFieldDefinition,
+    getSuggestedFilterKey,
     handleSearch,
     placeholder,
     searchSource,
@@ -516,7 +517,7 @@ function SearchQueryBuilderInputInternal({
                 textToken.type === Token.FILTER && textToken.key.text === filterValue
             )
           ) {
-            const filterKey = filterValue;
+            const filterKey = getSuggestedFilterKey(filterValue) ?? filterValue;
             const key = filterKeys[filterKey];
             dispatch({
               type: 'UPDATE_FREE_TEXT',

static/app/components/searchQueryBuilder/tokens/freeText.tsx

@@ -1,4 +1,4 @@
-import {useMemo} from 'react';
+import {useCallback, useMemo} from 'react';
 
 import {getHasTag} from 'sentry/components/events/searchBar';
 import type {EAPSpanSearchQueryBuilderProps} from 'sentry/components/performance/spanSearchQueryBuilder';
@@ -76,6 +76,25 @@ export function useSearchQueryBuilderProps({
     projectIds: projects,
   });
 
+  const getSuggestedFilterKey = useCallback(
+    (key: string) => {
+      // prioritize exact matches first
+      if (filterTags.hasOwnProperty(key)) {
+        return key;
+      }
+
+      // try to see if there's numeric attribute by the same name
+      const explicitNumberTag = `tags[${key},number]`;
+      if (filterTags.hasOwnProperty(explicitNumberTag)) {
+        return explicitNumberTag;
+      }
+
+      // give up, and fall back to the default behaviour
+      return null;
+    },
+    [filterTags]
+  );
+
   return {
     searchOnChange: organization.features.includes('ui-search-on-change'),
     placeholder: placeholderText,
@@ -88,6 +107,7 @@ export function useSearchQueryBuilderProps({
     getFilterTokenWarning,
     searchSource,
     filterKeySections,
+    getSuggestedFilterKey,
     getTagValues: getTraceItemAttributeValues,
     disallowUnsupportedFilters: true,
     recentSearches: itemTypeToRecentSearches(itemType),