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>
177 lines
6.4 KiB
TypeScript
177 lines
6.4 KiB
TypeScript
/**
|
|
* Copyright (c) HashiCorp, Inc.
|
|
* SPDX-License-Identifier: BUSL-1.1
|
|
*/
|
|
|
|
import Component from '@glimmer/component';
|
|
import { service } from '@ember/service';
|
|
import { action } from '@ember/object';
|
|
import { fromUnixTime, getUnixTime, isSameMonth, isAfter } from 'date-fns';
|
|
import { parseAPITimestamp } from 'core/utils/date-formatters';
|
|
import { formatDateObject } from 'core/utils/client-count-utils';
|
|
|
|
import type VersionService from 'vault/services/version';
|
|
import type ClientsActivityModel from 'vault/models/clients/activity';
|
|
import type ClientsConfigModel from 'vault/models/clients/config';
|
|
import type StoreService from 'vault/services/store';
|
|
import timestamp from 'core/utils/timestamp';
|
|
|
|
interface Args {
|
|
activity: ClientsActivityModel;
|
|
config: ClientsConfigModel;
|
|
startTimestamp: number;
|
|
endTimestamp: number;
|
|
namespace: string;
|
|
mountPath: string;
|
|
onFilterChange: CallableFunction;
|
|
}
|
|
|
|
export default class ClientsCountsPageComponent extends Component<Args> {
|
|
@service declare readonly version: VersionService;
|
|
@service declare readonly store: StoreService;
|
|
|
|
get startTimestampISO() {
|
|
return this.args.startTimestamp ? fromUnixTime(this.args.startTimestamp).toISOString() : null;
|
|
}
|
|
|
|
get endTimestampISO() {
|
|
return this.args.endTimestamp ? fromUnixTime(this.args.endTimestamp).toISOString() : null;
|
|
}
|
|
|
|
get formattedStartDate() {
|
|
return this.startTimestampISO ? parseAPITimestamp(this.startTimestampISO, 'MMMM yyyy') : null;
|
|
}
|
|
|
|
// returns text for empty state message if noActivityData
|
|
get dateRangeMessage() {
|
|
if (this.startTimestampISO && this.endTimestampISO) {
|
|
const endMonth = isSameMonth(
|
|
parseAPITimestamp(this.startTimestampISO) as Date,
|
|
parseAPITimestamp(this.endTimestampISO) as Date
|
|
)
|
|
? ''
|
|
: `to ${parseAPITimestamp(this.endTimestampISO, 'MMMM yyyy')}`;
|
|
// completes the message 'No data received from { dateRangeMessage }'
|
|
return `from ${parseAPITimestamp(this.startTimestampISO, 'MMMM yyyy')} ${endMonth}`;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
get versionText() {
|
|
return this.version.isEnterprise
|
|
? {
|
|
label: 'Billing start month',
|
|
description:
|
|
'This date comes from your license, and defines when client counting starts. Without this starting point, the data shown is not reliable.',
|
|
title: 'No billing start date found',
|
|
message:
|
|
'In order to get the most from this data, please enter your billing period start month. This will ensure that the resulting data is accurate.',
|
|
}
|
|
: {
|
|
label: 'Client counting start date',
|
|
description:
|
|
'This date is when client counting starts. Without this starting point, the data shown is not reliable.',
|
|
title: 'No start date found',
|
|
message:
|
|
'In order to get the most from this data, please enter a start month above. Vault will calculate new clients starting from that month.',
|
|
};
|
|
}
|
|
|
|
get namespaces() {
|
|
return this.args.activity.byNamespace
|
|
? this.args.activity.byNamespace.map((namespace) => ({
|
|
name: namespace.label,
|
|
id: namespace.label,
|
|
}))
|
|
: [];
|
|
}
|
|
|
|
get mountPaths() {
|
|
if (this.namespaces.length) {
|
|
return this.activityForNamespace?.mounts.map((mount) => ({
|
|
id: mount.label,
|
|
name: mount.label,
|
|
}));
|
|
}
|
|
return [];
|
|
}
|
|
|
|
get startTimeDiscrepancy() {
|
|
// show banner if startTime returned from activity log (response) is after the queried startTime
|
|
const { activity, config } = this.args;
|
|
const activityStartDateObject = parseAPITimestamp(activity.startTime) as Date;
|
|
const queryStartDateObject = parseAPITimestamp(this.startTimestampISO) as Date;
|
|
const isEnterprise =
|
|
this.startTimestampISO === config.billingStartTimestamp?.toISOString() && this.version.isEnterprise;
|
|
const message = isEnterprise ? 'Your license start date is' : 'You requested data from';
|
|
|
|
if (
|
|
isAfter(activityStartDateObject, queryStartDateObject) &&
|
|
!isSameMonth(activityStartDateObject, queryStartDateObject)
|
|
) {
|
|
return `${message} ${this.formattedStartDate}.
|
|
We only have data from ${parseAPITimestamp(activity.startTime, 'MMMM yyyy')},
|
|
and that is what is being shown here.`;
|
|
} else {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
get activityForNamespace() {
|
|
const { activity, namespace } = this.args;
|
|
return namespace ? activity.byNamespace.find((ns) => ns.label === namespace) : null;
|
|
}
|
|
|
|
get filteredActivity() {
|
|
// return activity counts based on selected namespace and auth mount values
|
|
const { namespace, mountPath, activity } = this.args;
|
|
if (namespace) {
|
|
return mountPath
|
|
? this.activityForNamespace?.mounts.find((mount) => mount.label === mountPath)
|
|
: this.activityForNamespace;
|
|
}
|
|
return activity.total;
|
|
}
|
|
|
|
@action
|
|
onDateChange(dateObject: { dateType: string; monthIdx: string; year: string }) {
|
|
const { dateType, monthIdx, year } = dateObject;
|
|
const { config } = this.args;
|
|
const currentTimestamp = getUnixTime(timestamp.now());
|
|
|
|
// converts the selectedDate to unix timestamp for activity query
|
|
const selectedDate = formatDateObject({ monthIdx, year }, dateType === 'endDate');
|
|
|
|
if (dateType !== 'cancel') {
|
|
const start_time = {
|
|
reset: getUnixTime(config?.billingStartTimestamp) || null, // clicked 'Current billing period' in calendar widget -> resets to billing start date
|
|
currentMonth: currentTimestamp, // clicked 'Current month' from calendar widget -> defaults to currentTimestamp
|
|
startDate: selectedDate, // from "Edit billing start" modal
|
|
}[dateType];
|
|
// endDate type is selection from calendar widget
|
|
const end_time = dateType === 'endDate' ? selectedDate : currentTimestamp; // defaults to currentTimestamp
|
|
const params = start_time !== undefined ? { start_time, end_time } : { end_time };
|
|
this.args.onFilterChange(params);
|
|
}
|
|
}
|
|
|
|
@action
|
|
setFilterValue(type: 'ns' | 'mountPath', [value]: [string | undefined]) {
|
|
const params = { [type]: value };
|
|
// unset mountPath value when namespace is cleared
|
|
if (type === 'ns' && !value) {
|
|
params['mountPath'] = undefined;
|
|
}
|
|
this.args.onFilterChange(params);
|
|
}
|
|
|
|
@action resetFilters() {
|
|
this.args.onFilterChange({
|
|
start_time: undefined,
|
|
end_time: undefined,
|
|
ns: undefined,
|
|
mountPath: undefined,
|
|
});
|
|
}
|
|
}
|