Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(custom-fields): reconcile backlog and normalize dropdown choices

Tin8f03cbd6bef9
diff --git a/apps/api/src/custom-field/controllers/create-custom-field.ts b/apps/api/src/custom-field/controllers/create-custom-field.ts
index 141a05116..5a982696c 100644
--- a/apps/api/src/custom-field/controllers/create-custom-field.ts
+++ b/apps/api/src/custom-field/controllers/create-custom-field.ts
@@ -19,7 +19,7 @@ async function createCustomField(
type: string,
required: boolean,
defaultValue?: string,
- options?: string[],
+ inputOptions?: string[],
) {
if (!name.trim())
throw new HTTPException(400, { message: "Name cannot be empty" });
@@ -45,6 +45,15 @@ async function createCustomField(
});
}
+ const options =
+ type === "dropdown"
+ ? Array.from(
+ new Set(
+ (inputOptions ?? []).map((option) => option.trim()).filter(Boolean),
+ ),
+ )
+ : inputOptions;
+
if (defaultValue !== undefined && defaultValue !== null) {
const trimmedValue = defaultValue.trim();
@@ -78,8 +87,7 @@ async function createCustomField(
}
} else if (type === "dropdown") {
if (options && options.length > 0) {
- const normalizedOptions = options.map((opt) => opt.trim());
- if (!normalizedOptions.includes(trimmedValue)) {
+ if (!options.includes(trimmedValue)) {
throw new HTTPException(400, {
message: "Default value must be one of the dropdown options",
});
diff --git a/apps/api/src/custom-field/controllers/update-custom-field.ts b/apps/api/src/custom-field/controllers/update-custom-field.ts
index 05d53da74..0dbdf3476 100644
--- a/apps/api/src/custom-field/controllers/update-custom-field.ts
+++ b/apps/api/src/custom-field/controllers/update-custom-field.ts
@@ -94,7 +94,8 @@ export default async function updateCustomField(
}
return replacement;
};
- if (field.type === "dropdown") return replace(value.trim());
+ if (field.type === "dropdown")
+ return replace(replacements.has(value) ? value : value.trim());
let selected: unknown;
try {
selected = JSON.parse(value);
diff --git a/apps/web/src/hooks/use-valid-custom-field-filters.test.tsx b/apps/web/src/hooks/use-valid-custom-field-filters.test.tsx
index 5496a44c1..db0c41bf8 100644
--- a/apps/web/src/hooks/use-valid-custom-field-filters.test.tsx
+++ b/apps/web/src/hooks/use-valid-custom-field-filters.test.tsx
@@ -2,7 +2,10 @@ import { renderHook, waitFor } from "@testing-library/react";
import { useState } from "react";
import { describe, expect, it, vi } from "vitest";
import type { BoardFilters } from "./use-task-filters";
-import { useValidCustomFieldFilters } from "./use-valid-custom-field-filters";
+import {
+ reconcileCustomFieldFilters,
+ useValidCustomFieldFilters,
+} from "./use-valid-custom-field-filters";
let fields:
| { id: string; type: string; options: string[]; hiddenOptions: string[] }[]
@@ -11,6 +14,15 @@ vi.mock("./queries/custom-field/use-get-custom-fields-by-project", () => ({
default: () => ({ data: fields }),
}));
describe("persisted custom field filters", () => {
+ it("reconciles the backlog's non-null filter map without changing empty state", () => {
+ const empty = {};
+ expect(reconcileCustomFieldFilters(empty, [])).toBe(empty);
+ expect(
+ reconcileCustomFieldFilters({ people: ["Old"] }, [
+ { id: "people", type: "dropdown", options: ["New"] },
+ ]) ?? {},
+ ).toEqual({});
+ });
it("drops obsolete choices after loading or renaming while retaining historical hidden choices", async () => {
fields = undefined;
const { result, rerender } = renderHook(() => {
diff --git a/apps/web/src/hooks/use-valid-custom-field-filters.ts b/apps/web/src/hooks/use-valid-custom-field-filters.ts
index bffd9be09..35a513ac9 100644
--- a/apps/web/src/hooks/use-valid-custom-field-filters.ts
+++ b/apps/web/src/hooks/use-valid-custom-field-filters.ts
@@ -11,26 +11,35 @@ export function useValidCustomFieldFilters(
useEffect(() => {
if (!fields) return;
setFilters((previous) => {
- if (!previous.customFields) return previous;
- const next = Object.fromEntries(
- Object.entries(previous.customFields).flatMap(([id, values]) => {
- const field = fields.find((candidate) => candidate.id === id);
- if (!field || !Array.isArray(values)) return [];
- const options = field.options;
- const valid =
- (field.type === "dropdown" || field.type === "multiselect") &&
- Array.isArray(options)
- ? values.filter((value) => options.includes(value))
- : values;
- return valid.length ? [[id, valid]] : [];
- }),
+ const customFields = reconcileCustomFieldFilters(
+ previous.customFields,
+ fields,
);
- if (JSON.stringify(next) === JSON.stringify(previous.customFields))
- return previous;
- return {
- ...previous,
- customFields: Object.keys(next).length ? next : null,
- };
+ return customFields === previous.customFields
+ ? previous
+ : { ...previous, customFields };
});
}, [fields, setFilters]);
}
+
+export function reconcileCustomFieldFilters(
+ current: Record<string, string[]> | null,
+ fields: { id: string; type: string; options: unknown }[],
+): Record<string, string[]> | null {
+ if (!current) return current;
+ const next = Object.fromEntries(
+ Object.entries(current).flatMap(([id, values]) => {
+ const field = fields.find((candidate) => candidate.id === id);
+ if (!field || !Array.isArray(values)) return [];
+ const options = field.options;
+ const valid =
+ (field.type === "dropdown" || field.type === "multiselect") &&
+ Array.isArray(options)
+ ? values.filter((value) => options.includes(value))
+ : values;
+ return valid.length ? [[id, valid]] : [];
+ }),
+ );
+ if (JSON.stringify(next) === JSON.stringify(current)) return current;
+ return Object.keys(next).length ? next : null;
+}
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx
index e0ba02788..c729a09c0 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/backlog.tsx
@@ -35,6 +35,7 @@ import { useGetTasks } from "@/hooks/queries/task/use-get-tasks";
import { useGetActiveWorkspaceUsers } from "@/hooks/queries/workspace-users/use-get-active-workspace-users";
import { useRegisterShortcuts } from "@/hooks/use-keyboard-shortcuts";
import { DUE_DATE_FILTER_VALUES } from "@/hooks/use-task-filters";
+import { reconcileCustomFieldFilters } from "@/hooks/use-valid-custom-field-filters";
import { getInitials } from "@/lib/get-initials";
import { getPriorityLabel } from "@/lib/i18n/domain";
import { resolveLabelColor } from "@/lib/label-color";
@@ -140,6 +141,18 @@ function RouteComponent() {
customFields: {} as Record<string, string[]>,
});
+ useEffect(() => {
+ setFilters((previous) => {
+ const customFields = reconcileCustomFieldFilters(
+ previous.customFields,
+ rawCustomFields,
+ );
+ return customFields === previous.customFields
+ ? previous
+ : { ...previous, customFields: customFields ?? {} };
+ });
+ }, [rawCustomFields]);
+
const updateFilter = (key: string, value: string | null) => {
setFilters((prev) => ({ ...prev, [key]: value }));
};
diff --git a/tests/api-integration/custom-field-edit.test.ts b/tests/api-integration/custom-field-edit.test.ts
index 561d0483d..c235d086b 100644
--- a/tests/api-integration/custom-field-edit.test.ts
+++ b/tests/api-integration/custom-field-edit.test.ts
@@ -69,6 +69,38 @@ async function fixture(type = "multiselect", role = "admin") {
}
describe("custom field editing", () => {
+ it("stores canonical dropdown options and defaults for subsequent task creation", async () => {
+ const { app, project } = await fixture();
+ const created = await app.request("/api/custom-field", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ projectId: project.id,
+ name: "Spaced",
+ type: "dropdown",
+ required: false,
+ options: [" Alice ", "Alice", " ", "Bob"],
+ defaultValue: " Alice ",
+ }),
+ });
+ expect(created.status, await created.clone().text()).toBe(200);
+ expect(await created.json()).toMatchObject({
+ options: ["Alice", "Bob"],
+ defaultValue: "Alice",
+ });
+ const task = await app.request(`/api/task/${project.id}`, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ title: "Uses defaults",
+ description: "",
+ priority: "no-priority",
+ status: "to-do",
+ }),
+ });
+ expect(task.status, await task.clone().text()).toBe(200);
+ });
+
it("normalizes legacy dropdown defaults before renaming options", async () => {
const { field, update } = await fixture("dropdown");
await db