code cleanup

mitodl · Oct 19, 2016 · 5270fab · 5270fab
1 parent e849196
commit 5270fab
Showing 1 changed file with 5 additions and 42 deletions.
diff --git a/static/js/components/Navbar.js b/static/js/components/Navbar.js
@@ -33,15 +33,15 @@ export default class Navbar extends React.Component {
     enrollDialogVisibility:      boolean,
     enrollSelectedProgram:       ?number,
     enrollments:                 ProgramEnrollmentsState,
+    navDrawerOpen:               boolean,
     pathname:                    string,
+    profile:                     Profile,
     setCurrentProgramEnrollment: (enrollment: ProgramEnrollment) => void,
     setEnrollDialogError:        (error: ?string) => void,
     setEnrollDialogVisibility:   (open: boolean) => void,
     setEnrollSelectedProgram:    (programId: ?number) => void,
     setNavDrawerOpen:            (b: boolean) => void,
-    navDrawerOpen:               boolean,
     setPhotoDialogVisibility:    (b: boolean) => void,
-    profile:                     Profile,
   };
 
   userMenu: Function = (): void|React$Element<*> => {
@@ -50,52 +50,15 @@ export default class Navbar extends React.Component {
   };
 
   programSelector: Function = (): React$Element<*> => {
-    const {
-      addProgramEnrollment,
-      currentProgramEnrollment,
-      dashboard,
-      enrollDialogError,
-      enrollDialogVisibility,
-      enrollSelectedProgram,
-      enrollments,
-      pathname,
-      setCurrentProgramEnrollment,
-      setEnrollDialogError,
-      setEnrollDialogVisibility,
-      setEnrollSelectedProgram,
-    } = this.props;
-
+    const { pathname } = this.props;
     return (
       <ProgramSelector
-        addProgramEnrollment={addProgramEnrollment}
-        currentProgramEnrollment={currentProgramEnrollment}
-        dashboard={dashboard}
-        enrollDialogError={enrollDialogError}
-        enrollDialogVisibility={enrollDialogVisibility}
-        enrollSelectedProgram={enrollSelectedProgram}
-        enrollments={enrollments}
+        {...this.props}
         selectorVisibility={!PROFILE_SETTINGS_REGEX.test(pathname)}
-        setCurrentProgramEnrollment={setCurrentProgramEnrollment}
-        setEnrollDialogError={setEnrollDialogError}
-        setEnrollDialogVisibility={setEnrollDialogVisibility}
-        setEnrollSelectedProgram={setEnrollSelectedProgram}
       />
     );
   };
 
-  navDrawerClass: Function = (open: boolean): string => (
-    open ? 'open' : 'closed'
-  );
-
-  navLink: Function = (location: string, text: string, iconName: string): React$Element<*> => (
-    <div className="link">
-      <Icon name={iconName} />
-      <Link to={location}>
-        { text }
-      </Link>
-    </div>
-  );
-
   navDrawer: Function = (drawerClass: string): React$Element => {
     const {
       profile,
@@ -159,7 +122,7 @@ export default class Navbar extends React.Component {
       link = '/learners';
     }
 
-    let drawerClass = `nav-drawer ${this.navDrawerClass(navDrawerOpen)}`;
+    let drawerClass = `nav-drawer ${navDrawerOpen ? 'open' : 'closed'}`;
 
     return (
       <div className="micromasters-navbar">