Skip to content

Commit 15a103b

Browse files
authored
chore(feedback): Cleanup flag: user-feedback-ui (#95195)
Feature is fully rolled out. We shouldn't guard anything on this flag anymore.
1 parent e33f7b6 commit 15a103b

File tree

6 files changed

+12
-39
lines changed

6 files changed

+12
-39
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const ALL_AVAILABLE_FEATURES = [
3232
'discover-query',
3333
'dashboards-basic',
3434
'dashboards-edit',
35-
'user-feedback-ui',
3635
'session-replay-ui',
3736
'performance-view',
3837
'profiling',

static/app/components/sidebar/index.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,13 @@ function Sidebar() {
252252
);
253253

254254
const feedback = hasOrganization && (
255-
<Feature features="user-feedback-ui" organization={organization}>
256-
<SidebarItem
257-
{...sidebarItemProps}
258-
icon={<IconMegaphone />}
259-
label={t('User Feedback')}
260-
to={`/organizations/${organization.slug}/feedback/`}
261-
id="feedback"
262-
/>
263-
</Feature>
255+
<SidebarItem
256+
{...sidebarItemProps}
257+
icon={<IconMegaphone />}
258+
label={t('User Feedback')}
259+
to={`/organizations/${organization.slug}/feedback/`}
260+
id="feedback"
261+
/>
264262
);
265263

266264
const alerts = hasOrganization && (

static/app/views/feedback/index.tsx

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import Feature from 'sentry/components/acl/feature';
21
import AnalyticsArea from 'sentry/components/analyticsArea';
3-
import {Alert} from 'sentry/components/core/alert';
4-
import * as Layout from 'sentry/components/layouts/thirds';
52
import NoProjectMessage from 'sentry/components/noProjectMessage';
63
import Redirect from 'sentry/components/redirect';
7-
import {t} from 'sentry/locale';
84
import type {RouteComponentProps} from 'sentry/types/legacyReactRouter';
95
import useOrganization from 'sentry/utils/useOrganization';
106
import {useRedirectNavV2Routes} from 'sentry/views/nav/useRedirectNavV2Routes';
@@ -26,24 +22,8 @@ export default function FeedbackContainer({children}: Props) {
2622
}
2723

2824
return (
29-
<Feature
30-
features="user-feedback-ui"
31-
organization={organization}
32-
renderDisabled={NoAccess}
33-
>
34-
<AnalyticsArea name="feedback">
35-
<NoProjectMessage organization={organization}>{children}</NoProjectMessage>
36-
</AnalyticsArea>
37-
</Feature>
38-
);
39-
}
40-
41-
function NoAccess() {
42-
return (
43-
<Layout.Page withPadding>
44-
<Alert.Container>
45-
<Alert type="warning">{t("You don't have access to this feature")}</Alert>
46-
</Alert.Container>
47-
</Layout.Page>
25+
<AnalyticsArea name="feedback">
26+
<NoProjectMessage organization={organization}>{children}</NoProjectMessage>
27+
</AnalyticsArea>
4828
);
4929
}

static/app/views/nav/index.spec.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const ALL_AVAILABLE_FEATURES = [
3131
'discover-query',
3232
'dashboards-basic',
3333
'dashboards-edit',
34-
'user-feedback-ui',
3534
'session-replay-ui',
3635
'ourlogs-enabled',
3736
'performance-view',

static/app/views/projectDetail/projectQuickLinks.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe('ProjectDetail > ProjectQuickLinks', function () {
3535

3636
await userEvent.click(userFeedback);
3737
expect(router.push).toHaveBeenCalledWith({
38-
pathname: '/organizations/org-slug/user-feedback/',
38+
pathname: '/organizations/org-slug/feedback/',
3939
query: {project: '2'},
4040
});
4141

static/app/views/projectDetail/projectQuickLinks.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ type Props = {
3131
};
3232

3333
function ProjectQuickLinks({organization, project}: Props) {
34-
const hasNewFeedback = organization.features.includes('user-feedback-ui');
3534
const domainView: DomainView | undefined = project
3635
? platformToDomainView([project], [parseInt(project.id, 10)])
3736
: 'backend';
@@ -67,9 +66,7 @@ function ProjectQuickLinks({organization, project}: Props) {
6766
{
6867
title: t('User Feedback'),
6968
to: {
70-
pathname: hasNewFeedback
71-
? `/organizations/${organization.slug}/feedback/`
72-
: `/organizations/${organization.slug}/user-feedback/`,
69+
pathname: `/organizations/${organization.slug}/feedback/`,
7370
query: {project: project?.id},
7471
},
7572
},

0 commit comments

Comments
 (0)