mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-21 06:31:07 +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>
145 lines
4.6 KiB
TypeScript
145 lines
4.6 KiB
TypeScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import Component from '@glimmer/component';
|
|
import { SVG_DIMENSIONS, formatNumbers } from 'vault/utils/chart-helpers';
|
|
import { parseAPITimestamp } from 'core/utils/date-formatters';
|
|
import { format, isValid } from 'date-fns';
|
|
import { debug } from '@ember/debug';
|
|
|
|
import type { Count, MonthlyChartData, Timestamp } from 'vault/vault/charts/client-counts';
|
|
import type ClientsVersionHistoryModel from 'vault/models/clients/version-history';
|
|
|
|
interface Args {
|
|
dataset: MonthlyChartData[];
|
|
upgradeData: ClientsVersionHistoryModel[];
|
|
xKey?: string;
|
|
yKey?: string;
|
|
chartHeight?: number;
|
|
}
|
|
|
|
interface ChartData {
|
|
x: Date;
|
|
y: number | null;
|
|
new: number;
|
|
tooltipUpgrade: string | null;
|
|
month: string; // used for test selectors and to match key on upgradeData
|
|
}
|
|
|
|
interface UpgradeByMonth {
|
|
[key: string]: ClientsVersionHistoryModel;
|
|
}
|
|
|
|
/**
|
|
* @module LineChart
|
|
* LineChart components are used to display time-based data in a line plot with accompanying tooltip
|
|
*
|
|
* @example
|
|
* ```js
|
|
* <LineChart @dataset={{dataset}} @upgradeData={{this.versionHistory}}/>
|
|
* ```
|
|
* @param {array} dataset - array of objects containing data to be plotted
|
|
* @param {string} [xKey=clients] - string denoting key for x-axis data of dataset. Should reference a timestamp string.
|
|
* @param {string} [yKey=timestamp] - string denoting key for y-axis data of dataset. Should reference a number or null.
|
|
* @param {array} [upgradeData=null] - array of objects containing version history from the /version-history endpoint
|
|
* @param {number} [chartHeight=190] - height of chart in pixels
|
|
*/
|
|
export default class LineChart extends Component<Args> {
|
|
// Chart settings
|
|
get yKey() {
|
|
return this.args.yKey || 'clients';
|
|
}
|
|
get xKey() {
|
|
return this.args.xKey || 'timestamp';
|
|
}
|
|
get chartHeight() {
|
|
return this.args.chartHeight || SVG_DIMENSIONS.height;
|
|
}
|
|
// Plot points
|
|
get data(): ChartData[] {
|
|
try {
|
|
return this.args.dataset?.map((datum) => {
|
|
const timestamp = parseAPITimestamp(datum[this.xKey as keyof Timestamp]) as Date;
|
|
if (isValid(timestamp) === false)
|
|
throw new Error(`Unable to parse value "${datum[this.xKey as keyof Timestamp]}" as date`);
|
|
const upgradeMessage = this.getUpgradeMessage(datum);
|
|
return {
|
|
x: timestamp,
|
|
y: (datum[this.yKey as keyof Count] as number) ?? null,
|
|
new: this.getNewClients(datum),
|
|
tooltipUpgrade: upgradeMessage,
|
|
month: datum.month,
|
|
};
|
|
});
|
|
} catch (e) {
|
|
debug(e as string);
|
|
return [];
|
|
}
|
|
}
|
|
get upgradedMonths() {
|
|
return this.data.filter((datum) => datum.tooltipUpgrade);
|
|
}
|
|
// Domains
|
|
get yDomain() {
|
|
const counts: number[] = this.data
|
|
.map((d) => d.y)
|
|
.flatMap((num) => (typeof num === 'number' ? [num] : []));
|
|
const max = Math.max(...counts);
|
|
// if max is <=4, hardcode 4 which is the y-axis tickCount so y-axes are not decimals
|
|
return [0, max <= 4 ? 4 : max];
|
|
}
|
|
get timeDomain() {
|
|
// assume data is sorted by time
|
|
const firstTime = this.data[0]?.x;
|
|
const lastTime = this.data[this.data.length - 1]?.x;
|
|
return [firstTime, lastTime];
|
|
}
|
|
|
|
get upgradeByMonthYear(): UpgradeByMonth {
|
|
const empty: UpgradeByMonth = {};
|
|
if (!Array.isArray(this.args.upgradeData)) return empty;
|
|
return (
|
|
this.args.upgradeData?.reduce((acc, upgrade) => {
|
|
if (upgrade.timestampInstalled) {
|
|
const key = parseAPITimestamp(upgrade.timestampInstalled, 'M/yy');
|
|
acc[key as string] = upgrade;
|
|
}
|
|
return acc;
|
|
}, empty) || empty
|
|
);
|
|
}
|
|
|
|
getUpgradeMessage(datum: MonthlyChartData) {
|
|
const upgradeInfo = this.upgradeByMonthYear[datum.month as string];
|
|
if (upgradeInfo) {
|
|
const { version, previousVersion } = upgradeInfo;
|
|
return `Vault was upgraded
|
|
${previousVersion ? 'from ' + previousVersion : ''} to ${version}`;
|
|
}
|
|
return null;
|
|
}
|
|
getNewClients(datum: MonthlyChartData) {
|
|
if (!datum?.new_clients) return 0;
|
|
return (datum?.new_clients[this.yKey as keyof Count] as number) || 0;
|
|
}
|
|
|
|
hasValue = (count: number | null) => {
|
|
return typeof count === 'number' ? true : false;
|
|
};
|
|
// These functions are used by the tooltip
|
|
formatCount = (count: number) => {
|
|
return formatNumbers([count]);
|
|
};
|
|
formatMonth = (date: Date) => {
|
|
return format(date, 'M/yy');
|
|
};
|
|
tooltipX = (original: number) => {
|
|
return original.toString();
|
|
};
|
|
tooltipY = (original: number) => {
|
|
return `${this.chartHeight - original + 15}`;
|
|
};
|
|
}
|