From eff46b076c296ce3346121551dd19aeb51ed7f20 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 May 2016 15:03:20 -0700 Subject: [PATCH 1/4] [New Edit Mode] #628 Removed duplicate logic from Create Action --- .../browse/src/creation/CreateAction.js | 30 +++++++++++-------- .../commonUI/edit/src/actions/EditAction.js | 6 ++++ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/platform/commonUI/browse/src/creation/CreateAction.js b/platform/commonUI/browse/src/creation/CreateAction.js index c5097e166d..2e04a0b07e 100644 --- a/platform/commonUI/browse/src/creation/CreateAction.js +++ b/platform/commonUI/browse/src/creation/CreateAction.js @@ -83,25 +83,29 @@ define( CreateAction.prototype.perform = function () { var newModel = this.type.getInitialModel(), parentObject = this.navigationService.getNavigation(), - editorCapability, - newObject; + newObject, + editAction, + editorCapability; + + function onSave() { + return editorCapability.save(); + } + + function onCancel() { + return editorCapability.cancel(); + } newModel.type = this.type.getKey(); newModel.location = parentObject.getId(); newObject = parentObject.useCapability('instantiation', newModel); + editorCapability = newObject.hasCapability('editor') && newObject.getCapability("editor"); - editorCapability = newObject.getCapability("editor"); - - if (countEditableViews(newObject) > 0 && newObject.hasCapability('composition')) { - this.navigationService.setNavigation(newObject); - return newObject.getCapability("action").perform("edit"); - } else { + editAction = newObject.getCapability("action").getActions("edit")[0]; + if (editAction) { + return editAction.perform("edit"); + } else if (editorCapability) { editorCapability.edit(); - return newObject.useCapability("action").perform("save").then(function () { - return editorCapability.save(); - }, function () { - return editorCapability.cancel(); - }); + return newObject.useCapability("action").perform("save").then(onSave, onCancel); } }; diff --git a/platform/commonUI/edit/src/actions/EditAction.js b/platform/commonUI/edit/src/actions/EditAction.js index b2aae8fa1b..9e5c90d897 100644 --- a/platform/commonUI/edit/src/actions/EditAction.js +++ b/platform/commonUI/edit/src/actions/EditAction.js @@ -74,6 +74,12 @@ define( self.domainObject.getCapability('editor').cancel(); self.navigationService.removeListener(cancelEditing); } + //If this is not the currently navigated object, then navigate + // to it. + if (this.navigationService.getNavigation() !== this.domainObject) { + this.navigationService.setNavigation(this.domainObject); + } + this.navigationService.addListener(cancelEditing); this.domainObject.useCapability("editor"); }; From 96af931c0b8a9aaa89085c935c3aecbcdd8f4304 Mon Sep 17 00:00:00 2001 From: Henry Date: Mon, 23 May 2016 16:48:31 -0700 Subject: [PATCH 2/4] Modified EditActionPolicy to prevent editing of table views unless object is a table type --- platform/commonUI/edit/src/policies/EditActionPolicy.js | 5 ++++- platform/features/table/bundle.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/platform/commonUI/edit/src/policies/EditActionPolicy.js b/platform/commonUI/edit/src/policies/EditActionPolicy.js index f0c2910c11..cc40c32d9f 100644 --- a/platform/commonUI/edit/src/policies/EditActionPolicy.js +++ b/platform/commonUI/edit/src/policies/EditActionPolicy.js @@ -56,7 +56,10 @@ define( // A view is editable unless explicitly flagged as not (views || []).forEach(function (view) { if (view.editable === true || - (view.key === 'plot' && type.getKey() === 'telemetry.panel')) { + (view.key === 'plot' && type.getKey() === 'telemetry.panel') || + (view.key === 'table' && type.getKey() === 'table') || + (view.key === 'rt-table' && type.getKey() === 'rttable') + ) { count++; } }); diff --git a/platform/features/table/bundle.js b/platform/features/table/bundle.js index ee907bc963..cdcb6603d9 100644 --- a/platform/features/table/bundle.js +++ b/platform/features/table/bundle.js @@ -133,7 +133,7 @@ define([ "telemetry" ], "delegation": true, - "editable": true + "editable": false }, { "name": "Real-time Table", @@ -144,7 +144,7 @@ define([ "telemetry" ], "delegation": true, - "editable": true + "editable": false } ], "directives": [ From f0ab817e87ce3f66941a637fdd19721804b13ab4 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 24 May 2016 10:23:48 -0700 Subject: [PATCH 3/4] Added tests, and fixed failing ones --- platform/commonUI/browse/bundle.js | 2 - .../browse/src/creation/CreateAction.js | 32 +---- .../src/creation/CreateActionProvider.js | 8 +- .../test/creation/CreateActionProviderSpec.js | 13 -- .../browse/test/creation/CreateActionSpec.js | 128 +++++++++++++----- 5 files changed, 103 insertions(+), 80 deletions(-) diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js index 73b3f44de7..8a694c57a7 100644 --- a/platform/commonUI/browse/bundle.js +++ b/platform/commonUI/browse/bundle.js @@ -309,9 +309,7 @@ define([ "type": "provider", "implementation": CreateActionProvider, "depends": [ - "$q", "typeService", - "navigationService", "policyService" ] }, diff --git a/platform/commonUI/browse/src/creation/CreateAction.js b/platform/commonUI/browse/src/creation/CreateAction.js index 2e04a0b07e..6ea0d513a5 100644 --- a/platform/commonUI/browse/src/creation/CreateAction.js +++ b/platform/commonUI/browse/src/creation/CreateAction.js @@ -43,11 +43,8 @@ define( * override this) * @param {ActionContext} context the context in which the * action is being performed - * @param {NavigationService} navigationService the navigation service, - * which handles changes in navigation. It allows the object - * being browsed/edited to be set. */ - function CreateAction(type, parent, context, $q, navigationService) { + function CreateAction(type, parent, context) { this.metadata = { key: 'create', glyph: type.getGlyph(), @@ -56,24 +53,8 @@ define( description: type.getDescription(), context: context }; - this.type = type; this.parent = parent; - this.navigationService = navigationService; - this.$q = $q; - } - - // Get a count of views which are not flagged as non-editable. - function countEditableViews(domainObject) { - var views = domainObject && domainObject.useCapability('view'), - count = 0; - - // A view is editable unless explicitly flagged as not - (views || []).forEach(function (view) { - count += (view.editable !== false) ? 1 : 0; - }); - - return count; } /** @@ -82,7 +63,6 @@ define( */ CreateAction.prototype.perform = function () { var newModel = this.type.getInitialModel(), - parentObject = this.navigationService.getNavigation(), newObject, editAction, editorCapability; @@ -96,16 +76,18 @@ define( } newModel.type = this.type.getKey(); - newModel.location = parentObject.getId(); - newObject = parentObject.useCapability('instantiation', newModel); + newModel.location = this.parent.getId(); + newObject = this.parent.useCapability('instantiation', newModel); editorCapability = newObject.hasCapability('editor') && newObject.getCapability("editor"); editAction = newObject.getCapability("action").getActions("edit")[0]; + //If an edit action is available, perform it if (editAction) { - return editAction.perform("edit"); + return editAction.perform(); } else if (editorCapability) { + //otherwise, use the save action editorCapability.edit(); - return newObject.useCapability("action").perform("save").then(onSave, onCancel); + return newObject.getCapability("action").perform("save").then(onSave, onCancel); } }; diff --git a/platform/commonUI/browse/src/creation/CreateActionProvider.js b/platform/commonUI/browse/src/creation/CreateActionProvider.js index 82f57343da..5039149104 100644 --- a/platform/commonUI/browse/src/creation/CreateActionProvider.js +++ b/platform/commonUI/browse/src/creation/CreateActionProvider.js @@ -44,10 +44,8 @@ define( * introduced in this bundle), responsible for handling actual * object creation. */ - function CreateActionProvider($q, typeService, navigationService, policyService) { + function CreateActionProvider(typeService, policyService) { this.typeService = typeService; - this.navigationService = navigationService; - this.$q = $q; this.policyService = policyService; } @@ -72,9 +70,7 @@ define( return new CreateAction( type, destination, - context, - self.$q, - self.navigationService + context ); }); }; diff --git a/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js b/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js index fbfc4a1140..d8aefe17fa 100644 --- a/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js +++ b/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js @@ -29,13 +29,10 @@ define( describe("The create action provider", function () { var mockTypeService, - mockDialogService, - mockNavigationService, mockPolicyService, mockCreationPolicy, mockPolicyMap = {}, mockTypes, - mockQ, provider; function createMockType(name) { @@ -61,14 +58,6 @@ define( "typeService", ["listTypes"] ); - mockDialogService = jasmine.createSpyObj( - "dialogService", - ["getUserInput"] - ); - mockNavigationService = jasmine.createSpyObj( - "navigationService", - ["setNavigation"] - ); mockPolicyService = jasmine.createSpyObj( "policyService", ["allow"] @@ -91,9 +80,7 @@ define( mockTypeService.listTypes.andReturn(mockTypes); provider = new CreateActionProvider( - mockQ, mockTypeService, - mockNavigationService, mockPolicyService ); }); diff --git a/platform/commonUI/browse/test/creation/CreateActionSpec.js b/platform/commonUI/browse/test/creation/CreateActionSpec.js index 5fa89512e0..b37339fa40 100644 --- a/platform/commonUI/browse/test/creation/CreateActionSpec.js +++ b/platform/commonUI/browse/test/creation/CreateActionSpec.js @@ -31,8 +31,10 @@ define( var mockType, mockParent, mockContext, - mockDialogService, - mockCreationService, + mockDomainObject, + capabilities = {}, + mockEditAction, + mockSaveAction, action; function mockPromise(value) { @@ -60,20 +62,61 @@ define( [ "getId", "getModel", - "getCapability" + "getCapability", + "useCapability" ] ); + mockDomainObject = jasmine.createSpyObj( + "domainObject", + [ + "getId", + "getModel", + "getCapability", + "hasCapability", + "useCapability" + ] + ); + mockDomainObject.hasCapability.andCallFake(function (name) { + return !!capabilities[name]; + }); + mockDomainObject.getCapability.andCallFake(function (name) { + return capabilities[name]; + }); + mockSaveAction = jasmine.createSpyObj( + "saveAction", + [ + "perform" + ] + ); + + capabilities.action = jasmine.createSpyObj( + "actionCapability", + [ + "getActions", + "perform" + ] + ); + + capabilities.editor = jasmine.createSpyObj( + "editorCapability", + [ + "edit", + "save", + "cancel" + ] + ); + + mockEditAction = jasmine.createSpyObj( + "editAction", + [ + "perform" + ] + ); + mockContext = { domainObject: mockParent }; - mockDialogService = jasmine.createSpyObj( - "dialogService", - ["getUserInput"] - ); - mockCreationService = jasmine.createSpyObj( - "creationService", - ["createObject"] - ); + mockParent.useCapability.andReturn(mockDomainObject); mockType.getKey.andReturn("test"); mockType.getGlyph.andReturn("T"); @@ -82,14 +125,10 @@ define( mockType.getProperties.andReturn([]); mockType.getInitialModel.andReturn({}); - mockDialogService.getUserInput.andReturn(mockPromise({})); - action = new CreateAction( mockType, mockParent, - mockContext, - mockDialogService, - mockCreationService + mockContext ); }); @@ -101,28 +140,49 @@ define( expect(metadata.glyph).toEqual("T"); }); - //TODO: Disabled for NEM Beta - xit("invokes the creation service when performed", function () { - action.perform(); - expect(mockCreationService.createObject).toHaveBeenCalledWith( - { type: "test" }, - mockParent - ); - }); - - //TODO: Disabled for NEM Beta - xit("does not create an object if the user cancels", function () { - mockDialogService.getUserInput.andReturn({ - then: function (callback, fail) { - fail(); - } + describe("the perform function", function () { + beforeEach(function () { + capabilities.action.getActions.andReturn([mockEditAction]); }); - action.perform(); + it("uses the instantiation capability when performed", function () { + action.perform(); + expect(mockParent.useCapability).toHaveBeenCalledWith("instantiation", jasmine.any(Object)); + }); - expect(mockCreationService.createObject) - .not.toHaveBeenCalled(); + it("uses the edit action if available", function () { + action.perform(); + expect(mockEditAction.perform).toHaveBeenCalled(); + }); + it("uses the save action if object does not have an edit action" + + " available", function () { + capabilities.action.getActions.andReturn([]); + capabilities.action.perform.andReturn(mockPromise(undefined)); + action.perform(); + expect(capabilities.action.perform).toHaveBeenCalledWith("save"); + }); + + describe("uses to editor capability", function () { + var promise = jasmine.createSpyObj("promise", ["then"]); + beforeEach(function () { + capabilities.action.getActions.andReturn([]); + capabilities.action.perform.andReturn(promise); + }); + + it("to save the edit if user saves dialog", function () { + action.perform(); + expect(promise.then).toHaveBeenCalled(); + promise.then.mostRecentCall.args[0](); + expect(capabilities.editor.save).toHaveBeenCalled(); + }); + + it("to cancel the edit if user cancels dialog", function () { + action.perform(); + promise.then.mostRecentCall.args[1](); + expect(capabilities.editor.cancel).toHaveBeenCalled(); + }); + }); }); }); From 32d7187db6a57ad9cf0423a3e7c48023b86b7b9f Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 24 May 2016 17:08:12 -0700 Subject: [PATCH 4/4] Relocated creation package to edit bundle --- platform/commonUI/browse/bundle.js | 91 ------------------ platform/commonUI/edit/bundle.js | 93 ++++++++++++++++++- .../res/templates/create/create-button.html | 0 .../res/templates/create/create-menu.html | 0 .../res/templates/create/locator.html | 0 .../commonUI/edit/src/actions/SaveAsAction.js | 2 +- .../src/creation/AddAction.js | 0 .../src/creation/AddActionProvider.js | 0 .../src/creation/CreateAction.js | 0 .../src/creation/CreateActionProvider.js | 0 .../src/creation/CreateMenuController.js | 0 .../src/creation/CreateWizard.js | 0 .../src/creation/CreationPolicy.js | 0 .../src/creation/CreationService.js | 0 .../src/creation/LocatorController.js | 0 .../test/creation/AddActionProviderSpec.js | 0 .../test/creation/CreateActionProviderSpec.js | 0 .../test/creation/CreateActionSpec.js | 0 .../test/creation/CreateMenuControllerSpec.js | 0 .../test/creation/CreateWizardSpec.js | 0 .../test/creation/CreationPolicySpec.js | 0 .../test/creation/CreationServiceSpec.js | 0 .../test/creation/LocatorControllerSpec.js | 0 23 files changed, 91 insertions(+), 95 deletions(-) rename platform/commonUI/{browse => edit}/res/templates/create/create-button.html (100%) rename platform/commonUI/{browse => edit}/res/templates/create/create-menu.html (100%) rename platform/commonUI/{browse => edit}/res/templates/create/locator.html (100%) rename platform/commonUI/{browse => edit}/src/creation/AddAction.js (100%) rename platform/commonUI/{browse => edit}/src/creation/AddActionProvider.js (100%) rename platform/commonUI/{browse => edit}/src/creation/CreateAction.js (100%) rename platform/commonUI/{browse => edit}/src/creation/CreateActionProvider.js (100%) rename platform/commonUI/{browse => edit}/src/creation/CreateMenuController.js (100%) rename platform/commonUI/{browse => edit}/src/creation/CreateWizard.js (100%) rename platform/commonUI/{browse => edit}/src/creation/CreationPolicy.js (100%) rename platform/commonUI/{browse => edit}/src/creation/CreationService.js (100%) rename platform/commonUI/{browse => edit}/src/creation/LocatorController.js (100%) rename platform/commonUI/{browse => edit}/test/creation/AddActionProviderSpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/CreateActionProviderSpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/CreateActionSpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/CreateMenuControllerSpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/CreateWizardSpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/CreationPolicySpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/CreationServiceSpec.js (100%) rename platform/commonUI/{browse => edit}/test/creation/LocatorControllerSpec.js (100%) diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js index 8a694c57a7..443660cc8b 100644 --- a/platform/commonUI/browse/bundle.js +++ b/platform/commonUI/browse/bundle.js @@ -24,23 +24,14 @@ define([ "./src/BrowseController", "./src/PaneController", "./src/BrowseObjectController", - "./src/creation/CreateMenuController", - "./src/creation/LocatorController", "./src/MenuArrowController", "./src/navigation/NavigationService", - "./src/creation/CreationPolicy", "./src/navigation/NavigateAction", "./src/windowing/NewTabAction", "./src/windowing/FullscreenAction", - "./src/creation/CreateActionProvider", - "./src/creation/AddActionProvider", - "./src/creation/CreationService", "./src/windowing/WindowTitler", "text!./res/templates/browse.html", - "text!./res/templates/create/locator.html", "text!./res/templates/browse-object.html", - "text!./res/templates/create/create-button.html", - "text!./res/templates/create/create-menu.html", "text!./res/templates/items/grid-item.html", "text!./res/templates/browse/object-header.html", "text!./res/templates/menu-arrow.html", @@ -53,23 +44,14 @@ define([ BrowseController, PaneController, BrowseObjectController, - CreateMenuController, - LocatorController, MenuArrowController, NavigationService, - CreationPolicy, NavigateAction, NewTabAction, FullscreenAction, - CreateActionProvider, - AddActionProvider, - CreationService, WindowTitler, browseTemplate, - locatorTemplate, browseObjectTemplate, - createButtonTemplate, - createMenuTemplate, gridItemTemplate, objectHeaderTemplate, menuArrowTemplate, @@ -136,22 +118,6 @@ define([ "$route" ] }, - { - "key": "CreateMenuController", - "implementation": CreateMenuController, - "depends": [ - "$scope" - ] - }, - { - "key": "LocatorController", - "implementation": LocatorController, - "depends": [ - "$scope", - "$timeout", - "objectService" - ] - }, { "key": "MenuArrowController", "implementation": MenuArrowController, @@ -160,12 +126,6 @@ define([ ] } ], - "controls": [ - { - "key": "locator", - "template": locatorTemplate - } - ], "representations": [ { "key": "view-object", @@ -181,17 +141,6 @@ define([ "view" ] }, - { - "key": "create-button", - "template": createButtonTemplate - }, - { - "key": "create-menu", - "template": createMenuTemplate, - "uses": [ - "action" - ] - }, { "key": "grid-item", "template": gridItemTemplate, @@ -244,12 +193,6 @@ define([ "implementation": NavigationService } ], - "policies": [ - { - "implementation": CreationPolicy, - "category": "creation" - } - ], "actions": [ { "key": "navigate", @@ -302,40 +245,6 @@ define([ "editable": false } ], - "components": [ - { - "key": "CreateActionProvider", - "provides": "actionService", - "type": "provider", - "implementation": CreateActionProvider, - "depends": [ - "typeService", - "policyService" - ] - }, - { - "key": "AddActionProvider", - "provides": "actionService", - "type": "provider", - "implementation": AddActionProvider, - "depends": [ - "$q", - "typeService", - "dialogService", - "policyService" - ] - }, - { - "key": "CreationService", - "provides": "creationService", - "type": "provider", - "implementation": CreationService, - "depends": [ - "$q", - "$log" - ] - } - ], "runs": [ { "implementation": WindowTitler, diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 527c6b60a1..5107329bfb 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -43,6 +43,15 @@ define([ "./src/capabilities/EditorCapability", "./src/capabilities/TransactionCapabilityDecorator", "./src/services/TransactionService", + "./src/creation/CreateMenuController", + "./src/creation/LocatorController", + "./src/creation/CreationPolicy", + "./src/creation/CreateActionProvider", + "./src/creation/AddActionProvider", + "./src/creation/CreationService", + "text!./res/templates/create/locator.html", + "text!./res/templates/create/create-button.html", + "text!./res/templates/create/create-menu.html", "text!./res/templates/library.html", "text!./res/templates/edit-object.html", "text!./res/templates/edit-action-buttons.html", @@ -72,6 +81,15 @@ define([ EditorCapability, TransactionCapabilityDecorator, TransactionService, + CreateMenuController, + LocatorController, + CreationPolicy, + CreateActionProvider, + AddActionProvider, + CreationService, + locatorTemplate, + createButtonTemplate, + createMenuTemplate, libraryTemplate, editObjectTemplate, editActionButtonsTemplate, @@ -112,7 +130,23 @@ define([ "$location", "policyService" ] - } + }, + { + "key": "CreateMenuController", + "implementation": CreateMenuController, + "depends": [ + "$scope" + ] + }, + { + "key": "LocatorController", + "implementation": LocatorController, + "depends": [ + "$scope", + "$timeout", + "objectService" + ] + }, ], "directives": [ { @@ -221,8 +255,11 @@ define([ "category": "navigation", "message": "There are unsaved changes.", "implementation": EditNavigationPolicy + }, + { + "implementation": CreationPolicy, + "category": "creation" } - ], "templates": [ { @@ -261,7 +298,18 @@ define([ { "key": "topbar-edit", "template": topbarEditTemplate - } + }, + { + "key": "create-button", + "template": createButtonTemplate + }, + { + "key": "create-menu", + "template": createMenuTemplate, + "uses": [ + "action" + ] + }, ], "components": [ { @@ -282,7 +330,40 @@ define([ "$q", "$log" ] + }, + { + "key": "CreateActionProvider", + "provides": "actionService", + "type": "provider", + "implementation": CreateActionProvider, + "depends": [ + "typeService", + "policyService" + ] + }, + { + "key": "AddActionProvider", + "provides": "actionService", + "type": "provider", + "implementation": AddActionProvider, + "depends": [ + "$q", + "typeService", + "dialogService", + "policyService" + ] + }, + { + "key": "CreationService", + "provides": "creationService", + "type": "provider", + "implementation": CreationService, + "depends": [ + "$q", + "$log" + ] } + ], "representers": [ { @@ -316,6 +397,12 @@ define([ "transactionService" ] } + ], + "controls": [ + { + "key": "locator", + "template": locatorTemplate + } ] } }); diff --git a/platform/commonUI/browse/res/templates/create/create-button.html b/platform/commonUI/edit/res/templates/create/create-button.html similarity index 100% rename from platform/commonUI/browse/res/templates/create/create-button.html rename to platform/commonUI/edit/res/templates/create/create-button.html diff --git a/platform/commonUI/browse/res/templates/create/create-menu.html b/platform/commonUI/edit/res/templates/create/create-menu.html similarity index 100% rename from platform/commonUI/browse/res/templates/create/create-menu.html rename to platform/commonUI/edit/res/templates/create/create-menu.html diff --git a/platform/commonUI/browse/res/templates/create/locator.html b/platform/commonUI/edit/res/templates/create/locator.html similarity index 100% rename from platform/commonUI/browse/res/templates/create/locator.html rename to platform/commonUI/edit/res/templates/create/locator.html diff --git a/platform/commonUI/edit/src/actions/SaveAsAction.js b/platform/commonUI/edit/src/actions/SaveAsAction.js index 05a9fe7918..cee67ebbfe 100644 --- a/platform/commonUI/edit/src/actions/SaveAsAction.js +++ b/platform/commonUI/edit/src/actions/SaveAsAction.js @@ -22,7 +22,7 @@ define( - ['../../../browse/src/creation/CreateWizard'], + ['../creation/CreateWizard'], function (CreateWizard) { /** diff --git a/platform/commonUI/browse/src/creation/AddAction.js b/platform/commonUI/edit/src/creation/AddAction.js similarity index 100% rename from platform/commonUI/browse/src/creation/AddAction.js rename to platform/commonUI/edit/src/creation/AddAction.js diff --git a/platform/commonUI/browse/src/creation/AddActionProvider.js b/platform/commonUI/edit/src/creation/AddActionProvider.js similarity index 100% rename from platform/commonUI/browse/src/creation/AddActionProvider.js rename to platform/commonUI/edit/src/creation/AddActionProvider.js diff --git a/platform/commonUI/browse/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js similarity index 100% rename from platform/commonUI/browse/src/creation/CreateAction.js rename to platform/commonUI/edit/src/creation/CreateAction.js diff --git a/platform/commonUI/browse/src/creation/CreateActionProvider.js b/platform/commonUI/edit/src/creation/CreateActionProvider.js similarity index 100% rename from platform/commonUI/browse/src/creation/CreateActionProvider.js rename to platform/commonUI/edit/src/creation/CreateActionProvider.js diff --git a/platform/commonUI/browse/src/creation/CreateMenuController.js b/platform/commonUI/edit/src/creation/CreateMenuController.js similarity index 100% rename from platform/commonUI/browse/src/creation/CreateMenuController.js rename to platform/commonUI/edit/src/creation/CreateMenuController.js diff --git a/platform/commonUI/browse/src/creation/CreateWizard.js b/platform/commonUI/edit/src/creation/CreateWizard.js similarity index 100% rename from platform/commonUI/browse/src/creation/CreateWizard.js rename to platform/commonUI/edit/src/creation/CreateWizard.js diff --git a/platform/commonUI/browse/src/creation/CreationPolicy.js b/platform/commonUI/edit/src/creation/CreationPolicy.js similarity index 100% rename from platform/commonUI/browse/src/creation/CreationPolicy.js rename to platform/commonUI/edit/src/creation/CreationPolicy.js diff --git a/platform/commonUI/browse/src/creation/CreationService.js b/platform/commonUI/edit/src/creation/CreationService.js similarity index 100% rename from platform/commonUI/browse/src/creation/CreationService.js rename to platform/commonUI/edit/src/creation/CreationService.js diff --git a/platform/commonUI/browse/src/creation/LocatorController.js b/platform/commonUI/edit/src/creation/LocatorController.js similarity index 100% rename from platform/commonUI/browse/src/creation/LocatorController.js rename to platform/commonUI/edit/src/creation/LocatorController.js diff --git a/platform/commonUI/browse/test/creation/AddActionProviderSpec.js b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/AddActionProviderSpec.js rename to platform/commonUI/edit/test/creation/AddActionProviderSpec.js diff --git a/platform/commonUI/browse/test/creation/CreateActionProviderSpec.js b/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/CreateActionProviderSpec.js rename to platform/commonUI/edit/test/creation/CreateActionProviderSpec.js diff --git a/platform/commonUI/browse/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/CreateActionSpec.js rename to platform/commonUI/edit/test/creation/CreateActionSpec.js diff --git a/platform/commonUI/browse/test/creation/CreateMenuControllerSpec.js b/platform/commonUI/edit/test/creation/CreateMenuControllerSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/CreateMenuControllerSpec.js rename to platform/commonUI/edit/test/creation/CreateMenuControllerSpec.js diff --git a/platform/commonUI/browse/test/creation/CreateWizardSpec.js b/platform/commonUI/edit/test/creation/CreateWizardSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/CreateWizardSpec.js rename to platform/commonUI/edit/test/creation/CreateWizardSpec.js diff --git a/platform/commonUI/browse/test/creation/CreationPolicySpec.js b/platform/commonUI/edit/test/creation/CreationPolicySpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/CreationPolicySpec.js rename to platform/commonUI/edit/test/creation/CreationPolicySpec.js diff --git a/platform/commonUI/browse/test/creation/CreationServiceSpec.js b/platform/commonUI/edit/test/creation/CreationServiceSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/CreationServiceSpec.js rename to platform/commonUI/edit/test/creation/CreationServiceSpec.js diff --git a/platform/commonUI/browse/test/creation/LocatorControllerSpec.js b/platform/commonUI/edit/test/creation/LocatorControllerSpec.js similarity index 100% rename from platform/commonUI/browse/test/creation/LocatorControllerSpec.js rename to platform/commonUI/edit/test/creation/LocatorControllerSpec.js