Merge pull request #1175 from Real-Dev-Squad/develop

[Sync] Dev to main

Author: prakashchoudhary07

__tests__/Utils/generateSuggestions.test.ts

@@ -10,17 +10,10 @@ describe('generateSuggestions', () => {
         expect(result).toEqual([{ title: 'test' }]);
     });
 
-    it('should handle user input with a colon separator', () => {
-        const userInput = 'assignee:John';
-        const chosenOptions = [{ title: 'test' }];
-        const result = generateSuggestions(userInput, chosenOptions);
-        expect(result).toEqual([{ assignee: 'john' }]);
-    });
-
     it('should handle user input without a colon separator', () => {
         const userInput = 'test';
         const result = generateSuggestions(userInput);
-        expect(result).toEqual([{ title: 'test' }, { assignee: 'test' }]);
+        expect(result).toEqual([{ title: 'test' }]);
     });
 
     it('should handle empty user input', () => {
@@ -41,35 +34,18 @@ describe('generateSuggestions', () => {
         expect(result).toEqual([{ title: 'test' }]);
     });
 
-    it('should suggest assignee even if it already selected ', () => {
-        const userInput = 'joy';
-        const chosenOptions = [{ assignee: 'amit' }];
-        const typedKey = 'assignee';
-        const result = generateSuggestions(userInput, chosenOptions, typedKey);
-        expect(result).toEqual([{ assignee: 'joy' }]);
-    });
     it('should not generate suggestion for title or status if already selected', () => {
         const userInput = 'joy';
         const chosenOptions = [{ title: 'amit' }];
         const typedKey = '';
         const result = generateSuggestions(userInput, chosenOptions, typedKey);
-        expect(result).toEqual([{ assignee: 'joy' }]);
-    });
-    it('should not generate duplicate assignee suggestion', () => {
-        const userInput = 'joy';
-        const chosenOptions = [{ assignee: 'joy' }];
-        const typedKey = 'assignee';
-        const result = generateSuggestions(userInput, chosenOptions, typedKey);
         expect(result).toEqual([]);
     });
     it('should handle case sensitivity for status suggestion', () => {
         const userInput = 'Joy-gupta';
         const chosenOptions = [{ status: 'amit' }];
         const typedKey = '';
         const result = generateSuggestions(userInput, chosenOptions, typedKey);
-        expect(result).toEqual([
-            { title: 'Joy-gupta' },
-            { assignee: 'joy-gupta' },
-        ]);
+        expect(result).toEqual([{ title: 'Joy-gupta' }]);
     });
 });

src/components/tasks/TaskSearchDev/TaskSearchDev.tsx

@@ -114,6 +114,9 @@ const TaskSearchDev = ({
                         );
                         setSelectedFilters(newOptions);
                         setOnEditSelectedFilterIndex(false);
+                        onClickSearchButton(
+                            convertSearchOptionsToQuery(newOptions)
+                        );
                         setOnRemoveSelectedFilterIndex(-1);
                     }
                 }
@@ -181,6 +184,7 @@ const TaskSearchDev = ({
         setSelectedFilters(updatedOptions);
         setOnEditSelectedFilterValue('');
         toggleInputFocus();
+        onClickSearchButton(convertSearchOptionsToQuery(updatedOptions));
     };
 
     const onSuggestionSelected = (

src/components/tasks/TaskSearchDev/useFilterSuggestion.tsx

@@ -22,24 +22,23 @@ export const useFilterSuggestion = ({
     activeFilterSuggestionDropdownIndex,
     setActiveFilterSuggestionDropdownIndex,
 }: Props) => {
-    const { data: searchedUsers } = useGetUsersByUsernameQuery(
+    const { key: typedKey, value: typedValue } = getUserInput();
+    const { data: userSearchResponse } = useGetUsersByUsernameQuery(
         {
-            searchString: defferedUserInput,
+            searchString: typedValue,
         },
         {
-            skip: defferedUserInput.length < 3,
+            // skip if typed key is not ['', 'assignee'] or if typed value is less than 3
+            skip: typedValue.length < 3 || !['', 'assignee'].includes(typedKey),
         }
     );
-    const assigneeSuggestions =
-        searchedUsers?.users?.map((user) => ({
-            assignee: user.username || user.github_display_name,
-        })) || [];
+
     const filterSuggestions = [
-        ...assigneeSuggestions,
-        ...getFilterSuggestions(),
+        ...getLocalSuggestions(),
+        ...getAssigneeSuggestions(),
     ];
 
-    function getFilterSuggestions() {
+    function getUserInput() {
         let userInput;
         if (
             onEditSelectedFilterIndex === false &&
@@ -52,7 +51,10 @@ export const useFilterSuggestion = ({
         ) {
             userInput = defferedPillValue;
         } else {
-            return [];
+            return {
+                key: '',
+                value: '',
+            };
         }
 
         userInput = userInput.trimStart();
@@ -64,12 +66,48 @@ export const useFilterSuggestion = ({
                 key = potentialKey.trim();
                 userInput = values.join(':').trimStart();
             }
+
+            return {
+                key,
+                value: userInput,
+            };
         }
-        if (userInput.length > 2) {
+
+        return {
+            key: '',
+            value: userInput,
+        };
+    }
+
+    function getAssigneeSuggestions() {
+        const serializedUserSuggestion =
+            userSearchResponse?.users?.map((user) => ({
+                assignee: user.username || user.github_display_name,
+            })) || [];
+
+        function removeSelectedUsersFromSuggestions(
+            suggestions: { assignee: string }[]
+        ) {
+            return suggestions.filter((suggestion) => {
+                // Return false if the suggestion is in selectedFilters
+                return !selectedFilters.some(
+                    (filter) => filter.assignee === suggestion.assignee
+                );
+            });
+        }
+
+        const result = removeSelectedUsersFromSuggestions(
+            serializedUserSuggestion
+        );
+        return result;
+    }
+
+    function getLocalSuggestions() {
+        if (typedValue.length > 2) {
             const result = generateSuggestions(
-                userInput,
+                typedValue,
                 selectedFilters,
-                key,
+                typedKey,
                 onEditSelectedFilterIndex
             );
 

src/utils/generateSuggestions.ts

@@ -40,31 +40,17 @@ export default function generateSuggestions(
 
     for (const field of SEARCH_OPTIONS) {
         const includeFieldInSuggestion = typedKey ? typedKey === field : true; // True, if typedKey matches field, if present, else True all the time
-        const matchedOptions = updatedOptions.find((option) => {
-            if (field === 'assignee') {
-                return option['assignee'] === userInput; // If assignee is the key, check for its value, as assignee can be multiple
-            } else {
-                return option[field]; // Otherwise check if the field is present
-            }
-        });
-        if (matchedOptions || !includeFieldInSuggestion) {
-            continue;
-        } else {
-            if (field === 'title') {
-                const value = {
-                    [field]: typedValue.trim(),
-                };
-                suggestions.push(value);
-            } else if (field === 'assignee') {
-                const value = {
-                    [field]: typedValue.trim(),
-                };
-                value[field] = value[field].replace(/ /g, '-').toLowerCase();
-                suggestions.push(value);
-            } else if (field === 'status') {
-                const result = matchStatus(typedValue);
-                if (result) suggestions = [...suggestions, ...result];
-            }
+        const matchedOptions = updatedOptions.find((option) => option[field]); // Otherwise check if the field is present
+        if (matchedOptions || !includeFieldInSuggestion) continue;
+
+        if (field === 'title') {
+            const value = {
+                [field]: typedValue.trim(),
+            };
+            suggestions.push(value);
+        } else if (field === 'status') {
+            const result = matchStatus(typedValue);
+            if (result) suggestions = [...suggestions, ...result];
         }
     }
     return suggestions;