[fix] file creation fixes

dummdidumm · dummdidumm · commit 72b6fb8398d8 · 2022-12-01T17:32:03.000+01:00
- fix names
- fix checks for allowed actions
- fix contextmenu appearance
diff --git a/src/routes/tutorial/[slug]/+page.svelte b/src/routes/tutorial/[slug]/+page.svelte
@@ -84,9 +84,10 @@
 		},
 
 		add: async (stubs) => {
-			const illegal_create = editing_constraints.create.some(
-				(c) => !stubs.some((s) => (s.type === 'directory' && c.startsWith(s.name)) || s.name === c)
+			const illegal_create = stubs.some(
+				(s) => !editing_constraints.create.some((c) => s.name === c)
 			);
+
 			if (illegal_create) {
 				modal_text =
 					'Only the following files and folders are allowed to be created in this tutorial chapter:\n' +
@@ -104,14 +105,15 @@
 		},
 
 		edit: async (to_rename, new_name) => {
-			const illegal_rename = editing_constraints.remove.some(
-				(r) =>
-					(to_rename.type === 'directory' && r.startsWith(to_rename.name)) || to_rename.name === r
-			);
+			const illegal_rename =
+				!editing_constraints.remove.some((r) => to_rename.name === r) ||
+				!editing_constraints.create.some((c) => new_name === c);
 			if (illegal_rename) {
 				modal_text =
 					'Only the following files and folders are allowed to be renamed in this tutorial chapter:\n' +
-					editing_constraints.remove.join('\n');
+					editing_constraints.remove.join('\n') +
+					'\n\nThey can only be renamed to the following:\n' +
+					editing_constraints.create.join('\n');
 				return;
 			}
 
@@ -141,9 +143,7 @@
 		},
 
 		remove: async (stub) => {
-			const illegal_delete = editing_constraints.remove.some(
-				(r) => (stub.type === 'directory' && r.startsWith(stub.name)) || stub.name === r
-			);
+			const illegal_delete = !editing_constraints.remove.some((r) => stub.name === r);
 			if (illegal_delete) {
 				modal_text =
 					'Only the following files and folders are allowed to be deleted in this tutorial chapter:\n' +
diff --git a/src/routes/tutorial/[slug]/ContextMenu.svelte b/src/routes/tutorial/[slug]/ContextMenu.svelte
@@ -24,7 +24,7 @@
 </script>
 
 {#if $menu_items}
-	<nav style="position: fixed; z-index: 1; top:{$menu_items.y}px; left:{$menu_items.x}px">
+	<nav style="position: fixed; z-index: 5; top:{$menu_items.y}px; left:{$menu_items.x}px">
 		<div class="navbar" id="navbar">
 			<ul>
 				{#each $menu_items.items as item}
diff --git a/src/routes/tutorial/[slug]/Folder.svelte b/src/routes/tutorial/[slug]/Folder.svelte
@@ -114,14 +114,14 @@
 				for (let i = 1; i <= parts.length; i++) {
 					const part = parts.slice(0, i).join('/');
 					const basename = /** @type{string} */ (part.split('/').pop());
-					const name = prefix + part + '/';
+					const name = prefix + part;
 					if (!files.some((file) => file.name === name)) {
 						if (i < parts.length || state === 'add_folder') {
 							stubs.push({ type: 'directory', name, depth: depth + i, basename });
 						} else if (i === parts.length && state === 'add_file') {
 							stubs.push({
 								type: 'file',
-								name: name.slice(0, -1),
+								name,
 								depth: depth + i,
 								basename,
 								text: true,
@@ -131,7 +131,9 @@
 					}
 				}
 
-				add(stubs);
+				if (stubs.length) {
+					add(stubs);
+				}
 			}
 		}
 
