@@ -1332,6 +1460,9 @@ async function purgeNextcloudAudit() {
function displaySettings(containerId, keys) {
const container = document.getElementById(containerId);
+ if (!container) {
+ return;
+ }
const settings = allSettings.filter(s => keys.includes(s.key));
if (settings.length === 0) {
@@ -1483,85 +1614,174 @@ async function removeCaseType(type) {
await saveCaseTypes(filtered);
}
+let usersCache = [];
+let groupsCache = [];
+let permissionsCache = [];
+let selectedUserId = null;
+let selectedGroupId = null;
+
async function loadUsers() {
+ await Promise.all([
+ loadAdminUsers(),
+ loadGroups(),
+ loadPermissions()
+ ]);
+}
+
+async function loadAdminUsers() {
try {
- const response = await fetch('/api/v1/users');
- const users = await response.json();
- displayUsers(users);
+ const response = await fetch('/api/v1/admin/users');
+ if (!response.ok) throw new Error('Failed to load users');
+ usersCache = await response.json();
+ displayUsers(usersCache);
} catch (error) {
console.error('Error loading users:', error);
+ const tbody = document.getElementById('usersTableBody');
+ tbody.innerHTML = '
| Kunne ikke indlæse brugere |
';
+ }
+}
+
+async function loadGroups() {
+ try {
+ const response = await fetch('/api/v1/admin/groups');
+ if (!response.ok) throw new Error('Failed to load groups');
+ groupsCache = await response.json();
+ displayGroups(groupsCache);
+ renderGroupCheckboxes('createUserGroups', []);
+ } catch (error) {
+ console.error('Error loading groups:', error);
+ const tbody = document.getElementById('groupsTableBody');
+ if (tbody) {
+ tbody.innerHTML = '
| Kunne ikke indlæse grupper |
';
+ }
+ }
+}
+
+async function loadPermissions() {
+ try {
+ const response = await fetch('/api/v1/admin/permissions');
+ if (!response.ok) throw new Error('Failed to load permissions');
+ permissionsCache = await response.json();
+ } catch (error) {
+ console.error('Error loading permissions:', error);
}
}
function displayUsers(users) {
const tbody = document.getElementById('usersTableBody');
-
- if (users.length === 0) {
+
+ if (!users || users.length === 0) {
tbody.innerHTML = '
| Ingen brugere fundet |
';
return;
}
-
- tbody.innerHTML = users.map(user => `
+
+ tbody.innerHTML = users.map(user => {
+ const groupBadges = (user.groups || []).map(name =>
+ `
${escapeHtml(name)}`
+ ).join('') || '
-';
+
+ return `
${getInitials(user.username)}
- ${escapeHtml(user.username)}
+
+ ${escapeHtml(user.username)}
+ ${user.is_superadmin ? 'Superadmin' : ''}
+
${user.full_name ? ` ${escapeHtml(user.full_name)}` : ''}
|
${user.email ? escapeHtml(user.email) : '-'} |
+ ${groupBadges} |
${user.is_active ? 'Aktiv' : 'Inaktiv'}
|
- ${user.last_login ? formatDate(user.last_login) : 'Aldrig'} |
- ${formatDate(user.created_at)} |
+ ${user.created_at ? formatDate(user.created_at) : '-'} |
-
|
+ `;
+ }).join('');
+}
+
+function displayGroups(groups) {
+ const tbody = document.getElementById('groupsTableBody');
+
+ if (!groups || groups.length === 0) {
+ tbody.innerHTML = '
| Ingen grupper fundet |
';
+ return;
+ }
+
+ tbody.innerHTML = groups.map(group => `
+
+ |
+ ${escapeHtml(group.name)}
+ ${group.description ? `${escapeHtml(group.description)}` : ''}
+ |
+
+
+ ${(group.permissions || []).length} rettigheder
+
+ |
+
+
+ |
+
`).join('');
}
function showCreateUserModal() {
+ renderGroupCheckboxes('createUserGroups', []);
const modal = new bootstrap.Modal(document.getElementById('createUserModal'));
modal.show();
}
async function createUser() {
+ const selectedGroups = getSelectedGroupIds('createUserGroups');
+ const passwordValue = document.getElementById('newPassword').value;
const user = {
username: document.getElementById('newUsername').value,
email: document.getElementById('newEmail').value,
full_name: document.getElementById('newFullName').value || null,
- password: document.getElementById('newPassword').value
+ password: passwordValue,
+ is_superadmin: document.getElementById('newIsSuperadmin').checked,
+ is_active: document.getElementById('newIsActive').checked,
+ group_ids: selectedGroups
};
-
+
try {
- const response = await fetch('/api/v1/users', {
+ const response = await fetch('/api/v1/admin/users', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(user)
});
-
+
if (response.ok) {
bootstrap.Modal.getInstance(document.getElementById('createUserModal')).hide();
document.getElementById('createUserForm').reset();
+ renderGroupCheckboxes('createUserGroups', []);
loadUsers();
} else {
- const error = await response.json();
- alert(error.detail || 'Kunne ikke oprette bruger');
+ alert(await getErrorMessage(response, 'Kunne ikke oprette bruger'));
}
} catch (error) {
console.error('Error creating user:', error);
@@ -1576,7 +1796,7 @@ async function toggleUserActive(userId, isActive) {
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ is_active: isActive })
});
-
+
if (response.ok) {
loadUsers();
}
@@ -1585,6 +1805,180 @@ async function toggleUserActive(userId, isActive) {
}
}
+function showCreateGroupModal() {
+ const modal = new bootstrap.Modal(document.getElementById('createGroupModal'));
+ modal.show();
+}
+
+async function createGroup() {
+ const payload = {
+ name: document.getElementById('newGroupName').value,
+ description: document.getElementById('newGroupDescription').value || null
+ };
+
+ if (!payload.name) {
+ alert('Navn er påkrævet');
+ return;
+ }
+
+ try {
+ const response = await fetch('/api/v1/admin/groups', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(payload)
+ });
+
+ if (response.ok) {
+ bootstrap.Modal.getInstance(document.getElementById('createGroupModal')).hide();
+ document.getElementById('createGroupForm').reset();
+ loadGroups();
+ } else {
+ alert(await getErrorMessage(response, 'Kunne ikke oprette gruppe'));
+ }
+ } catch (error) {
+ console.error('Error creating group:', error);
+ alert('Kunne ikke oprette gruppe');
+ }
+}
+
+function openUserGroupsModal(userId) {
+ const user = usersCache.find(u => u.user_id === userId);
+ if (!user) return;
+ selectedUserId = userId;
+
+ document.getElementById('userGroupsModalTitle').textContent = `Tildel grupper • ${user.username}`;
+ const selectedIds = (user.groups || [])
+ .map(name => {
+ const group = groupsCache.find(g => g.name === name);
+ return group ? group.id : null;
+ })
+ .filter(Boolean);
+
+ renderGroupCheckboxes('userGroupAssignments', selectedIds);
+
+ const modal = new bootstrap.Modal(document.getElementById('userGroupsModal'));
+ modal.show();
+}
+
+async function saveUserGroups() {
+ if (!selectedUserId) return;
+ const groupIds = getSelectedGroupIds('userGroupAssignments');
+
+ try {
+ const response = await fetch(`/api/v1/admin/users/${selectedUserId}/groups`, {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ group_ids: groupIds })
+ });
+
+ if (!response.ok) {
+ alert(await getErrorMessage(response, 'Kunne ikke opdatere grupper'));
+ return;
+ }
+
+ bootstrap.Modal.getInstance(document.getElementById('userGroupsModal')).hide();
+ loadAdminUsers();
+ } catch (error) {
+ console.error('Error updating user groups:', error);
+ alert('Kunne ikke opdatere grupper');
+ }
+}
+
+function openGroupPermissionsModal(groupId) {
+ const group = groupsCache.find(g => g.id === groupId);
+ if (!group) return;
+ selectedGroupId = groupId;
+
+ document.getElementById('groupPermissionsModalTitle').textContent = `Rettigheder • ${group.name}`;
+ renderPermissionsChecklist(group.permissions || []);
+
+ const modal = new bootstrap.Modal(document.getElementById('groupPermissionsModal'));
+ modal.show();
+}
+
+async function saveGroupPermissions() {
+ if (!selectedGroupId) return;
+ const permissionIds = Array.from(document.querySelectorAll('#groupPermissionsList input[type="checkbox"]:checked'))
+ .map(input => parseInt(input.dataset.permissionId));
+
+ try {
+ const response = await fetch(`/api/v1/admin/groups/${selectedGroupId}/permissions`, {
+ method: 'PUT',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ permission_ids: permissionIds })
+ });
+
+ if (!response.ok) {
+ alert(await getErrorMessage(response, 'Kunne ikke opdatere rettigheder'));
+ return;
+ }
+
+ bootstrap.Modal.getInstance(document.getElementById('groupPermissionsModal')).hide();
+ loadGroups();
+ } catch (error) {
+ console.error('Error updating group permissions:', error);
+ alert('Kunne ikke opdatere rettigheder');
+ }
+}
+
+function renderGroupCheckboxes(containerId, selectedIds = []) {
+ const container = document.getElementById(containerId);
+ if (!container) return;
+
+ if (!groupsCache || groupsCache.length === 0) {
+ container.innerHTML = '
Ingen grupper fundet
';
+ return;
+ }
+
+ container.innerHTML = groupsCache.map(group => `
+
+
+
+
+ `).join('');
+}
+
+function renderPermissionsChecklist(selectedCodes = []) {
+ const container = document.getElementById('groupPermissionsList');
+ if (!container) return;
+
+ if (!permissionsCache || permissionsCache.length === 0) {
+ container.innerHTML = '
Ingen rettigheder fundet
';
+ return;
+ }
+
+ const grouped = permissionsCache.reduce((acc, perm) => {
+ const key = perm.category || 'andet';
+ acc[key] = acc[key] || [];
+ acc[key].push(perm);
+ return acc;
+ }, {});
+
+ container.innerHTML = Object.entries(grouped).map(([category, perms]) => `
+
+
${escapeHtml(category)}
+ ${perms.map(perm => `
+
+
+
+
+ `).join('')}
+
+ `).join('');
+}
+
+function getSelectedGroupIds(containerId) {
+ return Array.from(document.querySelectorAll(`#${containerId} input[type="checkbox"]:checked`))
+ .map(input => parseInt(input.dataset.groupId));
+}
+
async function resetPassword(userId) {
const newPassword = prompt('Indtast ny adgangskode:');
if (!newPassword) return;
@@ -1807,6 +2201,26 @@ function escapeHtml(text) {
return div.innerHTML;
}
+async function getErrorMessage(response, fallback) {
+ try {
+ const text = await response.text();
+ if (text) {
+ try {
+ const data = JSON.parse(text);
+ if (data && data.detail) return data.detail;
+ if (data && data.message) return data.message;
+ } catch (error) {
+ return text;
+ }
+ }
+ } catch (error) {
+ // ignore body read errors
+ }
+
+ const statusLabel = response.status ? ` (${response.status} ${response.statusText || ''})` : '';
+ return `${fallback}${statusLabel}`.trim();
+}
+
function formatDate(dateString) {
const date = new Date(dateString);
return date.toLocaleDateString('da-DK', {
@@ -2772,7 +3186,8 @@ async function loadEmailTemplateCustomers() {
// Populate customer dropdowns (Filter and Modal)
try {
const response = await fetch('/api/v1/customers');
- const customers = await response.json();
+ const payload = await response.json();
+ const customers = Array.isArray(payload) ? payload : (payload.customers || []);
const filterSelect = document.getElementById('emailTemplateCustomerFilter');
const modalSelect = document.getElementById('emailTemplateCustomer');
diff --git a/docker-compose.yml b/docker-compose.yml
index 80a958f..5423245 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,6 +39,7 @@ services:
- ./uploads:/app/uploads
- ./static:/app/static
- ./data:/app/data
+ - ./migrations:/app/migrations:ro
# Mount for local development - live code reload
- ./app:/app/app:ro
- ./main.py:/app/main.py:ro