Skip to content

refactor(web): отображение команды в хэдере (#154) #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexMadM merged 1 commit into from
Mar 16, 2026
Merged

refactor(web): отображение команды в хэдере (#154) #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions apps/web/widgets/main-layout/ui/sidebar/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,12 @@ const Sidebar = ({ className, forceOpen, onNavigate }: Props) => {
const params = useParams<{ id?: string; projectId?: string }>()
const { data: teams } = useTeamsList()
const isOpen = forceOpen ?? isDesktopOpen
const teamId = typeof params.id === 'string' ? params.id : (teams?.[0]?.id ?? null)
const selectedTeamId = typeof params.id === 'string' ? params.id : null
const teamId = selectedTeamId ?? teams?.[0]?.id ?? null
const projectId = typeof params.projectId === 'string' ? params.projectId : null
const currentTeam = teams?.find((team) => team.id === teamId) ?? null
const currentTeam = selectedTeamId
? (teams?.find((team) => team.id === selectedTeamId) ?? null)
: null
const activeRouteId = getSidebarRouteId(pathname)
const sections = getSidebarSections(teamId)
const [workSection, ...otherSections] = sections
Expand Down Expand Up @@ -80,9 +83,11 @@ const Sidebar = ({ className, forceOpen, onNavigate }: Props) => {
<div className='truncate text-sm font-semibold leading-5'>
{sidebarWorkspace.title}
</div>
<div className='truncate text-xs text-muted-foreground'>
{currentTeam?.name ?? sidebarWorkspace.subtitle}
</div>
{currentTeam?.name ? (
<div className='truncate text-xs text-muted-foreground'>
{currentTeam.name}
</div>
) : null}
</div>
)}
</Link>
Expand Down
Loading