diff --git a/ui/app/models/license.js b/ui/app/models/license.js index 5cf21a6381..7631302b63 100644 --- a/ui/app/models/license.js +++ b/ui/app/models/license.js @@ -3,15 +3,29 @@ import Model, { attr } from '@ember-data/model'; /* sample response { "data": { - "expiration_time": "2017-11-14T16:34:36.546753-05:00", - "features": [ - "UI", - "HSM", - "Performance Replication", - "DR Replication" - ], - "license_id": "temporary", - "start_time": "2017-11-14T16:04:36.546753-05:00" + "autoloading_used": true, + "autoloaded": { + "expiration_time": "2017-11-14T16:34:36.546753-05:00", + "license_id": "some-id", + "start_time": "2017-11-14T16:04:36.546753-05:00" + "features": [ + "UI", + "HSM", + "Performance Replication", + "DR Replication" + ], + }, + "stored": { + "expiration_time": "2017-11-14T16:34:36.546753-05:00", + "license_id": "some-id", + "start_time": "2017-11-14T16:04:36.546753-05:00" + "features": [ + "UI", + "HSM", + "Performance Replication", + "DR Replication" + ], + } }, "warnings": [ "time left on license is 29m33s" diff --git a/ui/app/serializers/license.js b/ui/app/serializers/license.js index f33e28ec2a..0e9f13b8fd 100644 --- a/ui/app/serializers/license.js +++ b/ui/app/serializers/license.js @@ -2,16 +2,16 @@ import ApplicationSerializer from './application'; export default ApplicationSerializer.extend({ normalizeResponse(store, primaryModelClass, payload, id, requestType) { - let transformedPayload = { autoloaded: payload.autoloading_used, license_id: 'no-license' }; - if (payload.autoloaded) { + let transformedPayload = { autoloaded: payload.data.autoloading_used, license_id: 'no-license' }; + if (payload.data.autoloaded) { transformedPayload = { ...transformedPayload, - ...payload.autoloaded, + ...payload.data.autoloaded, }; - } else if (payload.stored) { + } else if (payload.data.stored) { transformedPayload = { ...transformedPayload, - ...payload.stored, + ...payload.data.stored, }; } transformedPayload.id = transformedPayload.license_id; diff --git a/ui/mirage/config.js b/ui/mirage/config.js index 208b3764bc..ed33615b53 100644 --- a/ui/mirage/config.js +++ b/ui/mirage/config.js @@ -33,27 +33,29 @@ export default function() { this.get('/sys/license/status', function() { return { - autoloading_used: false, - stored: { - expiration_time: EXPIRY_DATE, - features: ['DR Replication', 'Namespaces', 'Lease Count Quotas', 'Automated Snapshots'], - license_id: '0eca7ef8-ebc0-f875-315e-3cc94a7870cf', - performance_standby_count: 0, - start_time: '2020-04-28T00:00:00Z', - }, - persisted_autoload: { - expiration_time: EXPIRY_DATE, - features: ['DR Replication', 'Namespaces', 'Lease Count Quotas', 'Automated Snapshots'], - license_id: '0eca7ef8-ebc0-f875-315e-3cc94a7870cf', - performance_standby_count: 0, - start_time: '2020-04-28T00:00:00Z', - }, - autoloaded: { - expiration_time: EXPIRY_DATE, - features: ['DR Replication', 'Namespaces', 'Lease Count Quotas', 'Automated Snapshots'], - license_id: '0eca7ef8-ebc0-f875-315e-3cc94a7870cf', - performance_standby_count: 0, - start_time: '2020-04-28T00:00:00Z', + data: { + autoloading_used: false, + stored: { + expiration_time: EXPIRY_DATE, + features: ['DR Replication', 'Namespaces', 'Lease Count Quotas', 'Automated Snapshots'], + license_id: '0eca7ef8-ebc0-f875-315e-3cc94a7870cf', + performance_standby_count: 0, + start_time: '2020-04-28T00:00:00Z', + }, + persisted_autoload: { + expiration_time: EXPIRY_DATE, + features: ['DR Replication', 'Namespaces', 'Lease Count Quotas', 'Automated Snapshots'], + license_id: '0eca7ef8-ebc0-f875-315e-3cc94a7870cf', + performance_standby_count: 0, + start_time: '2020-04-28T00:00:00Z', + }, + autoloaded: { + expiration_time: EXPIRY_DATE, + features: ['DR Replication', 'Namespaces', 'Lease Count Quotas', 'Automated Snapshots'], + license_id: '0eca7ef8-ebc0-f875-315e-3cc94a7870cf', + performance_standby_count: 0, + start_time: '2020-04-28T00:00:00Z', + }, }, }; });