Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions react-spa/src/components/HierarchicalRulesTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ export const HierarchicalRulesTable: React.FC<HierarchicalRulesTableProps> = ({
)}
<th className="px-4 py-3 w-8"></th>
<th className="px-4 py-3">{t('hierarchicalRulesTable.columnDomainRule')}</th>
<th className="px-4 py-3 w-32">Estado</th>
{!readOnly && <th className="px-4 py-3 w-24 text-right">Acciones</th>}
<th className="px-4 py-3 w-32">Status</th>
{!readOnly && <th className="px-4 py-3 w-24 text-right">Actions</th>}
</tr>
</thead>
<tbody className="divide-y divide-slate-100">
Expand Down
8 changes: 4 additions & 4 deletions react-spa/src/hooks/useDashboardViewModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ export interface DashboardGroup {
export type DashboardSortOption = 'name' | 'rules' | 'recent';

export const DASHBOARD_SORT_OPTIONS: { value: DashboardSortOption; label: string }[] = [
{ value: 'name', label: 'Nombre (A-Z)' },
{ value: 'name', label: 'Name (A-Z)' },
{ value: 'rules', label: 'Most rules' },
{ value: 'recent', label: 'Recientes' },
{ value: 'recent', label: 'Recent' },
];

export function useDashboardSortOptions(): { value: DashboardSortOption; label: string }[] {
const t = useT();
return [
{ value: 'name', label: 'Nombre (A-Z)' },
{ value: 'name', label: 'Name (A-Z)' },
{ value: 'rules', label: t('dashboard.sort.mostRules') },
{ value: 'recent', label: 'Recientes' },
{ value: 'recent', label: 'Recent' },
];
}

Expand Down
8 changes: 4 additions & 4 deletions react-spa/src/hooks/useRulesManagerViewModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ import {

export function buildRulesManagerTabs(counts: ManagedRulesCounts) {
return [
{ id: 'all' as ManagedRulesFilterType, label: 'Todos', count: counts.all },
{ id: 'all' as ManagedRulesFilterType, label: 'All', count: counts.all },
{
id: 'allowed' as ManagedRulesFilterType,
label: 'Permitidas',
label: 'Allowed',
count: counts.allowed,
icon: createElement(Check, { size: 14 }),
},
{
id: 'blocked' as ManagedRulesFilterType,
label: 'Bloqueadas',
label: 'Blocked',
count: counts.blocked,
icon: createElement(Ban, { size: 14 }),
},
{
id: 'disabled' as ManagedRulesFilterType,
label: 'Inhabilitadas',
label: 'Disabled',
count: counts.disabled,
icon: createElement(PowerOff, { size: 14 }),
},
Expand Down
4 changes: 2 additions & 2 deletions react-spa/src/lib/__tests__/exportUsers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('buildUsersCsvExport', () => {
expect(result.mimeType).toBe(USERS_CSV_EXPORT_MIME_TYPE);
expect(result.content).toBe(
[
'Nombre,Email,Roles,Estado,Roles_codigo,Estado_codigo',
'Name,Email,Roles,Status,Roles_code,Status_code',
'Admin QA,admin@example.com,Admin,Active,admin,Active',
'Teacher QA,teacher@example.com,Teacher,Inactive,teacher,Inactive',
].join('\n')
Expand All @@ -50,7 +50,7 @@ describe('buildUsersCsvExport', () => {

expect(result.content).toBe(
[
'Nombre,Email,Roles,Estado',
'Name,Email,Roles,Status',
'Admin QA,admin@example.com,Admin,Active',
'Teacher QA,teacher@example.com,Teacher,Inactive',
].join('\n')
Expand Down
4 changes: 2 additions & 2 deletions react-spa/src/lib/exportUsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export function buildUsersCsvExport(
} {
const includeCodeColumns = options.includeCodeColumns ?? true;

const headers = ['Nombre', 'Email', 'Roles', 'Estado'];
if (includeCodeColumns) headers.push('Roles_codigo', 'Estado_codigo');
const headers = ['Name', 'Email', 'Roles', 'Status'];
if (includeCodeColumns) headers.push('Roles_code', 'Status_code');

const rows = users.map((user) => {
const rolesLabel = user.roles.map((role) => getUserRoleLabel(role, t)).join('|');
Expand Down
2 changes: 1 addition & 1 deletion react-spa/src/views/__tests__/Dashboard.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ describe('Dashboard', () => {
renderDashboard({ onNavigateToRules });

await waitFor(() => {
expect(screen.getByText(/Nombre \(A-Z\)/)).toBeInTheDocument();
expect(screen.getByText(/Name \(A-Z\)/)).toBeInTheDocument();
});
});

Expand Down
8 changes: 4 additions & 4 deletions react-spa/src/views/__tests__/RulesManager.wiring.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ vi.mock('../../hooks/useRulesManagerViewModel', () => ({
detectedType: { type: 'whitelist' as const, confidence: 'high' as const },
validationError: '',
tabs: [
{ id: 'all' as const, label: 'Todos', count: 51 },
{ id: 'allowed' as const, label: 'Permitidas', count: 50 },
{ id: 'blocked' as const, label: 'Bloqueadas', count: 1 },
{ id: 'disabled' as const, label: 'Inhabilitadas', count: 0 },
{ id: 'all' as const, label: 'All', count: 51 },
{ id: 'allowed' as const, label: 'Allowed', count: 50 },
{ id: 'blocked' as const, label: 'Blocked', count: 1 },
{ id: 'disabled' as const, label: 'Disabled', count: 0 },
],
emptyMessage: 'No rules configured',
handleAddRule: mockViewModel.handleAddRule,
Expand Down
2 changes: 1 addition & 1 deletion react-spa/src/views/__tests__/Users.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ describe('Users View', () => {

expect(filename).toBe('users.csv');
expect(mimeType).toBe('text/csv;charset=utf-8');
expect(csvContent).toContain('Nombre,Email,Roles,Estado');
expect(csvContent).toContain('Name,Email,Roles,Status');
expect(csvContent).toContain('Admin QA,admin@example.com,Admin,Active');
expect(csvContent).toContain('Teacher QA,teacher@example.com,Teacher,Inactive');
});
Expand Down