mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-20 10:20:15 +01:00
bugfix: Enhance Agent and AgentCategory schemas with new fields for category, support contact, and promotion status refactored and moved agent category methods and schema to data-schema package 🔧 fix: Merge and Rebase Conflicts - Move AgentCategory from api/models to @packages/data-schemas structure - Add schema, types, methods, and model following codebase conventions - Implement auto-seeding of default categories during AppService startup - Update marketplace controller to use new data-schemas methods - Remove old model file and standalone seed script refactor: unify agent marketplace to single endpoint with cursor pagination - Replace multiple marketplace routes with unified /marketplace endpoint - Add query string controls: category, search, limit, cursor, promoted, requiredPermission - Implement cursor-based pagination replacing page-based system - Integrate ACL permissions for proper access control - Fix ObjectId constructor error in Agent model - Update React components to use unified useGetMarketplaceAgentsQuery hook - Enhance type safety and remove deprecated useDynamicAgentQuery - Update tests for new marketplace architecture -Known issues: see more button after category switching + Unit tests feat: add icon property to ProcessedAgentCategory interface - Add useMarketplaceAgentsInfiniteQuery and useGetAgentCategoriesQuery to client/src/data-provider/Agents/ - Replace manual pagination in AgentGrid with infinite query pattern - Update imports to use local data provider instead of librechat-data-provider - Add proper permission handling with PERMISSION_BITS.VIEW/EDIT constants - Improve agent access control by adding requiredPermission validation in backend - Remove manual cursor/state management in favor of infinite query built-ins - Maintain existing search and category filtering functionality refactor: consolidate agent marketplace endpoints into main agents API and improve data management consistency - Remove dedicated marketplace controller and routes, merging functionality into main agents v1 API - Add countPromotedAgents function to Agent model for promoted agents count - Enhance getListAgents handler with marketplace filtering (category, search, promoted status) - Move getAgentCategories from marketplace to v1 controller with same functionality - Update agent mutations to invalidate marketplace queries and handle multiple permission levels - Improve cache management by updating all agent query variants (VIEW/EDIT permissions) - Consolidate agent data access patterns for better maintainability and consistency - Remove duplicate marketplace route definitions and middleware selected view only agents injected in the drop down fix: remove minlength validation for support contact name in agent schema feat: add validation and error messages for agent name in AgentConfig and AgentPanel fix: update agent permission check logic in AgentPanel to simplify condition Fix linting WIP Fix Unit tests WIP ESLint fixes eslint fix refactor: enhance isDuplicateVersion function in Agent model for improved comparison logic - Introduced handling for undefined/null values in array and object comparisons. - Normalized array comparisons to treat undefined/null as empty arrays. - Added deep comparison for objects and improved handling of primitive values. - Enhanced projectIds comparison to ensure consistent MongoDB ObjectId handling. refactor: remove redundant properties from IAgent interface in agent schema chore: update localization for agent detail component and clean up imports ci: update access middleware tests chore: remove unused PermissionTypes import from Role model ci: update AclEntry model tests ci: update button accessibility labels in AgentDetail tests refactor: update exhaustive dep. lint warning 🔧 fix: Fixed agent actions access feat: Add role-level permissions for agent sharing people picker - Add PEOPLE_PICKER permission type with VIEW_USERS and VIEW_GROUPS permissions - Create custom middleware for query-aware permission validation - Implement permission-based type filtering in PeoplePicker component - Hide people picker UI when user lacks permissions, show only public toggle - Support granular access: users-only, groups-only, or mixed search modes refactor: Replace marketplace interface config with permission-based system - Add MARKETPLACE permission type to handle marketplace access control - Update interface configuration to use role-based marketplace settings (admin/user) - Replace direct marketplace boolean config with permission-based checks - Modify frontend components to use marketplace permissions instead of interface config - Update agent query hooks to use marketplace permissions for determining permission levels - Add marketplace configuration structure similar to peoplePicker in YAML config - Backend now sets MARKETPLACE permissions based on interface configuration - When marketplace enabled: users get agents with EDIT permissions in dropdown lists (builder mode) - When marketplace disabled: users get agents with VIEW permissions in dropdown lists (browse mode) 🔧 fix: Redirect to New Chat if No Marketplace Access and Required Agent Name Placeholder (#8213) * Fix: Fix the redirect to new chat page if access to marketplace is denied * Fixed the required agent name placeholder --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> chore: fix tests, remove unnecessary imports refactor: Implement permission checks for file access via agents - Updated `hasAccessToFilesViaAgent` to utilize permission checks for VIEW and EDIT access. - Replaced project-based access validation with permission-based checks. - Enhanced tests to cover new permission logic and ensure proper access control for files associated with agents. - Cleaned up imports and initialized models in test files for consistency. refactor: Enhance test setup and cleanup for file access control - Introduced modelsToCleanup array to track models added during tests for proper cleanup. - Updated afterAll hooks in test files to ensure all collections are cleared and only added models are deleted. - Improved consistency in model initialization across test files. - Added comments for clarity on cleanup processes and test data management. chore: Update Jest configuration and test setup for improved timeout handling - Added a global test timeout of 30 seconds in jest.config.js. - Configured jest.setTimeout in jestSetup.js to allow individual test overrides if needed. - Enhanced test reliability by ensuring consistent timeout settings across all tests. refactor: Implement file access filtering based on agent permissions - Introduced `filterFilesByAgentAccess` function to filter files based on user access through agents. - Updated `getFiles` and `primeFiles` functions to utilize the new filtering logic. - Moved `hasAccessToFilesViaAgent` function from the File model to permission services, adjusting imports accordingly - Enhanced tests to ensure proper access control and filtering behavior for files associated with agents. fix: make support_contact field a nested object rather than a sub-document refactor: Update support_contact field initialization in agent model - Removed handling for empty support_contact object in createAgent function. - Changed default value of support_contact in agent schema to undefined. test: Add comprehensive tests for support_contact field handling and versioning refactor: remove unused avatar upload mutation field and add informational toast for success chore: add missing SidePanelProvider for AgentMarketplace and organize imports fix: resolve agent selection race condition in marketplace HandleStartChat - Set agent in localStorage before newConversation to prevent useSelectorEffects from auto-selecting previous agent fix: resolve agent dropdown showing raw ID instead of agent info from URL - Add proactive agent fetching when agent_id is present in URL parameters - Inject fetched agent into agents cache so dropdowns display proper name/avatar - Use useAgentsMap dependency to ensure proper cache initialization timing - Prevents raw agent IDs from showing in UI when visiting shared agent links Fix: Agents endpoint renamed to "My Agent" for less confusion with the Marketplace agents. chore: fix ESLint issues and Test Mocks ci: update permissions structure in loadDefaultInterface tests - Refactored permissions for MEMORY and added new permissions for MARKETPLACE and PEOPLE_PICKER. - Ensured consistent structure for permissions across different types. feat: support_contact validation to allow empty email strings
286 lines
9.2 KiB
TypeScript
286 lines
9.2 KiB
TypeScript
import React, { useMemo } from 'react';
|
|
import { Button, Spinner } from '@librechat/client';
|
|
import { PERMISSION_BITS } from 'librechat-data-provider';
|
|
import type t from 'librechat-data-provider';
|
|
import { useMarketplaceAgentsInfiniteQuery } from '~/data-provider/Agents';
|
|
import { useAgentCategories } from '~/hooks/Agents';
|
|
import useLocalize from '~/hooks/useLocalize';
|
|
import { useHasData } from './SmartLoader';
|
|
import ErrorDisplay from './ErrorDisplay';
|
|
import AgentCard from './AgentCard';
|
|
import { cn } from '~/utils';
|
|
|
|
interface AgentGridProps {
|
|
category: string; // Currently selected category
|
|
searchQuery: string; // Current search query
|
|
onSelectAgent: (agent: t.Agent) => void; // Callback when agent is selected
|
|
}
|
|
|
|
/**
|
|
* Component for displaying a grid of agent cards
|
|
*/
|
|
const AgentGrid: React.FC<AgentGridProps> = ({ category, searchQuery, onSelectAgent }) => {
|
|
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: PERMISSION_BITS.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]);
|
|
|
|
/**
|
|
* 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);
|
|
};
|
|
|
|
/**
|
|
* Load more agents when "See More" button is clicked
|
|
*/
|
|
const handleLoadMore = () => {
|
|
if (hasNextPage && !isFetching) {
|
|
fetchNextPage();
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Get the appropriate title for the agents grid based on current state
|
|
*/
|
|
const getGridTitle = () => {
|
|
if (searchQuery) {
|
|
return localize('com_agents_results_for', { query: searchQuery });
|
|
}
|
|
|
|
return getCategoryDisplayName(category);
|
|
};
|
|
|
|
// Loading skeleton component
|
|
const loadingSkeleton = (
|
|
<div className="space-y-6">
|
|
<div className="mb-4">
|
|
<div className="mb-2 h-6 w-48 animate-pulse rounded-md bg-gray-200 dark:bg-gray-700"></div>
|
|
<div className="h-4 w-64 animate-pulse rounded-md bg-gray-200 dark:bg-gray-700"></div>
|
|
</div>
|
|
<div className="grid grid-cols-1 gap-6 md:grid-cols-2">
|
|
{Array(6)
|
|
.fill(0)
|
|
.map((_, index) => (
|
|
<div
|
|
key={index}
|
|
className={cn(
|
|
'flex h-[250px] animate-pulse flex-col overflow-hidden rounded-lg',
|
|
'bg-gray-200 dark:bg-gray-800',
|
|
)}
|
|
>
|
|
<div className="h-40 bg-gray-300 dark:bg-gray-700"></div>
|
|
<div className="flex-1 p-5">
|
|
<div className="mb-3 h-4 w-3/4 rounded bg-gray-300 dark:bg-gray-700"></div>
|
|
<div className="mb-2 h-3 w-full rounded bg-gray-300 dark:bg-gray-700"></div>
|
|
<div className="h-3 w-2/3 rounded bg-gray-300 dark:bg-gray-700"></div>
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</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}
|
|
>
|
|
{/* Grid title - only show for search results */}
|
|
{searchQuery && (
|
|
<div className="mb-4">
|
|
<h2
|
|
className="text-xl font-bold text-gray-900 dark:text-white"
|
|
id={`category-heading-${category}`}
|
|
aria-label={`${getGridTitle()}, ${currentAgents.length || 0} agents available`}
|
|
>
|
|
{getGridTitle()}
|
|
</h2>
|
|
</div>
|
|
)}
|
|
|
|
{/* Handle empty results with enhanced accessibility */}
|
|
{(!currentAgents || currentAgents.length === 0) && !isLoading && !isFetching ? (
|
|
<div
|
|
className="py-12 text-center text-gray-500"
|
|
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">
|
|
{searchQuery
|
|
? localize('com_agents_search_empty_heading')
|
|
: localize('com_agents_empty_state_heading')}
|
|
</h3>
|
|
<p className="text-sm">
|
|
{searchQuery
|
|
? localize('com_agents_no_results')
|
|
: localize('com_agents_none_in_category')}
|
|
</p>
|
|
</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="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} onClick={() => onSelectAgent(agent)} />
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{/* Loading indicator when fetching more with accessibility */}
|
|
{isFetching && hasNextPage && (
|
|
<div
|
|
className="flex justify-center py-4"
|
|
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>
|
|
)}
|
|
|
|
{/* Load more button with enhanced accessibility */}
|
|
{hasNextPage && !isFetching && (
|
|
<div className="mt-8 flex justify-center">
|
|
<Button
|
|
variant="outline"
|
|
onClick={handleLoadMore}
|
|
className={cn(
|
|
'min-w-[160px] border-2 border-gray-300 bg-white px-6 py-3 font-medium text-gray-700',
|
|
'shadow-sm transition-all duration-200 hover:border-gray-400 hover:bg-gray-50',
|
|
'hover:shadow-md focus:ring-2 focus:ring-blue-500 focus:ring-offset-2',
|
|
'dark:border-gray-600 dark:bg-gray-800 dark:text-gray-200',
|
|
'dark:hover:border-gray-500 dark:hover:bg-gray-700 dark:focus:ring-blue-400',
|
|
)}
|
|
aria-label={localize('com_agents_load_more_label', {
|
|
category: getCategoryDisplayName(category),
|
|
})}
|
|
>
|
|
{localize('com_agents_see_more')}
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
);
|
|
|
|
if (isLoading || (isFetching && !isFetchingNextPage)) {
|
|
return loadingSkeleton;
|
|
}
|
|
return mainContent;
|
|
};
|
|
|
|
export default AgentGrid;
|