From 5b4610b3d9e9f6d64a0ff82a9313cc0dad09c1c3 Mon Sep 17 00:00:00 2001
From: Tanner Barlow <tanner.barlow12@gmail.com>
Date: Mon, 15 Apr 2019 14:57:12 -0700
Subject: [PATCH] Rename tag function in editor page

---
 .../pages/editorPage/editorPage.tsx           | 54 +++++--------------
 src/services/assetService.test.ts             |  2 +-
 2 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/src/react/components/pages/editorPage/editorPage.tsx b/src/react/components/pages/editorPage/editorPage.tsx
index 5ebcbe5b86..7c3aab68af 100644
--- a/src/react/components/pages/editorPage/editorPage.tsx
+++ b/src/react/components/pages/editorPage/editorPage.tsx
@@ -309,36 +309,23 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
     }
 
     private onTagRenamed = async (tagName: string, newTagName: string): Promise<void> => {
-        const { project } = this.state;
+        const { project, selectedAsset } = this.state;
+        const newProject = {
+            ...project,
+            tags: project.tags.map((t) => (t.name === tagName) ? {...t, name: newTagName} : t),
+        };
+
+        const assetService = new AssetService(newProject);
+        const asset = await assetService.renameTag(project.assets, tagName, newTagName, selectedAsset);
         this.setState({
-            project: {
-                ...project,
-                tags: project.tags.map((t) => (t.name === tagName) ? {...t, name: newTagName} : t),
-            }
+            project: newProject,
+            selectedAsset: asset || selectedAsset,
         }, async () => {
-            await this.props.actions.saveProject(project);
+            await this.props.actions.saveProject(newProject);
             if (this.canvas.current) {
-                this.canvas.current.updateCanvasToolsRegions();
+                this.canvas.current.updateCanvasToolsRegions(asset);
             }
         });
-        
-        // const { project, selectedAsset } = this.state;
-        // const assetService = new AssetService(project);
-        // const asset = await assetService.renameTag(project.assets, tagName, newTagName, selectedAsset);
-
-        // const newProject: IProject = {
-        //     ...project,
-        //     tags: project.tags.map((t) => (t.name === tagName) ? {...t, name: newTagName} : t),
-        // };
-        // this.setState({
-        //     project: newProject,
-        //     selectedAsset: asset || selectedAsset,
-        // }, async () => {
-        //     await this.props.actions.saveProject(newProject);
-        //     if (asset) {
-        //         this.canvas.current.updateCanvasToolsRegions(asset);
-        //     }
-        // });
     }
 
     private confirmTagDeleted = (tagName: string): void => {
@@ -350,7 +337,7 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
         const newProject = {
             ...project,
             tags: project.tags.filter((t) => t.name !== tagName),
-        }
+        };
 
         const assetService = new AssetService(newProject);
         const asset = await assetService.deleteTag(project.assets, tagName, selectedAsset);
@@ -363,21 +350,6 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
                 this.canvas.current.updateCanvasToolsRegions(asset);
             }
         });
-
-        // const { selectedAsset } = this.state;
-        // const { project } = this.props;
-        // const newProject: IProject = {
-        //     ...project,
-        //     tags: project.tags.filter((t) => t.name !== tagName),
-        // };
-        // await this.props.actions.saveProject(newProject);
-
-        // const assetService = new AssetService(project);
-        // const asset = await assetService.deleteTag(project.assets, tagName, selectedAsset);
-        // if (asset) {
-        //     this.canvas.current.updateCanvasToolsRegions(asset);
-        //     this.setState({selectedAsset: asset});
-        // }
     }
 
     private onCtrlTagClicked = (tag: ITag): void => {
diff --git a/src/services/assetService.test.ts b/src/services/assetService.test.ts
index 1bfce885d8..ee46e42447 100644
--- a/src/services/assetService.test.ts
+++ b/src/services/assetService.test.ts
@@ -343,7 +343,7 @@ describe("Asset Service", () => {
 
         beforeAll(() => {
             registerMixins();
-        })
+        });
 
         it("Deletes tag from assets", async () => {
             const tag1 = "tag1";