Skip to content

Modern Docker Management, Designed for Everyone

fix: localize settings backup cards and role presets and fix long label overflow (#4408)

Kyle Mendell5185d9c81edb
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index cd1a3cbea..b9b332360 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -3268,6 +3268,10 @@
"roles_delete_message": "Delete role \"{name}\"? This removes every assignment of it.",
"roles_save_changes": "Save changes",
"roles_clone_button": "Clone as custom role",
+ "roles_preset_editor_label": "All permissions (non-admin)",
+ "roles_preset_editor_description": "Matches the built-in Editor permission set.",
+ "roles_preset_global_admin_label": "Global Admin",
+ "roles_preset_global_admin_description": "Select every permission in the manifest.",
"roles_clone_success": "Cloned to \"{name}\"",
"roles_clone_failed": "Failed to clone role",
"roles_built_in": "Built-in",
diff --git a/frontend/src/lib/components/forms/role-assignments-editor.svelte b/frontend/src/lib/components/forms/role-assignments-editor.svelte
index 51d8afa9e..8aaabe076 100644
--- a/frontend/src/lib/components/forms/role-assignments-editor.svelte
+++ b/frontend/src/lib/components/forms/role-assignments-editor.svelte
@@ -120,7 +120,7 @@
onCheckedChange={(checked) => toggleQuickPreset(role.id, checked === true)}
/>
<div class="flex flex-col gap-1">
- <div class="flex items-center gap-2">
+ <div class="flex flex-wrap items-center gap-2">
<Badge variant={getRoleVariant(role.id)} size="sm">{role.name}</Badge>
<span class="text-xs text-muted-foreground">{m.global_org_wide()}</span>
</div>
@@ -149,7 +149,7 @@
onValueChange={(v) => updateAssignment(index, { environmentId: selectValueToEnvId(v) })}
>
<Select.Trigger class="w-full" aria-label={m.resource_environment_cap()}>
- <span>{selectedLabel.environment(envValue)}</span>
+ <span class="min-w-0 truncate">{selectedLabel.environment(envValue)}</span>
</Select.Trigger>
<Select.Content>
{#each envOptions as option (option.id)}
@@ -171,8 +171,8 @@
onValueChange={(v) => updateAssignment(index, { roleId: v })}
>
<Select.Trigger class="w-full" aria-label={m.common_role()}>
- <span class="flex items-center gap-2">
- <span>{selectedLabel.role(assignment.roleId)}</span>
+ <span class="flex min-w-0 items-center gap-2">
+ <span class="truncate">{selectedLabel.role(assignment.roleId)}</span>
</span>
</Select.Trigger>
<Select.Content>
diff --git a/frontend/src/lib/components/role-editor/permission-picker.svelte b/frontend/src/lib/components/role-editor/permission-picker.svelte
index ec6d4f16c..4405eddf9 100644
--- a/frontend/src/lib/components/role-editor/permission-picker.svelte
+++ b/frontend/src/lib/components/role-editor/permission-picker.svelte
@@ -86,6 +86,28 @@
}
}
+ function presetLabel(preset: PermissionPreset): string {
+ switch (preset.key) {
+ case 'editor':
+ return m.roles_preset_editor_label();
+ case 'global-admin':
+ return m.roles_preset_global_admin_label();
+ default:
+ return preset.label;
+ }
+ }
+
+ function presetDescription(preset: PermissionPreset): string | undefined {
+ switch (preset.key) {
+ case 'editor':
+ return m.roles_preset_editor_description();
+ case 'global-admin':
+ return m.roles_preset_global_admin_description();
+ default:
+ return preset.description;
+ }
+ }
+
function isPresetSelected(preset: PermissionPreset): boolean {
return preset.permissions.length > 0 && preset.permissions.every((permission) => selectedSet.has(permission));
}
@@ -111,9 +133,9 @@
onCheckedChange={(checked) => togglePreset(preset, checked === true)}
/>
<div class="flex flex-col gap-0.5">
- <span class="text-sm leading-none font-medium">{preset.label}</span>
+ <span class="text-sm leading-none font-medium">{presetLabel(preset)}</span>
{#if preset.description}
- <span class="text-xs text-muted-foreground">{preset.description}</span>
+ <span class="text-xs text-muted-foreground">{presetDescription(preset)}</span>
{/if}
</div>
</label>
diff --git a/frontend/src/lib/components/role-editor/role-editor.svelte b/frontend/src/lib/components/role-editor/role-editor.svelte
index fe5ebcecb..5392292cd 100644
--- a/frontend/src/lib/components/role-editor/role-editor.svelte
+++ b/frontend/src/lib/components/role-editor/role-editor.svelte
@@ -94,7 +94,7 @@
action="base"
tone="outline"
type="button"
- class="w-full"
+ class="h-auto min-h-9 w-full text-center whitespace-normal"
icon={CopyIcon}
onclick={onClone}
customLabel={m.roles_clone_button()}
diff --git a/frontend/src/routes/(app)/settings/+page.svelte b/frontend/src/routes/(app)/settings/+page.svelte
index 8268c2b18..9fb5a98d3 100644
--- a/frontend/src/routes/(app)/settings/+page.svelte
+++ b/frontend/src/routes/(app)/settings/+page.svelte
@@ -98,6 +98,14 @@
security: {
title: m.security,
description: m.settings_category_security_description
+ },
+ s3destinations: {
+ title: m.s3_destinations_title,
+ description: m.s3_destinations_description
+ },
+ systembackups: {
+ title: m.system_backups_title,
+ description: m.system_backups_description
}
} as const;