Skip to content

Commit a5fe28d

Browse files
coodoscoodos
authored
Fix/activity table UI erep (#604)
* chore: fix table * hotfix: dashboard UI
1 parent 8db5728 commit a5fe28d

File tree

2 files changed

+44
-38
lines changed

2 files changed

+44
-38
lines changed

‎platforms/eReputation-api/src/controllers/DashboardController.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ export class DashboardController {
6767
// Add received references (only if filter allows)
6868
if (filter === 'all' || filter === 'received-references') {
6969
receivedReferences.forEach(ref => {
70+
// Get author name, preferring name over ename, with fallback
71+
const authorName = ref.author?.name || ref.author?.ename || ref.author?.handle || 'Unknown';
7072
activities.push({
7173
id: `ref-received-${ref.id}`,
7274
type: 'reference',
7375
activity: 'Reference Received',
74-
target: ref.author.ename || ref.author.name,
76+
target: authorName,
7577
targetType: 'user',
7678
date: ref.createdAt,
7779
status: ref.status === 'revoked' ? 'Revoked' : 'Signed',

‎platforms/eReputation/client/src/pages/dashboard.tsx‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ export default function Dashboard() {
352352
setCurrentPage(1);
353353
}}
354354
className={`px-3 py-1.5 rounded-lg text-xs font-bold transition-all ${activeFilter === 'all'
355-
? 'bg-fig text-white shadow-md'
356-
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
355+
? 'bg-fig text-white shadow-md'
356+
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
357357
}`}
358358
>
359359
All
@@ -364,8 +364,8 @@ export default function Dashboard() {
364364
setCurrentPage(1);
365365
}}
366366
className={`px-3 py-1.5 rounded-lg text-xs font-bold transition-all ${activeFilter === 'sent-references'
367-
? 'bg-fig text-white shadow-md'
368-
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
367+
? 'bg-fig text-white shadow-md'
368+
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
369369
}`}
370370
>
371371
Sent References
@@ -376,8 +376,8 @@ export default function Dashboard() {
376376
setCurrentPage(1);
377377
}}
378378
className={`px-3 py-1.5 rounded-lg text-xs font-bold transition-all ${activeFilter === 'received-references'
379-
? 'bg-fig text-white shadow-md'
380-
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
379+
? 'bg-fig text-white shadow-md'
380+
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
381381
}`}
382382
>
383383
Received
@@ -388,8 +388,8 @@ export default function Dashboard() {
388388
setCurrentPage(1);
389389
}}
390390
className={`px-3 py-1.5 rounded-lg text-xs font-bold transition-all ${activeFilter === 'analysis'
391-
? 'bg-fig text-white shadow-md'
392-
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
391+
? 'bg-fig text-white shadow-md'
392+
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
393393
}`}
394394
>
395395
Analysis
@@ -400,8 +400,8 @@ export default function Dashboard() {
400400
setCurrentPage(1);
401401
}}
402402
className={`px-3 py-1.5 rounded-lg text-xs font-bold transition-all ${activeFilter === 'self-evaluation'
403-
? 'bg-fig text-white shadow-md'
404-
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
403+
? 'bg-fig text-white shadow-md'
404+
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
405405
}`}
406406
>
407407
Self Evaluation
@@ -412,8 +412,8 @@ export default function Dashboard() {
412412
setCurrentPage(1);
413413
}}
414414
className={`px-3 py-1.5 rounded-lg text-xs font-bold transition-all ${activeFilter === 'other-evaluations'
415-
? 'bg-fig text-white shadow-md'
416-
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
415+
? 'bg-fig text-white shadow-md'
416+
: 'bg-gray-100 text-gray-700 hover:bg-gray-200'
417417
}`}
418418
>
419419
Other Evaluations
@@ -470,7 +470,7 @@ export default function Dashboard() {
470470
<thead className="bg-gradient-to-r from-fig/10 to-fig/5">
471471
<tr>
472472
<th className="px-6 py-4 text-left text-xs font-black text-fig uppercase tracking-wider w-1/3">Evaluation Type</th>
473-
<th className="px-6 py-4 text-left text-xs font-black text-fig uppercase tracking-wider w-1/4">To / From</th>
473+
<th className="px-6 py-4 text-left text-xs font-black text-fig uppercase tracking-wider w-1/4">Context</th>
474474
<th className="px-6 py-4 text-left text-xs font-black text-fig uppercase tracking-wider w-1/6">Date</th>
475475
<th className="px-6 py-4 text-left text-xs font-black text-fig uppercase tracking-wider w-1/6">Status</th>
476476
<th className="px-6 py-4 w-16"></th>
@@ -482,16 +482,16 @@ export default function Dashboard() {
482482
<td className="px-6 py-4">
483483
<div className="flex items-center gap-3">
484484
<div className={`w-8 h-8 rounded-lg flex items-center justify-center border ${activity.activity === 'Self eReputation' || activity.activity === 'Self Calculation' || activity.activity === 'Self Evaluation'
485-
? 'bg-gradient-to-br from-orange-500/15 to-orange-500/10 border-orange-500/20 text-orange-600'
486-
: activity.activity === 'Other Evaluation' || activity.activity === 'User Evaluation'
487-
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
488-
: activity.activity === 'Group Evaluation'
489-
? 'bg-gradient-to-br from-blue-500/15 to-blue-500/10 border-blue-500/20 text-blue-600'
490-
: activity.activity === 'Platform Analysis' || activity.activity === 'Post-Platform Evaluation'
491-
? 'bg-gradient-to-br from-purple-500/15 to-purple-500/10 border-purple-500/20 text-purple-600'
492-
: activity.activity === 'Reference Provided' || activity.activity === 'Reference Received' || activity.type === 'reference'
493-
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
494-
: 'bg-gradient-to-br from-gray-500/15 to-gray-500/10 border-gray-500/20 text-gray-600'
485+
? 'bg-gradient-to-br from-orange-500/15 to-orange-500/10 border-orange-500/20 text-orange-600'
486+
: activity.activity === 'Other Evaluation' || activity.activity === 'User Evaluation'
487+
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
488+
: activity.activity === 'Group Evaluation'
489+
? 'bg-gradient-to-br from-blue-500/15 to-blue-500/10 border-blue-500/20 text-blue-600'
490+
: activity.activity === 'Platform Analysis' || activity.activity === 'Post-Platform Evaluation'
491+
? 'bg-gradient-to-br from-purple-500/15 to-purple-500/10 border-purple-500/20 text-purple-600'
492+
: activity.activity === 'Reference Provided' || activity.activity === 'Reference Received' || activity.type === 'reference'
493+
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
494+
: 'bg-gradient-to-br from-gray-500/15 to-gray-500/10 border-gray-500/20 text-gray-600'
495495
}`}>
496496
{getActivityIcon(activity.activity)}
497497
</div>
@@ -502,8 +502,10 @@ export default function Dashboard() {
502502
</td>
503503
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900 font-medium">
504504
{activity.activity === 'Reference Received'
505-
? (activity.target || 'Unknown')
506-
: activity.target || 'Unknown'}
505+
? `From ${activity.target || 'Unknown'}`
506+
: activity.activity === 'Reference Provided'
507+
? `To ${activity.target || 'Unknown'}`
508+
: activity.target || 'Unknown'}
507509
</td>
508510
<td className="px-6 py-4 whitespace-nowrap text-sm text-gray-500">
509511
{new Date(activity.date).toLocaleDateString()}
@@ -565,25 +567,27 @@ export default function Dashboard() {
565567
<div className="flex items-start justify-between">
566568
<div className="flex items-start gap-3 flex-1">
567569
<div className={`w-10 h-10 rounded-lg flex items-center justify-center border ${activity.activity === 'Self eReputation' || activity.activity === 'Self Calculation' || activity.activity === 'Self Evaluation'
568-
? 'bg-gradient-to-br from-orange-500/15 to-orange-500/10 border-orange-500/20 text-orange-600'
569-
: activity.activity === 'Other Evaluation' || activity.activity === 'User Evaluation'
570-
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
571-
: activity.activity === 'Group Evaluation'
572-
? 'bg-gradient-to-br from-blue-500/15 to-blue-500/10 border-blue-500/20 text-blue-600'
573-
: activity.activity === 'Platform Analysis' || activity.activity === 'Post-Platform Evaluation'
574-
? 'bg-gradient-to-br from-purple-500/15 to-purple-500/10 border-purple-500/20 text-purple-600'
575-
: activity.activity === 'Reference Provided' || activity.activity === 'Reference Received' || activity.type === 'reference'
576-
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
577-
: 'bg-gradient-to-br from-gray-500/15 to-gray-500/10 border-gray-500/20 text-gray-600'
570+
? 'bg-gradient-to-br from-orange-500/15 to-orange-500/10 border-orange-500/20 text-orange-600'
571+
: activity.activity === 'Other Evaluation' || activity.activity === 'User Evaluation'
572+
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
573+
: activity.activity === 'Group Evaluation'
574+
? 'bg-gradient-to-br from-blue-500/15 to-blue-500/10 border-blue-500/20 text-blue-600'
575+
: activity.activity === 'Platform Analysis' || activity.activity === 'Post-Platform Evaluation'
576+
? 'bg-gradient-to-br from-purple-500/15 to-purple-500/10 border-purple-500/20 text-purple-600'
577+
: activity.activity === 'Reference Provided' || activity.activity === 'Reference Received' || activity.type === 'reference'
578+
? 'bg-gradient-to-br from-green-500/15 to-green-500/10 border-green-500/20 text-green-600'
579+
: 'bg-gradient-to-br from-gray-500/15 to-gray-500/10 border-gray-500/20 text-gray-600'
578580
}`}>
579581
{getActivityIcon(activity.activity)}
580582
</div>
581583
<div className="flex-1 min-w-0">
582584
<div className="text-sm font-bold text-fig mb-1">{activity.activity}</div>
583585
<div className="text-xs text-gray-600 font-medium">
584586
{activity.activity === 'Reference Received'
585-
? (activity.target || 'Unknown')
586-
: activity.target || 'Unknown'}
587+
? `From ${activity.target || 'Unknown'}`
588+
: activity.activity === 'Reference Provided'
589+
? `To ${activity.target || 'Unknown'}`
590+
: activity.target || 'Unknown'}
587591
</div>
588592
</div>
589593
</div>

0 commit comments

Comments
 (0)