@evergis/react 3.1.129-alpha.1 → 3.1.129-alpha.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/Dashboard/containers/ChartContainer/types.d.ts +2 -2
- package/dist/components/Dashboard/hooks/useRelatedDataSourceAttributes.d.ts +2 -2
- package/dist/components/Dashboard/types.d.ts +3 -3
- package/dist/components/Dashboard/utils/formatChartRelatedValue.d.ts +2 -2
- package/dist/components/Dashboard/utils/getDataFromRelatedFeatures.d.ts +2 -2
- package/dist/components/Dashboard/utils/getElementValue.d.ts +2 -2
- package/dist/components/Dashboard/utils/getFeatureAttributes.d.ts +2 -3
- package/dist/components/Dashboard/utils/getLayerDefinition.d.ts +2 -3
- package/dist/components/Dashboard/utils/getLayerInfo.d.ts +3 -3
- package/dist/components/Dashboard/utils/getLayerInfoFromDataSources.d.ts +2 -2
- package/dist/components/Dashboard/utils/getRelatedAttribute.d.ts +2 -2
- package/dist/components/Dashboard/utils/getSvgUrl.d.ts +3 -2
- package/dist/components/Dashboard/utils/pieChartTooltipFromRelatedFeatures.d.ts +2 -2
- package/dist/components/Dashboard/utils/tooltipValueFromRelatedFeatures.d.ts +2 -2
- package/dist/components/LayerIcon/index.d.ts +2 -2
- package/dist/contexts/DashboardContext/types.d.ts +2 -3
- package/dist/contexts/FeatureCardContext/types.d.ts +3 -3
- package/dist/hooks/map/useLayerParams.d.ts +2 -2
- package/dist/index.js +14 -14
- package/dist/react.esm.js +14 -14
- package/dist/types/attribute.d.ts +0 -10
- package/dist/types/layer.d.ts +1 -2
- package/package.json +4 -4
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { BarChartData, PieChartData } from '@evergis/charts';
|
|
2
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
3
|
import { ConfigContainerChild, ContainerProps, FilterItem } from '../../types';
|
|
3
|
-
import { LayerInfo } from '../../../../types';
|
|
4
4
|
export type ChartProps = Pick<ContainerProps, "config" | "elementConfig" | "type" | "renderElement"> & {
|
|
5
5
|
element: ConfigContainerChild;
|
|
6
6
|
};
|
|
7
7
|
export type ChartDataProps = {
|
|
8
8
|
items: FilterItem[] | PieChartData[] | BarChartData[];
|
|
9
|
-
layerInfo:
|
|
9
|
+
layerInfo: QueryLayerServiceInfoDc | null;
|
|
10
10
|
attributeName: string | null;
|
|
11
11
|
attributeUnits: string | null;
|
|
12
12
|
dataSourceName: string | null;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { FeatureDc } from '@evergis/api';
|
|
1
|
+
import { FeatureDc, QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
2
|
import { ConfigContainerChild, FetchedDataSource, WidgetType } from '../types';
|
|
3
3
|
export declare const useRelatedDataSourceAttributes: ({ type, elementConfig, dataSources, feature, }: {
|
|
4
4
|
type: WidgetType;
|
|
@@ -6,7 +6,7 @@ export declare const useRelatedDataSourceAttributes: ({ type, elementConfig, dat
|
|
|
6
6
|
dataSources: FetchedDataSource[];
|
|
7
7
|
feature?: FeatureDc;
|
|
8
8
|
}) => {
|
|
9
|
-
layerInfo:
|
|
9
|
+
layerInfo: QueryLayerServiceInfoDc;
|
|
10
10
|
attributes: import('../types').ClientFeatureAttribute[];
|
|
11
11
|
dataSource: import('../types').WidgetDataSource;
|
|
12
12
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { CSSProperties, FC, ReactNode } from 'react';
|
|
2
2
|
import { i18n } from 'i18next';
|
|
3
|
-
import { AttributeDefinitionDc, AttributeFormatDefinitionDc, AttributeType, EqlRequestDc, FeatureDc, OgcGeometryType, PagedFeaturesListDc, PositionDc, RemoteTaskStatus, StringSubType } from '@evergis/api';
|
|
4
3
|
import { PieChartData, BarChartMarker } from '@evergis/charts';
|
|
5
4
|
import { IconTypesKeys, IOption } from '@evergis/uilib-gl';
|
|
6
|
-
import {
|
|
5
|
+
import { AttributeDefinitionDc, AttributeFormatDefinitionDc, AttributeType, EqlRequestDc, FeatureDc, OgcGeometryType, PagedFeaturesListDc, PositionDc, QueryLayerServiceInfoDc, RemoteTaskStatus, StringSubType } from '@evergis/api';
|
|
6
|
+
import { FeatureAttributeValue, EditGeometryType, ThemeName } from '../../types';
|
|
7
7
|
import { InnerContainerProps } from './containers/DataSourceInnerContainer/types';
|
|
8
8
|
export interface DashboardsProps {
|
|
9
9
|
zIndex?: CSSProperties["zIndex"];
|
|
@@ -319,7 +319,7 @@ export interface GetRenderElementProps extends Omit<ContainerProps, "renderEleme
|
|
|
319
319
|
expandedContainers?: Record<string, boolean>;
|
|
320
320
|
pageIndex?: number;
|
|
321
321
|
attributes?: ClientFeatureAttribute[];
|
|
322
|
-
layerInfo?:
|
|
322
|
+
layerInfo?: QueryLayerServiceInfoDc;
|
|
323
323
|
selectedTabId?: string;
|
|
324
324
|
setSelectedTabId?: (id: string) => void;
|
|
325
325
|
t?: i18n["t"];
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { i18n } from 'i18next';
|
|
2
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
3
|
import { ConfigRelatedDataSource } from '../types';
|
|
3
|
-
|
|
4
|
-
export declare const formatChartRelatedValue: (t: i18n["t"], value: string | number, layerInfo: LayerInfo, relatedAttributes: ConfigRelatedDataSource[]) => string | number;
|
|
4
|
+
export declare const formatChartRelatedValue: (t: i18n["t"], value: string | number, layerInfo: QueryLayerServiceInfoDc, relatedAttributes: ConfigRelatedDataSource[]) => string | number;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { i18n } from 'i18next';
|
|
2
|
-
import {
|
|
2
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
3
3
|
import { ConfigContainerChild, ConfigFilter, ConfigRelatedDataSource, FetchedDataSource, FilterItem } from '../types';
|
|
4
4
|
export declare const getDataFromRelatedFeatures: ({ t, config, filters, relatedConfig, dataSource, layerInfo }: {
|
|
5
5
|
t: i18n["t"];
|
|
@@ -7,5 +7,5 @@ export declare const getDataFromRelatedFeatures: ({ t, config, filters, relatedC
|
|
|
7
7
|
filters: ConfigFilter[];
|
|
8
8
|
relatedConfig: ConfigRelatedDataSource;
|
|
9
9
|
dataSource: FetchedDataSource;
|
|
10
|
-
layerInfo:
|
|
10
|
+
layerInfo: QueryLayerServiceInfoDc;
|
|
11
11
|
}) => FilterItem[] | null;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
3
|
import { ClientFeatureAttribute, ConfigContainerChild, ContainerProps, RenderElementValue } from '../types';
|
|
3
|
-
import { LayerInfo } from '../../../types';
|
|
4
4
|
export declare const getElementValue: ({ getDefaultContainer, ...props }: Pick<ContainerProps, "type" | "config" | "elementConfig" | "renderElement"> & {
|
|
5
|
-
layerInfo:
|
|
5
|
+
layerInfo: QueryLayerServiceInfoDc;
|
|
6
6
|
attributes: ClientFeatureAttribute[];
|
|
7
7
|
element: ConfigContainerChild;
|
|
8
8
|
getDefaultContainer?: () => ReactNode;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { FeatureDc } from '@evergis/api';
|
|
1
|
+
import { FeatureDc, QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
2
|
import { SelectedFeatureDc } from '../../../utils';
|
|
3
|
-
import { LayerInfo } from '../../../types';
|
|
4
3
|
import { ClientFeatureAttribute, FetchedDataSource } from '../types';
|
|
5
|
-
export declare function getFeatureAttributes(feature?: FeatureDc | SelectedFeatureDc, layer?:
|
|
4
|
+
export declare function getFeatureAttributes(feature?: FeatureDc | SelectedFeatureDc, layer?: QueryLayerServiceInfoDc, dataSource?: FetchedDataSource): ClientFeatureAttribute[];
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
import { LayerDefinitionDc } from '@evergis/api';
|
|
2
|
-
|
|
3
|
-
export declare const getLayerDefinition: (layer?: LayerInfo) => LayerDefinitionDc;
|
|
1
|
+
import { LayerDefinitionDc, QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
|
+
export declare const getLayerDefinition: (layer?: QueryLayerServiceInfoDc) => LayerDefinitionDc;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { ProxyServiceInfoDc, ServiceInfoDc } from '@evergis/api';
|
|
2
|
-
import {
|
|
1
|
+
import { ProxyServiceInfoDc, QueryLayerServiceInfoDc, ServiceInfoDc } from '@evergis/api';
|
|
2
|
+
import { ProxyServiceInfo } from '../../../types';
|
|
3
3
|
export declare const isCompositeLayerConfiguration: (value?: unknown) => value is ServiceInfoDc;
|
|
4
4
|
export declare const isProxyService: (value?: unknown) => value is ProxyServiceInfoDc;
|
|
5
5
|
export declare const getProxyService: (layer?: ServiceInfoDc) => ProxyServiceInfo;
|
|
6
6
|
export declare function getLayerInfo(layer?: ServiceInfoDc & {
|
|
7
7
|
type?: string;
|
|
8
|
-
}):
|
|
8
|
+
}): QueryLayerServiceInfoDc;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
2
|
import { ConfigDataSource } from '../types';
|
|
3
|
-
export declare const getLayerInfoFromDataSources: (layerInfos:
|
|
3
|
+
export declare const getLayerInfoFromDataSources: (layerInfos: QueryLayerServiceInfoDc[], dataSources: ConfigDataSource[], relatedDataSource: string) => QueryLayerServiceInfoDc | undefined;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const getRelatedAttribute: (layerInfo:
|
|
1
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
|
+
export declare const getRelatedAttribute: (layerInfo: QueryLayerServiceInfoDc, sourceAttributeName: string, relatedLayerName: string) => any;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
1
2
|
import { ConfigContainerChild } from '../types';
|
|
2
|
-
import { FeatureAttribute
|
|
3
|
+
import { FeatureAttribute } from '../../../types';
|
|
3
4
|
export declare const getSvgUrl: ({ elementConfig, layerInfo, attributes, }: {
|
|
4
5
|
elementConfig: ConfigContainerChild;
|
|
5
|
-
layerInfo:
|
|
6
|
+
layerInfo: QueryLayerServiceInfoDc;
|
|
6
7
|
attributes: FeatureAttribute[];
|
|
7
8
|
}) => string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ReactElement } from 'react';
|
|
2
2
|
import { i18n } from 'i18next';
|
|
3
3
|
import { PieChartData } from '@evergis/charts';
|
|
4
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
4
5
|
import { ConfigRelatedDataSource } from '../types';
|
|
5
|
-
|
|
6
|
-
export declare const pieChartTooltipFromRelatedFeatures: (t: i18n["t"], data: PieChartData[], relatedAttributes: ConfigRelatedDataSource[], layerInfo: LayerInfo) => ReactElement | string;
|
|
6
|
+
export declare const pieChartTooltipFromRelatedFeatures: (t: i18n["t"], data: PieChartData[], relatedAttributes: ConfigRelatedDataSource[], layerInfo: QueryLayerServiceInfoDc) => ReactElement | string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
2
|
import { i18n } from 'i18next';
|
|
3
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
3
4
|
import { ConfigRelatedDataSource } from '../types';
|
|
4
|
-
|
|
5
|
-
export declare const tooltipValueFromRelatedFeatures: (t: i18n["t"], value: number, relatedAttributes: ConfigRelatedDataSource[], layerInfo: LayerInfo) => number | string | ReactNode;
|
|
5
|
+
export declare const tooltipValueFromRelatedFeatures: (t: i18n["t"], value: number, relatedAttributes: ConfigRelatedDataSource[], layerInfo: QueryLayerServiceInfoDc) => number | string | ReactNode;
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { FC, PropsWithChildren } from 'react';
|
|
2
|
-
import { ExtendedProjectInfoDc } from '@evergis/api';
|
|
2
|
+
import { ExtendedProjectInfoDc, QueryLayerServiceInfoDc } from '@evergis/api';
|
|
3
3
|
import { ConfigContainer, DashboardLayerPayload, DashboardState, LayerItemProps, SelectedFilters, WidgetDataSource } from '../../components';
|
|
4
|
-
import { LayerInfo } from '../../types';
|
|
5
4
|
export type DashboardContextProps = PropsWithChildren<{
|
|
6
5
|
config?: ConfigContainer;
|
|
7
6
|
containerIds?: string[];
|
|
8
7
|
projectInfo?: ExtendedProjectInfoDc;
|
|
9
8
|
updateProject?: (projectInfo: ExtendedProjectInfoDc) => void;
|
|
10
9
|
pageIndex?: number;
|
|
11
|
-
layerInfos?:
|
|
10
|
+
layerInfos?: QueryLayerServiceInfoDc[];
|
|
12
11
|
dataSources?: WidgetDataSource[];
|
|
13
12
|
geometryFilter?: boolean;
|
|
14
13
|
loading?: boolean;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { PropsWithChildren } from 'react';
|
|
2
|
-
import { LayerReferenceConfigurationDc } from '@evergis/api';
|
|
2
|
+
import { LayerReferenceConfigurationDc, QueryLayerServiceInfoDc } from '@evergis/api';
|
|
3
3
|
import { ClientFeatureAttribute, ConfigContainer, EditAttributeValue, SelectedFilters, WidgetDataSource } from '../../components';
|
|
4
|
-
import {
|
|
4
|
+
import { SelectedFeature } from '../../types';
|
|
5
5
|
export type FeatureCardContextSettings = PropsWithChildren<{
|
|
6
6
|
config?: ConfigContainer;
|
|
7
7
|
attributes?: ClientFeatureAttribute[];
|
|
8
|
-
layerInfo?:
|
|
8
|
+
layerInfo?: QueryLayerServiceInfoDc;
|
|
9
9
|
feature?: SelectedFeature;
|
|
10
10
|
pageIndex?: number;
|
|
11
11
|
handBookReference?: LayerReferenceConfigurationDc;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const useLayerParams: (layer?:
|
|
1
|
+
import { QueryLayerServiceInfoDc } from '@evergis/api';
|
|
2
|
+
export declare const useLayerParams: (layer?: QueryLayerServiceInfoDc) => {};
|
package/dist/index.js
CHANGED
|
@@ -9592,7 +9592,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9592
9592
|
const [selectedPixels, setSelectedPixels] = React.useState(null);
|
|
9593
9593
|
const { filterName } = filter.options;
|
|
9594
9594
|
const { options } = elementConfig;
|
|
9595
|
-
const { barHeight, barWidth = DEFAULT_BAR_WIDTH, padding = DEFAULT_BAR_PADDING, height = DEFAULT_BAR_CHART_HEIGHT, radius = DEFAULT_BARCHART_RADIUS, width: configWidth, markers: configMarkers, colors: configColors, colorAttribute, defaultColor, primaryColor, drawMinMax } = options || {};
|
|
9595
|
+
const { barHeight, barWidth = DEFAULT_BAR_WIDTH, padding = DEFAULT_BAR_PADDING, height = DEFAULT_BAR_CHART_HEIGHT, radius = DEFAULT_BARCHART_RADIUS, width: configWidth, markers: configMarkers, colors: configColors, colorAttribute, defaultColor, primaryColor, drawMinMax, } = options || {};
|
|
9596
9596
|
const barFullWidth = barWidth + padding;
|
|
9597
9597
|
const { filters: configFilters } = currentPage;
|
|
9598
9598
|
const configFilter = React.useMemo(() => getConfigFilter(filterName, configFilters), [configFilters, filterName]);
|
|
@@ -9607,9 +9607,9 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9607
9607
|
dataSourceName: configFilter?.relatedDataSource,
|
|
9608
9608
|
attributeName: configFilter?.attributeValue,
|
|
9609
9609
|
attributeTitle: configFilter?.attributeAlias,
|
|
9610
|
-
attributeColor: colorAttribute
|
|
9610
|
+
attributeColor: colorAttribute,
|
|
9611
9611
|
},
|
|
9612
|
-
layerInfo: { layerDefinition: { attributes: dataSource?.attributeDefinition } }
|
|
9612
|
+
layerInfo: { layerDefinition: { attributes: dataSource?.attributeDefinition } },
|
|
9613
9613
|
}), [
|
|
9614
9614
|
colorAttribute,
|
|
9615
9615
|
configFilter?.attributeAlias,
|
|
@@ -9618,7 +9618,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9618
9618
|
configFilters,
|
|
9619
9619
|
dataSource,
|
|
9620
9620
|
elementConfig,
|
|
9621
|
-
t
|
|
9621
|
+
t,
|
|
9622
9622
|
]);
|
|
9623
9623
|
const amount = React.useMemo(() => filterItems?.length || 0, [filterItems?.length]);
|
|
9624
9624
|
const width = React.useMemo(() => configWidth || amount * barFullWidth, [amount, barFullWidth, configWidth]);
|
|
@@ -9654,8 +9654,8 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9654
9654
|
...item,
|
|
9655
9655
|
color: selectedRange && index >= selectedRange[0] && index <= selectedRange[1]
|
|
9656
9656
|
? primaryColor || theme.palette.primary
|
|
9657
|
-
: defaultColor || theme.palette.elementDeep
|
|
9658
|
-
}
|
|
9657
|
+
: defaultColor || theme.palette.elementDeep,
|
|
9658
|
+
},
|
|
9659
9659
|
];
|
|
9660
9660
|
});
|
|
9661
9661
|
}, [defaultColor, hasDefinedColors, primaryColor, selectedRange, theme.palette.elementDeep, theme.palette.primary]);
|
|
@@ -9683,8 +9683,8 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9683
9683
|
[filterName]: {
|
|
9684
9684
|
value: valueRange,
|
|
9685
9685
|
min: valueRange[0],
|
|
9686
|
-
max: valueRange[1]
|
|
9687
|
-
}
|
|
9686
|
+
max: valueRange[1],
|
|
9687
|
+
},
|
|
9688
9688
|
}, configFilter?.resetFilters);
|
|
9689
9689
|
}, [changeFilters, configFilter?.resetFilters, filterName, getValueRange]);
|
|
9690
9690
|
const prevDisabled = React.useMemo(() => loading || !selectedPixels || selectedPixels?.[0] - barFullWidth < 0, [barFullWidth, loading, selectedPixels]);
|
|
@@ -9742,7 +9742,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9742
9742
|
onPrev,
|
|
9743
9743
|
onNext,
|
|
9744
9744
|
onSelect,
|
|
9745
|
-
onBarClick
|
|
9745
|
+
onBarClick,
|
|
9746
9746
|
};
|
|
9747
9747
|
};
|
|
9748
9748
|
const BarChartFilter = ({ type, config, elementConfig, filter }) => {
|
|
@@ -9750,7 +9750,7 @@ const BarChartFilter = ({ type, config, elementConfig, filter }) => {
|
|
|
9750
9750
|
const { configFilters, loading, height, data, barWidth, barHeight, attributeValue, padding, selectedRange, prevDisabled, nextDisabled, onPrev, onNext, ...rest } = useBarChartFilter({
|
|
9751
9751
|
type,
|
|
9752
9752
|
elementConfig,
|
|
9753
|
-
filter
|
|
9753
|
+
filter,
|
|
9754
9754
|
});
|
|
9755
9755
|
const renderSelectedRange = React.useMemo(() => {
|
|
9756
9756
|
if (!selectedRange)
|
|
@@ -10514,7 +10514,7 @@ const useChartData = ({ element, type }) => {
|
|
|
10514
10514
|
relatedConfig: relatedAxis,
|
|
10515
10515
|
dataSource: featureDataSource,
|
|
10516
10516
|
layerInfo: layerInfo ||
|
|
10517
|
-
{ layerDefinition: { attributes: featureDataSource.attributeDefinition } }
|
|
10517
|
+
{ layerDefinition: { attributes: featureDataSource.attributeDefinition } },
|
|
10518
10518
|
})
|
|
10519
10519
|
: null,
|
|
10520
10520
|
color: axisColor,
|
|
@@ -10533,8 +10533,8 @@ const useChartData = ({ element, type }) => {
|
|
|
10533
10533
|
attributeName: null,
|
|
10534
10534
|
attributeUnits: null,
|
|
10535
10535
|
dataSourceName: null,
|
|
10536
|
-
color: null
|
|
10537
|
-
}
|
|
10536
|
+
color: null,
|
|
10537
|
+
},
|
|
10538
10538
|
];
|
|
10539
10539
|
}, [
|
|
10540
10540
|
currentPage?.dataSources,
|
|
@@ -10544,7 +10544,7 @@ const useChartData = ({ element, type }) => {
|
|
|
10544
10544
|
t,
|
|
10545
10545
|
attributes,
|
|
10546
10546
|
layerInfos,
|
|
10547
|
-
dataSources
|
|
10547
|
+
dataSources,
|
|
10548
10548
|
]);
|
|
10549
10549
|
const [data, setData] = React.useState(fetchedData);
|
|
10550
10550
|
React.useEffect(() => {
|
package/dist/react.esm.js
CHANGED
|
@@ -9590,7 +9590,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9590
9590
|
const [selectedPixels, setSelectedPixels] = useState(null);
|
|
9591
9591
|
const { filterName } = filter.options;
|
|
9592
9592
|
const { options } = elementConfig;
|
|
9593
|
-
const { barHeight, barWidth = DEFAULT_BAR_WIDTH, padding = DEFAULT_BAR_PADDING, height = DEFAULT_BAR_CHART_HEIGHT, radius = DEFAULT_BARCHART_RADIUS, width: configWidth, markers: configMarkers, colors: configColors, colorAttribute, defaultColor, primaryColor, drawMinMax } = options || {};
|
|
9593
|
+
const { barHeight, barWidth = DEFAULT_BAR_WIDTH, padding = DEFAULT_BAR_PADDING, height = DEFAULT_BAR_CHART_HEIGHT, radius = DEFAULT_BARCHART_RADIUS, width: configWidth, markers: configMarkers, colors: configColors, colorAttribute, defaultColor, primaryColor, drawMinMax, } = options || {};
|
|
9594
9594
|
const barFullWidth = barWidth + padding;
|
|
9595
9595
|
const { filters: configFilters } = currentPage;
|
|
9596
9596
|
const configFilter = useMemo(() => getConfigFilter(filterName, configFilters), [configFilters, filterName]);
|
|
@@ -9605,9 +9605,9 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9605
9605
|
dataSourceName: configFilter?.relatedDataSource,
|
|
9606
9606
|
attributeName: configFilter?.attributeValue,
|
|
9607
9607
|
attributeTitle: configFilter?.attributeAlias,
|
|
9608
|
-
attributeColor: colorAttribute
|
|
9608
|
+
attributeColor: colorAttribute,
|
|
9609
9609
|
},
|
|
9610
|
-
layerInfo: { layerDefinition: { attributes: dataSource?.attributeDefinition } }
|
|
9610
|
+
layerInfo: { layerDefinition: { attributes: dataSource?.attributeDefinition } },
|
|
9611
9611
|
}), [
|
|
9612
9612
|
colorAttribute,
|
|
9613
9613
|
configFilter?.attributeAlias,
|
|
@@ -9616,7 +9616,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9616
9616
|
configFilters,
|
|
9617
9617
|
dataSource,
|
|
9618
9618
|
elementConfig,
|
|
9619
|
-
t
|
|
9619
|
+
t,
|
|
9620
9620
|
]);
|
|
9621
9621
|
const amount = useMemo(() => filterItems?.length || 0, [filterItems?.length]);
|
|
9622
9622
|
const width = useMemo(() => configWidth || amount * barFullWidth, [amount, barFullWidth, configWidth]);
|
|
@@ -9652,8 +9652,8 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9652
9652
|
...item,
|
|
9653
9653
|
color: selectedRange && index >= selectedRange[0] && index <= selectedRange[1]
|
|
9654
9654
|
? primaryColor || theme.palette.primary
|
|
9655
|
-
: defaultColor || theme.palette.elementDeep
|
|
9656
|
-
}
|
|
9655
|
+
: defaultColor || theme.palette.elementDeep,
|
|
9656
|
+
},
|
|
9657
9657
|
];
|
|
9658
9658
|
});
|
|
9659
9659
|
}, [defaultColor, hasDefinedColors, primaryColor, selectedRange, theme.palette.elementDeep, theme.palette.primary]);
|
|
@@ -9681,8 +9681,8 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9681
9681
|
[filterName]: {
|
|
9682
9682
|
value: valueRange,
|
|
9683
9683
|
min: valueRange[0],
|
|
9684
|
-
max: valueRange[1]
|
|
9685
|
-
}
|
|
9684
|
+
max: valueRange[1],
|
|
9685
|
+
},
|
|
9686
9686
|
}, configFilter?.resetFilters);
|
|
9687
9687
|
}, [changeFilters, configFilter?.resetFilters, filterName, getValueRange]);
|
|
9688
9688
|
const prevDisabled = useMemo(() => loading || !selectedPixels || selectedPixels?.[0] - barFullWidth < 0, [barFullWidth, loading, selectedPixels]);
|
|
@@ -9740,7 +9740,7 @@ const useBarChartFilter = ({ type, filter, elementConfig }) => {
|
|
|
9740
9740
|
onPrev,
|
|
9741
9741
|
onNext,
|
|
9742
9742
|
onSelect,
|
|
9743
|
-
onBarClick
|
|
9743
|
+
onBarClick,
|
|
9744
9744
|
};
|
|
9745
9745
|
};
|
|
9746
9746
|
const BarChartFilter = ({ type, config, elementConfig, filter }) => {
|
|
@@ -9748,7 +9748,7 @@ const BarChartFilter = ({ type, config, elementConfig, filter }) => {
|
|
|
9748
9748
|
const { configFilters, loading, height, data, barWidth, barHeight, attributeValue, padding, selectedRange, prevDisabled, nextDisabled, onPrev, onNext, ...rest } = useBarChartFilter({
|
|
9749
9749
|
type,
|
|
9750
9750
|
elementConfig,
|
|
9751
|
-
filter
|
|
9751
|
+
filter,
|
|
9752
9752
|
});
|
|
9753
9753
|
const renderSelectedRange = useMemo(() => {
|
|
9754
9754
|
if (!selectedRange)
|
|
@@ -10512,7 +10512,7 @@ const useChartData = ({ element, type }) => {
|
|
|
10512
10512
|
relatedConfig: relatedAxis,
|
|
10513
10513
|
dataSource: featureDataSource,
|
|
10514
10514
|
layerInfo: layerInfo ||
|
|
10515
|
-
{ layerDefinition: { attributes: featureDataSource.attributeDefinition } }
|
|
10515
|
+
{ layerDefinition: { attributes: featureDataSource.attributeDefinition } },
|
|
10516
10516
|
})
|
|
10517
10517
|
: null,
|
|
10518
10518
|
color: axisColor,
|
|
@@ -10531,8 +10531,8 @@ const useChartData = ({ element, type }) => {
|
|
|
10531
10531
|
attributeName: null,
|
|
10532
10532
|
attributeUnits: null,
|
|
10533
10533
|
dataSourceName: null,
|
|
10534
|
-
color: null
|
|
10535
|
-
}
|
|
10534
|
+
color: null,
|
|
10535
|
+
},
|
|
10536
10536
|
];
|
|
10537
10537
|
}, [
|
|
10538
10538
|
currentPage?.dataSources,
|
|
@@ -10542,7 +10542,7 @@ const useChartData = ({ element, type }) => {
|
|
|
10542
10542
|
t,
|
|
10543
10543
|
attributes,
|
|
10544
10544
|
layerInfos,
|
|
10545
|
-
dataSources
|
|
10545
|
+
dataSources,
|
|
10546
10546
|
]);
|
|
10547
10547
|
const [data, setData] = useState(fetchedData);
|
|
10548
10548
|
useEffect(() => {
|
|
@@ -9,16 +9,6 @@ export type FeatureAttribute = {
|
|
|
9
9
|
value?: FeatureAttributeValue;
|
|
10
10
|
render?: ReactNode;
|
|
11
11
|
} & LayerAttribute;
|
|
12
|
-
export declare const enum AttributeValueType {
|
|
13
|
-
String = 0,
|
|
14
|
-
Phone = 1,
|
|
15
|
-
Url = 2,
|
|
16
|
-
Mail = 3
|
|
17
|
-
}
|
|
18
|
-
export type AttributeValue = {
|
|
19
|
-
value: string;
|
|
20
|
-
type: AttributeValueType;
|
|
21
|
-
};
|
|
22
12
|
export interface JSONAttributeValue {
|
|
23
13
|
link: string;
|
|
24
14
|
isExternal: boolean;
|
package/dist/types/layer.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { ProxyServiceInfoDc,
|
|
1
|
+
import { ProxyServiceInfoDc, ServiceInfoDc } from '@evergis/api';
|
|
2
2
|
export type ProxyServiceInfo = Required<Omit<ProxyServiceInfoDc, keyof ServiceInfoDc>>;
|
|
3
|
-
export type LayerInfo = QueryLayerServiceInfoDc;
|
|
4
3
|
export declare enum EditGeometryType {
|
|
5
4
|
Raster = "raster"
|
|
6
5
|
}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "3.1.129-alpha.
|
|
2
|
+
"version": "3.1.129-alpha.3",
|
|
3
3
|
"name": "@evergis/react",
|
|
4
4
|
"author": "Everpoint",
|
|
5
5
|
"license": "MIT",
|
|
@@ -54,10 +54,10 @@
|
|
|
54
54
|
"storybook": "^7.6.14"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@evergis/api": "^4.1.56-alpha.
|
|
57
|
+
"@evergis/api": "^4.1.56-alpha.3",
|
|
58
58
|
"@evergis/charts": "^3.1.52",
|
|
59
59
|
"@evergis/color": "^1.0.0-alpha.1",
|
|
60
|
-
"@evergis/uilib-gl": "^1.0.
|
|
60
|
+
"@evergis/uilib-gl": "^1.0.83",
|
|
61
61
|
"@mapbox/mapbox-gl-draw": "^1.5.0",
|
|
62
62
|
"@microsoft/signalr": "^8.0.7",
|
|
63
63
|
"@svgdotjs/svg.js": "^3.1.2",
|
|
@@ -87,5 +87,5 @@
|
|
|
87
87
|
"uuid": "^13.0.0",
|
|
88
88
|
"wkt": "^0.1.1"
|
|
89
89
|
},
|
|
90
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "01ef957006b5753b413a5c525ce21df4b3e03a79"
|
|
91
91
|
}
|