ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 09:28:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,382 Commits 988 Branches 212 Tags 191 MiB
fc7bd36dba
Commit Graph

2925 Commits

Author SHA1 Message Date
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
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