open #90
Squashed commit of the following:
commit a2d06583ca9f8b5a5d5db4e53bf8b522d173d49c
Merge: 74f289c 5d5425d
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 5d5425db04b5fe668f37c1a5afe1534852b1b638
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 a8856c061247b3edc758b4961dbe2325bc4b62ae
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 74f289cb34a9ad1f396590c8288d56b0a45b90ef
Merge: 4ec243c 29bdc9d
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 4ec243c6fbf2096d4241670f87cc1b41034b9d77
Merge: 407d988 3d996ac
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 407d9881ff6260865abce146c512a4468f6cc402
Merge: 6ee622b 21739ff
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 6ee622b3f5bbe65b5d75967e01e7b1791dcb42cb
Merge: 099d70b 87e317a
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 099d70b8d93c3d77e28fe9a5045b5eb2597df056
Merge: 90828ef 8e2a2ee
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 3d996ac46696b983addd8c4696d5fee983eaf1a2
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 90828ef63d712921672c431bfb310a41c7d0d35d
Merge: bf24ac7 dbebf08
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 29bdc9d57407c1aa7cb7a8549b0f4e70edf9dd2f
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 bf24ac7c933fb14cb9bd108e9b1b50070ac8a507
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 59f094763b5993f208a52fcc50daf999e2f4198b
Merge: 3080861 496cf85
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 dbebf085007be053a6f67d326b127cef16c93913
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 847c3560630430cba3ef1a8bf0339280222097ce
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 06bcd28558f5e9f6b3fd0e83c60a705a35702846
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 f88e8ebb51feed773e95206674cbb83da142e139
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 6d2b2fd81e0423faf7cfa0ea20bf55d30dd5e586
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 608800ae637cb4bc92f66fa8a5f9788751a7e9cb
Merge: 07818b0 fb0ce1e
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 07818b0a6d69e521ee962a5e8c0351d08153ffc1
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 496cf85b7e8b55f5b432444bd63058e0b0a93d5a
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Wed Oct 21 09:46:32 2015 -0700
[JSDoc] Correct mistake
commit 833f57e284d3f68cb70dd49ab7e27f20c7610c4c
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 9a63e997108000278b973c2128afc91309bac2b8
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 21739fffd91c4892d427502e299550e49bb2e12a
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 77d81f899bf2c1fb91d03bfc24399d8ba0f505a8
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 15:31:33 2015 -0700
[Style] JSLint compliance
commit fe3263fdfe8a1af779a37a4664ddd30c4e2380f4
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Tue Oct 20 15:27:46 2015 -0700
[Search] Remove invalid specs
commit ce42429fbdd23bc5eb52cb542e0f3c1be87398f0
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 76151d09a0a589fb646494079ebf8a483ecb2d11
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 ec7e6cc5b445439630ce56121383f47eb8849cde
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 1ddce48f7ec6b58627c7fea3e66cf8b2d5d94e6b
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 98b5ff3c77bb6fe88b6bcbd13d0db840e7bc33df
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 18:14:33 2015 -0700
[Search] Decrement number of pending requests
commit 14094a48fc542eca54d02f6db84cd4233305ffa5
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 8e2a2eeba5db5c9c14769c75bfe67fcfb63491a9
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 0f63e4dde9673c7edd85c0ca187a74a4add1fe53
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Oct 16 17:06:23 2015 -0700
[Tests] Rewrite search aggregator specs
commit 12efb47be74bc52ca67a7600e588c08ad8c67590
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 a2fce8e56c824c458fb625155abc92c086438c08
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 78e5c0143b67c48c00adb40702e54829839eeda0
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 099591ad2eb427ecde5d3dbde11a5c0c52b974c7
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 b5505f372f6a737a2a00a1f987aee97ee5facecf
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 9ad860babdc95a49fbbbd1a50f3e16e3c7802f6e
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 87e317a6f5b4f4e0eeabfc9268699784764dec6e
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 bf41d82a78282fdac3acaed1845188bf69eed651
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 a4944717a1eb1bcbe385dd3ddc7321ea8805ab34
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Tue Oct 6 16:47:37 2015 -0700
[Location] Test getOriginal method
commit 70bbd3cf97f43914572df00783763b208cbf08fa
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 e3afaf0842afa5abb3f3991f65a20f39c937f0a5
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 60f2f9fb6c50e19348f264cb3aae4f3baeea15a5
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
Move check for composition up higher in the sequence of
if-blocks in the validation step of linking; remove
fallback to [] for undefined composition, which is no
longer necessary as a consequence of this.
nasa/openmctweb#98
Remove redundant test case; modify composition-checking
test case to expose correct capability information.
In response to feedback from nasa/openmctweb#98
Reoder validation to consider the composition capability
first; refactor to express as a single expression to clarify
validation logic (explicitly say 'and' instead of implying
it with control flow.)
Based on feedback from nasa/openmctweb#98
Separate out location property from the CreationService,
instead handle in the entanglement bundle; this is
consistent with changes for identity management (attaching
a creator to newly-created domain object models).
for nasa/openmctweb#92
Merge in latest in preparation to merge; WTD-1482
Conflicts:
platform/commonUI/browse/src/creation/CreationService.js
platform/core/src/models/RootModelProvider.js
platform/entanglement/src/services/LinkService.js
platform/entanglement/src/services/MoveService.js
Clarify naming of method for retrieving contextual location of a domain
object.
Default behavior for objects that do not have a context is to return
undefined. Note that default behavior is not specified and could change
if needed.
Use the parent id as the location for a model.
This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.
Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
When moving an object that supports composition, child objects which
are originals must have their location updated as well. Children which
are links should not have their location updated, nor should any of
their children be updated.
MockLinkService.perform returns a promise for the linked domainObject.
When resolving the promise and not specifying an object to resolve it
with, it will resolve it with the domainObject that was originally
passed to it.
DomainObjects with a context capability also gain a LocationCapability.
This capability allows you to determine the location of the current
instance of a domain object, and also provides methods for determining
if the current instance of a domain object is a link, or if it is an
original.
