Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@red-hat-developer-hub/backstage-plugin-marketplace': minor
---

Integrate search query with filter dropdown counts for dynamic filtering

- Ensure filter dropdowns show only relevant options after search is applied
- Maintain AND logic across search + category + author + support filters
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export const useFilteredPluginFacet = (
const marketplaceApi = useMarketplaceApi();

const filters = searchParams.getAll('filter');
const fullTextSearch = searchParams.get('q');

// Get all plugins and apply client-side filtering for accurate facet calculation
const pluginsQuery = useQuery({
Expand All @@ -50,6 +51,7 @@ export const useFilteredPluginFacet = (
'getFilteredPluginFacet',
facet,
filters,
fullTextSearch,
excludeFilterType,
],
queryFn: async () => {
Expand Down Expand Up @@ -82,6 +84,16 @@ export const useFilteredPluginFacet = (

let filteredPlugins = pluginsQuery.data.items;

// Apply search filter first (always applied, not excluded)
if (fullTextSearch) {
const lowerCaseSearch = fullTextSearch.toLocaleLowerCase('en-US');
filteredPlugins = filteredPlugins.filter(plugin => {
const lowerCaseValue =
plugin.metadata?.title?.toLocaleLowerCase('en-US');
return lowerCaseValue?.includes(lowerCaseSearch);
});
}

// Apply category filters
const categories = activeFilters
.filter(filter => filter.startsWith('category='))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const useFilteredSupportTypes = () => {
const marketplaceApi = useMarketplaceApi();

const filters = searchParams.getAll('filter');
const fullTextSearch = searchParams.get('q');

// Get all plugins (not pre-filtered)
const allPluginsQuery = useQuery({
Expand Down Expand Up @@ -67,6 +68,16 @@ export const useFilteredSupportTypes = () => {

let availablePlugins = allPluginsQuery.data.items;

// Apply search filter first (always applied)
if (fullTextSearch) {
const lowerCaseSearch = fullTextSearch.toLocaleLowerCase('en-US');
availablePlugins = availablePlugins.filter(plugin => {
const lowerCaseValue =
plugin.metadata?.title?.toLocaleLowerCase('en-US');
return lowerCaseValue?.includes(lowerCaseSearch);
});
}

// Apply category filter if present
const categories = nonSupportFilters
.filter(filter => filter.startsWith('category='))
Expand Down Expand Up @@ -204,7 +215,7 @@ export const useFilteredSupportTypes = () => {
(a, b) => (a.displayOrder || 0) - (b.displayOrder || 0),
);
return result;
}, [allPluginsQuery.data?.items, nonSupportFilters, t]);
}, [allPluginsQuery.data?.items, nonSupportFilters, fullTextSearch, t]);

return {
data: items,
Expand Down