Skip to content

Fix/esigner and ereference issues #736

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

Merged
coodos merged 3 commits into from
Jan 28, 2026
Merged

Fix/esigner and ereference issues #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f81e2d
fix: ereference & esigner cosmetic changes
coodos Jan 28, 2026
be7fdd1
fix: UTC time instead of local
coodos Jan 28, 2026
e55a509
fix: UTC time explicitly set at backend
coodos Jan 28, 2026
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: 19 additions & 2 deletions platforms/eReputation-api/src/controllers/DashboardController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,23 @@ export class DashboardController {
this.calculationService = new CalculationService();
}

/**
* Maps reference status from DB format to display format.
*/
private mapReferenceStatus(status: string): string {
switch (status?.toLowerCase()) {
case "revoked":
return "Revoked";
case "signed":
case "active":
return "Signed";
case "pending":
return "Pending";
default:
return "Unknown";
}
}

getStats = async (req: Request, res: Response) => {
try {
const userId = req.user!.id;
Expand Down Expand Up @@ -58,7 +75,7 @@ export class DashboardController {
target: ref.targetName,
targetType: ref.targetType,
date: ref.createdAt,
status: ref.status === 'revoked' ? 'Revoked' : 'Signed',
status: this.mapReferenceStatus(ref.status),
data: ref
});
});
Expand All @@ -76,7 +93,7 @@ export class DashboardController {
target: authorName,
targetType: 'user',
date: ref.createdAt,
status: ref.status === 'revoked' ? 'Revoked' : 'Signed',
status: this.mapReferenceStatus(ref.status),
data: ref
});
});
Expand Down
3 changes: 3 additions & 0 deletions platforms/esigner-api/src/services/FileService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ export class FileService {
}
}

// Sort by creation time, newest first (so new files from others appear at top)
allFiles.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());

// Hide soft-deleted (File Manager delete workaround: name [[deleted]])
return allFiles.filter((f) => f.name !== SOFT_DELETED_FILE_NAME);
}
Expand Down
16 changes: 8 additions & 8 deletions platforms/esigner/src/routes/(protected)/files/[id]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,14 @@
<!-- Main Content: Split Layout -->
<main class="min-h-[calc(100vh-5rem)] flex flex-col overflow-hidden">
<!-- Page Header -->
<div class="bg-white border-b border-gray-200 px-4 sm:px-6 py-4 flex-shrink-0">
<div class="bg-white border-b border-gray-200 px-4 sm:px-6 py-4 flex-shrink-0 min-w-0 overflow-hidden">
<a href="/files" class="inline-flex items-center gap-2 text-blue-600 hover:text-blue-700 text-sm font-medium mb-2">
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
</svg>
Back to Signature Containers
</a>
<h1 class="text-xl sm:text-2xl font-bold text-gray-900 break-words">{file?.displayName || file?.name || 'Signature Container'}</h1>
<h1 class="text-xl sm:text-2xl font-bold text-gray-900 break-words min-w-0">{file?.displayName || file?.name || 'Signature Container'}</h1>
{#if file?.description}
<p class="text-sm text-gray-600 mt-1">{file.description}</p>
{/if}
Expand Down Expand Up @@ -401,8 +401,8 @@
</div>

<!-- Right Side: Metadata Sidebar (30%) - Full width on mobile -->
<div class="flex-1 lg:flex-[0.3] bg-white border-t lg:border-t-0 lg:border-l border-gray-200 overflow-y-auto">
<div class="p-4 sm:p-6 space-y-6">
<div class="flex-1 lg:flex-[0.3] bg-white border-t lg:border-t-0 lg:border-l border-gray-200 overflow-y-auto min-w-0">
<div class="p-4 sm:p-6 space-y-6 min-w-0">
<!-- Mobile Preview Button -->
<div class="lg:hidden mb-4">
{#if previewUrl && (file.mimeType?.startsWith('image/') || file.mimeType === 'application/pdf')}
Expand All @@ -420,10 +420,10 @@
</div>

<!-- Signature Container Info -->
<div>
<div class="min-w-0">
<h2 class="text-sm font-semibold text-gray-900 mb-3">Signature Container</h2>
<div class="space-y-3">
<div>
<div class="min-w-0">
<p class="text-xs text-gray-500 mb-1">Name</p>
<p class="text-sm font-medium text-gray-900 break-words">{file.displayName || file.name}</p>
</div>
Expand All @@ -440,9 +440,9 @@
<div class="border-t border-gray-200 pt-6">
<h2 class="text-sm font-semibold text-gray-900 mb-3">File Information</h2>
<div class="space-y-2 text-sm">
<div class="flex justify-between gap-2">
<div class="flex justify-between gap-2 min-w-0">
<span class="text-gray-600 flex-shrink-0">File Name:</span>
<span class="text-gray-900 font-medium truncate text-right" title={file.name}>{file.name}</span>
<span class="text-gray-900 font-medium truncate text-right min-w-0" title={file.name}>{file.name}</span>
</div>
<div class="flex justify-between gap-2">
<span class="text-gray-600 flex-shrink-0">Size:</span>
Expand Down
30 changes: 15 additions & 15 deletions platforms/esigner/src/routes/(protected)/files/new/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,16 +298,16 @@
displayName = file.displayName || file.name;
description = file.description || '';
}}
class={`p-4 border-2 rounded-lg text-left transition-colors ${
selectedFile?.id === file.id
? 'border-blue-600 bg-blue-50'
: 'border-gray-200 hover:border-gray-300'
}`}
>
<div class="flex items-center gap-3">
<span class="text-2xl">{getFileIcon(file.mimeType)}</span>
<div class="flex-1 min-w-0">
<p class="font-medium text-gray-900 truncate">{file.displayName || file.name}</p>
class={`p-4 border-2 rounded-lg text-left transition-colors min-w-0 overflow-hidden ${
selectedFile?.id === file.id
? 'border-blue-600 bg-blue-50'
: 'border-gray-200 hover:border-gray-300'
}`}
>
<div class="flex items-center gap-3 min-w-0">
<span class="text-2xl flex-shrink-0">{getFileIcon(file.mimeType)}</span>
<div class="flex-1 min-w-0 overflow-hidden">
<p class="font-medium text-gray-900 truncate" title={file.displayName || file.name}>{file.displayName || file.name}</p>
<p class="text-sm text-gray-600">{formatFileSize(file.size)}</p>
</div>
</div>
Expand Down Expand Up @@ -395,11 +395,11 @@
<h2 class="text-2xl font-bold text-gray-900 mb-6">Invite Signees</h2>

<!-- Selected File Info -->
<div class="mb-6 p-4 bg-gray-50 rounded-lg">
<div class="flex items-center gap-3">
<span class="text-2xl">{getFileIcon(selectedFile?.mimeType || '')}</span>
<div>
<p class="font-medium text-gray-900">{selectedFile?.name}</p>
<div class="mb-6 p-4 bg-gray-50 rounded-lg min-w-0 overflow-hidden">
<div class="flex items-center gap-3 min-w-0">
<span class="text-2xl flex-shrink-0">{getFileIcon(selectedFile?.mimeType || '')}</span>
<div class="min-w-0 flex-1 overflow-hidden">
<p class="font-medium text-gray-900 truncate" title={selectedFile?.displayName || selectedFile?.name}>{selectedFile?.displayName || selectedFile?.name}</p>
<p class="text-sm text-gray-600">{formatFileSize(selectedFile?.size || 0)}</p>
</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions platforms/evoting-api/src/services/MessageService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { Message } from "../database/entities/Message";
import { User } from "../database/entities/User";
import { Group } from "../database/entities/Group";

const UTC_OPTIONS: { timeZone: 'UTC' } = { timeZone: 'UTC' };

export class MessageService {
public messageRepository = AppDataSource.getRepository(Message);
private userRepository = AppDataSource.getRepository(User);
Expand Down Expand Up @@ -66,7 +68,7 @@ export class MessageService {
*/
async createVoteCreatedMessage(groupId: string, voteTitle: string, voteId: string, creatorName: string, deadline?: Date | null): Promise<Message> {
const deadlineText = deadline
? `\nDeadline: ${deadline.toLocaleDateString()} at ${deadline.toLocaleTimeString()}`
? `\nDeadline: ${deadline.toLocaleDateString(undefined, UTC_OPTIONS)} at ${deadline.toLocaleTimeString(undefined, UTC_OPTIONS)} UTC`
: '\nNo deadline set';

const voteUrl = `${process.env.PUBLIC_EVOTING_URL || 'http://localhost:3000'}/${voteId}`;
Expand All @@ -81,7 +83,7 @@ export class MessageService {
* Create a system message for vote deadline crossing
*/
async createVoteDeadlineMessage(groupId: string, voteTitle: string, voteId: string, creatorName: string, deadline: Date): Promise<Message> {
const deadlineText = `\nOriginal Deadline: ${deadline.toLocaleDateString()} at ${deadline.toLocaleTimeString()}`;
const deadlineText = `\nOriginal Deadline: ${deadline.toLocaleDateString(undefined, UTC_OPTIONS)} at ${deadline.toLocaleTimeString(undefined, UTC_OPTIONS)} UTC`;

return await this.createSystemMessage({
text: `eVoting Platform: Vote deadline passed!\n\n"${voteTitle}"\n\nVote ID: ${voteId}\n\nCreated by: ${creatorName}${deadlineText}\n\nThis vote has ended. Check the results!`,
Expand Down