From b58faae70d3b5a65cc5edb1fe2864dd79ee075db Mon Sep 17 00:00:00 2001
From: "Anna (Anya) Parker" <50943381+anna-parker@users.noreply.github.com>
Date: Thu, 2 Jan 2025 16:47:52 +0100
Subject: [PATCH] feat(components): add option to delete input of text-input
 and lineage-filter input with x and sort text-input datalist options

---
 .../lineageFilter/lineage-filter.stories.tsx  | 34 +++++++++++++++
 .../preact/lineageFilter/lineage-filter.tsx   | 42 ++++++++++++++-----
 .../preact/textInput/fetchAutocompleteList.ts |  2 +-
 .../preact/textInput/text-input.stories.tsx   | 21 +++++++++-
 .../src/preact/textInput/text-input.tsx       | 42 ++++++++++++++-----
 5 files changed, 118 insertions(+), 23 deletions(-)

diff --git a/components/src/preact/lineageFilter/lineage-filter.stories.tsx b/components/src/preact/lineageFilter/lineage-filter.stories.tsx
index 3ce4a033..647aa1b6 100644
--- a/components/src/preact/lineageFilter/lineage-filter.stories.tsx
+++ b/components/src/preact/lineageFilter/lineage-filter.stories.tsx
@@ -1,4 +1,5 @@
 import { type Meta, type StoryObj } from '@storybook/preact';
+import { expect, fireEvent, fn, waitFor, within } from '@storybook/test';
 
 import { LineageFilter, type LineageFilterProps } from './lineage-filter';
 import { previewHandles } from '../../../.storybook/preview';
@@ -55,6 +56,39 @@ export const Default: StoryObj<LineageFilterProps> = {
     ),
 };
 
+export const WithInitialValue: StoryObj<LineageFilterProps> = {
+    ...Default,
+    args: {
+        ...Default.args,
+        initialValue: 'XCB',
+    },
+    play: async ({ canvasElement, step }) => {
+        const canvas = within(canvasElement);
+
+        const changedListenerMock = fn();
+        await step('Setup event listener mock', async () => {
+            canvasElement.addEventListener('gs-lineage-filter-changed', changedListenerMock);
+        });
+
+        await waitFor(() => {
+            const input = canvas.getByPlaceholderText('Enter lineage', { exact: false });
+            expect(input).toHaveValue('XCB');
+        });
+
+        await step('Remove initial value', async () => {
+            await fireEvent.click(canvas.getByRole('button', { name: '✕' }));
+
+            await expect(changedListenerMock).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    detail: {
+                        host: undefined,
+                    },
+                }),
+            );
+        });
+    },
+};
+
 export const WithNoLapisField: StoryObj<LineageFilterProps> = {
     ...Default,
     args: {
diff --git a/components/src/preact/lineageFilter/lineage-filter.tsx b/components/src/preact/lineageFilter/lineage-filter.tsx
index 537eed66..9f932407 100644
--- a/components/src/preact/lineageFilter/lineage-filter.tsx
+++ b/components/src/preact/lineageFilter/lineage-filter.tsx
@@ -1,5 +1,5 @@
 import { type FunctionComponent } from 'preact';
-import { useContext, useRef } from 'preact/hooks';
+import { useContext, useRef, useState } from 'preact/hooks';
 import z from 'zod';
 
 import { fetchLineageAutocompleteList } from './fetchLineageAutocompleteList';
@@ -45,6 +45,9 @@ const LineageFilterInner: FunctionComponent<LineageFilterInnerProps> = ({
 
     const inputRef = useRef<HTMLInputElement>(null);
 
+    const [hasInput, setHasInput] = useState<boolean>(!!initialValue);
+    const [inputValue, setInputValue] = useState(initialValue || '');
+
     const { data, error, isLoading } = useQuery(
         () => fetchLineageAutocompleteList(lapis, lapisField),
         [lapisField, lapis],
@@ -73,6 +76,8 @@ const LineageFilterInner: FunctionComponent<LineageFilterInnerProps> = ({
                     composed: true,
                 }),
             );
+            setHasInput(value !== undefined);
+            setInputValue(value || '');
         }
     };
 
@@ -85,15 +90,32 @@ const LineageFilterInner: FunctionComponent<LineageFilterInnerProps> = ({
 
     return (
         <>
-            <input
-                type='text'
-                class='input input-bordered w-full'
-                placeholder={placeholderText !== undefined ? placeholderText : lapisField}
-                onInput={onInput}
-                ref={inputRef}
-                list={lapisField}
-                value={initialValue}
-            />
+            <div className='relative w-full'>
+                <input
+                    type='text'
+                    class='input input-bordered w-full pr-10'
+                    placeholder={placeholderText !== undefined ? placeholderText : lapisField}
+                    onInput={onInput}
+                    ref={inputRef}
+                    list={lapisField}
+                    value={inputValue}
+                />
+                {hasInput && (
+                    <button
+                        type='button'
+                        name='✕'
+                        className='absolute top-1/2 right-2 transform -translate-y-1/2 text-gray-500 hover:text-gray-700'
+                        onClick={() => {
+                            if (inputRef.current) {
+                                inputRef.current.value = '';
+                                onInput();
+                            }
+                        }}
+                    >
+                        ✕
+                    </button>
+                )}
+            </div>
             <datalist id={lapisField}>
                 {data.map((item) => (
                     <option value={item} key={item} />
diff --git a/components/src/preact/textInput/fetchAutocompleteList.ts b/components/src/preact/textInput/fetchAutocompleteList.ts
index 60557267..5cc95b2d 100644
--- a/components/src/preact/textInput/fetchAutocompleteList.ts
+++ b/components/src/preact/textInput/fetchAutocompleteList.ts
@@ -5,5 +5,5 @@ export async function fetchAutocompleteList(lapis: string, field: string, signal
 
     const data = (await fetchAggregatedOperator.evaluate(lapis, signal)).content;
 
-    return data.map((item) => item[field]);
+    return data.map((item) => item[field]).sort();
 }
diff --git a/components/src/preact/textInput/text-input.stories.tsx b/components/src/preact/textInput/text-input.stories.tsx
index 33425397..28230a71 100644
--- a/components/src/preact/textInput/text-input.stories.tsx
+++ b/components/src/preact/textInput/text-input.stories.tsx
@@ -1,5 +1,5 @@
 import { type Meta, type StoryObj } from '@storybook/preact';
-import { expect, waitFor, within } from '@storybook/test';
+import { expect, fireEvent, fn, waitFor, within } from '@storybook/test';
 
 import data from './__mockData__/aggregated_hosts.json';
 import { TextInput, type TextInputProps } from './text-input';
@@ -85,13 +85,30 @@ export const WithInitialValue: StoryObj<TextInputProps> = {
         ...Default.args,
         initialValue: 'Homo sapiens',
     },
-    play: async ({ canvasElement }) => {
+    play: async ({ canvasElement, step }) => {
         const canvas = within(canvasElement);
 
+        const changedListenerMock = fn();
+        await step('Setup event listener mock', async () => {
+            canvasElement.addEventListener('gs-text-input-changed', changedListenerMock);
+        });
+
         await waitFor(() => {
             const input = canvas.getByPlaceholderText('Enter a host name', { exact: false });
             expect(input).toHaveValue('Homo sapiens');
         });
+
+        await step('Remove initial value', async () => {
+            await fireEvent.click(canvas.getByRole('button', { name: '✕' }));
+
+            await expect(changedListenerMock).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    detail: {
+                        host: undefined,
+                    },
+                }),
+            );
+        });
     },
 };
 
diff --git a/components/src/preact/textInput/text-input.tsx b/components/src/preact/textInput/text-input.tsx
index d9da526f..3a9596eb 100644
--- a/components/src/preact/textInput/text-input.tsx
+++ b/components/src/preact/textInput/text-input.tsx
@@ -1,5 +1,5 @@
 import { type FunctionComponent } from 'preact';
-import { useContext, useRef } from 'preact/hooks';
+import { useContext, useRef, useState } from 'preact/hooks';
 import z from 'zod';
 
 import { fetchAutocompleteList } from './fetchAutocompleteList';
@@ -41,6 +41,9 @@ const TextInputInner: FunctionComponent<TextInputInnerProps> = ({ lapisField, pl
 
     const inputRef = useRef<HTMLInputElement>(null);
 
+    const [hasInput, setHasInput] = useState<boolean>(!!initialValue);
+    const [inputValue, setInputValue] = useState(initialValue || '');
+
     const { data, error, isLoading } = useQuery(() => fetchAutocompleteList(lapis, lapisField), [lapisField, lapis]);
 
     if (isLoading) {
@@ -66,6 +69,8 @@ const TextInputInner: FunctionComponent<TextInputInnerProps> = ({ lapisField, pl
                     composed: true,
                 }),
             );
+            setHasInput(value !== undefined);
+            setInputValue(value || '');
         }
     };
 
@@ -78,15 +83,32 @@ const TextInputInner: FunctionComponent<TextInputInnerProps> = ({ lapisField, pl
 
     return (
         <>
-            <input
-                type='text'
-                class='input input-bordered w-full'
-                placeholder={placeholderText ?? lapisField}
-                onInput={onInput}
-                ref={inputRef}
-                list={lapisField}
-                value={initialValue}
-            />
+            <div className='relative w-full'>
+                <input
+                    type='text'
+                    className='input input-bordered w-full pr-10'
+                    placeholder={placeholderText ?? lapisField}
+                    onInput={onInput}
+                    ref={inputRef}
+                    list={lapisField}
+                    value={inputValue}
+                />
+                {hasInput && (
+                    <button
+                        type='button'
+                        name='✕'
+                        className='absolute top-1/2 right-2 transform -translate-y-1/2 text-gray-500 hover:text-gray-700'
+                        onClick={() => {
+                            if (inputRef.current) {
+                                inputRef.current.value = '';
+                                onInput();
+                            }
+                        }}
+                    >
+                        ✕
+                    </button>
+                )}
+            </div>
             <datalist id={lapisField}>
                 {data.map((item) => (
                     <option value={item} key={item} />