refactor: remove ChartMeasures component from commons package and update block imports.

Author: sdimunzio

packages/commons/README.md

@@ -34,7 +34,6 @@ This package is used internally by DevGateway projects and is designed to be com
 
 - **ChartColors**: Provides color schemes (categorical, sequential, diverging) for charts.
 - **ChartLegends**: Customizable legend components for charts.
-- **ChartMeasures**: Components for configuring chart measures.
 - **Measures**: Utilities for handling data measures.
 - **Tooltip**: Customizable tooltip component for charts.
 
@@ -104,7 +103,6 @@ This package is used internally by DevGateway projects and is designed to be com
 
 - **ChartColorsProps**: Props for chart colors component.
 - **ChartLegendsProps**: Props for chart legends component.
-- **ChartMeasuresProps**: Props for chart measures component.
 - **FormatProps**: Props for format component.
 - **MeasuresProps**: Props for measures component.
 - **DataFiltersProps**: Props for data filters component.

packages/commons/src/ChartMeasures.jsx

@@ -8,12 +8,12 @@ export {
     BlockEditWithAPIMetadata, BlockEditWithFilters, ComponentWithSettings, SizeConfig
 } from './Blocks';
 
-export {categorical, sequential, diverging, ChartColors} from './ChartColors';
+export { categorical, sequential, diverging, ChartColors } from './ChartColors';
 
 
-export {DEFAULT_FORMAT_SETTINGS, BLOCKS_CATEGORY, BLOCKS_NS} from './Constants';
+export { DEFAULT_FORMAT_SETTINGS, BLOCKS_CATEGORY, BLOCKS_NS } from './Constants';
 
-export {CSVConfig} from './CSVSourceConfig';
+export { CSVConfig } from './CSVSourceConfig';
 export {
     DataFilters,
 } from './DataFilters';
@@ -42,7 +42,7 @@ export {
     panelFocus, togglePanel
 } from './Util';
 
-export {ChartLegends} from './ChartLegends';
-export {ChartMeasures} from './ChartMeasures';
-export {GenericIcon, ChartIcon} from './icons/index';
-export {CSVConfig as CSVSourceConfig} from './CSVSourceConfig';
+export { ChartLegends } from './ChartLegends';
+
+export { GenericIcon, ChartIcon } from './icons/index';
+export { CSVConfig as CSVSourceConfig } from './CSVSourceConfig';

packages/commons/src/index.js

@@ -7,9 +7,9 @@ import {
     TextareaControl,
     TextControl
 } from '@wordpress/components';
-import {PanelColorSettings} from '@wordpress/block-editor';
-import {__} from '@wordpress/i18n';
-import {togglePanel, ChartMeasures} from '@devgateway/dvz-wp-commons';
+import { PanelColorSettings } from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+import { togglePanel, Measures } from '@devgateway/dvz-wp-commons';
 
 const overLayPrototype = (preFillCsv) => {
     return {
@@ -29,7 +29,7 @@ const LineOverlay = (props) => {
         allMeasures,
         allCategories,
         apps,
-        attributes: {panelStatus, overlays, dimension1, app}
+        attributes: { panelStatus, overlays, dimension1, app }
     } = props;
 
 
@@ -42,30 +42,30 @@ const LineOverlay = (props) => {
             preFillCsv = cat ? cat.items.sort((s1, s2) => s1.position - s2.position).map(i => i.value).join(",\r\n") + "," : ""
         }
         const newOverlay = [...overlays, overLayPrototype(preFillCsv)];
-        setAttributes({overlays: newOverlay});
+        setAttributes({ overlays: newOverlay });
     };
 
 
     const remove = () => {
         const newOverlay = [...overlays]
         newOverlay.pop()
-        setAttributes({overlays: newOverlay})
+        setAttributes({ overlays: newOverlay })
 
     }
 
     const onChange = (idx, attribute, value) => {
         const newOverlay = [...overlays]
         newOverlay[idx][attribute] = value
 
-        setAttributes({overlays: newOverlay})
+        setAttributes({ overlays: newOverlay })
     }
 
     return <>{overlays && overlays.map((o, idx) => {
         const overlayMeasures = {}
         overlayMeasures[o.app] = {}
-        overlayMeasures[o.app][o.measure] = {selected: true}
+        overlayMeasures[o.app][o.measure] = { selected: true }
         return <PanelBody title={o.title} panelStatus={panelStatus['series_'] + idx}
-                          onToggle={e => togglePanel(panelStatus['series_'] + idx, panelStatus, setAttributes)}>
+            onToggle={e => togglePanel(panelStatus['series_'] + idx, panelStatus, setAttributes)}>
 
             <PanelRow>
                 <SelectControl
@@ -94,7 +94,7 @@ const LineOverlay = (props) => {
             </PanelRow>}
 
             {o.app != "csv" &&
-                <ChartMeasures
+                <Measures
                     title={"Select Measure"}
                     onMeasuresChange={e => null}
                     onFormatChange={a => alert("format")}
@@ -146,11 +146,11 @@ const LineOverlay = (props) => {
         <PanelRow>
             <ButtonGroup>
                 <Button isSecondary={true}
-                        onClick={add}>
+                    onClick={add}>
                     {__("Add Series")}
                 </Button>
                 <Button isSecondary={true}
-                        onClick={remove}>
+                    onClick={remove}>
                     {__("Remove Series")}
                 </Button>
             </ButtonGroup>