@evergis/react 3.1.74 → 3.1.76

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

@@ -0,0 +1,9 @@
+import { FC, CSSProperties } from 'react';
+import { ITerminalInitOnlyOptions, ITerminalOptions } from '@xterm/xterm';
+export interface TaskLogTerminalProps {
+    log?: string | Record<string, any>;
+    className?: string;
+    styles?: CSSProperties;
+    terminalOptions?: ITerminalOptions & ITerminalInitOnlyOptions;
+}
+export declare const LogTerminal: FC<TaskLogTerminalProps>;

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

@@ -13,6 +13,7 @@ export * from './FeatureCardHeader';
 export * from './FeatureCardTitle';
 export * from './HiddenTitleItems';
 export * from './Loading';
+export * from './LogTerminal';
 export * from './Pagination';
 export * from './Pagination/styled';
 export * from './StackBar';

package/dist/components/Dashboard/elements/ElementLink/LocalLink.d.ts

@@ -1,4 +1,5 @@
-import { FC } from 'react';
+import { CSSProperties, FC } from 'react';
 export declare const LocalLink: FC<{
     link: string;
+    style?: CSSProperties;
 }>;

package/dist/components/Dashboard/elements/ElementLink/styled.d.ts

@@ -1,4 +1,5 @@
 export declare const ExternalLink: import('styled-components').StyledComponent<any, any, any, any>;
+export declare const Link: import('styled-components').StyledComponent<"a", any, {}, never>;
 export declare const LocalLinkBlank: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').IBlankProps, never>;
 export declare const LocalLinkButton: import('styled-components').StyledComponent<any, any, any, any>;
 export declare const LocalLinkCopy: import('styled-components').StyledComponent<"div", any, import('@evergis/uilib-gl').FlexProps, never>;

package/dist/index.js

@@ -24,9 +24,9 @@ require('mapbox-gl/dist/mapbox-gl.css');
 var react = require('swiper/react');
 var ReactMarkdown = require('react-markdown');
 var remarkGfm = require('remark-gfm');
-require('@xterm/xterm/css/xterm.css');
 var xterm = require('@xterm/xterm');
 var addonFit = require('@xterm/addon-fit');
+require('@xterm/xterm/css/xterm.css');
 
 const AddFeatureButton = ({ title, icon = "feature_add" /* , layerName, geometryType*/ }) => {
     // const [, handleAddFeature] = useFeatureCreator(layerName, geometryType);
@@ -5695,8 +5695,8 @@ const TwoColumnContainer = React.memo(({ config, elementConfig, type, renderElem
         const icon = children?.[iconIndex];
         const hasIcon = !!icon;
         const elementChildren = elementConfig?.children?.map(child => ({
-            ...child,
             type: "attributeValue",
+            ...child,
             attributeName: attribute,
             options: { noUnits: hasUnits, ...child.options },
         }));
@@ -6848,121 +6848,6 @@ const StatusBadge = styled(uilibGl.Chip) `
   color: ${({ theme }) => theme.palette.iconContrast};
 `;
 
-const TerminalWrapper = styled.div `
-  flex: 1;
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-  box-sizing: border-box;
-  min-height: 0;
-
-  .xterm-viewport {
-    overflow-y: auto;
-  }
-
-  .xterm-screen .xterm-rows span {
-    letter-spacing: 0 !important;
-  }
-`;
-
-const LogTerminal = ({ log }) => {
-    const terminalRef = React.useRef(null);
-    const xtermRef = React.useRef(null);
-    const fitAddonRef = React.useRef(null);
-    const previousLogRef = React.useRef("");
-    const theme = styled.useTheme();
-    React.useEffect(() => {
-        if (!terminalRef.current)
-            return;
-        // Create terminal instance
-        const terminal = new xterm.Terminal({
-            cursorBlink: false,
-            fontSize: 12,
-            fontFamily: '"Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace',
-            scrollback: 10000,
-            convertEol: true,
-            lineHeight: 1.5,
-            theme: {
-                background: theme.palette.background,
-                foreground: theme.palette.textPrimary,
-                cursor: theme.palette.primary,
-            },
-        });
-        // Create fit addon
-        const fitAddon = new addonFit.FitAddon();
-        terminal.loadAddon(fitAddon);
-        // Open terminal
-        terminal.open(terminalRef.current);
-        fitAddon.fit();
-        // Store refs
-        xtermRef.current = terminal;
-        fitAddonRef.current = fitAddon;
-        // Handle window resize
-        const handleResize = () => {
-            fitAddon.fit();
-        };
-        window.addEventListener("resize", handleResize);
-        // Cleanup
-        return () => {
-            window.removeEventListener("resize", handleResize);
-            terminal.dispose();
-            xtermRef.current = null;
-            fitAddonRef.current = null;
-        };
-    }, [theme]);
-    // Update log content
-    React.useEffect(() => {
-        if (!xtermRef.current)
-            return;
-        // Handle different log types
-        if (typeof log === "string") {
-            // For string logs, only write the new content (append mode)
-            const previousLog = previousLogRef.current;
-            if (log !== previousLog) {
-                if (log.startsWith(previousLog)) {
-                    // Log is accumulated - write only the new part
-                    const newContent = log.substring(previousLog.length);
-                    xtermRef.current.write(newContent);
-                }
-                else {
-                    // Log was replaced completely - clear and write all
-                    xtermRef.current.clear();
-                    xtermRef.current.write(log);
-                }
-                previousLogRef.current = log;
-            }
-        }
-        else if (typeof log === "object") {
-            // JSON object (results) - always replace
-            xtermRef.current.clear();
-            const formatted = JSON.stringify(log, null, 2);
-            xtermRef.current.write(formatted);
-            previousLogRef.current = "";
-        }
-        else if (!log) {
-            // No log - clear terminal
-            xtermRef.current.clear();
-            previousLogRef.current = "";
-        }
-        // Scroll to bottom
-        xtermRef.current.scrollToBottom();
-    }, [log]);
-    React.useEffect(() => {
-        if (!fitAddonRef.current)
-            return;
-        const resizeObserver = new ResizeObserver(() => {
-            fitAddonRef.current?.fit();
-        });
-        if (terminalRef.current) {
-            resizeObserver.observe(terminalRef.current);
-        }
-        return () => {
-            resizeObserver.disconnect();
-        };
-    }, []);
-    return jsxRuntime.jsx(TerminalWrapper, { ref: terminalRef });
-};
-
 const STATUS_TRANSLATION_KEYS = {
     [api.RemoteTaskStatus.Process]: "taskProcess",
     [api.RemoteTaskStatus.Completed]: "taskCompleted",
@@ -7432,7 +7317,7 @@ const FeatureCardGradientHeader = ({ isRow }) => {
 };
 
 const HeaderFontColorMixin = styled.css `
-  ${HeaderTitleContainer}, ${LayerDescription} {
+  ${HeaderTitleContainer}, ${HeaderTitleContainer} *, ${LayerDescription} {
     color: ${({ $fontColor }) => $fontColor};
   }
 `;
@@ -7961,15 +7846,14 @@ const ExternalLink = styled(uilibGl.IconButton).attrs(() => ({
     color: ${({ theme: { palette } }) => palette.primaryDeep};
   }
 `;
-const LocalLinkBlank = styled(uilibGl.Blank) `
-  min-width: 13.5rem;
-  padding: 0.5rem 0.75rem 0;
-
-  a {
+const Link = styled.a `
     text-decoration: none;
     font-size: 0.75rem;
     color: ${({ theme: { palette } }) => palette.primary};
-  }
+`;
+const LocalLinkBlank = styled(uilibGl.Blank) `
+  min-width: 13.5rem;
+  padding: 0.5rem 0.75rem 0;
 
   ${uilibGl.IconButtonButton} {
     font-size: 0.75rem;
@@ -7981,8 +7865,13 @@ const LocalLinkButton = styled(uilibGl.IconButton).attrs(() => ({
   width: 1rem;
   height: 1rem;
   background-color: ${({ theme: { palette } }) => palette.primary};
+  padding: 0;
   border-radius: 50%;
 
+  :hover {
+    background-color: ${({ theme: { palette } }) => palette.primary};
+  }
+  
   span[kind] {
     display: flex;
     justify-content: center;
@@ -7999,23 +7888,30 @@ const LocalLinkCopy = styled(uilibGl.Flex) `
   justify-content: center;
 `;
 
-const LocalLink = React.memo(({ link }) => {
+const LocalLink = React.memo(({ link, style }) => {
     const { t } = useGlobalContext();
     const [isOpen, toggleOpen] = useToggle();
     const onCopy = React.useCallback(() => {
         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", defaultValue: "Копировать" }) }) })] }) }));
+    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(Link, { href: link, target: "_blank", rel: "noreferrer", style: style, 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 }) => {
     const { attributes } = useWidgetContext(type);
-    const attribute = getAttributeByName(elementConfig?.attributeName, attributes);
-    const link = attribute?.value;
-    if (!link || typeof link !== "string")
+    const { options, style } = elementConfig || {};
+    const { simple, title } = options || {};
+    const attribute = React.useMemo(() => getAttributeByName(elementConfig?.attributeName, attributes), [attributes, elementConfig?.attributeName]);
+    const link = React.useMemo(() => getResourceUrl(attribute?.value?.toString()), [attribute?.value]);
+    if (!link)
         return null;
-    return link.startsWith("http") ? jsxRuntime.jsx(ExternalLink, { onClick: () => window.open(link) }) : jsxRuntime.jsx(LocalLink, { link: link });
+    if (simple) {
+        return (jsxRuntime.jsx(Link, { href: link, target: "_blank", rel: "noreferrer", style: style, children: title ?? link }));
+    }
+    return link.startsWith("http")
+        ? jsxRuntime.jsx(ExternalLink, { style: style, onClick: () => window.open(link) })
+        : jsxRuntime.jsx(LocalLink, { style: style, link: link });
 });
 
 const MarkdownWrapper = styled.div `
@@ -10794,6 +10690,122 @@ const HiddenTitleItems = React.memo(({ elementConfig, config, type, filter }) =>
                     getConfigFilter(filterName, configFilters)?.defaultValue, index)) }));
 });
 
+const TerminalWrapper = styled.div `
+  flex: 1;
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+  min-height: 0;
+
+  .xterm-viewport {
+    overflow-y: auto;
+  }
+
+  .xterm-screen .xterm-rows span {
+    letter-spacing: 0 !important;
+  }
+`;
+
+const LogTerminal = ({ log, terminalOptions, className, styles }) => {
+    const terminalRef = React.useRef(null);
+    const xtermRef = React.useRef(null);
+    const fitAddonRef = React.useRef(null);
+    const previousLogRef = React.useRef("");
+    const theme = styled.useTheme();
+    React.useEffect(() => {
+        if (!terminalRef.current)
+            return;
+        // Create terminal instance
+        const terminal = new xterm.Terminal({
+            cursorBlink: false,
+            fontSize: 12,
+            fontFamily: '"Monaco", "Menlo", "Ubuntu Mono", "Consolas", "source-code-pro", monospace',
+            scrollback: 10000,
+            convertEol: true,
+            lineHeight: 1.5,
+            theme: {
+                background: theme.palette.background,
+                foreground: theme.palette.textPrimary,
+                cursor: theme.palette.primary,
+            },
+            ...terminalOptions,
+        });
+        // Create fit addon
+        const fitAddon = new addonFit.FitAddon();
+        terminal.loadAddon(fitAddon);
+        // Open terminal
+        terminal.open(terminalRef.current);
+        fitAddon.fit();
+        // Store refs
+        xtermRef.current = terminal;
+        fitAddonRef.current = fitAddon;
+        // Handle window resize
+        const handleResize = () => {
+            fitAddon.fit();
+        };
+        window.addEventListener("resize", handleResize);
+        // Cleanup
+        return () => {
+            window.removeEventListener("resize", handleResize);
+            terminal.dispose();
+            xtermRef.current = null;
+            fitAddonRef.current = null;
+        };
+    }, [theme, terminalOptions]);
+    // Update log content
+    React.useEffect(() => {
+        if (!xtermRef.current)
+            return;
+        // Handle different log types
+        if (typeof log === "string") {
+            // For string logs, only write the new content (append mode)
+            const previousLog = previousLogRef.current;
+            if (log !== previousLog) {
+                if (log.startsWith(previousLog)) {
+                    // Log is accumulated - write only the new part
+                    const newContent = log.substring(previousLog.length);
+                    xtermRef.current.write(newContent);
+                }
+                else {
+                    // Log was replaced completely - clear and write all
+                    xtermRef.current.clear();
+                    xtermRef.current.write(log);
+                }
+                previousLogRef.current = log;
+            }
+        }
+        else if (typeof log === "object") {
+            // JSON object (results) - always replace
+            xtermRef.current.clear();
+            const formatted = JSON.stringify(log, null, 2);
+            xtermRef.current.write(formatted);
+            previousLogRef.current = "";
+        }
+        else if (!log) {
+            // No log - clear terminal
+            xtermRef.current.clear();
+            previousLogRef.current = "";
+        }
+        // Scroll to bottom
+        xtermRef.current.scrollToBottom();
+    }, [log]);
+    React.useEffect(() => {
+        if (!fitAddonRef.current)
+            return;
+        const resizeObserver = new ResizeObserver(() => {
+            fitAddonRef.current?.fit();
+        });
+        if (terminalRef.current) {
+            resizeObserver.observe(terminalRef.current);
+        }
+        return () => {
+            resizeObserver.disconnect();
+        };
+    }, []);
+    return jsxRuntime.jsx(TerminalWrapper, { ref: terminalRef, className: className, style: styles });
+};
+
 const PageNavigator = styled(uilibGl.Flex) `
   margin-right: -0.5rem;
   align-items: center;
@@ -11217,6 +11229,7 @@ exports.LayerTree = LayerTree;
 exports.LayersContainer = LayersContainer;
 exports.LayersListWrapper = LayersListWrapper;
 exports.LinearProgressContainer = LinearProgressContainer;
+exports.LogTerminal = LogTerminal;
 exports.LogoContainer = LogoContainer;
 exports.MAX_CHART_WIDTH = MAX_CHART_WIDTH;
 exports.Map = Map$1;