Revert "Athena/fly join team (#55499)"

This reverts commit e4f8f53. Co-authored-by: sentaur-athena <132939361+sentaur-athena@users.noreply.github.com>
getsentry · Aug 31, 2023 · 8a10a85 · 8a10a85
1 parent e5c3f05
commit 8a10a85
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 89 deletions.
diff --git a/static/app/components/noProjectMessage.spec.tsx b/static/app/components/noProjectMessage.spec.tsx
@@ -1,6 +1,5 @@
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
-import {Label} from 'sentry/components/editableText';
 import NoProjectMessage from 'sentry/components/noProjectMessage';
 import ConfigStore from 'sentry/stores/configStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
@@ -27,41 +26,6 @@ describe('NoProjectMessage', function () {
     expect(screen.getByText('Remain Calm')).toBeInTheDocument();
   });
 
-  it('shows "Join a Team" when member has no teams', function () {
-    const organization = TestStubs.Organization({
-      slug: 'org-slug',
-      access: ['org:read', 'team:read'],
-    });
-    const childrenMock = jest.fn().mockReturnValue(null);
-    ProjectsStore.loadInitialData([]);
-
-    render(
-      <NoProjectMessage organization={organization}>{childrenMock}</NoProjectMessage>
-    );
-
-    expect(childrenMock).not.toHaveBeenCalled();
-    expect(screen.getByRole('button', {name: 'Join a Team'})).toBeInTheDocument();
-  });
-
-  it('does not show up when user has at least a project and a team', function () {
-    const organization = TestStubs.Organization({slug: 'org-slug'});
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    const project = TestStubs.Project({slug: 'project1', teams: [team]});
-    ProjectsStore.loadInitialData([{...project, hasAccess: true}]);
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
-
-    render(
-      <NoProjectMessage organization={organization}>
-        <Label data-test-id="project-row" isDisabled>
-          Some Project
-        </Label>
-      </NoProjectMessage>
-    );
-
-    expect(screen.getByTestId('project-row')).toBeInTheDocument();
-    expect(screen.queryByText('Remain Calm')).not.toBeInTheDocument();
-  });
-
   it('shows "Create Project" button when there are no projects', function () {
     ProjectsStore.loadInitialData([]);
 
@@ -132,20 +96,4 @@ describe('NoProjectMessage', function () {
       screen.getByText('You need at least one project to use this view')
     ).toBeInTheDocument();
   });
-
-  it('shows projects to superusers if membership is not required', function () {
-    ProjectsStore.loadInitialData([TestStubs.Project({isMember: false})]);
-
-    ConfigStore.set('user', {...ConfigStore.get('user'), isSuperuser: true});
-
-    render(
-      <NoProjectMessage organization={org}>
-        <Label data-test-id="project-row" isDisabled>
-          Some Project
-        </Label>
-      </NoProjectMessage>
-    );
-
-    expect(screen.getByTestId('project-row')).toBeInTheDocument();
-  });
 });
diff --git a/static/app/components/noProjectMessage.tsx b/static/app/components/noProjectMessage.tsx
@@ -26,7 +26,6 @@ function NoProjectMessage({
 }: Props) {
   const {projects, initiallyLoaded: projectsLoaded} = useProjects();
   const {teams, initiallyLoaded: teamsLoaded} = useTeams();
-  const isTeamMember = teams.some(team => team.isMember);
 
   const orgSlug = organization.slug;
   const {canCreateProject} = useProjectCreationAccess({organization, teams});
@@ -40,10 +39,7 @@ function NoProjectMessage({
       ? !!projects?.some(p => p.hasAccess)
       : !!projects?.some(p => p.isMember && p.hasAccess);
 
-  if (
-    (isTeamMember || isSuperuser) &&
-    (hasProjectAccess || !projectsLoaded || !teamsLoaded)
-  ) {
+  if (hasProjectAccess || !projectsLoaded || !teamsLoaded) {
     return <Fragment>{children}</Fragment>;
   }
 
@@ -85,7 +81,7 @@ function NoProjectMessage({
         <Layout.Title>{t('Remain Calm')}</Layout.Title>
         <HelpMessage>{t('You need at least one project to use this view')}</HelpMessage>
         <Actions gap={1}>
-          {!orgHasProjects && canCreateProject ? (
+          {!orgHasProjects ? (
             createProjectAction
           ) : (
             <Fragment>

diff --git a/static/app/views/alerts/create.spec.tsx b/static/app/views/alerts/create.spec.tsx
@@ -76,8 +76,6 @@ describe('ProjectAlertsCreate', function () {
   const createWrapper = (props = {}, location = {}) => {
     const {organization, project, router, routerContext} = initializeOrg(props);
     ProjectsStore.loadInitialData([project]);
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     const params = {orgId: organization.slug, projectId: project.slug};
     const wrapper = render(
       <AlertsContainer>

diff --git a/static/app/views/alerts/index.spec.tsx b/static/app/views/alerts/index.spec.tsx
@@ -1,14 +1,8 @@
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
-import TeamStore from 'sentry/stores/teamStore';
 import AlertsContainer from 'sentry/views/alerts';
 
 describe('AlertsContainer', function () {
-  beforeEach(() => {
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
-  });
-
   function SubView({hasMetricAlerts}: {hasMetricAlerts?: boolean}) {
     return <div>{hasMetricAlerts ? 'access' : 'no access'}</div>;
   }

diff --git a/static/app/views/alerts/list/incidents/index.spec.tsx b/static/app/views/alerts/list/incidents/index.spec.tsx
@@ -35,8 +35,6 @@ describe('IncidentsList', () => {
   };
 
   beforeEach(() => {
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/incidents/',
       body: [

diff --git a/static/app/views/dashboards/detail.spec.tsx b/static/app/views/dashboards/detail.spec.tsx
@@ -12,7 +12,6 @@ import {
 
 import * as modals from 'sentry/actionCreators/modal';
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import CreateDashboard from 'sentry/views/dashboards/create';
 import * as types from 'sentry/views/dashboards/types';
 import ViewEditDashboard from 'sentry/views/dashboards/view';
@@ -28,8 +27,6 @@ describe('Dashboards > Detail', function () {
     let initialData;
 
     beforeEach(function () {
-      const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-      TeamStore.loadInitialData([{...team, access: ['team:read']}]);
       act(() => ProjectsStore.loadInitialData(projects));
       initialData = initializeOrg({organization});
 

diff --git a/static/app/views/dashboards/manage/index.spec.tsx b/static/app/views/dashboards/manage/index.spec.tsx
@@ -4,7 +4,6 @@ import selectEvent from 'react-select-event';
 import {act, render, screen, userEvent, waitFor} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import ManageDashboards from 'sentry/views/dashboards/manage';
 
 const FEATURES = [
@@ -23,8 +22,6 @@ describe('Dashboards > Detail', function () {
     features: FEATURES,
   });
   beforeEach(function () {
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     act(() => ProjectsStore.loadInitialData([TestStubs.Project()]));
 
     MockApiClient.addMockResponse({

diff --git a/static/app/views/discover/eventDetails/index.spec.tsx b/static/app/views/discover/eventDetails/index.spec.tsx
@@ -2,7 +2,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {act, render, screen} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import EventView from 'sentry/utils/discover/eventView';
 import {ALL_VIEWS, DEFAULT_EVENT_VIEW} from 'sentry/views/discover/data';
 import EventDetails from 'sentry/views/discover/eventDetails';
@@ -14,8 +13,6 @@ describe('Discover > EventDetails', function () {
   );
 
   beforeEach(function () {
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     act(() => ProjectsStore.loadInitialData([TestStubs.Project()]));
 
     MockApiClient.addMockResponse({

diff --git a/static/app/views/organizationStats/teamInsights/index.spec.tsx b/static/app/views/organizationStats/teamInsights/index.spec.tsx
@@ -1,7 +1,6 @@
 import {render, screen} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import TeamInsightsContainer from 'sentry/views/organizationStats/teamInsights';
 
 describe('TeamInsightsContainer', () => {
@@ -23,8 +22,6 @@ describe('TeamInsightsContainer', () => {
   });
   it('allows access for orgs with flag', () => {
     ProjectsStore.loadInitialData([TestStubs.Project()]);
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     const organization = TestStubs.Organization({features: ['team-insights']});
     const context = TestStubs.routerContext([{organization}]);
     render(

diff --git a/static/app/views/projectDetail/index.spec.tsx b/static/app/views/projectDetail/index.spec.tsx
@@ -4,7 +4,6 @@ import {textWithMarkupMatcher} from 'sentry-test/utils';
 
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import ProjectDetails from 'sentry/views/projectDetail/projectDetail';
 
 describe('ProjectDetail', function () {
@@ -14,8 +13,6 @@ describe('ProjectDetail', function () {
   beforeEach(() => {
     PageFiltersStore.reset();
     ProjectsStore.reset();
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     // eslint-disable-next-line no-console
     jest.spyOn(console, 'error').mockImplementation(jest.fn());
 

diff --git a/static/app/views/releases/list/index.spec.tsx b/static/app/views/releases/list/index.spec.tsx
@@ -10,7 +10,6 @@ import {
 } from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import ReleasesList from 'sentry/views/releases/list/';
 import {ReleasesDisplayOption} from 'sentry/views/releases/list/releasesDisplayOptions';
 import {ReleasesSortOption} from 'sentry/views/releases/list/releasesSortOptions';
@@ -58,8 +57,6 @@ describe('ReleasesList', () => {
   let endpointMock, sessionApiMock;
 
   beforeEach(() => {
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
     act(() => ProjectsStore.loadInitialData(organization.projects));
     endpointMock = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/releases/',

diff --git a/static/app/views/userFeedback/index.spec.tsx b/static/app/views/userFeedback/index.spec.tsx
@@ -2,7 +2,6 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {render, screen, userEvent} from 'sentry-test/reactTestingLibrary';
 
 import ProjectsStore from 'sentry/stores/projectsStore';
-import TeamStore from 'sentry/stores/teamStore';
 import UserFeedback from 'sentry/views/userFeedback';
 
 describe('UserFeedback', function () {
@@ -23,8 +22,6 @@ describe('UserFeedback', function () {
 
   beforeEach(function () {
     ProjectsStore.loadInitialData([project]);
-    const team = TestStubs.Team({slug: 'team-slug', isMember: true});
-    TeamStore.loadInitialData([{...team, access: ['team:read']}]);
 
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/user-feedback/',