Skip to content

Task Timeouts #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johannwagner merged 18 commits into from
Feb 5, 2026
Merged

Task Timeouts #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aa3cada
Merge pull request #72 from wobcom/refactor/cleanliness
johannwagner Feb 5, 2026
832af4f
feat: task timeouts
Kek5chen Jan 8, 2026
98c7c39
fix: change order of log push to happen after db update
Kek5chen Jan 9, 2026
45f1829
fix: switch to garage for dev env instead of minio
Kek5chen Jan 9, 2026
b3f4e30
feat: add dotenvy to load .env files in vickyctl
Kek5chen Jan 9, 2026
3c03e2e
fix: add poisoned attr to task lock in frontend api
Kek5chen Jan 9, 2026
d52e5eb
fix: add timeout to filters
Kek5chen Jan 9, 2026
bcd713d
fix: react v6 navbar
Kek5chen Jan 9, 2026
2fb06eb
fix: use Filter list in TaskTags too
Kek5chen Jan 9, 2026
b0c2118
fix: weird xterm placeholder 50000 width div at end of DOM overflowing y
Kek5chen Jan 9, 2026
e4a80f7
fix: better xterm scaling
Kek5chen Jan 9, 2026
b6b43a2
fix: task bar scaling
Kek5chen Jan 9, 2026
b5100df
fix: lock badge overlap
Kek5chen Jan 9, 2026
3759e33
chore: add label in front of locks in UI
Kek5chen Jan 9, 2026
ea6cc4b
fix: task panel layouting
Kek5chen Jan 9, 2026
9353387
fix: update packages and build
Kek5chen Jan 15, 2026
77cfb40
fix: Fix formatting
johannwagner Feb 5, 2026
7ee577b
fix: Fix build
johannwagner Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 142 additions & 121 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2,483 changes: 1,200 additions & 1,283 deletions dashboard/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"react-dom": "^18.2.0",
"react-oidc-context": "^3.0.0-beta.0",
"react-router-dom": "^6.15.0",
"rsuite": "^5.39.0",
"rsuite": "^6.1.1",
"xterm": "^5.3.0",
"xterm-addon-fit": "^0.8.0"
},
Expand Down
5 changes: 1 addition & 4 deletions dashboard/src/components/filter-slider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { CSSProperties, useEffect, useMemo, useRef, useState } from "react";

import * as s from "./filter-slider.module.css";

type FilterValue = string | null;

export type FilterOption = { label: string; value: FilterValue; color: string };
import {FilterOption, FilterValue} from "./tasks";

type DragState = { startX: number; moved: boolean };

Expand Down
59 changes: 28 additions & 31 deletions dashboard/src/components/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,41 @@
import { Nav, Navbar } from "rsuite"
import {Avatar, Nav, Navbar} from "rsuite"

import * as s from "./menu.module.css";

import UserIcon from '@rsuite/icons/legacy/User';

import { Link, useNavigate } from "react-router-dom";
import { useContext, useEffect, useState } from "react";
import { useAPI } from "../services/api";
import { UserContext } from "../contexts/user";
import { useAuth } from "react-oidc-context";

import {NavLink} from "react-router-dom";
import {ReactEventHandler, useContext} from "react";
import {UserContext} from "../contexts/user";
import {useAuth} from "react-oidc-context";
import * as React from "react";

const Menu = () => {

const activeKey = "tasks";
const user = useContext(UserContext)
const auth = useAuth();

return (
<Navbar bordered shaded>
<Navbar.Brand>
<Link to={"/"}>Vicky</Link>
</Navbar.Brand>
{
user ? (
<Nav activeKey={activeKey}>
<Nav.Item eventKey="tasks" >
<Link to={"/tasks"}>Tasks</Link>
<Navbar>
<Navbar.Content>
<Navbar.Brand as={NavLink} to="/">
Vicky
</Navbar.Brand>
{
user ? (
<Nav>
<Nav.Item as={NavLink} to="/tasks">Tasks</Nav.Item>
</Nav>
)
: null
}
</Navbar.Content>
<Navbar.Content>
<Nav>
{user ? (
<Nav.Item icon={<Avatar circle background={"transparent"} size="sm"/>}>
{user.full_name}
</Nav.Item>
</Nav>
)
: null
}
<Nav pullRight>
{ user ? (
<Nav.Item icon={<UserIcon />}>
{user.full_name}
</Nav.Item>
) : null}
</Nav>
) : null}
</Nav>
</Navbar.Content>
</Navbar>
)

Expand Down
70 changes: 25 additions & 45 deletions dashboard/src/components/tag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,44 @@
import { useMemo } from "react"
import { Tag } from "rsuite";
import { ITask } from "../services/api"
import {useMemo} from "react"
import {Tag} from "rsuite";
import {ITask} from "../services/api"
import {FilterOption} from "./tasks";

type TaskTagProps = {
task: ITask,
size: "sm" | "md" | "lg"
options: FilterOption[],
}
const fallbackTag: FilterOption = { color: "", label: "-", value: "None" }

const TaskTag = (props: TaskTagProps) => {

const {
task,
size
size,
options,
} = props;

const [tagContent, tagColor] = useMemo(() => {
const tagContent = task.status.result ?? task.status.state
const tag: FilterOption = useMemo(() => {
const tagContent = task.status.state + (task.status.result ? "::" + task.status.result : "")

console.log(task)

let tagColor = null
let tagDisplay = null
switch (tagContent) {
case "ERROR": {
tagColor = "red";
tagDisplay = "Error";
break;
}
case "SUCCESS": {
tagColor = "green";
tagDisplay = "Success";
break;
}
case "RUNNING": {
tagColor = "violet";
tagDisplay = "Running";
break;
}
case "NEW": {
tagColor = "cyan";
tagDisplay = "New";
break;
}
case "NEEDSUSERVALIDATION": {
tagColor = "orange";
tagDisplay = "Validation";
break;
}
default: {
tagColor = "";
tagDisplay = "-"
}
}

return [tagDisplay, tagColor]
return options.find(o => o.value == tagContent) ?? fallbackTag

}, [task.status])

return (
<Tag style={{width: "6em", textAlign: "center"}} color={tagColor} size={size}>{tagContent}</Tag>
return (
<Tag
style={{
width: "6em",
display: "inline-flex",
alignItems: "center",
justifyContent: "center",
textAlign: "center",
}}
color={tag.color}
size={size}
>
{tag.label}
</Tag>
)

}
Expand Down
14 changes: 14 additions & 0 deletions dashboard/src/components/task.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
margin-bottom: 1em;
}

.TaskHeader {
width: 100%;
}

.Panel {
height: 100%;
}
Expand All @@ -11,6 +15,13 @@
height: 100%;
}

.Panel :global(.rs-panel-body) {
display: flex;
flex-direction: column;
min-height: 0;
box-sizing: border-box;
}

.TitleRow {
width: 100%;
}
Expand Down Expand Up @@ -40,4 +51,7 @@
padding: 2px 6px;
min-width: 4em;
text-align: center;
display: inline-flex;
align-items: center;
justify-content: center;
}
17 changes: 12 additions & 5 deletions dashboard/src/components/task.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as s from "./task.module.css";
import { Fragment, useEffect, useMemo, useState } from "react";
import { TaskTag } from "./tag";
import { useAPI } from "../services/api";
import {FILTERS} from "./tasks";

type TaskProps = {
task: ITask
Expand Down Expand Up @@ -37,13 +38,13 @@ const Task = (props: TaskProps) => {
}

return (
<Panel shaded bordered className={s.Panel}>
<HStack alignItems={"flex-start"} justifyContent="space-between">
<Panel shaded borderLeft={"1px solid var(--rs-gray-700)"} className={s.Panel}>
<HStack alignItems={"flex-start"} justifyContent="space-between" className={s.TaskHeader}>
<VStack spacing={10} className={s.TitleStack}>
<HStack justifyContent="space-between" alignItems="center" spacing={14} className={s.TitleRow}>
<HStack spacing={12} alignItems="center" className={s.TitleLeft}>
<h4 className={s.TitleText}>{task.display_name}</h4>
<TaskTag size="lg" task={task}/>
<TaskTag size="lg" task={task} options={FILTERS}/>
</HStack>
</HStack>

Expand All @@ -55,10 +56,16 @@ const Task = (props: TaskProps) => {
</HStack>
{task.locks.length ? (
<HStack spacing={8} className={s.LockRow}>
<Text muted>Locks:</Text>
{task.locks.map(lock => {
return (
<Badge key={`${task.id}-${lock.name}`} color={lock.type === "WRITE" ? "red" : "green"} content={lock.type === "WRITE" ? "W" : "R"}>
<Tag size="md" className={s.LockTag}>{lock.name}</Tag>
<Badge
key={`${task.id}-${lock.name}`}
color={lock.type === "WRITE" ? "red" : "green"}
content={lock.type === "WRITE" ? "W" : "R"}
offset={[0, 0]}
>
<Tag size="md" className={s.LockTag} color={lock.poisoned ? "red" : null}>{lock.name}</Tag>
</Badge>
)
})}
Expand Down
30 changes: 30 additions & 0 deletions dashboard/src/components/tasks.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

.List {
margin-top: 1em;
flex: 1 1 auto;
min-height: 0;
overflow-y: auto;
}

.List > a:hover div:first-of-type > span {
Expand All @@ -20,22 +23,45 @@
padding: 1em;
height: 100%;
width: 100%;
box-sizing: border-box;
overflow-x: hidden;
min-height: 0;
}

.Row {
margin-inline: 0;
height: 100%;
}

.TasksColumn {
height: 100%;
min-height: 0;
}

.GridElement {
height: 100%;
min-height: 0;
}

.TasksPanel {
position: relative;
overflow: visible; /* because the popover needs some space outside */
min-height: 340px; /* because the dropdown needs some space */
height: 100%;
}

.TasksPanel :global(.rs-panel-body) {
height: 100%;
display: flex;
flex-direction: column;
min-height: 0;
box-sizing: border-box;
}

.HeaderRow {
flex-wrap: wrap;
gap: 12px;
width: 100%;
}

.Filters {
Expand All @@ -44,6 +70,10 @@
gap: 10px;
}

.ListRow {
width: 100%;
}

.Pagination {
padding: 1em 0;

Expand Down
Loading
Loading