Commit Graph

152 Commits

Author SHA1 Message Date
Henry
c2517c1670 [Edit Mode] Canceling edit mode with unsaved changes now shows confirmation dialog to user. Fixes #664 2016-06-15 17:10:29 -07:00
Pete Richards
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
Andrew Henry
b1266abf01 [Edit] Fixed issue with cancel action throwing an error. Fixes #979 2016-06-01 10:41:01 +01:00
Henry
eda1f23df9 [Edit Mode] #629 rewriting disabled tests 2016-05-26 11:38:12 -07:00
Henry
7501f679f7 [Style] Fixed style issues introduced by #954 2016-05-25 12:10:39 -07:00
Henry
32d7187db6 Relocated creation package to edit bundle 2016-05-24 17:08:12 -07:00
Victor Woeltjen
264896c264 Merge branch 'master' into persist-on-mutation-825
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/commonUI/edit/test/actions/RemoveActionSpec.js
	platform/entanglement/src/services/LinkService.js
	platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
	platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
	platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js
2016-05-20 14:26:39 -07:00
Victor Woeltjen
9861e63589 [Code Style] Run fixstyle on merged changes 2016-05-20 13:09:16 -07:00
Victor Woeltjen
bce5643994 Merge branch 'master' into jscs-rebase-142
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/representation/src/MCTRepresentation.js
2016-05-20 13:07:58 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
e3208187bf Merge branch 'master' into persist-on-mutation-825
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
2016-05-20 10:59:54 -07:00
Henry
601bc03ba2 [New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic 2016-05-20 10:42:17 -07:00
Victor Woeltjen
8279acc9a5 [Persistence] Don't expect persist calls in PropertiesAction spec 2016-05-19 12:04:08 -07:00
Victor Woeltjen
63438ad9ba [Persistence] Don't expect persist calls in LinkAction spec 2016-05-19 12:02:42 -07:00
Victor Woeltjen
467f4d2257 [Persistence] Don't expect persist calls in RemoveAction spec 2016-05-19 12:00:51 -07:00
Victor Woeltjen
9b273bc148 [Persistence] Don't expect persist calls in EditRepresenter spec 2016-05-19 11:52:58 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle
...to apply code style settings from #142.
2016-05-19 11:29:13 -07:00
Henry
54a0de4a08 [New Edit Mode] #636 Removed edit concerns from DropGesture 2016-05-13 17:59:43 -07:00
Henry
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -07:00
Henry
69c4c3a2c8 Added tests 2016-05-12 16:14:42 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
cf9eb3f602 Resolved Merge conflicts, removed previously deleted files 2016-05-12 16:05:27 -07:00
Pete Richards
3ca9d21bbd Merge remote-tracking branch 'origin/open663' 2016-05-09 10:33:39 -07:00
Pete Richards
61683800cc [Style] Update style to reflect new jshint config
Update style to match new jshint config

https://github.com/nasa/openmct/issues/671
2016-05-09 10:33:26 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Henry
11cfb6e1b8 [Edit] Elements pool filtering displays more consistent results 2016-04-21 10:42:50 -07:00
Henry
06436c488a [Edit Mode] #794 Modified policy to show remove action in context for non-editable domain object types 2016-04-18 19:05:46 -07:00
Andrew Henry
6cb9619fbe Merge pull request #829 from nasa/open630
[Edit mode] Simplify SaveAction
2016-04-14 16:11:49 -07:00
Henry
26e368f52d [Edit mode] Simplify SaveAction 2016-04-12 14:40:19 -07:00
Henry
519a9333ab Updated tests 2016-04-11 17:10:35 -07:00
Henry
7f108c3b24 [Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture 2016-04-11 15:39:35 -07:00
Victor Woeltjen
d6ec7e9ab8 [Build] Remove unused variables from specs
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
Victor Woeltjen
ac5ac8d34e [Build] Remove boilerplate from scripts
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Henry
7b5218c5ba [Edit Mode] #627 Fixed failing tests
Removed reference to defunct NavigationServiceDecorator

Removed virtual panels from drop gesture
2016-03-02 11:12:41 -08:00
Henry
f192544be3 Addressing issues from code review 2016-03-02 11:10:49 -08:00
Henry
2cc2c6a9d3 [Edit Mode] #627 removed edit concerns from browse controllers and markup
Fixed elements not appearing in edit mode

Fixed failing tests
2016-03-02 11:05:23 -08:00
Melanie Lean
53c60ee64f [Timelines] #677 Applied fix to prevent editing of timelines in browse mode
Fixed failing test
2016-02-11 21:52:05 -08:00
Victor Woeltjen
b0e4947bf0 Merge pull request #500 from nasa/open480
[New Edit Mode] Adding sub objects to Timelines
2016-02-08 11:59:54 -08:00
Victor Woeltjen
aebae27391 [Tests] Remove suite.json files
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -08:00
Henry
b4448020e4 JSLint 2016-01-14 15:12:15 -08:00
Henry
0741e2cf5e Disabled failing tests 2016-01-14 15:11:19 -08:00
Henry
6058e50216 JSLint fixes 2015-12-09 10:04:49 -08:00
Henry
4419a101d6 [New Edit Mode] #199 Disabled all failing tests 2015-12-08 15:15:54 -08:00
Victor Woeltjen
d5f054e328 [Edit] Test return type
...from the edit-mode-wrapped persistence capability.
2015-12-04 11:20:19 -08:00
Victor Woeltjen
3310016264 [Properties] Hide rows without controls
Hide rows for domain object properties that do not have
associated controls from the Edit Properties dialog;
follow up for nasa/openmctweb#92
2015-09-02 12:01:43 -07:00
Victor Woeltjen
8759fdbd95 [Composition] Update specs
Update specs to reflect usage of the add method in
the composition capability.
2015-09-02 09:37:26 -07:00
Shivam Dave
3ec4cc099b [Action] RemoveAction
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
2015-08-27 09:41:00 -07:00
Shivam Dave
e7563ff4e9 [Action] Merge
Merged with master.
2015-08-26 10:11:23 -07:00
Shivam Dave
a507557cec [Remove] Remove Action
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
2015-08-26 10:07:51 -07:00
Shivam Dave
d0183d44c9 [Actions] Remove Action
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
2015-08-21 13:04:47 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle
WTD-1482.
2015-08-10 16:38:13 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
3a371483ab [Windowing] urlService
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
2015-06-25 14:07:02 -07:00
Victor Woeltjen
0ae1ba4a40 [Edit] Don't wrap non-editable objects
In Edit mode, don't bother wrapping domain objects which should
not be edited even in principle. Avoids insulating these objects
from updates which occur asynchronously, which in turn avoids
WTD-1291.
2015-06-17 10:23:16 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Victor Woeltjen
3e972650c7 [Containment] Test LinkAction
Add test cases for LinkAction, added to allow composition
changes to be controlled by policy. WTD-962.
2015-04-10 17:37:11 -07:00
Victor Woeltjen
79f6e8c082 Merge branch 'open1062' into open-master
Merge changes for WTD-1062
2015-04-08 12:48:49 -07:00
Victor Woeltjen
874f81010c [Edit] Update EditController spec
Update tests for EditController to match updated
usage of domain object API for WTD-1071.
2015-04-06 09:30:42 -07:00
Victor Woeltjen
60ed17e32b [Edit] Add test case for double-wrapping
Add test case to detect double-wrapping of domain objects
retrieved via the editable domain object cache, identified
as the root cause of WTD-1071.
2015-04-06 09:28:53 -07:00
Victor Woeltjen
3c3dd0ad17 Merge branch 'open1035' into open-master
Merge WTD-1035; resolving conflicts to avoid WTD-1069

Conflicts:
	platform/commonUI/edit/src/controllers/EditController.js
	platform/commonUI/edit/src/objects/EditableDomainObjectCache.js
2015-04-06 08:32:54 -07:00
Victor Woeltjen
9be40d6d2a [Edit] Fill in tests for Edit policies
Complete tests for policies for Edit actions, WTD-1062.
2015-04-01 16:21:06 -07:00
Victor Woeltjen
e2c6db8259 [Edit] Stub in specs for Edit policies
Stub in specs for policies added for Edit mode which control
the availability of the Edit and/or Edit Properties actions
in the view-control area, WTD-1062.
2015-04-01 16:08:15 -07:00
Victor Woeltjen
ac6aa3e819 [Edit] Add test cases for mct-before-unload
Add test cases for behavior to prompt user to confirm
navigation away from unsaved changes, WTD-1035.
2015-03-31 17:08:38 -07:00
Victor Woeltjen
2e82cffa5a [Edit] Add empty spec for mct-before-unload
Begin testing mct-before-unload directive, used to confirm navigation
away from unsaved changes, WTD-1035
2015-03-31 16:00:53 -07:00
Victor Woeltjen
0b0753df31 [Edit] Add test cases
Add test cases for EditController to account for changes to
support warning dialog when unsaved changes are present,
WTD-1035.
2015-03-31 15:58:13 -07:00
Victor Woeltjen
27af3a6b88 [Edit] Update specs
Update spec for editable persistence capability to include
delegation of refreshes, which supports revision-checking
when exiting edit mode. WTD-1033.
2015-03-24 17:07:06 -07:00
Victor Woeltjen
35371f89ab [Edit] Update failing specs
Update failing specs in Edit mode with changes made for revision
checking, WTD-1033.
2015-03-24 16:31:14 -07:00
Victor Woeltjen
41e248a2c5 [Edit] Add test cases
Add test cases for changes to Edit mode capability wrappers
which reduce scope of Create menu's Save in to the object
being edited, for WTD-922.
2015-03-18 12:36:51 -07:00
Victor Woeltjen
ea4a56bc25 [Edit] Update failing specs
Update failing specs after changes to insulate root in Edit
mode for WTD-922.
2015-03-18 12:27:23 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
bwyu
c2d7996785 Merge remote-tracking branch 'origin/open929' into open-master 2015-03-13 16:21:08 -07:00
bwyu
6575291e3e Merge remote-tracking branch 'origin/open788' into open-master 2015-03-10 12:41:08 -07:00
Victor Woeltjen
bbe26cd06c [Core] Edit-wrap relationship capability
Wrap objects retrieved via the relationship capability
with Edit mode caching etc, for WTD-1007.
2015-03-09 15:29:25 -07:00
Victor Woeltjen
d7e962e4b1 [Edit] Update tests
Update tests for Edit mode bundle to include the
general-purpose selection API, WTD-929.
2015-03-03 18:43:26 -08:00
Victor Woeltjen
0d5a849a41 [Edit] Restructure source folder
Restructure sources associated with Edit mode; work on
WTD-788 has increased number of sources here so more
organization is useful.
2015-02-26 17:06:30 -08:00
Victor Woeltjen
cb078e9620 [Edit] Test EditPanesController
Test EditPanesController, particularly for the root
cause of tree collapse, WTD-788.
2015-02-26 17:02:22 -08:00
Victor Woeltjen
1e76264d82 [Edit] Avoid extra commits
Avoid issuing extra commit calls from the Edit toolbar;
this can cause disruption of state from other views (such
as Fixed Position), WTD-881.
2015-02-24 09:47:00 -08:00
Victor Woeltjen
59ff539bfb [Fixed Position] Update specs for coverage
Update specs to restore code coverage after changes for WTD-881.
2015-02-24 09:18:00 -08:00
Victor Woeltjen
8452b2ab12 [Fixed Position] Update specs
Update failing specs after changes for WTD-881.
2015-02-24 09:07:57 -08:00
Victor Woeltjen
307fbe2151 [Edit] Update EditToolbar spec
Update EditToolbar spec to reflect changes for WTD-881.
2015-02-23 19:47:56 -08:00
Victor Woeltjen
8c653d39d7 [Edit] Update specs
Update specs for toolbars in Edit mode to reflect
changes for WTD-879.
2015-02-19 12:44:00 -08:00
Victor Woeltjen
3916968544 [Edit] Add EditToolbarRepresenter spec
Add tests for representer which mediates between view's
selection and toolbar contents, WTD-878.
2015-02-17 15:47:18 -08:00
Victor Woeltjen
5dc72b15c2 [Edit] Implement EditToolbar
Implement EditToolbar (sufficient to satisfy spec) which will
construct an mct-toolbar-friendly form structure based on both
the current selection and the view's defined toolbar structure.
WTD-878.
2015-02-17 13:47:14 -08:00
Victor Woeltjen
8f14f4e5eb [Edit] Add spec for toolbar
Add spec for class that will convert toolbar definition
provided by views to suitable input for mct-toolbar, WTD-878.
2015-02-17 12:58:36 -08:00
bwyu
107ed51cfc Merge remote-tracking branch 'origin/open723' into open-master 2015-02-03 17:26:53 -08:00
Victor Woeltjen
aa9ceeb2be [Actions] Update specs
Update specs for actions which change domain objects to
reflect their restriction to types that are creatable,
WTD-723.
2015-01-27 13:28:19 -08:00
Victor Woeltjen
be34e7fa9a [Edit] Add tests for updated capabilities
Add tests for capabilities which have been updated to work
when only a model (and not whole objects) are cached; that
change was introduced to prevent misbehavior of the Remove
action in Edit mode, WTD-473.
2015-01-27 12:18:31 -08:00
Victor Woeltjen
7c44365037 [Edit] Add model cache spec
Add a spec for an editable model cache; this will behave
similarly to the existing domain object cache, except
that it will cache only models. Use of this will permit
multiple instances of editable objects to be created with
unique contexts (that is, distinct parent objects accessible
via the context capability) which in turn will avoid the
ambiguous parentage which results in unexpected behavior of
the Remove action in Edit mode, WTD-473.
2015-01-27 11:02:00 -08:00
Victor Woeltjen
b1f8a54dab [Layout] Update specs
Update specs to reflect changes made to the manner in
which a view may persist view configuration changes,
for WTD-535.
2014-12-06 09:45:43 -08:00
Victor Woeltjen
ecb4283df0 [Layout] Fill in non-layout specs
Complete specs for scripts introduced in support of
Layout objects/views. WTD-535.
2014-12-05 16:27:32 -08:00
Victor Woeltjen
f418491cc4 [Layout] Add empty specs
Add empty specs for new scripts introduced during the
transition of Layout object type and view, WTD-535.
2014-12-05 15:39:07 -08:00
Victor Woeltjen
2ef244edce [Layout] Refer to new scripts from test suites
Add entries for new scripts to test suites, to ensure
tests fail until scripts added to support transition
of Layout object/view (WTD-535) have been completed.
WTD-535.
2014-12-05 15:33:25 -08:00
Victor Woeltjen
ba14aeabc6 [Forms] Complete specs
Fill in new specs and amend existing specs to ensure
full coverage after integration of forms component,
and associated changes. WTD-593.
2014-12-03 17:59:37 -08:00
Victor Woeltjen
6fb5da1b35 [Forms] Prune obsolete specs
Prune obsolete specs after changes made to support
integration of forms component, WTD-593.
2014-12-03 17:26:02 -08:00
Victor Woeltjen
5aff4e3777 [Forms] Edit Properties specs
Add baseline specs (not yet matched up to current implementation)
for Edit Properties action. WTD-593.
2014-12-03 17:07:01 -08:00
Victor Woeltjen
c432a4eb1e [Common UI] Complete specs for edit mode
Add specs for remaining capabilities and capability
wrappers employed by Edit mode. Completes coverage
for bundle platform/commonUI/edit, which is being
transitioned along with other commonUI bundles in
WTD-574.
2014-11-25 10:51:23 -08:00
Victor Woeltjen
7ddfcbca9b [Common UI] Fill in spec for RemoveAction
Fill in spec for the Remove action, included as part of
the bundle platform/commonUI/edit. WTD-574.
2014-11-25 10:08:50 -08:00
Victor Woeltjen
19b4dc3fa3 [Common UI] Spec for EditAction
Fill in spec for the Edit action, which enters Edit mode
Part of bundle platform/commonUI/edit, being transitioned
for WTD-574.
2014-11-25 09:48:54 -08:00
Victor Woeltjen
2f7746df53 [Common UI] Add specs for Save/Cancel
Add specs for the save and cancel conclude-editing
actions, part of bundle platform/commonUI/edit
(Edit Mode) which is transitioned among the various
common UI bundles. WTD-574
2014-11-25 09:35:55 -08:00