Merge branch 'release/19.11.0'

Author: jamescdavis

.eslintrc.js

@@ -34,6 +34,7 @@ module.exports = {
  'ember/new-module-imports': 'error',
  'ember/no-attrs-in-components': 'error',
  'ember/no-old-shims': 'error',
+ 'ember/routes-segments-snake-case': 'off',
  'import/export': 'off',
  'import/prefer-default-export': 'off',
  'no-restricted-globals': 'off',

CHANGELOG.md

@@ -4,6 +4,131 @@ 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).
 
+## [19.11.0] - 2019-12-16
+### Added
+- Components
+ - `institutions`
+ - `dashboard/departments-panel`
+ - `dashboard/institutional-users-list`
+ - `dashboard/panel`
+ - `dashboard/projects-panel`
+ - `Registries::DraftRegistrationManager`
+ - `Registries::SchemaBlockRenderer::Editable::Files`
+ - `Registries::SchemaBlockRenderer::ReadOnly::Files`
+ - `OsfLayout::RegistriesSideNav`
+ - `OsfLayout::RegistriesSideNav::Icon`
+ - `OsfLayout::RegistriesSideNav::Label`
+ - `OsfLayout::RegistriesSideNav::XLink`
+ - `PageLink`
+- Mirage
+ - Factories
+ - `institutional-user`
+ - Serializers
+ - `institutional-user`
+- Routes
+ - `institution`
+ - added `dashboard` nested route
+ - `guid-node`
+ - added `drafts` nested route
+- Engines
+ - Components
+ - `drafts/draft/-components/register`
+ - Routes
+ - `registries`
+ - `drafts.draft`, `draft/<draftId>`
+ - index route redirects to `draft/<draftId>/1`
+ - `drafts.draft.page`, `draft/<draftId>/<page>`
+- Utils
+ - `page-param`
+- Tests
+ - Integration
+ - `draft-registration-manager`
+ - `page-link`
+ - `registries-side-nav`
+ - Unit
+ - `page-param`
+ - Acceptance
+ - `draft form`
+- Environment
+ - Flags
+ - added `guid-node.drafts` route flag
+- Packages
+ - `ember-element-helper` v0.2.0
+
+### Changed
+- Components
+ - `paginated-list`
+ - added `isTable` attribute to use a `table` over an `ul`
+ - `sort-button`
+ - changed local `selected` classes to nested global classes
+ - `registries/schema-block-renderer/editable/**`
+ - `validated-input`
+ - Modified components to take in `onInput` callback.
+ - added `withStatSummary` trait
+ - `registries/partial-registration-modal`
+ - added `onContinue` hook
+ - `OsfLayout`
+ - renamed `left-nav` to `left-nav-old`
+ - created new `left-nav` that uses `registries-side-nav`
+- Mirage
+ - Factories
+ - `institution`
+ - added `withInstitutionalUsers` trait
+ - Scenarios
+ - `default`
+ - added `SchemaBlock` node with files and contributors
+- Models
+ - `base-file-item`
+ - added `createFolder`
+ - `draft-registration`
+ - added `registrationResponses`
+ - `file`
+ - added `toFileReference`
+ - `file-provider`
+ - use `rootFolder` instead of `files`
+ - added links
+ - `institution`
+ - added `currentUserIsAdmin` boolean
+ - added `statSummary` object
+ - `institutional-user`
+ - added `userGuid` string
+ - `registration`
+ - changed `draftRegistration` to be a relationship
+ - added `registrationResponses`
+ - added `includedNodeIds`
+ - added `createDoi`
+ - added `draftRegistrationId`
+ - removed `registrationChoice`
+ - removed `liftEmbargo`
+ - `registration-schema`
+ - added `schemaBlocks` inverse
+ - `schema-blocks`
+ - added `schema` relationship
+ - added `elementId` computed
+ - added `pageRouteParam` computed
+- Routes
+ - `institution`
+ - moved to `index` folder
+ - `registries.drafts.draft`
+ - added navigation
+ - `registries.overview`
+ - updated to use `leftNavOld`
+- Types
+ - Renamed `PageResponse` to `RegistrationResponse`
+- Tests
+ - `schema-block-renderer`
+ - added `files` block test
+
+### Removed
+- Tests
+ - unit, component tests using `FactoryGuy`
+ - `FactoryGuy` factories
+- Packages
+ - `ember-data-factory-guy`
+ - `ember-element-helper` (`fix-engines` branch)
+- Types
+ - `FactoryGuy` types
+
 ## [19.10.0] - 2019-10-02
 ### Added
 - Models
@@ -37,6 +162,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - `selected-list`
  - `upload-zone`
  - `widget`
+ - `registries/review-form-renderer`
+ - `schema-block-renderer/`
+ - `editable`
+ - `read-only`
 - Validators
  - `list` - apply a validator to a list
 - Tests
@@ -127,6 +256,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - darken background overlay
  - `registries/registries-metadata`
  - use `Subjects::Widget` and `Subjects::Display` (and related managers) for subjects editable field
+ - `schema-block-group-renderer`
+ - take in renderStrategy as mapper
+ - take variable for `registrationResponses`
+ - `schema-block-renderer`
+ - broke components into `editable` and `read-only` structures
 - Tests
  - renamed `taxonomy` to `subject` in `preprint-provider` FactoryGuy factory
  - Unit
@@ -135,6 +269,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - `serializers/taxonomy-test` renamed to `serializers/subject-test`
  - `models/preprint-test`
  - removed test for `subject` attribute
+ - Integration
+ - `registries/schema-block-group-renderer` updated to include `renderStrategy`
 - Mirage
  - Factories
  - `node`
@@ -221,7 +357,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - improved update acceptance tests to perform assertions in addition to taking snapshots
  - improved discover acceptance tests to perform assertions in addition to taking snapshots
 - Tests
- - added `ember-basic-dropdown-wormhole` div to test index.html 
+ - added `ember-basic-dropdown-wormhole` div to test index.html
 - Mirage
  - `osfNestedResource`
  - added `onCreate` hook to perform additional operations after creating a child resource

app/adapters/registration.ts

@@ -1,6 +1,7 @@
 import OsfAdapter from './osf-adapter';
 
 export default class RegistrationAdapter extends OsfAdapter {
+ parentRelationship = 'registeredFrom';
 }
 
 declare module 'ember-data/types/registries/adapter' {

app/app.ts

@@ -31,6 +31,7 @@ const App = Application.extend({
  'router',
  'ready',
  'osf-modal-state',
+ 'osf-router',
  ],
  },
  },
@@ -47,6 +48,8 @@ const App = Application.extend({
  'store',
  'toast',
  'osf-modal-state',
+ 'osf-router',
+ 'media',
  ],
  },
  },
@@ -69,6 +72,7 @@ const App = Application.extend({
  'status-messages',
  'store',
  'osf-modal-state',
+ 'osf-router',
  ],
  externalRoutes: {
  'guid-registration': 'guid-registration',
@@ -90,6 +94,7 @@ const App = Application.extend({
  'router',
  'head-data',
  'osf-modal-state',
+ 'osf-router',
  ],
  externalRoutes: {
  nodeForks: 'guid-node.forks',

app/authenticators/osf-cookie.ts

@@ -28,12 +28,16 @@ export default class OsfCookie extends Base {
  @service store!: DS.Store;
  @service currentUser!: CurrentUser;
 
+ lastVerifiedUserId?: string;
+
  /**
  * @method authenticate
  * @return {Promise}
  */
  async authenticate(): Promise<object> {
  const url = `${apiUrl}/${apiNamespace}/`;
+
+ // The API's root endpoint returns info on the current user, based on the request's auth cookie.
  let res: RootDocument = await this.currentUser.authenticatedAJAX(
  { url },
  );
@@ -70,16 +74,37 @@ export default class OsfCookie extends Base {
  }
 
  if (!userData) {
+ this.set('lastVerifiedUserId', null);
  throw new NotLoggedIn();
  }
 
  // Push the user into the store for later use
  this.store.pushPayload(userData);
 
- return { id: userData.data.id };
+ const { id } = userData.data;
+ this.set('lastVerifiedUserId', id);
+ return { id };
  }
 
  restore() {
+ const {
+ lastVerifiedUserId,
+ session: {
+ data,
+ isAuthenticated,
+ },
+ } = this;
+
+ if (
+ isAuthenticated &&
+ lastVerifiedUserId &&
+ data &&
+ data.authenticated.id === lastVerifiedUserId
+ ) {
+ // Everything is in order, no need to re-auth
+ return undefined;
+ }
+
  // Check for a valid auth cookie.
  // If it fails, the session will be invalidated.
  return this.authenticate();

app/guid-node/drafts/index/route.ts

@@ -0,0 +1,7 @@
+import Route from '@ember/routing/route';
+
+export default class GuidNodeDraftsIndex extends Route {
+ model() {
+ this.replaceWith('registries.drafts.draft', this.modelFor('guid-node.drafts'));
+ }
+}

app/guid-node/drafts/register/route.ts

@@ -0,0 +1,7 @@
+import Route from '@ember/routing/route';
+
+export default class GuidNodeDraftsRegister extends Route {
+ model() {
+ this.replaceWith('registries.drafts.draft.page', this.modelFor('guid-node.drafts'), 'review');
+ }
+}

app/guid-node/drafts/route.ts

@@ -0,0 +1,7 @@
+import Route from '@ember/routing/route';
+
+export default class GuidNodeDrafts extends Route {
+ model(params: { draftId: string }) {
+ return params.draftId;
+ }
+}

app/guid-node/registrations/controller.ts

@@ -2,16 +2,13 @@ import { action, computed } from '@ember-decorators/object';
 import { alias } from '@ember-decorators/object/computed';
 import { service } from '@ember-decorators/service';
 import Controller from '@ember/controller';
+import { assert } from '@ember/debug';
 import { task } from 'ember-concurrency';
 import DS from 'ember-data';
-import config from 'ember-get-config';
 
 import Node from 'ember-osf-web/models/node';
 import RegistrationSchema from 'ember-osf-web/models/registration-schema';
 import Analytics from 'ember-osf-web/services/analytics';
-import pathJoin from 'ember-osf-web/utils/path-join';
-
-const { OSF: { url: baseURL } } = config;
 
 export default class GuidNodeRegistrations extends Controller {
  @service analytics!: Analytics;
@@ -100,6 +97,9 @@ export default class GuidNodeRegistrations extends Controller {
 
  @action
  async createDraft(this: GuidNodeRegistrations) {
+ const branchedFrom = this.node!;
+ assert('Check that the node exists', Boolean(branchedFrom));
+
  if (this.selectedSchema.name === 'Prereg Challenge' && this.newModalOpen) {
  this.set('newModalOpen', false);
  this.set('preregConsented', false);
@@ -108,14 +108,17 @@ export default class GuidNodeRegistrations extends Controller {
  }
  const draftRegistration = this.store.createRecord('draft-registration', {
  registrationSupplement: this.selectedSchema.id,
- branchedFrom: this.node,
+ branchedFrom,
  registrationSchema: this.selectedSchema,
  });
  await draftRegistration.save();
  this.set('newModalOpen', false);
  this.set('selectedSchema', this.defaultSchema);
- window.location.assign(
- pathJoin(baseURL, draftRegistration.branchedFrom.get('id'), 'drafts', draftRegistration.id),
+
+ this.transitionToRoute(
+ 'guid-node.drafts',
+ branchedFrom.id,
+ draftRegistration.id,
  );
  }
 }

app/home/-components/hero-banner/component.ts

@@ -1,5 +1,5 @@
 import { tagName } from '@ember-decorators/component';
-import { action, computed } from '@ember-decorators/object';
+import { action } from '@ember-decorators/object';
 import { alias } from '@ember-decorators/object/computed';
 import { service } from '@ember-decorators/service';
 import Component from '@ember/component';
@@ -21,14 +21,9 @@ const { featureFlagNames: { ABTesting } } = config;
 export default class HomeHeroBanner extends Component {
  @service features!: Features;
 
- @alias(`features.${camelize(ABTesting.homePageVersionB)}`)
+ @alias(`features.${camelize(ABTesting.homePageHeroTextVersionB)}`)
  shouldShowVersionB!: boolean;
 
- @computed('shouldShowVersionB')
- get version(): string {
- return this.shouldShowVersionB ? 'versionB' : 'versionA';
- }
-
  @action
  search(query: string) {
  const { search } = serviceLinks;