@evergis/react 4.0.28 → 4.0.30

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

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { ContainerProps } from '../../types';
+export declare const ElementLayerName: FC<ContainerProps>;

package/dist/components/Dashboard/elements/registry.d.ts

@@ -16,4 +16,5 @@ export declare const elementComponents: {
     readonly markdown: import('react').FC<import('..').ContainerProps>;
     readonly uploader: import('react').FC<import('..').ContainerProps>;
     readonly modal: import('react').FC<import('..').ContainerProps>;
+    readonly layerName: import('react').FC<import('..').ContainerProps>;
 };

package/dist/index.js

@@ -4443,6 +4443,10 @@ const applyQueryFilters = ({ parameters: configParameters, filters: configFilter
             return result;
         }
         if (typeof configParameters[key] === "string" && configParameters[key].includes("{") && attributes?.length) {
+            const exactAttr = attributes.find(({ attributeName }) => configParameters[key] === `{${attributeName}}`);
+            if (exactAttr) {
+                return { ...result, [key]: exactAttr.value ?? "" };
+            }
             let interpolated = configParameters[key];
             attributes.forEach(({ attributeName, value: attrValue }) => {
                 interpolated = interpolated.replace(new RegExp(`\\{${attributeName}\\}`, "g"), attrValue?.toString() ?? "");
@@ -9391,6 +9395,13 @@ const ElementModal = React.memo(({ type = exports.WidgetType.Dashboard, elementC
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalIcon, { kind: icon || "new_window", onClick: handleOpen }), jsxRuntime.jsxs(uilibGl.Dialog, { isOpen: isOpen, onCloseRequest: handleClose, modal: true, maxWidth: maxWidth, minWidth: minWidth, minHeight: minHeight, style: { paddingBottom: "2rem" }, children: [jsxRuntime.jsx(uilibGl.DialogTitle, { children: jsxRuntime.jsxs(uilibGl.Flex, { justifyContent: "space-between", alignItems: "center", children: [!!title && jsxRuntime.jsx("span", { children: title }), jsxRuntime.jsx(uilibGl.IconButton, { kind: "close", onClick: handleClose })] }) }), jsxRuntime.jsx(uilibGl.DialogContent, { children: isLoading ? (jsxRuntime.jsx(DashboardLoading, {})) : (jsxRuntime.jsx(Container, { isColumn: true, noBorders: true, children: jsxRuntime.jsx(ContainerChildren, { type: type, items: modalContent, isMain: true, renderElement: renderElement }) })) })] })] }));
 });
 
+const ElementLayerName = React.memo(({ type }) => {
+    const { layerInfo } = useWidgetContext(type);
+    if (!layerInfo?.name)
+        return null;
+    return jsxRuntime.jsx("span", { children: layerInfo.name });
+});
+
 const elementComponents = {
     control: ElementControl,
     image: ElementImage,
@@ -9407,6 +9418,7 @@ const elementComponents = {
     markdown: ElementMarkdown,
     uploader: ElementUploader,
     modal: ElementModal,
+    layerName: ElementLayerName,
 };
 
 const getElementValue = ({ getDefaultContainer, ...props }) => {
@@ -9468,7 +9480,7 @@ function getFeatureAttributes(feature = {}, layer, dataSource) {
         const isIdAttribute = attributeName === idAttribute;
         const additionalProps = isIdAttribute
             ? {
-                value: idValue,
+                value: currentAttributes?.[attributeName] ?? idValue,
                 readOnly: true,
             }
             : {