@evergis/react 3.1.23 → 3.1.24

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

@@ -1,5 +1,6 @@
 import { WidgetType } from '../types';
 export declare const useWidgetContext: (type?: WidgetType) => {
+    config: import('../types').ConfigContainer;
     projectInfo: import('@evergis/api').ExtendedProjectInfoDc;
     layerInfos: import('../../..').LayerInfo[];
     updateProject: (projectInfo: import('@evergis/api').ExtendedProjectInfoDc) => void;
@@ -13,10 +14,10 @@ export declare const useWidgetContext: (type?: WidgetType) => {
     feature: import('../../..').SelectedFeature;
     closeFeatureCard: VoidFunction;
     components: {
-        LayerItem: import('react').FC<import('../..').LayerItemProps>;
-        ProjectCatalogMenu: import('react').FC;
-        ProjectPanelMenu: import('react').FC;
-        ProjectPagesMenu: import('react').FC;
+        LayerItem?: import('react').FC<import('../..').LayerItemProps>;
+        ProjectCatalogMenu?: import('react').FC;
+        ProjectPanelMenu?: import('react').FC;
+        ProjectPagesMenu?: import('react').FC;
     };
     isLoading: boolean;
     pageIndex: number;

package/dist/components/Dashboard/utils/getLayerInfo.d.ts

@@ -0,0 +1,8 @@
+import { ProxyServiceInfoDc, ServiceInfoDc } from '@evergis/api';
+import { LayerInfo, ProxyServiceInfo } from '../../../types';
+export declare const isCompositeLayerConfiguration: (value?: unknown) => value is ServiceInfoDc;
+export declare const isProxyService: (value?: unknown) => value is ProxyServiceInfoDc;
+export declare const getProxyService: (layer?: ServiceInfoDc) => ProxyServiceInfo;
+export declare function getLayerInfo(layer?: ServiceInfoDc & {
+    type?: string;
+}): LayerInfo;

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

@@ -32,6 +32,7 @@ export * from './getFilterSelectedItems';
 export * from './getFilterValue';
 export * from './getFormattedAttributes';
 export * from './getLayerDefinition';
+export * from './getLayerInfo';
 export * from './getLayerInfoFromDataSources';
 export * from './getPagesFromConfig';
 export * from './getPagesFromProjectInfo';

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

@@ -1,30 +1,31 @@
 import { FC, PropsWithChildren } from 'react';
 import { ExtendedProjectInfoDc } from '@evergis/api';
-import { DashboardLayerPayload, DashboardState, LayerItemProps, SelectedFilters, WidgetDataSource } from '../../components';
+import { ConfigContainer, DashboardLayerPayload, DashboardState, LayerItemProps, SelectedFilters, WidgetDataSource } from '../../components';
 import { LayerInfo } from '../../types';
 export type DashboardContextProps = PropsWithChildren<{
-    projectInfo: ExtendedProjectInfoDc;
-    updateProject: (projectInfo: ExtendedProjectInfoDc) => void;
-    pageIndex: number;
-    layerInfos: LayerInfo[];
-    dataSources: WidgetDataSource[];
-    geometryFilter: boolean;
-    loading: boolean;
-    filters: SelectedFilters;
-    dashboardLayers: DashboardState["layers"];
-    setDashboardLayer: (props: DashboardLayerPayload) => void;
-    selectedTabId: string;
-    components: {
-        LayerItem: FC<LayerItemProps>;
-        ProjectCatalogMenu: FC;
-        ProjectPanelMenu: FC;
-        ProjectPagesMenu: FC;
+    config?: ConfigContainer;
+    projectInfo?: ExtendedProjectInfoDc;
+    updateProject?: (projectInfo: ExtendedProjectInfoDc) => void;
+    pageIndex?: number;
+    layerInfos?: LayerInfo[];
+    dataSources?: WidgetDataSource[];
+    geometryFilter?: boolean;
+    loading?: boolean;
+    filters?: SelectedFilters;
+    dashboardLayers?: DashboardState["layers"];
+    setDashboardLayer?: (props: DashboardLayerPayload) => void;
+    selectedTabId?: string;
+    components?: {
+        LayerItem?: FC<LayerItemProps>;
+        ProjectCatalogMenu?: FC;
+        ProjectPanelMenu?: FC;
+        ProjectPagesMenu?: FC;
     };
-    changeFilters: (filters: SelectedFilters, resetFilters?: string[]) => void;
-    expandedContainers: Record<string, boolean>;
-    expandContainer: (id: string, expanded?: boolean) => void;
-    setSelectedTabId: (tab: string) => void;
-    nextPage: (total: number) => void;
-    prevPage: (total: number) => void;
-    changePage: (pageIndex: number) => void;
+    changeFilters?: (filters: SelectedFilters, resetFilters?: string[]) => void;
+    expandedContainers?: Record<string, boolean>;
+    expandContainer?: (id: string, expanded?: boolean) => void;
+    setSelectedTabId?: (tab: string) => void;
+    nextPage?: (total: number) => void;
+    prevPage?: (total: number) => void;
+    changePage?: (pageIndex: number) => void;
 }>;

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

@@ -2,9 +2,9 @@ import { PropsWithChildren } from 'react';
 import { i18n } from 'i18next';
 import { Api } from '@evergis/api';
 export type GlobalContextProps = PropsWithChildren<{
-    t: i18n["t"];
-    language: string;
-    ewktGeometry: string;
-    themeName: string;
-    api: Api;
+    t?: i18n["t"];
+    language?: string;
+    ewktGeometry?: string;
+    themeName?: string;
+    api?: Api;
 }>;

package/dist/contexts/index.d.ts

@@ -1,4 +1,3 @@
-export * from './ConfigContext';
 export * from './DashboardContext';
 export * from './FeatureCardContext';
 export * from './GlobalContext';

package/dist/index.js

@@ -3798,11 +3798,6 @@ const isLayerService = (value) => isObject(value) && "name" in value;
 
 const isNumeric = (number) => !isNaN(parseFloat(number)) && isFinite(number);
 
-const ConfigContext = React.createContext({});
-const ConfigProvider = React.memo(({ children, config }) => {
-    return jsxRuntime.jsx(ConfigContext.Provider, { value: { config }, children: children });
-});
-
 const DashboardContext = React.createContext({});
 const DashboardProvider = React.memo(({ children, ...props }) => {
     return jsxRuntime.jsx(DashboardContext.Provider, { value: props, children: children });
@@ -3916,9 +3911,10 @@ const ServerNotificationsProvider = ({ url, initialized, children }) => {
 };
 
 const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
-    const { projectInfo, updateProject, layerInfos, geometryFilter, dashboardLayers, setDashboardLayer, components: dashboardComponents, 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 { config, projectInfo, updateProject, layerInfos, geometryFilter, dashboardLayers, setDashboardLayer, components: dashboardComponents, 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, 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) || {};
     return {
+        config,
         projectInfo,
         layerInfos,
         updateProject,
@@ -3931,7 +3927,7 @@ const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
         closeFeatureCard,
         components: dashboardComponents,
         isLoading: type === exports.WidgetType.Dashboard ? projectLoading : featureLoading,
-        pageIndex: type === exports.WidgetType.Dashboard ? projectPageIndex : featurePageIndex,
+        pageIndex: type === exports.WidgetType.Dashboard ? projectPageIndex || 1 : featurePageIndex || 1,
         filters: type === exports.WidgetType.Dashboard ? projectFilters : featureFilters,
         changeFilters: type === exports.WidgetType.Dashboard ? projectChangeFilters : featureChangeFilters,
         dataSources: type === exports.WidgetType.Dashboard ? projectDataSources : featureDataSources,
@@ -5957,7 +5953,7 @@ const ChartContainer = React.memo(({ elementConfig, isVisible, type, renderEleme
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && (jsxRuntime.jsxs(Container, { isColumn: true, children: [aliasElement && jsxRuntime.jsx(ContainerAlias, { hasBottomMargin: true, children: renderElement({ id: "alias" }) }), jsxRuntime.jsx(ContainerValue, { column: !twoColumns, alignItems: "center", children: hasItems ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ContainerChart, { children: renderElement({ id: "chart" }) }), jsxRuntime.jsx(ContainerLegend, { children: renderElement({ id: "legend" }) })] })) : (jsxRuntime.jsx(jsxRuntime.Fragment, { children: "\u2014" })) })] }))] }));
 });
 
-const PagesContainer = React.memo(({ type }) => {
+const PagesContainer = React.memo(({ type = exports.WidgetType.Dashboard }) => {
     const { config } = useWidgetConfig(type);
     const { pageIndex, currentPage } = useWidgetPage(type);
     const { selectedTabId, setSelectedTabId, expandedContainers, attributes } = useWidgetContext(type);
@@ -8427,6 +8423,56 @@ const getFormattedAttributes = (t, data, attributes, config) => {
         : attributes;
 };
 
+const isCompositeLayerConfiguration = (value) => isObject(value) && "name" in value;
+const isProxyService = (value) => isLayerService(value) && ("sourceType" in value || value.type === "RemoteTileService");
+const getProxyService = (layer) => {
+    if (!isProxyService(layer))
+        return {
+            layers: [],
+            sourceType: "",
+            sourceUrl: "",
+            copyrightText: "",
+            legend: {
+                layers: [],
+            },
+        };
+    const { layers, sourceType, sourceUrl, legend, copyrightText } = layer;
+    return {
+        layers: layers || [],
+        copyrightText: copyrightText || "",
+        sourceUrl: sourceUrl || "",
+        sourceType: sourceType || "",
+        legend: {
+            layers: (legend && legend.layers) || [],
+        },
+    };
+};
+function getLayerInfo(layer) {
+    const configuration = layer?.configuration ?? {};
+    const attributesConfiguration = getAttributesConfiguration(layer);
+    const layerDefinition = getLayerDefinition(layer);
+    const configLayers = ("layers" in configuration && configuration.layers) || [];
+    return {
+        type: layer?.type,
+        ...(layer || {}),
+        name: layer?.name || "",
+        configuration: {
+            ...configuration,
+            layers: configLayers.filter(isCompositeLayerConfiguration),
+            attributesConfiguration,
+        },
+        acl: configuration.acl,
+        condition: ("condition" in configuration && configuration.condition) || undefined,
+        tableName: attributesConfiguration.tableName,
+        idAttribute: attributesConfiguration.idAttribute,
+        titleAttribute: layerDefinition.titleAttribute || attributesConfiguration.titleAttribute,
+        geometryAttribute: attributesConfiguration.geometryAttribute,
+        layerAttributes: attributesConfiguration.attributes,
+        srId: layerDefinition.srId,
+        proxy: getProxyService(layer),
+    };
+}
+
 const getLayerInfoFromDataSources = (layerInfos, dataSources, relatedDataSource) => layerInfos?.find(({ name }) => name === dataSources?.find(item => item.name === relatedDataSource)?.layerName);
 
 const getPagesFromConfig = (config) => config?.children?.[0]?.children;
@@ -8612,8 +8658,7 @@ const tooltipValueFromRelatedFeatures = (t, value, relatedAttributes, layerInfo)
 };
 
 const useWidgetConfig = (type = exports.WidgetType.Dashboard) => {
-    const { config: configProp } = React.useContext(ConfigContext);
-    const { projectInfo, layerInfo } = useWidgetContext(type);
+    const { config: configProp, projectInfo, layerInfo } = useWidgetContext(type);
     const config = React.useMemo(() => {
         if (configProp) {
             return configProp;
@@ -9367,13 +9412,13 @@ const DashboardLoading = React.memo(() => {
 
 const Dashboard = React.memo(({ type = exports.WidgetType.Dashboard, config }) => {
     const { dataSources, isLoading } = useWidgetContext(type);
-    const { currentPage } = useWidgetPage();
+    const { currentPage } = useWidgetPage(type);
     const isDiffPage = useDiffPage(type);
-    const dataSourceLoading = React.useMemo(() => currentPage?.dataSources?.length && !dataSources?.length && isLoading, [currentPage?.dataSources?.length, dataSources?.length, isLoading]);
+    const dataSourceLoading = React.useMemo(() => !!currentPage?.dataSources?.length && !dataSources?.length && isLoading, [currentPage?.dataSources?.length, dataSources?.length, isLoading]);
     if (dataSourceLoading || isDiffPage) {
         return (jsxRuntime.jsx(DashboardLoading, {}));
     }
-    return (jsxRuntime.jsx(ConfigProvider, { config: config, children: jsxRuntime.jsx(PagesContainer, { type: type }) }));
+    return (jsxRuntime.jsx(PagesContainer, { type: type }));
 });
 
 const CardCheckbox = styled(uilibGl.Checkbox) `
@@ -9856,8 +9901,6 @@ exports.Chart = Chart;
 exports.ChartContainer = ChartContainer;
 exports.ChartLegend = ChartLegend;
 exports.ChartLoading = ChartLoading;
-exports.ConfigContext = ConfigContext;
-exports.ConfigProvider = ConfigProvider;
 exports.ContainerChildren = ContainerChildren;
 exports.ContainerLoading = ContainerLoading;
 exports.ContainerWrapper = ContainerWrapper;
@@ -10040,9 +10083,11 @@ exports.getFilterValue = getFilterValue;
 exports.getFormattedAttributes = getFormattedAttributes;
 exports.getGradientColors = getGradientColors;
 exports.getLayerDefinition = getLayerDefinition;
+exports.getLayerInfo = getLayerInfo;
 exports.getLayerInfoFromDataSources = getLayerInfoFromDataSources;
 exports.getPagesFromConfig = getPagesFromConfig;
 exports.getPagesFromProjectInfo = getPagesFromProjectInfo;
+exports.getProxyService = getProxyService;
 exports.getRelatedAttribute = getRelatedAttribute;
 exports.getRenderElement = getRenderElement;
 exports.getResourceUrl = getResourceUrl;
@@ -10052,6 +10097,7 @@ exports.getSvgUrl = getSvgUrl;
 exports.getTotalFromAttributes = getTotalFromAttributes;
 exports.getTotalFromRelatedFeatures = getTotalFromRelatedFeatures;
 exports.hexToRgba = hexToRgba;
+exports.isCompositeLayerConfiguration = isCompositeLayerConfiguration;
 exports.isEmptyElementValue = isEmptyElementValue;
 exports.isEmptyValue = isEmptyValue;
 exports.isHiddenEmptyValue = isHiddenEmptyValue;
@@ -10059,6 +10105,7 @@ exports.isLayerService = isLayerService;
 exports.isNotValidSelectedTab = isNotValidSelectedTab;
 exports.isNumeric = isNumeric;
 exports.isObject = isObject;
+exports.isProxyService = isProxyService;
 exports.isVisibleContainer = isVisibleContainer;
 exports.numberOptions = numberOptions;
 exports.parseClientStyle = parseClientStyle;