Merge pull request #1324 from RedisInsight/fe/bugfix/RI-3722_No_tooltip_for_horeving_small_bar

#RU-3722 - no tooltip for horeving small bar

Author: egor-zalenski

redisinsight/ui/src/components/charts/bar-chart/BarChart.spec.tsx

@@ -1,12 +1,12 @@
-import { last } from 'lodash'
+import { isEmpty, last, min as minBy, reject } from 'lodash'
 import React from 'react'
 import { render, screen, fireEvent, waitFor } from 'uiSrc/utils/test-utils'
 
 import BarChart, { BarChartData, BarChartDataType } from './BarChart'
 
 const mockData: BarChartData[] = [
   { x: 1, y: 0, xlabel: '', ylabel: '' },
-  { x: 5, y: 10, xlabel: '', ylabel: '' },
+  { x: 5, y: 0.1, xlabel: '', ylabel: '' },
   { x: 10, y: 20, xlabel: '', ylabel: '' },
   { x: 2, y: 30, xlabel: '', ylabel: '' },
   { x: 30, y: 40, xlabel: '', ylabel: '' },
@@ -39,6 +39,18 @@ describe('BarChart', () => {
     })
   })
 
+  it('should render smallest bar with min height', () => {
+    const minBarHeight = 5
+    const smallestBar = minBy(
+      reject([...mockData], ({ y }) => !y),
+      ({ y }, i) => y,
+    ) ?? { x: 0, y: 0 }
+
+    render(<BarChart data={mockData} minBarHeight={minBarHeight} />)
+    expect(screen.getByTestId(`bar-${smallestBar.x}-${smallestBar.y}`)).toBeInTheDocument()
+    expect(screen.getByTestId(`bar-${smallestBar.x}-${smallestBar.y}`)).toHaveAttribute('height', `${minBarHeight}`)
+  })
+
   it('should render tooltip and content inside', async () => {
     render(<BarChart data={mockData} name="test" />)
 

redisinsight/ui/src/components/charts/bar-chart/BarChart.tsx

@@ -26,6 +26,7 @@ interface IProps {
   data?: BarChartData[]
   dataType?: BarChartDataType
   barWidth?: number
+  minBarHeight?: number
   width?: number
   height?: number
   yCountTicks?: number
@@ -45,6 +46,7 @@ interface IProps {
 export const DEFAULT_MULTIPLIER_GRID = 5
 export const DEFAULT_Y_TICKS = 8
 export const DEFAULT_BAR_WIDTH = 40
+export const MIN_BAR_HEIGHT = 3
 let cleanedData: IDatum[] = []
 
 const BarChart = (props: IProps) => {
@@ -55,6 +57,7 @@ const BarChart = (props: IProps) => {
     height: propHeight = 0,
     barWidth = DEFAULT_BAR_WIDTH,
     yCountTicks = DEFAULT_Y_TICKS,
+    minBarHeight = MIN_BAR_HEIGHT,
     dataType,
     classNames,
     divideLastColumn,
@@ -135,32 +138,6 @@ const BarChart = (props: IProps) => {
       .domain([0, maxY || 0])
       .range([height, 0])
 
-    // bars
-    svg
-      .selectAll('.bar')
-      .data(cleanedData)
-      .enter()
-      .append('rect')
-      .attr('class', cx(styles.bar, classNames?.bar))
-      .attr('x', (d) => xAxis(d.index))
-      .attr('width', barWidth)
-      .attr('y', (d) => yAxis(d.y))
-      .attr('height', (d) => height - yAxis(d.y))
-      .attr('data-testid', (d) => `bar-${d.x}-${d.y}`)
-      .on('mousemove mouseenter', (event, d) => {
-        tooltip.transition()
-          .duration(200)
-          .style('opacity', 1)
-        tooltip.html(tooltipValidation(d.y, d.index))
-          .style('left', `${event.pageX + 16}px`)
-          .style('top', `${event.pageY + 16}px`)
-          .attr('data-testid', 'bar-tooltip')
-      })
-      .on('mouseout', () => {
-        tooltip.transition()
-          .style('opacity', 0)
-      })
-
     // divider for last column
     if (divideLastColumn) {
       svg.append('line')
@@ -210,6 +187,35 @@ const BarChart = (props: IProps) => {
     yTicks.selectAll('text')
       .attr('x', -10)
 
+    // bars
+    svg
+      .selectAll('.bar')
+      .data(cleanedData)
+      .enter()
+      .append('rect')
+      .attr('class', cx(styles.bar, classNames?.bar))
+      .attr('x', (d) => xAxis(d.index))
+      .attr('width', barWidth)
+      // set minimal height for Bar
+      .attr('y', (d) => (d.y && height - yAxis(d.y) < minBarHeight ? height - minBarHeight : yAxis(d.y)))
+      .attr('height', (d) => {
+        const initialHeight = height - yAxis(d.y)
+        return initialHeight && initialHeight < minBarHeight ? minBarHeight : initialHeight
+      })
+      .attr('data-testid', (d) => `bar-${d.x}-${d.y}`)
+      .on('mouseenter mousemove', (event, d) => {
+        tooltip
+          .style('opacity', 1)
+        tooltip.html(tooltipValidation(d.y, d.index))
+          .style('left', `${event.pageX + 16}px`)
+          .style('top', `${event.pageY + 16}px`)
+          .attr('data-testid', 'bar-tooltip')
+      })
+      .on('mouseleave', () => {
+        tooltip
+          .style('opacity', 0)
+      })
+
     return () => {
       tooltip.remove()
     }