From b53a8edde5fb39983c9cfad6533a8fae56efb9c3 Mon Sep 17 00:00:00 2001
From: Kieran Farr <kieran.farr@gmail.com>
Date: Thu, 12 Dec 2024 11:43:30 -0800
Subject: [PATCH 1/3] barely working v1

- doesn't support undo
- doesn't refresh UI when renamed
---
 src/editor/components/components/Sidebar.js   | 12 +++++-
 .../lib/commands/EntityRenameCommand.js       | 40 +++++++++++++++++++
 src/editor/lib/commands/index.js              |  2 +
 src/editor/lib/entity.js                      |  9 +++++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 src/editor/lib/commands/EntityRenameCommand.js

diff --git a/src/editor/components/components/Sidebar.js b/src/editor/components/components/Sidebar.js
index 42d797ca..413757a4 100644
--- a/src/editor/components/components/Sidebar.js
+++ b/src/editor/components/components/Sidebar.js
@@ -1,4 +1,8 @@
-import { cloneEntity, removeSelectedEntity } from '../../lib/entity';
+import {
+  cloneEntity,
+  removeSelectedEntity,
+  renameEntity
+} from '../../lib/entity';
 import { Button } from '../components';
 import ComponentsContainer from './ComponentsContainer';
 import Events from '../../lib/Events';
@@ -98,6 +102,12 @@ export default class Sidebar extends React.Component {
                       <></>
                     ) : (
                       <div id="sidebar-buttons">
+                        <Button
+                          variant={'toolbtn'}
+                          onClick={() => renameEntity(entity)}
+                        >
+                          Rename
+                        </Button>
                         <Button
                           variant={'toolbtn'}
                           onClick={() => cloneEntity(entity)}
diff --git a/src/editor/lib/commands/EntityRenameCommand.js b/src/editor/lib/commands/EntityRenameCommand.js
new file mode 100644
index 00000000..027d7b7b
--- /dev/null
+++ b/src/editor/lib/commands/EntityRenameCommand.js
@@ -0,0 +1,40 @@
+import { Command } from '../command.js';
+import { createUniqueId } from '../entity.js';
+
+export class EntityRenameCommand extends Command {
+  constructor(editor, entity) {
+    super(editor);
+
+    this.type = 'entityrename';
+    this.name = 'Rename Entity';
+    this.updatable = false;
+    if (!entity.id) {
+      entity.id = createUniqueId();
+    }
+    this.entityIdToRename = entity.id;
+    this.entityId = null;
+  }
+
+  execute() {
+    const entityToRename = document.getElementById(this.entityIdToRename);
+    // prompt for new name
+    const newName = prompt(
+      'Enter new name for entity',
+      entityToRename.getAttribute('data-layer-name')
+    );
+
+    if (entityToRename && newName) {
+      entityToRename.setAttribute('data-layer-name', newName);
+    }
+  }
+
+  undo() {
+    const entity = document.getElementById(this.entityId);
+    if (entity) {
+      // entity.parentNode.removeChild(entity);
+      // Events.emit('entityremoved', entity);
+      // this.editor.selectEntity(document.getElementById(this.entityIdToClone));
+      console.log('cannot undo rename');
+    }
+  }
+}
diff --git a/src/editor/lib/commands/index.js b/src/editor/lib/commands/index.js
index 2f1a6afb..65877bf0 100644
--- a/src/editor/lib/commands/index.js
+++ b/src/editor/lib/commands/index.js
@@ -4,6 +4,7 @@ import { EntityCloneCommand } from './EntityCloneCommand.js';
 import { EntityCreateCommand } from './EntityCreateCommand.js';
 import { EntityRemoveCommand } from './EntityRemoveCommand.js';
 import { EntityUpdateCommand } from './EntityUpdateCommand.js';
+import { EntityRenameCommand } from './EntityRenameCommand.js';
 
 export const commandsByType = new Map();
 commandsByType.set('componentadd', ComponentAddCommand);
@@ -12,3 +13,4 @@ commandsByType.set('entityclone', EntityCloneCommand);
 commandsByType.set('entitycreate', EntityCreateCommand);
 commandsByType.set('entityremove', EntityRemoveCommand);
 commandsByType.set('entityupdate', EntityUpdateCommand);
+commandsByType.set('entityrename', EntityRenameCommand);
diff --git a/src/editor/lib/entity.js b/src/editor/lib/entity.js
index e6c6b284..07693329 100644
--- a/src/editor/lib/entity.js
+++ b/src/editor/lib/entity.js
@@ -115,6 +115,15 @@ export function cloneEntity(entity) {
   return AFRAME.INSPECTOR.execute('entityclone', entity);
 }
 
+/**
+ * Rename an entity, inserting it after the cloned one.
+ * @param {Element} entity Entity to clone
+ * @returns {Element} The clone
+ */
+export function renameEntity(entity) {
+  return AFRAME.INSPECTOR.execute('entityrename', entity);
+}
+
 /**
  * Clone an entity, inserting it after the cloned one. This is the implementation of the entityclone command.
  * @param {Element} entity Entity to clone

From b2488ad2183eb7ec4d5e8c8bc2e6f566cac1b255 Mon Sep 17 00:00:00 2001
From: Kieran Farr <kieran.farr@gmail.com>
Date: Thu, 12 Dec 2024 11:44:56 -0800
Subject: [PATCH 2/3] support undo/redo

thanks claude
---
 .../lib/commands/EntityRenameCommand.js       | 51 +++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/editor/lib/commands/EntityRenameCommand.js b/src/editor/lib/commands/EntityRenameCommand.js
index 027d7b7b..9ffbb001 100644
--- a/src/editor/lib/commands/EntityRenameCommand.js
+++ b/src/editor/lib/commands/EntityRenameCommand.js
@@ -1,3 +1,4 @@
+import Events from '../Events.js';
 import { Command } from '../command.js';
 import { createUniqueId } from '../entity.js';
 
@@ -7,34 +8,52 @@ export class EntityRenameCommand extends Command {
 
     this.type = 'entityrename';
     this.name = 'Rename Entity';
-    this.updatable = false;
+    this.updatable = true; // Allow updating for consecutive renames
+
     if (!entity.id) {
       entity.id = createUniqueId();
     }
-    this.entityIdToRename = entity.id;
-    this.entityId = null;
+    this.entityId = entity.id;
+    this.oldName = entity.getAttribute('data-layer-name') || '';
+    this.newName = null; // Will be set during execute
   }
 
   execute() {
-    const entityToRename = document.getElementById(this.entityIdToRename);
-    // prompt for new name
-    const newName = prompt(
-      'Enter new name for entity',
-      entityToRename.getAttribute('data-layer-name')
-    );
-
-    if (entityToRename && newName) {
-      entityToRename.setAttribute('data-layer-name', newName);
+    const entity = document.getElementById(this.entityId);
+    if (!entity) return;
+
+    // If newName hasn't been set (first execution), prompt for it
+    if (this.newName === null) {
+      const promptedName = prompt('Enter new name for entity', this.oldName);
+      // If user cancels or enters empty name, abort
+      if (!promptedName) return;
+      this.newName = promptedName;
     }
+
+    // Apply the new name
+    entity.setAttribute('data-layer-name', this.newName);
+    Events.emit('entityrenamed', {
+      entity,
+      oldName: this.oldName,
+      newName: this.newName
+    });
   }
 
   undo() {
     const entity = document.getElementById(this.entityId);
     if (entity) {
-      // entity.parentNode.removeChild(entity);
-      // Events.emit('entityremoved', entity);
-      // this.editor.selectEntity(document.getElementById(this.entityIdToClone));
-      console.log('cannot undo rename');
+      // Restore the old name
+      entity.setAttribute('data-layer-name', this.oldName);
+      Events.emit('entityrenamed', {
+        entity,
+        oldName: this.newName,
+        newName: this.oldName
+      });
     }
   }
+
+  update(command) {
+    // Handle consecutive renames by updating the newName
+    this.newName = command.newName;
+  }
 }

From 7d63d6c70517a0db54bcb233dc625558ae0a30fd Mon Sep 17 00:00:00 2001
From: Kieran Farr <kieran.farr@gmail.com>
Date: Thu, 12 Dec 2024 11:50:06 -0800
Subject: [PATCH 3/3] force refresh upon rename

---
 src/editor/lib/commands/EntityRenameCommand.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/editor/lib/commands/EntityRenameCommand.js b/src/editor/lib/commands/EntityRenameCommand.js
index 9ffbb001..033e24f7 100644
--- a/src/editor/lib/commands/EntityRenameCommand.js
+++ b/src/editor/lib/commands/EntityRenameCommand.js
@@ -37,6 +37,7 @@ export class EntityRenameCommand extends Command {
       oldName: this.oldName,
       newName: this.newName
     });
+    AFRAME.INSPECTOR.selectEntity(entity);
   }
 
   undo() {
@@ -49,6 +50,7 @@ export class EntityRenameCommand extends Command {
         oldName: this.newName,
         newName: this.oldName
       });
+      AFRAME.INSPECTOR.selectEntity(entity);
     }
   }