{isTransitioning && (
@@ -266,6 +294,8 @@ function DAGRunDetailsModal({
dagRun={displayData}
refreshFn={refreshFn}
dagRunId={displayDagRunId}
+ initialTab={initialTab}
+ fillHeight={fillContentHeight}
/>
)}
diff --git a/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunGroupedView.test.tsx b/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunGroupedView.test.tsx
index a8e9e0778f..2821e00f0f 100644
--- a/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunGroupedView.test.tsx
+++ b/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunGroupedView.test.tsx
@@ -27,6 +27,7 @@ describe('DAGRunGroupedView', () => {
name: 'scheduled-dag',
status: Status.Queued,
statusLabel: StatusLabel.queued,
+ artifactsAvailable: false,
autoRetryCount: 0,
autoRetryLimit: 0,
triggerType: TriggerType.scheduler,
@@ -40,6 +41,7 @@ describe('DAGRunGroupedView', () => {
name: 'scheduled-dag',
status: Status.Queued,
statusLabel: StatusLabel.queued,
+ artifactsAvailable: false,
autoRetryCount: 0,
autoRetryLimit: 0,
triggerType: TriggerType.scheduler,
@@ -72,6 +74,7 @@ describe('DAGRunGroupedView', () => {
name: 'grouped-dag',
status: Status.Failed,
statusLabel: StatusLabel.failed,
+ artifactsAvailable: false,
autoRetryCount: 0,
autoRetryLimit: 0,
triggerType: TriggerType.manual,
diff --git a/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunTable.test.tsx b/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunTable.test.tsx
index 71213499cf..bc695e57c7 100644
--- a/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunTable.test.tsx
+++ b/ui/src/features/dag-runs/components/dag-run-list/__tests__/DAGRunTable.test.tsx
@@ -78,6 +78,7 @@ describe('DAGRunTable', () => {
name: 'scheduled-dag',
status: Status.Failed,
statusLabel: StatusLabel.failed,
+ artifactsAvailable: false,
autoRetryCount: 1,
autoRetryLimit: 3,
triggerType: TriggerType.scheduler,
@@ -113,6 +114,7 @@ describe('DAGRunTable', () => {
name: 'bulk-dag',
status: Status.Failed,
statusLabel: StatusLabel.failed,
+ artifactsAvailable: false,
autoRetryCount: 0,
autoRetryLimit: 0,
triggerType: TriggerType.manual,
@@ -154,6 +156,7 @@ describe('DAGRunTable', () => {
name: 'alpha',
status: Status.Failed,
statusLabel: StatusLabel.failed,
+ artifactsAvailable: false,
autoRetryCount: 0,
autoRetryLimit: 0,
triggerType: TriggerType.manual,
diff --git a/ui/src/features/dag-runs/hooks/__tests__/useBulkDAGRunSelection.test.tsx b/ui/src/features/dag-runs/hooks/__tests__/useBulkDAGRunSelection.test.tsx
index 5be641dd65..5806450077 100644
--- a/ui/src/features/dag-runs/hooks/__tests__/useBulkDAGRunSelection.test.tsx
+++ b/ui/src/features/dag-runs/hooks/__tests__/useBulkDAGRunSelection.test.tsx
@@ -11,6 +11,7 @@ const buildDagRun = (name: string, dagRunId: string) => ({
dagRunId,
status: Status.Failed,
statusLabel: StatusLabel.failed,
+ artifactsAvailable: false,
autoRetryCount: 0,
autoRetryLimit: 0,
triggerType: TriggerType.manual,
diff --git a/ui/src/features/dags/components/DAGStatus.tsx b/ui/src/features/dags/components/DAGStatus.tsx
index 176e06cd21..b2ee95a5a1 100644
--- a/ui/src/features/dags/components/DAGStatus.tsx
+++ b/ui/src/features/dags/components/DAGStatus.tsx
@@ -23,7 +23,7 @@ import { components, NodeStatus, Status, Stream } from '../../../api/v1/schema';
import { AppBarContext } from '../../../contexts/AppBarContext';
import { useConfig } from '../../../contexts/ConfigContext';
import { useClient } from '../../../hooks/api';
-import { toMermaidNodeId } from '../../../lib/utils';
+import { cn, toMermaidNodeId } from '../../../lib/utils';
import BorderedBox from '../../../ui/BorderedBox';
import { DAGRunOutputs } from '../../dag-runs/components/dag-run-details';
import { DAGContext } from '../contexts/DAGContext';
@@ -44,9 +44,11 @@ type Props = {
dagRun: components['schemas']['DAGRunDetails'];
fileName: string;
artifactEnabled?: boolean;
+ initialTab?: StatusTab;
+ fillHeight?: boolean;
};
-type StatusTab =
+export type StatusTab =
| 'status'
| 'timeline'
| 'outputs'
@@ -64,13 +66,19 @@ function isSubDAGRun(dagRun: components['schemas']['DAGRunDetails']): boolean {
);
}
-function DAGStatus({ dagRun, fileName, artifactEnabled = false }: Props) {
+function DAGStatus({
+ dagRun,
+ fileName,
+ artifactEnabled = false,
+ initialTab = 'status',
+ fillHeight = false,
+}: Props) {
const appBarContext = React.useContext(AppBarContext);
const config = useConfig();
const navigate = useNavigate();
const { showError } = useErrorModal();
const [modal, setModal] = useState(false);
- const [activeTab, setActiveTab] = useState
('status');
+ const [activeTab, setActiveTab] = useState(initialTab);
// Flowchart direction preference stored in cookies
const [cookie, setCookie] = useCookies(['flowchart']);
@@ -327,6 +335,10 @@ function DAGStatus({ dagRun, fileName, artifactEnabled = false }: Props) {
const hasWaitingSteps = waitingStepCount > 0;
const hasArtifacts = artifactEnabled || !!dagRun.artifactsAvailable;
+ useEffect(() => {
+ setActiveTab(initialTab);
+ }, [dagRun.dagRunId, initialTab]);
+
// Reset to status tab if selected tab is not available
useEffect(() => {
if (activeTab === 'timeline' && !showTimeline) {
@@ -350,10 +362,19 @@ function DAGStatus({ dagRun, fileName, artifactEnabled = false }: Props) {
}
}, [hasWaitingSteps]);
+ const scrollPaneClassName = fillHeight
+ ? 'min-h-0 flex-1 overflow-auto pr-1'
+ : '';
+
return (
-
+
{/* Status Detail Tabs */}
-
+
setActiveTab('status')}
@@ -425,7 +446,7 @@ function DAGStatus({ dagRun, fileName, artifactEnabled = false }: Props) {
{/* Status Tab Content */}
{activeTab === 'status' && (
-
+
{/* DAG Graph Visualization */}
{dagRun.nodes && dagRun.nodes.length > 0 && (
@@ -523,36 +544,55 @@ function DAGStatus({ dagRun, fileName, artifactEnabled = false }: Props) {
{/* Approval Tab Content */}
{activeTab === 'approval' && hasWaitingSteps && (
-
+
)}
{/* Timeline Tab Content */}
{activeTab === 'timeline' && showTimeline && (
-
+
+
+
)}
{/* Outputs Tab Content */}
{activeTab === 'outputs' && (
-
+
+
+
)}
{activeTab === 'artifacts' && hasArtifacts && (
-
+
)}
{/* Chat Tab Content */}
- {activeTab === 'chat' &&
}
+ {activeTab === 'chat' && (
+
+
+
+ )}
{/* Spec Tab Content */}
{activeTab === 'spec' && (
-
+
+
+
)}
- {content}
-
- );
-}
-
function TreeNode({
node,
depth,
@@ -154,6 +147,8 @@ function TreeNode({
export default function ArtifactsTab({
dagRun,
artifactEnabled = false,
+ className,
+ fillHeight = false,
}: Props) {
const client = useClient();
const appBarContext = useContext(AppBarContext);
@@ -548,8 +543,19 @@ export default function ArtifactsTab({
}
return (
-
-
+
+
Artifacts
@@ -573,7 +579,12 @@ export default function ArtifactsTab({
-
+
{treeLoading ? (
Loading artifacts...
@@ -615,7 +626,12 @@ export default function ArtifactsTab({
-
+
@@ -642,7 +658,12 @@ export default function ArtifactsTab({
-
+
{!selectedPath ? (
Select a file to preview it.
@@ -681,7 +702,7 @@ export default function ArtifactsTab({
) : preview.kind === 'markdown' ? (
-
+
) : preview.kind === 'text' ? (
{preview.content || ''}
@@ -691,7 +712,10 @@ export default function ArtifactsTab({
) : (
diff --git a/ui/src/features/dags/components/common/__tests__/DAGActions.test.tsx b/ui/src/features/dags/components/common/__tests__/DAGActions.test.tsx
index da8e50bfa0..b9ce42fe90 100644
--- a/ui/src/features/dags/components/common/__tests__/DAGActions.test.tsx
+++ b/ui/src/features/dags/components/common/__tests__/DAGActions.test.tsx
@@ -46,6 +46,7 @@ describe('DAGActions', () => {
dagRunId: 'run-1',
status: Status.Failed,
statusLabel: StatusLabel.failed,
+ artifactsAvailable: false,
autoRetryCount: 1,
autoRetryLimit: 3,
startedAt: '',
@@ -68,6 +69,7 @@ describe('DAGActions', () => {
dagRunId: 'run-1',
status: Status.Running,
statusLabel: StatusLabel.running,
+ artifactsAvailable: false,
autoRetryCount: 0,
startedAt: '',
finishedAt: '',
diff --git a/ui/src/pages/docs/components/DocEditor.tsx b/ui/src/pages/docs/components/DocEditor.tsx
index 21afe42c40..77572a3de5 100644
--- a/ui/src/pages/docs/components/DocEditor.tsx
+++ b/ui/src/pages/docs/components/DocEditor.tsx
@@ -1,10 +1,6 @@
import MarkdownEditor from '@/components/editors/MarkdownEditor';
-import { MermaidBlock } from '@/components/ui/mermaid-block';
+import { DocMarkdownPreview } from '@/components/ui/doc-markdown-preview';
import { useSimpleToast } from '@/components/ui/simple-toast';
-import React from 'react';
-import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
-import './DocPreview.css';
import { useCanWrite } from '@/contexts/AuthContext';
import { useDocTabContext } from '@/contexts/DocTabContext';
import { useClient, useQuery } from '@/hooks/api';
@@ -12,7 +8,6 @@ import { useContentEditor } from '@/hooks/useContentEditor';
import { useDocSSE } from '@/hooks/useDocSSE';
import { sseFallbackOptions, useSSECacheSync } from '@/hooks/useSSECacheSync';
import { cn } from '@/lib/utils';
-import { slugifyHeading } from '@/lib/text-utils';
import { AppBarContext } from '@/contexts/AppBarContext';
import {
Check,
@@ -26,16 +21,6 @@ import {
import { useCallback, useContext, useEffect, useRef, useState } from 'react';
import DocExternalChangeDialog from './DocExternalChangeDialog';
-function headingId(children: React.ReactNode): string {
- const text =
- typeof children === 'string'
- ? children
- : Array.isArray(children)
- ? children.map((c) => (typeof c === 'string' ? c : '')).join('')
- : String(children ?? '');
- return slugifyHeading(text);
-}
-
type Props = {
tabId: string;
docPath: string;
@@ -367,46 +352,7 @@ function DocEditor({ tabId, docPath, onDeleteDoc, onContentChange }: Props) {
/>
) : (
-
-
(
- {children}
- ),
- h2: ({ children }) => (
- {children}
- ),
- h3: ({ children }) => (
- {children}
- ),
- h4: ({ children }) => (
- {children}
- ),
- h5: ({ children }) => (
- {children}
- ),
- h6: ({ children }) => (
- {children}
- ),
- code({ className: codeClassName, children }) {
- if (codeClassName === 'language-mermaid') {
- return ;
- }
- return {children};
- },
- pre({ children }) {
- const child = children as React.ReactElement;
- if (child?.type === MermaidBlock) {
- return <>{children};
- }
- return {children};
- },
- }}
- >
- {currentValue}
-
-
+
)}