Revert "feat(self-hosted): Errors only self-hosted sidebar (#71948)"

This reverts commit d495519.

Co-authored-by: armenzg <[email protected]>

Author: getsentry-bot

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

@@ -78,28 +78,6 @@ describe('Sidebar', function () {
     await userEvent.click(screen.getByTestId('sidebar-dropdown'));
   });
 
-  it('renders for self-hosted errors only', async function () {
-    act(() => void ConfigStore.set('isSelfHostedErrorsOnly', true));
-    const {container} = renderSidebar({organization});
-    expect(await screen.findByTestId('sidebar-dropdown')).toBeInTheDocument();
-    const sidebarItems = container.querySelectorAll('[id^="sidebar-item"]');
-    const sidebarItemIds = Array.from(sidebarItems).map(sidebarItem => sidebarItem.id);
-    expect(sidebarItems.length).toEqual(10);
-    expect(sidebarItemIds).toEqual([
-      'sidebar-item-issues',
-      'sidebar-item-projects',
-      'sidebar-item-alerts',
-      'sidebar-item-releases',
-      'sidebar-item-stats',
-      'sidebar-item-settings',
-      'sidebar-item-help',
-      'sidebar-item-broadcasts',
-      'sidebar-item-statusupdate',
-      'sidebar-item-collapse',
-    ]);
-    act(() => void ConfigStore.set('isSelfHostedErrorsOnly', false));
-  });
-
   it('has can logout', async function () {
     const mock = MockApiClient.addMockResponse({
       url: '/auth/',
@@ -296,93 +274,15 @@ describe('Sidebar', function () {
   });
 
   describe('when the accordion is used', () => {
-    const renderSidebarWithFeatures = (features: string[] = []) => {
-      return renderSidebar({
+    const renderSidebarWithFeatures = () => {
+      renderSidebar({
         organization: {
           ...organization,
-          features: [...organization.features, ...sidebarAccordionFeatures, ...features],
+          features: [...organization.features, ...sidebarAccordionFeatures],
         },
       });
     };
 
-    it('renders sidebar with features', async function () {
-      const {container} = renderSidebarWithFeatures();
-      expect(await screen.findByTestId('sidebar-dropdown')).toBeInTheDocument();
-      const sidebarItems = container.querySelectorAll('[id^="sidebar-item"]');
-      const sidebarItemIds = Array.from(sidebarItems).map(sidebarItem => sidebarItem.id);
-      expect(sidebarItems.length).toEqual(12);
-      expect(sidebarItemIds).toEqual([
-        'sidebar-item-issues',
-        'sidebar-item-projects',
-        'sidebar-item-sidebar-accordion-performance-item',
-        'sidebar-item-crons',
-        'sidebar-item-alerts',
-        'sidebar-item-releases',
-        'sidebar-item-stats',
-        'sidebar-item-settings',
-        'sidebar-item-help',
-        'sidebar-item-broadcasts',
-        'sidebar-item-statusupdate',
-        'sidebar-item-collapse',
-      ]);
-    });
-
-    it('renders new sidebar hierarchy', async function () {
-      const {container} = renderSidebarWithFeatures([
-        'performance-insights',
-        'insights-entry-points',
-      ]);
-      expect(await screen.findByTestId('sidebar-dropdown')).toBeInTheDocument();
-      const sidebarItems = container.querySelectorAll('[id^="sidebar-item"]');
-      const sidebarItemIds = Array.from(sidebarItems).map(sidebarItem => sidebarItem.id);
-      expect(sidebarItems.length).toEqual(21);
-      expect(sidebarItemIds).toEqual([
-        'sidebar-item-issues',
-        'sidebar-item-projects',
-        'sidebar-item-sidebar-accordion-explore-item',
-        'sidebar-item-sidebar-accordion-insights-item',
-        'sidebar-item-performance-http',
-        'sidebar-item-performance-database',
-        'sidebar-item-performance-browser-resources',
-        'sidebar-item-performance-mobile-app-startup',
-        'sidebar-item-performance-mobile-screens',
-        'sidebar-item-performance-webvitals',
-        'sidebar-item-performance-cache',
-        'sidebar-item-performance',
-        'sidebar-item-crons',
-        'sidebar-item-alerts',
-        'sidebar-item-releases',
-        'sidebar-item-stats',
-        'sidebar-item-settings',
-        'sidebar-item-help',
-        'sidebar-item-broadcasts',
-        'sidebar-item-statusupdate',
-        'sidebar-item-collapse',
-      ]);
-    });
-
-    it('renders sidebar items for self-hosted errors only', async function () {
-      act(() => void ConfigStore.set('isSelfHostedErrorsOnly', true));
-      const {container} = renderSidebarWithFeatures();
-      expect(await screen.findByTestId('sidebar-dropdown')).toBeInTheDocument();
-      const sidebarItems = container.querySelectorAll('[id^="sidebar-item"]');
-      const sidebarItemIds = Array.from(sidebarItems).map(sidebarItem => sidebarItem.id);
-      expect(sidebarItems.length).toEqual(10);
-      expect(sidebarItemIds).toEqual([
-        'sidebar-item-issues',
-        'sidebar-item-projects',
-        'sidebar-item-alerts',
-        'sidebar-item-releases',
-        'sidebar-item-stats',
-        'sidebar-item-settings',
-        'sidebar-item-help',
-        'sidebar-item-broadcasts',
-        'sidebar-item-statusupdate',
-        'sidebar-item-collapse',
-      ]);
-      act(() => void ConfigStore.set('isSelfHostedErrorsOnly', false));
-    });
-
     it('should not render floating accordion when expanded', async () => {
       renderSidebarWithFeatures();
       await userEvent.click(screen.getByTestId('sidebar-accordion-performance-item'));

static/app/components/sidebar/index.tsx

@@ -130,7 +130,6 @@ function Sidebar() {
   const organization = useOrganization({allowNull: true});
   const {shouldAccordionFloat} = useContext(ExpandedContext);
   const resourceModuleTitle = useModuleTitle(ModuleName.RESOURCE);
-  const isSelfHostedErrorsOnly = ConfigStore.get('isSelfHostedErrorsOnly');
 
   const collapsed = !!preferences.collapsed;
   const horizontal = useMedia(`(max-width: ${theme.breakpoints.medium})`);
@@ -672,7 +671,7 @@ function Sidebar() {
                   {projects}
                 </SidebarSection>
 
-                {hasNewSidebarHierarchy && !isSelfHostedErrorsOnly && (
+                {hasNewSidebarHierarchy && (
                   <Fragment>
                     <SidebarSection>
                       {explore}
@@ -690,7 +689,7 @@ function Sidebar() {
                   </Fragment>
                 )}
 
-                {!hasNewSidebarHierarchy && !isSelfHostedErrorsOnly && (
+                {!hasNewSidebarHierarchy && (
                   <Fragment>
                     <SidebarSection>
                       {performance}
@@ -712,18 +711,6 @@ function Sidebar() {
                   </Fragment>
                 )}
 
-                {isSelfHostedErrorsOnly && (
-                  <Fragment>
-                    <SidebarSection>
-                      {alerts}
-                      {discover2}
-                      {dashboards}
-                      {releases}
-                      {userFeedback}
-                    </SidebarSection>
-                  </Fragment>
-                )}
-
                 <SidebarSection>
                   {stats}
                   {settings}

static/app/types/system.tsx

@@ -150,7 +150,6 @@ export interface Config {
   // Maintain isOnPremise key for backcompat (plugins?).
   isOnPremise: boolean;
   isSelfHosted: boolean;
-  isSelfHostedErrorsOnly: boolean;
   languageCode: string;
   lastOrganization: string | null;
   links: {

tests/js/fixtures/config.ts

@@ -25,7 +25,6 @@ export function ConfigFixture(params: Partial<Config> = {}): Config {
     // Maintain isOnPremise key for backcompat (plugins?).
     isOnPremise: false,
     isSelfHosted: false,
-    isSelfHostedErrorsOnly: false,
     lastOrganization: null,
     gravatarBaseUrl: 'https://gravatar.com',
     initialTrace: {