From 0b79ec1235952d8dd7c350d9d45755133bb4c692 Mon Sep 17 00:00:00 2001
From: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue, 20 Dec 2016 14:45:08 -0800
Subject: [PATCH] [Browse] Simplify Edit Representation

Simplify edit registration and remove extra abstractions.  No longer
attach a status listener for every representation-- just use a single watch
for the edit controller.  Simplifies logic involved in switching controllers.

https://github.com/nasa/openmct/issues/1360
---
 platform/commonUI/browse/bundle.js            |  6 ---
 .../commonUI/browse/res/templates/browse.html |  2 +-
 .../browse/res/templates/view-object.html     | 33 ---------------
 .../edit/src/representers/EditRepresenter.js  | 41 +------------------
 4 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 platform/commonUI/browse/res/templates/view-object.html

diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js
index bed2fd1fbd..0dd556c40c 100644
--- a/platform/commonUI/browse/bundle.js
+++ b/platform/commonUI/browse/bundle.js
@@ -41,7 +41,6 @@ define([
     "text!./res/templates/items/items.html",
     "text!./res/templates/browse/object-properties.html",
     "text!./res/templates/browse/inspector-region.html",
-    "text!./res/templates/view-object.html",
     'legacyRegistry'
 ], function (
     BrowseController,
@@ -64,7 +63,6 @@ define([
     itemsTemplate,
     objectPropertiesTemplate,
     inspectorRegionTemplate,
-    viewObjectTemplate,
     legacyRegistry
 ) {
 
@@ -141,10 +139,6 @@ define([
                 }
             ],
             "representations": [
-                {
-                    "key": "view-object",
-                    "template": viewObjectTemplate
-                },
                 {
                     "key": "browse-object",
                     "template": browseObjectTemplate,
diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html
index aa1415ca81..214c765add 100644
--- a/platform/commonUI/browse/res/templates/browse.html
+++ b/platform/commonUI/browse/res/templates/browse.html
@@ -63,7 +63,7 @@
                     <mct-split-pane class='l-object-and-inspector contents abs' anchor='right'>
                         <div class='split-pane-component t-object pane primary-pane left'>
                             <mct-representation mct-object="navigatedObject"
-                                                key="'view-object'"
+                                                key="navigatedObject.getCapability('status').get('editing') ? 'edit-object' : 'browse-object'"
                                                 class="abs holder holder-object">
                             </mct-representation>
                             <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect flush-right"
diff --git a/platform/commonUI/browse/res/templates/view-object.html b/platform/commonUI/browse/res/templates/view-object.html
deleted file mode 100644
index c5fa669f13..0000000000
--- a/platform/commonUI/browse/res/templates/view-object.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
- Open MCT, Copyright (c) 2014-2016, United States Government
- as represented by the Administrator of the National Aeronautics and Space
- Administration. All rights reserved.
-
- Open MCT is licensed under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
-
- Open MCT includes source code licensed under additional open source
- licenses. See the Open Source Licenses file (LICENSES.md) included with
- this source code distribution or the Licensing information page available
- at runtime from the About dialog for additional information.
--->
-<!--
- A representation that allows the 'View' region of an object view to change
- dynamically (eg. between browse and edit modes). Values correspond to a
- representation key, and currently defaults to 'browse-object'.
-
- In the case of edit, the EditRepresenter will change this to editable
- representation of the object as needed.
- -->
-<mct-representation mct-object="domainObject"
-                    key="viewObjectTemplate || 'browse-object'"
-                    class="abs holder">
-</mct-representation>
diff --git a/platform/commonUI/edit/src/representers/EditRepresenter.js b/platform/commonUI/edit/src/representers/EditRepresenter.js
index 81252977b1..fa08d7be7b 100644
--- a/platform/commonUI/edit/src/representers/EditRepresenter.js
+++ b/platform/commonUI/edit/src/representers/EditRepresenter.js
@@ -47,7 +47,6 @@ define(
             var self = this;
 
             this.scope = scope;
-            this.listenHandle = undefined;
 
             // Mutate and persist a new version of a domain object's model.
             function doMutate(model) {
@@ -90,51 +89,15 @@ define(
             // Place the "commit" method in the scope
             scope.commit = commit;
 
-            // Clean up when the scope is destroyed
-            scope.$on("$destroy", function () {
-                self.destroy();
-            });
-
         }
 
         // Handle a specific representation of a specific domain object
-        EditRepresenter.prototype.represent = function represent(representation, representedObject) {
-            var scope = this.scope;
-
-            // Track the key, to know which view configuration to save to.
-            this.key = (representation || {}).key;
-            // Track the represented object
+        EditRepresenter.prototype.represent = function (representation, representedObject) {
             this.domainObject = representedObject;
-
-            // Ensure existing watches are released
-            this.destroy();
-
-            function setEditing() {
-                scope.viewObjectTemplate = 'edit-object';
-            }
-
-            /**
-             * Listen for changes in object state. If the object becomes
-             * editable then change the view and inspector regions
-             * object representation accordingly
-             */
-            this.listenHandle = this.domainObject.getCapability('status').listen(function (statuses) {
-                if (statuses.indexOf('editing') !== -1) {
-                    setEditing();
-                } else {
-                    delete scope.viewObjectTemplate;
-                }
-            });
-
-            if (representedObject.hasCapability('editor') && representedObject.getCapability('editor').isEditContextRoot()) {
-                setEditing();
-            }
         };
 
         // Respond to the destruction of the current representation.
-        EditRepresenter.prototype.destroy = function destroy() {
-            return this.listenHandle && this.listenHandle();
-        };
+        EditRepresenter.prototype.destroy = function () {};
 
         return EditRepresenter;
     }