mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-19 13:41:10 +02:00
* Client Count Routing Updates (#24733) * updates client count routing for sync and future additions * adds copyright header to clients sync template * adds missing copyright headers * UI: Adds secret_syncs to mirage /activity endpoint (#24846) * add secret_syncs to mirage endpoint * import clients handler * UI: Set up client charts for incoming sync data (#24852) * sum stacked bar values for tooltip total * make tooltip dynamic based on chartLegend * remove redundant helper * add secret_syncs to client count utils * move sum function to helper * update horizontal bar chart to include sync_clients * calculate sum of bars in tooltip * rename color palette const, define chart legends in each parent component instead of token.js * update tooltips * update mirage handler to add sys/ namespace * update mirage handler to add sys/ namespace * use pushObject * update test * UI: Secret sync bar chart (#24926) * install lineal * add ember-style-modifier dep * Add client count types for serialized data * Add sync bar chart component with tests * Chart is responsive * address comments * Clients Counts Parent Route (#24899) * adds interfaces for clients models * moves date formatting logic from clients activity adapter to utils file * adds clients counts route * updates links to clients route to point to top level and updates redirect to counts overview route * removes clients base route and moves overview and sync routes under counts * adds clients counts page component * converts clients route to ts * adds billing start timestamp to clients config mirage response and updates counts route to always attempt to fetch activity * fixes issue with updating namespace and auth mount query params always triggering client counts route model hook * adds tests for clients counts page component * adds missing copyright header to client-counts type file * Update ui/app/components/clients/page/counts.hbs Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> * fixes bad import in sync-bar-chart * updates clients counts route to bypass query if there is not start_time * pins d3-shape to 1.3.7 for now -- makes lineal play nice with old charts * fixes sync bar chart tooltip assertion --------- Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> * UI: convert line-chart to lineal (#24961) * lineal chart alongside svg * Add version-history to sync handler for testing * line chart is TS, test updated * remove d3-shape resolution * fix clients/token-test * use chartHeight in running-total template * use M/yy key instead of timestamp, chart is responsive * Add test for swapping datasets * add more edge case tests * more test * remove untrue assertion * fix weird decimal when between 1.1k and 2k * address feedback * Update line-chart to use timestamp instead of month key * Add timestamp to all places where month is on the clients activity response * Client Counts Overview (#24969) * adds counts base component for use in client counts child routes * adds clients counts overview page component * splits out monthly new chart from clients running total component * adds missing copyright headers * moves running total related assertions from token to overview acceptance test * removes new client assertions from running-total test and adds tests for monthly-new component * updates copy in running-total component * fixes clients overview tests * fixes timestamp stub not being restored in monthly-new test * fixes mfa-login test * renames counts component to activity * removes unused selectedAuthMethod arg from running-total component * adds timestamp back to running-total component * Secrets sync UI: add sync page component (#24982) * adds counts base component for use in client counts child routes * adds clients counts overview page component * splits out monthly new chart from clients running total component * adds missing copyright headers * move sync-bar-chart to charts/ folder * update types and rename chart * rename template file * moves running total related assertions from token to overview acceptance test * removes new client assertions from running-total test and adds tests for monthly-new component * updates copy in running-total component * fixes clients overview tests * fixes timestamp stub not being restored in monthly-new test * fixes mfa-login test * fix 0 values erroring charts * separate timestamp again * address merge conflicts * finish building sync chart component WIP css * renames counts component to activity * update import * revert name to dataKey * update styling for charts without legends * use monthly stat chart component for layout * use monthly chart stats in monthly new * implement stat wrapper; * remove extra grid div * rename component * fix legend css; * update test[ * remove arbitrarily setting max * add single month view * use stat text * update line chart tests * rename line chart * update tests --------- Co-authored-by: Jordan Reimer <zofskeez@gmail.com> * update selectors * add sync page tests * Secrets Sync UI: Add secrets syncs to csv export (#25056) * update mirage and add sync clients to export csv * fix sync legend label * remove word * update copy in modal * update mirage * fix attribution tooltip text * Clients Counts Token Route (#25019) * renames token route and page component back to dashboard * adds client counts token route and page component * updates charts in token page to use ChartContainer component * adds tests for clients token page component * restore clients dashboard test * use var for chart title sync page * updates clients token page to show usage stats when querying single month * updates token page clients averages to only include entity and non-entity clients in calculation * fixes monthly total counts lower than new clients in mirage handler * fixes token test --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> * Clients Usage Stats/Running Total Updates (#25094) * updates clients usage counts and running totals * updates usage stats total copy * fixes client counts overview tests * Secrets sync UI: cleanup and consolidation of components (#25090) * rename authMethod to mountPath * generalize count template copy * add todo to delete monthly new component * rename to tokenTab * wrap filters in conditional checking for start timestamp * some users may not have access to /config endpoint * fix querying when user has no billing date permissions and clicks current billing period * extend activity component from counts page * Revert "extend activity component from counts page" This reverts commit 1d0e85c82faf88c4385a04b1a5841cdde7fd00e0. * rename to startTimestampISO * remove timestamp from route and just use activity model responseTimestamp * fix chart y domain max * fix typos in usage stat and running totals component * delete backing class for display only template; * updates tests * adds comment for fetching license to get start date for billing * cleans up unused client counts files (#25157) * adds changelog * fix assertion copy * adds changelog description * updates enterprise sidebar nav test --------- Co-authored-by: clairebontempo@gmail.com <clairebontempo@gmail.com> Co-authored-by: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Co-authored-by: Chelsea Shaw <82459713+hashishaw@users.noreply.github.com>
189 lines
7.2 KiB
JavaScript
189 lines
7.2 KiB
JavaScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import { module, test } from 'qunit';
|
|
import { setupRenderingTest } from 'ember-qunit';
|
|
import { setupMirage } from 'ember-cli-mirage/test-support';
|
|
import { render, findAll } from '@ember/test-helpers';
|
|
import hbs from 'htmlbars-inline-precompile';
|
|
import clientsHandler from 'vault/mirage/handlers/clients';
|
|
import { getUnixTime } from 'date-fns';
|
|
import { calculateAverage } from 'vault/utils/chart-helpers';
|
|
import { formatNumber } from 'core/helpers/format-number';
|
|
import { dateFormat } from 'core/helpers/date-format';
|
|
import { SELECTORS as ts } from 'vault/tests/helpers/clients';
|
|
|
|
const START_TIME = getUnixTime(new Date('2023-10-01T00:00:00Z'));
|
|
const END_TIME = getUnixTime(new Date('2024-01-31T23:59:59Z'));
|
|
|
|
module('Integration | Component | clients | Page::Token', function (hooks) {
|
|
setupRenderingTest(hooks);
|
|
setupMirage(hooks);
|
|
|
|
hooks.beforeEach(async function () {
|
|
clientsHandler(this.server);
|
|
const store = this.owner.lookup('service:store');
|
|
const activityQuery = {
|
|
start_time: { timestamp: START_TIME },
|
|
end_time: { timestamp: END_TIME },
|
|
};
|
|
this.activity = await store.queryRecord('clients/activity', activityQuery);
|
|
this.newActivity = this.activity.byMonth.map((d) => d.new_clients);
|
|
this.versionHistory = await store
|
|
.findAll('clients/version-history')
|
|
.then((response) => {
|
|
return response.map(({ version, previousVersion, timestampInstalled }) => {
|
|
return {
|
|
version,
|
|
previousVersion,
|
|
timestampInstalled,
|
|
};
|
|
});
|
|
})
|
|
.catch(() => []);
|
|
this.startTimestamp = START_TIME;
|
|
this.endTimestamp = END_TIME;
|
|
this.renderComponent = () =>
|
|
render(hbs`
|
|
<Clients::Page::Token
|
|
@activity={{this.activity}}
|
|
@versionHistory={{this.versionHistory}}
|
|
@startTimestamp={{this.startTimestamp}}
|
|
@endTimestamp={{this.endTimestamp}}
|
|
@namespace={{this.ns}}
|
|
@mountPath={{this.mountPath}}
|
|
/>
|
|
`);
|
|
});
|
|
|
|
test('it should render monthly total chart', async function (assert) {
|
|
const getAverage = (data) => {
|
|
const average = ['entity_clients', 'non_entity_clients'].reduce((count, key) => {
|
|
return (count += calculateAverage(data, key) || 0);
|
|
}, 0);
|
|
return formatNumber([average]);
|
|
};
|
|
const expectedTotal = getAverage(this.activity.byMonth);
|
|
const expectedNew = getAverage(this.newActivity);
|
|
const chart = ts.charts.chart('monthly total');
|
|
|
|
await this.renderComponent();
|
|
|
|
assert
|
|
.dom(ts.charts.statTextValue('Average total clients per month'))
|
|
.hasText(expectedTotal, 'renders correct total clients');
|
|
assert
|
|
.dom(ts.charts.statTextValue('Average new clients per month'))
|
|
.hasText(expectedNew, 'renders correct new clients');
|
|
// assert bar chart is correct
|
|
findAll(`${chart} ${ts.charts.bar.xAxisLabel}`).forEach((e, i) => {
|
|
assert
|
|
.dom(e)
|
|
.hasText(
|
|
`${this.activity.byMonth[i].month}`,
|
|
`renders x-axis labels for bar chart: ${this.activity.byMonth[i].month}`
|
|
);
|
|
});
|
|
assert
|
|
.dom(`${chart} ${ts.charts.bar.dataBar}`)
|
|
.exists(
|
|
{ count: this.activity.byMonth.filter((m) => m.counts !== null).length * 2 },
|
|
'renders correct number of data bars'
|
|
);
|
|
const formattedTimestamp = dateFormat([this.activity.responseTimestamp, 'MMM d yyyy, h:mm:ss aaa'], {
|
|
withTimeZone: true,
|
|
});
|
|
assert
|
|
.dom(`${chart} ${ts.charts.timestamp}`)
|
|
.hasText(`Updated ${formattedTimestamp}`, 'renders timestamp');
|
|
assert.dom(`${chart} ${ts.charts.legendLabel(1)}`).hasText('Entity clients', 'Legend label renders');
|
|
assert.dom(`${chart} ${ts.charts.legendLabel(2)}`).hasText('Non-entity clients', 'Legend label renders');
|
|
});
|
|
|
|
test('it should render monthly new chart', async function (assert) {
|
|
const expectedNewEntity = formatNumber([calculateAverage(this.newActivity, 'entity_clients')]);
|
|
const expectedNewNonEntity = formatNumber([calculateAverage(this.newActivity, 'non_entity_clients')]);
|
|
const chart = ts.charts.chart('monthly new');
|
|
|
|
await this.renderComponent();
|
|
|
|
assert
|
|
.dom(ts.charts.statTextValue('Average new entity clients per month'))
|
|
.hasText(expectedNewEntity, 'renders correct new entity clients');
|
|
assert
|
|
.dom(ts.charts.statTextValue('Average new non-entity clients per month'))
|
|
.hasText(expectedNewNonEntity, 'renders correct new nonentity clients');
|
|
// assert bar chart is correct
|
|
findAll(`${chart} ${ts.charts.bar.xAxisLabel}`).forEach((e, i) => {
|
|
assert
|
|
.dom(e)
|
|
.hasText(
|
|
`${this.activity.byMonth[i].month}`,
|
|
`renders x-axis labels for bar chart: ${this.activity.byMonth[i].month}`
|
|
);
|
|
});
|
|
assert
|
|
.dom(`${chart} ${ts.charts.bar.dataBar}`)
|
|
.exists(
|
|
{ count: this.activity.byMonth.filter((m) => m.counts !== null).length * 2 },
|
|
'renders correct number of data bars'
|
|
);
|
|
const formattedTimestamp = dateFormat([this.activity.responseTimestamp, 'MMM d yyyy, h:mm:ss aaa'], {
|
|
withTimeZone: true,
|
|
});
|
|
assert
|
|
.dom(`${chart} ${ts.charts.timestamp}`)
|
|
.hasText(`Updated ${formattedTimestamp}`, 'renders timestamp');
|
|
assert.dom(`${chart} ${ts.charts.legendLabel(1)}`).hasText('Entity clients', 'Legend label renders');
|
|
assert.dom(`${chart} ${ts.charts.legendLabel(2)}`).hasText('Non-entity clients', 'Legend label renders');
|
|
});
|
|
|
|
test('it should render empty state for no new monthly data', async function (assert) {
|
|
this.activity.byMonth = this.activity.byMonth.map((d) => ({
|
|
...d,
|
|
new_clients: { month: d.month },
|
|
}));
|
|
const chart = ts.charts.chart('monthly-new');
|
|
|
|
await this.renderComponent();
|
|
|
|
assert.dom(`${chart} ${ts.charts.verticalBar}`).doesNotExist('Chart does not render');
|
|
assert.dom(`${chart} ${ts.charts.legend}`).doesNotExist('Legend does not render');
|
|
assert.dom(ts.emptyStateTitle).hasText('No new clients');
|
|
assert.dom(ts.tokenTab.entity).doesNotExist('New client counts does not exist');
|
|
assert.dom(ts.tokenTab.nonentity).doesNotExist('Average new client counts does not exist');
|
|
});
|
|
|
|
test('it should render usage stats', async function (assert) {
|
|
assert.expect(6);
|
|
|
|
this.activity.endTime = this.activity.startTime;
|
|
const {
|
|
total: { entity_clients, non_entity_clients },
|
|
} = this.activity;
|
|
|
|
const checkUsage = () => {
|
|
assert
|
|
.dom(ts.charts.statTextValue('Total clients'))
|
|
.hasText(formatNumber([entity_clients + non_entity_clients]), 'Total clients value renders');
|
|
assert
|
|
.dom(ts.charts.statTextValue('Entity clients'))
|
|
.hasText(formatNumber([entity_clients]), 'Entity clients value renders');
|
|
assert
|
|
.dom(ts.charts.statTextValue('Non-entity clients'))
|
|
.hasText(formatNumber([non_entity_clients]), 'Non-entity clients value renders');
|
|
};
|
|
|
|
// total usage should display for single month query
|
|
await this.renderComponent();
|
|
checkUsage();
|
|
|
|
// total usage should display when there is no monthly data
|
|
this.activity.byMonth = null;
|
|
await this.renderComponent();
|
|
checkUsage();
|
|
});
|
|
});
|