From a050d58e918b5684803559b0545eed09daf0f1d0 Mon Sep 17 00:00:00 2001
From: Meliora Ho <nho10@fordham.edu>
Date: Wed, 3 Apr 2024 02:28:04 +0000
Subject: [PATCH] enabled add, delete, and deselect tags

---
 compass/components/Table/Index.tsx            |  4 +-
 .../components/TagsInput/DropdownAction.tsx   | 17 +++++++--
 compass/components/TagsInput/Index.tsx        | 37 ++++++++++++-------
 compass/components/TagsInput/Tag.tsx          |  8 ++--
 compass/components/TagsInput/TagDropdown.tsx  |  6 +--
 compass/components/TagsInput/TagsArray.tsx    |  8 ++--
 6 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/compass/components/Table/Index.tsx b/compass/components/Table/Index.tsx
index 53a0e13..625dca3 100644
--- a/compass/components/Table/Index.tsx
+++ b/compass/components/Table/Index.tsx
@@ -12,6 +12,8 @@ import { useState } from "react";
 import { RowOptionMenu } from "./RowOptionMenu";
 import { RowOpenAction } from "./RowOpenAction";
 import { TableAction } from "./TableAction";
+import { AtSymbolIcon, Bars2Icon } from "@heroicons/react/24/solid";
+import TagsInput from "../TagsInput/Index";
 
 const usersExample = usersImport as unknown as User[];
 
@@ -40,7 +42,7 @@ export const Table = () => {
       cell: (info) => <RowOpenAction title={info.getValue()} />,
     }),
     columnHelper.accessor("role", {
-      cell: (info) => info.renderValue(),
+      cell: (info) => <TagsInput presetValue={info.getValue() }presetOptions={["administrator","volunteer","employee"]}  />,
     }),
     columnHelper.accessor("email", {
       header: () => <><AtSymbolIcon className="inline align-top h-4" /> Email</>,
diff --git a/compass/components/TagsInput/DropdownAction.tsx b/compass/components/TagsInput/DropdownAction.tsx
index fcddf48..737ec69 100644
--- a/compass/components/TagsInput/DropdownAction.tsx
+++ b/compass/components/TagsInput/DropdownAction.tsx
@@ -1,7 +1,7 @@
-import { EllipsisHorizontalIcon } from "@heroicons/react/24/solid";
+import { EllipsisHorizontalIcon, TrashIcon } from "@heroicons/react/24/solid";
 import { useState } from "react";
 
-export const DropdownAction = ({ tag }) => {
+export const DropdownAction = ({ tag, handleDeleteTag, handleAddTag }) => {
   const [isVisible, setVisible] = useState(false);
   const [inputValue, setInputValue] = useState(tag);
 
@@ -9,6 +9,11 @@ export const DropdownAction = ({ tag }) => {
     setVisible(false);
   };
 
+  const editTagOption = () => {
+    handleDeleteTag(tag)
+    handleAddTag(inputValue)
+  }
+
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setInputValue(e.target.value);
   };
@@ -21,14 +26,20 @@ export const DropdownAction = ({ tag }) => {
   return (
     <div>
       {isVisible ? (
-        <div className="absolute z-50 bg-white">
+        <div className="absolute flex flex-col justify-start z-50 rounded-md bg-white border border-gray-200 shadow p-2 space-y-2">
           <input
             type="text"
             value={inputValue}
             onChange={handleInputChange}
+            onKeyDown={editTagOption}
             onBlur={handleBlur}
             autoFocus
+            className="bg-gray-50 text-2xs focus:outline-none rounded-md font-normal text-gray-800 p-1 border-2 focus:border-blue-200"
           />
+          <button onClick={() => handleDeleteTag(inputValue)} className="justify-start flex flex-row space-x-4 hover:bg-gray-100 rounded-md items-center p-1 px-2">
+            <TrashIcon className="w-3 h-3" />
+            <p>Delete</p>
+          </button>
         </div>
       ) : (
         <EllipsisHorizontalIcon
diff --git a/compass/components/TagsInput/Index.tsx b/compass/components/TagsInput/Index.tsx
index 28855ec..3c8d43a 100644
--- a/compass/components/TagsInput/Index.tsx
+++ b/compass/components/TagsInput/Index.tsx
@@ -10,8 +10,8 @@ interface TagsInputProps {
 const TagsInput: React.FC<TagsInputProps> = ({ presetValue, presetOptions }) => {
   const [inputValue, setInputValue] = useState('');
   const [cellSelected, setCellSelected] = useState(false);
-  const [tags, setTags] = useState<string[]>([presetValue]);
-  const [options, setOptions] = useState<string[]>(presetOptions);
+  const [tags, setTags] = useState<Set<string>>(new Set(presetValue ? [presetValue] : []));
+  const [options, setOptions] = useState<Set<string>>(new Set(presetOptions));
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setInputValue(e.target.value);
@@ -19,43 +19,52 @@ const TagsInput: React.FC<TagsInputProps> = ({ presetValue, presetOptions }) =>
 
   const handleAddTag = (e: React.KeyboardEvent<HTMLInputElement>) => {
     if (e.key === 'Enter' && inputValue.trim()) {
-      setTags(prevTags => [...prevTags, inputValue]);
-      setOptions(prevOptions => [...prevOptions, inputValue]);
+      // To add to a Set, you need to create a new Set for immutability in React state updates.
+      setTags(prevTags => new Set(prevTags).add(inputValue));
+      setOptions(prevOptions => new Set(prevOptions).add(inputValue));
       setInputValue('');
     }
   };
 
-  const handleDeleteTag = (tagToDelete: string) => {
-    setTags(tags.filter(tag => tag !== tagToDelete));
-  };
+  const handleSelectTag = (tagToAdd: string) => {
+    if (!tags.has(tagToAdd)){ // Corrected syntax for checking if a Set contains an item
+      setTags(prevTags => new Set(prevTags).add(tagToAdd));
+    }
+  }
 
+  const handleDeleteTag = (tagToDelete: string) => {
+    setTags(prevTags => {
+      const updatedTags = new Set(prevTags);
+      updatedTags.delete(tagToDelete);
+      return updatedTags;
+    });
+  };
   const handleBlur = () => {
     setCellSelected(false);
   };
 
   return (
-    <div className="w-50 cursor-pointer" onClick={() => setCellSelected(true)}>
+    <div className="cursor-pointer" onClick={() => setCellSelected(true)}>
       {!cellSelected ? (
-        <TagsArray tags={tags} />
+        <TagsArray handleDelete={handleDeleteTag} tags={tags} />
       ) : (
-        <div className="absolute z-50 -mt-6">
+        <div className="absolute w-64 z-50 -ml-3 -mt-7">
           <div className="rounded-md border border-gray-200 shadow">
-            <div className="flex flex-wrap rounded-t-md items-center gap-2 bg-gray-50 p-2">
-              <TagsArray active tags={tags} />
+            <div  className="flex flex-wrap rounded-t-md items-center gap-2 bg-gray-50 p-2">
+              <TagsArray handleDelete={handleDeleteTag} active tags={tags} />
               <input
                 type="text"
                 value={inputValue}
                 placeholder="Search for an option..."
                 onChange={handleInputChange}
                 onKeyDown={handleAddTag}
-                onBlur={handleBlur}
                 className="focus:outline-none bg-transparent"
                 autoFocus
               />
             </div>
             <div className="flex rounded-b-md bg-white flex-col border-t border-gray-100 text-2xs font-medium text-gray-500 p-2">
               Select an option or create one
-              <TagDropdown tags={options} />
+              <TagDropdown handleAdd={handleSelectTag} tags={options} />
             </div>
           </div>
         </div>
diff --git a/compass/components/TagsInput/Tag.tsx b/compass/components/TagsInput/Tag.tsx
index 59ede37..e7093fd 100644
--- a/compass/components/TagsInput/Tag.tsx
+++ b/compass/components/TagsInput/Tag.tsx
@@ -1,12 +1,10 @@
 import { XMarkIcon } from "@heroicons/react/24/solid"
 
-export const Tag = ({children, active = false}) => {
-    const handleClick = () => {
-        
-    }
+export const Tag = ({children, handleDelete, active = false}) => {
+
     return (
         <span className="font-normal text-gray-800 flex flex-row p-1 px-2 rounded-lg bg-blue-100">{children}
-        {active && <XMarkIcon className="ml-1 w-3 text-blue-500" />}
+        {active && <button className="hover:bg-gray-200" onClick={() => handleDelete(children)}><XMarkIcon  className=" ml-1 w-3 text-blue-500" /></button>}
         </span>
     )
 }
\ No newline at end of file
diff --git a/compass/components/TagsInput/TagDropdown.tsx b/compass/components/TagsInput/TagDropdown.tsx
index b1b5f9b..535bf7f 100644
--- a/compass/components/TagsInput/TagDropdown.tsx
+++ b/compass/components/TagsInput/TagDropdown.tsx
@@ -2,11 +2,11 @@
 import { Tag } from "./Tag";
 import { DropdownAction } from "./DropdownAction";
 
-export const TagDropdown = ({ tags }) => {
+export const TagDropdown = ({ tags, handleAdd }) => {
   return (
     <div className="flex flex-col space-y-2 mt-2">
-      {tags.map((tag, index) => (
-        <div key={index} className="items-center rounded-md p-1 flex flex-row justify-between hover:bg-gray-100">
+      {Array.from(tags).map((tag, index) => (
+        <div onClick={() => handleAdd(tag)} key={index} className="items-center rounded-md p-1 flex flex-row justify-between hover:bg-gray-100">
           <Tag>{tag}</Tag>
           <DropdownAction tag={tag} />
         </div>
diff --git a/compass/components/TagsInput/TagsArray.tsx b/compass/components/TagsInput/TagsArray.tsx
index 98769c7..486a8a4 100644
--- a/compass/components/TagsInput/TagsArray.tsx
+++ b/compass/components/TagsInput/TagsArray.tsx
@@ -1,12 +1,12 @@
 import { Tag } from "./Tag"
 
-export const TagsArray = ({ tags, active = false }) => {
+export const TagsArray = ({ tags, handleDelete, active = false }) => {
     return(
-        <div className="flex items-center space-x-2">
+        <div className="flex flex-wrap gap-2 items-center">
         {
-          tags.map((tag) => {
+          Array.from(tags).map((tag) => {
             return (
-              <Tag active={active}>{tag}</Tag>
+              <Tag handleDelete={handleDelete} active={active}>{tag}</Tag>
             )
           })
         }