Merge pull request #395 from SYU15/rm-assigned-pages

Phase 1 of remove assigned pages

Author: SYU15

README.md

@@ -34,7 +34,7 @@ It’s a React.js-based browser application with a Node.js backend with the foll
     npm start
     ```
 
-5. (Optional) Set up Google Sheets for user tasking, saving important changes and repeated, “dictionary” changes. If you skip this step, everything will work fine, but your UI will show all pages when logged in, not just your assigned pages. See the section below on [Google Sheets](#google-sheets-tasking-and-significant-changes).
+5. (Optional) Set up Google Sheets for saving important changes and repeated, “dictionary” changes. See the section below on [Google Sheets](#google-sheets-tasking-and-significant-changes).
 
 [nodenv]: https://github.com/nodenv/nodenv
 [nvm-alternatives]: https://github.com/nodenv/nodenv/wiki/Alternatives
@@ -63,7 +63,7 @@ Screenshot:
 ![screenshot](screenshot.png)
 
 
-## Google Sheets (Tasking and Significant Changes)
+## Google Sheets (Significant Changes)
 
 The analysis UI keeps some data and runtime configuration separate from the public web monitoring database ([`web-monitoring-db`](http://github.com/edgi-govdata-archiving/web-monitoring-db)). This data is kept in 3 Google Docs spreadsheets. You can use the UI without configuring them, but you will be missing some functionality.
 
@@ -74,28 +74,7 @@ GOOGLE_SERVICE_CLIENT_EMAIL=73874number-example@developer.gserviceaccount.com
 GOOGLE_SHEETS_PRIVATE_KEY=-----BEGIN PRIVATE KEY-----\EXAMPLEExampleG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCsBjS7qpN+vUhz\nXRhcL3pwKZtewjZ478rs7FylT+YAJMmy1wOS3ze2FVYaBHelloFromXm9gL82OCSJn1ZThePastuwGA0\npe9oZSAtiB4ujaHhcWCO7ZYZzBvsPRJZR2eo4UokDpmgAS9ExTU7zN+eKTBTFGB4\nKDc7FAxqhk9dBcYFpLU34wuQsS/SZY1j3I/pmqQ7CHnGG+KLhyRiZ6UvlT8KjWejWTFdfMoredksjfGibberishkljfkls+\nkerGibberishll7\n7oU0VVs3xY5nhkjd#r34jkd7vxjknfy3jsdhf5zjkGYfyXFNhVjsl/bJ3AHA/C9Fd5z9JmOCsZE\nyD9Yjy72C50CjOgCp568pse85A==\n-----END PRIVATE KEY-----\n
 ```
 
-In the next two sections, you’ll create the 3 sheets.
-
-
-### Creating Tasking Sheets
-
-User tasking data (analysis timeframes, who is assigned what domains and pages, etc.) is currently kept in a Google Docs spreadsheet for easy manipulation by project admins. To enable tasking in your local build, you’ll need to create your own copy of this spreadsheet.
-
-You can start off by making a copy of [this example tasking sheet](https://docs.google.com/spreadsheets/d/1l5TAoJBbX6xV7ZYF9g5TnryJ4-SsatXvb-6cWuTMW5A/). Otherwise, you can create one from scratch: create a spreadsheet in Google Docs. It should have two worksheets or tabs, named:
-
-1. `Tasks` (this should be the first tab)
-2. `Timeframes`
-
-**The `Tasks` sheet** should be formatted such that the first column is a list of usernames/e-mail addresses. The rest of the columns in that row are the names of domains that the user in the first column is assigned (one domain per column). Domains are the `site` attribute of a page in [the API](https://api.monitoring.envirodatagov.org). The first row is reserved for column headers. The sheet might look like:
-
-| A | B | C |
-| - | - | - |
-| User/e-mail              | Site                | Site                 | Etc.          |
-| someone@example.com      | DOT - fhwa.dot.gov  | EPA - epa.gov        |               |
-| someone.else@example.com | EPA - epa.gov/arc-x | GAO - Climate Change | DOI - fws.gov |
-| learner@example.com      | DOI - blm.gov       |                      |               |
-
-In this case, someone@example.com is assigned two domains, while learner@example.com is assigned only one. There can be any number of columns on each row.
+In the next two sections, you’ll create the 2 sheets.
 
 **The `Timeframes` sheet** holds information about analysis timeframes. The analysis team currently works on changes in 3-day chunks and this sheet lets you define when those chunks start and end. It should have exactly two columns. The first is a date (in ISO 8601 format) that a timeframe starts on. The second is the duration of that timeframe in seconds (e.g. `259200` for 3 days). Timeframes are assumed to repeat until a new timeframe is started. Like `tasks`, the first row is reserved for column headers. This sheet might look like:
 

src/components/nav-bar.jsx

@@ -13,15 +13,14 @@ import {Link, NavLink} from 'react-router-dom';
  * The NavBar component renders an app title, user info, links, etc.
  * @param {NavBarProps} props
  */
-export default ({children = null, title = 'EDGI Web Monitoring', user = null, showLogin, logOut, pageFilter, setPageFilter}) => (
+export default ({children = null, title = 'EDGI Web Monitoring', user = null, showLogin, logOut }) => (
   <nav className="navbar navbar-inverse">
     <div className="container-fluid">
       <div className="navbar-header">
         <Link to="/" className="navbar-brand">{title}</Link>
       </div>
       <ul className="nav navbar-nav">
-        <li>{renderNavLink('Assigned Pages', 'assignedPages', pageFilter, setPageFilter)}</li>
-        <li>{renderNavLink('All Pages', 'pages', pageFilter, setPageFilter)}</li>
+        <li><NavLink to="/pages" exact>All Pages</NavLink></li>
         <li>{renderUserInfo(user, showLogin, logOut)}</li>
       </ul>
     </div>
@@ -43,18 +42,3 @@ function renderUserInfo (user, showLogin, logOut) {
     return <button className="auth-status btn btn-link" onClick={showLogin}>Log In</button>;
   }
 }
-
-function renderNavLink (linkText, filterToMatch, pageFilter, setPageFilter) {
-  const matchesFilter = match => match ? match.url === `/${filterToMatch}` : pageFilter === filterToMatch;
-  const setFilter = () => setPageFilter(filterToMatch);
-
-  return (
-    <NavLink
-      to={`/${filterToMatch}`}
-      isActive={matchesFilter}
-      onClick={setFilter}
-    >
-      {linkText}
-    </NavLink>
-  );
-}

src/components/web-monitoring-ui.jsx

@@ -19,7 +19,6 @@ const api = new WebMonitoringDb({
 });
 
 const localApi = new WebMonitoringApi(api);
-
 /**
  * WebMonitoringUi represents the root container for the app. It also maintains
  * a top-level lsit of pages to share across the app. We do this here instead
@@ -34,9 +33,7 @@ export default class WebMonitoringUi extends React.Component {
   constructor (props) {
     super(props);
     this.state = {
-      assignedPages: null,
       isLoading: true,
-      pageFilter: '', // keeps track of which set of pages we are looking at
       pages: null,
       search: null,
       showLogin: false,
@@ -47,14 +44,9 @@ export default class WebMonitoringUi extends React.Component {
     this.afterLogin = this.afterLogin.bind(this);
     this.logOut = this.logOut.bind(this);
     this.loadPages = this.loadPages.bind(this);
-    this.setPageFilter = this.setPageFilter.bind(this);
     this.search = this.search.bind(this);
   }
 
-  setPageFilter (filter) {
-    this.setState({pageFilter: filter});
-  }
-
   showLogin () {
     this.setState({showLogin: true});
   }
@@ -65,9 +57,9 @@ export default class WebMonitoringUi extends React.Component {
 
   afterLogin (user) {
     // Clear page lists (they could have held not-logged-in errors)
-    this.setState({pages: null, assignedPages: null});
+    this.setState({pages: null});
     this.hideLogin();
-    this.loadPages(this.state.pageFilter);
+    this.loadPages();
   }
 
   logOut () {
@@ -78,41 +70,32 @@ export default class WebMonitoringUi extends React.Component {
 
   search (query) {
     this.setState({search: query});
-    this.loadPages(this.state.pageFilter);
+    this.loadPages();
   }
 
   /**
-   * Load pages depending on whether we want all pages or assigned pages.
+   * Load all pages.
    * @private
-   * @param {string} pageFilter Must be either 'assignedPages' or 'pages'
    *
-   * Sends a requests out to either db-api or localApi for pages and sets
-   * corresponding `assignedPages` or `pages` property of state and `pageFilter`.
+   * Sends a requests out to localApi for pages and sets `pages` property of state.
    * These are passed as props to various child components.
    */
-  loadPages (pageFilter) {
+  loadPages () {
     api.isLoggedIn()
       .then(loggedIn => {
         if (!loggedIn) {
           return Promise.reject(new Error('You must be logged in to view pages'));
         }
 
         const query = Object.assign({include_latest: true}, this.state.search);
-        if (pageFilter === 'assignedPages') {
-          return localApi.getPagesForUser(api.userData.email, null, query);
-        }
-        else {
-          return api.getPages(query);
-        }
+        
+        return api.getPages(query);
       })
       // Set state.pages = error; downstream code should check `pages` type.
       .catch(error => error)
       .then(pages => {
-        // TODO: differentiate between having no assignments (pages == null)
-        // and having no changes to your assigned pages (pages == [])
         this.setState({
-          [pageFilter]: pages || [],
-          pageFilter
+          pages: pages || []
         });
       });
   }
@@ -141,11 +124,11 @@ export default class WebMonitoringUi extends React.Component {
       return this.renderLoginDialog();
     }
 
-    const withData = (ComponentType, pageType) => {
+    const withData = (ComponentType) => {
       return (routeProps) => {
-        const pages = this.state[pageType];
+        const pages = this.state.pages;
         if (!pages) {
-          this.loadPages(pageType);
+          this.loadPages();
         }
         return <ComponentType
           {...routeProps}
@@ -165,26 +148,16 @@ export default class WebMonitoringUi extends React.Component {
             user={this.state.user}
             showLogin={this.showLogin}
             logOut={this.logOut}
-            pageFilter={this.state.pageFilter}
-            setPageFilter={this.setPageFilter}
           >
             <EnvironmentBanner apiUrl={api.url}/>
           </NavBar>
-          <Route exact path="/" render={() => {
-            if (this.state.user) {
-              return <Redirect to="/assignedPages" />;
-            } else {
-              return <Redirect to="/pages" />;
-            }
-          }}/>
-          <Route path="/pages" render={withData(PageList, 'pages')} />
-          <Route path="/assignedPages" render={withData(PageList, 'assignedPages')} />
+          <Route exact path="/" render={() => <Redirect to="/pages" />}/>
+          <Route path="/pages" render={withData(PageList)} />
           <Route path="/page/:pageId/:change?" render={(routeProps) =>
             <PageDetails
               {...routeProps}
               user={this.state.user}
-              pageFilter={this.state.pageFilter}
-              pages={this.state[this.state.pageFilter]}
+              pages={this.state.pages}
             />
           }/>
           <Route path="/version/:versionId" component={VersionRedirect} />