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): clear obsolete selections in task creation

Tinda9e7e732e02
diff --git a/apps/web/src/components/shared/modals/create-task-modal.test.tsx b/apps/web/src/components/shared/modals/create-task-modal.test.tsx
index ac3bb9eee..32ece308b 100644
--- a/apps/web/src/components/shared/modals/create-task-modal.test.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.test.tsx
@@ -157,39 +157,43 @@ vi.mock("react-i18next", () => ({
}));
describe("CreateTaskModal", () => {
- it("removes newly hidden selections from an open creation form", async () => {
- useLocation.mockReturnValue({
- pathname: "/dashboard/workspace/workspace-1/project/project-1/board",
- });
- customFields = [
- {
- id: "people",
- name: "People",
- type: "multiselect",
- options: ["Former", "Current"],
- hiddenOptions: [],
- defaultValue: '["Former","Current"]',
- required: false,
- },
- ];
- const view = render(<CreateTaskModal open onClose={vi.fn()} />, {
- wrapper: createWrapper(),
- });
- enterTitle();
- customFields = customFields.map((field) => ({
- ...field,
- hiddenOptions: ["Former"],
- }));
- view.rerender(<CreateTaskModal open onClose={vi.fn()} />);
- await act(async () => {
- submit();
- });
- expect(createTask).toHaveBeenCalledWith(
- expect.objectContaining({
- customFields: [{ fieldId: "people", value: '["Current"]' }],
- }),
- );
- });
+ it.each(["hidden", "renamed"])(
+ "removes %s selections from an open creation form",
+ async (change) => {
+ useLocation.mockReturnValue({
+ pathname: "/dashboard/workspace/workspace-1/project/project-1/board",
+ });
+ customFields = [
+ {
+ id: "people",
+ name: "People",
+ type: "multiselect",
+ options: ["Former", "Current"],
+ hiddenOptions: [],
+ defaultValue: '["Former","Current"]',
+ required: false,
+ },
+ ];
+ const view = render(<CreateTaskModal open onClose={vi.fn()} />, {
+ wrapper: createWrapper(),
+ });
+ enterTitle();
+ customFields = customFields.map((field) => ({
+ ...field,
+ hiddenOptions: change === "hidden" ? ["Former"] : [],
+ options: change === "renamed" ? ["Renamed", "Current"] : field.options,
+ }));
+ view.rerender(<CreateTaskModal open onClose={vi.fn()} />);
+ await act(async () => {
+ submit();
+ });
+ expect(createTask).toHaveBeenCalledWith(
+ expect.objectContaining({
+ customFields: [{ fieldId: "people", value: '["Current"]' }],
+ }),
+ );
+ },
+ );
it("keeps unsaved input while discard confirmation is open", async () => {
useLocation.mockReturnValue({
diff --git a/apps/web/src/components/shared/modals/create-task-modal.tsx b/apps/web/src/components/shared/modals/create-task-modal.tsx
index 293af28ca..fef4678a2 100644
--- a/apps/web/src/components/shared/modals/create-task-modal.tsx
+++ b/apps/web/src/components/shared/modals/create-task-modal.tsx
@@ -315,18 +315,17 @@ function CreateTaskModalContent({
customFields.map((field) => {
let value = previousValues[field.id] ?? field.defaultValue ?? "";
const hidden = field.hiddenOptions ?? [];
- if (
- hidden.length &&
- field.type === "dropdown" &&
- hidden.includes(value)
- ) {
+ const visibleOptions = (field.options ?? []).filter(
+ (option) => !hidden.includes(option),
+ );
+ if (field.type === "dropdown" && !visibleOptions.includes(value)) {
value = "";
- } else if (hidden.length && field.type === "multiselect" && value) {
+ } else if (field.type === "multiselect" && value) {
try {
const selected: unknown = JSON.parse(value);
if (Array.isArray(selected)) {
value = JSON.stringify(
- selected.filter((option) => !hidden.includes(option)),
+ selected.filter((option) => visibleOptions.includes(option)),
);
}
} catch {