@evergis/react 4.0.168 → 4.0.169

package/dist/react.esm.js

@@ -3,7 +3,7 @@ import { Icon, IconButtonInnerChild, IconButton, Flex, CircularProgress, transit
 import { jsx, jsxs, Fragment as Fragment$1 } from 'react/jsx-runtime';
 import { memo, forwardRef, isValidElement, Fragment, createContext, useContext, useId, useMemo, useRef, useCallback, useLayoutEffect, useSyncExternalStore, useEffect, useState, createElement } from 'react';
 import { barChartClassNames, lineChartClassNames, BarChart as BarChart$1, LineChart, PieChart } from '@evergis/charts';
-import { AttributeType, AttributeIconType, StringSubType, RemoteTaskStatus, generateId, STORAGE_TOKEN_KEY, parseJwt, STORAGE_REFRESH_TOKEN_KEY, AttributeConfigurationType, LayerServiceType, OgcGeometryType } from '@evergis/api';
+import { AttributeType, AttributeIconType, StringSubType, RemoteTaskStatus, HTTPError, TaskResourceSubType, generateId, STORAGE_TOKEN_KEY, parseJwt, STORAGE_REFRESH_TOKEN_KEY, AttributeConfigurationType, LayerServiceType, OgcGeometryType } from '@evergis/api';
 import { Color as Color$1, ColorScale } from '@evergis/color';
 import { isValid, format, parseJSON, parseISO, toDate } from 'date-fns';
 import { isNil, isUndefined, isEqual, cloneDeep, isEmpty, uniqueId, uniqBy, unescape } from 'lodash';
@@ -6467,6 +6467,12 @@ function getActionOptionsError(type, value) {
         return "Options must be an object";
     if (type === "runTask" && (typeof value.taskName !== "string" || !value.taskName))
         return "runTask requires taskName";
+    if (type === "runTask") {
+        for (const field of ["fileName", "methodName"]) {
+            if (value[field] !== undefined && (typeof value[field] !== "string" || !value[field].trim()))
+                return `runTask ${field} must be a non-empty string`;
+        }
+    }
     if (type === "openModal" && (typeof value.modalId !== "string" || !value.modalId))
         return "openModal requires modalId";
     if (type === "openUrl" && (typeof value.url !== "string" || !value.url))
@@ -9035,6 +9041,22 @@ class PythonExecutionError extends Error {
 const RUN_ID_RADIX = 36;
 const TASK_OBSERVATION_TIMEOUT_MS = 86_400_000;
 
+const BAD_REQUEST_STATUS = 400;
+const getPythonTaskConfiguration = async (resourceId, manager, hasExplicitTarget) => {
+    try {
+        return await manager.getTaskResource({ id: resourceId });
+    }
+    catch (error) {
+        if (!hasExplicitTarget || !(error instanceof HTTPError) || error.response.status !== BAD_REQUEST_STATUS)
+            throw error;
+        // Clone the response so a propagated error retains its body for the caller.
+        const body = await error.response.clone().text().catch(() => "");
+        if (!body.includes("Python importMethod is required"))
+            throw error;
+        return undefined;
+    }
+};
+
 const resolvePythonTaskDefinition = async (request, manager) => {
     const task = request.taskName ? request.tasks?.find(({ name }) => name === request.taskName) : undefined;
     if (request.taskName && !task)
@@ -9042,20 +9064,23 @@ const resolvePythonTaskDefinition = async (request, manager) => {
     const resourceId = task?.resourceId ?? request.resourceId;
     if (!resourceId)
         throw new Error(`Task resourceId is missing: ${request.taskName ?? ""}`);
-    const configuration = await manager.getTaskResource({ id: resourceId });
-    if (!["pythonService", "PythonTask"].includes(configuration?.taskType)) {
+    const fileName = request.fileName ?? task?.fileName;
+    const methodName = request.methodName ?? task?.methodName;
+    const hasExplicitTarget = typeof fileName === "string" && !!fileName.trim() && typeof methodName === "string" && !!methodName.trim();
+    const configuration = await getPythonTaskConfiguration(resourceId, manager, hasExplicitTarget);
+    if (configuration && configuration.taskResourceSubType !== TaskResourceSubType.PythonTask && !["pythonService", "PythonTask"].includes(configuration.taskType)) {
         throw new Error(`Task ${request.taskName ?? resourceId} is not a Python task`);
     }
-    const schema = configuration.defaultConfiguration ?? {};
+    const schema = configuration?.defaultConfiguration ?? {};
     const defaults = buildDefaultForSchema(new SchemaResolver(schema), schema);
-    const parameters = [defaults, configuration.userConfiguration, task?.params, request.parameters]
+    const parameters = [defaults, configuration?.userConfiguration, task?.params, request.parameters]
         .filter(isObject)
         .reduce((base, override) => mergeActionParameters(base, override), {});
     return {
         resourceId,
         parameters,
-        fileName: request.fileName ?? schema.fileName,
-        methodName: request.methodName ?? schema.methodName,
+        fileName: fileName ?? schema.fileName,
+        methodName: methodName ?? schema.methodName,
         script: request.script,
     };
 };