overhauled occurences of AutoComplete in PermissionEditor and UserSelector, overhauled Occurences of UserSelector and PermissionEditor
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
});
|
});
|
||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
var json = await resp.json();
|
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 {
|
} else {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,9 +16,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function onSelect(entry){
|
function onSelect(entry){
|
||||||
for (let [k,v] of Object.entries(entry)){
|
users[entry.id] = entry;
|
||||||
users[k] = {name:v,id:k};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let sortedUsers = $derived.by(() => Object.values(users).sort((a, b) => a.name.localeCompare(b.name)));
|
let sortedUsers = $derived.by(() => Object.values(users).sort((a, b) => a.name.localeCompare(b.name)));
|
||||||
|
|||||||
@@ -37,9 +37,7 @@
|
|||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
yikes();
|
yikes();
|
||||||
const input = await resp.json();
|
const input = await resp.json();
|
||||||
return Object.fromEntries(
|
return Object.values(input).map(user => {return {...user,display:user.name}});
|
||||||
Object.entries(input).map(([key, value]) => [key, value.name])
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
error(resp);
|
error(resp);
|
||||||
return {};
|
return {};
|
||||||
|
|||||||
@@ -22,9 +22,7 @@
|
|||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
yikes();
|
yikes();
|
||||||
const input = await resp.json();
|
const input = await resp.json();
|
||||||
return Object.fromEntries(
|
return Object.values(input).map(user => { return {...user, display: user.name}});
|
||||||
Object.entries(input).map(([key, value]) => [key, value.name])
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
error(resp);
|
error(resp);
|
||||||
return {};
|
return {};
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
const origin = parent_task ? parent_task.members : project.members;
|
const origin = parent_task ? parent_task.members : project.members;
|
||||||
return Object.values(origin)
|
return Object.values(origin)
|
||||||
.filter(member => member.user.name.toLowerCase().includes(text.toLowerCase()))
|
.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(){
|
async function load(){
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
const origin = task.parent ? task.parent.members : project.members;
|
const origin = task.parent ? task.parent.members : project.members;
|
||||||
return Object.values(origin)
|
return Object.values(origin)
|
||||||
.filter(member => member.user.name.toLowerCase().includes(text.toLowerCase()))
|
.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}});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
});
|
});
|
||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
var json = await resp.json();
|
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 {
|
} else {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user