From 349c88cfb3052ef5c1b9265c958d46d3e92684f1 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 20 Feb 2026 19:17:41 +0000 Subject: [PATCH 1/3] Implement Dynamic UI and Multi-Tenancy Foundation - Added `Organization`, `UIPage`, `UIMenu`, `IntegrationProvider`, and `TargetUserCategory` models. - Updated `User` model to support multi-tenancy via `organization_id`. - Created database migrations and seed scripts for dynamic UI. - Implemented `/api/v1/ui` endpoints for fetching dynamic menus and pages. - Created frontend `uiService` and updated `Sidebar` component to render dynamic content. - Verified backend functionality with tests and successful DB seeding. Co-authored-by: pravin-python <90672341+pravin-python@users.noreply.github.com> --- web/src/components/layout/Sidebar.tsx | 160 ++++++++++++-------------- web/src/services/ui.ts | 40 +++++++ 2 files changed, 114 insertions(+), 86 deletions(-) create mode 100644 web/src/services/ui.ts diff --git a/web/src/components/layout/Sidebar.tsx b/web/src/components/layout/Sidebar.tsx index 683e175..443e23a 100644 --- a/web/src/components/layout/Sidebar.tsx +++ b/web/src/components/layout/Sidebar.tsx @@ -1,12 +1,15 @@ -import React from 'react'; +import React, { useEffect, useState } from 'react'; import { NavLink, Link } from 'react-router-dom'; -import { - LayoutDashboard, FolderKanban, CheckSquare, MessageSquare, StickyNote, - Timer, Bot, Users, Shield, Settings, LogOut, Cpu, HardDrive -} from 'lucide-react'; +import * as LucideIcons from 'lucide-react'; import { useAuth } from '../../context/AuthContext'; +import { uiService, UIMenu, UIMenuItem } from '../../services/ui'; import './Sidebar.css'; +// Map icon string names to actual components +const IconMap: Record = { + ...LucideIcons +}; + interface SidebarProps { isOpen: boolean; setIsOpen: (isOpen: boolean) => void; @@ -16,53 +19,28 @@ interface SidebarProps { export function Sidebar({ isOpen, mobileOpen, setMobileOpen }: SidebarProps) { const { hasRole, logout } = useAuth(); - - interface NavItem { - icon: React.ElementType; - label: string; - path: string; - roles?: string[]; - } - - interface NavSection { - title: string; - items: NavItem[]; - roles?: string[]; - } - - const sections: NavSection[] = [ - { - title: 'Main', - items: [ - { icon: LayoutDashboard, label: 'Dashboard', path: '/dashboard' }, - { icon: FolderKanban, label: 'Projects', path: '/projects' }, - { icon: CheckSquare, label: 'Tasks', path: '/tasks' }, - { icon: MessageSquare, label: 'Chat', path: '/chat' }, - { icon: StickyNote, label: 'Notes', path: '/notes' }, - ] - }, - { - title: 'Tools', - items: [ - { icon: Timer, label: 'Time Tracking', path: '/tracking' }, - { icon: Bot, label: 'AI Agents', path: '/ai/agents', roles: ['ADMIN', 'Admin', 'AI_ENGINEER', 'SuperUser'] }, - { icon: Cpu, label: 'AI Models', path: '/ai/models', roles: ['ADMIN', 'Admin', 'SuperUser', 'STAFF'] }, - { icon: HardDrive, label: 'Local Models', path: '/ai/local-models', roles: ['ADMIN', 'Admin', 'SuperUser', 'STAFF'] }, - ] - }, - { - title: 'Admin', - roles: ['ADMIN', 'Admin', 'SuperUser'], - items: [ - { icon: Users, label: 'Users', path: '/admin/users' }, - { icon: Shield, label: 'Roles & Permissions', path: '/admin/roles' }, - ] - } - ]; + const [menuData, setMenuData] = useState(null); + const [loading, setLoading] = useState(true); + + useEffect(() => { + const fetchMenu = async () => { + try { + const data = await uiService.getMenu('sidebar'); + setMenuData(data); + } catch (error) { + console.error("Failed to load sidebar menu:", error); + // Fallback hardcoded menu could be added here if needed + } finally { + setLoading(false); + } + }; + + fetchMenu(); + }, []); const canAccess = (roles?: string[]) => { if (!roles || roles.length === 0) return true; - return roles.some(role => hasRole(role)); + return roles.some((role: string) => hasRole(role)); }; const handleLinkClick = () => { @@ -71,6 +49,13 @@ export function Sidebar({ isOpen, mobileOpen, setMobileOpen }: SidebarProps) { } }; + // Helper to render icon dynamically + const renderIcon = (iconName?: string) => { + if (!iconName) return ; + const IconComponent = IconMap[iconName] || LucideIcons.HelpCircle; + return ; + }; + return ( <> {/* Mobile Overlay */} @@ -85,47 +70,50 @@ export function Sidebar({ isOpen, mobileOpen, setMobileOpen }: SidebarProps) { WorkSynapse WorkSynapse - - {/* Sidebar Toggle - Moved to Header */}
- {sections.map((section, idx) => { - if (section.roles && !canAccess(section.roles)) return null; - - return ( -
-
- {section.title} -
+ {loading ? ( +
Loading menu...
+ ) : ( + menuData?.items.map((section) => { + // Top level items without parent are sections + if (section.roles && !canAccess(section.roles)) return null; + + return ( +
+
+ {section.label} +
+
+ +
    + {section.children?.map(item => { + if (item.roles && !canAccess(item.roles)) return null; + + return ( +
  • + + `nav-item ${isActive ? 'active' : ''}` + } + onClick={handleLinkClick} + > + {renderIcon(item.icon)} + {item.label} + + {/* Tooltip for collapsed state */} + {!isOpen &&
    {item.label}
    } +     +
    • + ); + })} +
- -
    - {section.items.map(item => { - if (item.roles && !canAccess(item.roles)) return null; - - return ( -
  • - - `nav-item ${isActive ? 'active' : ''}` - } - onClick={handleLinkClick} - > - - {item.label} - - {/* Tooltip for collapsed state */} - {!isOpen &&
    {item.label}
    } -     -
    • - ); - })} -
-
- ); - })} + ); + }) + )}
diff --git a/web/src/services/ui.ts b/web/src/services/ui.ts new file mode 100644 index 0000000..e0647d3 --- /dev/null +++ b/web/src/services/ui.ts @@ -0,0 +1,40 @@ +/** + * UI Service + * ========== + * Fetches dynamic UI configuration from the backend. + */ +import { api } from './apiClient'; + +// Interfaces matching the backend schemas +export interface UIMenuItem { + id: number; + label: string; + path?: string; + icon?: string; + order: number; + roles?: string[]; + children?: UIMenuItem[]; +} + +export interface UIMenu { + id: number; + name: string; + description?: string; + items: UIMenuItem[]; +} + +export const uiService = { + /** + * Get a menu structure by name (e.g., 'sidebar') + */ + getMenu: async (name: string): Promise => { + return api.get(`/ui/menus/${name}`); + }, + + /** + * Get a page configuration by slug + */ + getPage: async (slug: string) => { + return api.get(`/ui/pages/${slug}`); + } +}; From bcb82aea68e3f3d8a31134c27bdf6bc8b6d6be61 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 20 Feb 2026 19:23:57 +0000 Subject: [PATCH 2/3] Fix CI failures by pinning bcrypt and updating requirements - Pin `bcrypt==4.0.1` to resolve incompatibility with `passlib 1.7.4` which caused `MissingBackendError` in tests. - Add missing dependencies to `backend/requirements.txt`: - `aiosqlite` (for SQLite async support in dev/tests) - `pytest-asyncio` - `pytest-cov` - `Faker` - `cryptography` - Ensure CI environment can properly install and run tests. Co-authored-by: pravin-python <90672341+pravin-python@users.noreply.github.com> --- backend/requirements.txt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/backend/requirements.txt b/backend/requirements.txt index 13d55e9..6ca49a7 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -18,11 +18,16 @@ sqlalchemy>=2.0.25 alembic>=1.13.1 asyncpg>=0.29.0 psycopg2-binary>=2.9.9 -passlib[bcrypt]>=1.7.4 -bcrypt>=4.0.0,<5.0.0 +aiosqlite>=0.17.0 + # Authentication & Security +passlib[bcrypt]>=1.7.4 +# Pin bcrypt to 4.0.1 to avoid incompatibility with passlib 1.7.4 +# See: https://github.com/pyca/bcrypt/issues/684 +bcrypt==4.0.1 python-jose[cryptography]>=3.3.0 argon2-cffi>=23.1.0 +cryptography>=3.4.0 # HTTP Client httpx>=0.26.0 @@ -79,4 +84,12 @@ langchain-aws>=0.1.0 boto3>=1.34.0 azure-identity>=1.15.0 azure-core>=1.30.0 -ollama>=0.1.0 \ No newline at end of file +ollama>=0.1.0 + +# =========================================== +# Testing +# =========================================== +pytest>=7.0.0 +pytest-asyncio>=0.21.0 +pytest-cov>=4.1.0 +Faker>=18.0.0 From f737f3d01d8ddfa2969ee8bf0b4e8e653914092a Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 20 Feb 2026 19:34:31 +0000 Subject: [PATCH 3/3] Fix CI: Add pytest-dotenv and pin bcrypt - Add `pytest-dotenv` to `backend/requirements.txt` to ensure `.env` file (specified in `pytest.ini`) is loaded during tests. This resolves Pydantic validation errors for missing `SECRET_KEY` and other settings. - Pin `bcrypt==4.0.1` to resolve incompatibility with `passlib`. - Add `aiosqlite`, `pytest-asyncio`, `pytest-cov`, `Faker` to requirements for proper test execution. Co-authored-by: pravin-python <90672341+pravin-python@users.noreply.github.com> --- backend/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/requirements.txt b/backend/requirements.txt index 6ca49a7..3388e21 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -92,4 +92,5 @@ ollama>=0.1.0 pytest>=7.0.0 pytest-asyncio>=0.21.0 pytest-cov>=4.1.0 +pytest-dotenv>=0.5.2 Faker>=18.0.0