From d6b1957cbd7d248928da014b05b4a8a6e88044ed Mon Sep 17 00:00:00 2001
From: gitdallas <dallas.nicol@gmail.com>
Date: Tue, 26 Sep 2023 15:30:29 -0500
Subject: [PATCH] fix(autocomplete): tags not generated for preselected options

Signed-off-by: gitdallas <dallas.nicol@gmail.com>
---
 client/src/app/components/Autocomplete.tsx    |  21 ++--
 .../application-form/application-form.tsx     | 102 ++++++------------
 2 files changed, 38 insertions(+), 85 deletions(-)

diff --git a/client/src/app/components/Autocomplete.tsx b/client/src/app/components/Autocomplete.tsx
index 71b4672e91..ad9236e754 100644
--- a/client/src/app/components/Autocomplete.tsx
+++ b/client/src/app/components/Autocomplete.tsx
@@ -42,9 +42,6 @@ export const Autocomplete: React.FC<IAutocompleteProps> = ({
 }) => {
   const [inputValue, setInputValue] = useState(searchString);
   const [menuIsOpen, setMenuIsOpen] = useState(false);
-  const [currentChips, setCurrentChips] = useState<Set<string>>(
-    new Set(selections)
-  );
   const [hint, setHint] = useState("");
   const [menuItems, setMenuItems] = useState<React.ReactElement[]>([]);
 
@@ -52,11 +49,6 @@ export const Autocomplete: React.FC<IAutocompleteProps> = ({
   const menuRef = useRef<HTMLDivElement>(null);
   const searchInputRef = useRef<HTMLInputElement>(null);
 
-  React.useEffect(() => {
-    onChange([...currentChips]);
-    buildMenu();
-  }, [currentChips]);
-
   React.useEffect(() => {
     buildMenu();
   }, [options]);
@@ -67,7 +59,7 @@ export const Autocomplete: React.FC<IAutocompleteProps> = ({
       .filter(
         (item: string, index: number, arr: string[]) =>
           arr.indexOf(item) === index &&
-          !currentChips.has(item) &&
+          !selections.includes(item) &&
           (!inputValue || item.toLowerCase().includes(inputValue.toLowerCase()))
       )
       .map((currentValue, index) => (
@@ -129,9 +121,11 @@ export const Autocomplete: React.FC<IAutocompleteProps> = ({
 
   /** callback for removing a chip from the chip selections */
   const deleteChip = (chipToDelete: string) => {
-    const newChips = new Set(currentChips);
+    const newChips = new Set(selections);
     newChips.delete(chipToDelete);
-    setCurrentChips(newChips);
+    // newChips.delete(chipToDelete);
+    onChange(Array.from(newChips));
+    // setCurrentChips(newChips);
   };
 
   /** add the given string as a chip in the chip group and clear the input */
@@ -145,7 +139,8 @@ export const Autocomplete: React.FC<IAutocompleteProps> = ({
       }
       newChipText = matchingOption;
     }
-    setCurrentChips(new Set([...currentChips, newChipText]));
+    // setCurrentChips(new Set([...currentChips, newChipText]));
+    onChange(Array.from(new Set([...selections, newChipText])));
     setInputValue("");
     setMenuIsOpen(false);
   };
@@ -301,7 +296,7 @@ export const Autocomplete: React.FC<IAutocompleteProps> = ({
       </FlexItem>
       <FlexItem key="chips">
         <Flex spaceItems={{ default: "spaceItemsXs" }}>
-          {Array.from(currentChips).map((currentChip) => (
+          {selections.map((currentChip) => (
             <FlexItem key={currentChip}>
               <Label color={labelColor} onClose={() => deleteChip(currentChip)}>
                 {currentChip}
diff --git a/client/src/app/pages/applications/components/application-form/application-form.tsx b/client/src/app/pages/applications/components/application-form/application-form.tsx
index cf0f91d67a..a9db83b323 100644
--- a/client/src/app/pages/applications/components/application-form/application-form.tsx
+++ b/client/src/app/pages/applications/components/application-form/application-form.tsx
@@ -445,78 +445,36 @@ export const ApplicationForm: React.FC<ApplicationFormProps> = ({
             name="tags"
             label={t("terms.tags")}
             fieldId="tags"
-            renderInput={({ field: { value, name, onChange } }) => (
-              <Autocomplete
-                noResultsMessage={t("message.noResultsFoundTitle")}
-                onChange={(selections) => {
-                  onChange(
-                    selections
-                      .map((sel) => getTagRef(sel))
-                      .filter((sel) => sel !== undefined) as TagRef[]
-                  );
-                }}
-                options={tagOptions.map((o) => o.value)}
-                placeholderText={t("composed.selectMany", {
-                  what: t("terms.tags").toLowerCase(),
-                })}
-                searchInputAriaLabel="tags-select-toggle"
-                selections={
-                  value
-                    .map(
-                      (formTag) =>
-                        tags?.find((tagRef) => tagRef.name === formTag.name)
-                    )
-                    .map((matchingTag) =>
-                      matchingTag ? matchingTag.name : undefined
-                    )
-                    .filter((e) => e !== undefined) as string[]
-                }
-              />
-              // <SimpleSelect
-              //   maxHeight={DEFAULT_SELECT_MAX_HEIGHT}
-              //   placeholderText={t("composed.selectMany", {
-              //     what: t("terms.tags").toLowerCase(),
-              //   })}
-              //   id="tags-select"
-              //   variant="typeaheadmulti"
-              //   toggleId="tags-select-toggle"
-              //   toggleAriaLabel="tags dropdown toggle"
-              //   aria-label={name}
-              //   value={value
-              //     .map((formTag) =>
-              //       tags?.find((tagRef) => tagRef.name === formTag.name)
-              //     )
-              //     .map((matchingTag) =>
-              //       matchingTag
-              //         ? {
-              //             value: matchingTag.name,
-              //             toString: () => matchingTag.name,
-              //           }
-              //         : undefined
-              //     )
-              //     .filter((e) => e !== undefined)}
-              //   options={tagOptions}
-              // onChange={(selection) => {
-              //   const selectionWithValue = selection.toString();
-
-              //   const currentValue = value || [];
-              //   const e = currentValue.find(
-              //     (f) => f.name === selectionWithValue
-              //   );
-              //   if (e) {
-              //     onChange(
-              //       currentValue.filter((f) => f.name !== selectionWithValue)
-              //     );
-              //   } else {
-              //     const tag = getTagRef(selectionWithValue);
-              //     if (currentValue && typeof tag !== "undefined")
-              //       onChange([...currentValue, tag]);
-              //   }
-              // }}
-              //   onClear={() => onChange([])}
-              //   noResultsFoundText={t("message.noResultsFoundTitle")}
-              // />
-            )}
+            renderInput={({ field: { value, name, onChange } }) => {
+              const selections = value
+                .map(
+                  (formTag) =>
+                    tags?.find((tagRef) => tagRef.name === formTag.name)
+                )
+                .map((matchingTag) =>
+                  matchingTag ? matchingTag.name : undefined
+                )
+                .filter((e) => e !== undefined) as string[];
+
+              return (
+                <Autocomplete
+                  noResultsMessage={t("message.noResultsFoundTitle")}
+                  onChange={(selections) => {
+                    onChange(
+                      selections
+                        .map((sel) => getTagRef(sel))
+                        .filter((sel) => sel !== undefined) as TagRef[]
+                    );
+                  }}
+                  options={tagOptions.map((o) => o.value)}
+                  placeholderText={t("composed.selectMany", {
+                    what: t("terms.tags").toLowerCase(),
+                  })}
+                  searchInputAriaLabel="tags-select-toggle"
+                  selections={selections}
+                />
+              );
+            }}
           />
           <HookFormPFGroupController
             control={control}