Add task priority enum and rename priority to rank
The existing integer priority field represents positional ordering within a state, not semantic importance. Rename it to rank and introduce a new priority field with enum values URGENT, HIGH, MEDIUM and LOW across the entire stack. Rank is now scoped to (state, priority) so tasks are ordered within each priority group. A generated priority_rank column combines both fields into a single sortable integer for cursor pagination. Dragging a task across priority groups updates its priority automatically based on the drop position neighbors. The backend first moves the task to the new group then repositions it at the target rank. The migration defaults existing rows to MEDIUM priority and backfills ranks per (state, priority) group. Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
@@ -23,7 +23,10 @@ import {
|
||||
DurationPicker,
|
||||
Input,
|
||||
Label,
|
||||
Option,
|
||||
PriorityLevel,
|
||||
PropertyRow,
|
||||
Select,
|
||||
Textarea,
|
||||
useDialogRef,
|
||||
} from "@probo/ui";
|
||||
@@ -47,6 +50,7 @@ const taskFragment = graphql`
|
||||
id
|
||||
description
|
||||
name
|
||||
priority
|
||||
timeEstimate
|
||||
deadline
|
||||
assignedTo {
|
||||
@@ -87,9 +91,12 @@ export const taskUpdateMutation = graphql`
|
||||
}
|
||||
`;
|
||||
|
||||
export const taskPriorities = ["URGENT", "HIGH", "MEDIUM", "LOW"] as const;
|
||||
|
||||
const createTaskSchema = z.object({
|
||||
name: z.string().min(1),
|
||||
description: z.string().optional().nullable(),
|
||||
priority: z.enum(taskPriorities),
|
||||
timeEstimate: z.string().optional().nullable(),
|
||||
assignedToId: z.string().optional().nullable(),
|
||||
measureId: z.preprocess(
|
||||
@@ -102,6 +109,7 @@ const createTaskSchema = z.object({
|
||||
const updateTaskSchema = z.object({
|
||||
name: z.string().min(1),
|
||||
description: z.string().optional().nullable(),
|
||||
priority: z.enum(taskPriorities),
|
||||
timeEstimate: z.string().optional().nullable(),
|
||||
assignedToId: z.preprocess(
|
||||
val => (val === "" || val == null ? null : val),
|
||||
@@ -120,10 +128,11 @@ type Props = {
|
||||
connection?: string;
|
||||
ref?: DialogRef;
|
||||
measureId?: string;
|
||||
onCompleted?: () => void;
|
||||
};
|
||||
|
||||
export default function TaskFormDialog(props: Props) {
|
||||
const { children, connection, ref, task: taskKey, measureId } = props;
|
||||
const { children, connection, ref, task: taskKey, measureId, onCompleted } = props;
|
||||
const { __ } = useTranslate();
|
||||
const newRef = useDialogRef();
|
||||
const dialogRef = ref ?? newRef;
|
||||
@@ -145,6 +154,7 @@ export default function TaskFormDialog(props: Props) {
|
||||
defaultValues: {
|
||||
name: task?.name ?? "",
|
||||
description: task?.description ?? "",
|
||||
priority: task?.priority ?? "MEDIUM",
|
||||
timeEstimate: task?.timeEstimate ?? "",
|
||||
assignedToId: task?.assignedTo?.id ?? "",
|
||||
measureId: task?.measure?.id ?? measureId ?? "",
|
||||
@@ -160,12 +170,16 @@ export default function TaskFormDialog(props: Props) {
|
||||
taskId: task.id,
|
||||
name: data.name,
|
||||
description: data.description || null,
|
||||
priority: data.priority,
|
||||
timeEstimate: data.timeEstimate || null,
|
||||
deadline: formatDatetime(data.deadline) ?? null,
|
||||
assignedToId: data.assignedToId ?? null,
|
||||
measureId: data.measureId || null,
|
||||
},
|
||||
},
|
||||
onCompleted: (_response, errors) => {
|
||||
if (!errors) onCompleted?.();
|
||||
},
|
||||
});
|
||||
} else {
|
||||
await mutate({
|
||||
@@ -174,6 +188,7 @@ export default function TaskFormDialog(props: Props) {
|
||||
organizationId,
|
||||
name: data.name,
|
||||
description: data.description || null,
|
||||
priority: data.priority,
|
||||
timeEstimate: data.timeEstimate || null,
|
||||
deadline: formatDatetime(data.deadline) ?? null,
|
||||
assignedToId: data.assignedToId || null,
|
||||
@@ -182,8 +197,11 @@ export default function TaskFormDialog(props: Props) {
|
||||
connections: [connection!],
|
||||
},
|
||||
onCompleted: (_response, errors) => {
|
||||
if (!errors && data.measureId) {
|
||||
updateStoreCounter(relayEnv, data.measureId, "tasks(first:0)", 1);
|
||||
if (!errors) {
|
||||
if (data.measureId) {
|
||||
updateStoreCounter(relayEnv, data.measureId, "tasks(first:0)", 1);
|
||||
}
|
||||
onCompleted?.();
|
||||
}
|
||||
},
|
||||
});
|
||||
@@ -224,6 +242,46 @@ export default function TaskFormDialog(props: Props) {
|
||||
{/* Properties form */}
|
||||
<div className="py-5 px-6 bg-subtle">
|
||||
<Label>{__("Properties")}</Label>
|
||||
<PropertyRow
|
||||
label={__("Priority")}
|
||||
error={formState.errors.priority?.message}
|
||||
>
|
||||
<Controller
|
||||
name="priority"
|
||||
control={control}
|
||||
render={({ field }) => (
|
||||
<Select
|
||||
value={field.value}
|
||||
onValueChange={field.onChange}
|
||||
>
|
||||
<Option value="URGENT">
|
||||
<span className="flex items-center gap-2">
|
||||
<PriorityLevel level="URGENT" />
|
||||
{__("Urgent")}
|
||||
</span>
|
||||
</Option>
|
||||
<Option value="HIGH">
|
||||
<span className="flex items-center gap-2">
|
||||
<PriorityLevel level="HIGH" />
|
||||
{__("High")}
|
||||
</span>
|
||||
</Option>
|
||||
<Option value="MEDIUM">
|
||||
<span className="flex items-center gap-2">
|
||||
<PriorityLevel level="MEDIUM" />
|
||||
{__("Medium")}
|
||||
</span>
|
||||
</Option>
|
||||
<Option value="LOW">
|
||||
<span className="flex items-center gap-2">
|
||||
<PriorityLevel level="LOW" />
|
||||
{__("Low")}
|
||||
</span>
|
||||
</Option>
|
||||
</Select>
|
||||
)}
|
||||
/>
|
||||
</PropertyRow>
|
||||
<PropertyRow
|
||||
label={__("Assigned to")}
|
||||
error={formState.errors.assignedToId?.message}
|
||||
|
||||
Reference in New Issue
Block a user