-
+
+ {/* title */}
+
+ {isFetchingWorkflowRunDetail ? (
+
+
+
+ ) : (
+
{workflowRunDetail?.workflowRunName}
+ )}
+
+ setIsOpenRerunWorkflowDialog(true),
+ disabled: isFetchingWorkflowRunRerunAllowedWorkflows,
+ },
+ ]}
+ className='bg-magpie-light-50 hover:text-magpie-light-500'
+ type='square'
+ />
+
-
-
+
+ {/* details */}
+
+
+
+
+
+ {/* libraries */}
+
+
+
+ }
+ onClose={handleCloseRerunWorkflowDialog}
+ closeBtn={{
+ label: 'Close',
+ onClick: handleCloseRerunWorkflowDialog,
+ }}
+ confirmBtn={{
+ label: 'Rerun',
+ onClick: handleRerunWorkflow,
+ disabled:
+ isFetchingWorkflowRunRerunAllowedWorkflows ||
+ !workflowRunRerunValidateDetail?.isValid ||
+ !selectedDataset,
+ }}
+ />
);
};
diff --git a/src/modules/runs/components/workflowRuns/WorkflowRunFilterHeader.tsx b/src/modules/runs/components/workflowRuns/WorkflowRunFilterHeader.tsx
index 0f3dd5e..3cd83ec 100644
--- a/src/modules/runs/components/workflowRuns/WorkflowRunFilterHeader.tsx
+++ b/src/modules/runs/components/workflowRuns/WorkflowRunFilterHeader.tsx
@@ -126,6 +126,13 @@ const WorkflowRunFilterHeader = () => {
setQueryParams({ workflowRunStatus: 'resolved' });
},
},
+ {
+ label: 'Deprecated',
+ subLabel: '',
+ onClick: () => {
+ setQueryParams({ workflowRunStatus: 'deprecated' });
+ },
+ },
{
label: 'Ongoing',
subLabel: '',
diff --git a/src/modules/runs/components/workflowRuns/WorkflowRunTable.tsx b/src/modules/runs/components/workflowRuns/WorkflowRunTable.tsx
index 4af43aa..963ad77 100644
--- a/src/modules/runs/components/workflowRuns/WorkflowRunTable.tsx
+++ b/src/modules/runs/components/workflowRuns/WorkflowRunTable.tsx
@@ -25,7 +25,7 @@ const WorkflowRunTable = ({ libraryOrcabusId }: { libraryOrcabusId?: string }) =
rowsPerPage: getPaginationParams().rowsPerPage || DEFAULT_PAGE_SIZE,
search: getQueryParams().search || undefined,
workflow__orcabus_id: getQueryParams().workflowTypeId || undefined,
- status: ['succeeded', 'failed', 'aborted', 'resolved'].includes(
+ status: ['succeeded', 'failed', 'aborted', 'resolved', 'deprecated'].includes(
getQueryParams().workflowRunStatus
)
? getQueryParams().workflowRunStatus
diff --git a/src/modules/runs/components/workflowRuns/WorkflowRunTimeline.tsx b/src/modules/runs/components/workflowRuns/WorkflowRunTimeline.tsx
index 8658fa1..5d8c7e6 100644
--- a/src/modules/runs/components/workflowRuns/WorkflowRunTimeline.tsx
+++ b/src/modules/runs/components/workflowRuns/WorkflowRunTimeline.tsx
@@ -11,16 +11,19 @@ import {
useWorkflowRunCommentCreateModel,
useWorkflowRunCommentUpdateModel,
useWorkflowRunCommentDeleteModel,
- useWorkflowRunResolvedStateCreateModel,
- useWorkflowRunResolvedStateUpdateModel,
+ useWorkflowRunStateCreateModel,
+ useWorkflowRunStateUpdateModel,
+ useWorkflowRunStateValidMapModel,
} from '@/api/workflow';
import { keepPreviousData } from '@tanstack/react-query';
import {
- CheckCircleIcon,
+ PlusCircleIcon,
+ PlusIcon,
ChatBubbleLeftRightIcon,
ChatBubbleBottomCenterTextIcon,
WrenchIcon,
TrashIcon,
+ ArrowsUpDownIcon,
} from '@heroicons/react/24/outline';
import toaster from '@/components/common/toaster';
import { Tooltip } from '@/components/common/tooltips';
@@ -32,11 +35,13 @@ import { getBadgeType, statusBackgroundColor } from '@/components/common/badges'
import { dayjs } from '@/utils/dayjs';
import { classNames, getUsername } from '@/utils/commonUtils';
import { BackdropWithText } from '@/components/common/backdrop';
+import { useWorkflowRunContext } from './WorkflowRunContext';
+import { Button } from '@/components/common/buttons';
const WorkflowRunTimeline = () => {
const { orcabusId } = useParams();
const { user } = useAuthContext();
-
+ const { refreshWorkflowRuns, setRefreshWorkflowRuns } = useWorkflowRunContext();
const [currentState, setCurrentState] = useState
(null);
const [selectedPayloadId, setSelectedPayloadId] = useState(null);
const [selectedState, setSelectedState] = useState(null);
@@ -46,10 +51,14 @@ const WorkflowRunTimeline = () => {
const [isOpenDeleteCommentDialog, setIsOpenDeleteCommentDialog] = useState(false);
const [commentId, setCommentId] = useState(null);
const [comment, setComment] = useState('');
- const [isOpenAddResolvedDialog, setIsOpenAddResolvedDialog] = useState(false);
- const [isOpenUpdateResolvedDialog, setIsOpenUpdateResolvedDialog] = useState(false);
- const [resolvedId, setResolvedId] = useState(null);
- const [resolvedComment, setResolvedComment] = useState('');
+
+ const [isReverseOrder, setIsReverseOrder] = useState(false);
+
+ const [isOpenAddStateDialog, setIsOpenAddStateDialog] = useState(false);
+ const [stateStatus, setStateStatus] = useState(null);
+ const [isOpenUpdateStateDialog, setIsOpenUpdateStateDialog] = useState(false);
+ const [stateId, setStateId] = useState(null);
+ const [stateComment, setStateComment] = useState('');
const {
data: workflowStateData,
@@ -62,6 +71,13 @@ const WorkflowRunTimeline = () => {
},
});
+ useEffect(() => {
+ if (refreshWorkflowRuns) {
+ refetchWorkflowState();
+ setRefreshWorkflowRuns(false);
+ }
+ }, [refreshWorkflowRuns, refetchWorkflowState, setRefreshWorkflowRuns]);
+
const {
data: workflowCommentData,
isFetching: isFetchingWorkflowComment,
@@ -73,49 +89,63 @@ const WorkflowRunTimeline = () => {
},
});
+ const { data: workflowRunStateValidMapData } = useWorkflowRunStateValidMapModel({
+ params: { path: { orcabusId: orcabusId?.split('.')[1] as string } },
+ reactQuery: {
+ enabled: !!orcabusId,
+ },
+ });
+
const workflowLastState = workflowStateData?.[workflowStateData.length - 1]?.status;
+ // check if the last state is valid for state creation
+ const isValidCreateState = Object.entries(workflowRunStateValidMapData || {}).some(([, value]) =>
+ (value as string[]).includes(workflowLastState || '')
+ );
+ // find all valid state key who has vale of workflowLastState
+ const validState = Object.entries(workflowRunStateValidMapData || {})
+ .filter(([, value]) => (value as string[]).includes(workflowLastState || ''))
+ .map(([key]) => key);
+
// format data and disply in the table
const workflowStateTimelineData = useMemo(
() =>
workflowStateData
- ? workflowStateData
- .map((state) => ({
- id: state.orcabusId,
- content: (
-
-
Status Updated
-
{state.status}
- {state.status === 'RESOLVED' && (
-
-
- {
- setResolvedId(state.orcabusId);
- setResolvedComment(state.comment || '');
- setIsOpenUpdateResolvedDialog(true);
- }}
- />
-
-
- )}
-
+
Status Updated
+
{state.status}
+ {Object.keys(workflowRunStateValidMapData || {}).includes(state.status) && (
+
+
+ {
+ setStateId(state.orcabusId);
+ setStateComment(state.comment || '');
+ setIsOpenUpdateStateDialog(true);
+ }}
+ />
+
+
+ )}
+
-
-
Timeline
-
-
+
+
Timeline
+
+
+ {workflowRuntimelineData.length} events
+
+
•
+
+
+
+
+
+ {isValidCreateState && (
+
+ )}
+