mirror of
https://github.com/hashicorp/vault.git
synced 2025-08-24 08:01: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>
173 lines
6.0 KiB
JavaScript
173 lines
6.0 KiB
JavaScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import Component from '@glimmer/component';
|
|
import { action } from '@ember/object';
|
|
import { tracked } from '@glimmer/tracking';
|
|
import { max } from 'd3-array';
|
|
// eslint-disable-next-line no-unused-vars
|
|
import { select, selectAll, node } from 'd3-selection';
|
|
import { axisLeft, axisBottom } from 'd3-axis';
|
|
import { scaleLinear, scalePoint } from 'd3-scale';
|
|
import { stack } from 'd3-shape';
|
|
import {
|
|
BAR_WIDTH,
|
|
GREY,
|
|
BLUE_PALETTE,
|
|
SVG_DIMENSIONS,
|
|
TRANSLATE,
|
|
calculateSum,
|
|
formatNumbers,
|
|
} from 'vault/utils/chart-helpers';
|
|
import { formatNumber } from 'core/helpers/format-number';
|
|
|
|
/**
|
|
* @module VerticalBarChart
|
|
* VerticalBarChart components are used to display stacked data in a vertical bar chart with accompanying tooltip
|
|
*
|
|
* @example
|
|
* ```js
|
|
* <VerticalBarChart @dataset={dataset} @chartLegend={chartLegend} />
|
|
* ```
|
|
* @param {array} dataset - dataset for the chart, must be an array of flattened objects
|
|
* @param {array} chartLegend - array of objects with key names 'key' and 'label' so data can be stacked
|
|
* @param {string} xKey - string denoting key for x-axis data (data[xKey]) of dataset
|
|
* @param {string} yKey - string denoting key for y-axis data (data[yKey]) of dataset
|
|
* @param {string} [noDataMessage] - custom empty state message that displays when no dataset is passed to the chart
|
|
*/
|
|
|
|
export default class VerticalBarChart extends Component {
|
|
@tracked tooltipTarget = '';
|
|
@tracked tooltipTotal = '';
|
|
@tracked tooltipStats = [];
|
|
|
|
get xKey() {
|
|
return this.args.xKey || 'month';
|
|
}
|
|
|
|
get yKey() {
|
|
return this.args.yKey || 'clients';
|
|
}
|
|
|
|
@action
|
|
renderChart(element, [chartData]) {
|
|
const dataset = chartData;
|
|
const filteredData = dataset.filter((e) => Object.keys(e).includes('clients')); // months with data will contain a 'clients' key (otherwise only a timestamp)
|
|
const stackFunction = stack().keys(this.args.chartLegend.map((l) => l.key));
|
|
const stackedData = stackFunction(filteredData);
|
|
const chartSvg = select(element);
|
|
const domainMax = max(filteredData.map((d) => d[this.yKey]));
|
|
|
|
chartSvg.attr('viewBox', `-50 20 600 ${SVG_DIMENSIONS.height}`); // set svg dimensions
|
|
|
|
// DEFINE DATA BAR SCALES
|
|
const yScale = scaleLinear().domain([0, domainMax]).range([0, 100]).nice();
|
|
|
|
const xScale = scalePoint()
|
|
.domain(dataset.map((d) => d[this.xKey]))
|
|
.range([0, SVG_DIMENSIONS.width]) // set width to fix number of pixels
|
|
.padding(0.2);
|
|
|
|
// clear out DOM before appending anything
|
|
chartSvg.selectAll('g').remove().exit().data(stackedData).enter();
|
|
const dataBars = chartSvg
|
|
.selectAll('g')
|
|
.data(stackedData)
|
|
.enter()
|
|
.append('g')
|
|
.style('fill', (d, i) => BLUE_PALETTE[i]);
|
|
|
|
dataBars
|
|
.selectAll('rect')
|
|
.data((stackedData) => stackedData)
|
|
.enter()
|
|
.append('rect')
|
|
.attr('width', `${BAR_WIDTH}px`)
|
|
.attr('class', 'data-bar')
|
|
.attr('data-test-vertical-chart', 'data-bar')
|
|
.attr('height', (stackedData) => `${yScale(stackedData[1] - stackedData[0])}%`)
|
|
.attr('x', ({ data }) => xScale(data[this.xKey])) // uses destructuring because was data.data.month
|
|
.attr('y', (data) => `${100 - yScale(data[1])}%`); // subtract higher than 100% to give space for x axis ticks
|
|
|
|
const tooltipTether = chartSvg
|
|
.append('g')
|
|
.attr('transform', `translate(${BAR_WIDTH / 2})`)
|
|
.attr('data-test-vertical-chart', 'tooltip-tethers')
|
|
.selectAll('circle')
|
|
.data(filteredData)
|
|
.enter()
|
|
.append('circle')
|
|
.style('opacity', '0')
|
|
.attr('cy', (d) => `${100 - yScale(d[this.yKey])}%`)
|
|
.attr('cx', (d) => xScale(d[this.xKey]))
|
|
.attr('r', 1);
|
|
|
|
// MAKE AXES //
|
|
const yAxisScale = scaleLinear()
|
|
.domain([0, max(filteredData.map((d) => d[this.yKey]))])
|
|
.range([`${SVG_DIMENSIONS.height}`, 0])
|
|
.nice();
|
|
|
|
const yAxis = axisLeft(yAxisScale)
|
|
.ticks(4)
|
|
.tickPadding(10)
|
|
.tickSizeInner(-SVG_DIMENSIONS.width)
|
|
.tickFormat(formatNumbers);
|
|
|
|
const xAxis = axisBottom(xScale).tickSize(0);
|
|
|
|
yAxis(chartSvg.append('g').attr('data-test-vertical-chart', 'y-axis-labels'));
|
|
xAxis(
|
|
chartSvg
|
|
.append('g')
|
|
.attr('transform', `translate(0, ${SVG_DIMENSIONS.height + 10})`)
|
|
.attr('data-test-vertical-chart', 'x-axis-labels')
|
|
);
|
|
|
|
chartSvg.selectAll('.domain').remove(); // remove domain lines
|
|
|
|
// WIDER SELECTION AREA FOR TOOLTIP HOVER
|
|
const greyBars = chartSvg
|
|
.append('g')
|
|
.attr('transform', `translate(${TRANSLATE.left})`)
|
|
.style('fill', `${GREY}`)
|
|
.style('opacity', '0')
|
|
.style('mix-blend-mode', 'multiply');
|
|
|
|
const tooltipRect = greyBars
|
|
.selectAll('rect')
|
|
.data(filteredData)
|
|
.enter()
|
|
.append('rect')
|
|
.style('cursor', 'pointer')
|
|
.attr('class', 'tooltip-rect')
|
|
.attr('height', '100%')
|
|
.attr('width', '30px') // three times width
|
|
.attr('y', '0') // start at bottom
|
|
.attr('x', (data) => xScale(data[this.xKey])); // not data.data because this is not stacked data
|
|
|
|
// MOUSE EVENT FOR TOOLTIP
|
|
tooltipRect.on('mouseover', (data) => {
|
|
const hoveredMonth = data[this.xKey];
|
|
const stackedNumbers = []; // accumulates stacked dataset values to calculate total
|
|
this.tooltipStats = []; // clear stats
|
|
this.args.chartLegend.forEach(({ key, label }) => {
|
|
stackedNumbers.push(data[key]);
|
|
this.tooltipStats.pushObject(`${formatNumber([data[key]])} ${label}`);
|
|
});
|
|
this.tooltipTotal = `${formatNumber([calculateSum(stackedNumbers)])} ${
|
|
data.new_clients ? 'total' : 'new'
|
|
} clients`;
|
|
// filter for the tether point that matches the hoveredMonth
|
|
const hoveredElement = tooltipTether.filter((data) => data.month === hoveredMonth).node();
|
|
this.tooltipTarget = hoveredElement; // grab the node from the list of rects
|
|
});
|
|
}
|
|
|
|
@action removeTooltip() {
|
|
this.tooltipTarget = null;
|
|
}
|
|
}
|