@evergis/react 3.1.18 → 3.1.19

package/dist/components/Dashboard/components/SvgImage/styled.d.ts

@@ -1,4 +1,4 @@
-export declare const StyledSvg: import('styled-components').StyledComponent<"div", any, {
+export declare const StyledSvg: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps & {
     $width?: number;
     $height?: number;
     $fontColor?: string;

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

@@ -1,5 +1,6 @@
+import { i18n } from 'i18next';
 export declare const useGlobalContext: () => {
-    t: import('i18next').TFunction<["translation", ...string[]], undefined>;
+    t: i18n["t"];
     language: string;
     themeName: string;
     api: import('@evergis/api').Api;

package/dist/index.js

@@ -3946,13 +3946,18 @@ const useWidgetContext = (type = exports.WidgetType.Dashboard) => {
 
 const useGlobalContext = () => {
     const { t, language, themeName, api, ewktGeometry } = React.useContext(GlobalContext) || {};
+    const translate = React.useCallback((value, options) => {
+        if (t)
+            return t(value, options);
+        return options?.defaultValue ?? value;
+    }, [t]);
     return React.useMemo(() => ({
-        t,
+        t: translate,
         language,
         themeName,
         api,
         ewktGeometry,
-    }), [language, t, api, ewktGeometry, themeName]);
+    }), [language, translate, api, ewktGeometry, themeName]);
 };
 
 const HEIGHT_OFFSET = 20;
@@ -5670,7 +5675,7 @@ const DataSourceProgressContainer = React.memo(({ config, elementConfig, type, i
         return jsxRuntime.jsx(DataSourceError, { name: elementConfig.templateName });
     }
     const isVisible = isVisibleContainer(id, expandable, expanded, expandedContainers);
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), !isVisible ? null : dataSource ? (jsxRuntime.jsxs(DataSourceProgressContainerWrapper, { children: [sliceItems(dataSource?.features)?.map((feature, index) => (jsxRuntime.jsx(DataSourceInnerContainer, { type: type, index: index, feature: feature, config: config, elementConfig: elementConfig, maxValue: currentMaxValue, innerComponent: innerComponent }, index))), checkIsSliced(dataSource?.features) && (jsxRuntime.jsx(ContainerToggler, { toggled: showMore, onClick: onShowMore, children: showMore ? t("hide", { ns: "dashboard" }) : t("showAll", { ns: "dashboard" }) })), showTotal && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(uilibGl.Divider, {}), jsxRuntime.jsxs(ProgressTotal, { children: [jsxRuntime.jsx(ProgressTotalTitle, { children: t("total", { ns: "dashboard" }) }), jsxRuntime.jsxs(ProgressValue, { children: [totalValue, jsxRuntime.jsx(ProgressUnits, { children: totalUnits })] })] })] }))] })) : (jsxRuntime.jsx(ContainerLoading, {})), jsxRuntime.jsx(HiddenTitleItems, { elementConfig: elementConfig, config: config, type: type })] }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), !isVisible ? null : dataSource ? (jsxRuntime.jsxs(DataSourceProgressContainerWrapper, { children: [sliceItems(dataSource?.features)?.map((feature, index) => (jsxRuntime.jsx(DataSourceInnerContainer, { type: type, index: index, feature: feature, config: config, elementConfig: elementConfig, maxValue: currentMaxValue, innerComponent: innerComponent }, index))), checkIsSliced(dataSource?.features) && (jsxRuntime.jsx(ContainerToggler, { toggled: showMore, onClick: onShowMore, children: showMore ? t("hide", { ns: "dashboard", defaultValue: "Свернуть" }) : t("showAll", { ns: "dashboard", defaultValue: "Показать все" }) })), showTotal && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(uilibGl.Divider, {}), jsxRuntime.jsxs(ProgressTotal, { children: [jsxRuntime.jsx(ProgressTotalTitle, { children: t("total", { ns: "dashboard", defaultValue: "Итого" }) }), jsxRuntime.jsxs(ProgressValue, { children: [totalValue, jsxRuntime.jsx(ProgressUnits, { children: totalUnits })] })] })] }))] })) : (jsxRuntime.jsx(ContainerLoading, {})), jsxRuntime.jsx(HiddenTitleItems, { elementConfig: elementConfig, config: config, type: type })] }));
 });
 
 const ProgressContainer = React.memo(({ type, elementConfig, feature, maxValue, index, renderElement }) => {
@@ -5705,7 +5710,7 @@ const ProgressContainer = React.memo(({ type, elementConfig, feature, maxValue,
         id: "icon",
         wrap: false
     }), [renderElement]);
-    const renderTooltip = React.useMemo(() => (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ProgressTooltipAlias, { children: renderTooltipAlias }), jsxRuntime.jsxs(ProgressTooltipValueContainer, { children: [jsxRuntime.jsx(ProgressTooltipValue, { children: renderTooltipValue }), jsxRuntime.jsx(ProgressTooltipValueOf, { children: t("of", { ns: "dashboard" }) }), jsxRuntime.jsx("div", { children: formatAttributeValue({ t, type: valueType, value: currentMaxValue, stringFormat }) })] })] })), [currentMaxValue, renderTooltipAlias, renderTooltipValue, stringFormat, t, valueType]);
+    const renderTooltip = React.useMemo(() => (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ProgressTooltipAlias, { children: renderTooltipAlias }), jsxRuntime.jsxs(ProgressTooltipValueContainer, { children: [jsxRuntime.jsx(ProgressTooltipValue, { children: renderTooltipValue }), jsxRuntime.jsx(ProgressTooltipValueOf, { children: t("of", { ns: "dashboard", defaultValue: "из" }) }), jsxRuntime.jsx("div", { children: formatAttributeValue({ t, type: valueType, value: currentMaxValue, stringFormat }) })] })] })), [currentMaxValue, renderTooltipAlias, renderTooltipValue, stringFormat, t, valueType]);
     const color = React.useMemo(() => colorAttribute
         ? attributes?.find(({ name }) => name === colorAttribute)?.value
         : colors?.[index] || bgColor, [attributes, bgColor, colorAttribute, colors, index]);
@@ -6759,7 +6764,7 @@ const HeaderTitle = ({ noFeature }) => {
             })) ||
             feature?.id);
     }, [attributes, feature, layerDefinition]);
-    return (jsxRuntime.jsxs(HeaderTitleContainer, { children: [noFeature ? (jsxRuntime.jsx(FeatureTitleContainer, { children: t("noObjectFound", { ns: "dashboard" }) })) : (jsxRuntime.jsx(FeatureTitleContainer, { clickable: true, children: jsxRuntime.jsx(uilibGl.Tooltip, { arrow: true, placement: "top", content: t("zoomToFeature", { ns: "dashboard" }), delay: [600, 0], children: ref => (jsxRuntime.jsx(uilibGl.FlexSpan, { ref: ref, onClick: () => zoomToFeatures([feature]), children: resultTitle })) }) })), jsxRuntime.jsx(LayerDescription, { title: resultDescription, children: resultDescription })] }));
+    return (jsxRuntime.jsxs(HeaderTitleContainer, { children: [noFeature ? (jsxRuntime.jsx(FeatureTitleContainer, { children: t("noObjectFound", { ns: "dashboard", defaultValue: "Объектов не найдено" }) })) : (jsxRuntime.jsx(FeatureTitleContainer, { clickable: true, children: jsxRuntime.jsx(uilibGl.Tooltip, { arrow: true, placement: "top", content: t("zoomToFeature", { ns: "dashboard", defaultValue: "Приблизить к объекту" }), delay: [600, 0], children: ref => (jsxRuntime.jsx(uilibGl.FlexSpan, { ref: ref, onClick: () => zoomToFeatures([feature]), children: resultTitle })) }) })), jsxRuntime.jsx(LayerDescription, { title: resultDescription, children: resultDescription })] }));
 };
 
 const LayerIconContainer = styled.div `
@@ -7169,7 +7174,7 @@ const SmallPreview = ({ images, totalCount, currentIndex, isLoading, setCurrentI
             onNextPage();
         }
     }, [currentIndex, images, isNextDisabled, onNextPage, setCurrentIndex]);
-    return (jsxRuntime.jsxs(SmallPreviewContainer$1, { currentIndex: currentIndex + 1, prevIndex: prevIndex + 1, children: [isLoading && jsxRuntime.jsx(uilibGl.LinearProgress, {}), images.length > 1 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(SmallPreviewLeft, { "$isDisabled": isPrevDisabled, onClick: prev }), jsxRuntime.jsx(SmallPreviewRight, { "$isDisabled": isNextDisabled, onClick: next }), jsxRuntime.jsx(SmallPreviewCounter, { children: jsxRuntime.jsxs("div", { children: [currentIndex + 1, " ", t("of", { ns: "dashboard" }), " ", total] }) })] })), jsxRuntime.jsx(SmallPreviewImages, { onClick: onClick, children: images.map(image => (jsxRuntime.jsx("img", { src: image.src, alt: "" }, image.src))) })] }));
+    return (jsxRuntime.jsxs(SmallPreviewContainer$1, { currentIndex: currentIndex + 1, prevIndex: prevIndex + 1, children: [isLoading && jsxRuntime.jsx(uilibGl.LinearProgress, {}), images.length > 1 && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(SmallPreviewLeft, { "$isDisabled": isPrevDisabled, onClick: prev }), jsxRuntime.jsx(SmallPreviewRight, { "$isDisabled": isNextDisabled, onClick: next }), jsxRuntime.jsx(SmallPreviewCounter, { children: jsxRuntime.jsxs("div", { children: [currentIndex + 1, " ", t("of", { ns: "dashboard", defaultValue: "из" }), " ", total] }) })] })), jsxRuntime.jsx(SmallPreviewImages, { onClick: onClick, children: images.map(image => (jsxRuntime.jsx("img", { src: image.src, alt: "" }, image.src))) })] }));
 };
 
 const DEFAULT_ARCHIVED_PERIOD = "#24h";
@@ -7438,7 +7443,7 @@ const LocalLink = React.memo(({ link }) => {
         navigator.clipboard.writeText(link);
         toggleOpen();
     }, [link, toggleOpen]);
-    return (jsxRuntime.jsx(uilibGl.Popover, { open: isOpen, zIndex: 10, onRequestClose: toggleOpen, anchorOrigin: "bottom-right", targetOrigin: "top-right", anchor: jsxRuntime.jsx(LocalLinkButton, { onClick: toggleOpen }), children: jsxRuntime.jsxs(LocalLinkBlank, { children: [jsxRuntime.jsx("a", { href: link, target: "_blank", rel: "noreferrer", children: link }), jsxRuntime.jsx(LocalLinkCopy, { children: jsxRuntime.jsx(uilibGl.IconButton, { kind: "copy", onClick: onCopy, children: t("copy", { ns: "dashboard" }) }) })] }) }));
+    return (jsxRuntime.jsx(uilibGl.Popover, { open: isOpen, zIndex: 10, onRequestClose: toggleOpen, anchorOrigin: "bottom-right", targetOrigin: "top-right", anchor: jsxRuntime.jsx(LocalLinkButton, { onClick: toggleOpen }), children: jsxRuntime.jsxs(LocalLinkBlank, { children: [jsxRuntime.jsx("a", { href: link, target: "_blank", rel: "noreferrer", children: link }), jsxRuntime.jsx(LocalLinkCopy, { children: jsxRuntime.jsx(uilibGl.IconButton, { kind: "copy", onClick: onCopy, children: t("copy", { ns: "dashboard", defaultValue: "Копировать" }) }) })] }) }));
 });
 
 const ElementLink = React.memo(({ type, elementConfig }) => {
@@ -7633,7 +7638,7 @@ const getDataFromAttributes = (t, config, attributes) => {
     return [
         ...data?.slice(0, config.options?.otherItems),
         {
-            name: t("other", { ns: "dashboard" }),
+            name: t("other", { ns: "dashboard", defaultValue: "Другое" }),
             color: FEATURE_CARD_OTHER_COLOR,
             value: Number(otherValue)
         }
@@ -7696,7 +7701,7 @@ const getDataFromRelatedFeatures = ({ t, config, filters, relatedConfig, dataSou
     }, []);
     if (isOtherSliced) {
         result.push({
-            name: t("other", { ns: "dashboard" }),
+            name: t("other", { ns: "dashboard", defaultValue: "Другое" }),
             color: FEATURE_CARD_OTHER_COLOR,
             value: Number(otherValue)
         });
@@ -7845,7 +7850,7 @@ const RangeNumberFilter = ({ type, filter }) => {
     const configFilter = getConfigFilter(filterName, configFilters);
     if (!configFilter)
         return null;
-    return (jsxRuntime.jsx(uilibGl.NumberRangeSlider, { value: value, min: minValue, max: maxValue, step: step || 1, sliderWidth: width ? `${width}px` : "17rem", label: label || t("interval", { ns: "dashboard" }), hasReset: true, onChange: setValue }));
+    return (jsxRuntime.jsx(uilibGl.NumberRangeSlider, { value: value, min: minValue, max: maxValue, step: step || 1, sliderWidth: width ? `${width}px` : "17rem", label: label || t("interval", { ns: "dashboard", defaultValue: "Интервал" }), hasReset: true, onChange: setValue }));
 };
 
 const TextFilter = ({ type, filter, config }) => {
@@ -8025,7 +8030,7 @@ const CheckboxFilter = ({ type, filter, elementConfig }) => {
                         });
                         changeFilters({ [filterName]: { value } });
                     } }, optionIndex));
-            }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: showMore ? t("hide", { ns: "dashboard" }) : t("showAll", { ns: "dashboard" }) }))] }));
+            }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: showMore ? t("hide", { ns: "dashboard", defaultValue: "Свернуть" }) : t("showAll", { ns: "dashboard", defaultValue: "Показать все" }) }))] }));
 };
 
 const ChartLoading = ({ column }) => (jsxRuntime.jsx(uilibGl.Flex, { position: "absolute", width: "100%", height: "inherit", children: jsxRuntime.jsx(uilibGl.Flex, { justifyContent: "center", alignContent: "center", alignItems: "center", width: "100%", height: "inherit", marginRight: column || column === undefined ? 0 : "-2rem", children: jsxRuntime.jsx(uilibGl.CircularProgress, { diameter: 1.5, mono: true }) }) }));
@@ -8317,7 +8322,7 @@ const RangeDateFilter = ({ type, filter }) => {
     }, [value]); // eslint-disable-line
     if (!configFilter)
         return null;
-    return (jsxRuntime.jsx(uilibGl.RangeNumberInput, { label: label || t("interval", { ns: "dashboard" }), selectedOption: { range: true }, minDate: getDate(minDate), maxDate: getDate(maxDate), value: [getDate(value[0]), getDate(value[1])], zIndex: 100, prefix: jsxRuntime.jsx(uilibGl.Icon, { kind: "date", disabled: true }), suffix: !isEmpty && !isDefault && jsxRuntime.jsx(StyledIconButton, { kind: "error", onClick: reset }), withTime: withTime, isDate: true, onChange: onChange }));
+    return (jsxRuntime.jsx(uilibGl.RangeNumberInput, { label: label || t("interval", { ns: "dashboard", defaultValue: "Интервал" }), selectedOption: { range: true }, minDate: getDate(minDate), maxDate: getDate(maxDate), value: [getDate(value[0]), getDate(value[1])], zIndex: 100, prefix: jsxRuntime.jsx(uilibGl.Icon, { kind: "date", disabled: true }), suffix: !isEmpty && !isDefault && jsxRuntime.jsx(StyledIconButton, { kind: "error", onClick: reset }), withTime: withTime, isDate: true, onChange: onChange }));
 };
 
 const getFilterComponent = (filterType) => {
@@ -8386,8 +8391,8 @@ const getFormattedAttributes = (t, data, attributes, config) => {
             ...attributes,
             {
                 ...otherAttribute,
-                name: t("other", { ns: "dashboard" }),
-                alias: t("other", { ns: "dashboard" })
+                name: t("other", { ns: "dashboard", defaultValue: "Другое" }),
+                alias: t("other", { ns: "dashboard", defaultValue: "Другое" })
             }
         ]
         : attributes;
@@ -8632,7 +8637,7 @@ const useWidgetPage = (type = exports.WidgetType.Dashboard) => {
         const pages = getPagesFromProjectInfo(newProjectInfo);
         if (!pages)
             return;
-        pages.push(createConfigPage({ pages, defaultTitle: t("page", { ns: "dashboard" }) }));
+        pages.push(createConfigPage({ pages, defaultTitle: t("page", { ns: "dashboard", defaultValue: "Страница" }) }));
         updateProject(newProjectInfo);
         changePage(pages.length);
     }, [changePage, projectInfo, t, updateProject]);
@@ -9290,7 +9295,7 @@ const ChartLegend = ({ data, chartElement, type, twoColumns, loading }) => {
     const showMoreBtn = !!shownItems && data.length > shownItems;
     if (!loading && !data?.length && !!hideEmpty)
         return null;
-    return (jsxRuntime.jsxs(uilibGl.Flex, { flexDirection: "column", opacity: loading ? FILTERED_VALUE_OPACITY / 100 : 1, children: [jsxRuntime.jsx(ChartLegendContainer, { twoColumns: twoColumns, children: sliceItems(data)?.map(({ name, color }, index) => (jsxRuntime.jsxs(ChartLegendItem, { hasAnyFilter: hasAnyFilter, isFiltered: isFiltered(name), onClick: axes?.[0]?.filterName ? () => onFilter(name) : undefined, children: [jsxRuntime.jsx(ChartLegendColor, { color: color }), jsxRuntime.jsx(ChartLegendName, { "$fontColor": fontColor, children: name })] }, index))) }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: t("other", { ns: "dashboard" }) }))] }));
+    return (jsxRuntime.jsxs(uilibGl.Flex, { flexDirection: "column", opacity: loading ? FILTERED_VALUE_OPACITY / 100 : 1, children: [jsxRuntime.jsx(ChartLegendContainer, { twoColumns: twoColumns, children: sliceItems(data)?.map(({ name, color }, index) => (jsxRuntime.jsxs(ChartLegendItem, { hasAnyFilter: hasAnyFilter, isFiltered: isFiltered(name), onClick: axes?.[0]?.filterName ? () => onFilter(name) : undefined, children: [jsxRuntime.jsx(ChartLegendColor, { color: color }), jsxRuntime.jsx(ChartLegendName, { "$fontColor": fontColor, children: name })] }, index))) }), showMoreBtn && (jsxRuntime.jsx(uilibGl.LegendToggler, { onClick: onShowMore, toggled: showMore, children: t("other", { ns: "dashboard", defaultValue: "Другое" }) }))] }));
 };
 
 const ContainerChildren = React.memo(({ items, isColumn, isMain, renderElement }) => {
@@ -9339,7 +9344,7 @@ const DashboardHeader = React.memo(() => {
 
 const DataSourceError = ({ name }) => {
     const { t } = useGlobalContext();
-    return (jsxRuntime.jsxs(DataSourceErrorContainer, { children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "alert" }), jsxRuntime.jsxs("div", { children: [t("block", { ns: "dashboard" }), " \"", name, "\" ", t("isNotLoaded", { ns: "dashboard" })] })] }));
+    return (jsxRuntime.jsxs(DataSourceErrorContainer, { children: [jsxRuntime.jsx(uilibGl.Icon, { kind: "alert" }), jsxRuntime.jsxs("div", { children: [t("block", { ns: "dashboard", defaultValue: "Блок" }), " \"", name, "\" ", t("isNotLoaded", { ns: "dashboard", defaultValue: "не загружен" })] })] }));
 };
 
 const ExpandableTitle = React.memo(({ elementConfig, type, renderElement }) => {
@@ -9394,7 +9399,7 @@ const FeatureCardTitle = ({ title, description }) => {
                 })) ||
             feature?.id);
     }, [attributes, feature?.id, layerDefinition, title, titleAttribute]);
-    return (jsxRuntime.jsxs(HeaderTitleContainer, { children: [jsxRuntime.jsx(FeatureTitleContainer, { clickable: true, children: jsxRuntime.jsx(uilibGl.Tooltip, { arrow: true, placement: "top", content: t("zoomToFeature", { ns: "dashboard" }), delay: [600, 0], children: ref => (jsxRuntime.jsx(uilibGl.FlexSpan, { ref: ref, onClick: () => zoomToFeatures([feature]), children: resultTitle })) }) }), jsxRuntime.jsx(LayerDescription, { title: resultDescription, children: resultDescription })] }));
+    return (jsxRuntime.jsxs(HeaderTitleContainer, { children: [jsxRuntime.jsx(FeatureTitleContainer, { clickable: true, children: jsxRuntime.jsx(uilibGl.Tooltip, { arrow: true, placement: "top", content: t("zoomToFeature", { ns: "dashboard", defaultValue: "Приблизить к объекту" }), delay: [600, 0], children: ref => (jsxRuntime.jsx(uilibGl.FlexSpan, { ref: ref, onClick: () => zoomToFeatures([feature]), children: resultTitle })) }) }), jsxRuntime.jsx(LayerDescription, { title: resultDescription, children: resultDescription })] }));
 };
 
 const HiddenFilters = styled(uilibGl.Flex) `
@@ -9524,7 +9529,8 @@ const StyledSvgColorMixin = styled.css `
     }
   }
 `;
-const StyledSvg = styled.div `
+const StyledSvg = styled(uilibGl.Flex) `
+  align-items: center;
   ${({ $width }) => !!$width && StyledSvgWidthMixin};
   ${({ $height }) => !!$height && StyledSvgHeightMixin};
   ${({ $fontColor }) => !!$fontColor && StyledSvgColorMixin};
@@ -9548,8 +9554,6 @@ const SvgImage = React.memo(({ url, width, height, fontColor }) => {
     React.useEffect(() => () => {
         setSvg(null);
     }, []);
-    // Todo remove the test info
-    console.info("svg", svg);
     const regexp = /<\/svg>\s*$/im;
     if (!regexp.test(svg))
         return null;
@@ -9569,7 +9573,7 @@ const TextTrim = React.memo(({ maxLength, expandable, lineBreak, children }) =>
         return jsxRuntime.jsx(jsxRuntime.Fragment, { children: formatValue(text) });
     const substring = `${text.substring(0, maxLength)}...`;
     if (expandable) {
-        return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [formatValue(expanded ? text : substring), jsxRuntime.jsx(uilibGl.LegendToggler, { toggled: expanded, onClick: toggleExpanded, children: expanded ? t("hide", { ns: "dashboard" }) : t("more", { ns: "dashboard" }) })] }));
+        return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [formatValue(expanded ? text : substring), jsxRuntime.jsx(uilibGl.LegendToggler, { toggled: expanded, onClick: toggleExpanded, children: expanded ? t("hide", { ns: "dashboard", defaultValue: "Свернуть" }) : t("more", { ns: "dashboard", defaultValue: "Подробнее" }) })] }));
     }
     return (jsxRuntime.jsx(uilibGl.Tooltip, { placement: "top", arrow: true, content: text, children: ref => jsxRuntime.jsx("div", { ref: ref, children: formatValue(substring) }) }));
 });