@evergis/react 4.0.65 → 4.0.66

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

@@ -10,8 +10,13 @@ export * from './useChartData';
 export * from './useDashboardHeader';
 export * from './useDataSources';
 export * from './useDiffPage';
+export * from './useAfterSave';
+export * from './useBeforeSave';
 export * from './useExpandableContainers';
 export * from './useExportPdf';
+export * from './useFeatureSaveHooks';
+export * from './useFeatureSaveHooks.utils';
+export * from './useSavePrototypeBuilder';
 export * from './useWidgetFilters';
 export * from './useGetConfigLayer';
 export * from './useGlobalContext';

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

@@ -0,0 +1,3 @@
+import { TaskPrototypeDto } from '@evergis/api';
+import { ConfigRelatedResource, SaveHookInput } from '../types';
+export declare const useAfterSave: (hook: ConfigRelatedResource | undefined, buildPrototype: (hook: ConfigRelatedResource, input: SaveHookInput) => TaskPrototypeDto) => (input: SaveHookInput) => Promise<void>;

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

@@ -0,0 +1,3 @@
+import { TaskPrototypeDto } from '@evergis/api';
+import { ConfigRelatedResource, SaveHookInput } from '../types';
+export declare const useBeforeSave: (hook: ConfigRelatedResource | undefined, buildPrototype: (hook: ConfigRelatedResource, input: SaveHookInput) => TaskPrototypeDto) => (input: SaveHookInput) => Promise<boolean>;

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

@@ -0,0 +1,16 @@
+/**
+ * Орchestrator-хук для серверных `beforeSave` / `afterSave` python-скриптов,
+ * описанных в `layerInfo.configuration.editConfiguration.options` слоя.
+ *
+ * - `runBeforeSave(input)` — `Promise<boolean>`, resolves `false` если
+ *   серверная проверка не прошла; сохранение должно быть отменено.
+ * - `runAfterSave(input)` — fire-and-forget после успешного save.
+ *
+ * Активируется только если у потребителя в GlobalProvider переданы
+ * `api`, `notification` и `t`, а приложение обёрнуто в
+ * `<ServerNotificationsProvider>` (для SignalR-подписки на прогресс).
+ */
+export declare const useFeatureSaveHooks: () => {
+    readonly runBeforeSave: (input: import('../types').SaveHookInput) => Promise<boolean>;
+    readonly runAfterSave: (input: import('../types').SaveHookInput) => Promise<void>;
+};

package/dist/components/Dashboard/hooks/useFeatureSaveHooks.utils.d.ts

@@ -0,0 +1,4 @@
+import { ConfigRelatedResource } from '../types';
+export declare const SAVE_HOOK_RESULT_DURATION = 4000;
+export declare const isHookActive: (hook?: ConfigRelatedResource) => hook is ConfigRelatedResource;
+export declare const createSaveNotificationId: () => string;

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

@@ -0,0 +1,3 @@
+import { TaskPrototypeDto } from '@evergis/api';
+import { ConfigRelatedResource, SaveHookInput } from '../types';
+export declare const useSavePrototypeBuilder: () => (hook: ConfigRelatedResource, input: SaveHookInput) => TaskPrototypeDto;

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

@@ -59,6 +59,28 @@ export interface ConfigRelatedResource {
     fileName?: string;
     methodName?: string;
 }
+/**
+ * Конфигурация `editConfiguration.options` слоя. Описывает серверные
+ * python-скрипты, выполняемые до и после сохранения объекта в FeatureCard.
+ *
+ * - `beforeSave` — синхронная серверная валидация перед сохранением.
+ *   Save ждёт `Completed`; при `Error` сохранение отменяется.
+ * - `afterSave` — fire-and-forget действие после успешного сохранения.
+ *
+ * Используется хуком `useFeatureSaveHooks`.
+ */
+export interface EditConfigurationOptions {
+    beforeSave?: ConfigRelatedResource;
+    afterSave?: ConfigRelatedResource;
+}
+/**
+ * Вход для `runBeforeSave` / `runAfterSave` хуков `useFeatureSaveHooks`.
+ * `featureId` равен `null` при создании нового объекта.
+ */
+export interface SaveHookInput {
+    featureId: number | string | null;
+    changedProperties: Record<string, unknown>;
+}
 export interface ConfigControl extends Pick<ConfigOptions, "relatedDataSource" | "minValue" | "maxValue" | "step" | "label" | "placeholder" | "width" | "variants"> {
     type: "dropdown" | "checkbox" | "chips" | "string";
     attributeName?: string;

package/dist/hooks/task/index.d.ts

@@ -1,4 +1,5 @@
 export * from './constants';
 export * from './usePythonTask';
 export * from './usePythonSandbox';
+export * from './useRemoteTask';
 export * from './types';

package/dist/hooks/task/useRemoteTask.d.ts

@@ -0,0 +1,16 @@
+import { RemoteTaskStatus, TaskPrototypeDto } from '@evergis/api';
+export interface RemoteTaskUpdate {
+    status: RemoteTaskStatus;
+    log?: string;
+}
+export interface RemoteTaskResult {
+    taskId: string;
+    status: RemoteTaskStatus.Completed | RemoteTaskStatus.Error;
+    log?: string;
+}
+export interface UseRemoteTaskOptions {
+    onUpdate?: (update: RemoteTaskUpdate) => void;
+}
+export declare const useRemoteTask: ({ onUpdate }?: UseRemoteTaskOptions) => {
+    runTask: (prototype: TaskPrototypeDto) => Promise<RemoteTaskResult>;
+};

package/dist/index.js

@@ -5747,6 +5747,49 @@ const usePythonTask = () => {
     };
 };
 
+const useRemoteTask = ({ onUpdate } = {}) => {
+    const { api: api$1 } = useGlobalContext();
+    const { addSubscription, connection, unsubscribeById } = useServerNotificationsContext();
+    const runTask = React.useCallback((prototype) => new Promise((resolve, reject) => {
+        const start = async () => {
+            const resourceId = prototype.subTaskSettings?.[0]?.startParameters?.resourceId;
+            let prototypeId = await api$1.remoteTaskManager.createTaskPrototype(prototype);
+            prototypeId = prototypeId.replace(/["']+/g, "");
+            const { id: taskId, success } = await api$1.remoteTaskManager.startTask1(prototypeId);
+            if (!success || !taskId) {
+                reject(new Error("startTask returned no taskId"));
+                return;
+            }
+            const subscriptionId = await addSubscription({
+                tag: "python_task_progress_event",
+                resourceId,
+            });
+            const onNotification = ({ data }) => {
+                if (data?.taskId !== taskId) {
+                    return;
+                }
+                onUpdate?.({ status: data.status, log: data.log });
+                const isCompleted = data.status === api.RemoteTaskStatus.Completed;
+                const isError = data.status === api.RemoteTaskStatus.Error;
+                if (isCompleted || isError) {
+                    connection?.off(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
+                    if (subscriptionId) {
+                        unsubscribeById(subscriptionId);
+                    }
+                    resolve({
+                        taskId,
+                        status: isCompleted ? api.RemoteTaskStatus.Completed : api.RemoteTaskStatus.Error,
+                        log: data.log,
+                    });
+                }
+            };
+            connection?.on(SERVER_NOTIFICATION_EVENT.PythonProgressNotification, onNotification);
+        };
+        start().catch(reject);
+    }), [api$1, addSubscription, connection, unsubscribeById, onUpdate]);
+    return { runTask };
+};
+
 const useAppHeight = () => {
     React.useEffect(() => {
         const setAppHeight = () => {
@@ -12413,6 +12456,112 @@ const useDiffPage = (type) => {
     return React.useMemo(() => isDiffPage, [isDiffPage]);
 };
 
+const SAVE_HOOK_RESULT_DURATION = 4000;
+const NOTIFICATION_ID_RADIX = 36;
+const NOTIFICATION_ID_LENGTH = 8;
+const isHookActive = (hook) => !!hook && (!!hook.resourceId || !!hook.fileName);
+const createSaveNotificationId = () => `save-hook-${Date.now()}-${Math.random().toString(NOTIFICATION_ID_RADIX).slice(2, NOTIFICATION_ID_LENGTH)}`;
+
+const useAfterSave = (hook, buildPrototype) => {
+    const { t, notification } = useGlobalContext();
+    const { runTask } = useRemoteTask();
+    return React.useCallback(async (input) => {
+        if (!isHookActive(hook)) {
+            return;
+        }
+        const notificationId = createSaveNotificationId();
+        notification?.add({
+            id: notificationId,
+            title: t("afterSaveProgress", { ns: "dashboard", defaultValue: "Выполняется действие после сохранения" }),
+            progress: true,
+            duration: Number.MAX_SAFE_INTEGER,
+        });
+        try {
+            const { status, log } = await runTask(buildPrototype(hook, input));
+            if (status === api.RemoteTaskStatus.Completed) {
+                notification?.update({
+                    id: notificationId,
+                    title: t("afterSaveSuccess", { ns: "dashboard", defaultValue: "Действие после сохранения выполнено" }),
+                    success: true,
+                    progress: false,
+                    duration: SAVE_HOOK_RESULT_DURATION,
+                });
+                return;
+            }
+            notification?.update({
+                id: notificationId,
+                title: t("afterSaveError", { ns: "dashboard", defaultValue: "Не удалось выполнить действие после сохранения" }),
+                description: log,
+                error: true,
+                progress: false,
+                duration: SAVE_HOOK_RESULT_DURATION,
+            });
+        }
+        catch (error) {
+            const description = error instanceof Error ? error.message : undefined;
+            notification?.update({
+                id: notificationId,
+                title: t("afterSaveError", { ns: "dashboard", defaultValue: "Не удалось выполнить действие после сохранения" }),
+                description,
+                error: true,
+                progress: false,
+                duration: SAVE_HOOK_RESULT_DURATION,
+            });
+        }
+    }, [hook, buildPrototype, runTask, notification, t]);
+};
+
+const useBeforeSave = (hook, buildPrototype) => {
+    const { t, notification } = useGlobalContext();
+    const { runTask } = useRemoteTask();
+    return React.useCallback(async (input) => {
+        if (!isHookActive(hook)) {
+            return true;
+        }
+        const notificationId = createSaveNotificationId();
+        notification?.add({
+            id: notificationId,
+            title: t("beforeSaveProgress", { ns: "dashboard", defaultValue: "Выполняется проверка перед сохранением" }),
+            progress: true,
+            duration: Number.MAX_SAFE_INTEGER,
+        });
+        try {
+            const { status, log } = await runTask(buildPrototype(hook, input));
+            if (status === api.RemoteTaskStatus.Completed) {
+                notification?.update({
+                    id: notificationId,
+                    title: t("beforeSaveSuccess", { ns: "dashboard", defaultValue: "Проверка перед сохранением пройдена" }),
+                    success: true,
+                    progress: false,
+                    duration: SAVE_HOOK_RESULT_DURATION,
+                });
+                return true;
+            }
+            notification?.update({
+                id: notificationId,
+                title: t("beforeSaveError", { ns: "dashboard", defaultValue: "Не удалось выполнить проверку перед сохранением" }),
+                description: log,
+                error: true,
+                progress: false,
+                duration: SAVE_HOOK_RESULT_DURATION,
+            });
+            return false;
+        }
+        catch (error) {
+            const description = error instanceof Error ? error.message : undefined;
+            notification?.update({
+                id: notificationId,
+                title: t("beforeSaveError", { ns: "dashboard", defaultValue: "Не удалось выполнить проверку перед сохранением" }),
+                description,
+                error: true,
+                progress: false,
+                duration: SAVE_HOOK_RESULT_DURATION,
+            });
+            return false;
+        }
+    }, [hook, buildPrototype, runTask, notification, t]);
+};
+
 const useExpandableContainers = () => {
     const [expandedContainers, setExpandedContainers] = React.useState({});
     const expandContainer = React.useCallback((id, expanded) => {
@@ -12520,6 +12669,83 @@ const useExportPdf = (id, margin = 20) => {
     return { loading, onExport };
 };
 
+const useSavePrototypeBuilder = () => {
+    const { ewktGeometry } = useGlobalContext();
+    const { layerInfo, attributes, dataSources, filters: selectedFilters, } = useWidgetContext(exports.WidgetType.FeatureCard);
+    const { projectInfo, dataSources: projectDataSources } = useWidgetContext(exports.WidgetType.Dashboard);
+    const { currentPage } = useWidgetPage(exports.WidgetType.FeatureCard);
+    return React.useCallback((hook, input) => {
+        const resolvedParameters = applyQueryFilters({
+            parameters: hook.parameters ?? {},
+            filters: currentPage?.filters ?? [],
+            selectedFilters,
+            geometry: ewktGeometry,
+            attributes,
+            layerInfo,
+            dataSources,
+            projectDataSources,
+        });
+        const scriptParameters = {
+            projectName: projectInfo?.name,
+            layerName: layerInfo?.name,
+            featureId: input.featureId,
+            properties: input.changedProperties,
+            ...resolvedParameters,
+        };
+        return {
+            enabled: true,
+            startIfPreviousError: true,
+            startIfPreviousNotFinished: true,
+            subTaskSettings: [
+                {
+                    type: "pythonService",
+                    startParameters: {
+                        resourceId: hook.resourceId,
+                        fileName: hook.fileName,
+                        methodName: hook.methodName,
+                        parameters: scriptParameters,
+                        method: "pythonrunner/run",
+                    },
+                },
+            ],
+        };
+    }, [
+        attributes,
+        currentPage?.filters,
+        dataSources,
+        ewktGeometry,
+        layerInfo,
+        projectDataSources,
+        projectInfo?.name,
+        selectedFilters,
+    ]);
+};
+
+/**
+ * Орchestrator-хук для серверных `beforeSave` / `afterSave` python-скриптов,
+ * описанных в `layerInfo.configuration.editConfiguration.options` слоя.
+ *
+ * - `runBeforeSave(input)` — `Promise<boolean>`, resolves `false` если
+ *   серверная проверка не прошла; сохранение должно быть отменено.
+ * - `runAfterSave(input)` — fire-and-forget после успешного save.
+ *
+ * Активируется только если у потребителя в GlobalProvider переданы
+ * `api`, `notification` и `t`, а приложение обёрнуто в
+ * `<ServerNotificationsProvider>` (для SignalR-подписки на прогресс).
+ */
+const useFeatureSaveHooks = () => {
+    const { layerInfo } = useWidgetContext(exports.WidgetType.FeatureCard);
+    const options = React.useMemo(() => layerInfo?.configuration
+        ?.editConfiguration?.options, [layerInfo?.configuration]);
+    const buildPrototype = useSavePrototypeBuilder();
+    const runBeforeSave = useBeforeSave(options?.beforeSave, buildPrototype);
+    const runAfterSave = useAfterSave(options?.afterSave, buildPrototype);
+    return {
+        runBeforeSave,
+        runAfterSave,
+    };
+};
+
 const getMinMaxFromStringValue = (items, value, current, type) => {
     const valueIndex = items.findIndex(item => item.value === (type === "min" ? value.min : value.max));
     const currentIndex = items.findIndex(item => item.value === (type === "min" ? value.min : value.max));
@@ -13799,6 +14025,7 @@ exports.PresentationPanelWrapper = PresentationPanelWrapper;
 exports.PresentationWrapper = PresentationWrapper;
 exports.ProgressContainer = ProgressContainer;
 exports.RoundedBackgroundContainer = RoundedBackgroundContainer;
+exports.SAVE_HOOK_RESULT_DURATION = SAVE_HOOK_RESULT_DURATION;
 exports.SERVER_NOTIFICATION_EVENT = SERVER_NOTIFICATION_EVENT;
 exports.STACK_BAR_TOTAL_HEIGHT = STACK_BAR_TOTAL_HEIGHT;
 exports.ServerNotificationsContext = ServerNotificationsContext;
@@ -13841,6 +14068,7 @@ exports.checkIsLoading = checkIsLoading;
 exports.createConfigLayer = createConfigLayer;
 exports.createConfigPage = createConfigPage;
 exports.createNewPageId = createNewPageId;
+exports.createSaveNotificationId = createSaveNotificationId;
 exports.createTreeNode = createTreeNode;
 exports.dateOptions = dateOptions;
 exports.debounce = debounce;
@@ -13902,6 +14130,7 @@ exports.hexToRgba = hexToRgba;
 exports.isEmptyElementValue = isEmptyElementValue;
 exports.isEmptyValue = isEmptyValue;
 exports.isHiddenEmptyValue = isHiddenEmptyValue;
+exports.isHookActive = isHookActive;
 exports.isLayerService = isLayerService;
 exports.isNotValidSelectedTab = isNotValidSelectedTab;
 exports.isNumeric = isNumeric;
@@ -13928,10 +14157,12 @@ exports.tooltipValueFromRelatedFeatures = tooltipValueFromRelatedFeatures;
 exports.transparentizeColor = transparentizeColor;
 exports.treeNodesToProjectItems = treeNodesToProjectItems;
 exports.updateDataSource = updateDataSource;
+exports.useAfterSave = useAfterSave;
 exports.useAppHeight = useAppHeight;
 exports.useAttachmentItems = useAttachmentItems;
 exports.useAttachmentPreviewImages = useAttachmentPreviewImages;
 exports.useAutoCompleteControl = useAutoCompleteControl;
+exports.useBeforeSave = useBeforeSave;
 exports.useChartChange = useChartChange;
 exports.useChartData = useChartData;
 exports.useContainerAttributes = useContainerAttributes;
@@ -13944,6 +14175,7 @@ exports.useDiffPage = useDiffPage;
 exports.useEditGroupAttributes = useEditGroupAttributes;
 exports.useExpandableContainers = useExpandableContainers;
 exports.useExportPdf = useExportPdf;
+exports.useFeatureSaveHooks = useFeatureSaveHooks;
 exports.useFetchImageWithAuth = useFetchImageWithAuth;
 exports.useFetchWithAuth = useFetchWithAuth;
 exports.useGetConfigLayer = useGetConfigLayer;
@@ -13962,7 +14194,9 @@ exports.usePythonSandbox = usePythonSandbox;
 exports.usePythonTask = usePythonTask;
 exports.useRedrawLayer = useRedrawLayer;
 exports.useRelatedDataSourceAttributes = useRelatedDataSourceAttributes;
+exports.useRemoteTask = useRemoteTask;
 exports.useRenderElement = useRenderElement;
+exports.useSavePrototypeBuilder = useSavePrototypeBuilder;
 exports.useServerNotificationsContext = useServerNotificationsContext;
 exports.useShownOtherItems = useShownOtherItems;
 exports.useToggle = useToggle;