implemented patching of project tasks when new user is added to project

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

backend/src/main/java/de/srsoftware/umbrella/backend/Application.java

@@ -14,7 +14,6 @@ import de.srsoftware.umbrella.bookmarks.BookmarkApi;
 import de.srsoftware.umbrella.company.CompanyModule;
 import de.srsoftware.umbrella.contact.ContactModule;
 import de.srsoftware.umbrella.core.SettingsService;
-import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.documents.DocumentApi;
 import de.srsoftware.umbrella.files.FileModule;
@@ -34,7 +33,6 @@ import de.srsoftware.umbrella.translations.Translations;
 import de.srsoftware.umbrella.user.UserModule;
 import de.srsoftware.umbrella.web.WebHandler;
 import de.srsoftware.umbrella.wiki.WikiModule;
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;

core/src/main/java/de/srsoftware/umbrella/core/Util.java

@@ -15,7 +15,6 @@ import static java.lang.System.Logger.Level.*;
 import static java.lang.System.Logger.Level.WARNING;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.xrbpowered.jparsedown.JParsedown;
 import de.srsoftware.tools.Mappable;
 import de.srsoftware.tools.Query;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
@@ -27,12 +26,13 @@ import java.net.URI;
 import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.regex.Pattern;
 import org.json.JSONObject;
 
 public class Util {
@@ -188,4 +188,19 @@ jspreadsheet(document.getElementById('spreadsheet'), {
 	public static String dateTimeOf(long epochMilis){
 		return LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMilis), ZoneId.systemDefault()).format(TIME_FORMATTER);
 	}
+
+	public static String toJson(ResultSet rs) {
+		try {
+			Map<String,Object> map = new HashMap<>();
+			var meta = rs.getMetaData();
+			for (int col = 1; col <= meta.getColumnCount(); col++) {
+				var key = meta.getColumnName(col);
+				var val = rs.getObject(col);
+				map.put(key, val);
+			}
+			return new JSONObject(map).toString();
+		} catch (SQLException e){
+			return e.getMessage();
+		}
+	}
 }

core/src/main/java/de/srsoftware/umbrella/core/api/TaskService.java

@@ -3,11 +3,13 @@ package de.srsoftware.umbrella.core.api;
 
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.Task;
+import de.srsoftware.umbrella.core.model.UmbrellaUser;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
 public interface TaskService {
+	void clonePermissions(long project_id, UmbrellaUser source, UmbrellaUser dest);
 	Map<Long, Task> listCompanyTasks(long companyId) throws UmbrellaException;
 	Map<Long, Task> listProjectTasks(long projectId) throws UmbrellaException;
 	Map<Long, Task> load(Collection<Long> taskIds);

core/src/main/java/de/srsoftware/umbrella/core/constants/Field.java

@@ -77,10 +77,11 @@ public class Field {
 	public static final String HEAD = "head";
 	public static final String HOURS = "hours";
 
-	public static final String ID        = "id";
-	public static final String INSTANTLY = "instantly";
-	public static final String ITEM      = "item";
-	public static final String ITEM_CODE = "item_code";
+	public static final String ID           = "id";
+	public static final String INHERIT_FROM = "inherit_from";
+	public static final String INSTANTLY    = "instantly";
+	public static final String ITEM         = "item";
+	public static final String ITEM_CODE    = "item_code";
 
 	public static final String KEY = "key";
 

core/src/main/java/de/srsoftware/umbrella/core/constants/Path.java

@@ -42,8 +42,8 @@ public class Path {
 	public static final String PROPERTY          = "property";
 	public static final String PURPOSES          = "purposes";
 
-	public static final String READ     = "read";
-	public static final String REDIRECT = "redirect";
+	public static final String READ      = "read";
+	public static final String REDIRECT  = "redirect";
 
 	public static final String SEARCH   = "search";
 	public static final String SELECT   = "select";

frontend/src/Components/Autocomplete.svelte

@@ -4,6 +4,7 @@
 
 
     let {
+        enabled       = true,
         id            = null,
         autofocus     = false,
         getCandidates = dummyGetCandidates,
@@ -148,7 +149,7 @@
 </style>
 
 <span class="autocomplete">
-    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} />
+    <input type="text" bind:value={candidate.display} {onkeyup} autofocus={autofocus} {id} {onblur} disabled={!enabled} />
     {#if candidates && candidates.length > 0}
     <ul bind:this={list_elem} class="suggestions" tabindex="-1">
         {#each candidates as candidate,i}

frontend/src/Components/PermissionEditor.svelte

@@ -10,6 +10,7 @@
 
     let {
         addMember        = (entry)    => console.log(`no handler for addMember(${entry})`),
+        enabled          = true,
         dropMember       = (member)   => console.log(`no handler for dropMember(${member})`),
         getCandidates    = defaultGetCandidates,
         members,
@@ -61,7 +62,7 @@
     <tr>
         <td>{t('add_object',{object:t('member')})}</td>
         <td>
-            <Autocomplete {getCandidates} onSelect={addMember} />
+            <Autocomplete {getCandidates} onSelect={addMember} {enabled} />
         </td>
     </tr>
     </tbody>

frontend/src/Components/UserSelector.svelte

@@ -6,6 +6,7 @@
     import Autocomplete       from './Autocomplete.svelte';
 
     let {
+        enabled       = true,
         getCandidates = async text => {},
         heading       = t('add_object',{object:t('user')}),
         users         = $bindable({})
@@ -37,7 +38,7 @@
     <tr>
         <td>{heading}</td>
         <td>
-            <Autocomplete {getCandidates} {onSelect} />
+            <Autocomplete {getCandidates} {onSelect} {enabled} />
         </td>
     </tr>
     </tbody>

frontend/src/routes/project/View.svelte

@@ -25,12 +25,13 @@
     let tasks          = $state(null);
     let show_closed    = $state(false);
     let new_color      = $state({tag:null,color:'#00aa00'})
+    let inherit_from   = $state(0);
 
     let new_state = $state({code:null,name:null})
     let state_available=$derived(new_state.name && new_state.code && !project.allowed_states[new_state.code]);
 
     async function addMember(user){
-        return await update({new_member:+user.id});
+        return await update({new_member:+user.id,inherit_from});
     }
 
     async function addState(){
@@ -239,7 +240,21 @@
     </label>
     <div class="em">{t('members')}</div>
     <div class="em">
-        <PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} />
+        <PermissionEditor members={project.members} {updatePermission} {addMember} {dropMember} enabled={inherit_from != 0}/>
+        <label>
+            └→ Inherit task permissions from:
+            <select bind:value={inherit_from}>
+                <option value={0}>{t('select user')}</option>
+                {#each Object.values(project.members) as member (member.user.id)}
+                <option value={member.user.id}>{member.user.name}</option>
+                {/each}
+            </select>
+            <pre>
+                <code>
+                    {JSON.stringify(project.members,null,2)}
+                </code>
+            </pre>
+        </label>
     </div>
     {#if project.allowed_states}
     {#each Object.keys(project.allowed_states) as key,idx}

frontend/src/routes/task/Add.svelte

@@ -63,9 +63,13 @@
         if (resp.ok){
             parent_task         = await resp.json();
             task.parent_task_id = +parent_task_id;
+            for (let [uid, member] of Object.entries(parent_task.members)){
+                if (['OWNER','ASSIGNEE'].includes(member.permission.name)) member.permission = { name: 'EDIT', code: 2 };
+                task.members[uid] = member;
+            }
             project_id          = +parent_task.project_id;
             yikes();
-            project             = null; // TODO
+            project             = null;
         } else error(resp);
     }
 
@@ -75,11 +79,17 @@
         if (resp.ok){
             project           = await resp.json();
             task.project_id   = +project_id;
+            if (Object.keys(task.members).length < 1) {
+                for (let [uid, member] of Object.entries(project.members)){
+                    if (['OWNER','ASSIGNEE'].includes(member.permission.name)) member.permission = { name: 'EDIT', code: 2 };
+                    task.members[uid] = member;
+                }
+            }
             if (assignee && project.members[assignee]){
                 task.members[assignee] = project.members[assignee];
                 task.members[assignee].permission = { name : "ASSIGNEE", code : 3 }
             }
-            if (task.taks.length < 1) task.tags = project.tags;
+            if (task.tags.length < 1) task.tags = project.tags;
             yikes();
         } else {
             error(resp);
@@ -124,6 +134,10 @@
         extendedSettings = !extendedSettings;
     }
 
+    function updatePermission(uid,perm){
+        task.members[uid].permission = perm;
+    }
+
     onMount(load);
 </script>
 
@@ -161,7 +175,7 @@
         {#if extendedSettings}
         <div>{t('members')}</div>
         <div>
-            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} />
+            <PermissionEditor members={task.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
         </div>
 
         <div>{t('estimated_time')}</div>

frontend/src/routes/task/ParentSelector.svelte

@@ -7,6 +7,7 @@
 
 	let { project, select = o => {}, task } = $props();
 	let tree = $state({});
+	let loading = $state(true);
 
 	async function loadParentCandidates(){
 		let url = api(`task/${task.id}/parent_candidates`);
@@ -14,6 +15,7 @@
 		if (res.ok){
 			yikes();
 			tree = await res.json();
+			loading = false;
 		} else error(res);
 	}
 
@@ -21,7 +23,16 @@
 </script>
 
 <div class="overlay parent_selector">
-	<h2>{t('select a new parent for {entity}',{entity:task.name})}</h2>
+	<h2>
+		{t('select a new parent for {entity}',{entity:task.name})}
+		<button onclick={ev => select(null)}>{t('abort')}</button>
+	</h2>
 	{t('project')}: {project.name}
+	{#if loading}
+	<p>
+		{t('loading')}
+	</p>
+	{:else}
 	<TaskTree {tree} {select} />
+	{/if}
 </div>

frontend/src/routes/task/View.svelte

@@ -81,6 +81,10 @@
         router.navigate(`/project/${project.id}/view`)
     }
 
+    function gotoTask(tid){
+        if (id) router.navigate(`/task/${tid}/view`)
+    }
+
 	function handleUpdateEvent(evt){
 		let json = JSON.parse(evt.data);
 		if (json.task) {
@@ -119,7 +123,8 @@
             if (task.show_closed) show_closed = true;
             loadChildren();
             if (task.project_id) loadProject();
-            if (task.parent_task_id) loadParent();
+            if (task.parent_task_id) await loadParent();
+            loadSiblings();
         } else error(resp);
     }
 
@@ -129,13 +134,36 @@
         if (resp.ok){
             project = await resp.json();
             yikes();
-        } else error(await resp.text());
+        } else error(resp);
+    }
+
+    async function loadSiblings(){
+        const url = api(`task/list`);
+        const select = task.parent_task_id ? {parent_task_id:task.parent_task_id} : {project_id: task.project_id};
+        select.show_closed = false;
+        const res = await post(url,select);
+        if (res.ok){
+            task.siblings = await res.json();
+            let last      = null;
+            let before    = undefined;
+            let after     = null;
+            for (let [sid, t] of Object.entries(task.siblings).toSorted((a,b) => a[1].name.localeCompare(b[1].name))){
+                if (before !== undefined) {
+                    after = +sid;
+                    break;
+                }
+                if (id == sid) before = last;
+                last = +sid;
+            }
+            task.before = before;
+            task.after  = after;
+        } else error(res)
     }
 
     function parentClick(ev){
         ev.preventDefault();
         if (!task.parent_task_id) return;
-        router.navigate(`/task/${task.parent_task_id}/view`);
+        gotoTask(task.parent_task_id);
         return false;
     }
 
@@ -193,7 +221,7 @@
 
     function update_parent(newVal){
         select_parent = false;
-        update({parent_task_id:newVal.id});
+        if (newVal) update({parent_task_id:newVal.id});
     }
 
     function updatePermission(user_id,permission){
@@ -232,10 +260,17 @@
         {/if}
         <button class="symbol" title={t('edit')} onclick={parentRightClick}></button>
         {/if}
+
     </div>
     <div>{t('task')}</div>
     <div class="name">
         <LineEditor bind:value={task.name} editable={true} onSet={val => update({name:val})} />
+        {#if task.before}
+        <button class="symbol" title={task.siblings[task.before].name} onclick={e => gotoTask(task.before)}></button>
+        {/if}
+        {#if task.after}
+        <button class="symbol" title={task.siblings[task.after].name} onclick={e => gotoTask(task.after)}></button>
+        {/if}
         <button class="symbol" title={t('settings')} onclick={toggleSettings}></button>
         <button class="symbol" title={t('timetracking')} onclick={addTime}></button>
     </div>

markdown/src/main/java/de/srsoftware/umbrella/markdown/MarkdownApi.java

@@ -14,11 +14,8 @@ import de.srsoftware.configuration.Configuration;
 import de.srsoftware.tools.Path;
 import de.srsoftware.umbrella.core.BaseHandler;
 import de.srsoftware.umbrella.core.ModuleRegistry;
-import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.api.MarkdownService;
-import de.srsoftware.umbrella.core.constants.Field;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java

@@ -22,6 +22,7 @@ import static de.srsoftware.umbrella.messagebus.MessageBus.messageBus;
 import static de.srsoftware.umbrella.messagebus.events.Event.EventType.CREATE;
 import static de.srsoftware.umbrella.project.Constants.CONFIG_DATABASE;
 import static java.lang.Boolean.TRUE;
+import static java.lang.System.Logger.Level.WARNING;
 import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
 
 import com.sun.net.httpserver.HttpExchange;
@@ -138,6 +139,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 	private void dropMember(Project project, long userId) {
 		if (project.members().get(userId).permission() == OWNER) throw forbidden("You may not remove the owner of the project");
 		projectDb.dropMember(project.id(),userId);
+		LOG.log(WARNING,"Removing member from project tasks not implemented"); // TODO
 		project.members().remove(userId);
 	}
 
@@ -223,7 +225,16 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 		UmbrellaUser newMember = null;
 		if (json.has(DROP_MEMBER) && json.get(DROP_MEMBER) instanceof Number id) dropMember(project,id.longValue());
 		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject memberJson) patchMembers(project,memberJson);
-		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) newMember = addMember(project,num.longValue());
+		if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) {
+			UmbrellaUser inheritFrom = null;
+			if (json.has(INHERIT_FROM)){
+				if (!(json.get(INHERIT_FROM) instanceof Number uid)) throw invalidField(INHERIT_FROM,Text.NUMBER);
+				inheritFrom = userService().loadUser(uid.longValue());
+				if (!project.hasMember(inheritFrom)) throw notAmember(inheritFrom);
+			}
+			newMember = addMember(project,num.longValue());
+			if (inheritFrom != null) taskService().clonePermissions(project.id(),inheritFrom,newMember);
+		}
 
 		project = projectDb.save(project.patch(json), user);
 		messageBus().dispatch(newMember != null ? new ProjectEvent(user,project,newMember) : new ProjectEvent(user,project, old));

task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java

@@ -18,10 +18,12 @@ import static de.srsoftware.umbrella.core.model.Status.*;
 import static de.srsoftware.umbrella.core.model.Translatable.t;
 import static de.srsoftware.umbrella.project.Constants.*;
 import static de.srsoftware.umbrella.task.Constants.*;
+import static java.lang.System.Logger.Level.TRACE;
 import static java.text.MessageFormat.format;
 
 import de.srsoftware.tools.jdbc.Query;
 import de.srsoftware.umbrella.core.BaseDb;
+import de.srsoftware.umbrella.core.Util;
 import de.srsoftware.umbrella.core.constants.Text;
 import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
 import de.srsoftware.umbrella.core.model.*;
@@ -242,6 +244,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 			var tasks = new HashMap<Long,Task>();
 			var rs = query.exec(db);
 			while (rs.next()){
+				LOG.log(TRACE,() -> Util.toJson(rs));
 				var task = Task.of(rs);
 				tasks.put(task.id(),task);
 			}
@@ -257,7 +260,7 @@ CREATE TABLE IF NOT EXISTS {0} (
 		try {
 			var query = select(ALL).from(TABLE_TASKS).leftJoin(ID,TABLE_TASKS_USERS,TASK_ID).where(USER_ID,equal(userId));
 			if (!showClosed) query.where(STATUS,lessThan(COMPLETE.code()));
-			var rs = query.sort("(CASE due_date WHEN \"\" THEN '9999-99-99' ELSE IFNULL(due_date,'9999-99-99') END), status COLLATE NOCASE").limit(limit).skip(offset).exec(db);
+			var rs = query.sort("(CASE due_date WHEN \"\" THEN '9999-99-99' ELSE IFNULL(due_date,'9999-99-99') END), status COLLATE NOCASE").limit(limit == null ? -1 : limit).skip(offset).exec(db);
 			var map = new ArrayList<Task>();
 			while (rs.next()) map.add(Task.of(rs));
 			rs.close();

task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java

@@ -66,6 +66,28 @@ public class TaskModule extends BaseHandler implements TaskService {
 		return user;
 	}
 
+	@Override
+	public void clonePermissions(long project_id, UmbrellaUser source, UmbrellaUser dest) {
+		var taskMap = taskDb.listProjectTasks(project_id,null,true);
+		loadMembers(taskMap.values());
+		for (var task : taskMap.values()) {
+			var memberShip = task.members().get(source.id());
+
+			Permission granted = memberShip == null ? EDIT : switch (memberShip.permission()) {
+				case ASSIGNEE,
+					 EDIT,
+					 OWNER ->
+						EDIT;
+				case READ_ONLY ->
+						READ_ONLY;
+			};
+			var newMember = new Member(dest, granted);
+			task.members().put(dest.id(), newMember);
+			task.dirty(MEMBERS);
+			taskDb.save(task);
+		}
+	}
+
 	private boolean deleteTask(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
 		var task = loadMembers(taskDb.load(taskId));
 		var member = task.members().get(user.id());
@@ -195,7 +217,7 @@ public class TaskModule extends BaseHandler implements TaskService {
 	private boolean getParentCandidates(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
 		var task = taskDb.load(taskId);
 		var project = projectService().load(task.projectId());
-		var projectTasks = taskDb.listProjectTasks(project.id(),null, false);
+		var projectTasks = taskDb.listProjectTasks(project.id(),null, true);
 		var mapped = projectTasks.values().stream().collect(Collectors.toMap(Task::id,Task::toMap));
 		var roots = new HashMap<Long,Map<String,Object>>();
 		for (var map : mapped.values()){
@@ -386,40 +408,33 @@ public class TaskModule extends BaseHandler implements TaskService {
 		long projectId = pid.longValue();
 		var project = projectService().load(projectId);
 		projectService().loadMembers(List.of(project));
-		var members = project.members();
-		var member = members.get(user.id());
+		var parentMembers = project.members();
+		var member = parentMembers.get(user.id());
 		if (member == null || member.permission() == READ_ONLY) throw forbidden("You are not allowed to create new tasks in this project");
 
 		var parentTask = json.has(PARENT_TASK_ID) && json.get(PARENT_TASK_ID) instanceof Number par ? taskService().load(Set.of(par.longValue())).get(par.longValue()) : null;
 		if (parentTask != null) {
 			taskService().loadMembers(parentTask);
-			members = parentTask.members();
-			member = members.get(user.id());
+			parentMembers = parentTask.members();
+			member = parentMembers.get(user.id());
 			if (member == null || member.permission() == READ_ONLY) throw forbidden("You are not allowed to add sub-stasks to {object}", OBJECT, parentTask.name());
 		}
 
 		var newMembers = new HashMap<Long, Permission>();
-		for (var mem : members.values()) { // Assign members from project or parent task
-			var permission = mem.permission() == OWNER ? EDIT : mem.permission();
-			newMembers.put(mem.user().id(), permission);
-		}
-
-		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject mems) {
-			// check of assignee has been set by client
-			for (var k : mems.keySet()) {
-				try {
-					var userId = Long.parseLong(k);
-					var permName = mems.getJSONObject(k).getJSONObject(PERMISSION).getString(NAME);
-					if (Permission.valueOf(permName) == ASSIGNEE) newMembers.put(userId, ASSIGNEE);
-				} catch (Exception ignored) {
-					LOG.log(WARNING, "Failed to parse {0}", mems.get(k));
-				}
+		if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject members) {
+			for (var key : members.keySet()){
+				var code = members.getJSONObject(key).getJSONObject(PERMISSION).getInt(CODE);
+				var perm = Permission.of(code);
+				if (perm == OWNER) perm = EDIT;
+				var userId = Long.parseLong(key);
+				if (!parentMembers.containsKey(userId)) throw forbidden("{user} is not a member of {path}",Field.USER,userService().loadUser(userId).name(),Field.PATH, parentTask == null ? project.name() : parentTask.name());
+				newMembers.put(userId,perm);
 			}
 		}
+
 		// set ownership to current user
 		newMembers.put(user.id(), OWNER);
 
-
 		json.put(MEMBERS, Map.of()); // reset member map for task-to-be-created
 		Task task = Task.of(json);
 		if (parentTask != null && parentTask.dueDate() != null && task.dueDate() == null) task.dueDate(parentTask.dueDate());

translations/src/main/resources/de.json

@@ -335,6 +335,7 @@
   "select_customer": "Kunde auswählen",
   "select_property": "Eigenschaft auswählen",
   "select_state": "Status wählen",
+  "select user": "Nutzer auswählen",
   "send_document": "Dokument versenden",
   "sender": "Absender",
   "sender_bank_account": "Bankverbindung",

translations/src/main/resources/en.json

@@ -335,6 +335,7 @@
   "select_customer": "select customer",
   "select_property": "select property",
   "select_state": "select state",
+  "select user": "select user",
   "send_document": "send document",
   "sender": "sender",
   "sender_bank_account": "bank account",

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

@@ -26,6 +26,11 @@ input{
     color: orange;
 }
 
+input:disabled{
+	border: 1px solid gray;
+	background: #444;
+}
+
 legend.date,
 legend.time{
     background-color: black;