ref(mixins): Remove the OrganizationState mixin

src/sentry/static/sentry/app/components/organizations/homeContainer.jsx

@@ -1,14 +1,12 @@
 import React from 'react';
 import styled from 'react-emotion';
 
-import ProjectNav from 'app/views/organizationProjectsDashboard/projectNav';
 import space from 'app/styles/space';
 
 export default class HomeContainer extends React.Component {
   render() {
     return (
-      <div className={`${this.props.className || ''} organization-home`}>
-        <ProjectNav />
+      <div className="organization-home">
         <div className="container">
           <Content>{this.props.children}</Content>
         </div>

src/sentry/static/sentry/app/routes.jsx

@@ -923,20 +923,17 @@ function routes() {
               component={errorHandler(LazyLoad)}
             />
           </Route>
-
           <Route
             path="/organizations/:orgId/projects/:projectId/getting-started/"
             component={errorHandler(ProjectGettingStarted)}
           >
             <IndexRoute component={errorHandler(ProjectInstallOverview)} />
             <Route path=":platform/" component={errorHandler(ProjectInstallPlatform)} />
           </Route>
-
           <Route
             path="/organizations/:orgId/projects/:projectId/events/:eventId/"
             component={errorHandler(ProjectEventRedirect)}
           />
-
           <Route
             path="/organizations/:orgId/issues/"
             component={errorHandler(OrganizationStreamContainer)}
@@ -1020,7 +1017,6 @@ function routes() {
               component={errorHandler(LazyLoad)}
             />
           </Route>
-
           <Route
             path="/organizations/:orgId/user-feedback/"
             componentPromise={() =>
@@ -1085,35 +1081,59 @@ function routes() {
             component={errorHandler(LazyLoad)}
           />
           <Route path="/organizations/:orgId/" component={OrganizationHomeContainer}>
-            <Redirect from="projects/" to="/:orgId/" />
+            <Redirect from="/organizations/:orgId/projects/" to="/:orgId/" />
             {hook('routes:organization')}
-            <Redirect path="teams/" to="/settings/:orgId/teams/" />
-            <Redirect path="teams/your-teams/" to="/settings/:orgId/teams/" />
-            <Redirect path="teams/all-teams/" to="/settings/:orgId/teams/" />
-            <Redirect path="teams/:teamId/" to="/settings/:orgId/teams/:teamId/" />
+            <Redirect path="/organizations/:orgId/teams/" to="/settings/:orgId/teams/" />
+            <Redirect
+              path="/organizations/:orgId/teams/your-teams/"
+              to="/settings/:orgId/teams/"
+            />
+            <Redirect
+              path="/organizations/:orgId/teams/all-teams/"
+              to="/settings/:orgId/teams/"
+            />
+            <Redirect
+              path="/organizations/:orgId/teams/:teamId/"
+              to="/settings/:orgId/teams/:teamId/"
+            />
             <Redirect
-              path="teams/:teamId/members/"
+              path="/organizations/:orgId/teams/:teamId/members/"
               to="/settings/:orgId/teams/:teamId/members/"
             />
             <Redirect
-              path="teams/:teamId/projects/"
+              path="/organizations/:orgId/teams/:teamId/projects/"
               to="/settings/:orgId/teams/:teamId/projects/"
             />
             <Redirect
-              path="teams/:teamId/settings/"
+              path="/organizations/:orgId/teams/:teamId/settings/"
               to="/settings/:orgId/teams/:teamId/settings/"
             />
-            <Redirect path="settings/" to="/settings/:orgId/" />
-            <Redirect path="api-keys/" to="/settings/:orgId/api-keys/" />
-            <Redirect path="api-keys/:apiKey/" to="/settings/:orgId/api-keys/:apiKey/" />
-            <Redirect path="members/" to="/settings/:orgId/members/" />
-            <Redirect path="members/new/" to="/settings/:orgId/members/new/" />
+            <Redirect path="/organizations/:orgId/settings/" to="/settings/:orgId/" />
             <Redirect
-              path="members/:memberId/"
+              path="/organizations/:orgId/api-keys/"
+              to="/settings/:orgId/api-keys/"
+            />
+            <Redirect
+              path="/organizations/:orgId/api-keys/:apiKey/"
+              to="/settings/:orgId/api-keys/:apiKey/"
+            />
+            <Redirect
+              path="/organizations/:orgId/members/"
+              to="/settings/:orgId/members/"
+            />
+            <Redirect
+              path="/organizations/:orgId/members/new/"
+              to="/settings/:orgId/members/new/"
+            />
+            <Redirect
+              path="/organizations/:orgId/members/:memberId/"
               to="/settings/:orgId/members/:memberId/"
             />
-            <Redirect path="rate-limits/" to="/settings/:orgId/rate-limits/" />
-            <Redirect path="repos/" to="/settings/:orgId/repos/" />
+            <Redirect
+              path="/organizations/:orgId/rate-limits/"
+              to="/settings/:orgId/rate-limits/"
+            />
+            <Redirect path="/organizations/:orgId/repos/" to="/settings/:orgId/repos/" />
           </Route>
           <Route
             path="/organizations/:orgId/projects/new/"

src/sentry/static/sentry/app/views/organizationGroupDetails/header.jsx

@@ -2,7 +2,6 @@ import {Link} from 'react-router';
 import {omit} from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
-import createReactClass from 'create-react-class';
 import styled from 'react-emotion';
 
 import {fetchOrgMembers} from 'app/actionCreators/members';
@@ -11,10 +10,8 @@ import AssigneeSelector from 'app/components/assigneeSelector';
 import Count from 'app/components/count';
 import EventOrGroupTitle from 'app/components/eventOrGroupTitle';
 import GuideAnchor from 'app/components/assistant/guideAnchor';
-import IndicatorStore from 'app/stores/indicatorStore';
 import ListLink from 'app/components/links/listLink';
 import NavTabs from 'app/components/navTabs';
-import OrganizationState from 'app/mixins/organizationState';
 import ProjectBadge from 'app/components/idBadge/projectBadge';
 import SeenByList from 'app/components/seenByList';
 import SentryTypes from 'app/sentryTypes';
@@ -24,25 +21,19 @@ import withApi from 'app/utils/withApi';
 
 import GroupActions from './actions';
 
-const GroupHeader = createReactClass({
-  displayName: 'GroupHeader',
-
-  propTypes: {
+class GroupHeader extends React.Component {
+  static propTypes = {
     api: PropTypes.object,
     group: SentryTypes.Group.isRequired,
     project: SentryTypes.Project,
-  },
+  };
 
-  contextTypes: {
+  static contextTypes = {
     location: PropTypes.object,
     organization: SentryTypes.Organization,
-  },
-
-  mixins: [OrganizationState],
+  };
 
-  getInitialState() {
-    return {memberList: null};
-  },
+  state = {memberList: null};
 
   componentDidMount() {
     const {organization} = this.context;
@@ -52,29 +43,7 @@ const GroupHeader = createReactClass({
       const users = memberList.map(member => member.user);
       this.setState({memberList: users});
     });
-  },
-
-  onToggleMute() {
-    const group = this.props.group;
-    const org = this.context.organization;
-    const loadingIndicator = IndicatorStore.add(t('Saving changes..'));
-
-    this.props.api.bulkUpdate(
-      {
-        orgId: org.slug,
-        projectId: group.project.slug,
-        itemIds: [group.id],
-        data: {
-          status: group.status === 'ignored' ? 'unresolved' : 'ignored',
-        },
-      },
-      {
-        complete: () => {
-          IndicatorStore.remove(loadingIndicator);
-        },
-      }
-    );
-  },
+  }
 
   getMessage() {
     const data = this.props.group;
@@ -87,7 +56,7 @@ const GroupHeader = createReactClass({
       default:
         return this.props.group.culprit || '';
     }
-  },
+  }
 
   render() {
     const {project, group} = this.props;
@@ -269,8 +238,8 @@ const GroupHeader = createReactClass({
         </NavTabs>
       </div>
     );
-  },
-});
+  }
+}
 
 const StyledProjectBadge = styled(ProjectBadge)`
   flex-shrink: 0;