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}}
Save
diff --git a/addon/components/osf-paginator/component.js b/addon/components/osf-paginator/component.js
index 4e5858023..9d121b23c 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 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
@@ -24,6 +27,13 @@ import layout from './template';
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/addon/components/pagination-control/component.js b/addon/components/pagination-control/component.js
index e6fa4025c..31dc42979 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 will be deprecated. Use pagination-pager instead.
+ *
* @class pagination-control
*/
export default Ember.Component.extend({
@@ -21,6 +24,14 @@ export default Ember.Component.extend({
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/addon/metrics-adapters/keen.js b/addon/metrics-adapters/keen.js
new file mode 100644
index 000000000..be8468294
--- /dev/null
+++ b/addon/metrics-adapters/keen.js
@@ -0,0 +1,298 @@
+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(),
+
+ toStringExtension() {
+ return 'Keen';
+ },
+
+ init() {},
+
+ 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(properties) {
+ window.contextVars = {};
+ window.contextVars.currentUser = this.userContextVars();
+ return this.KeenTracker().getInstance().trackPageView({ pageViewed: properties });
+ },
+
+ // 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);
+ return this.KeenTracker().getInstance().trackPrivateEvent(collection, properties, node);
+ },
+
+ willDestroy() {},
+
+ // Adapted from osf.io/website/static/js/keen.js
+ 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) {
+ let configInfo = {};
+ config.metricsAdapters.forEach((adapter) => {
+ if (adapter.name === 'Keen') {
+ configInfo = adapter.config;
+ }
+ });
+ instance = new KeenTracker();
+ instance.init(configInfo);
+ }
+ 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/addon/mixins/analytics.js b/addon/mixins/analytics.js
new file mode 100644
index 000000000..28e245ccf
--- /dev/null
+++ b/addon/mixins/analytics.js
@@ -0,0 +1,43 @@
+import Ember from 'ember';
+
+/**
+ * @module ember-osf
+ * @submodule mixins
+ */
+
+/**
+ * Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple
+ * analytics services)
+ *
+ * @class Analytics
+ */
+export default Ember.Mixin.create({
+ metrics: Ember.inject.service(),
+ actions: {
+ click(category, label, extra) {
+ if (extra && extra.toString() === '[object MouseEvent]') {
+ extra = null;
+ }
+ Ember.get(this, 'metrics')
+ .trackEvent({
+ category,
+ action: 'click',
+ label,
+ extra
+ });
+
+ return true;
+ },
+ track(category, action, label, extra) {
+ Ember.get(this, 'metrics')
+ .trackEvent({
+ category,
+ action,
+ label,
+ extra
+ });
+ return true;
+
+ }
+ }
+});
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
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/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/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
+
+
+
+
+
+
+
+
+
+ Show:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Analytics Class
+
+
+
+
+
Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple
+analytics services)
+
+
+
+
+
+
+
+
+
+
Item Index
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 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
- 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
- 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- 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
- 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- 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
- 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
- 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
- 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
- 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
- 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation 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 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation addon/mixins/analytics.js - Ember OSF Addon
+
+
+
+
+
+
+
+
+
+ Show:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
File: addon/mixins/analytics.js
+
+
+
+import Ember from 'ember';
+
+/**
+ * @module ember-osf
+ * @submodule mixins
+ */
+
+/**
+ * Analytics mixin. Provides actions that can be used in templates to track events (can send to multiple
+ * analytics services)
+ *
+ * @class Analytics
+ */
+export default Ember.Mixin.create({
+ metrics: Ember.inject.service(),
+ actions: {
+ click(category, label, extra) {
+ if (extra && extra.toString() === '[object MouseEvent]') {
+ extra = null;
+ }
+ Ember.get(this, 'metrics')
+ .trackEvent({
+ category,
+ action: 'click',
+ label,
+ extra
+ });
+
+ return true;
+ },
+ track(category, action, label, extra) {
+ Ember.get(this, 'metrics')
+ .trackEvent({
+ category,
+ action,
+ label,
+ extra
+ });
+ return true;
+
+ }
+ }
+});
+
+
+
+
+
+
+
+
+
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- 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
- 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- 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
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
- API Docs for: 0.2.0
+ API Docs for: 0.3.0
@@ -39,6 +39,7 @@
APIs
ajax-helpers Analytics auth CasAuthenticatedRouteMixin Citation
- 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 mixins 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)
mixins Module
This module provides the following classes:
- 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 