From 80842a9b7e3f5fe1a006184c0753bccf24875fa1 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 5 Feb 2021 16:57:06 -0500 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20sessions=20proper?= =?UTF-8?q?ty=20to=20target?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/addon/models/session.js | 8 +++- addons/api/addon/models/target.js | 18 +++++++++ addons/api/tests/unit/models/session-test.js | 22 +++++++++++ addons/api/tests/unit/models/target-test.js | 40 ++++++++++++++++++++ 4 files changed, 86 insertions(+), 2 deletions(-) diff --git a/addons/api/addon/models/session.js b/addons/api/addon/models/session.js index c86a4d2b7..5ab2e3c39 100644 --- a/addons/api/addon/models/session.js +++ b/addons/api/addon/models/session.js @@ -1,5 +1,6 @@ import GeneratedSessionModel from '../generated/models/session'; import { computed } from '@ember/object'; +import { equal } from '@ember/object/computed'; import { attr } from '@ember-data/model'; export default class SessionModel extends GeneratedSessionModel { @@ -9,12 +10,15 @@ export default class SessionModel extends GeneratedSessionModel { @attr('string', { readOnly: true }) proxy_address; @attr('number', { readOnly: true }) proxy_port; + @equal('status', 'active') isActive; + @equal('status', 'pending') isPending; + /** * @type {boolean} */ - @computed('status') + @computed('isActive', 'isPending') get isCancelable() { - return this.status?.match(/(active)|(pending)/i); + return this.isActive || this.isPending; } /** diff --git a/addons/api/addon/models/target.js b/addons/api/addon/models/target.js index c5f80ae4e..dc997a97d 100644 --- a/addons/api/addon/models/target.js +++ b/addons/api/addon/models/target.js @@ -36,6 +36,24 @@ export default class TargetModel extends GeneratedTargetModel { .filter((hostSetRef) => hostSetRef.model !== null); } + /** + * Sessions associated with this target (but only already loaded sessions). + * @type {SessionModel[]} + */ + get sessions() { + return this.store.peekAll('session').filter(s => s.target_id === this.id); + } + + /** + * True if any sessions associated with this target are active or pending. + * @type {boolean} + */ + get isActive() { + const pendingOrActiveSessions = + this.sessions.filter(s => s.isActive || s.isPending); + return Boolean(pendingOrActiveSessions.length); + } + // =methods /** diff --git a/addons/api/tests/unit/models/session-test.js b/addons/api/tests/unit/models/session-test.js index d4477c5d9..54c8b44cc 100644 --- a/addons/api/tests/unit/models/session-test.js +++ b/addons/api/tests/unit/models/session-test.js @@ -27,6 +27,28 @@ module('Unit | Model | session', function(hooks) { assert.ok(model.isCancelable); }); + test('it computes isActive', function (assert) { + assert.expect(2); + let store = this.owner.lookup('service:store'); + let model = store.createRecord('session', { + status: 'pending' + }); + assert.notOk(model.isActive); + model.status = 'active'; + assert.ok(model.isActive); + }); + + test('it computes isPending', function (assert) { + assert.expect(2); + let store = this.owner.lookup('service:store'); + let model = store.createRecord('session', { + status: 'active' + }); + assert.notOk(model.isPending); + model.status = 'pending'; + assert.ok(model.isPending); + }); + test('it computes a proxy attribute', function (assert) { let store = this.owner.lookup('service:store'); let model = store.createRecord('session'); diff --git a/addons/api/tests/unit/models/target-test.js b/addons/api/tests/unit/models/target-test.js index 925e84646..bacab9b42 100644 --- a/addons/api/tests/unit/models/target-test.js +++ b/addons/api/tests/unit/models/target-test.js @@ -179,4 +179,44 @@ module('Unit | Model | target', function (hooks) { const model = store.peekRecord('target', '123abc'); await model.removeHostSet('3'); }); + + test('it has a `sessions` array of session instances associated with the target (if those instances are already in the store)', function (assert) { + assert.expect(3); + const store = this.owner.lookup('service:store'); + store.push({ + data: { + id: '123abc', + type: 'target' + } + }); + const target = store.peekRecord('target', '123abc'); + assert.equal( target.sessions.length, 0); + store.push({ + data: { + id: '1', + type: 'session', + attributes: { target_id: '123abc' } + } + }); + store.push({ + data: { + id: '2', + type: 'session', + attributes: { target_id: '123abc' } + } + }); + store.push({ + data: { + id: '3', + type: 'session', + attributes: { target_id: '456xyz' } + } + }); + assert.equal(store.peekAll('session').length, 3, 'There are 3 sessions loaded in the store'); + assert.equal( + target.sessions.length, + 2, + 'Target has two associated sessions loaded in the store' + ); + }); });