fix(QueryTracker): redirect to yt operations from running yql queries […

…#522]
ytsaurus · Jul 25, 2024 · 2a91613 · 2a91613
1 parent 002cafa
commit 2a91613
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/packages/ui/src/ui/pages/query-tracker/Plan/models/yql/yql.ts b/packages/ui/src/ui/pages/query-tracker/Plan/models/yql/yql.ts
@@ -204,6 +204,9 @@ export interface definitions {
         running?: number;
         total?: number;
         stages?: definitions['EntryStringInstant'];
+        remoteData?: {
+            cluster_name?: string;
+        };
     };
     OperationErrorDto: {
         file?: string;

diff --git a/packages/ui/src/ui/pages/query-tracker/Plan/utils.ts b/packages/ui/src/ui/pages/query-tracker/Plan/utils.ts
@@ -596,12 +596,18 @@ export function usePrepareNode(operationIdToCluster: Map<string, string>) {
         } else if (node.progress?.remoteId) {
             const id = node.progress?.remoteId.split('/').pop();
 
-            if (id && operationIdToCluster.has(id)) {
-                const cluster = operationIdToCluster.get(id)!;
+            if (!id) {
+                node.url = getOperationUrl(node);
+
+                return node;
+            }
 
+            const cluster = operationIdToCluster.has(id)
+                ? operationIdToCluster.get(id)
+                : node.progress?.remoteData?.cluster_name;
+
+            if (cluster) {
                 node.url = buildOperationUrl(cluster, id);
-            } else {
-                node.url = getOperationUrl(node);
             }
         }