Merge b34efaa into e1adcc8

LibraryOfCongress · Sep 24, 2019 · 29a2f68 · 29a2f68
2 parents e1adcc8 + b34efaa
commit 29a2f68
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/concordia/static/js/action-app/components.js b/concordia/static/js/action-app/components.js
@@ -11,7 +11,7 @@ import {
     setChildren,
     setAttr,
     List
-} from 'https://cdnjs.cloudflare.com/ajax/libs/redom/3.18.0/redom.es.min.js';
+} from 'https://cdnjs.cloudflare.com/ajax/libs/redom/3.24.1/redom.es.min.js';
 
 export function conditionalUnmount(component) {
     if (component.el.parentNode) {

diff --git a/concordia/static/js/action-app/index.js b/concordia/static/js/action-app/index.js
@@ -1,7 +1,7 @@
 /* global Split jQuery URITemplate sortBy Sentry */
 /* eslint-disable no-console */
 
-import {mount} from 'https://cdnjs.cloudflare.com/ajax/libs/redom/3.18.0/redom.es.min.js';
+import {mount} from 'https://cdnjs.cloudflare.com/ajax/libs/redom/3.24.1/redom.es.min.js';
 import {
     Alert,
     AssetList,
@@ -364,11 +364,17 @@ export class ActionApp {
                 this.updateViewer();
             }
 
-            let assetListItem = this.assetList.lookup[assetId];
-            if (assetListItem) {
-                // If this is visible, we want to update the displayed asset
-                // list icon using the current value:
-                assetListItem.update(this.getAssetData(assetId));
+            if (typeof this.assetList.lookup == 'undefined') {
+                console.warn(
+                    `Expected this.assetList to be an initialized List but found ${this.assetList}`
+                );
+            } else {
+                let assetListItem = this.assetList.lookup[assetId];
+                if (assetListItem) {
+                    // If this is visible, we want to update the displayed asset
+                    // list icon using the current value:
+                    assetListItem.update(this.getAssetData(assetId));
+                }
             }
         });
 
@@ -617,6 +623,10 @@ export class ActionApp {
             of the fields which frequently change.
         */
 
+        if (typeof assetId != 'number') {
+            assetId = Number(assetId);
+        }
+
         let oldData = this.getAssetData(assetId) || {};
         let mergedData = Object.assign({}, oldData);
         mergedData = Object.assign(mergedData, newData);
@@ -639,6 +649,10 @@ export class ActionApp {
             }
         }
 
+        if (!('id' in mergedData)) {
+            mergedData.id = assetId;
+        }
+
         mergedData.editable = this.canEditAsset(mergedData);
 
         this.assets.set(assetId, mergedData);
@@ -671,7 +685,7 @@ export class ActionApp {
             assetID = asset.id;
         }
 
-        if (!asset) {
+        if (!asset || !assetID) {
             throw `No information for an asset with ID ${assetID}`;
         }