Browse Source

ref(js): Remove OrganizationActions (#38936)

Evan Purkhiser 2 years ago
parent
commit
b33f7b5efe

+ 5 - 5
static/app/actionCreators/onboardingTasks.spec.jsx

@@ -1,12 +1,12 @@
 import {updateOnboardingTask} from 'sentry/actionCreators/onboardingTasks';
-import OrganizationActions from 'sentry/actions/organizationActions';
 import ConfigStore from 'sentry/stores/configStore';
+import OrganizationStore from 'sentry/stores/organizationStore';
 
 describe('actionCreators/onboardingTasks', function () {
   const api = new MockApiClient();
   const user = ConfigStore.get('user');
 
-  jest.spyOn(OrganizationActions, 'update');
+  jest.spyOn(OrganizationStore, 'onUpdate');
 
   describe('updateOnboardingTask', function () {
     it('Adds the task to the organization when task does not exists', async function () {
@@ -32,7 +32,7 @@ describe('actionCreators/onboardingTasks', function () {
 
       expect(mockUpdate).toHaveBeenCalled();
 
-      expect(OrganizationActions.update).toHaveBeenCalledWith({
+      expect(OrganizationStore.onUpdate).toHaveBeenCalledWith({
         onboardingTasks: [{...testTask, user}],
       });
     });
@@ -63,7 +63,7 @@ describe('actionCreators/onboardingTasks', function () {
 
       // NOTE: user is not passed as it is already associated to the existing
       // onboarding task.
-      expect(OrganizationActions.update).toHaveBeenCalledWith({
+      expect(OrganizationStore.onUpdate).toHaveBeenCalledWith({
         onboardingTasks: [testTask],
       });
     });
@@ -88,7 +88,7 @@ describe('actionCreators/onboardingTasks', function () {
       await tick();
 
       expect(mockUpdate).not.toHaveBeenCalled();
-      expect(OrganizationActions.update).toHaveBeenCalledWith({
+      expect(OrganizationStore.onUpdate).toHaveBeenCalledWith({
         onboardingTasks: [{...testTask, user}],
       });
     });

+ 4 - 4
static/app/actionCreators/onboardingTasks.tsx

@@ -1,7 +1,7 @@
-import OrganizationActions from 'sentry/actions/organizationActions';
 import {Client} from 'sentry/api';
 import ConfigStore from 'sentry/stores/configStore';
-import {OnboardingTask, Organization} from 'sentry/types';
+import OrganizationStore from 'sentry/stores/organizationStore';
+import {OnboardingTask, OnboardingTaskStatus, Organization} from 'sentry/types';
 
 /**
  * Update an onboarding task.
@@ -37,7 +37,7 @@ export function updateOnboardingTask(
     ? organization.onboardingTasks.map(task =>
         task.task === updatedTask.task ? {...task, ...updatedTask} : task
       )
-    : [...organization.onboardingTasks, {...updatedTask, user}];
+    : [...organization.onboardingTasks, {...updatedTask, user} as OnboardingTaskStatus];
 
-  OrganizationActions.update({onboardingTasks});
+  OrganizationStore.onUpdate({onboardingTasks});
 }

+ 12 - 11
static/app/actionCreators/organization.spec.jsx

@@ -1,6 +1,5 @@
 import {fetchOrganizationDetails} from 'sentry/actionCreators/organization';
 import * as OrganizationsActionCreator from 'sentry/actionCreators/organizations';
-import OrganizationActions from 'sentry/actions/organizationActions';
 import ProjectActions from 'sentry/actions/projectActions';
 import OrganizationStore from 'sentry/stores/organizationStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
@@ -23,9 +22,9 @@ describe('OrganizationActionCreator', function () {
     jest.spyOn(PageFiltersStore, 'onReset');
     jest.spyOn(ProjectActions, 'loadProjects');
     jest.spyOn(ProjectActions, 'reset');
-    jest.spyOn(OrganizationActions, 'reset');
-    jest.spyOn(OrganizationActions, 'update');
-    jest.spyOn(OrganizationActions, 'fetchOrgError');
+    jest.spyOn(OrganizationStore, 'reset');
+    jest.spyOn(OrganizationStore, 'onUpdate');
+    jest.spyOn(OrganizationStore, 'onFetchOrgError');
     jest.spyOn(OrganizationsActionCreator, 'setActiveOrganization');
   });
 
@@ -50,8 +49,8 @@ describe('OrganizationActionCreator', function () {
 
     fetchOrganizationDetails(api, org.slug, false);
     await tick();
-    await tick();
-    expect(OrganizationActions.reset).toHaveBeenCalled();
+
+    expect(OrganizationStore.reset).toHaveBeenCalled();
     expect(PageFiltersStore.onReset).toHaveBeenCalled();
     expect(ProjectActions.reset).toHaveBeenCalled();
     expect(TeamStore.reset).toHaveBeenCalled();
@@ -68,7 +67,7 @@ describe('OrganizationActionCreator', function () {
       `/organizations/${org.slug}/teams/`,
       expect.anything()
     );
-    expect(OrganizationActions.update).toHaveBeenCalledWith(org, {replace: true});
+    expect(OrganizationStore.onUpdate).toHaveBeenCalledWith(org, {replace: true});
     expect(OrganizationsActionCreator.setActiveOrganization).toHaveBeenCalled();
 
     expect(TeamStore.loadInitialData).toHaveBeenCalledWith(teams);
@@ -93,7 +92,8 @@ describe('OrganizationActionCreator', function () {
 
     fetchOrganizationDetails(api, org.slug, true, true);
     await tick();
-    expect(OrganizationActions.reset).not.toHaveBeenCalled();
+
+    expect(OrganizationStore.reset).not.toHaveBeenCalled();
     expect(PageFiltersStore.onReset).not.toHaveBeenCalled();
     expect(ProjectActions.reset).not.toHaveBeenCalled();
     expect(TeamStore.reset).not.toHaveBeenCalled();
@@ -103,7 +103,7 @@ describe('OrganizationActionCreator', function () {
       expect.anything()
     );
 
-    expect(OrganizationActions.update).toHaveBeenCalledWith(org, {replace: true});
+    expect(OrganizationStore.onUpdate).toHaveBeenCalledWith(org, {replace: true});
     expect(OrganizationsActionCreator.setActiveOrganization).toHaveBeenCalled();
 
     expect(TeamStore.loadInitialData).toHaveBeenCalledWith(teams);
@@ -126,7 +126,8 @@ describe('OrganizationActionCreator', function () {
 
     fetchOrganizationDetails(api, org.slug, false);
     await tick();
-    expect(OrganizationActions.reset).toHaveBeenCalled();
+
+    expect(OrganizationStore.reset).toHaveBeenCalled();
     expect(PageFiltersStore.onReset).toHaveBeenCalled();
     expect(ProjectActions.reset).toHaveBeenCalled();
     expect(TeamStore.reset).toHaveBeenCalled();
@@ -134,6 +135,6 @@ describe('OrganizationActionCreator', function () {
       `/organizations/${org.slug}/`,
       expect.anything()
     );
-    expect(OrganizationActions.fetchOrgError).toHaveBeenCalled();
+    expect(OrganizationStore.onFetchOrgError).toHaveBeenCalled();
   });
 });

+ 4 - 4
static/app/actionCreators/organization.tsx

@@ -6,9 +6,9 @@ import * as Sentry from '@sentry/react';
 
 import {addErrorMessage} from 'sentry/actionCreators/indicator';
 import {setActiveOrganization} from 'sentry/actionCreators/organizations';
-import OrganizationActions from 'sentry/actions/organizationActions';
 import ProjectActions from 'sentry/actions/projectActions';
 import {Client, ResponseMeta} from 'sentry/api';
+import OrganizationStore from 'sentry/stores/organizationStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 import TeamStore from 'sentry/stores/teamStore';
 import {Organization, Project, Team} from 'sentry/types';
@@ -37,7 +37,7 @@ async function fetchOrg(
     throw new Error('retrieved organization is falsey');
   }
 
-  OrganizationActions.update(org, {replace: true});
+  OrganizationStore.onUpdate(org, {replace: true});
   setActiveOrganization(org);
 
   return org;
@@ -117,7 +117,7 @@ export function fetchOrganizationDetails(
   isInitialFetch?: boolean
 ) {
   if (!silent) {
-    OrganizationActions.reset();
+    OrganizationStore.reset();
     ProjectActions.reset();
     TeamStore.reset();
     PageFiltersStore.onReset();
@@ -131,7 +131,7 @@ export function fetchOrganizationDetails(
         return;
       }
 
-      OrganizationActions.fetchOrgError(err);
+      OrganizationStore.onFetchOrgError(err);
 
       if (err.status === 403 || err.status === 401) {
         const errMessage =

+ 2 - 3
static/app/actionCreators/organizations.tsx

@@ -2,11 +2,11 @@ import {browserHistory} from 'react-router';
 
 import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicator';
 import {resetPageFilters} from 'sentry/actionCreators/pageFilters';
-import OrganizationActions from 'sentry/actions/organizationActions';
 import {Client} from 'sentry/api';
 import GuideStore from 'sentry/stores/guideStore';
 import LatestContextStore from 'sentry/stores/latestContextStore';
 import OrganizationsStore from 'sentry/stores/organizationsStore';
+import OrganizationStore from 'sentry/stores/organizationStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import TeamStore from 'sentry/stores/teamStore';
 import {Organization} from 'sentry/types';
@@ -122,8 +122,7 @@ export function changeOrganizationSlug(
  */
 export function updateOrganization(org: Partial<Organization>) {
   OrganizationsStore.onUpdate(org);
-  LatestContextStore.onUpdateOrganization(org);
-  OrganizationActions.update(org);
+  OrganizationStore.onUpdate(org);
 }
 
 type FetchOrganizationByMemberParams = {

+ 0 - 5
static/app/actions/organizationActions.tsx

@@ -1,5 +0,0 @@
-import {createActions} from 'reflux';
-
-const OrganizationActions = createActions(['reset', 'fetchOrgError', 'update']);
-
-export default OrganizationActions;

+ 0 - 4
static/app/components/datePageFilter.spec.tsx

@@ -39,10 +39,6 @@ describe('DatePageFilter', function () {
     );
   });
 
-  afterEach(() => {
-    OrganizationStore.teardown();
-  });
-
   it('can change period', async function () {
     render(<DatePageFilter />, {
       context: routerContext,

+ 0 - 1
static/app/components/environmentPageFilter.spec.tsx

@@ -45,7 +45,6 @@ describe('EnvironmentPageFilter', function () {
   });
 
   afterEach(() => {
-    OrganizationStore.teardown();
     ProjectsStore.teardown();
   });
 

+ 4 - 4
static/app/components/organizations/pageFilters/pageFiltersContainer.spec.jsx

@@ -3,9 +3,9 @@ import {initializeOrg} from 'sentry-test/initializeOrg';
 import {act} from 'sentry-test/reactTestingLibrary';
 
 import * as globalActions from 'sentry/actionCreators/pageFilters';
-import OrganizationActions from 'sentry/actions/organizationActions';
 import PageFiltersContainer from 'sentry/components/organizations/pageFilters/container';
 import OrganizationsStore from 'sentry/stores/organizationsStore';
+import OrganizationStore from 'sentry/stores/organizationStore';
 import PageFiltersStore from 'sentry/stores/pageFiltersStore';
 import ProjectsStore from 'sentry/stores/projectsStore';
 import {getItem} from 'sentry/utils/localStorage';
@@ -72,7 +72,7 @@ describe('PageFiltersContainer', function () {
   beforeEach(function () {
     MockApiClient.clearMockResponses();
     ProjectsStore.loadInitialData(organization.projects);
-    OrganizationActions.update(organization);
+    OrganizationStore.onUpdate(organization);
     OrganizationsStore.addOrReplace(organization);
 
     getItem.mockImplementation(() => null);
@@ -421,7 +421,7 @@ describe('PageFiltersContainer', function () {
       },
     });
 
-    OrganizationActions.update(initializationObj.organization);
+    OrganizationStore.onUpdate(initializationObj.organization);
 
     wrapper = mountWithThemeAndOrg(
       <PageFiltersContainer hideGlobalHeader />,
@@ -512,7 +512,7 @@ describe('PageFiltersContainer', function () {
 
       // Eventually OrganizationContext will fetch org details for `org-slug`
       // and update `organization` prop emulate fetchOrganizationDetails
-      OrganizationActions.update(updatedOrganization);
+      OrganizationStore.onUpdate(updatedOrganization);
       wrapper.setContext({
         organization: updatedOrganization,
         location: {query: {}},

+ 0 - 1
static/app/components/projectPageFilter.spec.tsx

@@ -43,7 +43,6 @@ describe('ProjectPageFilter', function () {
   });
 
   afterEach(() => {
-    OrganizationStore.teardown();
     PageFiltersStore.reset();
   });
 

Some files were not shown because too many files changed in this diff