Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Review and integrate open-vista54a into master #216

Merged
merged 2 commits into from
Oct 27, 2015
Merged

Review and integrate open-vista54a into master #216

merged 2 commits into from
Oct 27, 2015

Conversation

charlesh88
Copy link
Contributor

Based on jpl github pull https://github.jpl.nasa.gov/MissionControl/vista/pull/116.
Changes the way limit CSS classes are applied: now uses 2 classes instead of one: Apply "s-limit-red" or "s-limit-yellow" to a tr element, or directly to any block element. When applied to a tr, the whole row will be colored, and a glyph icon will be added to the first cell of the row. For upper and lower limits, apply "s-limit-upr" and "s-limit-lwr" as a separate class.

Still to-do: make any mods needed in warp in order to apply classes properly.

Author checklist:

  • Changes address original issue? Y
  • Unit tests included and/or updated with changes? N/A
  • Command line build passes? N/A
  • Expect to pass code review? Y

@charlesh88
[Frontend] Platform-specific mods to limits
a8856c0 
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)
@charlesh88
[Frontend] Finessing and verifying CSS
5d5425d 
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
@charlesh88 charlesh88 added this to the Ballard milestone Oct 27, 2015
@charlesh88 charlesh88 mentioned this pull request Oct 27, 2015
Closed
@VWoeltjen
Copy link
Contributor

Looks good!

Reviewer Checklist

  1. Changes appear to address issue? Y
  2. Appropriate unit tests included? N/A (CSS changes only, out of scope for unit testing)
  3. Code style and in-line documentation are appropriate? Y
  4. Commit messages meet standards? Y

VWoeltjen added a commit that referenced this pull request Oct 27, 2015
@VWoeltjen
Merge pull request #216 from nasa/open-vista54a
a2d0658 
Review and integrate open-vista54a into master
@VWoeltjen VWoeltjen merged commit a2d0658 into master Oct 27, 2015
@VWoeltjen VWoeltjen deleted the open-vista54a branch October 27, 2015 21:07
@charlesh88 charlesh88 restored the open-vista54a branch October 27, 2015 21:21
charlesh88 added a commit that referenced this pull request Oct 28, 2015
@charlesh88
Merging in latest github/master
0a19ab4 
open #90
Squashed commit of the following:

commit a2d0658
Merge: 74f289c 5d5425d
Author: Victor Woeltjen <[email protected]>
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 5d5425d
Author: Charles Hacskaylo <[email protected]>
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 a8856c0
Author: Charles Hacskaylo <[email protected]>
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 74f289c
Merge: 4ec243c 29bdc9d
Author: akhenry <[email protected]>
Date:   Tue Oct 27 10:48:33 2015 -0700

    Merge pull request #206 from nasa/open150b

    [Plot] Ignore empty lines

commit 4ec243c
Merge: 407d988 3d996ac
Author: Victor Woeltjen <[email protected]>
Date:   Sat Oct 24 07:48:45 2015 -0700

    Merge pull request #212 from nasa/open211

    [RequireJS] Specify path for uuid

commit 407d988
Merge: 6ee622b 21739ff
Author: akhenry <[email protected]>
Date:   Fri Oct 23 19:16:51 2015 -0700

    Merge pull request #200 from nasa/open-toc

    [Documentation] Add table of contents

commit 6ee622b
Merge: 099d70b 87e317a
Author: akhenry <[email protected]>
Date:   Fri Oct 23 17:04:04 2015 -0700

    Merge pull request #192 from nasa/open153

    [CI] Remove non-existent bundle from procfile

commit 099d70b
Merge: 90828ef 8e2a2ee
Author: akhenry <[email protected]>
Date:   Fri Oct 23 17:00:46 2015 -0700

    Merge pull request #175 from nasa/open147

    [Entanglement] Add "Go To Original" action

commit 3d996ac
Author: Pete Richards <[email protected]>
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 #211.

commit 90828ef
Merge: bf24ac7 dbebf08
Author: Pete Richards <[email protected]>
Date:   Fri Oct 23 16:23:29 2015 -0700

    Merge remote-tracking branch 'github-open/open181' into open-master

commit 29bdc9d
Author: Victor Woeltjen <[email protected]>
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, #150.

commit bf24ac7
Author: Victor Woeltjen <[email protected]>
Date:   Fri Oct 23 12:14:46 2015 -0700

    [Search] Update field name

    Update field name in GenericSearchProvider to reflect changes
    from #193. Avoids exceptions on mutation.

    Additionally, add test case exercising relevant code and verifying
    that reindexing is scheduled upon mutation as expected.

commit 59f0947
Merge: 3080861 496cf85
Author: Victor Woeltjen <[email protected]>
Date:   Thu Oct 22 16:58:02 2015 -0700

    Merge pull request #193 from nasa/search-performance

    Search performance

commit dbebf08
Author: Victor Woeltjen <[email protected]>
Date:   Wed Oct 21 15:38:58 2015 -0700

    [Time Controller] Add test cases

    ...to verify behavior on text entry of dates.

commit 847c356
Author: Victor Woeltjen <[email protected]>
Date:   Wed Oct 21 15:26:42 2015 -0700

    [Time Controller] Change color when input is invalid

    #181

commit 06bcd28
Author: Victor Woeltjen <[email protected]>
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. #181

commit f88e8eb
Author: Victor Woeltjen <[email protected]>
Date:   Wed Oct 21 15:08:44 2015 -0700

    [Time Controller] Update model state for text entry

commit 6d2b2fd
Author: Victor Woeltjen <[email protected]>
Date:   Wed Oct 21 14:46:12 2015 -0700

    [Time Controller] Parse user-entered timestamps

    #181.

commit 608800a
Merge: 07818b0 fb0ce1e
Author: Victor Woeltjen <[email protected]>
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 07818b0
Author: Victor Woeltjen <[email protected]>
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, #181.

commit 496cf85
Author: Pete Richards <[email protected]>
Date:   Wed Oct 21 09:46:32 2015 -0700

    [JSDoc] Correct mistake

commit 833f57e
Author: Pete Richards <[email protected]>
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 9a63e99
Author: Pete Richards <[email protected]>
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 21739ff
Author: Victor Woeltjen <[email protected]>
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; #189.

commit 77d81f8
Author: Pete Richards <[email protected]>
Date:   Tue Oct 20 15:31:33 2015 -0700

    [Style] JSLint compliance

commit fe3263f
Author: Pete Richards <[email protected]>
Date:   Tue Oct 20 15:27:46 2015 -0700

    [Search] Remove invalid specs

commit ce42429
Author: Pete Richards <[email protected]>
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 76151d0
Author: Pete Richards <[email protected]>
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 ec7e6cc
Author: Pete Richards <[email protected]>
Date:   Tue Oct 20 13:55:46 2015 -0700

    [Search] Update spec for Generic Search Worker

commit 1ddce48
Author: Pete Richards <[email protected]>
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 98b5ff3
Author: Pete Richards <[email protected]>
Date:   Fri Oct 16 18:14:33 2015 -0700

    [Search] Decrement number of pending requests

commit 14094a4
Author: Pete Richards <[email protected]>
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 8e2a2ee
Author: Victor Woeltjen <[email protected]>
Date:   Mon Oct 19 12:08:49 2015 -0700

    [Entanglement] Add license headers

    ...per code review feedback from #175

commit 0f63e4d
Author: Pete Richards <[email protected]>
Date:   Fri Oct 16 17:06:23 2015 -0700

    [Tests] Rewrite search aggregator specs

commit 12efb47
Author: Pete Richards <[email protected]>
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 a2fce8e
Author: Pete Richards <[email protected]>
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 78e5c01
Author: Pete Richards <[email protected]>
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 099591a
Author: Pete Richards <[email protected]>
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 b5505f3
Author: Pete Richards <[email protected]>
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 9ad860b
Author: Pete Richards <[email protected]>
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 87e317a
Author: Pete Richards <[email protected]>
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 bf41d82
Author: Victor Woeltjen <[email protected]>
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
    #147

commit a494471
Author: Victor Woeltjen <[email protected]>
Date:   Tue Oct 6 16:47:37 2015 -0700

    [Location] Test getOriginal method

commit 70bbd3c
Author: Victor Woeltjen <[email protected]>
Date:   Tue Oct 6 16:37:37 2015 -0700

    [Entanglement] Add test cases for Go To Original

commit e3afaf0
Author: Victor Woeltjen <[email protected]>
Date:   Tue Oct 6 16:22:16 2015 -0700

    [Entanglement] Add Go To Original

    #147

commit 60f2f9f
Author: Victor Woeltjen <[email protected]>
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. #147
@larkin larkin deleted the open-vista54a branch May 3, 2016 18:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@VWoeltjen VWoeltjen

Labels
None yet
Projects
None yet
Milestone
Ballard
Development

Successfully merging this pull request may close these issues.
2 participants
@charlesh88 @VWoeltjen