Bug 1038578 - [Collection App] Icons are not updated after installing…

… hosted apps from marketplace

apps/collection/js/add_to_collection.js

@@ -3,10 +3,8 @@
 /* global BaseCollection */
 /* global CollectionIcon */
 /* global CollectionsDatabase */
-/* global Common */
 /* global eme */
 /* global HomeIcons */
-/* global PinnedHomeIcon */
 
 (function(exports) {
 
@@ -32,49 +30,13 @@
 
       CollectionsDatabase.get(event.data.collectionId).then(fresh => {
         var collection = BaseCollection.create(fresh);
-        var newPinned = new PinnedHomeIcon(event.data.identifier);
 
-        HomeIcons.init().then(() => {
-
-          // If a record is already pinned, delete it so it appears first.
-          for (var i = 0, iLen = collection.pinned.length; i < iLen; i++) {
-              if (collection.pinned[i].identifier === newPinned.identifier) {
-                collection.pinned.splice(i, 1);
-                break;
-              }
-          }
-
-          // If we don't have webicons, then we have likely never fetched this
-          //collection. Make a call to the server to fetch the apps.
-          if (!collection.webicons.length) {
-            var options = collection.categoryId ?
-              {categoryId: collection.categoryId} :
-              {query: collection.query};
-
-            eme.init()
-              .then(() => eme.api.Apps.search(options))
-              .then((response) => {
-                collection.addWebResults(response.response.apps);
-              })
-              .then(() => {
-                Common.getBackground(collection, grid.maxIconSize)
-                  .then((bgObject) => {
-                    collection.background = bgObject;
-                    this.pinAndSave(newPinned, collection);
-                  });
-              });
-          } else {
-            this.pinAndSave(newPinned, collection);
-          }
+        eme.init()
+        .then(() => HomeIcons.init())
+        .then(() => {
+          collection.dropHomeIcon(event.data.identifier);
         });
       });
-    },
-
-    pinAndSave: function(newPinned, collection) {
-      collection.pinned.unshift(newPinned);
-      collection.renderIcon().then(() => {
-        collection.save();
-      });
     }
   };
 

apps/collection/js/collection_icon.js

@@ -31,9 +31,6 @@
 
   /* constants */
 
-  // number of app icons in the collection icon
-  const numAppIcons = 3;
-
   // darkness of to side icons
   const sideIconDarken = 0.65;
 
@@ -102,12 +99,6 @@
     this.bgSrc = config.bgSrc || null;
   }
 
-  Object.defineProperty(CollectionIcon, 'numAppIcons', {
-    get: function get() {
-      return numAppIcons;
-    }
-  });
-
   CollectionIcon.init = function init(maxIconSize) {
     // measurements are based on a 60px icon (cf. bug 965711)
     scale = maxIconSize/60;

apps/collection/js/common.js

@@ -20,11 +20,16 @@
   const mozBgUrl =
     'http://fxos.cdn.mozilla.net/collection/background/{categoryId}' + suffix;
 
+  const APPS_IN_ICON = 3;
 
   function Common() {}
 
   Common.prototype = {
 
+    APPS_IN_ICON: APPS_IN_ICON,
+
+    chooseBackgroundRatio: chooseBackgroundRatio,
+
     b64toBlob: function b64toBlob(b64) {
       return new Promise((resolve, reject) => {
         var img = new Image();
@@ -46,8 +51,6 @@
       });
     },
 
-    chooseBackgroundRatio: chooseBackgroundRatio,
-
     // TODO
     // add support for 'size' parameter (like getEmeBackground has) to fetch
     // smaller backgrounds when the full size image is not required
@@ -59,7 +62,7 @@
 
       var url = mozBgUrl.replace('{categoryId}', collection.categoryId);
       var xhr = new XMLHttpRequest({mozSystem: true});
-      xhr.open('GET', url);
+      xhr.open('GET', url, true);
       xhr.responseType = 'blob';
 
       return new Promise((resolve, reject) => {
@@ -153,6 +156,48 @@
             .catch(function (e) {
               eme.log('getBackground', 'failed', e);
             });
+    },
+
+    getWebIcons: function getWebIcons(collection) {
+      var options =
+        (collection.categoryId) ? {categoryId: collection.categoryId} :
+                                  {query: collection.query};
+
+      options.limit = APPS_IN_ICON;
+
+      return eme.api.Apps.search(options).then(response => {
+        var webicons =
+          response.response.apps.slice(0, APPS_IN_ICON).map(app => app.icon);
+
+        return webicons;
+      });
+    },
+
+    /**
+     * prepares the assets needed for rendering a collection's icon:
+     * 1. background
+     * 2. web icons
+     *
+     * returns a promise resolved when all assets requests are done and
+     * updates the collection instance but not the db
+     *
+     */
+    prepareAssets: function prepareAssets(collection) {
+      var ready = Promise.resolve(null);
+
+      var backgroundPromise = collection.backgroundReady ?
+                              ready : this.getBackground(collection);
+
+      var iconsPromise = collection.iconsReady ?
+                              ready : this.getWebIcons(collection);
+
+      return Promise.all([iconsPromise, backgroundPromise])
+            .then((results) => {
+              // results are null if not fetched
+              collection.webicons = results[0] || collection.webicons;
+              collection.background = results[1] || collection.background;
+              return collection;
+            });
     }
   };
 

apps/collection/js/create_collection.js

@@ -32,7 +32,7 @@
     var maxIconSize = activity.source.data.maxIconSize;
 
     CollectionIcon.init(maxIconSize);
-    var numAppIcons = CollectionIcon.numAppIcons;
+    const APPS_IN_ICON = Common.APPS_IN_ICON;
 
     cancel.addEventListener('click', function() {
       // TODO request should always have an 'abort' method
@@ -75,10 +75,10 @@
                 // collection from custom query
                 // we make another request to get web app icons
                 dataReady = new Promise(function getIcons(resolve) {
-                  eme.api.Apps.search({query: selected, limit: numAppIcons})
+                  eme.api.Apps.search({query: selected, limit: APPS_IN_ICON})
                     .then(function success(response) {
                       var webicons =
-                        response.response.apps.slice(0,numAppIcons).map(
+                        response.response.apps.slice(0,APPS_IN_ICON).map(
                           function each(app) {
                             return app.icon;
                         });

apps/collection/js/native_info.js

@@ -10,7 +10,7 @@
   const SETUP_KEY = 'NativeInfo-setup';
 
   function onerror(e) {
-    eme.error('NativeInfo error', e.name || e.message || e);
+    eme.error('NativeInfo error', e && (e.name || e.message || e));
   }
 
   // Provides information about native apps in order to match them against