ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-02 03:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,663 Commits 989 Branches 212 Tags 191 MiB
7e60593501
Commit Graph

3101 Commits

Author SHA1 Message Date
Charles Hacskaylo
4f7ca98b60 Merge branch 'master' into nem468a. 
Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
 2016-01-11 13:29:26 -08:00
Charles Hacskaylo
a65ca7cb1e [Frontend] Refactor Inspector to use s-status-editing 
open #468
Removed ng-show="editMode" in object-inspector.html;
Refactored CSS as required in _inspector.scss;
Added opacity transition to splitter-inspect-panel and
split-pane-component pane bottom, but not working as desired currently:
entire inspector seems to be destroyed and recreated when switching into
and out of edit mode;
Moved <style> def for .location-item in object-inspector.html into .scss;
 2016-01-08 16:47:11 -08:00
Charles Hacskaylo
898dd557e5 [Frontend] Refactor to use s-status-editing instead of ng-class 
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
 2016-01-08 16:11:00 -08:00
Victor Woeltjen
0036974c60 Merge remote-tracking branch 'github/master' into open450b 
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json
 2016-01-08 15:36:10 -08:00
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
df631ba40e [API Refactor] Update failing specs 2016-01-08 12:58:06 -08:00
Victor Woeltjen
aa63308e0b [API Refactor] Fix JSLint failures 
Fix JSLint failures by excluding top-level code,
and by explicitly declaring variable require.
 2016-01-08 12:36:48 -08:00
Victor Woeltjen
72c721b605 [API] Remove bundles.json 
...and make its usage optional.
 2016-01-08 09:54:02 -08:00
Victor Woeltjen
1443ab61e3 [API] Obey strict DI from FormController 2016-01-08 09:42:38 -08:00
Victor Woeltjen
2b4d6c111c [API] Fix logging of paths 
When extensions have an explicitly-declared implementation,
do not log that they are being loaded.
 2016-01-07 16:06:04 -08:00
Victor Woeltjen
7728d308f2 [API] Obey strict DI rules 
Fix unintended implicit DI usage in  configuration
 2016-01-07 16:03:36 -08:00
Victor Woeltjen
9babe7167e [API] Enable strict DI 
...to facilitate detection of any issues with
optimizability of legacy support for imperative
registration.
 2016-01-07 15:56:09 -08:00
Victor Woeltjen
52579fefe1 [API] Simplify RequireJS config 2016-01-07 15:29:19 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Victor Woeltjen
5bbbdd4e50 [API] Fix explicit implementation assignments 2016-01-07 15:01:57 -08:00
Victor Woeltjen
4ed1836ae5 [API] Allow implementations to be passed directly 
Allow implementations to be passed in as values,
instead of strings, facilitating the loading of
said implementations via RequireJS.
 2016-01-07 15:01:39 -08:00
Victor Woeltjen
612dd7db2c [API] Expose browse through legacy registry 2016-01-06 17:54:56 -08:00
Victor Woeltjen
b87dd5def6 [API] Fix paths for legacyRegistry 2016-01-06 17:50:05 -08:00
Henry
a6ecda9cab Resolved conflict 2016-01-06 14:06:28 -08:00
Henry
b20488e77d Merged conflict 2016-01-06 14:05:40 -08:00
akhenry
05a909f66f Merge pull request #451 from nasa/open116 
[Time Conductor] Improve test coverage
 2016-01-06 13:26:33 -08:00
Victor Woeltjen
2436c32e6d [Time Conductor] Split test cases 
Verify table structure separately from table contents
per code review feedback,
https://github.com/nasa/openmctweb/pull/451/files#r48999214
 2016-01-06 13:00:16 -08:00
Victor Woeltjen
a39e8e44f0 [API] Load bundles from imperative registry 2016-01-06 11:22:44 -08:00
Victor Woeltjen
65fb5ab2a5 [API] Move angular dependency inward 2016-01-06 11:15:36 -08:00
Victor Woeltjen
9f66f39d8d [API] Add a top-level main.js 
...which can depend upon the bundle registry, as well
as a set of installed bundles.

https://github.com/nasa/openmctweb/issues/450
 2016-01-06 10:59:21 -08:00
Victor Woeltjen
fdc875379f [API] Refactor out application initialization 
...to simplify insertion of an imperative bundle registry,
WTD-450.
 2016-01-06 10:44:53 -08:00
Victor Woeltjen
83bdf7343d [Common UI] Test mct-splitter 
WTD-1400
 2016-01-05 10:14:25 -08:00
Victor Woeltjen
46e524a3b6 [Common UI] Begin testing mct-splitter 
WTD-1400
 2016-01-04 14:25:43 -08:00
Victor Woeltjen
22b7bb07aa [Common UI] Add mct-split-pane test cases 
...sufficient for full line coverage. WTD-1400
 2016-01-04 12:19:33 -08:00
Victor Woeltjen
7a25733be0 [Common UI] Remove obsolete split-pane container 
Remove obsolete split-pane container and associated
controller; this behavior is now handled by the
mct-split-pane directive.

Part of updates to tests for the mct-split-pane
directive, WTD-1400
 2016-01-04 11:34:24 -08:00
Victor Woeltjen
b9146fbeac [Time Conductor] Test TelemetryHandle.getDatum 
Test ability to look up datum object by index (used to
support evaluation of limit state in Fixed Position and
similar single-value views while time conducting.)
 2015-12-30 10:23:02 -08:00
Victor Woeltjen
a49deb5ab1 Merge remote-tracking branch 'github/master' into open116 
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116

Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
	platform/features/plot/test/PlotControllerSpec.js
 2015-12-30 10:15:05 -08:00
Victor Woeltjen
9b63a63efc Merge pull request #379 from nasa/open1337 
[Limits] Add test cases for limits
 2015-12-30 10:11:27 -08:00
Victor Woeltjen
2358541d91 [Time Conductor] Update RangeColumn spec 
Update RangeColumn spec. Changes appear to have been related
to limits (WTD-1337), but making changes in the context of
updating tests for time conductor,
https://github.com/nasa/openmctweb/issues/116
 2015-12-30 10:10:23 -08:00
Victor Woeltjen
38b5756d8d [Time Conductor] Verify plot bounds retention 
Verify that the domain axis of a plot retains bounds from
the time conductor, instead of doing its default behavior
of fitting to the data.
 2015-12-30 10:04:04 -08:00
Victor Woeltjen
c436bcce0a [Time Conductor] Test updated fixed position behavior 
Verify interactions from FixedControllers on events
issued by the time conductor.
 2015-12-30 09:29:24 -08:00
Victor Woeltjen
f0a5a836d6 Merge pull request #421 from nasa/open336 
Review and integrate open336
 2015-12-30 09:04:21 -08:00
Victor Woeltjen
2b0f6dd577 Merge pull request #437 from nasa/open431 
Review and integrate open431
 2015-12-30 09:02:42 -08:00
Victor Woeltjen
30fec7c2ac [Time Conductor] Test mct-click-elsewhere 2015-12-29 15:37:09 -08:00
Victor Woeltjen
3f4ed46c1c [Time Conductor] More tests for date-time picker 
Sufficient for 100% line coverage.
 2015-12-29 15:26:18 -08:00
Victor Woeltjen
ba4c66866c [Time Conductor] Add tests for date-time picker 2015-12-29 13:59:06 -08:00
Victor Woeltjen
fcee30c27e [Mobile] Test agentService.isTouch 2015-12-29 12:58:24 -08:00
Victor Woeltjen
560825cc86 [Mobile] Test DeviceMatchers 2015-12-29 12:55:17 -08:00
Victor Woeltjen
2df61998ab [Mobile] Detect touch support 2015-12-29 12:43:46 -08:00
Victor Woeltjen
91b42fc0cc [Mobile] Test DeviceClassifier 2015-12-29 12:41:38 -08:00
Victor Woeltjen
5eac0bc5d9 [Mobile] Include classifier as runs extension 
...to ensure that body gets device-related classes applied
when the application starts.
 2015-12-29 12:02:03 -08:00
Victor Woeltjen
d397f0f283 [Mobile] Add classes to body 
Add classes describing device characteristics to the
body of the current document at start-up. Refactor
device matchers out of the mct-device directive for
reuse and consistency here.

https://github.com/nasa/openmctweb/issues/169
 2015-12-29 11:59:41 -08:00
Victor Woeltjen
5f96861c44 [Duplicate] Handle single-element ID arrays 
Avoid type coercion related errors when testing to
see if a value is an ID that needs to be remapped.
 2015-12-17 15:10:15 -08:00
Victor Woeltjen
995d71f901 [Duplicate] Add test case 
Add test case for single-element string arrays, to
replicate bug around type coercion.

https://github.com/nasa/openmctweb/issues/444
 2015-12-17 15:07:16 -08:00
Pete Richards
82e4a53472 Merge remote-tracking branch 'github-open/open-warp1596b' into open-master 2015-12-17 14:20:18 -08:00
Charles Hacskaylo
e7a41061c6 [Frontend] Hiding filter input in autoflow element when in Layout 
open #425
(cherry picked from commit 119613e)
 2015-12-17 14:11:39 -08:00
Victor Woeltjen
4848a61e21 Merge pull request #439 from nasa/open428 
Fixed bug in copying #428
 2015-12-17 13:55:55 -08:00
Henry
6302e45c10 Fixed bug in copying #428 2015-12-17 13:47:31 -08:00
Victor Woeltjen
451157b653 Merge pull request #432 from nasa/open426 
Review and integrate open426
 2015-12-17 13:38:45 -08:00
Charles Hacskaylo
ae89a169d0 [Frontend] s-status-pending sanding and polishing 
open #431
Cleanups, comment removal; Inspector location items
with s-status-pending tweaked;
Fixed grid-item background class;
 2015-12-17 12:24:57 -08:00
Charles Hacskaylo
941d0d0057 [Frontend] Tree sanding and polishing 
open #431
Fixed vertical margins problem in tree and search results;
 2015-12-17 10:49:39 -08:00
Charles Hacskaylo
0296cfe3c1 [Frontend] Mobile sanding and polishing 
open #431
Fixed hiding of "search by type" in phone only;
Fixed search-input magnify glass z-index value;
Fixed tree search results heights;
 2015-12-17 10:21:06 -08:00
Pete Richards
f55168d1ac Merge remote-tracking branch 'github-open/open-warp1596' into open-master 2015-12-17 09:39:38 -08:00
Charles Hacskaylo
3c4fb8c43d [Frontend] Final final sanding on label flex-box conversion 
open #431
Tweaks for labels in Inspector;
 2015-12-16 17:38:02 -08:00
Charles Hacskaylo
ed7e16d341 [Frontend] More sanding on label flex-box conversion 
open #431
Moved object-label classes into their own include;
Fixing object-label in edit Elements pool and
Inspector; mixin refactoring;
 2015-12-16 17:32:43 -08:00
Charles Hacskaylo
9dc958b952 [Frontend] Final sanding on label flex-box conversion 
open #431
Fixed positioning for l-icon-link when applied to
inspection-location object;
 2015-12-16 16:49:16 -08:00
Charles Hacskaylo
ed3ee1099d [Frontend] Final sanding on adding s-status-pending 
open #431
Italicized text; Comments cleaned up;
To-do: fix regressed label elements in Inspector;
 2015-12-16 16:38:06 -08:00
Charles Hacskaylo
7fb506d4df Merge branch 'open431' of https://github.com/nasa/openmctweb into open431 2015-12-16 16:10:06 -08:00
Charles Hacskaylo
67707678a8 Merge branch 'master' of https://github.com/nasa/openmctweb into open431 2015-12-16 16:08:23 -08:00
Charles Hacskaylo
930b13f9a0 [Frontend] Added s-status-pending spinner to tree-item 
open #431
Refinements of tree item sizes and spacing;
Polished spinner-related classes;
Moved l-icon-link icon into -glyph element;
 2015-12-16 16:06:31 -08:00
Charles Hacskaylo
b59fc43038 [Frontend] Converting tree items and labels to flex-box 
open #431
Mobile fixes complete;
 2015-12-16 14:52:19 -08:00
Charles Hacskaylo
9b32461240 [Frontend] Converting tree items and labels to flex-box 
open #431
In-progress fixing mobile;
Mostly done, link icon in mobile needs
better positioning;
 2015-12-16 13:26:30 -08:00
Charles Hacskaylo
d1f617a54e [Frontend] Converting tree items and labels to flex-box 
open #431
In-progress fixing mobile;
Removed desktop and mobile-specific hide/show;
 2015-12-16 11:50:46 -08:00
Henry
83e77303aa [Copy] Duplication of layouts does not retain position and size of all elements. #428 2015-12-16 11:11:20 -08:00
Charles Hacskaylo
65a1d7495d [Frontend] Converting tree items and labels to flex-box 
open #431
In-progress;
TO-DO: need to fix mobile styles!
 2015-12-15 18:17:06 -08:00
Charles Hacskaylo
a98ab958c9 [Frontend] Adding s-status-pending classes to tree item labels 
open #431
In-progress;
 2015-12-15 17:06:47 -08:00
Charles Hacskaylo
6e1cadf338 [Frontend] Fixed splitter and related elements when collapsed 
open #426
Adds CSS to turn off pointer-events for the splitter, treeview
and inspect elements when they are in a collapsed state;
 2015-12-15 15:47:32 -08:00
Charles Hacskaylo
83a9b984e5 [Frontend] Recompile CSS after integration of open1596 
open #425
warp#1596
Recompile CSS after integration of cherry-pick from open1596;
 2015-12-14 15:28:48 -08:00
Charles Hacskaylo
978df93ffd [Frontend] Cherry-picking platform CSS mods for autoflow view 
warp #1596
open #425
Changes to autoflow styles, particularly in header;
Cleanup in effects.scss; CSS to be re-compiled;
(cherry picked from commit 5848077)
 2015-12-14 15:22:08 -08:00
akhenry
4e5cefbf03 Merge pull request #418 from nasa/open341 
Review and integrate open341
 2015-12-14 10:41:07 -08:00
Henry
cf73f3a0c4 Moved gesture from individual views up to browse-object.html for now to resolve #423 2015-12-11 16:42:05 -08:00
Henry
367d1b0247 [Edit] Drag-drop on folder triggers edit mode #420 2015-12-11 16:14:00 -08:00
Charles Hacskaylo
33b1c1689c [Frontend] Added classes for no-collapse indicator 
open #304
Added classes string and related classes to ClockIndicator;
 2015-12-11 15:49:50 -08:00
akhenry
0cfc070f3c Merge pull request #394 from nasa/open332 
[Duplicate] Rewrite identifiers in clones
 2015-12-11 15:06:34 -08:00
Charles Hacskaylo
21fd16ddf1 [Frontend] Delay added to expanded status indicator collapse 
open #336
 2015-12-11 15:02:10 -08:00
Charles Hacskaylo
24d28d6ec2 [Frontend] Fixed z-index problem with child-frames 
open nem_prototype
open #341
Added discrete z-index definition for frame.child-frame.panel;
 2015-12-11 14:47:25 -08:00
Victor Woeltjen
43f6981ba1 [Browse] Test navigation when path is not found 2015-12-11 13:21:52 -08:00
Victor Woeltjen
b8206b8824 [Browse] Ensure selection at startup 
...even when domain object identified by default path is
not found.
 2015-12-11 13:18:25 -08:00
Victor Woeltjen
5f7f349f29 [Browse] Specify default selection in a constant 
https://github.com/nasa/openmctweb/issues/401
 2015-12-11 12:31:06 -08:00
Victor Woeltjen
de88bf94d4 [Documentation] Fix type declaration 
Rephrase parameter type to something JSDoc can parse.

https://github.com/nasa/openmctweb/issues/411
 2015-12-11 10:51:16 -08:00
Henry
0ce19ad75d Disabled context menu for Location items in edit mode, and disabled context menu items for non-creatable objects 2015-12-10 17:39:56 -08:00
Henry
b32eb363f1 Fixed edit action and editable view policies for NEM 2015-12-10 16:53:25 -08:00
Henry
02e89f9c73 Merge branch 'open320' into nem_prototype 2015-12-10 14:39:34 -08:00
Henry
5cc80c737c Updated editable view policies 2015-12-10 14:39:22 -08:00
Henry
8c837c5f81 Simplified logic in EditableActionCapability 2015-12-10 14:09:56 -08:00
Henry
f96fa33d88 Removed some additional context menu options 2015-12-10 13:49:05 -08:00
Henry
ac379dbb3f [New Edit Mode] Create menu still visible when edit mode initiated by pressing create #407 2015-12-10 10:25:38 -08:00
Henry
5fd762fea9 Fixed problem with unload warning being shown when it shouldn't 2015-12-09 21:04:22 -08:00
Henry
322db5a0f5 Tweaked object creation 2015-12-09 20:57:23 -08:00
Henry
708aa7dcba Updated check for edit mode on create 2015-12-09 20:37:15 -08:00
Henry
a399b78d2c Fixed JSLint errors 2015-12-09 18:39:57 -08:00
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
2145bcf908 Re-enabled plots and scrolling 2015-12-09 17:25:48 -08:00
Henry
de256835fd [Edit Mode] Edit mode on objects that do not have a view supporting editing should edit properties instead. #320 2015-12-09 15:51:00 -08:00
Henry
2ca414d2a4 [New Edit Mode] Selecting 'Go To Original' from elements pool navigates without prompting user to save changes #396 2015-12-09 15:23:26 -08:00
Henry
856c61816c Go to original now shows prompt 2015-12-09 14:08:19 -08:00
Victor Woeltjen
8077cdb834 [Clocks/Timers] Make $scope available 
...to methods of TimerController
 2015-12-09 12:41:29 -08:00
Victor Woeltjen
7871af07c4 [Clocks/Timers] Fix parent constructor invocations 2015-12-09 12:40:21 -08:00
Victor Woeltjen
714ae3b9dc [Clocks/Timers] Update remaining classes 
Complete code style changes for Clocks/Timers.
 2015-12-09 12:39:01 -08:00
Victor Woeltjen
27fa56d838 [Clocks/Timers] Update code style for controllers 2015-12-09 12:33:11 -08:00
Victor Woeltjen
e30a82432d [Clocks/Timers] Update code style for actions 
https://github.com/nasa/openmctweb/issues/209
 2015-12-09 12:17:32 -08:00
akhenry
3d346b8906 Merge pull request #393 from nasa/open199f 
Review and integrate open199f
 2015-12-09 10:18:56 -08:00
Charles Hacskaylo
3730315388 [Frontend] Fixed hidden Create menu regression error 
open #199
open #278
 2015-12-09 10:11:44 -08:00
Henry
6058e50216 JSLint fixes 2015-12-09 10:04:49 -08:00
Henry
49579378dd [New Edit Mode] Fixed positioning of dropped objects #386 2015-12-09 09:51:00 -08:00
Victor Woeltjen
19f07aa398 [Duplicate] Add trailing newline 2015-12-08 16:34:36 -08:00
Henry
aae8f1575d Disabled drop gesture on browse-object to prevent drop being triggered twice 2015-12-08 16:28:30 -08:00
Victor Woeltjen
46f9b31cff [Duplicate] Test rewriting of identifiers 2015-12-08 16:27:46 -08:00
Charles Hacskaylo
267bcfeb8b [Frontend] Hide Create button when editing 
open #199
open #278
Hides Create button when s-status-editing applied;
Adds margin to search-bar input element when
Create button is hidden per above;
 2015-12-08 15:54:32 -08:00
Victor Woeltjen
e32feb29e2 [Duplicate] Rewrite identifiers in clones 
Traverse object models of clones and rewrite domain object
identifiers that have changed during duplication.

Addresses https://github.com/nasa/openmctweb/issues/332
 2015-12-08 15:45:45 -08:00
Henry
b5c741c911 Merge branch 'master' into open199 2015-12-08 15:42:37 -08:00
Henry
773cedddd5 Recompiled css 2015-12-08 15:37:22 -08:00
Pete Richards
89a93e2966 Merge remote-tracking branch 'github-open/open384' into open-master 2015-12-08 15:18:21 -08:00
Henry
55ea7a285e Merge remote-tracking branch 'origin/open199e' into open199 2015-12-08 15:17:36 -08:00
Henry
4419a101d6 [New Edit Mode] #199 Disabled all failing tests 2015-12-08 15:15:54 -08:00
Victor Woeltjen
038322e9aa [Layout] Update raw positions on drop 
When handling a drop into the layout, store the panel's
new position to the LayoutController's internal table of
raw positions (in addition to writing it to the configuration.)

Avoids https://github.com/nasa/openmctweb/issues/384
 2015-12-08 15:08:30 -08:00
Henry
4b7287e51e Fixed JSLint errors 2015-12-08 14:51:25 -08:00
Charles Hacskaylo
6502d36c7a [Frontend] Migrated to s-status-editing 
open #199
open #278
Changed CSS to use s-status-editing instead of .active
class;
Refined style defs to explicitly target tree and
search-results children in order to avoid items in
Inspector Elements pool from being designated as
being edited;
Removed {{searchText}} div from input-filter;
 2015-12-08 14:16:54 -08:00
Henry
4fbf547bfc Corrected merge issues from Master 2015-12-08 14:07:32 -08:00
Victor Woeltjen
6cef663db5 [Representation] Add ending newline 2015-12-08 13:43:41 -08:00
Victor Woeltjen
b2f5861458 [Representation] Test template prefetcher 2015-12-08 13:29:11 -08:00
Victor Woeltjen
f8809ce67f [Representation] Also prefetch containers 2015-12-08 13:06:24 -08:00
Victor Woeltjen
3c97eb6014 [Representation] Remove obsolete template definition 2015-12-08 12:59:41 -08:00
Victor Woeltjen
3498b0a50a [Representation] Prefetch templates 
...to ensure that dialogs et al can be displayed, even
after loss of network connectivity.

https://github.com/nasa/openmctweb/issues/383
 2015-12-08 12:59:18 -08:00
Henry
18607e9404 Merged from Master 2015-12-07 20:42:09 -08:00
Victor Woeltjen
14c5a817a7 [Limits] Test exposure of datum 
...which will be used to evaluate limits.
 2015-12-07 13:22:40 -08:00
Victor Woeltjen
258c5d95e6 [Limits] Test PlotLimitTracker 2015-12-07 12:58:56 -08:00
Victor Woeltjen
30a8ba5c11 [Limits] Test limit usage in PlotController 
WTD-1337
 2015-12-07 12:45:40 -08:00
Victor Woeltjen
33c372765f [Limits] Test limit usage from Fixed Position 
WTD-1337
 2015-12-07 12:33:29 -08:00
akhenry
ed7e0d8b0a Merge pull request #376 from nasa/open169b 
Review and integrate open169b
 2015-12-04 16:29:32 -08:00
Charles Hacskaylo
f3828ba516 [Frontend] Adjusted desktop breakpoint 
open #169
 2015-12-04 15:55:32 -08:00
akhenry
2a48c25453 Merge pull request #375 from nasa/open137 
Show warning for unsupported browsers
 2015-12-04 15:43:23 -08:00
akhenry
096da0cb94 Merge pull request #347 from nasa/open259b 
[Time Conductor] Don't update model while typing (v2)
 2015-12-04 15:34:03 -08:00
Charles Hacskaylo
ca8a07e1ae Merge remote-tracking branch 'github/open169a' into open169b 2015-12-04 15:33:49 -08:00
Victor Woeltjen
c02f965460 [Time Conductor] Remove unused property 
...from structure passed into date-time field. Note in
code review, https://github.com/nasa/openmctweb/pull/347
 2015-12-04 15:19:34 -08:00
Victor Woeltjen
5f440bb6de Merge pull request #372 from nasa/open58_notification 
[Persistence] Errors in persistence (after creating/modifying objects) should be visible to user #58
 2015-12-04 15:15:29 -08:00
Victor Woeltjen
fc729279ec [Common UI] Add spec for unsupported browser warning 2015-12-04 15:11:40 -08:00
Victor Woeltjen
d2a4a85e04 [Common UI] Test agentService.isBrowser 2015-12-04 14:12:00 -08:00
Victor Woeltjen
37890280ae [Common UI] Only show warning for unsupported browsers 2015-12-04 14:08:42 -08:00
Victor Woeltjen
a6ceae4045 [Common UI] Show warning at startup 
Show a warning about unsupported browsers at startup,
https://github.com/nasa/openmctweb/issues/137
 2015-12-04 13:53:45 -08:00
akhenry
3447e735dc Merge pull request #362 from nasa/open346 
[Entanglement] Add "Set Primary Location" action
 2015-12-04 13:48:27 -08:00
akhenry
b35224061f Merge pull request #374 from nasa/open305 
[Edit] Return a promise from editable persistence capability
 2015-12-04 12:44:08 -08:00
Victor Woeltjen
d5f054e328 [Edit] Test return type 
...from the edit-mode-wrapped persistence capability.
 2015-12-04 11:20:19 -08:00
Henry
eb4959cf49 [persistence] #58 renamed alertService to notificationService 2015-12-04 10:45:49 -08:00
Victor Woeltjen
cce415fc51 Merge pull request #371 from nasa/open338 
#338 [Copy] Copying an object with telemetry from the data dictionary results in a number of unknown objects in copied tree
 2015-12-04 09:46:24 -08:00
Henry
00f96c314a [persistence] #58 added tests for notification on persistence error 2015-12-03 20:32:03 -08:00
Victor Woeltjen
fefd27162c [Entanglement] Allow cross-space linking 
Allow links across spaces; only disallow move or copy.
Addresses WTD-1587
 2015-12-03 20:32:03 -08:00
Henry
b388c76e45 [copy] #338 Modified check to set object location, added setLocation flag, Removed unused parameter 2015-12-03 19:00:44 -08:00
akhenry
aaeaf3a096 Merge pull request #370 from nasa/open369 
[Performance] Fix usages of $interval
 2015-12-03 18:31:17 -08:00
Henry
57efe4e0d1 Removed UUID reference 2015-12-03 17:10:28 -08:00
Victor Woeltjen
dd4dbc9326 [Performance] Update spec for ElasticIndicator 
...to reflect changes in  call to reduce digest frequency.
 2015-12-03 16:45:30 -08:00
Henry
6aa77ff468 #338 fixed failing test 2015-12-03 16:41:06 -08:00
Henry
f8099550bd [Copy] #338 updated code style in CreationPolicy 2015-12-03 16:22:45 -08:00
Henry
96249e6bcc Removed redundant line in test spec 2015-12-03 15:51:27 -08:00
Henry
6e391098a3 Fixed jslint error 2015-12-03 15:32:26 -08:00
Henry
baec0f9719 #338 added new test case for creation of links when object type is not createable 2015-12-03 15:28:07 -08:00
Henry
6aab9f4e34 Added test for linking 2015-12-03 14:47:42 -08:00
Victor Woeltjen
1bf73935e4 [Performance] Add test case for mct-split-pane 2015-12-03 13:56:57 -08:00
Victor Woeltjen
49e51d0a62 [Performance] Update mct-chart spec 2015-12-03 13:39:37 -08:00
Victor Woeltjen
3e7bc2f37f [Performance] Don't invoke apply from indicator 
Don't invoke apply while polling from ElasticSearch
indicator; let the corresponding  request trigger
this.
 2015-12-03 13:29:54 -08:00
Victor Woeltjen
0f56fd2561 [Performance] Only invoke apply on size changes 
...as detected from mct-chart.
 2015-12-03 13:28:32 -08:00
Victor Woeltjen
9f0114eb39 [Performance] Don't invoke apply from MCTSplitPane 
Don't invoke apply on every  from MCTSplitPane
(this had been intended behavior, but argument was misplaced.)
 2015-12-03 13:27:59 -08:00
Henry
734e979c94 #338 Fixed failing tests after refactor 2015-12-03 12:49:54 -08:00
akhenry
983973843e Merge pull request #363 from nasa/open302 
[Representation] Check full path when comparing domain objects
 2015-12-03 10:01:35 -08:00
Henry
3b427c31a2 Fixed error with not properly referenced 2015-12-02 19:18:50 -08:00
Henry
cee0ecf0ef Removed use of composition and mutation because they trigger the search indexer too early and it tries to retrieve objects that have not been persisted yet 2015-12-02 19:10:10 -08:00
Henry
8e3c5db3bf #338 fixed incorrect 'allow' function specification in CreationPolicy 2015-12-02 14:14:04 -08:00
Henry
11d8daf3ed #338 Fixed incorrect specification of CreationPolicy in bundle.json 2015-12-02 14:07:08 -08:00
Henry
9953e16415 #338 Copy now using target persistence space 2015-12-02 14:06:22 -08:00
Henry
fe600de0f7 [Copy] #338 added CreationPolicy and appropriate tests, amended CreateActionProvider, and updated existing tests 2015-12-02 11:28:49 -08:00
Victor Woeltjen
386f1f20ff [Representation] Test switching between links 
Add test case to verify that representation gets refreshed
when switching among two linked instances of the same
domain object.
 2015-12-02 10:49:18 -08:00
Victor Woeltjen
5e07951892 [Representation] Handle missing context 
Handle missing context when generating an ID path;
this is missing in the root object.
 2015-12-02 10:23:11 -08:00
Victor Woeltjen
2514e44083 [Representation] Check full ID path 
...when determining if a representation needs to be
refreshed. Avoids representations becoming stale
when switching or navigating among linked instances
of the same domain object.

https://github.com/nasa/openmctweb/issues/302
 2015-12-02 10:21:00 -08:00
Henry
20d9c7158e Added jslint es5 mode 2015-12-01 22:40:50 -08:00
Henry
d8e319ebf8 Fixing jslint errors 2015-12-01 22:36:23 -08:00
Henry
a39cbbd917 Fixing jslint errors 2015-12-01 22:35:28 -08:00
Henry
8df27a1c05 Fixing jslint errors 2015-12-01 22:34:26 -08:00
Henry
26cf9c14f4 [Persistence] Errors in persistence (after creating/modifying objects) should be visible to user #58 2015-12-01 22:03:53 -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
Victor Woeltjen
571f6d183a [Entanglement] Expose Set Primary Location 2015-12-01 16:26:19 -08:00
Victor Woeltjen
1292e39c46 [Entanglement] Implement Set Primary Location 2015-12-01 16:20:30 -08:00
Victor Woeltjen
6fe3f82fb1 [Entanglement] Add test for Set Primary Location 
https://github.com/nasa/openmctweb/issues/346
 2015-12-01 15:59:37 -08:00
Charles Hacskaylo
5fd55939a9 [Frontend] Fixed overflow problem that was hiding toolbar menu 
open #199
open #283
Tweaks to .tool-bar layout to handle very
narrow widths;
 2015-12-01 09:12:33 -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
Charles Hacskaylo
da8fb99e82 [Frontend] Fixing bad breakpoints for tablet vs. desktop 
open #169
 2015-11-30 15:57:45 -08:00
Victor Woeltjen
c8d77bc2db [Entanglement] Allow cross-space linking 
Allow links across spaces; only disallow move or copy.
Addresses WTD-1587
 2015-11-30 15:27:10 -08:00
Henry
acb7d4b807 renamed variable 2015-11-30 09:35:44 -08:00
Henry
6fb6f54cfa Fixed objects being dropped twice in fixed layout 2015-11-27 15:21:24 -08:00
Victor Woeltjen
b5e52fce75 [Time Conductor] Remove redundant test block 2015-11-27 14:48:48 -08:00
Victor Woeltjen
3afcb52934 [Time Conductor] Use ng-blur from template 2015-11-27 14:35:51 -08:00
Victor Woeltjen
677b0cffec [Time Conductor] Test form isolation 
Verify that form inputs are ignored until some explicit trigger
 2015-11-27 14:33:35 -08:00
Victor Woeltjen
248bc68f0d [Time Conductor] Test restoration of old values 
...and clarify name of the function in scope which does this.
 2015-11-27 14:23:30 -08:00
Henry
9a42cb4f7e Merge branch 'open277' into open199 2015-11-27 14:16:59 -08:00
Henry
b573b3a681 Amended change so that context menu only suppressed on navigation menu 2015-11-27 14:16:37 -08:00
Henry
6558461fda Reverted changes after refactor 2015-11-27 13:05:55 -08:00
Henry
4b23e3fbcb Refactored changes to ContextMenuGesture.js 2015-11-27 13:02:19 -08:00
Victor Woeltjen
57d23c3696 [Time Conductor] Add missing license header 2015-11-27 12:37:51 -08:00
Victor Woeltjen
8babfc5ca9 [Time Conductor] Propogate blur from text field 2015-11-27 12:37:23 -08:00
Victor Woeltjen
271b5d1a73 [Time Conductor] Test choices via picker 
...to ensure that they trigger blur events. Also, test changes
via text entry to ensure that they don't (the template is responsible
for this.)
 2015-11-27 12:36:40 -08:00
Victor Woeltjen
7d4e7a0925 [Time Conductor] Allow ng-blur on mct-controls 2015-11-27 12:29:53 -08:00
Victor Woeltjen
3fd4304de1 Merge pull request #345 from nasa/open32 
[Layout] Layout rebuilds after resize/reposition #32
 2015-11-27 09:59:01 -08:00
Henry
db7224486c [Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32 2015-11-25 19:11:29 -08:00
Henry
6d0f3c7faa [Layout] Layout rebuilds after resize/reposition #32 
Refactored layoutPanels method

Fixed JSLint errors

fixed failing tests
 2015-11-25 15:30:33 -08:00
Henry
988323bdbd merged Open32 2015-11-25 14:59:47 -08:00
Henry
9eb8158c4e [Edit Mode] Disallow context menu actions on tree items during edit mode. #277 2015-11-25 14:44:31 -08:00
Henry
3b9cd5f1ac Merge branch 'open279-proto' into open199-merge 2015-11-25 11:25:00 -08:00
Victor Woeltjen
ffff13205a [Time Conductor] Check for value changes 
...on watches triggered from the picker. Only want to
trigger a submit when this actually constitutes a change from
the datetime field's underlying model (to avoid triggering
form submission when datetime picker is initialized.)
 2015-11-25 11:21:51 -08:00
Henry
64a7647ec3 #279 Added search filter support to elements pool 2015-11-25 11:20:58 -08:00
Victor Woeltjen
16efd85dfc [Time Conductor] Submit immediately on picker changes 2015-11-25 11:16:31 -08:00
Victor Woeltjen
1ef09ffbdd [Time Conductor] Restore last valid values 
Restore last valid values on blur, in a date-time entry field.
 2015-11-25 11:12:41 -08:00
Victor Woeltjen
976ecce075 [Time Conductor] Update model on submit/blur 2015-11-25 11:09:11 -08:00
Victor Woeltjen
87a51a9eb3 [Time Conductor] Listen for blur, submit 
https://github.com/nasa/openmctweb/issues/259
 2015-11-25 11:02:03 -08:00
Henry
9ed10ba9da Merge branch 'open279-proto' into open199-merge 2015-11-25 10:47:21 -08:00
Henry
c211f413aa [New Edit Mode] Add Elements pool to New Edit Mode #279 2015-11-25 10:40:37 -08:00
Henry
268a2c2427 Merged from master 2015-11-25 09:04:11 -08:00
Henry
c84de00e80 [Layout] Layout rebuilds after resize/reposition #32 2015-11-24 21:51:10 -08:00
Victor Woeltjen
15ec9df538 Merge pull request #327 from nasa/open208b 
[Timelines] Bring over CSS
 2015-11-23 10:38:02 -08:00
Victor Woeltjen
7974ffdda2 Merge remote-tracking branch 'github/master' into open245b 
...in preparation to complete merge nasa/openmctweb#257

Conflicts:
	platform/entanglement/src/actions/CopyAction.js
	platform/entanglement/src/actions/LinkAction.js
	platform/entanglement/src/actions/MoveAction.js
 2015-11-21 07:05:51 -08:00
Victor Woeltjen
d5858622ba [Persistence] Fix grammar in JSDoc 
...and add some explanation of METHOD_DEFAULTS.
 2015-11-21 06:59:12 -08:00
Victor Woeltjen
096fee8b6d Merge remote-tracking branch 'github/master' into open208b 
Conflicts:
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2015-11-21 06:42:45 -08:00
Victor Woeltjen
0635e7c38e [Timeline] Disambiguate datetime control 
Timeline uses a custom date-time control on creation;
use a distinct key for this to avoid a naming collision
with platform's datetime. Addresses abnormal behavior
identified in nasa/openmctweb#208
 2015-11-20 17:26:43 -08:00
Victor Woeltjen
845b1dcd6f Merge pull request #321 from nasa/open169 
Review and integrate open169
 2015-11-20 17:13:39 -08:00
Victor Woeltjen
e6c9cbf0cd [Persistence] Clarify JSDoc 
Per code review feedback, nasa/openmctweb#257
 2015-11-20 17:08:39 -08:00
Charles Hacskaylo
fd3059b380 [Frontend] Final cleanups, tweaks; Refactored s-icon-btn 
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
 2015-11-20 16:47:04 -08:00
Charles Hacskaylo
5a7349117a [Frontend] Cleanups to Timeline tabular label elements 
open #208
Colors normalized for theming;
 2015-11-20 16:27:26 -08:00
Charles Hacskaylo
50134bbc7f [Frontend] Theming and cleanups in Clocks and Timers 
open #208
Also converted timer to use flexbox layout;
 2015-11-20 16:19:27 -08:00
Charles Hacskaylo
3854df27d8 [Frontend] Styling on Timeline zoom buttons 
open #208
Fixed in both themes;
 2015-11-20 15:42:08 -08:00
Charles Hacskaylo
fc53dbd8a4 [Frontend] Themes added to Timelines 
open #208
Espresso and Snow now supported; bulk of
work done except for minor cleanups, like zoom
buttons; Dragging not working currently in Timelines;
 2015-11-20 15:23:08 -08:00
Henry
7849803a5d Fixed cancel and drop-initiated edit 2015-11-20 14:00:29 -08:00
akhenry
fb0ba0cff9 Merge pull request #323 from nasa/open251 
Review and integrate open251
 2015-11-20 13:30:24 -08:00
akhenry
573e5608fc Merge pull request #319 from nasa/open-status-tracking 
[Status] Add status tracking
 2015-11-20 13:18:09 -08:00
Victor Woeltjen
37a7c2b1df Merge pull request #309 from nasa/open308 
[Workers] Allow web workers to be shared
 2015-11-20 11:40:26 -08:00
Henry
4f0f9e4104 Merge branch 'open-status-tracking' into open278 2015-11-20 11:28:06 -08:00
Henry
e6054b8252 #287 - modified to use s-status-editing, but CSS needed 2015-11-20 11:23:34 -08:00
Victor Woeltjen
38274728f6 [Workers] Update JSDoc 
...per review feedback, nasa/openmctweb#309
 2015-11-20 11:12:29 -08:00
Henry
a864c172d5 [Edit Mode Prototype] #278 Added visual indication of edit 2015-11-20 10:07:58 -08:00
Victor Woeltjen
400b992ec3 [Status] Revise API 
Change method names, add a getter to status capability;
per code review feedback, nasa/openmctweb#319.
 2015-11-20 09:46:08 -08:00
Charles Hacskaylo
de59f191b8 [Frontend] Relocating files 
open #208
Moving initial files into new positions, based
on Victor's work in #242;
 2015-11-20 09:14:07 -08:00
Charles Hacskaylo
3d3b250536 Merge remote-tracking branch 'github/master' into open208 2015-11-20 08:38:19 -08:00
Charles Hacskaylo
32815d8427 [Frontend] Markup and CSS fixes 
open #251
Fixed markup and CSS to remove erroneously
applied "select" class;
Modified .select to not use overflow: hidden;
Better positioning for *-options elements;
 2015-11-19 18:50:10 -08:00
Henry
10a44c026c [Edit Mode] Visual indication of object being edited #278 2015-11-19 18:45:18 -08:00
Charles Hacskaylo
3e25d17702 [Mobile / Frontend] Modified media query device detection approach 
open #169
Significant simplification of media query device detection
to focus on width only; tablet max-width and desktop
min-width modified to create gapless ranges;
 2015-11-19 15:16:21 -08:00
Henry
9631d95a52 Merge remote-tracking branch 'origin/open-status-tracking' into open278-proto 2015-11-19 15:13:10 -08:00
Henry
4ea757faa5 Adding support for object status 2015-11-19 15:12:43 -08:00
Henry
50d83eaffb Merge remote-tracking branch 'origin/open278' into open278-proto 2015-11-19 14:50:01 -08:00