mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-16 04:36:34 +01:00
* style: AgentCard and AgentGrid UI with improved layout and accessibility - Updated AgentCard component to improve layout, including flexbox adjustments for better responsiveness and spacing. - Added aria-label for agent description to enhance accessibility. - Introduced a new translation key for agent description in the localization file. - Modified AgentGrid to include horizontal margins for better alignment on various screen sizes. * style: Update AgentCard description line clamp for improved readability - Increased the line clamp for agent descriptions in the AgentCard component from 3 to 5 lines, enhancing the display of longer descriptions while maintaining a clean layout. * feat: Integrate Agent Detail Dialog in AgentCard Component - Enhanced the AgentCard component to include an OGDialog for displaying detailed agent information. - Introduced AgentDetailContent to manage the content of the dialog, allowing users to view agent details and initiate chats directly from the card. - Updated AgentGrid to utilize the new onSelect prop for agent selection, improving the interaction flow. - Removed deprecated code related to agent detail handling in the Marketplace component for cleaner implementation. * ci: Enhance AgentCard and Accessibility Tests with Improved Mocks and Keyboard Interaction - Updated AgentCard tests to utilize the new onSelect prop for better interaction handling. - Introduced comprehensive mocks for hooks and components to streamline testing and avoid testing internal implementations. - Improved accessibility tests by ensuring keyboard interactions are properly handled and do not throw errors. - Enhanced the overall structure of tests to support better readability and maintainability.
234 lines
6.9 KiB
TypeScript
234 lines
6.9 KiB
TypeScript
import React, { useMemo, useEffect } from 'react';
|
|
import { Spinner } from '@librechat/client';
|
|
import { PermissionBits } from 'librechat-data-provider';
|
|
import type t from 'librechat-data-provider';
|
|
import { useMarketplaceAgentsInfiniteQuery } from '~/data-provider/Agents';
|
|
import { useAgentCategories, useLocalize } from '~/hooks';
|
|
import { useInfiniteScroll } from '~/hooks/useInfiniteScroll';
|
|
import { useHasData } from './SmartLoader';
|
|
import ErrorDisplay from './ErrorDisplay';
|
|
import AgentCard from './AgentCard';
|
|
|
|
interface AgentGridProps {
|
|
category: string;
|
|
searchQuery: string;
|
|
onSelectAgent: (agent: t.Agent) => void;
|
|
scrollElementRef?: React.RefObject<HTMLElement>;
|
|
}
|
|
|
|
/**
|
|
* Component for displaying a grid of agent cards
|
|
*/
|
|
const AgentGrid: React.FC<AgentGridProps> = ({
|
|
category,
|
|
searchQuery,
|
|
onSelectAgent,
|
|
scrollElementRef,
|
|
}) => {
|
|
const localize = useLocalize();
|
|
|
|
// Get category data from API
|
|
const { categories } = useAgentCategories();
|
|
|
|
// Build query parameters based on current state
|
|
const queryParams = useMemo(() => {
|
|
const params: {
|
|
requiredPermission: number;
|
|
category?: string;
|
|
search?: string;
|
|
limit: number;
|
|
promoted?: 0 | 1;
|
|
} = {
|
|
requiredPermission: PermissionBits.VIEW, // View permission for marketplace viewing
|
|
limit: 6,
|
|
};
|
|
|
|
// Handle search
|
|
if (searchQuery) {
|
|
params.search = searchQuery;
|
|
// Include category filter for search if it's not 'all' or 'promoted'
|
|
if (category !== 'all' && category !== 'promoted') {
|
|
params.category = category;
|
|
}
|
|
} else {
|
|
// Handle category-based queries
|
|
if (category === 'promoted') {
|
|
params.promoted = 1;
|
|
} else if (category !== 'all') {
|
|
params.category = category;
|
|
}
|
|
// For 'all' category, no additional filters needed
|
|
}
|
|
|
|
return params;
|
|
}, [category, searchQuery]);
|
|
|
|
// Use infinite query for marketplace agents
|
|
const {
|
|
data,
|
|
isLoading,
|
|
error,
|
|
isFetching,
|
|
fetchNextPage,
|
|
hasNextPage,
|
|
refetch,
|
|
isFetchingNextPage,
|
|
} = useMarketplaceAgentsInfiniteQuery(queryParams);
|
|
|
|
// Flatten all pages into a single array of agents
|
|
const currentAgents = useMemo(() => {
|
|
if (!data?.pages) return [];
|
|
return data.pages.flatMap((page) => page.data || []);
|
|
}, [data?.pages]);
|
|
|
|
// Check if we have meaningful data to prevent unnecessary loading states
|
|
const hasData = useHasData(data?.pages?.[0]);
|
|
|
|
// Set up infinite scroll
|
|
const { setScrollElement } = useInfiniteScroll({
|
|
hasNextPage,
|
|
isLoading: isFetching || isFetchingNextPage,
|
|
fetchNextPage: () => {
|
|
if (hasNextPage && !isFetching) {
|
|
fetchNextPage();
|
|
}
|
|
},
|
|
threshold: 0.8, // Trigger when 80% scrolled
|
|
throttleMs: 200,
|
|
});
|
|
|
|
// Connect the scroll element when it's provided
|
|
useEffect(() => {
|
|
const scrollElement = scrollElementRef?.current;
|
|
if (scrollElement) {
|
|
setScrollElement(scrollElement);
|
|
}
|
|
}, [scrollElementRef, setScrollElement]);
|
|
|
|
/**
|
|
* Get category display name from API data or use fallback
|
|
*/
|
|
const getCategoryDisplayName = (categoryValue: string) => {
|
|
const categoryData = categories.find((cat) => cat.value === categoryValue);
|
|
if (categoryData) {
|
|
return categoryData.label;
|
|
}
|
|
|
|
// Fallback for special categories or unknown categories
|
|
if (categoryValue === 'promoted') {
|
|
return localize('com_agents_top_picks');
|
|
}
|
|
if (categoryValue === 'all') {
|
|
return 'All';
|
|
}
|
|
|
|
// Simple capitalization for unknown categories
|
|
return categoryValue.charAt(0).toUpperCase() + categoryValue.slice(1);
|
|
};
|
|
|
|
// Simple loading spinner
|
|
const loadingSpinner = (
|
|
<div className="flex justify-center py-12">
|
|
<Spinner className="h-8 w-8 text-primary" />
|
|
</div>
|
|
);
|
|
|
|
// Handle error state with enhanced error display
|
|
if (error) {
|
|
return (
|
|
<ErrorDisplay
|
|
error={error || 'Unknown error occurred'}
|
|
onRetry={() => refetch()}
|
|
context={{
|
|
searchQuery,
|
|
category,
|
|
}}
|
|
/>
|
|
);
|
|
}
|
|
|
|
// Main content component with proper semantic structure
|
|
const mainContent = (
|
|
<div
|
|
className="space-y-6"
|
|
role="tabpanel"
|
|
id={`category-panel-${category}`}
|
|
aria-labelledby={`category-tab-${category}`}
|
|
aria-live="polite"
|
|
aria-busy={isLoading && !hasData}
|
|
>
|
|
{/* Handle empty results with enhanced accessibility */}
|
|
{(!currentAgents || currentAgents.length === 0) && !isLoading && !isFetching ? (
|
|
<div
|
|
className="py-12 text-center text-text-secondary"
|
|
role="status"
|
|
aria-live="polite"
|
|
aria-label={
|
|
searchQuery
|
|
? localize('com_agents_search_empty_heading')
|
|
: localize('com_agents_empty_state_heading')
|
|
}
|
|
>
|
|
<h3 className="mb-2 text-lg font-medium">{localize('com_agents_empty_state_heading')}</h3>
|
|
</div>
|
|
) : (
|
|
<>
|
|
{/* Announcement for screen readers */}
|
|
<div id="search-results-count" className="sr-only" aria-live="polite" aria-atomic="true">
|
|
{localize('com_agents_grid_announcement', {
|
|
count: currentAgents?.length || 0,
|
|
category: getCategoryDisplayName(category),
|
|
})}
|
|
</div>
|
|
|
|
{/* Agent grid - 2 per row with proper semantic structure */}
|
|
{currentAgents && currentAgents.length > 0 && (
|
|
<div
|
|
className="mx-4 grid grid-cols-1 gap-6 md:grid-cols-2"
|
|
role="grid"
|
|
aria-label={localize('com_agents_grid_announcement', {
|
|
count: currentAgents.length,
|
|
category: getCategoryDisplayName(category),
|
|
})}
|
|
>
|
|
{currentAgents.map((agent: t.Agent, index: number) => (
|
|
<div key={`${agent.id}-${index}`} role="gridcell">
|
|
<AgentCard agent={agent} onSelect={onSelectAgent} />
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{/* Loading indicator when fetching more with accessibility */}
|
|
{isFetchingNextPage && (
|
|
<div
|
|
className="flex justify-center py-8"
|
|
role="status"
|
|
aria-live="polite"
|
|
aria-label={localize('com_agents_loading')}
|
|
>
|
|
<Spinner className="h-6 w-6 text-primary" />
|
|
<span className="sr-only">{localize('com_agents_loading')}</span>
|
|
</div>
|
|
)}
|
|
|
|
{/* End of results indicator */}
|
|
{!hasNextPage && currentAgents && currentAgents.length > 0 && (
|
|
<div className="mt-8 text-center">
|
|
<p className="text-sm text-text-secondary">
|
|
{localize('com_agents_no_more_results')}
|
|
</p>
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
);
|
|
|
|
if (isLoading || (isFetching && !isFetchingNextPage)) {
|
|
return loadingSpinner;
|
|
}
|
|
return mainContent;
|
|
};
|
|
|
|
export default AgentGrid;
|