[WIP] remove assigned pages

Author: SYU15

.env.example

@@ -14,8 +14,6 @@ GOOGLE_SHEETS_PRIVATE_KEY=-----BEGIN PRIVATE KEY-----\EXAMPLEExampleG9w0BAQEFAAS
 
 # IDs of each Google Sheet used. To determine a sheet’s ID, see:
 # https://developers.google.com/sheets/api/guides/concepts#spreadsheet_id
-# Sheet that maps users to their assigned sites
-GOOGLE_TASK_SHEET_ID=example_sdf8Za7sdft39a_osnzhJBI2dsftasdf
 # Sheet where changes marked as “important” are saved
 GOOGLE_IMPORTANT_CHANGE_SHEET_ID=example_sdf8Za7sdft39a_osnzhJBI2dsftasdf
 # Sheet where changes in the “dictionary” (of insignificant changes) are saved

DEPLOYMENT.md

@@ -20,8 +20,6 @@ In our deployment, environment variables are named:
 6. `GOOGLE_IMPORTANT_CHANGE_SHEET_ID`
 7. `GOOGLE_DICTIONARY_SHEET_ID`
 
-All are optional, but you will need to set the `GOOGLE_*` variables if you want to use the “assigned pages” feature (see the “Google Sheets” section of [README.md](./README.md) for more details).
-
 ## Shell script
 
 The script takes 2 arguments that are optional.

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 user tasking, 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
@@ -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

@@ -20,7 +20,6 @@ export default ({children = null, title = 'EDGI Web Monitoring', user = null, sh
         <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>{renderUserInfo(user, showLogin, logOut)}</li>
       </ul>

src/components/web-monitoring-ui.jsx

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import AriaModal from 'react-aria-modal';
 import {BrowserRouter as Router, Redirect, Route} from 'react-router-dom';
-import WebMonitoringApi from '../services/web-monitoring-api';
 import WebMonitoringDb from '../services/web-monitoring-db';
 import EnvironmentBanner from './environment-banner';
 import Loading from './loading';
@@ -18,8 +17,6 @@ const api = new WebMonitoringDb({
   url: configuration.WEB_MONITORING_DB_URL
 });
 
-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,7 +31,6 @@ 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,
@@ -65,7 +61,7 @@ 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);
   }
@@ -82,12 +78,11 @@ export default class WebMonitoringUi extends React.Component {
   }
 
   /**
-   * 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'
+   * @param {string} pageFilter Must be '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 ocalApi for pages and sets `pages` property of state and `pageFilter`.
    * These are passed as props to various child components.
    */
   loadPages (pageFilter) {
@@ -98,23 +93,19 @@ export default class WebMonitoringUi extends React.Component {
         }
 
         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
         });
-      });
+      })
+      // Set state.pages = error; downstream code should check `pages` type.
+      .catch(error => error);
   }
 
   loadUser () {
@@ -170,15 +161,8 @@ export default class WebMonitoringUi extends React.Component {
           >
             <EnvironmentBanner apiUrl={api.url}/>
           </NavBar>
-          <Route exact path="/" render={() => {
-            if (this.state.user) {
-              return <Redirect to="/assignedPages" />;
-            } else {
-              return <Redirect to="/pages" />;
-            }
-          }}/>
+          <Route exact path="/" render={() => <Redirect to="/pages" />}/>
           <Route path="/pages" render={withData(PageList, 'pages')} />
-          <Route path="/assignedPages" render={withData(PageList, 'assignedPages')} />
           <Route path="/page/:pageId/:change?" render={(routeProps) =>
             <PageDetails
               {...routeProps}
@@ -210,11 +194,10 @@ export default class WebMonitoringUi extends React.Component {
   }
 
   getChildContext () {
-    return {api, localApi};
+    return { api };
   }
 }
 
 WebMonitoringUi.childContextTypes = {
-  api: PropTypes.instanceOf(WebMonitoringDb),
-  localApi: PropTypes.instanceOf(WebMonitoringApi)
+  api: PropTypes.instanceOf(WebMonitoringDb)
 };

src/services/__tests__/web-monitoring-api.test.js

@@ -37,51 +37,4 @@ describe('WebMonitoringApi', () => {
       start: new Date('2017-01-01')
     });
   });
-
-  test('getDomainsForUser() returns parsed data', () => {
-    fetch.mock('begin:/api/domains/', {domains: ['first', 'second']});
-    return expect(api.getDomainsForUser('x'))
-      .resolves
-      .toEqual(['first', 'second']);
-  });
-
-  test('getDomainsForUser() rejects for users without assignments', () => {
-    fetch.mock('begin:/api/domains/', {error: 'NOT_FOUND'});
-    return expect(api.getDomainsForUser('x')).rejects.toBeTruthy();
-  });
-
-  test('getDomainsForUser() rejects for bad input', () => {
-    return expect(api.getDomainsForUser()).rejects.toBeTruthy();
-  });
-
-  test('getPagesForUser() calls through to WebMonitoringDb', () => {
-    fetch
-      .mock('begin:/api/timeframe', {
-        duration: 259200,
-        end: '2017-01-04',
-        start: '2017-01-01'
-      })
-      .mock('begin:/api/domains/', {domains: ['first', 'second']});
-
-    expect(api.getPagesForUser('x')).resolves.toEqual([
-      {url: 'a', tags: [{name: 'site:first'}]},
-      {url: 'b', tags: [{name: 'site:second'}]},
-      {url: 'c', tags: [{name: 'site:second'}]}
-    ]);
-  });
-
-  test.skip('getPagesForUser() does not have duplicate entries', () => {
-    fetch
-      .mock('begin:/api/timeframe', {
-        duration: 259200,
-        end: '2017-01-04',
-        start: '2017-01-01'
-      })
-      .mock('begin:/api/domains/', {domains: ['first', 'first']});
-
-    expect(api.getPagesForUser('x')).resolves.toEqual([
-      {url: 'a', site: 'first'}
-    ]);
-  });
-
 });

src/services/web-monitoring-api.js

@@ -36,56 +36,6 @@ export default class WebMonitoringApi {
       });
   }
 
-  /**
-     * Get a list of domains assigned to a given user.
-     * @param {string} username
-     * @returns {Promise<string[]>}
-     */
-  getDomainsForUser (username) {
-    if (!username) {
-      return Promise.reject(new TypeError('The first argument to getDomainsForUser() must be a string.'));
-    }
-
-    const url = `/api/domains/${username}`;
-    return fetch(url)
-      .then(response => response.json())
-      .then(data => {
-        if (data.error) {
-          throw new Error(data.error);
-        }
-
-        return data.domains;
-      });
-  }
-
-  /**
-     * Get a list of pages a user should analyze based on their assigned
-     * domains and the analysis timeframe.
-     *
-     * This promise can resolve to an array of pages OR to `null`, which
-     * indicates the user has no assigned pages to monitor (an empty array of
-     * pages means none of their pages were updated in the given timeframe).
-     *
-     * @param {string} username
-     * @param {AnalysisTimeframe} [timeframe] If omitted, defaults to current
-     * @param {object} [query] Additional query options for getting pages
-     * @returns {Promise<Page[]>}
-     */
-  getPagesForUser (username, timeframe, query = {}) {
-    const domainsRequest = this.getDomainsForUser(username);
-    const timeframeRequest = Promise.resolve(timeframe || this.getCurrentTimeframe());
-
-    return Promise.all([domainsRequest, timeframeRequest])
-      .then(([domains, timeframe]) => {
-        if (domains.length === 0) return null;
-        return this._getPagesByDomains(
-          domains,
-          this._dateRangeString(timeframe),
-          query
-        );
-      });
-  }
-
   /**
      * Add change information to the dictionary of insignificant changes in
      * Google sheets.