change "self serve" to "self service"

Author: doctorhilarius

src/components/ChallengesComponent/ChallengeList/index.js

@@ -48,10 +48,10 @@ class ChallengeList extends Component {
    * @param {String} projectStatus project status
    */
   updateSearchParam (searchText, projectStatus) {
-    const { status, filterChallengeName, loadChallengesByPage, activeProjectId, selfServe } = this.props
+    const { status, filterChallengeName, loadChallengesByPage, activeProjectId, selfService } = this.props
     this.setState({ searchText }, () => {
       if (status !== projectStatus || searchText !== filterChallengeName) {
-        loadChallengesByPage(1, activeProjectId, projectStatus, searchText, selfServe)
+        loadChallengesByPage(1, activeProjectId, projectStatus, searchText, selfService)
       }
     })
   }
@@ -62,9 +62,9 @@ class ChallengeList extends Component {
    */
   handlePageChange (pageNumber) {
     const { searchText } = this.state
-    const { page, loadChallengesByPage, activeProjectId, status, selfServe } = this.props
+    const { page, loadChallengesByPage, activeProjectId, status, selfService } = this.props
     if (page !== pageNumber) {
-      loadChallengesByPage(pageNumber, activeProjectId, status, searchText, selfServe)
+      loadChallengesByPage(pageNumber, activeProjectId, status, searchText, selfService)
     }
   }
 
@@ -73,8 +73,8 @@ class ChallengeList extends Component {
    */
   reloadChallengeList () {
     const { searchText } = this.state
-    const { page, loadChallengesByPage, activeProjectId, status, selfServe } = this.props
-    loadChallengesByPage(page, activeProjectId, status, searchText, selfServe)
+    const { page, loadChallengesByPage, activeProjectId, status, selfService } = this.props
+    loadChallengesByPage(page, activeProjectId, status, searchText, selfService)
   }
 
   /**
@@ -270,7 +270,7 @@ ChallengeList.propTypes = {
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
-  selfServe: PropTypes.bool
+  selfService: PropTypes.bool
 }
 
 export default ChallengeList

src/components/ChallengesComponent/index.js

@@ -28,7 +28,7 @@ const ChallengesComponent = ({
   partiallyUpdateChallengeDetails,
   deleteChallenge,
   isBillingAccountExpired,
-  selfServe
+  selfService
 }) => {
   return (
     <Sticky top={10}>
@@ -77,7 +77,7 @@ const ChallengesComponent = ({
               partiallyUpdateChallengeDetails={partiallyUpdateChallengeDetails}
               deleteChallenge={deleteChallenge}
               isBillingAccountExpired={isBillingAccountExpired}
-              selfServe={selfServe}
+              selfService={selfService}
             />
           )}
         </div>
@@ -104,7 +104,7 @@ ChallengesComponent.propTypes = {
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
-  selfServe: PropTypes.bool
+  selfService: PropTypes.bool
 }
 
 ChallengesComponent.defaultProps = {

src/components/Sidebar/index.js

@@ -13,7 +13,7 @@ import { isBetaMode } from '../../util/cookie'
 const Sidebar = ({
   projectId,
   resetSidebarActiveParams,
-  selfServe
+  selfService
 }) => {
   return (
     <div className={styles.sidebar}>
@@ -23,12 +23,12 @@ const Sidebar = ({
         {isBetaMode() && <span className={styles.beta}>beta</span>}
       </div>
       <Link to='/'>
-        <div className={cn(styles.homeLink, { [styles.active]: !projectId && !selfServe })} onClick={resetSidebarActiveParams}>
+        <div className={cn(styles.homeLink, { [styles.active]: !projectId && !selfService })} onClick={resetSidebarActiveParams}>
           All Work
         </div>
       </Link>
-      <Link to='/self-serve'>
-        <div className={cn(styles.homeLink, { [styles.active]: !projectId && selfServe })} onClick={resetSidebarActiveParams}>
+      <Link to='/self-service'>
+        <div className={cn(styles.homeLink, { [styles.active]: !projectId && selfService })} onClick={resetSidebarActiveParams}>
           Self-Service Opportunities
         </div>
       </Link>
@@ -48,7 +48,7 @@ const Sidebar = ({
 Sidebar.propTypes = {
   projectId: PropTypes.string,
   resetSidebarActiveParams: PropTypes.func,
-  selfServe: PropTypes.bool
+  selfService: PropTypes.bool
 }
 
 export default Sidebar

src/containers/Challenges/index.js

@@ -28,10 +28,10 @@ class Challenges extends Component {
   }
 
   componentDidMount () {
-    const { activeProjectId, resetSidebarActiveParams, menu, projectId, selfServe } = this.props
+    const { activeProjectId, resetSidebarActiveParams, menu, projectId, selfService } = this.props
     if (menu === 'NULL' && activeProjectId !== -1) {
       resetSidebarActiveParams()
-    } else if (projectId || selfServe) {
+    } else if (projectId || selfService) {
       if (projectId) {
         this.props.loadProject(projectId)
       }
@@ -46,10 +46,10 @@ class Challenges extends Component {
   }
 
   reloadChallenges (props) {
-    const { activeProjectId, projectDetail: reduxProjectInfo, projectId, challengeProjectId, loadProject, selfServe } = props
-    if (activeProjectId !== challengeProjectId || selfServe) {
-      this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '', selfServe)
-      if (!selfServe && (!reduxProjectInfo || `${reduxProjectInfo.id}` !== projectId)
+    const { activeProjectId, projectDetail: reduxProjectInfo, projectId, challengeProjectId, loadProject, selfService } = props
+    if (activeProjectId !== challengeProjectId || selfService) {
+      this.props.loadChallengesByPage(1, projectId ? parseInt(projectId) : -1, CHALLENGE_STATUS.ACTIVE, '', selfService)
+      if (!selfService && (!reduxProjectInfo || `${reduxProjectInfo.id}` !== projectId)
       ) {
         loadProject(projectId)
       }
@@ -85,7 +85,7 @@ class Challenges extends Component {
       partiallyUpdateChallengeDetails,
       deleteChallenge,
       isBillingAccountExpired,
-      selfServe
+      selfService
     } = this.props
     const { searchProjectName, onlyMyProjects } = this.state
     const projectInfo = _.find(projects, { id: activeProjectId }) || {}
@@ -120,7 +120,7 @@ class Challenges extends Component {
             <label>My Projects</label>
           </div>
           {
-            activeProjectId === -1 && !selfServe && <div>No project selected. Select one below</div>
+            activeProjectId === -1 && !selfService && <div>No project selected. Select one below</div>
           }
           {
             isLoading ? <Loader /> : (
@@ -130,7 +130,7 @@ class Challenges extends Component {
             )
           }
         </div>
-        {(activeProjectId !== -1 || selfServe) && <ChallengesComponent
+        {(activeProjectId !== -1 || selfService) && <ChallengesComponent
           activeProject={({
             ...projectInfo,
             ...((reduxProjectInfo && reduxProjectInfo.id === activeProjectId) ? reduxProjectInfo : {})
@@ -148,7 +148,7 @@ class Challenges extends Component {
           partiallyUpdateChallengeDetails={partiallyUpdateChallengeDetails}
           deleteChallenge={deleteChallenge}
           isBillingAccountExpired={isBillingAccountExpired}
-          selfServe={selfServe}
+          selfService={selfService}
         />
         }
       </Fragment>
@@ -178,7 +178,7 @@ Challenges.propTypes = {
   partiallyUpdateChallengeDetails: PropTypes.func.isRequired,
   deleteChallenge: PropTypes.func.isRequired,
   isBillingAccountExpired: PropTypes.bool,
-  selfServe: PropTypes.bool
+  selfService: PropTypes.bool
 }
 
 const mapStateToProps = ({ challenges, sidebar, projects }) => ({

src/containers/Sidebar/index.js

@@ -15,8 +15,8 @@ class SidebarContainer extends Component {
   }
 
   componentDidMount () {
-    const { projectId, activeProjectId, isLoading, selfServe } = this.props
-    if (!projectId && activeProjectId === -1 && !isLoading && !selfServe) {
+    const { projectId, activeProjectId, isLoading, selfService } = this.props
+    if (!projectId && activeProjectId === -1 && !isLoading && !selfService) {
       this.props.loadProjects()
     }
 
@@ -26,13 +26,13 @@ class SidebarContainer extends Component {
   }
 
   componentWillReceiveProps (nextProps) {
-    const { projectId, isLoading, selfServe, projects } = nextProps
+    const { projectId, isLoading, selfService, projects } = nextProps
 
     // if we're viewing a specific project,
     // or we're viewing the self serve page,
     // or if the project is already loading,
     // don't load the projects
-    if (!!projectId || selfServe || isLoading) {
+    if (!!projectId || selfService || isLoading) {
       // if we're not in the middle of loading,
       // and we have projects to unload,
       // unload them
@@ -59,7 +59,7 @@ class SidebarContainer extends Component {
   }
 
   render () {
-    const { isLoading, setActiveProject, projectId, resetSidebarActiveParams, projects, selfServe, unloadProjects } = this.props
+    const { isLoading, setActiveProject, projectId, resetSidebarActiveParams, projects, selfService, unloadProjects } = this.props
     const { searchProjectName } = this.state
 
     return (
@@ -71,7 +71,7 @@ class SidebarContainer extends Component {
         resetSidebarActiveParams={resetSidebarActiveParams}
         updateProjectsList={this.updateProjectName}
         searchProjectName={searchProjectName}
-        selfServe={selfServe}
+        selfService={selfService}
         unloadProjects={unloadProjects}
       />
     )
@@ -87,7 +87,7 @@ SidebarContainer.propTypes = {
   setActiveProject: PropTypes.func,
   projectId: PropTypes.string,
   resetSidebarActiveParams: PropTypes.func,
-  selfServe: PropTypes.bool
+  selfService: PropTypes.bool
 }
 
 const mapStateToProps = ({ sidebar }) => ({

src/routes.js

@@ -119,11 +119,11 @@ class Routes extends React.Component {
             <Sidebar />
           )()}
         />
-        <Route exact path='/self-serve'
+        <Route exact path='/self-service'
           render={() => renderApp(
-            <Challenges selfServe='true' />,
+            <Challenges selfService='true' />,
             <TopBarContainer />,
-            <Sidebar selfServe='true' />
+            <Sidebar selfService='true' />
           )()}
         />
         <Route exact path='/projects/:projectId/challenges/new'