@evergis/react 3.1.65 → 3.1.66

package/dist/react.esm.js

@@ -4825,6 +4825,7 @@ const SERVER_NOTIFICATION_EVENT = {
 const usePythonTask = () => {
     const { api, t } = useGlobalContext();
     const { addSubscription, connection, unsubscribeById } = useServerNotificationsContext();
+    const [status, setStatus] = useState(RemoteTaskStatus.Unknown);
     const [result, setResult] = useState(null);
     const [error, setError] = useState(null);
     const [loading, setLoading] = useState(false);
@@ -4832,15 +4833,18 @@ const usePythonTask = () => {
     const [taskId, setTaskId] = useState(null);
     const [subscriptionId, setSubscriptionId] = useState(null);
     const reset = useCallback(() => {
+        setStatus(RemoteTaskStatus.Unknown);
         setResult(null);
         setError(null);
-        setLoading(true);
+        setLoading(false);
         setExecutionTime(null);
         setTaskId(null);
         setSubscriptionId(null);
     }, []);
     const runTask = useCallback(async ({ resourceId, parameters, script, fileName, methodName, }) => {
         reset();
+        setStatus(RemoteTaskStatus.Process);
+        setLoading(true);
         const start = Date.now();
         let prototypeId = await api.remoteTaskManager.createTaskPrototype({
             enabled: true,
@@ -4863,6 +4867,7 @@ const usePythonTask = () => {
         prototypeId = prototypeId.replace(/["']+/g, "");
         const { id: newTaskId, success } = await api.remoteTaskManager.startTask1(prototypeId);
         if (!success) {
+            setStatus(RemoteTaskStatus.Error);
             setResult(t("taskRunFail", { ns: "devMode", defaultValue: "Не удалось запустить задачу" }));
             setExecutionTime(Date.now() - start);
             setLoading(false);
@@ -4875,6 +4880,7 @@ const usePythonTask = () => {
         setSubscriptionId(newSubscriptionId);
         const onNotification = ({ data }) => {
             if (data?.taskId === newTaskId) {
+                setStatus(data.status);
                 setResult(`${data ? `${data}\n` : ""}${data.log || ""}`);
                 setError(null);
                 setExecutionTime(Date.now() - start);
@@ -4898,7 +4904,7 @@ const usePythonTask = () => {
         reset();
         unsubscribeById(subscriptionId);
     }, [api, reset, unsubscribeById, taskId, subscriptionId]);
-    return { runTask, stopTask, result, error, loading, executionTime };
+    return { taskId, runTask, stopTask, result, error, status, loading, executionTime };
 };
 
 const useAppHeight = () => {
@@ -6730,13 +6736,24 @@ const UploadContainer = memo(({ type, elementConfig, renderElement }) => {
     return (jsxs(Fragment$1, { children: [jsx(ExpandableTitle, { elementConfig: elementConfig, type: type, renderElement: renderElement }), isVisible && renderElement({ id: "uploader", wrap: false })] }));
 });
 
+const StatusWaitingButton = styled(WaitingButton) `
+  ${({ status = RemoteTaskStatus.Unknown, statusColors }) => !!statusColors?.[status] && css `
+    transition: background-color ${transition.toggle};
+    background-color: ${statusColors[status]};
+    
+    :hover {
+      background-color: ${statusColors[status]};
+    }
+  `}
+`;
+
 const TaskContainer = memo(({ type, elementConfig }) => {
     const { t, ewktGeometry } = useGlobalContext();
     const { dataSources, filters: selectedFilters } = useWidgetContext(type);
     const { currentPage } = useWidgetPage(type);
-    const { runTask, loading } = usePythonTask();
+    const { taskId, runTask, stopTask, status, loading } = usePythonTask();
     const { options } = elementConfig || {};
-    const { title, relatedResources, center, icon } = options || {};
+    const { title, relatedResources, center, icon, statusColors } = options || {};
     const onClick = useCallback(async () => {
         await Promise.all(relatedResources.map(({ resourceId, parameters, script, fileName, methodName }) => {
             const newParams = applyQueryFilters({
@@ -6749,7 +6766,7 @@ const TaskContainer = memo(({ type, elementConfig }) => {
             return runTask({ resourceId, parameters: newParams, script, fileName, methodName });
         }));
     }, [currentPage.filters, dataSources, ewktGeometry, relatedResources, runTask, selectedFilters]);
-    return (jsx(Flex, { justifyContent: center ? "center" : "flex-start", children: jsxs(WaitingButton, { primary: true, isWaiting: loading, disabled: !relatedResources?.length, onClick: onClick, children: [icon && jsx(FlexSpan, { marginRight: "0.5rem", children: jsx(Icon, { kind: icon }) }), title || t("run", { ns: "dashboard", defaultValue: "Запуск" })] }) }));
+    return (jsxs(Flex, { justifyContent: center ? "center" : "flex-start", children: [jsxs(StatusWaitingButton, { primary: true, status: status, statusColors: statusColors, isWaiting: loading, disabled: !relatedResources?.length, onClick: onClick, children: [icon && jsx(FlexSpan, { marginRight: "0.5rem", children: jsx(Icon, { kind: icon }) }), title || t("run", { ns: "dashboard", defaultValue: "Запуск" })] }), !!taskId && (jsx(IconButton, { kind: "stop", onClick: stopTask }))] }));
 });
 
 const containerComponents = {