Register mixins and run async loop

tbarlow12 · wbreza · commit f11edfafb502 · 2019-04-19T11:58:32.000-07:00
diff --git a/src/react/components/pages/editorPage/editorPage.tsx b/src/react/components/pages/editorPage/editorPage.tsx
@@ -316,7 +316,7 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
         const newProject: IProject = {
             ...project,
             tags: project.tags.map((t) => (t.name === tagName) ? {...t, name: newTagName} : t),
-        }
+        };
         this.setState({
             project: newProject,
             selectedAsset: asset || selectedAsset,
@@ -337,10 +337,9 @@ export default class EditorPage extends React.Component<IEditorPageProps, IEdito
         const { project } = this.props;
         const newProject: IProject = {
             ...project,
-            tags: project.tags.filter((t) => t.name !== tagName)
-        }
+            tags: project.tags.filter((t) => t.name !== tagName),
+        };
         await this.props.actions.saveProject(newProject);
-        debugger;
 
         const assetService = new AssetService(project);
         const asset = await assetService.deleteTag(project.assets, tagName, selectedAsset);
diff --git a/src/services/assetService.test.ts b/src/services/assetService.test.ts
@@ -8,6 +8,7 @@ import { TFRecordsBuilder, FeatureType } from "../providers/export/tensorFlowRec
 import HtmlFileReader from "../common/htmlFileReader";
 import { encodeFileURI } from "../common/utils";
 import _ from "lodash";
+import registerMixins from "../registerMixins";
 
 describe("Asset Service", () => {
     describe("Static Methods", () => {
@@ -340,6 +341,10 @@ describe("Asset Service", () => {
             return project;
         }
 
+        beforeAll(() => {
+            registerMixins();
+        })
+
         it("Deletes tag from assets", async () => {
             const tag1 = "tag1";
             const tag2 = "tag2";
diff --git a/src/services/assetService.ts b/src/services/assetService.ts
@@ -247,8 +247,9 @@ export class AssetService {
             return;
         }
         const assetKeys = Object.keys(assets);
+
         // Loop over assets and update if necessary
-        for (const assetKey of assetKeys) {
+        await assetKeys.forEachAsync(async (assetKey) => {
             const asset = assets[assetKey];
             if (asset.state !== AssetState.Tagged) {
                 return;
@@ -258,28 +259,7 @@ export class AssetService {
             if (updatedAssetMetadata) {
                 await this.save(updatedAssetMetadata);
             }
-        }
-        if (currentAsset) {
-            return this.updateTagInAssetMetadata(currentAsset, tagName, transformer);
-        }
-        /*
-        TODO: Replace with async
-
-        For some reason in tests, the `forEachAsync` is not recognized as a function
-
-        await assetKeys.forEachAsync(async (assetKey) => {
-            const asset = project.assets[assetKey];
-            if (asset.state !== AssetState.Tagged) {
-                return;
-            }
-            const assetMetadata = await assetService.getAssetMetadata(asset);
-            const updatedAssetMetadata = this.updateTagInAssetMetadata(assetMetadata, tagName, transformer);
-            if (updatedAssetMetadata) {
-                await assetService.save(updatedAssetMetadata);
-            }
         });
-
-        */
     }
 
     /**
