Merge branch 'release/19.3.0'

Author: jamescdavis

.eslintrc.js

@@ -3,14 +3,14 @@ module.exports = {
  server: true,
  },
  root: true,
- parser: 'typescript-eslint-parser',
+ parser: '@typescript-eslint/parser',
  parserOptions: {
  ecmaVersion: 2017,
  sourceType: 'module',
  },
  extends: '@centerforopenscience/eslint-config/ember',
  plugins: [
- 'typescript',
+ '@typescript-eslint',
  ],
  env: {
  browser: true,
@@ -37,6 +37,12 @@ module.exports = {
  'import/export': 'off',
  'import/prefer-default-export': 'off',
  'no-restricted-globals': 'off',
+ 'space-before-function-paren': ['error', {
+ anonymous: 'never',
+ named: 'never',
+ asyncArrow: 'always',
+ }],
+ 'no-underscore-dangle': 'off',
  },
  overrides: [
  {
@@ -60,6 +66,7 @@ module.exports = {
  rules: {
  'no-useless-constructor': 'off',
  'space-infix-ops': 'off',
+ 'no-shadow': 'off',
  },
  },
  {
@@ -73,6 +80,25 @@ module.exports = {
  rules: {
  'no-await-in-loop': 'off',
  'ember/avoid-leaking-state-in-components': 'off',
+ 'ember/avoid-leaking-state-in-ember-objects': 'off',
+ },
+ },
+ {
+ files: ['mirage/**/*'],
+ rules: {
+ 'ember/avoid-leaking-state-in-ember-objects': 'off',
+ },
+ },
+ {
+ files: ['lib/*/index.js'],
+ rules: {
+ 'ember/avoid-leaking-state-in-ember-objects': 'off',
+ },
+ },
+ {
+ files: ['lib/*/addon/engine.js'],
+ rules: {
+ 'ember/avoid-leaking-state-in-ember-objects': 'off',
  },
  },
  ],

CHANGELOG.md

@@ -4,6 +4,33 @@ 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.3.0]
+### Added
+- Addons:
+ - `ember-changesets`
+- Components:
+ - `institutions-widget` - has a list of institutions associated with a node. Has a modal to add/remove
+ - `institutions-list` - shows a list of institutions
+ - `institution-select-list` - a checkbox list of institutions a user can select
+ - `placeholder`
+ - `circle` - a placeholder for circlular elements
+- Routes:
+ - `new-home` - new logged out home page route
+ - `settings/account/change-password` - Panel for changing a user's password
+ - `password-strength-bar` - Shows the strength of a given password
+ - `support` - updated language and links
+
+### Changed
+- Components
+ - `validated-model-form` - use changesets automatically
+
+### Removed
+- Components
+ - `settings/account/request-export`
+
+### Fixed
+- `osf-navbar/auth-dropdown` - make sure `campaign` and `next` query params are included in link to register
+
 ## [19.2.0] - 2019-03-04
 ### Added
 - Components:
@@ -63,6 +90,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
  - Use a production build for handbook
 - OSF API
  - Bump version from 2.8 to 2.14
+- Linting
+ - upgraded to latest versions of:
+ - eslint-plugin-typescript -> @typescript-eslint/eslint-plugin
+ - typescript-eslint-parser -> @typescript-eslint/eslint-parser (now a dep of @typescript-eslint/eslint-plugin)
+ - ember-cli-eslint (upgrade required to get eslint 5, for compatibility with @typescript-eslint/eslint-plugin)
+ - eslint-plugin-ember (upgrade required for compatibility with ember-cli-eslint)
+ - eslint-config-airbnb-base (upgrade required for compatibility with eslint 5)
+ - eslint-plugin-eslint-comments (upgrade required for compatibility with eslint 5)
+ - made style and config changes so that linting passes after above upgrades
 
 ### Removed
 - Components:
@@ -698,7 +734,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/0.7.0...HEAD
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.2.0...HEAD
+[19.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.1.2...19.2.0
+[19.1.2]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.1.1...19.1.2
+[19.1.1]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.1.0...19.1.1
+[19.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.0.2...19.1.0
+[19.0.2]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.0.1...19.0.2
+[19.0.1]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.0.0...19.0.1
+[19.0.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.2.2...19.0.0
+[18.2.2]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.2.1...18.2.2
+[18.2.1]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.2.0...18.2.1
+[18.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.1.2...18.2.0
+[18.1.2]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.1.1...18.1.2
+[18.1.1]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.1.0...18.1.1
+[18.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/18.0.0...18.1.0
+[18.0.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/0.7.0...18.0.0
 [0.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/0.6.1...0.7.0
 [0.6.1]: https://github.com/CenterForOpenScience/ember-osf-web/compare/0.6.0...0.6.1
 [0.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/compare/0.5.2...0.6.1

app/adapters/user-password.ts

@@ -0,0 +1,25 @@
+import config from 'ember-get-config';
+
+import OsfAdapter from './osf-adapter';
+
+const {
+ OSF: {
+ apiUrl: host,
+ apiNamespace: namespace,
+ },
+} = config;
+
+export default class UserPasswordAdapter extends OsfAdapter {
+ urlForCreateRecord(): string {
+ if (this.currentUser && this.currentUser.user && this.currentUser.user.id) {
+ return `${host}/${namespace}/users/${this.currentUser.user.id}/settings/password/`;
+ }
+ throw Error('Must provide valid user');
+ }
+}
+
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ 'user-password': UserPasswordAdapter;
+ } // eslint-disable-line semi
+}

app/app.ts

@@ -9,6 +9,7 @@ const App = Application.extend({
  modulePrefix,
  Resolver,
 
+ // eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
  engines: {
  collections: {
  dependencies: {

app/application/-components/verify-email-modal/component.ts

@@ -115,18 +115,17 @@ export default class VerifyEmailModal extends Component.extend({
  verifyError: 'verifyEmail.add.verifyError',
  denyError: 'verifyEmail.add.denyError',
  };
- } else {
- return {
- header: 'verifyEmail.merge.header',
- body: 'verifyEmail.merge.body',
- verifyButton: 'verifyEmail.merge.verifyButton',
- denyButton: 'verifyEmail.merge.denyButton',
- verifySuccess: 'verifyEmail.merge.verifySuccess',
- denySuccess: 'verifyEmail.merge.denySuccess',
- verifyError: 'verifyEmail.merge.verifyError',
- denyError: 'verifyEmail.merge.denyError',
- };
  }
+ return {
+ header: 'verifyEmail.merge.header',
+ body: 'verifyEmail.merge.body',
+ verifyButton: 'verifyEmail.merge.verifyButton',
+ denyButton: 'verifyEmail.merge.denyButton',
+ verifySuccess: 'verifyEmail.merge.verifySuccess',
+ denySuccess: 'verifyEmail.merge.denySuccess',
+ verifyError: 'verifyEmail.merge.verifyError',
+ denyError: 'verifyEmail.merge.denyError',
+ };
  }
 
  constructor(...args: any[]) {

app/const/service-links.ts

@@ -11,11 +11,11 @@ const serviceLinks = {
  preprintsDiscover: `${osfUrl}preprints/discover/`,
  preprintsHome: `${osfUrl}preprints/`,
  preprintsSubmit: `${osfUrl}preprints/submit/`,
- preprintsSupport: 'http://help.osf.io/m/preprints/',
+ preprintsSupport: 'https://openscience.zendesk.com/hc/en-us/categories/360001530554',
  profile: `${osfUrl}profile/`,
  registriesDiscover: `${osfUrl}registries/discover/`,
  registriesHome: `${osfUrl}registries/`,
- registriesSupport: 'http://help.osf.io/m/registrations/',
+ registriesSupport: 'https://openscience.zendesk.com/hc/en-us/categories/360001550953',
  search: `${osfUrl}search/`,
  settings: `${osfUrl}settings/`,
  reviewsHome: `${osfUrl}reviews/`,

app/dashboard/controller.ts

@@ -76,6 +76,7 @@ export default class Dashboard extends Controller {
 
  const nodes: QueryHasManyResult<Node> = yield user.queryHasMany('nodes', {
  embed: ['contributors', 'parent', 'root'],
+ // eslint-disable-next-line ember/no-global-jquery
  filter: this.filter ? { title: $('<div>').text(this.filter).html() } : undefined,
  page: more ? this.incrementProperty('page') : this.set('page', 1),
  sort: this.sort || undefined,

app/decorators/check-auth.ts

@@ -48,7 +48,7 @@ export default function checkAuth<T extends ConcreteSubclass<Route>>(
  'error-no-api',
  transitionTargetURL(transition).slice(1),
  );
- return;
+ return undefined;
  }
  }
  // In any case, let the route load normally.

app/guid-node/forks/controller.ts

@@ -33,7 +33,7 @@ export default class GuidNodeForks extends Controller {
  @computed('node')
  get nodeType(this: GuidNodeForks) {
  if (!this.node) {
- return;
+ return undefined;
  }
  return this.node.parent ? 'component' : 'project';
  }

app/guid-node/registrations/controller.ts

@@ -48,9 +48,7 @@ export default class GuidNodeRegistrations extends Controller {
  },
  });
  schemas = schemas.toArray();
- schemas.sort((a: RegistrationSchema, b: RegistrationSchema) => {
- return a.name.length - b.name.length;
- });
+ schemas.sort((a: RegistrationSchema, b: RegistrationSchema) => a.name.length - b.name.length);
  this.set('defaultSchema', schemas.firstObject);
  this.set('selectedSchema', this.defaultSchema);
  this.set('schemas', schemas);
@@ -63,7 +61,7 @@ export default class GuidNodeRegistrations extends Controller {
  return this.tab ? this.tab : 'registrations';
  }
 
- @computed('node.id', 'node.root.id', 'node.root.userHasAdminPermission')
+ @computed('node.{id,root.id,root.userHasAdminPermission}')
  get isComponentRootAdmin() {
  return this.node && this.node.id !== this.node.root.get('id') && this.node.root.get('userHasAdminPermission');
  }