Skip to content

Commit 138aaa4

Browse files
ka1ea6ka1ea6
authored
Merge pull request #64 from cortex-reply/fix/colleagues
fix: applies fix on colleagues
2 parents 805160b + 7c348bc commit 138aaa4

7 files changed

Lines changed: 237 additions & 215 deletions

File tree

‎src/components/AdvancedComponents/user-selection.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { Input } from '@/components/ui/input'
88
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
99
import { Badge } from '@/components/ui/badge'
1010
import { motion, AnimatePresence } from 'motion/react'
11-
import { type User as UserType } from '../DigitalColleagues/types'
11+
import { type User as UserType } from '../Foundary/types'
1212

1313
interface UserSelectionProps {
1414
users: UserType[]
@@ -28,10 +28,10 @@ export function UserSelection({
2828
const filteredUsers = useMemo(() => {
2929
return users.filter((user) => {
3030
const matchesSearch =
31-
user.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
32-
user.email.toLowerCase().includes(searchTerm.toLowerCase()) ||
33-
user.role.toLowerCase().includes(searchTerm.toLowerCase()) ||
34-
(user.skills || []).some((skill) => skill.toLowerCase().includes(searchTerm.toLowerCase()))
31+
user.name?.toLowerCase().includes(searchTerm.toLowerCase()) ||
32+
user.email.toLowerCase().includes(searchTerm.toLowerCase())
33+
// user.role.toLowerCase().includes(searchTerm.toLowerCase()) ||
34+
// (user.skills || []).some((skill) => skill.toLowerCase().includes(searchTerm.toLowerCase()))
3535

3636
return matchesSearch
3737
})
@@ -102,14 +102,14 @@ export function UserSelection({
102102
<div className="flex items-start justify-between">
103103
<div className="flex items-center gap-3">
104104
<Avatar>
105-
<AvatarImage src={user.avatar} alt={user.name} />
105+
{/* <AvatarImage src={user.avatar} alt={user.name} /> */}
106106
<AvatarFallback>
107107
<User className="h-4 w-4" />
108108
</AvatarFallback>
109109
</Avatar>
110110
<div>
111111
<CardTitle className="text-lg">{user.name}</CardTitle>
112-
<p className="text-sm text-muted-foreground">{user.role}</p>
112+
{/* <p className="text-sm text-muted-foreground">{user.role}</p> */}
113113
</div>
114114
</div>
115115
{selectedUserId === user.id && <Check className="h-5 w-5 text-primary" />}
@@ -123,15 +123,15 @@ export function UserSelection({
123123
</div>
124124
<div>
125125
<p className="text-sm text-muted-foreground">Department</p>
126-
<Badge variant="secondary">{user.department}</Badge>
126+
{/* <Badge variant="secondary">{user.department}</Badge> */}
127127
</div>
128-
{user.location && (
128+
{/* {user.location && (
129129
<div>
130130
<p className="text-sm text-muted-foreground">Location</p>
131131
<p className="text-sm">{user.location}</p>
132132
</div>
133-
)}
134-
{user.skills && user.skills.length > 0 && (
133+
)} */}
134+
{/* {user.skills && user.skills.length > 0 && (
135135
<div>
136136
<p className="text-sm text-muted-foreground mb-2">Skills</p>
137137
<div className="flex flex-wrap gap-1">
@@ -147,7 +147,7 @@ export function UserSelection({
147147
)}
148148
</div>
149149
</div>
150-
)}
150+
)} */}
151151
</div>
152152
</CardContent>
153153
</Card>

‎src/components/DigitalColleagues/Pages/dashboardpage.tsx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,16 @@ export default function Home({
163163
)
164164
case 'colleagues':
165165
return (
166-
<ColleaguesView
167-
initialColleagues={initialColleagues}
168-
availableUsers={users}
169-
onColleagueAdd={onColleagueAdd}
170-
onColleagueEdit={onColleagueEdit}
171-
onColleagueDelete={onColleagueDelete}
172-
/>
166+
<div>
167+
<h1>Colleagues</h1>
168+
</div>
169+
// <ColleaguesView
170+
// initialColleagues={initialColleagues}
171+
// availableUsers={users}
172+
// onColleagueAdd={onColleagueAdd}
173+
// onColleagueEdit={onColleagueEdit}
174+
// onColleagueDelete={onColleagueDelete}
175+
// />
173176
)
174177
case 'chat':
175178
return (

‎src/components/DigitalColleagues/Views/ColleaguesView.tsx‎

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ import { UserSelection } from '../../AdvancedComponents/user-selection'
1919
import { DigitalColleagueClone } from '../digital-colleague-clone'
2020
import { ColleagueTypeSelection } from '../colleague-type-selection'
2121
import { DigitalColleagueOptions } from '../digital-colleague-options'
22+
import { type KnowledgeDocument } from '../types'
2223
import {
23-
type Colleague,
24+
type User as UserType,
2425
type HumanColleague,
26+
type Colleague,
2527
type DigitalColleague,
26-
type KnowledgeDocument,
27-
type User as UserType,
28-
} from '../types'
28+
TypedDigitalColleague,
29+
} from '../../Foundary/types'
2930
import { motion, AnimatePresence } from 'motion/react'
3031
import { DashboardHero } from '../../Heros/DashboardHero'
3132
interface ColleaguesViewProps {
@@ -81,17 +82,16 @@ export default function ColleaguesView({
8182
const matchesSearch =
8283
colleague.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
8384
(colleague.type === 'human' &&
84-
(colleague.email?.toLowerCase().includes(searchTerm.toLowerCase()) ||
85-
colleague.role?.toLowerCase().includes(searchTerm.toLowerCase()))) ||
85+
colleague.email?.toLowerCase().includes(searchTerm.toLowerCase())) ||
8686
(colleague.type === 'digital' &&
8787
colleague.jobDescription?.toLowerCase().includes(searchTerm.toLowerCase()))
8888

89-
const matchesDepartment =
90-
departmentFilter === 'all' ||
91-
(colleague.type === 'human' && colleague.department === departmentFilter)
92-
const matchesStatus = statusFilter === 'all' || colleague.status === statusFilter
89+
// const matchesDepartment =
90+
// departmentFilter === 'all' ||
91+
// (colleague.type === 'human' && colleague.department === departmentFilter)
92+
// const matchesStatus = statusFilter === 'all' || colleague.status === statusFilter
9393

94-
return matchesSearch && matchesDepartment && matchesStatus
94+
return matchesSearch
9595
})
9696

9797
const humanColleagues = filteredColleagues.filter((c) => c.type === 'human')
@@ -127,26 +127,29 @@ export default function ColleaguesView({
127127
const humanColleague: HumanColleague = {
128128
id: `human-${Date.now()}`,
129129
type: 'human',
130-
name: user.name,
130+
name: user.name || '',
131131
email: user.email,
132-
role: user.role,
133-
department: user.department,
134-
phone: user.phone,
135-
location: user.location,
136-
timezone: user.timezone,
137-
skills: user.skills || [],
138-
bio: user.bio,
139-
status: 'active',
140-
joinedDate: new Date(),
141-
lastActive: new Date(),
132+
createdAt: new Date().toISOString(),
133+
updatedAt: new Date().toISOString(),
134+
135+
// role: user.role,
136+
// department: user.department,
137+
// phone: user.phone,
138+
// location: user.location,
139+
// timezone: user.timezone,
140+
// skills: user.skills || [],
141+
// bio: user.bio,
142+
// status: 'active',
143+
// joinedDate: new Date(),
144+
// lastActive: new Date(),
142145
}
143146

144147
setColleagues((prev) => [...prev, humanColleague])
145148
onColleagueAdd?.(humanColleague)
146149
setCurrentView('main')
147150
}
148151

149-
const handleDigitalColleagueClone = (clonedColleague: DigitalColleague) => {
152+
const handleDigitalColleagueClone = (clonedColleague: TypedDigitalColleague) => {
150153
if (!clonedColleague || !clonedColleague.id) {
151154
console.error(
152155
'Invalid cloned colleague provided to handleDigitalColleagueClone:',
@@ -165,7 +168,7 @@ export default function ColleaguesView({
165168
setCurrentView('form')
166169
}
167170

168-
const handleSaveColleague = (colleague: DigitalColleague) => {
171+
const handleSaveColleague = (colleague: TypedDigitalColleague) => {
169172
if (!colleague || !colleague.id) {
170173
console.error('Invalid colleague provided to handleSaveColleague:', colleague)
171174
return
@@ -282,38 +285,38 @@ export default function ColleaguesView({
282285
)
283286
}
284287

285-
if (currentView === 'digitalClone') {
286-
return (
287-
<DigitalColleagueClone
288-
digitalColleagues={safeExistingDigitalColleagues}
289-
onColleagueClone={handleDigitalColleagueClone}
290-
onCancel={() => setCurrentView('digitalOptions')}
291-
/>
292-
)
293-
}
294-
295-
if (currentView === 'form') {
296-
return (
297-
<ColleagueForm
298-
colleague={editingColleague || undefined}
299-
onSave={handleSaveColleague}
300-
onCancel={handleCancelForm}
301-
availableKnowledgeDocuments={getAllAvailableKnowledgeDocuments()}
302-
/>
303-
)
304-
}
305-
306-
if (currentView === 'view') {
307-
return (
308-
<ColleagueForm
309-
colleague={viewingColleague || undefined}
310-
onSave={handleSaveColleague}
311-
onCancel={handleCancelView}
312-
readOnly={true}
313-
availableKnowledgeDocuments={getAllAvailableKnowledgeDocuments()}
314-
/>
315-
)
316-
}
288+
// if (currentView === 'digitalClone') {
289+
// return (
290+
// <DigitalColleagueClone
291+
// digitalColleagues={safeExistingDigitalColleagues}
292+
// onColleagueClone={handleDigitalColleagueClone}
293+
// onCancel={() => setCurrentView('digitalOptions')}
294+
// />
295+
// )
296+
// }
297+
298+
// if (currentView === 'form') {
299+
// return (
300+
// <ColleagueForm
301+
// colleague={editingColleague || undefined}
302+
// onSave={handleSaveColleague}
303+
// onCancel={handleCancelForm}
304+
// availableKnowledgeDocuments={getAllAvailableKnowledgeDocuments()}
305+
// />
306+
// )
307+
// }
308+
309+
// if (currentView === 'view') {
310+
// return (
311+
// <ColleagueForm
312+
// colleague={viewingColleague || undefined}
313+
// onSave={handleSaveColleague}
314+
// onCancel={handleCancelView}
315+
// readOnly={true}
316+
// availableKnowledgeDocuments={getAllAvailableKnowledgeDocuments()}
317+
// />
318+
// )
319+
// }
317320

318321
return (
319322
<div className="px-2 md:px-4 py-4 space-y-8">
@@ -360,7 +363,7 @@ export default function ColleaguesView({
360363
<CardContent>
361364
<div className="text-2xl font-bold">{colleagues.length}</div>
362365
<p className="text-xs text-muted-foreground">
363-
{colleagues.filter((c) => c.status === 'active').length} active
366+
{/* {colleagues.filter((c) => c.status === 'active').length} active */}
364367
</p>
365368
</CardContent>
366369
</Card>
@@ -374,7 +377,7 @@ export default function ColleaguesView({
374377
{colleagues.filter((c) => c.type === 'human').length}
375378
</div>
376379
<p className="text-xs text-muted-foreground">
377-
{colleagues.filter((c) => c.type === 'human' && c.status === 'active').length}{' '}
380+
{/* {colleagues.filter((c) => c.type === 'human' && c.status === 'active').length}{' '} */}
378381
active
379382
</p>
380383
</CardContent>
@@ -389,7 +392,7 @@ export default function ColleaguesView({
389392
{colleagues.filter((c) => c.type === 'digital').length}
390393
</div>
391394
<p className="text-xs text-muted-foreground">
392-
{colleagues.filter((c) => c.type === 'digital' && c.status === 'active').length}{' '}
395+
{/* {colleagues.filter((c) => c.type === 'digital' && c.status === 'active').length}{' '} */}
393396
active
394397
</p>
395398
</CardContent>
@@ -466,7 +469,7 @@ export default function ColleaguesView({
466469
: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3'
467470
}`}
468471
>
469-
{filteredColleagues.map((colleague) => (
472+
{/* {filteredColleagues.map((colleague) => (
470473
<ColleagueCard
471474
key={`${colleague}-${colleague.id}`}
472475
colleague={colleague}
@@ -475,7 +478,7 @@ export default function ColleaguesView({
475478
onViewDetails={handleViewDetails}
476479
compact={compactView}
477480
/>
478-
))}
481+
))} */}
479482
</div>
480483
)}
481484

@@ -487,7 +490,7 @@ export default function ColleaguesView({
487490
: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3'
488491
}`}
489492
>
490-
{humanColleagues.map((colleague) => (
493+
{/* {humanColleagues.map((colleague) => (
491494
<ColleagueCard
492495
key={colleague.id}
493496
colleague={colleague}
@@ -496,7 +499,7 @@ export default function ColleaguesView({
496499
onViewDetails={handleViewDetails}
497500
compact={compactView}
498501
/>
499-
))}
502+
))} */}
500503
</div>
501504
)}
502505

@@ -508,7 +511,7 @@ export default function ColleaguesView({
508511
: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3'
509512
}`}
510513
>
511-
{digitalColleagues.map((colleague) => (
514+
{/* {digitalColleagues.map((colleague) => (
512515
<ColleagueCard
513516
key={colleague.id}
514517
colleague={colleague}
@@ -517,7 +520,7 @@ export default function ColleaguesView({
517520
onViewDetails={handleViewDetails}
518521
compact={compactView}
519522
/>
520-
))}
523+
))} */}
521524
</div>
522525
)}
523526
</div>

0 commit comments

Comments
 (0)