Merge branch 'feature/kanban_new_task_form' into dev

frontend/src/routes/project/Kanban.svelte

@@ -10,6 +10,7 @@
     import Card              from './KanbanCard.svelte';
     import LineEditor        from '../../Components/LineEditor.svelte';
     import MarkdownEditor    from '../../Components/MarkdownEditor.svelte';
+    import TaskForm          from '../task/Add.svelte';
 
 	let eventSource      = null;
     let connectionStatus = 'disconnected';
@@ -26,7 +27,7 @@
     let users        = [];
     let columns      = $derived(project.allowed_states?Object.keys(project.allowed_states).length+1:1);
     let info         = $state(null);
-
+    let task_form    = $state(false);
     let stateList = {};
     $effect(() => updateUrl(filter_input));
 
@@ -120,7 +121,9 @@
             if (method != 'delete') processTask(json.task);
 
             // show notification
-            if (json.user.id != user.id) {
+            if (json.user.id == user.id) {
+                if (method == 'create') task_form = false; // task has been created by current user
+            } else {
                 let term = "user_updated_entity";
                 if (method == 'create') term = "user_created_entity";
                 if (method == 'delete') term = "user_deleted_entity";
@@ -249,6 +252,9 @@
         }
     }
 
+    function show_task_form(project_id,assignee,state_id){
+        task_form = {project_id,assignee,state_id};
+    }
 
     function updateUrl(){
         let url = window.location.origin + window.location.pathname;
@@ -267,6 +273,12 @@
 </svelte:head>
 
 {#if project}
+{#if task_form}
+<div class="overlay">
+    <TaskForm project_id={task_form.project_id} assignee={task_form.assignee} state_id={task_form.state_id} />
+</div>
+{/if} <!-- task form -->
+
 <h1 onclick={ev => router.navigate(`/project/${project.id}/view`)}>{project.name}</h1>
 {/if}
 {#if info}
@@ -300,8 +312,8 @@
                     <Card onclick={e => openTask(task.id)} ondragstart={ev => dragged=task} {task} tag_colors={project.tag_colors} />
                     {/if}
                 {/each}
-                <div class="add_task">
+                <div class="add_task" onclick={ev => show_task_form(project.id,u.id,+state)}>
-                    <LineEditor value={t('add_object',{object:t('task')})} editable={true} onSet={(name) => create(name,u.id,state)}/>
+                    {t('add_object',{object:t('task')})}
                 </div>
             </div>
         {/each}
@@ -310,4 +322,4 @@
 <div class="archive {highlight.archive?'hover':''}" ondragover={hover_archive} ondragleave={e => delete highlight.archive} ondrop={do_archive} >
 {t('hide')}
 </div>
-{/if}
+{/if} <!-- project -->

frontend/src/routes/task/Add.svelte

@@ -2,7 +2,7 @@
     import { onMount }       from 'svelte';
     import { useTinyRouter } from 'svelte-tiny-router';
 
-    import { api }           from '../../urls.svelte.js';
+    import { api, get }      from '../../urls.svelte.js';
     import { error, yikes }  from '../../warn.svelte';
     import { t }             from '../../translations.svelte.js';
     import { user }          from '../../user.svelte.js';
@@ -11,7 +11,7 @@
     import PermissionEditor  from '../../Components/PermissionEditor.svelte';
     import Tags              from '../tags/TagList.svelte';
 
-    let { project_id = null, parent_task_id } = $props();
+    let { project_id = null, parent_task_id = null, assignee = null, state_id = null } = $props();
     let project          = $state(null);
     let extendedSettings = $state(false);
     let parent_task      = $state(null);
@@ -20,6 +20,7 @@
         description    : { source : '', rendered : '' },
         due_date       : null,
         est_time       : null,
+        members        : {},
         no_index       : false,
         show_closed    : false,
         start_date     : null,
@@ -29,6 +30,7 @@
 
     function addMember(member){
         for (let uid of Object.keys(member)) task.members[uid] = project.members[uid];
+        console.log(task.members);
     }
 
     function flat(json){
@@ -44,29 +46,32 @@
     async function load(){
         if (parent_task_id) await loadParent();
         if (project_id) loadProject();
+        if (state_id)   task.status   = { code : +state_id };
         loadTags();
     }
 
     async function loadParent(){
         const url  = api(`task/${parent_task_id}`);
-        const resp = await fetch(url,{credentials:'include'});
+        const resp = await get(url);
         if (resp.ok){
             parent_task         = await resp.json();
             task.parent_task_id = +parent_task_id;
-            project_id          = parent_task.project_id;
+            project_id          = +parent_task.project_id;
             yikes();
             project             = null; // TODO
-        } else {
+        } else error(resp);
-            error(resp);
-        }
     }
 
     async function loadProject(){
         const url  = api(`project/${project_id}`);
-        const resp = await fetch(url,{credentials:'include'});
+        const resp = await get(url);
         if (resp.ok){
             project           = await resp.json();
             task.project_id   = +project_id;
+            if (assignee && project.members[assignee]){
+                task.members[assignee] = project.members[assignee];
+                task.members[assignee].permission = { name : "ASSIGNEE", code : 3 }
+            }
             yikes();
         } else {
             error(resp);
@@ -78,7 +83,7 @@
         if (project_id) url = api(`tags/project/${project_id}`);
         if (parent_task_id) url = api(`tags/task/${parent_task_id}`);
         if (url) {
-            const resp = await fetch(url,{credentials:'include'});
+            const resp = await get(url);
             if (resp.ok) task.tags = await resp.json();
         }
     }
@@ -107,10 +112,12 @@
             body        : JSON.stringify(task)
         });
         if (resp.ok) {
-            task = await resp.json();
+            if (!assignee) { // if assignee is set, this form was opened within an external context. hence we don`t want to navigate somewhere else!
-            if (task.parent_task_id){
+                task = await resp.json();
-                router.navigate(`/task/${task.parent_task_id}/view`);
+                if (task.parent_task_id){
-            } else router.navigate(`/task/${task.id}/view`);
+                    router.navigate(`/task/${task.parent_task_id}/view`);
+                } else router.navigate(`/task/${task.id}/view`);
+            }
             yikes();
         } else {
             error(resp);
@@ -183,7 +190,7 @@
                     {t('members')}
                 </th>
                 <td>
-                    <PermissionEditor members={task.members} {addMember} {getCandidates} {dropMember} />
+                    <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} />
                 </td>
             </tr>
             <tr>
@@ -245,4 +252,4 @@
         </tbody>
     </table>
     <button onclick={saveTask}>{t('save_object',{object:t('task')})}</button>
-</fieldset>
+</fieldset>

frontend/src/routes/task/View.svelte

@@ -270,7 +270,7 @@
 
         <div>{t('members')}</div>
         <div>
-            <PermissionEditor members={task.members} {updatePermission} {addMember} {dropMember} {getCandidates} />
+            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
         </div>
         <div>{t('start_date')}</div>
         <div>

web/src/main/resources/web/css/default.css

@@ -183,6 +183,17 @@ td, tr{
 	padding: 3px;
 }
 
+.overlay {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	left: 0;
+	padding: 40px 10px 10px;
+	background: rgba(0,0,0,0.9);
+	z-index: 50;
+}
+
 .warn {
     padding: 5px;
     border-radius: 6px;