Merge branch 'master' into tkdodo/ref/releases-endpoint-to-apiOptions

Author: TkDodo

src/sentry/objectstore/types.py

@@ -6,5 +6,5 @@
 class ObjectstoreUploadOptions(TypedDict):
     url: str
     scopes: list[tuple[str, str]]
-    # TODO: add authToken
+    authToken: str | None
     expirationPolicy: str

src/sentry/preprod/api/endpoints/project_preprod_upload_options.py

@@ -16,6 +16,7 @@
 from sentry.api.bases.project import ProjectEndpoint, ProjectReleasePermission
 from sentry.api.utils import generate_locality_url
 from sentry.models.project import Project
+from sentry.objectstore import get_preprod_session
 from sentry.objectstore.types import ObjectstoreUploadOptions
 from sentry.utils.http import absolute_uri
 
@@ -35,6 +36,7 @@ def get(self, request: Request, project: Project) -> Response:
             return Response({"detail": "Feature not enabled"}, status=403)
 
         organization = project.organization
+        session = get_preprod_session(org=organization.id, project=project.id)
 
         path = reverse(
             "sentry-api-0-organization-objectstore",
@@ -53,6 +55,7 @@ def get(self, request: Request, project: Project) -> Response:
                 ("org", str(organization.id)),
                 ("project", str(project.id)),
             ],
+            authToken=session.mint_token(),
             expirationPolicy=format_expiration(
                 TimeToLive(timedelta(days=30))
             ),  # Hardcoded for now, check with Objectstore before increasing

src/sentry/utils/prompts.py

@@ -15,6 +15,7 @@ class _PromptConfig(TypedDict):
     "data_consent_banner": {"required_fields": ["organization_id"]},
     "data_consent_priority": {"required_fields": ["organization_id"]},
     "github_missing_members": {"required_fields": ["organization_id"]},
+    "issue_android_tombstones_onboarding": {"required_fields": ["organization_id", "project_id"]},
     "issue_feedback_hidden": {"required_fields": ["organization_id", "project_id"]},
     "issue_priority": {"required_fields": ["organization_id"]},
     "issue_replay_inline_onboarding": {"required_fields": ["organization_id", "project_id"]},

static/app/components/profiling/continuousProfileHeader.tsx

@@ -13,6 +13,8 @@ import {trackAnalytics} from 'sentry/utils/analytics';
 import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
 
 interface ContinuousProfileHeader {
   transaction: Event | null;
@@ -21,6 +23,7 @@ interface ContinuousProfileHeader {
 export function ContinuousProfileHeader({transaction}: ContinuousProfileHeader) {
   const location = useLocation();
   const organization = useOrganization();
+  const hasPageFrameFeature = useHasPageFrameFeature();
 
   // @TODO add breadcrumbs when other views are implemented
   const breadCrumbs = useMemo((): ProfilingBreadcrumbsProps['trails'] => {
@@ -51,7 +54,13 @@ export function ContinuousProfileHeader({transaction}: ContinuousProfileHeader)
         </SmallerProfilingBreadcrumbsWrapper>
       </SmallerHeaderContent>
       <StyledHeaderActions>
-        <FeedbackButton />
+        {hasPageFrameFeature ? (
+          <TopBar.Slot name="feedback">
+            <FeedbackButton>{null}</FeedbackButton>
+          </TopBar.Slot>
+        ) : (
+          <FeedbackButton />
+        )}
         {transactionTarget && (
           <LinkButton size="sm" onClick={handleGoToTransaction} to={transactionTarget}>
             {t('Go to Trace')}

static/app/components/profiling/profileHeader.tsx

@@ -13,6 +13,8 @@ import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
 import {isSchema, isSentrySampledProfile} from 'sentry/utils/profiling/guards/profile';
 import {useLocation} from 'sentry/utils/useLocation';
 import {useOrganization} from 'sentry/utils/useOrganization';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
 import {useProfiles} from 'sentry/views/profiling/profilesProvider';
 
 function getTransactionName(input: Profiling.ProfileInput): string {
@@ -36,6 +38,7 @@ function ProfileHeader({transaction, projectId, eventId}: ProfileHeaderProps) {
   const location = useLocation();
   const organization = useOrganization();
   const profiles = useProfiles();
+  const hasPageFrameFeature = useHasPageFrameFeature();
 
   const transactionName =
     profiles.type === 'resolved' ? getTransactionName(profiles.data) : '';
@@ -89,7 +92,13 @@ function ProfileHeader({transaction, projectId, eventId}: ProfileHeaderProps) {
         </SmallerProfilingBreadcrumbsWrapper>
       </SmallerHeaderContent>
       <StyledHeaderActions>
-        <FeedbackButton />
+        {hasPageFrameFeature ? (
+          <TopBar.Slot name="feedback">
+            <FeedbackButton>{null}</FeedbackButton>
+          </TopBar.Slot>
+        ) : (
+          <FeedbackButton />
+        )}
         {transactionTarget && (
           <LinkButton size="sm" onClick={handleGoToTransaction} to={transactionTarget}>
             {t('Go to Trace')}

static/app/views/alerts/list/header.tsx

@@ -15,6 +15,8 @@ import {useLocation} from 'sentry/utils/useLocation';
 import {useNavigate} from 'sentry/utils/useNavigate';
 import {useOrganization} from 'sentry/utils/useOrganization';
 import {makeAlertsPathname} from 'sentry/views/alerts/pathnames';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
 
 type Props = {
   activeTab: 'stream' | 'rules';
@@ -25,6 +27,7 @@ export function AlertHeader({activeTab}: Props) {
   const location = useLocation();
   const organization = useOrganization();
   const {selection} = usePageFilters();
+  const hasPageFrameFeature = useHasPageFrameFeature();
   /**
    * Incidents list is currently at the organization level, but the link needs to
    * go down to a specific project scope.
@@ -79,7 +82,13 @@ export function AlertHeader({activeTab}: Props) {
           >
             {t('Create Alert')}
           </CreateAlertButton>
-          <FeedbackButton />
+          {hasPageFrameFeature ? (
+            <TopBar.Slot name="feedback">
+              <FeedbackButton>{null}</FeedbackButton>
+            </TopBar.Slot>
+          ) : (
+            <FeedbackButton />
+          )}
           <LinkButton
             size="sm"
             onClick={handleNavigateToSettings}

static/app/views/automations/components/automationFeedbackButton.tsx

@@ -1,18 +1,31 @@
 import {FeedbackButton} from 'sentry/components/feedbackButton/feedbackButton';
 import {t} from 'sentry/locale';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
+
+const automationFeedbackOptions = {
+  messagePlaceholder: t('How can we improve the alerts experience?'),
+  tags: {
+    ['feedback.source']: 'automations',
+    ['feedback.owner']: 'aci',
+  },
+};
 
 export function AutomationFeedbackButton() {
+  const hasPageFrameFeature = useHasPageFrameFeature();
+
+  if (hasPageFrameFeature) {
+    return (
+      <TopBar.Slot name="feedback">
+        <FeedbackButton feedbackOptions={automationFeedbackOptions}>
+          {null}
+        </FeedbackButton>
+      </TopBar.Slot>
+    );
+  }
+
   return (
-    <FeedbackButton
-      size="sm"
-      feedbackOptions={{
-        messagePlaceholder: t('How can we improve the alerts experience?'),
-        tags: {
-          ['feedback.source']: 'automations',
-          ['feedback.owner']: 'aci',
-        },
-      }}
-    >
+    <FeedbackButton size="sm" feedbackOptions={automationFeedbackOptions}>
       {t('Feedback')}
     </FeedbackButton>
   );

static/app/views/dashboards/manage/index.tsx

@@ -59,6 +59,8 @@ import type {DashboardsLayout} from 'sentry/views/dashboards/manage/types';
 import {DashboardFilter, PREBUILT_DASHBOARD_LABEL} from 'sentry/views/dashboards/types';
 import type {DashboardDetails, DashboardListItem} from 'sentry/views/dashboards/types';
 import {PREBUILT_DASHBOARDS} from 'sentry/views/dashboards/utils/prebuiltConfigs';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
 import RouteError from 'sentry/views/routeError';
 
 import DashboardGrid from './dashboardGrid';
@@ -162,6 +164,7 @@ function ManageDashboards() {
   const navigate = useNavigate();
   const location = useLocation();
   const api = useApi();
+  const hasPageFrameFeature = useHasPageFrameFeature();
   const dashboardGridRef = useRef<HTMLDivElement>(null);
   const hasPrebuiltDashboards = organization.features.includes(
     'dashboards-prebuilt-insights-dashboards'
@@ -645,7 +648,13 @@ function ManageDashboards() {
                         </TemplateSwitch>
                       )}
 
-                      <FeedbackButton />
+                      {hasPageFrameFeature ? (
+                        <TopBar.Slot name="feedback">
+                          <FeedbackButton>{null}</FeedbackButton>
+                        </TopBar.Slot>
+                      ) : (
+                        <FeedbackButton />
+                      )}
                       <Feature features={['dashboards-ai-generate']}>
                         {({hasFeature: hasAiGenerate}) =>
                           hasAiGenerate && areAiFeaturesAllowed ? (

static/app/views/detectors/components/monitorFeedbackButton.tsx

@@ -1,18 +1,29 @@
 import {FeedbackButton} from 'sentry/components/feedbackButton/feedbackButton';
 import {t} from 'sentry/locale';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
+
+const monitorFeedbackOptions = {
+  messagePlaceholder: t('How can we improve the monitor experience?'),
+  tags: {
+    ['feedback.source']: 'monitors',
+    ['feedback.owner']: 'aci',
+  },
+};
 
 export function MonitorFeedbackButton() {
+  const hasPageFrameFeature = useHasPageFrameFeature();
+
+  if (hasPageFrameFeature) {
+    return (
+      <TopBar.Slot name="feedback">
+        <FeedbackButton feedbackOptions={monitorFeedbackOptions}>{null}</FeedbackButton>
+      </TopBar.Slot>
+    );
+  }
+
   return (
-    <FeedbackButton
-      size="sm"
-      feedbackOptions={{
-        messagePlaceholder: t('How can we improve the monitor experience?'),
-        tags: {
-          ['feedback.source']: 'monitors',
-          ['feedback.owner']: 'aci',
-        },
-      }}
-    >
+    <FeedbackButton size="sm" feedbackOptions={monitorFeedbackOptions}>
       {t('Feedback')}
     </FeedbackButton>
   );

static/app/views/explore/errors/content.tsx

@@ -16,6 +16,8 @@ import {
 } from 'sentry/views/explore/errors/body';
 import {ErrorsFilterSection} from 'sentry/views/explore/errors/filterContent';
 import {useControlSectionExpanded} from 'sentry/views/explore/hooks/useControlSectionExpanded';
+import {TopBar} from 'sentry/views/navigation/topBar';
+import {useHasPageFrameFeature} from 'sentry/views/navigation/useHasPageFrameFeature';
 
 export default function ErrorsContent() {
   const organization = useOrganization();
@@ -37,6 +39,7 @@ export default function ErrorsContent() {
 }
 
 function ErrorsHeader() {
+  const hasPageFrameFeature = useHasPageFrameFeature();
   return (
     <Layout.Header unified>
       <Layout.HeaderContent unified>
@@ -45,7 +48,13 @@ function ErrorsHeader() {
         </Layout.Title>
       </Layout.HeaderContent>
       <Layout.HeaderActions>
-        <FeedbackButton />
+        {hasPageFrameFeature ? (
+          <TopBar.Slot name="feedback">
+            <FeedbackButton>{null}</FeedbackButton>
+          </TopBar.Slot>
+        ) : (
+          <FeedbackButton />
+        )}
       </Layout.HeaderActions>
     </Layout.Header>
   );