axidio-styleguide-library1-v2 0.2.29 → 0.2.30

package/fesm2022/axidio-styleguide-library1-v2.mjs

@@ -3379,7 +3379,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
 class GroupChartComponent extends ComponentUniqueId {
     constructor() {
         super();
-        this.customChartConfiguration = {};
         this.clickEvent = new EventEmitter();
         this.headerMenuclickEvent = new EventEmitter();
         this.isHeaderVisible = true;
@@ -3387,18 +3386,6 @@ class GroupChartComponent extends ComponentUniqueId {
         this.isTransparentBackground = false;
         this.chartConfiguration = {};
         this.objectKeys = Object.keys;
-        this.CONSTANTS = {
-            SHORT_TICK_LENGTH: 4,
-            LONG_TICK_LENGTH: 16,
-            SHORT_TICK_LENGTH_BG: 5,
-            LONG_TICK_LENGTH_BG: 30,
-            LEFT_RIGHT_SPACES: 50,
-            RIGHT_SVG_WIDTH: 60,
-            ZOOM_WIDTH_MULTIPLIER: 40,
-            DRILLDOWN_WIDTH_MULTIPLIER: 160,
-            MIN_BAR_WIDTH_SINGLE: 200,
-            MIN_BAR_WIDTH_MULTIPLE: 125,
-        };
         this.defaultConfiguration = {
             margin: { top: 20, right: 20, bottom: 20, left: 40 },
             labelFormatter: ChartHelper.defaultFormatter,
@@ -3427,11 +3414,9 @@ class GroupChartComponent extends ComponentUniqueId {
         this.isZoomedOut = false;
         this.isDD1Open = false;
         this.isDD2Open = false;
-        this.keepOrder = (a) => a;
-    }
-    ngOnInit() {
-        this.initializeConfiguration();
+        this.keepOrder = (a, b) => a;
     }
+    ngOnInit() { }
     get isAlertEnabled() {
         return this.chartConfiguration?.headerMenuOptions?.some((option) => option.id === 'editAlert');
     }
@@ -3441,15 +3426,30 @@ class GroupChartComponent extends ComponentUniqueId {
             this.initializegroupChart();
         }, 10);
     }
-    handleZoominZoomoutClick({ isZoomOut, event }) {
+    isZoomOutSelected(isZoomOut, event) {
         this.isZoomedOut = isZoomOut;
         this.onResized(event);
     }
+    handleZoominZoomoutClick({ isZoomOut, event }) {
+        this.isZoomOutSelected(isZoomOut, event);
+    }
     isLegendVisible() {
         return !!(this.chartData?.metaData?.colors &&
             Object.keys(this.chartData.metaData.colors).length > 1);
     }
-    initializeConfiguration() {
+    initializegroupChart() {
+        this.mergeConfigurations();
+        const chartContext = this.prepareChartData();
+        const dimensions = this.calculateDimensions(chartContext);
+        const scales = this.createScales(chartContext, dimensions);
+        const svgElements = this.createSVGStructure(dimensions);
+        this.renderAxes(svgElements, scales, chartContext, dimensions);
+        this.renderBars(svgElements.svg, chartContext, scales, dimensions);
+        this.renderLabels(svgElements, scales, chartContext, dimensions);
+        this.renderTargetLine(svgElements, scales, chartContext, dimensions);
+        this.renderLineGraph(svgElements.svg, chartContext, scales);
+    }
+    mergeConfigurations() {
         for (const key in this.defaultConfiguration) {
             this.chartConfiguration[key] = ChartHelper.getValueByConfigurationType(key, this.defaultConfiguration, this.customChartConfiguration);
         }
@@ -3463,143 +3463,113 @@ class GroupChartComponent extends ComponentUniqueId {
             this.isTransparentBackground = this.chartConfiguration.isTransparentBackground;
         }
     }
-    initializegroupChart() {
+    prepareChartData() {
         const data = this.chartData.data;
-        const metaData = this.prepareMetaData(this.chartData.metaData);
+        const metaData = this.chartData.metaData;
         const lineData = this.chartData.lineData;
-        const isRia = this.chartConfiguration.isRia || false;
-        const { width, height } = this.calculateDimensions();
-        const { svg, svgYAxisLeft, svgYAxisRight } = this.createSvgContainers(width, height);
-        const scales = this.createScales(data, metaData, width, height, lineData);
-        this.renderAxes(svg, svgYAxisLeft, svgYAxisRight, scales, width, height);
-        this.renderBars(svg, data, metaData, scales, isRia);
-        this.renderLabels(svg, svgYAxisLeft, svgYAxisRight, metaData, width, height, scales);
-        this.renderTargetLine(svg, svgYAxisRight, scales.y, width);
-        this.renderLineGraph(svg, lineData, metaData, scales, isRia);
-    }
-    prepareMetaData(metaData) {
         if (!metaData.colorAboveTarget) {
             metaData.colorAboveTarget = metaData.colors;
         }
-        return metaData;
+        return {
+            data,
+            metaData,
+            lineData,
+            keyList: metaData.keyList,
+            colorMap: metaData.colors,
+            isRia: this.customChartConfiguration?.isRia || false,
+        };
     }
-    calculateDimensions() {
+    calculateDimensions(chartContext) {
         const chartContainer = d3.select(this.containerElt.nativeElement);
         const verticalstackedcontainer = d3.select(this.groupcontainerElt.nativeElement);
         const margin = this.chartConfiguration.margin;
-        let width = parseInt(chartContainer.style('width')) - margin.left - margin.right;
-        width = this.adjustWidthForZoom(width);
+        let width = this.calculateWidth(chartContainer, margin);
         let height = this.calculateHeight(verticalstackedcontainer, margin);
-        return { width, height };
+        return { width, height, margin, chartContainer, verticalstackedcontainer };
     }
-    adjustWidthForZoom(width) {
+    calculateWidth(chartContainer, margin) {
+        const baseWidth = parseInt(chartContainer.style('width')) - margin.left - margin.right;
         const dataLength = this.chartData.data.length;
+        let width = baseWidth;
         if (dataLength > 30 && this.isZoomedOut) {
-            const baseWidth = dataLength * this.CONSTANTS.ZOOM_WIDTH_MULTIPLIER;
-            const dropdownWidth = this.chartData.dropdownData1 ? dataLength * 60 : baseWidth;
-            width = Math.max(width, dropdownWidth);
+            const multiplier = this.chartData.dropdownData1 ? 60 : 40;
+            width = Math.max(width, dataLength * multiplier);
         }
         if (this.chartData.dropdownData2 && width < dataLength * 120 && this.isZoomedOut) {
             width = dataLength * 120;
         }
         if (dataLength > 8 && !this.isZoomedOut) {
-            width = this.chartData.dropdownData2 && width < dataLength * 250
-                ? dataLength * 250
-                : dataLength * this.CONSTANTS.DRILLDOWN_WIDTH_MULTIPLIER;
+            if (this.chartData.dropdownData2 && width < dataLength * 250) {
+                width = dataLength * 250;
+            }
+            else {
+                width = dataLength * 160;
+            }
         }
         return width;
     }
-    calculateHeight(container, margin) {
-        let height = parseInt(container.style('height')) *
-            (this.chartConfiguration.svgHeight / 100) - margin.top - margin.bottom;
+    calculateHeight(verticalstackedcontainer, margin) {
+        let height = parseInt(verticalstackedcontainer.style('height')) *
+            (this.chartConfiguration.svgHeight / 100) -
+            margin.top -
+            margin.bottom;
         if (this.chartConfiguration.isFullScreen && this.chartConfiguration.svgHeight !== 70) {
             height = this.chartConfiguration.svgHeight;
         }
         else if (this.chartConfiguration.isFullScreen) {
-            height = parseInt(container.style('height'));
+            height = parseInt(verticalstackedcontainer.style('height'));
         }
         if (this.chartConfiguration.isDrilldownChart && !this.isHeaderVisible) {
-            height = parseInt(container.style('height')) - margin.top - margin.bottom - 130;
+            height = parseInt(verticalstackedcontainer.style('height')) - margin.top - margin.bottom - 130;
         }
         if (this.chartConfiguration.isHeaderVisible) {
-            height = parseInt(container.style('height')) - margin.top - margin.bottom - 100;
+            height = parseInt(verticalstackedcontainer.style('height')) - margin.top - margin.bottom - 100;
         }
         return height;
     }
-    createSvgContainers(width, height) {
-        const chartContainer = d3.select(this.containerElt.nativeElement);
-        const margin = this.chartConfiguration.margin;
-        const outerContainer = chartContainer
-            .append('div')
-            .attr('id', this.uniqueId)
-            .attr('class', 'outer-container')
-            .style('width', '100%')
-            .style('height', height + 'px')
-            .style('overflow-x', 'hidden')
-            .style('padding-left', `${margin.left}px`)
-            .style('padding-right', `${this.CONSTANTS.RIGHT_SVG_WIDTH}px`)
-            .style('margin-left', '15px');
-        const svgYAxisLeft = this.createLeftYAxis(outerContainer, height, margin);
-        const svgYAxisRight = this.createRightYAxis(outerContainer, height, margin);
-        const innerContainer = outerContainer
-            .append('div')
-            .attr('class', 'inner-container')
-            .style('width', '100%')
-            .style('overflow-x', 'auto');
-        const svg = innerContainer
-            .append('svg')
-            .attr('width', width - this.CONSTANTS.RIGHT_SVG_WIDTH)
-            .attr('height', height + margin.top + margin.bottom + 30)
-            .append('g')
-            .attr('transform', `translate(0, ${margin.top})`);
-        return { svg, svgYAxisLeft, svgYAxisRight };
-    }
-    createLeftYAxis(container, height, margin) {
-        return container
-            .append('svg')
-            .attr('width', '100')
-            .attr('height', height + margin.top + margin.bottom + 10)
-            .style('position', 'absolute')
-            .style('left', '0')
-            .style('z-index', 1)
-            .append('g')
-            .attr('transform', `translate(${margin.left + 15}, ${margin.top})`);
-    }
-    createRightYAxis(container, height, margin) {
-        return container
-            .append('svg')
-            .attr('width', this.CONSTANTS.RIGHT_SVG_WIDTH)
-            .attr('height', height + margin.top + margin.bottom + 10)
-            .style('position', 'absolute')
-            .style('right', '12px')
-            .style('z-index', 1)
-            .append('g')
-            .attr('transform', `translate(0, ${margin.top})`);
-    }
-    createScales(data, metaData, width, height, lineData) {
-        const { x, xScaleFromOrigin } = this.createXScales(data, width);
-        const y = this.createYScale(data, metaData.keyList, height);
-        const xSubgroup = this.createSubgroupScale(metaData.keyList, x);
-        const lineYscale = lineData ? this.createLineYScale(lineData, height) : null;
-        return { x, xScaleFromOrigin, y, xSubgroup, lineYscale };
-    }
-    createXScales(data, width) {
-        const groups = data.map((d) => d.name);
-        const x = d3
-            .scaleBand()
-            .domain(groups)
-            .range([
-            this.CONSTANTS.LEFT_RIGHT_SPACES,
-            width - this.CONSTANTS.RIGHT_SVG_WIDTH - this.CONSTANTS.LEFT_RIGHT_SPACES,
-        ])
-            .padding(0.3);
-        const xScaleFromOrigin = d3
-            .scaleBand()
-            .domain(groups)
-            .range([0, width - this.CONSTANTS.RIGHT_SVG_WIDTH]);
-        return { x, xScaleFromOrigin };
+    createScales(chartContext, dimensions) {
+        const { data, metaData, lineData, keyList } = chartContext;
+        const { width, height, margin } = dimensions;
+        const leftAndRightSpaces = 50;
+        const rightSvgWidth = 60;
+        const groups = d3.map(data, (d) => d.name).keys();
+        let x;
+        if (this.chartConfiguration.isMultiChartGridLine !== undefined) {
+            x = d3
+                .scaleBand()
+                .rangeRound([width, 0])
+                .align(0.5)
+                .padding(0.5)
+                .domain(data.map((d) => d.name.toLowerCase()));
+        }
+        else {
+            x = d3
+                .scaleBand()
+                .domain(groups)
+                .range([leftAndRightSpaces, width - rightSvgWidth - leftAndRightSpaces])
+                .padding(0.3);
+        }
+        const xScaleFromOrigin = d3.scaleBand().domain(groups).range([0, width - rightSvgWidth]);
+        const xSubgroup = d3.scaleBand().domain(keyList).range([0, x.bandwidth()]);
+        const maxValue = this.calculateMaxValue(data, keyList);
+        const y = d3.scaleLinear().domain([0, maxValue]).nice().rangeRound([height, 0]);
+        let lineYscale = null;
+        if (lineData) {
+            lineYscale = this.createLineYScale(lineData, height);
+        }
+        const color = d3.scaleOrdinal().domain(keyList).range(Object.values(metaData.colors));
+        return {
+            x,
+            xScaleFromOrigin,
+            xSubgroup,
+            y,
+            lineYscale,
+            color,
+            leftAndRightSpaces,
+            rightSvgWidth,
+        };
     }
-    createYScale(data, keyList, height) {
+    calculateMaxValue(data, keyList) {
         let maxValue = d3.max(data, (d) => d3.max(keyList, (key) => +d[key])) || 0;
         if (maxValue === 0) {
             maxValue = this.chartData.targetLineData
@@ -3613,10 +3583,7 @@ class GroupChartComponent extends ComponentUniqueId {
             const target = this.chartData.targetLineData.target;
             maxValue = maxValue < 10 && target < 10 ? target + 3 : target + 20;
         }
-        return d3.scaleLinear().domain([0, maxValue]).range([height, 0]).nice();
-    }
-    createSubgroupScale(subgroups, x) {
-        return d3.scaleBand().domain(subgroups).range([0, x.bandwidth()]);
+        return maxValue;
     }
     createLineYScale(lineData, height) {
         let maxLineValue = d3.max(lineData, (d) => +d.value) || 0;
@@ -3626,39 +3593,180 @@ class GroupChartComponent extends ComponentUniqueId {
             minLineValue -= 3;
         if (minLineValue > 0)
             minLineValue = 0;
-        return d3
-            .scaleLinear()
-            .domain([minLineValue, maxLineValue])
-            .range([height, minLineValue]);
+        return d3.scaleLinear().domain([minLineValue, maxLineValue]).range([height, minLineValue]);
     }
-    renderAxes(svg, svgYAxisLeft, svgYAxisRight, scales, width, height) {
-        this.renderXAxis(svg, scales.x, height);
-        this.renderYAxis(svg, svgYAxisLeft, scales.y, width, height);
-        this.renderGridLines(svg, scales, width, height);
+    createSVGStructure(dimensions) {
+        const { chartContainer, height, margin } = dimensions;
+        const rightSvgWidth = 60;
+        const outerContainer = chartContainer
+            .append('div')
+            .attr('id', this.uniqueId)
+            .attr('class', 'outer-container')
+            .style('width', '100%')
+            .style('height', height)
+            .style('overflow-x', 'hidden')
+            .style('padding-left', `${margin.left}px`)
+            .style('padding-right', `${rightSvgWidth}px`)
+            .style('margin-left', '15px');
+        const svgYAxisLeft = outerContainer
+            .append('svg')
+            .attr('width', 100)
+            .attr('height', height + margin.top + margin.bottom + 10)
+            .style('position', 'absolute')
+            .style('left', '0')
+            .style('z-index', 1)
+            .append('g')
+            .attr('transform', `translate(${margin.left + 15},${margin.top})`);
+        const svgYAxisRight = outerContainer
+            .append('svg')
+            .attr('width', rightSvgWidth)
+            .attr('height', height + margin.top + margin.bottom + 10)
+            .style('position', 'absolute')
+            .style('right', '12px')
+            .style('z-index', 1)
+            .append('g')
+            .attr('transform', `translate(0,${margin.top})`);
+        const innerContainer = outerContainer
+            .append('div')
+            .attr('class', 'inner-container')
+            .style('width', '100%')
+            .style('overflow-x', 'auto');
+        const svg = innerContainer
+            .append('svg')
+            .attr('width', dimensions.width - rightSvgWidth)
+            .attr('height', height + margin.top + margin.bottom + 30)
+            .append('g')
+            .attr('transform', `translate(0,${margin.top})`);
+        return { outerContainer, svgYAxisLeft, svgYAxisRight, svg };
+    }
+    renderAxes(svgElements, scales, chartContext, dimensions) {
+        const { svg, svgYAxisLeft, svgYAxisRight } = svgElements;
+        const { x, xScaleFromOrigin, y, lineYscale } = scales;
+        const { height } = dimensions;
+        const { metaData, lineData, keyList } = chartContext;
+        this.renderXAxis(svg, x, xScaleFromOrigin, height, chartContext, keyList);
+        this.renderYAxis(svg, svgYAxisLeft, svgYAxisRight, y, dimensions);
+        if (this.chartConfiguration.yAxisGrid) {
+            this.renderYAxisGrid(svg, y, dimensions.width);
+        }
+        if (this.chartConfiguration.isXgridBetweenLabels) {
+            this.renderXAxisGrid(svg, x, height);
+        }
+        if (lineData && this.chartConfiguration.showLineChartAxis && lineYscale) {
+            this.renderLineYAxis(svgYAxisRight, lineYscale);
+        }
     }
-    renderXAxis(svg, x, height) {
-        if (!this.chartConfiguration.isMultiChartGridLine) {
+    renderXAxis(svg, x, xScaleFromOrigin, height, chartContext, keyList) {
+        const { data, metaData } = chartContext;
+        if (this.chartConfiguration.isMultiChartGridLine === undefined) {
             svg
                 .append('g')
                 .attr('class', 'x1 axis1')
-                .attr('transform', `translate(0, ${height})`)
+                .attr('transform', `translate(0,${height})`)
                 .call(d3.axisBottom(x))
                 .call((g) => g.select('.domain').remove());
             svg.selectAll('g.x1.axis1 g.tick line').remove();
-            const yOffset = this.chartData.metaData.keyList.length > 1 &&
-                !this.chartData.metaData.xLabel ? 32 : 0;
-            svg
-                .selectAll('g.x1.axis1 g.tick text')
-                .attr('class', 'lib-xaxis-labels-texts-drilldown')
-                .style('fill', 'var(--chart-text-color)')
-                .attr('y', yOffset);
+            const textClass = 'lib-xaxis-labels-texts-drilldown';
+            const textSelection = svg.selectAll('g.x1.axis1 g.tick text').attr('class', textClass).style('fill', 'var(--chart-text-color)');
+            if (keyList.length > 1 && !metaData.xLabel) {
+                textSelection.attr('y', 32);
+            }
+        }
+        else {
+            this.renderMultiChartXAxis(svg, x, height, data, metaData);
+        }
+        if (this.chartConfiguration.xLabelsOnSameLine) {
+            this.renderXLabelsOnSameLine(svg, data, metaData);
+        }
+        // Render bottom x-axis
+        svg
+            .append('g')
+            .attr('class', 'x2 axis2')
+            .attr('transform', `translate(0,${height})`)
+            .style('color', '#000')
+            .call(d3.axisBottom(xScaleFromOrigin).tickSize(0))
+            .call((g) => g.select('.domain').attr('fill', 'none'));
+        svg.selectAll('g.x2.axis2 g.tick text').style('display', 'none');
+        if (this.isZoomedOut) {
+            svg.selectAll('.lib-xaxis-labels-texts-drilldown').attr('class', 'lib-display-hidden');
         }
     }
-    renderYAxis(svg, svgYAxisLeft, y, width, height) {
+    renderMultiChartXAxis(svg, x, height, data, metaData) {
+        let alternate_text = false;
+        const short_tick_length_bg = 5;
+        const long_tick_length_bg = 30;
+        svg
+            .append('g')
+            .attr('class', 'x1 axis1')
+            .attr('transform', `translate(0,${height})`)
+            .call(d3.axisBottom(x).tickSize(0))
+            .call((g) => g.select('.domain').attr('fill', 'none'));
+        svg.selectAll('g.x1.axis1 g.tick line').attr('y2', () => {
+            if (alternate_text && !this.chartConfiguration.isNoAlternateXaxisText) {
+                alternate_text = false;
+                return long_tick_length_bg - 7;
+            }
+            else {
+                alternate_text = true;
+                return short_tick_length_bg - 4;
+            }
+        });
+        alternate_text = false;
+        svg.selectAll('g.x1.axis1 g.tick text').attr('class', 'lib-xaxis-labels-texts-weeklycharts').attr('y', () => {
+            if (alternate_text) {
+                alternate_text = false;
+                return long_tick_length_bg;
+            }
+            else {
+                alternate_text = true;
+                return short_tick_length_bg;
+            }
+        });
+    }
+    renderXLabelsOnSameLine(svg, data, metaData) {
+        const short_tick_length_bg = 5;
+        const long_tick_length_bg = 30;
+        svg
+            .selectAll('g.x1.axis1 g.tick text')
+            .attr('class', 'lib-xaxis-labels-texts-drilldown')
+            .attr('y', short_tick_length_bg)
+            .text((d) => {
+            const isValueToBeIgnored = data.some((indiv) => indiv.name.toLowerCase() === d.trim().toLowerCase() &&
+                indiv[metaData.keyList[0]] === -1);
+            if (isValueToBeIgnored)
+                return '';
+            if (d.trim().indexOf(' ') > -1) {
+                return d.trim().substring(0, d.indexOf(' ')).toLowerCase();
+            }
+            return d.toLowerCase();
+        });
+        svg
+            .selectAll('g.x1.axis1 g.tick')
+            .append('text')
+            .attr('class', 'lib-xaxis-labels-texts-drilldown')
+            .attr('y', long_tick_length_bg)
+            .attr('fill', 'currentColor')
+            .text((d) => {
+            if (d.trim().indexOf(' ') > -1) {
+                return d.trim().substring(d.indexOf(' ')).toLowerCase();
+            }
+            return '';
+        });
+    }
+    renderYAxis(svg, svgYAxisLeft, svgYAxisRight, y, dimensions) {
+        svg
+            .append('g')
+            .attr('class', 'lib-stacked-y-axis-text yaxis-dashed')
+            .attr('style', this.chartConfiguration.yAxisCustomTextStyles)
+            .attr('transform', 'translate(0,0)')
+            .call(y)
+            .style('display', 'none');
         svgYAxisLeft
+            .append('g')
             .append('g')
             .attr('class', 'lib-yaxis-labels-texts-drilldown yaxis-dashed')
             .attr('style', this.chartConfiguration.yAxisCustomTextStyles)
+            .attr('transform', 'translate(0,0)')
             .call(d3
             .axisLeft(y)
             .tickSize(0)
@@ -3666,32 +3774,16 @@ class GroupChartComponent extends ComponentUniqueId {
             .tickFormat(this.chartConfiguration.yAxisLabelFomatter))
             .selectAll('text')
             .style('fill', 'var(--chart-text-color)');
-        this.applyAxisVisibility();
-    }
-    renderGridLines(svg, scales, width, height) {
-        if (this.chartConfiguration.isXgridBetweenLabels) {
-            svg
-                .append('g')
-                .attr('class', 'grid')
-                .attr('transform', `translate(${scales.x.bandwidth() / 2}, ${height})`)
-                .call(d3.axisBottom(scales.x).tickSize(-height).tickFormat(''))
-                .style('stroke-dasharray', '5 5')
-                .style('color', 'var(--chart-grid-color, #999999)')
-                .call((g) => g.select('.domain').remove());
-        }
-        if (this.chartConfiguration.yAxisGrid) {
-            svg
-                .append('g')
-                .call(d3
-                .axisLeft(scales.y)
-                .ticks(this.chartConfiguration.numberOfYTicks)
-                .tickSize(-width))
-                .style('color', 'var(--chart-axis-color, #B9B9B9)')
-                .style('opacity', '0.5')
-                .call((g) => g.select('.domain').remove());
-        }
+        svgYAxisRight
+            .append('g')
+            .attr('class', 'lib-yaxis-labels-texts-drilldown yaxis-dashed')
+            .attr('style', this.chartConfiguration.yAxisCustomTextStyles)
+            .attr('transform', 'translate(0,0)')
+            .call(y)
+            .style('display', 'none');
+        this.applyAxisVisibilitySettings();
     }
-    applyAxisVisibility() {
+    applyAxisVisibilitySettings() {
         if (this.chartConfiguration.isXaxisLabelHidden) {
             d3.selectAll('g.lib-line-x-axis-text > g > text').attr('class', 'lib-display-hidden');
         }
@@ -3702,36 +3794,72 @@ class GroupChartComponent extends ComponentUniqueId {
             d3.selectAll('.yaxis-dashed').attr('class', 'lib-display-hidden');
         }
         if (this.chartConfiguration.isYaxisDashed) {
-            d3.selectAll('.yaxis-dashed')
-                .style('stroke-dasharray', '5 5')
-                .style('color', '#999999');
+            d3.selectAll('.yaxis-dashed').style('stroke-dasharray', '5 5').style('color', '#999999');
         }
     }
-    renderBars(svg, data, metaData, scales, isRia) {
+    renderYAxisGrid(svg, y, width) {
+        svg
+            .append('g')
+            .call(d3.axisLeft(y).ticks(this.chartConfiguration.numberOfYTicks).tickSize(-width))
+            .style('color', 'var(--chart-axis-color, #B9B9B9)')
+            .style('opacity', '0.5')
+            .call((g) => g.select('.domain').remove());
+    }
+    renderXAxisGrid(svg, x, height) {
+        svg
+            .append('g')
+            .attr('class', 'grid')
+            .attr('transform', `translate(${x.bandwidth() / 2},${height})`)
+            .call(d3.axisBottom(x).tickSize(-height).tickFormat(''))
+            .style('stroke-dasharray', '5 5')
+            .style('color', 'var(--chart-grid-color, #999999)')
+            .call((g) => g.select('.domain').remove());
+    }
+    renderLineYAxis(svgYAxisRight, lineYscale) {
+        const yLineAxis = d3
+            .axisRight(lineYscale)
+            .ticks(this.chartConfiguration.numberOfYTicks)
+            .tickSize(0)
+            .tickFormat(this.chartConfiguration.yLineAxisLabelFomatter);
+        svgYAxisRight
+            .append('g')
+            .attr('class', 'lib-stacked-y-axis-text1')
+            .attr('style', this.chartConfiguration.yAxisCustomTextStyles)
+            .attr('transform', 'translate(0,0)')
+            .call(yLineAxis);
+    }
+    renderBars(svg, chartContext, scales, dimensions) {
+        const { data, metaData, keyList, isRia } = chartContext;
+        const { x, xSubgroup, y } = scales;
+        const { height } = dimensions;
         const state = svg
             .append('g')
             .selectAll('.state')
             .data(data)
             .enter()
             .append('g')
-            .attr('transform', (d) => `translate(${scales.x(d.name)}, 0)`);
+            .attr('transform', (d) => `translate(${x(d.name)},0)`);
         state
             .selectAll('rect')
-            .data((d) => this.prepareBarData(d, metaData.keyList))
+            .data((d) => this.prepareBarData(d, keyList))
             .enter()
             .append('rect')
             .attr('class', 'bars')
             .on('click', (d) => this.handleBarClick(d, metaData))
-            .attr('x', (d) => this.getBarX(d, scales, data))
-            .attr('y', (d) => scales.y(d.value))
-            .attr('width', (d) => this.getBarWidth(d, scales, data))
-            .attr('height', (d) => this.getBarHeight(d, scales))
-            .style('cursor', metaData.hasDrillDown && !isRia ? 'pointer' : 'default')
+            .attr('x', (d) => this.getBarX(d, data, x, xSubgroup))
+            .attr('y', (d) => y(d.value))
+            .attr('width', (d) => this.getBarWidth(d, data, x, xSubgroup))
+            .attr('height', (d) => this.getBarHeight(d, y, height))
+            .style('cursor', (d) => (metaData.hasDrillDown && !isRia ? 'pointer' : 'default'))
             .attr('fill', (d) => this.getBarColor(d, metaData));
-        if (!isRia && (this.chartConfiguration.displayTitleOnTop || !this.chartConfiguration.textsOnBar)) {
-            state.selectAll('rect')
-                .on('mouseout', () => this.handleMouseOut(svg))
-                .on('mouseover', (d) => this.handleMouseOver(d, svg, scales, metaData, data));
+        if (!isRia && (this.chartConfiguration.displayTitleOnTop || (!this.chartConfiguration.textsOnBar && !this.chartConfiguration.displayTitleOnTop))) {
+            state.selectAll('rect').on('mouseout', (d, i) => this.handleMouseOut(svg)).on('mouseover', (d, i) => this.handleMouseOver(svg, d, data, metaData, x, y, scales.leftAndRightSpaces));
+        }
+        if (this.chartConfiguration.textsOnBar && !this.isZoomedOut) {
+            this.renderBarTexts(state, data, metaData, keyList, x, xSubgroup, y, isRia, svg);
+        }
+        if (this.chartConfiguration.isDrilldownChart) {
+            svg.selectAll('g.x1.axis1 g.tick line').style('display', 'none');
         }
     }
     prepareBarData(d, keyList) {
@@ -3740,138 +3868,212 @@ class GroupChartComponent extends ComponentUniqueId {
     handleBarClick(d, metaData) {
         if (d.key === 'Target')
             return;
-        const shouldBlock = metaData.barWithoutClick?.length &&
-            (metaData.barWithoutClick.includes(d?.name) || metaData.barWithoutClick.includes(d?.key));
-        if (!shouldBlock) {
+        if (!metaData.barWithoutClick?.length ||
+            (!metaData.barWithoutClick.includes(d?.name) && !metaData.barWithoutClick.includes(d?.key))) {
             this.handleClick(d);
         }
     }
-    getBarX(d, scales, data) {
-        if (!this.chartConfiguration.isDrilldownChart) {
-            return scales.xSubgroup(d.key);
+    getBarX(d, data, x, xSubgroup) {
+        if (this.chartConfiguration.isDrilldownChart) {
+            return this.calculateDrilldownBarX(d, data, x);
         }
-        let tempScale = scales.xSubgroup;
+        return xSubgroup(d.key);
+    }
+    calculateDrilldownBarX(d, data, x) {
+        let tempScale;
         data.forEach((indiv) => {
             if (indiv.name === d.name) {
-                const keys = Object.keys(indiv).filter((_, i) => i !== 0);
-                tempScale = d3.scaleBand().domain(keys).range([0, scales.x.bandwidth()]);
-                tempScale = this.adjustScaleForWidth(tempScale, scales.x.bandwidth(), data.length);
+                const keys = Object.keys(indiv).filter((temp, i) => i !== 0);
+                tempScale = d3.scaleBand().domain(keys).range([0, x.bandwidth()]);
+                if (x.bandwidth() > 100) {
+                    tempScale = this.adjustDrilldownScale(tempScale, data, x);
+                }
             }
         });
-        return tempScale(d.key);
+        return tempScale ? tempScale(d.key) : 0;
     }
-    getBarWidth(d, scales, data) {
-        if (!this.chartConfiguration.isDrilldownChart) {
-            return scales.xSubgroup.bandwidth();
+    adjustDrilldownScale(tempScale, data, x) {
+        if (this.chartData.data.length === 1) {
+            const keysLength = Object.keys(this.chartData.data[0]).length;
+            const offset = keysLength === 2 ? 200 : 300;
+            tempScale.range([
+                0 + (x.bandwidth() - offset) / 2,
+                x.bandwidth() - (x.bandwidth() - offset) / 2,
+            ]);
+        }
+        else {
+            tempScale.range([
+                0 + (x.bandwidth() - 125) / 2,
+                x.bandwidth() - (x.bandwidth() - 125) / 2,
+            ]);
         }
-        let tempScale = scales.xSubgroup;
-        data.forEach((indiv) => {
-            if (indiv.name === d.name) {
-                const keys = Object.keys(indiv).filter((_, i) => i !== 0);
-                tempScale = d3.scaleBand().domain(keys).range([0, scales.x.bandwidth()]);
-                tempScale = this.adjustScaleForWidth(tempScale, scales.x.bandwidth(), data.length);
-            }
-        });
-        return tempScale.bandwidth();
-    }
-    adjustScaleForWidth(tempScale, bandwidth, dataLength) {
-        if (bandwidth <= 100)
-            return tempScale;
-        const isSingleItem = dataLength === 1;
-        const minWidth = isSingleItem
-            ? this.CONSTANTS.MIN_BAR_WIDTH_SINGLE
-            : this.CONSTANTS.MIN_BAR_WIDTH_MULTIPLE;
-        const offset = (bandwidth - minWidth) / 2;
-        tempScale.range([offset, bandwidth - offset]);
         return tempScale;
     }
-    getBarHeight(d, scales) {
-        if (d.value === -1 || !d.value) {
-            return scales.y.range()[0] - scales.y(0);
+    getBarWidth(d, data, x, xSubgroup) {
+        if (this.chartConfiguration.isDrilldownChart) {
+            let tempScale;
+            data.forEach((indiv) => {
+                if (indiv.name === d.name) {
+                    const keys = Object.keys(indiv).filter((temp, i) => i !== 0);
+                    tempScale = d3.scaleBand().domain(keys).range([0, x.bandwidth()]);
+                    if (x.bandwidth() > 100) {
+                        tempScale = this.adjustDrilldownScale(tempScale, data, x);
+                    }
+                }
+            });
+            return tempScale ? tempScale.bandwidth() : 0;
         }
-        return scales.y.range()[0] - scales.y(d.value);
+        return xSubgroup.bandwidth();
+    }
+    getBarHeight(d, y, height) {
+        if (d.value === -1)
+            return height - y(0);
+        if (d.value)
+            return height - y(d.value);
+        return height - y(0);
     }
     getBarColor(d, metaData) {
-        const targetLineData = this.chartData.targetLineData;
-        const isAboveTarget = targetLineData && d.value >= targetLineData.target;
-        if (d.value && isAboveTarget && metaData.colorAboveTarget) {
-            return metaData.colorAboveTarget[d.key];
+        if (d.value &&
+            this.chartData.targetLineData &&
+            d.value >= parseInt(this.chartData.targetLineData.target) &&
+            this.chartData.metaData.colorAboveTarget) {
+            return this.chartData.metaData.colorAboveTarget[d.key];
         }
-        return metaData.colors[d.key];
+        return this.chartData.metaData.colors[d.key];
+    }
+    renderBarTexts(state, data, metaData, keyList, x, xSubgroup, y, isRia, svg) {
+        state
+            .selectAll('text')
+            .data((d) => this.prepareBarData(d, keyList))
+            .enter()
+            .append('text')
+            .attr('x', 0)
+            .attr('y', 0)
+            .attr('class', 'lib-data-labels-weeklycharts')
+            .text((d) => this.getBarTextLabel(d))
+            .style('fill', '#000')
+            .style('font-weight', 'bold')
+            .style('font-size', () => this.getBarTextFontSize())
+            .attr('transform', (d) => this.getBarTextTransform(d, data, x, xSubgroup, y))
+            .on('click', (d) => this.handleBarClick(d, metaData));
+        if (!isRia) {
+            state
+                .selectAll('.lib-data-labels-weeklycharts')
+                .on('mouseout', (d, i) => this.handleMouseOut(svg))
+                .on('mouseover', (d, i) => this.handleMouseOver(svg, d, data, metaData, x, y, x.bandwidth()));
+        }
+    }
+    getBarTextLabel(d) {
+        if (!d.key || !d.value)
+            return '';
+        return d.key.length > 20 ? d.key.substring(0, 17) + '...' : d.key;
+    }
+    getBarTextFontSize() {
+        if (this.chartConfiguration.isDrilldownChart) {
+            if (window.innerWidth > 1900)
+                return '18px';
+            if (window.innerWidth < 1400)
+                return '10px';
+            return '14px';
+        }
+        return '14px';
+    }
+    getBarTextTransform(d, data, x, xSubgroup, y) {
+        let tempScale;
+        data.forEach((indiv) => {
+            if (indiv.name === d.name) {
+                const keys = Object.keys(indiv).filter((temp, i) => i !== 0);
+                tempScale = d3.scaleBand().domain(keys).range([0, x.bandwidth()]);
+                if (x.bandwidth() > 100) {
+                    tempScale = this.adjustDrilldownScale(tempScale, data, x);
+                }
+            }
+        });
+        if (this.chartConfiguration.textAlwaysHorizontal) {
+            return `translate(${xSubgroup(d.key)},${y(d.value) - 3})`;
+        }
+        if (tempScale && !isNaN(tempScale(d.key))) {
+            return `translate(${tempScale(d.key) + tempScale.bandwidth() * 0.55},${y(0) - 10}) rotate(270)`;
+        }
+        return 'translate(0,0)';
     }
-    handleMouseOver(d, svg, scales, metaData, data) {
+    handleMouseOver(svg, d, data, metaData, x, y, leftAndRightSpaces) {
         svg.selectAll('.lib-verticalstack-title-ontop').remove();
+        let tempScale;
+        data.forEach((indiv) => {
+            if (indiv.name === d.name) {
+                const keys = Object.keys(indiv).filter((temp, i) => i !== 0);
+                tempScale = d3.scaleBand().domain(keys).range([0, x.bandwidth()]);
+                if (x.bandwidth() > 100) {
+                    tempScale = this.adjustDrilldownScale(tempScale, data, x);
+                }
+            }
+        });
         const foreignObject = svg
             .append('foreignObject')
+            .attr('x', () => this.calculateTooltipX(d, x, tempScale, metaData, leftAndRightSpaces))
+            .attr('y', () => y(d.value) - 43)
             .attr('class', 'lib-verticalstack-title-ontop')
-            .attr('x', this.getTooltipX(d, scales, data, metaData))
-            .attr('y', scales.y(d.value) - 43)
-            .attr('width', this.getTooltipWidth(d, scales, data, metaData))
+            .attr('width', () => this.calculateTooltipWidth(tempScale, metaData, leftAndRightSpaces))
             .attr('height', 40);
         foreignObject
             .append('xhtml:div')
             .attr('class', 'title')
             .style('z-index', 99)
-            .html(this.getTooltipHtml(d, metaData));
-    }
-    getTooltipX(d, scales, data, metaData) {
-        let tempScale = this.getTempScale(d, scales, data);
-        const baseX = scales.x(d.name) + tempScale(d.key);
-        if (!metaData.hasDrillDown) {
-            return baseX - (tempScale.bandwidth() + this.CONSTANTS.LEFT_RIGHT_SPACES * 2) / 2 + tempScale.bandwidth() / 2;
-        }
-        if (tempScale.bandwidth() + this.CONSTANTS.LEFT_RIGHT_SPACES * 2 > 180) {
-            return baseX + tempScale.bandwidth() / 2 - 90;
-        }
-        return baseX - (tempScale.bandwidth() + this.CONSTANTS.LEFT_RIGHT_SPACES * 2) / 2 + tempScale.bandwidth() / 2;
+            .html(() => this.getTooltipHTML(d, metaData));
     }
-    getTooltipWidth(d, scales, data, metaData) {
-        let tempScale = this.getTempScale(d, scales, data);
-        if (!metaData.hasDrillDown) {
-            return (tempScale.bandwidth() + this.CONSTANTS.LEFT_RIGHT_SPACES * 2) + 'px';
-        }
-        if (tempScale.bandwidth() + this.CONSTANTS.LEFT_RIGHT_SPACES * 2 > 180) {
-            return '180px';
+    calculateTooltipX(d, x, tempScale, metaData, leftAndRightSpaces) {
+        if (metaData.hasDrillDown) {
+            if (tempScale.bandwidth() + leftAndRightSpaces * 2 > 180) {
+                return x(d.name) + tempScale(d.key) + tempScale.bandwidth() / 2 - 90;
+            }
+            return (x(d.name) +
+                tempScale(d.key) -
+                (tempScale.bandwidth() + leftAndRightSpaces * 2) / 2 +
+                tempScale.bandwidth() / 2);
         }
-        return (tempScale.bandwidth() + this.CONSTANTS.LEFT_RIGHT_SPACES * 2) + 'px';
+        return (x(d.name) +
+            tempScale(d.key) -
+            (tempScale.bandwidth() + leftAndRightSpaces * 2) / 2 +
+            tempScale.bandwidth() / 2);
     }
-    getTempScale(d, scales, data) {
-        let tempScale = scales.xSubgroup;
-        data.forEach((indiv) => {
-            if (indiv.name === d.name) {
-                const keys = Object.keys(indiv).filter((_, i) => i !== 0);
-                tempScale = d3.scaleBand().domain(keys).range([0, scales.x.bandwidth()]);
-                tempScale = this.adjustScaleForWidth(tempScale, scales.x.bandwidth(), data.length);
+    calculateTooltipWidth(tempScale, metaData, leftAndRightSpaces) {
+        if (metaData.hasDrillDown) {
+            if (tempScale.bandwidth() + leftAndRightSpaces * 2 > 180) {
+                return '180px';
             }
-        });
-        return tempScale;
+            return tempScale.bandwidth() + leftAndRightSpaces * 2;
+        }
+        return tempScale.bandwidth() + leftAndRightSpaces * 2;
     }
-    getTooltipHtml(d, metaData) {
+    getTooltipHTML(d, metaData) {
         const dataType = metaData.dataType || '';
         if (!this.isZoomedOut) {
-            return `<span class="title-bar-name">${d.name}</span>
-              <span class="title-bar-value"><span>${d.value}</span>${dataType}</span>`;
+            return `<span class="title-bar-name">${d.name}</span><span class="title-bar-value"><span>${d.value}</span>${dataType}</span>`;
+        }
+        else {
+            const tempKey = d.name.length <= 8 ? d.name : d.name.substring(0, 5) + '...';
+            return `<span class="title-bar-name">${tempKey}:${d.value}${dataType}</span><span class="title-bar-value">${d.name}</span>`;
         }
-        const truncatedName = d.name.length <= 8 ? d.name : d.name.substring(0, 5) + '...';
-        return `<span class="title-bar-name">${truncatedName}:${d.value}${dataType}</span>
-            <span class="title-bar-value">${d.name}</span>`;
     }
     handleMouseOut(svg) {
         svg.selectAll('.lib-verticalstack-title-ontop').remove();
     }
-    renderLabels(svg, svgYAxisLeft, svgYAxisRight, metaData, width, height, scales) {
+    renderLabels(svgElements, scales, chartContext, dimensions) {
+        const { svg, svgYAxisLeft, svgYAxisRight } = svgElements;
+        const { metaData } = chartContext;
+        const { width, height, margin } = dimensions;
         if (metaData.yLabel) {
-            this.renderYLabel(svgYAxisLeft, metaData.yLabel, height);
+            this.renderYAxisLabel(svgYAxisLeft, metaData.yLabel, height, margin);
         }
         if (metaData.xLabel) {
-            this.renderXLabel(svg, metaData.xLabel, width, height);
+            this.renderXAxisLabel(svg, metaData.xLabel, width, height, margin);
         }
         if (metaData.lineyLabel) {
-            this.renderLineYLabel(svgYAxisRight, metaData.lineyLabel);
+            this.renderLineYAxisLabel(svgYAxisRight, metaData.lineyLabel);
         }
     }
-    renderYLabel(svgYAxisLeft, yLabel, height) {
-        const margin = this.chartConfiguration.margin;
+    renderYAxisLabel(svgYAxisLeft, yLabel, height, margin) {
         svgYAxisLeft
             .append('text')
             .attr('class', 'lib-axis-group-label font-size-1')
@@ -3881,33 +4083,44 @@ class GroupChartComponent extends ComponentUniqueId {
             .attr('x', 0 - height / 2)
             .attr('dy', '1em')
             .style('text-anchor', 'middle')
-            .attr('fill', 'var(--chart-text-color)')
-            .text(this.chartConfiguration.isMultiChartGridLine ? yLabel.toLowerCase() : yLabel);
+            .attr('fill', 'var(--chart-text-color)');
+        if (this.chartConfiguration.isMultiChartGridLine === undefined) {
+            svgYAxisLeft.selectAll('.lib-axis-group-label').style('font-size', 'smaller').text(yLabel);
+        }
+        else {
+            svgYAxisLeft
+                .selectAll('.lib-axis-group-label')
+                .attr('class', 'lib-ylabel-weeklyCharts')
+                .text(yLabel.toLowerCase());
+        }
     }
-    renderXLabel(svg, xLabel, width, height) {
-        const margin = this.chartConfiguration.margin;
+    renderXAxisLabel(svg, xLabel, width, height, margin) {
         const isAcronym = this.isAcronym(xLabel.replace(/[^A-Za-z]/g, ''));
-        let labelClass = 'lib-axis-group-label font-size-1';
+        let baseClass = 'lib-axis-group-label font-size-1';
         if (this.chartConfiguration.isDrilldownChart) {
-            labelClass += ' lib-xlabel-drilldowncharts';
+            baseClass += ' lib-xlabel-drilldowncharts';
         }
-        else if (this.chartConfiguration.isMultiChartGridLine) {
-            labelClass += ' lib-xlabel-weeklyCharts';
+        else if (this.chartConfiguration.isMultiChartGridLine !== undefined) {
+            baseClass += ' lib-xlabel-weeklyCharts';
         }
         else {
-            labelClass += ' lib-axis-waterfall-label';
+            baseClass += ' lib-axis-waterfall-label';
         }
         svg
             .append('text')
-            .attr('class', labelClass)
+            .attr('class', baseClass)
             .attr('style', this.chartConfiguration.xAxisCustomlabelStyles)
-            .attr('transform', `translate(${width / 2}, ${height + margin.top + 20})`)
+            .attr('transform', `translate(${width / 2},${height + margin.top + 20})`)
             .style('text-anchor', 'middle')
             .style('fill', 'var(--chart-text-color)')
             .text(isAcronym ? xLabel.toUpperCase() : xLabel.toLowerCase())
             .style('text-transform', isAcronym ? 'none' : 'capitalize');
     }
-    renderLineYLabel(svgYAxisRight, lineyLabel) {
+    isAcronym(label) {
+        return ((label.length <= 4 && /^[A-Z]+$/.test(label)) ||
+            (label === label.toUpperCase() && /[A-Z]/.test(label)));
+    }
+    renderLineYAxisLabel(svgYAxisRight, lineyLabel) {
         svgYAxisRight
             .append('text')
             .attr('class', 'lib-axis-group-label lib-line-axis')
@@ -3920,15 +4133,15 @@ class GroupChartComponent extends ComponentUniqueId {
             .style('font-size', 'smaller')
             .text(lineyLabel);
     }
-    isAcronym(label) {
-        return ((label.length <= 4 && /^[A-Z]+$/.test(label)) ||
-            (label === label.toUpperCase() && /[A-Z]/.test(label)));
-    }
-    renderTargetLine(svg, svgYAxisRight, yScale, width) {
+    renderTargetLine(svgElements, scales, chartContext, dimensions) {
         if (!this.chartData.targetLineData)
             return;
-        const targetLineData = this.chartData.targetLineData;
-        const yZero = yScale(targetLineData.target);
+        const { svg, svgYAxisRight } = svgElements;
+        const { y } = scales;
+        const { width } = dimensions;
+        const { metaData } = chartContext;
+        const targetData = this.chartData.targetLineData;
+        const yZero = y(targetData.target);
         svg
             .append('line')
             .attr('x1', 0)
@@ -3936,45 +4149,49 @@ class GroupChartComponent extends ComponentUniqueId {
             .attr('y1', yZero)
             .attr('y2', yZero)
             .style('stroke-dasharray', '5 5')
-            .style('stroke', targetLineData.color);
-        const dataType = this.chartData.metaData.dataType || '';
-        const targetName = targetLineData.targetName || 'target';
+            .style('stroke', targetData.color);
+        const rightSvgWidth = 60;
         svgYAxisRight
             .append('foreignObject')
-            .attr('transform', `translate(0, ${yZero - 30})`)
-            .attr('width', this.CONSTANTS.RIGHT_SVG_WIDTH)
+            .attr('transform', `translate(0,${yZero - 30})`)
+            .attr('width', rightSvgWidth)
             .attr('height', 50)
             .append('xhtml:div')
             .attr('class', 'target-display')
             .style('color', 'var(--chart-text-color)')
-            .html(`<div>${targetName}</div><div>${targetLineData.target}${dataType}</div>`);
+            .html(() => {
+            const dataType = metaData.dataType || '';
+            const targetName = targetData.targetName || 'target';
+            return `<div>${targetName}</div><div>${targetData.target}${dataType}</div>`;
+        });
     }
-    renderLineGraph(svg, lineData, metaData, scales, isRia) {
+    renderLineGraph(svg, chartContext, scales) {
+        const { lineData, metaData } = chartContext;
         if (!lineData)
             return;
-        const linePath = d3
-            .line()
-            .x((d) => scales.x(d.name) + scales.x.bandwidth() / 2)
-            .y((d) => scales.lineYscale(d.value));
+        const { x, lineYscale } = scales;
         svg
             .append('path')
             .datum(lineData)
             .attr('fill', 'none')
             .attr('stroke', this.chartConfiguration.lineGraphColor)
             .attr('stroke-width', 1.5)
-            .attr('d', linePath);
+            .attr('d', d3
+            .line()
+            .x((d) => x(d.name) + x.bandwidth() / 2)
+            .y((d) => lineYscale(d.value)));
         const dot = svg
             .selectAll('myCircles')
             .data(lineData)
             .enter()
             .append('g')
-            .on('click', (d) => this.handleLinePointClick(d, metaData));
+            .on('click', (d) => this.handleBarClick(d, metaData));
         dot
             .append('circle')
             .attr('fill', this.chartConfiguration.lineGraphColor)
             .attr('stroke', 'none')
-            .attr('cx', (d) => scales.x(d.name) + scales.x.bandwidth() / 2)
-            .attr('cy', (d) => scales.lineYscale(d.value))
+            .attr('cx', (d) => x(d.name) + x.bandwidth() / 2)
+            .attr('cy', (d) => lineYscale(d.value))
             .style('cursor', 'pointer')
             .attr('r', 3);
         if (this.chartConfiguration.lineGraphColor) {
@@ -3983,19 +4200,12 @@ class GroupChartComponent extends ComponentUniqueId {
                 .attr('class', 'dot')
                 .attr('color', this.chartConfiguration.lineGraphColor)
                 .attr('style', 'font-size: .85em')
-                .attr('x', (d) => scales.x(d.name) + scales.x.bandwidth() / 2)
-                .attr('y', (d) => scales.lineYscale(d.value))
+                .attr('x', (d) => x(d.name) + x.bandwidth() / 2)
+                .attr('y', (d) => lineYscale(d.value))
                 .attr('dy', '-1em')
                 .text((d) => this.chartConfiguration.labelFormatter(d.value));
         }
     }
-    handleLinePointClick(d, metaData) {
-        const shouldBlock = metaData.barWithoutClick?.length &&
-            (metaData.barWithoutClick.includes(d?.name) || metaData.barWithoutClick.includes(d?.key));
-        if (!shouldBlock) {
-            this.handleClick(d);
-        }
-    }
     handleClick(d) {
         if (this.chartData.metaData.hasDrillDown || d?.toggleFrom) {
             this.clickEvent.emit(d);