Merge branch 'release/0.7.0'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,45 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2018-08-07
+### Added
+- Models:
+    - `region` - for storage i18n
+- Components:
+    - `cookie-banner` - notify logged-out users the site uses cookies
+- Feature Flags:
+    - `storage_i18n` - enable region selector on project creation
+- Assets:
+    - images for home page
+    - images for dashboard
+- Third-party Packages:
+    - `qunit-dom` - Better test assetions (especially for hidden things)
+    - `ember-test-selectors` - Find things in your dom without messing everything up
+- Tests:
+    - `dashboard` - more application tests
+- Misc:
+    - `keen` metrics adapter configured for anonymized IP addresses
+    - CSRF support on all ajax requests
+- DX:
+    - `ember-cli-mirage` factories for users, nodes, contributors, and institutions
+    - resources to the handbook
+
+### Changed
+- Models:
+    - `node` - add `region` relationship
+    - `user` - add `defaultRegion` relationship
+- Components:
+    - `maintenance-banner` - set cookie on dismiss and check cookie before showing
+    - `osf-footer` - remove Google Plus logo/link
+- Services:
+    - `analytics` - support multiple metrics adapters
+- Routes:
+    - `guid-node` - add `join-osf-banner`
+    - `home` - replace testimonial and use local assets
+    - `dashboard` - use local assets
+- DX:
+  - enable sourcemap generation by default
+
 ## [0.6.1] - 2018-07-31
 ### Changed
 - local storage key used for `ember-simple-auth`
@@ -35,6 +74,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - Dashboard filtering
   - User quick files page (more event tracking)
   - Quick files detail page (event tracking)
+- Mirage/Tests:
+  - Factories (and supporting code) for Mirage and the Dashboard
+  - Dashboard application test
 
 ### Changed
 - Components:

app/adapters/osf-adapter.ts

@@ -5,10 +5,11 @@ import config from 'ember-get-config';
 import { pluralize } from 'ember-inflector';
 import Session from 'ember-simple-auth/services/session';
 
+import CurrentUser from 'ember-osf-web/services/current-user';
+
 const { JSONAPIAdapter } = DS;
 const {
     OSF: {
-        apiHeaders,
         apiUrl: host,
         apiNamespace: namespace,
     },
@@ -41,7 +42,6 @@ enum RequestType {
 export default class OsfAdapter extends JSONAPIAdapter.extend({
     host,
     namespace,
-    headers: apiHeaders,
 
     /**
      * Overrides buildQuery method - Allows users to embed resources with findRecord
@@ -129,6 +129,12 @@ export default class OsfAdapter extends JSONAPIAdapter.extend({
     },
 }) {
     @service session!: Session;
+    @service currentUser!: CurrentUser;
+
+    get headers() {
+        // Not a computed; evaluate every time in case something changes
+        return this.currentUser.ajaxHeaders();
+    }
 
     handleResponse(
         status: number,

app/adapters/region.ts

@@ -0,0 +1,9 @@
+import OsfAdapter from './osf-adapter';
+
+export default class RegionSerializer extends OsfAdapter {}
+
+declare module 'ember-data' {
+    interface AdapterRegistry {
+        'region': RegionSerializer;
+    }
+}

app/application/template.hbs

@@ -12,5 +12,6 @@
         {{outlet}}
     </div>
     {{osf-footer}}
+    {{cookie-banner}}
     {{osf-mode-footer}}
 </div>

app/authenticators/osf-cookie.ts

@@ -7,7 +7,7 @@ import Base from 'ember-simple-auth/authenticators/base';
 import Session from 'ember-simple-auth/services/session';
 
 import { NotLoggedIn } from 'ember-osf-web/errors';
-import authenticatedAJAX from 'ember-osf-web/utils/ajax-helpers';
+import CurrentUser from 'ember-osf-web/services/current-user';
 
 const {
     OSF: {
@@ -30,13 +30,14 @@ export default class OsfCookie extends Base {
     @service features!: Features;
     @service session!: Session;
     @service store!: DS.Store;
+    @service currentUser!: CurrentUser;
 
     /**
      * @method authenticate
      * @return {Promise}
      */
     async authenticate(): Promise<object> {
-        const res: ApiRootResponse = await authenticatedAJAX({
+        const res: ApiRootResponse = await this.currentUser.authenticatedAJAX({
             url: `${apiUrl}/${apiNamespace}/`,
         });
 
@@ -69,7 +70,7 @@ export default class OsfCookie extends Base {
     }
 
     async _checkApiVersion() {
-        const res: ApiRootResponse = await authenticatedAJAX(
+        const res: ApiRootResponse = await this.currentUser.authenticatedAJAX(
             {
                 url: `${apiUrl}/${apiNamespace}/`,
                 data: {

app/dashboard/controller.ts

@@ -1,16 +1,27 @@
 import { action, computed } from '@ember-decorators/object';
-import { alias, oneWay, or } from '@ember-decorators/object/computed';
+import { alias, or } from '@ember-decorators/object/computed';
 import { service } from '@ember-decorators/service';
 import { A } from '@ember/array';
 import Controller from '@ember/controller';
-import { task, timeout } from 'ember-concurrency';
+import { all, task, timeout } from 'ember-concurrency';
 import DS from 'ember-data';
+import config from 'ember-get-config';
+
 import Institution from 'ember-osf-web/models/institution';
 import Node from 'ember-osf-web/models/node';
+import Region from 'ember-osf-web/models/region';
 import User from 'ember-osf-web/models/user';
 import Analytics from 'ember-osf-web/services/analytics';
 import CurrentUser from 'ember-osf-web/services/current-user';
 
+// TODO pull these from the database
+const {
+    dashboard: {
+        noteworthyNode,
+        popularNode,
+    },
+} = config;
+
 interface QueryHasManyResponse<T> extends Array<T> {
     meta?: {
         total?: number;
@@ -36,13 +47,24 @@ export default class Dashboard extends Controller {
     'failedLoading-noteworthy': boolean = false;
     'failedLoading-popular': boolean = false;
 
-    institutions = A([]);
+    institutions: Institution[] = A([]);
     nodes: QueryHasManyResponse<Node> = A([]);
     noteworthy = A([]);
     popular = A([]);
 
-    getInstitutions = task(function *(this: Dashboard) {
-        this.set('institutions', yield this.get('store').findAll('institution'));
+    setupTask = task(function *(this: Dashboard) {
+        this.set('filter', null);
+
+        const institutions = this.store.findAll('institution');
+
+        yield all([
+            institutions,
+            this.get('findNodes').perform(),
+            this.get('getPopularAndNoteworthy').perform(popularNode, 'popular'),
+            this.get('getPopularAndNoteworthy').perform(noteworthyNode, 'noteworthy'),
+        ]);
+
+        this.set('institutions', institutions.toArray());
     }).restartable();
 
     filterNodes = task(function *(this: Dashboard, filter: string) {
@@ -96,30 +118,39 @@ export default class Dashboard extends Controller {
         return yield user.queryHasMany('nodes', { filter: { title } });
     }).restartable();
 
-    createNode = task(function *(this: Dashboard, title: string, description: string, templateFrom: Node) {
+    createNode = task(function *(
+        this: Dashboard,
+        title: string,
+        description: string,
+        institutions: Institution[],
+        templateFrom?: Node,
+        storageRegion?: Region,
+    ) {
         if (!title) {
             return;
         }
-        const store = this.get('store');
-        const data = {
+        const node = this.store.createRecord('node', {
             category: 'project',
             description,
             public: false,
-            templateFrom,
             title,
-        };
-        const node = store.createRecord('node', data);
-        const institutions = this.get('institutionsSelected');
+        });
+
+        if (templateFrom) {
+            node.set('templateFrom', templateFrom.id);
+        }
         if (institutions.length) {
             node.set('affiliatedInstitutions', institutions.slice());
         }
+        if (storageRegion) {
+            node.set('region', storageRegion);
+        }
         yield node.save();
 
         this.set('newNode', node);
     }).drop();
 
     @alias('currentUser.user') user!: User;
-    @oneWay('user.institutions') institutionsSelected!: DS.PromiseManyArray<Institution> | Institution[];
 
     @or('nodes.length', 'filter', 'findNodes.isRunning') hasNodes!: boolean;
 
@@ -139,27 +170,6 @@ export default class Dashboard extends Controller {
         this.get('findNodes').perform();
     }
 
-    @action
-    selectInstitution(this: Dashboard, institution: Institution) {
-        const selected = this.set('institutionsSelected', this.get('institutionsSelected').slice());
-
-        if (selected.includes(institution)) {
-            selected.removeObject(institution);
-        } else {
-            selected.pushObject(institution);
-        }
-    }
-
-    @action
-    selectAllInstitutions(this: Dashboard) {
-        this.set('institutionsSelected', this.get('user').get('institutions').slice());
-    }
-
-    @action
-    removeAllInstitutions(this: Dashboard) {
-        this.set('institutionsSelected', A([]));
-    }
-
     @action
     toggleModal(this: Dashboard) {
         if (this.get('modalOpen')) {

app/dashboard/route.ts

@@ -1,7 +1,6 @@
 import { action } from '@ember-decorators/object';
 import { service } from '@ember-decorators/service';
 import Route from '@ember/routing/route';
-import config from 'ember-get-config';
 import Session from 'ember-simple-auth/services/session';
 
 import DashboardController from 'ember-osf-web/dashboard/controller';
@@ -10,14 +9,6 @@ import Analytics from 'ember-osf-web/services/analytics';
 import CurrentUser from 'ember-osf-web/services/current-user';
 import Ready from 'ember-osf-web/services/ready';
 
-// TODO pull these from the database
-const {
-    dashboard: {
-        noteworthyNode,
-        popularNode,
-    },
-} = config;
-
 @requireAuth('home')
 export default class Dashboard extends Route {
     @service analytics!: Analytics;
@@ -27,16 +18,9 @@ export default class Dashboard extends Route {
 
     async setupController(this: Dashboard, controller: DashboardController): Promise<void> {
         const blocker = this.get('ready').getBlocker();
-        controller.set('filter', null);
 
         try {
-            await Promise.all([
-                controller.get('findNodes').perform(),
-                controller.get('getInstitutions').perform(),
-                controller.get('getPopularAndNoteworthy').perform(popularNode, 'popular'),
-                controller.get('getPopularAndNoteworthy').perform(noteworthyNode, 'noteworthy'),
-            ]);
-
+            await controller.get('setupTask').perform();
             blocker.done();
         } catch (e) {
             blocker.errored(e);

app/dashboard/styles.scss

@@ -1,7 +1,7 @@
 /* stylelint-disable */
 .quickSearch {
     min-height: 700px;
-    background: #C5D6E6 url('/static/img/bg6.jpg') top center repeat-y;
+    background: #C5D6E6 url('/assets/images/dashboard/bg6.jpg') top center repeat-y;
     background-size: cover;
 }
 
@@ -24,7 +24,7 @@
 }
 
 .bg-web {
-    background: #166595 url("/static/img/front-page/bg-web.png") no-repeat center top;
+    background: #166595 url("/assets/images/home/bg-web.png") no-repeat center top;
     background-size: cover;
 }
 
@@ -37,17 +37,6 @@
     color: $color-text-white;
 }
 
-// .prereg {
-//     background: #C5D6E6 url("/static/img/bg6.jpg") no-repeat center top;
-//     background-size: cover;
-
-// }
-
-// .prereg-banner {
-//     background: $color-bg-blue-dark;
-//     color: $color-text-white;
-// }
-
 .preprints {
     background: $color-bg-gray-blue-dark;
     color: $color-text-white;
@@ -185,26 +174,3 @@
     color: $color-text-placeholder-grey-dark;
     opacity: 1;
 }
-
-// ::-webkit-input-placeholder {
-//     /* Webkit, Blink, Edge */
-//     color: $color-text-placeholder-grey-dark;
-// }
-// :-moz-placeholder {
-//     /* Mozilla Firefox 4 to 18 */
-//     color: $color-text-placeholder-grey-dark;
-//     opacity: 1;
-// }
-// ::-moz-placeholder {
-//     /* Mozilla Firefox 19+ */
-//     color: $color-text-placeholder-grey-dark;
-//     opacity: 1;
-// }
-// :-ms-input-placeholder {
-//     /* Internet Explorer 10-11 */
-//     color: $color-text-placeholder-grey-dark;
-// }
-// ::-ms-input-placeholder {
-//     /* Microsoft Edge */
-//     color: $color-text-placeholder-grey-dark;
-// }