From 8a10a852f7e1ec2a4e61c4d8e3296607cb84eb43 Mon Sep 17 00:00:00 2001 From: getsentry-bot Date: Thu, 31 Aug 2023 16:31:18 +0000 Subject: [PATCH] Revert "Athena/fly join team (#55499)" This reverts commit e4f8f536af5a545e3975e776f3dc8ed00fba8ad0. Co-authored-by: sentaur-athena <132939361+sentaur-athena@users.noreply.github.com> --- .../app/components/noProjectMessage.spec.tsx | 52 ------------------- static/app/components/noProjectMessage.tsx | 8 +-- static/app/views/alerts/create.spec.tsx | 2 - static/app/views/alerts/index.spec.tsx | 6 --- .../alerts/list/incidents/index.spec.tsx | 2 - static/app/views/dashboards/detail.spec.tsx | 3 -- .../views/dashboards/manage/index.spec.tsx | 3 -- .../discover/eventDetails/index.spec.tsx | 3 -- .../teamInsights/index.spec.tsx | 3 -- static/app/views/projectDetail/index.spec.tsx | 3 -- static/app/views/releases/list/index.spec.tsx | 3 -- static/app/views/userFeedback/index.spec.tsx | 3 -- 12 files changed, 2 insertions(+), 89 deletions(-) diff --git a/static/app/components/noProjectMessage.spec.tsx b/static/app/components/noProjectMessage.spec.tsx index aeaddd42a4725f..25f168ace1189a 100644 --- 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( - {childrenMock} - ); - - 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( - - - - ); - - 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( - - - - ); - - expect(screen.getByTestId('project-row')).toBeInTheDocument(); - }); }); diff --git a/static/app/components/noProjectMessage.tsx b/static/app/components/noProjectMessage.tsx index 988b226de18916..d44f5b12b83573 100644 --- 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 {children}; } @@ -85,7 +81,7 @@ function NoProjectMessage({ {t('Remain Calm')} {t('You need at least one project to use this view')} - {!orgHasProjects && canCreateProject ? ( + {!orgHasProjects ? ( createProjectAction ) : ( diff --git a/static/app/views/alerts/create.spec.tsx b/static/app/views/alerts/create.spec.tsx index e42fb4c86dd2f3..b239397faa0852 100644 --- 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( diff --git a/static/app/views/alerts/index.spec.tsx b/static/app/views/alerts/index.spec.tsx index 34c100c75261d4..370bbf11802b78 100644 --- 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
{hasMetricAlerts ? 'access' : 'no access'}
; } diff --git a/static/app/views/alerts/list/incidents/index.spec.tsx b/static/app/views/alerts/list/incidents/index.spec.tsx index 118fa8035015a6..6854bdaa80347f 100644 --- 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 index e34067784b75d0..3273200b84dbab 100644 --- 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 index 38fba20598c87a..0543bdb248d6f5 100644 --- 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 index c395883c918c61..a1bf3050105aaf 100644 --- 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 index a8ec9d0eddb063..a3a7fb4b5ed66d 100644 --- 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 index 4ad8b0dd716f32..28ee986e056c94 100644 --- 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 index 5e6a602765b93d..baa9f43e404220 100644 --- 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 index aa551145979d90..fdeb2f19bb9677 100644 --- 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/',