Merge branch 'develop' into fix/table-row-deletion-480

Author: NagariaHussain

frontend/src/components/WikiDocumentList.vue

@@ -298,10 +298,8 @@ async function applyReorder(payload) {
 		payload.newParent,
 		siblingKeys,
 	);
-	for (const sibling of payload.siblings || []) {
-		if (sibling && !sibling._changeType) {
-			sibling._changeType = 'reordered';
-		}
+	if (payload?.item && !payload.item._changeType) {
+		payload.item._changeType = 'reordered';
 	}
 	toast.success(__('Documents reordered'));
 	await loadChanges();

wiki/api/wiki_space.py

@@ -85,10 +85,8 @@ def reorder_wiki_documents(
 	# Direct reorder for users with write permission
 	parent_changed = doc.parent_wiki_document != new_parent
 
-	# Update parent if changed
 	if parent_changed:
-		doc.parent_wiki_document = new_parent
-		doc.save()
+		frappe.db.set_value("Wiki Document", doc_name, "parent_wiki_document", new_parent)
 
 	# Batch update sort_order for all siblings
 	_batch_update_sort_order(siblings_list)

wiki/frappe_wiki/doctype/wiki_change_request/test_wiki_change_request.py

@@ -359,6 +359,41 @@ def test_get_change_request_returns_dict(self):
 		self.assertEqual(data.get("name"), cr.name)
 		self.assertEqual(data.get("title"), cr.title)
 
+	def test_merge_preserves_existing_routes(self):
+		"""Merging a CR must not regenerate routes for existing documents.
+		Routes are permalinks — they should remain stable across merges."""
+		space = create_test_wiki_space()
+
+		# Build a small tree with a group and two child pages
+		group = create_test_wiki_document(space.root_group, title="Introduction", is_group=1)
+		page_a = create_test_wiki_document(group.name, title="Getting Started")
+		page_b = create_test_wiki_document(group.name, title="Installation")
+
+		# Record routes before CR merge
+		routes_before = {}
+		for doc in (group, page_a, page_b):
+			doc.reload()
+			self.assertTrue(doc.route, f"{doc.title} should have a route")
+			routes_before[doc.name] = doc.route
+
+		# Create a change request that only edits content (no structural changes)
+		cr = create_change_request(space.name, "Content update")
+		page_a_key = frappe.get_value("Wiki Document", page_a.name, "doc_key")
+		update_cr_page(cr.name, page_a_key, {"content": "Updated content"})
+
+		# Merge — this used to set doc.route = None for every document,
+		# forcing regeneration and triggering duplicate-route errors.
+		merge_change_request(cr.name)
+
+		# Verify routes are unchanged
+		for doc_name, old_route in routes_before.items():
+			current_route = frappe.db.get_value("Wiki Document", doc_name, "route")
+			self.assertEqual(
+				current_route,
+				old_route,
+				f"Route of {doc_name} changed after CR merge: {old_route!r} -> {current_route!r}",
+			)
+
 	def test_archive_change_request_sets_status(self):
 		space = create_test_wiki_space()
 		create_test_wiki_document(space.root_group, title="Page A")

wiki/frappe_wiki/doctype/wiki_change_request/wiki_change_request.py

@@ -1215,7 +1215,6 @@ def apply_merge_revision(space: Document, revision: Document) -> None:
 			content = frappe.get_value("Wiki Content Blob", content_blob, "content")
 			doc.content = content
 
-		doc.route = None
 		if doc.is_new():
 			doc.insert()
 			key_to_name[doc_key] = doc.name

wiki/test_api.py

@@ -266,6 +266,69 @@ def test_reorder_via_frappe_call(self):
 		self.assertEqual(sort_orders["Q5"], 0)
 		self.assertEqual(sort_orders["Q6"], 1)
 
+	def test_reorder_preserves_routes(self):
+		"""Routes must never change during reorder — neither for simple sort-order
+		changes nor for reparenting.  A page's route is its permalink and must
+		remain stable regardless of where it sits in the tree."""
+		from wiki.api.wiki_space import reorder_wiki_documents
+
+		space = create_test_wiki_space()
+
+		# Build a small tree:
+		#   root_group
+		#   ├── group_a          (group)
+		#   │   ├── page_1       (leaf)
+		#   │   └── page_2       (leaf)
+		#   └── group_b          (group)
+		group_a = create_wiki_document(space.root_group, "Group A", is_group=True)
+		page_1 = create_wiki_document(group_a.name, "Page One")
+		page_2 = create_wiki_document(group_a.name, "Page Two")
+		group_b = create_wiki_document(space.root_group, "Group B", is_group=True)
+
+		# Record every route before any reorder
+		routes_before = {}
+		for doc in (group_a, page_1, page_2, group_b):
+			doc.reload()
+			routes_before[doc.name] = doc.route
+
+		frappe.set_user("Administrator")
+
+		# --- Case 1: simple sort-order swap (no parent change) ---
+		# Swap group_a and group_b among the root's children
+		siblings = json.dumps([group_b.name, group_a.name])
+		reorder_wiki_documents(
+			doc_name=group_b.name,
+			new_parent=space.root_group,
+			new_index=0,
+			siblings=siblings,
+		)
+
+		for doc_name, old_route in routes_before.items():
+			current_route = frappe.db.get_value("Wiki Document", doc_name, "route")
+			self.assertEqual(
+				current_route,
+				old_route,
+				f"Route of {doc_name} changed after sort-order reorder: "
+				f"{old_route!r} -> {current_route!r}",
+			)
+
+		# --- Case 2: reparent page_1 from group_a into group_b ---
+		siblings_in_b = json.dumps([page_1.name])
+		reorder_wiki_documents(
+			doc_name=page_1.name,
+			new_parent=group_b.name,
+			new_index=0,
+			siblings=siblings_in_b,
+		)
+
+		for doc_name, old_route in routes_before.items():
+			current_route = frappe.db.get_value("Wiki Document", doc_name, "route")
+			self.assertEqual(
+				current_route,
+				old_route,
+				f"Route of {doc_name} changed after reparent: " f"{old_route!r} -> {current_route!r}",
+			)
+
 	def test_reorder_detailed_debug(self):
 		"""Detailed test to trace exactly what happens during reorder.