From 05af90290b77a6b4a0a511eca5beb943f1239ca0 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Mon, 22 Jan 2018 13:19:48 -0600
Subject: [PATCH] action and component manager updates

---
 .../app/services/actionsManager.js            |  2 +-
 .../app/services/componentManager.js          | 51 +++++++++----------
 public/extensions/extensions-manager          |  2 +-
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/app/services/actionsManager.js b/app/assets/javascripts/app/services/actionsManager.js
index 9a5b9d1cc..bf2002df8 100644
--- a/app/assets/javascripts/app/services/actionsManager.js
+++ b/app/assets/javascripts/app/services/actionsManager.js
@@ -150,7 +150,7 @@ class ActionsManager {
         this.httpManager.getAbsolute(action.url, {}, function(response){
           action.error = false;
           EncryptionHelper.decryptItem(response.item, this.authManager.keys());
-          var item = this.modelManager.createItem(response.item);
+          var item = this.modelManager.createItem(response.item, true /* Dont notify observers */);
           customCallback({item: item});
 
         }.bind(this), function(response){
diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index f28c8c4f0..bd7151f26 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -181,6 +181,30 @@ class ComponentManager {
     this.replyToMessage(component, originalMessage, response);
   }
 
+  replyToMessage(component, originalMessage, replyData) {
+    var reply = {
+      action: "reply",
+      original: originalMessage,
+      data: replyData
+    }
+
+    this.sendMessageToComponent(component, reply);
+  }
+
+  sendMessageToComponent(component, message) {
+    if(component.hidden && message.action !== "component-registered") {
+      if(this.loggingEnabled) {
+        console.log("Component disabled for current item, not sending any messages.", component.name);
+      }
+      return;
+    }
+
+    if(this.loggingEnabled) {
+      console.log("Web|sendMessageToComponent", component, message);
+    }
+    component.window.postMessage(message, "*");
+  }
+
   get components() {
     return this.modelManager.allItemsMatchingTypes(["SN|Component", "SN|Theme"]);
   }
@@ -231,8 +255,6 @@ class ComponentManager {
       create-item
       delete-items
       set-component-data
-      save-context-client-data
-      get-context-client-data
       install-local-component
       toggle-activate-component
       request-permissions
@@ -601,30 +623,6 @@ class ComponentManager {
     angular.element(document.body).append(el);
   }
 
-  replyToMessage(component, originalMessage, replyData) {
-    var reply = {
-      action: "reply",
-      original: originalMessage,
-      data: replyData
-    }
-
-    this.sendMessageToComponent(component, reply);
-  }
-
-  sendMessageToComponent(component, message) {
-    if(component.hidden && message.action !== "component-registered") {
-      if(this.loggingEnabled) {
-        console.log("Component disabled for current item, not sending any messages.", component.name);
-      }
-      return;
-    }
-
-    if(this.loggingEnabled) {
-      console.log("Web|sendMessageToComponent", component, message);
-    }
-    component.window.postMessage(message, "*");
-  }
-
   installComponent(url) {
     var name = getParameterByName("name", url);
     var area = getParameterByName("area", url);
@@ -691,6 +689,7 @@ class ComponentManager {
       sessionKey: component.sessionKey,
       componentData: component.componentData,
       data: {
+        uuid: component.uuid,
         environment: isDesktopApplication() ? "desktop" : "web"
       }
     });
diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager
index 6276445f8..87b260800 160000
--- a/public/extensions/extensions-manager
+++ b/public/extensions/extensions-manager
@@ -1 +1 @@
-Subproject commit 6276445f895d9b40a64bda7353330df934bda054
+Subproject commit 87b26080032d4df427015e49396895f506501bc9