🔧 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
2025-06-13 15:06:36 +02:00
|
|
|
import { AgentListResponse } from 'librechat-data-provider';
|
2025-06-23 10:22:27 -04:00
|
|
|
import React, { useState, useEffect } from 'react';
|
|
|
|
|
|
|
|
|
|
interface SmartLoaderProps {
|
|
|
|
|
/** Whether the content is currently loading */
|
|
|
|
|
isLoading: boolean;
|
|
|
|
|
/** Whether there is existing data to show */
|
|
|
|
|
hasData: boolean;
|
|
|
|
|
/** Delay before showing loading state (in ms) - prevents flashing for quick loads */
|
|
|
|
|
delay?: number;
|
|
|
|
|
/** Loading skeleton/spinner component */
|
|
|
|
|
loadingComponent: React.ReactNode;
|
|
|
|
|
/** Content to show when loaded */
|
|
|
|
|
children: React.ReactNode;
|
|
|
|
|
/** Additional CSS classes */
|
|
|
|
|
className?: string;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* SmartLoader - Intelligent loading wrapper that prevents flashing
|
|
|
|
|
*
|
|
|
|
|
* Only shows loading states when:
|
|
|
|
|
* 1. Actually loading AND no existing data
|
|
|
|
|
* 2. Loading has lasted longer than the delay threshold
|
|
|
|
|
*
|
|
|
|
|
* This prevents brief loading flashes for cached/fast responses
|
|
|
|
|
*/
|
|
|
|
|
export const SmartLoader: React.FC<SmartLoaderProps> = ({
|
|
|
|
|
isLoading,
|
|
|
|
|
hasData,
|
|
|
|
|
delay = 150,
|
|
|
|
|
loadingComponent,
|
|
|
|
|
children,
|
|
|
|
|
className = '',
|
|
|
|
|
}) => {
|
|
|
|
|
const [shouldShowLoading, setShouldShowLoading] = useState(false);
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
let timeoutId: NodeJS.Timeout;
|
|
|
|
|
|
|
|
|
|
if (isLoading && !hasData) {
|
|
|
|
|
// Only show loading after delay to prevent flashing
|
|
|
|
|
timeoutId = setTimeout(() => {
|
|
|
|
|
setShouldShowLoading(true);
|
|
|
|
|
}, delay);
|
|
|
|
|
} else {
|
|
|
|
|
// Immediately hide loading when done
|
|
|
|
|
setShouldShowLoading(false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return () => {
|
|
|
|
|
if (timeoutId) {
|
|
|
|
|
clearTimeout(timeoutId);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
}, [isLoading, hasData, delay]);
|
|
|
|
|
|
|
|
|
|
// Show loading state only if we've determined it should be shown
|
|
|
|
|
if (shouldShowLoading) {
|
|
|
|
|
return <div className={className}>{loadingComponent}</div>;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Show content (including when loading but we have existing data)
|
|
|
|
|
return <div className={className}>{children}</div>;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Hook to determine if we have meaningful data to show
|
|
|
|
|
* Helps prevent loading states when we already have cached content
|
|
|
|
|
*/
|
🔧 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
2025-06-13 15:06:36 +02:00
|
|
|
export const useHasData = (data: AgentListResponse | undefined): boolean => {
|
2025-06-23 10:22:27 -04:00
|
|
|
if (!data) return false;
|
|
|
|
|
|
|
|
|
|
// Type guard for object data
|
|
|
|
|
if (typeof data === 'object' && data !== null) {
|
|
|
|
|
// Check for agent list data
|
|
|
|
|
if ('agents' in data) {
|
|
|
|
|
const agents = (data as any).agents;
|
|
|
|
|
return Array.isArray(agents) && agents.length > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check for single agent data
|
|
|
|
|
if ('id' in data || 'name' in data) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check for categories data (array)
|
|
|
|
|
if (Array.isArray(data)) {
|
|
|
|
|
return data.length > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export default SmartLoader;
|