⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
fix(task): load sidebar status metadata from columns and restore default status i18n
Tin7d65de722db0
diff --git a/apps/web/src/components/task/subtask-status-popover.tsx b/apps/web/src/components/task/subtask-status-popover.tsxindex a9941b364..10dbc803f 100644--- a/apps/web/src/components/task/subtask-status-popover.tsx+++ b/apps/web/src/components/task/subtask-status-popover.tsx@@ -12,6 +12,7 @@ import { useUpdateTaskStatus } from "@/hooks/mutations/task/use-update-task-statimport { useGetColumns } from "@/hooks/queries/column/use-get-columns";import { useNumberedShortcuts } from "@/hooks/use-numbered-shortcuts";import { getColumnIcon } from "@/lib/column";+import { getStatusDisplayLabel } from "@/lib/i18n/domain";import { toast } from "@/lib/toast";import type Task from "@/types/task";@@ -87,7 +88,9 @@ export default function SubtaskStatusPopover({onClick={() => handleStatusChange(status.value)}>{getColumnIcon(status.value, status.isFinal)}- <span className="text-sm">{status.label}</span>+ <span className="text-sm">+ {getStatusDisplayLabel(status.value, status.label)}+ </span>{currentStatus === status.value ? (<Check className="ml-auto h-4 w-4" />) : (diff --git a/apps/web/src/components/task/task-properties-sidebar.tsx b/apps/web/src/components/task/task-properties-sidebar.tsxindex b042f8a09..58804c479 100644--- a/apps/web/src/components/task/task-properties-sidebar.tsx+++ b/apps/web/src/components/task/task-properties-sidebar.tsx@@ -22,6 +22,7 @@ import labelColors from "@/constants/label-colors";import useGetGiteaIntegration from "@/hooks/queries/gitea-integration/use-get-gitea-integration";import useGetGithubIntegration from "@/hooks/queries/github-integration/use-get-github-integration";import useGetLabelsByTask from "@/hooks/queries/label/use-get-labels-by-task";+import { useGetColumns } from "@/hooks/queries/column/use-get-columns";import useGetProject from "@/hooks/queries/project/use-get-project";import useGetProjects from "@/hooks/queries/project/use-get-projects";import useGetTask from "@/hooks/queries/task/use-get-task";@@ -30,7 +31,7 @@ import { cn } from "@/lib/cn";import { getColumnIcon } from "@/lib/column";import { dueDateStatusColors, getDueDateStatus } from "@/lib/due-date-status";import { formatDateShort } from "@/lib/format";-import { getPriorityLabel, getStatusLabel } from "@/lib/i18n/domain";+import { getPriorityLabel, getStatusDisplayLabel } from "@/lib/i18n/domain";import { getPriorityIcon } from "@/lib/priority";import { toast } from "@/lib/toast";import TaskAssigneePopover from "./task-assignee-popover";@@ -81,6 +82,7 @@ export default function TaskPropertiesSidebar({const { t } = useTranslation();const { data: task } = useGetTask(taskId ?? "");const { data: project } = useGetProject({ id: projectId, workspaceId });+ const { data: columns = [] } = useGetColumns(projectId);const { data: workspaceUsers } = useGetActiveWorkspaceUsers(workspaceId);const { data: taskLabels = [] } = useGetLabelsByTask(taskId ?? "");const { data: githubIntegration } = useGetGithubIntegration(projectId);@@ -88,10 +90,10 @@ export default function TaskPropertiesSidebar({const { data: workspaceProjects = [] } = useGetProjects({ workspaceId });const canMoveTask =Boolean(task) && workspaceProjects.some((p) => p.id !== task?.projectId);- const statusColumn = project?.columns?.find(- (column) => column.id === task?.status,+ const statusColumn = columns.find(+ (column) => column.slug === task?.status || column.id === task?.status,);- const statusLabel = statusColumn?.name || getStatusLabel(task?.status ?? "");+ const statusLabel = getStatusDisplayLabel(task?.status ?? "", statusColumn?.name);const statusIsFinal = statusColumn?.isFinal ?? false;const projectSlug = project?.slug;diff --git a/apps/web/src/components/task/task-status-popover.tsx b/apps/web/src/components/task/task-status-popover.tsxindex 80b59ea71..b04f5375c 100644--- a/apps/web/src/components/task/task-status-popover.tsx+++ b/apps/web/src/components/task/task-status-popover.tsx@@ -11,6 +11,7 @@ import { ShortcutNumber } from "@/components/ui/shortcut-number";import { useUpdateTaskStatus } from "@/hooks/mutations/task/use-update-task-status";import { useNumberedShortcuts } from "@/hooks/use-numbered-shortcuts";import { getColumnIcon } from "@/lib/column";+import { getStatusDisplayLabel } from "@/lib/i18n/domain";import { toast } from "@/lib/toast";import useProjectStore from "@/store/project";import type Task from "@/types/task";@@ -78,7 +79,9 @@ export default function TaskStatusPopover({onClick={() => handleStatusChange(status.value)}>{getColumnIcon(status.value, status.isFinal)}- <span className="text-sm">{status.label}</span>+ <span className="text-sm">+ {getStatusDisplayLabel(status.value, status.label)}+ </span>{task.status === status.value ? (<Check className="ml-auto h-4 w-4" />) : (diff --git a/apps/web/src/lib/i18n/domain.ts b/apps/web/src/lib/i18n/domain.tsindex 0e669715c..0c6adf94c 100644--- a/apps/web/src/lib/i18n/domain.ts+++ b/apps/web/src/lib/i18n/domain.ts@@ -1,4 +1,5 @@import i18n from "i18next";+import { DEFAULT_COLUMNS } from "@/constants/columns";export function getStatusLabel(status: string) {return i18n.t(`tasks:status.${status}`, {@@ -6,6 +7,20 @@ export function getStatusLabel(status: string) {});}+export function getStatusDisplayLabel(status: string, columnName?: string) {+ const defaultName = DEFAULT_COLUMNS.find((column) => column.id === status)?.name;++ if (columnName) {+ if (defaultName && columnName === defaultName) {+ return getStatusLabel(status);+ }++ return columnName;+ }++ return getStatusLabel(status);+}+export function getPriorityLabel(priority: string) {return i18n.t(`tasks:priority.${priority}`, {defaultValue: toDisplayCase(priority),