genai consent

Author: jennmueng

static/app/components/events/autofix/autofixSetupModal.tsx

@@ -8,7 +8,6 @@ import {
   useAutofixSetup,
 } from 'sentry/components/events/autofix/useAutofixSetup';
 import {GuidedSteps} from 'sentry/components/guidedSteps/guidedSteps';
-import HookOrDefault from 'sentry/components/hookOrDefault';
 import ExternalLink from 'sentry/components/links/externalLink';
 import LoadingError from 'sentry/components/loadingError';
 import LoadingIndicator from 'sentry/components/loadingIndicator';
@@ -18,11 +17,6 @@ import {space} from 'sentry/styles/space';
 import {trackAnalytics} from 'sentry/utils/analytics';
 import useOrganization from 'sentry/utils/useOrganization';
 
-const ConsentStep = HookOrDefault({
-  hookName: 'component:ai-setup-data-consent',
-  defaultComponent: null,
-});
-
 function AutofixIntegrationStep({autofixSetup}: {autofixSetup: AutofixSetupResponse}) {
   if (autofixSetup.integration.ok) {
     return (
@@ -283,7 +277,6 @@ function AutofixSetupSteps({
 }) {
   return (
     <GuidedSteps>
-      <ConsentStep hasConsented={autofixSetup.genAIConsent.ok} />
       <GuidedSteps.Step
         stepKey="integration"
         title={t('Install the GitHub Integration')}
@@ -349,7 +342,8 @@ export function AutofixSetupContent({
 
   return (
     <Fragment>
-      <Header>Set up Sentry AI</Header>
+      <Divider />
+      <Header>Set up Autofix</Header>
       <p>
         Sentry's AI-enabled Autofix uses all of the contextual data surrounding this error
         to work with you to find the root cause and create a fix.
@@ -401,3 +395,8 @@ const GithubLink = styled('div')`
   align-items: center;
   gap: ${space(0.5)};
 `;
+
+const Divider = styled('div')`
+  margin: ${space(3)} 0;
+  border-bottom: 2px solid ${p => p.theme.gray100};
+`;

static/app/types/hooks.tsx

@@ -72,6 +72,9 @@ export type RouteHooks = {
  * Component specific hooks for DateRange and SelectorItems
  * These components have plan specific overrides in getsentry
  */
+type AiSetupDataConsentProps = {
+  groupId: string;
+};
 type AutofixSetupConsentStepProps = {hasConsented: boolean};
 type DateRangeProps = React.ComponentProps<typeof DateRange>;
 
@@ -184,7 +187,7 @@ export type MembershipSettingsProps = {
  * Component wrapping hooks
  */
 export type ComponentHooks = {
-  'component:ai-setup-data-consent': () => React.ComponentType<{}>;
+  'component:ai-setup-data-consent': () => React.ComponentType<AiSetupDataConsentProps> | null;
   'component:autofix-setup-step-consent': () => React.ComponentType<AutofixSetupConsentStepProps> | null;
   'component:codecov-integration-settings-link': () => React.ComponentType<CodecovLinkProps>;
   'component:confirm-account-close': () => React.ComponentType<AttemptCloseAttemptProps>;

static/app/views/issueDetails/streamline/solutionsHubDrawer.tsx

@@ -156,17 +156,20 @@ export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerPr
 
   const config = getConfigForIssueType(group, project);
 
-  const isSetupComplete = setupData?.integration.ok && setupData?.genAIConsent.ok;
-  const hasSummary = summaryData && !isError && setupData?.genAIConsent.ok;
+  const hasConsent = Boolean(setupData?.genAIConsent.ok);
+  const isAutofixSetupComplete = setupData?.integration.ok && hasConsent;
+
+  const hasSummary = summaryData && !isError && hasConsent;
 
   const organization = useOrganization();
   const isSampleError = useIsSampleEvent();
+
   const displayAiAutofix =
     shouldDisplayAiAutofixForOrganization(organization) &&
     config.autofix &&
     !shouldShowCustomErrorResourceConfig(group, project) &&
-    hasStacktraceWithFrames(event);
-  // !isSampleError;
+    hasStacktraceWithFrames(event) &&
+    !isSampleError;
 
   return (
     <SolutionsDrawerContainer>
@@ -234,30 +237,34 @@ export function SolutionsHubDrawer({group, project, event}: SolutionsHubDrawerPr
             )}
           />
         </HeaderText>
-        {hasSummary && (
-          <StyledCard>
-            <GroupSummaryBody data={summaryData} isError={isError} />
-          </StyledCard>
-        )}
-        {displayAiAutofix && (
+        {!hasConsent ? (
+          <AiSetupDataConsent groupId={group.id} />
+        ) : (
           <Fragment>
-            {!isSetupLoading && !isSetupComplete ? (
-              <SetupContainer>
-                <AutofixSetupContent
-                  projectId={project.id}
-                  groupId={group.id}
-                  onComplete={refetchSetup}
-                />
-              </SetupContainer>
-            ) : !autofixData ? (
-              <AutofixStartBox onSend={triggerAutofix} groupId={group.id} />
-            ) : (
-              <AutofixSteps
-                data={autofixData}
-                groupId={group.id}
-                runId={autofixData.run_id}
-                onRetry={reset}
-              />
+            {hasSummary && (
+              <StyledCard>
+                <GroupSummaryBody data={summaryData} isError={isError} />
+              </StyledCard>
+            )}
+            {displayAiAutofix && (
+              <Fragment>
+                {!isSetupLoading && !isAutofixSetupComplete ? (
+                  <AutofixSetupContent
+                    groupId={group.id}
+                    projectId={project.id}
+                    refetchSetup={refetchSetup}
+                  />
+                ) : !autofixData ? (
+                  <AutofixStartBox onSend={triggerAutofix} groupId={group.id} />
+                ) : (
+                  <AutofixSteps
+                    data={autofixData}
+                    groupId={group.id}
+                    runId={autofixData.run_id}
+                    onRetry={reset}
+                  />
+                )}
+              </Fragment>
             )}
           </Fragment>
         )}