Merge branch 'release/19.1.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',
+ 'import/export': 'off',
  'import/prefer-default-export': 'off',
  'no-restricted-globals': 'off',
  },

.template-lintrc.js

@@ -8,7 +8,9 @@ module.exports = {
  rules: {
  'block-indentation': 4,
  'no-bare-strings': true,
+ 'no-implicit-this': true,
  'no-nested-interactive': false,
+ quotes: 'single',
  },
 
  ignore: [

.travis.yml

@@ -17,7 +17,7 @@ jobs:
  include:
  - stage: "test"
  if: |
- branch ~= /^develop$|^master$|^\d+\.\d+\.\d+$|^release\/.+$/ OR \
+ branch ~= /^develop$|^master$|^release\/.+$/ OR \
  type = pull_request OR \
  env(RESTRICT_PUSH_BUILDS) != true
  addons:

CHANGELOG.md

@@ -4,6 +4,41 @@ 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.1.0] - 2019-01-23
+### Added
+- Addons:
+ - `loaders-css` - For animated loading indicators
+- Components:
+ - `settings.account.-components.security` - Two-factor authentication panel.
+ - `osf-button` - our new, use-everywhere button component
+- Models:
+ - `user-setting`
+- Routes:
+ - `settings.account`
+- Styles:
+ - All styles from `osf-style`
+- Validators:
+ - `httpUrl` - validates that a string looks like an http url
+
+### Changed
+- Addons:
+ - `ember-cli-mirage@0.4.10`
+ - `ember-qunit@3.4.4`
+ - `ember-cli-qunit@4.4.0`
+ - `ember-cli-sass@8.0.1`
+- Components:
+ - `contributor-list` - takes an optional parameter `truncated`
+- Models:
+ - `developer-app` - use custom `httpUrl` validator for urls
+- Templates:
+ - `no-implicit-this` template rule activated
+- Types:
+ - upgrade to ember and ember-data 3.x types
+
+### Removed
+- Addons:
+ - `osf-style`
+
 ## [19.0.2] - 2019-01-08
 ### Changed
 - Routes

app/adapters/banner.ts

@@ -4,8 +4,8 @@ export default class BannerAdapter extends OsfAdapter {
  namespace = '_';
 }
 
-declare module 'ember-data' {
- interface AdapterRegistry {
- 'banner': BannerAdapter;
- }
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ banner: BannerAdapter;
+ } // eslint-disable-line semi
 }

app/adapters/citation.ts

@@ -1,10 +1,10 @@
 import OsfAdapter from './osf-adapter';
 
-export default class Citation extends OsfAdapter {
+export default class CitationAdapter extends OsfAdapter {
 }
 
-declare module 'ember-data' {
- interface AdapterRegistry {
- 'citation': Citation;
- }
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ citation: CitationAdapter;
+ } // eslint-disable-line semi
 }

app/adapters/collected-metadatum.ts

@@ -1,16 +1,11 @@
 import { assert } from '@ember/debug';
 import DS from 'ember-data';
-import OsfAdapter from 'ember-osf-web/adapters/osf-adapter';
-import $ from 'jquery';
+import RSVP from 'rsvp';
 
-export default class CollectedMetadatum extends OsfAdapter.extend({
- /**
- * Stub for typing
- */
- urlPrefix(...args: any[]): string {
- return this._super(...args);
- },
+import OsfAdapter from 'ember-osf-web/adapters/osf-adapter';
+import param from 'ember-osf-web/utils/param';
 
+export default class CollectedMetadatumAdapter extends OsfAdapter {
  urlForHybridGuid(id: string): string {
  const splitId = id.split('-');
 
@@ -19,48 +14,51 @@ export default class CollectedMetadatum extends OsfAdapter.extend({
  const [collectionId, collectedMetadatumId] = splitId;
 
  return `${this.urlPrefix()}/collections/${collectionId}/collected_metadata/${collectedMetadatumId}`;
- },
+ }
 
  urlForCreateRecord(_: 'collected-metadatum', { record }: DS.Snapshot): string {
  return `${this.urlPrefix()}/collections/${record.get('collection.id')}/collected_metadata/`;
- },
+ }
 
  urlForFindRecord(id: string): string {
  return this.urlForHybridGuid(id);
- },
+ }
 
  urlForUpdateRecord(id: string): string {
  return this.urlForHybridGuid(id);
- },
+ }
 
- urlForQuery(this: CollectedMetadatum): string {
+ urlForQuery(): string {
  return `${this.urlPrefix()}/search/collections/`;
- },
+ }
 
- query(_: DS.Store, type: any, query: any): Promise<any> {
+ query(_: DS.Store, type: any, query: Record<string, string>): RSVP.Promise<any> {
  const url = this.buildURL(type.modelName, null, null, 'query', query);
- const { page, ...restQuery } = query;
+ const { page, sort, ...restQuery } = query;
 
- let queryParams = '';
+ const queryParams: Record<string, string> = {};
 
  if (page) {
- queryParams += `?${$.param({ page })}`;
+ queryParams.page = page;
+ }
+
+ if (sort) {
+ queryParams.sort = sort;
  }
 
- return this.ajax(`${url}${queryParams}`, 'POST', {
+ return this.ajax([url, param(queryParams)].join('?'), 'POST', {
  data: {
  data: {
- attributes: this.sortQueryParams ? this.sortQueryParams(restQuery) : restQuery,
+ attributes: restQuery,
  },
  type: 'search',
  },
  });
- },
-}) {
+ }
 }
 
-declare module 'ember-data' {
- interface AdapterRegistry {
- 'collected-metadatum': CollectedMetadatum;
- }
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ 'collected-metadatum': CollectedMetadatumAdapter;
+ } // eslint-disable-line semi
 }

app/adapters/collection-provider.ts

@@ -1,13 +1,13 @@
 import OsfAdapter from './osf-adapter';
 
-export default class CollectionProvider extends OsfAdapter {
+export default class CollectionProviderAdapter extends OsfAdapter {
  pathForType(_: string): string {
  return 'providers/collections';
  }
 }
 
-declare module 'ember-data' {
- interface AdapterRegistry {
- 'collection-provider': CollectionProvider;
- }
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ 'collection-provider': CollectionProviderAdapter;
+ } // eslint-disable-line semi
 }

app/adapters/collection.ts

@@ -1,30 +1,29 @@
 import DS from 'ember-data';
+
 import OsfAdapter from './osf-adapter';
 
 const requestTypes = ['createRecord', 'updateRecord', 'deleteRecord'];
 
-export default class Collection extends OsfAdapter.extend({
+export default class CollectionAdapter extends OsfAdapter {
  buildURL(
- this: Collection,
  modelName: 'collection',
  id: string,
  snapshot: DS.Snapshot,
  requestType: string,
- ): string {
+ ) {
  // Embed linked_nodes
- const base: string = this._super(modelName, id, snapshot, requestType);
+ const base = super.buildURL(modelName, id, snapshot, requestType);
 
  if (requestTypes.includes(requestType)) {
  return base;
  }
 
  return `${base}?embed=linked_nodes`;
- },
-}) {
+ }
 }
 
-declare module 'ember-data' {
- interface AdapterRegistry {
- 'collection': Collection;
- }
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ collection: CollectionAdapter;
+ } // eslint-disable-line semi
 }

app/adapters/comment-report.ts

@@ -1,10 +1,10 @@
 import OsfAdapter from './osf-adapter';
 
-export default class CommentReport extends OsfAdapter {
+export default class CommentReportAdapter extends OsfAdapter {
 }
 
-declare module 'ember-data' {
- interface AdapterRegistry {
- 'comment-report': CommentReport;
- }
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ 'comment-report': CommentReportAdapter;
+ } // eslint-disable-line semi
 }