UI: Allow metrics view without config read (#12348)

* pass default value for defaultSpan on pricing metrics dates component

* Add changelog

* Add test for no config policy
This commit is contained in:
Chelsea Shaw 2021-08-18 15:33:39 -05:00 committed by GitHub
parent 2b3da872b3
commit 92739f494f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 1 deletions

3
changelog/12348.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note: bug
ui: Fixes metrics page when read on counter config not allowed
```

View File

@ -50,7 +50,7 @@
@queryEnd={{model.queryEnd}} @queryEnd={{model.queryEnd}}
@resultStart={{model.activity.startTime}} @resultStart={{model.activity.startTime}}
@resultEnd={{model.activity.endTime}} @resultEnd={{model.activity.endTime}}
@defaultSpan={{model.config.defaultReportMonths}} @defaultSpan={{or model.config.defaultReportMonths 12}}
@retentionMonths={{model.config.retentionMonths}} @retentionMonths={{model.config.retentionMonths}}
/> />
{{#unless model.activity.total}} {{#unless model.activity.total}}

View File

@ -2,9 +2,22 @@ import { module, test } from 'qunit';
import { visit, currentURL, findAll } from '@ember/test-helpers'; import { visit, currentURL, findAll } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit'; import { setupApplicationTest } from 'ember-qunit';
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
import { create } from 'ember-cli-page-object';
import authPage from 'vault/tests/pages/auth'; import authPage from 'vault/tests/pages/auth';
import logout from 'vault/tests/pages/logout'; import logout from 'vault/tests/pages/logout';
import consoleClass from 'vault/tests/pages/components/console/ui-panel';
const consoleComponent = create(consoleClass);
const tokenWithPolicy = async function(name, policy) {
await consoleComponent.runCommands([
`write sys/policies/acl/${name} policy=${btoa(policy)}`,
`write -field=client_token auth/token/create policies=${name}`,
]);
return consoleComponent.lastLogOutput;
};
module('Acceptance | usage metrics', function(hooks) { module('Acceptance | usage metrics', function(hooks) {
setupApplicationTest(hooks); setupApplicationTest(hooks);
@ -65,6 +78,28 @@ module('Acceptance | usage metrics', function(hooks) {
assert.equal(currentURL(), '/vault/metrics'); assert.equal(currentURL(), '/vault/metrics');
assert.dom('[data-test-pricing-metrics-form]').exists('Pricing metrics date form exists'); assert.dom('[data-test-pricing-metrics-form]').exists('Pricing metrics date form exists');
assert.dom('[data-test-configuration-tab]').exists('Metrics config tab exists');
assert.dom('[data-test-tracking-disabled]').doesNotExist('Flash message does not exists');
assert.ok(findAll('.selectable-card').length === 3, 'renders the counts');
});
test('it shows metrics even if config endpoint not allowed', async function(assert) {
server.create('metrics/activity');
const deny_config_policy = `
path "sys/internal/counters/config" {
capabilities = ["deny"]
},
`;
const userToken = await tokenWithPolicy('no-metrics-config', deny_config_policy);
await logout.visit();
await authPage.login(userToken);
await visit('/vault/metrics');
assert.equal(currentURL(), '/vault/metrics');
assert.dom('[data-test-pricing-metrics-form]').exists('Pricing metrics date form exists');
assert.dom('[data-test-configuration-tab]').doesNotExist('Metrics config tab does not exist');
assert.dom('[data-test-tracking-disabled]').doesNotExist('Flash message does not exists'); assert.dom('[data-test-tracking-disabled]').doesNotExist('Flash message does not exists');
assert.ok(findAll('.selectable-card').length === 3, 'renders the counts'); assert.ok(findAll('.selectable-card').length === 3, 'renders the counts');
}); });