2025-05-30 22:18:13 -04:00
|
|
|
jest.mock('~/models', () => ({
|
2024-08-21 19:57:34 -04:00
|
|
|
initializeRoles: jest.fn(),
|
2025-06-23 10:22:27 -04:00
|
|
|
seedDefaultRoles: jest.fn(),
|
🔧 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
|
|
|
ensureDefaultCategories: jest.fn(),
|
2025-05-30 22:18:13 -04:00
|
|
|
}));
|
|
|
|
|
jest.mock('~/models/Role', () => ({
|
2024-08-26 15:34:46 -04:00
|
|
|
updateAccessPermissions: jest.fn(),
|
2024-08-21 19:57:34 -04:00
|
|
|
getRoleByName: jest.fn(),
|
|
|
|
|
updateRoleByName: jest.fn(),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('~/config', () => ({
|
|
|
|
|
logger: {
|
|
|
|
|
info: jest.fn(),
|
|
|
|
|
warn: jest.fn(),
|
|
|
|
|
error: jest.fn(),
|
|
|
|
|
},
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('./Config/loadCustomConfig', () => jest.fn());
|
|
|
|
|
jest.mock('./start/interface', () => ({
|
|
|
|
|
loadDefaultInterface: jest.fn(),
|
|
|
|
|
}));
|
|
|
|
|
jest.mock('./ToolService', () => ({
|
|
|
|
|
loadAndFormatTools: jest.fn().mockReturnValue({}),
|
|
|
|
|
}));
|
|
|
|
|
jest.mock('./start/checks', () => ({
|
|
|
|
|
checkVariables: jest.fn(),
|
|
|
|
|
checkHealth: jest.fn(),
|
|
|
|
|
checkConfig: jest.fn(),
|
|
|
|
|
checkAzureVariables: jest.fn(),
|
2025-05-24 10:23:17 -04:00
|
|
|
checkWebSearchConfig: jest.fn(),
|
2024-08-21 19:57:34 -04:00
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
const AppService = require('./AppService');
|
|
|
|
|
const { loadDefaultInterface } = require('./start/interface');
|
|
|
|
|
|
2024-08-26 15:34:46 -04:00
|
|
|
describe('AppService interface configuration', () => {
|
2024-08-21 19:57:34 -04:00
|
|
|
let app;
|
|
|
|
|
let mockLoadCustomConfig;
|
|
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
|
app = { locals: {} };
|
|
|
|
|
jest.resetModules();
|
|
|
|
|
jest.clearAllMocks();
|
|
|
|
|
mockLoadCustomConfig = require('./Config/loadCustomConfig');
|
|
|
|
|
});
|
|
|
|
|
|
2024-08-26 15:34:46 -04:00
|
|
|
it('should set prompts and bookmarks to true when loadDefaultInterface returns true for both', async () => {
|
2024-08-21 19:57:34 -04:00
|
|
|
mockLoadCustomConfig.mockResolvedValue({});
|
2024-08-26 15:34:46 -04:00
|
|
|
loadDefaultInterface.mockResolvedValue({ prompts: true, bookmarks: true });
|
2024-08-21 19:57:34 -04:00
|
|
|
|
|
|
|
|
await AppService(app);
|
|
|
|
|
|
|
|
|
|
expect(app.locals.interfaceConfig.prompts).toBe(true);
|
2024-08-26 15:34:46 -04:00
|
|
|
expect(app.locals.interfaceConfig.bookmarks).toBe(true);
|
2024-08-21 19:57:34 -04:00
|
|
|
expect(loadDefaultInterface).toHaveBeenCalled();
|
|
|
|
|
});
|
|
|
|
|
|
2024-08-26 15:34:46 -04:00
|
|
|
it('should set prompts and bookmarks to false when loadDefaultInterface returns false for both', async () => {
|
|
|
|
|
mockLoadCustomConfig.mockResolvedValue({ interface: { prompts: false, bookmarks: false } });
|
|
|
|
|
loadDefaultInterface.mockResolvedValue({ prompts: false, bookmarks: false });
|
2024-08-21 19:57:34 -04:00
|
|
|
|
|
|
|
|
await AppService(app);
|
|
|
|
|
|
|
|
|
|
expect(app.locals.interfaceConfig.prompts).toBe(false);
|
2024-08-26 15:34:46 -04:00
|
|
|
expect(app.locals.interfaceConfig.bookmarks).toBe(false);
|
2024-08-21 19:57:34 -04:00
|
|
|
expect(loadDefaultInterface).toHaveBeenCalled();
|
|
|
|
|
});
|
|
|
|
|
|
2024-08-26 15:34:46 -04:00
|
|
|
it('should not set prompts and bookmarks when loadDefaultInterface returns undefined for both', async () => {
|
2024-08-21 19:57:34 -04:00
|
|
|
mockLoadCustomConfig.mockResolvedValue({});
|
|
|
|
|
loadDefaultInterface.mockResolvedValue({});
|
|
|
|
|
|
|
|
|
|
await AppService(app);
|
|
|
|
|
|
|
|
|
|
expect(app.locals.interfaceConfig.prompts).toBeUndefined();
|
2024-08-26 15:34:46 -04:00
|
|
|
expect(app.locals.interfaceConfig.bookmarks).toBeUndefined();
|
|
|
|
|
expect(loadDefaultInterface).toHaveBeenCalled();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should set prompts and bookmarks to different values when loadDefaultInterface returns different values', async () => {
|
|
|
|
|
mockLoadCustomConfig.mockResolvedValue({ interface: { prompts: true, bookmarks: false } });
|
|
|
|
|
loadDefaultInterface.mockResolvedValue({ prompts: true, bookmarks: false });
|
|
|
|
|
|
|
|
|
|
await AppService(app);
|
|
|
|
|
|
|
|
|
|
expect(app.locals.interfaceConfig.prompts).toBe(true);
|
|
|
|
|
expect(app.locals.interfaceConfig.bookmarks).toBe(false);
|
2024-08-21 19:57:34 -04:00
|
|
|
expect(loadDefaultInterface).toHaveBeenCalled();
|
|
|
|
|
});
|
|
|
|
|
});
|