Skip to content

fix: make workspace icons consistent between active and inactive states #2044

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

Open
xielixing wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make workspace icons consistent between active and inactive states #2044

Show file tree
Hide file tree
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
21 changes: 4 additions & 17 deletions src/web-ui/src/app/components/NavPanel/sections/workspaces/WorkspaceItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { lazy, Suspense, useCallback, useContext, useEffect, useMemo, use
import { createPortal } from 'react-dom';
import { Folder, FolderOpen, MoreHorizontal, FolderSearch, Plus, ChevronDown, Trash2, RotateCcw, Copy, FileText, GitBranch, Bot, Link2, ListChecks, Loader2, Clock3 } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { DotMatrixArrowRightIcon } from './DotMatrixArrowRightIcon';
import { Button, ConfirmDialog, Modal, Tooltip } from '@/component-library';
import { useI18n } from '@/infrastructure/i18n';
import { aiExperienceConfigService } from '@/infrastructure/config/services/AIExperienceConfigService';
Expand Down Expand Up @@ -790,15 +789,9 @@ const WorkspaceItem: React.FC<WorkspaceItemProps> = ({
data-workspace-id={workspace.id}
>
<span className="bitfun-nav-panel__assistant-item-avatar" aria-hidden="true">
{isActive ? (
<span className="bitfun-nav-panel__assistant-item-active-icon">
<DotMatrixArrowRightIcon size={14} />
</span>
) : (
<span className="bitfun-nav-panel__assistant-item-avatar-letter">
{workspaceDisplayName.charAt(0)}
</span>
)}
<span className="bitfun-nav-panel__assistant-item-avatar-letter">
{workspaceDisplayName.charAt(0)}
</span>
<span className={`bitfun-nav-panel__assistant-item-icon-toggle${sessionsCollapsed ? ' is-collapsed' : ''}`}>
<ChevronDown size={12} />
</span>
Expand Down Expand Up @@ -1025,13 +1018,7 @@ const WorkspaceItem: React.FC<WorkspaceItemProps> = ({
>
<span className="bitfun-nav-panel__workspace-item-icon" aria-hidden="true">
<span className="bitfun-nav-panel__workspace-item-icon-default">
{isActive ? (
<span className="bitfun-nav-panel__workspace-item-active-icon">
<DotMatrixArrowRightIcon size={14} />
</span>
) : (
<FolderOpen size={14} />
)}
<FolderOpen size={14} />
</span>
<span className={`bitfun-nav-panel__workspace-item-icon-toggle${sessionsCollapsed ? ' is-collapsed' : ''}`}>
<ChevronDown size={14} />
Expand Down
21 changes: 1 addition & 20 deletions src/web-ui/src/app/components/NavPanel/sections/workspaces/WorkspaceListSection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,24 +301,6 @@
padding-right: 52px;
}

&__workspace-item-active-icon {
display: inline-flex;
align-items: center;
justify-content: center;
color: inherit;
}

&__assistant-item-active-icon {
display: inline-flex;
align-items: center;
justify-content: center;
color: inherit;
transition: opacity $motion-fast $easing-standard,
transform $motion-fast $easing-standard;
opacity: 1;
transform: scale(1);
}

&__workspace-item-avatar {
position: relative;
display: inline-flex;
Expand Down Expand Up @@ -1115,8 +1097,7 @@
&:hover {
background: color-mix(in srgb, var(--element-bg-medium) 60%, transparent);

.bitfun-nav-panel__assistant-item-avatar-letter,
.bitfun-nav-panel__assistant-item-active-icon {
.bitfun-nav-panel__assistant-item-avatar-letter {
opacity: 0;
transform: scale(0.6);
}
Expand Down
20 changes: 20 additions & 0 deletions ...web-ui/src/app/components/NavPanel/sections/workspaces/WorkspaceListSectionLayout.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ function readWorkspaceListStylesheet(): string {
return stylesheet.replace(/\r\n/g, '\n');
}

function readWorkspaceItemSource(): string {
return readFileSync(
fileURLToPath(new URL('./WorkspaceItem.tsx', import.meta.url)),
'utf8',
);
}

function extractBlock(stylesheet: string, selector: string): string {
const escapedSelector = selector.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
const match = stylesheet.match(new RegExp(`${escapedSelector}\\s*\\{(?<body>[\\s\\S]*?)\\n\\s*\\}`));
Expand Down Expand Up @@ -90,4 +97,17 @@ describe('WorkspaceListSection layout styles', () => {
expect(block).toContain('height: 20px;');
}
});

it('renders the same icon for active and inactive workspace rows', () => {
const source = readWorkspaceItemSource();
const stylesheet = readWorkspaceListStylesheet();

// Active and inactive workspace rows must not render different icon types
// (e.g. an arrow for active, folder for inactive).
expect(source).not.toContain('DotMatrixArrowRightIcon');
expect(source).not.toContain('workspace-item-active-icon');
expect(source).not.toContain('assistant-item-active-icon');
expect(stylesheet).not.toContain('workspace-item-active-icon');
expect(stylesheet).not.toContain('assistant-item-active-icon');
});
});