Skip to content

fix: disable non-current projects in switcher when NAO_DEFAULT_PROJECT_PATH is set #1177

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
Nithishvb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: disable non-current projects in switcher when NAO_DEFAULT_PROJECT_PATH is set #1177

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
1 change: 1 addition & 0 deletions apps/backend/src/trpc/system.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const systemRoutes = {
enableUserSignup: await isUserSignupAvailable(),
betaAutomationsEnabled: env.BETA_AUTOMATIONS_ENABLED,
betaContextRecommendationsEnabled: env.BETA_CONTEXT_RECOMMENDATIONS_ENABLED,
hasDefaultProjectPath: Boolean(env.NAO_DEFAULT_PROJECT_PATH),
})),

version: adminProtectedProcedure.query(() => ({
Expand Down
27 changes: 18 additions & 9 deletions apps/frontend/src/components/project-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export function ProjectSelector({
projects,
currentProjectId,
onChange,
disabledProjectIds,
className,
triggerClassName,
triggerVariant,
Expand All @@ -32,6 +33,7 @@ export function ProjectSelector({
projects: ProjectOption[];
currentProjectId: string;
onChange: (projectId: string) => void;
disabledProjectIds?: string[];
className?: string;
triggerClassName?: string;
triggerVariant?: 'default' | 'ghost';
Expand All @@ -50,16 +52,23 @@ export function ProjectSelector({
<SelectContent position='popper' align={align}>
<SelectGroup>
<SelectLabel>Projects</SelectLabel>
{projects.map((project) => (
<SelectItem key={project.id} value={project.id}>
<span className='flex min-w-0 items-center justify-between gap-3'>
<span className='truncate'>{project.name}</span>
<span className='shrink-0 text-xs text-muted-foreground'>
{USER_ROLE_LABELS[project.userRole]}
{projects.map((project) => {
const isDisabled = disabledProjectIds?.includes(project.id);
return (
<SelectItem
key={project.id}
value={project.id}
disabled={isDisabled}
>
<span className='flex min-w-0 items-center justify-between gap-3'>
<span className='truncate'>{project.name}</span>
<span className='shrink-0 text-xs text-muted-foreground'>
{USER_ROLE_LABELS[project.userRole]}
</span>
</span>
</span>
</SelectItem>
))}
</SelectItem>
);
})}
</SelectGroup>
</SelectContent>
</Select>
Expand Down
10 changes: 10 additions & 0 deletions apps/frontend/src/components/sidebar-settings-nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ interface SidebarSettingsNavProps {
hasLicense: boolean;
projects: ProjectOption[];
currentProjectId?: string;
isProjectPinned?: boolean;
onProjectChange: (projectId: string) => void;
}

Expand All @@ -153,6 +154,7 @@ export function SidebarSettingsNav({
hasLicense,
projects,
currentProjectId,
isProjectPinned,
onProjectChange,
}: SidebarSettingsNavProps) {
const navigate = useNavigate();
Expand Down Expand Up @@ -378,6 +380,7 @@ export function SidebarSettingsNav({
<ProjectSwitcherSubItem
projects={projects}
currentProjectId={currentProjectId}
isProjectPinned={isProjectPinned}
onChange={onProjectChange}
/>
)}
Expand All @@ -393,19 +396,26 @@ export function SidebarSettingsNav({
function ProjectSwitcherSubItem({
projects,
currentProjectId,
isProjectPinned,
onChange,
}: {
projects: ProjectOption[];
currentProjectId: string;
isProjectPinned?: boolean;
onChange: (projectId: string) => void;
}) {
const disabledProjectIds = isProjectPinned
? projects.filter((p) => p.id !== currentProjectId).map((p) => p.id)
: undefined;

return (
<div className='ml-3 mt-1 pl-3 border-l border-sidebar-border'>
<div className='px-1 pb-1 text-[10px] uppercase tracking-wider text-muted-foreground'>Switch project</div>
<ProjectSelector
projects={projects}
currentProjectId={currentProjectId}
onChange={onChange}
disabledProjectIds={disabledProjectIds}
triggerVariant='ghost'
triggerIcon={<Folder className='size-3.5 shrink-0' />}
triggerClassName={cn(
Expand Down
2 changes: 2 additions & 0 deletions apps/frontend/src/components/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export function Sidebar() {
const branding = useBranding();
const { isAdmin, isContextAdmin, isViewer } = usePermissions();
const isCloud = config.data?.naoMode === 'cloud';
const isProjectPinned = !isCloud && config.data?.hasDefaultProjectPath === true;
const betaAutomationsEnabled = config.data?.betaAutomationsEnabled === true;
const { groupBy, filters, setGroupBy, toggleFilter } = useChatViewPreferences();
const hasLicense = license.data?.tokenProvided === true;
Expand Down Expand Up @@ -246,6 +247,7 @@ export function Sidebar() {
hasLicense={hasLicense}
projects={projects.data ?? []}
currentProjectId={project.data?.id}
isProjectPinned={isProjectPinned}
onProjectChange={handleProjectChange}
/>
) : (
Expand Down
Loading