Fix known groups/users label-related default key and typing

backend/src/cmd/known_groups.rs

@@ -71,7 +71,7 @@ fn print_group(group: &KnownGroup) {
     print!(r#"    {}: {{ "label": {{"#, json!(group.role));
 
     // Sort by key to get consistent ordering (hashmap order is random).
-    let mut labels = group.label.0.iter().collect::<Vec<_>>();
+    let mut labels = group.label.iter().collect::<Vec<_>>();
     labels.sort();
     for (lang, label) in labels {
         print!(" {}: {}", json!(lang), json!(label));

backend/src/model/translated_string.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, fmt, str::FromStr};
+use std::{collections::HashMap, fmt, ops::Deref, str::FromStr};
 use bytes::BytesMut;
 use fallible_iterator::FallibleIterator;
 use juniper::{GraphQLScalar, InputValue, ScalarValue};
@@ -13,7 +13,7 @@ use crate::prelude::*;
 #[derive(Serialize, Deserialize, Clone, GraphQLScalar)]
 #[serde(try_from = "HashMap<LangKey, String>")]
 #[graphql(parse_token(String))]
-pub(crate) struct TranslatedString(pub(crate) HashMap<LangKey, String>);
+pub(crate) struct TranslatedString(HashMap<LangKey, String>);
 
 impl TranslatedString {
     pub(crate) fn default(&self) -> &str {
@@ -35,6 +35,13 @@ impl TranslatedString {
     }
 }
 
+impl Deref for TranslatedString {
+    type Target = HashMap<LangKey, String>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
 impl TryFrom<HashMap<LangKey, String>> for TranslatedString {
     type Error = Error;
 
@@ -112,14 +119,15 @@ impl<'a> FromSql<'a> for TranslatedString {
         _: &postgres_types::Type,
         raw: &'a [u8],
     ) -> Result<Self, Box<dyn std::error::Error + Sync + Send>> {
-        postgres_protocol::types::hstore_from_sql(raw)?
+        let map: HashMap<LangKey, String> = postgres_protocol::types::hstore_from_sql(raw)?
             .map(|(k, v)| {
                 let v = v.ok_or("translated label contained null value in hstore")?;
                 let k = k.parse()?;
                 Ok((k, v.to_owned()))
             })
-            .collect()
-            .map(Self)
+            .collect()?;
+
+        Ok(map.try_into()?)
     }
 
     fn accepts(ty: &postgres_types::Type) -> bool {

frontend/relay.config.js

@@ -12,7 +12,7 @@ module.exports = {
         "Cursor": "string",
         "ByteSpan": "string",
         "ExtraMetadata": "Record<string, Record<string, string[]>>",
-        "TranslatedString": "Record<string, string>",
+        "TranslatedString": "{ default: string } & Record<string, string | undefined>",
     },
     schemaExtensions: [APP_PATH],
 };

frontend/src/routes/Upload.tsx

@@ -748,7 +748,7 @@ const MetaDataEdit: React.FC<MetaDataEditProps> = ({ onSave, disabled, knownRole
         [user.userRole, {
             actions: new Set(["read", "write"]),
             info: {
-                label: { "_": user.displayName },
+                label: { "default": user.displayName },
                 implies: null,
                 large: false,
             },

frontend/src/ui/Access.tsx

@@ -270,7 +270,7 @@ const AclSelect: React.FC<AclSelectProps> = ({ acl, inheritedAcl, kind }) => {
                 prev.set(option.role, {
                     actions: new Set([permissionLevels.default]),
                     info: {
-                        label: info?.label ?? { "_": option.label },
+                        label: info?.label ?? { "default": option.label },
                         implies: [...info?.implies ?? new Set()],
                         large: info?.large ?? false,
                     },
@@ -883,7 +883,7 @@ export const AclEditButtons: React.FC<AclEditButtonsProps> = ({
 // ===== Helper functions
 // ==============================================================================================
 
-type TranslatedLabel = Record<string, string>;
+type TranslatedLabel = { default: string } & Record<string, string | undefined>;
 
 /** Returns a label for the role, if known to Tobira. */
 const getLabel = (role: string, label: TranslatedLabel | undefined, i18n: i18n) => {
@@ -925,11 +925,14 @@ const insertBuiltinRoleInfo = (
     i18n: i18n,
     addAnonymous: boolean,
 ) => {
-    const keyToTranslatedString = (key: ParseKeys): TranslatedLabel => Object.fromEntries(
-        i18n.languages
-            .filter(lng => i18n.exists(key, { lng }))
-            .map(lng => [lng, i18n.t(key, { lng })])
-    );
+    const keyToTranslatedString = (key: ParseKeys): TranslatedLabel => ({
+        default: i18n.t(key, { lng: "en" }),
+        ...Object.fromEntries(
+            i18n.languages
+                .filter(lng => i18n.exists(key, { lng }))
+                .map(lng => [lng, i18n.t(key, { lng })])
+        ),
+    });
 
     const anonymousInfo = {
         implies: [],