Merge branch 'release/19.10.0'

Author: jamescdavis

.editorconfig

@@ -6,7 +6,7 @@ root = true
 
 
 [*]
-end_of_line = lf
+# end_of_line = lf (https://github.com/editorconfig/editorconfig/issues/226)
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

.eslintrc.js

@@ -43,6 +43,7 @@ module.exports = {
  asyncArrow: 'always',
  }],
  'no-underscore-dangle': 'off',
+ 'linebreak-style': ['error', (process.platform === 'win32' ? 'windows' : 'unix')],
  },
  overrides: [
  {

CHANGELOG.md

@@ -4,6 +4,194 @@ 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.10.0] - 2019-10-02
+### Added
+- Models
+ - `institutional-user`
+- Helpers
+ - `random-text`
+ - generates random text
+ - `unique-id`
+ - generate a unique-enough string for use in a DOM element's `id`
+ - `has-validation-error`
+ - check if a list of validator results contains a validation error
+- Components
+ - `subjects/`
+ - `browse`
+ - `browse/animated-expand`
+ - `browse/browse-manager`
+ - `browse/item-list`
+ - `browse/item`
+ - `display`
+ - `manager`
+ - `manager/single`
+ - `search`
+ - `search/search-result`
+ - `widget`
+ - `editable-field/subject-field-manager`
+ - `files/`
+ - `browse`
+ - `item`
+ - `list`
+ - `manager`
+ - `selected-list`
+ - `upload-zone`
+ - `widget`
+- Validators
+ - `list` - apply a validator to a list
+- Tests
+ - Unit
+ - helpers
+ - `has-validation-error`
+ - validators
+ - `validateList`
+ - Integration
+ - `unique-id`
+ - `random-text`
+ - `Files::Widget`
+- Ember Optional Features
+ - `template-only-glimmer-components`
+- Mirage
+ - Factories
+ - `subject`
+ - `file-provider`
+ - Serializers
+ - `subject`
+ - `file-provider`
+ - Views
+ - `provider-subjects`
+ - `file`
+- Types
+ - `ember-animated`
+- Packages
+ - `ember-animated`
+ - `ember-element-helper` (`fix-engines` branch)
+- Handbook
+ - `Subjects::Widget` component to gallery
+ - `Files::Widget` component to gallery
+ - `validateList` validator
+ - `has-validation-error` helper
+
+### Changed
+- Models
+ - `taxonomy`
+ - renamed to `subject` and updated for new subjects-as-relationships architecture
+ - `node`
+ - changed `subjects` attribute into a hasMany relationship
+ - `preprint`
+ - changed `subjects` attribute into a hasMany relationship
+ - removed `uniqueSubjects` computed property
+ - `preprint-provider`
+ - changed `hasHighlightedSubjects` alias to use `highlighted_subjects` related link meta
+ - `provider`
+ - renamed `taxonomies` hasMany relationship to `subjects`
+ - renamed `highlightedTaxonomies` hasMany relationship to `highlightedSubjects`
+ - `file`
+ - rename `node` belongsTo relationship to `target`
+- Serializers
+ - `taxonomy`
+ - renamed to `subject`
+- Adapters
+ - `taxonomy`
+ - renamed to `subject`
+- Components
+ - `editable-field`
+ - use `osf-dialog` instead of `bs-modal`
+ - pass `@fixedWidth` through to `OsfDialog`
+ - use `@manager.isSaving` to disable submit & cancel buttons
+ - `category-manager`
+ - expose `isSaving` as alias for `save.isRunning`
+ - `description-manager`
+ - expose `isSaving` as alias for `save.isRunning`
+ - `institutions-manager`
+ - expose `isSaving` as alias for `save.isRunning`
+ - `license-manager`
+ - expose `isSaving` as alias for `save.isRunning`
+ - `publication-doi-manager`
+ - expose `isSaving` as alias for `save.isRunning`
+ - `tags-manager`
+ - expose `isSaving` as alias for `save.isRunning`
+ - `node-category-picker`
+ - remove `@renderInPlace={{true}}` from `PowerSelect` invocation
+ - `zoom-to-route`
+ - remove `@renderInPlace={{true}}` from `PowerSelect` invocation
+ - `registries/registries-license-picker`
+ - remove `@renderInPlace={{true}}` from `PowerSelect` invocation
+ - `registries/license-viewer`
+ - use `osf-dialog` instead of `bs-modal`
+ - `file-icon`
+ - folders should always use folder icon
+ - `sort-button`
+ - suppress box-shadow when active
+ - `osf-dialog`
+ - darken background overlay
+ - `registries/registries-metadata`
+ - use `Subjects::Widget` and `Subjects::Display` (and related managers) for subjects editable field
+- Tests
+ - renamed `taxonomy` to `subject` in `preprint-provider` FactoryGuy factory
+ - Unit
+ - `adapters/taxonomy-test` renamed to `adapters/subject-test`
+ - `models/taxonomy-test` renamed to `models/subject-test`
+ - `serializers/taxonomy-test` renamed to `serializers/subject-test`
+ - `models/preprint-test`
+ - removed test for `subject` attribute
+- Mirage
+ - Factories
+ - `node`
+ - removed `subjects` attribute
+ - added `withFiles` trait
+ - `registration`
+ - added `widthSubjects` trait
+ - `file`
+ - added `target` association
+ - addded `asFolder` trait
+ - Serializers
+ - `registration-provider`
+ - added subjects related link
+ - `registration`
+ - added subjects self and related links
+ - `file`
+ - s/`node`/`target`/
+ - added folder links
+ - `node`
+ - added files link
+ - Views
+ - `osf-resource`
+ - added self link patch handling
+ - Scenarios
+ - `registration`
+ - create some subjects
+ - `handbook`
+ - create a file tree for the handbook
+- Types
+ - `ember-changeset-validations`
+ - added `ValidatorFunction` and `ValidatorResult`
+- Config
+ - updated to use API version 2.16
+- Packages
+ - upgrade to `ember-animated@0.8.1`
+
+### Removed
+- Tests
+ - `taxonomy` FactoryGuy factory
+
+### Fixed
+- Components
+ - `home/support-section/support-item`
+ - s/this./@/ because this is template-only
+ - added splattributes because this is template-only
+ - `registries/registries-advisory-board`
+ - fixed template lint
+ - added splattributes because this is template-only
+ - `meetings/index/meetings-footer`
+ - added splattributes because this is template-only
+ - `registries/registries-advisory-board`
+ - added splattributes because this is template-only
+ - `registries/sharing-icons/popover`
+ - added splattributes because this is template-only
+- Handbook
+ - `osf-dialog` `demo-is-open` needs component file because it muts `isOpen`
+
 ## [19.9.0] - 2019-09-06
 ### Added
 - Components
@@ -1167,7 +1355,8 @@ 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/19.9.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.10.0...develop
+[19.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.10.0
 [19.9.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.9.0
 [19.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.8.0
 [19.7.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.7.1

app/adapters/institutional-user.ts

@@ -0,0 +1,11 @@
+import OsfAdapter from './osf-adapter';
+
+export default class InstitutionalUserAdapter extends OsfAdapter {
+ parentRelationship = 'institution';
+}
+
+declare module 'ember-data/types/registries/adapter' {
+ export default interface AdapterRegistry {
+ 'institutional-user': InstitutionalUserAdapter;
+ } // eslint-disable-line semi
+}

app/adapters/taxonomy.ts renamed to app/adapters/subject.ts

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

app/app.ts

@@ -43,6 +43,7 @@ const App = Application.extend({
  'i18n',
  'ready',
  'router',
+ 'session',
  'store',
  'toast',
  'osf-modal-state',

app/home/-components/support-section/support-item/template.hbs

@@ -1,17 +1,17 @@
-<div local-class='container'>
- {{#if (eq this.icon 'search')}}
- <img data-test-icon-image src='/assets/images/new-home/search.svg' alt={{this.icon}}>
- {{else if (eq this.icon 'pencil-alt')}}
- <img data-test-icon-image src='/assets/images/new-home/pencil-alt.svg' alt={{this.icon}}>
- {{else if (eq this.icon 'chart-area')}}
- <img data-test-icon-image src='/assets/images/new-home/chart-area.svg' alt={{this.icon}}>
- {{else if (eq this.icon 'file-alt')}}
- <img data-test-icon-image src='/assets/images/new-home/file-alt.svg' alt={{this.icon}}>
+<div local-class='container' ...attributes>
+ {{#if (eq @icon 'search')}}
+ <img data-test-icon-image src='/assets/images/new-home/search.svg' alt={{@icon}}>
+ {{else if (eq @icon 'pencil-alt')}}
+ <img data-test-icon-image src='/assets/images/new-home/pencil-alt.svg' alt={{@icon}}>
+ {{else if (eq @icon 'chart-area')}}
+ <img data-test-icon-image src='/assets/images/new-home/chart-area.svg' alt={{@icon}}>
+ {{else if (eq @icon 'file-alt')}}
+ <img data-test-icon-image src='/assets/images/new-home/file-alt.svg' alt={{@icon}}>
  {{/if}}
  <h2 data-test-support-header>
- {{this.header}}
+ {{@header}}
  </h2>
  <p data-test-support-description>
- {{this.description}}
+ {{@description}}
  </p>
 </div>

app/locales/en/translations.ts

@@ -75,6 +75,7 @@ export default {
  warning: 'Warning',
  sort_asc: 'Sort ascending',
  sort_desc: 'Sort descending',
+ last_modified: 'Last modified',
  sort: 'Sort',
  asc_paren: '(asc)',
  desc_paren: '(desc)',
@@ -1160,32 +1161,34 @@ export default {
  },
 
  registration_metadata: {
- contributors: 'Contributors',
- description: 'Description',
- show_more: 'Show more',
- show_less: 'Show less',
- no_description: 'No description given.',
- registration_type: 'Registration type',
- date_registered: 'Date registered',
- date_created: 'Date created',
- registered_from: 'Registered from',
- category: 'Category',
- registration_doi: 'Registration DOI',
- publication_doi: 'Publication DOI',
+ add_description: 'Add description',
+ add_license: 'Add license',
  affiliated_institutions: 'Affiliated institutions',
- license: 'License',
- no_license: 'No license',
- no_publication_doi: 'No publication DOI given',
- disciplines: 'Disciplines',
- tags: 'Tags',
+ category: 'Category',
  citation: 'Citation',
- add_description: 'Add description',
+ contributors: 'Contributors',
  create_doi: 'Create DOI',
+ date_created: 'Date created',
+ date_registered: 'Date registered',
+ description: 'Description',
+ disciplines: 'Disciplines',
  edit_field: 'Edit {{field}}',
+ license: 'License',
+ no_description: 'No description',
  no_doi: 'No DOI assigned',
- add_license: 'Add license',
- select_license: 'Select license',
+ no_license: 'No license',
  no_matches: 'No matches found',
+ no_publication_doi: 'No publication DOI',
+ no_subjects: 'No subjects',
+ publication_doi: 'Publication DOI',
+ registered_from: 'Registered from',
+ registration_doi: 'Registration DOI',
+ registration_type: 'Registration type',
+ select_license: 'Select license',
+ show_less: 'Show less',
+ show_more: 'Show more',
+ subjects: 'Subjects',
+ tags: 'Tags',
 
  edit_description: {
  success: 'Description successfully updated.',
@@ -1217,6 +1220,7 @@ export default {
  success: 'Tags successfully updated.',
  error: 'Unable to save tags.',
  },
+ save_subjects_error: 'Unable to save subjects',
  },
 
  form_view: {
@@ -1610,6 +1614,23 @@ export default {
  editContributorsOnYourProject: 'Edit contributors on your project',
  },
  },
+ 'files-widget': {
+ no_files: 'Drag and drop files here to upload files to this folder',
+ message: 'Only files from root project on OSF Storage are available to attach. To attach files from components or non "OSF Storage" addons, first add them to your root project files.',
+ },
+ subjects: {
+ browse: {
+ browse_all: 'Browse all subjects',
+ },
+ search: {
+ search_all: 'Search subjects',
+ placeholder: 'Type to search',
+ no_results: 'No matching subjects found. Try a less specific search.',
+ },
+ display: {
+ placeholder: 'Your selections will appear here',
+ },
+ },
  },
  settings: {
  toggleNav: 'Toggle navigation',

app/meetings/index/-components/meetings-footer/template.hbs

@@ -1,4 +1,4 @@
-<div class='row icon-bar m-v-lg'>
+<div class='row icon-bar m-v-lg' ...attributes>
  <div class='col-md-4 col-sm-4 text-center '>
  <div class='p-v-md m-t-xl m-h-md'>
  <FaIcon

app/models/file.ts

@@ -56,7 +56,7 @@ export default class FileModel extends BaseFileItem {
 
  // TODO: In the future apiv2 may also need to support this pointing at nodes OR registrations
  @belongsTo('node')
- node!: DS.PromiseObject<NodeModel> & NodeModel;
+ target!: DS.PromiseObject<NodeModel> & NodeModel;
 
  @belongsTo('user')
  user!: DS.PromiseObject<UserModel> & UserModel;