diff --git a/frontend/src/Components/PermissionEditor.svelte b/frontend/src/Components/PermissionEditor.svelte index af81e957..f28dc2c8 100644 --- a/frontend/src/Components/PermissionEditor.svelte +++ b/frontend/src/Components/PermissionEditor.svelte @@ -28,7 +28,7 @@ }); if (resp.ok){ var json = await resp.json(); - return Object.values(json).map(user => { return {id:user.id,name:user.name,display:user.name}; }); + return Object.values(json).map(user => { return {...user,display:user.name}; }); } else { return []; } diff --git a/frontend/src/Components/UserSelector.svelte b/frontend/src/Components/UserSelector.svelte index f7ea63bf..836db2f3 100644 --- a/frontend/src/Components/UserSelector.svelte +++ b/frontend/src/Components/UserSelector.svelte @@ -16,9 +16,7 @@ } function onSelect(entry){ - for (let [k,v] of Object.entries(entry)){ - users[k] = {name:v,id:k}; - } + users[entry.id] = entry; } let sortedUsers = $derived.by(() => Object.values(users).sort((a, b) => a.name.localeCompare(b.name))); diff --git a/frontend/src/routes/bookmark/Index.svelte b/frontend/src/routes/bookmark/Index.svelte index e9d4290c..bcf166a3 100644 --- a/frontend/src/routes/bookmark/Index.svelte +++ b/frontend/src/routes/bookmark/Index.svelte @@ -37,9 +37,7 @@ if (resp.ok){ yikes(); const input = await resp.json(); - return Object.fromEntries( - Object.entries(input).map(([key, value]) => [key, value.name]) - ); + return Object.values(input).map(user => {return {...user,display:user.name}}); } else { error(resp); return {}; diff --git a/frontend/src/routes/company/Editor.svelte b/frontend/src/routes/company/Editor.svelte index 833c841a..8579fdba 100644 --- a/frontend/src/routes/company/Editor.svelte +++ b/frontend/src/routes/company/Editor.svelte @@ -22,9 +22,7 @@ if (resp.ok){ yikes(); const input = await resp.json(); - return Object.fromEntries( - Object.entries(input).map(([key, value]) => [key, value.name]) - ); + return Object.values(input).map(user => { return {...user, display: user.name}}); } else { error(resp); return {}; diff --git a/frontend/src/routes/task/Add.svelte b/frontend/src/routes/task/Add.svelte index 0e9d5bcc..398a0b99 100644 --- a/frontend/src/routes/task/Add.svelte +++ b/frontend/src/routes/task/Add.svelte @@ -47,7 +47,7 @@ const origin = parent_task ? parent_task.members : project.members; return Object.values(origin) .filter(member => member.user.name.toLowerCase().includes(text.toLowerCase())) - .map(member => {return { id:member.user.id,display:member.user.name}}); + .map(member => {return { ...member.user,display:member.user.name}}); } async function load(){ diff --git a/frontend/src/routes/task/View.svelte b/frontend/src/routes/task/View.svelte index d2a001d3..8714ef88 100644 --- a/frontend/src/routes/task/View.svelte +++ b/frontend/src/routes/task/View.svelte @@ -65,7 +65,7 @@ const origin = task.parent ? task.parent.members : project.members; return Object.values(origin) .filter(member => member.user.name.toLowerCase().includes(text.toLowerCase())) - .map(member => { return {id:member.user.id,display:member.user.name}}); + .map(member => { return {...member.user,display:member.user.name}}); } diff --git a/frontend/src/routes/wiki/View.svelte b/frontend/src/routes/wiki/View.svelte index eb36254a..0cba778d 100644 --- a/frontend/src/routes/wiki/View.svelte +++ b/frontend/src/routes/wiki/View.svelte @@ -73,7 +73,7 @@ }); if (resp.ok){ var json = await resp.json(); - return Object.values(json).filter(nonMember).map(user => { return {id:user.id,display:user.name}}); + return Object.values(json).filter(nonMember).map(user => { return {...user,display:user.name}}); } else { return []; }