Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dashboard/src/components/task.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Task = (props: TaskProps) => {
const [confirming, setConfirming] = useState(false);
const [confirmError, setConfirmError] = useState<string | null>(null);

const needsValidation = task.status.state === "NEEDS_USER_VALIDATION" || task.status.state === "NEEDSUSERVALIDATION";
const needsValidation = task.status.state === "NEEDS_USER_VALIDATION";

const onConfirm = async () => {
try {
Expand Down
4 changes: 2 additions & 2 deletions vicky/src/lib/database/entities/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ use crate::database::entities::task::db_impl::DbTask;
FromSqlRow,
AsExpression,
)]
#[serde(rename_all = "UPPERCASE")]
#[strum(serialize_all = "UPPERCASE")]
#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
#[strum(serialize_all = "SCREAMING_SNAKE_CASE")]
#[diesel(sql_type = db_impl::LockKindSqlType)]
pub enum LockKind {
Read,
Expand Down
4 changes: 2 additions & 2 deletions vicky/src/lib/database/entities/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ pub const HEARTBEAT_TIMEOUT_SEC: i64 = 60;
pub const EXPECTED_HEARTBEAT_INTERVAL_SEC: i64 = 15;

#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, clap::ValueEnum)]
#[serde(tag = "result", rename_all = "UPPERCASE")]
#[serde(tag = "result", rename_all = "SCREAMING_SNAKE_CASE")]
pub enum TaskResult {
Success,
Error,
Timeout,
}

#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, FromSqlRow, AsExpression)]
#[serde(tag = "state", rename_all = "UPPERCASE")]
#[serde(tag = "state", rename_all = "SCREAMING_SNAKE_CASE")]
#[diesel(sql_type = db_impl::TaskStatusSqlType)]
pub enum TaskStatus {
NeedsUserValidation,
Expand Down
Loading