From 69c82bc362a88c5c70c0bde9e972732e971620a1 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Fri, 17 Aug 2018 09:57:22 -0500
Subject: [PATCH] Component manager do not save locked items

---
 .../app/services/componentManager.js          | 33 ++++++++++++++++---
 app/assets/templates/editor.html.haml         |  2 +-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/app/services/componentManager.js b/app/assets/javascripts/app/services/componentManager.js
index 10c6c92c5..8741e4a33 100644
--- a/app/assets/javascripts/app/services/componentManager.js
+++ b/app/assets/javascripts/app/services/componentManager.js
@@ -479,6 +479,24 @@ class ComponentManager {
       We map the items here because modelManager is what updates the UI. If you were to instead get the items directly,
       this would update them server side via sync, but would never make its way back to the UI.
       */
+
+      // Filter locked items
+      var ids = responseItems.map((i) => {return i.uuid});
+      var items = this.modelManager.findItems(ids);
+      var lockedCount = 0;
+      for(var item of items) {
+        if(item.locked) {
+          _.remove(responseItems, {uuid: item.uuid});
+          lockedCount++;
+        }
+      }
+
+      if(lockedCount > 0) {
+        var itemNoun = lockedCount == 1 ? "item" : "items";
+        var auxVerb = lockedCount == 1 ? "is" : "are";
+        alert(`${lockedCount} ${itemNoun} you are attempting to save ${auxVerb} locked and cannot be edited.`);
+      }
+
       var localItems = this.modelManager.mapResponseItemsToLocalModels(responseItems, SFModelManager.MappingSourceComponentRetrieved, component.uuid);
 
       for(var responseItem of responseItems) {
@@ -488,11 +506,16 @@ class ComponentManager {
           alert(`The extension ${component.name} is trying to save an item with type ${responseItem.content_type}, but that item does not exist. Please restart this extension and try again.`);
           continue;
         }
-        _.merge(item.content, responseItem.content);
-        if(responseItem.clientData) {
-          item.setDomainDataItem(component.getClientDataKey(), responseItem.clientData, ComponentManager.ClientDataDomain);
+
+        // 8/2018: Why did we have this here? `mapResponseItemsToLocalModels` takes care of merging item content. We definitely shouldn't be doing this directly.
+        // _.merge(item.content, responseItem.content);
+
+        if(!item.locked) {
+          if(responseItem.clientData) {
+            item.setDomainDataItem(component.getClientDataKey(), responseItem.clientData, ComponentManager.ClientDataDomain);
+          }
+          item.setDirty(true);
         }
-        item.setDirty(true);
       }
 
       this.syncManager.sync().then((response) => {
@@ -575,7 +598,7 @@ class ComponentManager {
         reply = {deleted: false};
       }
 
-      this.replyToMessage(component, message, reply)      
+      this.replyToMessage(component, message, reply)
     });
   }
 
diff --git a/app/assets/templates/editor.html.haml b/app/assets/templates/editor.html.haml
index 5564a5c45..35275825e 100644
--- a/app/assets/templates/editor.html.haml
+++ b/app/assets/templates/editor.html.haml
@@ -65,7 +65,7 @@
 
     %panel-resizer.left{"ng-if" => "ctrl.marginResizersEnabled", "panel-id" => "'editor-content'", "on-resize-finish" => "ctrl.onPanelResizeFinish","control" => "ctrl.resizeControl", "min-width" => 300, "property" => "'left'", "hoverable" => "true"}
 
-    %component-view.component-view{"ng-if" => "ctrl.selectedEditor", "component" => "ctrl.selectedEditor", "ng-style" => "ctrl.note.locked && {'pointer-events' : 'none'}", "ng-class" => "{'locked' : ctrl.note.locked }"}
+    %component-view.component-view{"ng-if" => "ctrl.selectedEditor", "component" => "ctrl.selectedEditor"}
 
     %textarea.editable#note-text-editor{"ng-if" => "!ctrl.selectedEditor", "ng-model" => "ctrl.note.text", "ng-readonly" => "ctrl.note.locked",
      "ng-change" => "ctrl.contentChanged()", "ng-trim" => "false", "ng-click" => "ctrl.clickedTextArea()",