fix(company-input-v2): dropdown UX cleanup, clear-icon, canonical-case fixes

package.json

@@ -25,6 +25,9 @@
     "@mui/icons-material": "^7.3.9",
     "@mui/material": "^5.15.20",
     "@react-pdf/renderer": "^3.1.11",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^11.2.7",
+    "@testing-library/user-event": "^13.5.0",
     "awesome-bootstrap-checkbox": "^1.0.1",
     "babel-cli": "^6.26.0",
     "babel-jest": "^28.1.0",

src/components/inputs/__tests__/company-input-v2.test.js

@@ -0,0 +1,247 @@
+/**
+ * @jest-environment jsdom
+ *
+ * Copyright 2025 OpenStack Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+import React from "react";
+import { render, screen, fireEvent, waitFor, act } from "@testing-library/react";
+import "@testing-library/jest-dom";
+
+import CompanyInputV2, {
+    isCompanyObject,
+    isExistingCompany,
+    isNewCompany,
+    findExistingByName,
+    normalizeCompanyValue
+} from "../company-input-v2";
+
+// Mock the API helper so tests can drive the callback synchronously.
+jest.mock("../../../utils/query-actions", () => ({
+    queryRegistrationCompanies: jest.fn()
+}));
+// eslint-disable-next-line import/first
+import { queryRegistrationCompanies } from "../../../utils/query-actions";
+
+describe("isCompanyObject", () => {
+    it("returns true for objects with a name string", () => {
+        expect(isCompanyObject({ name: "Tipit" })).toBe(true);
+        expect(isCompanyObject({ id: 5, name: "Tipit" })).toBe(true);
+        expect(isCompanyObject({ id: 0, name: "" })).toBe(true);
+    });
+
+    it("returns false for non-objects or objects missing a name string", () => {
+        expect(isCompanyObject(null)).toBe(false);
+        expect(isCompanyObject(undefined)).toBe(false);
+        expect(isCompanyObject("Tipit")).toBe(false);
+        expect(isCompanyObject(5)).toBe(false);
+        expect(isCompanyObject({})).toBe(false);
+        expect(isCompanyObject({ name: 5 })).toBe(false);
+        expect(isCompanyObject({ name: null })).toBe(false);
+    });
+});
+
+describe("isExistingCompany", () => {
+    it("returns true when the object has a positive id and name string", () => {
+        expect(isExistingCompany({ id: 1, name: "Tipit" })).toBe(true);
+        expect(isExistingCompany({ id: 999, name: "Tipco" })).toBe(true);
+    });
+
+    it("returns false for free-text entries (id === 0)", () => {
+        expect(isExistingCompany({ id: 0, name: "Acme" })).toBe(false);
+    });
+
+    it("returns false for non-objects, missing/zero id, or missing name", () => {
+        expect(isExistingCompany(null)).toBe(false);
+        expect(isExistingCompany({ name: "Tipit" })).toBe(false); // no id
+        expect(isExistingCompany({ id: -1, name: "Tipit" })).toBe(false);
+        expect(isExistingCompany({ id: 5 })).toBe(false); // no name
+    });
+});
+
+describe("isNewCompany", () => {
+    it("returns true for free-text entries with a non-empty name", () => {
+        expect(isNewCompany({ id: 0, name: "Acme" })).toBe(true);
+        expect(isNewCompany({ id: 0, name: "  Acme  " })).toBe(true);
+    });
+
+    it("returns false for existing companies (id > 0)", () => {
+        expect(isNewCompany({ id: 1, name: "Tipit" })).toBe(false);
+    });
+
+    it("returns false for empty or whitespace-only names", () => {
+        expect(isNewCompany({ id: 0, name: "" })).toBe(false);
+        expect(isNewCompany({ id: 0, name: "   " })).toBe(false);
+    });
+
+    it("returns false for non-objects or missing name", () => {
+        expect(isNewCompany(null)).toBe(false);
+        expect(isNewCompany({ id: 0 })).toBe(false);
+        expect(isNewCompany("Acme")).toBe(false);
+    });
+});
+
+describe("findExistingByName", () => {
+    const existing = [
+        { id: 1, name: "Tipit" },
+        { id: 2, name: "Tipco" },
+        { id: 3, name: "ACME Corp" }
+    ];
+
+    it("returns the matching existing company when name matches case-insensitively", () => {
+        expect(findExistingByName(existing, "tipit")).toEqual({ id: 1, name: "Tipit" });
+        expect(findExistingByName(existing, "TIPCO")).toEqual({ id: 2, name: "Tipco" });
+        expect(findExistingByName(existing, "  acme corp  ")).toEqual({ id: 3, name: "ACME Corp" });
+    });
+
+    it("returns null when no existing company matches", () => {
+        expect(findExistingByName(existing, "Nonexistent")).toBeNull();
+    });
+
+    it("returns null for empty/missing inputs", () => {
+        expect(findExistingByName(existing, "")).toBeNull();
+        expect(findExistingByName(existing, "   ")).toBeNull();
+        expect(findExistingByName(existing, undefined)).toBeNull();
+        expect(findExistingByName(null, "Tipit")).toBeNull();
+    });
+
+    it("ignores free-text entries (id === 0) when searching", () => {
+        const mixed = [
+            { id: 0, name: "tipit" },          // free-text entry
+            { id: 1, name: "Tipit" }            // real company
+        ];
+        // Should pick the real one even though the free-text comes first
+        expect(findExistingByName(mixed, "tipit")).toEqual({ id: 1, name: "Tipit" });
+    });
+
+    it("returns null when only free-text entries are present", () => {
+        const freeTextOnly = [{ id: 0, name: "Acme" }];
+        expect(findExistingByName(freeTextOnly, "Acme")).toBeNull();
+    });
+});
+
+describe("normalizeCompanyValue", () => {
+    it("returns the value unchanged when it has a real name", () => {
+        const v = { id: 1, name: "Tipit" };
+        expect(normalizeCompanyValue(v)).toBe(v);
+        expect(normalizeCompanyValue("Tipit")).toBe("Tipit");
+    });
+
+    it("returns null for null/undefined", () => {
+        expect(normalizeCompanyValue(null)).toBeNull();
+        expect(normalizeCompanyValue(undefined)).toBeNull();
+    });
+
+    it("returns null for empty strings", () => {
+        expect(normalizeCompanyValue("")).toBeNull();
+        expect(normalizeCompanyValue("   ")).toBeNull();
+    });
+
+    it("returns null for objects with no name or empty name", () => {
+        expect(normalizeCompanyValue({})).toBeNull();
+        expect(normalizeCompanyValue({ id: 5 })).toBeNull();
+        expect(normalizeCompanyValue({ id: 0, name: "" })).toBeNull();
+        expect(normalizeCompanyValue({ id: 0, name: "   " })).toBeNull();
+    });
+});
+
+describe("CompanyInputV2 integration", () => {
+    beforeEach(() => {
+        queryRegistrationCompanies.mockReset();
+    });
+
+    // Helper: render the component inside a controlled wrapper so we can react
+    // to onChange the same way a real form would (updating `value`).
+    const renderControlled = ({ initialValue = null, onChange } = {}) => {
+        let setValue;
+        const Wrapper = () => {
+            const [value, _setValue] = React.useState(initialValue);
+            setValue = _setValue;
+            return (
+                <CompanyInputV2
+                    summitId={1}
+                    name="company"
+                    value={value}
+                    onChange={(ev) => {
+                        if (onChange) onChange(ev);
+                        // Mirror what a real form does: write the value back.
+                        _setValue(ev.target.value);
+                    }}
+                />
+            );
+        };
+        const utils = render(<Wrapper />);
+        return { ...utils, getValue: () => setValue };
+    };
+
+    it("on blur commits the canonical existing match when the typed text matches case-insensitively", () => {
+        // Capture the API callback so we can resolve it manually.
+        let resolveQuery;
+        queryRegistrationCompanies.mockImplementation((_summitId, _input, cb) => {
+            resolveQuery = cb;
+        });
+
+        const onChange = jest.fn();
+        renderControlled({ onChange });
+        const input = screen.getByRole("combobox");
+
+        // Type "tipit": triggers onInputChange -> effect -> queryRegistrationCompanies
+        fireEvent.change(input, { target: { value: "tipit" } });
+        // Resolve the API with the canonical company.
+        act(() => { resolveQuery([{ id: 1, name: "Tipit" }]); });
+
+        // Blur: autoSelect commits the typed string; our onChange handler maps
+        // it to the canonical option via findExistingByName.
+        fireEvent.blur(input);
+
+        // Find the call where the canonical value landed.
+        const committed = onChange.mock.calls
+            .map((c) => c[0].target.value)
+            .find((v) => v && typeof v === "object" && v.id === 1);
+        expect(committed).toEqual({ id: 1, name: "Tipit" });
+    });
+
+    it("auto-replaces a free-text commit with the canonical match when the API response arrives after blur", () => {
+        // Withhold the API callback to simulate the network being slower than blur.
+        let resolveQuery;
+        queryRegistrationCompanies.mockImplementation((_summitId, _input, cb) => {
+            resolveQuery = cb;
+        });
+
+        const onChange = jest.fn();
+        // Start with the free-text commit already in place (what happens when
+        // blur fires before the response).
+        renderControlled({ initialValue: { id: 0, name: "tipit" }, onChange });
+        const input = screen.getByRole("combobox");
+
+        // Type to populate inputValue so the effect kicks in.
+        fireEvent.change(input, { target: { value: "tipit" } });
+
+        // Now the response arrives with the canonical option.
+        act(() => { resolveQuery([{ id: 1, name: "Tipit" }]); });
+
+        // The component should have called onChange with the canonical option.
+        const promoted = onChange.mock.calls
+            .map((c) => c[0].target.value)
+            .find((v) => v && typeof v === "object" && v.id === 1);
+        expect(promoted).toEqual({ id: 1, name: "Tipit" });
+    });
+
+    it("does not render the clear icon when the value is an empty-name object", () => {
+        queryRegistrationCompanies.mockImplementation(() => {});
+        render(
+            <CompanyInputV2
+                summitId={1}
+                name="company"
+                value={{ id: 0, name: "" }}
+                onChange={() => {}}
+            />
+        );
+        // MUI's clear button uses aria-label="Clear".
+        expect(screen.queryByLabelText("Clear")).not.toBeInTheDocument();
+    });
+});