Working on merge into. Cannot be applied yet.

client/src/components/windows/manage_tags/ManageTagMenu.tsx

@@ -34,7 +34,7 @@ export default function ManageTagMenu(props: {
     onRename: (s: string) => void,
     onDelete: () => void,
     onMove: (to: string | null) => void,
-    onCreateChild: (name: string) => void,
+    onMergeInto: (to: string) => void,
     tag: any,
     changedTags: any[], // Tags organized hierarchically with "children" fields
 }) {
@@ -76,5 +76,15 @@ export default function ManageTagMenu(props: {
                 props.onMove(v);
             }} />
         </NestedMenuItem>
+        <NestedMenuItem
+            parentMenuOpen={props.open}
+            label="Merge into"
+        >
+            <PickTag tags={props.changedTags} open={props.open} root={false} onPick={(v: string | null) => {
+                if(v === null) { return; }
+                props.onClose();
+                props.onMergeInto(v);
+            }} />
+        </NestedMenuItem>
     </Menu>
 }

client/src/components/windows/manage_tags/ManageTagsWindow.tsx

@@ -201,8 +201,18 @@ export function SingleTag(props: {
                     ]
                 })
             }}
-            onCreateChild={(name: string) => {
+            onMergeInto={(into: string) => {
-
+                props.dispatch({
+                    type: ManageTagsWindowActions.SetPendingChanges,
+                    value: [
+                        ...props.state.pendingChanges,
+                        {
+                            type: TagChangeType.MergeTo,
+                            id: tag.tagId,
+                            into: into,
+                        }
+                    ]
+                })
             }}
             tag={tag}
             changedTags={props.changedTags}
@@ -230,6 +240,9 @@ function annotateTagsWithChanges(tags: Record<string, any>, changes: TagChange[]
             case TagChangeType.MoveTo:
                 retval[change.id].proposedParent = change.parent;
                 break;
+            case TagChangeType.MergeTo:
+                retval[change.id].proposedMergeInto = change.into;
+                break;
             case TagChangeType.Create:
                 retval[change.id] = {
                     isNewTag: true,
@@ -270,6 +283,9 @@ function applyTagsChanges(tags: Record<string, any>, changes: TagChange[]) {
                 retval[change.id].parentId = change.parent;
                 if (change.parent === null) { delete retval[change.id].parentId; }
                 break;
+            case TagChangeType.MergeTo:
+                applyDelete(change.id);
+                break;
             case TagChangeType.Create:
                 retval[change.id] = {
                     name: change.name,

client/src/components/windows/manage_tags/TagChange.tsx

@@ -20,6 +20,7 @@ export interface TagChange {
     parent?: string | null, // Stringified integer == MuDBase ID. Other string == not yet committed to DB.
     // null refers to the tags root.
     name?: string,
+    into?: string, // Used for storing the tag ID to merge into, if applicable. As in the other ID fields.
 }
 
 export async function submitTagChanges(changes: TagChange[]) {
@@ -103,6 +104,10 @@ export function TagChangeDisplay(props: {
                 <MakeTag name={newParent ? newParent.name : "/"} /> :
                 <CircularProgress />;
             return <Typography>Move {MainTag} from {OldParent} to {NewParent}</Typography>
+        case TagChangeType.MergeTo:
+            const intoTag = props.getTagDetails(props.change.into || "unknown");
+            const IntoTag = <MakeTag name={intoTag.name} />
+            return <Typography>Merge {MainTag} into {IntoTag}</Typography>
         case TagChangeType.Create:
             return props.change.parent ?
                 <Typography>Create {MainTag} under <MakeTag name={newParent.name} /></Typography> :