frontend cleanup

This commit is contained in:
2025-10-29 00:02:44 +01:00
parent 8554fbd6e5
commit b4282c2b4b
4 changed files with 164 additions and 88 deletions
+22 -4
View File
@@ -7,6 +7,8 @@ import {
ChevronsLeftIcon,
LogoutIcon,
ChevronDownIcon,
SettingsIcon,
CheckIcon,
} from '../ui/icons';
import { getTagColorStyle } from '../utils/colors';
@@ -159,6 +161,7 @@ const Sidebar = ({
tenants = [],
activeTenantId = null,
onSelectTenant,
onOpenSettings,
}) => {
const sortedCorrespondents = useMemo(
() =>
@@ -232,7 +235,7 @@ const Sidebar = ({
const handleTenantSelect = useCallback(
(tenant) => {
const targetId = tenant?.tenant_id || tenant?.tenantId || tenant?.id || null;
const targetId = tenant?.id || null;
if (!targetId) {
return;
}
@@ -247,6 +250,11 @@ const Sidebar = ({
onLogout?.();
}, [onLogout]);
const handleSettingsFromMenu = useCallback(() => {
setTenantMenuOpen(false);
onOpenSettings?.();
}, [onOpenSettings]);
const renderNodes = useCallback(
(ids, depth) =>
ids.map((id) => {
@@ -317,7 +325,7 @@ const Sidebar = ({
<span className="menu__empty">No tenants available.</span>
) : (
tenants.map((tenant) => {
const tenantId = tenant?.tenant_id || tenant?.tenantId || tenant?.id || null;
const tenantId = tenant?.id || null;
const isActive = tenantId === activeTenantId;
return (
<button
@@ -327,16 +335,26 @@ const Sidebar = ({
onClick={() => handleTenantSelect(tenant)}
role="menuitem"
>
<span className="menu__check-slot">
{isActive ? <CheckIcon size={16} /> : null}
</span>
<span className="menu__label">
{tenant?.slug || tenant?.name || tenantId || 'Tenant'}
{tenant?.slug || tenant?.name || tenantId || 'Tenant'}
</span>
{isActive ? <span className="menu__active-indicator">Active</span> : null}
</button>
);
})
)}
</div>
<div className="menu__footer">
<button
type="button"
className="menu__settings"
onClick={handleSettingsFromMenu}
>
<SettingsIcon size={16} />
Settings
</button>
<button
type="button"
className="menu__logout"