@evergis/react 3.1.81 → 3.1.82

package/dist/components/Dashboard/components/Dashboard/index.d.ts

@@ -1,7 +1,6 @@
 import { FC } from 'react';
-import { ConfigContainer, WidgetType } from '../../types';
+import { WidgetType } from '../../types';
 export declare const Dashboard: FC<{
     type?: WidgetType;
-    config?: ConfigContainer;
     noBorders?: boolean;
 }>;

package/dist/components/Dashboard/hooks/useWidgetConfig.d.ts

@@ -1,6 +1,5 @@
-import { ConfigContainer, ConfigContainerChild, WidgetType } from '../types';
+import { ConfigContainerChild, WidgetType } from '../types';
 export declare const useWidgetConfig: (type?: WidgetType) => {
     config: any;
-    editConfig: ConfigContainer;
     pages: ConfigContainerChild[];
 };

package/dist/components/Dashboard/hooks/useWidgetContext.d.ts

@@ -20,6 +20,7 @@ export declare const useWidgetContext: (type?: WidgetType) => {
         ProjectPagesMenu?: import('react').FC;
     };
     config: import('../types').ConfigContainer;
+    isEditing: boolean;
     isLoading: boolean;
     pageIndex: number;
     filters: import('../types').SelectedFilters;

package/dist/components/Dashboard/types.d.ts

@@ -48,6 +48,7 @@ export interface ConfigOptions {
     relatedResources?: ConfigRelatedResource[];
     statusColors?: Record<RemoteTaskStatus, string>;
     chartType?: "bar" | "line" | "pie" | "stack";
+    controlType?: "dropdown" | "checkbox";
     layerNames?: string[];
     layerName?: string;
     geometryType?: GeometryType | EditGeometryType;

package/dist/contexts/DashboardContext/types.d.ts

@@ -12,6 +12,7 @@ export type DashboardContextProps = PropsWithChildren<{
     dataSources?: WidgetDataSource[];
     geometryFilter?: boolean;
     loading?: boolean;
+    editMode?: boolean;
     filters?: SelectedFilters;
     dashboardLayers?: DashboardState["layers"];
     setDashboardLayer?: (props: DashboardLayerPayload) => void;

package/dist/contexts/FeatureCardContext/types.d.ts

@@ -10,7 +10,7 @@ export type FeatureCardContextSettings = PropsWithChildren<{
     pageIndex?: number;
     handBookReference?: LayerReferenceConfigurationDc;
     isRaster?: boolean;
-    isEditing?: boolean;
+    editMode?: boolean;
     isFeatureEditable?: boolean;
     hasCopyRights?: boolean;
     editOnly?: boolean;

package/dist/index.js

@@ -4003,8 +4003,8 @@ const ServerNotificationsProvider = ({ url, initialized, children }) => {
 };
 
 const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
-    const { projectInfo, updateProject, layerInfos, geometryFilter, dashboardLayers, setDashboardLayer, components: dashboardComponents, config: dashboardConfig, containerIds, pageIndex: projectPageIndex, selectedTabId: projectSelectedTabId, setSelectedTabId: setProjectSelectedTabId, dataSources: projectDataSources, loading: projectLoading, filters: projectFilters, changeFilters: projectChangeFilters, expandContainer: projectExpandContainer, expandedContainers: projectExpandedContainers, nextPage: projectNextPage, prevPage: projectPrevPage, changePage: projectChangePage, } = React.useContext(DashboardContext) || {};
-    const { layerInfo, attributes, feature, closeFeatureCard, config: featureConfig, pageIndex: featurePageIndex, selectedTabId: featureSelectedTabId, setSelectedTabId: setFeatureSelectedTabId, dataSources: featureDataSources, loading: featureLoading, filters: featureFilters, changeFilters: featureChangeFilters, expandContainer: featureExpandContainer, expandedContainers: featureExpandedContainers, nextPage: featureNextPage, prevPage: featurePrevPage, changePage: featureChangePage, } = React.useContext(FeatureCardContext) || {};
+    const { projectInfo, updateProject, layerInfos, geometryFilter, dashboardLayers, setDashboardLayer, components: dashboardComponents, config: dashboardConfig, containerIds, pageIndex: projectPageIndex, selectedTabId: projectSelectedTabId, setSelectedTabId: setProjectSelectedTabId, dataSources: projectDataSources, loading: projectLoading, editMode: projectEditMode, filters: projectFilters, changeFilters: projectChangeFilters, expandContainer: projectExpandContainer, expandedContainers: projectExpandedContainers, nextPage: projectNextPage, prevPage: projectPrevPage, changePage: projectChangePage, } = React.useContext(DashboardContext) || {};
+    const { layerInfo, attributes, feature, closeFeatureCard, config: featureConfig, pageIndex: featurePageIndex, selectedTabId: featureSelectedTabId, setSelectedTabId: setFeatureSelectedTabId, dataSources: featureDataSources, loading: featureLoading, editMode: featureEditMode, filters: featureFilters, changeFilters: featureChangeFilters, expandContainer: featureExpandContainer, expandedContainers: featureExpandedContainers, nextPage: featureNextPage, prevPage: featurePrevPage, changePage: featureChangePage, } = React.useContext(FeatureCardContext) || {};
     return {
         projectInfo,
         layerInfos,
@@ -4019,6 +4019,7 @@ const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
         containerIds,
         components: dashboardComponents,
         config: type === exports.WidgetType.Dashboard ? dashboardConfig : featureConfig,
+        isEditing: type === exports.WidgetType.Dashboard ? projectEditMode : featureEditMode,
         isLoading: type === exports.WidgetType.Dashboard ? projectLoading : featureLoading,
         pageIndex: type === exports.WidgetType.Dashboard ? projectPageIndex || 1 : featurePageIndex || 1,
         filters: type === exports.WidgetType.Dashboard ? projectFilters : featureFilters,
@@ -7771,33 +7772,30 @@ const ElementChips = React.memo(({ type, elementConfig }) => {
 const ElementControl = ({ elementConfig }) => {
     const { t } = useGlobalContext();
     const { dataSources, filters, changeFilters } = useWidgetContext(exports.WidgetType.FeatureCard);
+    const [value, setValue] = React.useState();
     const { options, attributeName } = elementConfig || {};
     const { filterName, relatedDataSource, label, placeholder = t("selectValue", { ns: "dashboard", defaultValue: "Выберите значение" }) } = options || {};
-    // Получаем данные из datasource
     const dataSource = React.useMemo(() => getDataSource(relatedDataSource, dataSources), [relatedDataSource, dataSources]);
-    // Формируем опции для dropdown из features datasource
     const items = React.useMemo(() => {
         if (!dataSource?.features?.length || !attributeName) {
             return [];
         }
-        return dataSource.features.map((feature, index) => ({
-            id: feature.id || index,
-            value: feature.attributes?.[attributeName] || "",
-            label: feature.attributes?.[attributeName] || "",
+        return dataSource.features.map(({ attributes }) => ({
+            value: attributes?.[attributeName] || "",
+            text: attributes?.[attributeName] || "",
         }));
-    }, [dataSource, attributeName]);
-    // Получаем текущее выбранное значение
-    const selectedItem = React.useMemo(() => items.find(opt => opt.value === filters?.[filterName]?.value), [items, filters, filterName]);
-    const handleChange = React.useCallback((option) => {
-        if (changeFilters && filterName) {
-            changeFilters({
+    }, [dataSource?.features, attributeName]);
+    const handleChange = React.useCallback(([option]) => {
+        setValue(option?.value);
+        if (filterName) {
+            changeFilters?.({
                 [filterName]: {
-                    value: option?.value || null,
+                    value: option?.value,
                 },
             });
         }
     }, [changeFilters, filterName]);
-    return (jsxRuntime.jsx(uilibGl.Dropdown, { label: label, options: items, value: selectedItem, onChange: handleChange, width: "100%", placeholder: placeholder }));
+    return (jsxRuntime.jsx(uilibGl.Dropdown, { zIndex: 1000, width: "100%", label: label, options: items, value: filters?.[filterName]?.value ?? value, placeholder: placeholder, onChange: handleChange }));
 };
 
 const StyledIconFontSizeMixin = styled.css `
@@ -9620,11 +9618,16 @@ const tooltipValueFromRelatedFeatures = (t, value, relatedAttributes, layerInfo)
 };
 
 const useWidgetConfig = (type = exports.WidgetType.Dashboard) => {
-    const { config: configProp, containerIds, projectInfo, layerInfo } = useWidgetContext(type);
+    const { config: configProp, containerIds, projectInfo, layerInfo, isEditing } = useWidgetContext(type);
     const config = React.useMemo(() => {
         if (configProp) {
             return configProp;
         }
+        if (isEditing) {
+            return type === exports.WidgetType.Dashboard
+                ? (projectInfo?.content?.editConfiguration || {})
+                : (layerInfo?.configuration?.editConfiguration || {});
+        }
         const currentConfig = type === exports.WidgetType.Dashboard
             ? (projectInfo?.content?.dashboardConfiguration || {})
             : (layerInfo?.configuration?.cardConfiguration || {});
@@ -9640,14 +9643,10 @@ const useWidgetConfig = (type = exports.WidgetType.Dashboard) => {
             return newConfig;
         }
         return currentConfig;
-    }, [configProp, containerIds, layerInfo?.configuration?.cardConfiguration, projectInfo?.content?.dashboardConfiguration, type]);
-    const editConfig = React.useMemo(() => type === exports.WidgetType.Dashboard
-        ? (projectInfo?.content?.editConfiguration || {})
-        : (layerInfo?.configuration?.editConfiguration || {}), []);
+    }, [configProp, containerIds, layerInfo?.configuration?.cardConfiguration, projectInfo?.content?.dashboardConfiguration, type, isEditing]);
     const pages = React.useMemo(() => (getPagesFromConfig(config) || []), [config]);
     return {
         config,
-        editConfig,
         pages,
     };
 };
@@ -10384,20 +10383,17 @@ const Chart = React.memo(({ config, element, elementConfig, type, renderElement
         return (jsxRuntime.jsxs(Tooltip, { children: [jsxRuntime.jsx(ChartTooltipLabel, { children: labels[indexX] }), items
                     .filter(({ value }) => !isEmptyValue(value))
                     ?.map(({ layerName, attributeName, attributeUnits, dataSourceName, value, stroke }, index) => {
-                    const layerInfo = !attributeUnits
-                        ? layerInfos?.find(({ name }) => name === layerName)
-                        : null;
-                    const attribute = !attributeUnits
-                        ? layerInfo?.layerDefinition.attributes[attributeName]
-                        : null;
-                    const dataSource = dataSourceName ? getDataSource(dataSourceName, dataSources) : null;
-                    const dataSourceUnits = !dataSource || !attributeUnits
-                        ? null
-                        : dataSource.features?.[0]?.attributes?.[attributeUnits];
-                    const legendValue = attribute
-                        ? formatAttributeValue({ t, type: attribute.type, value, stringFormat: attribute.stringFormat })
-                        : [value, dataSourceUnits].filter(Boolean).join(" ");
-                    return (jsxRuntime.jsxs(ChartTooltipRow, { children: [jsxRuntime.jsx(ChartLegendColor$1, { "$color": stroke }), jsxRuntime.jsx(ChartLegendValue, { children: legendValue })] }, index));
+                    const layerInfo = layerInfos?.find(({ name }) => name === layerName);
+                    const attribute = layerInfo?.layerDefinition.attributes[attributeName];
+                    const dataSource = getDataSource(dataSourceName, dataSources);
+                    const units = attributeUnits
+                        ? dataSource?.features?.[0]?.attributes?.[attributeUnits]
+                        : attribute?.stringFormat?.unitsLabel;
+                    const formatValue = attribute
+                        ? formatAttributeValue({ t, type: attribute.type, value, stringFormat: attribute.stringFormat, noUnits: true })
+                        : value;
+                    const resultValue = [formatValue, units].filter(Boolean).join(" ");
+                    return (jsxRuntime.jsxs(ChartTooltipRow, { children: [jsxRuntime.jsx(ChartLegendColor$1, { "$color": stroke }), jsxRuntime.jsx(ChartLegendValue, { children: resultValue })] }, index));
                 })] }));
     }, [labels, layerInfos, dataSources, dotSnapping]);
     const markers = React.useMemo(() => getChartMarkers(data[0]?.items, configMarkers, dataSources), [data, dataSources, configMarkers]);
@@ -10543,7 +10539,7 @@ const DashboardLoading = React.memo(() => {
     return (jsxRuntime.jsx(Container, { noBorders: true, children: jsxRuntime.jsx(ContainerWrapper, { "$noMargin": true, children: jsxRuntime.jsx(DashboardWrapper, { children: jsxRuntime.jsx(DashboardPlaceholderWrap, { children: jsxRuntime.jsxs(DashboardPlaceholder, { isLoading: true, children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "dashboard_loading" }), jsxRuntime.jsx(uilibGl.Flex, { width: "8rem", children: jsxRuntime.jsx(uilibGl.LinearProgress, {}) })] }) }) }) }) }));
 });
 
-const Dashboard = React.memo(({ type = exports.WidgetType.Dashboard, config, noBorders }) => {
+const Dashboard = React.memo(({ type = exports.WidgetType.Dashboard, noBorders }) => {
     const { dataSources, isLoading } = useWidgetContext(type);
     const { currentPage } = useWidgetPage(type);
     const isDiffPage = useDiffPage(type);
@@ -10551,7 +10547,7 @@ const Dashboard = React.memo(({ type = exports.WidgetType.Dashboard, config, noB
     if (dataSourceLoading || isDiffPage) {
         return (jsxRuntime.jsx(DashboardLoading, {}));
     }
-    return (jsxRuntime.jsx(PagesContainer, { type: type, config: config, noBorders: noBorders }));
+    return (jsxRuntime.jsx(PagesContainer, { type: type, noBorders: noBorders }));
 });
 
 const CardCheckbox = styled(uilibGl.Checkbox) `