From 255ae70cfba002ff14b483a5ca838751b6cf3ccd Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Wed, 28 Mar 2018 09:11:09 -0400 Subject: [PATCH 1/4] add subscription model --- addon/adapters/subscription.js | 4 ++++ addon/models/subscription.js | 18 ++++++++++++++++++ addon/serializers/subscription.js | 4 ++++ app/adapters/subscription.js | 1 + app/models/subscription.js | 1 + app/serializers/subscription.js | 1 + 6 files changed, 29 insertions(+) create mode 100644 addon/adapters/subscription.js create mode 100644 addon/models/subscription.js create mode 100644 addon/serializers/subscription.js create mode 100644 app/adapters/subscription.js create mode 100644 app/models/subscription.js create mode 100644 app/serializers/subscription.js diff --git a/addon/adapters/subscription.js b/addon/adapters/subscription.js new file mode 100644 index 000000000..5a903d089 --- /dev/null +++ b/addon/adapters/subscription.js @@ -0,0 +1,4 @@ +import OsfAdapter from './osf-adapter'; + +export default OsfAdapter.extend({ +}); diff --git a/addon/models/subscription.js b/addon/models/subscription.js new file mode 100644 index 000000000..b3aaf5c2b --- /dev/null +++ b/addon/models/subscription.js @@ -0,0 +1,18 @@ +import Ember from 'ember'; +import DS from 'ember-data'; + +import OsfModel from './osf-model'; + +/** + * @module ember-osf + * @submodule models + */ + +/** + * Model for OSF APIv2 subscriptions. + * @class Subscription + */ +export default OsfModel.extend({ + eventName: DS.attr('string'), + frequency: DS.attr('string'), +}); diff --git a/addon/serializers/subscription.js b/addon/serializers/subscription.js new file mode 100644 index 000000000..c5617e1d4 --- /dev/null +++ b/addon/serializers/subscription.js @@ -0,0 +1,4 @@ +import OsfSerializer from './osf-serializer'; + +export default OsfSerializer.extend({ +}); diff --git a/app/adapters/subscription.js b/app/adapters/subscription.js new file mode 100644 index 000000000..8564171bd --- /dev/null +++ b/app/adapters/subscription.js @@ -0,0 +1 @@ +export { default } from 'ember-osf/adapters/subscription'; diff --git a/app/models/subscription.js b/app/models/subscription.js new file mode 100644 index 000000000..95371d6c0 --- /dev/null +++ b/app/models/subscription.js @@ -0,0 +1 @@ +export { default } from 'ember-osf/models/subscription'; diff --git a/app/serializers/subscription.js b/app/serializers/subscription.js new file mode 100644 index 000000000..1de935896 --- /dev/null +++ b/app/serializers/subscription.js @@ -0,0 +1 @@ +export { default } from 'ember-osf/serializers/subscription'; From 430e199267fb98f75792435b505f7324baebade8 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Mon, 2 Apr 2018 10:01:55 -0400 Subject: [PATCH 2/4] fix linting --- addon/models/subscription.js | 1 - tests/unit/models/subscription-test.js | 27 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 tests/unit/models/subscription-test.js diff --git a/addon/models/subscription.js b/addon/models/subscription.js index b3aaf5c2b..0fd224ae5 100644 --- a/addon/models/subscription.js +++ b/addon/models/subscription.js @@ -1,4 +1,3 @@ -import Ember from 'ember'; import DS from 'ember-data'; import OsfModel from './osf-model'; diff --git a/tests/unit/models/subscription-test.js b/tests/unit/models/subscription-test.js new file mode 100644 index 000000000..87ec7cacb --- /dev/null +++ b/tests/unit/models/subscription-test.js @@ -0,0 +1,27 @@ +import { moduleForModel, test } from 'ember-qunit'; + +moduleForModel('subscription', 'Unit | Model | contributor', { + // Specify the other units that are required for this test. + needs: [ + 'transform:links', + 'transform:embed', + ] +}); + +test('it exists', function(assert) { + let model = this.subject(); + // let store = this.store(); + assert.ok(!!model); +}); + +test('it has an attribute: frequency', function(assert) { + var model = this.subject(); + var hasAttr = Object.keys(model.toJSON()).indexOf('frequency') > -1; + assert.ok(hasAttr); +}); + +test('it has an attribute: eventName', function(assert) { + var model = this.subject(); + var hasAttr = Object.keys(model.toJSON()).indexOf('eventName') > -1; + assert.ok(hasAttr); +}); From 04101ae79564bf96a77569a2e5eeb1046099574b Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Tue, 3 Apr 2018 16:06:29 -0400 Subject: [PATCH 3/4] add servicelink --- addon/const/service-links.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addon/const/service-links.js b/addon/const/service-links.js index 2f0c070a0..bd01783ca 100644 --- a/addon/const/service-links.js +++ b/addon/const/service-links.js @@ -34,6 +34,7 @@ const serviceLinks = { registriesSupport: 'http://help.osf.io/m/registrations/', search: `${osfUrl}search/`, settings: `${osfUrl}settings/`, + settingsNotifications: `${osfUrl}settings/notifications/`, reviewsHome: `${osfUrl}reviews/`, }; From 74c2498c62613ae0ba4c6116751be2796174e481 Mon Sep 17 00:00:00 2001 From: Yuhuai Liu Date: Wed, 4 Apr 2018 10:07:11 -0400 Subject: [PATCH 4/4] Remove redundant line. --- tests/unit/models/subscription-test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/unit/models/subscription-test.js b/tests/unit/models/subscription-test.js index 87ec7cacb..3f338ff4b 100644 --- a/tests/unit/models/subscription-test.js +++ b/tests/unit/models/subscription-test.js @@ -10,7 +10,6 @@ moduleForModel('subscription', 'Unit | Model | contributor', { test('it exists', function(assert) { let model = this.subject(); - // let store = this.store(); assert.ok(!!model); });