Merge branch 'release/19.6.0'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,61 @@ 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.6.0] - 2019-07-12
+### Added
+- Mirage:
+ - Factories:
+ - `collected-metadatum`
+ - `collection-provider`
+ - `taxonomy`
+ - Serializers:
+ - `collected-metadatum`
+ - `collection-provider`
+ - `taxonomy`
+ - Fixtures:
+ - `taxonomies`
+ - Scenarios:
+ - `collection`
+ - Views:
+ - `collection-provider-taxonomies`
+ - `collection-search`
+ - Endpoints:
+ - `/providers/collections`
+ - `/providers/collections/:parentID/licenses/`
+ - `/collections/:parentID/collected_metadata/`
+ - `/providers/collections/:parentID/taxonomies`
+ - `/search/collections/`
+
+### Changed
+- Models:
+ - `collected-metadatum` - changed `guid` relationship to be a `node` relationship
+ - `collection-provider` - removed `collections` relatioship
+ - `collection`
+ - removed `provider` relationship inverse (`collections`)
+ - added `collectedMetadata` relationship
+- Routes:
+ - `new-home`
+ - renamed to `home` (replacing existing `home` route)
+ - add scroll analytics and improve wording
+- Engines:
+ - `collections`
+ - updated `collection-item-picker` component to use `collectedMetadata` relationship
+ - updated `collections-submission` component to set the `guid` relationship to the node instead of the guid
+- Tests:
+ - Acceptance:
+ - `new-home` - renamed to `logged-out-homepage` (replacing existing `logged-out-homepage` test)
+- Mirage:
+ - Factories:
+ - `collection` - add choices fields
+ - Serializers:
+ - `collection` - add `provider` and `collectedMetadata` relationships
+ - Views:
+ - `osf-resource` - add pass through `process()` to `osfNestedResource` `show` action
+ - Utils:
+ - `filter` - add ability to filter by a list of ids.
+- Misc:
+ - add lang attribute to `html` element in `index.html`
+
 ## [19.5.1] - 2019-06-24
 ### Added
 - Tests:
@@ -953,7 +1008,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.5.1...HEAD
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.6.0...HEAD
+[19.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.6.0
 [19.5.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.5.1
 [19.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.5.0
 [19.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.4.0

app/new-home/-components/hero-banner/component.ts renamed to app/home/-components/hero-banner/component.ts

@@ -18,15 +18,15 @@ const { featureFlagNames: { ABTesting } } = config;
 
 @layout(template, styles)
 @tagName('')
-export default class NewHome extends Component {
+export default class HomeHeroBanner extends Component {
  @service features!: Features;
 
  @alias(`features.${camelize(ABTesting.homePageVersionB)}`)
  shouldShowVersionB!: boolean;
 
  @computed('shouldShowVersionB')
- get versionClass(this: NewHome): string {
- return this.shouldShowVersionB ? 'versionB' : '';
+ get version(): string {
+ return this.shouldShowVersionB ? 'versionB' : 'versionA';
  }
 
  @action

app/new-home/-components/hero-banner/styles.scss renamed to app/home/-components/hero-banner/styles.scss

@@ -88,6 +88,10 @@
  font-size: 20px;
  max-width: 350px;
  }
+
+ .searchBar {
+ padding-top: 35px;
+ }
 }
 
 @media(max-width: 768px) {
@@ -149,6 +153,10 @@
  .getStartedButton {
  margin: 15px auto 35px;
  }
+
+ .searchBar {
+ padding-top: 0;
+ }
  }
 }
 

app/new-home/-components/hero-banner/template.hbs renamed to app/home/-components/hero-banner/template.hbs

@@ -1,12 +1,15 @@
-<div local-class='hero'>
+<section
+ local-class='hero'
+ {{track-scroll 'Hero Banner'}}
+>
  <header local-class='heroHeader'>
  <h1 data-test-hero-heading>
  {{t 'osf-components.hero-banner.heading'}}
  </h1>
  <h2 data-test-hero-subheading>
  {{t 'osf-components.hero-banner.subheading'}}
  </h2>
- <div data-test-hero-container local-class='{{this.versionClass}}'>
+ <div data-test-hero-container local-class='{{this.version}}'>
  <div data-test-add-research local-class='addResearch'>
  {{#if this.shouldShowVersionB}}
  <h3 data-test-add-research-heading>
@@ -32,4 +35,4 @@
  </div>
  </div>
  </header>
-</div>
+</section>

app/new-home/-components/integrations-section/component.ts renamed to app/home/-components/integrations-section/component.ts

@@ -6,14 +6,8 @@ import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
 import config from 'ember-get-config';
 
-import { layout } from 'ember-osf-web/decorators/component';
-
-import styles from './styles';
-import template from './template';
-
 const { featureFlagNames: { ABTesting } } = config;
 
-@layout(template, styles)
 @tagName('')
 export default class IntegrationsSection extends Component {
  @service features!: Features;

app/new-home/-components/integrations-section/styles.scss renamed to app/home/-components/integrations-section/styles.scss

@@ -1,4 +1,7 @@
-<div local-class='container'>
+<section
+ local-class='container'
+ {{track-scroll 'Integrations Section'}}
+>
  <header local-class='integrationsHeader'>
  <h1 data-test-integrations-heading local-class='integrationsHeading'>
  {{t 'new-home.integrations-section.header'}}
@@ -90,9 +93,4 @@
  </div>
  </div>
  </div>
- {{#if (not this.shouldShowVersionB)}}
- <div local-class='buttonContainer'>
- <GetStartedButton />
- </div>
- {{/if}}
-</div>
+</section>

app/new-home/-components/integrations-section/template.hbs renamed to app/home/-components/integrations-section/template.hbs

@@ -1,6 +1,6 @@
 <OsfLink
  data-test-learn-more-button
- data-analytics-name='learn_more_button'
+ data-analytics-name='Learn more button'
  class='btn btn-primary'
  local-class='learnMoreButton'
  @href={{this.learnMoreUrl}}