Browse Source

chore(TS): convert actionCreator navigation (#16786)

Stephen Cefali 5 years ago
parent
commit
272ea4727c

+ 3 - 2
src/sentry/static/sentry/app/actionCreators/navigation.jsx → src/sentry/static/sentry/app/actionCreators/navigation.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
 import get from 'lodash/get';
+import {InjectedRouter} from 'react-router/lib/Router';
 
 import {openModal} from 'app/actionCreators/modal';
 import ContextPickerModal from 'app/components/contextPickerModal';
 import NavigationActions from 'app/actions/navigationActions';
 
-export function navigateTo(to, router) {
+export function navigateTo(to: string, router: InjectedRouter) {
   // Check for placeholder params
   const needOrg = to.indexOf(':orgId') > -1;
   const needProject = to.indexOf(':projectId') > -1;
@@ -34,6 +35,6 @@ export function navigateTo(to, router) {
   }
 }
 
-export function setLastRoute(route) {
+export function setLastRoute(route: string) {
   NavigationActions.setLastRoute(route);
 }

+ 7 - 3
src/sentry/static/sentry/app/components/contextPickerModal.tsx

@@ -69,7 +69,7 @@ type Props = {
    * Id of the project (most likely from the URL)
    * on which the modal was opened
    */
-  comingFromProjectId: string;
+  comingFromProjectId?: string;
 };
 
 class ContextPickerModal extends React.Component<Props> {
@@ -259,7 +259,8 @@ class ContextPickerModal extends React.Component<Props> {
               ref={ref => {
                 this.projectSelect = ref;
                 this.focusProjectSelector();
-                this.focusProjectOption(comingFromProjectId, projects);
+                comingFromProjectId &&
+                  this.focusProjectOption(comingFromProjectId, projects);
               }}
               placeholder={t('Select a Project')}
               name="project"
@@ -275,7 +276,10 @@ class ContextPickerModal extends React.Component<Props> {
   }
 }
 
-type ContainerProps = {};
+type ContainerProps = Omit<
+  Props,
+  'projects' | 'loading' | 'organizations' | 'organization' | 'onSelectOrganization'
+>;
 
 type ContainerState = {
   organizations?: Organization[];