@evergis/react 4.0.136 → 4.0.137

package/dist/components/Dashboard/containers/AttachmentContainer/constants.d.ts

@@ -14,6 +14,7 @@ export declare const SHP_MIME_TYPE = "application/octet-stream";
 export declare const KML_MIME_TYPE = "application/octet-stream";
 export declare const ZIP_MIME_TYPE = "application/zip";
 export declare const PYTHON_MIME_TYPES: string[];
+export declare const DOWNLOAD_ERROR_DURATION = 5000;
 export declare enum AddAttachmentSource {
     Pc = "pc",
     Catalog = "catalog",

package/dist/components/Dashboard/containers/AttachmentContainer/utils/saveBlobAsFile.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Отдаёт браузеру уже загруженный файл под именем `fileName`.
+ *
+ * Адрес отзывается не сразу: часть браузеров дочитывает поток уже после клика, и мгновенный
+ * `revokeObjectURL` обрывает сохранение.
+ */
+export declare const saveBlobAsFile: (blob: Blob, fileName: string) => void;

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

@@ -1,3 +1,4 @@
+export * from './useAttachmentDownload';
 export * from './useAttachmentItems';
 export * from './useAttachmentPreviewImages';
 export * from './useAutoCompleteControl';

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

@@ -0,0 +1,9 @@
+import { Attachment } from '../containers/AttachmentContainer/types';
+/**
+ * Скачивание вложения по требованию — файл запрашивается в момент клика, а не заранее.
+ *
+ * Свой файл лежит за авторизацией (`Authorization: Bearer`), поэтому ссылкой его не отдать:
+ * он тянется через api и сохраняется из памяти. Чужой открывается ссылкой — кросс-доменный
+ * `download` браузер всё равно игнорирует.
+ */
+export declare const useAttachmentDownload: (items: Attachment[]) => ((index: number) => void);

package/dist/index.js

@@ -12,6 +12,7 @@ var dateFns = require('date-fns');
 var locale = require('date-fns/locale');
 var wkt = require('wkt');
 var turf = require('@turf/turf');
+var uuid = require('uuid');
 var signalr = require('@microsoft/signalr');
 var MapboxDraw = require('@mapbox/mapbox-gl-draw');
 var react = require('swiper/react');
@@ -21,7 +22,6 @@ var rehypeRaw = require('rehype-raw');
 var rehypeSanitize = require('rehype-sanitize');
 var remarkGfm = require('remark-gfm');
 var MapGL = require('react-map-gl/maplibre');
-var uuid = require('uuid');
 require('@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.css');
 require('mapbox-gl/dist/mapbox-gl.css');
 var jspdf = require('jspdf');
@@ -5694,6 +5694,127 @@ const ServerNotificationsProvider = ({ url, initialized, apiClient, children })
         }, children: children }));
 };
 
+const useGlobalContext = () => {
+    const { t, language, themeName, api, ewktGeometry, ewktExtent, zoomLevel, notification } = React.useContext(GlobalContext) || {};
+    const translate = React.useCallback((value, options) => {
+        if (t)
+            return t(value, options);
+        return options?.defaultValue ?? value;
+    }, [t]);
+    return React.useMemo(() => ({
+        t: translate,
+        language,
+        themeName,
+        api,
+        ewktGeometry,
+        ewktExtent,
+        zoomLevel,
+        notification,
+    }), [language, translate, api, ewktGeometry, ewktExtent, zoomLevel, themeName, notification]);
+};
+
+const GRID_TILE_SIZE = "4.5rem";
+const LIST_ICON_SIZE = "1.5rem";
+const JPG_MIME_TYPE = "image/jpeg";
+const PNG_MIME_TYPE = "image/png";
+const IMAGE_MIME_TYPES = [
+    "image/apng",
+    "image/avif",
+    "image/gif",
+    "image/jpeg",
+    "image/png",
+    "image/svg+xml",
+    "image/webp",
+];
+const XLSX_MIME_TYPES = [
+    "application/vnd.ms-excel",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+];
+const PDF_MIME_TYPE = "application/pdf";
+const DOCX_MIME_TYPES = [
+    "application/msword",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+];
+const CSV_MIME_TYPE = "text/csv";
+const JSON_MIME_TYPE = "application/json";
+const TXT_MIME_TYPE = "text/plain";
+const PPTX_MIME_TYPES = [
+    "application/vnd.ms-powerpoint",
+    "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+];
+const SHP_MIME_TYPE = "application/octet-stream";
+const KML_MIME_TYPE = "application/octet-stream";
+const ZIP_MIME_TYPE = "application/zip";
+const PYTHON_MIME_TYPES = ["application/x-python-code", "text/x-python"];
+const DOWNLOAD_ERROR_DURATION = 5000;
+var AddAttachmentSource;
+(function (AddAttachmentSource) {
+    AddAttachmentSource["Pc"] = "pc";
+    AddAttachmentSource["Catalog"] = "catalog";
+    AddAttachmentSource["Link"] = "link";
+})(AddAttachmentSource || (AddAttachmentSource = {}));
+
+const REVOKE_DELAY = 1000;
+/**
+ * Отдаёт браузеру уже загруженный файл под именем `fileName`.
+ *
+ * Адрес отзывается не сразу: часть браузеров дочитывает поток уже после клика, и мгновенный
+ * `revokeObjectURL` обрывает сохранение.
+ */
+const saveBlobAsFile = (blob, fileName) => {
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement("a");
+    link.href = url;
+    link.download = fileName;
+    link.style.display = "none";
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    window.setTimeout(() => URL.revokeObjectURL(url), REVOKE_DELAY);
+};
+
+/**
+ * Скачивание вложения по требованию — файл запрашивается в момент клика, а не заранее.
+ *
+ * Свой файл лежит за авторизацией (`Authorization: Bearer`), поэтому ссылкой его не отдать:
+ * он тянется через api и сохраняется из памяти. Чужой открывается ссылкой — кросс-доменный
+ * `download` браузер всё равно игнорирует.
+ */
+const useAttachmentDownload = (items) => {
+    const { api, notification, t } = useGlobalContext();
+    const inFlightRef = React.useRef(new Set());
+    return React.useCallback((index) => {
+        const item = items[index];
+        if (!item)
+            return;
+        if (item.isExternal) {
+            window.open(item.link, "_blank", "noopener,noreferrer");
+            return;
+        }
+        if (!api?.catalog?.getFile || inFlightRef.current.has(item.link))
+            return;
+        inFlightRef.current.add(item.link);
+        api.catalog
+            .getFile(item.link)
+            .then(blob => saveBlobAsFile(blob, item.name))
+            .catch(error => {
+            notification?.add({
+                id: uuid.v4(),
+                title: t("attachments.downloadError", {
+                    ns: "common",
+                    defaultValue: "Не удалось скачать вложение",
+                }),
+                description: error instanceof Error ? error.message : item.name,
+                error: true,
+                duration: DOWNLOAD_ERROR_DURATION,
+            });
+        })
+            .finally(() => {
+            inFlightRef.current.delete(item.link);
+        });
+    }, [items, api, notification, t]);
+};
+
 /**
  * Контекст виджет-фрейма. Возвращаемый объект включает поля и {@link DashboardContext},
  * и {@link FeatureCardContext}, а гибридные (`config`, `isEditing`, `isLoading`, `pageIndex`,
@@ -5810,65 +5931,6 @@ const useAttachmentItems = ({ type, elementConfig, valueOverride, }) => {
     };
 };
 
-const useGlobalContext = () => {
-    const { t, language, themeName, api, ewktGeometry, ewktExtent, zoomLevel, notification } = React.useContext(GlobalContext) || {};
-    const translate = React.useCallback((value, options) => {
-        if (t)
-            return t(value, options);
-        return options?.defaultValue ?? value;
-    }, [t]);
-    return React.useMemo(() => ({
-        t: translate,
-        language,
-        themeName,
-        api,
-        ewktGeometry,
-        ewktExtent,
-        zoomLevel,
-        notification,
-    }), [language, translate, api, ewktGeometry, ewktExtent, zoomLevel, themeName, notification]);
-};
-
-const GRID_TILE_SIZE = "4.5rem";
-const LIST_ICON_SIZE = "1.5rem";
-const JPG_MIME_TYPE = "image/jpeg";
-const PNG_MIME_TYPE = "image/png";
-const IMAGE_MIME_TYPES = [
-    "image/apng",
-    "image/avif",
-    "image/gif",
-    "image/jpeg",
-    "image/png",
-    "image/svg+xml",
-    "image/webp",
-];
-const XLSX_MIME_TYPES = [
-    "application/vnd.ms-excel",
-    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-];
-const PDF_MIME_TYPE = "application/pdf";
-const DOCX_MIME_TYPES = [
-    "application/msword",
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-];
-const CSV_MIME_TYPE = "text/csv";
-const JSON_MIME_TYPE = "application/json";
-const TXT_MIME_TYPE = "text/plain";
-const PPTX_MIME_TYPES = [
-    "application/vnd.ms-powerpoint",
-    "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-];
-const SHP_MIME_TYPE = "application/octet-stream";
-const KML_MIME_TYPE = "application/octet-stream";
-const ZIP_MIME_TYPE = "application/zip";
-const PYTHON_MIME_TYPES = ["application/x-python-code", "text/x-python"];
-var AddAttachmentSource;
-(function (AddAttachmentSource) {
-    AddAttachmentSource["Pc"] = "pc";
-    AddAttachmentSource["Catalog"] = "catalog";
-    AddAttachmentSource["Link"] = "link";
-})(AddAttachmentSource || (AddAttachmentSource = {}));
-
 var FileType;
 (function (FileType) {
     FileType[FileType["UNKNOWN"] = 0] = "UNKNOWN";
@@ -9202,9 +9264,11 @@ const AttachmentContainer = React.memo(({ type, elementConfig, renderElement })
             setPreviewIndex(idx);
     }, [items]);
     const handleClosePreview = React.useCallback(() => setPreviewIndex(null), []);
+    const downloadByIndex = useAttachmentDownload(items);
+    const handleDownload = React.useCallback((_image, index) => downloadByIndex(index), [downloadByIndex]);
     const handleShowMore = React.useCallback(() => setShowMore(true), [setShowMore]);
     const isVisible = isVisibleContainer(id, expandable, expanded, expandedContainers);
-    return (jsxRuntime.jsxs(ContainerRoot, { ...root, children: [jsxRuntime.jsx(ContainerBackground, { elementConfig: elementConfig, renderElement: renderElement }), jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && (jsxRuntime.jsx(Container, { ...body, children: jsxRuntime.jsxs(uilibGl.Flex, { column: true, children: [jsxRuntime.jsx(AttachmentsHeader, { alias: renderElement?.({ id: "alias" }), count: items.length, viewMode: viewMode, onChangeViewMode: setViewMode }), jsxRuntime.jsx(AttachmentsContent, { children: viewMode === "grid" ? (jsxRuntime.jsx(AttachmentsGrid, { items: visibleItems, isEdit: false, onPreview: handlePreview })) : (jsxRuntime.jsx(AttachmentsList, { items: visibleItems, isEdit: false, onPreview: handlePreview })) }), hasMore && !showMore && (jsxRuntime.jsx(ShowMoreButton, { hiddenCount: hiddenCount, onClick: handleShowMore })), previewIndex !== null && (jsxRuntime.jsx(uilibGl.Preview, { images: previewImages, initialIndex: previewIndex, isOpen: previewIndex !== null, onClose: handleClosePreview, errorTitleText: t("attachments.resourceUnavailable", {
+    return (jsxRuntime.jsxs(ContainerRoot, { ...root, children: [jsxRuntime.jsx(ContainerBackground, { elementConfig: elementConfig, renderElement: renderElement }), jsxRuntime.jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && (jsxRuntime.jsx(Container, { ...body, children: jsxRuntime.jsxs(uilibGl.Flex, { column: true, children: [jsxRuntime.jsx(AttachmentsHeader, { alias: renderElement?.({ id: "alias" }), count: items.length, viewMode: viewMode, onChangeViewMode: setViewMode }), jsxRuntime.jsx(AttachmentsContent, { children: viewMode === "grid" ? (jsxRuntime.jsx(AttachmentsGrid, { items: visibleItems, isEdit: false, onPreview: handlePreview })) : (jsxRuntime.jsx(AttachmentsList, { items: visibleItems, isEdit: false, onPreview: handlePreview })) }), hasMore && !showMore && (jsxRuntime.jsx(ShowMoreButton, { hiddenCount: hiddenCount, onClick: handleShowMore })), previewIndex !== null && (jsxRuntime.jsx(uilibGl.Preview, { images: previewImages, initialIndex: previewIndex, isOpen: previewIndex !== null, onClose: handleClosePreview, onDownload: handleDownload, errorTitleText: t("attachments.resourceUnavailable", {
                                 ns: "common",
                                 defaultValue: "Ресурс недоступен",
                             }) }, previewIndex))] }) }))] }));
@@ -13249,6 +13313,8 @@ const EditAttachmentContainer = React.memo(({ type, elementConfig, renderElement
             setPreviewIndex(idx);
     }, [items]);
     const handleClosePreview = React.useCallback(() => setPreviewIndex(null), []);
+    const downloadByIndex = useAttachmentDownload(items);
+    const handleDownload = React.useCallback((_image, index) => downloadByIndex(index), [downloadByIndex]);
     const handleShowMore = React.useCallback(() => setShowMore(true), [setShowMore]);
     const handleDelete = React.useCallback((link) => {
         persist(items.filter(item => item.link !== link));
@@ -13299,7 +13365,7 @@ const EditAttachmentContainer = React.memo(({ type, elementConfig, renderElement
             setUploading(false);
         }
     }, [api, items, parentResourceId, persist]);
-    return (jsxRuntime.jsxs(AttachmentsContainer, { id: id, style: { ...BASE_CONTAINER_STYLE, ...style }, ...bgHost, children: [jsxRuntime.jsx(ContainerBackground, { elementConfig: elementConfig, renderElement: renderElement }), jsxRuntime.jsx(AttachmentsHeader, { alias: renderElement?.({ id: "alias" }), count: items.length, viewMode: viewMode, onChangeViewMode: setViewMode }), jsxRuntime.jsx(AttachmentsContent, { children: viewMode === "grid" ? (jsxRuntime.jsx(AttachmentsGrid, { items: visibleItems, isEdit: true, onPreview: handlePreview, onDelete: handleDelete })) : (jsxRuntime.jsx(AttachmentsList, { items: visibleItems, isEdit: true, onPreview: handlePreview, onDelete: handleDelete })) }), hasMore && !showMore && (jsxRuntime.jsx(ShowMoreButton, { hiddenCount: hiddenCount, onClick: handleShowMore })), jsxRuntime.jsx(AddButton, { accept: fileExtensions, onSelectFiles: uploading ? () => undefined : handleUpload, onSelectFromCatalog: handleSelectFromCatalog, onSelectFromLink: handleOpenLinkDialog }), jsxRuntime.jsx(AttachmentLinkDialog, { isOpen: isLinkDialogOpen, onClose: handleCloseLinkDialog, onSubmit: handleAddByLink }), previewIndex !== null && (jsxRuntime.jsx(uilibGl.Preview, { images: previewImages, initialIndex: previewIndex, isOpen: previewIndex !== null, onClose: handleClosePreview }, previewIndex))] }));
+    return (jsxRuntime.jsxs(AttachmentsContainer, { id: id, style: { ...BASE_CONTAINER_STYLE, ...style }, ...bgHost, children: [jsxRuntime.jsx(ContainerBackground, { elementConfig: elementConfig, renderElement: renderElement }), jsxRuntime.jsx(AttachmentsHeader, { alias: renderElement?.({ id: "alias" }), count: items.length, viewMode: viewMode, onChangeViewMode: setViewMode }), jsxRuntime.jsx(AttachmentsContent, { children: viewMode === "grid" ? (jsxRuntime.jsx(AttachmentsGrid, { items: visibleItems, isEdit: true, onPreview: handlePreview, onDelete: handleDelete })) : (jsxRuntime.jsx(AttachmentsList, { items: visibleItems, isEdit: true, onPreview: handlePreview, onDelete: handleDelete })) }), hasMore && !showMore && (jsxRuntime.jsx(ShowMoreButton, { hiddenCount: hiddenCount, onClick: handleShowMore })), jsxRuntime.jsx(AddButton, { accept: fileExtensions, onSelectFiles: uploading ? () => undefined : handleUpload, onSelectFromCatalog: handleSelectFromCatalog, onSelectFromLink: handleOpenLinkDialog }), jsxRuntime.jsx(AttachmentLinkDialog, { isOpen: isLinkDialogOpen, onClose: handleCloseLinkDialog, onSubmit: handleAddByLink }), previewIndex !== null && (jsxRuntime.jsx(uilibGl.Preview, { images: previewImages, initialIndex: previewIndex, isOpen: previewIndex !== null, onClose: handleClosePreview, onDownload: handleDownload }, previewIndex))] }));
 });
 
 // `ProgressContainer` и `RoundedBackgroundContainer` исторически принимают `InnerContainerProps`
@@ -18854,6 +18920,7 @@ exports.transparentizeColor = transparentizeColor;
 exports.updateDataSource = updateDataSource;
 exports.useAfterSave = useAfterSave;
 exports.useAppHeight = useAppHeight;
+exports.useAttachmentDownload = useAttachmentDownload;
 exports.useAttachmentItems = useAttachmentItems;
 exports.useAttachmentPreviewImages = useAttachmentPreviewImages;
 exports.useAutoCompleteControl = useAutoCompleteControl;