From 0a62a37eb3b60bb1f4aa2a96ec67c1fce387eb3b Mon Sep 17 00:00:00 2001 From: Sherif Date: Tue, 31 Jan 2017 16:08:04 -0500 Subject: [PATCH 01/58] settings --- package.json | 1 + yarn.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package.json b/package.json index b507f5982..dac5739a3 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "loader": "2.1.0", "loader.js": "4.0.3", "moment": "^2.13.0", + "pagination-pager": "2.4.2", "phantomjs-prebuilt": "^2.1.7" }, "keywords": [ diff --git a/yarn.lock b/yarn.lock index 81e8dc1de..a0a967f6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4420,6 +4420,10 @@ output-file-sync@^1.1.0: mkdirp "^0.5.1" object-assign "^4.1.0" +pagination-pager@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/pagination-pager/-/pagination-pager-2.4.2.tgz#01f6a5f101de867193fc1d1dc16fbab6cd02e49d" + parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" From 347b14416e5ea080e525bbdf787a5dc1ccfc2a33 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 14:15:51 -0500 Subject: [PATCH 02/58] Move keen-tracker from website/static/js/keen.js to ember-oaf. --- addon/mixins/keen-tracker.js | 270 +++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) create mode 100644 addon/mixins/keen-tracker.js diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js new file mode 100644 index 000000000..75ab4dfda --- /dev/null +++ b/addon/mixins/keen-tracker.js @@ -0,0 +1,270 @@ +import Ember from 'ember'; +import md5 from 'npm:js-md5'; +import config from 'ember-get-config'; +import _get from 'npm:lodash/get'; +import Cookie from 'npm:js-cookie'; +import keenTracking from 'npm:keen-tracking'; + +// Adapted from website/static/js/keen.js +export default Ember.Mixin.create({ + keen: Ember.inject.service(), + session: Ember.inject.service(), + KeenTracker() { + const keenContextVars = { + private: { + projectId: config.KEEN_PROJECT_ID, + writeKey: config.KEEN_WRITE_KEY + }, + public: { + projectId: config.KEEN_PROJECT_ID, + writeKey: config.KEEN_WRITE_KEY + } + }; + + function _nowUTC() { + + var now = new Date(); + return new Date( + now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), + now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds() + ); + } + + function _createOrUpdateKeenSession() { + var expDate = new Date(); + var expiresInMinutes = 25; + expDate.setTime(expDate.getTime() + (expiresInMinutes * 60 * 1000)); + var currentSessionId = Cookie.get('keenSessionId') || keenTracking.helpers.getUniqueId(); + Cookie.set('keenSessionId', currentSessionId, {expires: expDate, path: '/'}); + } + + function _getOrCreateKeenId() { + if (!Cookie.get('keenUserId')) { + Cookie.set('keenUserId', keenTracking.helpers.getUniqueId(), {expires: 365, path: '/'}); + } + return Cookie.get('keenUserId'); + } + + + function _defaultKeenPayload() { + _createOrUpdateKeenSession(); + + var user = window.contextVars.currentUser; + var node = window.contextVars.node; + var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); + return { + page: { + title: document.title, + url: document.URL, + meta: pageMeta, + info: {}, + }, + referrer: { + url: document.referrer, + info: {}, + }, + time: { + local: keenTracking.helpers.getDatetimeIndex(), + utc: keenTracking.helpers.getDatetimeIndex(_nowUTC()), + }, + node: { + id: _get(node, 'id'), + title: _get(node, 'title'), + type: _get(node, 'category'), + tags: _get(node, 'tags'), + }, + anon: { + id: md5(Cookie.get('keenSessionId')), + continent: user.anon.continent, + country: user.anon.country, + }, + meta: { + epoch: 1, // version of pageview event schema + }, + keen: { + addons: [ + { + name: 'keen:url_parser', + input: { + url: 'page.url', + }, + output: 'page.info', + }, + { + name: 'keen:url_parser', + input: { + url: 'referrer.url', + }, + output: 'referrer.info', + }, + { + name: 'keen:referrer_parser', + input: { + referrer_url: 'referrer.url', + page_url: 'page.url', + }, + output: 'referrer.info', + }, + ] + }, + }; + } // end _defaultKeenPayload + + function _trackCustomEvent(client, collection, eventData) { + if (client === null) { + return; + } + client.recordEvent(collection, eventData, function (err) { + if (err) { + console.log(err); + // Raven.captureMessage('Error sending Keen data to ' + collection + ': <' + err + '>', { + // extra: {payload: eventData} + // }); + } + }); + } + + function _trackCustomEvents(client, events) { + if (client === null) { + return; + } + client.recordEvents(events, function (err, res) { + if (err) { + // Raven.captureMessage('Error sending Keen data for multiple events: <' + err + '>', { + // extra: {payload: events} + // }); + } else { + for (var collection in res) { + var results = res[collection]; + for (var idx in results) { + if (!results[idx].success) { + // Raven.captureMessage('Error sending Keen data to ' + collection + '.', { + // extra: {payload: events[collection][idx]} + // }); + } + } + } + } + }); + } + + function KeenTracker() { + if (instance) { + throw new Error('Cannot instantiate another KeenTracker instance.'); + } else { + var self = this; + + self._publicClient = null; + self._privateClient = null; + + self.init = function _initKeentracker(params) { + var self = this; + + if (params === undefined) { + return self; + } + + self._publicClient = new keenTracking({ + projectId: params.public.projectId, + writeKey: params.public.writeKey, + }); + self._publicClient.extendEvents(_defaultPublicKeenPayload); + + self._privateClient = new keenTracking({ + projectId: params.private.projectId, + writeKey: params.private.writeKey, + }); + self._privateClient.extendEvents(_defaultPrivateKeenPayload); + + return self; + }; + + var _defaultPublicKeenPayload = function() { return _defaultKeenPayload(); }; + var _defaultPrivateKeenPayload = function() { + var payload = _defaultKeenPayload(); + var user = window.contextVars.currentUser; + payload.visitor = { + id: _getOrCreateKeenId(), + session: Cookie.get('keenSessionId'), + returning: Boolean(Cookie.get('keenUserId')), + }; + payload.tech = { + browser: keenTracking.helpers.getBrowserProfile(), + ua: '${keen.user_agent}', + ip: '${keen.ip}', + info: {}, + }; + payload.user = { + id: user.id, + entry_point: user.entryPoint, + institutions: user.institutions, + locale: user.locale, + timezone: user.timezone, + }; + payload.keen.addons.push({ + name: 'keen:ip_to_geo', + input: { + ip: 'tech.ip', + }, + output: 'geo', + }); + payload.keen.addons.push({ + name: 'keen:ua_parser', + input: { + ua_string: 'tech.ua' + }, + output: 'tech.info', + }); + + return payload; + }; + + self.trackPageView = function () { + var self = this; + if (_get(window, 'contextVars.node.isPublic', false) && + _get(window, 'contextVars.analyticsMeta.pageMeta.public', false)) { + self.trackPublicEvent('pageviews', {}); + } + self.trackPrivateEvent('pageviews', {}); + }; + + self.trackPrivateEvent = function(collection, event) { + return _trackCustomEvent(self._privateClient, collection, event); + }; + self.trackPrivateEvents = function(events) { + return _trackCustomEvents(self._privateClient, events); + }; + + self.trackPublicEvent = function(collection, event) { + return _trackCustomEvent(self._publicClient, collection, event); + }; + self.trackPublicEvents = function(events) { + return _trackCustomEvents(self._publicClient, events); + }; + } + } + + var instance = null; + return { + getInstance() { + if (!instance) { + instance = new KeenTracker(); + instance.init(keenContextVars); + } + return instance; + } + }; + }, + keenTrackEvent(event_collection, properties) { + return this.KeenTracker().getInstance().trackPrivateEvent(event_collection, properties); + }, + keenTrackFrontEndEvent(category, action, label) { + return this.keenTrackEvent('front-end-events', { + interaction: { + category: category, + action: action, + label: label + } + }); + } +}); From 31e0d8ba8d666383cd82f8233412e5598695cb33 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 14:18:11 -0500 Subject: [PATCH 03/58] Add keen-tracker dependencies. Import dependencies in app so available in addon. --- app/mixins/keen-tracker.js | 9 +++++++++ package.json | 8 +++++++- tests/unit/mixins/keen-tracker-test.js | 12 ++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app/mixins/keen-tracker.js create mode 100644 tests/unit/mixins/keen-tracker-test.js diff --git a/app/mixins/keen-tracker.js b/app/mixins/keen-tracker.js new file mode 100644 index 000000000..dbb4eb383 --- /dev/null +++ b/app/mixins/keen-tracker.js @@ -0,0 +1,9 @@ +// This helps ember-browserify find npm modules in ember-cli addons + +import md5 from 'npm:js-md5'; // jshint ignore:line +import config from 'ember-get-config'; // jshint ignore:line +import _get from 'npm:lodash/get'; // jshint ignore:line +import Cookie from 'npm:js-cookie'; // jshint ignore:line +import keenTracking from 'npm:keen-tracking'; // jshint ignore:line + +export {default} from 'ember-osf/mixins/keen-tracker'; diff --git a/package.json b/package.json index b507f5982..fcfa6da72 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "ember-a11y-testing": "0.0.5", "ember-ajax": "0.7.1", "ember-bootstrap": "0.7.2", + "ember-browserify": "^1.1.13", "ember-cli": "^2.4.3", "ember-cli-app-version": "^1.0.0", "ember-cli-bootstrap-sassy": "0.5.3", @@ -52,7 +53,9 @@ "ember-faker": "^1.1.0", "ember-font-awesome": "2.1.1", "ember-infinity": "0.2.3", + "ember-keen": "0.3.2", "ember-load-initializers": "0.5.1", + "ember-lodash": "4.17.0", "ember-page-title": "3.0.3", "ember-power-select": "1.0.0-alpha.5", "ember-resolver": "2.0.3", @@ -85,7 +88,10 @@ "ember-sinon": "0.5.1", "ember-sinon-qunit": "1.3.3", "ember-truth-helpers": "1.2.0", - "js-yaml": "^3.6.0" + "js-cookie": "^2.1.3", + "js-md5": "^0.4.2", + "js-yaml": "^3.6.0", + "keen-tracking": "^1.1.3" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/tests/unit/mixins/keen-tracker-test.js b/tests/unit/mixins/keen-tracker-test.js new file mode 100644 index 000000000..3097563ca --- /dev/null +++ b/tests/unit/mixins/keen-tracker-test.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; +import KeenTrackerMixin from 'ember-osf/mixins/keen-tracker'; +import { module, test } from 'qunit'; + +module('Unit | Mixin | keen tracker'); + +// Replace this with your real tests. +test('it works', function(assert) { + let KeenTrackerObject = Ember.Object.extend(KeenTrackerMixin); + let subject = KeenTrackerObject.create(); + assert.ok(subject); +}); From 813fab50a69949172c07d11638d337166945fca5 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 14:18:39 -0500 Subject: [PATCH 04/58] Experiment with KeenTrackerMixin in dummy app. --- tests/dummy/app/controllers/nodes/detail/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/dummy/app/controllers/nodes/detail/index.js b/tests/dummy/app/controllers/nodes/detail/index.js index fe044e785..5c4098287 100644 --- a/tests/dummy/app/controllers/nodes/detail/index.js +++ b/tests/dummy/app/controllers/nodes/detail/index.js @@ -2,8 +2,9 @@ import Ember from 'ember'; import CommentableMixin from 'ember-osf/mixins/commentable'; import TaggableMixin from 'ember-osf/mixins/taggable-mixin'; import NodeActionsMixin from 'ember-osf/mixins/node-actions'; +import KeenTrackerMixin from 'ember-osf/mixins/keen-tracker'; -export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActionsMixin, { +export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActionsMixin, KeenTrackerMixin, { toast: Ember.inject.service(), propertiesVisible: false, isSaving: false, @@ -27,6 +28,7 @@ export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActi // Would update node properly! }, updateNode() { + this.keenTrackFrontEndEvent('button', 'click', 'updateNode'); this.set('isSaving', true); return this._super(...arguments) .then(() => { From b06b75065ef6c6300bd6f8834ec459d4103e629c Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 15:32:49 -0500 Subject: [PATCH 05/58] Build necessary contextVars. --- addon/mixins/keen-tracker.js | 73 ++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 75ab4dfda..896b02806 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -10,17 +10,6 @@ export default Ember.Mixin.create({ keen: Ember.inject.service(), session: Ember.inject.service(), KeenTracker() { - const keenContextVars = { - private: { - projectId: config.KEEN_PROJECT_ID, - writeKey: config.KEEN_WRITE_KEY - }, - public: { - projectId: config.KEEN_PROJECT_ID, - writeKey: config.KEEN_WRITE_KEY - } - }; - function _nowUTC() { var now = new Date(); @@ -164,13 +153,13 @@ export default Ember.Mixin.create({ return self; } - self._publicClient = new keenTracking({ + self._publicClient = keenTracking({ projectId: params.public.projectId, writeKey: params.public.writeKey, }); self._publicClient.extendEvents(_defaultPublicKeenPayload); - self._privateClient = new keenTracking({ + self._privateClient = keenTracking({ projectId: params.private.projectId, writeKey: params.private.writeKey, }); @@ -249,22 +238,66 @@ export default Ember.Mixin.create({ getInstance() { if (!instance) { instance = new KeenTracker(); - instance.init(keenContextVars); + instance.init(window.contextVars.keen); } return instance; } }; }, - keenTrackEvent(event_collection, properties) { + userContextVars() { + // Extract user variables from session. + const session = this.get('session'); + let user = {}; + if (session.get('isAuthenticated')) { + let userInfo = session.get('session.authenticated'); + user = { + id: userInfo.id, + entry_point: userInfo.attributes.entry_point, + institutions: null, + locale: userInfo.attributes.locale, + timezone: userInfo.attributes.timezone + }; + } + user.anon = {}; // Can I get this info? + return user; + }, + nodeContextVars(node) { + // Extract node variables, if passed in. + let nodeVars = {}; + if (node) { + nodeVars = { + id: node.get('id'), + title: node.get('title'), + type: node.get('category'), + tags: node.get('tags'), + isPublic: node.get('public') + }; + } + return nodeVars; + }, + keenTrackEvent(event_collection, properties, node) { + // Adds context vars and sends keen trackPrivateEvent method + window.contextVars = {}; + window.contextVars.currentUser = this.userContextVars(); + window.contextVars.node = this.nodeContextVars(node); + window.contextVars.keen = config.KEEN; return this.KeenTracker().getInstance().trackPrivateEvent(event_collection, properties); }, - keenTrackFrontEndEvent(category, action, label) { + /** + * For front-end event-tracking - Sends event to keen. Collection: front-end-events. Properties: + * interaction dictionary plus supplement info like OSF + * + * @method keenTrackFrontEndEvent + * @param {Object} event Dictionary with category, action, label + * @param {Object} node Node model, if exists + */ + keenTrackFrontEndEvent(event, node) { return this.keenTrackEvent('front-end-events', { interaction: { - category: category, - action: action, - label: label + category: event.category || null, + action: event.action || null, + label: event.label || null } - }); + }, node); } }); From b06e83afec8e943d923185a1383fde19717ff556 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 15:33:36 -0500 Subject: [PATCH 06/58] Modify variables passing in in dummy app. --- tests/dummy/app/controllers/nodes/detail/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/dummy/app/controllers/nodes/detail/index.js b/tests/dummy/app/controllers/nodes/detail/index.js index 5c4098287..ab4c86d3f 100644 --- a/tests/dummy/app/controllers/nodes/detail/index.js +++ b/tests/dummy/app/controllers/nodes/detail/index.js @@ -28,7 +28,12 @@ export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActi // Would update node properly! }, updateNode() { - this.keenTrackFrontEndEvent('button', 'click', 'updateNode'); + this.keenTrackFrontEndEvent({ + category:'button', + action: 'click', + label: 'Update Node' + }, this.get('model')); + this.set('isSaving', true); return this._super(...arguments) .then(() => { From 93d4bd5b33cfc7db7b7412ada6c7ad4ed56b5286 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:15:36 -0500 Subject: [PATCH 07/58] Remove ember-keen. --- addon/mixins/keen-tracker.js | 1 - package.json | 1 - 2 files changed, 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 896b02806..a5e37864b 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -7,7 +7,6 @@ import keenTracking from 'npm:keen-tracking'; // Adapted from website/static/js/keen.js export default Ember.Mixin.create({ - keen: Ember.inject.service(), session: Ember.inject.service(), KeenTracker() { function _nowUTC() { diff --git a/package.json b/package.json index fcfa6da72..6ac927de0 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "ember-faker": "^1.1.0", "ember-font-awesome": "2.1.1", "ember-infinity": "0.2.3", - "ember-keen": "0.3.2", "ember-load-initializers": "0.5.1", "ember-lodash": "4.17.0", "ember-page-title": "3.0.3", From 0d3e5a432beaae510b4e0710657204c8200c4f3d Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:16:49 -0500 Subject: [PATCH 08/58] Initialize keenTracker with KEEN config directly. --- addon/mixins/keen-tracker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index a5e37864b..b7dff5233 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -238,6 +238,7 @@ export default Ember.Mixin.create({ if (!instance) { instance = new KeenTracker(); instance.init(window.contextVars.keen); + instance.init(config.KEEN); } return instance; } @@ -279,7 +280,6 @@ export default Ember.Mixin.create({ window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); - window.contextVars.keen = config.KEEN; return this.KeenTracker().getInstance().trackPrivateEvent(event_collection, properties); }, /** From f4fb716c0518e9287d83303aef8023648af7bfed Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:17:40 -0500 Subject: [PATCH 09/58] Add comments. --- addon/mixins/keen-tracker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index b7dff5233..5e8cd2833 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -40,6 +40,7 @@ export default Ember.Mixin.create({ var user = window.contextVars.currentUser; var node = window.contextVars.node; var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); + var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); // Is there any way to get this?? return { page: { title: document.title, @@ -237,7 +238,6 @@ export default Ember.Mixin.create({ getInstance() { if (!instance) { instance = new KeenTracker(); - instance.init(window.contextVars.keen); instance.init(config.KEEN); } return instance; @@ -253,7 +253,7 @@ export default Ember.Mixin.create({ user = { id: userInfo.id, entry_point: userInfo.attributes.entry_point, - institutions: null, + institutions: null, // Don't really want to make an API request to fetch user institutions. locale: userInfo.attributes.locale, timezone: userInfo.attributes.timezone }; From aab862956a535c460d7fad723e2849cb1b837e49 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:18:41 -0500 Subject: [PATCH 10/58] Add a beforeModel hook to the keen-tracker mixin for sending page views (WIP). Mixin must be added to route. --- addon/mixins/keen-tracker.js | 19 +++++++++++++------ tests/dummy/app/routes/nodes/detail/index.js | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 5e8cd2833..608299813 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -1,16 +1,24 @@ import Ember from 'ember'; import md5 from 'npm:js-md5'; -import config from 'ember-get-config'; import _get from 'npm:lodash/get'; import Cookie from 'npm:js-cookie'; +import config from 'ember-get-config'; import keenTracking from 'npm:keen-tracking'; // Adapted from website/static/js/keen.js export default Ember.Mixin.create({ session: Ember.inject.service(), + // Add this mixin to your route, and the beforeModel hook will send pageviews to keen + // TODO add node to context vars, if exists? + beforeModel(transition) { + let data = { + page: transition.get('targetName'), + queryParams: transition.get('queryParams') + }; + return this.KeenTracker().getInstance().trackPageView(data); + }, KeenTracker() { function _nowUTC() { - var now = new Date(); return new Date( now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), @@ -39,7 +47,6 @@ export default Ember.Mixin.create({ var user = window.contextVars.currentUser; var node = window.contextVars.node; - var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); // Is there any way to get this?? return { page: { @@ -208,13 +215,13 @@ export default Ember.Mixin.create({ return payload; }; - self.trackPageView = function () { + self.trackPageView = function (data) { var self = this; if (_get(window, 'contextVars.node.isPublic', false) && _get(window, 'contextVars.analyticsMeta.pageMeta.public', false)) { - self.trackPublicEvent('pageviews', {}); + self.trackPublicEvent('pageviews', data); } - self.trackPrivateEvent('pageviews', {}); + self.trackPrivateEvent('pageviews', data); }; self.trackPrivateEvent = function(collection, event) { diff --git a/tests/dummy/app/routes/nodes/detail/index.js b/tests/dummy/app/routes/nodes/detail/index.js index 691689939..c6cacea86 100644 --- a/tests/dummy/app/routes/nodes/detail/index.js +++ b/tests/dummy/app/routes/nodes/detail/index.js @@ -1,6 +1,7 @@ import Ember from 'ember'; +import KeenTrackerMixin from 'ember-osf/mixins/keen-tracker'; -export default Ember.Route.extend({ +export default Ember.Route.extend(KeenTrackerMixin, { model() { return this.modelFor('nodes.detail'); }, From b7c601855c5c7b85c8cf16765cc4f8ad4d1141fb Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:21:57 -0500 Subject: [PATCH 11/58] Add Keen config to dummy app. --- tests/dummy/config/environment.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 0c30b283c..a3f8f35c2 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -14,6 +14,16 @@ module.exports = function(environment) { } var ENV = { + KEEN: { + private: { + projectId: "process.env.KEEN_PRIVATE_PROJECT_ID", + writeKey: "process.env.KEEN_PRIVATE_WRITE_KEY" + }, + public: { + projectId: "process.env.KEEN_PUBLIC_PROJECT_ID", + writeKey: "process.env.KEEN_PUBLIC_WRITE_KEY" + } + }, modulePrefix: 'dummy', environment: environment, baseURL: '/', From 43af4c99ade42037bd2e5380c034d623812b17c3 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:43:49 -0500 Subject: [PATCH 12/58] No transition.get. --- addon/mixins/keen-tracker.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 608299813..e2102688e 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -14,6 +14,8 @@ export default Ember.Mixin.create({ let data = { page: transition.get('targetName'), queryParams: transition.get('queryParams') + page: transition.targetName, + queryParams: transition.queryParams }; return this.KeenTracker().getInstance().trackPageView(data); }, From bd06a55e28262c922fec3213d5e9cf254eb58c8d Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 1 Feb 2017 16:44:11 -0500 Subject: [PATCH 13/58] Temporarily set contextVars in beforeModel hook. --- addon/mixins/keen-tracker.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index e2102688e..8c12266ae 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -12,11 +12,12 @@ export default Ember.Mixin.create({ // TODO add node to context vars, if exists? beforeModel(transition) { let data = { - page: transition.get('targetName'), - queryParams: transition.get('queryParams') page: transition.targetName, queryParams: transition.queryParams }; + window.contextVars = {}; + window.contextVars.currentUser = this.userContextVars(); + window.contextVars.node = this.nodeContextVars(null); return this.KeenTracker().getInstance().trackPageView(data); }, KeenTracker() { From 7ae5459b3685de9d8daec2e89db1e551ae417035 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Thu, 2 Feb 2017 09:07:22 -0500 Subject: [PATCH 14/58] Commit lock file. --- yarn.lock | 843 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 815 insertions(+), 28 deletions(-) diff --git a/yarn.lock b/yarn.lock index 81e8dc1de..5148d33c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +JSONStream@^1.0.3: + version "1.3.0" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.0.tgz#680ab9ac6572a8a1a207e0b38721db1c77b215e5" + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + "JSV@>= 4.0.x": version "4.0.2" resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57" @@ -17,10 +24,22 @@ accepts@1.3.3, accepts@~1.3.3: mime-types "~2.1.11" negotiator "0.6.1" +acorn@^1.0.3: + version "1.2.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014" + +acorn@^2.6.4, acorn@^2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7" + acorn@^3.1.0: version "3.3.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" +acorn@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a" + after@0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627" @@ -133,6 +152,10 @@ array-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" +array-filter@~0.0.0: + version "0.0.1" + resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec" + array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" @@ -148,6 +171,14 @@ array-index@^1.0.0: debug "^2.2.0" es6-symbol "^3.0.2" +array-map@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" + +array-reduce@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b" + array-to-error@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07" @@ -174,6 +205,14 @@ asap@^2.0.0, asap@~2.0.4: version "2.0.5" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f" +asn1.js@^4.0.0: + version "4.9.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40" + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" @@ -186,6 +225,12 @@ assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" +assert@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" + dependencies: + util "0.10.3" + ast-traverse@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ast-traverse/-/ast-traverse-0.1.1.tgz#69cf2b8386f19dcda1bb1e05d68fe359d8897de6" @@ -198,6 +243,12 @@ ast-types@0.9.2: version "0.9.2" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.2.tgz#2cc19979d15c655108bf565323b8e7ee38751f6b" +astw@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astw/-/astw-2.0.0.tgz#08121ac8288d35611c0ceec663f6cd545604897d" + dependencies: + acorn "^1.0.3" + async-disk-cache@^1.0.0: version "1.0.9" resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.0.9.tgz#23bafb823184f463407e474e8d5f87899f72ca63" @@ -411,6 +462,10 @@ base64-arraybuffer@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" +base64-js@^1.0.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" + base64id@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/base64id/-/base64id-0.1.0.tgz#02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f" @@ -463,6 +518,10 @@ bluebird@^3.1.1, bluebird@^3.4.6: version "3.4.7" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: + version "4.11.6" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" + body@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069" @@ -692,7 +751,7 @@ broccoli-funnel@^0.2.3: symlink-or-copy "^1.0.0" walk-sync "^0.2.6" -broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.6: +broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.1.0.tgz#dfb91a37c902456456de4a40a1881948d65b27d9" dependencies: @@ -744,7 +803,7 @@ broccoli-merge-trees@^0.2.1: debug "^2.2.0" symlink-or-copy "^1.0.0" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.2, broccoli-merge-trees@^1.1.3: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.1.tgz#16a7494ed56dbe61611f6c2d4817cfbaad2a3055" dependencies: @@ -764,7 +823,7 @@ broccoli-middleware@^0.18.1: handlebars "^4.0.4" mime "^1.2.11" -broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0: +broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0: version "1.2.13" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.13.tgz#61368669e2b8f35238fdd38a2a896597e4a1c821" dependencies: @@ -847,6 +906,13 @@ broccoli-stew@^1.0.0, broccoli-stew@^1.2.0, broccoli-stew@^1.3.3: rsvp "^3.0.16" walk-sync "^0.3.0" +broccoli-string-replace@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.1.tgz#e560d20db3569a336043110b4048210fa6f1478b" + dependencies: + broccoli-persistent-filter "^1.1.5" + minimatch "^2.0.8" + broccoli-uglify-sourcemap@^1.0.0: version "1.5.1" resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.1.tgz#9fd2e87f1c177b11a758e73c3a11d6a03d90d086" @@ -872,6 +938,129 @@ broccoli-writer@^0.1.1, broccoli-writer@~0.1.1: quick-temp "^0.1.0" rsvp "^3.0.6" +brorand@^1.0.1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.6.tgz#4028706b915f91f7b349a2e0bf3c376039d216e5" + +browser-pack@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.2.tgz#f86cd6cef4f5300c8e63e07a4d512f65fbff4531" + dependencies: + JSONStream "^1.0.3" + combine-source-map "~0.7.1" + defined "^1.0.0" + through2 "^2.0.0" + umd "^3.0.0" + +browser-resolve@^1.11.0, browser-resolve@^1.7.0: + version "1.11.2" + resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce" + dependencies: + resolve "1.1.7" + +browserify-aes@^1.0.0, browserify-aes@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a" + dependencies: + buffer-xor "^1.0.2" + cipher-base "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.0" + inherits "^2.0.1" + +browserify-cipher@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" + dependencies: + browserify-aes "^1.0.4" + browserify-des "^1.0.0" + evp_bytestokey "^1.0.0" + +browserify-des@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd" + dependencies: + cipher-base "^1.0.1" + des.js "^1.0.0" + inherits "^2.0.1" + +browserify-rsa@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" + dependencies: + bn.js "^4.1.0" + randombytes "^2.0.1" + +browserify-sign@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f" + dependencies: + bn.js "^4.1.1" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.2" + elliptic "^6.0.0" + inherits "^2.0.1" + parse-asn1 "^5.0.0" + +browserify-zlib@~0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" + dependencies: + pako "~0.2.0" + +browserify@^13.0.0: + version "13.3.0" + resolved "https://registry.yarnpkg.com/browserify/-/browserify-13.3.0.tgz#b5a9c9020243f0c70e4675bec8223bc627e415ce" + dependencies: + JSONStream "^1.0.3" + assert "^1.4.0" + browser-pack "^6.0.1" + browser-resolve "^1.11.0" + browserify-zlib "~0.1.2" + buffer "^4.1.0" + cached-path-relative "^1.0.0" + concat-stream "~1.5.1" + console-browserify "^1.1.0" + constants-browserify "~1.0.0" + crypto-browserify "^3.0.0" + defined "^1.0.0" + deps-sort "^2.0.0" + domain-browser "~1.1.0" + duplexer2 "~0.1.2" + events "~1.1.0" + glob "^7.1.0" + has "^1.0.0" + htmlescape "^1.1.0" + https-browserify "~0.0.0" + inherits "~2.0.1" + insert-module-globals "^7.0.0" + labeled-stream-splicer "^2.0.0" + module-deps "^4.0.8" + os-browserify "~0.1.1" + parents "^1.0.1" + path-browserify "~0.0.0" + process "~0.11.0" + punycode "^1.3.2" + querystring-es3 "~0.2.0" + read-only-stream "^2.0.0" + readable-stream "^2.0.2" + resolve "^1.1.4" + shasum "^1.0.0" + shell-quote "^1.6.1" + stream-browserify "^2.0.0" + stream-http "^2.0.0" + string_decoder "~0.10.0" + subarg "^1.0.0" + syntax-error "^1.1.1" + through2 "^2.0.0" + timers-browserify "^1.0.1" + tty-browserify "~0.0.0" + url "~0.11.0" + util "~0.10.1" + vm-browserify "~0.0.1" + xtend "^4.0.0" + bser@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169" @@ -882,10 +1071,26 @@ buffer-shims@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" +buffer-xor@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" + +buffer@^4.1.0: + version "4.9.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + isarray "^1.0.0" + builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" +builtin-status-codes@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" + builtins@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/builtins/-/builtins-0.0.7.tgz#355219cd6cf18dbe7c01cc7fd2dce765cfdc549a" @@ -898,6 +1103,10 @@ bytes@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070" +cached-path-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.0.tgz#d1094c577fbd9a8b8bd43c96af6188aa205d05f4" + callsite@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" @@ -996,6 +1205,12 @@ chownr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" +cipher-base@^1.0.0, cipher-base@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07" + dependencies: + inherits "^2.0.1" + clean-base-url@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b" @@ -1116,6 +1331,15 @@ columnify@~1.5.4: strip-ansi "^3.0.0" wcwidth "^1.0.0" +combine-source-map@~0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e" + dependencies: + convert-source-map "~1.1.0" + inline-source-map "~0.6.0" + lodash.memoize "~3.0.3" + source-map "~0.5.3" + combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" @@ -1162,7 +1386,7 @@ component-emitter@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3" -component-emitter@1.2.1: +component-emitter@1.2.1, component-emitter@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" @@ -1199,7 +1423,7 @@ concat-stream@1.5.0: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@^1.4.7, concat-stream@^1.5.2: +concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2: version "1.6.0" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" dependencies: @@ -1207,6 +1431,14 @@ concat-stream@^1.4.7, concat-stream@^1.5.2: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@~1.5.0, concat-stream@~1.5.1: + version "1.5.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" + dependencies: + inherits "~2.0.1" + readable-stream "~2.0.0" + typedarray "~0.0.5" + config-chain@~1.1.10: version "1.1.11" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" @@ -1234,7 +1466,7 @@ configstore@^2.0.0: write-file-atomic "^1.1.2" xdg-basedir "^2.0.0" -console-browserify@1.1.x: +console-browserify@1.1.x, console-browserify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" dependencies: @@ -1250,6 +1482,10 @@ consolidate@^0.14.0: dependencies: bluebird "^3.1.1" +constants-browserify@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" + content-disposition@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.1.tgz#87476c6a67c8daa87e32e87616df883ba7fb071b" @@ -1266,6 +1502,10 @@ convert-source-map@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67" +convert-source-map@~1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" + cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" @@ -1300,6 +1540,29 @@ core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" +create-ecdh@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" + dependencies: + bn.js "^4.1.0" + elliptic "^6.0.0" + +create-hash@^1.1.0, create-hash@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.2.tgz#51210062d7bb7479f6c65bb41a92208b1d61abad" + dependencies: + cipher-base "^1.0.1" + inherits "^2.0.1" + ripemd160 "^1.0.0" + sha.js "^2.3.6" + +create-hmac@^1.1.0, create-hmac@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.4.tgz#d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170" + dependencies: + create-hash "^1.1.0" + inherits "^2.0.1" + cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" @@ -1321,6 +1584,21 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" +crypto-browserify@^3.0.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522" + dependencies: + browserify-cipher "^1.0.0" + browserify-sign "^4.0.0" + create-ecdh "^4.0.0" + create-hash "^1.1.0" + create-hmac "^1.1.0" + diffie-hellman "^5.0.0" + inherits "^2.0.1" + pbkdf2 "^3.0.3" + public-encrypt "^4.0.0" + randombytes "^2.0.0" + cst@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/cst/-/cst-0.3.0.tgz#67aa8b30274e0061e64366aea45c0652a5e61aef" @@ -1427,6 +1705,32 @@ depd@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.0.tgz#e1bd82c6aab6ced965b97b88b17ed3e528ca18c3" +deps-sort@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5" + dependencies: + JSONStream "^1.0.3" + shasum "^1.0.0" + subarg "^1.0.0" + through2 "^2.0.0" + +derequire@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/derequire/-/derequire-2.0.6.tgz#31a414bb7ca176239fa78b116636ef77d517e768" + dependencies: + acorn "^4.0.3" + concat-stream "^1.4.6" + escope "^3.6.0" + through2 "^2.0.0" + yargs "^6.5.0" + +des.js@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" + dependencies: + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -1445,7 +1749,7 @@ detect-indent@^3.0.0: minimist "^1.1.0" repeating "^1.1.0" -detective@^4.3.1: +detective@^4.0.0, detective@^4.3.1: version "4.3.2" resolved "https://registry.yarnpkg.com/detective/-/detective-4.3.2.tgz#77697e2e7947ac3fe7c8e26a6d6f115235afa91c" dependencies: @@ -1463,6 +1767,14 @@ diff@^1.3.1: version "1.4.0" resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" +diffie-hellman@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" + dependencies: + bn.js "^4.1.0" + miller-rabin "^4.0.0" + randombytes "^2.0.0" + dom-serializer@0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82" @@ -1470,6 +1782,10 @@ dom-serializer@0: domelementtype "~1.1.1" entities "~1.1.1" +domain-browser@~1.1.0: + version "1.1.7" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" + domelementtype@1: version "1.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2" @@ -1497,6 +1813,12 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" +duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" + dependencies: + readable-stream "^2.0.2" + ecc-jsbn@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" @@ -1515,6 +1837,15 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" +elliptic@^6.0.0: + version "6.3.2" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.2.tgz#e4c81e0829cf0a65ab70e998b8232723b5c1bc48" + dependencies: + bn.js "^4.4.0" + brorand "^1.0.1" + hash.js "^1.0.0" + inherits "^2.0.1" + ember-a11y-testing@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/ember-a11y-testing/-/ember-a11y-testing-0.0.5.tgz#8759f6b70705e60fb5109b3ecac6d9e0068bf0b7" @@ -1552,6 +1883,33 @@ ember-bootstrap@0.7.2: ember-cli-htmlbars "^1.0.2" ember-wormhole "^0.3.4" +ember-browserify@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/ember-browserify/-/ember-browserify-1.1.13.tgz#df74eea4adf4694e8c364222f9c5fd605000930b" + dependencies: + acorn "^2.6.4" + broccoli-caching-writer "^3.0.3" + broccoli-kitchen-sink-helpers "^0.3.1" + broccoli-merge-trees "^1.1.2" + broccoli-plugin "^1.2.1" + browserify "^13.0.0" + core-object "^1.1.0" + debug "^2.2.0" + derequire "^2.0.3" + ember-cli-version-checker "^1.1.4" + fs-tree "^1.0.0" + fs-tree-diff "^0.5.0" + lodash "^4.5.1" + md5-hex "^1.3.0" + mkdirp "^0.5.0" + promise-map-series "^0.2.0" + quick-temp "^0.1.2" + rimraf "^2.2.8" + rsvp "^3.0.14" + symlink-or-copy "^1.0.0" + through2 "^2.0.0" + walk-sync "^0.2.7" + ember-cli-app-version@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-1.0.1.tgz#d135eba75f30e791d8a5e5844f1251dcbcc40438" @@ -2034,6 +2392,16 @@ ember-lodash@0.0.6: ember-cli-babel "^5.1.5" lodash-es "^3.10.0" +ember-lodash@4.17.0: + version "4.17.0" + resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.17.0.tgz#15ffb72b050131f28c8dd6bf00146c64ff7496c7" + dependencies: + broccoli-funnel "^1.1.0" + broccoli-merge-trees "^1.1.1" + broccoli-string-replace "^0.1.1" + ember-cli-babel "^5.1.6" + lodash-es "^4.17.2" + ember-moment@6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-6.1.0.tgz#5c2e7448e22007f9839c41e05bd3013a9eba2a82" @@ -2262,7 +2630,7 @@ error@^7.0.0: string-template "~0.2.1" xtend "~4.0.0" -es5-ext@^0.10.7, es5-ext@~0.10.11, es5-ext@~0.10.2: +es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7: version "0.10.12" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047" dependencies: @@ -2277,17 +2645,47 @@ es6-iterator@2: es5-ext "^0.10.7" es6-symbol "3" +es6-map@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897" + dependencies: + d "~0.1.1" + es5-ext "~0.10.11" + es6-iterator "2" + es6-set "~0.1.3" + es6-symbol "~3.1.0" + event-emitter "~0.3.4" + es6-promise@~4.0.3: version "4.0.5" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.0.5.tgz#7882f30adde5b240ccfa7f7d78c548330951ae42" -es6-symbol@3, es6-symbol@^3.0.2, es6-symbol@~3.1: +es6-set@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8" + dependencies: + d "~0.1.1" + es5-ext "~0.10.11" + es6-iterator "2" + es6-symbol "3" + event-emitter "~0.3.4" + +es6-symbol@3, es6-symbol@^3.0.2, es6-symbol@~3.1, es6-symbol@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa" dependencies: d "~0.1.1" es5-ext "~0.10.11" +es6-weak-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.1.tgz#0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81" + dependencies: + d "^0.1.1" + es5-ext "^0.10.8" + es6-iterator "2" + es6-symbol "3" + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -2296,6 +2694,15 @@ escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^ version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" +escope@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" + dependencies: + es6-map "^0.1.3" + es6-weak-map "^2.0.1" + esrecurse "^4.1.0" + estraverse "^4.1.1" + esprima-fb@~12001.1.0-dev-harmony-fb: version "12001.1.0-dev-harmony-fb" resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915" @@ -2316,10 +2723,21 @@ esprima@~3.1.0: version "3.1.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" -estraverse@^4.1.0: +esrecurse@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220" + dependencies: + estraverse "~4.1.0" + object-assign "^4.0.1" + +estraverse@^4.1.0, estraverse@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" +estraverse@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2" + esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -2328,6 +2746,13 @@ etag@~1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/etag/-/etag-1.7.0.tgz#03d30b5f67dd6e632d2945d30d6652731a34d5d8" +event-emitter@~0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5" + dependencies: + d "~0.1.1" + es5-ext "~0.10.7" + eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" @@ -2336,6 +2761,16 @@ events-to-array@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.0.2.tgz#b3484465534fe4ff66fbdd1a83b777713ba404aa" +events@~1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + +evp_bytestokey@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53" + dependencies: + create-hash "^1.1.1" + exec-sh@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.0.tgz#14f75de3f20d286ef933099b2ce50a90359cef10" @@ -2648,7 +3083,7 @@ fs-tree-diff@^0.3.0: debug "^2.2.0" fast-ordered-set "^1.0.2" -fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6: +fs-tree-diff@^0.5.0, fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623" dependencies: @@ -2657,6 +3092,13 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5 path-posix "^1.0.0" symlink-or-copy "^1.1.8" +fs-tree@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-tree/-/fs-tree-1.0.0.tgz#ef64da3e6dd32cc0df27c3b3e0c299ffa575c026" + dependencies: + mkdirp "~0.5.0" + rimraf "~2.2.8" + fs-vacuum@~1.2.9: version "1.2.9" resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.9.tgz#4f90193ab8ea02890995bcd4e804659a5d366b2d" @@ -2702,6 +3144,10 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: mkdirp ">=0.5 0" rimraf "2" +function-bind@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" + gauge@~2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.6.0.tgz#d35301ad18e96902b4751dcbbe40f4218b942a46" @@ -2789,7 +3235,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1: +glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@~7.1.1: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -2926,6 +3372,12 @@ has-unicode@^2.0.0, has-unicode@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" +has@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" + dependencies: + function-bind "^1.0.2" + hash-for-dep@^1.0.2: version "1.1.2" resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.1.2.tgz#e3347ed92960eb0bb53a2c6c2b70e36d75b7cd0c" @@ -2935,6 +3387,12 @@ hash-for-dep@^1.0.2: heimdalljs-logger "^0.1.7" resolve "^1.1.6" +hash.js@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573" + dependencies: + inherits "^2.0.1" + hasha@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" @@ -2995,6 +3453,10 @@ htmlbars@0.14.24: version "0.14.24" resolved "https://registry.yarnpkg.com/htmlbars/-/htmlbars-0.14.24.tgz#858e1ff795d3f8659dcbf7b11e2b845d65a5d6ab" +htmlescape@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" + htmlparser2@3.8.3, htmlparser2@3.8.x: version "3.8.3" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068" @@ -3028,6 +3490,10 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" +https-browserify@~0.0.0: + version "0.0.1" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" + i@0.3.x: version "0.3.5" resolved "https://registry.yarnpkg.com/i/-/i-0.3.5.tgz#1d2b854158ec8169113c6cb7f6b6801e99e211d5" @@ -3036,6 +3502,10 @@ iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.15" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb" +ieee754@^1.1.4: + version "1.1.8" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" + iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" @@ -3112,6 +3582,12 @@ inline-source-map-comment@^1.0.5: sum-up "^1.0.1" xtend "^4.0.0" +inline-source-map@~0.6.0: + version "0.6.2" + resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" + dependencies: + source-map "~0.5.3" + inquirer@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" @@ -3131,6 +3607,19 @@ inquirer@^1.2.1: strip-ansi "^3.0.0" through "^2.3.6" +insert-module-globals@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.1.tgz#c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3" + dependencies: + JSONStream "^1.0.3" + combine-source-map "~0.7.1" + concat-stream "~1.5.1" + is-buffer "^1.1.0" + lexical-scope "^1.2.0" + process "~0.11.0" + through2 "^2.0.0" + xtend "^4.0.0" + invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -3143,7 +3632,7 @@ is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" -is-buffer@^1.0.2: +is-buffer@^1.0.2, is-buffer@^1.1.0: version "1.1.4" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" @@ -3256,11 +3745,11 @@ is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" -isarray@0.0.1: +isarray@0.0.1, isarray@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -3300,6 +3789,18 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" +js-cookie@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.0.tgz#479c20d0a0bb6cab81491f917788cd025d6452f0" + +js-cookie@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz#48071625217ac9ecfab8c343a13d42ec09ff0526" + +js-md5@^0.4.2: + version "0.4.2" + resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.4.2.tgz#8a1231e60ab392a6d3a75db6d532ec0c59667bc3" + js-string-escape@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" @@ -3408,6 +3909,12 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" +json-stable-stringify@~0.0.0: + version "0.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45" + dependencies: + jsonify "~0.0.0" + json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -3437,6 +3944,10 @@ jsonlint@~1.6.2: JSV ">= 4.0.x" nomnom ">= 1.5.x" +jsonparse@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.0.tgz#85fc245b1d9259acc6941960b905adf64e7de0e8" + jsonpointer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" @@ -3449,6 +3960,20 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.3.6" +keen-core@0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/keen-core/-/keen-core-0.1.2.tgz#e8c107fdef227f56e6cf12eb59ef41ff38c37778" + dependencies: + component-emitter "^1.2.0" + +keen-tracking@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/keen-tracking/-/keen-tracking-1.1.3.tgz#1159d2066b90474472fb611ac31c37bc51d94b72" + dependencies: + component-emitter "^1.2.0" + js-cookie "2.1.0" + keen-core "0.1.2" + kew@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" @@ -3469,6 +3994,14 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +labeled-stream-splicer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59" + dependencies: + inherits "^2.0.1" + isarray "~0.0.1" + stream-splicer "^2.0.0" + layout-bin-packer@^1.2.0: version "1.2.2" resolved "https://registry.yarnpkg.com/layout-bin-packer/-/layout-bin-packer-1.2.2.tgz#3f3f6fdaeb1fc0989aa60de52d98f27f8fa12150" @@ -3495,6 +4028,12 @@ leven@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3" +lexical-scope@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4" + dependencies: + astw "^2.0.0" + linkify-it@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f" @@ -3537,6 +4076,10 @@ lodash-es@^3.10.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-3.10.1.tgz#a1c85d9829c9009004339dc3846dbabb46cf4e19" +lodash-es@^4.17.2: + version "4.17.4" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" + lodash._arraycopy@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1" @@ -3703,6 +4246,10 @@ lodash.keysin@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash.memoize@~3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" + lodash.merge@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994" @@ -3865,7 +4412,7 @@ matcher-collection@^1.0.0, matcher-collection@^1.0.1: dependencies: minimatch "^3.0.2" -md5-hex@^1.0.2, md5-hex@^1.2.1: +md5-hex@^1.0.2, md5-hex@^1.2.1, md5-hex@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" dependencies: @@ -3934,6 +4481,13 @@ micromatch@^2.1.5, micromatch@^2.3.7: parse-glob "^3.0.4" regex-cache "^0.4.2" +miller-rabin@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.0.tgz#4a62fb1d42933c05583982f4c716f6fb9e6c6d3d" + dependencies: + bn.js "^4.0.0" + brorand "^1.0.1" + "mime-db@>= 1.24.0 < 2", mime-db@~1.25.0: version "1.25.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.25.0.tgz#c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392" @@ -3948,13 +4502,17 @@ mime@1.3.4, mime@^1.2.11: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" +minimalistic-assert@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" + "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.0, minimatch@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" dependencies: brace-expansion "^1.0.0" -minimatch@^2.0.1, minimatch@^2.0.3: +minimatch@^2.0.1, minimatch@^2.0.3, minimatch@^2.0.8: version "2.0.10" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" dependencies: @@ -3994,6 +4552,26 @@ mktemp@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b" +module-deps@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.0.8.tgz#55fd70623399706c3288bef7a609ff1e8c0ed2bb" + dependencies: + JSONStream "^1.0.3" + browser-resolve "^1.7.0" + cached-path-relative "^1.0.0" + concat-stream "~1.5.0" + defined "^1.0.0" + detective "^4.0.0" + duplexer2 "^0.1.2" + inherits "^2.0.1" + parents "^1.0.0" + readable-stream "^2.0.2" + resolve "^1.1.3" + stream-combiner2 "^1.1.1" + subarg "^1.0.0" + through2 "^2.0.0" + xtend "^4.0.0" + moment-timezone@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.3.1.tgz#3ef47856b02d53b718a10a5ec2023aa299e07bf5" @@ -4387,6 +4965,10 @@ ora@^0.2.0: cli-spinners "^0.1.2" object-assign "^4.0.1" +os-browserify@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54" + os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -4420,6 +5002,26 @@ output-file-sync@^1.1.0: mkdirp "^0.5.1" object-assign "^4.1.0" +pako@~0.2.0: + version "0.2.9" + resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" + +parents@^1.0.0, parents@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" + dependencies: + path-platform "~0.11.15" + +parse-asn1@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.0.0.tgz#35060f6d5015d37628c770f4e091a0b5a278bc23" + dependencies: + asn1.js "^4.0.0" + browserify-aes "^1.0.0" + create-hash "^1.1.0" + evp_bytestokey "^1.0.0" + pbkdf2 "^3.0.3" + parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" @@ -4467,6 +5069,10 @@ path-array@^1.0.0: dependencies: array-index "^1.0.0" +path-browserify@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" + path-exists@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081" @@ -4485,6 +5091,10 @@ path-is-inside@^1.0.1, path-is-inside@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" +path-platform@~0.11.15: + version "0.11.15" + resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" + path-posix@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/path-posix/-/path-posix-1.0.0.tgz#06b26113f56beab042545a23bfa88003ccac260f" @@ -4505,6 +5115,12 @@ pathval@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pathval/-/pathval-0.1.1.tgz#08f911cdca9cce5942880da7817bc0b723b66d82" +pbkdf2@^3.0.3: + version "3.0.9" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.9.tgz#f2c4b25a600058b3c3773c086c37dbbee1ffe693" + dependencies: + create-hmac "^1.1.2" + pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" @@ -4575,11 +5191,15 @@ process-relative-require@^1.0.0: dependencies: node-modules-path "^1.0.0" +process@~0.11.0: + version "0.11.9" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1" + progress@~1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" -promise-map-series@^0.2.1: +promise-map-series@^0.2.0, promise-map-series@^0.2.1: version "0.2.3" resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847" dependencies: @@ -4616,7 +5236,21 @@ pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" -punycode@^1.4.1: +public-encrypt@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" + dependencies: + bn.js "^4.1.0" + browserify-rsa "^4.0.0" + create-hash "^1.1.0" + parse-asn1 "^5.0.0" + randombytes "^2.0.1" + +punycode@1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + +punycode@^1.3.2, punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -4632,6 +5266,14 @@ qs@~6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" +querystring-es3@~0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" + +querystring@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" + quick-temp@0.1.6, quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5: version "0.1.6" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.6.tgz#a6242a15cba9f9cdbd341287b5c569e318eec307" @@ -4651,6 +5293,10 @@ randomatic@^1.1.3: is-number "^2.0.2" kind-of "^3.0.2" +randombytes@^2.0.0, randombytes@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec" + range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" @@ -4681,6 +5327,12 @@ read-installed@~4.0.3: optionalDependencies: graceful-fs "^4.1.2" +read-only-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" + dependencies: + readable-stream "^2.0.2" + "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@~2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.4.tgz#61ed1b2256ea438d8008895090be84b8e799c853" @@ -4743,7 +5395,7 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.2.2: +readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" dependencies: @@ -4974,7 +5626,11 @@ resolve-dir@^0.1.0: expand-tilde "^1.2.2" global-modules "^0.2.3" -resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7: +resolve@1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" + +resolve@^1.1.2, resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7: version "1.2.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" @@ -5005,10 +5661,14 @@ rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4 dependencies: glob "^7.0.5" -rimraf@~2.2.6: +rimraf@~2.2.6, rimraf@~2.2.8: version "2.2.8" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" +ripemd160@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e" + rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.3.3.tgz#34633caaf8bc66ceff4be3c2e1dffd032538a813" @@ -5102,6 +5762,12 @@ setprototypeof@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08" +sha.js@^2.3.6, sha.js@~2.4.4: + version "2.4.8" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f" + dependencies: + inherits "^2.0.1" + sha@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae" @@ -5109,6 +5775,13 @@ sha@~2.0.1: graceful-fs "^4.1.2" readable-stream "^2.0.2" +shasum@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f" + dependencies: + json-stable-stringify "~0.0.0" + sha.js "~2.4.4" + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -5119,6 +5792,15 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" +shell-quote@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767" + dependencies: + array-filter "~0.0.0" + array-map "~0.0.0" + array-reduce "~0.0.0" + jsonify "~0.0.0" + shelljs@0.3.x: version "0.3.0" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1" @@ -5254,7 +5936,7 @@ source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.0, source-map@~0.5.1: +source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" @@ -5322,11 +6004,42 @@ stack-trace@0.0.x: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +stream-browserify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" + dependencies: + inherits "~2.0.1" + readable-stream "^2.0.2" + +stream-combiner2@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" + dependencies: + duplexer2 "~0.1.0" + readable-stream "^2.0.2" + +stream-http@^2.0.0: + version "2.6.3" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3" + dependencies: + builtin-status-codes "^3.0.0" + inherits "^2.0.1" + readable-stream "^2.1.0" + to-arraybuffer "^1.0.0" + xtend "^4.0.0" + +stream-splicer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83" + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.2" + string-template@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" -string-width@^1.0.1: +string-width@^1.0.1, string-width@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" dependencies: @@ -5338,7 +6051,7 @@ string.prototype.codepointat@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78" -string_decoder@0.10, string_decoder@~0.10.x: +string_decoder@0.10, string_decoder@~0.10.0, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" @@ -5390,6 +6103,12 @@ styled_string@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a" +subarg@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" + dependencies: + minimist "^1.1.0" + sum-up@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e" @@ -5412,6 +6131,12 @@ sync-exec@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105" +syntax-error@^1.1.1: + version "1.1.6" + resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.1.6.tgz#b4549706d386cc1c1dc7c2423f18579b6cade710" + dependencies: + acorn "^2.7.0" + tap-parser@^3.0.2: version "3.0.5" resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-3.0.5.tgz#b947f69e0b3e53d4b92011f6cc552e16dadc7ec9" @@ -5478,10 +6203,23 @@ throttleit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" -through@^2.3.6, through@~2.3.8: +through2@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" + dependencies: + readable-stream "^2.1.5" + xtend "~4.0.1" + +"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" +timers-browserify@^1.0.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" + dependencies: + process "~0.11.0" + tiny-lr@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.0.3.tgz#386731170ce521263a9d337f769ee8f11e88eb04" @@ -5513,6 +6251,10 @@ to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" +to-arraybuffer@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" + to-double-quotes@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-double-quotes/-/to-double-quotes-2.0.0.tgz#aaf231d6fa948949f819301bbab4484d8588e4a7" @@ -5557,6 +6299,10 @@ tryor@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b" +tty-browserify@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" + tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -5605,6 +6351,10 @@ umask@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d" +umd@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e" + underscore.string@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d" @@ -5639,6 +6389,13 @@ untildify@^2.1.0: dependencies: os-homedir "^1.0.0" +url@~0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + dependencies: + punycode "1.3.2" + querystring "0.2.0" + user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" @@ -5651,7 +6408,7 @@ util-extend@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" -"util@>=0.10.3 <1": +util@0.10.3, "util@>=0.10.3 <1", util@~0.10.1: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: @@ -5703,6 +6460,12 @@ verror@1.3.6: dependencies: extsprintf "1.0.2" +vm-browserify@~0.0.1: + version "0.0.4" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" + dependencies: + indexof "0.0.1" + vow-fs@~0.3.4: version "0.3.6" resolved "https://registry.yarnpkg.com/vow-fs/-/vow-fs-0.3.6.tgz#2d4c59be22e2bf2618ddf597ab4baa923be7200d" @@ -5872,7 +6635,7 @@ xmlhttprequest-ssl@1.5.3: version "1.5.3" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d" -xtend@^4.0.0, xtend@~4.0.0: +xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" @@ -5898,6 +6661,12 @@ yargs-parser@^2.4.1: camelcase "^3.0.0" lodash.assign "^4.0.6" +yargs-parser@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" + dependencies: + camelcase "^3.0.0" + yargs@^4.7.1: version "4.8.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" @@ -5917,6 +6686,24 @@ yargs@^4.7.1: y18n "^3.2.1" yargs-parser "^2.4.1" +yargs@^6.5.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" + dependencies: + camelcase "^3.0.0" + cliui "^3.2.0" + decamelize "^1.1.1" + get-caller-file "^1.0.1" + os-locale "^1.4.0" + read-pkg-up "^1.0.1" + require-directory "^2.1.1" + require-main-filename "^1.0.1" + set-blocking "^2.0.0" + string-width "^1.0.2" + which-module "^1.0.0" + y18n "^3.2.1" + yargs-parser "^4.2.0" + yargs@~3.10.0: version "3.10.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" From 3229a17a90ca456bb249c1bdafd35c6ca4158a6c Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Thu, 2 Feb 2017 09:07:43 -0500 Subject: [PATCH 15/58] JS errors. --- addon/mixins/keen-tracker.js | 63 ++++++++++--------- .../app/controllers/nodes/detail/index.js | 2 +- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 8c12266ae..62d7c1f53 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -34,17 +34,20 @@ export default Ember.Mixin.create({ var expiresInMinutes = 25; expDate.setTime(expDate.getTime() + (expiresInMinutes * 60 * 1000)); var currentSessionId = Cookie.get('keenSessionId') || keenTracking.helpers.getUniqueId(); - Cookie.set('keenSessionId', currentSessionId, {expires: expDate, path: '/'}); + Cookie.set('keenSessionId', currentSessionId, { + expires: expDate, path: '/' + }); } function _getOrCreateKeenId() { if (!Cookie.get('keenUserId')) { - Cookie.set('keenUserId', keenTracking.helpers.getUniqueId(), {expires: 365, path: '/'}); + Cookie.set('keenUserId', keenTracking.helpers.getUniqueId(), { + expires: 365, path: '/' + }); } return Cookie.get('keenUserId'); } - function _defaultKeenPayload() { _createOrUpdateKeenSession(); @@ -129,6 +132,8 @@ export default Ember.Mixin.create({ } client.recordEvents(events, function (err, res) { if (err) { + console.log(err); + // TODO RAVEN // Raven.captureMessage('Error sending Keen data for multiple events: <' + err + '>', { // extra: {payload: events} // }); @@ -137,6 +142,8 @@ export default Ember.Mixin.create({ var results = res[collection]; for (var idx in results) { if (!results[idx].success) { + console.log(err); + // TODO RAVEN // Raven.captureMessage('Error sending Keen data to ' + collection + '.', { // extra: {payload: events[collection][idx]} // }); @@ -151,31 +158,31 @@ export default Ember.Mixin.create({ if (instance) { throw new Error('Cannot instantiate another KeenTracker instance.'); } else { - var self = this; + var _this = this; - self._publicClient = null; - self._privateClient = null; + _this._publicClient = null; + _this._privateClient = null; - self.init = function _initKeentracker(params) { - var self = this; + _this.init = function _initKeentracker(params) { + var _this = this; if (params === undefined) { - return self; + return _this; } - self._publicClient = keenTracking({ + _this._publicClient = keenTracking({ projectId: params.public.projectId, writeKey: params.public.writeKey, }); - self._publicClient.extendEvents(_defaultPublicKeenPayload); + _this._publicClient.extendEvents(_defaultPublicKeenPayload); - self._privateClient = keenTracking({ + _this._privateClient = keenTracking({ projectId: params.private.projectId, writeKey: params.private.writeKey, }); - self._privateClient.extendEvents(_defaultPrivateKeenPayload); + _this._privateClient.extendEvents(_defaultPrivateKeenPayload); - return self; + return _this; }; var _defaultPublicKeenPayload = function() { return _defaultKeenPayload(); }; @@ -218,27 +225,27 @@ export default Ember.Mixin.create({ return payload; }; - self.trackPageView = function (data) { - var self = this; + _this.trackPageView = function (data) { + var _this = this; if (_get(window, 'contextVars.node.isPublic', false) && _get(window, 'contextVars.analyticsMeta.pageMeta.public', false)) { - self.trackPublicEvent('pageviews', data); + _this.trackPublicEvent('pageviews', data); } - self.trackPrivateEvent('pageviews', data); + _this.trackPrivateEvent('pageviews', data); }; - self.trackPrivateEvent = function(collection, event) { - return _trackCustomEvent(self._privateClient, collection, event); + _this.trackPrivateEvent = function(collection, event) { + return _trackCustomEvent(_this._privateClient, collection, event); }; - self.trackPrivateEvents = function(events) { - return _trackCustomEvents(self._privateClient, events); + _this.trackPrivateEvents = function(events) { + return _trackCustomEvents(_this._privateClient, events); }; - self.trackPublicEvent = function(collection, event) { - return _trackCustomEvent(self._publicClient, collection, event); + _this.trackPublicEvent = function(collection, event) { + return _trackCustomEvent(_this._publicClient, collection, event); }; - self.trackPublicEvents = function(events) { - return _trackCustomEvents(self._publicClient, events); + _this.trackPublicEvents = function(events) { + return _trackCustomEvents(_this._publicClient, events); }; } } @@ -285,12 +292,12 @@ export default Ember.Mixin.create({ } return nodeVars; }, - keenTrackEvent(event_collection, properties, node) { + keenTrackEvent(collection, properties, node) { // Adds context vars and sends keen trackPrivateEvent method window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); - return this.KeenTracker().getInstance().trackPrivateEvent(event_collection, properties); + return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties); }, /** * For front-end event-tracking - Sends event to keen. Collection: front-end-events. Properties: diff --git a/tests/dummy/app/controllers/nodes/detail/index.js b/tests/dummy/app/controllers/nodes/detail/index.js index ab4c86d3f..184134403 100644 --- a/tests/dummy/app/controllers/nodes/detail/index.js +++ b/tests/dummy/app/controllers/nodes/detail/index.js @@ -29,7 +29,7 @@ export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActi }, updateNode() { this.keenTrackFrontEndEvent({ - category:'button', + category: 'button', action: 'click', label: 'Update Node' }, this.get('model')); From 304c35fb6a22d3cd12f3d9d292aa5d307f980b84 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Thu, 2 Feb 2017 10:17:23 -0500 Subject: [PATCH 16/58] Use afterModel hook instead of beforeModel hook so model info is available to send to keen in page view tracker. Remove Raven capturing. --- addon/mixins/keen-tracker.js | 60 +++++++++--------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 62d7c1f53..d58b89335 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -8,17 +8,13 @@ import keenTracking from 'npm:keen-tracking'; // Adapted from website/static/js/keen.js export default Ember.Mixin.create({ session: Ember.inject.service(), - // Add this mixin to your route, and the beforeModel hook will send pageviews to keen + // Add this mixin to your route, and the afterModel hook will send pageviews to keen // TODO add node to context vars, if exists? - beforeModel(transition) { - let data = { - page: transition.targetName, - queryParams: transition.queryParams - }; + afterModel(model) { // Using afterModel hook so node info can be sent to keen window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); - window.contextVars.node = this.nodeContextVars(null); - return this.KeenTracker().getInstance().trackPageView(data); + window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted + return this.KeenTracker().getInstance().trackPageView(); }, KeenTracker() { function _nowUTC() { @@ -53,7 +49,7 @@ export default Ember.Mixin.create({ var user = window.contextVars.currentUser; var node = window.contextVars.node; - var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); // Is there any way to get this?? + var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); // Do not have this information. return { page: { title: document.title, @@ -116,42 +112,14 @@ export default Ember.Mixin.create({ if (client === null) { return; } - client.recordEvent(collection, eventData, function (err) { - if (err) { - console.log(err); - // Raven.captureMessage('Error sending Keen data to ' + collection + ': <' + err + '>', { - // extra: {payload: eventData} - // }); - } - }); + client.recordEvent(collection, eventData); } function _trackCustomEvents(client, events) { if (client === null) { return; } - client.recordEvents(events, function (err, res) { - if (err) { - console.log(err); - // TODO RAVEN - // Raven.captureMessage('Error sending Keen data for multiple events: <' + err + '>', { - // extra: {payload: events} - // }); - } else { - for (var collection in res) { - var results = res[collection]; - for (var idx in results) { - if (!results[idx].success) { - console.log(err); - // TODO RAVEN - // Raven.captureMessage('Error sending Keen data to ' + collection + '.', { - // extra: {payload: events[collection][idx]} - // }); - } - } - } - } - }); + client.recordEvents(events); } function KeenTracker() { @@ -269,13 +237,13 @@ export default Ember.Mixin.create({ let userInfo = session.get('session.authenticated'); user = { id: userInfo.id, - entry_point: userInfo.attributes.entry_point, + entry_point: userInfo.attributes.entry_point, // Don't have the entry point. institutions: null, // Don't really want to make an API request to fetch user institutions. locale: userInfo.attributes.locale, timezone: userInfo.attributes.timezone }; } - user.anon = {}; // Can I get this info? + user.anon = {}; // Do not have this info, but most duplicated in geo. return user; }, nodeContextVars(node) { @@ -300,20 +268,20 @@ export default Ember.Mixin.create({ return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties); }, /** - * For front-end event-tracking - Sends event to keen. Collection: front-end-events. Properties: - * interaction dictionary plus supplement info like OSF + * For front-end event-tracking - Sends event info to keen front-end-events collection. Collection: front-end-events. + * Properties: interaction dictionary plus supplemental info in default keen payload * * @method keenTrackFrontEndEvent * @param {Object} event Dictionary with category, action, label - * @param {Object} node Node model, if exists + * @param {Object} model Relevant model - node model if exists */ - keenTrackFrontEndEvent(event, node) { + keenTrackFrontEndEvent(event, model) { return this.keenTrackEvent('front-end-events', { interaction: { category: event.category || null, action: event.action || null, label: event.label || null } - }, node); + }, model); } }); From 14ef12af827b3bda1903cd666808a7b7c00d1599 Mon Sep 17 00:00:00 2001 From: Sherif Date: Thu, 2 Feb 2017 11:06:49 -0500 Subject: [PATCH 17/58] remove the 3d party component from ember-osf and move to the client app (e.g. preprints). --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index dac5739a3..b507f5982 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "loader": "2.1.0", "loader.js": "4.0.3", "moment": "^2.13.0", - "pagination-pager": "2.4.2", "phantomjs-prebuilt": "^2.1.7" }, "keywords": [ From 5d26f5400633d56fddaa49bc7a78b8ae74f0a524 Mon Sep 17 00:00:00 2001 From: Sherif Date: Thu, 2 Feb 2017 11:07:43 -0500 Subject: [PATCH 18/58] Add deprecate warning message to existing pagination components --- addon/components/osf-paginator/component.js | 7 +++++++ addon/components/pagination-control/component.js | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/addon/components/osf-paginator/component.js b/addon/components/osf-paginator/component.js index 4e5858023..ff19917d5 100644 --- a/addon/components/osf-paginator/component.js +++ b/addon/components/osf-paginator/component.js @@ -24,6 +24,13 @@ import layout from './template'; export default Ember.Component.extend({ layout, currentPage: 1, + init() { + this._super(...arguments); + Ember.deprecate("osf-paginator is now deprecated. Use pagination-pager instead", false, { + id: "osf-paginator", + until: '0.1.0' + }); + }, pages: Ember.computed('totalSearchResults', function() { let totalSearchResults = this.get('totalSearchResults'); return Math.ceil(totalSearchResults / 10); diff --git a/addon/components/pagination-control/component.js b/addon/components/pagination-control/component.js index e6fa4025c..f939a96fe 100644 --- a/addon/components/pagination-control/component.js +++ b/addon/components/pagination-control/component.js @@ -21,6 +21,14 @@ export default Ember.Component.extend({ return this.get('currentPage') >= this.get('pageCount'); }), + init() { + this._super(...arguments); + Ember.deprecate("pagination-control is now deprecated. Use pagination-pager instead", false, { + id: "pagination-control", + until: '0.1.0' + }); + }, + // TODO: This actions hash feels a bit kludgy actions: { next() { From 84c8f3ef1e02844d45157ca19d587aa6ea183003 Mon Sep 17 00:00:00 2001 From: Sherif Date: Thu, 2 Feb 2017 11:34:11 -0500 Subject: [PATCH 19/58] Adjust styling --- addon/components/osf-paginator/component.js | 10 +++++----- addon/components/pagination-control/component.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addon/components/osf-paginator/component.js b/addon/components/osf-paginator/component.js index ff19917d5..b40239be3 100644 --- a/addon/components/osf-paginator/component.js +++ b/addon/components/osf-paginator/component.js @@ -25,11 +25,11 @@ export default Ember.Component.extend({ layout, currentPage: 1, init() { - this._super(...arguments); - Ember.deprecate("osf-paginator is now deprecated. Use pagination-pager instead", false, { - id: "osf-paginator", - until: '0.1.0' - }); + this._super(...arguments); + Ember.deprecate('osf-paginator is now deprecated. Use pagination-pager instead', false, { + id: 'osf-paginator', + until: '0.1.0' + }); }, pages: Ember.computed('totalSearchResults', function() { let totalSearchResults = this.get('totalSearchResults'); diff --git a/addon/components/pagination-control/component.js b/addon/components/pagination-control/component.js index f939a96fe..c7bce4b4c 100644 --- a/addon/components/pagination-control/component.js +++ b/addon/components/pagination-control/component.js @@ -22,11 +22,11 @@ export default Ember.Component.extend({ }), init() { - this._super(...arguments); - Ember.deprecate("pagination-control is now deprecated. Use pagination-pager instead", false, { - id: "pagination-control", - until: '0.1.0' - }); + this._super(...arguments); + Ember.deprecate('pagination-control is now deprecated. Use pagination-pager instead', false, { + id: 'pagination-control', + until: '0.1.0' + }); }, // TODO: This actions hash feels a bit kludgy From b10f9c7b53d97b04887edff14e27b1d3d3b28c24 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Thu, 2 Feb 2017 12:14:11 -0500 Subject: [PATCH 20/58] Remove double quotes. --- tests/dummy/config/environment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index a3f8f35c2..1870faba1 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -16,12 +16,12 @@ module.exports = function(environment) { var ENV = { KEEN: { private: { - projectId: "process.env.KEEN_PRIVATE_PROJECT_ID", - writeKey: "process.env.KEEN_PRIVATE_WRITE_KEY" + projectId: 'process.env.KEEN_PRIVATE_PROJECT_ID', + writeKey: 'process.env.KEEN_PRIVATE_WRITE_KEY' }, public: { - projectId: "process.env.KEEN_PUBLIC_PROJECT_ID", - writeKey: "process.env.KEEN_PUBLIC_WRITE_KEY" + projectId: 'process.env.KEEN_PUBLIC_PROJECT_ID', + writeKey: 'process.env.KEEN_PUBLIC_WRITE_KEY' } }, modulePrefix: 'dummy', From 809a469d16f152590dc036bdd8a9091f09fae4e2 Mon Sep 17 00:00:00 2001 From: Sherif Date: Thu, 2 Feb 2017 12:21:20 -0500 Subject: [PATCH 21/58] Add a note to docstring --- addon/components/osf-paginator/component.js | 3 +++ addon/components/pagination-control/component.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addon/components/osf-paginator/component.js b/addon/components/osf-paginator/component.js index b40239be3..b35d4a64f 100644 --- a/addon/components/osf-paginator/component.js +++ b/addon/components/osf-paginator/component.js @@ -16,6 +16,9 @@ import layout from './template'; * fetchResults=(action 'fetchResults') * query=query}} * ``` + * + * The osf-paginator is now deprecated. Use pagination-pager instead. + * * @class osf-paginator * @param {integer} totalSearchResults Number of total search results to be paginated * @param {action} fetchResults - action for fetching other pages of results diff --git a/addon/components/pagination-control/component.js b/addon/components/pagination-control/component.js index c7bce4b4c..e6abc3392 100644 --- a/addon/components/pagination-control/component.js +++ b/addon/components/pagination-control/component.js @@ -8,6 +8,9 @@ import layout from './template'; /** * Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin. + * + * The pagination-control is now deprecated. Use pagination-pager instead. + * * @class pagination-control */ export default Ember.Component.extend({ From 767c1c2533563a2a8bb20705cff5681b9a938802 Mon Sep 17 00:00:00 2001 From: Sherif Date: Thu, 2 Feb 2017 14:13:46 -0500 Subject: [PATCH 22/58] Adjust language and version number --- addon/components/osf-paginator/component.js | 6 +++--- addon/components/pagination-control/component.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addon/components/osf-paginator/component.js b/addon/components/osf-paginator/component.js index b35d4a64f..9d121b23c 100644 --- a/addon/components/osf-paginator/component.js +++ b/addon/components/osf-paginator/component.js @@ -17,7 +17,7 @@ import layout from './template'; * query=query}} * ``` * - * The osf-paginator is now deprecated. Use pagination-pager instead. + * The osf-paginator will be deprecated. Use pagination-pager instead. * * @class osf-paginator * @param {integer} totalSearchResults Number of total search results to be paginated @@ -29,9 +29,9 @@ export default Ember.Component.extend({ currentPage: 1, init() { this._super(...arguments); - Ember.deprecate('osf-paginator is now deprecated. Use pagination-pager instead', false, { + Ember.deprecate('osf-paginator will be deprecated. Use pagination-pager instead', false, { id: 'osf-paginator', - until: '0.1.0' + until: '1.0.0' }); }, pages: Ember.computed('totalSearchResults', function() { diff --git a/addon/components/pagination-control/component.js b/addon/components/pagination-control/component.js index e6abc3392..31dc42979 100644 --- a/addon/components/pagination-control/component.js +++ b/addon/components/pagination-control/component.js @@ -9,7 +9,7 @@ import layout from './template'; /** * Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin. * - * The pagination-control is now deprecated. Use pagination-pager instead. + * The pagination-control will be deprecated. Use pagination-pager instead. * * @class pagination-control */ @@ -26,9 +26,9 @@ export default Ember.Component.extend({ init() { this._super(...arguments); - Ember.deprecate('pagination-control is now deprecated. Use pagination-pager instead', false, { + Ember.deprecate('pagination-control will be deprecated. Use pagination-pager instead', false, { id: 'pagination-control', - until: '0.1.0' + until: '1.0.0' }); }, From a614a07db3b2cc5ab4da3785f19a1ed24c6f8c26 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Thu, 2 Feb 2017 16:35:19 -0500 Subject: [PATCH 23/58] Add keenClick and keenTrack actions. --- addon/mixins/keen-tracker.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index d58b89335..a918593d1 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -8,14 +8,25 @@ import keenTracking from 'npm:keen-tracking'; // Adapted from website/static/js/keen.js export default Ember.Mixin.create({ session: Ember.inject.service(), + // Add this mixin to your route, and the afterModel hook will send pageviews to keen - // TODO add node to context vars, if exists? afterModel(model) { // Using afterModel hook so node info can be sent to keen window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted return this.KeenTracker().getInstance().trackPageView(); }, + actions: { + //keenClick action can be used in template + keenClick(category, label, node) { + return this.keenTrackFrontEndEvent({category: category, action: 'click', label: label}, node); + + }, + //keenTrack action can be used in template + keenTrack(category, action, label, node) { + return this.keenTrackFrontEndEvent({category: category, action: action, label: label}, node); + } + }, KeenTracker() { function _nowUTC() { var now = new Date(); From 49e89c3c96461e8291efa00740a9404ac36ee78c Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Thu, 2 Feb 2017 16:49:35 -0500 Subject: [PATCH 24/58] Spaces between brackets. --- addon/mixins/keen-tracker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index a918593d1..ed220b526 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -19,12 +19,12 @@ export default Ember.Mixin.create({ actions: { //keenClick action can be used in template keenClick(category, label, node) { - return this.keenTrackFrontEndEvent({category: category, action: 'click', label: label}, node); + return this.keenTrackFrontEndEvent({ category: category, action: 'click', label: label }, node); }, //keenTrack action can be used in template keenTrack(category, action, label, node) { - return this.keenTrackFrontEndEvent({category: category, action: action, label: label}, node); + return this.keenTrackFrontEndEvent({ category: category, action: action, label: label }, node); } }, KeenTracker() { From cfca8016031a39bac546b6261f38037cb72dfea9 Mon Sep 17 00:00:00 2001 From: Sherif Date: Fri, 3 Feb 2017 10:04:43 -0500 Subject: [PATCH 25/58] Remove the pagination-pager from yarn.lock --- yarn.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index a0a967f6f..81e8dc1de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4420,10 +4420,6 @@ output-file-sync@^1.1.0: mkdirp "^0.5.1" object-assign "^4.1.0" -pagination-pager@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/pagination-pager/-/pagination-pager-2.4.2.tgz#01f6a5f101de867193fc1d1dc16fbab6cd02e49d" - parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" From 41ea208c4459dde02ac4c86ce80a401c8e25a8fa Mon Sep 17 00:00:00 2001 From: Sherif Date: Fri, 3 Feb 2017 11:17:49 -0500 Subject: [PATCH 26/58] Add yuidoc --- docs/api.js | 7 +- docs/classes/CasAuthenticatedRouteMixin.html | 3 + docs/classes/Citation.html | 217 +++++++++++++++ docs/classes/Collection.html | 3 + docs/classes/Comment.html | 3 + docs/classes/CommentReport.html | 3 + docs/classes/CommentableMixin.html | 3 + docs/classes/Contributor.html | 3 + docs/classes/DraftRegistration.html | 3 + docs/classes/FetchAllRouteMixin.html | 3 + docs/classes/File.html | 3 + docs/classes/FileCacheBypassMixin.html | 3 + docs/classes/FileItemMixin.html | 3 + docs/classes/FileProvider.html | 3 + docs/classes/FileVersion.html | 3 + docs/classes/GenericDataADapter.html | 3 + docs/classes/InfinityCustomMixin.html | 3 + docs/classes/Institution.html | 3 + docs/classes/Log.html | 3 + docs/classes/Metaschema.html | 3 + docs/classes/Node.html | 11 +- docs/classes/NodeActionsMixin.html | 20 +- docs/classes/NodeLink.html | 3 + docs/classes/OsfAdapter.html | 19 +- docs/classes/OsfAgnosticAuthController.html | 3 + docs/classes/OsfAgnosticAuthRoute.html | 3 + docs/classes/OsfCookieAuthenticator.html | 5 +- docs/classes/OsfCookieAuthorizer.html | 3 + docs/classes/OsfCookieLoginController.html | 3 + docs/classes/OsfCookieLoginRoute.html | 3 + docs/classes/OsfModel.html | 3 + docs/classes/OsfSerializer.html | 3 + docs/classes/OsfTokenAuthenticator.html | 3 + docs/classes/OsfTokenAuthorizer.html | 3 + .../classes/OsfTokenLoginControllerMixin.html | 3 + docs/classes/OsfTokenLoginRouteMixin.html | 3 + docs/classes/PaginatedControllerMixin.html | 3 + docs/classes/PaginatedRouteMixin.html | 3 + docs/classes/Preprint.html | 3 + docs/classes/Registration.html | 3 + docs/classes/RegistrationActionsMixin.html | 3 + docs/classes/TaggableMixin.html | 3 + docs/classes/Taxonomy.html | 3 + docs/classes/User.html | 3 + docs/classes/ajax-helpers.html | 3 + docs/classes/auth.html | 3 + docs/classes/citation-widget.html | 217 +++++++++++++++ docs/classes/comment-detail.html | 3 + docs/classes/comment-form.html | 3 + docs/classes/comment-pane.html | 3 + docs/classes/current-user.html | 3 + docs/classes/dropzone-widget.html | 3 + docs/classes/elem-id.html | 3 + docs/classes/eosf-project-nav.html | 3 + docs/classes/file-browser-icon.html | 3 + docs/classes/file-browser.html | 3 + docs/classes/file-chooser component.html | 3 + docs/classes/file-manager.html | 3 + docs/classes/file-renderer.html | 3 + docs/classes/file-version.html | 3 + docs/classes/file-widget.html | 3 + docs/classes/navbar-auth-dropdown.html | 262 ++++++++++++++++++ docs/classes/oauth-popup.html | 3 + docs/classes/osf-copyright.html | 3 + docs/classes/osf-footer.html | 3 + docs/classes/osf-mode-footer.html | 3 + docs/classes/osf-navbar.html | 34 +-- docs/classes/osf-paginator.html | 4 + docs/classes/pagination-control.html | 4 + docs/classes/search-dropdown.html | 3 + docs/classes/sign-up.html | 3 + docs/classes/tags-widget.html | 3 + docs/data.json | 175 +++++++++--- docs/files/addon_adapters_osf-adapter.js.html | 22 +- .../addon_authenticators_osf-cookie.js.html | 6 +- .../addon_authenticators_osf-token.js.html | 3 + .../addon_authorizers_osf-cookie.js.html | 3 + .../files/addon_authorizers_osf-token.js.html | 3 + ...mponents_citation-widget_component.js.html | 238 ++++++++++++++++ ...omponents_comment-detail_component.js.html | 3 + ..._components_comment-form_component.js.html | 3 + ..._components_comment-pane_component.js.html | 3 + ...mponents_dropzone-widget_component.js.html | 3 + ...ponents_eosf-project-nav_component.js.html | 3 + ...onents_file-browser-icon_component.js.html | 3 + ...onents_file-browser-item_component.js.html | 3 + ..._components_file-browser_component.js.html | 3 + ..._components_file-chooser_component.js.html | 3 + ...components_file-renderer_component.js.html | 3 + ..._components_file-version_component.js.html | 3 + ...n_components_file-widget_component.js.html | 3 + ...nts_navbar-auth-dropdown_component.js.html | 256 +++++++++++++++++ ...n_components_oauth-popup_component.js.html | 3 + ...components_osf-copyright_component.js.html | 3 + ...on_components_osf-footer_component.js.html | 3 + ...mponents_osf-mode-footer_component.js.html | 3 + ...on_components_osf-navbar_component.js.html | 40 +-- ...components_osf-paginator_component.js.html | 13 + ...nents_pagination-control_component.js.html | 14 + ...mponents_search-dropdown_component.js.html | 3 + ...addon_components_sign-up_component.js.html | 3 + ...n_components_tags-widget_component.js.html | 3 + docs/files/addon_const_permissions.js.html | 3 + docs/files/addon_helpers_elem-id.js.html | 3 + ...don_mixins_cas-authenticated-route.js.html | 3 + docs/files/addon_mixins_commentable.js.html | 3 + .../addon_mixins_fetch-all-route.js.html | 3 + .../addon_mixins_file-cache-bypass.js.html | 3 + docs/files/addon_mixins_file-item.js.html | 3 + .../addon_mixins_generic-data-adapter.js.html | 3 + .../addon_mixins_infinity-custom.js.html | 3 + docs/files/addon_mixins_node-actions.js.html | 31 ++- ...ixins_osf-agnostic-auth-controller.js.html | 3 + ...don_mixins_osf-agnostic-auth-route.js.html | 3 + ...mixins_osf-cookie-login-controller.js.html | 3 + ...ddon_mixins_osf-cookie-login-route.js.html | 3 + ..._mixins_osf-token-login-controller.js.html | 3 + ...addon_mixins_osf-token-login-route.js.html | 3 + .../addon_mixins_paginated-controller.js.html | 3 + .../addon_mixins_paginated-route.js.html | 3 + .../addon_mixins_registration-actions.js.html | 3 + .../files/addon_mixins_taggable-mixin.js.html | 3 + docs/files/addon_models_citation.js.html | 201 ++++++++++++++ docs/files/addon_models_collection.js.html | 10 +- .../files/addon_models_comment-report.js.html | 3 + docs/files/addon_models_comment.js.html | 3 + docs/files/addon_models_contributor.js.html | 3 + .../addon_models_draft-registration.js.html | 3 + docs/files/addon_models_file-provider.js.html | 3 + docs/files/addon_models_file-version.js.html | 3 + docs/files/addon_models_file.js.html | 3 + docs/files/addon_models_institution.js.html | 3 + docs/files/addon_models_log.js.html | 3 + docs/files/addon_models_metaschema.js.html | 3 + docs/files/addon_models_node-link.js.html | 3 + docs/files/addon_models_node.js.html | 14 +- docs/files/addon_models_osf-model.js.html | 3 + docs/files/addon_models_preprint.js.html | 7 +- docs/files/addon_models_registration.js.html | 3 + docs/files/addon_models_taxonomy.js.html | 3 + docs/files/addon_models_user.js.html | 3 + .../addon_serializers_osf-serializer.js.html | 12 +- .../files/addon_services_current-user.js.html | 3 + .../files/addon_services_file-manager.js.html | 3 + docs/files/addon_utils_ajax-helpers.js.html | 3 + docs/files/addon_utils_auth.js.html | 5 +- docs/index.html | 3 + docs/modules/adapters.html | 3 + docs/modules/authenticators.html | 3 + docs/modules/authorizers.html | 3 + docs/modules/components.html | 24 +- docs/modules/ember-osf.html | 35 ++- docs/modules/ember-preprints.html | 3 + docs/modules/ember.html | 3 + docs/modules/helpers.html | 3 + docs/modules/mixins.html | 3 + docs/modules/models.html | 14 +- docs/modules/serializers.html | 3 + docs/modules/services.html | 3 + docs/modules/utils.html | 3 + package.json | 3 +- yarn.lock | 152 +++++++++- 162 files changed, 2273 insertions(+), 192 deletions(-) create mode 100644 docs/classes/Citation.html create mode 100644 docs/classes/citation-widget.html create mode 100644 docs/classes/navbar-auth-dropdown.html create mode 100644 docs/files/addon_components_citation-widget_component.js.html create mode 100644 docs/files/addon_components_navbar-auth-dropdown_component.js.html create mode 100644 docs/files/addon_models_citation.js.html diff --git a/docs/api.js b/docs/api.js index d93336640..7f843fdf3 100644 --- a/docs/api.js +++ b/docs/api.js @@ -2,6 +2,7 @@ YUI.add("yuidoc-meta", function(Y) { Y.YUIDoc = { meta: { "classes": [ "CasAuthenticatedRouteMixin", + "Citation", "Collection", "Comment", "CommentReport", @@ -45,6 +46,7 @@ YUI.add("yuidoc-meta", function(Y) { "User", "ajax-helpers", "auth", + "citation-widget", "comment-detail", "comment-form", "comment-pane", @@ -59,6 +61,7 @@ YUI.add("yuidoc-meta", function(Y) { "file-renderer", "file-version", "file-widget", + "navbar-auth-dropdown", "oauth-popup", "osf-copyright", "osf-footer", @@ -104,7 +107,7 @@ YUI.add("yuidoc-meta", function(Y) { { "displayName": "components", "name": "components", - "description": "Display information about an individual comment, including controls to edit, delete, and report.\nThis component is typically used as part of the `comment-pane` component; see that component for further information.\n\nSample usage:\n```handlebars\n{{comment-detail\n comment=comment\n editComment=attrs.editComment\n deleteComment=attrs.deleteComment\n restoreComment=attrs.restoreComment\n reportComment=attrs.reportComment}}\n```" + "description": "Lists citations for node in APA, MLA, and Chicago formats" }, { "displayName": "ember", @@ -132,7 +135,7 @@ YUI.add("yuidoc-meta", function(Y) { { "displayName": "models", "name": "models", - "description": "Model for OSF APIv2 collections\nFor field and usage information, see:\n* https://api.osf.io/v2/docs/#!/v2/Collection_List_GET" + "description": "Model for OSF APIv2 citation styles" }, { "displayName": "serializers", diff --git a/docs/classes/CasAuthenticatedRouteMixin.html b/docs/classes/CasAuthenticatedRouteMixin.html index 8484536bb..36bd42963 100644 --- a/docs/classes/CasAuthenticatedRouteMixin.html +++ b/docs/classes/CasAuthenticatedRouteMixin.html @@ -41,6 +41,8 @@

APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Citation.html b/docs/classes/Citation.html new file mode 100644 index 000000000..771b929ce --- /dev/null +++ b/docs/classes/Citation.html @@ -0,0 +1,217 @@ + + + + + Citation - Ember OSF + + + + + + + + +
    +
    +
    +

    +
    +
    + API Docs for: 0.0.1 +
    +
    +
    + + +
    +
    + Show: + + + + + + + +
    + +
    +
    +
    +

    Citation Class

    +
    + + +
    + Defined in: addon/models/citation.js:10 +
    + + Module: models
    + Parent Module: ember-osf + +
    + + +
    +

    Model for OSF APIv2 citation styles

    + +
    + + +
    + + +
    +
    +

    Item Index

    + + + + +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + diff --git a/docs/classes/Collection.html b/docs/classes/Collection.html index 242257009..fca8ee268 100644 --- a/docs/classes/Collection.html +++ b/docs/classes/Collection.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Comment.html b/docs/classes/Comment.html index a4e47235b..105d3bc61 100644 --- a/docs/classes/Comment.html +++ b/docs/classes/Comment.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/CommentReport.html b/docs/classes/CommentReport.html index de1048f29..0bdd017c9 100644 --- a/docs/classes/CommentReport.html +++ b/docs/classes/CommentReport.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/CommentableMixin.html b/docs/classes/CommentableMixin.html index 5226bb001..115abe030 100644 --- a/docs/classes/CommentableMixin.html +++ b/docs/classes/CommentableMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Contributor.html b/docs/classes/Contributor.html index a4408c1ef..9372f0f87 100644 --- a/docs/classes/Contributor.html +++ b/docs/classes/Contributor.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/DraftRegistration.html b/docs/classes/DraftRegistration.html index 1667b0a86..3c488d8ff 100644 --- a/docs/classes/DraftRegistration.html +++ b/docs/classes/DraftRegistration.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/FetchAllRouteMixin.html b/docs/classes/FetchAllRouteMixin.html index b00ba073b..7a8adbcc9 100644 --- a/docs/classes/FetchAllRouteMixin.html +++ b/docs/classes/FetchAllRouteMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/File.html b/docs/classes/File.html index 0ae60c16c..1dd5a16b8 100644 --- a/docs/classes/File.html +++ b/docs/classes/File.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/FileCacheBypassMixin.html b/docs/classes/FileCacheBypassMixin.html index 726d33b45..06af10e19 100644 --- a/docs/classes/FileCacheBypassMixin.html +++ b/docs/classes/FileCacheBypassMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/FileItemMixin.html b/docs/classes/FileItemMixin.html index c5aaf95d8..c4e6eaa92 100644 --- a/docs/classes/FileItemMixin.html +++ b/docs/classes/FileItemMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/FileProvider.html b/docs/classes/FileProvider.html index 1515451be..7dd9cf6cd 100644 --- a/docs/classes/FileProvider.html +++ b/docs/classes/FileProvider.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/FileVersion.html b/docs/classes/FileVersion.html index a99ca9845..fb6392042 100644 --- a/docs/classes/FileVersion.html +++ b/docs/classes/FileVersion.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/GenericDataADapter.html b/docs/classes/GenericDataADapter.html index bd0fb6cdd..05c39086c 100644 --- a/docs/classes/GenericDataADapter.html +++ b/docs/classes/GenericDataADapter.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/InfinityCustomMixin.html b/docs/classes/InfinityCustomMixin.html index d735fe412..cde136fa7 100644 --- a/docs/classes/InfinityCustomMixin.html +++ b/docs/classes/InfinityCustomMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Institution.html b/docs/classes/Institution.html index b1754168f..e42697ff3 100644 --- a/docs/classes/Institution.html +++ b/docs/classes/Institution.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Log.html b/docs/classes/Log.html index 3a15b171a..46bb61092 100644 --- a/docs/classes/Log.html +++ b/docs/classes/Log.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Metaschema.html b/docs/classes/Metaschema.html index 4b53b6a9e..4f57c1f65 100644 --- a/docs/classes/Metaschema.html +++ b/docs/classes/Metaschema.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Node.html b/docs/classes/Node.html index 1fd1b87c9..6edb67af1 100644 --- a/docs/classes/Node.html +++ b/docs/classes/Node.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -258,7 +261,7 @@

    isContributor

    Defined in - addon/models/node.js:103 + addon/models/node.js:110

    @@ -315,7 +318,7 @@

    isAnonymous

    Defined in - addon/models/node.js:96 + addon/models/node.js:103

    @@ -340,7 +343,7 @@

    isProject

    Defined in - addon/models/node.js:83 + addon/models/node.js:90

    @@ -365,7 +368,7 @@

    isRegistration

    Defined in - addon/models/node.js:89 + addon/models/node.js:96

    diff --git a/docs/classes/NodeActionsMixin.html b/docs/classes/NodeActionsMixin.html index 80322d968..197cc97b9 100644 --- a/docs/classes/NodeActionsMixin.html +++ b/docs/classes/NodeActionsMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -666,7 +669,7 @@

    addNodeLink

    -

    Add a node link (pointer) to another node

    +

    Adds a relationship to another node, called a linkedNode.

    @@ -680,7 +683,7 @@

    Parameters:

    -

    ID of the node for which you wish to create a pointer

    +

    ID of the node for which you wish to create a link

    @@ -693,7 +696,7 @@

    Returns:

    Promise: -

    Returns a promise that resolves to model for the newly created NodeLink

    +

    Returns a promise that resolves to the newly updated node

    @@ -883,7 +886,7 @@

    removeNodeLink

    (
    • - nodeLink + linkedNode
    )
    @@ -909,7 +912,7 @@

    removeNodeLink

    -

    Remove a node link (pointer) to another node

    +

    Removes the linkedNode relationship to another node. Does not remove the linked node itself.

    @@ -918,12 +921,12 @@

    Parameters:

    • - nodeLink + linkedNode Object
      -

      nodeLink record to be destroyed.

      +

      linkedNode relationship to be destroyed.

      @@ -936,8 +939,7 @@

      Returns:

      Promise: -

      Returns a promise that resolves after the node link has been removed. This does not delete -the target node itself.

      +

      Returns a promise that resolves to the newly updated node

    diff --git a/docs/classes/NodeLink.html b/docs/classes/NodeLink.html index c474bb64a..78832d1c4 100644 --- a/docs/classes/NodeLink.html +++ b/docs/classes/NodeLink.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfAdapter.html b/docs/classes/OsfAdapter.html index a5c71e76b..35c910ff5 100644 --- a/docs/classes/OsfAdapter.html +++ b/docs/classes/OsfAdapter.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -280,7 +283,7 @@

    _addRelated

    Defined in - addon/adapters/osf-adapter.js:93 + addon/adapters/osf-adapter.js:110

    @@ -392,7 +395,7 @@

    _buildRelationshipURL

    Defined in - addon/adapters/osf-adapter.js:47 + addon/adapters/osf-adapter.js:64

    @@ -481,7 +484,7 @@

    _createRelated

    Defined in - addon/adapters/osf-adapter.js:65 + addon/adapters/osf-adapter.js:82

    @@ -601,7 +604,7 @@

    _deleteRelated

    Defined in - addon/adapters/osf-adapter.js:155 + addon/adapters/osf-adapter.js:172

    @@ -724,7 +727,7 @@

    _doRelatedRequest

    Defined in - addon/adapters/osf-adapter.js:172 + addon/adapters/osf-adapter.js:189

    @@ -851,7 +854,7 @@

    _handleRelatedRequest

    Defined in - addon/adapters/osf-adapter.js:229 + addon/adapters/osf-adapter.js:246

    @@ -961,7 +964,7 @@

    _removeRelated

    Defined in - addon/adapters/osf-adapter.js:136 + addon/adapters/osf-adapter.js:153

    @@ -1082,7 +1085,7 @@

    _updateRelated

    Defined in - addon/adapters/osf-adapter.js:114 + addon/adapters/osf-adapter.js:131

    diff --git a/docs/classes/OsfAgnosticAuthController.html b/docs/classes/OsfAgnosticAuthController.html index 156be6058..cd73ce93d 100644 --- a/docs/classes/OsfAgnosticAuthController.html +++ b/docs/classes/OsfAgnosticAuthController.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfAgnosticAuthRoute.html b/docs/classes/OsfAgnosticAuthRoute.html index 1eedb83be..0192133b2 100644 --- a/docs/classes/OsfAgnosticAuthRoute.html +++ b/docs/classes/OsfAgnosticAuthRoute.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfCookieAuthenticator.html b/docs/classes/OsfCookieAuthenticator.html index 4b236e64d..6625d9c31 100644 --- a/docs/classes/OsfCookieAuthenticator.html +++ b/docs/classes/OsfCookieAuthenticator.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -237,7 +240,7 @@

    authenticate

    Defined in - addon/authenticators/osf-cookie.js:61 + addon/authenticators/osf-cookie.js:60

    diff --git a/docs/classes/OsfCookieAuthorizer.html b/docs/classes/OsfCookieAuthorizer.html index e6738fa85..2766a8042 100644 --- a/docs/classes/OsfCookieAuthorizer.html +++ b/docs/classes/OsfCookieAuthorizer.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfCookieLoginController.html b/docs/classes/OsfCookieLoginController.html index 02d75eba4..59bd6e04c 100644 --- a/docs/classes/OsfCookieLoginController.html +++ b/docs/classes/OsfCookieLoginController.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfCookieLoginRoute.html b/docs/classes/OsfCookieLoginRoute.html index a9516c1f0..858a304e6 100644 --- a/docs/classes/OsfCookieLoginRoute.html +++ b/docs/classes/OsfCookieLoginRoute.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfModel.html b/docs/classes/OsfModel.html index eb6c5282d..d7eb96799 100644 --- a/docs/classes/OsfModel.html +++ b/docs/classes/OsfModel.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfSerializer.html b/docs/classes/OsfSerializer.html index 1ba0bb6b9..0fef883d1 100644 --- a/docs/classes/OsfSerializer.html +++ b/docs/classes/OsfSerializer.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfTokenAuthenticator.html b/docs/classes/OsfTokenAuthenticator.html index 9e5794419..74d9935a5 100644 --- a/docs/classes/OsfTokenAuthenticator.html +++ b/docs/classes/OsfTokenAuthenticator.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfTokenAuthorizer.html b/docs/classes/OsfTokenAuthorizer.html index da960f423..240092964 100644 --- a/docs/classes/OsfTokenAuthorizer.html +++ b/docs/classes/OsfTokenAuthorizer.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfTokenLoginControllerMixin.html b/docs/classes/OsfTokenLoginControllerMixin.html index 56b34777b..d10ad5f0b 100644 --- a/docs/classes/OsfTokenLoginControllerMixin.html +++ b/docs/classes/OsfTokenLoginControllerMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/OsfTokenLoginRouteMixin.html b/docs/classes/OsfTokenLoginRouteMixin.html index bcf6a4504..2fcd74fd7 100644 --- a/docs/classes/OsfTokenLoginRouteMixin.html +++ b/docs/classes/OsfTokenLoginRouteMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/PaginatedControllerMixin.html b/docs/classes/PaginatedControllerMixin.html index 76330e7ee..3b95367e5 100644 --- a/docs/classes/PaginatedControllerMixin.html +++ b/docs/classes/PaginatedControllerMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/PaginatedRouteMixin.html b/docs/classes/PaginatedRouteMixin.html index 0dcb1468d..c7aa4e3e2 100644 --- a/docs/classes/PaginatedRouteMixin.html +++ b/docs/classes/PaginatedRouteMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Preprint.html b/docs/classes/Preprint.html index 021699539..a48959faa 100644 --- a/docs/classes/Preprint.html +++ b/docs/classes/Preprint.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Registration.html b/docs/classes/Registration.html index 3900f97e5..ce65d061b 100644 --- a/docs/classes/Registration.html +++ b/docs/classes/Registration.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/RegistrationActionsMixin.html b/docs/classes/RegistrationActionsMixin.html index 725836c9c..5644e7361 100644 --- a/docs/classes/RegistrationActionsMixin.html +++ b/docs/classes/RegistrationActionsMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/TaggableMixin.html b/docs/classes/TaggableMixin.html index 3b87407b5..96b9fbfbf 100644 --- a/docs/classes/TaggableMixin.html +++ b/docs/classes/TaggableMixin.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/Taxonomy.html b/docs/classes/Taxonomy.html index 9481a7f71..d3a239113 100644 --- a/docs/classes/Taxonomy.html +++ b/docs/classes/Taxonomy.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/User.html b/docs/classes/User.html index 41fe97dc4..e90e91c59 100644 --- a/docs/classes/User.html +++ b/docs/classes/User.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/ajax-helpers.html b/docs/classes/ajax-helpers.html index a3e53ed3f..bb76377cb 100644 --- a/docs/classes/ajax-helpers.html +++ b/docs/classes/ajax-helpers.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/auth.html b/docs/classes/auth.html index 024e7f495..fa0da5298 100644 --- a/docs/classes/auth.html +++ b/docs/classes/auth.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/citation-widget.html b/docs/classes/citation-widget.html new file mode 100644 index 000000000..22770417e --- /dev/null +++ b/docs/classes/citation-widget.html @@ -0,0 +1,217 @@ + + + + + citation-widget - Ember OSF + + + + + + + + +
    +
    +
    +

    +
    +
    + API Docs for: 0.0.1 +
    +
    +
    + + +
    +
    + Show: + + + + + + + +
    + +
    +
    +
    +

    citation-widget Class

    +
    + + + + + Module: components
    + Parent Module: ember-osf + +
    + + +
    +

    Lists citations for node in APA, MLA, and Chicago formats

    + +
    + + +
    + + +
    +
    +

    Item Index

    + + + + +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + diff --git a/docs/classes/comment-detail.html b/docs/classes/comment-detail.html index 9b2e6bb30..b13dc46ae 100644 --- a/docs/classes/comment-detail.html +++ b/docs/classes/comment-detail.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/comment-form.html b/docs/classes/comment-form.html index 633cb5306..2ee43c054 100644 --- a/docs/classes/comment-form.html +++ b/docs/classes/comment-form.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/comment-pane.html b/docs/classes/comment-pane.html index 6abfd8ae1..ab63eba3b 100644 --- a/docs/classes/comment-pane.html +++ b/docs/classes/comment-pane.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/current-user.html b/docs/classes/current-user.html index 7a7197dcb..c86beb967 100644 --- a/docs/classes/current-user.html +++ b/docs/classes/current-user.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/dropzone-widget.html b/docs/classes/dropzone-widget.html index 11adb5873..678dd9d13 100644 --- a/docs/classes/dropzone-widget.html +++ b/docs/classes/dropzone-widget.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/elem-id.html b/docs/classes/elem-id.html index 9380103e7..4f03d717c 100644 --- a/docs/classes/elem-id.html +++ b/docs/classes/elem-id.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/eosf-project-nav.html b/docs/classes/eosf-project-nav.html index 59cc82a00..972890a1d 100644 --- a/docs/classes/eosf-project-nav.html +++ b/docs/classes/eosf-project-nav.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-browser-icon.html b/docs/classes/file-browser-icon.html index 1f232583c..1b4228cf1 100644 --- a/docs/classes/file-browser-icon.html +++ b/docs/classes/file-browser-icon.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-browser.html b/docs/classes/file-browser.html index 8fe055436..9476d4e2e 100644 --- a/docs/classes/file-browser.html +++ b/docs/classes/file-browser.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-chooser component.html b/docs/classes/file-chooser component.html index 323ae9e42..303e50eda 100644 --- a/docs/classes/file-chooser component.html +++ b/docs/classes/file-chooser component.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-manager.html b/docs/classes/file-manager.html index 77ccfc9b3..1e24dc5ef 100644 --- a/docs/classes/file-manager.html +++ b/docs/classes/file-manager.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-renderer.html b/docs/classes/file-renderer.html index 8fa9fb338..48cec208f 100644 --- a/docs/classes/file-renderer.html +++ b/docs/classes/file-renderer.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-version.html b/docs/classes/file-version.html index 2747a935b..bcd6abaf1 100644 --- a/docs/classes/file-version.html +++ b/docs/classes/file-version.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/file-widget.html b/docs/classes/file-widget.html index 4167a3790..950df2058 100644 --- a/docs/classes/file-widget.html +++ b/docs/classes/file-widget.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/navbar-auth-dropdown.html b/docs/classes/navbar-auth-dropdown.html new file mode 100644 index 000000000..311993604 --- /dev/null +++ b/docs/classes/navbar-auth-dropdown.html @@ -0,0 +1,262 @@ + + + + + navbar-auth-dropdown - Ember OSF + + + + + + + + +
    +
    +
    +

    +
    +
    + API Docs for: 0.0.1 +
    +
    +
    + + +
    +
    + Show: + + + + + + + +
    + +
    +
    +
    +

    navbar-auth-dropdown Class

    +
    + + + + + Module: components
    + Parent Module: ember-osf + +
    + + +
    +

    Display the login dropdown on the navbar

    +

    Sample usage:

    +
    {{navbar-auth-dropdown
    +  loginAction=loginAction
    +  redirectUrl=redirectUrl}}
    +
    + +
    + + +
    + + +
    +
    +

    Item Index

    + + +
    +

    Properties

    + + +
    + + +
    + + +
    +

    Properties

    + +
    +

    signupUrl

    + String + + + + + + + +
    +

    The URL to use for signup. May be overridden, eg for special campaign pages

    + +
    + + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + diff --git a/docs/classes/oauth-popup.html b/docs/classes/oauth-popup.html index b1ace4fbe..b018740c6 100644 --- a/docs/classes/oauth-popup.html +++ b/docs/classes/oauth-popup.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/osf-copyright.html b/docs/classes/osf-copyright.html index 0dbe349ea..95c4c8440 100644 --- a/docs/classes/osf-copyright.html +++ b/docs/classes/osf-copyright.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/osf-footer.html b/docs/classes/osf-footer.html index 758beb524..8afbd7c8b 100644 --- a/docs/classes/osf-footer.html +++ b/docs/classes/osf-footer.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/osf-mode-footer.html b/docs/classes/osf-mode-footer.html index a7bb64ceb..a79605b7c 100644 --- a/docs/classes/osf-mode-footer.html +++ b/docs/classes/osf-mode-footer.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/osf-navbar.html b/docs/classes/osf-navbar.html index a951406fa..dcf3a41ba 100644 --- a/docs/classes/osf-navbar.html +++ b/docs/classes/osf-navbar.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -201,10 +204,6 @@

    Properties

    hideSearch -
  • - signupUrl - -
  • @@ -226,7 +225,7 @@

    hideSearch

    -
    -

    signupUrl

    - String - - - - - - - -
    -

    The URL to use for signup. May be overridden, eg for special campaign pages

    - -
    - - -
    diff --git a/docs/classes/osf-paginator.html b/docs/classes/osf-paginator.html index b68fbc44d..b3794a4d4 100644 --- a/docs/classes/osf-paginator.html +++ b/docs/classes/osf-paginator.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -178,6 +181,7 @@

    osf-paginator Class

    fetchResults=(action 'fetchResults') query=query}} +

    The osf-paginator will be deprecated. Use pagination-pager instead.

    diff --git a/docs/classes/pagination-control.html b/docs/classes/pagination-control.html index 069b5d848..e33eb4be8 100644 --- a/docs/classes/pagination-control.html +++ b/docs/classes/pagination-control.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -172,6 +175,7 @@

    pagination-control Class

    Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin.

    +

    The pagination-control will be deprecated. Use pagination-pager instead.

    diff --git a/docs/classes/search-dropdown.html b/docs/classes/search-dropdown.html index 567f59539..7dc5a828a 100644 --- a/docs/classes/search-dropdown.html +++ b/docs/classes/search-dropdown.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/sign-up.html b/docs/classes/sign-up.html index 47a487a9a..4b5bb1c29 100644 --- a/docs/classes/sign-up.html +++ b/docs/classes/sign-up.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/tags-widget.html b/docs/classes/tags-widget.html index 0dc991440..3ebd36e0f 100644 --- a/docs/classes/tags-widget.html +++ b/docs/classes/tags-widget.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/data.json b/docs/data.json index 51fe0ce68..582fefb2d 100644 --- a/docs/data.json +++ b/docs/data.json @@ -58,11 +58,20 @@ "fors": {}, "namespaces": {} }, - "addon/components/comment-detail/component.js": { - "name": "addon/components/comment-detail/component.js", + "addon/components/citation-widget/component.js": { + "name": "addon/components/citation-widget/component.js", "modules": { "components": 1 }, + "classes": { + "citation-widget": 1 + }, + "fors": {}, + "namespaces": {} + }, + "addon/components/comment-detail/component.js": { + "name": "addon/components/comment-detail/component.js", + "modules": {}, "classes": { "comment-detail": 1 }, @@ -166,6 +175,15 @@ "fors": {}, "namespaces": {} }, + "addon/components/navbar-auth-dropdown/component.js": { + "name": "addon/components/navbar-auth-dropdown/component.js", + "modules": {}, + "classes": { + "navbar-auth-dropdown": 1 + }, + "fors": {}, + "namespaces": {} + }, "addon/components/oauth-popup/component.js": { "name": "addon/components/oauth-popup/component.js", "modules": {}, @@ -438,11 +456,20 @@ "fors": {}, "namespaces": {} }, - "addon/models/collection.js": { - "name": "addon/models/collection.js", + "addon/models/citation.js": { + "name": "addon/models/citation.js", "modules": { "models": 1 }, + "classes": { + "Citation": 1 + }, + "fors": {}, + "namespaces": {} + }, + "addon/models/collection.js": { + "name": "addon/models/collection.js", + "modules": {}, "classes": { "Collection": 1 }, @@ -676,6 +703,7 @@ "OsfTokenAuthenticator": 1, "OsfCookieAuthorizer": 1, "OsfTokenAuthorizer": 1, + "citation-widget": 1, "comment-detail": 1, "comment-form": 1, "comment-pane": 1, @@ -687,6 +715,7 @@ "file-renderer": 1, "file-version": 1, "file-widget": 1, + "navbar-auth-dropdown": 1, "oauth-popup": 1, "osf-copyright": 1, "osf-footer": 1, @@ -715,6 +744,7 @@ "PaginatedRouteMixin": 1, "RegistrationActionsMixin": 1, "TaggableMixin": 1, + "Citation": 1, "Collection": 1, "CommentReport": 1, "Comment": 1, @@ -798,6 +828,7 @@ "submodules": {}, "elements": {}, "classes": { + "citation-widget": 1, "comment-detail": 1, "comment-form": 1, "comment-pane": 1, @@ -809,6 +840,7 @@ "file-renderer": 1, "file-version": 1, "file-widget": 1, + "navbar-auth-dropdown": 1, "oauth-popup": 1, "osf-copyright": 1, "osf-footer": 1, @@ -827,7 +859,7 @@ "namespace": "", "file": "addon/components/tags-widget/component.js", "line": 9, - "description": "Display information about an individual comment, including controls to edit, delete, and report.\nThis component is typically used as part of the `comment-pane` component; see that component for further information.\n\nSample usage:\n```handlebars\n{{comment-detail\n comment=comment\n editComment=attrs.editComment\n deleteComment=attrs.deleteComment\n restoreComment=attrs.restoreComment\n reportComment=attrs.reportComment}}\n```" + "description": "Lists citations for node in APA, MLA, and Chicago formats" }, "helpers": { "name": "helpers", @@ -894,6 +926,7 @@ "submodules": {}, "elements": {}, "classes": { + "Citation": 1, "Collection": 1, "CommentReport": 1, "Comment": 1, @@ -920,7 +953,7 @@ "namespace": "", "file": "addon/models/user.js", "line": 11, - "description": "Model for OSF APIv2 collections\nFor field and usage information, see:\n* https://api.osf.io/v2/docs/#!/v2/Collection_List_GET" + "description": "Model for OSF APIv2 citation styles" }, "ember-preprints": { "name": "ember-preprints", @@ -1070,6 +1103,28 @@ "description": "Ember-simple-auth compatible authorizer based on OAuth2 bearer tokens.\n\nIntended to be used with the authenticator of the same name.", "extends": "ember-simple-auth/BaseAuthorizer" }, + "citation-widget": { + "name": "citation-widget", + "shortname": "citation-widget", + "classitems": [], + "plugins": [], + "extensions": [], + "plugin_for": [], + "extension_for": [], + "module": "ember-osf", + "submodule": "components", + "namespace": "", + "file": "addon/components/citation-widget/component.js", + "line": 24, + "description": "Lists citations for node in APA, MLA, and Chicago formats", + "params": [ + { + "name": "node", + "description": "for which to fetch citations", + "type": "Node" + } + ] + }, "comment-detail": { "name": "comment-detail", "shortname": "comment-detail", @@ -1301,6 +1356,21 @@ "line": 13, "description": "Widget to quickly upload a file to a selected project\n```handlebars\n{{file-widget\n preUpload=(action 'preUpload')\n buildUrl=(action 'buildUrl')\n listeners=dropzoneOptions\n options=dropzoneOptions}}\n```" }, + "navbar-auth-dropdown": { + "name": "navbar-auth-dropdown", + "shortname": "navbar-auth-dropdown", + "classitems": [], + "plugins": [], + "extensions": [], + "plugin_for": [], + "extension_for": [], + "module": "ember-osf", + "submodule": "components", + "namespace": "", + "file": "addon/components/navbar-auth-dropdown/component.js", + "line": 10, + "description": "Display the login dropdown on the navbar\n\nSample usage:\n```handlebars\n{{navbar-auth-dropdown\n loginAction=loginAction\n redirectUrl=redirectUrl}}\n```" + }, "oauth-popup": { "name": "oauth-popup", "shortname": "oauth-popup", @@ -1389,7 +1459,7 @@ "namespace": "", "file": "addon/components/osf-paginator/component.js", "line": 9, - "description": "OSF Paginator adapted from osf/website/static/js/paginator.js\n\nSample usage:\n```handlebars\n{{osf-paginator\n totalSearchResults=totalSearchResults\n fetchResults=(action 'fetchResults')\n query=query}}\n```", + "description": "OSF Paginator adapted from osf/website/static/js/paginator.js\n\nSample usage:\n```handlebars\n{{osf-paginator\n totalSearchResults=totalSearchResults\n fetchResults=(action 'fetchResults')\n query=query}}\n```\n\nThe osf-paginator will be deprecated. Use pagination-pager instead.", "params": [ { "name": "totalSearchResults", @@ -1421,7 +1491,7 @@ "namespace": "", "file": "addon/components/pagination-control/component.js", "line": 9, - "description": "Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin." + "description": "Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin.\n\nThe pagination-control will be deprecated. Use pagination-pager instead." }, "search-dropdown": { "name": "search-dropdown", @@ -1800,6 +1870,21 @@ "description": "Controller mixin that implements basic tagging functionality. Uses the model defined in the model hook.", "extends": "Ember.Mixin" }, + "Citation": { + "name": "Citation", + "shortname": "Citation", + "classitems": [], + "plugins": [], + "extensions": [], + "plugin_for": [], + "extension_for": [], + "module": "ember-osf", + "submodule": "models", + "namespace": "", + "file": "addon/models/citation.js", + "line": 10, + "description": "Model for OSF APIv2 citation styles" + }, "Collection": { "name": "Collection", "shortname": "Collection", @@ -2153,7 +2238,15 @@ "classitems": [ { "file": "addon/adapters/osf-adapter.js", - "line": 47, + "line": 32, + "description": "Overrides buildQuery method - Allows users to embed resources with findRecord\nOSF APIv2 does not have \"include\" functionality, instead we use 'embed'.\nUsage: findRecord(type, id, {include: 'resource'}) or findRecord(type, id, {include: ['resource1', resource2]})\nSwaps included resources with embedded resources", + "class": "OsfAdapter", + "module": "ember-osf", + "submodule": "adapters" + }, + { + "file": "addon/adapters/osf-adapter.js", + "line": 64, "description": "Construct a URL for a relationship create/update/delete.", "itemtype": "method", "name": "_buildRelationshipURL", @@ -2181,7 +2274,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 65, + "line": 82, "description": "Handle creation of related resources", "itemtype": "method", "name": "_createRelated", @@ -2225,7 +2318,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 93, + "line": 110, "description": "Handle add(s) of related resources. This differs from CREATEs in that the related\nrecord is already saved and is just being associated with the inverse record.", "itemtype": "method", "name": "_addRelated", @@ -2269,7 +2362,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 114, + "line": 131, "description": "Handle update(s) of related resources", "itemtype": "method", "name": "_updateRelated", @@ -2313,7 +2406,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 136, + "line": 153, "description": "Handle removal of related resources. This differs from DELETEs in that the related\nrecord is not deleted, just dissociated from the inverse record.", "itemtype": "method", "name": "_removeRelated", @@ -2357,7 +2450,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 155, + "line": 172, "description": "Handle deletion of related resources", "itemtype": "method", "name": "_deleteRelated", @@ -2401,7 +2494,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 172, + "line": 189, "description": "A helper for making _*Related requests", "itemtype": "method", "name": "_doRelatedRequest", @@ -2450,7 +2543,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 229, + "line": 246, "description": "Delegate a series of requests based on a snapshot, relationship, and a change.\nThe change argument can be 'delete', 'remove', 'update', 'add', 'create'", "itemtype": "method", "name": "_handleRelatedRequest", @@ -2499,7 +2592,7 @@ }, { "file": "addon/authenticators/osf-cookie.js", - "line": 61, + "line": 60, "description": "For now, simply verify that a token is present and can be used", "itemtype": "method", "name": "authenticate", @@ -2545,23 +2638,23 @@ "submodule": "components" }, { - "file": "addon/components/osf-navbar/component.js", - "line": 27, - "description": "Whether search icons and functionality show up", + "file": "addon/components/navbar-auth-dropdown/component.js", + "line": 33, + "description": "The URL to use for signup. May be overridden, eg for special campaign pages", "itemtype": "property", - "name": "hideSearch", - "type": "{Boolean}", - "class": "osf-navbar", + "name": "signupUrl", + "type": "{String}", + "class": "navbar-auth-dropdown", "module": "ember-osf", "submodule": "components" }, { "file": "addon/components/osf-navbar/component.js", - "line": 34, - "description": "The URL to use for signup. May be overridden, eg for special campaign pages", + "line": 26, + "description": "Whether search icons and functionality show up", "itemtype": "property", - "name": "signupUrl", - "type": "{String}", + "name": "hideSearch", + "type": "{Boolean}", "class": "osf-navbar", "module": "ember-osf", "submodule": "components" @@ -3243,18 +3336,18 @@ { "file": "addon/mixins/node-actions.js", "line": 199, - "description": "Add a node link (pointer) to another node", + "description": "Adds a relationship to another node, called a linkedNode.", "itemtype": "method", "name": "addNodeLink", "params": [ { "name": "targetNodeId", - "description": "ID of the node for which you wish to create a pointer", + "description": "ID of the node for which you wish to create a link", "type": "String" } ], "return": { - "description": "Returns a promise that resolves to model for the newly created NodeLink", + "description": "Returns a promise that resolves to the newly updated node", "type": "Promise" }, "class": "NodeActionsMixin", @@ -3264,18 +3357,18 @@ { "file": "addon/mixins/node-actions.js", "line": 214, - "description": "Remove a node link (pointer) to another node", + "description": "Removes the linkedNode relationship to another node. Does not remove the linked node itself.", "itemtype": "method", "name": "removeNodeLink", "params": [ { - "name": "nodeLink", - "description": "nodeLink record to be destroyed.", + "name": "linkedNode", + "description": "linkedNode relationship to be destroyed.", "type": "Object" } ], "return": { - "description": "Returns a promise that resolves after the node link has been removed. This does not delete\nthe target node itself.", + "description": "Returns a promise that resolves to the newly updated node", "type": "Promise" }, "class": "NodeActionsMixin", @@ -3555,7 +3648,7 @@ }, { "file": "addon/models/node.js", - "line": 83, + "line": 90, "description": "Is this a project? Flag can be used to provide template-specific behavior for different resource types.", "itemtype": "property", "name": "isProject", @@ -3566,7 +3659,7 @@ }, { "file": "addon/models/node.js", - "line": 89, + "line": 96, "description": "Is this a registration? Flag can be used to provide template-specific behavior for different resource types.", "itemtype": "property", "name": "isRegistration", @@ -3577,7 +3670,7 @@ }, { "file": "addon/models/node.js", - "line": 96, + "line": 103, "description": "Is this node being viewed through an anonymized, view-only link?", "itemtype": "property", "name": "isAnonymous", @@ -3588,7 +3681,7 @@ }, { "file": "addon/models/node.js", - "line": 103, + "line": 110, "description": "Determine whether the specified user ID is a contributor on this node", "itemtype": "method", "name": "isContributor", @@ -4401,7 +4494,11 @@ "warnings": [ { "message": "replacing incorrect tag: returns with return", - "line": " addon/models/node.js:103" + "line": " addon/models/node.js:110" + }, + { + "message": "Missing item type\nOverrides buildQuery method - Allows users to embed resources with findRecord\nOSF APIv2 does not have \"include\" functionality, instead we use 'embed'.\nUsage: findRecord(type, id, {include: 'resource'}) or findRecord(type, id, {include: ['resource1', resource2]})\nSwaps included resources with embedded resources", + "line": " addon/adapters/osf-adapter.js:32" } ] } \ No newline at end of file diff --git a/docs/files/addon_adapters_osf-adapter.js.html b/docs/files/addon_adapters_osf-adapter.js.html index 5e183e276..5c111a52c 100644 --- a/docs/files/addon_adapters_osf-adapter.js.html +++ b/docs/files/addon_adapters_osf-adapter.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -185,9 +188,26 @@

    File: addon/adapters/osf-adapter.js

    * @uses GenericDataAdapterMixin */ export default DS.JSONAPIAdapter.extend(HasManyQuery.RESTAdapterMixin, GenericDataAdapterMixin, { + headers: { + ACCEPT: 'application/vnd.api+json; version=2.3' + }, authorizer: config['ember-simple-auth'].authorizer, host: config.OSF.apiUrl, namespace: config.OSF.apiNamespace, + /** + * Overrides buildQuery method - Allows users to embed resources with findRecord + * OSF APIv2 does not have "include" functionality, instead we use 'embed'. + * Usage: findRecord(type, id, {include: 'resource'}) or findRecord(type, id, {include: ['resource1', resource2]}) + * Swaps included resources with embedded resources + */ + buildQuery() { + let query = this._super(...arguments); + if (query.include) { + query.embed = query.include; + } + delete query.include; + return query; + }, buildURL(modelName, id, snapshot, requestType) { var url = this._super(...arguments); var options = (snapshot ? snapshot.adapterOptions : false) || {}; @@ -382,7 +402,7 @@

    File: addon/adapters/osf-adapter.js

    data: data, isBulk: isBulk }).then(res => { - if (!Ember.$.isArray(res.data)) { + if (res && !Ember.$.isArray(res.data)) { res.data = [res.data]; } return res; diff --git a/docs/files/addon_authenticators_osf-cookie.js.html b/docs/files/addon_authenticators_osf-cookie.js.html index 3ffc0d648..8c5221430 100644 --- a/docs/files/addon_authenticators_osf-cookie.js.html +++ b/docs/files/addon_authenticators_osf-cookie.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -213,8 +216,7 @@

    File: addon/authenticators/osf-cookie.js

    // Can't do this via AJAX request because it redirects to CAS, and AJAX + redirect = CORS issue // Manually clear session before user leaves the page, since we aren't sticking around for ESA to do so later - this.get('session.session')._clear(true) - .then(() => window.location = `${config.OSF.url}logout/`); + return this.get('session.session')._clear(true); } else { // This branch is expected to be called when a test request reveals the user to lack permissions... so session should be wiped return Ember.RSVP.resolve(); diff --git a/docs/files/addon_authenticators_osf-token.js.html b/docs/files/addon_authenticators_osf-token.js.html index de33b00e8..c4da1b4a2 100644 --- a/docs/files/addon_authenticators_osf-token.js.html +++ b/docs/files/addon_authenticators_osf-token.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_authorizers_osf-cookie.js.html b/docs/files/addon_authorizers_osf-cookie.js.html index 168f7ff57..2beb2c690 100644 --- a/docs/files/addon_authorizers_osf-cookie.js.html +++ b/docs/files/addon_authorizers_osf-cookie.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_authorizers_osf-token.js.html b/docs/files/addon_authorizers_osf-token.js.html index b4175a088..88fb15f40 100644 --- a/docs/files/addon_authorizers_osf-token.js.html +++ b/docs/files/addon_authorizers_osf-token.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_citation-widget_component.js.html b/docs/files/addon_components_citation-widget_component.js.html new file mode 100644 index 000000000..e50a8d3d1 --- /dev/null +++ b/docs/files/addon_components_citation-widget_component.js.html @@ -0,0 +1,238 @@ + + + + + addon/components/citation-widget/component.js - Ember OSF + + + + + + + + +
    +
    +
    +

    +
    +
    + API Docs for: 0.0.1 +
    +
    +
    + + +
    +
    + Show: + + + + + + + +
    + +
    +
    +
    +

    File: addon/components/citation-widget/component.js

    + +
    +
    +import Ember from 'ember';
    +import layout from './template';
    +
    +/**
    + * @module ember-osf
    + * @submodule components
    + */
    +
    +const citationStyles = [
    +    {
    +        linkSuffix: 'apa',
    +        attr: 'apa'
    +    },
    +    {
    +        linkSuffix: 'chicago-author-date',
    +        attr: 'chicago'
    +    },
    +    {
    +        linkSuffix: 'modern-language-association',
    +        attr: 'mla'
    +    }
    +];
    +
    +/**
    + * Lists citations for node in APA, MLA, and Chicago formats
    + *
    + * @class citation-widget
    + * @param {node} node for which to fetch citations
    + */
    +export default Ember.Component.extend({
    +    layout,
    +    apa: null,
    +    chicago: null,
    +    mla: null,
    +    node: null,
    +    store: Ember.inject.service(),
    +
    +    didRender() {
    +        const node = this.get('node');
    +
    +        if (!node) {
    +            return;
    +        }
    +
    +        const citationLink = node.get('links.relationships.citation.links.related.href');
    +
    +        for (const { linkSuffix, attr } of citationStyles) {
    +            this.get('store')
    +                .adapterFor('node')
    +                .ajax(`${citationLink}${linkSuffix}/`, 'GET')
    +                .then(resp => this.set(attr, resp.data.attributes.citation));
    +        }
    +    }
    +});
    +
    +    
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + diff --git a/docs/files/addon_components_comment-detail_component.js.html b/docs/files/addon_components_comment-detail_component.js.html index 3315b743f..a96ff351b 100644 --- a/docs/files/addon_components_comment-detail_component.js.html +++ b/docs/files/addon_components_comment-detail_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_comment-form_component.js.html b/docs/files/addon_components_comment-form_component.js.html index af5d68bbd..48e862c01 100644 --- a/docs/files/addon_components_comment-form_component.js.html +++ b/docs/files/addon_components_comment-form_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_comment-pane_component.js.html b/docs/files/addon_components_comment-pane_component.js.html index 88a6f0960..c9045558a 100644 --- a/docs/files/addon_components_comment-pane_component.js.html +++ b/docs/files/addon_components_comment-pane_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_dropzone-widget_component.js.html b/docs/files/addon_components_dropzone-widget_component.js.html index e91bb1d9c..6a090b178 100644 --- a/docs/files/addon_components_dropzone-widget_component.js.html +++ b/docs/files/addon_components_dropzone-widget_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_eosf-project-nav_component.js.html b/docs/files/addon_components_eosf-project-nav_component.js.html index 20a931bb7..11a8c8028 100644 --- a/docs/files/addon_components_eosf-project-nav_component.js.html +++ b/docs/files/addon_components_eosf-project-nav_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-browser-icon_component.js.html b/docs/files/addon_components_file-browser-icon_component.js.html index 9f3d48324..4e809ef61 100644 --- a/docs/files/addon_components_file-browser-icon_component.js.html +++ b/docs/files/addon_components_file-browser-icon_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-browser-item_component.js.html b/docs/files/addon_components_file-browser-item_component.js.html index 9eaf0d8b3..da1a82093 100644 --- a/docs/files/addon_components_file-browser-item_component.js.html +++ b/docs/files/addon_components_file-browser-item_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-browser_component.js.html b/docs/files/addon_components_file-browser_component.js.html index 7a83729b2..4ff5a0464 100644 --- a/docs/files/addon_components_file-browser_component.js.html +++ b/docs/files/addon_components_file-browser_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-chooser_component.js.html b/docs/files/addon_components_file-chooser_component.js.html index 3b419aa36..0384327df 100644 --- a/docs/files/addon_components_file-chooser_component.js.html +++ b/docs/files/addon_components_file-chooser_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-renderer_component.js.html b/docs/files/addon_components_file-renderer_component.js.html index 3e011825a..d83d0d375 100644 --- a/docs/files/addon_components_file-renderer_component.js.html +++ b/docs/files/addon_components_file-renderer_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-version_component.js.html b/docs/files/addon_components_file-version_component.js.html index 8298cb7cb..e623c4003 100644 --- a/docs/files/addon_components_file-version_component.js.html +++ b/docs/files/addon_components_file-version_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-widget_component.js.html b/docs/files/addon_components_file-widget_component.js.html index 4a9a5d7a9..6c43807f3 100644 --- a/docs/files/addon_components_file-widget_component.js.html +++ b/docs/files/addon_components_file-widget_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_navbar-auth-dropdown_component.js.html b/docs/files/addon_components_navbar-auth-dropdown_component.js.html new file mode 100644 index 000000000..e5549a453 --- /dev/null +++ b/docs/files/addon_components_navbar-auth-dropdown_component.js.html @@ -0,0 +1,256 @@ + + + + + addon/components/navbar-auth-dropdown/component.js - Ember OSF + + + + + + + + +
    +
    +
    +

    +
    +
    + API Docs for: 0.0.1 +
    +
    +
    + + +
    +
    + Show: + + + + + + + +
    + +
    +
    +
    +

    File: addon/components/navbar-auth-dropdown/component.js

    + +
    +
    +import Ember from 'ember';
    +import layout from './template';
    +import config from 'ember-get-config';
    +
    +/**
    + * @module ember-osf
    + * @submodule components
    + */
    +
    +/**
    + * Display the login dropdown on the navbar
    + *
    + * Sample usage:
    + * ```handlebars
    + * {{navbar-auth-dropdown
    + *   loginAction=loginAction
    + *   redirectUrl=redirectUrl}}
    + * ```
    + *
    + * @class navbar-auth-dropdown
    + */
    +export default Ember.Component.extend({
    +    layout,
    +    session: Ember.inject.service(),
    +    currentUser: Ember.inject.service(),
    +
    +    tagName: 'li',
    +    classNames: ['dropdown'],
    +    classNameBindings: ['notAuthenticated:sign-in'],
    +    notAuthenticated: Ember.computed.not('session.isAuthenticated'),
    +    redirectUrl: null,
    +
    +    /**
    +     * The URL to use for signup. May be overridden, eg for special campaign pages
    +     *
    +     * @property signupUrl
    +     * @type {String}
    +     */
    +    signupUrl: config.OSF.url + 'register',
    +
    +    gravatarUrl: Ember.computed('user', function() {
    +        let imgLink = this.get('user.links.profile_image');
    +
    +        return imgLink ? `${imgLink}&s=25` : '';
    +    }),
    +    host: config.OSF.url,
    +    user: null,
    +    _loadCurrentUser() {
    +        this.get('currentUser')
    +            .load()
    +            .then(user => this.set('user', user));
    +    },
    +    init() {
    +        this._super(...arguments);
    +        // TODO: React to changes in service/ event?
    +        if (this.get('session.isAuthenticated')) {
    +            this._loadCurrentUser();
    +        }
    +    },
    +    // TODO: These parameters are defined in osf settings.py; make sure ember config matches.
    +    allowLogin: true,
    +    enableInstitutions: true,
    +    actions: {
    +        logout() {
    +            const redirectUrl = this.get('redirectUrl');
    +            const query = redirectUrl ? '?' + Ember.$.param({ redirect_url: redirectUrl }) : '';
    +            // TODO: May not work well if logging out from page that requires login- check?
    +            this.get('session').invalidate()
    +                .then(() => window.location.href = `${config.OSF.url}logout/${query}`);
    +        },
    +    }
    +});
    +
    +    
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + diff --git a/docs/files/addon_components_oauth-popup_component.js.html b/docs/files/addon_components_oauth-popup_component.js.html index 5581ba2d8..b005ac063 100644 --- a/docs/files/addon_components_oauth-popup_component.js.html +++ b/docs/files/addon_components_oauth-popup_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-copyright_component.js.html b/docs/files/addon_components_osf-copyright_component.js.html index 72732dfd8..10b3235f0 100644 --- a/docs/files/addon_components_osf-copyright_component.js.html +++ b/docs/files/addon_components_osf-copyright_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-footer_component.js.html b/docs/files/addon_components_osf-footer_component.js.html index 68d28c7fb..17a6bc3d5 100644 --- a/docs/files/addon_components_osf-footer_component.js.html +++ b/docs/files/addon_components_osf-footer_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-mode-footer_component.js.html b/docs/files/addon_components_osf-mode-footer_component.js.html index 1d804a97d..ec5fe75af 100644 --- a/docs/files/addon_components_osf-mode-footer_component.js.html +++ b/docs/files/addon_components_osf-mode-footer_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-navbar_component.js.html b/docs/files/addon_components_osf-navbar_component.js.html index d93a55790..ead61ee80 100644 --- a/docs/files/addon_components_osf-navbar_component.js.html +++ b/docs/files/addon_components_osf-navbar_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -184,7 +187,6 @@

    File: addon/components/osf-navbar/component.js

    export default Ember.Component.extend({ layout, session: Ember.inject.service(), - currentUser: Ember.inject.service(), onSearchPage: false, /** * Whether search icons and functionality show up @@ -193,46 +195,14 @@

    File: addon/components/osf-navbar/component.js

    */ hideSearch: false, - /** - * The URL to use for signup. May be overridden, eg for special campaign pages - * - * @property signupUrl - * @type {String} - */ - signupUrl: config.OSF.url + 'register', - - gravatarUrl: Ember.computed('user', function() { - let imgLink = this.get('user.links.profile_image'); - if (imgLink) { - imgLink += '&s=25'; - } - return imgLink; - }), - fullName: null, host: config.OSF.url, - user: null, + showSearch: false, - _loadCurrentUser() { - this.get('currentUser').load().then((user) => this.set('user', user)); - }, - init() { - this._super(...arguments); - // TODO: React to changes in service/ event? - if (this.get('session.isAuthenticated')) { - this._loadCurrentUser(); - } - }, - // TODO: These parameters are defined in osf settings.py; make sure ember config matches. - allowLogin: true, - enableInstitutions: true, + actions: { toggleSearch() { this.toggleProperty('showSearch'); }, - logout() { - // TODO: May not work well if logging out from page that requires login- check? - this.get('session').invalidate(); - }, } }); diff --git a/docs/files/addon_components_osf-paginator_component.js.html b/docs/files/addon_components_osf-paginator_component.js.html index 0d9ceeaf5..8ea32bd3d 100644 --- a/docs/files/addon_components_osf-paginator_component.js.html +++ b/docs/files/addon_components_osf-paginator_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -178,6 +181,9 @@

    File: addon/components/osf-paginator/component.js

    * fetchResults=(action 'fetchResults') * query=query}} * ``` + * + * The osf-paginator will be deprecated. Use pagination-pager instead. + * * @class osf-paginator * @param {integer} totalSearchResults Number of total search results to be paginated * @param {action} fetchResults - action for fetching other pages of results @@ -186,6 +192,13 @@

    File: addon/components/osf-paginator/component.js

    export default Ember.Component.extend({ layout, currentPage: 1, + init() { + this._super(...arguments); + Ember.deprecate('osf-paginator will be deprecated. Use pagination-pager instead', false, { + id: 'osf-paginator', + until: '1.0.0' + }); + }, pages: Ember.computed('totalSearchResults', function() { let totalSearchResults = this.get('totalSearchResults'); return Math.ceil(totalSearchResults / 10); diff --git a/docs/files/addon_components_pagination-control_component.js.html b/docs/files/addon_components_pagination-control_component.js.html index 1cb529401..efd6fd879 100644 --- a/docs/files/addon_components_pagination-control_component.js.html +++ b/docs/files/addon_components_pagination-control_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -170,6 +173,9 @@

    File: addon/components/pagination-control/component.js< /** * Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin. + * + * The pagination-control will be deprecated. Use pagination-pager instead. + * * @class pagination-control */ export default Ember.Component.extend({ @@ -183,6 +189,14 @@

    File: addon/components/pagination-control/component.js< return this.get('currentPage') >= this.get('pageCount'); }), + init() { + this._super(...arguments); + Ember.deprecate('pagination-control will be deprecated. Use pagination-pager instead', false, { + id: 'pagination-control', + until: '1.0.0' + }); + }, + // TODO: This actions hash feels a bit kludgy actions: { next() { diff --git a/docs/files/addon_components_search-dropdown_component.js.html b/docs/files/addon_components_search-dropdown_component.js.html index 13fae458c..4ea9dddf6 100644 --- a/docs/files/addon_components_search-dropdown_component.js.html +++ b/docs/files/addon_components_search-dropdown_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_sign-up_component.js.html b/docs/files/addon_components_sign-up_component.js.html index 51012d64d..ed7bb5939 100644 --- a/docs/files/addon_components_sign-up_component.js.html +++ b/docs/files/addon_components_sign-up_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_tags-widget_component.js.html b/docs/files/addon_components_tags-widget_component.js.html index ddb073b20..ad1301d7f 100644 --- a/docs/files/addon_components_tags-widget_component.js.html +++ b/docs/files/addon_components_tags-widget_component.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_const_permissions.js.html b/docs/files/addon_const_permissions.js.html index 386687081..c3b032230 100644 --- a/docs/files/addon_const_permissions.js.html +++ b/docs/files/addon_const_permissions.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_helpers_elem-id.js.html b/docs/files/addon_helpers_elem-id.js.html index 2b4104d92..ef86f1d5c 100644 --- a/docs/files/addon_helpers_elem-id.js.html +++ b/docs/files/addon_helpers_elem-id.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_cas-authenticated-route.js.html b/docs/files/addon_mixins_cas-authenticated-route.js.html index 12f612b63..152c4afdc 100644 --- a/docs/files/addon_mixins_cas-authenticated-route.js.html +++ b/docs/files/addon_mixins_cas-authenticated-route.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_commentable.js.html b/docs/files/addon_mixins_commentable.js.html index 872c7f93a..0a152dde6 100644 --- a/docs/files/addon_mixins_commentable.js.html +++ b/docs/files/addon_mixins_commentable.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_fetch-all-route.js.html b/docs/files/addon_mixins_fetch-all-route.js.html index 6863bbfbf..94a8ac68c 100644 --- a/docs/files/addon_mixins_fetch-all-route.js.html +++ b/docs/files/addon_mixins_fetch-all-route.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_file-cache-bypass.js.html b/docs/files/addon_mixins_file-cache-bypass.js.html index 90deb04a1..81e99684b 100644 --- a/docs/files/addon_mixins_file-cache-bypass.js.html +++ b/docs/files/addon_mixins_file-cache-bypass.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_file-item.js.html b/docs/files/addon_mixins_file-item.js.html index e8dfa7dbb..e5a613988 100644 --- a/docs/files/addon_mixins_file-item.js.html +++ b/docs/files/addon_mixins_file-item.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_generic-data-adapter.js.html b/docs/files/addon_mixins_generic-data-adapter.js.html index 512232012..25effd46b 100644 --- a/docs/files/addon_mixins_generic-data-adapter.js.html +++ b/docs/files/addon_mixins_generic-data-adapter.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_infinity-custom.js.html b/docs/files/addon_mixins_infinity-custom.js.html index 4d8ee77d8..370fdaec4 100644 --- a/docs/files/addon_mixins_infinity-custom.js.html +++ b/docs/files/addon_mixins_infinity-custom.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_node-actions.js.html b/docs/files/addon_mixins_node-actions.js.html index 6ddea6d22..91a86deaa 100644 --- a/docs/files/addon_mixins_node-actions.js.html +++ b/docs/files/addon_mixins_node-actions.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -359,31 +362,33 @@

    File: addon/mixins/node-actions.js

    return this.get('_node').addChild(title, description, category); }, /** - * Add a node link (pointer) to another node + * Adds a relationship to another node, called a linkedNode. * * @method addNodeLink - * @param {String} targetNodeId ID of the node for which you wish to create a pointer - * @return {Promise} Returns a promise that resolves to model for the newly created NodeLink + * @param {String} targetNodeId ID of the node for which you wish to create a link + * @return {Promise} Returns a promise that resolves to the newly updated node */ addNodeLink(targetNodeId) { var node = this.get('_node'); - var nodeLink = this.store.createRecord('node-link', { - target: targetNodeId + return this.store.findRecord('node', targetNodeId).then(linkedNode => { + node.get('linkedNodes').pushObject(linkedNode); + return node.save(); }); - node.get('nodeLinks').pushObject(nodeLink); - return node.save().then(() => nodeLink); + }, /** - * Remove a node link (pointer) to another node + * Removes the linkedNode relationship to another node. Does not remove the linked node itself. * * @method removeNodeLink - * @param {Object} nodeLink nodeLink record to be destroyed. - * @return {Promise} Returns a promise that resolves after the node link has been removed. This does not delete - * the target node itself. + * @param {Object} linkedNode linkedNode relationship to be destroyed. + * @return {Promise} Returns a promise that resolves to the newly updated node */ - removeNodeLink(nodeLink) { - return nodeLink.destroyRecord(); + removeNodeLink(linkedNode) { + var node = this.get('_node'); + node.get('linkedNodes').removeObject(linkedNode); + return node.save(); } + } }); diff --git a/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html b/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html index 8a90ce8c8..33f36f5e1 100644 --- a/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html +++ b/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-agnostic-auth-route.js.html b/docs/files/addon_mixins_osf-agnostic-auth-route.js.html index b7538dbfc..f8fa03a1d 100644 --- a/docs/files/addon_mixins_osf-agnostic-auth-route.js.html +++ b/docs/files/addon_mixins_osf-agnostic-auth-route.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-cookie-login-controller.js.html b/docs/files/addon_mixins_osf-cookie-login-controller.js.html index dbf8f501a..18598c6a2 100644 --- a/docs/files/addon_mixins_osf-cookie-login-controller.js.html +++ b/docs/files/addon_mixins_osf-cookie-login-controller.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-cookie-login-route.js.html b/docs/files/addon_mixins_osf-cookie-login-route.js.html index fa88ac4ef..ea681fb79 100644 --- a/docs/files/addon_mixins_osf-cookie-login-route.js.html +++ b/docs/files/addon_mixins_osf-cookie-login-route.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-token-login-controller.js.html b/docs/files/addon_mixins_osf-token-login-controller.js.html index 639f9b0ae..ac867c229 100644 --- a/docs/files/addon_mixins_osf-token-login-controller.js.html +++ b/docs/files/addon_mixins_osf-token-login-controller.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-token-login-route.js.html b/docs/files/addon_mixins_osf-token-login-route.js.html index 9f271d648..efc4f9ee9 100644 --- a/docs/files/addon_mixins_osf-token-login-route.js.html +++ b/docs/files/addon_mixins_osf-token-login-route.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_paginated-controller.js.html b/docs/files/addon_mixins_paginated-controller.js.html index 682afaeea..c23a7fc1a 100644 --- a/docs/files/addon_mixins_paginated-controller.js.html +++ b/docs/files/addon_mixins_paginated-controller.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_paginated-route.js.html b/docs/files/addon_mixins_paginated-route.js.html index a1d01e1a9..7506f1d9f 100644 --- a/docs/files/addon_mixins_paginated-route.js.html +++ b/docs/files/addon_mixins_paginated-route.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_registration-actions.js.html b/docs/files/addon_mixins_registration-actions.js.html index 52190cdb0..4b33fe6ca 100644 --- a/docs/files/addon_mixins_registration-actions.js.html +++ b/docs/files/addon_mixins_registration-actions.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_taggable-mixin.js.html b/docs/files/addon_mixins_taggable-mixin.js.html index 7d5f5b14a..dcdd9e8c8 100644 --- a/docs/files/addon_mixins_taggable-mixin.js.html +++ b/docs/files/addon_mixins_taggable-mixin.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_citation.js.html b/docs/files/addon_models_citation.js.html new file mode 100644 index 000000000..f066edea4 --- /dev/null +++ b/docs/files/addon_models_citation.js.html @@ -0,0 +1,201 @@ + + + + + addon/models/citation.js - Ember OSF + + + + + + + + +
    +
    +
    +

    +
    +
    + API Docs for: 0.0.1 +
    +
    +
    + + +
    +
    + Show: + + + + + + + +
    + +
    +
    +
    +

    File: addon/models/citation.js

    + +
    +
    +import DS from 'ember-data';
    +
    +import OsfModel from './osf-model';
    +
    +/**
    + * @module ember-osf
    + * @submodule models
    + */
    +
    +/**
    + * Model for OSF APIv2 citation styles
    + *
    + * @class Citation
    + */
    +export default OsfModel.extend({
    +    citation: DS.attr('string')
    +});
    +
    +    
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + diff --git a/docs/files/addon_models_collection.js.html b/docs/files/addon_models_collection.js.html index 12b77024d..45f850074 100644 --- a/docs/files/addon_models_collection.js.html +++ b/docs/files/addon_models_collection.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -181,12 +184,13 @@

    File: addon/models/collection.js

    dateCreated: DS.attr('date'), dateModified: DS.attr('date'), bookmarks: DS.attr('boolean'), - // nodeLinks: DS.hasMany('node-links', { - // inverse:null - // }), linkedNodes: DS.hasMany('nodes', { inverse: null, serializerType: 'linked-node' + }), + linkedRegistrations: DS.hasMany('registrations', { + inverse: null, + serializerType: 'linked-node' }) }); diff --git a/docs/files/addon_models_comment-report.js.html b/docs/files/addon_models_comment-report.js.html index 69aeadd57..a019a0f5e 100644 --- a/docs/files/addon_models_comment-report.js.html +++ b/docs/files/addon_models_comment-report.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_comment.js.html b/docs/files/addon_models_comment.js.html index 8235edb79..d9cb14415 100644 --- a/docs/files/addon_models_comment.js.html +++ b/docs/files/addon_models_comment.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_contributor.js.html b/docs/files/addon_models_contributor.js.html index 83ee5e8a6..e330a72a9 100644 --- a/docs/files/addon_models_contributor.js.html +++ b/docs/files/addon_models_contributor.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_draft-registration.js.html b/docs/files/addon_models_draft-registration.js.html index 73c4b4d42..539a62440 100644 --- a/docs/files/addon_models_draft-registration.js.html +++ b/docs/files/addon_models_draft-registration.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_file-provider.js.html b/docs/files/addon_models_file-provider.js.html index d063122a5..08bc6042b 100644 --- a/docs/files/addon_models_file-provider.js.html +++ b/docs/files/addon_models_file-provider.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_file-version.js.html b/docs/files/addon_models_file-version.js.html index e99f4a931..7110cf1c0 100644 --- a/docs/files/addon_models_file-version.js.html +++ b/docs/files/addon_models_file-version.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_file.js.html b/docs/files/addon_models_file.js.html index c46a18cbe..42abcbe12 100644 --- a/docs/files/addon_models_file.js.html +++ b/docs/files/addon_models_file.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_institution.js.html b/docs/files/addon_models_institution.js.html index bb2717fa8..b83338c9e 100644 --- a/docs/files/addon_models_institution.js.html +++ b/docs/files/addon_models_institution.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_log.js.html b/docs/files/addon_models_log.js.html index ba3d3f62c..7515d73d1 100644 --- a/docs/files/addon_models_log.js.html +++ b/docs/files/addon_models_log.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_metaschema.js.html b/docs/files/addon_models_metaschema.js.html index 5fbd11e7e..6a383f650 100644 --- a/docs/files/addon_models_metaschema.js.html +++ b/docs/files/addon_models_metaschema.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_node-link.js.html b/docs/files/addon_models_node-link.js.html index 8202e6f39..c45799736 100644 --- a/docs/files/addon_models_node-link.js.html +++ b/docs/files/addon_models_node-link.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_node.js.html b/docs/files/addon_models_node.js.html index 5078e08ea..e1e4bf79a 100644 --- a/docs/files/addon_models_node.js.html +++ b/docs/files/addon_models_node.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -200,6 +203,7 @@

    File: addon/models/node.js

    dateCreated: DS.attr('date'), dateModified: DS.attr('date'), + nodeLicense: DS.attr(), tags: DS.attr(), templateFrom: DS.attr('string'), @@ -222,11 +226,17 @@

    File: addon/models/node.js

    allowBulkRemove: true, inverse: 'node' }), + citation: DS.belongsTo('citation'), + + license: DS.belongsTo('license', { + inverse: null + }), files: DS.hasMany('file-provider'), //forkedFrom: DS.belongsTo('node'), - nodeLinks: DS.hasMany('node-links', { - inverse: null + linkedNodes: DS.hasMany('nodes', { + inverse: null, + serializerType: 'linked-node' }), registrations: DS.hasMany('registrations', { inverse: 'registeredFrom' diff --git a/docs/files/addon_models_osf-model.js.html b/docs/files/addon_models_osf-model.js.html index ecbe7a9fa..c7d9b39bb 100644 --- a/docs/files/addon_models_osf-model.js.html +++ b/docs/files/addon_models_osf-model.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_preprint.js.html b/docs/files/addon_models_preprint.js.html index 9630028f0..3a59e818c 100644 --- a/docs/files/addon_models_preprint.js.html +++ b/docs/files/addon_models_preprint.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -183,13 +186,15 @@

    File: addon/models/preprint.js

    subjects: DS.attr(), dateCreated: DS.attr('date'), datePublished: DS.attr('date'), - dateModifed: DS.attr('date'), + dateModified: DS.attr('date'), doi: DS.attr('string'), isPublished: DS.attr('boolean'), isPreprintOrphan: DS.attr('boolean'), + licenseRecord: DS.attr(), // Relationships node: DS.belongsTo('node', { inverse: null, async: true }), + license: DS.belongsTo('license', { inverse: null }), primaryFile: DS.belongsTo('file', { inverse: null }), provider: DS.belongsTo('preprint-provider', { inverse: 'preprints', async: true }), }); diff --git a/docs/files/addon_models_registration.js.html b/docs/files/addon_models_registration.js.html index bc1b2f88a..4f0a3eede 100644 --- a/docs/files/addon_models_registration.js.html +++ b/docs/files/addon_models_registration.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_taxonomy.js.html b/docs/files/addon_models_taxonomy.js.html index 8254ddebe..bb70c3390 100644 --- a/docs/files/addon_models_taxonomy.js.html +++ b/docs/files/addon_models_taxonomy.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_user.js.html b/docs/files/addon_models_user.js.html index 0b0e12e4f..03be95594 100644 --- a/docs/files/addon_models_user.js.html +++ b/docs/files/addon_models_user.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_serializers_osf-serializer.js.html b/docs/files/addon_serializers_osf-serializer.js.html index 82264a662..370c169e0 100644 --- a/docs/files/addon_serializers_osf-serializer.js.html +++ b/docs/files/addon_serializers_osf-serializer.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -202,6 +205,9 @@

    File: addon/serializers/osf-serializer.js

    } //TODO Pagination probably breaks here let data = resourceHash.embeds[embedded].data || resourceHash.embeds[embedded]; + if (!('errors' in data)) { + this.store.pushPayload({ data }); + } if (Array.isArray(data)) { included = included.concat(data); } else { @@ -274,11 +280,11 @@

    File: addon/serializers/osf-serializer.js

    }, normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) { // jshint ignore:line - // Ember data does not yet support pagination. For any request that returns more than one result, extract - // links.meta from the payload links section, and add to the model metadata manually. + // Ember data does not yet support pagination. For any request that returns more than one result, add pagination data + // under meta, and then calculate total pages to be loaded. let documentHash = this._super(...arguments); documentHash.meta = documentHash.meta || {}; - documentHash.meta.pagination = Ember.get(payload || {}, 'links.meta'); + documentHash.meta.pagination = Ember.$.extend(true, {}, Ember.get(payload || {}, 'meta')); documentHash.meta.total = Math.ceil(documentHash.meta.pagination.total / documentHash.meta.pagination.per_page); return documentHash; } diff --git a/docs/files/addon_services_current-user.js.html b/docs/files/addon_services_current-user.js.html index 0e7a75f59..dcc35acb4 100644 --- a/docs/files/addon_services_current-user.js.html +++ b/docs/files/addon_services_current-user.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_services_file-manager.js.html b/docs/files/addon_services_file-manager.js.html index 03dc38a3c..9f13b7dca 100644 --- a/docs/files/addon_services_file-manager.js.html +++ b/docs/files/addon_services_file-manager.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_utils_ajax-helpers.js.html b/docs/files/addon_utils_ajax-helpers.js.html index d4e44e329..186fd7ecf 100644 --- a/docs/files/addon_utils_ajax-helpers.js.html +++ b/docs/files/addon_utils_ajax-helpers.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_utils_auth.js.html b/docs/files/addon_utils_auth.js.html index ae81c9cb4..5f143e4ec 100644 --- a/docs/files/addon_utils_auth.js.html +++ b/docs/files/addon_utils_auth.js.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -202,7 +205,7 @@

    File: addon/utils/auth.js

    */ function getCookieAuthUrl(nextUri) { nextUri = nextUri || config.OSF.redirectUri; - let loginUri = `${config.OSF.url}login?next=${encodeURIComponent(nextUri)}`; + const loginUri = `${config.OSF.url}login/?next=${encodeURIComponent(nextUri)}`; return `${config.OSF.cookieLoginUrl}?service=${encodeURIComponent(loginUri)}`; } diff --git a/docs/index.html b/docs/index.html index 6286c96f4..75129de3f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/adapters.html b/docs/modules/adapters.html index dab4aa866..cf276e724 100644 --- a/docs/modules/adapters.html +++ b/docs/modules/adapters.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/authenticators.html b/docs/modules/authenticators.html index 4a34aaf78..9a2ba3969 100644 --- a/docs/modules/authenticators.html +++ b/docs/modules/authenticators.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/authorizers.html b/docs/modules/authorizers.html index 2e329cd25..2c80eed96 100644 --- a/docs/modules/authorizers.html +++ b/docs/modules/authorizers.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/components.html b/docs/modules/components.html index 00ffc873e..9ed98587d 100644 --- a/docs/modules/components.html +++ b/docs/modules/components.html @@ -41,6 +41,8 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • +
  • Citation
  • +
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -72,6 +74,7 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • +
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -168,16 +171,7 @@

    components Module

    -

    Display information about an individual comment, including controls to edit, delete, and report. -This component is typically used as part of the comment-pane component; see that component for further information.

    -

    Sample usage:

    -
    {{comment-detail
    -  comment=comment
    -  editComment=attrs.editComment
    -  deleteComment=attrs.deleteComment
    -  restoreComment=attrs.restoreComment
    -  reportComment=attrs.reportComment}}
    -
    +

    Lists citations for node in APA, MLA, and Chicago formats

    @@ -187,6 +181,11 @@

    components Module

    This module provides the following classes:

    @@ -225,7 +226,7 @@

    hideSearch

    +
    +

    signupUrl

    + String + + + + + + + +
    +

    The URL to use for signup. May be overridden, eg for special campaign pages

    + +
    + + +
    diff --git a/docs/classes/osf-paginator.html b/docs/classes/osf-paginator.html index b3794a4d4..b68fbc44d 100644 --- a/docs/classes/osf-paginator.html +++ b/docs/classes/osf-paginator.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -181,7 +178,6 @@

    osf-paginator Class

    fetchResults=(action 'fetchResults') query=query}} -

    The osf-paginator will be deprecated. Use pagination-pager instead.

    diff --git a/docs/classes/pagination-control.html b/docs/classes/pagination-control.html index e33eb4be8..069b5d848 100644 --- a/docs/classes/pagination-control.html +++ b/docs/classes/pagination-control.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -175,7 +172,6 @@

    pagination-control Class

    Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin.

    -

    The pagination-control will be deprecated. Use pagination-pager instead.

    diff --git a/docs/classes/search-dropdown.html b/docs/classes/search-dropdown.html index 7dc5a828a..567f59539 100644 --- a/docs/classes/search-dropdown.html +++ b/docs/classes/search-dropdown.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/sign-up.html b/docs/classes/sign-up.html index 4b5bb1c29..47a487a9a 100644 --- a/docs/classes/sign-up.html +++ b/docs/classes/sign-up.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/classes/tags-widget.html b/docs/classes/tags-widget.html index 3ebd36e0f..0dc991440 100644 --- a/docs/classes/tags-widget.html +++ b/docs/classes/tags-widget.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/data.json b/docs/data.json index 582fefb2d..51fe0ce68 100644 --- a/docs/data.json +++ b/docs/data.json @@ -58,20 +58,11 @@ "fors": {}, "namespaces": {} }, - "addon/components/citation-widget/component.js": { - "name": "addon/components/citation-widget/component.js", + "addon/components/comment-detail/component.js": { + "name": "addon/components/comment-detail/component.js", "modules": { "components": 1 }, - "classes": { - "citation-widget": 1 - }, - "fors": {}, - "namespaces": {} - }, - "addon/components/comment-detail/component.js": { - "name": "addon/components/comment-detail/component.js", - "modules": {}, "classes": { "comment-detail": 1 }, @@ -175,15 +166,6 @@ "fors": {}, "namespaces": {} }, - "addon/components/navbar-auth-dropdown/component.js": { - "name": "addon/components/navbar-auth-dropdown/component.js", - "modules": {}, - "classes": { - "navbar-auth-dropdown": 1 - }, - "fors": {}, - "namespaces": {} - }, "addon/components/oauth-popup/component.js": { "name": "addon/components/oauth-popup/component.js", "modules": {}, @@ -456,20 +438,11 @@ "fors": {}, "namespaces": {} }, - "addon/models/citation.js": { - "name": "addon/models/citation.js", + "addon/models/collection.js": { + "name": "addon/models/collection.js", "modules": { "models": 1 }, - "classes": { - "Citation": 1 - }, - "fors": {}, - "namespaces": {} - }, - "addon/models/collection.js": { - "name": "addon/models/collection.js", - "modules": {}, "classes": { "Collection": 1 }, @@ -703,7 +676,6 @@ "OsfTokenAuthenticator": 1, "OsfCookieAuthorizer": 1, "OsfTokenAuthorizer": 1, - "citation-widget": 1, "comment-detail": 1, "comment-form": 1, "comment-pane": 1, @@ -715,7 +687,6 @@ "file-renderer": 1, "file-version": 1, "file-widget": 1, - "navbar-auth-dropdown": 1, "oauth-popup": 1, "osf-copyright": 1, "osf-footer": 1, @@ -744,7 +715,6 @@ "PaginatedRouteMixin": 1, "RegistrationActionsMixin": 1, "TaggableMixin": 1, - "Citation": 1, "Collection": 1, "CommentReport": 1, "Comment": 1, @@ -828,7 +798,6 @@ "submodules": {}, "elements": {}, "classes": { - "citation-widget": 1, "comment-detail": 1, "comment-form": 1, "comment-pane": 1, @@ -840,7 +809,6 @@ "file-renderer": 1, "file-version": 1, "file-widget": 1, - "navbar-auth-dropdown": 1, "oauth-popup": 1, "osf-copyright": 1, "osf-footer": 1, @@ -859,7 +827,7 @@ "namespace": "", "file": "addon/components/tags-widget/component.js", "line": 9, - "description": "Lists citations for node in APA, MLA, and Chicago formats" + "description": "Display information about an individual comment, including controls to edit, delete, and report.\nThis component is typically used as part of the `comment-pane` component; see that component for further information.\n\nSample usage:\n```handlebars\n{{comment-detail\n comment=comment\n editComment=attrs.editComment\n deleteComment=attrs.deleteComment\n restoreComment=attrs.restoreComment\n reportComment=attrs.reportComment}}\n```" }, "helpers": { "name": "helpers", @@ -926,7 +894,6 @@ "submodules": {}, "elements": {}, "classes": { - "Citation": 1, "Collection": 1, "CommentReport": 1, "Comment": 1, @@ -953,7 +920,7 @@ "namespace": "", "file": "addon/models/user.js", "line": 11, - "description": "Model for OSF APIv2 citation styles" + "description": "Model for OSF APIv2 collections\nFor field and usage information, see:\n* https://api.osf.io/v2/docs/#!/v2/Collection_List_GET" }, "ember-preprints": { "name": "ember-preprints", @@ -1103,28 +1070,6 @@ "description": "Ember-simple-auth compatible authorizer based on OAuth2 bearer tokens.\n\nIntended to be used with the authenticator of the same name.", "extends": "ember-simple-auth/BaseAuthorizer" }, - "citation-widget": { - "name": "citation-widget", - "shortname": "citation-widget", - "classitems": [], - "plugins": [], - "extensions": [], - "plugin_for": [], - "extension_for": [], - "module": "ember-osf", - "submodule": "components", - "namespace": "", - "file": "addon/components/citation-widget/component.js", - "line": 24, - "description": "Lists citations for node in APA, MLA, and Chicago formats", - "params": [ - { - "name": "node", - "description": "for which to fetch citations", - "type": "Node" - } - ] - }, "comment-detail": { "name": "comment-detail", "shortname": "comment-detail", @@ -1356,21 +1301,6 @@ "line": 13, "description": "Widget to quickly upload a file to a selected project\n```handlebars\n{{file-widget\n preUpload=(action 'preUpload')\n buildUrl=(action 'buildUrl')\n listeners=dropzoneOptions\n options=dropzoneOptions}}\n```" }, - "navbar-auth-dropdown": { - "name": "navbar-auth-dropdown", - "shortname": "navbar-auth-dropdown", - "classitems": [], - "plugins": [], - "extensions": [], - "plugin_for": [], - "extension_for": [], - "module": "ember-osf", - "submodule": "components", - "namespace": "", - "file": "addon/components/navbar-auth-dropdown/component.js", - "line": 10, - "description": "Display the login dropdown on the navbar\n\nSample usage:\n```handlebars\n{{navbar-auth-dropdown\n loginAction=loginAction\n redirectUrl=redirectUrl}}\n```" - }, "oauth-popup": { "name": "oauth-popup", "shortname": "oauth-popup", @@ -1459,7 +1389,7 @@ "namespace": "", "file": "addon/components/osf-paginator/component.js", "line": 9, - "description": "OSF Paginator adapted from osf/website/static/js/paginator.js\n\nSample usage:\n```handlebars\n{{osf-paginator\n totalSearchResults=totalSearchResults\n fetchResults=(action 'fetchResults')\n query=query}}\n```\n\nThe osf-paginator will be deprecated. Use pagination-pager instead.", + "description": "OSF Paginator adapted from osf/website/static/js/paginator.js\n\nSample usage:\n```handlebars\n{{osf-paginator\n totalSearchResults=totalSearchResults\n fetchResults=(action 'fetchResults')\n query=query}}\n```", "params": [ { "name": "totalSearchResults", @@ -1491,7 +1421,7 @@ "namespace": "", "file": "addon/components/pagination-control/component.js", "line": 9, - "description": "Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin.\n\nThe pagination-control will be deprecated. Use pagination-pager instead." + "description": "Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin." }, "search-dropdown": { "name": "search-dropdown", @@ -1870,21 +1800,6 @@ "description": "Controller mixin that implements basic tagging functionality. Uses the model defined in the model hook.", "extends": "Ember.Mixin" }, - "Citation": { - "name": "Citation", - "shortname": "Citation", - "classitems": [], - "plugins": [], - "extensions": [], - "plugin_for": [], - "extension_for": [], - "module": "ember-osf", - "submodule": "models", - "namespace": "", - "file": "addon/models/citation.js", - "line": 10, - "description": "Model for OSF APIv2 citation styles" - }, "Collection": { "name": "Collection", "shortname": "Collection", @@ -2238,15 +2153,7 @@ "classitems": [ { "file": "addon/adapters/osf-adapter.js", - "line": 32, - "description": "Overrides buildQuery method - Allows users to embed resources with findRecord\nOSF APIv2 does not have \"include\" functionality, instead we use 'embed'.\nUsage: findRecord(type, id, {include: 'resource'}) or findRecord(type, id, {include: ['resource1', resource2]})\nSwaps included resources with embedded resources", - "class": "OsfAdapter", - "module": "ember-osf", - "submodule": "adapters" - }, - { - "file": "addon/adapters/osf-adapter.js", - "line": 64, + "line": 47, "description": "Construct a URL for a relationship create/update/delete.", "itemtype": "method", "name": "_buildRelationshipURL", @@ -2274,7 +2181,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 82, + "line": 65, "description": "Handle creation of related resources", "itemtype": "method", "name": "_createRelated", @@ -2318,7 +2225,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 110, + "line": 93, "description": "Handle add(s) of related resources. This differs from CREATEs in that the related\nrecord is already saved and is just being associated with the inverse record.", "itemtype": "method", "name": "_addRelated", @@ -2362,7 +2269,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 131, + "line": 114, "description": "Handle update(s) of related resources", "itemtype": "method", "name": "_updateRelated", @@ -2406,7 +2313,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 153, + "line": 136, "description": "Handle removal of related resources. This differs from DELETEs in that the related\nrecord is not deleted, just dissociated from the inverse record.", "itemtype": "method", "name": "_removeRelated", @@ -2450,7 +2357,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 172, + "line": 155, "description": "Handle deletion of related resources", "itemtype": "method", "name": "_deleteRelated", @@ -2494,7 +2401,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 189, + "line": 172, "description": "A helper for making _*Related requests", "itemtype": "method", "name": "_doRelatedRequest", @@ -2543,7 +2450,7 @@ }, { "file": "addon/adapters/osf-adapter.js", - "line": 246, + "line": 229, "description": "Delegate a series of requests based on a snapshot, relationship, and a change.\nThe change argument can be 'delete', 'remove', 'update', 'add', 'create'", "itemtype": "method", "name": "_handleRelatedRequest", @@ -2592,7 +2499,7 @@ }, { "file": "addon/authenticators/osf-cookie.js", - "line": 60, + "line": 61, "description": "For now, simply verify that a token is present and can be used", "itemtype": "method", "name": "authenticate", @@ -2638,23 +2545,23 @@ "submodule": "components" }, { - "file": "addon/components/navbar-auth-dropdown/component.js", - "line": 33, - "description": "The URL to use for signup. May be overridden, eg for special campaign pages", + "file": "addon/components/osf-navbar/component.js", + "line": 27, + "description": "Whether search icons and functionality show up", "itemtype": "property", - "name": "signupUrl", - "type": "{String}", - "class": "navbar-auth-dropdown", + "name": "hideSearch", + "type": "{Boolean}", + "class": "osf-navbar", "module": "ember-osf", "submodule": "components" }, { "file": "addon/components/osf-navbar/component.js", - "line": 26, - "description": "Whether search icons and functionality show up", + "line": 34, + "description": "The URL to use for signup. May be overridden, eg for special campaign pages", "itemtype": "property", - "name": "hideSearch", - "type": "{Boolean}", + "name": "signupUrl", + "type": "{String}", "class": "osf-navbar", "module": "ember-osf", "submodule": "components" @@ -3336,18 +3243,18 @@ { "file": "addon/mixins/node-actions.js", "line": 199, - "description": "Adds a relationship to another node, called a linkedNode.", + "description": "Add a node link (pointer) to another node", "itemtype": "method", "name": "addNodeLink", "params": [ { "name": "targetNodeId", - "description": "ID of the node for which you wish to create a link", + "description": "ID of the node for which you wish to create a pointer", "type": "String" } ], "return": { - "description": "Returns a promise that resolves to the newly updated node", + "description": "Returns a promise that resolves to model for the newly created NodeLink", "type": "Promise" }, "class": "NodeActionsMixin", @@ -3357,18 +3264,18 @@ { "file": "addon/mixins/node-actions.js", "line": 214, - "description": "Removes the linkedNode relationship to another node. Does not remove the linked node itself.", + "description": "Remove a node link (pointer) to another node", "itemtype": "method", "name": "removeNodeLink", "params": [ { - "name": "linkedNode", - "description": "linkedNode relationship to be destroyed.", + "name": "nodeLink", + "description": "nodeLink record to be destroyed.", "type": "Object" } ], "return": { - "description": "Returns a promise that resolves to the newly updated node", + "description": "Returns a promise that resolves after the node link has been removed. This does not delete\nthe target node itself.", "type": "Promise" }, "class": "NodeActionsMixin", @@ -3648,7 +3555,7 @@ }, { "file": "addon/models/node.js", - "line": 90, + "line": 83, "description": "Is this a project? Flag can be used to provide template-specific behavior for different resource types.", "itemtype": "property", "name": "isProject", @@ -3659,7 +3566,7 @@ }, { "file": "addon/models/node.js", - "line": 96, + "line": 89, "description": "Is this a registration? Flag can be used to provide template-specific behavior for different resource types.", "itemtype": "property", "name": "isRegistration", @@ -3670,7 +3577,7 @@ }, { "file": "addon/models/node.js", - "line": 103, + "line": 96, "description": "Is this node being viewed through an anonymized, view-only link?", "itemtype": "property", "name": "isAnonymous", @@ -3681,7 +3588,7 @@ }, { "file": "addon/models/node.js", - "line": 110, + "line": 103, "description": "Determine whether the specified user ID is a contributor on this node", "itemtype": "method", "name": "isContributor", @@ -4494,11 +4401,7 @@ "warnings": [ { "message": "replacing incorrect tag: returns with return", - "line": " addon/models/node.js:110" - }, - { - "message": "Missing item type\nOverrides buildQuery method - Allows users to embed resources with findRecord\nOSF APIv2 does not have \"include\" functionality, instead we use 'embed'.\nUsage: findRecord(type, id, {include: 'resource'}) or findRecord(type, id, {include: ['resource1', resource2]})\nSwaps included resources with embedded resources", - "line": " addon/adapters/osf-adapter.js:32" + "line": " addon/models/node.js:103" } ] } \ No newline at end of file diff --git a/docs/files/addon_adapters_osf-adapter.js.html b/docs/files/addon_adapters_osf-adapter.js.html index 5c111a52c..5e183e276 100644 --- a/docs/files/addon_adapters_osf-adapter.js.html +++ b/docs/files/addon_adapters_osf-adapter.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -188,26 +185,9 @@

    File: addon/adapters/osf-adapter.js

    * @uses GenericDataAdapterMixin */ export default DS.JSONAPIAdapter.extend(HasManyQuery.RESTAdapterMixin, GenericDataAdapterMixin, { - headers: { - ACCEPT: 'application/vnd.api+json; version=2.3' - }, authorizer: config['ember-simple-auth'].authorizer, host: config.OSF.apiUrl, namespace: config.OSF.apiNamespace, - /** - * Overrides buildQuery method - Allows users to embed resources with findRecord - * OSF APIv2 does not have "include" functionality, instead we use 'embed'. - * Usage: findRecord(type, id, {include: 'resource'}) or findRecord(type, id, {include: ['resource1', resource2]}) - * Swaps included resources with embedded resources - */ - buildQuery() { - let query = this._super(...arguments); - if (query.include) { - query.embed = query.include; - } - delete query.include; - return query; - }, buildURL(modelName, id, snapshot, requestType) { var url = this._super(...arguments); var options = (snapshot ? snapshot.adapterOptions : false) || {}; @@ -402,7 +382,7 @@

    File: addon/adapters/osf-adapter.js

    data: data, isBulk: isBulk }).then(res => { - if (res && !Ember.$.isArray(res.data)) { + if (!Ember.$.isArray(res.data)) { res.data = [res.data]; } return res; diff --git a/docs/files/addon_authenticators_osf-cookie.js.html b/docs/files/addon_authenticators_osf-cookie.js.html index 8c5221430..3ffc0d648 100644 --- a/docs/files/addon_authenticators_osf-cookie.js.html +++ b/docs/files/addon_authenticators_osf-cookie.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -216,7 +213,8 @@

    File: addon/authenticators/osf-cookie.js

    // Can't do this via AJAX request because it redirects to CAS, and AJAX + redirect = CORS issue // Manually clear session before user leaves the page, since we aren't sticking around for ESA to do so later - return this.get('session.session')._clear(true); + this.get('session.session')._clear(true) + .then(() => window.location = `${config.OSF.url}logout/`); } else { // This branch is expected to be called when a test request reveals the user to lack permissions... so session should be wiped return Ember.RSVP.resolve(); diff --git a/docs/files/addon_authenticators_osf-token.js.html b/docs/files/addon_authenticators_osf-token.js.html index c4da1b4a2..de33b00e8 100644 --- a/docs/files/addon_authenticators_osf-token.js.html +++ b/docs/files/addon_authenticators_osf-token.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_authorizers_osf-cookie.js.html b/docs/files/addon_authorizers_osf-cookie.js.html index 2beb2c690..168f7ff57 100644 --- a/docs/files/addon_authorizers_osf-cookie.js.html +++ b/docs/files/addon_authorizers_osf-cookie.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_authorizers_osf-token.js.html b/docs/files/addon_authorizers_osf-token.js.html index 88fb15f40..b4175a088 100644 --- a/docs/files/addon_authorizers_osf-token.js.html +++ b/docs/files/addon_authorizers_osf-token.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_citation-widget_component.js.html b/docs/files/addon_components_citation-widget_component.js.html deleted file mode 100644 index e50a8d3d1..000000000 --- a/docs/files/addon_components_citation-widget_component.js.html +++ /dev/null @@ -1,238 +0,0 @@ - - - - - addon/components/citation-widget/component.js - Ember OSF - - - - - - - - -
    -
    -
    -

    -
    -
    - API Docs for: 0.0.1 -
    -
    -
    - - -
    -
    - Show: - - - - - - - -
    - -
    -
    -
    -

    File: addon/components/citation-widget/component.js

    - -
    -
    -import Ember from 'ember';
    -import layout from './template';
    -
    -/**
    - * @module ember-osf
    - * @submodule components
    - */
    -
    -const citationStyles = [
    -    {
    -        linkSuffix: 'apa',
    -        attr: 'apa'
    -    },
    -    {
    -        linkSuffix: 'chicago-author-date',
    -        attr: 'chicago'
    -    },
    -    {
    -        linkSuffix: 'modern-language-association',
    -        attr: 'mla'
    -    }
    -];
    -
    -/**
    - * Lists citations for node in APA, MLA, and Chicago formats
    - *
    - * @class citation-widget
    - * @param {node} node for which to fetch citations
    - */
    -export default Ember.Component.extend({
    -    layout,
    -    apa: null,
    -    chicago: null,
    -    mla: null,
    -    node: null,
    -    store: Ember.inject.service(),
    -
    -    didRender() {
    -        const node = this.get('node');
    -
    -        if (!node) {
    -            return;
    -        }
    -
    -        const citationLink = node.get('links.relationships.citation.links.related.href');
    -
    -        for (const { linkSuffix, attr } of citationStyles) {
    -            this.get('store')
    -                .adapterFor('node')
    -                .ajax(`${citationLink}${linkSuffix}/`, 'GET')
    -                .then(resp => this.set(attr, resp.data.attributes.citation));
    -        }
    -    }
    -});
    -
    -    
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - diff --git a/docs/files/addon_components_comment-detail_component.js.html b/docs/files/addon_components_comment-detail_component.js.html index a96ff351b..3315b743f 100644 --- a/docs/files/addon_components_comment-detail_component.js.html +++ b/docs/files/addon_components_comment-detail_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_comment-form_component.js.html b/docs/files/addon_components_comment-form_component.js.html index 48e862c01..af5d68bbd 100644 --- a/docs/files/addon_components_comment-form_component.js.html +++ b/docs/files/addon_components_comment-form_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_comment-pane_component.js.html b/docs/files/addon_components_comment-pane_component.js.html index c9045558a..88a6f0960 100644 --- a/docs/files/addon_components_comment-pane_component.js.html +++ b/docs/files/addon_components_comment-pane_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_dropzone-widget_component.js.html b/docs/files/addon_components_dropzone-widget_component.js.html index 6a090b178..e91bb1d9c 100644 --- a/docs/files/addon_components_dropzone-widget_component.js.html +++ b/docs/files/addon_components_dropzone-widget_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_eosf-project-nav_component.js.html b/docs/files/addon_components_eosf-project-nav_component.js.html index 11a8c8028..20a931bb7 100644 --- a/docs/files/addon_components_eosf-project-nav_component.js.html +++ b/docs/files/addon_components_eosf-project-nav_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-browser-icon_component.js.html b/docs/files/addon_components_file-browser-icon_component.js.html index 4e809ef61..9f3d48324 100644 --- a/docs/files/addon_components_file-browser-icon_component.js.html +++ b/docs/files/addon_components_file-browser-icon_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-browser-item_component.js.html b/docs/files/addon_components_file-browser-item_component.js.html index da1a82093..9eaf0d8b3 100644 --- a/docs/files/addon_components_file-browser-item_component.js.html +++ b/docs/files/addon_components_file-browser-item_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-browser_component.js.html b/docs/files/addon_components_file-browser_component.js.html index 4ff5a0464..7a83729b2 100644 --- a/docs/files/addon_components_file-browser_component.js.html +++ b/docs/files/addon_components_file-browser_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-chooser_component.js.html b/docs/files/addon_components_file-chooser_component.js.html index 0384327df..3b419aa36 100644 --- a/docs/files/addon_components_file-chooser_component.js.html +++ b/docs/files/addon_components_file-chooser_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-renderer_component.js.html b/docs/files/addon_components_file-renderer_component.js.html index d83d0d375..3e011825a 100644 --- a/docs/files/addon_components_file-renderer_component.js.html +++ b/docs/files/addon_components_file-renderer_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-version_component.js.html b/docs/files/addon_components_file-version_component.js.html index e623c4003..8298cb7cb 100644 --- a/docs/files/addon_components_file-version_component.js.html +++ b/docs/files/addon_components_file-version_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_file-widget_component.js.html b/docs/files/addon_components_file-widget_component.js.html index 6c43807f3..4a9a5d7a9 100644 --- a/docs/files/addon_components_file-widget_component.js.html +++ b/docs/files/addon_components_file-widget_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_navbar-auth-dropdown_component.js.html b/docs/files/addon_components_navbar-auth-dropdown_component.js.html deleted file mode 100644 index e5549a453..000000000 --- a/docs/files/addon_components_navbar-auth-dropdown_component.js.html +++ /dev/null @@ -1,256 +0,0 @@ - - - - - addon/components/navbar-auth-dropdown/component.js - Ember OSF - - - - - - - - -
    -
    -
    -

    -
    -
    - API Docs for: 0.0.1 -
    -
    -
    - - -
    -
    - Show: - - - - - - - -
    - -
    -
    -
    -

    File: addon/components/navbar-auth-dropdown/component.js

    - -
    -
    -import Ember from 'ember';
    -import layout from './template';
    -import config from 'ember-get-config';
    -
    -/**
    - * @module ember-osf
    - * @submodule components
    - */
    -
    -/**
    - * Display the login dropdown on the navbar
    - *
    - * Sample usage:
    - * ```handlebars
    - * {{navbar-auth-dropdown
    - *   loginAction=loginAction
    - *   redirectUrl=redirectUrl}}
    - * ```
    - *
    - * @class navbar-auth-dropdown
    - */
    -export default Ember.Component.extend({
    -    layout,
    -    session: Ember.inject.service(),
    -    currentUser: Ember.inject.service(),
    -
    -    tagName: 'li',
    -    classNames: ['dropdown'],
    -    classNameBindings: ['notAuthenticated:sign-in'],
    -    notAuthenticated: Ember.computed.not('session.isAuthenticated'),
    -    redirectUrl: null,
    -
    -    /**
    -     * The URL to use for signup. May be overridden, eg for special campaign pages
    -     *
    -     * @property signupUrl
    -     * @type {String}
    -     */
    -    signupUrl: config.OSF.url + 'register',
    -
    -    gravatarUrl: Ember.computed('user', function() {
    -        let imgLink = this.get('user.links.profile_image');
    -
    -        return imgLink ? `${imgLink}&s=25` : '';
    -    }),
    -    host: config.OSF.url,
    -    user: null,
    -    _loadCurrentUser() {
    -        this.get('currentUser')
    -            .load()
    -            .then(user => this.set('user', user));
    -    },
    -    init() {
    -        this._super(...arguments);
    -        // TODO: React to changes in service/ event?
    -        if (this.get('session.isAuthenticated')) {
    -            this._loadCurrentUser();
    -        }
    -    },
    -    // TODO: These parameters are defined in osf settings.py; make sure ember config matches.
    -    allowLogin: true,
    -    enableInstitutions: true,
    -    actions: {
    -        logout() {
    -            const redirectUrl = this.get('redirectUrl');
    -            const query = redirectUrl ? '?' + Ember.$.param({ redirect_url: redirectUrl }) : '';
    -            // TODO: May not work well if logging out from page that requires login- check?
    -            this.get('session').invalidate()
    -                .then(() => window.location.href = `${config.OSF.url}logout/${query}`);
    -        },
    -    }
    -});
    -
    -    
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - diff --git a/docs/files/addon_components_oauth-popup_component.js.html b/docs/files/addon_components_oauth-popup_component.js.html index b005ac063..5581ba2d8 100644 --- a/docs/files/addon_components_oauth-popup_component.js.html +++ b/docs/files/addon_components_oauth-popup_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-copyright_component.js.html b/docs/files/addon_components_osf-copyright_component.js.html index 10b3235f0..72732dfd8 100644 --- a/docs/files/addon_components_osf-copyright_component.js.html +++ b/docs/files/addon_components_osf-copyright_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-footer_component.js.html b/docs/files/addon_components_osf-footer_component.js.html index 17a6bc3d5..68d28c7fb 100644 --- a/docs/files/addon_components_osf-footer_component.js.html +++ b/docs/files/addon_components_osf-footer_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-mode-footer_component.js.html b/docs/files/addon_components_osf-mode-footer_component.js.html index ec5fe75af..1d804a97d 100644 --- a/docs/files/addon_components_osf-mode-footer_component.js.html +++ b/docs/files/addon_components_osf-mode-footer_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_osf-navbar_component.js.html b/docs/files/addon_components_osf-navbar_component.js.html index ead61ee80..d93a55790 100644 --- a/docs/files/addon_components_osf-navbar_component.js.html +++ b/docs/files/addon_components_osf-navbar_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -187,6 +184,7 @@

    File: addon/components/osf-navbar/component.js

    export default Ember.Component.extend({ layout, session: Ember.inject.service(), + currentUser: Ember.inject.service(), onSearchPage: false, /** * Whether search icons and functionality show up @@ -195,14 +193,46 @@

    File: addon/components/osf-navbar/component.js

    */ hideSearch: false, - host: config.OSF.url, + /** + * The URL to use for signup. May be overridden, eg for special campaign pages + * + * @property signupUrl + * @type {String} + */ + signupUrl: config.OSF.url + 'register', + gravatarUrl: Ember.computed('user', function() { + let imgLink = this.get('user.links.profile_image'); + if (imgLink) { + imgLink += '&s=25'; + } + return imgLink; + }), + fullName: null, + host: config.OSF.url, + user: null, showSearch: false, - + _loadCurrentUser() { + this.get('currentUser').load().then((user) => this.set('user', user)); + }, + init() { + this._super(...arguments); + // TODO: React to changes in service/ event? + if (this.get('session.isAuthenticated')) { + this._loadCurrentUser(); + } + }, + // TODO: These parameters are defined in osf settings.py; make sure ember config matches. + allowLogin: true, + enableInstitutions: true, actions: { toggleSearch() { this.toggleProperty('showSearch'); }, + logout() { + // TODO: May not work well if logging out from page that requires login- check? + this.get('session').invalidate(); + }, } }); diff --git a/docs/files/addon_components_osf-paginator_component.js.html b/docs/files/addon_components_osf-paginator_component.js.html index 8ea32bd3d..0d9ceeaf5 100644 --- a/docs/files/addon_components_osf-paginator_component.js.html +++ b/docs/files/addon_components_osf-paginator_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -181,9 +178,6 @@

    File: addon/components/osf-paginator/component.js

    * fetchResults=(action 'fetchResults') * query=query}} * ``` - * - * The osf-paginator will be deprecated. Use pagination-pager instead. - * * @class osf-paginator * @param {integer} totalSearchResults Number of total search results to be paginated * @param {action} fetchResults - action for fetching other pages of results @@ -192,13 +186,6 @@

    File: addon/components/osf-paginator/component.js

    export default Ember.Component.extend({ layout, currentPage: 1, - init() { - this._super(...arguments); - Ember.deprecate('osf-paginator will be deprecated. Use pagination-pager instead', false, { - id: 'osf-paginator', - until: '1.0.0' - }); - }, pages: Ember.computed('totalSearchResults', function() { let totalSearchResults = this.get('totalSearchResults'); return Math.ceil(totalSearchResults / 10); diff --git a/docs/files/addon_components_pagination-control_component.js.html b/docs/files/addon_components_pagination-control_component.js.html index efd6fd879..1cb529401 100644 --- a/docs/files/addon_components_pagination-control_component.js.html +++ b/docs/files/addon_components_pagination-control_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -173,9 +170,6 @@

    File: addon/components/pagination-control/component.js< /** * Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin. - * - * The pagination-control will be deprecated. Use pagination-pager instead. - * * @class pagination-control */ export default Ember.Component.extend({ @@ -189,14 +183,6 @@

    File: addon/components/pagination-control/component.js< return this.get('currentPage') >= this.get('pageCount'); }), - init() { - this._super(...arguments); - Ember.deprecate('pagination-control will be deprecated. Use pagination-pager instead', false, { - id: 'pagination-control', - until: '1.0.0' - }); - }, - // TODO: This actions hash feels a bit kludgy actions: { next() { diff --git a/docs/files/addon_components_search-dropdown_component.js.html b/docs/files/addon_components_search-dropdown_component.js.html index 4ea9dddf6..13fae458c 100644 --- a/docs/files/addon_components_search-dropdown_component.js.html +++ b/docs/files/addon_components_search-dropdown_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_sign-up_component.js.html b/docs/files/addon_components_sign-up_component.js.html index ed7bb5939..51012d64d 100644 --- a/docs/files/addon_components_sign-up_component.js.html +++ b/docs/files/addon_components_sign-up_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_components_tags-widget_component.js.html b/docs/files/addon_components_tags-widget_component.js.html index ad1301d7f..ddb073b20 100644 --- a/docs/files/addon_components_tags-widget_component.js.html +++ b/docs/files/addon_components_tags-widget_component.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_const_permissions.js.html b/docs/files/addon_const_permissions.js.html index c3b032230..386687081 100644 --- a/docs/files/addon_const_permissions.js.html +++ b/docs/files/addon_const_permissions.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_helpers_elem-id.js.html b/docs/files/addon_helpers_elem-id.js.html index ef86f1d5c..2b4104d92 100644 --- a/docs/files/addon_helpers_elem-id.js.html +++ b/docs/files/addon_helpers_elem-id.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_cas-authenticated-route.js.html b/docs/files/addon_mixins_cas-authenticated-route.js.html index 152c4afdc..12f612b63 100644 --- a/docs/files/addon_mixins_cas-authenticated-route.js.html +++ b/docs/files/addon_mixins_cas-authenticated-route.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_commentable.js.html b/docs/files/addon_mixins_commentable.js.html index 0a152dde6..872c7f93a 100644 --- a/docs/files/addon_mixins_commentable.js.html +++ b/docs/files/addon_mixins_commentable.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_fetch-all-route.js.html b/docs/files/addon_mixins_fetch-all-route.js.html index 94a8ac68c..6863bbfbf 100644 --- a/docs/files/addon_mixins_fetch-all-route.js.html +++ b/docs/files/addon_mixins_fetch-all-route.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_file-cache-bypass.js.html b/docs/files/addon_mixins_file-cache-bypass.js.html index 81e99684b..90deb04a1 100644 --- a/docs/files/addon_mixins_file-cache-bypass.js.html +++ b/docs/files/addon_mixins_file-cache-bypass.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_file-item.js.html b/docs/files/addon_mixins_file-item.js.html index e5a613988..e8dfa7dbb 100644 --- a/docs/files/addon_mixins_file-item.js.html +++ b/docs/files/addon_mixins_file-item.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_generic-data-adapter.js.html b/docs/files/addon_mixins_generic-data-adapter.js.html index 25effd46b..512232012 100644 --- a/docs/files/addon_mixins_generic-data-adapter.js.html +++ b/docs/files/addon_mixins_generic-data-adapter.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_infinity-custom.js.html b/docs/files/addon_mixins_infinity-custom.js.html index 370fdaec4..4d8ee77d8 100644 --- a/docs/files/addon_mixins_infinity-custom.js.html +++ b/docs/files/addon_mixins_infinity-custom.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_node-actions.js.html b/docs/files/addon_mixins_node-actions.js.html index 91a86deaa..6ddea6d22 100644 --- a/docs/files/addon_mixins_node-actions.js.html +++ b/docs/files/addon_mixins_node-actions.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -362,33 +359,31 @@

    File: addon/mixins/node-actions.js

    return this.get('_node').addChild(title, description, category); }, /** - * Adds a relationship to another node, called a linkedNode. + * Add a node link (pointer) to another node * * @method addNodeLink - * @param {String} targetNodeId ID of the node for which you wish to create a link - * @return {Promise} Returns a promise that resolves to the newly updated node + * @param {String} targetNodeId ID of the node for which you wish to create a pointer + * @return {Promise} Returns a promise that resolves to model for the newly created NodeLink */ addNodeLink(targetNodeId) { var node = this.get('_node'); - return this.store.findRecord('node', targetNodeId).then(linkedNode => { - node.get('linkedNodes').pushObject(linkedNode); - return node.save(); + var nodeLink = this.store.createRecord('node-link', { + target: targetNodeId }); - + node.get('nodeLinks').pushObject(nodeLink); + return node.save().then(() => nodeLink); }, /** - * Removes the linkedNode relationship to another node. Does not remove the linked node itself. + * Remove a node link (pointer) to another node * * @method removeNodeLink - * @param {Object} linkedNode linkedNode relationship to be destroyed. - * @return {Promise} Returns a promise that resolves to the newly updated node + * @param {Object} nodeLink nodeLink record to be destroyed. + * @return {Promise} Returns a promise that resolves after the node link has been removed. This does not delete + * the target node itself. */ - removeNodeLink(linkedNode) { - var node = this.get('_node'); - node.get('linkedNodes').removeObject(linkedNode); - return node.save(); + removeNodeLink(nodeLink) { + return nodeLink.destroyRecord(); } - } }); diff --git a/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html b/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html index 33f36f5e1..8a90ce8c8 100644 --- a/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html +++ b/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-agnostic-auth-route.js.html b/docs/files/addon_mixins_osf-agnostic-auth-route.js.html index f8fa03a1d..b7538dbfc 100644 --- a/docs/files/addon_mixins_osf-agnostic-auth-route.js.html +++ b/docs/files/addon_mixins_osf-agnostic-auth-route.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-cookie-login-controller.js.html b/docs/files/addon_mixins_osf-cookie-login-controller.js.html index 18598c6a2..dbf8f501a 100644 --- a/docs/files/addon_mixins_osf-cookie-login-controller.js.html +++ b/docs/files/addon_mixins_osf-cookie-login-controller.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-cookie-login-route.js.html b/docs/files/addon_mixins_osf-cookie-login-route.js.html index ea681fb79..fa88ac4ef 100644 --- a/docs/files/addon_mixins_osf-cookie-login-route.js.html +++ b/docs/files/addon_mixins_osf-cookie-login-route.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-token-login-controller.js.html b/docs/files/addon_mixins_osf-token-login-controller.js.html index ac867c229..639f9b0ae 100644 --- a/docs/files/addon_mixins_osf-token-login-controller.js.html +++ b/docs/files/addon_mixins_osf-token-login-controller.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_osf-token-login-route.js.html b/docs/files/addon_mixins_osf-token-login-route.js.html index efc4f9ee9..9f271d648 100644 --- a/docs/files/addon_mixins_osf-token-login-route.js.html +++ b/docs/files/addon_mixins_osf-token-login-route.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_paginated-controller.js.html b/docs/files/addon_mixins_paginated-controller.js.html index c23a7fc1a..682afaeea 100644 --- a/docs/files/addon_mixins_paginated-controller.js.html +++ b/docs/files/addon_mixins_paginated-controller.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_paginated-route.js.html b/docs/files/addon_mixins_paginated-route.js.html index 7506f1d9f..a1d01e1a9 100644 --- a/docs/files/addon_mixins_paginated-route.js.html +++ b/docs/files/addon_mixins_paginated-route.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_registration-actions.js.html b/docs/files/addon_mixins_registration-actions.js.html index 4b33fe6ca..52190cdb0 100644 --- a/docs/files/addon_mixins_registration-actions.js.html +++ b/docs/files/addon_mixins_registration-actions.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_mixins_taggable-mixin.js.html b/docs/files/addon_mixins_taggable-mixin.js.html index dcdd9e8c8..7d5f5b14a 100644 --- a/docs/files/addon_mixins_taggable-mixin.js.html +++ b/docs/files/addon_mixins_taggable-mixin.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_citation.js.html b/docs/files/addon_models_citation.js.html deleted file mode 100644 index f066edea4..000000000 --- a/docs/files/addon_models_citation.js.html +++ /dev/null @@ -1,201 +0,0 @@ - - - - - addon/models/citation.js - Ember OSF - - - - - - - - -
    -
    -
    -

    -
    -
    - API Docs for: 0.0.1 -
    -
    -
    - - -
    -
    - Show: - - - - - - - -
    - -
    -
    -
    -

    File: addon/models/citation.js

    - -
    -
    -import DS from 'ember-data';
    -
    -import OsfModel from './osf-model';
    -
    -/**
    - * @module ember-osf
    - * @submodule models
    - */
    -
    -/**
    - * Model for OSF APIv2 citation styles
    - *
    - * @class Citation
    - */
    -export default OsfModel.extend({
    -    citation: DS.attr('string')
    -});
    -
    -    
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - diff --git a/docs/files/addon_models_collection.js.html b/docs/files/addon_models_collection.js.html index 45f850074..12b77024d 100644 --- a/docs/files/addon_models_collection.js.html +++ b/docs/files/addon_models_collection.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -184,13 +181,12 @@

    File: addon/models/collection.js

    dateCreated: DS.attr('date'), dateModified: DS.attr('date'), bookmarks: DS.attr('boolean'), + // nodeLinks: DS.hasMany('node-links', { + // inverse:null + // }), linkedNodes: DS.hasMany('nodes', { inverse: null, serializerType: 'linked-node' - }), - linkedRegistrations: DS.hasMany('registrations', { - inverse: null, - serializerType: 'linked-node' }) }); diff --git a/docs/files/addon_models_comment-report.js.html b/docs/files/addon_models_comment-report.js.html index a019a0f5e..69aeadd57 100644 --- a/docs/files/addon_models_comment-report.js.html +++ b/docs/files/addon_models_comment-report.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_comment.js.html b/docs/files/addon_models_comment.js.html index d9cb14415..8235edb79 100644 --- a/docs/files/addon_models_comment.js.html +++ b/docs/files/addon_models_comment.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_contributor.js.html b/docs/files/addon_models_contributor.js.html index e330a72a9..83ee5e8a6 100644 --- a/docs/files/addon_models_contributor.js.html +++ b/docs/files/addon_models_contributor.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_draft-registration.js.html b/docs/files/addon_models_draft-registration.js.html index 539a62440..73c4b4d42 100644 --- a/docs/files/addon_models_draft-registration.js.html +++ b/docs/files/addon_models_draft-registration.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_file-provider.js.html b/docs/files/addon_models_file-provider.js.html index 08bc6042b..d063122a5 100644 --- a/docs/files/addon_models_file-provider.js.html +++ b/docs/files/addon_models_file-provider.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_file-version.js.html b/docs/files/addon_models_file-version.js.html index 7110cf1c0..e99f4a931 100644 --- a/docs/files/addon_models_file-version.js.html +++ b/docs/files/addon_models_file-version.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_file.js.html b/docs/files/addon_models_file.js.html index 42abcbe12..c46a18cbe 100644 --- a/docs/files/addon_models_file.js.html +++ b/docs/files/addon_models_file.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_institution.js.html b/docs/files/addon_models_institution.js.html index b83338c9e..bb2717fa8 100644 --- a/docs/files/addon_models_institution.js.html +++ b/docs/files/addon_models_institution.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_log.js.html b/docs/files/addon_models_log.js.html index 7515d73d1..ba3d3f62c 100644 --- a/docs/files/addon_models_log.js.html +++ b/docs/files/addon_models_log.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_metaschema.js.html b/docs/files/addon_models_metaschema.js.html index 6a383f650..5fbd11e7e 100644 --- a/docs/files/addon_models_metaschema.js.html +++ b/docs/files/addon_models_metaschema.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_node-link.js.html b/docs/files/addon_models_node-link.js.html index c45799736..8202e6f39 100644 --- a/docs/files/addon_models_node-link.js.html +++ b/docs/files/addon_models_node-link.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_node.js.html b/docs/files/addon_models_node.js.html index e1e4bf79a..5078e08ea 100644 --- a/docs/files/addon_models_node.js.html +++ b/docs/files/addon_models_node.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -203,7 +200,6 @@

    File: addon/models/node.js

    dateCreated: DS.attr('date'), dateModified: DS.attr('date'), - nodeLicense: DS.attr(), tags: DS.attr(), templateFrom: DS.attr('string'), @@ -226,17 +222,11 @@

    File: addon/models/node.js

    allowBulkRemove: true, inverse: 'node' }), - citation: DS.belongsTo('citation'), - - license: DS.belongsTo('license', { - inverse: null - }), files: DS.hasMany('file-provider'), //forkedFrom: DS.belongsTo('node'), - linkedNodes: DS.hasMany('nodes', { - inverse: null, - serializerType: 'linked-node' + nodeLinks: DS.hasMany('node-links', { + inverse: null }), registrations: DS.hasMany('registrations', { inverse: 'registeredFrom' diff --git a/docs/files/addon_models_osf-model.js.html b/docs/files/addon_models_osf-model.js.html index c7d9b39bb..ecbe7a9fa 100644 --- a/docs/files/addon_models_osf-model.js.html +++ b/docs/files/addon_models_osf-model.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_preprint.js.html b/docs/files/addon_models_preprint.js.html index 3a59e818c..9630028f0 100644 --- a/docs/files/addon_models_preprint.js.html +++ b/docs/files/addon_models_preprint.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -186,15 +183,13 @@

    File: addon/models/preprint.js

    subjects: DS.attr(), dateCreated: DS.attr('date'), datePublished: DS.attr('date'), - dateModified: DS.attr('date'), + dateModifed: DS.attr('date'), doi: DS.attr('string'), isPublished: DS.attr('boolean'), isPreprintOrphan: DS.attr('boolean'), - licenseRecord: DS.attr(), // Relationships node: DS.belongsTo('node', { inverse: null, async: true }), - license: DS.belongsTo('license', { inverse: null }), primaryFile: DS.belongsTo('file', { inverse: null }), provider: DS.belongsTo('preprint-provider', { inverse: 'preprints', async: true }), }); diff --git a/docs/files/addon_models_registration.js.html b/docs/files/addon_models_registration.js.html index 4f0a3eede..bc1b2f88a 100644 --- a/docs/files/addon_models_registration.js.html +++ b/docs/files/addon_models_registration.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_taxonomy.js.html b/docs/files/addon_models_taxonomy.js.html index bb70c3390..8254ddebe 100644 --- a/docs/files/addon_models_taxonomy.js.html +++ b/docs/files/addon_models_taxonomy.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_models_user.js.html b/docs/files/addon_models_user.js.html index 03be95594..0b0e12e4f 100644 --- a/docs/files/addon_models_user.js.html +++ b/docs/files/addon_models_user.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_serializers_osf-serializer.js.html b/docs/files/addon_serializers_osf-serializer.js.html index 370c169e0..82264a662 100644 --- a/docs/files/addon_serializers_osf-serializer.js.html +++ b/docs/files/addon_serializers_osf-serializer.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -205,9 +202,6 @@

    File: addon/serializers/osf-serializer.js

    } //TODO Pagination probably breaks here let data = resourceHash.embeds[embedded].data || resourceHash.embeds[embedded]; - if (!('errors' in data)) { - this.store.pushPayload({ data }); - } if (Array.isArray(data)) { included = included.concat(data); } else { @@ -280,11 +274,11 @@

    File: addon/serializers/osf-serializer.js

    }, normalizeArrayResponse(store, primaryModelClass, payload, id, requestType) { // jshint ignore:line - // Ember data does not yet support pagination. For any request that returns more than one result, add pagination data - // under meta, and then calculate total pages to be loaded. + // Ember data does not yet support pagination. For any request that returns more than one result, extract + // links.meta from the payload links section, and add to the model metadata manually. let documentHash = this._super(...arguments); documentHash.meta = documentHash.meta || {}; - documentHash.meta.pagination = Ember.$.extend(true, {}, Ember.get(payload || {}, 'meta')); + documentHash.meta.pagination = Ember.get(payload || {}, 'links.meta'); documentHash.meta.total = Math.ceil(documentHash.meta.pagination.total / documentHash.meta.pagination.per_page); return documentHash; } diff --git a/docs/files/addon_services_current-user.js.html b/docs/files/addon_services_current-user.js.html index dcc35acb4..0e7a75f59 100644 --- a/docs/files/addon_services_current-user.js.html +++ b/docs/files/addon_services_current-user.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_services_file-manager.js.html b/docs/files/addon_services_file-manager.js.html index 9f13b7dca..03dc38a3c 100644 --- a/docs/files/addon_services_file-manager.js.html +++ b/docs/files/addon_services_file-manager.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_utils_ajax-helpers.js.html b/docs/files/addon_utils_ajax-helpers.js.html index 186fd7ecf..d4e44e329 100644 --- a/docs/files/addon_utils_ajax-helpers.js.html +++ b/docs/files/addon_utils_ajax-helpers.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/files/addon_utils_auth.js.html b/docs/files/addon_utils_auth.js.html index 5f143e4ec..ae81c9cb4 100644 --- a/docs/files/addon_utils_auth.js.html +++ b/docs/files/addon_utils_auth.js.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -205,7 +202,7 @@

    File: addon/utils/auth.js

    */ function getCookieAuthUrl(nextUri) { nextUri = nextUri || config.OSF.redirectUri; - const loginUri = `${config.OSF.url}login/?next=${encodeURIComponent(nextUri)}`; + let loginUri = `${config.OSF.url}login?next=${encodeURIComponent(nextUri)}`; return `${config.OSF.cookieLoginUrl}?service=${encodeURIComponent(loginUri)}`; } diff --git a/docs/index.html b/docs/index.html index 75129de3f..6286c96f4 100644 --- a/docs/index.html +++ b/docs/index.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/adapters.html b/docs/modules/adapters.html index cf276e724..dab4aa866 100644 --- a/docs/modules/adapters.html +++ b/docs/modules/adapters.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/authenticators.html b/docs/modules/authenticators.html index 9a2ba3969..4a34aaf78 100644 --- a/docs/modules/authenticators.html +++ b/docs/modules/authenticators.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/authorizers.html b/docs/modules/authorizers.html index 2c80eed96..2e329cd25 100644 --- a/docs/modules/authorizers.html +++ b/docs/modules/authorizers.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • diff --git a/docs/modules/components.html b/docs/modules/components.html index 9ed98587d..00ffc873e 100644 --- a/docs/modules/components.html +++ b/docs/modules/components.html @@ -41,8 +41,6 @@

    APIs

  • ajax-helpers
  • auth
  • CasAuthenticatedRouteMixin
  • -
  • Citation
  • -
  • citation-widget
  • Collection
  • Comment
  • comment-detail
  • @@ -74,7 +72,6 @@

    APIs

  • Institution
  • Log
  • Metaschema
  • -
  • navbar-auth-dropdown
  • Node
  • NodeActionsMixin
  • NodeLink
  • @@ -171,7 +168,16 @@

    components Module

    -

    Lists citations for node in APA, MLA, and Chicago formats

    +

    Display information about an individual comment, including controls to edit, delete, and report. +This component is typically used as part of the comment-pane component; see that component for further information.

    +

    Sample usage:

    +
    {{comment-detail
    +  comment=comment
    +  editComment=attrs.editComment
    +  deleteComment=attrs.deleteComment
    +  restoreComment=attrs.restoreComment
    +  reportComment=attrs.reportComment}}
    +
    @@ -181,11 +187,6 @@

    components Module

    This module provides the following classes:

      -
    • - - citation-widget - -
    • comment-detail @@ -241,11 +242,6 @@

      components Module

      file-widget
    • -
    • - - navbar-auth-dropdown - -
    • oauth-popup diff --git a/docs/modules/ember-osf.html b/docs/modules/ember-osf.html index 0402dd69c..1ab461ec0 100644 --- a/docs/modules/ember-osf.html +++ b/docs/modules/ember-osf.html @@ -41,8 +41,6 @@

      APIs

    • ajax-helpers
    • auth
    • CasAuthenticatedRouteMixin
    • -
    • Citation
    • -
    • citation-widget
    • Collection
    • Comment
    • comment-detail
    • @@ -74,7 +72,6 @@

      APIs

    • Institution
    • Log
    • Metaschema
    • -
    • navbar-auth-dropdown
    • Node
    • NodeActionsMixin
    • NodeLink
    • @@ -191,16 +188,6 @@

      ember-osf Module

      CasAuthenticatedRouteMixin -
    • - - Citation - -
    • -
    • - - citation-widget - -
    • Collection @@ -356,11 +343,6 @@

      ember-osf Module

      Metaschema
    • -
    • - - navbar-auth-dropdown - -
    • Node @@ -561,7 +543,18 @@

      ember-osf Module

      - Lists citations for node in APA, MLA, and Chicago formats + Display information about an individual comment, including controls to edit, delete, and report. +This component is typically used as part of the comment-pane component; see that component for further information. + +Sample usage: +`handlebars +{{comment-detail + comment=comment + editComment=attrs.editComment + deleteComment=attrs.deleteComment + restoreComment=attrs.restoreComment + reportComment=attrs.reportComment}} +`
    • @@ -593,7 +586,9 @@

      ember-osf Module

      - Model for OSF APIv2 citation styles + Model for OSF APIv2 collections +For field and usage information, see: +* https://api.osf.io/v2/docs/#!/v2/Collection_List_GET
    • diff --git a/docs/modules/ember-preprints.html b/docs/modules/ember-preprints.html index c32b13793..f96d613f7 100644 --- a/docs/modules/ember-preprints.html +++ b/docs/modules/ember-preprints.html @@ -41,8 +41,6 @@

      APIs

    • ajax-helpers
    • auth
    • CasAuthenticatedRouteMixin
    • -
    • Citation
    • -
    • citation-widget
    • Collection
    • Comment
    • comment-detail
    • @@ -74,7 +72,6 @@

      APIs

    • Institution
    • Log
    • Metaschema
    • -
    • navbar-auth-dropdown
    • Node
    • NodeActionsMixin
    • NodeLink
    • diff --git a/docs/modules/ember.html b/docs/modules/ember.html index 729a18028..6ad639901 100644 --- a/docs/modules/ember.html +++ b/docs/modules/ember.html @@ -41,8 +41,6 @@

      APIs

    • ajax-helpers
    • auth
    • CasAuthenticatedRouteMixin
    • -
    • Citation
    • -
    • citation-widget
    • Collection
    • Comment
    • comment-detail
    • @@ -74,7 +72,6 @@

      APIs

    • Institution
    • Log
    • Metaschema
    • -
    • navbar-auth-dropdown
    • Node
    • NodeActionsMixin
    • NodeLink
    • diff --git a/docs/modules/helpers.html b/docs/modules/helpers.html index 8198db428..e52626739 100644 --- a/docs/modules/helpers.html +++ b/docs/modules/helpers.html @@ -41,8 +41,6 @@

      APIs

    • ajax-helpers
    • auth
    • CasAuthenticatedRouteMixin
    • -
    • Citation
    • -
    • citation-widget
    • Collection
    • Comment
    • comment-detail
    • @@ -74,7 +72,6 @@

      APIs

    • Institution
    • Log
    • Metaschema
    • -
    • navbar-auth-dropdown
    • Node
    • NodeActionsMixin
    • NodeLink
    • diff --git a/docs/modules/mixins.html b/docs/modules/mixins.html index 794219f26..383c6ca4c 100644 --- a/docs/modules/mixins.html +++ b/docs/modules/mixins.html @@ -41,8 +41,6 @@

      APIs

    • ajax-helpers
    • auth
    • CasAuthenticatedRouteMixin
    • -
    • Citation
    • -
    • citation-widget
    • Collection
    • Comment
    • comment-detail
    • @@ -74,7 +72,6 @@

      APIs

    • Institution
    • Log
    • Metaschema
    • -
    • navbar-auth-dropdown
    • Node
    • NodeActionsMixin
    • NodeLink
    • diff --git a/docs/modules/models.html b/docs/modules/models.html index 336882e02..84d76a732 100644 --- a/docs/modules/models.html +++ b/docs/modules/models.html @@ -41,8 +41,6 @@

      APIs

    • ajax-helpers
    • auth
    • CasAuthenticatedRouteMixin
    • -
    • Citation
    • -
    • citation-widget
    • Collection
    • Comment
    • comment-detail
    • @@ -74,7 +72,6 @@

      APIs

    • Institution
    • Log
    • Metaschema
    • -
    • navbar-auth-dropdown
    • Node
    • NodeActionsMixin
    • NodeLink
    • @@ -171,7 +168,11 @@

      models Module

      -

      Model for OSF APIv2 citation styles

      +

      Model for OSF APIv2 collections +For field and usage information, see:

      +
      @@ -181,11 +182,6 @@

      models Module

      This module provides the following classes:

        -
      • - - Citation - -
      • Collection diff --git a/docs/modules/serializers.html b/docs/modules/serializers.html index e23867a33..e27712a05 100644 --- a/docs/modules/serializers.html +++ b/docs/modules/serializers.html @@ -41,8 +41,6 @@

        APIs

      • ajax-helpers
      • auth
      • CasAuthenticatedRouteMixin
      • -
      • Citation
      • -
      • citation-widget
      • Collection
      • Comment
      • comment-detail
      • @@ -74,7 +72,6 @@

        APIs

      • Institution
      • Log
      • Metaschema
      • -
      • navbar-auth-dropdown
      • Node
      • NodeActionsMixin
      • NodeLink
      • diff --git a/docs/modules/services.html b/docs/modules/services.html index c15ad1b5d..f1bd58b85 100644 --- a/docs/modules/services.html +++ b/docs/modules/services.html @@ -41,8 +41,6 @@

        APIs

      • ajax-helpers
      • auth
      • CasAuthenticatedRouteMixin
      • -
      • Citation
      • -
      • citation-widget
      • Collection
      • Comment
      • comment-detail
      • @@ -74,7 +72,6 @@

        APIs

      • Institution
      • Log
      • Metaschema
      • -
      • navbar-auth-dropdown
      • Node
      • NodeActionsMixin
      • NodeLink
      • diff --git a/docs/modules/utils.html b/docs/modules/utils.html index d6c34867d..93e47900b 100644 --- a/docs/modules/utils.html +++ b/docs/modules/utils.html @@ -41,8 +41,6 @@

        APIs

      • ajax-helpers
      • auth
      • CasAuthenticatedRouteMixin
      • -
      • Citation
      • -
      • citation-widget
      • Collection
      • Comment
      • comment-detail
      • @@ -74,7 +72,6 @@

        APIs

      • Institution
      • Log
      • Metaschema
      • -
      • navbar-auth-dropdown
      • Node
      • NodeActionsMixin
      • NodeLink
      • diff --git a/package.json b/package.json index d5cc03e0f..b507f5982 100644 --- a/package.json +++ b/package.json @@ -85,8 +85,7 @@ "ember-sinon": "0.5.1", "ember-sinon-qunit": "1.3.3", "ember-truth-helpers": "1.2.0", - "js-yaml": "^3.6.0", - "yuidocjs": "^0.10.2" + "js-yaml": "^3.6.0" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/yarn.lock b/yarn.lock index ecce113e4..81e8dc1de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -174,18 +174,10 @@ asap@^2.0.0, asap@~2.0.4: version "2.0.5" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f" -asn1@0.1.11: - version "0.1.11" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7" - asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" -assert-plus@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160" - assert-plus@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" @@ -234,18 +226,10 @@ async@^2.0.1: dependencies: lodash "^4.14.0" -async@~0.9.0: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" -aws-sign2@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz#c57103f7a17fc037f02d7c2e64b602ea223f7d63" - aws-sign2@~0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" @@ -488,12 +472,6 @@ body@^5.1.0: raw-body "~1.1.0" safe-json-parse "~1.0.1" -boom@0.4.x: - version "0.4.2" - resolved "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz#7a636e9ded4efcefb19cef4947a3c67dfaee911b" - dependencies: - hoek "0.9.x" - boom@2.x.x: version "2.10.1" resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" @@ -1144,12 +1122,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -combined-stream@~0.0.4: - version "0.0.7" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f" - dependencies: - delayed-stream "0.0.5" - commander@2.8.x: version "2.8.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" @@ -1343,12 +1315,6 @@ cross-spawn@^5.0.0: shebang-command "^1.2.0" which "^1.2.9" -cryptiles@0.2.x: - version "0.2.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c" - dependencies: - boom "0.4.x" - cryptiles@2.x.x: version "2.0.5" resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" @@ -1364,10 +1330,6 @@ cst@^0.3.0: babylon "^6.7.0" source-map-support "^0.4.0" -ctype@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f" - currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -1453,10 +1415,6 @@ defs@~1.1.0: tryor "~0.1.2" yargs "~3.27.0" -delayed-stream@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -2418,7 +2376,7 @@ expand-tilde@^1.2.2: dependencies: os-homedir "^1.0.1" -express@^4.10.7, express@^4.12.3, express@^4.13.1: +express@^4.10.7, express@^4.12.3: version "4.14.0" resolved "https://registry.yarnpkg.com/express/-/express-4.14.0.tgz#c1ee3f42cdc891fb3dc650a8922d51ec847d0d66" dependencies: @@ -2604,22 +2562,10 @@ for-own@^0.1.4: dependencies: for-in "^0.1.5" -forever-agent@~0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.5.2.tgz#6d0e09c4921f94a27f63d3b49c5feff1ea4c5130" - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" -form-data@~0.1.0: - version "0.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.1.4.tgz#91abd788aba9702b1aabfa8bc01031a2ac9e3b12" - dependencies: - async "~0.9.0" - combined-stream "~0.0.4" - mime "~1.2.11" - form-data@~1.0.0-rc4: version "1.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c" @@ -2996,15 +2942,6 @@ hasha@~2.2.0: is-stream "^1.0.1" pinkie-promise "^2.0.0" -hawk@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-1.1.1.tgz#87cd491f9b46e4e2aeaca335416766885d2d1ed9" - dependencies: - boom "0.4.x" - cryptiles "0.2.x" - hoek "0.9.x" - sntp "0.2.x" - hawk@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" @@ -3033,10 +2970,6 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3: dependencies: rsvp "~3.2.1" -hoek@0.9.x: - version "0.9.1" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505" - hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" @@ -3087,14 +3020,6 @@ http-proxy@^1.13.1, http-proxy@^1.9.0: eventemitter3 "1.x.x" requires-port "1.x.x" -http-signature@~0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz#4fbdac132559aa8323121e540779c0a012b27e66" - dependencies: - asn1 "0.1.11" - assert-plus "^0.1.5" - ctype "0.5.3" - http-signature@~1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" @@ -3483,7 +3408,7 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" -json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1: +json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -3910,7 +3835,7 @@ markdown-it@8.0.0: mdurl "^1.0.1" uc.micro "^1.0.3" -markdown-it@^4.3.0, markdown-it@^4.4.0: +markdown-it@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414" dependencies: @@ -3950,10 +3875,6 @@ md5-o-matic@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3" -mdn-links@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/mdn-links/-/mdn-links-0.1.0.tgz#e24c83b97cb4c5886cc39f2f780705fbfe273aa5" - mdurl@^1.0.1, mdurl@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -4023,18 +3944,10 @@ mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, dependencies: mime-db "~1.25.0" -mime-types@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce" - mime@1.3.4, mime@^1.2.11: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" -mime@~1.2.11: - version "1.2.11" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" - "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@~3.0.0, minimatch@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" @@ -4234,7 +4147,7 @@ node-sass@^3.8.0: request "^2.61.0" sass-graph "^2.1.1" -node-uuid@^1.4.3, node-uuid@~1.4.0, node-uuid@~1.4.7: +node-uuid@^1.4.3, node-uuid@~1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.7.tgz#6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f" @@ -4407,10 +4320,6 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" -oauth-sign@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz#cb540f93bb2b22a7d5941691a288d60e8ea9386e" - oauth-sign@~0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" @@ -4719,10 +4628,6 @@ qs@6.2.0, qs@^6.2.0, qs@~6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" -qs@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768" - qs@~6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" @@ -5020,25 +4925,6 @@ request@2, request@^2.61.0, request@^2.74.0, request@~2.79.0: tunnel-agent "~0.4.1" uuid "^3.0.0" -request@~2.40.0: - version "2.40.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.40.0.tgz#4dd670f696f1e6e842e66b4b5e839301ab9beb67" - dependencies: - forever-agent "~0.5.0" - json-stringify-safe "~5.0.0" - mime-types "~1.0.1" - node-uuid "~1.4.0" - qs "~1.0.0" - optionalDependencies: - aws-sign2 "~0.5.0" - form-data "~0.1.0" - hawk "1.1.1" - http-signature "~0.10.0" - oauth-sign "~0.3.0" - stringstream "~0.0.4" - tough-cookie ">=0.12.0" - tunnel-agent "~0.4.0" - request@~2.74.0: version "2.74.0" resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab" @@ -5113,7 +4999,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@~2.5.4: +rimraf@2, rimraf@2.x.x, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@~2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" dependencies: @@ -5276,12 +5162,6 @@ slide@^1.1.3, slide@^1.1.5, slide@~1.1.3, slide@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" -sntp@0.2.x: - version "0.2.4" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz#fb885f18b0f3aad189f824862536bceeec750900" - dependencies: - hoek "0.9.x" - sntp@1.x.x: version "1.0.9" resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" @@ -5645,7 +5525,7 @@ to-single-quotes@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/to-single-quotes/-/to-single-quotes-2.0.1.tgz#7cc29151f0f5f2c41946f119f5932fe554170125" -tough-cookie@>=0.12.0, tough-cookie@~2.3.0: +tough-cookie@~2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" dependencies: @@ -5677,7 +5557,7 @@ tryor@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b" -tunnel-agent@~0.4.0, tunnel-agent@~0.4.1: +tunnel-agent@~0.4.1: version "0.4.3" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" @@ -6066,21 +5946,3 @@ yauzl@2.4.1: yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - -yui@^3.18.1: - version "3.18.1" - resolved "https://registry.yarnpkg.com/yui/-/yui-3.18.1.tgz#e000269ec0a7b6fbc741cbb8fcbd0e65117b014c" - dependencies: - request "~2.40.0" - -yuidocjs@^0.10.2: - version "0.10.2" - resolved "https://registry.yarnpkg.com/yuidocjs/-/yuidocjs-0.10.2.tgz#33924967ce619024cd70ef694e267d2f988f73f6" - dependencies: - express "^4.13.1" - graceful-fs "^4.1.2" - markdown-it "^4.3.0" - mdn-links "^0.1.0" - minimatch "^3.0.2" - rimraf "^2.4.1" - yui "^3.18.1" From eb7a1ae1e899b08561ad70f2733428f3f383c17a Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Fri, 3 Feb 2017 16:36:38 -0500 Subject: [PATCH 28/58] Pass in url instead of node. --- addon/mixins/keen-tracker.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index ed220b526..ca5de11fd 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -18,8 +18,8 @@ export default Ember.Mixin.create({ }, actions: { //keenClick action can be used in template - keenClick(category, label, node) { - return this.keenTrackFrontEndEvent({ category: category, action: 'click', label: label }, node); + keenClick(category, label, url) { + return this.keenTrackFrontEndEvent({ category: category, action: 'click', label: label, url: url }); }, //keenTrack action can be used in template @@ -291,7 +291,8 @@ export default Ember.Mixin.create({ interaction: { category: event.category || null, action: event.action || null, - label: event.label || null + label: event.label || null, + url: event.url || null } }, model); } From 3e424e5515c000d94a50e1659f7aeca292564784 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 6 Feb 2017 11:24:51 -0500 Subject: [PATCH 29/58] Check if node id. --- addon/mixins/keen-tracker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index ca5de11fd..fe979c3ac 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -260,7 +260,7 @@ export default Ember.Mixin.create({ nodeContextVars(node) { // Extract node variables, if passed in. let nodeVars = {}; - if (node) { + if (node && node.id) { nodeVars = { id: node.get('id'), title: node.get('title'), From a43b17837eb500c45753148471bb7f3aa2924b21 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 6 Feb 2017 12:11:17 -0500 Subject: [PATCH 30/58] Pass transition data when tracking page view. --- addon/mixins/keen-tracker.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index fe979c3ac..78413d22d 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -10,11 +10,15 @@ export default Ember.Mixin.create({ session: Ember.inject.service(), // Add this mixin to your route, and the afterModel hook will send pageviews to keen - afterModel(model) { // Using afterModel hook so node info can be sent to keen + afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted - return this.KeenTracker().getInstance().trackPageView(); + let transitionData = { + page: transition.targetName, + queryParams: transition.queryParams + }; + return this.KeenTracker().getInstance().trackPageView(transitionData); }, actions: { //keenClick action can be used in template From a8a56d7f4094ff66a2cda576abfb5df310e8435f Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 6 Feb 2017 12:20:16 -0500 Subject: [PATCH 31/58] Nest transition data under transition. --- addon/mixins/keen-tracker.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 78413d22d..dcf77f4b4 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -15,8 +15,10 @@ export default Ember.Mixin.create({ window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted let transitionData = { - page: transition.targetName, - queryParams: transition.queryParams + transition: { + page: transition.targetName, + queryParams: transition.queryParams + } }; return this.KeenTracker().getInstance().trackPageView(transitionData); }, From 239d980d55606d226e5702044e37e4066bae0a8b Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Tue, 7 Feb 2017 16:41:26 -0500 Subject: [PATCH 32/58] Expand comment. --- addon/mixins/keen-tracker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index dcf77f4b4..798d3aac0 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -9,7 +9,7 @@ import keenTracking from 'npm:keen-tracking'; export default Ember.Mixin.create({ session: Ember.inject.service(), - // Add this mixin to your route, and the afterModel hook will send pageviews to keen + // Add this mixin to your route, and the afterModel hook will send pageviews to keen. Be sure to call super if using afterModel hook in route! afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); From a9011808be0283e5d00fa2b542f8b0d4a1763a17 Mon Sep 17 00:00:00 2001 From: Sherif Abdelhamid Date: Tue, 7 Feb 2017 20:24:52 -0500 Subject: [PATCH 33/58] Add new field for about link --- addon/models/preprint-provider.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addon/models/preprint-provider.js b/addon/models/preprint-provider.js index ed722d45d..bf4d11ae3 100644 --- a/addon/models/preprint-provider.js +++ b/addon/models/preprint-provider.js @@ -13,6 +13,7 @@ export default OsfModel.extend({ socialTwitter: DS.attr('fixstring'), socialFacebook: DS.attr('fixstring'), socialInstagram: DS.attr('fixstring'), + aboutLink: DS.attr('fixstring'), headerText: DS.attr('fixstring'), subjectsAcceptable: DS.attr(), // Relationships From ade00d06077c725c9513ce448adbbf03ad10b5d8 Mon Sep 17 00:00:00 2001 From: Baylee Swenson Date: Thu, 9 Feb 2017 09:32:22 -0500 Subject: [PATCH 34/58] Added inline styling to prevent lines breaking mid-word --- addon/components/license-picker/template.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/components/license-picker/template.hbs b/addon/components/license-picker/template.hbs index 4e9e6dffc..ab8ae6dfc 100644 --- a/addon/components/license-picker/template.hbs +++ b/addon/components/license-picker/template.hbs @@ -40,7 +40,7 @@ {{/if}} {{#if (or showText (not toggleText))}} -
        {{nodeLicenseText}}
        +
        {{nodeLicenseText}}
        {{/if}} {{#unless autosave}} From c25e57f43ebc8d19b0eb0574ce31fbe253c749de Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 15 Feb 2017 09:56:35 -0500 Subject: [PATCH 35/58] Pass in extra field instead of url to keenClick. --- addon/mixins/keen-tracker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 798d3aac0..abfb564f5 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -24,8 +24,8 @@ export default Ember.Mixin.create({ }, actions: { //keenClick action can be used in template - keenClick(category, label, url) { - return this.keenTrackFrontEndEvent({ category: category, action: 'click', label: label, url: url }); + keenClick(category, label, extra) { + return this.keenTrackFrontEndEvent({ category: category, action: 'click', label: label, extra: extra }); }, //keenTrack action can be used in template @@ -298,7 +298,7 @@ export default Ember.Mixin.create({ category: event.category || null, action: event.action || null, label: event.label || null, - url: event.url || null + extra: event.extra || null } }, model); } From 9c32f3ddbecd5bb592f241115083b6b43c0af473 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 15 Feb 2017 11:38:45 -0500 Subject: [PATCH 36/58] Modify keenTrack and add keenTrackNode. --- addon/mixins/keen-tracker.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index abfb564f5..f465c214b 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -29,9 +29,14 @@ export default Ember.Mixin.create({ }, //keenTrack action can be used in template - keenTrack(category, action, label, node) { + keenTrack(category, action, label, extra) { + return this.keenTrackFrontEndEvent({ category: category, action: action, label: label, extra: extra }); + }, + + //keenTrackNode action can pass in node model + keenTrackNode(category, action, label, node) { return this.keenTrackFrontEndEvent({ category: category, action: action, label: label }, node); - } + }, }, KeenTracker() { function _nowUTC() { From c3317afbbc7ecf43f8df50654fad5237e4c1a520 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 15 Feb 2017 14:31:15 -0500 Subject: [PATCH 37/58] Use pageViewed instead of transition as key. Add model id and model type if model is a single record. --- addon/mixins/keen-tracker.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index f465c214b..2844cec17 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -15,11 +15,15 @@ export default Ember.Mixin.create({ window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted let transitionData = { - transition: { + pageViewed: { page: transition.targetName, - queryParams: transition.queryParams + queryParams: transition.queryParams, } }; + if (model.id) { + transitionData.relatedModel = model.id; + transitionData.modelType = model.constructor.modelName; + } return this.KeenTracker().getInstance().trackPageView(transitionData); }, actions: { From c5e102cf8a8bc7a45f3a6c540f416e542cbfac3d Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Wed, 15 Feb 2017 14:40:01 -0500 Subject: [PATCH 38/58] Put model and type under pageViewed [skip ci] --- addon/mixins/keen-tracker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js index 2844cec17..a7fdc869d 100644 --- a/addon/mixins/keen-tracker.js +++ b/addon/mixins/keen-tracker.js @@ -21,8 +21,8 @@ export default Ember.Mixin.create({ } }; if (model.id) { - transitionData.relatedModel = model.id; - transitionData.modelType = model.constructor.modelName; + transitionData.pageViewed.relatedModel = model.id; + transitionData.pageViewed.modelType = model.constructor.modelName; } return this.KeenTracker().getInstance().trackPageView(transitionData); }, From b41f7ff8c5a6e4d42856c98cd0a139ed088fa45f Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 13:54:58 -0500 Subject: [PATCH 39/58] Install ember-metrics. --- package.json | 1 + yarn.lock | 263 +++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 222 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 56e1dc3ee..ee58c57ad 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "ember-infinity": "0.2.3", "ember-load-initializers": "0.5.1", "ember-lodash": "4.17.0", + "ember-metrics": "^0.8.1", "ember-page-title": "3.0.3", "ember-power-select": "1.0.0-alpha.5", "ember-resolver": "2.0.3", diff --git a/yarn.lock b/yarn.lock index 1f974ff29..90a04521d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13,7 +13,7 @@ JSONStream@^1.0.3: version "4.0.2" resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57" -abbrev@1, abbrev@~1.0.9: +abbrev@1, abbrev@1.0.x, abbrev@~1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" @@ -267,7 +267,7 @@ async@0.2.x, async@~0.2.6, async@~0.2.9: version "0.2.10" resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" -async@^1.4.0, async@^1.5.2: +async@1.x, async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" @@ -289,7 +289,7 @@ aws4@^1.2.1: version "1.5.0" resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.5.0.tgz#0a29ffb79c31c9e712eeb087e8e7a64b4a56d755" -babel-core@^5.0.0: +babel-core@^5.0.0, babel-core@^5.8.38: version "5.8.38" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-5.8.38.tgz#1fcaee79d7e61b750b00b8e54f6dfc9d0af86558" dependencies: @@ -522,6 +522,21 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.6" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" +body-parser@^1.15.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.16.1.tgz#51540d045adfa7a0c6995a014bb6b1ed9b802329" + dependencies: + bytes "2.4.0" + content-type "~1.0.2" + debug "2.6.1" + depd "~1.1.0" + http-errors "~1.5.1" + iconv-lite "0.4.15" + on-finished "~2.3.0" + qs "6.2.1" + raw-body "~2.2.0" + type-is "~1.6.14" + body@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069" @@ -1103,6 +1118,10 @@ bytes@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070" +bytes@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339" + cached-path-relative@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.0.tgz#d1094c577fbd9a8b8bd43c96af6188aa205d05f4" @@ -1423,15 +1442,7 @@ concat-stream@1.5.0: readable-stream "~2.0.0" typedarray "~0.0.5" -concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" - dependencies: - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -concat-stream@~1.5.0, concat-stream@~1.5.1: +concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1: version "1.5.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" dependencies: @@ -1540,6 +1551,16 @@ core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" +coveralls@^2.11.15: + version "2.11.16" + resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.11.16.tgz#da9061265142ddee954f68379122be97be8ab4b1" + dependencies: + js-yaml "3.6.1" + lcov-parse "0.0.10" + log-driver "1.2.5" + minimist "1.2.0" + request "2.79.0" + create-ecdh@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" @@ -1650,6 +1671,12 @@ debug@2.3.3: dependencies: ms "0.7.2" +debug@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351" + dependencies: + ms "0.7.2" + debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0: version "2.6.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b" @@ -1668,6 +1695,10 @@ deep-equal@*: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" +deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -1944,6 +1975,27 @@ ember-cli-broccoli-sane-watcher@^2.0.3: rsvp "^3.0.18" sane "^1.1.1" +ember-cli-code-coverage@0.3.11: + version "0.3.11" + resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-0.3.11.tgz#9012e14ec5d6ef27d7c6b89d4c8c22b5a49709be" + dependencies: + babel-core "^5.8.38" + body-parser "^1.15.0" + broccoli-filter "^1.2.3" + broccoli-funnel "^1.0.1" + broccoli-merge-trees "^1.1.1" + ember-cli-babel "^5.1.6" + escodegen "^1.8.0" + esprima "^2.7.2" + exists-sync "0.0.3" + extend "^3.0.0" + fs-extra "^0.26.7" + istanbul "^0.4.3" + node-dir "^0.1.16" + rsvp "^3.2.1" + source-map "0.5.6" + string.prototype.startswith "^0.2.0" + ember-cli-dependency-checker@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-1.3.0.tgz#f0e8cb7f0f43c1e560494eaa9372804e7a088a2a" @@ -2402,6 +2454,15 @@ ember-lodash@4.17.0: ember-cli-babel "^5.1.6" lodash-es "^4.17.2" +ember-metrics@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/ember-metrics/-/ember-metrics-0.8.1.tgz#f571bc884c101880cf5ab857ef11048fcb284e35" + dependencies: + broccoli-funnel "^1.0.1" + ember-cli-babel "^5.1.6" + ember-getowner-polyfill "^1.0.0" + ember-runtime-enumerable-includes-polyfill "^1.0.1" + ember-moment@6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-6.1.0.tgz#5c2e7448e22007f9839c41e05bd3013a9eba2a82" @@ -2451,6 +2512,13 @@ ember-router-generator@^1.0.0: dependencies: recast "^0.11.3" +ember-runtime-enumerable-includes-polyfill@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-1.0.4.tgz#16a7612e347a2edf07da8b2f2f09dbfee70deba0" + dependencies: + ember-cli-babel "^5.1.6" + ember-cli-version-checker "^1.1.6" + ember-simple-auth@1.1.0-beta.5: version "1.1.0-beta.5" resolved "https://registry.yarnpkg.com/ember-simple-auth/-/ember-simple-auth-1.1.0-beta.5.tgz#f34ac0c9e3887c6a1e5bb121314c736c1126664b" @@ -2694,6 +2762,17 @@ escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^ version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" +escodegen@1.8.x, escodegen@^1.8.0: + version "1.8.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" + dependencies: + esprima "^2.7.1" + estraverse "^1.9.1" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.2.0" + escope@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" @@ -2711,7 +2790,7 @@ esprima-fb@~15001.1001.0-dev-harmony-fb: version "15001.1001.0-dev-harmony-fb" resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659" -esprima@^2.6.0: +esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1, esprima@^2.7.2: version "2.7.3" resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" @@ -2730,6 +2809,10 @@ esrecurse@^4.1.0: estraverse "~4.1.0" object-assign "^4.0.1" +estraverse@^1.9.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44" + estraverse@^4.1.0, estraverse@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -2877,6 +2960,10 @@ eyes@0.1.x: version "0.1.8" resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" +fast-levenshtein@~2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/fast-ordered-set/-/fast-ordered-set-1.0.3.tgz#3fbb36634f7be79e4f7edbdb4a357dee25d184eb" @@ -3054,7 +3141,7 @@ fs-extra@^0.24.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" -fs-extra@^0.26.0: +fs-extra@^0.26.0, fs-extra@^0.26.7: version "0.26.7" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9" dependencies: @@ -3323,7 +3410,7 @@ growly@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -handlebars@^4.0.4: +handlebars@^4.0.1, handlebars@^4.0.4: version "4.0.6" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7" dependencies: @@ -3374,6 +3461,10 @@ has-cors@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" +has-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" + has-unicode@^2.0.0, has-unicode@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -3473,7 +3564,7 @@ htmlparser2@3.8.3, htmlparser2@3.8.x: entities "1.0" readable-stream "1.1" -http-errors@~1.5.0: +http-errors@~1.5.0, http-errors@~1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750" dependencies: @@ -3504,7 +3595,7 @@ i@0.3.x: version "0.3.5" resolved "https://registry.yarnpkg.com/i/-/i-0.3.5.tgz#1d2b854158ec8169113c6cb7f6b6801e99e211d5" -iconv-lite@^0.4.5, iconv-lite@~0.4.13: +iconv-lite@0.4.15, iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.15" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb" @@ -3553,7 +3644,7 @@ inherit@^2.2.2: version "2.2.6" resolved "https://registry.yarnpkg.com/inherit/-/inherit-2.2.6.tgz#f1614b06c8544e8128e4229c86347db73ad9788d" -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" @@ -3777,6 +3868,25 @@ isstream@0.1.x, isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" +istanbul@^0.4.3: + version "0.4.5" + resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b" + dependencies: + abbrev "1.0.x" + async "1.x" + escodegen "1.8.x" + esprima "2.7.x" + glob "^5.0.15" + handlebars "^4.0.1" + js-yaml "3.x" + mkdirp "0.5.x" + nopt "3.x" + once "1.x" + resolve "1.1.x" + supports-color "^3.1.0" + which "^1.1.1" + wordwrap "^1.0.0" + istextorbinary@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.1.0.tgz#dbed2a6f51be2f7475b68f89465811141b758874" @@ -3815,7 +3925,14 @@ js-tokens@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-1.0.1.tgz#cc435a5c8b94ad15acb7983140fc80182c89aeae" -js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.0, js-yaml@^3.6.1: +js-yaml@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" + dependencies: + argparse "^1.0.7" + esprima "^2.6.0" + +js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.0, js-yaml@^3.6.1: version "3.7.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" dependencies: @@ -4022,6 +4139,10 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +lcov-parse@0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3" + leek@0.0.23: version "0.0.23" resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.23.tgz#d44b9f55b27e22902a6603eaeec193f0c301d25f" @@ -4034,6 +4155,13 @@ leven@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3" +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + lexical-scope@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4" @@ -4332,6 +4460,10 @@ lodash@~4.16.4: version "4.16.6" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777" +log-driver@1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056" + lolex@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31" @@ -4528,7 +4660,7 @@ minimist@0.0.8, minimist@~0.0.1: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3: +minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -4640,6 +4772,12 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" +node-dir@^0.1.16: + version "0.1.16" + resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.16.tgz#d2ef583aa50b90d93db8cdd26fcea58353957fe4" + dependencies: + minimatch "^3.0.2" + node-emoji@^1.4.1: version "1.5.0" resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.0.tgz#9a0d9fe03fd43afa357d6d8e439aa31e599959b7" @@ -4742,7 +4880,7 @@ node-uuid@^1.4.3, node-uuid@~1.4.7: chalk "~0.4.0" underscore "~1.6.0" -"nopt@2 || 3", nopt@^3.0.1, nopt@^3.0.3, nopt@~3.0.6: +"nopt@2 || 3", nopt@3.x, nopt@^3.0.1, nopt@^3.0.3, nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: @@ -4937,7 +5075,7 @@ on-headers@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" -once@^1.3.0, once@^1.3.3, once@~1.4.0: +once@1.x, once@^1.3.0, once@^1.3.3, once@~1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: @@ -4958,6 +5096,17 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" +optionator@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.4" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + wordwrap "~1.0.0" + options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" @@ -5175,6 +5324,10 @@ portfinder@^1.0.7: debug "^2.2.0" mkdirp "0.5.x" +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" @@ -5268,6 +5421,10 @@ qs@6.2.0, qs@^6.2.0, qs@~6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b" +qs@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625" + qs@~6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442" @@ -5314,6 +5471,14 @@ raw-body@~1.1.0: bytes "1" string_decoder "0.10" +raw-body@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.2.0.tgz#994976cf6a5096a41162840492f0bdc5d6e7fb96" + dependencies: + bytes "2.4.0" + iconv-lite "0.4.15" + unpipe "1.0.0" + read-cmd-shim@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b" @@ -5380,7 +5545,7 @@ read@1, read@1.0.x, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@~2.1.5: +"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@~2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" dependencies: @@ -5401,18 +5566,6 @@ readable-stream@1.1: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - readable-stream@~1.0.2: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -5558,7 +5711,7 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@2, request@^2.61.0, request@^2.74.0, request@~2.79.0: +request@2, request@2.79.0, request@^2.61.0, request@^2.74.0, request@~2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -5632,7 +5785,7 @@ resolve-dir@^0.1.0: expand-tilde "^1.2.2" global-modules "^0.2.3" -resolve@1.1.7: +resolve@1.1.7, resolve@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" @@ -5942,10 +6095,16 @@ source-map@0.4.x, source-map@^0.4.2, source-map@^0.4.4: dependencies: amdefine ">=0.0.4" -source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: +source-map@0.5.6, source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" +source-map@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d" + dependencies: + amdefine ">=0.0.4" + spawn-args@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb" @@ -6057,6 +6216,10 @@ string.prototype.codepointat@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz#6b26e9bd3afcaa7be3b4269b526de1b82000ac78" +string.prototype.startswith@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz#da68982e353a4e9ac4a43b450a2045d1c445ae7b" + string_decoder@0.10, string_decoder@~0.10.0, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" @@ -6129,6 +6292,12 @@ supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" +supports-color@^3.1.0: + version "3.2.3" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + dependencies: + has-flag "^1.0.0" + symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3" @@ -6317,14 +6486,20 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" -type-is@~1.6.13: +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + dependencies: + prelude-ls "~1.1.2" + +type-is@~1.6.13, type-is@~1.6.14: version "1.6.14" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2" dependencies: media-typer "0.3.0" mime-types "~2.1.13" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -6385,7 +6560,7 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unpipe@~1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -6539,7 +6714,7 @@ which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" -which@1, which@^1.0.5, which@^1.2.12, which@^1.2.9, which@~1.2.10, which@~1.2.11: +which@1, which@^1.0.5, which@^1.1.1, which@^1.2.12, which@^1.2.9, which@~1.2.10, which@~1.2.11: version "1.2.12" resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192" dependencies: @@ -6579,6 +6754,10 @@ wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" +wordwrap@^1.0.0, wordwrap@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" From 3989b0049fd3b89a96268f85f4248425b334a8cc Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 13:56:35 -0500 Subject: [PATCH 40/58] Start custom Metrics adapter for keen to be used with ember-metrics (WIP) [skip-ci] --- addon/metrics-adapters/keen.js | 289 +++++++++++++++++++++++ app/metrics-adapters/keen.js | 1 + tests/unit/metrics-adapters/keen-test.js | 12 + 3 files changed, 302 insertions(+) create mode 100644 addon/metrics-adapters/keen.js create mode 100644 app/metrics-adapters/keen.js create mode 100644 tests/unit/metrics-adapters/keen-test.js diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js new file mode 100644 index 000000000..65f5b188b --- /dev/null +++ b/addon/metrics-adapters/keen.js @@ -0,0 +1,289 @@ +import BaseAdapter from 'ember-metrics/metrics-adapters/base'; +import Ember from 'ember'; +import md5 from 'npm:js-md5'; +import _get from 'npm:lodash/get'; +import Cookie from 'npm:js-cookie'; +import config from 'ember-get-config'; +import keenTracking from 'npm:keen-tracking'; + +export default BaseAdapter.extend({ + toStringExtension() { + return 'Keen'; + }, + + init() { + // TODO + console.log('start'); + }, + + identify() { + + }, + + trackEvent(properties, collection, node) { + window.contextVars = {}; + window.contextVars.currentUser = this.userContextVars(); + window.contextVars.node = this.nodeContextVars(node); + return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties); + }, + + + trackPage() { + + }, + + alias() { + + }, + + willDestroy() { + // TODO + console.log('done'); + + }, + + KeenTracker() { + function _nowUTC() { + var now = new Date(); + return new Date( + now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), + now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds() + ); + } + + function _createOrUpdateKeenSession() { + var expDate = new Date(); + var expiresInMinutes = 25; + expDate.setTime(expDate.getTime() + (expiresInMinutes * 60 * 1000)); + var currentSessionId = Cookie.get('keenSessionId') || keenTracking.helpers.getUniqueId(); + Cookie.set('keenSessionId', currentSessionId, { + expires: expDate, path: '/' + }); + } + + function _getOrCreateKeenId() { + if (!Cookie.get('keenUserId')) { + Cookie.set('keenUserId', keenTracking.helpers.getUniqueId(), { + expires: 365, path: '/' + }); + } + return Cookie.get('keenUserId'); + } + + function _defaultKeenPayload() { + _createOrUpdateKeenSession(); + + var user = window.contextVars.currentUser; + var node = window.contextVars.node; + var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); // Do not have this information. + return { + page: { + title: document.title, + url: document.URL, + meta: pageMeta, + info: {}, + }, + referrer: { + url: document.referrer, + info: {}, + }, + time: { + local: keenTracking.helpers.getDatetimeIndex(), + utc: keenTracking.helpers.getDatetimeIndex(_nowUTC()), + }, + node: { + id: _get(node, 'id'), + title: _get(node, 'title'), + type: _get(node, 'category'), + tags: _get(node, 'tags'), + }, + anon: { + id: md5(Cookie.get('keenSessionId')), + continent: user.anon.continent, + country: user.anon.country, + }, + meta: { + epoch: 1, // version of pageview event schema + }, + keen: { + addons: [ + { + name: 'keen:url_parser', + input: { + url: 'page.url', + }, + output: 'page.info', + }, + { + name: 'keen:url_parser', + input: { + url: 'referrer.url', + }, + output: 'referrer.info', + }, + { + name: 'keen:referrer_parser', + input: { + referrer_url: 'referrer.url', + page_url: 'page.url', + }, + output: 'referrer.info', + }, + ] + }, + }; + } // end _defaultKeenPayload + + function _trackCustomEvent(client, collection, eventData) { + if (client === null) { + return; + } + client.recordEvent(collection, eventData); + } + + function _trackCustomEvents(client, events) { + if (client === null) { + return; + } + client.recordEvents(events); + } + + function KeenTracker() { + if (instance) { + throw new Error('Cannot instantiate another KeenTracker instance.'); + } else { + var _this = this; + + _this._publicClient = null; + _this._privateClient = null; + + _this.init = function _initKeentracker(params) { + var _this = this; + + if (params === undefined) { + return _this; + } + + _this._publicClient = keenTracking({ + projectId: params.public.projectId, + writeKey: params.public.writeKey, + }); + _this._publicClient.extendEvents(_defaultPublicKeenPayload); + + _this._privateClient = keenTracking({ + projectId: params.private.projectId, + writeKey: params.private.writeKey, + }); + _this._privateClient.extendEvents(_defaultPrivateKeenPayload); + + return _this; + }; + + var _defaultPublicKeenPayload = function() { return _defaultKeenPayload(); }; + var _defaultPrivateKeenPayload = function() { + var payload = _defaultKeenPayload(); + var user = window.contextVars.currentUser; + payload.visitor = { + id: _getOrCreateKeenId(), + session: Cookie.get('keenSessionId'), + returning: Boolean(Cookie.get('keenUserId')), + }; + payload.tech = { + browser: keenTracking.helpers.getBrowserProfile(), + ua: '${keen.user_agent}', + ip: '${keen.ip}', + info: {}, + }; + payload.user = { + id: user.id, + entry_point: user.entryPoint, + institutions: user.institutions, + locale: user.locale, + timezone: user.timezone, + }; + payload.keen.addons.push({ + name: 'keen:ip_to_geo', + input: { + ip: 'tech.ip', + }, + output: 'geo', + }); + payload.keen.addons.push({ + name: 'keen:ua_parser', + input: { + ua_string: 'tech.ua' + }, + output: 'tech.info', + }); + + return payload; + }; + + _this.trackPageView = function (data) { + var _this = this; + if (_get(window, 'contextVars.node.isPublic', false) && + _get(window, 'contextVars.analyticsMeta.pageMeta.public', false)) { + _this.trackPublicEvent('pageviews', data); + } + _this.trackPrivateEvent('pageviews', data); + }; + + _this.trackPrivateEvent = function(collection, event) { + return _trackCustomEvent(_this._privateClient, collection, event); + }; + _this.trackPrivateEvents = function(events) { + return _trackCustomEvents(_this._privateClient, events); + }; + + _this.trackPublicEvent = function(collection, event) { + return _trackCustomEvent(_this._publicClient, collection, event); + }; + _this.trackPublicEvents = function(events) { + return _trackCustomEvents(_this._publicClient, events); + }; + } + } + + var instance = null; + return { + getInstance() { + if (!instance) { + instance = new KeenTracker(); + instance.init(config.KEEN); + } + return instance; + } + }; + }, + userContextVars() { + // Extract user variables from session. + const session = this.get('session'); + let user = {}; + if (session.get('isAuthenticated')) { + let userInfo = session.get('session.authenticated'); + user = { + id: userInfo.id, + entry_point: userInfo.attributes.entry_point, // Don't have the entry point. + institutions: null, // Don't really want to make an API request to fetch user institutions. + locale: userInfo.attributes.locale, + timezone: userInfo.attributes.timezone + }; + } + user.anon = {}; // Do not have this info, but most duplicated in geo. + return user; + }, + nodeContextVars(node) { + // Extract node variables, if passed in. + let nodeVars = {}; + if (node && node.id) { + nodeVars = { + id: node.get('id'), + title: node.get('title'), + type: node.get('category'), + tags: node.get('tags'), + isPublic: node.get('public') + }; + } + return nodeVars; + }, +}); diff --git a/app/metrics-adapters/keen.js b/app/metrics-adapters/keen.js new file mode 100644 index 000000000..998453fe3 --- /dev/null +++ b/app/metrics-adapters/keen.js @@ -0,0 +1 @@ +export { default } from 'ember-osf/metrics-adapters/keen'; diff --git a/tests/unit/metrics-adapters/keen-test.js b/tests/unit/metrics-adapters/keen-test.js new file mode 100644 index 000000000..7da3eadd3 --- /dev/null +++ b/tests/unit/metrics-adapters/keen-test.js @@ -0,0 +1,12 @@ +import { moduleFor, test } from 'ember-qunit'; + +moduleFor('metrics-adapter:keen', 'Keen adapter', { + // Specify the other units that are required for this test. + // needs: ['serializer:foo'] +}); + +// Replace this with your real tests. +test('it exists', function(assert) { + var adapter = this.subject(); + assert.ok(adapter); +}); From 28e1ab0cc17623f525791c44d6847c325e252f74 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 13:56:59 -0500 Subject: [PATCH 41/58] Start Analytics mixin (pulling in code from Ember-Preprints) [skip-ci] --- addon/mixins/analytics-mixin.js | 41 +++++++++++++++++++++++ tests/unit/mixins/analytics-mixin-test.js | 12 +++++++ 2 files changed, 53 insertions(+) create mode 100644 addon/mixins/analytics-mixin.js create mode 100644 tests/unit/mixins/analytics-mixin-test.js diff --git a/addon/mixins/analytics-mixin.js b/addon/mixins/analytics-mixin.js new file mode 100644 index 000000000..6242b9f47 --- /dev/null +++ b/addon/mixins/analytics-mixin.js @@ -0,0 +1,41 @@ +import Ember from 'ember'; + +/** + * @module ember-preprints + * @submodule mixins + */ + +/** + * Google Analytics mixin. Provides actions that can be used in templates to track events. + * + * @class AnalyticsMixin + */ +export default Ember.Mixin.create({ + metrics: Ember.inject.service(), + actions: { + click(category, label, url) { + Ember.get(this, 'metrics') + .trackEvent({ + category, + action: 'click', + label + }); + + // Needed for outbound links, see https://support.google.com/analytics/answer/1136920?hl=en + if (url) + window.location.href = url; + + return true; + }, + track(category, action, label) { + Ember.get(this, 'metrics') + .trackEvent({ + category, + action, + label + }); + return true; + + } + } +}); diff --git a/tests/unit/mixins/analytics-mixin-test.js b/tests/unit/mixins/analytics-mixin-test.js new file mode 100644 index 000000000..03598ceed --- /dev/null +++ b/tests/unit/mixins/analytics-mixin-test.js @@ -0,0 +1,12 @@ +import Ember from 'ember'; +import AnalyticsMixinMixin from 'ember-osf/mixins/analytics-mixin'; +import { module, test } from 'qunit'; + +module('Unit | Mixin | analytics mixin'); + +// Replace this with your real tests. +test('it works', function(assert) { + let AnalyticsMixinObject = Ember.Object.extend(AnalyticsMixinMixin); + let subject = AnalyticsMixinObject.create(); + assert.ok(subject); +}); From 453e50bcb2ced4019e5d5f07491aea40931ecae6 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 14:56:27 -0500 Subject: [PATCH 42/58] Combine all front-end-events into front-end-events collection. [skip-ci] --- addon/metrics-adapters/keen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index 65f5b188b..dd4b9a644 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -20,11 +20,11 @@ export default BaseAdapter.extend({ }, - trackEvent(properties, collection, node) { + trackEvent(properties, node) { window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); - return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties); + return this.KeenTracker().getInstance().trackPrivateEvent('front-end-events', properties, node); }, From bfb93486a8257ce8f7ce2f870938d4cd9547f56b Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 14:57:40 -0500 Subject: [PATCH 43/58] Inject session service. [skip-ci] --- addon/metrics-adapters/keen.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index dd4b9a644..e1dff2cea 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -7,8 +7,10 @@ import config from 'ember-get-config'; import keenTracking from 'npm:keen-tracking'; export default BaseAdapter.extend({ + session: Ember.inject.service(), + toStringExtension() { - return 'Keen'; + return 'Keen'; }, init() { From 5969bc31fba328715e03b8ecab301e2b7ccb7b87 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 15:05:30 -0500 Subject: [PATCH 44/58] Nest properties under interaction key. [skip-ci] --- addon/metrics-adapters/keen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index e1dff2cea..8ca8f4d55 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -26,7 +26,7 @@ export default BaseAdapter.extend({ window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); - return this.KeenTracker().getInstance().trackPrivateEvent('front-end-events', properties, node); + return this.KeenTracker().getInstance().trackPrivateEvent('front-end-events', { interaction: properties }, node); }, From 8ebdee14091cc8886304f2a264fe9fd7f400a080 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 16:24:57 -0500 Subject: [PATCH 45/58] Modify analytics-mixim. [skip-ci] --- addon/mixins/analytics-mixin.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addon/mixins/analytics-mixin.js b/addon/mixins/analytics-mixin.js index 6242b9f47..de927e969 100644 --- a/addon/mixins/analytics-mixin.js +++ b/addon/mixins/analytics-mixin.js @@ -1,38 +1,40 @@ import Ember from 'ember'; /** - * @module ember-preprints + * @module ember-osf * @submodule mixins */ /** - * Google Analytics mixin. Provides actions that can be used in templates to track events. + * Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple + * analytics services) * * @class AnalyticsMixin */ export default Ember.Mixin.create({ metrics: Ember.inject.service(), actions: { - click(category, label, url) { + click(category, label, extra) { + if (extra && extra.toString() === '[object MouseEvent]') { + extra = null; + } Ember.get(this, 'metrics') .trackEvent({ category, action: 'click', - label + label, + extra }); - // Needed for outbound links, see https://support.google.com/analytics/answer/1136920?hl=en - if (url) - window.location.href = url; - return true; }, - track(category, action, label) { + track(category, action, label, extra) { Ember.get(this, 'metrics') .trackEvent({ category, action, - label + label, + extra }); return true; From 8bc670ef8f9e5f59ffda1917010f8e82e5e92020 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 16:33:24 -0500 Subject: [PATCH 46/58] Rename Analytics Mixin [skip-ci] --- addon/mixins/{analytics-mixin.js => analytics.js} | 2 +- tests/unit/mixins/{analytics-mixin-test.js => analytics.js} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename addon/mixins/{analytics-mixin.js => analytics.js} (97%) rename tests/unit/mixins/{analytics-mixin-test.js => analytics.js} (54%) diff --git a/addon/mixins/analytics-mixin.js b/addon/mixins/analytics.js similarity index 97% rename from addon/mixins/analytics-mixin.js rename to addon/mixins/analytics.js index de927e969..28e245ccf 100644 --- a/addon/mixins/analytics-mixin.js +++ b/addon/mixins/analytics.js @@ -9,7 +9,7 @@ import Ember from 'ember'; * Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple * analytics services) * - * @class AnalyticsMixin + * @class Analytics */ export default Ember.Mixin.create({ metrics: Ember.inject.service(), diff --git a/tests/unit/mixins/analytics-mixin-test.js b/tests/unit/mixins/analytics.js similarity index 54% rename from tests/unit/mixins/analytics-mixin-test.js rename to tests/unit/mixins/analytics.js index 03598ceed..d85147f36 100644 --- a/tests/unit/mixins/analytics-mixin-test.js +++ b/tests/unit/mixins/analytics.js @@ -1,12 +1,12 @@ import Ember from 'ember'; -import AnalyticsMixinMixin from 'ember-osf/mixins/analytics-mixin'; +import AnalyticsMixin from 'ember-osf/mixins/analytics'; import { module, test } from 'qunit'; -module('Unit | Mixin | analytics mixin'); +module('Unit | Mixin | analytics'); // Replace this with your real tests. test('it works', function(assert) { - let AnalyticsMixinObject = Ember.Object.extend(AnalyticsMixinMixin); + let AnalyticsMixinObject = Ember.Object.extend(AnalyticsMixin); let subject = AnalyticsMixinObject.create(); assert.ok(subject); }); From 2e18a05e87a6bc61f694e469fcb34720c50a3e84 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 18:19:42 -0500 Subject: [PATCH 47/58] Add afterModel hook to analytics mixin to track page views and add trackPage method to keen metrics adapter. --- addon/metrics-adapters/keen.js | 17 +++++------------ addon/mixins/analytics.js | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index 8ca8f4d55..54bb4d9fd 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -18,30 +18,23 @@ export default BaseAdapter.extend({ console.log('start'); }, - identify() { - - }, - trackEvent(properties, node) { window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); return this.KeenTracker().getInstance().trackPrivateEvent('front-end-events', { interaction: properties }, node); - }, - - - trackPage() { - }, - alias() { - + trackPage(transitionData, model) { + window.contextVars = {}; + window.contextVars.currentUser = this.userContextVars(); + window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted + return this.KeenTracker().getInstance().trackPageView(transitionData); }, willDestroy() { // TODO console.log('done'); - }, KeenTracker() { diff --git a/addon/mixins/analytics.js b/addon/mixins/analytics.js index 28e245ccf..f12b5c977 100644 --- a/addon/mixins/analytics.js +++ b/addon/mixins/analytics.js @@ -13,6 +13,21 @@ import Ember from 'ember'; */ export default Ember.Mixin.create({ metrics: Ember.inject.service(), + // Add this mixin to your route, and the afterModel hook will track pageviews. Be sure to call super if using afterModel hook in route! + afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen + let transitionData = { + pageViewed: { + page: transition.targetName, + queryParams: transition.queryParams, + } + }; + if (model.id) { + transitionData.pageViewed.relatedModel = model.id; + transitionData.pageViewed.modelType = model.constructor.modelName; + } + Ember.get(this, 'metrics') + .trackPage(transitionData, model); + }, actions: { click(category, label, extra) { if (extra && extra.toString() === '[object MouseEvent]') { From a8aa043c48ee1f04db6c1ba8af458fd4dbbbd8d7 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 18:47:57 -0500 Subject: [PATCH 48/58] afterModel hook not working. Try didTransition (WIP) [skip-ci] --- addon/mixins/analytics.js | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/addon/mixins/analytics.js b/addon/mixins/analytics.js index f12b5c977..ed3c2a0c1 100644 --- a/addon/mixins/analytics.js +++ b/addon/mixins/analytics.js @@ -14,19 +14,32 @@ import Ember from 'ember'; export default Ember.Mixin.create({ metrics: Ember.inject.service(), // Add this mixin to your route, and the afterModel hook will track pageviews. Be sure to call super if using afterModel hook in route! - afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen - let transitionData = { - pageViewed: { - page: transition.targetName, - queryParams: transition.queryParams, - } - }; - if (model.id) { - transitionData.pageViewed.relatedModel = model.id; - transitionData.pageViewed.modelType = model.constructor.modelName; - } - Ember.get(this, 'metrics') - .trackPage(transitionData, model); + // afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen + // let transitionData = { + // pageViewed: { + // page: transition.targetName, + // queryParams: transition.queryParams, + // } + // }; + // if (model.id) { + // transitionData.pageViewed.relatedModel = model.id; + // transitionData.pageViewed.modelType = model.constructor.modelName; + // } + // Ember.get(this, 'metrics') + // .trackPage(transitionData, model); + // }, + didTransition() { + this._super(...arguments); + this._trackPage(); + }, + + _trackPage() { + Ember.run.scheduleOnce('afterRender', this, () => { + const page = this.get('url'); + const title = this.getWithDefault('currentRouteName', 'unknown'); + + Ember.get(this, 'metrics').trackPage({ page, title }); + }); }, actions: { click(category, label, extra) { From 543f3cea2ce0a956d97ef61847c03915f0585883 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 20:27:39 -0500 Subject: [PATCH 49/58] Remove afterModel hook, didTransition, and _trackPage. Put in router instead. [skip-ci] --- addon/metrics-adapters/keen.js | 5 ++--- addon/mixins/analytics.js | 28 ---------------------------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index 54bb4d9fd..77d89fc13 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -25,11 +25,10 @@ export default BaseAdapter.extend({ return this.KeenTracker().getInstance().trackPrivateEvent('front-end-events', { interaction: properties }, node); }, - trackPage(transitionData, model) { + trackPage(properties) { window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); - window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted - return this.KeenTracker().getInstance().trackPageView(transitionData); + return this.KeenTracker().getInstance().trackPageView({ pageViewed: {properties} }); }, willDestroy() { diff --git a/addon/mixins/analytics.js b/addon/mixins/analytics.js index ed3c2a0c1..28e245ccf 100644 --- a/addon/mixins/analytics.js +++ b/addon/mixins/analytics.js @@ -13,34 +13,6 @@ import Ember from 'ember'; */ export default Ember.Mixin.create({ metrics: Ember.inject.service(), - // Add this mixin to your route, and the afterModel hook will track pageviews. Be sure to call super if using afterModel hook in route! - // afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen - // let transitionData = { - // pageViewed: { - // page: transition.targetName, - // queryParams: transition.queryParams, - // } - // }; - // if (model.id) { - // transitionData.pageViewed.relatedModel = model.id; - // transitionData.pageViewed.modelType = model.constructor.modelName; - // } - // Ember.get(this, 'metrics') - // .trackPage(transitionData, model); - // }, - didTransition() { - this._super(...arguments); - this._trackPage(); - }, - - _trackPage() { - Ember.run.scheduleOnce('afterRender', this, () => { - const page = this.get('url'); - const title = this.getWithDefault('currentRouteName', 'unknown'); - - Ember.get(this, 'metrics').trackPage({ page, title }); - }); - }, actions: { click(category, label, extra) { if (extra && extra.toString() === '[object MouseEvent]') { From 1f429db7a3543d59fc0bec8ade07523a93e90cf9 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 20:48:11 -0500 Subject: [PATCH 50/58] Add default metricsAdapters and pull config from Keen metricsAdapters instead of config.Keen. [ci-skip] --- addon/metrics-adapters/keen.js | 10 ++++++++-- tests/dummy/config/environment.js | 29 +++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index 77d89fc13..fe22b8c26 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -28,7 +28,7 @@ export default BaseAdapter.extend({ trackPage(properties) { window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); - return this.KeenTracker().getInstance().trackPageView({ pageViewed: {properties} }); + return this.KeenTracker().getInstance().trackPageView({ pageViewed: properties }); }, willDestroy() { @@ -242,8 +242,14 @@ export default BaseAdapter.extend({ return { getInstance() { if (!instance) { + let configInfo = {}; + config.metricsAdapters.forEach((adapter) => { + if (adapter.name === 'Keen') { + configInfo = adapter.config; + } + }); instance = new KeenTracker(); - instance.init(config.KEEN); + instance.init(configInfo); } return instance; } diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 1870faba1..b1feddc22 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -14,16 +14,29 @@ module.exports = function(environment) { } var ENV = { - KEEN: { - private: { - projectId: 'process.env.KEEN_PRIVATE_PROJECT_ID', - writeKey: 'process.env.KEEN_PRIVATE_WRITE_KEY' + metricsAdapters: [ + { + name: 'GoogleAnalytics', + environments: ['all'], + config: { + id: process.env.GOOGLE_ANALYTICS_ID + } }, - public: { - projectId: 'process.env.KEEN_PUBLIC_PROJECT_ID', - writeKey: 'process.env.KEEN_PUBLIC_WRITE_KEY' + { + name: 'Keen', + environments: ['all'], + config: { + private: { + projectId: 'process.env.KEEN_PRIVATE_PROJECT_ID', + writeKey: 'process.env.KEEN_PRIVATE_WRITE_KEY' + }, + public: { + projectId: 'process.env.KEEN_PUBLIC_PROJECT_ID', + writeKey: 'process.env.KEEN_PUBLIC_WRITE_KEY' + } + } } - }, + ], modulePrefix: 'dummy', environment: environment, baseURL: '/', From 1e3098e0854d31e5d94f7feee42e684c61de295b Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 21:22:14 -0500 Subject: [PATCH 51/58] Remove quotes. --- tests/dummy/config/environment.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index b1feddc22..76628dff8 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -27,12 +27,12 @@ module.exports = function(environment) { environments: ['all'], config: { private: { - projectId: 'process.env.KEEN_PRIVATE_PROJECT_ID', - writeKey: 'process.env.KEEN_PRIVATE_WRITE_KEY' + projectId: process.env.KEEN_PRIVATE_PROJECT_ID, + writeKey: process.env.KEEN_PRIVATE_WRITE_KEY }, public: { - projectId: 'process.env.KEEN_PUBLIC_PROJECT_ID', - writeKey: 'process.env.KEEN_PUBLIC_WRITE_KEY' + projectId: process.env.KEEN_PUBLIC_PROJECT_ID, + writeKey: process.env.KEEN_PUBLIC_WRITE_KEY } } } From 6828909bf7a4846bbcac18e3253104bb1c2368f2 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 21:22:28 -0500 Subject: [PATCH 52/58] Remove body of init and willDestroy. --- addon/metrics-adapters/keen.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index fe22b8c26..20ace5c4e 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -1,10 +1,10 @@ -import BaseAdapter from 'ember-metrics/metrics-adapters/base'; import Ember from 'ember'; import md5 from 'npm:js-md5'; import _get from 'npm:lodash/get'; import Cookie from 'npm:js-cookie'; import config from 'ember-get-config'; import keenTracking from 'npm:keen-tracking'; +import BaseAdapter from 'ember-metrics/metrics-adapters/base'; export default BaseAdapter.extend({ session: Ember.inject.service(), @@ -13,10 +13,7 @@ export default BaseAdapter.extend({ return 'Keen'; }, - init() { - // TODO - console.log('start'); - }, + init() {}, trackEvent(properties, node) { window.contextVars = {}; @@ -31,10 +28,7 @@ export default BaseAdapter.extend({ return this.KeenTracker().getInstance().trackPageView({ pageViewed: properties }); }, - willDestroy() { - // TODO - console.log('done'); - }, + willDestroy() {}, KeenTracker() { function _nowUTC() { From 436a7282639e7beee391b32e9845ed0b0a8b0a36 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Mon, 20 Feb 2017 21:58:39 -0500 Subject: [PATCH 53/58] Add method to track a specific collection. --- addon/metrics-adapters/keen.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index 20ace5c4e..3ea1cff23 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -28,6 +28,13 @@ export default BaseAdapter.extend({ return this.KeenTracker().getInstance().trackPageView({ pageViewed: properties }); }, + trackSpecificCollection(collection, properties, node) { + window.contextVars = {}; + window.contextVars.currentUser = this.userContextVars(); + window.contextVars.node = this.nodeContextVars(node); + return this.KeenTracker().getInstance().trackPrivateEvent(collection, { interaction: properties }, node); + }, + willDestroy() {}, KeenTracker() { From 2a1468e1cb1fbe95edd623521605e2024e17fd64 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Tue, 21 Feb 2017 13:30:55 -0500 Subject: [PATCH 54/58] Remove Keen-Tracker mixin. --- addon/mixins/keen-tracker.js | 314 ------------------ .../app/controllers/nodes/detail/index.js | 3 +- tests/dummy/app/routes/nodes/detail/index.js | 4 +- tests/unit/mixins/keen-tracker-test.js | 12 - 4 files changed, 3 insertions(+), 330 deletions(-) delete mode 100644 addon/mixins/keen-tracker.js delete mode 100644 tests/unit/mixins/keen-tracker-test.js diff --git a/addon/mixins/keen-tracker.js b/addon/mixins/keen-tracker.js deleted file mode 100644 index a7fdc869d..000000000 --- a/addon/mixins/keen-tracker.js +++ /dev/null @@ -1,314 +0,0 @@ -import Ember from 'ember'; -import md5 from 'npm:js-md5'; -import _get from 'npm:lodash/get'; -import Cookie from 'npm:js-cookie'; -import config from 'ember-get-config'; -import keenTracking from 'npm:keen-tracking'; - -// Adapted from website/static/js/keen.js -export default Ember.Mixin.create({ - session: Ember.inject.service(), - - // Add this mixin to your route, and the afterModel hook will send pageviews to keen. Be sure to call super if using afterModel hook in route! - afterModel(model, transition) { // Using afterModel hook so node info can be sent to keen - window.contextVars = {}; - window.contextVars.currentUser = this.userContextVars(); - window.contextVars.node = this.nodeContextVars(model); // model may not be a node, in which case, only id might be extracted - let transitionData = { - pageViewed: { - page: transition.targetName, - queryParams: transition.queryParams, - } - }; - if (model.id) { - transitionData.pageViewed.relatedModel = model.id; - transitionData.pageViewed.modelType = model.constructor.modelName; - } - return this.KeenTracker().getInstance().trackPageView(transitionData); - }, - actions: { - //keenClick action can be used in template - keenClick(category, label, extra) { - return this.keenTrackFrontEndEvent({ category: category, action: 'click', label: label, extra: extra }); - - }, - //keenTrack action can be used in template - keenTrack(category, action, label, extra) { - return this.keenTrackFrontEndEvent({ category: category, action: action, label: label, extra: extra }); - }, - - //keenTrackNode action can pass in node model - keenTrackNode(category, action, label, node) { - return this.keenTrackFrontEndEvent({ category: category, action: action, label: label }, node); - }, - }, - KeenTracker() { - function _nowUTC() { - var now = new Date(); - return new Date( - now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), - now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds() - ); - } - - function _createOrUpdateKeenSession() { - var expDate = new Date(); - var expiresInMinutes = 25; - expDate.setTime(expDate.getTime() + (expiresInMinutes * 60 * 1000)); - var currentSessionId = Cookie.get('keenSessionId') || keenTracking.helpers.getUniqueId(); - Cookie.set('keenSessionId', currentSessionId, { - expires: expDate, path: '/' - }); - } - - function _getOrCreateKeenId() { - if (!Cookie.get('keenUserId')) { - Cookie.set('keenUserId', keenTracking.helpers.getUniqueId(), { - expires: 365, path: '/' - }); - } - return Cookie.get('keenUserId'); - } - - function _defaultKeenPayload() { - _createOrUpdateKeenSession(); - - var user = window.contextVars.currentUser; - var node = window.contextVars.node; - var pageMeta = _get(window, 'contextVars.analyticsMeta.pageMeta', {}); // Do not have this information. - return { - page: { - title: document.title, - url: document.URL, - meta: pageMeta, - info: {}, - }, - referrer: { - url: document.referrer, - info: {}, - }, - time: { - local: keenTracking.helpers.getDatetimeIndex(), - utc: keenTracking.helpers.getDatetimeIndex(_nowUTC()), - }, - node: { - id: _get(node, 'id'), - title: _get(node, 'title'), - type: _get(node, 'category'), - tags: _get(node, 'tags'), - }, - anon: { - id: md5(Cookie.get('keenSessionId')), - continent: user.anon.continent, - country: user.anon.country, - }, - meta: { - epoch: 1, // version of pageview event schema - }, - keen: { - addons: [ - { - name: 'keen:url_parser', - input: { - url: 'page.url', - }, - output: 'page.info', - }, - { - name: 'keen:url_parser', - input: { - url: 'referrer.url', - }, - output: 'referrer.info', - }, - { - name: 'keen:referrer_parser', - input: { - referrer_url: 'referrer.url', - page_url: 'page.url', - }, - output: 'referrer.info', - }, - ] - }, - }; - } // end _defaultKeenPayload - - function _trackCustomEvent(client, collection, eventData) { - if (client === null) { - return; - } - client.recordEvent(collection, eventData); - } - - function _trackCustomEvents(client, events) { - if (client === null) { - return; - } - client.recordEvents(events); - } - - function KeenTracker() { - if (instance) { - throw new Error('Cannot instantiate another KeenTracker instance.'); - } else { - var _this = this; - - _this._publicClient = null; - _this._privateClient = null; - - _this.init = function _initKeentracker(params) { - var _this = this; - - if (params === undefined) { - return _this; - } - - _this._publicClient = keenTracking({ - projectId: params.public.projectId, - writeKey: params.public.writeKey, - }); - _this._publicClient.extendEvents(_defaultPublicKeenPayload); - - _this._privateClient = keenTracking({ - projectId: params.private.projectId, - writeKey: params.private.writeKey, - }); - _this._privateClient.extendEvents(_defaultPrivateKeenPayload); - - return _this; - }; - - var _defaultPublicKeenPayload = function() { return _defaultKeenPayload(); }; - var _defaultPrivateKeenPayload = function() { - var payload = _defaultKeenPayload(); - var user = window.contextVars.currentUser; - payload.visitor = { - id: _getOrCreateKeenId(), - session: Cookie.get('keenSessionId'), - returning: Boolean(Cookie.get('keenUserId')), - }; - payload.tech = { - browser: keenTracking.helpers.getBrowserProfile(), - ua: '${keen.user_agent}', - ip: '${keen.ip}', - info: {}, - }; - payload.user = { - id: user.id, - entry_point: user.entryPoint, - institutions: user.institutions, - locale: user.locale, - timezone: user.timezone, - }; - payload.keen.addons.push({ - name: 'keen:ip_to_geo', - input: { - ip: 'tech.ip', - }, - output: 'geo', - }); - payload.keen.addons.push({ - name: 'keen:ua_parser', - input: { - ua_string: 'tech.ua' - }, - output: 'tech.info', - }); - - return payload; - }; - - _this.trackPageView = function (data) { - var _this = this; - if (_get(window, 'contextVars.node.isPublic', false) && - _get(window, 'contextVars.analyticsMeta.pageMeta.public', false)) { - _this.trackPublicEvent('pageviews', data); - } - _this.trackPrivateEvent('pageviews', data); - }; - - _this.trackPrivateEvent = function(collection, event) { - return _trackCustomEvent(_this._privateClient, collection, event); - }; - _this.trackPrivateEvents = function(events) { - return _trackCustomEvents(_this._privateClient, events); - }; - - _this.trackPublicEvent = function(collection, event) { - return _trackCustomEvent(_this._publicClient, collection, event); - }; - _this.trackPublicEvents = function(events) { - return _trackCustomEvents(_this._publicClient, events); - }; - } - } - - var instance = null; - return { - getInstance() { - if (!instance) { - instance = new KeenTracker(); - instance.init(config.KEEN); - } - return instance; - } - }; - }, - userContextVars() { - // Extract user variables from session. - const session = this.get('session'); - let user = {}; - if (session.get('isAuthenticated')) { - let userInfo = session.get('session.authenticated'); - user = { - id: userInfo.id, - entry_point: userInfo.attributes.entry_point, // Don't have the entry point. - institutions: null, // Don't really want to make an API request to fetch user institutions. - locale: userInfo.attributes.locale, - timezone: userInfo.attributes.timezone - }; - } - user.anon = {}; // Do not have this info, but most duplicated in geo. - return user; - }, - nodeContextVars(node) { - // Extract node variables, if passed in. - let nodeVars = {}; - if (node && node.id) { - nodeVars = { - id: node.get('id'), - title: node.get('title'), - type: node.get('category'), - tags: node.get('tags'), - isPublic: node.get('public') - }; - } - return nodeVars; - }, - keenTrackEvent(collection, properties, node) { - // Adds context vars and sends keen trackPrivateEvent method - window.contextVars = {}; - window.contextVars.currentUser = this.userContextVars(); - window.contextVars.node = this.nodeContextVars(node); - return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties); - }, - /** - * For front-end event-tracking - Sends event info to keen front-end-events collection. Collection: front-end-events. - * Properties: interaction dictionary plus supplemental info in default keen payload - * - * @method keenTrackFrontEndEvent - * @param {Object} event Dictionary with category, action, label - * @param {Object} model Relevant model - node model if exists - */ - keenTrackFrontEndEvent(event, model) { - return this.keenTrackEvent('front-end-events', { - interaction: { - category: event.category || null, - action: event.action || null, - label: event.label || null, - extra: event.extra || null - } - }, model); - } -}); diff --git a/tests/dummy/app/controllers/nodes/detail/index.js b/tests/dummy/app/controllers/nodes/detail/index.js index 8accc4fe9..8b93f95a9 100644 --- a/tests/dummy/app/controllers/nodes/detail/index.js +++ b/tests/dummy/app/controllers/nodes/detail/index.js @@ -3,9 +3,8 @@ import config from 'ember-get-config'; import CommentableMixin from 'ember-osf/mixins/commentable'; import TaggableMixin from 'ember-osf/mixins/taggable-mixin'; import NodeActionsMixin from 'ember-osf/mixins/node-actions'; -import KeenTrackerMixin from 'ember-osf/mixins/keen-tracker'; -export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActionsMixin, KeenTrackerMixin, { +export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActionsMixin, { toast: Ember.inject.service(), propertiesVisible: false, host: config.OSF.url, diff --git a/tests/dummy/app/routes/nodes/detail/index.js b/tests/dummy/app/routes/nodes/detail/index.js index c6cacea86..2e162ce2d 100644 --- a/tests/dummy/app/routes/nodes/detail/index.js +++ b/tests/dummy/app/routes/nodes/detail/index.js @@ -1,7 +1,7 @@ import Ember from 'ember'; -import KeenTrackerMixin from 'ember-osf/mixins/keen-tracker'; +import Analytics from 'ember-osf/mixins/analytics'; -export default Ember.Route.extend(KeenTrackerMixin, { +export default Ember.Route.extend(Analytics, { model() { return this.modelFor('nodes.detail'); }, diff --git a/tests/unit/mixins/keen-tracker-test.js b/tests/unit/mixins/keen-tracker-test.js deleted file mode 100644 index 3097563ca..000000000 --- a/tests/unit/mixins/keen-tracker-test.js +++ /dev/null @@ -1,12 +0,0 @@ -import Ember from 'ember'; -import KeenTrackerMixin from 'ember-osf/mixins/keen-tracker'; -import { module, test } from 'qunit'; - -module('Unit | Mixin | keen tracker'); - -// Replace this with your real tests. -test('it works', function(assert) { - let KeenTrackerObject = Ember.Object.extend(KeenTrackerMixin); - let subject = KeenTrackerObject.create(); - assert.ok(subject); -}); From fe53d7588f0e8ba3c4b799082c9390f51d399339 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Tue, 21 Feb 2017 13:31:13 -0500 Subject: [PATCH 55/58] Change signature of trackSpecificCollection. --- addon/metrics-adapters/keen.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index 3ea1cff23..ac65f4a59 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -28,7 +28,14 @@ export default BaseAdapter.extend({ return this.KeenTracker().getInstance().trackPageView({ pageViewed: properties }); }, - trackSpecificCollection(collection, properties, node) { + // Use when tracking something specific, not a generic front-end-event. Usually for something we want + // to isolate and later display to the user. + trackSpecificCollection(trackingInfo) { + // Tracking info should be structured like this: + // {collection: 'keen-collection-name', eventData: eventData, node: node } + const collection = trackingInfo.collection || 'front-end-events'; + const properties = trackingInfo.eventData || {}; + const node = trackingInfo.node || null; window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); @@ -37,6 +44,7 @@ export default BaseAdapter.extend({ willDestroy() {}, + // Adapted from osf.io/website/static/js/keen.js KeenTracker() { function _nowUTC() { var now = new Date(); From f922385ece51fe13c7dc1d0ac385a1a9e18a630f Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Tue, 21 Feb 2017 13:52:10 -0500 Subject: [PATCH 56/58] Assume properties are a dictionary. --- addon/metrics-adapters/keen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js index ac65f4a59..be8468294 100644 --- a/addon/metrics-adapters/keen.js +++ b/addon/metrics-adapters/keen.js @@ -39,7 +39,7 @@ export default BaseAdapter.extend({ window.contextVars = {}; window.contextVars.currentUser = this.userContextVars(); window.contextVars.node = this.nodeContextVars(node); - return this.KeenTracker().getInstance().trackPrivateEvent(collection, { interaction: properties }, node); + return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties, node); }, willDestroy() {}, From ccf72736b13f00396de7f6fe52736ead070bf0e5 Mon Sep 17 00:00:00 2001 From: Dawn Pattison Date: Tue, 21 Feb 2017 14:17:42 -0500 Subject: [PATCH 57/58] Remove usage of obsolete method in dummy app. --- tests/dummy/app/controllers/nodes/detail/index.js | 6 ------ tests/dummy/app/routes/nodes/detail/index.js | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/dummy/app/controllers/nodes/detail/index.js b/tests/dummy/app/controllers/nodes/detail/index.js index 8b93f95a9..a3222bf26 100644 --- a/tests/dummy/app/controllers/nodes/detail/index.js +++ b/tests/dummy/app/controllers/nodes/detail/index.js @@ -29,12 +29,6 @@ export default Ember.Controller.extend(CommentableMixin, TaggableMixin, NodeActi // Would update node properly! }, updateNode() { - this.keenTrackFrontEndEvent({ - category: 'button', - action: 'click', - label: 'Update Node' - }, this.get('model')); - this.set('isSaving', true); return this._super(...arguments) .then(() => { diff --git a/tests/dummy/app/routes/nodes/detail/index.js b/tests/dummy/app/routes/nodes/detail/index.js index 2e162ce2d..691689939 100644 --- a/tests/dummy/app/routes/nodes/detail/index.js +++ b/tests/dummy/app/routes/nodes/detail/index.js @@ -1,7 +1,6 @@ import Ember from 'ember'; -import Analytics from 'ember-osf/mixins/analytics'; -export default Ember.Route.extend(Analytics, { +export default Ember.Route.extend({ model() { return this.modelFor('nodes.detail'); }, From 78f70c95ce1a7f465259e902bfd5d87dade84881 Mon Sep 17 00:00:00 2001 From: Andy Boughton Date: Thu, 2 Mar 2017 16:58:29 -0500 Subject: [PATCH 58/58] Bump for 0.3.0 release [#LEI-537] --- docs/api.js | 3 +- docs/classes/Analytics.html | 225 +++++++++++++++++ docs/classes/CasAuthenticatedRouteMixin.html | 3 +- docs/classes/Citation.html | 3 +- docs/classes/Collection.html | 3 +- docs/classes/Comment.html | 3 +- docs/classes/CommentReport.html | 3 +- docs/classes/CommentableMixin.html | 3 +- docs/classes/Contributor.html | 3 +- docs/classes/DraftRegistration.html | 3 +- docs/classes/FetchAllRouteMixin.html | 3 +- docs/classes/File.html | 3 +- docs/classes/FileCacheBypassMixin.html | 3 +- docs/classes/FileItemMixin.html | 3 +- docs/classes/FileProvider.html | 3 +- docs/classes/FileVersion.html | 3 +- docs/classes/GenericDataADapter.html | 3 +- docs/classes/InfinityCustomMixin.html | 3 +- docs/classes/Institution.html | 3 +- docs/classes/Log.html | 3 +- docs/classes/Metaschema.html | 3 +- docs/classes/Node.html | 3 +- docs/classes/NodeActionsMixin.html | 3 +- docs/classes/NodeLink.html | 3 +- docs/classes/OsfAdapter.html | 3 +- docs/classes/OsfAgnosticAuthController.html | 3 +- docs/classes/OsfAgnosticAuthRoute.html | 3 +- docs/classes/OsfCookieAuthenticator.html | 3 +- docs/classes/OsfCookieAuthorizer.html | 3 +- docs/classes/OsfCookieLoginController.html | 3 +- docs/classes/OsfCookieLoginRoute.html | 3 +- docs/classes/OsfModel.html | 3 +- docs/classes/OsfSerializer.html | 3 +- docs/classes/OsfTokenAuthenticator.html | 3 +- docs/classes/OsfTokenAuthorizer.html | 3 +- .../classes/OsfTokenLoginControllerMixin.html | 3 +- docs/classes/OsfTokenLoginRouteMixin.html | 3 +- docs/classes/PaginatedControllerMixin.html | 3 +- docs/classes/PaginatedRouteMixin.html | 3 +- docs/classes/Preprint.html | 3 +- docs/classes/Registration.html | 3 +- docs/classes/RegistrationActionsMixin.html | 3 +- docs/classes/TaggableMixin.html | 3 +- docs/classes/Taxonomy.html | 3 +- docs/classes/User.html | 3 +- docs/classes/ajax-helpers.html | 3 +- docs/classes/auth.html | 3 +- docs/classes/citation-widget.html | 3 +- docs/classes/comment-detail.html | 3 +- docs/classes/comment-form.html | 3 +- docs/classes/comment-pane.html | 3 +- docs/classes/current-user.html | 3 +- docs/classes/dropzone-widget.html | 3 +- docs/classes/elem-id.html | 3 +- docs/classes/eosf-project-nav.html | 3 +- docs/classes/file-browser-icon.html | 3 +- docs/classes/file-browser.html | 3 +- docs/classes/file-chooser component.html | 3 +- docs/classes/file-manager.html | 3 +- docs/classes/file-renderer.html | 3 +- docs/classes/file-version.html | 3 +- docs/classes/file-widget.html | 3 +- docs/classes/fix-special-char-helper.html | 3 +- docs/classes/fix-special-char.html | 3 +- docs/classes/fixstring.html | 3 +- docs/classes/navbar-auth-dropdown.html | 3 +- docs/classes/oauth-popup.html | 3 +- docs/classes/osf-copyright.html | 3 +- docs/classes/osf-footer.html | 3 +- docs/classes/osf-mode-footer.html | 3 +- docs/classes/osf-navbar.html | 3 +- docs/classes/osf-paginator.html | 4 +- docs/classes/pagination-control.html | 4 +- docs/classes/permissions.html | 3 +- docs/classes/search-dropdown.html | 3 +- docs/classes/sign-up.html | 3 +- docs/classes/tags-widget.html | 3 +- docs/data.json | 38 ++- docs/files/addon_adapters_osf-adapter.js.html | 3 +- .../addon_authenticators_osf-cookie.js.html | 3 +- .../addon_authenticators_osf-token.js.html | 3 +- .../addon_authorizers_osf-cookie.js.html | 3 +- .../files/addon_authorizers_osf-token.js.html | 3 +- ...mponents_citation-widget_component.js.html | 3 +- ...omponents_comment-detail_component.js.html | 3 +- ..._components_comment-form_component.js.html | 3 +- ..._components_comment-pane_component.js.html | 3 +- ...mponents_dropzone-widget_component.js.html | 3 +- ...ponents_eosf-project-nav_component.js.html | 3 +- ...onents_file-browser-icon_component.js.html | 3 +- ...onents_file-browser-item_component.js.html | 3 +- ..._components_file-browser_component.js.html | 3 +- ..._components_file-chooser_component.js.html | 3 +- ...components_file-renderer_component.js.html | 3 +- ..._components_file-version_component.js.html | 3 +- ...n_components_file-widget_component.js.html | 3 +- ...nts_navbar-auth-dropdown_component.js.html | 3 +- ...n_components_oauth-popup_component.js.html | 3 +- ...components_osf-copyright_component.js.html | 3 +- ...on_components_osf-footer_component.js.html | 3 +- ...mponents_osf-mode-footer_component.js.html | 3 +- ...on_components_osf-navbar_component.js.html | 3 +- ...components_osf-paginator_component.js.html | 13 +- ...nents_pagination-control_component.js.html | 14 +- ...mponents_search-dropdown_component.js.html | 3 +- ...addon_components_sign-up_component.js.html | 3 +- ...n_components_tags-widget_component.js.html | 3 +- docs/files/addon_const_permissions.js.html | 3 +- docs/files/addon_helpers_elem-id.js.html | 3 +- .../addon_helpers_fix-special-char.js.html | 3 +- docs/files/addon_mixins_analytics.js.html | 234 ++++++++++++++++++ ...don_mixins_cas-authenticated-route.js.html | 3 +- docs/files/addon_mixins_commentable.js.html | 3 +- .../addon_mixins_fetch-all-route.js.html | 3 +- .../addon_mixins_file-cache-bypass.js.html | 3 +- docs/files/addon_mixins_file-item.js.html | 3 +- .../addon_mixins_generic-data-adapter.js.html | 3 +- .../addon_mixins_infinity-custom.js.html | 3 +- docs/files/addon_mixins_node-actions.js.html | 3 +- ...ixins_osf-agnostic-auth-controller.js.html | 3 +- ...don_mixins_osf-agnostic-auth-route.js.html | 3 +- ...mixins_osf-cookie-login-controller.js.html | 3 +- ...ddon_mixins_osf-cookie-login-route.js.html | 3 +- ..._mixins_osf-token-login-controller.js.html | 3 +- ...addon_mixins_osf-token-login-route.js.html | 3 +- .../addon_mixins_paginated-controller.js.html | 3 +- .../addon_mixins_paginated-route.js.html | 3 +- .../addon_mixins_registration-actions.js.html | 3 +- .../files/addon_mixins_taggable-mixin.js.html | 3 +- docs/files/addon_models_citation.js.html | 3 +- docs/files/addon_models_collection.js.html | 3 +- .../files/addon_models_comment-report.js.html | 3 +- docs/files/addon_models_comment.js.html | 3 +- docs/files/addon_models_contributor.js.html | 3 +- .../addon_models_draft-registration.js.html | 3 +- docs/files/addon_models_file-provider.js.html | 3 +- docs/files/addon_models_file-version.js.html | 3 +- docs/files/addon_models_file.js.html | 3 +- docs/files/addon_models_institution.js.html | 3 +- docs/files/addon_models_log.js.html | 3 +- docs/files/addon_models_metaschema.js.html | 3 +- docs/files/addon_models_node-link.js.html | 3 +- docs/files/addon_models_node.js.html | 3 +- docs/files/addon_models_osf-model.js.html | 3 +- docs/files/addon_models_preprint.js.html | 3 +- docs/files/addon_models_registration.js.html | 3 +- docs/files/addon_models_taxonomy.js.html | 3 +- docs/files/addon_models_user.js.html | 3 +- .../addon_serializers_osf-serializer.js.html | 3 +- .../files/addon_services_current-user.js.html | 3 +- .../files/addon_services_file-manager.js.html | 3 +- docs/files/addon_transforms_fixstring.js.html | 3 +- docs/files/addon_utils_ajax-helpers.js.html | 4 +- docs/files/addon_utils_auth.js.html | 3 +- .../addon_utils_fix-special-char.js.html | 3 +- docs/index.html | 3 +- docs/modules/adapters.html | 3 +- docs/modules/authenticators.html | 3 +- docs/modules/authorizers.html | 3 +- docs/modules/components.html | 3 +- docs/modules/const.html | 3 +- docs/modules/ember-osf.html | 14 +- docs/modules/ember-preprints.html | 3 +- docs/modules/ember.html | 3 +- docs/modules/helpers.html | 3 +- docs/modules/mixins.html | 13 +- docs/modules/models.html | 3 +- docs/modules/serializers.html | 3 +- docs/modules/services.html | 3 +- docs/modules/transforms.html | 3 +- docs/modules/utils.html | 3 +- package.json | 2 +- 172 files changed, 865 insertions(+), 183 deletions(-) create mode 100644 docs/classes/Analytics.html create mode 100644 docs/files/addon_mixins_analytics.js.html diff --git a/docs/api.js b/docs/api.js index f00c1a199..95782715f 100644 --- a/docs/api.js +++ b/docs/api.js @@ -1,6 +1,7 @@ YUI.add("yuidoc-meta", function(Y) { Y.YUIDoc = { meta: { "classes": [ + "Analytics", "CasAuthenticatedRouteMixin", "Citation", "Collection", @@ -140,7 +141,7 @@ YUI.add("yuidoc-meta", function(Y) { { "displayName": "mixins", "name": "mixins", - "description": "Replacement for Ember-simple-auth AuthenticatedRouteMixin. Instead of redirecting to an internal route,\n this mixin redirects to CAS login URL, and brings the user back to the last requested page afterwards\n\nFor OAuth this is done via the state parameter, and for cookies this is done via the service parameter. (TODO: Need a mixin that detects this!)" + "description": "Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple\nanalytics services)" }, { "displayName": "models", diff --git a/docs/classes/Analytics.html b/docs/classes/Analytics.html new file mode 100644 index 000000000..4aa63aa35 --- /dev/null +++ b/docs/classes/Analytics.html @@ -0,0 +1,225 @@ + + + + + Analytics - Ember OSF Addon + + + + + + + + +
        +
        +
        +

        +
        +
        + API Docs for: 0.3.0 +
        +
        +
        + +
        + +
        +
        +
        + Show: + + + + + + + +
        + +
        +
        +
        +

        Analytics Class

        +
        + + +
        + Defined in: addon/mixins/analytics.js:8 +
        + + Module: mixins
        + Parent Module: ember-osf + +
        + + +
        +

        Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple +analytics services)

        + +
        + + +
        + + +
        +
        +

        Item Index

        + + + + +
        + + + + +
        +
        +
        +
        +
        +
        +
        +
        + + + + + + + + + + diff --git a/docs/classes/CasAuthenticatedRouteMixin.html b/docs/classes/CasAuthenticatedRouteMixin.html index aff3c230b..0835455e6 100644 --- a/docs/classes/CasAuthenticatedRouteMixin.html +++ b/docs/classes/CasAuthenticatedRouteMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/FileCacheBypassMixin.html b/docs/classes/FileCacheBypassMixin.html index a12d9a720..261494a4c 100644 --- a/docs/classes/FileCacheBypassMixin.html +++ b/docs/classes/FileCacheBypassMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/InfinityCustomMixin.html b/docs/classes/InfinityCustomMixin.html index 05c52567e..0227c6dd2 100644 --- a/docs/classes/InfinityCustomMixin.html +++ b/docs/classes/InfinityCustomMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfAgnosticAuthController.html b/docs/classes/OsfAgnosticAuthController.html index 05ef0d736..208496dd6 100644 --- a/docs/classes/OsfAgnosticAuthController.html +++ b/docs/classes/OsfAgnosticAuthController.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfAgnosticAuthRoute.html b/docs/classes/OsfAgnosticAuthRoute.html index 8c42a04f1..ac8d80752 100644 --- a/docs/classes/OsfAgnosticAuthRoute.html +++ b/docs/classes/OsfAgnosticAuthRoute.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfCookieAuthenticator.html b/docs/classes/OsfCookieAuthenticator.html index 8eb5f9373..aae881cd6 100644 --- a/docs/classes/OsfCookieAuthenticator.html +++ b/docs/classes/OsfCookieAuthenticator.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfCookieAuthorizer.html b/docs/classes/OsfCookieAuthorizer.html index 6e4dd5343..17012bc83 100644 --- a/docs/classes/OsfCookieAuthorizer.html +++ b/docs/classes/OsfCookieAuthorizer.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfCookieLoginController.html b/docs/classes/OsfCookieLoginController.html index 0016c773d..d7dd2ca71 100644 --- a/docs/classes/OsfCookieLoginController.html +++ b/docs/classes/OsfCookieLoginController.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfCookieLoginRoute.html b/docs/classes/OsfCookieLoginRoute.html index 19999f5eb..64da8c62f 100644 --- a/docs/classes/OsfCookieLoginRoute.html +++ b/docs/classes/OsfCookieLoginRoute.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfTokenAuthenticator.html b/docs/classes/OsfTokenAuthenticator.html index c17196990..43956bbe0 100644 --- a/docs/classes/OsfTokenAuthenticator.html +++ b/docs/classes/OsfTokenAuthenticator.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfTokenLoginControllerMixin.html b/docs/classes/OsfTokenLoginControllerMixin.html index 78b4585cc..d60e59095 100644 --- a/docs/classes/OsfTokenLoginControllerMixin.html +++ b/docs/classes/OsfTokenLoginControllerMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/OsfTokenLoginRouteMixin.html b/docs/classes/OsfTokenLoginRouteMixin.html index 17fcc86a6..fd286dfdd 100644 --- a/docs/classes/OsfTokenLoginRouteMixin.html +++ b/docs/classes/OsfTokenLoginRouteMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/PaginatedControllerMixin.html b/docs/classes/PaginatedControllerMixin.html index 689b2d011..718df1cf6 100644 --- a/docs/classes/PaginatedControllerMixin.html +++ b/docs/classes/PaginatedControllerMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/PaginatedRouteMixin.html b/docs/classes/PaginatedRouteMixin.html index c987ba4e8..478cbd39c 100644 --- a/docs/classes/PaginatedRouteMixin.html +++ b/docs/classes/PaginatedRouteMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/RegistrationActionsMixin.html b/docs/classes/RegistrationActionsMixin.html index c16f73e53..64e804927 100644 --- a/docs/classes/RegistrationActionsMixin.html +++ b/docs/classes/RegistrationActionsMixin.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/file-chooser component.html b/docs/classes/file-chooser component.html index cff893315..9ced81a34 100644 --- a/docs/classes/file-chooser component.html +++ b/docs/classes/file-chooser component.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/fix-special-char-helper.html b/docs/classes/fix-special-char-helper.html index 86317de7a..904d5c0a6 100644 --- a/docs/classes/fix-special-char-helper.html +++ b/docs/classes/fix-special-char-helper.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/classes/navbar-auth-dropdown.html b/docs/classes/navbar-auth-dropdown.html index 5414fa4c3..05d294600 100644 --- a/docs/classes/navbar-auth-dropdown.html +++ b/docs/classes/navbar-auth-dropdown.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    diff --git a/docs/classes/pagination-control.html b/docs/classes/pagination-control.html index b1335b172..04401a299 100644 --- a/docs/classes/pagination-control.html +++ b/docs/classes/pagination-control.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • @@ -181,6 +182,7 @@

      pagination-control Class

      Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin.

      +

      The pagination-control will be deprecated. Use pagination-pager instead.

      diff --git a/docs/classes/permissions.html b/docs/classes/permissions.html index 2be3be854..67b598270 100644 --- a/docs/classes/permissions.html +++ b/docs/classes/permissions.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/data.json b/docs/data.json index ea986f407..8cd990767 100644 --- a/docs/data.json +++ b/docs/data.json @@ -4,7 +4,7 @@ "description": "Ember components for interacting with the Open Science Framework", "url": "https://github.com/CenterForOpenScience/ember-osf", "logo": "https://cos.io/static/img/icons/cos_wide.png", - "version": "0.2.0" + "version": "0.3.0" }, "files": { "addon/adapters/osf-adapter.js": { @@ -305,11 +305,20 @@ "fors": {}, "namespaces": {} }, - "addon/mixins/cas-authenticated-route.js": { - "name": "addon/mixins/cas-authenticated-route.js", + "addon/mixins/analytics.js": { + "name": "addon/mixins/analytics.js", "modules": { "mixins": 1 }, + "classes": { + "Analytics": 1 + }, + "fors": {}, + "namespaces": {} + }, + "addon/mixins/cas-authenticated-route.js": { + "name": "addon/mixins/cas-authenticated-route.js", + "modules": {}, "classes": { "CasAuthenticatedRouteMixin": 1 }, @@ -764,6 +773,7 @@ "permissions": 1, "elem-id": 1, "fix-special-char-helper": 1, + "Analytics": 1, "CasAuthenticatedRouteMixin": 1, "CommentableMixin": 1, "FetchAllRouteMixin": 1, @@ -936,6 +946,7 @@ "submodules": {}, "elements": {}, "classes": { + "Analytics": 1, "CasAuthenticatedRouteMixin": 1, "CommentableMixin": 1, "FetchAllRouteMixin": 1, @@ -961,7 +972,7 @@ "namespace": "", "file": "addon/mixins/taggable-mixin.js", "line": 8, - "description": "Replacement for Ember-simple-auth AuthenticatedRouteMixin. Instead of redirecting to an internal route,\n this mixin redirects to CAS login URL, and brings the user back to the last requested page afterwards\n\nFor OAuth this is done via the state parameter, and for cookies this is done via the service parameter. (TODO: Need a mixin that detects this!)" + "description": "Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple\nanalytics services)" }, "ember": { "name": "ember", @@ -1530,7 +1541,7 @@ "namespace": "", "file": "addon/components/osf-paginator/component.js", "line": 9, - "description": "OSF Paginator adapted from osf/website/static/js/paginator.js\n\nSample usage:\n```handlebars\n{{osf-paginator\n totalSearchResults=totalSearchResults\n fetchResults=(action 'fetchResults')\n query=query}}\n```", + "description": "OSF Paginator adapted from osf/website/static/js/paginator.js\n\nSample usage:\n```handlebars\n{{osf-paginator\n totalSearchResults=totalSearchResults\n fetchResults=(action 'fetchResults')\n query=query}}\n```\n\nThe osf-paginator will be deprecated. Use pagination-pager instead.", "params": [ { "name": "totalSearchResults", @@ -1562,7 +1573,7 @@ "namespace": "", "file": "addon/components/pagination-control/component.js", "line": 9, - "description": "Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin." + "description": "Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin.\n\nThe pagination-control will be deprecated. Use pagination-pager instead." }, "search-dropdown": { "name": "search-dropdown", @@ -1668,6 +1679,21 @@ "fix-special-char" ] }, + "Analytics": { + "name": "Analytics", + "shortname": "Analytics", + "classitems": [], + "plugins": [], + "extensions": [], + "plugin_for": [], + "extension_for": [], + "module": "ember-osf", + "submodule": "mixins", + "namespace": "", + "file": "addon/mixins/analytics.js", + "line": 8, + "description": "Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple\nanalytics services)" + }, "CasAuthenticatedRouteMixin": { "name": "CasAuthenticatedRouteMixin", "shortname": "CasAuthenticatedRouteMixin", diff --git a/docs/files/addon_adapters_osf-adapter.js.html b/docs/files/addon_adapters_osf-adapter.js.html index 261149501..a02183127 100644 --- a/docs/files/addon_adapters_osf-adapter.js.html +++ b/docs/files/addon_adapters_osf-adapter.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_authenticators_osf-cookie.js.html b/docs/files/addon_authenticators_osf-cookie.js.html index a92a75ee8..bd9ddd178 100644 --- a/docs/files/addon_authenticators_osf-cookie.js.html +++ b/docs/files/addon_authenticators_osf-cookie.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_authenticators_osf-token.js.html b/docs/files/addon_authenticators_osf-token.js.html index 397b38d08..fc25362c7 100644 --- a/docs/files/addon_authenticators_osf-token.js.html +++ b/docs/files/addon_authenticators_osf-token.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_authorizers_osf-cookie.js.html b/docs/files/addon_authorizers_osf-cookie.js.html index 4e9368b06..a913d658b 100644 --- a/docs/files/addon_authorizers_osf-cookie.js.html +++ b/docs/files/addon_authorizers_osf-cookie.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_authorizers_osf-token.js.html b/docs/files/addon_authorizers_osf-token.js.html index a4c1be6e6..af6fc95ae 100644 --- a/docs/files/addon_authorizers_osf-token.js.html +++ b/docs/files/addon_authorizers_osf-token.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_citation-widget_component.js.html b/docs/files/addon_components_citation-widget_component.js.html index b5b13d621..8b3f58343 100644 --- a/docs/files/addon_components_citation-widget_component.js.html +++ b/docs/files/addon_components_citation-widget_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_comment-detail_component.js.html b/docs/files/addon_components_comment-detail_component.js.html index db07c0a9b..12c74e759 100644 --- a/docs/files/addon_components_comment-detail_component.js.html +++ b/docs/files/addon_components_comment-detail_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_comment-form_component.js.html b/docs/files/addon_components_comment-form_component.js.html index c669ea031..93402064f 100644 --- a/docs/files/addon_components_comment-form_component.js.html +++ b/docs/files/addon_components_comment-form_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_comment-pane_component.js.html b/docs/files/addon_components_comment-pane_component.js.html index 5354b9e0f..8ea9eab08 100644 --- a/docs/files/addon_components_comment-pane_component.js.html +++ b/docs/files/addon_components_comment-pane_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_dropzone-widget_component.js.html b/docs/files/addon_components_dropzone-widget_component.js.html index 4c02f3d54..30bb8599a 100644 --- a/docs/files/addon_components_dropzone-widget_component.js.html +++ b/docs/files/addon_components_dropzone-widget_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_eosf-project-nav_component.js.html b/docs/files/addon_components_eosf-project-nav_component.js.html index 00b74ec36..d69f5b96d 100644 --- a/docs/files/addon_components_eosf-project-nav_component.js.html +++ b/docs/files/addon_components_eosf-project-nav_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-browser-icon_component.js.html b/docs/files/addon_components_file-browser-icon_component.js.html index 9ed4253cb..ae81b5f5e 100644 --- a/docs/files/addon_components_file-browser-icon_component.js.html +++ b/docs/files/addon_components_file-browser-icon_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-browser-item_component.js.html b/docs/files/addon_components_file-browser-item_component.js.html index 93d94b4ef..cf904e23d 100644 --- a/docs/files/addon_components_file-browser-item_component.js.html +++ b/docs/files/addon_components_file-browser-item_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-browser_component.js.html b/docs/files/addon_components_file-browser_component.js.html index 28dcc9282..08b1276d0 100644 --- a/docs/files/addon_components_file-browser_component.js.html +++ b/docs/files/addon_components_file-browser_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-chooser_component.js.html b/docs/files/addon_components_file-chooser_component.js.html index bb8bbfc23..2531a64ff 100644 --- a/docs/files/addon_components_file-chooser_component.js.html +++ b/docs/files/addon_components_file-chooser_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-renderer_component.js.html b/docs/files/addon_components_file-renderer_component.js.html index 93756c472..997c982f4 100644 --- a/docs/files/addon_components_file-renderer_component.js.html +++ b/docs/files/addon_components_file-renderer_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-version_component.js.html b/docs/files/addon_components_file-version_component.js.html index 21ec97d1b..a93271806 100644 --- a/docs/files/addon_components_file-version_component.js.html +++ b/docs/files/addon_components_file-version_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_file-widget_component.js.html b/docs/files/addon_components_file-widget_component.js.html index b0695d386..bd3c104c8 100644 --- a/docs/files/addon_components_file-widget_component.js.html +++ b/docs/files/addon_components_file-widget_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_navbar-auth-dropdown_component.js.html b/docs/files/addon_components_navbar-auth-dropdown_component.js.html index 52bd55aab..ab2e82f57 100644 --- a/docs/files/addon_components_navbar-auth-dropdown_component.js.html +++ b/docs/files/addon_components_navbar-auth-dropdown_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_oauth-popup_component.js.html b/docs/files/addon_components_oauth-popup_component.js.html index 2d86c0ab3..e5acd6a38 100644 --- a/docs/files/addon_components_oauth-popup_component.js.html +++ b/docs/files/addon_components_oauth-popup_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_osf-copyright_component.js.html b/docs/files/addon_components_osf-copyright_component.js.html index d35c38fa3..17f70f039 100644 --- a/docs/files/addon_components_osf-copyright_component.js.html +++ b/docs/files/addon_components_osf-copyright_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_osf-footer_component.js.html b/docs/files/addon_components_osf-footer_component.js.html index 86cec9510..d73a0aba1 100644 --- a/docs/files/addon_components_osf-footer_component.js.html +++ b/docs/files/addon_components_osf-footer_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_osf-mode-footer_component.js.html b/docs/files/addon_components_osf-mode-footer_component.js.html index 6a9313a96..128d93d19 100644 --- a/docs/files/addon_components_osf-mode-footer_component.js.html +++ b/docs/files/addon_components_osf-mode-footer_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_osf-navbar_component.js.html b/docs/files/addon_components_osf-navbar_component.js.html index 8a6a266e1..fd4b650a3 100644 --- a/docs/files/addon_components_osf-navbar_component.js.html +++ b/docs/files/addon_components_osf-navbar_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_osf-paginator_component.js.html b/docs/files/addon_components_osf-paginator_component.js.html index fbd17a537..7d674e07b 100644 --- a/docs/files/addon_components_osf-paginator_component.js.html +++ b/docs/files/addon_components_osf-paginator_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • @@ -187,6 +188,9 @@

      File: addon/components/osf-paginator/component.js

      * fetchResults=(action 'fetchResults') * query=query}} * ``` + * + * The osf-paginator will be deprecated. Use pagination-pager instead. + * * @class osf-paginator * @param {integer} totalSearchResults Number of total search results to be paginated * @param {action} fetchResults - action for fetching other pages of results @@ -195,6 +199,13 @@

      File: addon/components/osf-paginator/component.js

      export default Ember.Component.extend({ layout, currentPage: 1, + init() { + this._super(...arguments); + Ember.deprecate('osf-paginator will be deprecated. Use pagination-pager instead', false, { + id: 'osf-paginator', + until: '1.0.0' + }); + }, pages: Ember.computed('totalSearchResults', function() { let totalSearchResults = this.get('totalSearchResults'); return Math.ceil(totalSearchResults / 10); diff --git a/docs/files/addon_components_pagination-control_component.js.html b/docs/files/addon_components_pagination-control_component.js.html index dc8b975b9..970d064ac 100644 --- a/docs/files/addon_components_pagination-control_component.js.html +++ b/docs/files/addon_components_pagination-control_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • @@ -179,6 +180,9 @@

      File: addon/components/pagination-control/component.js< /** * Display a simple pagination control that advances the page. Intended for use with PaginatedRouteMixin. + * + * The pagination-control will be deprecated. Use pagination-pager instead. + * * @class pagination-control */ export default Ember.Component.extend({ @@ -192,6 +196,14 @@

      File: addon/components/pagination-control/component.js< return this.get('currentPage') >= this.get('pageCount'); }), + init() { + this._super(...arguments); + Ember.deprecate('pagination-control will be deprecated. Use pagination-pager instead', false, { + id: 'pagination-control', + until: '1.0.0' + }); + }, + // TODO: This actions hash feels a bit kludgy actions: { next() { diff --git a/docs/files/addon_components_search-dropdown_component.js.html b/docs/files/addon_components_search-dropdown_component.js.html index 5574d3c4a..e041d7295 100644 --- a/docs/files/addon_components_search-dropdown_component.js.html +++ b/docs/files/addon_components_search-dropdown_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_sign-up_component.js.html b/docs/files/addon_components_sign-up_component.js.html index bf5831ccc..9f43d503b 100644 --- a/docs/files/addon_components_sign-up_component.js.html +++ b/docs/files/addon_components_sign-up_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_components_tags-widget_component.js.html b/docs/files/addon_components_tags-widget_component.js.html index 6b3c2d47a..638f6f02b 100644 --- a/docs/files/addon_components_tags-widget_component.js.html +++ b/docs/files/addon_components_tags-widget_component.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_const_permissions.js.html b/docs/files/addon_const_permissions.js.html index fe83958f2..46c439b30 100644 --- a/docs/files/addon_const_permissions.js.html +++ b/docs/files/addon_const_permissions.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_helpers_elem-id.js.html b/docs/files/addon_helpers_elem-id.js.html index d3280e4bb..db455dcea 100644 --- a/docs/files/addon_helpers_elem-id.js.html +++ b/docs/files/addon_helpers_elem-id.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_helpers_fix-special-char.js.html b/docs/files/addon_helpers_fix-special-char.js.html index 5b7b0ada6..03d15ff38 100644 --- a/docs/files/addon_helpers_fix-special-char.js.html +++ b/docs/files/addon_helpers_fix-special-char.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_commentable.js.html b/docs/files/addon_mixins_commentable.js.html index ca23ef037..5aae249eb 100644 --- a/docs/files/addon_mixins_commentable.js.html +++ b/docs/files/addon_mixins_commentable.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_fetch-all-route.js.html b/docs/files/addon_mixins_fetch-all-route.js.html index 07468727e..d2a409239 100644 --- a/docs/files/addon_mixins_fetch-all-route.js.html +++ b/docs/files/addon_mixins_fetch-all-route.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_file-cache-bypass.js.html b/docs/files/addon_mixins_file-cache-bypass.js.html index ed937f99f..73aa228fd 100644 --- a/docs/files/addon_mixins_file-cache-bypass.js.html +++ b/docs/files/addon_mixins_file-cache-bypass.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_file-item.js.html b/docs/files/addon_mixins_file-item.js.html index d5909c224..0fbb7f4fe 100644 --- a/docs/files/addon_mixins_file-item.js.html +++ b/docs/files/addon_mixins_file-item.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_generic-data-adapter.js.html b/docs/files/addon_mixins_generic-data-adapter.js.html index 0f7d8dbf9..12461a784 100644 --- a/docs/files/addon_mixins_generic-data-adapter.js.html +++ b/docs/files/addon_mixins_generic-data-adapter.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_infinity-custom.js.html b/docs/files/addon_mixins_infinity-custom.js.html index 498a8e8cb..c0053d91b 100644 --- a/docs/files/addon_mixins_infinity-custom.js.html +++ b/docs/files/addon_mixins_infinity-custom.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_node-actions.js.html b/docs/files/addon_mixins_node-actions.js.html index 674452c8f..30f89a43e 100644 --- a/docs/files/addon_mixins_node-actions.js.html +++ b/docs/files/addon_mixins_node-actions.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html b/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html index 5115bf5f8..03c8efddd 100644 --- a/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html +++ b/docs/files/addon_mixins_osf-agnostic-auth-controller.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_osf-agnostic-auth-route.js.html b/docs/files/addon_mixins_osf-agnostic-auth-route.js.html index dc6b0f08b..ce9865d1c 100644 --- a/docs/files/addon_mixins_osf-agnostic-auth-route.js.html +++ b/docs/files/addon_mixins_osf-agnostic-auth-route.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_osf-cookie-login-controller.js.html b/docs/files/addon_mixins_osf-cookie-login-controller.js.html index efe5051b7..fac2912d9 100644 --- a/docs/files/addon_mixins_osf-cookie-login-controller.js.html +++ b/docs/files/addon_mixins_osf-cookie-login-controller.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_osf-cookie-login-route.js.html b/docs/files/addon_mixins_osf-cookie-login-route.js.html index 0c000f92c..8083609e2 100644 --- a/docs/files/addon_mixins_osf-cookie-login-route.js.html +++ b/docs/files/addon_mixins_osf-cookie-login-route.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_osf-token-login-controller.js.html b/docs/files/addon_mixins_osf-token-login-controller.js.html index 298aec760..5c6c18e03 100644 --- a/docs/files/addon_mixins_osf-token-login-controller.js.html +++ b/docs/files/addon_mixins_osf-token-login-controller.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_osf-token-login-route.js.html b/docs/files/addon_mixins_osf-token-login-route.js.html index d01a75749..abe6462d4 100644 --- a/docs/files/addon_mixins_osf-token-login-route.js.html +++ b/docs/files/addon_mixins_osf-token-login-route.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_paginated-controller.js.html b/docs/files/addon_mixins_paginated-controller.js.html index ed582233b..efbeaf212 100644 --- a/docs/files/addon_mixins_paginated-controller.js.html +++ b/docs/files/addon_mixins_paginated-controller.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_paginated-route.js.html b/docs/files/addon_mixins_paginated-route.js.html index dcce49599..4e6f1cfbb 100644 --- a/docs/files/addon_mixins_paginated-route.js.html +++ b/docs/files/addon_mixins_paginated-route.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_registration-actions.js.html b/docs/files/addon_mixins_registration-actions.js.html index 7c2c46f1a..9280b3650 100644 --- a/docs/files/addon_mixins_registration-actions.js.html +++ b/docs/files/addon_mixins_registration-actions.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_mixins_taggable-mixin.js.html b/docs/files/addon_mixins_taggable-mixin.js.html index c1af67059..8b18b84c2 100644 --- a/docs/files/addon_mixins_taggable-mixin.js.html +++ b/docs/files/addon_mixins_taggable-mixin.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_citation.js.html b/docs/files/addon_models_citation.js.html index 4a8697245..122e6dd70 100644 --- a/docs/files/addon_models_citation.js.html +++ b/docs/files/addon_models_citation.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_collection.js.html b/docs/files/addon_models_collection.js.html index a12f17ff0..a39547524 100644 --- a/docs/files/addon_models_collection.js.html +++ b/docs/files/addon_models_collection.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_comment-report.js.html b/docs/files/addon_models_comment-report.js.html index 7f827345a..6ebfbe5b3 100644 --- a/docs/files/addon_models_comment-report.js.html +++ b/docs/files/addon_models_comment-report.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_comment.js.html b/docs/files/addon_models_comment.js.html index 2d1e5e7f3..e56f28c9e 100644 --- a/docs/files/addon_models_comment.js.html +++ b/docs/files/addon_models_comment.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_contributor.js.html b/docs/files/addon_models_contributor.js.html index cc537bcd3..94d066731 100644 --- a/docs/files/addon_models_contributor.js.html +++ b/docs/files/addon_models_contributor.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_draft-registration.js.html b/docs/files/addon_models_draft-registration.js.html index 249bb1217..9791a3378 100644 --- a/docs/files/addon_models_draft-registration.js.html +++ b/docs/files/addon_models_draft-registration.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_file-provider.js.html b/docs/files/addon_models_file-provider.js.html index edc18a5d2..6b6348667 100644 --- a/docs/files/addon_models_file-provider.js.html +++ b/docs/files/addon_models_file-provider.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_file-version.js.html b/docs/files/addon_models_file-version.js.html index e3dee4153..0e9a09fd0 100644 --- a/docs/files/addon_models_file-version.js.html +++ b/docs/files/addon_models_file-version.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_institution.js.html b/docs/files/addon_models_institution.js.html index 17c207e21..fbad0fd63 100644 --- a/docs/files/addon_models_institution.js.html +++ b/docs/files/addon_models_institution.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_metaschema.js.html b/docs/files/addon_models_metaschema.js.html index 4456592c2..0688c610b 100644 --- a/docs/files/addon_models_metaschema.js.html +++ b/docs/files/addon_models_metaschema.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_node-link.js.html b/docs/files/addon_models_node-link.js.html index f002e8470..7e6863a22 100644 --- a/docs/files/addon_models_node-link.js.html +++ b/docs/files/addon_models_node-link.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_osf-model.js.html b/docs/files/addon_models_osf-model.js.html index feb7cde41..b00eb637d 100644 --- a/docs/files/addon_models_osf-model.js.html +++ b/docs/files/addon_models_osf-model.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_preprint.js.html b/docs/files/addon_models_preprint.js.html index 026d6080e..17ad8c68b 100644 --- a/docs/files/addon_models_preprint.js.html +++ b/docs/files/addon_models_preprint.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_registration.js.html b/docs/files/addon_models_registration.js.html index 88c12dc22..bbd82ca17 100644 --- a/docs/files/addon_models_registration.js.html +++ b/docs/files/addon_models_registration.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_models_taxonomy.js.html b/docs/files/addon_models_taxonomy.js.html index 3ea6adbd4..231318fc7 100644 --- a/docs/files/addon_models_taxonomy.js.html +++ b/docs/files/addon_models_taxonomy.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_serializers_osf-serializer.js.html b/docs/files/addon_serializers_osf-serializer.js.html index 39a01ba87..34b1d5f20 100644 --- a/docs/files/addon_serializers_osf-serializer.js.html +++ b/docs/files/addon_serializers_osf-serializer.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_services_current-user.js.html b/docs/files/addon_services_current-user.js.html index 657346003..68fcffbd9 100644 --- a/docs/files/addon_services_current-user.js.html +++ b/docs/files/addon_services_current-user.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_services_file-manager.js.html b/docs/files/addon_services_file-manager.js.html index 5789561a4..cc4cf2952 100644 --- a/docs/files/addon_services_file-manager.js.html +++ b/docs/files/addon_services_file-manager.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_transforms_fixstring.js.html b/docs/files/addon_transforms_fixstring.js.html index a2dedd2ea..a03cef324 100644 --- a/docs/files/addon_transforms_fixstring.js.html +++ b/docs/files/addon_transforms_fixstring.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_utils_ajax-helpers.js.html b/docs/files/addon_utils_ajax-helpers.js.html index 777b5974d..d384ab921 100644 --- a/docs/files/addon_utils_ajax-helpers.js.html +++ b/docs/files/addon_utils_ajax-helpers.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    diff --git a/docs/files/addon_utils_auth.js.html b/docs/files/addon_utils_auth.js.html index f55bbb0cc..954719e10 100644 --- a/docs/files/addon_utils_auth.js.html +++ b/docs/files/addon_utils_auth.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/docs/files/addon_utils_fix-special-char.js.html b/docs/files/addon_utils_fix-special-char.js.html index 276d9d295..f099a5fee 100644 --- a/docs/files/addon_utils_fix-special-char.js.html +++ b/docs/files/addon_utils_fix-special-char.js.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • @@ -187,6 +188,11 @@

      ember-osf Module

      This module provides the following classes:

        +
      • + + Analytics + +
      • auth @@ -616,10 +622,8 @@

        ember-osf Module

        - Replacement for Ember-simple-auth AuthenticatedRouteMixin. Instead of redirecting to an internal route, - this mixin redirects to CAS login URL, and brings the user back to the last requested page afterwards - -For OAuth this is done via the state parameter, and for cookies this is done via the service parameter. (TODO: Need a mixin that detects this!) + Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple +analytics services)
      • diff --git a/docs/modules/ember-preprints.html b/docs/modules/ember-preprints.html index 9bc6783de..3e7f15c5a 100644 --- a/docs/modules/ember-preprints.html +++ b/docs/modules/ember-preprints.html @@ -17,7 +17,7 @@

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    - API Docs for: 0.2.0 + API Docs for: 0.3.0
    @@ -39,6 +39,7 @@

    APIs

    • ajax-helpers
    • +
    • Analytics
    • auth
    • CasAuthenticatedRouteMixin
    • Citation
    • diff --git a/package.json b/package.json index 8e248bf58..b7d3f07c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-osf", - "version": "0.2.1", + "version": "0.3.0", "description": "Reusable ember models and components for interacting with the Open Science Framework", "directories": { "doc": "docs",