Merge branch 'release/0.24.0'

Author: jamescdavis

CHANGELOG.md

@@ -4,6 +4,22 @@ 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).
 
+## [0.24.0] - 2019-04-09
+### Added
+- `chronos-journal` model/adapter/serializer
+- `chronos-submission` model/adapter/serializer
+- `preprint-request` model/adapter/serializer
+- `preprint-request-action` model/adapter/serializer
+- `lazy-options-load-more` component
+
+# Changed
+- `preprint` model - added `requests` relationship
+- `lazy-options` component - moved load more button to its own component
+
+# Removed
+- `jquery-extensions` instance intializer
+- `jquery-checkinview` util
+
 ## [0.23.0] - 2019-03-04
 ### Added
 - `X-CSRFToken` header to AJAX requests

addon/adapters/chronos-journal.js

@@ -0,0 +1,8 @@
+import OsfAdapter from './osf-adapter';
+
+export default OsfAdapter.extend({
+    namespace: '_/chronos',
+    pathForType: function () {
+        return 'journals';
+    }
+});

addon/adapters/chronos-submission.js

@@ -0,0 +1,16 @@
+import OsfAdapter from './osf-adapter';
+
+export default OsfAdapter.extend({
+    namespace: '_/chronos',
+    urlForQuery: function (query) {
+        const url = `${this.host}/${this.namespace}/${query.preprintId}/submissions/`;
+        delete query.preprintId;
+        return url;
+    },
+
+    urlForCreateRecord: function (modelname, snapshot) {
+        const preprintId = snapshot.belongsTo('preprint').id;
+        const url = `${this.host}/${this.namespace}/${preprintId}/submissions/`;
+        return url;
+    }
+});

addon/adapters/preprint-request-action.js

@@ -0,0 +1,7 @@
+import OsfAdapter from './osf-adapter';
+
+export default OsfAdapter.extend({
+    pathForType: function(){
+        return 'actions/requests/preprints/';
+    }
+});

addon/adapters/preprint-request.js

@@ -0,0 +1,15 @@
+import OsfAdapter from './osf-adapter';
+import config from 'ember-get-config';
+
+export default OsfAdapter.extend({
+    urlForQuery: function (query) {
+        const url = `${this.host}/${config.OSF.apiNamespace}/providers/preprints/${query.providerId}/withdraw_requests/`;
+        delete query.providerId;
+        return url;
+    },
+    urlForCreateRecord: function (modelname, snapshot) {
+        const preprintId = snapshot.belongsTo('target').id;
+        const url = `${this.host}/${config.OSF.apiNamespace}/preprints/${preprintId}/requests/`;
+        return url;
+    }
+});

addon/components/lazy-options-load-more/component.js

@@ -0,0 +1,10 @@
+import Component from '@ember/component';
+import InViewportMixin from 'ember-in-viewport';
+import layout from './template';
+
+export default Component.extend(InViewportMixin, {
+    layout,
+    didEnterViewport() {
+        this.get('loadMore')();
+    },
+});

addon/components/lazy-options-load-more/template.hbs

@@ -0,0 +1 @@
+<li role="button" class="ember-power-select-option aloha">Load more</li>

addon/components/lazy-options/component.js

@@ -3,7 +3,6 @@ import Ember from 'ember';
 import layout from './template';
 import PSOptionsComponent from 'ember-power-select/components/power-select/options';
 const {
-    $,
     assert,
     get,
 } = Ember;
@@ -14,19 +13,5 @@ const OptionsComponent = PSOptionsComponent.extend({
         this._super(...arguments);
         assert('<component:infinite-options>: You must provide a closure action name `loadMore`', get(this, 'loadMore') && typeof get(this, 'loadMore') === 'function');
     },
-    didInsertElement() {
-        this._super(...arguments);
-        const checkVisibility = () => {
-            if ($(this.element).find('.ember-power-select-option--load-more').checkInView(true)) {
-                const loadMore = get(this, 'loadMore');
-                return loadMore();
-            }
-        };
-        $(this.element).on('scroll', () => checkVisibility());
-    },
-    willDestroyElement() {
-        this._super(...arguments);
-        $(this.element).off('scroll');
-    }
 });
 export default OptionsComponent;

addon/components/lazy-options/template.hbs

@@ -37,5 +37,5 @@
 {{#if isLoading}}
     Loading...
 {{else if canLoadMore}}
-    <li role="button" class="ember-power-select-option ember-power-select-option--load-more" {{action loadMore}}></li>
+    {{lazy-options-load-more loadMore=loadMore}}
 {{/if}}