* Fixed that if a parent was type "argument", all children claims would be imported as "premises" (ie. in the "generic" child-group), even if the collection they were in was of a non-premise type (eg. "arguments"). [these non-premise children now all get imported into the "freeform" group]

* MS relinking a node under the same parent is now allowed, so long as the child-group is changing. (regarding of child-group types)
* Fixed that pyroscope and tilt were using the same port.

Author: Venryx

Packages/app-server/src/db/commands/link_node.rs

@@ -91,8 +91,13 @@ pub async fn link_node(ctx: &AccessorContext<'_>, actor: &User, is_root: bool, i
 
 	assert_user_can_add_child(ctx, actor, &new_parent).await?; // defensive
 
-	let pasting_premise_as_relevance_arg = node_data.r#type == NodeType::claim && childGroup == ChildGroup::relevance;
-	ensure!(oldParentID.as_ref() != Some(&newParentID) || pasting_premise_as_relevance_arg, "Old-parent-id and new-parent-id cannot be the same! (unless changing between truth-arg and relevance-arg)");
+	// if the new-parent-id is the same as the old-parent-id, then only allow the re-link to proceed if the child-group is changing
+	if Some(&newParentID) == oldParentID.as_ref()
+		&& let Some(old_parent) = &old_parent
+	{
+		let old_link = get_first_link_under_parent(ctx, &nodeID, old_parent.id.as_str()).await?;
+		ensure!(childGroup != old_link.group, "Old-parent-id and new-parent-id cannot be the same! (unless changing child-group)");
+	}
 
 	if unlink_from_old_parent {
 		let closest_map_root_node = if new_parent.rootNodeForMap.is_some() {

Packages/client/Source/Utils/DataFormats/JSON/ClaimGen/ImportHelpers.ts

@@ -48,11 +48,13 @@ export const NewNodeResource = CreateAccessor((context: ImportContext, nodeData:
 	const parentNodeType = parentNodeData ? CG_Node.GetNodeType(parentNodeData) : context.importUnderNode.type;
 	const link = new NodeLink({
 		group:
-			// if this parent->child link is valid using child-group "generic", then do that
-			NodeType_Info.for[parentNodeType].childGroup_childTypes.get(ChildGroup.generic)?.includes(nodeType)
-				? ChildGroup.generic
-				// else, fall back to using the "freeform" child-group
-				: ChildGroup.freeform,
+			// if parent is of type "argument", then use "freeform" child-group for anything *except* its "premises" and "atomic_claims" children
+			// (since this is a special case where "generic" group results in the special "vertical" display-mode, which we only want for premises/atomic-claims)
+			parentNodeType == NodeType.argument && (nodeData._originCollectionName != "premises" && nodeData._originCollectionName != "atomic_claims") ? ChildGroup.freeform :
+			// else, if this parent->child link is valid using child-group "generic", go with that
+			NodeType_Info.for[parentNodeType].childGroup_childTypes.get(ChildGroup.generic)?.includes(nodeType) ? ChildGroup.generic :
+			// else, fall back to using the "freeform" child-group
+			ChildGroup.freeform,
 		orderKey: orderKey.toString(),
 		//form: claimForm,
 	});

Packages/js-common/Source/Commands/LinkNode_HighLevel.ts

@@ -117,10 +117,16 @@ export class LinkNode_HighLevel extends Command<Payload, {argumentWrapperID?: st
 		this.newParent_data = this.newParent_data ?? GetNodeL2.NN(newParentID);
 		this.orderKeyForOuterNode = this.orderKeyForOuterNode ?? GetHighestLexoRankUnderParent(newParentID).next().key;
 
-		//let pastingPremiseAsRelevanceArg = IsPremiseOfMultiPremiseArgument(this.node_data, oldParent_data) && createWrapperArg;
-		//const pastingPremiseAsRelevanceArg = this.node_data.type == NodeType.claim && createWrapperArg;
-		const pastingPremiseAsRelevanceArg = this.node_data.type == NodeType.claim && childGroup == ChildGroup.relevance;
-		AssertV(oldParentID !== newParentID || pastingPremiseAsRelevanceArg, "Old-parent-id and new-parent-id cannot be the same! (unless changing between truth-arg and relevance-arg)");
+		/*const pastingPremiseAsRelevanceArg = this.node_data.type == NodeType.claim && childGroup == ChildGroup.relevance;
+		AssertV(oldParentID !== newParentID || pastingPremiseAsRelevanceArg, "Old-parent-id and new-parent-id cannot be the same! (unless changing between truth-arg and relevance-arg)");*/
+
+		// if the new-parent-id is the same as the old-parent-id, then only allow the re-link to proceed if the child-group is changing
+		if (newParentID == oldParentID) {
+			const oldLink = GetNodeLinks(oldParentID, nodeID)[0];
+			AssertV(oldLink, `Cannot find old-link for node (${nodeID}) under old-parent-id (${oldParentID})!`);
+			AssertV(childGroup != oldLink.group, "Old-parent-id and new-parent-id cannot be the same! (unless changing child-group)");
+		}
+
 		//AssertV(CanContributeToNode(MeID(), newParentID), "Cannot paste under a node with contributions disabled.");
 
 		// if (command.payload.unlinkFromOldParent && node.parents.VKeys().length == 1 && newParentPath.startsWith(draggedNodePath)) {

README.md

@@ -156,7 +156,7 @@ Remote (public):
 Port-assignment scheme: (ie. meaning of each digit in `ABCD`)
 * A) app/project [5: debate-map]
 * B) cluster [0: skipped, 1: local, 2: remote] (0 is skipped to avoid clashes with common ports, eg. 5000 for UPnP)
-* C) pod [0: web-server, 1: app-server, 2: postgres instance, 3: monitor, 4: hyperknowledge, 5: tilt]
+* C) pod [0: web-server, 1: app-server, 2: postgres instance, 3: monitor, 4: hyperknowledge, 5: pyroscope, 9: tilt]
 * D) variant [0: main, 1: served from webpack, etc.]
 
 > Note: Not all web-accessible k8s services are shown in the list above. Specifically:

package-scripts.js

@@ -341,11 +341,11 @@ Object.assign(scripts, {
 			return KubeCTLCommand(commandArgs[0], `-n postgres-operator port-forward $(${GetPodNameCmd_DB(commandArgs[0])}) 8081:5432`);
 		}),*/
 
-		tiltUp_local:         `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt up   -f ./Tilt/Main.star --context dm-local --port 5150 -- --env dev                       ${extraTiltArgs}`,
-		tiltUp_local_release: `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt up   -f ./Tilt/Main.star --context dm-local --port 5150 -- --env dev  --compileWithRelease ${extraTiltArgs}`,
-		tiltDown_local:       `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt down -f ./Tilt/Main.star --context dm-local --port 5150 -- --env dev                       ${extraTiltArgs}`,
-		tiltUp_ovh:           `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt up   -f ./Tilt/Main.star --context dm-ovh   --port 5250 -- --env prod                      ${extraTiltArgs}`,
-		tiltDown_ovh:         `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt down -f ./Tilt/Main.star --context dm-ovh   --port 5250 -- --env prod                      ${extraTiltArgs}`,
+		tiltUp_local:         `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt up   -f ./Tilt/Main.star --context dm-local --port 5190 -- --env dev                       ${extraTiltArgs}`,
+		tiltUp_local_release: `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt up   -f ./Tilt/Main.star --context dm-local --port 5190 -- --env dev  --compileWithRelease ${extraTiltArgs}`,
+		tiltDown_local:       `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt down -f ./Tilt/Main.star --context dm-local --port 5190 -- --env dev                       ${extraTiltArgs}`,
+		tiltUp_ovh:           `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt up   -f ./Tilt/Main.star --context dm-ovh   --port 5290 -- --env prod                      ${extraTiltArgs}`,
+		tiltDown_ovh:         `${PrepDockerCmd()} ${SetTiltEnvCmd()} tilt down -f ./Tilt/Main.star --context dm-ovh   --port 5290 -- --env prod                      ${extraTiltArgs}`,
 		// these are pod-specific tilt-up commands, for when you want to only update a single pod (well technically, that one pod plus all its dependencies, currently -- but still useful to avoid updating other 1st-party pods)
 		tiltUp_ovh_webServer:            Dynamic(()=>RunTiltUp_ForSpecificPod("dm-web-server", 10361)), // tilt-port +(10+1), as targeted tilt-up #1
 		tiltUp_ovh_appServer:            Dynamic(()=>RunTiltUp_ForSpecificPod("dm-app-server", 10362)), // tilt-port +(10+2), as targeted tilt-up #2