@@ -53,6 +53,7 @@ export function SidebarLink({
5353 setSelectedChatbots,
5454 setExpandedDepartments,
5555 expandedDepartments,
56+ activeChatbot,
5657 } = useSidebar ( )
5758
5859 const { setActiveDepartment, activeDepartment } = useWorkspace ( )
@@ -96,14 +97,12 @@ export function SidebarLink({
9697 prev . includes ( department . departmentId ) ? [ ] : [ department . departmentId ] ,
9798 )
9899 setActiveChatbot ( null )
99- setActiveDepartment ( ( prevDepartment ) => {
100- const newDepartmentId =
101- department . departmentId === prevDepartment
102- ? null // clicking the same department turns it off
103- : department . departmentId
100+ const newDepartment : [ string , number ] | null =
101+ activeDepartment && department . departmentId === activeDepartment [ 1 ]
102+ ? null
103+ : [ 'department' , department . departmentId ]
104104
105- return newDepartmentId
106- } )
105+ setActiveDepartment ( newDepartment )
107106 } ,
108107 [
109108 router ,
@@ -144,7 +143,7 @@ export function SidebarLink({
144143
145144 // TODO: Create a guard in a useEffect to fetch the current department by grabbing the department param and fetch the department to update the activeDepartment state
146145
147- const isActive = activeDepartment === department . departmentId
146+ const isActive = activeDepartment ?. [ 1 ] === department . departmentId
148147 const isDepartmentSelected = allBotsSelected
149148 const isIndeterminate = someBotsSelected && ! allBotsSelected
150149 const isPro = routeType === 'pro'
@@ -193,7 +192,7 @@ export function SidebarLink({
193192 const departmentUrl = useMemo ( ( ) => {
194193 if ( ! department ) return ''
195194
196- const isNewDepartment = department . departmentId !== activeDepartment
195+ const isNewDepartment = activeDepartment ?. [ 1 ] !== department . departmentId
197196
198197 if ( page === 'profile' ) {
199198 // For profile pages
0 commit comments