From ed5416477d6d29711053059e47c9d862a2ba1e93 Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Wed, 17 May 2023 12:01:34 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20More=20updates=20for=20?= =?UTF-8?q?models=20and=20mirage=20(#253)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generated/models/session-recording.js | 20 ++++++++++++------ addons/api/addon/models/session-recording.js | 4 ++++ .../mirage/factories/connection-recording.js | 5 +++++ .../api/mirage/factories/session-recording.js | 21 ++++++++++++++++++- .../factories/connection-recording.js | 4 ---- .../generated/factories/session-recording.js | 7 ------- .../addon/helpers/format-date-iso-human.js | 2 +- addons/core/addon/helpers/format-date-iso.js | 2 +- .../helpers/format-date-iso-human-test.js | 8 +++++++ .../helpers/format-date-iso-test.js | 8 +++++++ 10 files changed, 61 insertions(+), 20 deletions(-) diff --git a/addons/api/addon/generated/models/session-recording.js b/addons/api/addon/generated/models/session-recording.js index aca92a8a6..ad6611c79 100644 --- a/addons/api/addon/generated/models/session-recording.js +++ b/addons/api/addon/generated/models/session-recording.js @@ -77,12 +77,6 @@ export default class GeneratedSessionRecordingModel extends BaseModel { }) updated_time; - @attr('date', { - description: 'The time that the Session recording will be deleted.', - readOnly: true, - }) - delete_on; - @attr({ description: 'The array of mime types that this recording will support.', readOnly: true, @@ -94,4 +88,18 @@ export default class GeneratedSessionRecordingModel extends BaseModel { readOnly: true, }) duration; + + @attr('string', { + description: + 'The current state of the session recording. One of "started", "available" and "unknown".', + readOnly: true, + }) + state; + + @attr('string', { + description: + 'Any error seen during the closing of the session recording. Currently only set if state is "unknown".', + readOnly: true, + }) + error_details; } diff --git a/addons/api/addon/models/session-recording.js b/addons/api/addon/models/session-recording.js index b0649845e..800f8c3af 100644 --- a/addons/api/addon/models/session-recording.js +++ b/addons/api/addon/models/session-recording.js @@ -8,6 +8,10 @@ export const TYPES_SESSION_RECORDING = Object.freeze([ TYPE_SESSION_RECORDING_SSH, ]); +export const STATE_SESSION_RECORDING_STARTED = 'started'; +export const STATE_SESSION_RECORDING_AVAILABLE = 'available'; +export const STATE_SESSION_RECORDING_UNKNOWN = 'unknown'; + export default class SessionRecordingModel extends GeneratedSessionRecordingModel { @hasMany('connection-recording', { async: false }) connection_recordings; diff --git a/addons/api/mirage/factories/connection-recording.js b/addons/api/mirage/factories/connection-recording.js index 148a7fedf..76145d661 100644 --- a/addons/api/mirage/factories/connection-recording.js +++ b/addons/api/mirage/factories/connection-recording.js @@ -5,8 +5,13 @@ import factory from '../generated/factories/connection-recording'; import generateId from '../helpers/id'; +import { faker } from '@faker-js/faker'; export default factory.extend({ id: () => generateId('cr_'), connection_id: () => generateId('sc_'), + start_time(i) { + return i % 3 === 2 ? null : faker.date.recent(3, this.end_time); + }, + end_time: (i) => (i % 3 === 2 ? null : faker.date.recent()), }); diff --git a/addons/api/mirage/factories/session-recording.js b/addons/api/mirage/factories/session-recording.js index e77fbb2fe..3086c4aea 100644 --- a/addons/api/mirage/factories/session-recording.js +++ b/addons/api/mirage/factories/session-recording.js @@ -8,8 +8,18 @@ import permissions from '../helpers/permissions'; import generateId from '../helpers/id'; import { faker } from '@faker-js/faker'; import { trait } from 'miragejs'; -import { TYPES_SESSION_RECORDING as types } from 'api/models/session-recording'; +import { + TYPES_SESSION_RECORDING as types, + STATE_SESSION_RECORDING_STARTED, + STATE_SESSION_RECORDING_AVAILABLE, + STATE_SESSION_RECORDING_UNKNOWN, +} from 'api/models/session-recording'; +const states = [ + STATE_SESSION_RECORDING_STARTED, + STATE_SESSION_RECORDING_AVAILABLE, + STATE_SESSION_RECORDING_UNKNOWN, +]; const pickRandomElement = (arr) => faker.helpers.arrayElement(arr); export default factory.extend({ id: () => generateId('sr_'), @@ -17,6 +27,15 @@ export default factory.extend({ // Cycle through available types type: (i) => types[i % types.length], + state: (i) => states[i % states.length], + + start_time(i) { + return i % 4 === 3 ? null : faker.date.recent(3, this.end_time); + }, + end_time(i) { + return i % 4 === 3 ? null : faker.date.recent(1, this.updated_time); + }, + authorized_actions: () => permissions.authorizedActionsFor('session-recording') || [ 'no-op', diff --git a/addons/api/mirage/generated/factories/connection-recording.js b/addons/api/mirage/generated/factories/connection-recording.js index e36f7b262..62837e435 100644 --- a/addons/api/mirage/generated/factories/connection-recording.js +++ b/addons/api/mirage/generated/factories/connection-recording.js @@ -15,9 +15,5 @@ export default Factory.extend({ bytes_down: () => faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), errors: () => faker.datatype.number({ max: 10 }), - start_time() { - return faker.date.recent(3, this.end_time); - }, - end_time: () => faker.date.recent(), duration: () => `${faker.datatype.number()}s`, }); diff --git a/addons/api/mirage/generated/factories/session-recording.js b/addons/api/mirage/generated/factories/session-recording.js index 19ebb4650..f04359cb1 100644 --- a/addons/api/mirage/generated/factories/session-recording.js +++ b/addons/api/mirage/generated/factories/session-recording.js @@ -15,13 +15,6 @@ export default Factory.extend({ bytes_down: () => faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), errors: () => faker.datatype.number({ max: 10 }), - start_time() { - return faker.date.recent(3, this.end_time); - }, - end_time() { - return faker.date.recent(1, this.updated_time); - }, updated_time: () => faker.date.recent(), - deleted_on: () => faker.date.soon(), duration: () => `${faker.datatype.number()}s`, }); diff --git a/addons/core/addon/helpers/format-date-iso-human.js b/addons/core/addon/helpers/format-date-iso-human.js index 62100cc33..cb4af11fe 100644 --- a/addons/core/addon/helpers/format-date-iso-human.js +++ b/addons/core/addon/helpers/format-date-iso-human.js @@ -11,7 +11,7 @@ import { helper } from '@ember/component/helper'; */ export default helper(function formatDateIsoHuman(params /*, hash*/) { return params[0] - .toISOString() + ?.toISOString() .replace('T', ' ') .replace(/\.\d*Z/, ''); }); diff --git a/addons/core/addon/helpers/format-date-iso.js b/addons/core/addon/helpers/format-date-iso.js index c142a1012..1bbd56daf 100644 --- a/addons/core/addon/helpers/format-date-iso.js +++ b/addons/core/addon/helpers/format-date-iso.js @@ -10,5 +10,5 @@ import { helper } from '@ember/component/helper'; * e.g. "2020-01-01T00:00:00.999Z". */ export default helper(function formatDateIso(params /*, hash*/) { - return params[0].toISOString(); + return params[0]?.toISOString(); }); diff --git a/addons/core/tests/integration/helpers/format-date-iso-human-test.js b/addons/core/tests/integration/helpers/format-date-iso-human-test.js index 11b97efbe..4037cf143 100644 --- a/addons/core/tests/integration/helpers/format-date-iso-human-test.js +++ b/addons/core/tests/integration/helpers/format-date-iso-human-test.js @@ -18,4 +18,12 @@ module('Integration | Helper | format-date-iso-human', function (hooks) { assert.strictEqual(this.element.textContent.trim(), '2020-01-01 00:00:00'); }); + + test('it renders when null', async function (assert) { + this.set('inputValue', null); + + await render(hbs`{{format-date-iso-human this.inputValue }}`); + + assert.strictEqual(this.element.textContent.trim(), ''); + }); }); diff --git a/addons/core/tests/integration/helpers/format-date-iso-test.js b/addons/core/tests/integration/helpers/format-date-iso-test.js index abd5a1333..9e78495b2 100644 --- a/addons/core/tests/integration/helpers/format-date-iso-test.js +++ b/addons/core/tests/integration/helpers/format-date-iso-test.js @@ -21,4 +21,12 @@ module('Integration | Helper | format-date-iso', function (hooks) { '2020-01-01T00:00:00.999Z' ); }); + + test('it renders when null', async function (assert) { + this.set('inputValue', null); + + await render(hbs`{{format-date-iso this.inputValue}}`); + + assert.strictEqual(this.element.textContent.trim(), ''); + }); });