From 4a9610f3825dd40116f68364406b4d40c9f7a233 Mon Sep 17 00:00:00 2001 From: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Date: Thu, 26 Jan 2023 18:21:12 -0800 Subject: [PATCH] UI: combine current + history client count tabs into one dashboard (#17575) * WIP/initial routing-ish * refactor date dropdown to reuse in modal and allowe current month selection * swap linter disable line * refactor date-dropdown to return object * refactor calendar widget, add tests * change calendar start and end args to getters * refactor dashboard to use date objects instead of array of year, month * remove dashboard files for easier to follow git diff * comment out dashboard tab until route name updated * delete current tab and route * fix undefined banner time * cleanup version history serializer and upgrade data * first pass of updating tests * add changelog * update client count util test * validate end time is after start time * update comment * add current month to calendar widget * add comments for code changes to make following API update * Removed a modified file from pull request * address comments/cleanup * update variables to const * update test const * rename history -> dashboard, fix tests * fix timestamps for attribution chart * update release note * refactor using backend start and end time params * add test for adapter formatting time params * fix tests * cleanup adapter comment and query params * change back history file name for diff * rename file using cli * revert filenames * rename files via git cli * revert route file name * last cli rename * refactor mirage * hold off on running total changes * update params in test * refactor to remove conditional assertions * finish tests * fix firefox tooltip * remove current-when * refactor version history * add timezone/UTC note * final cleanup!!!! * fix test * fix client count date tests * fix date-dropdown test * clear datedropdown completely * update date selectors to accommodate new year (#18586) * Revert "hold off on running total changes" This reverts commit 8dc79a626d549df83bc47e290392a556c670f98f. * remove assumed 0 values * update average helper to only calculate for array of objects * remove passing in bar chart data, map in running totals component instead * cleanup usage stat component * clear ss filters for new queries * update csv export, add explanation to modal * update test copy * consistently return null if no upgrade during activity (instead of empty array) * update description, add clarifying comments * update tes * add more clarifying comments * fix historic single month chart * remove old test tag * Update ui/app/components/clients/dashboard.js --- changelog/17575.txt | 3 + ui/app/adapters/clients/activity.js | 50 +- ui/app/adapters/clients/monthly.js | 13 - ui/app/adapters/clients/version-history.js | 8 +- ui/app/components/calendar-widget.js | 138 +- ui/app/components/clients/attribution.js | 56 +- ui/app/components/clients/current.js | 152 - ui/app/components/clients/dashboard.js | 371 ++ ui/app/components/clients/history.js | 393 -- ui/app/components/clients/line-chart.js | 6 +- ui/app/components/clients/monthly-usage.js | 2 +- ui/app/components/clients/running-total.js | 44 +- .../components/clients/vertical-bar-chart.js | 6 +- ui/app/components/date-dropdown.js | 82 +- ui/app/models/clients/activity.js | 2 - ui/app/models/clients/config.js | 2 +- ui/app/models/clients/monthly.js | 6 - ui/app/models/clients/version-history.js | 1 + ui/app/router.js | 3 +- ui/app/routes/vault/cluster/clients.js | 40 +- .../routes/vault/cluster/clients/current.js | 17 - .../routes/vault/cluster/clients/dashboard.js | 43 + .../routes/vault/cluster/clients/history.js | 46 - ui/app/serializers/clients/activity.js | 3 - ui/app/serializers/clients/monthly.js | 25 - ui/app/serializers/clients/version-history.js | 14 +- ui/app/styles/components/calendar-widget.scss | 6 - ui/app/styles/components/modal.scss | 17 + ui/app/styles/core/helpers.scss | 3 + .../templates/components/calendar-widget.hbs | 32 +- .../components/clients/attribution.hbs | 77 +- .../templates/components/clients/current.hbs | 86 - .../components/clients/dashboard.hbs | 208 + .../templates/components/clients/history.hbs | 262 - .../components/clients/monthly-usage.hbs | 4 +- .../components/clients/running-total.hbs | 139 +- .../components/clients/usage-stats.hbs | 8 +- ui/app/templates/components/cluster-info.hbs | 2 +- ui/app/templates/components/date-dropdown.hbs | 147 +- ui/app/templates/vault/cluster.hbs | 6 +- ui/app/templates/vault/cluster/clients.hbs | 9 +- .../vault/cluster/clients/current.hbs | 1 - .../vault/cluster/clients/dashboard.hbs | 1 + .../vault/cluster/clients/history.hbs | 1 - ui/app/utils/chart-helpers.js | 15 +- .../{templates => }/components/stat-text.hbs | 3 +- ui/lib/core/addon/components/stat-text.js | 21 - ui/lib/core/addon/helpers/date-format.js | 17 +- ui/lib/core/addon/utils/client-count-utils.js | 196 +- ui/lib/core/addon/utils/date-formatters.js | 11 - ui/mirage/handlers/activity.js | 5666 ----------------- ui/mirage/handlers/clients.js | 3441 +--------- ui/mirage/handlers/index.js | 3 +- ui/package.json | 2 +- ui/tests/acceptance/client-current-test.js | 175 - ...story-test.js => client-dashboard-test.js} | 205 +- ui/tests/helpers/clients.js | 190 +- .../components/calendar-widget-test.js | 369 +- .../components/clients/attribution-test.js | 81 +- .../components/clients/monthly-usage-test.js | 4 +- .../components/clients/running-total-test.js | 28 +- .../components/clients/usage-stats-test.js | 8 +- .../components/date-dropdown-test.js | 220 +- .../integration/helpers/date-format-test.js | 37 +- .../utils/client-count-utils-test.js | 2 + .../integration/utils/date-formatters-test.js | 26 +- ui/tests/pages/components/calendar-widget.js | 3 +- .../unit/adapters/clients-activity-test.js | 132 + ui/tests/unit/utils/chart-helpers-test.js | 21 +- ui/yarn.lock | 8 +- 70 files changed, 2096 insertions(+), 11323 deletions(-) create mode 100644 changelog/17575.txt delete mode 100644 ui/app/adapters/clients/monthly.js delete mode 100644 ui/app/components/clients/current.js create mode 100644 ui/app/components/clients/dashboard.js delete mode 100644 ui/app/components/clients/history.js delete mode 100644 ui/app/models/clients/monthly.js delete mode 100644 ui/app/routes/vault/cluster/clients/current.js create mode 100644 ui/app/routes/vault/cluster/clients/dashboard.js delete mode 100644 ui/app/routes/vault/cluster/clients/history.js delete mode 100644 ui/app/serializers/clients/monthly.js delete mode 100644 ui/app/templates/components/clients/current.hbs create mode 100644 ui/app/templates/components/clients/dashboard.hbs delete mode 100644 ui/app/templates/components/clients/history.hbs delete mode 100644 ui/app/templates/vault/cluster/clients/current.hbs create mode 100644 ui/app/templates/vault/cluster/clients/dashboard.hbs delete mode 100644 ui/app/templates/vault/cluster/clients/history.hbs rename ui/lib/core/addon/{templates => }/components/stat-text.hbs (61%) delete mode 100644 ui/lib/core/addon/components/stat-text.js delete mode 100644 ui/mirage/handlers/activity.js delete mode 100644 ui/tests/acceptance/client-current-test.js rename ui/tests/acceptance/{client-history-test.js => client-dashboard-test.js} (69%) create mode 100644 ui/tests/unit/adapters/clients-activity-test.js diff --git a/changelog/17575.txt b/changelog/17575.txt new file mode 100644 index 000000000..f08b53ff8 --- /dev/null +++ b/changelog/17575.txt @@ -0,0 +1,3 @@ +```release-note:improvement +ui: use the combined activity log (partial + historic) API for client count dashboard and remove use of monthly endpoint +``` diff --git a/ui/app/adapters/clients/activity.js b/ui/app/adapters/clients/activity.js index a8990b463..f191a285a 100644 --- a/ui/app/adapters/clients/activity.js +++ b/ui/app/adapters/clients/activity.js @@ -1,38 +1,22 @@ -import Application from '../application'; -import { formatRFC3339 } from 'date-fns'; +import ApplicationAdapter from '../application'; +import { getUnixTime } from 'date-fns'; -export default Application.extend({ - // Since backend converts the timezone to UTC, sending the first (1) as start or end date can cause the month to change. - // To mitigate this impact of timezone conversion, hard coding the dates to avoid month change. - formatTimeParams(query) { - let { start_time, end_time } = query; - // check if it's an array, if it is, it's coming from an action like selecting a new startTime or new EndTime - if (Array.isArray(start_time)) { - const startYear = Number(start_time[0]); - const startMonth = Number(start_time[1]); - start_time = formatRFC3339(new Date(startYear, startMonth, 10)); - } - if (end_time) { - if (Array.isArray(end_time)) { - const endYear = Number(end_time[0]); - const endMonth = Number(end_time[1]); - end_time = formatRFC3339(new Date(endYear, endMonth, 20)); - } +export default class ActivityAdapter extends ApplicationAdapter { + // javascript localizes new Date() objects but all activity log data is stored in UTC + // create date object from user's input using Date.UTC() then send to backend as unix + // time params from the backend are formatted as a zulu timestamp + formatQueryParams(queryParams) { + let { start_time, end_time } = queryParams; + start_time = start_time.timestamp || getUnixTime(Date.UTC(start_time.year, start_time.monthIdx, 1)); + // day=0 for Date.UTC() returns the last day of the month before + // increase monthIdx by one to get last day of queried month + end_time = end_time.timestamp || getUnixTime(Date.UTC(end_time.year, end_time.monthIdx + 1, 0)); + return { start_time, end_time }; + } - return { start_time, end_time }; - } else { - return { start_time }; - } - }, - - // query comes in as either: {start_time: '2021-03-17T00:00:00Z'} or - // {start_time: Array(2), end_time: Array(2)} - // end_time: (2) ['2022', 0] - // start_time: (2) ['2021', 2] queryRecord(store, type, query) { const url = `${this.buildURL()}/internal/counters/activity`; - // check if start and/or end times are in RFC3395 format, if not convert with timezone UTC/zulu. - const queryParams = this.formatTimeParams(query); + const queryParams = this.formatQueryParams(query); if (queryParams) { return this.ajax(url, 'GET', { data: queryParams }).then((resp) => { const response = resp || {}; @@ -40,5 +24,5 @@ export default Application.extend({ return response; }); } - }, -}); + } +} diff --git a/ui/app/adapters/clients/monthly.js b/ui/app/adapters/clients/monthly.js deleted file mode 100644 index a1f3c5e1c..000000000 --- a/ui/app/adapters/clients/monthly.js +++ /dev/null @@ -1,13 +0,0 @@ -import ApplicationAdapter from '../application'; - -export default class MonthlyAdapter extends ApplicationAdapter { - queryRecord() { - const url = `${this.buildURL()}/internal/counters/activity/monthly`; - // Query has startTime defined. The API will return the endTime if none is provided. - return this.ajax(url, 'GET').then((resp) => { - const response = resp || {}; - response.id = response.request_id || 'no-data'; - return response; - }); - } -} diff --git a/ui/app/adapters/clients/version-history.js b/ui/app/adapters/clients/version-history.js index b45927e3a..2387a8322 100644 --- a/ui/app/adapters/clients/version-history.js +++ b/ui/app/adapters/clients/version-history.js @@ -1,6 +1,6 @@ -import Application from '../application'; +import ApplicationAdapter from '../application'; -export default Application.extend({ +export default class VersionHistoryAdapter extends ApplicationAdapter { findAll() { return this.ajax(this.buildURL() + '/version-history', 'GET', { data: { @@ -9,5 +9,5 @@ export default Application.extend({ }).then((resp) => { return resp; }); - }, -}); + } +} diff --git a/ui/app/components/calendar-widget.js b/ui/app/components/calendar-widget.js index c8725fbd1..981677e10 100644 --- a/ui/app/components/calendar-widget.js +++ b/ui/app/components/calendar-widget.js @@ -1,141 +1,113 @@ import Component from '@glimmer/component'; -import layout from '../templates/components/calendar-widget'; -import { setComponentTemplate } from '@ember/component'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; - +import { ARRAY_OF_MONTHS, parseAPITimestamp } from 'core/utils/date-formatters'; +import { addYears, isSameYear, subYears } from 'date-fns'; /** * @module CalendarWidget - * CalendarWidget components are used in the client counts metrics. It helps users understand the ranges they can select. + * CalendarWidget component is used in the client counts dashboard to select a month/year to query the /activity endpoint. + * The component returns an object with selected date info, example: { dateType: 'endDate', monthIdx: 0, monthName: 'January', year: 2022 } * * @example * ```js - * + * * + * @param {string} startTimestamp - ISO timestamp string of the calendar widget's start time, displays in dropdown trigger + * @param {string} endTimestamp - ISO timestamp string for the calendar widget's end time, displays in dropdown trigger + * @param {function} selectMonth - callback function from parent - fires when selecting a month or clicking "Current billing period" + * /> * ``` */ -class CalendarWidget extends Component { +export default class CalendarWidget extends Component { currentDate = new Date(); - currentYear = this.currentDate.getFullYear(); // integer - currentMonth = parseInt(this.currentDate.getMonth()); // integer and zero index - - @tracked allMonthsNodeList = []; - @tracked displayYear = this.currentYear; // init to currentYear and then changes as a user clicks on the chevrons + @tracked calendarDisplayDate = this.currentDate; // init to current date, updates when user clicks on calendar chevrons @tracked showCalendar = false; @tracked tooltipTarget = null; @tracked tooltipText = null; - get selectedMonthId() { - if (!this.args.endTimeFromResponse) return ''; - const [year, monthIndex] = this.args.endTimeFromResponse; - return `${monthIndex}-${year}`; + // both date getters return a date object + get startDate() { + return parseAPITimestamp(this.args.startTimestamp); + } + get endDate() { + return parseAPITimestamp(this.args.endTimestamp); + } + get displayYear() { + return this.calendarDisplayDate.getFullYear(); } get disableFutureYear() { - return this.displayYear === this.currentYear; + return isSameYear(this.calendarDisplayDate, this.currentDate); } get disablePastYear() { - const startYear = parseInt(this.args.startTimeDisplay.split(' ')[1]); - return this.displayYear === startYear; // if on startYear then don't let them click back to the year prior + // calendar widget should only go as far back as the passed in start time + return isSameYear(this.calendarDisplayDate, this.startDate); } get widgetMonths() { - const displayYear = this.displayYear; - const currentYear = this.currentYear; - const currentMonthIdx = this.currentMonth; - const [startMonth, startYear] = this.args.startTimeDisplay.split(' '); - const startMonthIdx = this.args.arrayOfMonths.indexOf(startMonth); - return this.args.arrayOfMonths.map((month, idx) => { - const monthId = `${idx}-${displayYear}`; + const startYear = this.startDate.getFullYear(); + const startMonthIdx = this.startDate.getMonth(); + return ARRAY_OF_MONTHS.map((month, index) => { let readonly = false; - // if widget is showing billing start year, disable if month is before start month - if (parseInt(startYear) === displayYear && idx < startMonthIdx) { + // if widget is showing same year as @startTimestamp year, disable if month is before start month + if (startYear === this.displayYear && index < startMonthIdx) { readonly = true; } - // if widget showing current year, disable if month is current or later - if (displayYear === currentYear && idx >= currentMonthIdx) { + // if widget showing current year, disable if month is later than current month + if (this.displayYear === this.currentDate.getFullYear() && index > this.currentDate.getMonth()) { readonly = true; } return { - id: monthId, - month, + index, + year: this.displayYear, + name: month, readonly, - current: monthId === `${currentMonthIdx}-${currentYear}`, }; }); } - // HELPER FUNCTIONS (alphabetically) // - addClass(element, classString) { - element.classList.add(classString); - } - - removeClass(element, classString) { - element.classList.remove(classString); - } - - resetDisplayYear() { - let setYear = this.currentYear; - if (this.args.endTimeDisplay) { - try { - const year = this.args.endTimeDisplay.split(' ')[1]; - setYear = parseInt(year); - } catch (e) { - console.debug('Error resetting display year', e); // eslint-disable-line - } - } - this.displayYear = setYear; - } - - // ACTIONS (alphabetically) // @action addTooltip() { if (this.disablePastYear) { - const previousYear = Number(this.displayYear) - 1; - this.tooltipText = `${previousYear} is unavailable because it is before your billing start month. Change your billing start month to a date in ${previousYear} to see data for this year.`; // set tooltip text + const previousYear = this.displayYear - 1; + this.tooltipText = `${previousYear} is unavailable because it is before your start date. Change your start month to a date in ${previousYear} to see data for this year.`; this.tooltipTarget = '#previous-year'; } } @action - addYear() { - this.displayYear = this.displayYear + 1; - } - - @action removeTooltip() { + removeTooltip() { this.tooltipTarget = null; } @action - selectCurrentBillingPeriod(D) { - this.args.handleCurrentBillingPeriod(); // resets the billing startTime and endTime to what it is on init via the parent. - this.showCalendar = false; - D.actions.close(); // close the dropdown. - } - @action - selectEndMonth(monthId, D) { - const [monthIdx, year] = monthId.split('-'); - this.toggleShowCalendar(); - this.args.handleClientActivityQuery(parseInt(monthIdx), parseInt(year), 'endTime'); - D.actions.close(); // close the dropdown. + addYear() { + this.calendarDisplayDate = addYears(this.calendarDisplayDate, 1); } @action subYear() { - this.displayYear = this.displayYear - 1; + this.calendarDisplayDate = subYears(this.calendarDisplayDate, 1); } @action toggleShowCalendar() { this.showCalendar = !this.showCalendar; - this.resetDisplayYear(); + this.calendarDisplayDate = this.endDate; + } + + @action + handleDateShortcut(dropdown, { target }) { + this.args.selectMonth({ dateType: target.name }); // send clicked shortcut to parent callback + this.showCalendar = false; + dropdown.close(); + } + + @action + selectMonth(month, dropdown) { + const { index, year, name } = month; + this.toggleShowCalendar(); + this.args.selectMonth({ monthIdx: index, monthName: name, year, dateType: 'endDate' }); + dropdown.close(); } } -export default setComponentTemplate(layout, CalendarWidget); diff --git a/ui/app/components/clients/attribution.js b/ui/app/components/clients/attribution.js index 337925d88..54a70dd9f 100644 --- a/ui/app/components/clients/attribution.js +++ b/ui/app/components/clients/attribution.js @@ -2,6 +2,9 @@ import Component from '@glimmer/component'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; import { inject as service } from '@ember/service'; +import { parseAPITimestamp } from 'core/utils/date-formatters'; +import { format, isSameMonth } from 'date-fns'; + /** * @module Attribution * Attribution components display the top 10 total client counts for namespaces or auth methods (mounts) during a billing period. @@ -16,10 +19,11 @@ import { inject as service } from '@ember/service'; * @totalClientAttribution={{this.totalClientAttribution}} * @newClientAttribution={{this.newClientAttribution}} * @selectedNamespace={{this.selectedNamespace}} - * @startTimeDisplay={{date-format this.responseTimestamp "MMMM yyyy"}} - * @isDateRange={{this.isDateRange}} - * @isCurrentMonth={{false}} - * @timestamp={{this.responseTimestamp}} + * @startTimestamp={{this.startTime}} + * @endTimestamp={{this.endTime}} + * @isHistoricalMonth={{false}} + * @responseTimestamp={{this.responseTimestamp}} + * @upgradeExplanation="We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data." * /> * ``` * @param {array} chartLegend - (passed to child) array of objects with key names 'key' and 'label' so data can be stacked @@ -28,23 +32,31 @@ import { inject as service } from '@ember/service'; * @param {array} totalClientAttribution - array of objects containing a label and breakdown of client counts for total clients * @param {array} newClientAttribution - array of objects containing a label and breakdown of client counts for new clients * @param {string} selectedNamespace - namespace selected from filter bar - * @param {string} startTimeDisplay - string that displays as start date for CSV modal - * @param {string} endTimeDisplay - string that displays as end date for CSV modal - * @param {boolean} isDateRange - getter calculated in parent to relay if dataset is a date range or single month and display text accordingly - * @param {boolean} isCurrentMonth - boolean to determine if rendered in current month tab or not - * @param {string} timestamp - ISO timestamp created in serializer to timestamp the response + * @param {string} startTimestamp - timestamp string from activity response to render start date for CSV modal and whether copy reads 'month' or 'date range' + * @param {string} endTimestamp - timestamp string from activity response to render end date for CSV modal and whether copy reads 'month' or 'date range' + * @param {string} responseTimestamp - ISO timestamp created in serializer to timestamp the response, renders in bottom left corner below attribution chart + * @param {boolean} isHistoricalMonth - when true data is from a single, historical month so side-by-side charts should display for attribution data + * @param {boolean} upgradeExplanation - if data contains an upgrade, explanation is generated by the parent to be rendered in the export modal */ export default class Attribution extends Component { @tracked showCSVDownloadModal = false; @service download; - get hasCsvData() { - return this.args.totalClientAttribution ? this.args.totalClientAttribution.length > 0 : false; + get formattedStartDate() { + if (!this.args.startTimestamp) return null; + return parseAPITimestamp(this.args.startTimestamp, 'MMMM yyyy'); + } + get formattedEndDate() { + if (!this.args.startTimestamp && !this.args.endTimestamp) return null; + // displays on CSV export modal, no need to display duplicate months and years + const startDateObject = parseAPITimestamp(this.args.startTimestamp); + const endDateObject = parseAPITimestamp(this.args.endTimestamp); + return isSameMonth(startDateObject, endDateObject) ? null : format(endDateObject, 'MMMM yyyy'); } - get isDateRange() { - return this.args.isDateRange; + get hasCsvData() { + return this.args.totalClientAttribution ? this.args.totalClientAttribution.length > 0 : false; } get isSingleNamespace() { @@ -75,7 +87,7 @@ export default class Attribution extends Component { } get chartText() { - const dateText = this.isDateRange ? 'date range' : 'month'; + const dateText = this.formattedEndDate ? 'date range' : 'month'; switch (this.isSingleNamespace) { case true: return { @@ -118,7 +130,7 @@ export default class Attribution extends Component { const otherColumns = newColumns ? [...totalColumns, ...newColumns] : [...totalColumns]; return [ `${typeof namespaceColumn === 'string' ? namespaceColumn : namespaceColumn.label}`, - `${mountColumn ? mountColumn.label : ''}`, + `${mountColumn ? mountColumn.label : '*'}`, ...otherColumns, ]; } @@ -127,9 +139,14 @@ export default class Attribution extends Component { const totalAttribution = this.args.totalClientAttribution; const newAttribution = this.barChartNewClients ? this.args.newClientAttribution : null; const csvData = []; + // added to clarify that the row of namespace totals without an auth method (blank) are not additional clients + // but indicate the total clients for that ns, including its auth methods + const descriptionOfBlanks = this.isSingleNamespace + ? '' + : `\n *namespace totals, inclusive of auth method clients`; const csvHeader = [ 'Namespace path', - 'Authentication method', + `"Authentication method ${descriptionOfBlanks}"`, 'Total clients', 'Entity clients', 'Non-entity clients', @@ -173,15 +190,14 @@ export default class Attribution extends Component { return csvData.map((d) => d.join()).join('\n'); } - get getCsvFileName() { - const endRange = this.isDateRange ? `-${this.args.endTimeDisplay}` : ''; - const csvDateRange = this.args.startTimeDisplay + endRange; + get formattedCsvFileName() { + const endRange = this.formattedEndDate ? `-${this.formattedEndDate}` : ''; + const csvDateRange = this.formattedStartDate + endRange; return this.isSingleNamespace ? `clients_by_auth_method_${csvDateRange}` : `clients_by_namespace_${csvDateRange}`; } - // ACTIONS @action exportChartData(filename) { const contents = this.generateCsvData(); diff --git a/ui/app/components/clients/current.js b/ui/app/components/clients/current.js deleted file mode 100644 index e21681005..000000000 --- a/ui/app/components/clients/current.js +++ /dev/null @@ -1,152 +0,0 @@ -import Component from '@glimmer/component'; -import { tracked } from '@glimmer/tracking'; -import { isAfter, startOfMonth } from 'date-fns'; -import { action } from '@ember/object'; - -export default class Current extends Component { - chartLegend = [ - { key: 'entity_clients', label: 'entity clients' }, - { key: 'non_entity_clients', label: 'non-entity clients' }, - ]; - @tracked selectedNamespace = null; - @tracked namespaceArray = this.byNamespace.map((namespace) => { - return { name: namespace['label'], id: namespace['label'] }; - }); - - @tracked selectedAuthMethod = null; - @tracked authMethodOptions = []; - - get upgradeVersionHistory() { - const versionHistory = this.args.model.versionHistory; - if (!versionHistory || versionHistory.length === 0) { - return null; - } - - // get upgrade data for initial upgrade to 1.9 and/or 1.10 - const relevantUpgrades = []; - const importantUpgrades = ['1.9', '1.10']; - importantUpgrades.forEach((version) => { - const findUpgrade = versionHistory.find((versionData) => versionData.id.match(version)); - if (findUpgrade) relevantUpgrades.push(findUpgrade); - }); - // array of upgrade data objects for noteworthy upgrades - return relevantUpgrades; - } - - // Response client count data by namespace for current/partial month - get byNamespace() { - return this.args.model.monthly?.byNamespace || []; - } - - get isGatheringData() { - // return true if tracking IS enabled but no data collected yet - return this.args.model.config?.enabled === 'On' && this.byNamespace.length === 0; - } - - get hasAttributionData() { - if (this.selectedAuthMethod) return false; - if (this.selectedNamespace) { - return this.authMethodOptions.length > 0; - } - return this.totalUsageCounts.clients !== 0 && !!this.totalClientAttribution; - } - - get filteredCurrentData() { - const namespace = this.selectedNamespace; - const auth = this.selectedAuthMethod; - if (!namespace && !auth) { - return this.byNamespace; - } - if (!auth) { - return this.byNamespace.find((ns) => ns.label === namespace); - } - return this.byNamespace - .find((ns) => ns.label === namespace) - .mounts?.find((mount) => mount.label === auth); - } - - get upgradeDuringCurrentMonth() { - if (!this.upgradeVersionHistory) { - return null; - } - const upgradesWithinData = this.upgradeVersionHistory.filter((upgrade) => { - // TODO how do timezones affect this? - const upgradeDate = new Date(upgrade.timestampInstalled); - return isAfter(upgradeDate, startOfMonth(new Date())); - }); - // return all upgrades that happened within date range of queried activity - return upgradesWithinData.length === 0 ? null : upgradesWithinData; - } - - get upgradeVersionAndDate() { - if (!this.upgradeDuringCurrentMonth) { - return null; - } - if (this.upgradeDuringCurrentMonth.length === 2) { - const versions = this.upgradeDuringCurrentMonth.map((upgrade) => upgrade.id).join(' and '); - return `Vault was upgraded to ${versions} during this month.`; - } else { - const version = this.upgradeDuringCurrentMonth[0]; - return `Vault was upgraded to ${version.id} on this month.`; - } - } - - get versionSpecificText() { - if (!this.upgradeDuringCurrentMonth) { - return null; - } - if (this.upgradeDuringCurrentMonth.length === 1) { - const version = this.upgradeDuringCurrentMonth[0].id; - if (version.match('1.9')) { - return ' How we count clients changed in 1.9, so keep that in mind when looking at the data below.'; - } - if (version.match('1.10')) { - return ' We added mount level attribution starting in 1.10, so keep that in mind when looking at the data below.'; - } - } - // return combined explanation if spans multiple upgrades - return ' How we count clients changed in 1.9 and we added mount level attribution starting in 1.10. Keep this in mind when looking at the data below.'; - } - - // top level TOTAL client counts for current/partial month - get totalUsageCounts() { - return this.selectedNamespace ? this.filteredCurrentData : this.args.model.monthly?.total; - } - - // total client attribution data for horizontal bar chart in attribution component - get totalClientAttribution() { - if (this.selectedNamespace) { - return this.filteredCurrentData?.mounts || null; - } else { - return this.byNamespace; - } - } - - get responseTimestamp() { - return this.args.model.monthly?.responseTimestamp; - } - - // ACTIONS - @action - selectNamespace([value]) { - // value comes in as [namespace0] - this.selectedNamespace = value; - if (!value) { - this.authMethodOptions = []; - // on clear, also make sure auth method is cleared - this.selectedAuthMethod = null; - } else { - // Side effect: set auth namespaces - const mounts = this.filteredCurrentData.mounts?.map((mount) => ({ - id: mount.label, - name: mount.label, - })); - this.authMethodOptions = mounts; - } - } - - @action - setAuthMethod([authMount]) { - this.selectedAuthMethod = authMount; - } -} diff --git a/ui/app/components/clients/dashboard.js b/ui/app/components/clients/dashboard.js new file mode 100644 index 000000000..a37077ff8 --- /dev/null +++ b/ui/app/components/clients/dashboard.js @@ -0,0 +1,371 @@ +import Component from '@glimmer/component'; +import { action } from '@ember/object'; +import { inject as service } from '@ember/service'; +import { tracked } from '@glimmer/tracking'; +import { isAfter, isBefore, isSameMonth, format } from 'date-fns'; +import getStorage from 'vault/lib/token-storage'; +import { parseAPITimestamp } from 'core/utils/date-formatters'; +// my sincere apologies to the next dev who has to refactor/debug this (⇀‸↼‶) +export default class Dashboard extends Component { + @service store; + @service version; + + chartLegend = [ + { key: 'entity_clients', label: 'entity clients' }, + { key: 'non_entity_clients', label: 'non-entity clients' }, + ]; + + // RESPONSE + @tracked startMonthTimestamp; // when user queries, updates to first month object of response + @tracked endMonthTimestamp; // when user queries, updates to last month object of response + @tracked queriedActivityResponse = null; + // track params sent to /activity request + @tracked activityQueryParams = { + start: {}, // updates when user edits billing start month + end: {}, // updates when user queries end dates via calendar widget + }; + + // SEARCH SELECT FILTERS + get namespaceArray() { + return this.getActivityResponse.byNamespace + ? this.getActivityResponse.byNamespace.map((namespace) => ({ + name: namespace.label, + id: namespace.label, + })) + : []; + } + @tracked selectedNamespace = null; + @tracked selectedAuthMethod = null; + @tracked authMethodOptions = []; + + // TEMPLATE VIEW + @tracked noActivityData; + @tracked showBillingStartModal = false; + @tracked isLoadingQuery = false; + @tracked errorObject = null; + + constructor() { + super(...arguments); + this.startMonthTimestamp = this.args.model.licenseStartTimestamp; + this.endMonthTimestamp = this.args.model.currentDate; + this.activityQueryParams.start.timestamp = this.args.model.licenseStartTimestamp; + this.activityQueryParams.end.timestamp = this.args.model.currentDate; + this.noActivityData = this.args.model.activity.id === 'no-data' ? true : false; + } + + // returns text for empty state message if noActivityData + get dateRangeMessage() { + if (!this.startMonthTimestamp && !this.endMonthTimestamp) return null; + const endMonth = isSameMonth( + parseAPITimestamp(this.startMonthTimestamp), + parseAPITimestamp(this.endMonthTimestamp) + ) + ? '' + : ` to ${parseAPITimestamp(this.endMonthTimestamp, 'MMMM yyyy')}`; + // completes the message 'No data received from { dateRangeMessage }' + return `from ${parseAPITimestamp(this.startMonthTimestamp, 'MMMM yyyy')}` + endMonth; + } + + 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 isDateRange() { + return !isSameMonth( + parseAPITimestamp(this.getActivityResponse.startTime), + parseAPITimestamp(this.getActivityResponse.endTime) + ); + } + + get isCurrentMonth() { + return ( + isSameMonth( + parseAPITimestamp(this.getActivityResponse.startTime), + parseAPITimestamp(this.args.model.currentDate) + ) && + isSameMonth( + parseAPITimestamp(this.getActivityResponse.endTime), + parseAPITimestamp(this.args.model.currentDate) + ) + ); + } + + get startTimeDiscrepancy() { + // show banner if startTime returned from activity log (response) is after the queried startTime + const activityStartDateObject = parseAPITimestamp(this.getActivityResponse.startTime); + const queryStartDateObject = parseAPITimestamp(this.startMonthTimestamp); + let message = 'You requested data from'; + if (this.startMonthTimestamp === this.args.model.licenseStartTimestamp && this.version.isEnterprise) { + // on init, date is automatically pulled from license start date and user hasn't queried anything yet + message = 'Your license start date is'; + } + if ( + isAfter(activityStartDateObject, queryStartDateObject) && + !isSameMonth(activityStartDateObject, queryStartDateObject) + ) { + return `${message} ${parseAPITimestamp(this.startMonthTimestamp, 'MMMM yyyy')}. + We only have data from ${parseAPITimestamp(this.getActivityResponse.startTime, 'MMMM yyyy')}, + and that is what is being shown here.`; + } else { + return null; + } + } + + get upgradeDuringActivity() { + const versionHistory = this.args.model.versionHistory; + if (!versionHistory || versionHistory.length === 0) { + return null; + } + + // filter for upgrade data of noteworthy upgrades (1.9 and/or 1.10) + const upgradeVersionHistory = versionHistory.filter( + ({ version }) => version.match('1.9') || version.match('1.10') + ); + if (!upgradeVersionHistory || upgradeVersionHistory.length === 0) { + return null; + } + + const activityStart = parseAPITimestamp(this.getActivityResponse.startTime); + const activityEnd = parseAPITimestamp(this.getActivityResponse.endTime); + // filter and return all upgrades that happened within date range of queried activity + const upgradesWithinData = upgradeVersionHistory.filter(({ timestampInstalled }) => { + const upgradeDate = parseAPITimestamp(timestampInstalled); + return isAfter(upgradeDate, activityStart) && isBefore(upgradeDate, activityEnd); + }); + return upgradesWithinData.length === 0 ? null : upgradesWithinData; + } + + get upgradeVersionAndDate() { + if (!this.upgradeDuringActivity) return null; + + if (this.upgradeDuringActivity.length === 2) { + const [firstUpgrade, secondUpgrade] = this.upgradeDuringActivity; + const firstDate = parseAPITimestamp(firstUpgrade.timestampInstalled, 'MMM d, yyyy'); + const secondDate = parseAPITimestamp(secondUpgrade.timestampInstalled, 'MMM d, yyyy'); + return `Vault was upgraded to ${firstUpgrade.version} (${firstDate}) and ${secondUpgrade.version} (${secondDate}) during this time range.`; + } else { + const [upgrade] = this.upgradeDuringActivity; + return `Vault was upgraded to ${upgrade.version} on ${parseAPITimestamp( + upgrade.timestampInstalled, + 'MMM d, yyyy' + )}.`; + } + } + + get upgradeExplanation() { + if (!this.upgradeDuringActivity) return null; + if (this.upgradeDuringActivity.length === 1) { + const version = this.upgradeDuringActivity[0].version; + if (version.match('1.9')) { + return ' How we count clients changed in 1.9, so keep that in mind when looking at the data.'; + } + if (version.match('1.10')) { + return ' We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data.'; + } + } + // return combined explanation if spans multiple upgrades + return ' How we count clients changed in 1.9 and we added monthly breakdowns and mount level attribution starting in 1.10. Keep this in mind when looking at the data.'; + } + + get formattedStartDate() { + if (!this.startMonthTimestamp) return null; + return parseAPITimestamp(this.startMonthTimestamp, 'MMMM yyyy'); + } + + // GETTERS FOR RESPONSE & DATA + + // on init API response uses license start_date, getter updates when user queries dates + get getActivityResponse() { + return this.queriedActivityResponse || this.args.model.activity; + } + + get byMonthActivityData() { + if (this.selectedNamespace) { + return this.filteredActivityByMonth; + } else { + return this.getActivityResponse?.byMonth; + } + } + + get hasAttributionData() { + if (this.selectedAuthMethod) return false; + if (this.selectedNamespace) { + return this.authMethodOptions.length > 0; + } + return !!this.totalClientAttribution && this.totalUsageCounts && this.totalUsageCounts.clients !== 0; + } + + // (object) top level TOTAL client counts for given date range + get totalUsageCounts() { + return this.selectedNamespace ? this.filteredActivityByNamespace : this.getActivityResponse.total; + } + + // (object) single month new client data with total counts + array of namespace breakdown + get newClientCounts() { + return this.isDateRange ? null : this.byMonthActivityData[0]?.new_clients; + } + + // total client data for horizontal bar chart in attribution component + get totalClientAttribution() { + if (this.selectedNamespace) { + return this.filteredActivityByNamespace?.mounts || null; + } else { + return this.getActivityResponse?.byNamespace || null; + } + } + + // new client data for horizontal bar chart + get newClientAttribution() { + // new client attribution only available in a single, historical month (not a date range or current month) + if (this.isDateRange || this.isCurrentMonth) return null; + + if (this.selectedNamespace) { + return this.newClientCounts?.mounts || null; + } else { + return this.newClientCounts?.namespaces || null; + } + } + + get responseTimestamp() { + return this.getActivityResponse.responseTimestamp; + } + + // FILTERS + get filteredActivityByNamespace() { + const namespace = this.selectedNamespace; + const auth = this.selectedAuthMethod; + if (!namespace && !auth) { + return this.getActivityResponse; + } + if (!auth) { + return this.getActivityResponse.byNamespace.find((ns) => ns.label === namespace); + } + return this.getActivityResponse.byNamespace + .find((ns) => ns.label === namespace) + .mounts?.find((mount) => mount.label === auth); + } + + get filteredActivityByMonth() { + const namespace = this.selectedNamespace; + const auth = this.selectedAuthMethod; + if (!namespace && !auth) { + return this.getActivityResponse?.byMonth; + } + const namespaceData = this.getActivityResponse?.byMonth + .map((m) => m.namespaces_by_key[namespace]) + .filter((d) => d !== undefined); + if (!auth) { + return namespaceData.length === 0 ? null : namespaceData; + } + const mountData = namespaceData + .map((namespace) => namespace.mounts_by_key[auth]) + .filter((d) => d !== undefined); + return mountData.length === 0 ? null : mountData; + } + + @action + async handleClientActivityQuery({ dateType, monthIdx, year }) { + this.showBillingStartModal = false; + switch (dateType) { + case 'cancel': + return; + case 'reset': // clicked 'Current billing period' in calendar widget -> reset to initial start/end dates + this.activityQueryParams.start.timestamp = this.args.model.licenseStartTimestamp; + this.activityQueryParams.end.timestamp = this.args.model.currentDate; + break; + case 'currentMonth': // clicked 'Current month' from calendar widget + this.activityQueryParams.start.timestamp = this.args.model.currentDate; + this.activityQueryParams.end.timestamp = this.args.model.currentDate; + break; + case 'startDate': // from "Edit billing start" modal + this.activityQueryParams.start = { monthIdx, year }; + this.activityQueryParams.end.timestamp = this.args.model.currentDate; + break; + case 'endDate': // selected month and year from calendar widget + this.activityQueryParams.end = { monthIdx, year }; + break; + default: + break; + } + try { + this.isLoadingQuery = true; + const response = await this.store.queryRecord('clients/activity', { + start_time: this.activityQueryParams.start, + end_time: this.activityQueryParams.end, + }); + // preference for byMonth timestamps because those correspond to a user's query + const { byMonth } = response; + this.startMonthTimestamp = byMonth[0]?.timestamp || response.startTime; + this.endMonthTimestamp = byMonth[byMonth.length - 1]?.timestamp || response.endTime; + if (response.id === 'no-data') { + this.noActivityData = true; + } else { + this.noActivityData = false; + getStorage().setItem('vault:ui-inputted-start-date', this.startMonthTimestamp); + } + this.queriedActivityResponse = response; + + // reset search-select filters + this.selectedNamespace = null; + this.selectedAuthMethod = null; + this.authMethodOptions = []; + } catch (e) { + this.errorObject = e; + return e; + } finally { + this.isLoadingQuery = false; + } + } + + get hasMultipleMonthsData() { + return this.byMonthActivityData && this.byMonthActivityData.length > 1; + } + + @action + selectNamespace([value]) { + this.selectedNamespace = value; + if (!value) { + this.authMethodOptions = []; + // on clear, also make sure auth method is cleared + this.selectedAuthMethod = null; + } else { + // Side effect: set auth namespaces + const mounts = this.filteredActivityByNamespace.mounts?.map((mount) => ({ + id: mount.label, + name: mount.label, + })); + this.authMethodOptions = mounts; + } + } + + @action + setAuthMethod([authMount]) { + this.selectedAuthMethod = authMount; + } + + // validation function sent to selecting 'endDate' + @action + isEndBeforeStart(selection) { + let { start } = this.activityQueryParams; + start = start?.timestamp ? parseAPITimestamp(start.timestamp) : new Date(start.year, start.monthIdx); + return isBefore(selection, start) && !isSameMonth(start, selection) + ? `End date must be after ${format(start, 'MMMM yyyy')}` + : false; + } +} diff --git a/ui/app/components/clients/history.js b/ui/app/components/clients/history.js deleted file mode 100644 index 0e40b93c1..000000000 --- a/ui/app/components/clients/history.js +++ /dev/null @@ -1,393 +0,0 @@ -import Component from '@glimmer/component'; -import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; -import { tracked } from '@glimmer/tracking'; -import { isSameMonth, isAfter, isBefore } from 'date-fns'; -import getStorage from 'vault/lib/token-storage'; -import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters'; -import { dateFormat } from 'core/helpers/date-format'; -import { parseAPITimestamp } from 'core/utils/date-formatters'; - -const INPUTTED_START_DATE = 'vault:ui-inputted-start-date'; - -export default class History extends Component { - @service store; - @service version; - - arrayOfMonths = ARRAY_OF_MONTHS; - - chartLegend = [ - { key: 'entity_clients', label: 'entity clients' }, - { key: 'non_entity_clients', label: 'non-entity clients' }, - ]; - - // FOR START DATE EDIT & MODAL // - months = Array.from({ length: 12 }, (item, i) => { - return new Date(0, i).toLocaleString('en-US', { month: 'long' }); - }); - years = Array.from({ length: 5 }, (item, i) => { - return new Date().getFullYear() - i; - }); - currentDate = new Date(); - currentYear = this.currentDate.getFullYear(); // integer of year - currentMonth = this.currentDate.getMonth(); // index of month - - @tracked isEditStartMonthOpen = false; - @tracked startMonth = null; - @tracked startYear = null; - @tracked allowedMonthMax = 12; - @tracked disabledYear = null; - - // FOR HISTORY COMPONENT // - - // RESPONSE - @tracked endTimeFromResponse = this.args.model.endTimeFromResponse; - @tracked startTimeFromResponse = this.args.model.startTimeFromLicense; // ex: ['2021', 3] is April 2021 (0 indexed) - @tracked startTimeRequested = null; - @tracked queriedActivityResponse = null; - - // SEARCH SELECT - @tracked selectedNamespace = null; - @tracked namespaceArray = this.getActivityResponse.byNamespace - ? this.getActivityResponse.byNamespace.map((namespace) => ({ - name: namespace.label, - id: namespace.label, - })) - : []; - @tracked selectedAuthMethod = null; - @tracked authMethodOptions = []; - - // TEMPLATE MESSAGING - @tracked noActivityDate = ''; - @tracked responseRangeDiffMessage = null; - @tracked isLoadingQuery = false; - @tracked licenseStartIsCurrentMonth = this.args.model.activity?.isLicenseDateError || false; - @tracked errorObject = 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 isDateRange() { - return !isSameMonth( - parseAPITimestamp(this.getActivityResponse.startTime), - parseAPITimestamp(this.getActivityResponse.endTime) - ); - } - - get upgradeVersionHistory() { - const versionHistory = this.args.model.versionHistory; - if (!versionHistory || versionHistory.length === 0) { - return null; - } - - // get upgrade data for initial upgrade to 1.9 and/or 1.10 - const relevantUpgrades = []; - const importantUpgrades = ['1.9', '1.10']; - importantUpgrades.forEach((version) => { - const findUpgrade = versionHistory.find((versionData) => versionData.id.match(version)); - if (findUpgrade) relevantUpgrades.push(findUpgrade); - }); - - // array of upgrade data objects for noteworthy upgrades - return relevantUpgrades; - } - - get upgradeDuringActivity() { - if (!this.upgradeVersionHistory) { - return null; - } - const activityStart = new Date(this.getActivityResponse.startTime); - const activityEnd = new Date(this.getActivityResponse.endTime); - const upgradesWithinData = this.upgradeVersionHistory.filter((upgrade) => { - // TODO how do timezones affect this? - const upgradeDate = new Date(upgrade.timestampInstalled); - return isAfter(upgradeDate, activityStart) && isBefore(upgradeDate, activityEnd); - }); - // return all upgrades that happened within date range of queried activity - return upgradesWithinData.length === 0 ? null : upgradesWithinData; - } - - get upgradeVersionAndDate() { - if (!this.upgradeDuringActivity) { - return null; - } - if (this.upgradeDuringActivity.length === 2) { - const firstUpgrade = this.upgradeDuringActivity[0]; - const secondUpgrade = this.upgradeDuringActivity[1]; - const firstDate = dateFormat([firstUpgrade.timestampInstalled, 'MMM d, yyyy'], { isFormatted: true }); - const secondDate = dateFormat([secondUpgrade.timestampInstalled, 'MMM d, yyyy'], { isFormatted: true }); - return `Vault was upgraded to ${firstUpgrade.id} (${firstDate}) and ${secondUpgrade.id} (${secondDate}) during this time range.`; - } else { - const upgrade = this.upgradeDuringActivity[0]; - return `Vault was upgraded to ${upgrade.id} on ${dateFormat( - [upgrade.timestampInstalled, 'MMM d, yyyy'], - { isFormatted: true } - )}.`; - } - } - - get versionSpecificText() { - if (!this.upgradeDuringActivity) { - return null; - } - if (this.upgradeDuringActivity.length === 1) { - const version = this.upgradeDuringActivity[0].id; - if (version.match('1.9')) { - return ' How we count clients changed in 1.9, so keep that in mind when looking at the data below.'; - } - if (version.match('1.10')) { - return ' We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data below.'; - } - } - // return combined explanation if spans multiple upgrades - return ' How we count clients changed in 1.9 and we added monthly breakdowns and mount level attribution starting in 1.10. Keep this in mind when looking at the data below.'; - } - - get startTimeDisplay() { - if (!this.startTimeFromResponse) { - return null; - } - const month = this.startTimeFromResponse[1]; - const year = this.startTimeFromResponse[0]; - return `${this.arrayOfMonths[month]} ${year}`; - } - - get endTimeDisplay() { - if (!this.endTimeFromResponse) { - return null; - } - const month = this.endTimeFromResponse[1]; - const year = this.endTimeFromResponse[0]; - return `${this.arrayOfMonths[month]} ${year}`; - } - - // GETTERS FOR RESPONSE & DATA - - // on init API response uses license start_date, getter updates when user queries dates - get getActivityResponse() { - return this.queriedActivityResponse || this.args.model.activity; - } - - get byMonthActivityData() { - if (this.selectedNamespace) { - return this.filteredActivityByMonth; - } else { - return this.getActivityResponse?.byMonth; - } - } - - get byMonthNewClients() { - if (this.byMonthActivityData) { - return this.byMonthActivityData?.map((m) => m.new_clients); - } - return null; - } - - get hasAttributionData() { - if (this.selectedAuthMethod) return false; - if (this.selectedNamespace) { - return this.authMethodOptions.length > 0; - } - return !!this.totalClientAttribution && this.totalUsageCounts && this.totalUsageCounts.clients !== 0; - } - - // (object) top level TOTAL client counts for given date range - get totalUsageCounts() { - return this.selectedNamespace ? this.filteredActivityByNamespace : this.getActivityResponse.total; - } - - // (object) single month new client data with total counts + array of namespace breakdown - get newClientCounts() { - return this.isDateRange ? null : this.byMonthActivityData[0]?.new_clients; - } - - // total client data for horizontal bar chart in attribution component - get totalClientAttribution() { - if (this.selectedNamespace) { - return this.filteredActivityByNamespace?.mounts || null; - } else { - return this.getActivityResponse?.byNamespace || null; - } - } - - // new client data for horizontal bar chart - get newClientAttribution() { - // new client attribution only available in a single, historical month (not a date range) - if (this.isDateRange) return null; - - if (this.selectedNamespace) { - return this.newClientCounts?.mounts || null; - } else { - return this.newClientCounts?.namespaces || null; - } - } - - get responseTimestamp() { - return this.getActivityResponse.responseTimestamp; - } - - // FILTERS - get filteredActivityByNamespace() { - const namespace = this.selectedNamespace; - const auth = this.selectedAuthMethod; - if (!namespace && !auth) { - return this.getActivityResponse; - } - if (!auth) { - return this.getActivityResponse.byNamespace.find((ns) => ns.label === namespace); - } - return this.getActivityResponse.byNamespace - .find((ns) => ns.label === namespace) - .mounts?.find((mount) => mount.label === auth); - } - - get filteredActivityByMonth() { - const namespace = this.selectedNamespace; - const auth = this.selectedAuthMethod; - if (!namespace && !auth) { - return this.getActivityResponse?.byMonth; - } - const namespaceData = this.getActivityResponse?.byMonth - .map((m) => m.namespaces_by_key[namespace]) - .filter((d) => d !== undefined); - if (!auth) { - return namespaceData.length === 0 ? null : namespaceData; - } - const mountData = namespaceData - .map((namespace) => namespace.mounts_by_key[auth]) - .filter((d) => d !== undefined); - return mountData.length === 0 ? null : mountData; - } - - @action - async handleClientActivityQuery(month, year, dateType) { - this.isEditStartMonthOpen = false; - if (dateType === 'cancel') { - return; - } - // clicked "Current Billing period" in the calendar widget - if (dateType === 'reset') { - this.startTimeRequested = this.args.model.startTimeFromLicense; - this.endTimeRequested = null; - } - // clicked "Edit" Billing start month in History which opens a modal. - if (dateType === 'startTime') { - const monthIndex = this.arrayOfMonths.indexOf(month); - this.startTimeRequested = [year.toString(), monthIndex]; // ['2021', 0] (e.g. January 2021) - this.endTimeRequested = null; - } - // clicked "Custom End Month" from the calendar-widget - if (dateType === 'endTime') { - // use the currently selected startTime for your startTimeRequested. - this.startTimeRequested = this.startTimeFromResponse; - this.endTimeRequested = [year.toString(), month]; // endTime comes in as a number/index whereas startTime comes in as a month name. Hence the difference between monthIndex and month. - } - - try { - this.isLoadingQuery = true; - const response = await this.store.queryRecord('clients/activity', { - start_time: this.startTimeRequested, - end_time: this.endTimeRequested, - }); - if (response.id === 'no-data') { - // empty response (204) is the only time we want to update the displayed date with the requested time - this.startTimeFromResponse = this.startTimeRequested; - this.noActivityDate = this.startTimeDisplay; - } else { - // note: this.startTimeDisplay (getter) is updated by the @tracked startTimeFromResponse - this.startTimeFromResponse = response.formattedStartTime; - this.endTimeFromResponse = response.formattedEndTime; - this.storage().setItem(INPUTTED_START_DATE, this.startTimeFromResponse); - } - this.queriedActivityResponse = response; - this.licenseStartIsCurrentMonth = response.isLicenseDateError; - // compare if the response startTime comes after the requested startTime. If true throw a warning. - // only display if they selected a startTime - if ( - dateType === 'startTime' && - isAfter( - new Date(this.getActivityResponse.startTime), - new Date(this.startTimeRequested[0], this.startTimeRequested[1]) - ) - ) { - this.responseRangeDiffMessage = `You requested data from ${month} ${year}. We only have data from ${this.startTimeDisplay}, and that is what is being shown here.`; - } else { - this.responseRangeDiffMessage = null; - } - } catch (e) { - this.errorObject = e; - return e; - } finally { - this.isLoadingQuery = false; - } - } - - get hasMultipleMonthsData() { - return this.byMonthActivityData && this.byMonthActivityData.length > 1; - } - - @action - handleCurrentBillingPeriod() { - this.handleClientActivityQuery(0, 0, 'reset'); - } - - @action - selectNamespace([value]) { - // value comes in as [namespace0] - this.selectedNamespace = value; - if (!value) { - this.authMethodOptions = []; - // on clear, also make sure auth method is cleared - this.selectedAuthMethod = null; - } else { - // Side effect: set auth namespaces - const mounts = this.filteredActivityByNamespace.mounts?.map((mount) => ({ - id: mount.label, - name: mount.label, - })); - this.authMethodOptions = mounts; - } - } - - @action - setAuthMethod([authMount]) { - this.selectedAuthMethod = authMount; - } - - // FOR START DATE MODAL - @action - selectStartMonth(month, event) { - this.startMonth = month; - // disables months if in the future - this.disabledYear = this.months.indexOf(month) >= this.currentMonth ? this.currentYear : null; - event.close(); - } - - @action - selectStartYear(year, event) { - this.startYear = year; - this.allowedMonthMax = year === this.currentYear ? this.currentMonth : 12; - event.close(); - } - - storage() { - return getStorage(); - } -} diff --git a/ui/app/components/clients/line-chart.js b/ui/app/components/clients/line-chart.js index 378548830..ba0ce4d90 100644 --- a/ui/app/components/clients/line-chart.js +++ b/ui/app/components/clients/line-chart.js @@ -54,7 +54,7 @@ export default class LineChart extends Component { } else if (!Object.keys(upgradeData[0]).includes('timestampInstalled')) { // eslint-disable-next-line console.debug( - `upgrade must be an object with the following key names: ['id', 'previousVersion', 'timestampInstalled']` + `upgrade must be an object with the following key names: ['version', 'previousVersion', 'timestampInstalled']` ); return null; } else { @@ -184,9 +184,9 @@ export default class LineChart extends Component { this.tooltipUpgradeText = ''; const upgradeInfo = findUpgradeData(data); if (upgradeInfo) { - const { id, previousVersion } = upgradeInfo; + const { version, previousVersion } = upgradeInfo; this.tooltipUpgradeText = `Vault was upgraded - ${previousVersion ? 'from ' + previousVersion : ''} to ${id}`; + ${previousVersion ? 'from ' + previousVersion : ''} to ${version}`; } const node = hoverCircles.filter((plot) => plot[this.xKey] === data[this.xKey]).node(); diff --git a/ui/app/components/clients/monthly-usage.js b/ui/app/components/clients/monthly-usage.js index ea803875c..6cdd99bc7 100644 --- a/ui/app/components/clients/monthly-usage.js +++ b/ui/app/components/clients/monthly-usage.js @@ -9,7 +9,7 @@ import { calculateAverage } from 'vault/utils/chart-helpers'; * ```js * ``` diff --git a/ui/app/components/clients/running-total.js b/ui/app/components/clients/running-total.js index 6c3b09951..320bffc40 100644 --- a/ui/app/components/clients/running-total.js +++ b/ui/app/components/clients/running-total.js @@ -12,8 +12,7 @@ import { calculateAverage } from 'vault/utils/chart-helpers'; @@ -21,38 +20,44 @@ import { calculateAverage } from 'vault/utils/chart-helpers'; * @param {array} chartLegend - array of objects with key names 'key' and 'label' so data can be stacked * @param {string} selectedAuthMethod - string of auth method label for empty state message in bar chart - * @param {array} barChartData - array of objects from /activity response, from the 'months' key - object example: { + * @param {array} byMonthActivityData - array of objects from /activity response, from the 'months' key, includes total and new clients per month + object structure: { month: '1/22', entity_clients: 23, non_entity_clients: 45, - total: 68, + clients: 68, namespaces: [], new_clients: { entity_clients: 11, non_entity_clients: 36, - total: 47, + clients: 47, namespaces: [], }, }; - * @param {array} lineChartData - array of objects from /activity response, from the 'months' key * @param {object} runningTotals - top level totals from /activity response { clients: 3517, entity_clients: 1593, non_entity_clients: 1924 } - * @param {object} upgradeData - object containing version upgrade data e.g.: {id: '1.9.0', previousVersion: null, timestampInstalled: '2021-11-03T10:23:16Z'} + * @param {object} upgradeData - object containing version upgrade data e.g.: {version: '1.9.0', previousVersion: null, timestampInstalled: '2021-11-03T10:23:16Z'} * @param {string} timestamp - ISO timestamp created in serializer to timestamp the response * */ export default class RunningTotal extends Component { + get byMonthNewClients() { + if (this.args.byMonthActivityData) { + return this.args.byMonthActivityData?.map((m) => m.new_clients); + } + return null; + } + get entityClientData() { return { runningTotal: this.args.runningTotals.entity_clients, - averageNewClients: calculateAverage(this.args.barChartData, 'entity_clients') || '0', + averageNewClients: calculateAverage(this.byMonthNewClients, 'entity_clients'), }; } get nonEntityClientData() { return { runningTotal: this.args.runningTotals.non_entity_clients, - averageNewClients: calculateAverage(this.args.barChartData, 'non_entity_clients') || '0', + averageNewClients: calculateAverage(this.byMonthNewClients, 'non_entity_clients'), }; } @@ -70,22 +75,7 @@ export default class RunningTotal extends Component { ); } - get showSingleMonth() { - if (this.args.lineChartData?.length === 1) { - const monthData = this.args?.lineChartData[0]; - return { - total: { - total: monthData.clients, - entityClients: monthData.entity_clients, - nonEntityClients: monthData.non_entity_clients, - }, - new: { - total: monthData.new_clients.clients, - entityClients: monthData.new_clients.entity_clients, - nonEntityClients: monthData.new_clients.non_entity_clients, - }, - }; - } - return null; + get singleMonthData() { + return this.args?.byMonthActivityData[0]; } } diff --git a/ui/app/components/clients/vertical-bar-chart.js b/ui/app/components/clients/vertical-bar-chart.js index 2d84567d2..d8d57e821 100644 --- a/ui/app/components/clients/vertical-bar-chart.js +++ b/ui/app/components/clients/vertical-bar-chart.js @@ -93,13 +93,15 @@ export default class VerticalBarChart extends Component { const tooltipTether = chartSvg .append('g') .attr('transform', `translate(${BAR_WIDTH / 2})`) - .attr('data-test-vertical-chart', 'tool-tip-tethers') + .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('cx', (d) => xScale(d[this.xKey])) + .attr('r', 1); // MAKE AXES // const yAxisScale = scaleLinear() diff --git a/ui/app/components/date-dropdown.js b/ui/app/components/date-dropdown.js index bf9df3754..20b957a3f 100644 --- a/ui/app/components/date-dropdown.js +++ b/ui/app/components/date-dropdown.js @@ -1,53 +1,79 @@ import Component from '@glimmer/component'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; - +import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters'; /** * @module DateDropdown - * DateDropdown components are used to display a dropdown of months and years to handle date selection + * DateDropdown components are used to display a dropdown of months and years to handle date selection. Future dates are disabled (current month and year are selectable). + * The component returns an object with selected date info, example: { dateType: 'start', monthIdx: 0, monthName: 'January', year: 2022 } * * @example * ```js - * + * * ``` - * @param {function} handleDateSelection - is the action from the parent that the date picker triggers - * @param {string} [name] - optional argument passed from date dropdown to parent function + * @param {function} handleSubmit - callback function from parent that the date picker triggers on submit + * @param {function} [handleCancel] - optional callback for cancel action, if exists then buttons appear modal style with a light gray background + * @param {string} [dateType] - optional argument to give the selected month/year a type * @param {string} [submitText] - optional argument to change submit button text + * @param {function} [validateDate] - parent function to validate date selection, receives date object and returns an error message that's passed to the inline alert */ export default class DateDropdown extends Component { currentDate = new Date(); currentYear = this.currentDate.getFullYear(); // integer of year - currentMonth = this.currentDate.getMonth(); // index of month + currentMonthIdx = this.currentDate.getMonth(); // integer of month, 0 indexed + dropdownMonths = ARRAY_OF_MONTHS.map((m, i) => ({ name: m, index: i })); + dropdownYears = Array.from({ length: 5 }, (item, i) => this.currentYear - i); - @tracked allowedMonthMax = 12; - @tracked disabledYear = null; - @tracked startMonth = null; - @tracked startYear = null; - - months = Array.from({ length: 12 }, (item, i) => { - return new Date(0, i).toLocaleString('en-US', { month: 'long' }); - }); - years = Array.from({ length: 5 }, (item, i) => { - return new Date().getFullYear() - i; - }); + @tracked maxMonthIdx = 11; // disables months with index greater than this number, initially all months are selectable + @tracked disabledYear = null; // year as integer if current year should be disabled + @tracked selectedMonth = null; + @tracked selectedYear = null; + @tracked invalidDate = null; @action - selectStartMonth(month, event) { - this.startMonth = month; - // disables months if in the future - this.disabledYear = this.months.indexOf(month) >= this.currentMonth ? this.currentYear : null; - event.close(); + selectMonth(month, dropdown) { + this.selectedMonth = month; + // disable current year if selected month is later than current month + this.disabledYear = month.index > this.currentMonthIdx ? this.currentYear : null; + dropdown.close(); } @action - selectStartYear(year, event) { - this.startYear = year; - this.allowedMonthMax = year === this.currentYear ? this.currentMonth : 12; - event.close(); + selectYear(year, dropdown) { + this.selectedYear = year; + // disable months after current month if selected year is current year + this.maxMonthIdx = year === this.currentYear ? this.currentMonthIdx : 11; + dropdown.close(); } @action - saveDateSelection() { - this.args.handleDateSelection(this.startMonth, this.startYear, this.args.name); + handleSubmit() { + if (this.args.validateDate) { + this.invalidDate = null; + this.invalidDate = this.args.validateDate(new Date(this.selectedYear, this.selectedMonth.index)); + if (this.invalidDate) return; + } + const { index, name } = this.selectedMonth; + this.args.handleSubmit({ + monthIdx: index, + monthName: name, + year: this.selectedYear, + dateType: this.args.dateType, + }); + this.resetDropdown(); + } + + @action + handleCancel() { + this.args.handleCancel(); + this.resetDropdown(); + } + + resetDropdown() { + this.maxMonthIdx = 11; + this.disabledYear = null; + this.selectedMonth = null; + this.selectedYear = null; + this.invalidDate = null; } } diff --git a/ui/app/models/clients/activity.js b/ui/app/models/clients/activity.js index 70d8f4914..e599a52db 100644 --- a/ui/app/models/clients/activity.js +++ b/ui/app/models/clients/activity.js @@ -3,8 +3,6 @@ export default class Activity extends Model { @attr('array') byMonth; @attr('array') byNamespace; @attr('object') total; - @attr('array') formattedEndTime; - @attr('array') formattedStartTime; @attr('string') startTime; @attr('string') endTime; @attr('string') responseTimestamp; diff --git a/ui/app/models/clients/config.js b/ui/app/models/clients/config.js index e4f101ca2..c261847d9 100644 --- a/ui/app/models/clients/config.js +++ b/ui/app/models/clients/config.js @@ -5,7 +5,7 @@ import { expandAttributeMeta } from 'vault/utils/field-to-attrs'; import { apiPath } from 'vault/macros/lazy-capabilities'; const M = Model.extend({ - queriesAvailable: attr('boolean'), + queriesAvailable: attr('boolean'), // true only if historical data exists, will be false if there is only current month data retentionMonths: attr('number', { label: 'Retention period', subText: 'The number of months of activity logs to maintain for client tracking.', diff --git a/ui/app/models/clients/monthly.js b/ui/app/models/clients/monthly.js deleted file mode 100644 index 2ec3859b2..000000000 --- a/ui/app/models/clients/monthly.js +++ /dev/null @@ -1,6 +0,0 @@ -import Model, { attr } from '@ember-data/model'; -export default class MonthlyModel extends Model { - @attr('string') responseTimestamp; - @attr('object') total; // total clients during the current/partial month - @attr('array') byNamespace; -} diff --git a/ui/app/models/clients/version-history.js b/ui/app/models/clients/version-history.js index 2175a2fc3..6c15ac3be 100644 --- a/ui/app/models/clients/version-history.js +++ b/ui/app/models/clients/version-history.js @@ -1,5 +1,6 @@ import Model, { attr } from '@ember-data/model'; export default class VersionHistoryModel extends Model { + @attr('string') version; @attr('string') previousVersion; @attr('string') timestampInstalled; } diff --git a/ui/app/router.js b/ui/app/router.js index c2c90dd4f..c742f9518 100644 --- a/ui/app/router.js +++ b/ui/app/router.js @@ -20,8 +20,7 @@ Router.map(function () { this.route('license'); this.route('mfa-setup'); this.route('clients', function () { - this.route('current'); - this.route('history'); + this.route('dashboard'); this.route('config'); this.route('edit'); }); diff --git a/ui/app/routes/vault/cluster/clients.js b/ui/app/routes/vault/cluster/clients.js index 2bb529703..c7af00950 100644 --- a/ui/app/routes/vault/cluster/clients.js +++ b/ui/app/routes/vault/cluster/clients.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import RSVP from 'rsvp'; +import { hash } from 'rsvp'; import { action } from '@ember/object'; import getStorage from 'vault/lib/token-storage'; import { inject as service } from '@ember/service'; @@ -8,32 +8,24 @@ const INPUTTED_START_DATE = 'vault:ui-inputted-start-date'; export default class ClientsRoute extends Route { @service store; async getVersionHistory() { - try { - const arrayOfModels = []; - const response = await this.store.findAll('clients/version-history'); // returns a class with nested models - response.forEach((model) => { - arrayOfModels.push({ - id: model.id, - previousVersion: model.previousVersion, - timestampInstalled: model.timestampInstalled, + return this.store + .findAll('clients/version-history') + .then((response) => { + return response.map(({ version, previousVersion, timestampInstalled }) => { + return { + version, + previousVersion, + timestampInstalled, + }; }); - }); - return arrayOfModels; - } catch (e) { - console.debug(e); // eslint-disable-line - return []; - } + }) + .catch(() => []); } - async model() { - const config = await this.store.queryRecord('clients/config', {}).catch((e) => { - console.debug(e); // eslint-disable-line - // swallowing error so activity can show if no config permissions - return {}; - }); - - return RSVP.hash({ - config, + model() { + // swallow config error so activity can show if no config permissions + return hash({ + config: this.store.queryRecord('clients/config', {}).catch(() => {}), versionHistory: this.getVersionHistory(), }); } diff --git a/ui/app/routes/vault/cluster/clients/current.js b/ui/app/routes/vault/cluster/clients/current.js deleted file mode 100644 index d631c0121..000000000 --- a/ui/app/routes/vault/cluster/clients/current.js +++ /dev/null @@ -1,17 +0,0 @@ -import Route from '@ember/routing/route'; -import RSVP from 'rsvp'; -import { inject as service } from '@ember/service'; - -export default class CurrentRoute extends Route { - @service store; - - async model() { - const parentModel = this.modelFor('vault.cluster.clients'); - - return RSVP.hash({ - config: parentModel.config, - monthly: await this.store.queryRecord('clients/monthly', {}), - versionHistory: parentModel.versionHistory, - }); - } -} diff --git a/ui/app/routes/vault/cluster/clients/dashboard.js b/ui/app/routes/vault/cluster/clients/dashboard.js new file mode 100644 index 000000000..3968d6b84 --- /dev/null +++ b/ui/app/routes/vault/cluster/clients/dashboard.js @@ -0,0 +1,43 @@ +import Route from '@ember/routing/route'; +import getStorage from 'vault/lib/token-storage'; +import { inject as service } from '@ember/service'; + +export default class DashboardRoute extends Route { + @service store; + currentDate = new Date().toISOString(); + + async getActivity(start_time) { + // on init ONLY make network request if we have a start_time + return start_time + ? await this.store.queryRecord('clients/activity', { + start_time: { timestamp: start_time }, + end_time: { timestamp: this.currentDate }, + }) + : {}; + } + + async getLicenseStartTime() { + try { + const license = await this.store.queryRecord('license', {}); + // if license.startTime is 'undefined' return 'null' for consistency + return license.startTime || getStorage().getItem('vault:ui-inputted-start-date') || null; + } catch (e) { + // return null so user can input date manually + // if already inputted manually, will be in localStorage + return getStorage().getItem('vault:ui-inputted-start-date') || null; + } + } + + async model() { + const { config, versionHistory } = this.modelFor('vault.cluster.clients'); + const licenseStart = await this.getLicenseStartTime(); + const activity = await this.getActivity(licenseStart); + return { + config, + versionHistory, + activity, + licenseStartTimestamp: licenseStart, + currentDate: this.currentDate, + }; + } +} diff --git a/ui/app/routes/vault/cluster/clients/history.js b/ui/app/routes/vault/cluster/clients/history.js deleted file mode 100644 index f0e8a8f4f..000000000 --- a/ui/app/routes/vault/cluster/clients/history.js +++ /dev/null @@ -1,46 +0,0 @@ -import Route from '@ember/routing/route'; -import { isSameMonth } from 'date-fns'; -import RSVP from 'rsvp'; -import getStorage from 'vault/lib/token-storage'; -import { parseRFC3339 } from 'core/utils/date-formatters'; -import { inject as service } from '@ember/service'; -const INPUTTED_START_DATE = 'vault:ui-inputted-start-date'; - -export default class HistoryRoute extends Route { - @service store; - - async getActivity(start_time) { - if (isSameMonth(new Date(start_time), new Date())) { - // triggers empty state to manually enter date if license begins in current month - return { isLicenseDateError: true }; - } - // on init ONLY make network request if we have a start_time - return start_time ? await this.store.queryRecord('clients/activity', { start_time }) : {}; - } - - async getLicenseStartTime() { - try { - const license = await this.store.queryRecord('license', {}); - // if license.startTime is 'undefined' return 'null' for consistency - return license.startTime || getStorage().getItem(INPUTTED_START_DATE) || null; - } catch (e) { - // return null so user can input date manually - // if already inputted manually, will be in localStorage - return getStorage().getItem(INPUTTED_START_DATE) || null; - } - } - - async model() { - const parentModel = this.modelFor('vault.cluster.clients'); - const licenseStart = await this.getLicenseStartTime(); - const activity = await this.getActivity(licenseStart); - - return RSVP.hash({ - config: parentModel.config, - activity, - startTimeFromLicense: parseRFC3339(licenseStart), - endTimeFromResponse: parseRFC3339(activity?.endTime), - versionHistory: parentModel.versionHistory, - }); - } -} diff --git a/ui/app/serializers/clients/activity.js b/ui/app/serializers/clients/activity.js index 9748af84f..0fdbb7ba0 100644 --- a/ui/app/serializers/clients/activity.js +++ b/ui/app/serializers/clients/activity.js @@ -1,6 +1,5 @@ import ApplicationSerializer from '../application'; import { formatISO } from 'date-fns'; -import { parseRFC3339 } from 'core/utils/date-formatters'; import { formatByMonths, formatByNamespace, homogenizeClientNaming } from 'core/utils/client-count-utils'; export default class ActivitySerializer extends ApplicationSerializer { normalizeResponse(store, primaryModelClass, payload, id, requestType) { @@ -14,8 +13,6 @@ export default class ActivitySerializer extends ApplicationSerializer { by_namespace: formatByNamespace(payload.data.by_namespace), by_month: formatByMonths(payload.data.months), total: homogenizeClientNaming(payload.data.total), - formatted_end_time: parseRFC3339(payload.data.end_time), - formatted_start_time: parseRFC3339(payload.data.start_time), }; delete payload.data.by_namespace; delete payload.data.months; diff --git a/ui/app/serializers/clients/monthly.js b/ui/app/serializers/clients/monthly.js deleted file mode 100644 index 9f114e594..000000000 --- a/ui/app/serializers/clients/monthly.js +++ /dev/null @@ -1,25 +0,0 @@ -import ApplicationSerializer from '../application'; -import { formatISO } from 'date-fns'; -import { formatByNamespace, homogenizeClientNaming } from 'core/utils/client-count-utils'; - -export default class MonthlySerializer extends ApplicationSerializer { - normalizeResponse(store, primaryModelClass, payload, id, requestType) { - if (payload.id === 'no-data') { - return super.normalizeResponse(store, primaryModelClass, payload, id, requestType); - } - const response_timestamp = formatISO(new Date()); - // TODO CMB: the following is assumed, need to confirm - // the months array will always include a single object: a timestamp of the current month and new/total count data, if available - const transformedPayload = { - ...payload, - response_timestamp, - by_namespace: formatByNamespace(payload.data.by_namespace), - // nest within 'total' object to mimic /activity response shape - total: homogenizeClientNaming(payload.data), - }; - delete payload.data.by_namespace; - delete payload.data.months; - delete payload.data.total; - return super.normalizeResponse(store, primaryModelClass, transformedPayload, id, requestType); - } -} diff --git a/ui/app/serializers/clients/version-history.js b/ui/app/serializers/clients/version-history.js index 465fcf1e6..ab378d1e1 100644 --- a/ui/app/serializers/clients/version-history.js +++ b/ui/app/serializers/clients/version-history.js @@ -1,13 +1,11 @@ import ApplicationSerializer from '../application'; -export default ApplicationSerializer.extend({ +export default class VersionHistorySerializer extends ApplicationSerializer { + primaryKey = 'version'; + normalizeItems(payload) { if (payload.data.keys && Array.isArray(payload.data.keys)) { - return payload.data.keys.map((key) => { - const model = payload.data.key_info[key]; - model.id = key; - return model; - }); + return payload.data.keys.map((key) => ({ version: key, ...payload.data.key_info[key] })); } - }, -}); + } +} diff --git a/ui/app/styles/components/calendar-widget.scss b/ui/app/styles/components/calendar-widget.scss index b96b374b6..be6c13b7b 100644 --- a/ui/app/styles/components/calendar-widget.scss +++ b/ui/app/styles/components/calendar-widget.scss @@ -82,12 +82,6 @@ $dark-gray: #535f73; color: lighten($dark-gray, 30%); pointer-events: none; } - &.is-selected-month { - background-color: lighten($dark-gray, 30%); - color: white; - text-align: center; - pointer-events: none; - } } } diff --git a/ui/app/styles/components/modal.scss b/ui/app/styles/components/modal.scss index 61b8ca436..5037e44ec 100644 --- a/ui/app/styles/components/modal.scss +++ b/ui/app/styles/components/modal.scss @@ -91,3 +91,20 @@ pre { margin-left: 10px; } } + +// customize spacing (.modal-card-body is restricted to padding: 20px) +.modal-card-custom { + background-color: white; + flex-grow: 1; + flex-shrink: 1; + overflow: auto; + + &.has-padding-m { + padding: $spacing-m; + } + + &.has-padding-btm-left { + padding-bottom: $spacing-m; + padding-left: $spacing-m; + } +} diff --git a/ui/app/styles/core/helpers.scss b/ui/app/styles/core/helpers.scss index 97540851a..2f6ec3ffc 100644 --- a/ui/app/styles/core/helpers.scss +++ b/ui/app/styles/core/helpers.scss @@ -225,6 +225,9 @@ .has-top-padding-l { padding-top: $spacing-l; } +.has-left-padding-l { + padding-left: $spacing-l; +} .has-top-padding-xxl { padding-top: $spacing-xxl; } diff --git a/ui/app/templates/components/calendar-widget.hbs b/ui/app/templates/components/calendar-widget.hbs index a5fff1e6f..18eba7f0c 100644 --- a/ui/app/templates/components/calendar-widget.hbs +++ b/ui/app/templates/components/calendar-widget.hbs @@ -4,9 +4,9 @@ class={{concat "toolbar-link" (if D.isOpen " is-active")}} @htmlTag="button" > - {{@startTimeDisplay}} + {{date-format this.startDate "MMM yyyy"}} - - {{@endTimeDisplay}} + {{date-format this.endDate "MMM yyyy"}} @@ -15,12 +15,24 @@ DATE OPTIONS
    +
  • + +
  • @@ -65,7 +77,7 @@ {{this.displayYear}}

    {{/each}} diff --git a/ui/app/templates/components/clients/attribution.hbs b/ui/app/templates/components/clients/attribution.hbs index a71ce44e1..cf57aacd9 100644 --- a/ui/app/templates/components/clients/attribution.hbs +++ b/ui/app/templates/components/clients/attribution.hbs @@ -1,6 +1,6 @@ -{{! show single horizontal bar chart unless data is from a single, historical month (isDateRange = false) }} +{{! only show side-by-side horizontal bar charts if data is from a single, historical month }}
    @@ -21,12 +21,32 @@ {{/if}}
    - {{#if this.barChartTotalClients}} - {{#if (or @isDateRange @isCurrentMonth)}} + {{#if @isHistoricalMonth}} +
    +

    New clients

    +

    {{this.chartText.newCopy}}

    + +
    + +
    +

    Total clients

    +

    {{this.chartText.totalCopy}}

    + +
    + {{else}}
    Clients in {{this.attributionBreakdown}}

    {{format-number this.topClientCounts.clients}}

    - {{else}} -
    -

    New clients

    -

    {{this.chartText.newCopy}}

    - -
    - -
    -

    Total clients

    -

    {{this.chartText.totalCopy}}

    - -
    {{/if}}
    {{capitalize @chartLegend.0.label}} @@ -79,12 +78,13 @@
    {{/if}}
    - {{#if @timestamp}} + {{#if @responseTimestamp}} Updated - {{date-format @timestamp "MMM d yyyy, h:mm:ss aaa"}} + {{date-format @responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}} {{/if}}
    + {{! MODAL FOR CSV DOWNLOAD }} This export will include the namespace path, authentication method path, and the associated total, entity, and non-entity clients for the below - {{if @isCurrentMonth "month" "date range"}}. + {{if this.formattedEndDate "date range" "month"}}.

    -

    SELECTED DATE {{if @endTimeDisplay " RANGE"}}

    -

    {{@startTimeDisplay}} {{if @endTimeDisplay "-"}} {{@endTimeDisplay}}

    +

    SELECTED DATE {{if this.formattedEndDate " RANGE"}}

    +

    {{this.formattedStartDate}} {{if this.formattedEndDate "-"}} {{this.formattedEndDate}}

    - + {{#if @upgradeExplanation}} +
    + + Your data contains an upgrade. + + Learn more here. + + +

    {{@upgradeExplanation}}

    +
    + {{/if}}
    \ No newline at end of file diff --git a/ui/app/templates/components/clients/current.hbs b/ui/app/templates/components/clients/current.hbs deleted file mode 100644 index 639721648..000000000 --- a/ui/app/templates/components/clients/current.hbs +++ /dev/null @@ -1,86 +0,0 @@ -
    -

    - The below data is for the current month starting from the first day. For historical data, see the history tab. -

    - {{#if (eq @model.config.enabled "Off")}} - - {{#if @model.config.configPath.canUpdate}} - - Go to configuration - - {{/if}} - - {{else if this.isGatheringData}} - - {{else if (eq @model.monthly.id "no-data")}} - - {{else}} -
    - FILTERS - - - - {{#if (not (is-empty this.authMethodOptions))}} - - {{/if}} - - -
    - {{#if this.upgradeDuringCurrentMonth}} - - {{this.upgradeVersionAndDate}} - {{this.versionSpecificText}} - - Learn more here. - - - {{/if}} - {{#if this.totalUsageCounts}} - - {{#if this.hasAttributionData}} - - {{/if}} - {{/if}} - {{/if}} -
    \ No newline at end of file diff --git a/ui/app/templates/components/clients/dashboard.hbs b/ui/app/templates/components/clients/dashboard.hbs new file mode 100644 index 000000000..ebf2fc669 --- /dev/null +++ b/ui/app/templates/components/clients/dashboard.hbs @@ -0,0 +1,208 @@ +
    +

    + This dashboard will surface Vault client usage over time. Clients represent a user or service that has authenticated to + Vault. Documentation is available + here. + Date queries are sent in UTC. +

    +

    + {{this.versionText.label}} +

    +
    + {{#if this.formattedStartDate}} +

    {{this.formattedStartDate}}

    + + {{else}} + + {{/if}} +
    +

    + {{this.versionText.description}} +

    + {{#if this.noActivityData}} + {{#if (eq @model.config.enabled "On")}} + + {{else}} + + {{#if @model.config.configPath.canUpdate}} +

    + + Go to configuration + +

    + {{/if}} +     + {{/if}} + {{else if this.errorObject}} + + {{else}} + {{#if (eq @model.config.enabled "Off")}} + + Tracking is currently disabled and data is not being collected. Historical data can be searched, but you will need to + + edit the configuration + + to enable tracking again. + + {{/if}} + {{#if (or this.totalUsageCounts this.hasAttributionData)}} +
    + FILTERS + + + + {{#if this.namespaceArray}} + + {{/if}} + {{#if (not (is-empty this.authMethodOptions))}} + + {{/if}} + + +
    + + {{#if (or this.upgradeDuringActivity this.startTimeDiscrepancy)}} + +
      + {{#if this.startTimeDiscrepancy}} +
    • {{this.startTimeDiscrepancy}}
      • + {{/if}} + {{#if this.upgradeDuringActivity}} +
    • + {{this.upgradeVersionAndDate}} + {{this.upgradeExplanation}} + + Learn more here. + +
      • + {{/if}} +
    +     + {{/if}} + {{#if this.isLoadingQuery}} + + {{else}} + {{#if this.totalUsageCounts}} + {{#unless this.byMonthActivityData}} + {{! UsageStats render when viewing a single, historical month AND activity data predates new client breakdown (< v1.10.0) + or viewing the current month filtered down to auth method }} + + {{/unless}} + {{#if this.byMonthActivityData}} + + {{/if}} + {{#if this.hasAttributionData}} + + {{/if}} + {{#if this.hasMultipleMonthsData}} + + {{/if}} + {{/if}} + {{/if}} + {{else if (and (not @model.licenseStartTimestamp) (not this.startMonthTimestamp))}} + {{! Empty state for no billing/license start date }} + + {{else}} + + + + {{/if}} + {{/if}} + + {{! BILLING START DATE MODAL }} + + +
    +

    + {{this.versionText.description}} +

    +

    {{this.versionText.label}}

    +
    + +     +
    \ No newline at end of file diff --git a/ui/app/templates/components/clients/history.hbs b/ui/app/templates/components/clients/history.hbs deleted file mode 100644 index bf666b59a..000000000 --- a/ui/app/templates/components/clients/history.hbs +++ /dev/null @@ -1,262 +0,0 @@ -
    -

    - This data is presented by full month. If there is data missing, it’s possible that tracking was turned off at the time. - Vault will only show data for contiguous blocks of time during which tracking was on. Documentation is available - here. -

    -

    - {{this.versionText.label}} -

    -
    - {{#if this.startTimeDisplay}} -

    {{this.startTimeDisplay}}

    - - {{else}} - - {{/if}} -
    -

    - {{this.versionText.description}} -

    - {{#if this.licenseStartIsCurrentMonth}} - - - - {{else if (eq @model.config.queriesAvailable false)}} - {{#if (eq @model.config.enabled "On")}} - - {{else}} - - {{#if @model.config.configPath.canUpdate}} -

    - - Go to configuration - -

    - {{/if}} -     - {{/if}} - {{else if this.errorObject}} - - {{else}} - {{#if (eq @model.config.enabled "Off")}} - - Tracking is currently disabled and data is not being collected. Historical data can be searched, but you will need to - - edit the configuration - - to enable tracking again. - - {{/if}} - {{#if (or this.totalUsageCounts this.hasAttributionData)}} -
    - FILTERS - - - - {{#if this.namespaceArray}} - - {{/if}} - {{#if (not (is-empty this.authMethodOptions))}} - - {{/if}} - - -
    - - {{#if (or this.upgradeDuringActivity this.responseRangeDiffMessage)}} - -
      - {{#if this.responseRangeDiffMessage}} -
    • {{this.responseRangeDiffMessage}}
      • - {{/if}} - {{#if this.upgradeDuringActivity}} -
    • - {{this.upgradeVersionAndDate}} - {{this.versionSpecificText}} - - Learn more here. - -
      • - {{/if}} -
    -     - {{/if}} - {{#if this.isLoadingQuery}} - - {{else}} - {{#if this.totalUsageCounts}} - {{#unless this.byMonthActivityData}} - - {{/unless}} - {{#if this.byMonthActivityData}} - - {{/if}} - {{#if this.hasAttributionData}} - - {{/if}} - {{#if this.hasMultipleMonthsData}} - - {{/if}} - {{/if}} - {{/if}} - {{else if (and (not @model.startTimeFromLicense) (not this.startTimeFromResponse))}} - {{! Empty state for no billing/license start date }} - - {{else}} - - {{/if}} - {{/if}} - - {{! BILLING START DATE MODAL }} - -
    -

    - {{this.versionText.description}} -

    -

    {{this.versionText.label}}

    -
    - - - {{or this.startMonth "Month"}} - - - - - - - - - {{or this.startYear "Year"}} - - - - - - -
    -
    -
    - - -
    -     -
    \ No newline at end of file diff --git a/ui/app/templates/components/clients/monthly-usage.hbs b/ui/app/templates/components/clients/monthly-usage.hbs index 9c65c64d9..307c6b098 100644 --- a/ui/app/templates/components/clients/monthly-usage.hbs +++ b/ui/app/templates/components/clients/monthly-usage.hbs @@ -32,9 +32,9 @@
    - {{#if @timestamp}} + {{#if @responseTimestamp}} Updated - {{date-format @timestamp "MMM d yyyy, h:mm:ss aaa"}} + {{date-format @responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}} {{/if}}
    diff --git a/ui/app/templates/components/clients/running-total.hbs b/ui/app/templates/components/clients/running-total.hbs index d20289d41..2a857cbbe 100644 --- a/ui/app/templates/components/clients/running-total.hbs +++ b/ui/app/templates/components/clients/running-total.hbs @@ -1,46 +1,4 @@ -{{#if this.showSingleMonth}} -
    -
    -

    Vault client counts

    -

    - A client is any user or service that interacts with Vault. They are made up of entity clients and non-entity clients. - The total client count number is an important consideration for Vault billing. -

    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -{{else}} +{{#if (gt @byMonthActivityData.length 1)}}
    @@ -51,8 +9,8 @@

    -
    - +
    +
    @@ -77,11 +35,11 @@
    -
    -

    Average new entity clients per month

    -

    - {{format-number this.entityClientData.averageNewClients}} -

    -
    + {{#if this.hasAverageNewClients}} +
    +

    Average new entity clients per month

    +

    + {{format-number this.entityClientData.averageNewClients}} +

    +
    -
    -

    Average new non-entity clients per month

    -

    - {{format-number this.nonEntityClientData.averageNewClients}} -

    -
    +
    +

    Average new non-entity clients per month

    +

    + {{format-number this.nonEntityClientData.averageNewClients}} +

    +
    + {{/if}}
    - {{#if @timestamp}} + {{#if @responseTimestamp}} Updated - {{date-format @timestamp "MMM d yyyy, h:mm:ss aaa"}} + {{date-format @responseTimestamp "MMM d yyyy, h:mm:ss aaa" withTimeZone=true}} {{/if}}
    @@ -124,4 +84,61 @@ {{/if}}
    +{{else}} + {{#if (and @isHistoricalMonth this.singleMonthData.new_clients.clients)}} +
    +
    +

    Vault client counts

    +

    + A client is any user or service that interacts with Vault. They are made up of entity clients and non-entity + clients. The total client count number is an important consideration for Vault billing. +

    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + {{else}} + {{! This renders when either: + -> viewing the current month and all namespaces (no filters) + -> filtering by a namespace with no month over month data + if filtering by a mount with no month over month data in dashboard.hbs renders }} + + {{/if}} {{/if}} \ No newline at end of file diff --git a/ui/app/templates/components/clients/usage-stats.hbs b/ui/app/templates/components/clients/usage-stats.hbs index ce2381c20..f993a7e5b 100644 --- a/ui/app/templates/components/clients/usage-stats.hbs +++ b/ui/app/templates/components/clients/usage-stats.hbs @@ -2,7 +2,7 @@

    {{@title}}

    -

    These totals are within this namespace and all its children.

    +

    {{or @description "These totals are within this namespace and all its children."}}

    @@ -15,7 +15,7 @@
  • - +
    Client count diff --git a/ui/app/templates/components/date-dropdown.hbs b/ui/app/templates/components/date-dropdown.hbs index 4d0f133d6..e08837014 100644 --- a/ui/app/templates/components/date-dropdown.hbs +++ b/ui/app/templates/components/date-dropdown.hbs @@ -1,61 +1,86 @@ - - - {{or this.startMonth "Month"}} - - - - - - - - - {{or this.startYear "Year"}} - - - - - - - \ No newline at end of file +
    + + + {{or this.selectedMonth.name "Month"}} + + + + + + + + + {{or this.selectedYear "Year"}} + + + + + + + {{#unless @handleCancel}} + + {{/unless}} + {{#if this.invalidDate}} + + {{/if}} +
    +{{#if @handleCancel}} +
    + + +
    +{{/if}} \ No newline at end of file diff --git a/ui/app/templates/vault/cluster.hbs b/ui/app/templates/vault/cluster.hbs index 3663a3fef..c7561ca78 100644 --- a/ui/app/templates/vault/cluster.hbs +++ b/ui/app/templates/vault/cluster.hbs @@ -78,11 +78,7 @@ )}}
    - + Client count
    diff --git a/ui/app/templates/vault/cluster/clients.hbs b/ui/app/templates/vault/cluster/clients.hbs index f8cfd1665..25693f6a7 100644 --- a/ui/app/templates/vault/cluster/clients.hbs +++ b/ui/app/templates/vault/cluster/clients.hbs @@ -6,14 +6,11 @@ -
    +
    \ No newline at end of file diff --git a/ui/lib/core/addon/components/stat-text.js b/ui/lib/core/addon/components/stat-text.js deleted file mode 100644 index dfa5f4fa9..000000000 --- a/ui/lib/core/addon/components/stat-text.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @module StatText - * StatText components are used to display a label and associated value beneath, with the option to include a description. - * - * @example - * ```js - * - * ``` - * @param {string} label=null - The label for the statistic - * @param {number} value=null - Value passed in, usually a number or statistic - * @param {string} size=null - Sizing changes whether or not there is subtext. If there is subtext 's' and 'l' are valid sizes. If no subtext, then 'm' is also acceptable. - * @param {string} [subText] - SubText is optional and will display below the label - */ - -import Component from '@glimmer/component'; -import layout from '../templates/components/stat-text'; -import { setComponentTemplate } from '@ember/component'; -/* eslint ember/no-empty-glimmer-component-classes: 'warn' */ -class StatTextComponent extends Component {} - -export default setComponentTemplate(layout, StatTextComponent); diff --git a/ui/lib/core/addon/helpers/date-format.js b/ui/lib/core/addon/helpers/date-format.js index f2f8f9ec4..d0471d9f8 100644 --- a/ui/lib/core/addon/helpers/date-format.js +++ b/ui/lib/core/addon/helpers/date-format.js @@ -1,16 +1,11 @@ import { helper } from '@ember/component/helper'; import { format, parseISO } from 'date-fns'; -export function dateFormat([date, style], { isFormatted = false, dateOnly = false }) { +export function dateFormat([date, style], { isFormatted = false, withTimeZone = false }) { // see format breaking in upgrade to date-fns 2.x https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md#changed-5 if (isFormatted) { return format(new Date(date), style); } - // when date is in '2021-09-01T00:00:00Z' format - // remove hours so date displays unaffected by timezone - if (dateOnly && typeof date === 'string') { - date = date.split('T')[0]; - } let number = typeof date === 'string' ? parseISO(date) : date; if (!number) { return; @@ -18,7 +13,15 @@ export function dateFormat([date, style], { isFormatted = false, dateOnly = fals if (number.toString().length === 10) { number = new Date(number * 1000); } - return format(number, style); + let zone; // local timezone ex: 'PST' + try { + // passing undefined means default to the browser's locale + zone = ' ' + number.toLocaleTimeString(undefined, { timeZoneName: 'short' }).split(' ')[2]; + } catch (e) { + zone = ''; + } + zone = withTimeZone ? zone : ''; + return format(number, style) + zone; } export default helper(dateFormat); diff --git a/ui/lib/core/addon/utils/client-count-utils.js b/ui/lib/core/addon/utils/client-count-utils.js index c4cf65285..141ab13ef 100644 --- a/ui/lib/core/addon/utils/client-count-utils.js +++ b/ui/lib/core/addon/utils/client-count-utils.js @@ -2,7 +2,7 @@ import { parseAPITimestamp } from 'core/utils/date-formatters'; import { compareAsc } from 'date-fns'; export const formatByMonths = (monthsArray) => { - // the months array will always include a timestamp of the month and either new/total client data or counts = null + // the monthsArray will always include a timestamp of the month and either new/total client data or counts = null if (!Array.isArray(monthsArray)) return monthsArray; const sortedPayload = sortMonthsByTimestamp(monthsArray); @@ -15,11 +15,13 @@ export const formatByMonths = (monthsArray) => { const newCounts = m.new_clients ? flattenDataset(m.new_clients) : {}; return { month, + timestamp: m.timestamp, ...totalCounts, namespaces: formatByNamespace(m.namespaces) || [], namespaces_by_key: namespaceArrayToObject(totalClientsByNamespace, newClientsByNamespace, month), new_clients: { month, + timestamp: m.timestamp, ...newCounts, namespaces: formatByNamespace(m.new_clients?.namespaces) || [], }, @@ -116,6 +118,7 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName clients, entity_clients, non_entity_clients, + mounts: newClientsByMount, }, mounts: [...nestNewClientsWithinMounts], }; @@ -149,98 +152,103 @@ export const namespaceArrayToObject = (totalClientsByNamespace, newClientsByName }; }); return namespaces_by_key; - // structure of object returned - // namespace_by_key: { - // "namespace_label": { - // month: "3/22", - // clients: 32, - // entity_clients: 16, - // non_entity_clients: 16, - // new_clients: { - // month: "3/22", - // clients: 5, - // entity_clients: 2, - // non_entity_clients: 3, - // }, - // mounts_by_key: { - // "mount_label": { - // month: "3/22", - // clients: 3, - // entity_clients: 2, - // non_entity_clients: 1, - // new_clients: { - // month: "3/22", - // clients: 5, - // entity_clients: 2, - // non_entity_clients: 3, - // }, - // }, - // }, - // }, - // }; + /* + structure of object returned + namespace_by_key: { + "namespace_label": { + month: "3/22", + clients: 32, + entity_clients: 16, + non_entity_clients: 16, + new_clients: { + month: "3/22", + clients: 5, + entity_clients: 2, + non_entity_clients: 3, + mounts: [...array of this namespace's mounts and their new client counts], + }, + mounts_by_key: { + "mount_label": { + month: "3/22", + clients: 3, + entity_clients: 2, + non_entity_clients: 1, + new_clients: { + month: "3/22", + clients: 5, + entity_clients: 2, + non_entity_clients: 3, + }, + }, + }, + }, + }; + */ }; -// API RESPONSE STRUCTURE: -// data: { -// ** by_namespace organized in descending order of client count number ** -// by_namespace: [ -// { -// namespace_id: '96OwG', -// namespace_path: 'test-ns/', -// counts: {}, -// mounts: [{ mount_path: 'path-1', counts: {} }], -// }, -// ], -// ** months organized in ascending order of timestamps, oldest to most recent -// months: [ -// { -// timestamp: '2022-03-01T00:00:00Z', -// counts: {}, -// namespaces: [ -// { -// namespace_id: 'root', -// namespace_path: '', -// counts: {}, -// mounts: [{ mount_path: 'auth/up2/', counts: {} }], -// }, -// ], -// new_clients: { -// counts: {}, -// namespaces: [ -// { -// namespace_id: 'root', -// namespace_path: '', -// counts: {}, -// mounts: [{ mount_path: 'auth/up2/', counts: {} }], -// }, -// ], -// }, -// }, -// { -// timestamp: '2022-04-01T00:00:00Z', -// counts: {}, -// namespaces: [ -// { -// namespace_id: 'root', -// namespace_path: '', -// counts: {}, -// mounts: [{ mount_path: 'auth/up2/', counts: {} }], -// }, -// ], -// new_clients: { -// counts: {}, -// namespaces: [ -// { -// namespace_id: 'root', -// namespace_path: '', -// counts: {}, -// mounts: [{ mount_path: 'auth/up2/', counts: {} }], -// }, -// ], -// }, -// }, -// ], -// start_time: 'start timestamp string', -// end_time: 'end timestamp string', -// total: { clients: 300, non_entity_clients: 100, entity_clients: 400} , -// } +/* +API RESPONSE STRUCTURE: +data: { + ** by_namespace organized in descending order of client count number ** + by_namespace: [ + { + namespace_id: '96OwG', + namespace_path: 'test-ns/', + counts: {}, + mounts: [{ mount_path: 'path-1', counts: {} }], + }, + ], + ** months organized in ascending order of timestamps, oldest to most recent + months: [ + { + timestamp: '2022-03-01T00:00:00Z', + counts: {}, + namespaces: [ + { + namespace_id: 'root', + namespace_path: '', + counts: {}, + mounts: [{ mount_path: 'auth/up2/', counts: {} }], + }, + ], + new_clients: { + counts: {}, + namespaces: [ + { + namespace_id: 'root', + namespace_path: '', + counts: {}, + mounts: [{ mount_path: 'auth/up2/', counts: {} }], + }, + ], + }, + }, + { + timestamp: '2022-04-01T00:00:00Z', + counts: {}, + namespaces: [ + { + namespace_id: 'root', + namespace_path: '', + counts: {}, + mounts: [{ mount_path: 'auth/up2/', counts: {} }], + }, + ], + new_clients: { + counts: {}, + namespaces: [ + { + namespace_id: 'root', + namespace_path: '', + counts: {}, + mounts: [{ mount_path: 'auth/up2/', counts: {} }], + }, + ], + }, + }, + ], + start_time: 'start timestamp string', + end_time: 'end timestamp string', + total: { clients: 300, non_entity_clients: 100, entity_clients: 400} , +} +*/ diff --git a/ui/lib/core/addon/utils/date-formatters.js b/ui/lib/core/addon/utils/date-formatters.js index f8a6bb9bf..fd9fac8f4 100644 --- a/ui/lib/core/addon/utils/date-formatters.js +++ b/ui/lib/core/addon/utils/date-formatters.js @@ -23,17 +23,6 @@ export const parseAPITimestamp = (timestamp, style) => { return format(date, style); }; -// convert ISO timestamp '2021-03-21T00:00:00Z' to ['2021', 2] -// (e.g. 2021 March, month is zero indexed) (used by calendar widget) -export const parseRFC3339 = (timestamp) => { - if (Array.isArray(timestamp)) { - // return if already formatted correctly - return timestamp; - } - const date = parseAPITimestamp(timestamp); - return date ? [`${date.getFullYear()}`, date.getMonth()] : null; -}; - // convert M/yy (format of dates in charts) to 'Month yyyy' (format in tooltip) export function formatChartDate(date) { const array = date.split('/'); diff --git a/ui/mirage/handlers/activity.js b/ui/mirage/handlers/activity.js deleted file mode 100644 index c783f8be1..000000000 --- a/ui/mirage/handlers/activity.js +++ /dev/null @@ -1,5666 +0,0 @@ -export default function (server) { - // 1.10 API response - server.get('sys/version-history', function () { - return { - keys: ['1.9.0', '1.9.1', '1.9.2'], - key_info: { - '1.9.0': { - previous_version: null, - timestamp_installed: '2021-11-03T10:23:16Z', - }, - '1.9.1': { - previous_version: '1.9.0', - timestamp_installed: '2021-12-03T10:23:16Z', - }, - '1.9.2': { - previous_version: '1.9.1', - timestamp_installed: '2021-01-03T10:23:16Z', - }, - }, - }; - }); - - server.get('sys/internal/counters/config', function () { - return { - request_id: '00001', - data: { - default_report_months: 12, - enabled: 'default-enable', - queries_available: true, - retention_months: 24, - }, - }; - }); - - server.get( - '/sys/internal/counters/activity', - function (_, req) { - const start_time = req.queryParams.start_time || '2021-03-17T00:00:00Z'; - const end_time = req.queryParams.end_time || '2021-12-31T23:59:59Z'; - return { - request_id: '26be5ab9-dcac-9237-ec12-269a8ca647d5', - data: { - start_time, - end_time, - total: { - _comment1: 'total client counts', - clients: 3637, - _comment2: 'following 2 fields are deprecated', - entity_clients: 1643, - non_entity_clients: 1994, - }, - by_namespace: [ - { - namespace_id: '5SWT8', - namespace_path: 'namespacelonglonglong4/', - counts: { - entity_clients: 171, - non_entity_clients: 20, - clients: 191, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 28, - entity_clients: 18, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 25, - entity_clients: 15, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 20, - entity_clients: 10, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/jdRjF', - counts: { - clients: 27, - entity_clients: 15, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/yyBoC', - counts: { - clients: 24, - entity_clients: 14, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/WLxYp', - counts: { - clients: 18, - entity_clients: 11, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/SNM6V', - counts: { - clients: 5, - entity_clients: 2, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/vNHtH', - counts: { - clients: 9, - entity_clients: 5, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/EqmlO', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'BCl56', - namespace_path: 'namespace8/', - counts: { - entity_clients: 141, - non_entity_clients: 47, - clients: 188, - }, - mounts: [ - { - path: 'auth/method/LpVqc', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/VFHO6', - counts: { - clients: 33, - entity_clients: 19, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/utu0r', - counts: { - clients: 25, - entity_clients: 16, - non_entity_clients: 9, - }, - }, - { - path: 'auth/method/xikiW', - counts: { - clients: 25, - entity_clients: 13, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/uPSo6', - counts: { - clients: 18, - entity_clients: 12, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/Z8fpo', - counts: { - clients: 14, - entity_clients: 7, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/5BBm7', - counts: { - clients: 10, - entity_clients: 8, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/Eyxkz', - counts: { - clients: 11, - entity_clients: 8, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/QBC0w', - counts: { - clients: 13, - entity_clients: 9, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/8MdGr', - counts: { - clients: 4, - entity_clients: 3, - non_entity_clients: 1, - }, - }, - ], - }, - { - namespace_id: 'yHcL9', - namespace_path: 'namespace11/', - counts: { - entity_clients: 10, - non_entity_clients: 176, - clients: 186, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 33, - entity_clients: 20, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 22, - entity_clients: 8, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 29, - entity_clients: 16, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 20, - entity_clients: 13, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/LY3am', - counts: { - clients: 29, - entity_clients: 16, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/McQ4X', - counts: { - clients: 20, - entity_clients: 15, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/NpjhH', - counts: { - clients: 17, - entity_clients: 11, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/ToKO8', - counts: { - clients: 12, - entity_clients: 9, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/wfApH', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/L9uWV', - counts: { - clients: 1, - entity_clients: 0, - non_entity_clients: 1, - }, - }, - ], - }, - { - namespace_id: 'bw5UO', - namespace_path: 'namespace6/', - counts: { - entity_clients: 29, - non_entity_clients: 155, - clients: 184, - }, - mounts: [ - { - path: 'auth/method/XQUrA', - counts: { - clients: 34, - entity_clients: 19, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/1p6HR', - counts: { - clients: 30, - entity_clients: 15, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/qRjoJ', - counts: { - clients: 24, - entity_clients: 12, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/x9QQB', - counts: { - clients: 27, - entity_clients: 16, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/rezK4', - counts: { - clients: 20, - entity_clients: 15, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/qWNSS', - counts: { - clients: 23, - entity_clients: 15, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/OmQEf', - counts: { - clients: 14, - entity_clients: 10, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/PhoAy', - counts: { - clients: 8, - entity_clients: 6, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/aUuyM', - counts: { - clients: 3, - entity_clients: 3, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/kUj1S', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'F0xGm', - namespace_path: 'namespace10/', - counts: { - entity_clients: 75, - non_entity_clients: 107, - clients: 182, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 34, - entity_clients: 19, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 25, - entity_clients: 13, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 29, - entity_clients: 17, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 21, - entity_clients: 8, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/9v04G', - counts: { - clients: 21, - entity_clients: 13, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/6hAlO', - counts: { - clients: 23, - entity_clients: 12, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/ydSdP', - counts: { - clients: 8, - entity_clients: 4, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/i0CTY', - counts: { - clients: 8, - entity_clients: 6, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/nevwU', - counts: { - clients: 6, - entity_clients: 3, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/k2jYC', - counts: { - clients: 7, - entity_clients: 4, - non_entity_clients: 3, - }, - }, - ], - }, - { - namespace_id: 'MSgZE', - namespace_path: 'namespace7/', - counts: { - entity_clients: 72, - non_entity_clients: 109, - clients: 181, - }, - mounts: [ - { - path: 'auth/method/gD50V', - counts: { - clients: 31, - entity_clients: 19, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/iJRmf', - counts: { - clients: 31, - entity_clients: 17, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/GrNjy', - counts: { - clients: 18, - entity_clients: 12, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/r0Uw3', - counts: { - clients: 23, - entity_clients: 11, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/k2lQG', - counts: { - clients: 25, - entity_clients: 18, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/hJxto', - counts: { - clients: 15, - entity_clients: 8, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/vtDck', - counts: { - clients: 16, - entity_clients: 8, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/1CenH', - counts: { - clients: 9, - entity_clients: 4, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/M47Ey', - counts: { - clients: 8, - entity_clients: 4, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/gVT0t', - counts: { - clients: 5, - entity_clients: 5, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'AAidI', - namespace_path: 'namespace20/', - counts: { - entity_clients: 39, - non_entity_clients: 141, - clients: 180, - }, - mounts: [ - { - path: 'auth/method/zolCO', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/6p3g4', - counts: { - clients: 26, - entity_clients: 15, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/iKOdR', - counts: { - clients: 22, - entity_clients: 12, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/brnKt', - counts: { - clients: 30, - entity_clients: 19, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/qK3rr', - counts: { - clients: 17, - entity_clients: 12, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/DmAuN', - counts: { - clients: 13, - entity_clients: 7, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/krE4t', - counts: { - clients: 21, - entity_clients: 13, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/sFrWK', - counts: { - clients: 11, - entity_clients: 10, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/bQg4l', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/Jaw0k', - counts: { - clients: 1, - entity_clients: 0, - non_entity_clients: 1, - }, - }, - ], - }, - { - namespace_id: '5KxXA', - namespace_path: 'namespace18anotherlong/', - counts: { - entity_clients: 168, - non_entity_clients: 11, - clients: 179, - }, - mounts: [ - { - path: 'auth/method/GkDM1', - counts: { - clients: 33, - entity_clients: 18, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/7deLa', - counts: { - clients: 30, - entity_clients: 15, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/Ash3Y', - counts: { - clients: 30, - entity_clients: 17, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/doKJ0', - counts: { - clients: 21, - entity_clients: 13, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/9Irmo', - counts: { - clients: 13, - entity_clients: 5, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/jdYx5', - counts: { - clients: 18, - entity_clients: 12, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/sYe2h', - counts: { - clients: 11, - entity_clients: 6, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/Z5F36', - counts: { - clients: 6, - entity_clients: 3, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/O0cuK', - counts: { - clients: 11, - entity_clients: 6, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/0clSt', - counts: { - clients: 6, - entity_clients: 2, - non_entity_clients: 4, - }, - }, - ], - }, - { - namespace_id: 'yYNw2', - namespace_path: 'namespace19/', - counts: { - entity_clients: 50, - non_entity_clients: 129, - clients: 179, - }, - mounts: [ - { - path: 'auth/method/zD8lQ', - counts: { - clients: 31, - entity_clients: 16, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/Dl96I', - counts: { - clients: 31, - entity_clients: 19, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/ElIse', - counts: { - clients: 31, - entity_clients: 19, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/AXzhE', - counts: { - clients: 20, - entity_clients: 13, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/cNuC6', - counts: { - clients: 22, - entity_clients: 12, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/gXtbE', - counts: { - clients: 20, - entity_clients: 13, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/PptIE', - counts: { - clients: 12, - entity_clients: 7, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/QILdh', - counts: { - clients: 7, - entity_clients: 5, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/cClAS', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/YYm3v', - counts: { - clients: 3, - entity_clients: 3, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'R6L40', - namespace_path: 'namespace2/', - counts: { - entity_clients: 121, - non_entity_clients: 56, - clients: 177, - }, - mounts: [ - { - path: 'auth/method/824CE', - counts: { - clients: 33, - entity_clients: 18, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/r2zb4', - counts: { - clients: 29, - entity_clients: 17, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/1zfD6', - counts: { - clients: 25, - entity_clients: 15, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/L14lj', - counts: { - clients: 24, - entity_clients: 14, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/cTsw9', - counts: { - clients: 19, - entity_clients: 12, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/3KTWZ', - counts: { - clients: 19, - entity_clients: 11, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/Douf5', - counts: { - clients: 13, - entity_clients: 6, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/30eez', - counts: { - clients: 9, - entity_clients: 7, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/xSSJz', - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/pR3x7', - counts: { - clients: 1, - entity_clients: 0, - non_entity_clients: 1, - }, - }, - ], - }, - { - namespace_id: 'Z4Rzh', - namespace_path: 'namespace1/', - counts: { - entity_clients: 142, - non_entity_clients: 33, - clients: 175, - }, - mounts: [ - { - path: 'auth/method/NqMeC', - counts: { - clients: 34, - entity_clients: 20, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/S0FaZ', - counts: { - clients: 30, - entity_clients: 20, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/vzH3z', - counts: { - clients: 28, - entity_clients: 17, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/uP1zV', - counts: { - clients: 26, - entity_clients: 14, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/yAga3', - counts: { - clients: 14, - entity_clients: 6, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/DTAFz', - counts: { - clients: 17, - entity_clients: 9, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/Rk3Pt', - counts: { - clients: 16, - entity_clients: 9, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/wnNH5', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/N3BJy', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/C5qsy', - counts: { - clients: 3, - entity_clients: 3, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'XGu7R', - namespace_path: 'namespace12/', - counts: { - entity_clients: 18, - non_entity_clients: 157, - clients: 175, - }, - mounts: [ - { - path: 'auth/method/qcuLl', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/KGWiS', - counts: { - clients: 29, - entity_clients: 17, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/iM8pi', - counts: { - clients: 21, - entity_clients: 13, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/IeyA4', - counts: { - clients: 27, - entity_clients: 18, - non_entity_clients: 9, - }, - }, - { - path: 'auth/method/KGFfV', - counts: { - clients: 21, - entity_clients: 13, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/23AQk', - counts: { - clients: 14, - entity_clients: 10, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/PqTWe', - counts: { - clients: 11, - entity_clients: 9, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/pPSo1', - counts: { - clients: 8, - entity_clients: 6, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/HMu5H', - counts: { - clients: 7, - entity_clients: 4, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/xpOk3', - counts: { - clients: 2, - entity_clients: 0, - non_entity_clients: 2, - }, - }, - ], - }, - { - namespace_id: 'IeyJp', - namespace_path: 'namespace14/', - counts: { - entity_clients: 33, - non_entity_clients: 142, - clients: 175, - }, - mounts: [ - { - path: 'auth/method/8NFVo', - counts: { - clients: 30, - entity_clients: 16, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/XnNDy', - counts: { - clients: 31, - entity_clients: 18, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/RYrzg', - counts: { - clients: 26, - entity_clients: 14, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/SOKji', - counts: { - clients: 27, - entity_clients: 17, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/CEYXo', - counts: { - clients: 19, - entity_clients: 13, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/RPjsj', - counts: { - clients: 15, - entity_clients: 10, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/dIqPJ', - counts: { - clients: 9, - entity_clients: 6, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/wThqG', - counts: { - clients: 8, - entity_clients: 6, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/Sa1dO', - counts: { - clients: 7, - entity_clients: 5, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/0JVs1', - counts: { - clients: 3, - entity_clients: 3, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'kxU4t', - namespace_path: 'namespacelonglonglong3/', - counts: { - entity_clients: 151, - non_entity_clients: 21, - clients: 172, - }, - mounts: [ - { - path: 'auth/method/lDz9c', - counts: { - clients: 32, - entity_clients: 17, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/GtbUu', - counts: { - clients: 23, - entity_clients: 13, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/WCyYz', - counts: { - clients: 30, - entity_clients: 17, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/j227p', - counts: { - clients: 21, - entity_clients: 14, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/9V6aN', - counts: { - clients: 20, - entity_clients: 13, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/USYOd', - counts: { - clients: 17, - entity_clients: 13, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/8pfWr', - counts: { - clients: 12, - entity_clients: 7, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/0L511', - counts: { - clients: 6, - entity_clients: 2, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/6d0rw', - counts: { - clients: 6, - entity_clients: 4, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/ECHpZ', - counts: { - clients: 5, - entity_clients: 5, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: '5xKya', - namespace_path: 'namespace15/', - counts: { - entity_clients: 73, - non_entity_clients: 98, - clients: 171, - }, - mounts: [ - { - path: 'auth/method/u2r0G', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/mKqBV', - counts: { - clients: 29, - entity_clients: 18, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/nGOa2', - counts: { - clients: 19, - entity_clients: 9, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/46UKX', - counts: { - clients: 21, - entity_clients: 11, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/WHW73', - counts: { - clients: 26, - entity_clients: 15, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/KcO46', - counts: { - clients: 20, - entity_clients: 12, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/y2vSv', - counts: { - clients: 13, - entity_clients: 12, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/VNy4X', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/cEDV9', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/CZTaj', - counts: { - clients: 3, - entity_clients: 3, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - entity_clients: 112, - non_entity_clients: 58, - clients: 170, - }, - mounts: [ - { - path: 'auth/method/koO6h', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/iF9oZ', - counts: { - clients: 31, - entity_clients: 20, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/N6guZ', - counts: { - clients: 28, - entity_clients: 16, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/h2CxN', - counts: { - clients: 16, - entity_clients: 9, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/pA5pU', - counts: { - clients: 21, - entity_clients: 15, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/xbqJh', - counts: { - clients: 9, - entity_clients: 6, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/m7vOo', - counts: { - clients: 10, - entity_clients: 6, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/lULhW', - counts: { - clients: 9, - entity_clients: 7, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/hB9qn', - counts: { - clients: 10, - entity_clients: 8, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/RIEKI', - counts: { - clients: 1, - entity_clients: 0, - non_entity_clients: 1, - }, - }, - ], - }, - { - namespace_id: 'DcgzU', - namespace_path: 'namespace17/', - counts: { - entity_clients: 43, - non_entity_clients: 125, - clients: 168, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 33, - entity_clients: 19, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 22, - entity_clients: 10, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 21, - entity_clients: 10, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/7ecN2', - counts: { - clients: 14, - entity_clients: 10, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/AYdDo', - counts: { - clients: 16, - entity_clients: 8, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/kS9h6', - counts: { - clients: 9, - entity_clients: 4, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/dIoMU', - counts: { - clients: 6, - entity_clients: 3, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/eXB1u', - counts: { - clients: 7, - entity_clients: 3, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/SQ8Ty', - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 2, - }, - }, - ], - }, - { - namespace_id: 'Uc0o8', - namespace_path: 'namespace16/', - counts: { - entity_clients: 56, - non_entity_clients: 112, - clients: 168, - }, - mounts: [ - { - path: 'auth/method/my50c', - counts: { - clients: 33, - entity_clients: 18, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/D8zfa', - counts: { - clients: 29, - entity_clients: 17, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/w2xnA', - counts: { - clients: 32, - entity_clients: 18, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/FwR7Z', - counts: { - clients: 20, - entity_clients: 12, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/wwNCu', - counts: { - clients: 17, - entity_clients: 10, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/vv2O6', - counts: { - clients: 11, - entity_clients: 7, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/zRqUm', - counts: { - clients: 9, - entity_clients: 6, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/Yez2v', - counts: { - clients: 8, - entity_clients: 3, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/SBBJ2', - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/NNSCC', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - ], - }, - { - namespace_id: 'Rqa3W', - namespace_path: 'namespace13/', - counts: { - entity_clients: 9, - non_entity_clients: 156, - clients: 165, - }, - mounts: [ - { - path: 'auth/method/KPlRb', - counts: { - clients: 33, - entity_clients: 20, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/199gy', - counts: { - clients: 29, - entity_clients: 19, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/UDpxk', - counts: { - clients: 24, - entity_clients: 14, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/bmgSl', - counts: { - clients: 21, - entity_clients: 13, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/oyWlP', - counts: { - clients: 20, - entity_clients: 12, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/z7Uka', - counts: { - clients: 15, - entity_clients: 5, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/ftNn7', - counts: { - clients: 10, - entity_clients: 6, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/pvdQ7', - counts: { - clients: 9, - entity_clients: 7, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/DsnIn', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/E1YLg', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'aJuQG', - namespace_path: 'namespace9/', - counts: { - entity_clients: 80, - non_entity_clients: 71, - clients: 151, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 31, - entity_clients: 18, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 21, - entity_clients: 7, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 25, - entity_clients: 12, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 23, - entity_clients: 13, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/klonh', - counts: { - clients: 15, - entity_clients: 7, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/JyhFQ', - counts: { - clients: 15, - entity_clients: 5, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/S66CH', - counts: { - clients: 7, - entity_clients: 4, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/6pBz3', - counts: { - clients: 6, - entity_clients: 4, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/qHCZa', - counts: { - clients: 6, - entity_clients: 4, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/I6OpF', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - ], - }, - { - namespace_id: 'DochC', - namespace_path: 'ns2/', - counts: { - _comment3: 'simulating response with old key names', - distinct_entities: 45, - non_entity_tokens: 55, - clients: 100, - }, - }, - { - namespace_id: 'RtgpW', - namespace_path: 'ns1/', - counts: { - _comment4: 'and another namespace with old key names', - distinct_entities: 5, - non_entity_tokens: 15, - clients: 20, - }, - }, - ], - months: [ - { - timestamp: '2022-01-01T08:00:00.000Z', - counts: { - clients: 68, - entity_clients: 23, - non_entity_clients: 45, - }, - namespaces: [ - { - counts: { - entity_clients: 14, - non_entity_clients: 18, - clients: 32, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 18, - entity_clients: 8, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 6, - entity_clients: 3, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 5, - entity_clients: 2, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 4, - non_entity_clients: 13, - clients: 17, - }, - mounts: [ - { - path: 'auth/method/KPlRb', - counts: { - clients: 8, - entity_clients: 1, - non_entity_clients: 7, - }, - }, - { - path: 'auth/method/199gy', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/UDpxk', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/bmgSl', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace13/', - path: '', - }, - { - counts: { - entity_clients: 3, - non_entity_clients: 12, - clients: 15, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 5, - entity_clients: 1, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 2, - entity_clients: 0, - non_entity_clients: 2, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - entity_clients: 2, - non_entity_clients: 2, - clients: 4, - }, - mounts: [ - { - path: 'auth/method/qcuLl', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/KGWiS', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/iM8pi', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/IeyA4', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace12/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 47, - entity_clients: 11, - non_entity_clients: 36, - }, - namespaces: [ - { - counts: { - clients: 14, - entity_clients: 11, - non_entity_clients: 3, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 6, - entity_clients: 4, - non_entity_clients: 813, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 113, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 45, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 168, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 11, - entity_clients: 9, - non_entity_clients: 2, - }, - mounts: [ - { - path: 'auth/method/KPlRb', - counts: { - clients: 5, - entity_clients: 1, - non_entity_clients: 346, - }, - }, - { - path: 'auth/method/199gy', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 85, - }, - }, - { - path: 'auth/method/UDpxk', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/bmgSl', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - ], - id: 'namespace13/', - path: '', - }, - { - counts: { - clients: 10, - entity_clients: 8, - non_entity_clients: 2, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 453, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 291, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 4, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/qcuLl', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 253, - }, - }, - { - path: 'auth/method/KGWiS', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 26, - }, - }, - { - path: 'auth/method/iM8pi', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 126, - }, - }, - { - path: 'auth/method/IeyA4', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 53, - }, - }, - ], - id: 'namespace12/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-02-01T08:00:00.000Z', - counts: { - clients: 115, - entity_clients: 95, - non_entity_clients: 20, - }, - namespaces: [ - { - counts: { - entity_clients: 83, - non_entity_clients: 17, - clients: 100, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 73, - entity_clients: 61, - non_entity_clients: 12, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 19, - entity_clients: 17, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 10, - non_entity_clients: 1, - clients: 11, - }, - mounts: [ - { - path: 'auth/method/824CE', - counts: { - clients: 7, - entity_clients: 6, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/r2zb4', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/1zfD6', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/L14lj', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace2/', - path: '', - }, - { - counts: { - entity_clients: 1, - non_entity_clients: 1, - clients: 2, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - entity_clients: 1, - non_entity_clients: 1, - clients: 2, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 30, - entity_clients: 26, - non_entity_clients: 4, - }, - namespaces: [ - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: -1, - entity_clients: -1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/824CE', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/r2zb4', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/1zfD6', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/L14lj', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace2/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: -1, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-03-01T08:00:00.000Z', - counts: { - clients: 145, - entity_clients: 121, - non_entity_clients: 24, - }, - namespaces: [ - { - counts: { - entity_clients: 83, - non_entity_clients: 20, - clients: 103, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 71, - entity_clients: 61, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 21, - entity_clients: 15, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 8, - entity_clients: 6, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 20, - non_entity_clients: 2, - clients: 22, - }, - mounts: [ - { - path: 'auth/method/824CE', - counts: { - clients: 11, - entity_clients: 10, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/r2zb4', - counts: { - clients: 7, - entity_clients: 6, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/1zfD6', - counts: { - clients: 3, - entity_clients: 3, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/L14lj', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace2/', - path: '', - }, - { - counts: { - entity_clients: 15, - non_entity_clients: 1, - clients: 16, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 11, - entity_clients: 10, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - entity_clients: 3, - non_entity_clients: 1, - clients: 4, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 29, - entity_clients: 21, - non_entity_clients: 8, - }, - namespaces: [ - { - counts: { - clients: 127, - entity_clients: 119, - non_entity_clients: 8, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 108, - entity_clients: 69, - non_entity_clients: 813, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 9, - entity_clients: 1, - non_entity_clients: 113, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 5, - entity_clients: 4, - non_entity_clients: 45, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 168, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 40, - entity_clients: 39, - non_entity_clients: 1, - }, - mounts: [ - { - path: 'auth/method/824CE', - counts: { - clients: 35, - entity_clients: 10, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/r2zb4', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 495, - }, - }, - { - path: 'auth/method/1zfD6', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/L14lj', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 5, - }, - }, - ], - id: 'namespace2/', - path: '', - }, - { - counts: { - clients: 21, - entity_clients: 15, - non_entity_clients: 6, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 10, - entity_clients: 2, - non_entity_clients: 453, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 4, - entity_clients: 3, - non_entity_clients: 291, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 4, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 1019, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 29, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 7, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-04-01T07:00:00.000Z', - counts: { - clients: 174, - entity_clients: 81, - non_entity_clients: 93, - }, - namespaces: [ - { - counts: { - entity_clients: 53, - non_entity_clients: 83, - clients: 136, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 102, - entity_clients: 37, - non_entity_clients: 65, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 25, - entity_clients: 12, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 5, - entity_clients: 2, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 2, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - entity_clients: 14, - non_entity_clients: 5, - clients: 19, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 11, - entity_clients: 9, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 4, - entity_clients: 3, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - entity_clients: 7, - non_entity_clients: 4, - clients: 11, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - { - counts: { - entity_clients: 7, - non_entity_clients: 1, - clients: 8, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace9/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 20, - entity_clients: 5, - non_entity_clients: 15, - }, - namespaces: [ - { - counts: { - clients: 725, - entity_clients: 416, - non_entity_clients: 309, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 281, - entity_clients: 48, - non_entity_clients: 453, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 252, - entity_clients: 142, - non_entity_clients: 291, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 93, - entity_clients: 43, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 86, - entity_clients: 19, - non_entity_clients: 4, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - clients: 178, - entity_clients: 99, - non_entity_clients: 79, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 76, - entity_clients: 69, - non_entity_clients: 1019, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 64, - entity_clients: 38, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 20, - entity_clients: 12, - non_entity_clients: 29, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 15, - entity_clients: 12, - non_entity_clients: 7, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - clients: 40, - entity_clients: 28, - non_entity_clients: 12, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 24, - entity_clients: 9, - non_entity_clients: 195, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 10, - entity_clients: 8, - non_entity_clients: 88, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 58, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - { - counts: { - clients: 34, - entity_clients: 21, - non_entity_clients: 13, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 27, - entity_clients: 14, - non_entity_clients: 445, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 378, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 4, - }, - }, - ], - id: 'namespace9/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-05-01T07:00:00.000Z', - counts: { - clients: 194, - entity_clients: 187, - non_entity_clients: 7, - }, - namespaces: [ - { - counts: { - entity_clients: 106, - non_entity_clients: 3, - clients: 109, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 44, - entity_clients: 43, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 34, - entity_clients: 33, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 21, - entity_clients: 20, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 10, - entity_clients: 10, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 80, - non_entity_clients: 3, - clients: 83, - }, - mounts: [ - { - path: 'auth/method/qcuLl', - counts: { - clients: 37, - entity_clients: 36, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/KGWiS', - counts: { - clients: 35, - entity_clients: 34, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/iM8pi', - counts: { - clients: 10, - entity_clients: 9, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/IeyA4', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace12/', - path: '', - }, - { - counts: { - entity_clients: 1, - non_entity_clients: 1, - clients: 2, - }, - mounts: [ - { - path: 'auth/method/XQUrA', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/1p6HR', - counts: { - clients: null, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/qRjoJ', - counts: { - clients: null, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/x9QQB', - counts: { - clients: null, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace6/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 38, - entity_clients: 29, - non_entity_clients: 9, - }, - namespaces: [ - { - counts: { - clients: 62, - entity_clients: 37, - non_entity_clients: 25, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 57, - entity_clients: 26, - non_entity_clients: 813, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 113, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 45, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 168, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 31, - entity_clients: 20, - non_entity_clients: 11, - }, - mounts: [ - { - path: 'auth/method/qcuLl', - counts: { - clients: 27, - entity_clients: 24, - non_entity_clients: 253, - }, - }, - { - path: 'auth/method/KGWiS', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 26, - }, - }, - { - path: 'auth/method/iM8pi', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 126, - }, - }, - { - path: 'auth/method/IeyA4', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 53, - }, - }, - ], - id: 'namespace12/', - path: '', - }, - { - counts: { - clients: 30, - entity_clients: 21, - non_entity_clients: 9, - }, - mounts: [ - { - path: 'auth/method/XQUrA', - counts: { - clients: 15, - entity_clients: 5, - non_entity_clients: 164, - }, - }, - { - path: 'auth/method/1p6HR', - counts: { - clients: 7, - entity_clients: 4, - non_entity_clients: 292, - }, - }, - { - path: 'auth/method/qRjoJ', - counts: { - clients: 6, - entity_clients: 1, - non_entity_clients: 47, - }, - }, - { - path: 'auth/method/x9QQB', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 33, - }, - }, - ], - id: 'namespace6/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-06-01T07:00:00.000Z', - counts: { - clients: 232, - entity_clients: 47, - non_entity_clients: 185, - }, - namespaces: [ - { - counts: { - entity_clients: 21, - non_entity_clients: 102, - clients: 123, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 111, - entity_clients: 12, - non_entity_clients: 99, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 7, - entity_clients: 6, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 19, - non_entity_clients: 59, - clients: 78, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 37, - entity_clients: 8, - non_entity_clients: 29, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 25, - entity_clients: 5, - non_entity_clients: 20, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 9, - entity_clients: 4, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 7, - entity_clients: 2, - non_entity_clients: 5, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - entity_clients: 7, - non_entity_clients: 24, - clients: 31, - }, - mounts: [ - { - path: 'auth/method/my50c', - counts: { - clients: 20, - entity_clients: 4, - non_entity_clients: 16, - }, - }, - { - path: 'auth/method/D8zfa', - counts: { - clients: 7, - entity_clients: 1, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/w2xnA', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/FwR7Z', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace16/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 71, - entity_clients: 49, - non_entity_clients: 22, - }, - namespaces: [ - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/my50c', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/D8zfa', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/w2xnA', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/FwR7Z', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace16/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-07-01T07:00:00.000Z', - counts: { - clients: 303, - entity_clients: 218, - non_entity_clients: 85, - }, - namespaces: [ - { - counts: { - entity_clients: 120, - non_entity_clients: 44, - clients: 164, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 81, - entity_clients: 61, - non_entity_clients: 20, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 44, - entity_clients: 31, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 32, - entity_clients: 24, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 7, - entity_clients: 4, - non_entity_clients: 3, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 65, - non_entity_clients: 35, - clients: 100, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 88, - entity_clients: 62, - non_entity_clients: 26, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 7, - entity_clients: 1, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - entity_clients: 33, - non_entity_clients: 6, - clients: 39, - }, - mounts: [ - { - path: 'auth/method/my50c', - counts: { - clients: 29, - entity_clients: 26, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/D8zfa', - counts: { - clients: 4, - entity_clients: 3, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/w2xnA', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/FwR7Z', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace16/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 72, - entity_clients: 46, - non_entity_clients: 26, - }, - namespaces: [ - { - counts: { - clients: 41, - entity_clients: 39, - non_entity_clients: 2, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 21, - entity_clients: 18, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 12, - entity_clients: 9, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 14, - entity_clients: 13, - non_entity_clients: 1, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 8, - entity_clients: 6, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - clients: 10, - entity_clients: 6, - non_entity_clients: 4, - }, - mounts: [ - { - path: 'auth/method/my50c', - counts: { - clients: 6, - entity_clients: 5, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/D8zfa', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/w2xnA', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/FwR7Z', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace16/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-08-01T07:00:00.000Z', - counts: { - clients: 375, - entity_clients: 80, - non_entity_clients: 295, - }, - namespaces: [ - { - counts: { - entity_clients: 63, - non_entity_clients: 216, - clients: 279, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 200, - entity_clients: 43, - non_entity_clients: 157, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 49, - entity_clients: 14, - non_entity_clients: 35, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 19, - entity_clients: 4, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 11, - entity_clients: 2, - non_entity_clients: 9, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 14, - non_entity_clients: 45, - clients: 59, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 40, - entity_clients: 6, - non_entity_clients: 34, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 9, - entity_clients: 4, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 6, - entity_clients: 2, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 2, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - { - counts: { - entity_clients: 3, - non_entity_clients: 34, - clients: 37, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 29, - entity_clients: 1, - non_entity_clients: 28, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 5, - entity_clients: 1, - non_entity_clients: 4, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 1, - entity_clients: 0, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace9/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - namespaces: [ - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace9/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-09-01T07:00:00.000Z', - counts: { - clients: 375, - entity_clients: 67, - non_entity_clients: 308, - }, - namespaces: [ - { - counts: { - entity_clients: 34, - non_entity_clients: 230, - clients: 264, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 107, - entity_clients: 26, - non_entity_clients: 81, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 81, - entity_clients: 4, - non_entity_clients: 77, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 55, - entity_clients: 3, - non_entity_clients: 52, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 21, - entity_clients: 1, - non_entity_clients: 20, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 24, - non_entity_clients: 48, - clients: 72, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 59, - entity_clients: 21, - non_entity_clients: 38, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 7, - entity_clients: 1, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - { - counts: { - entity_clients: 9, - non_entity_clients: 30, - clients: 39, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 18, - entity_clients: 3, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 14, - entity_clients: 3, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 5, - entity_clients: 2, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace9/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 114, - entity_clients: 63, - non_entity_clients: 51, - }, - namespaces: [ - { - counts: { - clients: 7, - entity_clients: 6, - non_entity_clients: 1, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - { - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/RCpUn', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/S0O4t', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/QqXfg', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/CSSoi', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace9/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-10-01T07:00:00.000Z', - counts: { - clients: 489, - entity_clients: 134, - non_entity_clients: 355, - }, - namespaces: [ - { - counts: { - entity_clients: 108, - non_entity_clients: 322, - clients: 430, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 257, - entity_clients: 35, - non_entity_clients: 222, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 79, - entity_clients: 34, - non_entity_clients: 45, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 65, - entity_clients: 32, - non_entity_clients: 33, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 29, - entity_clients: 7, - non_entity_clients: 22, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - entity_clients: 15, - non_entity_clients: 26, - clients: 41, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 22, - entity_clients: 9, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 9, - entity_clients: 3, - non_entity_clients: 6, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 7, - entity_clients: 2, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 3, - entity_clients: 1, - non_entity_clients: 2, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - entity_clients: 11, - non_entity_clients: 7, - clients: 18, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 8, - entity_clients: 5, - non_entity_clients: 3, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 21, - entity_clients: 11, - non_entity_clients: 10, - }, - namespaces: [ - { - counts: { - clients: 154, - entity_clients: 129, - non_entity_clients: 25, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 114, - entity_clients: 84, - non_entity_clients: 453, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 33, - entity_clients: 25, - non_entity_clients: 291, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 4, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - { - counts: { - clients: 6, - entity_clients: 3, - non_entity_clients: 3, - }, - mounts: [ - { - path: 'auth/method/qT4Wl', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1019, - }, - }, - { - path: 'auth/method/Vhu56', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 11, - }, - }, - { - path: 'auth/method/PCc58', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 29, - }, - }, - { - path: 'auth/method/nPP4c', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 7, - }, - }, - ], - id: 'namespace11/', - path: '', - }, - { - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 2, - }, - mounts: [ - { - path: 'auth/method/xYL0l', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 195, - }, - }, - { - path: 'auth/method/CwWM7', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 88, - }, - }, - { - path: 'auth/method/swCd0', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 58, - }, - }, - { - path: 'auth/method/0CZTs', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace10/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-11-01T07:00:00.000Z', - counts: { - clients: 510, - entity_clients: 164, - non_entity_clients: 346, - }, - namespaces: [ - { - counts: { - entity_clients: 66, - non_entity_clients: 176, - clients: 242, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 108, - entity_clients: 26, - non_entity_clients: 82, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 93, - entity_clients: 22, - non_entity_clients: 71, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 29, - entity_clients: 15, - non_entity_clients: 14, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 12, - entity_clients: 3, - non_entity_clients: 9, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 51, - non_entity_clients: 120, - clients: 171, - }, - mounts: [ - { - path: 'auth/method/lDz9c', - counts: { - clients: 144, - entity_clients: 31, - non_entity_clients: 113, - }, - }, - { - path: 'auth/method/GtbUu', - counts: { - clients: 15, - entity_clients: 10, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/WCyYz', - counts: { - clients: 7, - entity_clients: 6, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/j227p', - counts: { - clients: 5, - entity_clients: 4, - non_entity_clients: 1, - }, - }, - ], - id: 'namespacelonglonglong3/', - path: '', - }, - { - counts: { - entity_clients: 47, - non_entity_clients: 50, - clients: 97, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 53, - entity_clients: 23, - non_entity_clients: 30, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 33, - entity_clients: 16, - non_entity_clients: 17, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 9, - entity_clients: 7, - non_entity_clients: 2, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 27, - entity_clients: 8, - non_entity_clients: 19, - }, - namespaces: [ - { - counts: { - clients: 79, - entity_clients: 40, - non_entity_clients: 39, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 43, - entity_clients: 19, - non_entity_clients: 813, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 19, - entity_clients: 15, - non_entity_clients: 113, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 9, - entity_clients: 6, - non_entity_clients: 45, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 4, - entity_clients: 2, - non_entity_clients: 168, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 4, - entity_clients: 3, - non_entity_clients: 1, - }, - mounts: [ - { - path: 'auth/method/lDz9c', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 392, - }, - }, - { - path: 'auth/method/GtbUu', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 32, - }, - }, - { - path: 'auth/method/WCyYz', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - { - path: 'auth/method/j227p', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 51, - }, - }, - ], - id: 'namespacelonglonglong3/', - path: '', - }, - { - counts: { - clients: 3, - entity_clients: 2, - non_entity_clients: 1, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 453, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 291, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 1, - entity_clients: 1, - non_entity_clients: 13, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 4, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - ], - }, - }, - { - timestamp: '2022-12-01T08:00:00.000Z', - counts: { - clients: 537, - entity_clients: 125, - non_entity_clients: 412, - }, - namespaces: [ - { - counts: { - entity_clients: 89, - non_entity_clients: 188, - clients: 277, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 148, - entity_clients: 79, - non_entity_clients: 69, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 63, - entity_clients: 4, - non_entity_clients: 59, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 40, - entity_clients: 3, - non_entity_clients: 37, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 26, - entity_clients: 3, - non_entity_clients: 23, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - entity_clients: 24, - non_entity_clients: 187, - clients: 211, - }, - mounts: [ - { - path: 'auth/method/u2r0G', - counts: { - clients: 190, - entity_clients: 17, - non_entity_clients: 173, - }, - }, - { - path: 'auth/method/mKqBV', - counts: { - clients: 12, - entity_clients: 4, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/nGOa2', - counts: { - clients: 7, - entity_clients: 2, - non_entity_clients: 5, - }, - }, - { - path: 'auth/method/46UKX', - counts: { - clients: 2, - entity_clients: 1, - non_entity_clients: 1, - }, - }, - ], - id: 'namespace15/', - path: '', - }, - { - counts: { - entity_clients: 12, - non_entity_clients: 37, - clients: 49, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 22, - entity_clients: 6, - non_entity_clients: 16, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 14, - entity_clients: 4, - non_entity_clients: 10, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 9, - entity_clients: 1, - non_entity_clients: 8, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 4, - entity_clients: 1, - non_entity_clients: 3, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - ], - new_clients: { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - namespaces: [ - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/cdZ64', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/UpXi1', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/6OzPw', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/PkimI', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace17/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/u2r0G', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/mKqBV', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/nGOa2', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/46UKX', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespace15/', - path: '', - }, - { - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/8YJO3', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/Ro774', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - { - path: 'auth/method/ZIpjT', - counts: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - }, - ], - id: 'namespacelonglonglong4/', - path: '', - }, - ], - }, - }, - ], - }, - }; - }, - { timing: 3000 } - ); - - server.get('/sys/internal/counters/activity/monthly', function () { - return { - request_id: '26be5ab9-dcac-9237-ec12-269a8ca64742', - lease_id: '', - renewable: false, - lease_duration: 0, - data: { - by_namespace: [ - { - namespace_id: '0lHBL', - namespace_path: 'ns1/', - counts: { - distinct_entities: 85, - non_entity_tokens: 15, - clients: 100, - }, - mounts: [ - { - path: 'auth/method/uMGBU', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/woiej', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - ], - }, - { - namespace_id: 'RxD81', - namespace_path: 'ns2/', - counts: { - distinct_entities: 35, - non_entity_tokens: 20, - clients: 55, - }, - mounts: [ - { - path: 'auth/method/ABCD1', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/ABCD2', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 12, - non_entity_tokens: 8, - clients: 20, - }, - mounts: [ - { - path: 'auth/method/XYZZ2', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - path: 'auth/method/XYZZ1', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - ], - }, - ], - distinct_entities: 132, - non_entity_tokens: 43, - clients: 175, - }, - wrap_info: null, - warnings: null, - auth: null, - }; - }); -} diff --git a/ui/mirage/handlers/clients.js b/ui/mirage/handlers/clients.js index a4fbc5c9b..46d22b74e 100644 --- a/ui/mirage/handlers/clients.js +++ b/ui/mirage/handlers/clients.js @@ -1,2839 +1,127 @@ import { - formatISO, - isAfter, isBefore, - sub, - isSameMonth, startOfMonth, endOfMonth, addMonths, subMonths, differenceInCalendarMonths, + fromUnixTime, + isAfter, + formatRFC3339, } from 'date-fns'; import { parseAPITimestamp } from 'core/utils/date-formatters'; -import formatRFC3339 from 'date-fns/formatRFC3339'; - -const NEW_DATE = new Date(); -const COUNTS_START = subMonths(NEW_DATE, 12); // pretend vault user started cluster 1 year ago +const CURRENT_DATE = new Date(); +const COUNTS_START = subMonths(CURRENT_DATE, 12); // pretend vault user started cluster 6 months ago // for testing, we're in the middle of a license/billing period -const LICENSE_START = startOfMonth(subMonths(NEW_DATE, 6)); -const LICENSE_END = endOfMonth(addMonths(NEW_DATE, 6)); - +const LICENSE_START = startOfMonth(subMonths(CURRENT_DATE, 6)); // upgrade happened 1 month after license start const UPGRADE_DATE = addMonths(LICENSE_START, 1); -// Oldest to newest -const MOCK_MONTHLY_DATA = [ - { - timestamp: formatISO(UPGRADE_DATE), - counts: { - distinct_entities: 0, - entity_clients: 10433, - non_entity_tokens: 0, - non_entity_clients: 7555, - clients: 17988, - }, - namespaces: [ - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 3458, - non_entity_tokens: 0, - non_entity_clients: 1631, - clients: 5089, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 948, - non_entity_tokens: 0, - non_entity_clients: 714, - clients: 1662, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 899, - non_entity_tokens: 0, - non_entity_clients: 301, - clients: 1200, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 692, - non_entity_tokens: 0, - non_entity_clients: 474, - clients: 1166, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 919, - non_entity_tokens: 0, - non_entity_clients: 142, - clients: 1061, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 2428, - non_entity_tokens: 0, - non_entity_clients: 1841, - clients: 4269, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 969, - non_entity_tokens: 0, - non_entity_clients: 396, - clients: 1365, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 794, - non_entity_tokens: 0, - non_entity_clients: 501, - clients: 1295, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 289, - non_entity_tokens: 0, - non_entity_clients: 666, - clients: 955, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 376, - non_entity_tokens: 0, - non_entity_clients: 278, - clients: 654, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 2384, - non_entity_tokens: 0, - non_entity_clients: 1278, - clients: 3662, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 853, - non_entity_tokens: 0, - non_entity_clients: 553, - clients: 1406, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 677, - non_entity_tokens: 0, - non_entity_clients: 182, - clients: 859, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 582, - non_entity_tokens: 0, - non_entity_clients: 175, - clients: 757, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 272, - non_entity_tokens: 0, - non_entity_clients: 368, - clients: 640, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 943, - non_entity_tokens: 0, - non_entity_clients: 1595, - clients: 2538, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 318, - non_entity_tokens: 0, - non_entity_clients: 735, - clients: 1053, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 362, - non_entity_tokens: 0, - non_entity_clients: 415, - clients: 777, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 158, - non_entity_tokens: 0, - non_entity_clients: 325, - clients: 483, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 105, - non_entity_tokens: 0, - non_entity_clients: 120, - clients: 225, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 1220, - non_entity_tokens: 0, - non_entity_clients: 1210, - clients: 2430, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 697, - non_entity_tokens: 0, - non_entity_clients: 516, - clients: 1213, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 154, - non_entity_tokens: 0, - non_entity_clients: 480, - clients: 634, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 223, - non_entity_tokens: 0, - non_entity_clients: 97, - clients: 320, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 146, - non_entity_tokens: 0, - non_entity_clients: 117, - clients: 263, - }, - }, - ], - }, - ], - new_clients: { - counts: { - distinct_entities: 0, - entity_clients: 5032, - non_entity_tokens: 0, - non_entity_clients: 2888, - clients: 7920, - }, - namespaces: [ - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1907, - non_entity_tokens: 0, - non_entity_clients: 354, - clients: 2261, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 753, - non_entity_tokens: 0, - non_entity_clients: 138, - clients: 891, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 516, - non_entity_tokens: 0, - non_entity_clients: 91, - clients: 607, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 474, - non_entity_tokens: 0, - non_entity_clients: 1, - clients: 475, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 164, - non_entity_tokens: 0, - non_entity_clients: 124, - clients: 288, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 843, - non_entity_tokens: 0, - non_entity_clients: 748, - clients: 1591, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 597, - non_entity_tokens: 0, - non_entity_clients: 369, - clients: 966, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 185, - non_entity_tokens: 0, - non_entity_clients: 156, - clients: 341, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 59, - non_entity_tokens: 0, - non_entity_clients: 223, - clients: 282, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 1291, - non_entity_tokens: 0, - non_entity_clients: 268, - clients: 1559, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 518, - non_entity_tokens: 0, - non_entity_clients: 78, - clients: 596, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 291, - non_entity_tokens: 0, - non_entity_clients: 85, - clients: 376, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 276, - non_entity_tokens: 0, - non_entity_clients: 59, - clients: 335, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 206, - non_entity_tokens: 0, - non_entity_clients: 46, - clients: 252, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 663, - non_entity_tokens: 0, - non_entity_clients: 778, - clients: 1441, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 478, - non_entity_tokens: 0, - non_entity_clients: 309, - clients: 787, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 129, - non_entity_tokens: 0, - non_entity_clients: 313, - clients: 442, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 32, - non_entity_tokens: 0, - non_entity_clients: 79, - clients: 111, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 24, - non_entity_tokens: 0, - non_entity_clients: 77, - clients: 101, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 328, - non_entity_tokens: 0, - non_entity_clients: 740, - clients: 1068, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 143, - non_entity_tokens: 0, - non_entity_clients: 273, - clients: 416, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 136, - non_entity_tokens: 0, - non_entity_clients: 142, - clients: 278, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 19, - non_entity_tokens: 0, - non_entity_clients: 216, - clients: 235, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 30, - non_entity_tokens: 0, - non_entity_clients: 109, - clients: 139, - }, - }, - ], - }, - ], - }, - }, - { - timestamp: formatISO(addMonths(UPGRADE_DATE, 1)), - counts: { - distinct_entities: 0, - entity_clients: 10285, - non_entity_tokens: 0, - non_entity_clients: 10425, - clients: 20710, - }, - namespaces: [ - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 2335, - non_entity_tokens: 0, - non_entity_clients: 2644, - clients: 4979, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 939, - non_entity_tokens: 0, - non_entity_clients: 649, - clients: 1588, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 461, - non_entity_tokens: 0, - non_entity_clients: 870, - clients: 1331, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 172, - non_entity_tokens: 0, - non_entity_clients: 990, - clients: 1162, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 763, - non_entity_tokens: 0, - non_entity_clients: 135, - clients: 898, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 2054, - non_entity_tokens: 0, - non_entity_clients: 2747, - clients: 4801, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 540, - non_entity_tokens: 0, - non_entity_clients: 941, - clients: 1481, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 722, - non_entity_tokens: 0, - non_entity_clients: 507, - clients: 1229, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 611, - non_entity_tokens: 0, - non_entity_clients: 520, - clients: 1131, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 181, - non_entity_tokens: 0, - non_entity_clients: 779, - clients: 960, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 2788, - non_entity_tokens: 0, - non_entity_clients: 1720, - clients: 4508, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 643, - non_entity_tokens: 0, - non_entity_clients: 814, - clients: 1457, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 811, - non_entity_tokens: 0, - non_entity_clients: 385, - clients: 1196, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 932, - non_entity_tokens: 0, - non_entity_clients: 72, - clients: 1004, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 402, - non_entity_tokens: 0, - non_entity_clients: 449, - clients: 851, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1162, - non_entity_tokens: 0, - non_entity_clients: 2187, - clients: 3349, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 483, - non_entity_tokens: 0, - non_entity_clients: 839, - clients: 1322, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 373, - non_entity_tokens: 0, - non_entity_clients: 858, - clients: 1231, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 271, - non_entity_tokens: 0, - non_entity_clients: 154, - clients: 425, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 35, - non_entity_tokens: 0, - non_entity_clients: 336, - clients: 371, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 1946, - non_entity_tokens: 0, - non_entity_clients: 1127, - clients: 3073, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 322, - non_entity_tokens: 0, - non_entity_clients: 537, - clients: 859, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 685, - non_entity_tokens: 0, - non_entity_clients: 132, - clients: 817, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 321, - non_entity_tokens: 0, - non_entity_clients: 385, - clients: 706, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 618, - non_entity_tokens: 0, - non_entity_clients: 73, - clients: 691, - }, - }, - ], - }, - ], - new_clients: { - counts: { - distinct_entities: 0, - entity_clients: 5315, - non_entity_tokens: 0, - non_entity_clients: 5724, - clients: 11039, - }, - namespaces: [ - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 1253, - non_entity_tokens: 0, - non_entity_clients: 1529, - clients: 2782, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 452, - non_entity_tokens: 0, - non_entity_clients: 433, - clients: 885, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 134, - non_entity_tokens: 0, - non_entity_clients: 732, - clients: 866, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 472, - non_entity_tokens: 0, - non_entity_clients: 361, - clients: 833, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 195, - non_entity_tokens: 0, - non_entity_clients: 3, - clients: 198, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1032, - non_entity_tokens: 0, - non_entity_clients: 1652, - clients: 2684, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 93, - non_entity_tokens: 0, - non_entity_clients: 849, - clients: 942, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 692, - non_entity_tokens: 0, - non_entity_clients: 117, - clients: 809, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 159, - non_entity_tokens: 0, - non_entity_clients: 596, - clients: 755, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 88, - non_entity_tokens: 0, - non_entity_clients: 90, - clients: 178, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 1482, - non_entity_tokens: 0, - non_entity_clients: 742, - clients: 2224, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 278, - non_entity_tokens: 0, - non_entity_clients: 372, - clients: 650, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 546, - non_entity_tokens: 0, - non_entity_clients: 52, - clients: 598, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 313, - non_entity_tokens: 0, - non_entity_clients: 264, - clients: 577, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 345, - non_entity_tokens: 0, - non_entity_clients: 54, - clients: 399, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 1090, - non_entity_tokens: 0, - non_entity_clients: 600, - clients: 1690, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 632, - non_entity_tokens: 0, - non_entity_clients: 7, - clients: 639, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 180, - non_entity_tokens: 0, - non_entity_clients: 317, - clients: 497, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 214, - non_entity_tokens: 0, - non_entity_clients: 239, - clients: 453, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 64, - non_entity_tokens: 0, - non_entity_clients: 37, - clients: 101, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 458, - non_entity_tokens: 0, - non_entity_clients: 1201, - clients: 1659, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 134, - non_entity_tokens: 0, - non_entity_clients: 827, - clients: 961, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 232, - non_entity_tokens: 0, - non_entity_clients: 112, - clients: 344, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 4, - non_entity_tokens: 0, - non_entity_clients: 193, - clients: 197, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 88, - non_entity_tokens: 0, - non_entity_clients: 69, - clients: 157, - }, - }, - ], - }, - ], - }, - }, - { - timestamp: formatISO(addMonths(UPGRADE_DATE, 2)), - counts: { - distinct_entities: 0, - entity_clients: 9721, - non_entity_tokens: 0, - non_entity_clients: 11472, - clients: 21193, - }, - namespaces: [ - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 2321, - non_entity_tokens: 0, - non_entity_clients: 2864, - clients: 5185, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 616, - non_entity_tokens: 0, - non_entity_clients: 940, - clients: 1556, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 965, - non_entity_tokens: 0, - non_entity_clients: 393, - clients: 1358, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 587, - non_entity_tokens: 0, - non_entity_clients: 724, - clients: 1311, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 153, - non_entity_tokens: 0, - non_entity_clients: 807, - clients: 960, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 2711, - non_entity_tokens: 0, - non_entity_clients: 1883, - clients: 4594, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 619, - non_entity_tokens: 0, - non_entity_clients: 925, - clients: 1544, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 661, - non_entity_tokens: 0, - non_entity_clients: 814, - clients: 1475, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 954, - non_entity_tokens: 0, - non_entity_clients: 7, - clients: 961, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 477, - non_entity_tokens: 0, - non_entity_clients: 137, - clients: 614, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1426, - non_entity_tokens: 0, - non_entity_clients: 2978, - clients: 4404, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 780, - non_entity_tokens: 0, - non_entity_clients: 696, - clients: 1476, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 369, - non_entity_tokens: 0, - non_entity_clients: 977, - clients: 1346, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 200, - non_entity_tokens: 0, - non_entity_clients: 753, - clients: 953, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 77, - non_entity_tokens: 0, - non_entity_clients: 552, - clients: 629, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 2213, - non_entity_tokens: 0, - non_entity_clients: 1851, - clients: 4064, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 610, - non_entity_tokens: 0, - non_entity_clients: 893, - clients: 1503, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 957, - non_entity_tokens: 0, - non_entity_clients: 136, - clients: 1093, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 262, - non_entity_tokens: 0, - non_entity_clients: 605, - clients: 867, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 384, - non_entity_tokens: 0, - non_entity_clients: 217, - clients: 601, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 1050, - non_entity_tokens: 0, - non_entity_clients: 1896, - clients: 2946, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 74, - non_entity_tokens: 0, - non_entity_clients: 978, - clients: 1052, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 238, - non_entity_tokens: 0, - non_entity_clients: 530, - clients: 768, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 367, - non_entity_tokens: 0, - non_entity_clients: 199, - clients: 566, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 371, - non_entity_tokens: 0, - non_entity_clients: 189, - clients: 560, - }, - }, - ], - }, - ], - new_clients: { - counts: { - distinct_entities: 0, - entity_clients: 4637, - non_entity_tokens: 0, - non_entity_clients: 5789, - clients: 10426, - }, - namespaces: [ - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1170, - non_entity_tokens: 0, - non_entity_clients: 1525, - clients: 2695, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 511, - non_entity_tokens: 0, - non_entity_clients: 720, - clients: 1231, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 76, - non_entity_tokens: 0, - non_entity_clients: 479, - clients: 555, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 431, - non_entity_tokens: 0, - non_entity_clients: 72, - clients: 503, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 152, - non_entity_tokens: 0, - non_entity_clients: 254, - clients: 406, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 1482, - non_entity_tokens: 0, - non_entity_clients: 1129, - clients: 2611, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 553, - non_entity_tokens: 0, - non_entity_clients: 884, - clients: 1437, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 664, - non_entity_tokens: 0, - non_entity_clients: 11, - clients: 675, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 153, - non_entity_tokens: 0, - non_entity_clients: 230, - clients: 383, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 112, - non_entity_tokens: 0, - non_entity_clients: 4, - clients: 116, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 1067, - non_entity_tokens: 0, - non_entity_clients: 968, - clients: 2035, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 0, - non_entity_tokens: 0, - non_entity_clients: 865, - clients: 865, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 659, - non_entity_tokens: 0, - non_entity_clients: 4, - clients: 663, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 292, - non_entity_tokens: 0, - non_entity_clients: 40, - clients: 332, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 116, - non_entity_tokens: 0, - non_entity_clients: 59, - clients: 175, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 547, - non_entity_tokens: 0, - non_entity_clients: 1270, - clients: 1817, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 36, - non_entity_tokens: 0, - non_entity_clients: 546, - clients: 582, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 61, - non_entity_tokens: 0, - non_entity_clients: 467, - clients: 528, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 286, - non_entity_tokens: 0, - non_entity_clients: 216, - clients: 502, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 164, - non_entity_tokens: 0, - non_entity_clients: 41, - clients: 205, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 371, - non_entity_tokens: 0, - non_entity_clients: 897, - clients: 1268, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 152, - non_entity_tokens: 0, - non_entity_clients: 490, - clients: 642, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 70, - non_entity_tokens: 0, - non_entity_clients: 160, - clients: 230, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 84, - non_entity_tokens: 0, - non_entity_clients: 141, - clients: 225, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 65, - non_entity_tokens: 0, - non_entity_clients: 106, - clients: 171, - }, - }, - ], - }, - ], - }, - }, - { - timestamp: formatISO(addMonths(UPGRADE_DATE, 3)), - counts: { - distinct_entities: 0, - entity_clients: 10873, - non_entity_tokens: 0, - non_entity_clients: 9343, - clients: 20216, - }, - namespaces: [ - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 1303, - non_entity_tokens: 0, - non_entity_clients: 3388, - clients: 4691, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 721, - non_entity_tokens: 0, - non_entity_clients: 980, - clients: 1701, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 377, - non_entity_tokens: 0, - non_entity_clients: 838, - clients: 1215, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 127, - non_entity_tokens: 0, - non_entity_clients: 877, - clients: 1004, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 78, - non_entity_tokens: 0, - non_entity_clients: 693, - clients: 771, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 2404, - non_entity_tokens: 0, - non_entity_clients: 2085, - clients: 4489, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 830, - non_entity_tokens: 0, - non_entity_clients: 779, - clients: 1609, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 926, - non_entity_tokens: 0, - non_entity_clients: 311, - clients: 1237, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 82, - non_entity_tokens: 0, - non_entity_clients: 896, - clients: 978, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 566, - non_entity_tokens: 0, - non_entity_clients: 99, - clients: 665, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 3076, - non_entity_tokens: 0, - non_entity_clients: 1396, - clients: 4472, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 874, - non_entity_tokens: 0, - non_entity_clients: 601, - clients: 1475, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 921, - non_entity_tokens: 0, - non_entity_clients: 428, - clients: 1349, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 885, - non_entity_tokens: 0, - non_entity_clients: 204, - clients: 1089, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 396, - non_entity_tokens: 0, - non_entity_clients: 163, - clients: 559, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 2298, - non_entity_tokens: 0, - non_entity_clients: 1632, - clients: 3930, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 858, - non_entity_tokens: 0, - non_entity_clients: 663, - clients: 1521, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 669, - non_entity_tokens: 0, - non_entity_clients: 272, - clients: 941, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 183, - non_entity_tokens: 0, - non_entity_clients: 567, - clients: 750, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 588, - non_entity_tokens: 0, - non_entity_clients: 130, - clients: 718, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 1792, - non_entity_tokens: 0, - non_entity_clients: 842, - clients: 2634, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 611, - non_entity_tokens: 0, - non_entity_clients: 215, - clients: 826, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 365, - non_entity_tokens: 0, - non_entity_clients: 368, - clients: 733, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 469, - non_entity_tokens: 0, - non_entity_clients: 244, - clients: 713, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 347, - non_entity_tokens: 0, - non_entity_clients: 15, - clients: 362, - }, - }, - ], - }, - ], - new_clients: { - counts: { - distinct_entities: 0, - entity_clients: 5855, - non_entity_tokens: 0, - non_entity_clients: 4729, - clients: 10584, - }, - namespaces: [ - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 1409, - non_entity_tokens: 0, - non_entity_clients: 1429, - clients: 2838, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 532, - non_entity_tokens: 0, - non_entity_clients: 563, - clients: 1095, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 655, - non_entity_tokens: 0, - non_entity_clients: 179, - clients: 834, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 34, - non_entity_tokens: 0, - non_entity_clients: 658, - clients: 692, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 188, - non_entity_tokens: 0, - non_entity_clients: 29, - clients: 217, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1869, - non_entity_tokens: 0, - non_entity_clients: 592, - clients: 2461, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 745, - non_entity_tokens: 0, - non_entity_clients: 239, - clients: 984, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 539, - non_entity_tokens: 0, - non_entity_clients: 132, - clients: 671, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 294, - non_entity_tokens: 0, - non_entity_clients: 110, - clients: 404, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 291, - non_entity_tokens: 0, - non_entity_clients: 111, - clients: 402, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 838, - non_entity_tokens: 0, - non_entity_clients: 1486, - clients: 2324, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 629, - non_entity_tokens: 0, - non_entity_clients: 742, - clients: 1371, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 166, - non_entity_tokens: 0, - non_entity_clients: 410, - clients: 576, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 12, - non_entity_tokens: 0, - non_entity_clients: 279, - clients: 291, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 31, - non_entity_tokens: 0, - non_entity_clients: 55, - clients: 86, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 996, - non_entity_tokens: 0, - non_entity_clients: 805, - clients: 1801, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 484, - non_entity_tokens: 0, - non_entity_clients: 145, - clients: 629, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 396, - non_entity_tokens: 0, - non_entity_clients: 156, - clients: 552, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 18, - non_entity_tokens: 0, - non_entity_clients: 401, - clients: 419, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 98, - non_entity_tokens: 0, - non_entity_clients: 103, - clients: 201, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 743, - non_entity_tokens: 0, - non_entity_clients: 417, - clients: 1160, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 188, - non_entity_tokens: 0, - non_entity_clients: 168, - clients: 356, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 196, - non_entity_tokens: 0, - non_entity_clients: 115, - clients: 311, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 291, - non_entity_tokens: 0, - non_entity_clients: 3, - clients: 294, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 68, - non_entity_tokens: 0, - non_entity_clients: 131, - clients: 199, - }, - }, - ], - }, - ], - }, - }, - { - timestamp: formatISO(addMonths(UPGRADE_DATE, 4)), - counts: { - distinct_entities: 0, - entity_clients: 10342, - non_entity_tokens: 0, - non_entity_clients: 13170, - clients: 23512, - }, - namespaces: [ - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 2816, - non_entity_tokens: 0, - non_entity_clients: 3098, - clients: 5914, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 726, - non_entity_tokens: 0, - non_entity_clients: 995, - clients: 1721, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 737, - non_entity_tokens: 0, - non_entity_clients: 850, - clients: 1587, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 754, - non_entity_tokens: 0, - non_entity_clients: 617, - clients: 1371, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 599, - non_entity_tokens: 0, - non_entity_clients: 636, - clients: 1235, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 2253, - non_entity_tokens: 0, - non_entity_clients: 2404, - clients: 4657, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 775, - non_entity_tokens: 0, - non_entity_clients: 689, - clients: 1464, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 699, - non_entity_tokens: 0, - non_entity_clients: 652, - clients: 1351, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 566, - non_entity_tokens: 0, - non_entity_clients: 487, - clients: 1053, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 213, - non_entity_tokens: 0, - non_entity_clients: 576, - clients: 789, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 1725, - non_entity_tokens: 0, - non_entity_clients: 2927, - clients: 4652, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 811, - non_entity_tokens: 0, - non_entity_clients: 417, - clients: 1228, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 294, - non_entity_tokens: 0, - non_entity_clients: 900, - clients: 1194, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 503, - non_entity_tokens: 0, - non_entity_clients: 620, - clients: 1123, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 117, - non_entity_tokens: 0, - non_entity_clients: 990, - clients: 1107, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 1678, - non_entity_tokens: 0, - non_entity_clients: 2775, - clients: 4453, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 972, - non_entity_tokens: 0, - non_entity_clients: 608, - clients: 1580, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 172, - non_entity_tokens: 0, - non_entity_clients: 957, - clients: 1129, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 220, - non_entity_tokens: 0, - non_entity_clients: 756, - clients: 976, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 314, - non_entity_tokens: 0, - non_entity_clients: 454, - clients: 768, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1870, - non_entity_tokens: 0, - non_entity_clients: 1966, - clients: 3836, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 839, - non_entity_tokens: 0, - non_entity_clients: 762, - clients: 1601, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 447, - non_entity_tokens: 0, - non_entity_clients: 583, - clients: 1030, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 382, - non_entity_tokens: 0, - non_entity_clients: 375, - clients: 757, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 202, - non_entity_tokens: 0, - non_entity_clients: 246, - clients: 448, - }, - }, - ], - }, - ], - new_clients: { - counts: { - distinct_entities: 0, - entity_clients: 5959, - non_entity_tokens: 0, - non_entity_clients: 6985, - clients: 12944, - }, - namespaces: [ - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 0, - entity_clients: 873, - non_entity_tokens: 0, - non_entity_clients: 2355, - clients: 3228, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 196, - non_entity_tokens: 0, - non_entity_clients: 811, - clients: 1007, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 38, - non_entity_tokens: 0, - non_entity_clients: 931, - clients: 969, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 148, - non_entity_tokens: 0, - non_entity_clients: 608, - clients: 756, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 491, - non_entity_tokens: 0, - non_entity_clients: 5, - clients: 496, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1352, - non_entity_tokens: 0, - non_entity_clients: 1506, - clients: 2858, - }, - mounts: [ - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 245, - non_entity_tokens: 0, - non_entity_clients: 560, - clients: 805, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 465, - non_entity_tokens: 0, - non_entity_clients: 332, - clients: 797, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 529, - non_entity_tokens: 0, - non_entity_clients: 117, - clients: 646, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 113, - non_entity_tokens: 0, - non_entity_clients: 497, - clients: 610, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 0, - entity_clients: 1355, - non_entity_tokens: 0, - non_entity_clients: 1353, - clients: 2708, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 557, - non_entity_tokens: 0, - non_entity_clients: 538, - clients: 1095, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 410, - non_entity_tokens: 0, - non_entity_clients: 496, - clients: 906, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 146, - non_entity_tokens: 0, - non_entity_clients: 237, - clients: 383, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 242, - non_entity_tokens: 0, - non_entity_clients: 82, - clients: 324, - }, - }, - ], - }, - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 0, - entity_clients: 1514, - non_entity_tokens: 0, - non_entity_clients: 578, - clients: 2092, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 602, - non_entity_tokens: 0, - non_entity_clients: 147, - clients: 749, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 259, - non_entity_tokens: 0, - non_entity_clients: 344, - clients: 603, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 349, - non_entity_tokens: 0, - non_entity_clients: 43, - clients: 392, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 304, - non_entity_tokens: 0, - non_entity_clients: 44, - clients: 348, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 865, - non_entity_tokens: 0, - non_entity_clients: 1193, - clients: 2058, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 10, - non_entity_tokens: 0, - non_entity_clients: 722, - clients: 732, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 0, - entity_clients: 643, - non_entity_tokens: 0, - non_entity_clients: 4, - clients: 647, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 0, - entity_clients: 93, - non_entity_tokens: 0, - non_entity_clients: 379, - clients: 472, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 0, - entity_clients: 119, - non_entity_tokens: 0, - non_entity_clients: 88, - clients: 207, - }, - }, - ], - }, - ], - }, - }, -]; -function generateNullMonths(startDate, endDate) { - const numberOfMonths = differenceInCalendarMonths(endDate, startDate); - const months = []; - for (let i = 0; i < numberOfMonths; i++) { - months.push({ - timestamp: formatRFC3339(startOfMonth(addMonths(startDate, i))), - counts: null, - namespace: null, - new_clients: null, +function getSum(array, key) { + return array.reduce((sum, { counts }) => sum + counts[key], 0); +} + +function getTotalCounts(array) { + return { + distinct_entities: getSum(array, 'entity_clients'), + entity_clients: getSum(array, 'entity_clients'), + non_entity_tokens: getSum(array, 'non_entity_clients'), + non_entity_clients: getSum(array, 'non_entity_clients'), + clients: getSum(array, 'clients'), + }; +} + +function randomBetween(min, max) { + return Math.floor(Math.random() * (max - min + 1) + min); +} + +function arrayOfCounts(max, arrayLength) { + var result = []; + var sum = 0; + for (var i = 0; i < arrayLength - 1; i++) { + result[i] = randomBetween(1, max - (arrayLength - i - 1) - sum); + sum += result[i]; + } + result[arrayLength - 1] = max - sum; + return result.sort((a, b) => b - a); +} + +function generateNamespaceBlock(idx = 0, isLowerCounts = false, ns) { + const min = isLowerCounts ? 10 : 50; + const max = isLowerCounts ? 100 : 5000; + const nsBlock = { + namespace_id: ns?.namespace_id || (idx === 0 ? 'root' : Math.random().toString(36).slice(2, 7) + idx), + namespace_path: ns?.namespace_path || (idx === 0 ? '' : `ns/${idx}`), + counts: {}, + }; + const mounts = []; + Array.from(Array(10)).forEach((mount, index) => { + const mountClients = randomBetween(min, max); + const [nonEntity, entity] = arrayOfCounts(mountClients, 2); + mounts.push({ + mount_path: `auth/authid${index}`, + counts: { + clients: mountClients, + entity_clients: entity, + non_entity_clients: nonEntity, + distinct_entities: entity, + non_entity_tokens: nonEntity, + }, + }); + }); + mounts.sort((a, b) => b.counts.clients - a.counts.clients); + nsBlock.mounts = mounts; + nsBlock.counts = getTotalCounts(mounts); + return nsBlock; +} + +function generateMonths(startDate, endDate, namespaces) { + const startDateObject = startOfMonth(parseAPITimestamp(startDate)); + const endDateObject = startOfMonth(parseAPITimestamp(endDate)); + const numberOfMonths = differenceInCalendarMonths(endDateObject, startDateObject) + 1; + const months = []; + if (isBefore(startDateObject, UPGRADE_DATE) && isBefore(endDateObject, UPGRADE_DATE)) { + // months block is empty if dates do not span an upgrade + return []; + } + for (let i = 0; i < numberOfMonths; i++) { + const month = addMonths(startDateObject, i); + const hasNoData = isBefore(month, UPGRADE_DATE); + if (hasNoData) { + months.push({ + timestamp: formatRFC3339(month), + counts: null, + namespaces: null, + new_clients: null, + }); + continue; + } + + const monthNs = namespaces.map((ns, idx) => generateNamespaceBlock(idx, true, ns)); + const newClients = namespaces.map((ns, idx) => generateNamespaceBlock(idx, true, ns)); + months.push({ + timestamp: formatRFC3339(month), + counts: getTotalCounts(monthNs), + namespaces: monthNs.sort((a, b) => b.counts.clients - a.counts.clients), + new_clients: { + counts: getTotalCounts(newClients), + namespaces: newClients.sort((a, b) => b.counts.clients - a.counts.clients), + }, }); - continue; } return months; } -const handleMockQuery = (queryStartTimestamp, queryEndTimestamp, monthlyData) => { - const queryStartDate = startOfMonth(parseAPITimestamp(queryStartTimestamp)); - const queryEndDate = parseAPITimestamp(queryEndTimestamp); - // monthlyData is oldest to newest - const dataEarliestMonth = parseAPITimestamp(monthlyData[0].timestamp); - const dataLatestMonth = parseAPITimestamp(monthlyData[monthlyData.length - 1].timestamp); - const transformedMonthlyArray = [...monthlyData]; - // If query end is before last month in array, return only through end query - if (isBefore(queryEndDate, dataLatestMonth)) { - const indexQueryStart = monthlyData.findIndex((e) => - isSameMonth(queryStartDate, parseAPITimestamp(e.timestamp)) - ); - const indexQueryEnd = monthlyData.findIndex((e) => - isSameMonth(queryEndDate, parseAPITimestamp(e.timestamp)) - ); - return transformedMonthlyArray.slice(indexQueryStart, indexQueryEnd + 1); - } - // If query wants months previous to the data we have, generate months without data prior - if (isBefore(queryStartDate, dataEarliestMonth)) { - return [...generateNullMonths(queryStartDate, dataEarliestMonth), ...transformedMonthlyArray]; - } - // If query is after earliest month in array, return latest to month that matches query - if (isAfter(queryStartDate, dataEarliestMonth)) { - const index = monthlyData.findIndex((e) => isSameMonth(queryStartDate, parseAPITimestamp(e.timestamp))); - return transformedMonthlyArray.slice(index); - } - return transformedMonthlyArray; -}; +function generateActivityResponse(namespaces, startDate, endDate) { + return { + start_time: isAfter(new Date(startDate), COUNTS_START) ? startDate : formatRFC3339(COUNTS_START), + end_time: endDate, + by_namespace: namespaces.sort((a, b) => b.counts.clients - a.counts.clients), + months: generateMonths(startDate, endDate, namespaces), + total: getTotalCounts(namespaces), + }; +} export default function (server) { server.get('sys/license/status', function () { @@ -2843,7 +131,7 @@ export default function (server) { autoloaded: { license_id: 'my-license-id', start_time: formatRFC3339(LICENSE_START), - expiration_time: formatRFC3339(LICENSE_END), + expiration_time: formatRFC3339(endOfMonth(addMonths(CURRENT_DATE, 6))), }, }, }; @@ -2862,520 +150,17 @@ export default function (server) { }); server.get('/sys/internal/counters/activity', (schema, req) => { - const { start_time, end_time } = req.queryParams; - + let { start_time, end_time } = req.queryParams; + // backend returns a timestamp if given unix time, so first convert to timestamp string here + if (!start_time.includes('T')) start_time = fromUnixTime(start_time).toISOString(); + if (!end_time.includes('T')) end_time = fromUnixTime(end_time).toISOString(); + const namespaces = Array.from(Array(12)).map((v, idx) => generateNamespaceBlock(idx)); return { - request_id: '25f55fbb-f253-9c46-c6f0-3cdd3ada91ab', + request_id: 'some-activity-id', lease_id: '', renewable: false, lease_duration: 0, - data: { - by_namespace: [ - { - namespace_id: 'PU6JB', - namespace_path: 'test-ns-2/', - counts: { - distinct_entities: 23326, - entity_clients: 23326, - non_entity_tokens: 17826, - non_entity_clients: 17826, - clients: 41152, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 6508, - entity_clients: 6508, - non_entity_tokens: 3634, - non_entity_clients: 3634, - clients: 10142, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 5118, - entity_clients: 5118, - non_entity_tokens: 4942, - non_entity_clients: 4942, - clients: 10060, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 5931, - entity_clients: 5931, - non_entity_tokens: 4057, - non_entity_clients: 4057, - clients: 9988, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 4962, - entity_clients: 4962, - non_entity_tokens: 3739, - non_entity_clients: 3739, - clients: 8701, - }, - }, - ], - }, - { - namespace_id: '3lq5r', - namespace_path: 'test-ns-2-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 19842, - entity_clients: 19842, - non_entity_tokens: 20799, - non_entity_clients: 20799, - clients: 40641, - }, - mounts: [ - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 4695, - entity_clients: 4695, - non_entity_tokens: 6620, - non_entity_clients: 6620, - clients: 11315, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 5762, - entity_clients: 5762, - non_entity_tokens: 4112, - non_entity_clients: 4112, - clients: 9874, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 5303, - entity_clients: 5303, - non_entity_tokens: 4538, - non_entity_clients: 4538, - clients: 9841, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 3501, - entity_clients: 3501, - non_entity_tokens: 4974, - non_entity_clients: 4974, - clients: 8475, - }, - }, - ], - }, - { - namespace_id: 'sJRLj', - namespace_path: 'test-ns-1-with-namespace-length-over-18-characters/', - counts: { - distinct_entities: 20389, - entity_clients: 20389, - non_entity_tokens: 19445, - non_entity_clients: 19445, - clients: 39834, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 5356, - entity_clients: 5356, - non_entity_tokens: 5075, - non_entity_clients: 5075, - clients: 10431, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 4639, - entity_clients: 4639, - non_entity_tokens: 5242, - non_entity_clients: 5242, - clients: 9881, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 4926, - entity_clients: 4926, - non_entity_tokens: 4163, - non_entity_clients: 4163, - clients: 9089, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 4437, - entity_clients: 4437, - non_entity_tokens: 4201, - non_entity_clients: 4201, - clients: 8638, - }, - }, - ], - }, - { - namespace_id: 'opmJ1', - namespace_path: 'test-ns-1/', - counts: { - distinct_entities: 19316, - entity_clients: 19316, - non_entity_tokens: 18450, - non_entity_clients: 18450, - clients: 37766, - }, - mounts: [ - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 4952, - entity_clients: 4952, - non_entity_tokens: 5080, - non_entity_clients: 5080, - clients: 10032, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 5198, - entity_clients: 5198, - non_entity_tokens: 3825, - non_entity_clients: 3825, - clients: 9023, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 3827, - entity_clients: 3827, - non_entity_tokens: 5156, - non_entity_clients: 5156, - clients: 8983, - }, - }, - { - mount_path: 'path-2', - counts: { - distinct_entities: 3981, - entity_clients: 3981, - non_entity_tokens: 3661, - non_entity_clients: 3661, - clients: 7642, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 15416, - entity_clients: 15416, - non_entity_tokens: 19892, - non_entity_clients: 19892, - clients: 35308, - }, - mounts: [ - { - mount_path: 'path-2', - counts: { - distinct_entities: 3936, - entity_clients: 3936, - non_entity_tokens: 5428, - non_entity_clients: 5428, - clients: 9364, - }, - }, - { - mount_path: 'path-1', - counts: { - distinct_entities: 4021, - entity_clients: 4021, - non_entity_tokens: 4530, - non_entity_clients: 4530, - clients: 8551, - }, - }, - { - mount_path: 'path-4-with-over-18-characters', - counts: { - distinct_entities: 2934, - entity_clients: 2934, - non_entity_tokens: 5357, - non_entity_clients: 5357, - clients: 8291, - }, - }, - { - mount_path: 'path-3-with-over-18-characters', - counts: { - distinct_entities: 3938, - entity_clients: 3938, - non_entity_tokens: 3932, - non_entity_clients: 3932, - clients: 7870, - }, - }, - ], - }, - ], - end_time: end_time || formatISO(endOfMonth(sub(NEW_DATE, { months: 1 }))), - months: handleMockQuery(start_time, end_time, MOCK_MONTHLY_DATA), - start_time: isBefore(new Date(start_time), COUNTS_START) ? formatRFC3339(COUNTS_START) : start_time, - total: { - distinct_entities: 98289, - entity_clients: 98289, - non_entity_tokens: 96412, - non_entity_clients: 96412, - clients: 194701, - }, - }, - wrap_info: null, - warnings: null, - auth: null, - }; - }); - - server.get('/sys/internal/counters/activity/monthly', function () { - const timestamp = NEW_DATE; - return { - request_id: '26be5ab9-dcac-9237-ec12-269a8ca64742', - lease_id: '', - renewable: false, - lease_duration: 0, - data: { - by_namespace: [ - { - namespace_id: '0lHBL', - namespace_path: 'ns1/', - counts: { - distinct_entities: 85, - non_entity_tokens: 15, - clients: 100, - }, - mounts: [ - { - mount_path: 'auth/method/uMGBU', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - mount_path: 'auth/method/woiej', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - ], - }, - { - namespace_id: 'RxD81', - namespace_path: 'ns2/', - counts: { - distinct_entities: 35, - non_entity_tokens: 20, - clients: 55, - }, - mounts: [ - { - mount_path: 'auth/method/ABCD1', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - mount_path: 'auth/method/ABCD2', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 12, - non_entity_tokens: 8, - clients: 20, - }, - mounts: [ - { - mount_path: 'auth/method/XYZZ2', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - mount_path: 'auth/method/XYZZ1', - counts: { - clients: 35, - entity_clients: 20, - non_entity_clients: 15, - }, - }, - { - mount_path: 'auth_userpass_3158c012', - counts: { - clients: 2, - entity_clients: 2, - non_entity_clients: 0, - }, - }, - ], - }, - ], - months: [ - { - timestamp: startOfMonth(timestamp).toISOString(), - counts: { - distinct_entities: 0, - entity_clients: 4, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 4, - }, - namespaces: [ - { - namespace_id: 'lHmap', - namespace_path: 'education/', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - mounts: [ - { - mount_path: 'auth_userpass_a36c8125', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - }, - ], - }, - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - mounts: [ - { - mount_path: 'auth_userpass_3158c012', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - }, - ], - }, - ], - new_clients: { - counts: { - distinct_entities: 0, - entity_clients: 4, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 4, - }, - namespaces: [ - { - namespace_id: 'root', - namespace_path: '', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - mounts: [ - { - mount_path: 'auth_userpass_3158c012', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - }, - ], - }, - { - namespace_id: 'lHmap', - namespace_path: 'education/', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - mounts: [ - { - mount_path: 'auth_userpass_a36c8125', - counts: { - distinct_entities: 0, - entity_clients: 2, - non_entity_tokens: 0, - non_entity_clients: 0, - clients: 2, - }, - }, - ], - }, - ], - }, - }, - ], - distinct_entities: 132, - entity_clients: 132, - non_entity_tokens: 43, - non_entity_clients: 43, - clients: 175, - }, + data: generateActivityResponse(namespaces, start_time, end_time), wrap_info: null, warnings: null, auth: null, diff --git a/ui/mirage/handlers/index.js b/ui/mirage/handlers/index.js index c51ab5c1a..38c506ef0 100644 --- a/ui/mirage/handlers/index.js +++ b/ui/mirage/handlers/index.js @@ -1,7 +1,6 @@ // add all handlers here // individual lookup done in mirage config import base from './base'; -import activity from './activity'; import clients from './clients'; import db from './db'; import kms from './kms'; @@ -11,4 +10,4 @@ import oidcConfig from './oidc-config'; import hcpLink from './hcp-link'; import kubernetes from './kubernetes'; -export { base, activity, clients, db, kms, mfaConfig, mfaLogin, oidcConfig, hcpLink, kubernetes }; +export { base, clients, db, kms, mfaConfig, mfaLogin, oidcConfig, hcpLink, kubernetes }; diff --git a/ui/package.json b/ui/package.json index 3523fd67d..a1bd52758 100644 --- a/ui/package.json +++ b/ui/package.json @@ -147,7 +147,7 @@ "ember-inflector": "4.0.2", "ember-load-initializers": "^2.1.2", "ember-maybe-in-element": "^2.0.3", - "ember-modal-dialog": "4.0.0", + "ember-modal-dialog": "^4.0.1", "ember-modifier": "^3.1.0", "ember-page-title": "^7.0.0", "ember-power-select": "6.0.1", diff --git a/ui/tests/acceptance/client-current-test.js b/ui/tests/acceptance/client-current-test.js deleted file mode 100644 index b344d7a82..000000000 --- a/ui/tests/acceptance/client-current-test.js +++ /dev/null @@ -1,175 +0,0 @@ -import { module, test } from 'qunit'; -import { visit, currentURL, settled, click } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; -import { setupMirage } from 'ember-cli-mirage/test-support'; -import ENV from 'vault/config/environment'; -import authPage from 'vault/tests/pages/auth'; -import { create } from 'ember-cli-page-object'; -import { clickTrigger } from 'ember-power-select/test-support/helpers'; -import ss from 'vault/tests/pages/components/search-select'; -import { overrideResponse, SELECTORS } from '../helpers/clients'; - -const searchSelect = create(ss); - -module('Acceptance | clients current tab', function (hooks) { - setupApplicationTest(hooks); - setupMirage(hooks); - - hooks.before(function () { - ENV['ember-cli-mirage'].handler = 'clients'; - }); - - hooks.after(function () { - ENV['ember-cli-mirage'].handler = null; - }); - - hooks.beforeEach(function () { - return authPage.login(); - }); - - test('shows empty state when config disabled, no data', async function (assert) { - assert.expect(3); - this.server.get('sys/internal/counters/config', () => { - return { - request_id: 'some-config-id', - data: { - default_report_months: 12, - enabled: 'default-disable', - retention_months: 24, - }, - }; - }); - this.server.get('sys/internal/counters/activity/monthly', () => overrideResponse(204)); - await visit('/vault/clients/current'); - assert.strictEqual(currentURL(), '/vault/clients/current'); - assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active'); - assert.dom(SELECTORS.emptyStateTitle).hasText('Tracking is disabled'); - }); - - test('shows empty state when config enabled, no data', async function (assert) { - assert.expect(3); - this.server.get('sys/internal/counters/activity/monthly', () => { - return { - request_id: 'some-monthly-id', - data: { - by_namespace: [], - clients: 0, - distinct_entities: 0, - entity_clients: 0, - months: [], - non_entity_clients: 0, - non_entity_tokens: 0, - }, - }; - }); - await visit('/vault/clients/current'); - assert.strictEqual(currentURL(), '/vault/clients/current'); - assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active'); - assert.dom(SELECTORS.emptyStateTitle).hasText('No data received'); - }); - - test('filters correctly on current with full data', async function (assert) { - assert.expect(27); - await visit('/vault/clients/current'); - assert.strictEqual(currentURL(), '/vault/clients/current'); - assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active'); - assert.dom(SELECTORS.usageStats).exists('usage stats block exists'); - assert.dom('[data-test-stat-text-container]').exists({ count: 3 }, '3 stat texts exist'); - - // TODO update with dynamic counts - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43'); - assert.dom('[data-test-clients-attribution]').exists('Shows attribution area'); - assert.dom('[data-test-chart-container="new-clients"]').doesNotExist(); - await settled(); - - // FILTER BY NAMESPACE - await clickTrigger(); - await searchSelect.options.objectAt(0).click(); - await settled(); - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('100'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('85'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15'); - assert.dom('[data-test-chart-container="new-clients"]').doesNotExist(); - await settled(); - - // FILTER BY AUTH METHOD - await clickTrigger(); - await searchSelect.options.objectAt(0).click(); - await settled(); - - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('35'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('20'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15'); - assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution block'); - - // Delete auth filter goes back to filtered only on namespace - await click('#auth-method-search-select [data-test-selected-list-button="delete"]'); - - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('100'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('85'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15'); - await settled(); - assert.dom('[data-test-chart-container="new-clients"]').doesNotExist(); - assert.dom(SELECTORS.attributionBlock).exists('Still shows attribution block'); - await clickTrigger(); - await searchSelect.options.objectAt(0).click(); - await settled(); - // Delete namespace filter with auth filter on - await click('#namespace-search-select-monthly [data-test-selected-list-button="delete"]'); - // Goes back to no filters - // TODO update with dynamic counts - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43'); - assert.dom('[data-test-chart-container="new-clients"]').doesNotExist(); - assert.dom('[data-test-chart-container="new-clients"] [data-test-empty-state-subtext]').doesNotExist(); - }); - - test('filters correctly on current with no auth mounts', async function (assert) { - assert.expect(16); - await visit('/vault/clients/current'); - assert.strictEqual(currentURL(), '/vault/clients/current'); - assert.dom(SELECTORS.currentMonthActiveTab).hasText('Current month', 'current month tab is active'); - assert.dom(SELECTORS.usageStats).exists('usage stats block exists'); - assert.dom('[data-test-stat-text-container]').exists({ count: 3 }, '3 stat texts exist'); - // TODO CMB update with dynamic data - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43'); - assert.dom('[data-test-clients-attribution]').exists('Shows attribution area'); - assert.dom('[data-test-chart-container="new-clients"]').doesNotExist(); - - // Filter by namespace - await clickTrigger(); - await searchSelect.options.objectAt(0).click(); - await settled(); - - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('100'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('85'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('15'); - - // TODO add month data without mounts - // assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution'); - // assert.dom('#auth-method-search-select').doesNotExist('Auth method filter is not shown'); - - // Remove namespace filter - await click('#namespace-search-select-monthly [data-test-selected-list-button="delete"]'); - - // Goes back to no filters - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('175'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('132'); - assert.dom('[data-test-stat-text="non-entity-clients"] .stat-value').hasText('43'); - assert.dom('[data-test-chart-container="new-clients"]').doesNotExist(); - }); - - test('shows correct empty state when config off but no read on config', async function (assert) { - assert.expect(2); - this.server.get('sys/internal/counters/activity/monthly', () => overrideResponse(204)); - this.server.get('sys/internal/counters/config', () => overrideResponse(403)); - await visit('/vault/clients/current'); - assert.dom(SELECTORS.filterBar).doesNotExist('Filter bar is not shown'); - assert.dom(SELECTORS.emptyStateTitle).containsText('No data available', 'Shows no data empty state'); - }); -}); diff --git a/ui/tests/acceptance/client-history-test.js b/ui/tests/acceptance/client-dashboard-test.js similarity index 69% rename from ui/tests/acceptance/client-history-test.js rename to ui/tests/acceptance/client-dashboard-test.js index b693af977..1964497ab 100644 --- a/ui/tests/acceptance/client-history-test.js +++ b/ui/tests/acceptance/client-dashboard-test.js @@ -10,20 +10,20 @@ import { create } from 'ember-cli-page-object'; import ss from 'vault/tests/pages/components/search-select'; import { clickTrigger } from 'ember-power-select/test-support/helpers'; import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters'; +import { formatNumber } from 'core/helpers/format-number'; const searchSelect = create(ss); -const NEW_DATE = new Date(); -const LAST_MONTH = startOfMonth(subMonths(NEW_DATE, 1)); -const COUNTS_START = subMonths(NEW_DATE, 12); // pretend vault user started cluster 1 year ago +const CURRENT_DATE = new Date(); +const LAST_MONTH = startOfMonth(subMonths(CURRENT_DATE, 1)); +const COUNTS_START = subMonths(CURRENT_DATE, 12); // pretend vault user started cluster 1 year ago // for testing, we're in the middle of a license/billing period -const LICENSE_START = startOfMonth(subMonths(NEW_DATE, 6)); - +const LICENSE_START = startOfMonth(subMonths(CURRENT_DATE, 6)); // upgrade happened 1 month after license start const UPGRADE_DATE = addMonths(LICENSE_START, 1); -module('Acceptance | clients history tab', function (hooks) { +module('Acceptance | client counts dashboard tab', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -31,6 +31,10 @@ module('Acceptance | clients history tab', function (hooks) { ENV['ember-cli-mirage'].handler = 'clients'; }); + hooks.beforeEach(function () { + this.store = this.owner.lookup('service:store'); + }); + hooks.after(function () { ENV['ember-cli-mirage'].handler = null; }); @@ -39,30 +43,7 @@ module('Acceptance | clients history tab', function (hooks) { return authPage.login(); }); - test('shows warning when config off, no data, queries_available=true', async function (assert) { - assert.expect(6); - this.server.get('sys/internal/counters/activity', () => overrideResponse(204)); - this.server.get('sys/internal/counters/config', () => { - return { - request_id: 'some-config-id', - data: { - default_report_months: 12, - enabled: 'default-disable', - queries_available: true, - retention_months: 24, - }, - }; - }); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history'); - assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active'); - assert.dom('[data-test-tracking-disabled] .message-title').hasText('Tracking is disabled'); - assert.dom(SELECTORS.emptyStateTitle).hasText('No data received'); - assert.dom(SELECTORS.filterBar).doesNotExist('Shows filter bar to search previous dates'); - assert.dom(SELECTORS.usageStats).doesNotExist('No usage stats'); - }); - - test('shows warning when config off, no data, queries_available=false', async function (assert) { + test('shows warning when config off, no data', async function (assert) { assert.expect(4); this.server.get('sys/internal/counters/activity', () => overrideResponse(204)); this.server.get('sys/internal/counters/config', () => { @@ -76,14 +57,14 @@ module('Acceptance | clients history tab', function (hooks) { }, }; }); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history'); - assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active'); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard'); + assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active'); assert.dom(SELECTORS.emptyStateTitle).hasText('Data tracking is disabled'); assert.dom(SELECTORS.filterBar).doesNotExist('Filter bar is hidden when no data available'); }); - test('shows empty state when config enabled and queries_available=false', async function (assert) { + test('shows empty state when config enabled and no data', async function (assert) { assert.expect(4); this.server.get('sys/internal/counters/activity', () => overrideResponse(204)); this.server.get('sys/internal/counters/config', () => { @@ -92,31 +73,28 @@ module('Acceptance | clients history tab', function (hooks) { data: { default_report_months: 12, enabled: 'default-enable', - queries_available: false, retention_months: 24, }, }; }); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history'); - assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active'); - - assert.dom(SELECTORS.emptyStateTitle).hasText('No monthly history'); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard'); + assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active'); + assert.dom(SELECTORS.emptyStateTitle).hasTextContaining('No data received'); assert.dom(SELECTORS.filterBar).doesNotExist('Does not show filter bar'); }); - test('visiting history tab config on and data with mounts', async function (assert) { + test('visiting dashboard tab config on and data with mounts', async function (assert) { assert.expect(8); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history'); - + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard'); assert .dom(SELECTORS.dateDisplay) .hasText(format(LICENSE_START, 'MMMM yyyy'), 'billing start month is correctly parsed from license'); assert .dom(SELECTORS.rangeDropdown) .hasText( - `${format(LICENSE_START, 'MMMM yyyy')} - ${format(LAST_MONTH, 'MMMM yyyy')}`, + `${format(LICENSE_START, 'MMM yyyy')} - ${format(CURRENT_DATE, 'MMM yyyy')}`, 'Date range shows dates correctly parsed activity response' ); assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area'); @@ -129,18 +107,15 @@ module('Acceptance | clients history tab', function (hooks) { .hasText(`${format(LICENSE_START, 'M/yy')}`, 'x-axis labels start with billing start date'); assert.strictEqual( findAll('[data-test-line-chart="plot-point"]').length, - 5, - `line chart plots 5 points to match query` + 6, + `line chart plots 6 points to match query` ); }); test('updates correctly when querying date ranges', async function (assert) { assert.expect(26); - // TODO CMB: wire up dynamically generated activity to mirage clients handler - // const activity = generateActivityResponse(5, LICENSE_START, LAST_MONTH); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history'); - + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard'); // query for single, historical month with no new counts await click(SELECTORS.rangeDropdown); await click('[data-test-show-calendar]'); @@ -148,7 +123,6 @@ module('Acceptance | clients history tab', function (hooks) { await click('[data-test-previous-year]'); } await click(find(`[data-test-calendar-month=${ARRAY_OF_MONTHS[LICENSE_START.getMonth()]}]`)); - assert.dom('[data-test-usage-stats]').exists('total usage stats show'); assert .dom(SELECTORS.runningTotalMonthStats) @@ -173,11 +147,10 @@ module('Acceptance | clients history tab', function (hooks) { // change billing start to month/year of first upgrade await click('[data-test-start-date-editor] button'); await click(SELECTORS.monthDropdown); - await click(find(`[data-test-date-modal-month="${ARRAY_OF_MONTHS[UPGRADE_DATE.getMonth()]}"]`)); + await click(`[data-test-dropdown-month="${ARRAY_OF_MONTHS[UPGRADE_DATE.getMonth()]}"]`); await click(SELECTORS.yearDropdown); - await click(find(`[data-test-date-modal-year="${UPGRADE_DATE.getFullYear()}`)); - await click('[data-test-modal-save]'); - + await click(`[data-test-dropdown-year="${UPGRADE_DATE.getFullYear()}"]`); + await click('[data-test-date-dropdown-submit]'); assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area'); assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block'); assert @@ -188,12 +161,12 @@ module('Acceptance | clients history tab', function (hooks) { .hasText(`${format(UPGRADE_DATE, 'M/yy')}`, 'x-axis labels start with updated billing start month'); assert.strictEqual( findAll('[data-test-line-chart="plot-point"]').length, - 5, - `line chart plots 5 points to match query` + 6, + `line chart plots 6 points to match query` ); - // query custom end month - const customEndDate = subMonths(NEW_DATE, 3); + // query three months ago + const customEndDate = subMonths(CURRENT_DATE, 3); await click(SELECTORS.rangeDropdown); await click('[data-test-show-calendar]'); if (parseInt(find('[data-test-display-year]').innerText) !== customEndDate.getFullYear()) { @@ -216,7 +189,7 @@ module('Acceptance | clients history tab', function (hooks) { .dom(xAxisLabels[xAxisLabels.length - 1]) .hasText(`${format(subMonths(LAST_MONTH, 2), 'M/yy')}`, 'x-axis labels end with queried end month'); - // query for single, historical month + // query for single, historical month (upgrade month) await click(SELECTORS.rangeDropdown); await click('[data-test-show-calendar]'); if (parseInt(find('[data-test-display-year]').innerText) !== UPGRADE_DATE.getFullYear()) { @@ -236,13 +209,13 @@ module('Acceptance | clients history tab', function (hooks) { // reset to billing period await click('[data-test-popup-menu-trigger]'); await click('[data-test-current-billing-period]'); - // query month older than count start date await click('[data-test-start-date-editor] button'); + await click(SELECTORS.monthDropdown); + await click(`[data-test-dropdown-month="${ARRAY_OF_MONTHS[LICENSE_START.getMonth()]}"]`); await click(SELECTORS.yearDropdown); - await click(find(`[data-test-date-modal-year="${LICENSE_START.getFullYear() - 3}`)); - await click('[data-test-modal-save]'); - + await click(`[data-test-dropdown-year="${LICENSE_START.getFullYear() - 3}"]`); + await click('[data-test-date-dropdown-submit]'); assert .dom('[data-test-alert-banner="alert"]') .hasTextContaining( @@ -251,53 +224,83 @@ module('Acceptance | clients history tab', function (hooks) { ); }); - test('filters correctly on history with full data', async function (assert) { - assert.expect(19); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history', 'clients/history URL is correct'); - assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active'); + test('dashboard filters correctly with full data', async function (assert) { + assert.expect(21); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct'); + assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active'); assert .dom(SELECTORS.runningTotalMonthlyCharts) .exists('Shows running totals with monthly breakdown charts'); assert.dom(SELECTORS.attributionBlock).exists('Shows attribution area'); assert.dom(SELECTORS.monthlyUsageBlock).exists('Shows monthly usage block'); + const response = await this.store.peekRecord('clients/activity', 'some-activity-id'); // FILTER BY NAMESPACE await clickTrigger(); await searchSelect.options.objectAt(0).click(); - await settled(); + const topNamespace = response.byNamespace[0]; + const topMount = topNamespace.mounts[0]; assert.ok(true, 'Filter by first namespace'); + assert.strictEqual( + find(SELECTORS.selectedNs).innerText.toLowerCase(), + topNamespace.label, + 'selects top namespace' + ); assert.dom('[data-test-top-attribution]').includesText('Top auth method'); - assert.dom('[data-test-running-total-entity]').includesText('23,326', 'total entity clients is accurate'); assert - .dom('[data-test-running-total-nonentity]') - .includesText('17,826', 'total non-entity clients is accurate'); - assert.dom('[data-test-attribution-clients]').includesText('10,142', 'top attribution clients accurate'); + .dom('[data-test-running-total-entity] p') + .includesText(`${formatNumber([topNamespace.entity_clients])}`, 'total entity clients is accurate'); + assert + .dom('[data-test-running-total-nonentity] p') + .includesText( + `${formatNumber([topNamespace.non_entity_clients])}`, + 'total non-entity clients is accurate' + ); + assert + .dom('[data-test-attribution-clients] p') + .includesText(`${formatNumber([topMount.clients])}`, 'top attribution clients accurate'); // FILTER BY AUTH METHOD await clickTrigger(); await searchSelect.options.objectAt(0).click(); await settled(); assert.ok(true, 'Filter by first auth method'); - assert.dom('[data-test-running-total-entity]').includesText('6,508', 'total entity clients is accurate'); + assert.strictEqual( + find(SELECTORS.selectedAuthMount).innerText.toLowerCase(), + topMount.label, + 'selects top mount' + ); assert - .dom('[data-test-running-total-nonentity]') - .includesText('3,634', 'total non-entity clients is accurate'); + .dom('[data-test-running-total-entity] p') + .includesText(`${formatNumber([topMount.entity_clients])}`, 'total entity clients is accurate'); + assert + .dom('[data-test-running-total-nonentity] p') + .includesText(`${formatNumber([topMount.non_entity_clients])}`, 'total non-entity clients is accurate'); assert.dom(SELECTORS.attributionBlock).doesNotExist('Does not show attribution block'); await click('#namespace-search-select [data-test-selected-list-button="delete"]'); assert.ok(true, 'Remove namespace filter without first removing auth method filter'); assert.dom('[data-test-top-attribution]').includesText('Top namespace'); - assert - .dom('[data-test-attribution-clients]') - .hasTextContaining('41,152', 'top attribution clients back to unfiltered value'); assert .dom('[data-test-running-total-entity]') - .hasTextContaining('98,289', 'total entity clients is back to unfiltered value'); + .hasTextContaining( + `${formatNumber([response.total.entity_clients])}`, + 'total entity clients is back to unfiltered value' + ); assert .dom('[data-test-running-total-nonentity]') - .hasTextContaining('96,412', 'total non-entity clients is back to unfiltered value'); + .hasTextContaining( + `${formatNumber([formatNumber([response.total.non_entity_clients])])}`, + 'total non-entity clients is back to unfiltered value' + ); + assert + .dom('[data-test-attribution-clients]') + .hasTextContaining( + `${formatNumber([topNamespace.clients])}`, + 'top attribution clients back to unfiltered value' + ); }); test('shows warning if upgrade happened within license period', async function (assert) { @@ -327,22 +330,23 @@ module('Acceptance | clients history tab', function (hooks) { }, }; }); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history', 'clients/history URL is correct'); - assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active'); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct'); + assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active'); assert .dom('[data-test-alert-banner="alert"]') .hasTextContaining( `Warning Vault was upgraded to 1.10.1 on ${format( UPGRADE_DATE, 'MMM d, yyyy' - )}. We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data below. Learn more here.` + )}. We added monthly breakdowns and mount level attribution starting in 1.10, so keep that in mind when looking at the data. Learn more here.` ); }); test('Shows empty if license start date is current month', async function (assert) { - const licenseStart = NEW_DATE; - const licenseEnd = addMonths(NEW_DATE, 12); + // TODO cmb update to reflect new behavior + const licenseStart = CURRENT_DATE; + const licenseEnd = addMonths(CURRENT_DATE, 12); this.server.get('sys/license/status', function () { return { request_id: 'my-license-request-id', @@ -355,21 +359,16 @@ module('Acceptance | clients history tab', function (hooks) { }, }; }); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history', 'clients/history URL is correct'); - assert.dom(SELECTORS.emptyStateTitle).hasText('No data for this billing period'); - assert - .dom(SELECTORS.dateDisplay) - .hasText(format(licenseStart, 'MMMM yyyy'), 'Shows license date, gives ability to edit'); - assert.dom(SELECTORS.monthDropdown).exists('Dropdown exists to select month'); - assert.dom(SELECTORS.yearDropdown).exists('Dropdown exists to select year'); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct'); + assert.dom(SELECTORS.emptyStateTitle).doesNotExist('No data for this billing period'); }); test('shows correct interface if no permissions on license', async function (assert) { this.server.get('/sys/license/status', () => overrideResponse(403)); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history', 'clients/history URL is correct'); - assert.dom(SELECTORS.historyActiveTab).hasText('History', 'history tab is active'); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct'); + assert.dom(SELECTORS.dashboardActiveTab).hasText('Dashboard', 'dashboard tab is active'); // Message changes depending on ent or OSS assert.dom(SELECTORS.emptyStateTitle).exists('Empty state exists'); assert.dom(SELECTORS.monthDropdown).exists('Dropdown exists to select month'); @@ -382,8 +381,8 @@ module('Acceptance | clients history tab', function (hooks) { this.server.get('sys/internal/counters/config', () => overrideResponse(403)); this.server.get('sys/internal/counters/activity', () => overrideResponse(403)); - await visit('/vault/clients/history'); - assert.strictEqual(currentURL(), '/vault/clients/history', 'clients/history URL is correct'); + await visit('/vault/clients/dashboard'); + assert.strictEqual(currentURL(), '/vault/clients/dashboard', 'clients/dashboard URL is correct'); assert .dom(SELECTORS.emptyStateTitle) .includesText('start date found', 'Empty state shows no billing start date'); diff --git a/ui/tests/helpers/clients.js b/ui/tests/helpers/clients.js index 06b3d7e88..5ce8aec17 100644 --- a/ui/tests/helpers/clients.js +++ b/ui/tests/helpers/clients.js @@ -1,4 +1,3 @@ -import { addMonths, differenceInCalendarMonths, formatRFC3339, startOfMonth } from 'date-fns'; import { Response } from 'miragejs'; /** Scenarios @@ -18,8 +17,7 @@ import { Response } from 'miragejs'; License start date this month */ export const SELECTORS = { - currentMonthActiveTab: '.active[data-test-current-month]', - historyActiveTab: '.active[data-test-history]', + dashboardActiveTab: '.active[data-test-dashboard]', emptyStateTitle: '[data-test-empty-state-title]', usageStats: '[data-test-usage-stats]', dateDisplay: '[data-test-date-display]', @@ -32,6 +30,8 @@ export const SELECTORS = { runningTotalMonthStats: '[data-test-running-total="single-month-stats"]', runningTotalMonthlyCharts: '[data-test-running-total="monthly-charts"]', monthlyUsageBlock: '[data-test-monthly-usage]', + selectedAuthMount: 'div#auth-method-search-select [data-test-selected-option] div', + selectedNs: 'div#namespace-search-select [data-test-selected-option] div', }; export const CHART_ELEMENTS = { @@ -74,187 +74,3 @@ export function overrideResponse(httpStatus, data) { } return new Response(200, { 'Content-Type': 'application/json' }, JSON.stringify(data)); } - -function generateNamespaceBlock(idx = 0, skipMounts = false) { - let mountCount = 1; - const nsBlock = { - namespace_id: `${idx}UUID`, - namespace_path: `${idx}/namespace`, - counts: { - clients: mountCount * 15, - entity_clients: mountCount * 5, - non_entity_clients: mountCount * 10, - distinct_entities: mountCount * 5, - non_entity_tokens: mountCount * 10, - }, - }; - if (!skipMounts) { - mountCount = Math.floor((Math.random() + idx) * 20); - const mounts = []; - Array.from(Array(mountCount)).forEach((v, index) => { - mounts.push({ - mount_path: `auth/authid${index}`, - counts: { - clients: 5, - entity_clients: 3, - non_entity_clients: 2, - distinct_entities: 3, - non_entity_tokens: 2, - }, - }); - }); - nsBlock.mounts = mounts; - } - return nsBlock; -} - -function generateCounts(max, arrayLength) { - function randomBetween(min, max) { - return Math.floor(Math.random() * (max - min + 1) + min); - } - var result = []; - var sum = 0; - for (var i = 0; i < arrayLength - 1; i++) { - result[i] = randomBetween(1, max - (arrayLength - i - 1) - sum); - sum += result[i]; - } - result[arrayLength - 1] = max - sum; - return result.sort((a, b) => b - a); -} - -function generateMonths(startDate, endDate, hasNoData = false) { - const numberOfMonths = differenceInCalendarMonths(endDate, startDate) + 1; - const months = []; - - for (let i = 0; i < numberOfMonths; i++) { - if (hasNoData) { - months.push({ - timestamp: formatRFC3339(startOfMonth(addMonths(startDate, i))), - counts: null, - namespace: null, - new_clients: null, - }); - continue; - } - const namespaces = Array.from(Array(5)).map((v, idx) => { - return generateNamespaceBlock(idx); - }); - const clients = numberOfMonths * 5 + i * 5; - const [entity_clients, non_entity_clients] = generateCounts(clients, 2); - const counts = { - clients, - entity_clients, - non_entity_clients, - distinct_entities: entity_clients, - non_entity_tokens: non_entity_clients, - }; - const new_counts = 5 + i; - const [new_entity, new_non_entity] = generateCounts(new_counts, 2); - months.push({ - timestamp: formatRFC3339(startOfMonth(addMonths(startDate, i))), - counts, - namespaces, - new_clients: { - counts: { - distinct_entities: new_entity, - entity_clients: new_entity, - non_entity_tokens: new_non_entity, - non_entity_clients: new_non_entity, - clients: new_counts, - }, - namespaces, - }, - }); - } - return months; -} - -export function generateActivityResponse(nsCount = 1, startDate, endDate) { - if (nsCount === 0) { - return { - request_id: 'some-activity-id', - data: { - start_time: formatRFC3339(startDate), - end_time: formatRFC3339(endDate), - total: { - clients: 0, - entity_clients: 0, - non_entity_clients: 0, - }, - by_namespace: [ - { - namespace_id: `root`, - namespace_path: '', - counts: { - entity_clients: 0, - non_entity_clients: 0, - clients: 0, - }, - }, - ], - months: generateMonths(startDate, endDate, false), - }, - }; - } - const namespaces = Array.from(Array(nsCount)).map((v, idx) => { - return generateNamespaceBlock(idx); - }); - return { - request_id: 'some-activity-id', - data: { - start_time: formatRFC3339(startDate), - end_time: formatRFC3339(endDate), - total: { - clients: 999, - entity_clients: 666, - non_entity_clients: 333, - }, - by_namespace: namespaces, - months: generateMonths(startDate, endDate), - }, - }; -} - -export function generateCurrentMonthResponse(namespaceCount, skipMounts = false, configEnabled = true) { - if (!configEnabled) { - return { - data: { id: 'no-data' }, - }; - } - if (!namespaceCount) { - return { - request_id: 'monthly-response-id', - data: { - by_namespace: [], - clients: 0, - distinct_entities: 0, - entity_clients: 0, - non_entity_clients: 0, - non_entity_tokens: 0, - months: [], - }, - }; - } - // generate by_namespace data - const by_namespace = Array.from(Array(namespaceCount)).map((ns, idx) => - generateNamespaceBlock(idx, skipMounts) - ); - const counts = by_namespace.reduce( - (prev, curr) => { - return { - clients: prev.clients + curr.counts.clients, - entity_clients: prev.entity_clients + curr.counts.entity_clients, - non_entity_clients: prev.non_entity_clients + curr.counts.non_entity_clients, - }; - }, - { clients: 0, entity_clients: 0, non_entity_clients: 0 } - ); - return { - request_id: 'monthly-response-id', - data: { - by_namespace, - ...counts, - months: [], - }, - }; -} diff --git a/ui/tests/integration/components/calendar-widget-test.js b/ui/tests/integration/components/calendar-widget-test.js index f10134c45..f0187bf9b 100644 --- a/ui/tests/integration/components/calendar-widget-test.js +++ b/ui/tests/integration/components/calendar-widget-test.js @@ -1,140 +1,321 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; -import { render, click } from '@ember/test-helpers'; +import { render, click, findAll, find } from '@ember/test-helpers'; import sinon from 'sinon'; import hbs from 'htmlbars-inline-precompile'; import calendarDropdown from 'vault/tests/pages/components/calendar-widget'; import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters'; -import { subYears } from 'date-fns'; +import { subMonths, subYears } from 'date-fns'; +import format from 'date-fns/format'; module('Integration | Component | calendar-widget', function (hooks) { setupRenderingTest(hooks); + const isDisplayingSameYear = (comparisonDate, calendarYear) => { + return comparisonDate.getFullYear() === parseInt(calendarYear); + }; + hooks.beforeEach(function () { - const CURRENT_YEAR = new Date().getFullYear(); - const PREVIOUS_YEAR = subYears(new Date(), 1).getFullYear(); - this.set('currentYear', CURRENT_YEAR); - this.set('previousYear', PREVIOUS_YEAR); + const CURRENT_DATE = new Date(); + this.set('currentDate', CURRENT_DATE); + this.set('calendarStartDate', subMonths(CURRENT_DATE, 12)); + this.set('calendarEndDate', CURRENT_DATE); + this.set('startTimestamp', subMonths(CURRENT_DATE, 12).toISOString()); + this.set('endTimestamp', CURRENT_DATE.toISOString()); this.set('handleClientActivityQuery', sinon.spy()); - this.set('handleCurrentBillingPeriod', sinon.spy()); - this.set('arrayOfMonths', ARRAY_OF_MONTHS); - this.set('endTimeFromResponse', [CURRENT_YEAR, 0]); }); - test('it renders and can open the calendar view', async function (assert) { + test('it renders and disables correct months when start date is 12 months ago', async function (assert) { + assert.expect(14); await render(hbs` `); + assert.dom(calendarDropdown.dateRangeTrigger).hasText( + `${format(this.calendarStartDate, 'MMM yyyy')} - + ${format(this.calendarEndDate, 'MMM yyyy')}`, + 'renders and formats start and end dates' + ); await calendarDropdown.openCalendar(); assert.ok(calendarDropdown.showsCalendar, 'renders the calendar component'); + + // assert months in current year are disabled/enabled correctly + const monthButtons = findAll('[data-test-calendar-month]'); + const enabledMonths = [], + disabledMonths = []; + for (let monthIdx = 0; monthIdx < 12; monthIdx++) { + if (monthIdx > this.calendarEndDate.getMonth()) { + disabledMonths.push(monthButtons[monthIdx]); + } else { + enabledMonths.push(monthButtons[monthIdx]); + } + } + enabledMonths.forEach((btn) => { + assert + .dom(btn) + .doesNotHaveClass( + 'is-readOnly', + `${ARRAY_OF_MONTHS[btn.id] + this.calendarEndDate.getFullYear()} is enabled` + ); + }); + disabledMonths.forEach((btn) => { + assert + .dom(btn) + .hasClass( + 'is-readOnly', + `${ARRAY_OF_MONTHS[btn.id] + this.calendarEndDate.getFullYear()} is read only` + ); + }); }); - test('it does not allow a user to click to a future year but does allow a user to click to previous year', async function (assert) { + test('it renders and disables months before start timestamp', async function (assert) { await render(hbs` `); await calendarDropdown.openCalendar(); - assert.dom('[data-test-future-year]').isDisabled('Future year is disabled'); - + assert.dom('[data-test-next-year]').isDisabled('Future year is disabled'); await calendarDropdown.clickPreviousYear(); - assert.dom('[data-test-display-year]').hasText(this.previousYear.toString(), 'shows the previous year'); assert - .dom('[data-test-calendar-month="January"]') - .hasClass( - 'is-readOnly', - `January ${this.previousYear} is disabled because it comes before startTimeDisplay` - ); + .dom('[data-test-display-year]') + .hasText(`${subYears(this.currentDate, 1).getFullYear()}`, 'shows the previous year'); + assert.dom('[data-test-previous-year]').isDisabled('disables previous year'); + + // assert months in previous year are disabled/enabled correctly + const monthButtons = findAll('[data-test-calendar-month]'); + const enabledMonths = [], + disabledMonths = []; + for (let monthIdx = 0; monthIdx < 12; monthIdx++) { + if (monthIdx < this.calendarStartDate.getMonth()) { + disabledMonths.push(monthButtons[monthIdx]); + } else { + enabledMonths.push(monthButtons[monthIdx]); + } + } + disabledMonths.forEach((btn) => { + assert + .dom(btn) + .hasClass( + 'is-readOnly', + `${ARRAY_OF_MONTHS[btn.id] + this.calendarEndDate.getFullYear()} is read only` + ); + }); + enabledMonths.forEach((btn) => { + assert + .dom(btn) + .doesNotHaveClass( + 'is-readOnly', + `${ARRAY_OF_MONTHS[btn.id] + this.calendarEndDate.getFullYear()} is enabled` + ); + }); }); - test('it disables the current month', async function (assert) { + test('it calls parent callback with correct arg when clicking "Current billing period"', async function (assert) { await render(hbs` `); - await calendarDropdown.openCalendar(); - const month = this.arrayOfMonths[new Date().getMonth()]; - assert - .dom(`[data-test-calendar-month="${month}"]`) - .hasClass('is-readOnly', `${month} ${this.currentYear} is disabled`); - // The component also disables all months after the current one, but this - // is tricky to test since it's based on browser time, so the behavior - // would be different in december than other months - }); - - test('it allows you to reset the billing period', async function (assert) { - await render(hbs` - - `); await calendarDropdown.menuToggle(); await calendarDropdown.clickCurrentBillingPeriod(); - assert.ok(this.handleCurrentBillingPeriod.calledOnce, 'it calls the parents handleCurrentBillingPeriod'); - }); - - test('it passes the appropriate data to the handleCurrentBillingPeriod when a date is selected', async function (assert) { - await render(hbs` - - `); - await calendarDropdown.openCalendar(); - await calendarDropdown.clickPreviousYear(); - await click('[data-test-calendar-month="October"]'); // select endTime of October 2021 - assert.ok(this.handleClientActivityQuery.calledOnce, 'it calls the parents handleClientActivityQuery'); - assert.ok( - this.handleClientActivityQuery.calledWith(9, this.previousYear, 'endTime'), - 'Passes the month as an index, year and date type to the parent' + assert.propEqual( + this.handleClientActivityQuery.args[0][0], + { dateType: 'reset' }, + 'it calls parent function with reset dateType' ); }); - test('it displays the year from endTimeDisplay when opened', async function (assert) { - this.set('endTimeFromResponse', [this.previousYear, 11]); + test('it calls parent callback with correct arg when clicking "Current month"', async function (assert) { await render(hbs` - - `); + + `); + await calendarDropdown.menuToggle(); + await calendarDropdown.clickCurrentMonth(); + assert.propEqual( + this.handleClientActivityQuery.args[0][0], + { dateType: 'currentMonth' }, + 'it calls parent function with currentMoth dateType' + ); + }); + + test('it calls parent callback with correct arg when selecting a month', async function (assert) { + await render(hbs` + + `); await calendarDropdown.openCalendar(); - assert - .dom('[data-test-display-year]') - .hasText(this.previousYear.toString(), 'Shows year from the end response'); + await click(`[data-test-calendar-month="${ARRAY_OF_MONTHS[this.calendarEndDate.getMonth()]}"]`); + assert.propEqual( + this.handleClientActivityQuery.lastCall.lastArg, + { + dateType: 'endDate', + monthIdx: this.currentDate.getMonth(), + monthName: ARRAY_OF_MONTHS[this.currentDate.getMonth()], + year: this.currentDate.getFullYear(), + }, + 'it calls parent function with end date (current) month/year' + ); + + await calendarDropdown.openCalendar(); + await calendarDropdown.clickPreviousYear(); + await click(`[data-test-calendar-month="${ARRAY_OF_MONTHS[this.calendarStartDate.getMonth()]}"]`); + assert.propEqual( + this.handleClientActivityQuery.lastCall.lastArg, + { + dateType: 'endDate', + monthIdx: this.currentDate.getMonth(), + monthName: ARRAY_OF_MONTHS[this.currentDate.getMonth()], + year: this.currentDate.getFullYear() - 1, + }, + 'it calls parent function with start date month/year' + ); + }); + + test('it disables correct months when start date 6 months ago', async function (assert) { + this.set('calendarStartDate', subMonths(this.currentDate, 6)); + this.set('startTimestamp', subMonths(this.currentDate, 6).toISOString()); + await render(hbs` + + `); + + await calendarDropdown.openCalendar(); + assert.dom('[data-test-next-year]').isDisabled('Future year is disabled'); + + const displayYear = find('[data-test-display-year]').innerText; + const isRangeSameYear = isDisplayingSameYear(this.calendarStartDate, displayYear); + + // only click previous year if 6 months ago was last year + if (!isRangeSameYear) { + await calendarDropdown.clickPreviousYear(); + } + assert.dom('[data-test-previous-year]').isDisabled('previous year is disabled'); + + // DOM calendar is viewing start date year + findAll('[data-test-calendar-month]').forEach((m) => { + // months before start month should always be disabled + if (m.id < this.calendarStartDate.getMonth()) { + assert.dom(m).hasClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is read only`); + } + // if start/end dates are in the same year, DOM is also showing end date + if (isRangeSameYear) { + // months after end date should be disabled + if (m.id > this.calendarEndDate.getMonth()) { + assert.dom(m).hasClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is read only`); + } + // months between including start/end month should be enabled + if (m.id >= this.calendarStartDate.getMonth() && m.id <= this.calendarEndDate.getMonth()) { + assert.dom(m).doesNotHaveClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is enabled`); + } + } + }); + + // click back to current year if duration spans multiple years + if (!isRangeSameYear) { + await click('[data-test-next-year]'); + findAll('[data-test-calendar-month]').forEach((m) => { + // DOM is no longer showing start month, all months before current date should be enabled + if (m.id <= this.currentDate.getMonth()) { + assert.dom(m).doesNotHaveClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is enabled`); + } + // future months should be disabled + if (m.id > this.currentDate.getMonth()) { + assert.dom(m).hasClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is read only`); + } + }); + } + }); + + test('it disables correct months when start date 36 months ago', async function (assert) { + this.set('calendarStartDate', subMonths(this.currentDate, 36)); + this.set('startTimestamp', subMonths(this.currentDate, 36).toISOString()); + await render(hbs` + + `); + + await calendarDropdown.openCalendar(); + assert.dom('[data-test-next-year]').isDisabled('Future year is disabled'); + + let displayYear = find('[data-test-display-year]').innerText; + + while (!isDisplayingSameYear(this.calendarStartDate, displayYear)) { + await calendarDropdown.clickPreviousYear(); + displayYear = find('[data-test-display-year]').innerText; + } + + assert.dom('[data-test-previous-year]').isDisabled('previous year is disabled'); + assert.dom('[data-test-next-year]').isEnabled('next year is enabled'); + + // DOM calendar is viewing start date year (3 years ago) + findAll('[data-test-calendar-month]').forEach((m) => { + // months before start month should always be disabled + if (m.id < this.calendarStartDate.getMonth()) { + assert.dom(m).hasClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is read only`); + } + if (m.id >= this.calendarStartDate.getMonth()) { + assert.dom(m).doesNotHaveClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is enabled`); + } + }); + + await click('[data-test-next-year]'); + displayYear = await find('[data-test-display-year]').innerText; + + if (!isDisplayingSameYear(this.currentDate, displayYear)) { + await findAll('[data-test-calendar-month]').forEach((m) => { + // years between should have all months enabled + assert.dom(m).doesNotHaveClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is enabled`); + }); + } + + await click('[data-test-next-year]'); + displayYear = await find('[data-test-display-year]').innerText; + + if (!isDisplayingSameYear(this.currentDate, displayYear)) { + await findAll('[data-test-calendar-month]').forEach((m) => { + // years between should have all months enabled + assert.dom(m).doesNotHaveClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is enabled`); + }); + } + + await click('[data-test-next-year]'); + displayYear = await find('[data-test-display-year]').innerText; + // now DOM is showing current year + assert.dom('[data-test-next-year]').isDisabled('Future year is disabled'); + if (isDisplayingSameYear(this.currentDate, displayYear)) { + findAll('[data-test-calendar-month]').forEach((m) => { + // all months before current month should be enabled + if (m.id <= this.currentDate.getMonth()) { + assert.dom(m).doesNotHaveClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is enabled`); + } + // future months should be disabled + if (m.id > this.currentDate.getMonth()) { + assert.dom(m).hasClass('is-readOnly', `${ARRAY_OF_MONTHS[m.id] + displayYear} is read only`); + } + }); + } }); }); diff --git a/ui/tests/integration/components/clients/attribution-test.js b/ui/tests/integration/components/clients/attribution-test.js index 9ccbf4ed9..7edf87a76 100644 --- a/ui/tests/integration/components/clients/attribution-test.js +++ b/ui/tests/integration/components/clients/attribution-test.js @@ -2,16 +2,17 @@ import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; import { render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; -import { formatRFC3339 } from 'date-fns'; +import { endOfMonth, formatRFC3339 } from 'date-fns'; import { click } from '@ember/test-helpers'; +import subMonths from 'date-fns/subMonths'; module('Integration | Component | clients/attribution', function (hooks) { setupRenderingTest(hooks); hooks.beforeEach(function () { + this.set('startTimestamp', formatRFC3339(subMonths(new Date(), 6))); this.set('timestamp', formatRFC3339(new Date())); this.set('selectedNamespace', null); - this.set('isDateRange', true); this.set('chartLegend', [ { label: 'entity clients', key: 'entity_clients' }, { label: 'non-entity clients', key: 'non_entity_clients' }, @@ -48,9 +49,11 @@ module('Integration | Component | clients/attribution', function (hooks) { @chartLegend={{this.chartLegend}} @totalClientAttribution={{this.totalClientAttribution}} @totalUsageCounts={{this.totalUsageCounts}} - @timestamp={{this.timestamp}} + @responseTimestamp={{this.timestamp}} + @startTimestamp={{this.startTimestamp}} + @endTimestamp={{this.timestamp}} @selectedNamespace={{this.selectedNamespace}} - @isDateRange={{this.isDateRange}} + @isHistoricalMonth={{false}} /> `); @@ -71,17 +74,20 @@ module('Integration | Component | clients/attribution', function (hooks) { assert.dom('[data-test-attribution-clients]').includesText('namespace').includesText('10'); }); - test('it renders correct text for a single month', async function (assert) { - this.set('isDateRange', false); + test('it renders two charts and correct text for single, historical month', async function (assert) { + this.start = formatRFC3339(subMonths(new Date(), 1)); + this.end = formatRFC3339(subMonths(endOfMonth(new Date()), 1)); await render(hbs` `); assert @@ -124,6 +130,51 @@ module('Integration | Component | clients/attribution', function (hooks) { ); }); + test('it renders single chart for current month', async function (assert) { + await render(hbs` + + + `); + assert + .dom('[data-test-chart-container="single-chart"]') + .exists('renders single chart with total clients'); + assert + .dom('[data-test-attribution-subtext]') + .hasTextContaining('this month', 'renders total monthly namespace text'); + }); + + test('it renders single chart and correct text for for date range', async function (assert) { + await render(hbs` + + + `); + + assert + .dom('[data-test-chart-container="single-chart"]') + .exists('renders single chart with total clients'); + assert + .dom('[data-test-attribution-subtext]') + .hasTextContaining('date range', 'renders total monthly namespace text'); + }); + test('it renders with data for selected namespace auth methods for a date range', async function (assert) { this.set('selectedNamespace', 'second'); await render(hbs` @@ -132,9 +183,11 @@ module('Integration | Component | clients/attribution', function (hooks) { @chartLegend={{this.chartLegend}} @totalClientAttribution={{this.namespaceMountsData}} @totalUsageCounts={{this.totalUsageCounts}} - @timestamp={{this.timestamp}} + @responseTimestamp={{this.timestamp}} + @startTimestamp={{this.startTimestamp}} + @endTimestamp={{this.timestamp}} @selectedNamespace={{this.selectedNamespace}} - @isDateRange={{this.isDateRange}} + @isHistoricalMonth={{this.isHistoricalMonth}} /> `); @@ -161,13 +214,13 @@ module('Integration | Component | clients/attribution', function (hooks) { `); await click('[data-test-attribution-export-button]'); assert.dom('.modal.is-active .title').hasText('Export attribution data', 'modal appears to export csv'); - assert.dom('.modal.is-active').includesText('January 2022 - February 2022'); + assert.dom('.modal.is-active').includesText('June 2022 - December 2022'); }); }); diff --git a/ui/tests/integration/components/clients/monthly-usage-test.js b/ui/tests/integration/components/clients/monthly-usage-test.js index ce86c4ed9..f20bb8463 100644 --- a/ui/tests/integration/components/clients/monthly-usage-test.js +++ b/ui/tests/integration/components/clients/monthly-usage-test.js @@ -1421,7 +1421,7 @@ module('Integration | Component | clients/monthly-usage', function (hooks) { test('it renders empty state with no data', async function (assert) { await render(hbs` - + `); assert.dom('[data-test-monthly-usage]').exists('monthly usage component renders'); assert.dom('[data-test-component="empty-state"]').exists(); @@ -1446,7 +1446,7 @@ module('Integration | Component | clients/monthly-usage', function (hooks) { `); assert.dom('[data-test-monthly-usage]').exists('monthly usage component renders'); diff --git a/ui/tests/integration/components/clients/running-total-test.js b/ui/tests/integration/components/clients/running-total-test.js index 4d6f46ff6..04700e0d8 100644 --- a/ui/tests/integration/components/clients/running-total-test.js +++ b/ui/tests/integration/components/clients/running-total-test.js @@ -1424,7 +1424,6 @@ module('Integration | Component | clients/running-total', function (hooks) { test('it renders with full monthly activity data', async function (assert) { this.set('byMonthActivityData', MONTHLY_ACTIVITY); - this.set('byMonthNewClients', NEW_ACTIVITY); this.set('totalUsageCounts', TOTAL_USAGE_COUNTS); const expectedTotalEntity = formatNumber([TOTAL_USAGE_COUNTS.entity_clients]); const expectedTotalNonEntity = formatNumber([TOTAL_USAGE_COUNTS.non_entity_clients]); @@ -1436,11 +1435,11 @@ module('Integration | Component | clients/running-total', function (hooks) { `); @@ -1496,8 +1495,8 @@ module('Integration | Component | clients/running-total', function (hooks) { }); test('it renders with no new monthly data', async function (assert) { - this.set('byMonthActivityData', MONTHLY_ACTIVITY); - this.set('byMonthNewClients', NEW_ACTIVITY); + const monthlyWithoutNew = MONTHLY_ACTIVITY.map((d) => ({ ...d, new_clients: { month: d.month } })); + this.set('byMonthActivityData', monthlyWithoutNew); this.set('totalUsageCounts', TOTAL_USAGE_COUNTS); const expectedTotalEntity = formatNumber([TOTAL_USAGE_COUNTS.entity_clients]); const expectedTotalNonEntity = formatNumber([TOTAL_USAGE_COUNTS.non_entity_clients]); @@ -1507,12 +1506,12 @@ module('Integration | Component | clients/running-total', function (hooks) { `); - assert.dom('[data-test-running-total]').exists('running total component renders'); assert.dom('[data-test-line-chart]').exists('line chart renders'); assert.dom('[data-test-vertical-bar-chart]').doesNotExist('vertical bar chart does not render'); @@ -1528,17 +1527,16 @@ module('Integration | Component | clients/running-total', function (hooks) { .hasText(`${expectedTotalNonEntity}`, `renders correct new average ${expectedTotalNonEntity}`); assert .dom('[data-test-running-new-entity] p.data-details') - .hasText('0', 'renders 0 average new entity clients'); + .doesNotExist('new client counts does not exist'); assert .dom('[data-test-running-new-nonentity] p.data-details') - .hasText('0', 'renders 0 average entity clients'); + .doesNotExist('average new client counts does not exist'); }); test('it renders with single historical month data', async function (assert) { const singleMonth = MONTHLY_ACTIVITY[MONTHLY_ACTIVITY.length - 1]; const singleMonthNew = NEW_ACTIVITY[NEW_ACTIVITY.length - 1]; this.set('singleMonth', [singleMonth]); - this.set('singleMonthNew', [singleMonthNew]); const expectedTotalClients = formatNumber([singleMonth.clients]); const expectedTotalEntity = formatNumber([singleMonth.entity_clients]); const expectedTotalNonEntity = formatNumber([singleMonth.non_entity_clients]); @@ -1551,10 +1549,10 @@ module('Integration | Component | clients/running-total', function (hooks) { `); assert.dom('[data-test-running-total]').exists('running total component renders'); diff --git a/ui/tests/integration/components/clients/usage-stats-test.js b/ui/tests/integration/components/clients/usage-stats-test.js index c07fc745b..c0b1043f5 100644 --- a/ui/tests/integration/components/clients/usage-stats-test.js +++ b/ui/tests/integration/components/clients/usage-stats-test.js @@ -11,13 +11,15 @@ module('Integration | Component | clients/usage-stats', function (hooks) { assert.dom('[data-test-stat-text]').exists({ count: 3 }, 'Renders 3 Stat texts even with no data passed'); assert.dom('[data-test-stat-text="total-clients"]').exists('Total clients exists'); - assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('0', 'Value defaults to zero'); + assert.dom('[data-test-stat-text="total-clients"] .stat-value').hasText('-', 'renders dash when no data'); assert.dom('[data-test-stat-text="entity-clients"]').exists('Entity clients exists'); - assert.dom('[data-test-stat-text="entity-clients"] .stat-value').hasText('0', 'Value defaults to zero'); + assert + .dom('[data-test-stat-text="entity-clients"] .stat-value') + .hasText('-', 'renders dash when no data'); assert.dom('[data-test-stat-text="non-entity-clients"]').exists('Non entity clients exists'); assert .dom('[data-test-stat-text="non-entity-clients"] .stat-value') - .hasText('0', 'Value defaults to zero'); + .hasText('-', 'renders dash when no data'); assert .dom('a') .hasAttribute('href', 'https://developer.hashicorp.com/vault/tutorials/monitoring/usage-metrics'); diff --git a/ui/tests/integration/components/date-dropdown-test.js b/ui/tests/integration/components/date-dropdown-test.js index b2952ee58..7ab6c81ff 100644 --- a/ui/tests/integration/components/date-dropdown-test.js +++ b/ui/tests/integration/components/date-dropdown-test.js @@ -1,72 +1,79 @@ -/* eslint qunit/no-conditional-assertions: "warn" */ -import { module, skip, test } from 'qunit'; +import { module, test } from 'qunit'; import { setupRenderingTest } from 'ember-qunit'; -import { click, render } from '@ember/test-helpers'; +import { click, find, findAll, render } from '@ember/test-helpers'; import { hbs } from 'ember-cli-htmlbars'; - -const ARRAY_OF_MONTHS = [ - 'January', - 'February', - 'March', - 'April', - 'May', - 'June', - 'July', - 'August', - 'September', - 'October', - 'November', - 'December', -]; - -const CURRENT_DATE = new Date(); -const CURRENT_YEAR = CURRENT_DATE.getFullYear(); // integer of year -const CURRENT_MONTH = CURRENT_DATE.getMonth(); // index of month +import { ARRAY_OF_MONTHS } from 'core/utils/date-formatters'; module('Integration | Component | date-dropdown', function (hooks) { setupRenderingTest(hooks); - test('it renders dropdown', async function (assert) { - this.set('text', 'Save'); + hooks.before(function () { + const currentDate = new Date(); + this.currentYear = currentDate.getFullYear(); // integer of year + this.currentMonth = currentDate.getMonth(); // index of month + }); + test('it renders dropdown', async function (assert) { await render(hbs`
    `); assert.dom('[data-test-date-dropdown-submit]').hasText('Submit', 'button renders default text'); + assert + .dom('[data-test-date-dropdown-cancel]') + .doesNotExist('it does not render cancel button by default'); + }); + + test('it fires off cancel callback', async function (assert) { + assert.expect(2); + const onCancel = () => { + assert.ok('fires onCancel callback'); + }; + this.set('onCancel', onCancel); await render(hbs`
    - +
    `); assert.dom('[data-test-date-dropdown-submit]').hasText('Save', 'button renders passed in text'); + await click(find('[data-test-date-dropdown-cancel]')); }); - // skip until https://github.com/hashicorp/vault/pull/17575 is merged which refactors these tests and fixes flakiness - skip('it renders dropdown and selects month and year', async function (assert) { - assert.expect(27); - const parentAction = (month, year) => { - assert.strictEqual(month, 'January', 'sends correct month to parent callback'); - assert.strictEqual(year, CURRENT_YEAR, 'sends correct year to parent callback'); + test('it renders dropdown and selects month and year', async function (assert) { + assert.expect(26); + const parentAction = (args) => { + assert.propEqual( + args, + { + dateType: 'start', + monthIdx: 0, + monthName: 'January', + year: this.currentYear, + }, + 'sends correct args to parent' + ); }; this.set('parentAction', parentAction); await render(hbs` -
    - -
    +
    + +
    `); - const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]'); - const yearDropdown = this.element.querySelector('[data-test-popup-menu-trigger="year"]'); - const submitButton = this.element.querySelector('[data-test-date-dropdown-submit]'); + const monthDropdown = find('[data-test-popup-menu-trigger="month"]'); + const yearDropdown = find('[data-test-popup-menu-trigger="year"]'); + const submitButton = find('[data-test-date-dropdown-submit]'); assert.true(submitButton.disabled, 'button is disabled when no month or year selected'); await click(monthDropdown); - const dropdownListMonths = this.element.querySelectorAll('[data-test-month-list] button'); + const dropdownListMonths = findAll('[data-test-month-list] button'); + assert.strictEqual(dropdownListMonths.length, 12, 'dropdown has 12 months'); for (const [index, month] of ARRAY_OF_MONTHS.entries()) { assert.dom(dropdownListMonths[index]).hasText(`${month}`, `dropdown includes ${month}`); @@ -77,98 +84,121 @@ module('Integration | Component | date-dropdown', function (hooks) { assert.dom('.ember-basic-dropdown-content').doesNotExist('dropdown closes after selecting month'); await click(yearDropdown); - const dropdownListYears = this.element.querySelectorAll('[data-test-year-list] button'); + const dropdownListYears = findAll('[data-test-year-list] button'); assert.strictEqual(dropdownListYears.length, 5, 'dropdown has 5 years'); for (const [index, year] of dropdownListYears.entries()) { - const comparisonYear = CURRENT_YEAR - index; + const comparisonYear = this.currentYear - index; assert.dom(year).hasText(`${comparisonYear}`, `dropdown includes ${comparisonYear}`); } await click(dropdownListYears[0]); - assert.dom(yearDropdown).hasText(`${CURRENT_YEAR}`, `dropdown selects ${CURRENT_YEAR}`); + assert.dom(yearDropdown).hasText(`${this.currentYear}`, `dropdown selects ${this.currentYear}`); assert.dom('.ember-basic-dropdown-content').doesNotExist('dropdown closes after selecting year'); assert.false(submitButton.disabled, 'button enabled when month and year selected'); await click(submitButton); }); - skip('it disables correct years when selecting month first', async function (assert) { - assert.expect(60); + test('selecting month first: it enables current year when selecting valid months', async function (assert) { + // the date dropdown displays 5 years, multiply by month to calculate how many assertions to expect + const datesEnabled = (this.currentMonth + 1) * 5; + assert.expect(datesEnabled); await render(hbs`
    `); - const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]'); - const yearDropdown = this.element.querySelector('[data-test-popup-menu-trigger="year"]'); + const monthDropdown = find('[data-test-popup-menu-trigger="month"]'); + const yearDropdown = find('[data-test-popup-menu-trigger="year"]'); - for (let i = 0; i < 12; i++) { + // select months before or equal to current month and assert year is enabled + for (let monthIdx = 0; monthIdx < this.currentMonth + 1; monthIdx++) { await click(monthDropdown); - const dropdownListMonths = this.element.querySelectorAll('[data-test-month-list] button'); - await click(dropdownListMonths[i]); - + const dropdownListMonths = findAll('[data-test-month-list] button'); + await click(dropdownListMonths[monthIdx]); await click(yearDropdown); - const dropdownListYears = this.element.querySelectorAll('[data-test-year-list] button'); - - if (i < CURRENT_MONTH) { - for (const year of dropdownListYears) { - assert.false(year.disabled, `${ARRAY_OF_MONTHS[i]} ${year.innerText} valid`); - } - } else { - for (const [yearIndex, year] of dropdownListYears.entries()) { - if (yearIndex === 0) { - assert.true(year.disabled, `${ARRAY_OF_MONTHS[i]} ${year.innerText} disabled`); - } else { - assert.false(year.disabled, `${ARRAY_OF_MONTHS[i]} ${year.innerText} valid`); - } - } + const dropdownListYears = findAll('[data-test-year-list] button'); + for (const year of dropdownListYears) { + assert.false(year.disabled, `${ARRAY_OF_MONTHS[monthIdx]} ${year.innerText} enabled`); } await click(yearDropdown); } }); - skip('it disables correct months when selecting year first', async function (assert) { - assert.expect(60); + test('selecting month first: it disables current year when selecting future months', async function (assert) { + // assertions only run for future months + const yearsDisabled = 11 - this.currentMonth; // ex: in December, current year is enabled for all months, so 0 assertions will run + assert.expect(yearsDisabled); await render(hbs`
    `); - const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]'); - const yearDropdown = this.element.querySelector('[data-test-popup-menu-trigger="year"]'); - - for (let i = 0; i < 5; i++) { - await click(yearDropdown); - const dropdownListYears = this.element.querySelectorAll('[data-test-year-list] button'); - await click(dropdownListYears[i]); + const monthDropdown = find('[data-test-popup-menu-trigger="month"]'); + const yearDropdown = find('[data-test-popup-menu-trigger="year"]'); + // select future months and assert current year is disabled + for (let monthIdx = this.currentMonth + 1; monthIdx < 12; monthIdx++) { await click(monthDropdown); - const dropdownListMonths = this.element.querySelectorAll('[data-test-month-list] button'); + const dropdownListMonths = findAll('[data-test-month-list] button'); + await click(dropdownListMonths[monthIdx]); + await click(yearDropdown); + const dropdownListYears = findAll('[data-test-year-list] button'); + const currentYear = dropdownListYears[0]; + assert.true(currentYear.disabled, `${ARRAY_OF_MONTHS[monthIdx]} ${currentYear.innerText} disabled`); + await click(yearDropdown); + } + }); - if (i === 0) { - for (const [monthIndex, month] of dropdownListMonths.entries()) { - if (monthIndex < CURRENT_MONTH) { - assert.false( - month.disabled, - `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[i].innerText.trim()} valid` - ); - } else { - assert.true( - month.disabled, - `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[i].innerText.trim()} disabled` - ); - } - } - } else { - for (const [monthIndex, month] of dropdownListMonths.entries()) { - assert.false( - month.disabled, - `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[i].innerText.trim()} valid` - ); - } + test('selecting year first: it disables future months when current year selected', async function (assert) { + assert.expect(12); + await render(hbs` +
    + +
    + `); + const monthDropdown = find('[data-test-popup-menu-trigger="month"]'); + const yearDropdown = find('[data-test-popup-menu-trigger="year"]'); + await click(yearDropdown); + await click(`[data-test-dropdown-year="${this.currentYear}"]`); + await click(monthDropdown); + const dropdownListMonths = findAll('[data-test-month-list] button'); + const enabledMonths = dropdownListMonths.slice(0, this.currentMonth + 1); + const disabledMonths = dropdownListMonths.slice(this.currentMonth + 1); + for (const [monthIndex, month] of enabledMonths.entries()) { + assert.false(month.disabled, `${ARRAY_OF_MONTHS[monthIndex]} ${this.currentYear} enabled`); + } + for (const [monthIndex, month] of disabledMonths.entries()) { + assert.true(month.disabled, `${ARRAY_OF_MONTHS[monthIndex]} ${this.currentYear} disabled`); + } + }); + + test('selecting year first: it enables all months when past year is selected', async function (assert) { + assert.expect(48); + await render(hbs` +
    + +
    + `); + + const monthDropdown = find('[data-test-popup-menu-trigger="month"]'); + const yearDropdown = find('[data-test-popup-menu-trigger="year"]'); + + // start at 1 because current year (index=0) is accounted for in previous test + for (let yearIdx = 1; yearIdx < 5; yearIdx++) { + await click(yearDropdown); + const dropdownListYears = findAll('[data-test-year-list] button'); + await click(dropdownListYears[yearIdx]); + await click(monthDropdown); + const dropdownListMonths = findAll('[data-test-month-list] button'); + for (const [monthIndex, month] of dropdownListMonths.entries()) { + assert.false( + month.disabled, + `${ARRAY_OF_MONTHS[monthIndex]} ${dropdownListYears[yearIdx].innerText.trim()} enabled` + ); } await click(monthDropdown); } diff --git a/ui/tests/integration/helpers/date-format-test.js b/ui/tests/integration/helpers/date-format-test.js index c0ca265cc..e1be50b80 100644 --- a/ui/tests/integration/helpers/date-format-test.js +++ b/ui/tests/integration/helpers/date-format-test.js @@ -11,18 +11,16 @@ module('Integration | Helper | date-format', function (hooks) { const today = new Date(); this.set('today', today); - await render(hbs`

    Date: {{date-format this.today "yyyy"}}

    `); - assert - .dom('[data-test-date-format]') - .includesText(today.getFullYear(), 'it renders the date in the year format'); + await render(hbs`{{date-format this.today "yyyy"}}`); + assert.dom(this.element).includesText(today.getFullYear(), 'it renders the date in the year format'); }); test('it supports date timestamps', async function (assert) { const today = new Date().getTime(); this.set('today', today); - await render(hbs`

    {{date-format this.today 'hh:mm:ss'}}

    `); - const formattedDate = document.querySelector('.date-format').innerText; + await render(hbs`{{date-format this.today 'hh:mm:ss'}}`); + const formattedDate = this.element.innerText; assert.ok(formattedDate.match(/^\d{2}:\d{2}:\d{2}$/)); }); @@ -30,37 +28,32 @@ module('Integration | Helper | date-format', function (hooks) { const todayString = new Date().getFullYear().toString(); this.set('todayString', todayString); - await render(hbs`

    Date: {{date-format this.todayString "yyyy"}}

    `); - assert - .dom('[data-test-date-format]') - .includesText(todayString, 'it renders the a date if passed in as a string'); + await render(hbs`{{date-format this.todayString "yyyy"}}`); + assert.dom(this.element).includesText(todayString, 'it renders the a date if passed in as a string'); }); test('it supports ten digit dates', async function (assert) { const tenDigitDate = 1621785298; this.set('tenDigitDate', tenDigitDate); - await render(hbs`

    Date: {{date-format this.tenDigitDate "MM/dd/yyyy"}}

    `); - assert.dom('[data-test-date-format]').includesText('05/23/2021'); + await render(hbs`{{date-format this.tenDigitDate "MM/dd/yyyy"}}`); + assert.dom(this.element).includesText('05/23/2021'); }); test('it supports already formatted dates', async function (assert) { const formattedDate = new Date(); this.set('formattedDate', formattedDate); - await render( - hbs`

    Date: {{date-format this.formattedDate 'MMMM dd, yyyy hh:mm:ss a' isFormatted=true}}

    ` - ); - assert.dom('[data-test-date-format]').includesText(format(formattedDate, 'MMMM dd, yyyy hh:mm:ss a')); + await render(hbs`{{date-format this.formattedDate 'MMMM dd, yyyy hh:mm:ss a' isFormatted=true}}`); + assert.dom(this.element).includesText(format(formattedDate, 'MMMM dd, yyyy hh:mm:ss a')); }); - test('displays correct date when timestamp is in ISO 8601 format', async function (assert) { - const timestampDate = '2021-09-01T00:00:00Z'; + test('displays time zone if withTimeZone=true', async function (assert) { + const timestampDate = '2022-12-06T11:29:15-08:00'; + const zone = new Date().toLocaleTimeString(undefined, { timeZoneName: 'short' }).split(' ')[2]; this.set('timestampDate', timestampDate); - await render( - hbs`

    Date: {{date-format this.timestampDate 'MMM dd, yyyy' dateOnly=true}}

    ` - ); - assert.dom('[data-test-date-format]').includesText('Date: Sep 01, 2021'); + await render(hbs`{{date-format this.timestampDate 'MMM d yyyy, h:mm:ss aaa' withTimeZone=true}}`); + assert.dom(this.element).hasTextContaining(`${zone}`); }); }); diff --git a/ui/tests/integration/utils/client-count-utils-test.js b/ui/tests/integration/utils/client-count-utils-test.js index 329e17355..0679bf0bb 100644 --- a/ui/tests/integration/utils/client-count-utils-test.js +++ b/ui/tests/integration/utils/client-count-utils-test.js @@ -663,6 +663,7 @@ module('Integration | Util | client count utils', function (hooks) { new_clients: { month: '6/21', namespaces: [], + timestamp: '2021-06-01T00:00:00Z', }, timestamp: '2021-06-01T00:00:00Z', }, @@ -674,6 +675,7 @@ module('Integration | Util | client count utils', function (hooks) { new_clients: { month: '7/21', namespaces: [], + timestamp: '2021-07-01T00:00:00Z', }, timestamp: '2021-07-01T00:00:00Z', }, diff --git a/ui/tests/integration/utils/date-formatters-test.js b/ui/tests/integration/utils/date-formatters-test.js index 1aa741be2..bd454aa23 100644 --- a/ui/tests/integration/utils/date-formatters-test.js +++ b/ui/tests/integration/utils/date-formatters-test.js @@ -1,12 +1,7 @@ import { module, test } from 'qunit'; import { setupTest } from 'ember-qunit'; import { format, formatRFC3339, isSameDay, isSameMonth, isSameYear } from 'date-fns'; -import { - ARRAY_OF_MONTHS, - parseAPITimestamp, - parseRFC3339, - formatChartDate, -} from 'core/utils/date-formatters'; +import { parseAPITimestamp, formatChartDate } from 'core/utils/date-formatters'; module('Integration | Util | date formatters utils', function (hooks) { setupTest(hooks); @@ -30,25 +25,6 @@ module('Integration | Util | date formatters utils', function (hooks) { assert.strictEqual(formattedTimestamp, format(DATE, 'MM yyyy'), 'it formats the date'); }); - test('parseRFC3339: convert timestamp to array for widget', async function (assert) { - assert.expect(4); - const arrayArg = ['2021', 2]; - assert.strictEqual(parseRFC3339(arrayArg), arrayArg, 'it returns arg if already an array'); - assert.strictEqual( - parseRFC3339(UNIX_TIME), - null, - 'it returns null parsing a timestamp of the wrong format' - ); - - const parsedTimestamp = parseRFC3339(API_TIMESTAMP); - assert.strictEqual(parsedTimestamp[0], format(DATE, 'yyyy'), 'first element is a string of the year'); - assert.strictEqual( - ARRAY_OF_MONTHS[parsedTimestamp[1]], - format(DATE, 'MMMM'), - 'second element is an integer of the month' - ); - }); - test('formatChartDate: expand chart date to full month and year', async function (assert) { assert.expect(1); const chartDate = '03/21'; diff --git a/ui/tests/pages/components/calendar-widget.js b/ui/tests/pages/components/calendar-widget.js index 09bc71c64..bbe9c3748 100644 --- a/ui/tests/pages/components/calendar-widget.js +++ b/ui/tests/pages/components/calendar-widget.js @@ -2,11 +2,12 @@ import { clickable, create, isPresent } from 'ember-cli-page-object'; export default create({ clickPreviousYear: clickable('[data-test-previous-year]'), + clickCurrentMonth: clickable('[data-test-current-month]'), clickCurrentBillingPeriod: clickable('[data-test-current-billing-period]'), customEndMonthBtn: clickable('[data-test-show-calendar]'), menuToggle: clickable('[data-test-popup-menu-trigger="true"]'), showsCalendar: isPresent('[data-test-calendar-widget-container]'), - + dateRangeTrigger: '[data-test-popup-menu-trigger="true"]', async openCalendar() { await this.menuToggle(); await this.customEndMonthBtn(); diff --git a/ui/tests/unit/adapters/clients-activity-test.js b/ui/tests/unit/adapters/clients-activity-test.js new file mode 100644 index 000000000..64da61d29 --- /dev/null +++ b/ui/tests/unit/adapters/clients-activity-test.js @@ -0,0 +1,132 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; +import { setupMirage } from 'ember-cli-mirage/test-support'; +import { lastDayOfMonth, subMonths, format, fromUnixTime, addMonths } from 'date-fns'; +import { parseAPITimestamp, ARRAY_OF_MONTHS } from 'core/utils/date-formatters'; + +module('Unit | Adapter | clients activity', function (hooks) { + setupTest(hooks); + setupMirage(hooks); + + hooks.beforeEach(function () { + this.store = this.owner.lookup('service:store'); + this.modelName = 'clients/activity'; + this.startDate = subMonths(new Date(), 6); + this.endDate = new Date(); + this.readableUnix = (unix) => parseAPITimestamp(fromUnixTime(unix).toISOString(), 'MMMM dd yyyy'); + }); + + test('it does not format if both params are timestamp strings', async function (assert) { + assert.expect(1); + const queryParams = { + start_time: { timestamp: this.startDate.toISOString() }, + end_time: { timestamp: this.endDate.toISOString() }, + }; + this.server.get('sys/internal/counters/activity', (schema, req) => { + assert.propEqual(req.queryParams, { + start_time: this.startDate.toISOString(), + end_time: this.endDate.toISOString(), + }); + }); + + this.store.queryRecord(this.modelName, queryParams); + }); + + test('it formats start_time if only end_time is a timestamp string', async function (assert) { + assert.expect(2); + const twoMonthsAhead = addMonths(this.startDate, 2); + const month = twoMonthsAhead.getMonth(); + const year = twoMonthsAhead.getFullYear(); + const queryParams = { + start_time: { + monthIdx: month, + year, + }, + end_time: { + timestamp: this.endDate.toISOString(), + }, + }; + + this.server.get('sys/internal/counters/activity', (schema, req) => { + const { start_time, end_time } = req.queryParams; + const readableStart = this.readableUnix(start_time); + assert.strictEqual( + readableStart, + `${ARRAY_OF_MONTHS[month]} 01 ${year}`, + `formatted unix start time is the first of the month: ${readableStart}` + ); + assert.strictEqual(end_time, this.endDate.toISOString(), 'end time is a timestamp string'); + }); + + this.store.queryRecord(this.modelName, queryParams); + }); + + test('it formats end_time only if only start_time is a timestamp string', async function (assert) { + assert.expect(2); + const twoMothsAgo = subMonths(this.endDate, 2); + const month = twoMothsAgo.getMonth() - 2; + const year = twoMothsAgo.getFullYear(); + const dayOfMonth = format(lastDayOfMonth(new Date(year, month, 10)), 'dd'); + const queryParams = { + start_time: { + timestamp: this.startDate.toISOString(), + }, + end_time: { + monthIdx: month, + year, + }, + }; + + this.server.get('sys/internal/counters/activity', (schema, req) => { + const { start_time, end_time } = req.queryParams; + const readableEnd = this.readableUnix(end_time); + assert.strictEqual(start_time, this.startDate.toISOString(), 'start time is a timestamp string'); + assert.strictEqual( + readableEnd, + `${ARRAY_OF_MONTHS[month]} ${dayOfMonth} ${year}`, + `formatted unix end time is the last day of the month: ${readableEnd}` + ); + }); + + this.store.queryRecord(this.modelName, queryParams); + }); + + test('it formats both params if neither are a timestamp', async function (assert) { + assert.expect(2); + const startDate = subMonths(this.startDate, 2); + const endDate = addMonths(this.endDate, 2); + const startMonth = startDate.getMonth() + 2; + const startYear = startDate.getFullYear(); + const endMonth = endDate.getMonth() - 2; + const endYear = endDate.getFullYear(); + const endDay = format(lastDayOfMonth(new Date(endYear, endMonth, 10)), 'dd'); + const queryParams = { + start_time: { + monthIdx: startMonth, + year: startYear, + }, + end_time: { + monthIdx: endMonth, + year: endYear, + }, + }; + + this.server.get('sys/internal/counters/activity', (schema, req) => { + const { start_time, end_time } = req.queryParams; + const readableEnd = this.readableUnix(end_time); + const readableStart = this.readableUnix(start_time); + assert.strictEqual( + readableStart, + `${ARRAY_OF_MONTHS[startMonth]} 01 ${startYear}`, + `formatted unix start time is the first of the month: ${readableStart}` + ); + assert.strictEqual( + readableEnd, + `${ARRAY_OF_MONTHS[endMonth]} ${endDay} ${endYear}`, + `formatted unix end time is the last day of the month: ${readableEnd}` + ); + }); + + this.store.queryRecord(this.modelName, queryParams); + }); +}); diff --git a/ui/tests/unit/utils/chart-helpers-test.js b/ui/tests/unit/utils/chart-helpers-test.js index 45026f36f..3f1c98710 100644 --- a/ui/tests/unit/utils/chart-helpers-test.js +++ b/ui/tests/unit/utils/chart-helpers-test.js @@ -38,24 +38,10 @@ module('Unit | Utility | chart-helpers', function () { { label: 'foo', value: undefined }, { label: 'bar', value: 22 }, ]; + const testArray3 = [{ label: 'foo' }, { label: 'bar' }]; const getAverage = (array) => array.reduce((a, b) => a + b, 0) / array.length; assert.strictEqual(calculateAverage(null), null, 'returns null if dataset it null'); assert.strictEqual(calculateAverage([]), null, 'returns null if dataset it empty array'); - assert.strictEqual( - calculateAverage([0]), - getAverage([0]), - `returns ${getAverage([0])} if array is just 0 0` - ); - assert.strictEqual( - calculateAverage([1]), - getAverage([1]), - `returns ${getAverage([1])} if array is just 1` - ); - assert.strictEqual( - calculateAverage([5, 1, 41, 5]), - getAverage([5, 1, 41, 5]), - `returns correct average for array of integers` - ); assert.strictEqual( calculateAverage(testArray1, 'value'), getAverage([10, 22]), @@ -66,5 +52,10 @@ module('Unit | Utility | chart-helpers', function () { getAverage([0, 22]), `returns correct average for array of objects containing undefined values` ); + assert.strictEqual( + calculateAverage(testArray3, 'value'), + null, + 'returns null when object key does not exist at all' + ); }); }); diff --git a/ui/yarn.lock b/ui/yarn.lock index 57861f9dd..e5a6b8a2f 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -10006,10 +10006,10 @@ ember-maybe-in-element@^2.0.3: ember-cli-version-checker "^5.1.1" ember-in-element-polyfill "^1.0.1" -ember-modal-dialog@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ember-modal-dialog/-/ember-modal-dialog-4.0.0.tgz#ab599ad14055550706800bd9aac3a2cbb7799748" - integrity sha512-ofh+xG8v6Lg60R3JXaG9pW683OWCexDQT/JT7S0TOgywSHzdC9WYE4/kIbvxZ6T9Ka87CosP+cz2A2iJ/jvZNQ== +ember-modal-dialog@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/ember-modal-dialog/-/ember-modal-dialog-4.0.1.tgz#093e0b5a32e2824b573bec9f0c935b4f990dbaff" + integrity sha512-6RQjQClvufYB7Y/sOS90HF3tfmLe7LLDM3fgl8BsAEu9xSJTHZTz+xpBY467hxIkl2vAXH6rNLFCf7W/Rm9Jcw== dependencies: "@embroider/macros" "^1.0.0" "@embroider/util" "^1.0.0"