diff --git a/package.json b/package.json index caa6bebeb..d367bfe87 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,8 @@ "redux-logger": "^3.0.6", "redux-promise-middleware": "^6.1.1", "redux-thunk": "^2.3.0", - "reselect": "^4.0.0" + "reselect": "^4.0.0", + "victory": "^33.1.1" }, "devDependencies": { "apidoc-mock": "^3.0.1", diff --git a/public/locales/en-US.json b/public/locales/en-US.json index 80ae9fe50..b5228410e 100644 --- a/public/locales/en-US.json +++ b/public/locales/en-US.json @@ -10,9 +10,9 @@ "tooltipPreviousLabelWeekly": "from previous week", "tooltipPreviousLabelMonthly": "from previous month", "tooltipPreviousLabelQuarterly": "from previous quarter", - "tooltipSockets": "sockets on", - "tooltipSocketsThreshold": "Socket Threshold", - "legendSocketsLabel": "Sockets", - "legendSocketsThresholdLabel": "Socket Threshold" + "tooltipSockets": "systems on", + "tooltipSocketsThreshold": "Subscription Threshold", + "legendSocketsLabel": "Systems", + "legendSocketsThresholdLabel": "Subscription Threshold" } } diff --git a/src/common/__tests__/__snapshots__/graphHelpers.test.js.snap b/src/common/__tests__/__snapshots__/graphHelpers.test.js.snap index a62e48bae..3df86c557 100644 --- a/src/common/__tests__/__snapshots__/graphHelpers.test.js.snap +++ b/src/common/__tests__/__snapshots__/graphHelpers.test.js.snap @@ -4,34 +4,34 @@ exports[`GraphHelpers should convert graph data and generate tooltips when usage Object { "chartData": Array [ Object { - "tooltip": "5 lorem tooltip label Jun 1", + "tooltip": "5 lorem tooltip label June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 5, }, Object { - "tooltip": "7 lorem tooltip label Jun 2 + "tooltip": "7 lorem tooltip label June 2 +2 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 1, "xAxisLabel": "Jun 2", "y": 7, }, Object { - "tooltip": "3 lorem tooltip label Jun 3 + "tooltip": "3 lorem tooltip label June 3 -4 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 2, "xAxisLabel": "Jun 3", "y": 3, }, Object { - "tooltip": "0 lorem tooltip label Jun 4 + "tooltip": "0 lorem tooltip label June 4 -3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 5", + "tooltip": "0 lorem tooltip label June 5", "x": 4, "xAxisLabel": "Jun 5", "y": 0, @@ -46,31 +46,31 @@ exports[`GraphHelpers should convert graph data and return zeroed usage array if Object { "chartData": Array [ Object { - "tooltip": "0 lorem tooltip label Jun 1", + "tooltip": "0 lorem tooltip label June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 2", + "tooltip": "0 lorem tooltip label June 2", "x": 1, "xAxisLabel": "Jun 2", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 3", + "tooltip": "0 lorem tooltip label June 3", "x": 2, "xAxisLabel": "Jun 3", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 4", + "tooltip": "0 lorem tooltip label June 4", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 5", + "tooltip": "0 lorem tooltip label June 5", "x": 4, "xAxisLabel": "Jun 5", "y": 0, @@ -85,31 +85,31 @@ exports[`GraphHelpers should convert graph data and return zeroed usage array if Object { "chartData": Array [ Object { - "tooltip": "0 lorem tooltip label Jun 1", + "tooltip": "0 lorem tooltip label June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 2", + "tooltip": "0 lorem tooltip label June 2", "x": 1, "xAxisLabel": "Jun 2", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 3", + "tooltip": "0 lorem tooltip label June 3", "x": 2, "xAxisLabel": "Jun 3", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 4", + "tooltip": "0 lorem tooltip label June 4", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 5", + "tooltip": "0 lorem tooltip label June 5", "x": 4, "xAxisLabel": "Jun 5", "y": 0, @@ -124,31 +124,31 @@ exports[`GraphHelpers should convert graph data and returned zeroed array when u Object { "chartData": Array [ Object { - "tooltip": "0 lorem tooltip label Jun 1", + "tooltip": "0 lorem tooltip label June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 2", + "tooltip": "0 lorem tooltip label June 2", "x": 1, "xAxisLabel": "Jun 2", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 3", + "tooltip": "0 lorem tooltip label June 3", "x": 2, "xAxisLabel": "Jun 3", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 4", + "tooltip": "0 lorem tooltip label June 4", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jun 5", + "tooltip": "0 lorem tooltip label June 5", "x": 4, "xAxisLabel": "Jun 5", "y": 0, @@ -163,34 +163,34 @@ exports[`GraphHelpers should convert graph data and threshold data: threshold ch Object { "chartData": Array [ Object { - "tooltip": "5 lorem tooltip label Jun 1", + "tooltip": "5 lorem tooltip label June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 5, }, Object { - "tooltip": "7 lorem tooltip label Jun 2 + "tooltip": "7 lorem tooltip label June 2 +2 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 1, "xAxisLabel": "Jun 2", "y": 7, }, Object { - "tooltip": "3 lorem tooltip label Jun 3 + "tooltip": "3 lorem tooltip label June 3 -4 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 2, "xAxisLabel": "Jun 3", "y": 3, }, Object { - "tooltip": "0 lorem tooltip label Jun 4 + "tooltip": "0 lorem tooltip label June 4 -3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "1 lorem tooltip label Jun 5 + "tooltip": "1 lorem tooltip label June 5 +1 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 4, "xAxisLabel": "Jun 5", @@ -232,34 +232,34 @@ exports[`GraphHelpers should convert graph data and threshold data: threshold ch Object { "chartData": Array [ Object { - "tooltip": "5 lorem tooltip label Jun 1", + "tooltip": "5 lorem tooltip label June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 5, }, Object { - "tooltip": "7 lorem tooltip label Jun 2 + "tooltip": "7 lorem tooltip label June 2 +2 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 1, "xAxisLabel": "Jun 2", "y": 7, }, Object { - "tooltip": "3 lorem tooltip label Jun 3 + "tooltip": "3 lorem tooltip label June 3 -4 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 2, "xAxisLabel": "Jun 3", "y": 3, }, Object { - "tooltip": "0 lorem tooltip label Jun 4 + "tooltip": "0 lorem tooltip label June 4 -3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "1 lorem tooltip label Jun 5 + "tooltip": "1 lorem tooltip label June 5 +1 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 4, "xAxisLabel": "Jun 5", @@ -275,33 +275,33 @@ exports[`GraphHelpers should handle cross quarter labels: quarter granularity 1` Object { "chartData": Array [ Object { - "tooltip": "5 lorem tooltip label Apr", + "tooltip": "5 lorem tooltip label April", "x": 0, "xAxisLabel": "Apr", "y": 5, }, Object { - "tooltip": "0 lorem tooltip label Jul + "tooltip": "0 lorem tooltip label July -5 t('curiosity-graph.tooltipPreviousLabelQuarterly')", "x": 1, "xAxisLabel": "Jul", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Oct", + "tooltip": "0 lorem tooltip label October", "x": 2, "xAxisLabel": "Oct", "y": 0, }, Object { - "tooltip": "0 lorem tooltip label Jan 2019", + "tooltip": "0 lorem tooltip label January 2019", "x": 3, "xAxisLabel": "Jan 2019", "y": 0, }, Object { - "tooltip": "7 lorem tooltip label Apr + "tooltip": "7 lorem tooltip label April +7 t('curiosity-graph.tooltipPreviousLabelQuarterly')", "x": 4, "xAxisLabel": "Apr", @@ -317,44 +317,44 @@ exports[`GraphHelpers should handle cross year labels: cross year 1`] = ` Object { "chartData": Array [ Object { - "tooltip": "5 lorem tooltip label Dec 31", + "tooltip": "5 lorem tooltip label December 31", "x": 0, "xAxisLabel": "Dec 31", "y": 5, }, Object { - "tooltip": "7 lorem tooltip label Jan 1 + "tooltip": "7 lorem tooltip label January 1 +2 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 1, "xAxisLabel": "Jan 1", "y": 7, }, Object { - "tooltip": "7 lorem tooltip label Jan 2", + "tooltip": "7 lorem tooltip label January 2", "x": 2, "xAxisLabel": "Jan 2", "y": 7, }, Object { - "tooltip": "7 lorem tooltip label Jan 3", + "tooltip": "7 lorem tooltip label January 3", "x": 3, "xAxisLabel": "Jan 3", "y": 7, }, Object { - "tooltip": "7 lorem tooltip label Jan 4", + "tooltip": "7 lorem tooltip label January 4", "x": 4, "xAxisLabel": "Jan 4", "y": 7, }, Object { - "tooltip": "7 lorem tooltip label Jan 5 2019", + "tooltip": "7 lorem tooltip label January 5 2019", "x": 5, "xAxisLabel": "Jan 5 2019", "y": 7, }, Object { - "tooltip": "7 lorem tooltip label Jan 6", + "tooltip": "7 lorem tooltip label January 6", "x": 6, "xAxisLabel": "Jan 6", "y": 7, diff --git a/src/common/graphHelpers.js b/src/common/graphHelpers.js index 23e44c0cb..8c09f404d 100644 --- a/src/common/graphHelpers.js +++ b/src/common/graphHelpers.js @@ -7,14 +7,20 @@ const GRANULARITY_TYPES = rhelApiTypes.RHSM_API_QUERY_GRANULARITY_TYPES; /** * Chart Date Format (used in axis and tooltips) */ +const chartDateDayFormatLong = 'MMMM D'; +const chartDateDayFormatYearLong = 'MMMM D YYYY'; const chartDateDayFormatShort = 'MMM D'; -const chartDateDayFormat = 'MMM D YYYY'; +const chartDateDayFormatYearShort = 'MMM D YYYY'; +const chartDateMonthFormatLong = 'MMMM'; +const chartDateMonthFormatYearLong = 'MMMM YYYY'; const chartDateMonthFormatShort = 'MMM'; -const chartDateMonthFormat = 'MMM YYYY'; +const chartDateMonthFormatYearShort = 'MMM YYYY'; +const chartDateQuarterFormatLong = 'MMMM'; +const chartDateQuarterFormatYearLong = 'MMMM YYYY'; const chartDateQuarterFormatShort = 'MMM'; -const chartDateQuarterFormat = 'MMM YYYY'; +const chartDateQuarterFormatYearShort = 'MMM YYYY'; /** * Returns x axis ticks/intervals array for the xAxisTickInterval @@ -151,17 +157,32 @@ const fillFormatChartData = ({ data, endDate, granularity, startDate, tooltipLab const checkTick = i % granularityTick === 0; const isNewYear = i !== 0 && checkTick && year !== previousYear; let formattedDate; + let formattedDateTooltip; if (granularityType === 'quarters') { formattedDate = isNewYear - ? momentDate.format(chartDateQuarterFormat) + ? momentDate.format(chartDateQuarterFormatYearShort) : momentDate.format(chartDateQuarterFormatShort); + + formattedDateTooltip = isNewYear + ? momentDate.format(chartDateQuarterFormatYearLong) + : momentDate.format(chartDateQuarterFormatLong); } else if (granularityType === 'months') { formattedDate = isNewYear - ? momentDate.format(chartDateMonthFormat) + ? momentDate.format(chartDateMonthFormatYearShort) : momentDate.format(chartDateMonthFormatShort); + + formattedDateTooltip = isNewYear + ? momentDate.format(chartDateMonthFormatYearLong) + : momentDate.format(chartDateMonthFormatLong); } else { - formattedDate = isNewYear ? momentDate.format(chartDateDayFormat) : momentDate.format(chartDateDayFormatShort); + formattedDate = isNewYear + ? momentDate.format(chartDateDayFormatYearShort) + : momentDate.format(chartDateDayFormatShort); + + formattedDateTooltip = isNewYear + ? momentDate.format(chartDateDayFormatYearLong) + : momentDate.format(chartDateDayFormatLong); } const yAxis = (data[stringDate] && data[stringDate].data) || 0; @@ -172,7 +193,7 @@ const fillFormatChartData = ({ data, endDate, granularity, startDate, tooltipLab const labelData = { data: yAxis, previousData, - formattedDate, + formattedDate: formattedDateTooltip, granularity, tooltipLabel }; diff --git a/src/components/chartArea/__tests__/__snapshots__/chartArea.test.js.snap b/src/components/chartArea/__tests__/__snapshots__/chartArea.test.js.snap index c9adc719e..e03cd1a8c 100644 --- a/src/components/chartArea/__tests__/__snapshots__/chartArea.test.js.snap +++ b/src/components/chartArea/__tests__/__snapshots__/chartArea.test.js.snap @@ -310,12 +310,12 @@ exports[`ChartArea Component should allow tick formatting: y tick format 1`] = ` } + role="presentation" + shapeRendering="auto" + /> + } + cursorDimension="x" + cursorLabelComponent={ + } + tspanComponent={} + /> + } + cursorLabelOffset={ + Object { + "x": 5, + "y": -10, + } + } labelComponent={ - } - role="presentation" - shapeRendering="auto" - /> - } + } - labelComponent={ - } - tspanComponent={} - /> - } - renderInPortal={true} - /> + > + + } labels={[Function]} portalComponent={} portalZIndex={99} responsive={true} - voronoiPadding={5} + voronoiDimension="x" + voronoiPadding={50} /> } domain={ @@ -695,39 +710,54 @@ exports[`ChartArea Component should handle variation in passed properties with s } } containerComponent={ - } + role="presentation" + shapeRendering="auto" + /> + } + cursorDimension="x" + cursorLabelComponent={ + } + tspanComponent={} + /> + } + cursorLabelOffset={ + Object { + "x": 5, + "y": -10, + } + } labelComponent={ - } - role="presentation" - shapeRendering="auto" - /> - } + } - labelComponent={ - } - tspanComponent={} - /> - } - renderInPortal={true} - /> + > + + } labels={[Function]} portalComponent={} portalZIndex={99} responsive={true} - voronoiPadding={5} + voronoiDimension="x" + voronoiPadding={50} /> } domain={ @@ -899,39 +929,54 @@ exports[`ChartArea Component should render basic data: data 1`] = ` } } containerComponent={ - } + role="presentation" + shapeRendering="auto" + /> + } + cursorDimension="x" + cursorLabelComponent={ + } + tspanComponent={} + /> + } + cursorLabelOffset={ + Object { + "x": 5, + "y": -10, + } + } labelComponent={ - } - role="presentation" - shapeRendering="auto" - /> - } + } - labelComponent={ - } - tspanComponent={} - /> - } - renderInPortal={true} - /> + > + + } labels={[Function]} portalComponent={} portalZIndex={99} responsive={true} - voronoiPadding={5} + voronoiDimension="x" + voronoiPadding={50} /> } legendComponent={ diff --git a/src/components/chartArea/chartArea.js b/src/components/chartArea/chartArea.js index 12de33cca..559e7d475 100644 --- a/src/components/chartArea/chartArea.js +++ b/src/components/chartArea/chartArea.js @@ -1,12 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { createContainer, VictoryPortal } from 'victory'; import { Chart, ChartAxis, ChartLegend, - ChartVoronoiContainer, ChartStack, ChartThreshold, + ChartTooltip, ChartArea as PfChartArea } from '@patternfly/react-charts'; import _cloneDeep from 'lodash/cloneDeep'; @@ -210,8 +211,22 @@ class ChartArea extends React.Component { const chartProps = { padding, ...chartLegendProps, ...chartDomain }; if (maxY > 0) { + const VictoryVoronoiCursorContainer = createContainer('voronoi', 'cursor'); + const labelComponent = ( + + + + ); + chartProps.containerComponent = ( - datum.tooltip} /> + datum.tooltip} + labelComponent={labelComponent} + /> ); } diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap index c4c78ac70..91cd2b9ed 100644 --- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap +++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap @@ -20,19 +20,19 @@ msgstr \\"\\" msgid \\"curiosity-graph.legendSocketsThresholdLabel\\" msgstr \\"\\" -#: src/common/graphHelpers.js:62 +#: src/common/graphHelpers.js:68 msgid \\"curiosity-graph.tooltipPreviousLabelDaily\\" msgstr \\"\\" -#: src/common/graphHelpers.js:55 +#: src/common/graphHelpers.js:61 msgid \\"curiosity-graph.tooltipPreviousLabelMonthly\\" msgstr \\"\\" -#: src/common/graphHelpers.js:58 +#: src/common/graphHelpers.js:64 msgid \\"curiosity-graph.tooltipPreviousLabelQuarterly\\" msgstr \\"\\" -#: src/common/graphHelpers.js:52 +#: src/common/graphHelpers.js:58 msgid \\"curiosity-graph.tooltipPreviousLabelWeekly\\" msgstr \\"\\" diff --git a/src/components/rhelGraphCard/__tests__/__snapshots__/rhelGraphCard.test.js.snap b/src/components/rhelGraphCard/__tests__/__snapshots__/rhelGraphCard.test.js.snap index e88e46244..8c3484a5d 100644 --- a/src/components/rhelGraphCard/__tests__/__snapshots__/rhelGraphCard.test.js.snap +++ b/src/components/rhelGraphCard/__tests__/__snapshots__/rhelGraphCard.test.js.snap @@ -53,187 +53,187 @@ exports[`RhelGraphCard Component should render a non-connected component: non-co Object { "data": Array [ Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 20", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 20", "x": 0, "xAxisLabel": "Jun 20", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 21", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 21", "x": 1, "xAxisLabel": "Jun 21", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 22", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 22", "x": 2, "xAxisLabel": "Jun 22", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 23", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 23", "x": 3, "xAxisLabel": "Jun 23", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 24", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 24", "x": 4, "xAxisLabel": "Jun 24", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 25", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 25", "x": 5, "xAxisLabel": "Jun 25", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 26", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 26", "x": 6, "xAxisLabel": "Jun 26", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 27", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 27", "x": 7, "xAxisLabel": "Jun 27", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 28", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 28", "x": 8, "xAxisLabel": "Jun 28", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 29", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 29", "x": 9, "xAxisLabel": "Jun 29", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 30", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 30", "x": 10, "xAxisLabel": "Jun 30", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 1", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 1", "x": 11, "xAxisLabel": "Jul 1", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 2", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 2", "x": 12, "xAxisLabel": "Jul 2", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 3", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 3", "x": 13, "xAxisLabel": "Jul 3", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 4", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 4", "x": 14, "xAxisLabel": "Jul 4", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 5", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 5", "x": 15, "xAxisLabel": "Jul 5", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 6", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 6", "x": 16, "xAxisLabel": "Jul 6", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 7", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 7", "x": 17, "xAxisLabel": "Jul 7", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 8", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 8", "x": 18, "xAxisLabel": "Jul 8", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 9", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 9", "x": 19, "xAxisLabel": "Jul 9", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 10", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 10", "x": 20, "xAxisLabel": "Jul 10", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 11", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 11", "x": 21, "xAxisLabel": "Jul 11", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 12", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 12", "x": 22, "xAxisLabel": "Jul 12", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 13", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 13", "x": 23, "xAxisLabel": "Jul 13", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 14", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 14", "x": 24, "xAxisLabel": "Jul 14", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 15", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 15", "x": 25, "xAxisLabel": "Jul 15", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 16", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 16", "x": 26, "xAxisLabel": "Jul 16", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 17", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 17", "x": 27, "xAxisLabel": "Jul 17", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 18", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 18", "x": 28, "xAxisLabel": "Jul 18", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 19", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 19", "x": 29, "xAxisLabel": "Jul 19", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jul 20", + "tooltip": "0 t('curiosity-graph.tooltipSockets') July 20", "x": 30, "xAxisLabel": "Jul 20", "y": 0, @@ -286,186 +286,186 @@ Object { Object { "data": Array [ Object { - "tooltip": "5 t('curiosity-graph.tooltipSockets') Jun 1", + "tooltip": "5 t('curiosity-graph.tooltipSockets') June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 5, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 2 + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 2 -5 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 1, "xAxisLabel": "Jun 2", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 3", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 3", "x": 2, "xAxisLabel": "Jun 3", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 4", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 4", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 5", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 5", "x": 4, "xAxisLabel": "Jun 5", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 6", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 6", "x": 5, "xAxisLabel": "Jun 6", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 7", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 7", "x": 6, "xAxisLabel": "Jun 7", "y": 0, }, Object { - "tooltip": "7 t('curiosity-graph.tooltipSockets') Jun 8 + "tooltip": "7 t('curiosity-graph.tooltipSockets') June 8 +7 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 7, "xAxisLabel": "Jun 8", "y": 7, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 9 + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 9 -7 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 8, "xAxisLabel": "Jun 9", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 10", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 10", "x": 9, "xAxisLabel": "Jun 10", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 11", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 11", "x": 10, "xAxisLabel": "Jun 11", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 12", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 12", "x": 11, "xAxisLabel": "Jun 12", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 13", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 13", "x": 12, "xAxisLabel": "Jun 13", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 14", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 14", "x": 13, "xAxisLabel": "Jun 14", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 15", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 15", "x": 14, "xAxisLabel": "Jun 15", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 16", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 16", "x": 15, "xAxisLabel": "Jun 16", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 17", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 17", "x": 16, "xAxisLabel": "Jun 17", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 18", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 18", "x": 17, "xAxisLabel": "Jun 18", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 19", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 19", "x": 18, "xAxisLabel": "Jun 19", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 20", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 20", "x": 19, "xAxisLabel": "Jun 20", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 21", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 21", "x": 20, "xAxisLabel": "Jun 21", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 22", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 22", "x": 21, "xAxisLabel": "Jun 22", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 23", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 23", "x": 22, "xAxisLabel": "Jun 23", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 24", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 24", "x": 23, "xAxisLabel": "Jun 24", "y": 0, }, Object { - "tooltip": "3 t('curiosity-graph.tooltipSockets') Jun 25 + "tooltip": "3 t('curiosity-graph.tooltipSockets') June 25 +3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 24, "xAxisLabel": "Jun 25", "y": 3, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 26 + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 26 -3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 25, "xAxisLabel": "Jun 26", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 27", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 27", "x": 26, "xAxisLabel": "Jun 27", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 28", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 28", "x": 27, "xAxisLabel": "Jun 28", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 29", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 29", "x": 28, "xAxisLabel": "Jun 29", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 30", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 30", "x": 29, "xAxisLabel": "Jun 30", "y": 0, @@ -545,186 +545,186 @@ exports[`RhelGraphCard Component should render multiple states: fulfilled 1`] = Object { "data": Array [ Object { - "tooltip": "5 t('curiosity-graph.tooltipSockets') Jun 1", + "tooltip": "5 t('curiosity-graph.tooltipSockets') June 1", "x": 0, "xAxisLabel": "Jun 1", "y": 5, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 2 + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 2 -5 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 1, "xAxisLabel": "Jun 2", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 3", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 3", "x": 2, "xAxisLabel": "Jun 3", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 4", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 4", "x": 3, "xAxisLabel": "Jun 4", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 5", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 5", "x": 4, "xAxisLabel": "Jun 5", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 6", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 6", "x": 5, "xAxisLabel": "Jun 6", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 7", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 7", "x": 6, "xAxisLabel": "Jun 7", "y": 0, }, Object { - "tooltip": "7 t('curiosity-graph.tooltipSockets') Jun 8 + "tooltip": "7 t('curiosity-graph.tooltipSockets') June 8 +7 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 7, "xAxisLabel": "Jun 8", "y": 7, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 9 + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 9 -7 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 8, "xAxisLabel": "Jun 9", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 10", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 10", "x": 9, "xAxisLabel": "Jun 10", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 11", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 11", "x": 10, "xAxisLabel": "Jun 11", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 12", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 12", "x": 11, "xAxisLabel": "Jun 12", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 13", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 13", "x": 12, "xAxisLabel": "Jun 13", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 14", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 14", "x": 13, "xAxisLabel": "Jun 14", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 15", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 15", "x": 14, "xAxisLabel": "Jun 15", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 16", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 16", "x": 15, "xAxisLabel": "Jun 16", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 17", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 17", "x": 16, "xAxisLabel": "Jun 17", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 18", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 18", "x": 17, "xAxisLabel": "Jun 18", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 19", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 19", "x": 18, "xAxisLabel": "Jun 19", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 20", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 20", "x": 19, "xAxisLabel": "Jun 20", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 21", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 21", "x": 20, "xAxisLabel": "Jun 21", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 22", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 22", "x": 21, "xAxisLabel": "Jun 22", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 23", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 23", "x": 22, "xAxisLabel": "Jun 23", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 24", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 24", "x": 23, "xAxisLabel": "Jun 24", "y": 0, }, Object { - "tooltip": "3 t('curiosity-graph.tooltipSockets') Jun 25 + "tooltip": "3 t('curiosity-graph.tooltipSockets') June 25 +3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 24, "xAxisLabel": "Jun 25", "y": 3, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 26 + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 26 -3 t('curiosity-graph.tooltipPreviousLabelDaily')", "x": 25, "xAxisLabel": "Jun 26", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 27", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 27", "x": 26, "xAxisLabel": "Jun 27", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 28", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 28", "x": 27, "xAxisLabel": "Jun 28", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 29", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 29", "x": 28, "xAxisLabel": "Jun 29", "y": 0, }, Object { - "tooltip": "0 t('curiosity-graph.tooltipSockets') Jun 30", + "tooltip": "0 t('curiosity-graph.tooltipSockets') June 30", "x": 29, "xAxisLabel": "Jun 30", "y": 0, diff --git a/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap b/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap index 7cd0ba7f5..cb24fd9ad 100644 --- a/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap +++ b/src/redux/selectors/__tests__/__snapshots__/graphCardSelectors.test.js.snap @@ -2,7 +2,6 @@ exports[`GraphCardSelectors Should error on a RHEL product ID without granularity provided: rhelGraphCard: no granularity error 1`] = ` Object { - "cached": false, "error": true, "fulfilled": false, "graphData": Object { @@ -16,7 +15,6 @@ Object { exports[`GraphCardSelectors Should handle pending state on a RHEL product ID: rhelGraphCard: pending 1`] = ` Object { - "cached": false, "error": false, "fulfilled": false, "graphData": Object { @@ -30,7 +28,6 @@ Object { exports[`GraphCardSelectors Should map a fulfilled RHEL product ID response to an aggregated output: rhelGraphCard: fulfilled granularity 1`] = ` Object { - "cached": false, "error": false, "fulfilled": true, "graphData": Object { @@ -79,7 +76,6 @@ Object { exports[`GraphCardSelectors Should pass data through on a RHEL product ID when granularity provided mismatches between aggregated responses: rhelGraphCard: granularity mismatch fulfilled 1`] = ` Object { - "cached": false, "error": false, "fulfilled": true, "graphData": Object { diff --git a/src/redux/selectors/graphCardSelectors.js b/src/redux/selectors/graphCardSelectors.js index 1bfd86291..c7a09135d 100644 --- a/src/redux/selectors/graphCardSelectors.js +++ b/src/redux/selectors/graphCardSelectors.js @@ -17,7 +17,6 @@ const rhelGraphCardSelector = createSelector( const initialLoad = typeof cachedGranularity.initialLoad === 'boolean' ? cachedGranularity.initialLoad : true; const updatedData = { - cached: false, error: false, fulfilled: false, pending: false, @@ -44,10 +43,9 @@ const rhelGraphCardSelector = createSelector( updatedData.graphData.capacity = _get(capacity, ['data', rhelApiTypes.RHSM_API_RESPONSE_CAPACITY_DATA], []); updatedData.initialLoad = false; updatedData.fulfilled = true; - updatedData.cached = false; if (reportGranularity === capacityGranularity) { - rhelGraphCardCache[granularity] = { ...updatedData, cached: true }; + rhelGraphCardCache[granularity] = { ...updatedData }; } } diff --git a/yarn.lock b/yarn.lock index 8761f0020..7418fc79f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4399,6 +4399,13 @@ delaunay-find@0.0.3: dependencies: delaunator "^4.0.0" +delaunay-find@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/delaunay-find/-/delaunay-find-0.0.4.tgz#144c3da64e5a4b7b841bc709cfb899d8437324ac" + integrity sha512-Dlez+Pc4Q33Y2mKe/h+p4NmQ6+W6kT6tXL+1dQfuVvp1mEDKTXRjbr6HcW5ftDKyVEY08MCCdqbR0Y6dnYYEPA== + dependencies: + delaunator "^4.0.0" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -12531,6 +12538,19 @@ victory-create-container@^33.1.0: victory-voronoi-container "^33.1.0" victory-zoom-container "^33.1.0" +victory-create-container@^33.1.1: + version "33.1.1" + resolved "https://registry.yarnpkg.com/victory-create-container/-/victory-create-container-33.1.1.tgz#49b8f3d9e55ed380b6d88c9ddb902bcd1749e099" + integrity sha512-M4cRC5rjtRcWqUCegc6CkPKL0CNM0SJwlp/kFG5qOv736P+u5wm883C6BevW7a+aOy6lbYgKRUH19Yboxcuydw== + dependencies: + lodash "^4.17.15" + victory-brush-container "^33.1.0" + victory-core "^33.1.0" + victory-cursor-container "^33.1.0" + victory-selection-container "^33.1.0" + victory-voronoi-container "^33.1.1" + victory-zoom-container "^33.1.0" + victory-cursor-container@^33.1.0: version "33.1.0" resolved "https://registry.yarnpkg.com/victory-cursor-container/-/victory-cursor-container-33.1.0.tgz#6614baece4683a6e7db9e28da2c67c238db5f1e8" @@ -12655,6 +12675,17 @@ victory-voronoi-container@^33.1.0: victory-core "^33.1.0" victory-tooltip "^33.1.0" +victory-voronoi-container@^33.1.1: + version "33.1.1" + resolved "https://registry.yarnpkg.com/victory-voronoi-container/-/victory-voronoi-container-33.1.1.tgz#3b66953e00109b7eb0976425c7a9124335b3c072" + integrity sha512-oZtOmF1ODQWmkXgOU3XnR1frEB8ZJaEwIWc1fQVpnmAXhXD4k6a2/B0w9DanHWk2KgcMkmP2c0zriGeSgmNj4Q== + dependencies: + delaunay-find "0.0.4" + lodash "^4.17.15" + prop-types "^15.5.8" + victory-core "^33.1.0" + victory-tooltip "^33.1.0" + victory-voronoi@^33.1.0: version "33.1.0" resolved "https://registry.yarnpkg.com/victory-voronoi/-/victory-voronoi-33.1.0.tgz#0496da977c2bdaa2bb85394694e8f7f8dd5447aa" @@ -12705,6 +12736,37 @@ victory@^33.0.5: victory-voronoi-container "^33.1.0" victory-zoom-container "^33.1.0" +victory@^33.1.1: + version "33.1.1" + resolved "https://registry.yarnpkg.com/victory/-/victory-33.1.1.tgz#c83f0438b04f48b555936d875518c6256d516357" + integrity sha512-V/jBG4s3ZZBgqc1D9OKXRptKlpLZroPoJ+0hIq5RvAIqYndqpy2g9xdYQOKtvL62C8LavbgDpd0iKR7ejI/I/g== + dependencies: + victory-area "^33.1.0" + victory-axis "^33.1.0" + victory-bar "^33.1.0" + victory-box-plot "^33.1.0" + victory-brush-container "^33.1.0" + victory-brush-line "^33.1.0" + victory-candlestick "^33.1.0" + victory-chart "^33.1.0" + victory-core "^33.1.0" + victory-create-container "^33.1.1" + victory-cursor-container "^33.1.0" + victory-errorbar "^33.1.0" + victory-group "^33.1.0" + victory-legend "^33.1.0" + victory-line "^33.1.0" + victory-pie "^33.1.0" + victory-polar-axis "^33.1.0" + victory-scatter "^33.1.0" + victory-selection-container "^33.1.0" + victory-shared-events "^33.1.0" + victory-stack "^33.1.0" + victory-tooltip "^33.1.0" + victory-voronoi "^33.1.0" + victory-voronoi-container "^33.1.1" + victory-zoom-container "^33.1.0" + vm-browserify@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"