fix(API/index.ts): change parameter types in searchComponent function to allow null values for query, page, limit, status, and tags

refactor(StorePage/index.tsx): rename filteredCategories state variable to filteredTags for better semantics
feat(StorePage/index.tsx): add functionality to filter components by tags and update search results accordingly

src/frontend/src/controllers/API/index.ts

@@ -644,11 +644,11 @@ export async function getComponent(component_id: string) {
 }
 
 export async function searchComponent(
-  query: string,
+  query: string | null,
-  page?: number,
+  page?: number | null,
-  limit?: number,
+  limit?: number | null,
-  status?: string,
+  status?: string | null,
-  tags?: [string]
+  tags?: string[]
 ) {
   try {
     let url = `${BASE_URL_API}store/search/`;

src/frontend/src/pages/StorePage/index.tsx

@@ -37,8 +37,7 @@ export default function StorePage(): JSX.Element {
   }, []);
   const [data, setData] = useState<storeComponent[]>([]);
   const [loading, setLoading] = useState(false);
-  const [search, setSearch] = useState(false);
+  const [filteredCategories, setFilterCategories] = useState<any[]>([]);
-  const [filteredCategories, setFilteredCategories] = useState(new Set());
   const [inputText, setInputText] = useState<string>("");
   const [searchData, setSearchData] = useState(data);
   const { setErrorData } = useContext(alertContext);
@@ -47,24 +46,17 @@ export default function StorePage(): JSX.Element {
   const [index, setPageIndex] = useState(1);
   const [errorApiKey, setErrorApiKey] = useState(false);
   const { setSavedFlows, savedFlows } = useContext(StoreContext);
-  const [tags, setTags] = useState<string[]>([]);
+  const [tags, setTags] = useState<{ id: string; name: string }[]>([]);
   const tagListId = useRef<{ id: string; name: string }[]>([]);
-  const [renderPagination, setRenderPagination] = useState(
+  const [renderPagination, setRenderPagination] = useState(false);
-    searchData?.length > 0 && !loading && !search
-  );
 
   useEffect(() => {
     getStoreTags().then((res) => {
       tagListId.current = res;
-      let tags = res.map((tag) => tag.name);
+      setTags(res);
-      setTags(tags);
     });
   }, []);
 
-  useEffect(() => {
-    setRenderPagination(searchData?.length > 0 && !loading && !search);
-  }, [loading, search]);
-
   async function getSavedComponents() {
     setLoading(true);
     const result = await getStoreSavedComponents();
@@ -89,6 +81,7 @@ export default function StorePage(): JSX.Element {
 
   const handleGetComponents = () => {
     setLoading(true);
+    setRenderPagination(true);
     getStoreComponents(index - 1, size)
       .then((res) => {
         setSearchData(res);
@@ -109,17 +102,15 @@ export default function StorePage(): JSX.Element {
   const handleSearch = (inputText: string) => {
     if (inputText === "") {
       handleGetComponents();
-      setSearch(false);
       return;
     }
-    setSearch(true);
     setLoading(true);
     searchComponent(inputText).then(
       (res) => {
         setSearchData(res);
         setData(res);
-        setRenderPagination(false);
         setLoading(false);
+        setRenderPagination(false);
       },
       (error) => {
         setLoading(false);
@@ -129,6 +120,7 @@ export default function StorePage(): JSX.Element {
 
   function handleChangePagination(pageIndex: number, pageSize: number) {
     setLoading(true);
+    setRenderPagination(true);
     getStoreComponents(pageIndex, pageSize)
       .then((res) => {
         setData(res);
@@ -136,7 +128,6 @@ export default function StorePage(): JSX.Element {
         setPageIndex(pageIndex);
         setPageSize(pageSize);
         setLoading(false);
-        setRenderPagination(true);
       })
       .catch((err) => {
         setSearchData([]);
@@ -148,6 +139,25 @@ export default function StorePage(): JSX.Element {
       });
   }
 
+  function handleFilterByTags(filterArray) {
+    if (filterArray.length === 0) {
+      handleGetComponents();
+      return;
+    }
+    setRenderPagination(false);
+    searchComponent(null, 1, 10000, null, filterArray).then(
+      (res) => {
+        setSearchData(res);
+        setData(res);
+        setLoading(false);
+      },
+      (error) => {
+        setLoading(false);
+        setSearchData([]);
+      }
+    );
+  }
+
   return (
     <>
       <Header />
@@ -207,7 +217,6 @@ export default function StorePage(): JSX.Element {
             <div className="flex w-[13%] items-center justify-center gap-3 text-sm">
               <Select
                 onValueChange={(value) => {
-                  setFilteredCategories(new Set());
                   if (value === "Flow") {
                     setSearchData(data.filter((f) => f.is_component === false));
                     setRenderPagination(false);
@@ -224,9 +233,9 @@ export default function StorePage(): JSX.Element {
                   <SelectValue placeholder="Both" />
                 </SelectTrigger>
                 <SelectContent>
+                  <SelectItem value="">Both</SelectItem>
                   <SelectItem value="Flow">Flows</SelectItem>
                   <SelectItem value="Component">Components</SelectItem>
-                  <SelectItem value="">Both</SelectItem>
                 </SelectContent>
               </Select>
             </div>
@@ -236,28 +245,26 @@ export default function StorePage(): JSX.Element {
               tags.map((i, idx) => (
                 <Badge
                   onClick={() => {
-                    filteredCategories.has(i)
+                    const index = filteredCategories?.indexOf(i.id);
-                      ? setFilteredCategories((old) => {
+                    const copyFilterArray = cloneDeep(filteredCategories);
-                          let newFilteredCategories = cloneDeep(old);
+                    if (index === -1) {
-                          newFilteredCategories.delete(i);
+                      copyFilterArray.push(i.id);
-                          return newFilteredCategories;
+                    } else {
-                        })
+                      copyFilterArray.splice(index, 1);
-                      : setFilteredCategories((old) => {
+                    }
-                          let newFilteredCategories = cloneDeep(old);
+                    setFilterCategories(copyFilterArray);
-                          newFilteredCategories.add(i);
+                    handleFilterByTags(copyFilterArray);
-                          return newFilteredCategories;
-                        });
                   }}
                   variant="gray"
                   size="md"
                   className={cn(
                     "cursor-pointer border-none",
-                    filteredCategories.has(i)
+                    filteredCategories.some((category) => category === i.id)
                       ? "bg-beta-foreground text-background hover:bg-beta-foreground"
                       : ""
                   )}
                 >
-                  {i}
+                  {i.name}
                 </Badge>
               ))}
           </div>
@@ -272,8 +279,10 @@ export default function StorePage(): JSX.Element {
               searchData
                 .filter(
                   (f) =>
-                    Array.from(filteredCategories).length === 0 ||
+                    filteredCategories?.length === 0 ||
-                    filteredCategories.has(f.is_component)
+                    filteredCategories.some(
+                      (category) => category === f.is_component
+                    )
                 )
                 .map((item, idx) => (
                   <MarketCardComponent key={idx} data={item} />
@@ -282,7 +291,7 @@ export default function StorePage(): JSX.Element {
           </div>
         </div>
 
-        {renderPagination && (
+        {!loading && renderPagination && (
           <div className="relative my-3">
             <PaginatorComponent
               storeComponent={true}