Commit Graph

165 Commits

Author SHA1 Message Date
Henry
39b3e6c4a9 [Edit Mode] Limit context menu options available for objects in edit mode
[Edit Mode] Edit mode on objects that do not have a view supporting editing should edit properties instead. #320
2015-12-09 18:14:17 -08:00
Henry
856c61816c Go to original now shows prompt 2015-12-09 14:08:19 -08:00
Henry
49579378dd [New Edit Mode] Fixed positioning of dropped objects #386 2015-12-09 09:51:00 -08:00
Henry
4b7287e51e Fixed JSLint errors 2015-12-08 14:51:25 -08:00
Henry
18607e9404 Merged from Master 2015-12-07 20:42:09 -08:00
Victor Woeltjen
03edd26e17 [Edit] Return promise from editable persistence
https://github.com/nasa/openmctweb/issues/305
2015-12-01 16:45:08 -08:00
Henry
4f3c9f270b [New Edit Mode Prototype] Hide edit button when in edit mode #350. - Modified edit policy to hide edit button when in edit mode 2015-11-30 17:58:58 -08:00
Henry
64a7647ec3 #279 Added search filter support to elements pool 2015-11-25 11:20:58 -08:00
Henry
c211f413aa [New Edit Mode] Add Elements pool to New Edit Mode #279 2015-11-25 10:40:37 -08:00
Henry
7849803a5d Fixed cancel and drop-initiated edit 2015-11-20 14:00:29 -08:00
Henry
a864c172d5 [Edit Mode Prototype] #278 Added visual indication of edit 2015-11-20 10:07:58 -08:00
Henry
10a44c026c [Edit Mode] Visual indication of object being edited #278 2015-11-19 18:45:18 -08:00
Henry
4ea757faa5 Adding support for object status 2015-11-19 15:12:43 -08:00
Henry
19d2970e0e Merge in "create button initiates edit mode" 2015-11-19 14:13:28 -08:00
Henry
b06a38da2f Fixed incorrect case 2015-11-19 13:17:14 -08:00
Henry
f45e236281 #286 Fixed issues with composition not surviving through create wizard 2015-11-19 13:11:01 -08:00
Henry
2e2b18eaa5 [Edit Mode Prototype] Create button initiates edit-mode immediately #286 2015-11-19 10:33:44 -08:00
Henry
2251a0c1e9 https://github.com/nasa/openmctweb/issues/287 2015-11-17 15:01:13 -08:00
Henry
cd3bdf4f81 Change to navigate by location change 2015-11-16 17:45:31 -08:00
Henry
564a822423 Fixed saving 2015-11-12 17:05:43 -08:00
Henry
16c3229a84 Telemetry Panels now created correctly 2015-11-12 10:22:37 -08:00
Henry
f0e293a513 Virtual panels working again with refactored code 2015-11-11 14:59:00 -08:00
Henry
5f8d13672f Reverted model modified hack 2015-11-11 11:58:15 -08:00
Henry
ba8c2b8468 Fixed buttons not appearing on edit mode click 2015-11-10 22:10:43 -08:00
Henry
3e7264d6b8 Initial implementation of virtual panel 2015-10-27 17:38:31 -07:00
Henry
19bdf743fc Added save/cancel 2015-10-26 14:14:56 -07:00
Henry
0fb9f3731a Edit mode and cancel buttons work 2015-10-22 10:09:09 -07:00
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -07:00
Pete Richards
70bc17c79f Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
Victor Woeltjen
72c122e0ee Merge remote-tracking branch 'github/master' into open95b
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
2015-09-15 11:35:25 -07:00
Victor Woeltjen
c6df7cebe5 [Angular] Check for context capability
Check for existence of context capability from Remove action
during navigation check. This avoids an exception that
appears to have been swallowed in earlier versions of
Angular.
2015-09-09 17:25:02 -07: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
b9d8b124ff [Composition] Use composition.add from link action 2015-09-02 09:08:47 -07:00
Shivam Dave
7ffbc9ad2f [Remove Action] Check
Added check for traverseObject
context because prior to this,
was not checked.
2015-08-31 13:37:22 -07:00
Shivam Dave
687d86790e [Action] RemoveAction
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49: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
dadbf3f6dc [Action] RemoveAction
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
2015-08-27 09:17:11 -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
3492cd3942 [Code Style] Fix bug introduced by refactor
Do some extra checking, since capabilities may have
properties which are note methods. WTD-1482.
2015-08-12 13:57:17 -07:00
Victor Woeltjen
c450c22ddd [Code Style] Satisfy JSLint
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
2015-08-11 13:03:06 -07:00
Victor Woeltjen
aa08db1050 [Code Style] Avoid copying window/scope
Avoids Angular errors; WTD-1482.
2015-08-11 11:00:56 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle
WTD-1482.
2015-08-10 16:38:13 -07:00
Victor Woeltjen
a7a1ac70e5 [JSDoc] Remove obsolete module references
WTD-1482.
2015-08-07 12:14:40 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs
WTD-1482.
2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references
WTD-1482
2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
Shivam Dave
3d0e0af7f2 [Windowing] Remove variable
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
2015-06-25 14:28:38 -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
Shivam Dave
6d28add055 [Windowing] urlService
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
2015-06-25 13:16:15 -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
f6df73c11b Merge branch 'open-master' into open962
Merge in latest from open-master into topic branch
for WTD-962
2015-04-10 17:30:03 -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
44eb54884b [Containment] Fire a link action on drop
Fire a link action as the result of a drag-drop operation,
WTD-962.
2015-04-07 20:35:54 -07:00
Victor Woeltjen
5adcd3cd6d [Containment] Implement Link
Implement link as a basic action, to separate it out from
drop gesture such that it can be controlled by policy. For
WTD-962.
2015-04-07 20:20:56 -07:00
Victor Woeltjen
8b6a972fa4 [Edit] Avoid double-wrapping
Avoid double-wrapping editable domain objects, WTD-1071.
2015-04-06 09:30:14 -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
facf350648 [Edit] Add policy to restrict views in Edit mode
Add policy to disallow views in Edit mode which have been
explicitly flagged as non-editable, WTD-1062.
2015-04-01 15:50:15 -07:00
Victor Woeltjen
ccf2ccc4c6 [Edit] Add policy for the Edit action
Allow Edit mode only when editable views exist, WTD-1062.
2015-04-01 15:45:43 -07:00
Victor Woeltjen
dc7d504691 [Edit] Check for route changes
Respond to route changes via mct-before-unload, in order to
show a prompt to allow the user to confirm navigation changes
which do not trigger onbeforeunload (such as using back to
change the hash route). WTD-1035.
2015-03-31 14:46:11 -07:00
Victor Woeltjen
5ef382d159 [Edit] Add clarifying comments
Add clarifying comments related to checking of conditions
on unload, WTD-1035.
2015-03-31 14:39:30 -07:00
Victor Woeltjen
8a8c84eacf Merge branch 'open-master' into open1035
Merge in latest changes into topic branch for WTD-1035,
dialog warning before navigating out of Edit mode.
2015-03-31 14:32:55 -07:00
Victor Woeltjen
0090732f71 [Persistence] Handle refresh after edit
Correctly handle Discard changes after leaving Edit mode when
conflicts are detected; WTD-1033.
2015-03-24 15:53:27 -07:00
Victor Woeltjen
821cc65d6f [Edit] Remove unused code
Remove unused and/or excessive code related to Save in Edit mode.
WTD-1033.
2015-03-24 10:41:56 -07:00
Victor Woeltjen
8f288751db [Edit] Persist in a group
Invoke persist calls when leaving Edit mode in a group, instead of
in-order, to allow these revision-checking to be handling for the
group as a whole. WTD-1033.
2015-03-24 10:01:45 -07:00
Victor Woeltjen
bb4ea2d4ae [Edit] Get to true root from EditPanesController
Part of refactoring to hide objects outside of Edit mode from
the Create menus in Edit mode, WTD-922.
2015-03-18 09:56:15 -07:00
Victor Woeltjen
6e783648d6 [Edit] Hide root object
Act as if the object being edited is the root object when
in Edit mode, except in the Library pane (which has its own
means of getting the real root object.) WTD-922.
2015-03-17 18:11:46 -07:00
Victor Woeltjen
783d2f332b [Edit] Add mct-before-unload directive
Add directive for exposing expressions which should be
evaluated for the browser's onbeforeunload event, to
prevent user-initiated navigation from causing a loss
of unsaved changes. WTD-1035.
2015-03-16 17:28:10 -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
bc69f19012 [Edit] Utilize EditToolbarSelection
Utilize newer, more general-purpose selector from the
representer responsible for binding selection scope to
toolbar. WTD-929.
2015-03-03 18:34:03 -08:00
Victor Woeltjen
6c97815efb [Edit] Add Selection class
Add class to handle selection, which will be synchronized
to the toolbar. WTD-929.
2015-03-03 18:31:34 -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
988716ff01 [Edit] Refresh Library less aggressively
Update the root object (used to populate the Library pane)
less often, to avoid recreating the whole tree and thereby
causing the tree to collapse. WTD-788.
2015-02-26 16:53:15 -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
6c7dfb878b [Edit] Avoid rebuilding toolbar on edit
Avoid rebuilding the toolbar in Edit mode whenever
any change occurs to avoid losing the binding to the
current selection state; needed for color picker to
work properly for WTD-881.
2015-02-23 15:57:45 -08:00
Victor Woeltjen
f894233182 [Edit] Default to inclusive mode
Default to inclusive mode in Edit mode toolbar;
simplifies adding additional toolbar elements for
Fixed Position view, WTD-881.
2015-02-23 15:13:46 -08:00
Victor Woeltjen
c183f08886 [Edit] Fix state-watching
Repair/simplify state-watching in representer for toolbar
in edit mode; avoids issue where destroy calls detach
watches for state change in toolbar prematurely. WTD-881.
2015-02-23 14:51:17 -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
5680710c06 [Fixed Position] Implement remove
Implement remove button for selected elements in fixed
position view. WTD-879.
2015-02-18 20:12:55 -08:00
Victor Woeltjen
db2f2eb098 [Fixed Position] Improve button support
Improve button support from toolbars by adding a click
function when generating structures for mct-toolbar based
on view definitions. WTD-879.
2015-02-17 16:29:15 -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
023c12ec3b [Edit] Add toolbar representer
Add a representer to handle exposing toolbars for views in
edit mode. WTD-878.
2015-02-17 14:31:02 -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
4c42d4de28 [Actions] Restrict mutating actions
Restrict actions which cause mutation of domain objects to
types of domain objects which can be created. (This does not
include Packet or Telemetry Point, WTD-723.)
2015-01-27 13:28:12 -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
3135174491 [Edit] Utilize model cache
Utilize model cache, permitting object models in edit mode to
be reused across multiple distinct instances with unique
contexts (unique contexts are necessary to avoid ambiguity in
the Remove action, WTD-473).

To avoid infinite digest cycles as a consequence of this,
refactor context/composition capability wrappers such that the
former is idempotent (since idempotence is no longer ensured
by the EditableDomainObjectCache) to avoid infinite digest
errors in Edit mode.
2015-01-27 11:52:58 -08:00
Victor Woeltjen
431af3adbc [Edit] Implement model cache
Implement a cache to store domain object models,
to allow the cache for individual objects to distinguish
objects based on their parentage and avoid ambiguous
Remove actions (WTD-473.)
2015-01-27 11:12:33 -08:00