diff --git a/static/app/types/hooks.tsx b/static/app/types/hooks.tsx index 40882b43b61d73..cefe01ea12915f 100644 --- a/static/app/types/hooks.tsx +++ b/static/app/types/hooks.tsx @@ -271,7 +271,6 @@ export type FeatureDisabledHooks = { 'feature-disabled:project-selector-all-projects': FeatureDisabledHook; 'feature-disabled:project-selector-checkbox': FeatureDisabledHook; 'feature-disabled:rate-limits': FeatureDisabledHook; - 'feature-disabled:relay': FeatureDisabledHook; 'feature-disabled:replay-sidebar-item': FeatureDisabledHook; 'feature-disabled:sso-basic': FeatureDisabledHook; 'feature-disabled:sso-saml2': FeatureDisabledHook; diff --git a/static/app/views/settings/organizationRelay/index.tsx b/static/app/views/settings/organizationRelay/index.tsx index 983997fc5429f0..edd5b69ab4653c 100644 --- a/static/app/views/settings/organizationRelay/index.tsx +++ b/static/app/views/settings/organizationRelay/index.tsx @@ -1,34 +1,7 @@ -import Feature from 'sentry/components/acl/feature'; -import FeatureDisabled from 'sentry/components/acl/featureDisabled'; -import Panel from 'sentry/components/panels/panel'; -import PanelBody from 'sentry/components/panels/panelBody'; -import {t} from 'sentry/locale'; -import useOrganization from 'sentry/utils/useOrganization'; - import {RelayWrapper} from './relayWrapper'; function OrganizationRelay() { - const organization = useOrganization(); - return ( - ( - - - - - - )} - > - - - ); + return ; } export default OrganizationRelay; diff --git a/static/gsApp/components/features/disabledRelay.tsx b/static/gsApp/components/features/disabledRelay.tsx deleted file mode 100644 index 369de479acced8..00000000000000 --- a/static/gsApp/components/features/disabledRelay.tsx +++ /dev/null @@ -1,82 +0,0 @@ -import styled from '@emotion/styled'; - -import {Button} from 'sentry/components/core/button'; -import EmptyMessage from 'sentry/components/emptyMessage'; -import Panel from 'sentry/components/panels/panel'; -import {IconBroadcast, IconBusiness} from 'sentry/icons'; -import {t, tct} from 'sentry/locale'; -import {space} from 'sentry/styles/space'; -import type {Organization} from 'sentry/types/organization'; - -import {openUpsellModal} from 'getsentry/actionCreators/modal'; -import LearnMoreButton from 'getsentry/components/features/learnMoreButton'; -import PlanFeature from 'getsentry/components/features/planFeature'; -import {displayPlanName} from 'getsentry/utils/billing'; - -type Props = { - features: string[]; - organization: Organization; -}; - -function DisabledRelay({organization, features}: Props) { - return ( - - {({plan}) => ( - - } - title={t('Protect your private data and more by running a local Relay')} - description={tct( - '[strong: Sentry Relay] offers enterprise-grade data security by providing a standalone service that acts as a middle layer between your application and sentry.io. This feature [planRequirement] or above.', - - { - strong: , - planRequirement: ( - {t('requires a %s Plan', displayPlanName(plan))} - ), - } - )} - action={ - - } - onClick={() => openUpsellModal({organization, source: 'feature.relay'})} - > - {t('Learn More')} - - - {t('Documentation')} - - - } - /> - - )} - - ); -} - -export default DisabledRelay; - -const ButtonBar = styled('div')` - display: flex; - flex-wrap: wrap; - justify-content: center; - align-items: center; - margin: -${space(0.75)}; -`; - -const StyledButton = styled(Button)` - margin: ${space(0.75)}; -`; - -const StyledLearnMoreButton = styled(LearnMoreButton)` - margin: ${space(0.75)}; -`; diff --git a/static/gsApp/components/labelWithPowerIcon.tsx b/static/gsApp/components/labelWithPowerIcon.tsx index 938bbd0ac95390..5d106152f36371 100644 --- a/static/gsApp/components/labelWithPowerIcon.tsx +++ b/static/gsApp/components/labelWithPowerIcon.tsx @@ -11,7 +11,6 @@ import type {Subscription} from 'getsentry/types'; import {isEnterprise} from 'getsentry/utils/billing'; const SSO = 'sso'; -const RELAY = 'relay'; const ALLOCATIONS = 'allocations-upsell'; const TEAM_ROLES = 'team-roles-upsell'; @@ -37,11 +36,6 @@ const POWER_FEATURE_CONFIG = [ features: ['sso-saml2'], partial: true, }, - { - id: RELAY, - features: ['relay'], - partial: false, - }, { id: ALLOCATIONS, features: ['spend-allocations'], diff --git a/static/gsApp/registerHooks.tsx b/static/gsApp/registerHooks.tsx index ea35d81d9eec81..bd73c6d5e85314 100644 --- a/static/gsApp/registerHooks.tsx +++ b/static/gsApp/registerHooks.tsx @@ -19,7 +19,6 @@ import DisabledDataForwarding from 'getsentry/components/features/disabledDataFo import DisabledDateRange from 'getsentry/components/features/disabledDateRange'; import DisabledDiscardGroup from 'getsentry/components/features/disabledDiscardGroup'; import DisabledRateLimits from 'getsentry/components/features/disabledRateLimits'; -import DisabledRelay from 'getsentry/components/features/disabledRelay'; import DisabledSelectorItems from 'getsentry/components/features/disabledSelectorItems'; import ExploreDateRangeQueryLimitFooter from 'getsentry/components/features/exploreDateRangeQueryLimitFooter'; import InsightsDateRangeQueryLimitFooter from 'getsentry/components/features/insightsDateRangeQueryLimitFooter'; @@ -267,7 +266,6 @@ const GETSENTRY_HOOKS: Partial = { 'feature-disabled:discard-groups': p => , 'feature-disabled:data-forwarding': p => , - 'feature-disabled:relay': p => , 'feature-disabled:rate-limits': p => , 'feature-disabled:sso-basic': p => , 'feature-disabled:sso-saml2': p => , diff --git a/tests/js/getsentry-test/fixtures/featureList.ts b/tests/js/getsentry-test/fixtures/featureList.ts index 7717badd7dd5b1..5781dd8881a1ba 100644 --- a/tests/js/getsentry-test/fixtures/featureList.ts +++ b/tests/js/getsentry-test/fixtures/featureList.ts @@ -92,11 +92,6 @@ export function FeatureListFixture(): Record { description: 'Configure custom Symbol Servers, Amazon S3 buckets, or GCS buckets for debug files.', }, - relay: { - name: 'Relay', - description: - 'Use Relay as middle layer for on premise data scrubbing before sending data to Sentry.', - }, 'app-store-connect-multiple': { name: 'Multiple App Store Connect apps', description: 'Add multiple Apple App Store Connect apps per project',