completed autocomplete box in permission editor for projects
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -9,11 +9,11 @@
|
|||||||
onSelect = dummyOnSelect,
|
onSelect = dummyOnSelect,
|
||||||
} = $props();
|
} = $props();
|
||||||
|
|
||||||
const ignore = ['Escape','Tab','ArrowUp','ArrowLeft','ArrowRight'];
|
const ignore = ['ArrowLeft','ArrowRight'];
|
||||||
let candidate = $state({ display : '' });
|
let candidate = $state({ display : '' });
|
||||||
|
let selected = $state([]);
|
||||||
let candidates = $derived(getCandidates(candidate.display));
|
let candidates = $derived(getCandidates(candidate.display));
|
||||||
|
|
||||||
|
|
||||||
async function dummyGetCandidates(text){
|
async function dummyGetCandidates(text){
|
||||||
console.warn(`getCandidates(${text}) not overridden!`);
|
console.warn(`getCandidates(${text}) not overridden!`);
|
||||||
if (!text) return [];
|
if (!text) return [];
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
// if Enter is pressed on the input field, this method gets called with
|
// if Enter is pressed on the input field, this method gets called with
|
||||||
// either the selected candidate or
|
// either the selected candidate or
|
||||||
// an anonymous object with the entered text in the display field
|
// an anonymous object with the entered text in the display field
|
||||||
console.warn('onCommit not overridden!');
|
console.warn(`onCommit(${JSON.stringify(candidate)}) not overridden!`);
|
||||||
}
|
}
|
||||||
|
|
||||||
function dummyOnSelect(candidate){
|
function dummyOnSelect(candidate){
|
||||||
@@ -43,31 +43,63 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function onkeyup(ev){
|
async function onkeyup(ev){
|
||||||
const select = ev.target;
|
if (ignore.includes(ev.key)) return;
|
||||||
const key = ev.key;
|
if (ev.key == 'ArrowDown'){
|
||||||
if (ignore.includes(key)) return;
|
ev.preventDefault();
|
||||||
|
selected = selected.length < 1 ? [0] : [selected[0]+1]
|
||||||
|
if (selected[0] >= candidates.length) selected = [0];
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (ev.key == 'ArrowUp'){
|
||||||
|
ev.preventDefault();
|
||||||
|
selected = selected.length < 1 ? [-1] : [selected[0]-1]
|
||||||
|
if (selected[0] < 0) selected = [candidates.length-1];
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (ev.key == 'Enter'|| ev.key == 'Tab'){
|
||||||
|
ev.preventDefault();
|
||||||
|
if (selected.length>0) {
|
||||||
|
candidate = candidates[selected[0]];
|
||||||
|
candidates = [];
|
||||||
|
selected = [];
|
||||||
|
onSelect(candidate);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (ev.key == 'Enter') {
|
||||||
|
candidates = [];
|
||||||
|
selected = [];
|
||||||
|
onCommit(candidate);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (ev.key == 'Escape'){
|
||||||
|
ev.preventDefault();
|
||||||
|
candidates = [];
|
||||||
|
selected = [];
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
candidates = await getCandidates(candidate.display);
|
candidates = await getCandidates(candidate.display);
|
||||||
|
if (selected>candidates.length) selected = candidates.length;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
div { position : relative }
|
div { position : relative }
|
||||||
select { position : absolute; top: 30px; left: 3px; }
|
select { position : absolute; top: 30px; left: 3px; }
|
||||||
|
|
||||||
|
select { background: black; color: orange; border: 1px solid orange; border-radius: 5px; }
|
||||||
|
option:checked { background: orange; color: black; }
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<input type="text" bind:value={candidate.display} {onkeyup} />
|
<input type="text" bind:value={candidate.display} {onkeyup} />
|
||||||
{#if candidates && candidates.length > 1}
|
{#if candidates && candidates.length > 0}
|
||||||
<select multiple>
|
<select bind:value={selected} multiple tabindex="-1">
|
||||||
{#each candidates as candidate (candidate.display)}
|
{#each candidates as candidate,i}
|
||||||
<option value={candidate}>{candidate.display}</option>
|
<option value={i}>{candidate.display}</option>
|
||||||
{/each}
|
{/each}
|
||||||
</select>
|
</select>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{#if candidates}
|
|
||||||
<pre>
|
|
||||||
{JSON.stringify(candidates,null,2)}
|
|
||||||
</pre>
|
|
||||||
{/if}
|
|
||||||
{JSON.stringify(candidate)}
|
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
<script>
|
<script>
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
|
|
||||||
import { api } from '../urls.svelte';
|
import { api, get, post } from '../urls.svelte';
|
||||||
import { t } from '../translations.svelte';
|
import { t } from '../translations.svelte';
|
||||||
|
import { error, yikes } from '../warn.svelte';
|
||||||
|
|
||||||
import Autocomplete from './Autocomplete.svelte';
|
import Autocomplete from './Autocomplete.svelte';
|
||||||
import PermissionSelector from './PermissionSelector.svelte';
|
import PermissionSelector from './PermissionSelector.svelte';
|
||||||
@@ -27,7 +28,7 @@
|
|||||||
});
|
});
|
||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
var json = await resp.json();
|
var json = await resp.json();
|
||||||
return Object.fromEntries(Object.values(json).map(user => [user.id,user.name]));
|
return Object.values(json).map(user => { return {id:user.id,name:user.name,display:user.name}; });
|
||||||
} else {
|
} else {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
@@ -35,12 +36,10 @@
|
|||||||
|
|
||||||
async function loadPermissions(){
|
async function loadPermissions(){
|
||||||
const url = api('task/permissions');
|
const url = api('task/permissions');
|
||||||
const resp = await fetch(url,{credentials: 'include'});
|
const resp = await get(url);
|
||||||
if (resp.ok){
|
if (resp.ok){
|
||||||
permissions = await resp.json();
|
permissions = await resp.json();
|
||||||
} else {
|
} else error(resp);
|
||||||
message = await resp.text();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function onSelect(entry){
|
function onSelect(entry){
|
||||||
@@ -66,7 +65,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>{t('add_object',{object:t('member')})}</td>
|
<td>{t('add_object',{object:t('member')})}</td>
|
||||||
<td>
|
<td>
|
||||||
<Autocomplete />
|
<Autocomplete {getCandidates} {onSelect} />
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -28,9 +28,8 @@
|
|||||||
let new_state = $state({code:null,name:null})
|
let new_state = $state({code:null,name:null})
|
||||||
let state_available=$derived(new_state.name && new_state.code && !project.allowed_states[new_state.code]);
|
let state_available=$derived(new_state.name && new_state.code && !project.allowed_states[new_state.code]);
|
||||||
|
|
||||||
async function addMember(entry){
|
async function addMember(user){
|
||||||
const ids = Object.keys(entry);
|
update({new_member:+user.id});
|
||||||
if (ids) update({new_member:+ids.pop()});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function addState(){
|
async function addState(){
|
||||||
@@ -67,21 +66,6 @@
|
|||||||
update({drop_member:member.user.id});
|
update({drop_member:member.user.id});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getCandidates(text){
|
|
||||||
const url = api('user/search');
|
|
||||||
const resp = await fetch(url,{
|
|
||||||
credentials : 'include',
|
|
||||||
method : 'POST',
|
|
||||||
body : text
|
|
||||||
});
|
|
||||||
if (resp.ok){
|
|
||||||
var json = await resp.json();
|
|
||||||
return Object.fromEntries(Object.values(json).map(user => [user.id,user.name]));
|
|
||||||
} else {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleCreate(evt){
|
function handleCreate(evt){
|
||||||
let json = JSON.parse(evt.data);
|
let json = JSON.parse(evt.data);
|
||||||
json.event = 'create';
|
json.event = 'create';
|
||||||
@@ -242,7 +226,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<div class="em">{t('members')}</div>
|
<div class="em">{t('members')}</div>
|
||||||
<div class="em">
|
<div class="em">
|
||||||
<PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
|
<PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} />
|
||||||
</div>
|
</div>
|
||||||
{#if project.allowed_states}
|
{#if project.allowed_states}
|
||||||
{#each Object.keys(project.allowed_states) as key,idx}
|
{#each Object.keys(project.allowed_states) as key,idx}
|
||||||
|
|||||||
Reference in New Issue
Block a user