Browse Source

test(js): Drop DetailedOrganization (#72762)

Requires https://github.com/getsentry/sentry/pull/72756 +
https://github.com/getsentry/getsentry/pull/14322
Evan Purkhiser 9 months ago
parent
commit
ea0c995239

+ 0 - 5
static/app/types/organization.tsx

@@ -83,11 +83,6 @@ export interface Organization extends OrganizationSummary {
   planSampleRate?: number | null;
 }
 
-export interface DetailedOrganization extends Organization {
-  projects: Project[];
-  teams: Team[];
-}
-
 export interface Team {
   access: Scope[];
   avatar: Avatar;

+ 4 - 6
tests/js/fixtures/organization.ts

@@ -1,10 +1,10 @@
 import {OrgRoleListFixture, TeamRoleListFixture} from 'sentry-fixture/roleList';
 
-import type {DetailedOrganization} from 'sentry/types/organization';
+import type {Organization} from 'sentry/types/organization';
+
+export function OrganizationFixture( params: Partial<Organization> = {}): Organization {
+
 
-export function OrganizationFixture(
-  params: Partial<DetailedOrganization> = {}
-): DetailedOrganization {
   const slug = params.slug ?? 'org-slug';
   return {
     id: '3',
@@ -81,8 +81,6 @@ export function OrganizationFixture(
     aggregatedDataConsent: false,
     storeCrashReports: 0,
     trustedRelays: [],
-    teams: [],
-    projects: [],
     ...params,
 
     orgRoleList: OrgRoleListFixture(),

+ 4 - 8
tests/js/sentry-test/initializeOrg.tsx

@@ -2,7 +2,6 @@ import type {InjectedRouter, PlainRoute, RouteComponentProps} from 'react-router
 import type {Location} from 'history';
 import {OrganizationFixture} from 'sentry-fixture/organization';
 import {ProjectFixture} from 'sentry-fixture/project';
-import {OrgRoleListFixture, TeamRoleListFixture} from 'sentry-fixture/roleList';
 import {RouterFixture} from 'sentry-fixture/routerFixture';
 
 import type {Organization} from 'sentry/types/organization';
@@ -37,15 +36,12 @@ export function initializeOrg<RouterParams = {orgId: string; projectId: string}>
   projects: additionalProjects,
   router: additionalRouter,
 }: InitializeOrgOptions<RouterParams> = {}) {
-  const projects = (additionalProjects || [{}]).map(p => ProjectFixture(p));
+  const organization = OrganizationFixture(additionalOrg);
+  const projects = additionalProjects
+    ? additionalProjects.map(ProjectFixture)
+    : [ProjectFixture()];
 
   const [project] = projects;
-  const organization = OrganizationFixture({
-    projects,
-    ...additionalOrg,
-    orgRoleList: OrgRoleListFixture(),
-    teamRoleList: TeamRoleListFixture(),
-  });
 
   const router = RouterFixture({
     ...additionalRouter,

+ 0 - 1
tests/js/sentry-test/performance/initializePerformanceData.ts

@@ -36,7 +36,6 @@ export function initializeData(settings?: InitializeDataSettings) {
 
   const organization = OrganizationFixture({
     features,
-    projects,
   });
   const routerLocation: {query: {project?: string}} = {
     query: {