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
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;
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!
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
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
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)
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;
...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.)
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;
open #251
Fixed markup and CSS to remove erroneously
applied "select" class;
Modified .select to not use overflow: hidden;
Better positioning for *-options elements;
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;
open #199
open #279
Last commit didn't fully take...
Integrated inspector changes from open279 into
new edit mode work from open199; _layout.scss
had a bit of difficult conflict resolution but seems
good at this point...
open #199
open #279
Integrated inspector changes from open279 into
new edit mode work from open199; _layout.scss
had a bit of difficult conflict resolution but seems
good at this point...
open #250
Fixed min and max widths for panes to prevent
weird pane expand/collapse behaviors, like
Inspector covering the main view area;
Added min-width to .holder-all element;
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
open #250
Fixed margin/spacing problems with results element;
Added transition to results display;
Begin adding # results found / no results messaging;
Moved class .off to _globals.scss;
open #250
Significant changes to flex classes, markup in
browse.html and search.html to support better
flex layout;
Search results now scrolls properly;
Significant refactoring and cleanups in search and _search.scss;
open #244
Fixing scroll issue in Inspector via flex layout;
Added new _archetypes.scss file for .l-flex* and .col styles;
moved .col and associated mixin out of _layout.scss
and into _archetypes;
open #90
IN-PROGRESS
Merged in latest from github/master;
Fixed margins when in edit mode;
Fixed edit area not utilizing overflow: auto properly;
TO-DO: verify mobile is Ok;
open #90
IN-PROGRESS
mini-tab location in markup in browse.html changed;
Single menu icon for collapsed treeview;
Close 'x' boxes instead of arrow icons;
TO-DO: verify mobile is Ok;
Use default format when no format is specified, and throw an
error when a specified format is unrecognized, from both
date-time field controller and time range controller.
open #90
IN-PROGRESS
To support desired edge-to-edge styling of Inspector pane;
Removed superflous .scss file;
Enhancements to splitter .scss to allow flush edging and
edge shadows;
open #90
Major work in-progress on switching to .t-item-icon from
.type-icon to get item icons working better, especially
in .inspector-location in Inspector;
Significant mods to label.html;
open #90
Squashed commit of the following:
commit a2d06583ca
Merge: 74f289c5d5425d
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 27 14:04:49 2015 -0700
Merge pull request #216 from nasa/open-vista54a
Review and integrate open-vista54a into master
commit 5d5425db04
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Oct 27 11:50:16 2015 -0700
[Frontend] Finessing and verifying CSS
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
commit a8856c0612
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Oct 27 11:40:35 2015 -0700
[Frontend] Platform-specific mods to limits
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
commit 74f289cb34
Merge: 4ec243c29bdc9d
Author: akhenry <akhenry@gmail.com>
Date: Tue Oct 27 10:48:33 2015 -0700
Merge pull request #206 from nasa/open150b
[Plot] Ignore empty lines
commit 4ec243c6fb
Merge: 407d9883d996ac
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Sat Oct 24 07:48:45 2015 -0700
Merge pull request #212 from nasa/open211
[RequireJS] Specify path for uuid
commit 407d9881ff
Merge: 6ee622b21739ff
Author: akhenry <akhenry@gmail.com>
Date: Fri Oct 23 19:16:51 2015 -0700
Merge pull request #200 from nasa/open-toc
[Documentation] Add table of contents
commit 6ee622b3f5
Merge: 099d70b87e317a
Author: akhenry <akhenry@gmail.com>
Date: Fri Oct 23 17:04:04 2015 -0700
Merge pull request #192 from nasa/open153
[CI] Remove non-existent bundle from procfile
commit 099d70b8d9
Merge: 90828ef8e2a2ee
Author: akhenry <akhenry@gmail.com>
Date: Fri Oct 23 17:00:46 2015 -0700
Merge pull request #175 from nasa/open147
[Entanglement] Add "Go To Original" action
commit 3d996ac466
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 23 16:32:05 2015 -0700
[RequireJS] Specify path for uuid
Specify path for uuid, making it available for any code that would require it,
without that code needing to know the path to it.
Fixes https://github.com/nasa/openmctweb/issues/211.
commit 90828ef63d
Merge: bf24ac7dbebf08
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 23 16:23:29 2015 -0700
Merge remote-tracking branch 'github-open/open181' into open-master
commit 29bdc9d574
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri Oct 23 13:04:06 2015 -0700
[Plot] Ignore empty lines
Ignore empty lines (plot lines with no data) when determining
domain extrema; avoids failure to draw multiple plot lines in
a telemetry panel, nasa/openmctweb#150.
commit bf24ac7c93
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Fri Oct 23 12:14:46 2015 -0700
[Search] Update field name
Update field name in GenericSearchProvider to reflect changes
from nasa/openmctweb#193. Avoids exceptions on mutation.
Additionally, add test case exercising relevant code and verifying
that reindexing is scheduled upon mutation as expected.
commit 59f094763b
Merge: 3080861496cf85
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu Oct 22 16:58:02 2015 -0700
Merge pull request #193 from nasa/search-performance
Search performance
commit dbebf08500
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 15:38:58 2015 -0700
[Time Controller] Add test cases
...to verify behavior on text entry of dates.
commit 847c356063
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 15:26:42 2015 -0700
[Time Controller] Change color when input is invalid
nasa/openmctweb#181
commit 06bcd28558
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 15:22:00 2015 -0700
[Time Controller] Keep inputs in sync
Keep inputs in sync with displayed data in time controller,
without overwriting user-entered text. nasa/openmctweb#181
commit f88e8ebb51
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 15:08:44 2015 -0700
[Time Controller] Update model state for text entry
commit 6d2b2fd81e
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 14:46:12 2015 -0700
[Time Controller] Parse user-entered timestamps
nasa/openmctweb#181.
commit 608800ae63
Merge: 07818b0fb0ce1e
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 14:40:42 2015 -0700
Merge remote-tracking branch 'github/master' into open181
Conflicts:
platform/commonUI/general/res/templates/controls/time-controller.html
commit 07818b0a6d
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Oct 21 14:35:18 2015 -0700
[Time Controller] Show bounds in a text field
Show bounds in a text field to allow user editing; supports manual
editing of time controller bounds, nasa/openmctweb#181.
commit 496cf85b7e
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Wed Oct 21 09:46:32 2015 -0700
[JSDoc] Correct mistake
commit 833f57e284
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Wed Oct 21 07:39:59 2015 -0700
[Search] Don't block UI between requests
Timeout subsequent calls to keepIndexing at the end of a
indexRequest, so that UI operations are not blocked.
commit 9a63e99710
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 16:01:42 2015 -0700
[Search] Add spec for ElasticSearchProvider
Add spec coverage for ElasticSearchProvider. Also remove
unneeded guards for max number of results, as the aggregator
will always provide a max number of results.
commit 21739fffd9
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 20 15:52:49 2015 -0700
[Documentation] Add table of contents
Add table of contents to generated documents, without
modifying document sources; nasa/openmctweb#189.
commit 77d81f899b
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 15:31:33 2015 -0700
[Style] JSLint compliance
commit fe3263fdfe
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 15:27:46 2015 -0700
[Search] Remove invalid specs
commit ce42429fbd
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 15:14:43 2015 -0700
[Search] expose constants, add fudge factor
The SearchAggregator exposes it's constants to add stability to
tests.
It also has a fudge factor which increaases the number of results
it requests from providers to better support pagination when using
client side filtering.
commit 76151d09a0
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 15:13:37 2015 -0700
[Search] use service for filters, add spec
Add a spec for the SearchController, and use the SearchService to
execute filters by supplying a filterPredicate.
commit ec7e6cc5b4
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 13:55:46 2015 -0700
[Search] Update spec for Generic Search Worker
commit 1ddce48f7e
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 13:12:04 2015 -0700
[Search] Specs for GenericSearchProvider
Write specs for GenericSearchProvider and resolve some implementation
bugs they uncovered.
commit 98b5ff3c77
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 18:14:33 2015 -0700
[Search] Decrement number of pending requests
commit 14094a48fc
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 17:33:23 2015 -0700
[Search] Remove old specs in prep for rewrite
Remove old specs in prep for rewrite.
commit 8e2a2eeba5
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon Oct 19 12:08:49 2015 -0700
[Entanglement] Add license headers
...per code review feedback from nasa/openmctweb#175
commit 0f63e4dde9
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 17:06:23 2015 -0700
[Tests] Rewrite search aggregator specs
commit 12efb47be7
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 16:09:51 2015 -0700
[Search] Remove timeouts and timestamps
Remove timeouts and timestamps which were not effectively doing anything.
commit a2fce8e56c
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 16:05:31 2015 -0700
[Search] Rewrite elasticsearch provider with prototype
Rewrite the elasticsearch provider to use prototypes and clean up the implementation.
Now returns a modelResults object to keep it in line with the general search
provider.
commit 78e5c0143b
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 15:26:46 2015 -0700
[Search] Overhaul generic search provider
Rewrite the generic search provider to use prototypes. Increase performance
by utilizing the model service instead of the object service, and use a
simplified method of request queueing.
commit 099591ad2e
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 15:26:04 2015 -0700
[Search] Aggregator returns objects, providers return models
Search providers return search results as models for domain objects, as the
actual number of max results is enforced by the aggregator, and because the
individual providers store and return the models for their objects already.
This lowers the amount of resources consumed instantiating domain objects, and
also allows the individual search providers to implement function-based
filtering on domain object models, which is beneficial as it allows the search
filtering in the search controller to be done before paginating of results.
commit b5505f372f
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 12:39:41 2015 -0700
[Search] Generic Worker Performance Tweaks
The generic search worker now does indexing work during the index operation,
ensuring that queries do not have to do extraneous or repeat calculations.
Change the return format slightly and fixed a bug in the GenericSearchProvider
which caused more objects than intended to be returned from the provider.
commit 9ad860babd
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 12:34:47 2015 -0700
[Search] Rewrite search controller, tidy
Rewrite the search controller, making numerous changes and using prototypical
style.
First, the search controller immediately hides previous results when a new
search is started. Secondly, the search controller ensures that search results
displayed match the currently entered query, preventing race conditions. Finally,
the search controller uses a poor filtering option that means it may not display
all results.
commit 87e317a6f5
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 11:33:42 2015 -0700
[CI] Remove non-existent bundle from procfile
Remove the example/localstorage bundle from the procfile.
Fixes#153.
commit bf41d82a78
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 6 16:50:35 2015 -0700
[Entanglement] Restore missing specs
Restore specs which had been omitted from suite.json (but currently
succeed for the relevant scripts); done in the context of
nasa/openmctweb#147
commit a4944717a1
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 6 16:47:37 2015 -0700
[Location] Test getOriginal method
commit 70bbd3cf97
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 6 16:37:37 2015 -0700
[Entanglement] Add test cases for Go To Original
commit e3afaf0842
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 6 16:22:16 2015 -0700
[Entanglement] Add Go To Original
nasa/openmctweb#147
commit 60f2f9fb6c
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 6 16:08:48 2015 -0700
[Location] Add getOriginal method
Add a getOriginal method to the location capability, to simplify
loading of original versions of objects. nasa/openmctweb#147
open #90
Create and Search controls now properly change
to mini-tabs when treeview is collapsed;
Mods to .create-btn to use :before for symbol instead of span;
TO-DO: why does mct-device alter the order of items in the rendered
markup?
open #90
Added code to MCTSplitter and MCTSplitPane to allow
toggling of CSS class 'resizing' on pane elements when
the user is actively using the splitter;
Added resize transition animation to split pane elements
when user not actively resizing;
open #90
Major work on new .mini-tab elements, used
as controls to expand/collapse panes;
Cleaned up splitter hover behavior;
Changed mixin controlGrippy to not be tied
to :before;
Remove dependency on now (current time can be retrieved via
timeService); fix domain-switching behavior such that changes
to time systems are reflected in changes to default bounds.
Add typedefs relevant to the date aggregator; in particular,
document properties used to determine how to format timestamps
associated with a telemetry point.
