Merge in "create button initiates edit mode"

platform/commonUI/browse/bundle.json

@@ -150,7 +150,8 @@
                 "provides": "actionService",
                 "type": "provider",
                 "implementation": "creation/CreateActionProvider.js",
-                "depends": [ "typeService", "dialogService", "creationService", "policyService" ]
+                "depends": ["$q", "typeService",
+                    "navigationService"]
             },
             {
                 "key": "CreationService",

platform/commonUI/browse/src/creation/CreateAction.js

@@ -25,8 +25,10 @@
  * Module defining CreateAction. Created by vwoeltje on 11/10/14.
  */
 define(
-    ['./CreateWizard'],
+    ['./CreateWizard',
-    function (CreateWizard) {
+    'uuid',
+    '../../../edit/src/objects/EditableDomainObject'],
+    function (CreateWizard, uuid, EditableDomainObject) {
         "use strict";
 
         /**
@@ -45,13 +47,11 @@ define(
          *        override this)
          * @param {ActionContext} context the context in which the
          *        action is being performed
-         * @param {DialogService} dialogService the dialog service
+         * @param {NavigationService} navigationService the navigation service,
-         *        to use when requesting user input
+         *        which handles changes in navigation. It allows the object
-         * @param {CreationService} creationService the creation service,
+         *        being browsed/edited to be set.
-         *        which handles the actual instantiation and persistence
-         *        of the newly-created domain object
          */
-        function CreateAction(type, parent, context, dialogService, creationService, policyService) {
+        function CreateAction(type, parent, context, $q, navigationService) {
             this.metadata = {
                 key: 'create',
                 glyph: type.getGlyph(),
@@ -63,9 +63,8 @@ define(
 
             this.type = type;
             this.parent = parent;
-            this.policyService = policyService;
+            this.navigationService = navigationService;
-            this.dialogService = dialogService;
+            this.$q = $q;
-            this.creationService = creationService;
         }
 
         /**
@@ -73,45 +72,24 @@ define(
          * This will prompt for user input first.
          */
         CreateAction.prototype.perform = function () {
-            /*
+            var newModel = this.type.getInitialModel(),
-             Overview of steps in object creation:
+                parentObject = this.navigationService.getNavigation(),
+                newObject,
+                editableObject;
 
-             1. Show dialog
+            newModel.type = this.type.getKey();
-             a. Prepare dialog contents
+            newObject = parentObject.useCapability('instantiation', newModel);
-             b. Invoke dialogService
+            editableObject = new EditableDomainObject(newObject, this.$q);
-             2. Create new object in persistence service
+            editableObject.setOriginalObject(parentObject);
-             a. Generate UUID
+            editableObject.useCapability('mutation', function(model){
-             b. Store model
+                model.location = parentObject.getId();
-             3. Mutate destination container
+            });
-             a. Get mutation capability
-             b. Add new id to composition
-             4. Persist destination container
-             a. ...use persistence capability.
-             */
 
-            // The wizard will handle creating the form model based
+            if (newObject.hasCapability('composition') && this.type.getKey()!=='folder') {
-            // on the type...
+                this.navigationService.setNavigation(editableObject);
-            var wizard =
+            } else {
-                new CreateWizard(this.type, this.parent, this.policyService),
+                return editableObject.getCapability('action').perform('save');
-                self = this;
-
-            // Create and persist the new object, based on user
-            // input.
-            function persistResult(formValue) {
-                var parent = wizard.getLocation(formValue),
-                    newModel = wizard.createModel(formValue);
-                return self.creationService.createObject(newModel, parent);
             }
-
-            function doNothing() {
-                // Create cancelled, do nothing
-                return false;
-            }
-
-            return this.dialogService.getUserInput(
-                wizard.getFormStructure(),
-                wizard.getInitialFormValue()
-            ).then(persistResult, doNothing);
         };
 
 

platform/commonUI/browse/src/creation/CreateActionProvider.js

@@ -46,11 +46,10 @@ define(
          *        introduced in this bundle), responsible for handling actual
          *        object creation.
          */
-        function CreateActionProvider(typeService, dialogService, creationService, policyService) {
+        function CreateActionProvider($q, typeService, navigationService) {
             this.typeService = typeService;
-            this.dialogService = dialogService;
+            this.navigationService = navigationService;
-            this.creationService = creationService;
+            this.$q = $q;
-            this.policyService = policyService;
         }
 
         CreateActionProvider.prototype.getActions = function (actionContext) {
@@ -75,9 +74,8 @@ define(
                     type,
                     destination,
                     context,
-                    self.dialogService,
+                    self.$q,
-                    self.creationService,
+                    self.navigationService
-                    self.policyService
                 );
             });
         };

platform/commonUI/browse/src/creation/CreateWizard.js

@@ -34,9 +34,9 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function CreateWizard(type, parent, policyService) {
+        function CreateWizard(type, parent, policyService, initialModel) {
             this.type = type;
-            this.model = type.getInitialModel();
+            this.model = initialModel || type.getInitialModel();
             this.properties = type.getProperties();
             this.parent = parent;
             this.policyService = policyService;

platform/commonUI/edit/src/actions/SaveAction.js

@@ -76,19 +76,26 @@ define(
 
             function doWizardSave(parent) {
                 var context = domainObject.getCapability("context");
-                var wizard = new CreateWizard(domainObject.useCapability('type'), parent, self.policyService);
+                var wizard = new CreateWizard(domainObject.useCapability('type'), parent, self.policyService, domainObject.getModel());
+
+                function mergeObjects(fromObject, toObject){
+                    Object.keys(fromObject).forEach(function(key) {
+                        toObject[key] = fromObject[key];
+                    });
+                }
 
                 // Create and persist the new object, based on user
                 // input.
                 function buildObjectFromInput(formValue) {
                     var parent = wizard.getLocation(formValue),
-                        newModel = wizard.createModel(formValue);
+                        formModel = wizard.createModel(formValue);
+
+                        formModel.location = parent.getId();
                         //Replace domain object model with model collected
                         // from user form.
                         domainObject.useCapability("mutation", function(){
-                            newModel.location = parent.getId();
+                            //Replace object model with the model from the form
-                            newModel.composition = domainObject.getModel().composition;
+                            return formModel;
-                            return newModel;
                         });
                         return domainObject;
                 }
@@ -133,7 +140,7 @@ define(
 
             function persistObject(object){
 
-                return (object.hasCapability('editor') && object.getCapability('editor').save() || object.getCapability('persistence').persist())
+                return (object.hasCapability('editor') && object.getCapability('editor').save(true) || object.getCapability('persistence').persist())
                     .then(resolveWith(object));
                 /*
                 if (object.hasCapability('editor')){
@@ -165,9 +172,9 @@ define(
             // during editing.
             function doSave() {
                 //WARNING: HACK
-                //This is a new 'virtual panel' that has not been persisted
+                //This is a new 'virtual object' that has not been persisted
                 // yet.
-                if (domainObject.getModel().type === 'telemetry.panel' && !domainObject.getModel().persisted){
+                if (!domainObject.getModel().persisted){
                     return getParent(domainObject)
                             .then(doWizardSave)
                             .then(persistObject)