👔 Grab consent status directly in context and pass down

Author: nsdeschenes

static/app/components/searchQueryBuilder/askSeer.tsx

@@ -155,18 +155,12 @@ function AskSeerOption<T>({state}: {state: ComboBoxState<T>}) {
 
 export function AskSeer<T>({state}: {state: ComboBoxState<T>}) {
   const organization = useOrganization();
-  const {gaveSeerConsentRef} = useSearchQueryBuilder();
+  const {gaveSeerConsent} = useSearchQueryBuilder();
   const isMutating = useIsMutating({
     mutationKey: [setupCheckQueryKey(organization.slug)],
   });
 
-  const {setupAcknowledgement, isPending: isPendingSetupCheck} =
-    useOrganizationSeerSetup();
-  const orgHasAcknowledged = setupAcknowledgement.orgHasAcknowledged;
-
-  if (!gaveSeerConsentRef.current && orgHasAcknowledged && !isPendingSetupCheck) {
-    gaveSeerConsentRef.current = true;
-  }
+  const {isPending: isPendingSetupCheck} = useOrganizationSeerSetup();
 
   if (isPendingSetupCheck || isMutating) {
     return (
@@ -179,7 +173,7 @@ export function AskSeer<T>({state}: {state: ComboBoxState<T>}) {
     );
   }
 
-  if (orgHasAcknowledged) {
+  if (gaveSeerConsent) {
     return (
       <AskSeerPane>
         <AskSeerOption state={state} />

static/app/components/searchQueryBuilder/context.tsx

@@ -8,6 +8,7 @@ import {
   useState,
 } from 'react';
 
+import {useOrganizationSeerSetup} from 'sentry/components/events/autofix/useOrganizationSeerSetup';
 import type {SearchQueryBuilderProps} from 'sentry/components/searchQueryBuilder';
 import {useHandleSearch} from 'sentry/components/searchQueryBuilder/hooks/useHandleSearch';
 import {
@@ -39,7 +40,7 @@ interface SearchQueryBuilderContextData {
   filterKeySections: FilterKeySection[];
   filterKeys: TagCollection;
   focusOverride: FocusOverride | null;
-  gaveSeerConsentRef: React.RefObject<boolean>;
+  gaveSeerConsent: boolean;
   getFieldDefinition: (key: string, kind?: FieldKind) => FieldDefinition | null;
   getSuggestedFilterKey: (key: string) => string | null;
   getTagValues: (tag: Tag, query: string) => Promise<string[]>;
@@ -102,9 +103,9 @@ export function SearchQueryBuilderProvider({
   const wrapperRef = useRef<HTMLDivElement>(null);
   const actionBarRef = useRef<HTMLDivElement>(null);
   const organization = useOrganization();
+  const {setupAcknowledgement} = useOrganizationSeerSetup();
 
   const [displaySeerResults, setDisplaySeerResults] = useState(false);
-  const gaveSeerConsentRef = useRef(false);
 
   const {state, dispatch} = useQueryBuilderState({
     initialQuery,
@@ -190,7 +191,7 @@ export function SearchQueryBuilderProvider({
       setDisplaySeerResults,
       replaceRawSearchKeys,
       filterKeyAliases,
-      gaveSeerConsentRef,
+      gaveSeerConsent: setupAcknowledgement.orgHasAcknowledged,
     };
   }, [
     disabled,
@@ -212,6 +213,7 @@ export function SearchQueryBuilderProvider({
     recentSearches,
     replaceRawSearchKeys,
     searchSource,
+    setupAcknowledgement.orgHasAcknowledged,
     size,
     stableFieldDefinitionGetter,
     stableFilterKeys,

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

@@ -183,7 +183,7 @@ function useHiddenItems<T extends SelectOptionOrSectionWithKey<string>>({
   maxOptions?: number;
   shouldFilterResults?: boolean;
 }) {
-  const {gaveSeerConsentRef} = useSearchQueryBuilder();
+  const {gaveSeerConsent} = useSearchQueryBuilder();
   const hiddenOptions: Set<SelectKey> = useMemo(() => {
     const options = getHiddenOptions(
       items,
@@ -192,7 +192,7 @@ function useHiddenItems<T extends SelectOptionOrSectionWithKey<string>>({
     );
 
     if (showAskSeerOption) {
-      if (gaveSeerConsentRef.current) {
+      if (gaveSeerConsent) {
         options.add(ASK_SEER_ITEM_KEY);
       } else {
         options.add(ASK_SEER_CONSENT_ITEM_KEY);
@@ -202,7 +202,7 @@ function useHiddenItems<T extends SelectOptionOrSectionWithKey<string>>({
     return options;
   }, [
     filterValue,
-    gaveSeerConsentRef,
+    gaveSeerConsent,
     items,
     maxOptions,
     shouldFilterResults,

static/app/components/searchQueryBuilder/tokens/filterKeyListBox/useFilterKeyListBox.tsx

@@ -169,7 +169,7 @@ export function useFilterKeyListBox({filterValue}: {filterValue: string}) {
     getFieldDefinition,
     setDisplaySeerResults,
     enableAISearch,
-    gaveSeerConsentRef,
+    gaveSeerConsent,
   } = useSearchQueryBuilder();
   const {sectionedItems} = useFilterKeyItems();
   const recentFilters = useRecentSearchFilters();
@@ -186,7 +186,7 @@ export function useFilterKeyListBox({filterValue}: {filterValue: string}) {
     const askSeerItem = [];
     if (enableAISearch) {
       askSeerItem.push(
-        gaveSeerConsentRef.current ? createAskSeerItem() : createAskSeerConsentItem()
+        gaveSeerConsent ? createAskSeerItem() : createAskSeerConsentItem()
       );
     }
 
@@ -217,8 +217,8 @@ export function useFilterKeyListBox({filterValue}: {filterValue: string}) {
   }, [
     enableAISearch,
     filterKeys,
+    gaveSeerConsent,
     getFieldDefinition,
-    gaveSeerConsentRef,
     recentFilters,
     recentSearches,
     sectionedItems,

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

@@ -138,7 +138,7 @@ export function useSortedFilterKeyItems({
     disallowFreeText,
     replaceRawSearchKeys,
     enableAISearch,
-    gaveSeerConsentRef,
+    gaveSeerConsent,
   } = useSearchQueryBuilder();
   const organization = useOrganization();
 
@@ -250,7 +250,7 @@ export function useSortedFilterKeyItems({
       const askSeerItem = [];
       if (enableAISearch) {
         askSeerItem.push(
-          gaveSeerConsentRef.current ? createAskSeerItem() : createAskSeerConsentItem()
+          gaveSeerConsent ? createAskSeerItem() : createAskSeerConsentItem()
         );
       }
 
@@ -275,8 +275,8 @@ export function useSortedFilterKeyItems({
     filterKeys,
     filterValue,
     flatKeys,
+    gaveSeerConsent,
     getFieldDefinition,
-    gaveSeerConsentRef,
     hasRawSearchReplacement,
     includeSuggestions,
     inputValue,