Merge branch 'release/20.8.0'

Author: fabmiz

CHANGELOG.md

@@ -4,6 +4,18 @@ 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).
 
+## [20.8.0] - 2020-07-29
+### Added
+- `contributor-list` read-only to draft metadata page
+- `ember-template-lint` addon
+
+### Changed
+- analytics for collections
+- styles for registries discover sort dropdown (bugfix)
+
+### Removed
+- `ember-cli-template-lint`
+
 ## [20.7.1] - 2020-07-22
 ### Changed
 - keen public pageviews logging
@@ -1623,7 +1635,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/20.7.1...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.8.0...develop
+[20.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.8.0
 [20.7.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.7.1
 [20.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.7.0
 [20.6.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.6.1

lib/app-components/addon/components/branded-navbar/template.hbs

@@ -43,7 +43,7 @@
                     <li>
                         {{#link-to
                             'provider.submit'
-                            click=(action 'click' 'link' (concat 'Navbar - Add ' @objectType) target=this.analytics)
+                            click=(action 'click' 'link' (concat 'Navbar - ' (t @addLinkKey) ' - ' this.theme.id) target=this.analytics)
                         }}
                             <span role='button'>{{t @addLinkKey}}</span>
                         {{/link-to}}

lib/collections/addon/components/collection-search-result/node/template.hbs

@@ -1,16 +1,18 @@
 <div
     data-test-collection-search-result-node={{this.item.id}}
+    data-analytics-scope={{concat 'Collections search results - ' this.theme.id}}
     class='row'
 >
     <div class='col-xs-12'>
         {{!Title}}
         <h4>
-            <a
+            <OsfLink
                 data-test-collection-search-result-node-title
-                href={{this.item.links.html}}
+                @href={{this.item.links.html}}
+                data-analytics-name='Result Title'
             >
                 {{this.item.title}}
-            </a>
+            </OsfLink>
         </h4>
     </div>
 

lib/collections/addon/components/discover-page/component.ts

@@ -338,8 +338,7 @@ export default class DiscoverPage extends Component {
 
     @action
     clearFilters() {
-        this.analytics.track('button', 'click', 'Discover - Clear Filters');
-
+        this.analytics.track('button', 'click', `Discover - Clear Filters - ${this.theme.id}`);
         if (this.facetContexts) {
             // Clear all of the activeFilters
             this.facetContexts
@@ -366,7 +365,7 @@ export default class DiscoverPage extends Component {
     @action
     searchAction() {
         // Only want to track search here when button clicked. Keypress search tracking is debounced in trackSearch
-        this.analytics.track('button', 'click', 'Discover - Search', this.q);
+        this.analytics.track('button', 'click', `Discover - Search - ${this.theme.id}`, this.q);
         this.search();
     }
 

lib/collections/addon/components/discover-page/facets/checklist/component.ts

@@ -6,6 +6,7 @@ import DS from 'ember-data';
 import { layout } from 'ember-osf-web/decorators/component';
 import Collection from 'ember-osf-web/models/collection';
 import CollectionProvider from 'ember-osf-web/models/collection-provider';
+import Analytics from 'ember-osf-web/services/analytics';
 
 import Base from '../base/component';
 import styles from './styles';
@@ -17,6 +18,7 @@ interface Item {
 
 @layout(template, styles)
 export default abstract class SearchFacetChecklist extends Base {
+    @service analytics!: Analytics;
     @service store!: DS.Store;
 
     allItems: Item[] = [];
@@ -72,7 +74,7 @@ export default abstract class SearchFacetChecklist extends Base {
     didInsertElement(this: SearchFacetChecklist) {
         super.didInsertElement();
 
-        const { context, filterChanged, filterProperty } = this;
+        const { analytics, context, filterChanged, filterProperty, theme } = this;
 
         setProperties(context, {
             updateFilters(item?: string) {
@@ -81,6 +83,12 @@ export default abstract class SearchFacetChecklist extends Base {
                 if (item) {
                     const method = activeFilter.includes(item) ? 'removeObject' : 'pushObject';
                     activeFilter[method](item);
+                    const filterAction = method === 'removeObject' ? 'remove' : 'add';
+                    analytics.track(
+                        'filter',
+                        filterAction,
+                        `Discover - Filter ${context.title} ${item} - ${theme.id}`,
+                    );
                 }
 
                 setProperties(context, {

lib/collections/addon/components/discover-page/styles.scss

@@ -19,6 +19,7 @@
 
 .sortByOptionList {
     background-color: #efefef;
+    left: auto;
 
     li:hover {
         background-color: #d9d9d9;

lib/collections/addon/discover/route.ts

@@ -1,20 +1,26 @@
+import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import DS from 'ember-data';
 
+import Analytics from 'ember-osf-web/services/analytics';
+
 export default class Discover extends Route {
     @service store!: DS.Store;
+    @service analytics!: Analytics;
 
     queryParams = {
         queryString: {
             replace: true,
         },
     };
 
-    /**
-     * Stub
-     */
     model() {
         return this.store.findAll('collection-provider', { reload: true });
     }
+
+    @action
+    didTransition() {
+        this.analytics.trackPage();
+    }
 }

lib/collections/addon/provider/discover/route.ts

@@ -1,6 +1,8 @@
+import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { DS } from 'ember-data';
+import Analytics from 'ember-osf-web/services/analytics';
 import Theme from 'ember-osf-web/services/theme';
 
 export default class ProviderDiscover extends Route {
@@ -9,8 +11,14 @@ export default class ProviderDiscover extends Route {
 
     @service store!: DS.Store;
     @service theme!: Theme;
+    @service analytics!: Analytics;
 
     model() {
         return [];
     }
+
+    @action
+    didTransition() {
+        this.analytics.trackPage();
+    }
 }

lib/osf-components/addon/components/contributors/card/editable/component.ts

@@ -0,0 +1,13 @@
+import { tagName } from '@ember-decorators/component';
+import Component from '@ember/component';
+
+import { layout } from 'ember-osf-web/decorators/component';
+import { Permission } from 'ember-osf-web/models/osf-model';
+import styles from './styles';
+import template from './template';
+
+@layout(template, styles)
+@tagName('')
+export default class ContributorsCardEditable extends Component {
+    permissionOptions = [...Object.values(Permission)];
+}

lib/osf-components/addon/components/contributors/card/editable/styles.scss

@@ -0,0 +1,15 @@
+.CardContainer {
+    composes: CardContainer from '../styles.scss';
+}
+
+.MainSection {
+    composes: MainSection from '../styles.scss';
+}
+
+.CardSection {
+    composes: CardSection from '../styles.scss';
+
+    :global(.ember-power-select-trigger) {
+        max-width: 150px;
+    }
+}