Review and integrate open90: Expand/collapse Treeview and Inspection #233

charlesh88 · 2015-11-02T21:51:21Z

This branch ended up manually integrating (rather than merging) work from open73 (#73) by Shivam Dave and Sarah Hale, due to severe merge issues and incomplete development. Some notes:

Most of the manual integration was focused on integrating the expand/collapse functionality with similar but duplicate functionality earlier integrated via mobile. open90 provides a consolidated approach that works properly in desktop and mobile.
Sarah's work on the core of Inspection (/platform/commonUI/general/src/controllers/ObjectInspectorController.js and its spec.js) was brought over as was.
A change to the splitter's approach to margins and the look of split panes necessitated significant changes to markup in /platform/commonUI/.../browse.html and MCTSplitPane.js. The splitter no longer adds spacing around the splitter element; rather, the splitter via CSS now creates its margins via its width. This allows themes to have splitters that look and feel different, while decoupling the splitter JS code from look-and-feel.

Author checklist:

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

open #188 Added icon-dataset e611;

prod-uisymbols Added e612 Save icon;

open #90 Renamed BrowseTreeController to PaneController; Ensuring mobile functionality parity;

open #90 Implementing PaneController; Added inspection pane and toggle button in browse-object.html;

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;

open #90 Fixed broken mobile styles; Removed commented out scss;

open #90 Refined positioning of .mini-tab elements when panes are collapsed;

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 Animation, styles, hide-show added panes and splitters; Finessed spacing; trans-prop* mixins normalized and added delay arg;

open #90 Refactored templates to move all split-pane elements into browse.html;

open #90 open #73 In-progress manual integrated Sarah Hale's work on ObjectInspector;

open #90 open #73 Adding missed new files;

open #90

open #90 Significant styling in object-inspector.html;

open #90 Modding mini-tab look, just started;

open #90 Significant styling on new mini-tabs; Main layout margins adjusted;

open #90 Significant redo of splitter styling;

open #90

open #90 Splitter spacing now being handled in CSS, so modded calcs in MCTSplitPane to not add space; CSS calcs adjusted; comments removed;

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 Treeview and search now transition properly when user collapses left pane while searching;

open #90 Treeview and Inspector should be hidden by default when opening in a new tab;

open #90

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

open #90 Fixed problem of right pane primary not going all the way left; Finessed timing of tree pane fade in / fade out;

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 (cherry picked from commit 946a6d4)

open #90 and updated icon;

open #90

charlesh88 · 2015-11-03T23:49:12Z

Fixing ci errors...

open #90 open #233

charlesh88 · 2015-11-04T00:54:40Z

Woo hoo! Fixed problems. Reassigning back to Victor.

charlesh88 · 2015-11-04T01:06:15Z

Crap, lots of conflicts with master now that messages are in. Fixing...

open #90 open #233 Conflicts: example/generator/src/SinewaveConstants.js platform/commonUI/general/bundle.json platform/commonUI/general/res/sass/_main.scss platform/commonUI/general/res/sass/user-environ/_layout.scss platform/commonUI/notification/src/NotificationIndicator.js platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/espresso/res/sass/_constants.scss platform/commonUI/themes/snow/res/css/theme-snow.css

charlesh88 · 2015-11-04T01:43:21Z

Fixed merge issues with master and pushed up. Prior version of open90 backed up as open90-premerge-master.

charlesh88 · 2015-11-04T01:46:31Z

@VWoeltjen Can we please review and integrate this before more changes are pushed to master? :)

larkin · 2015-11-04T01:57:50Z

@charlesh88 Hrm, this is still showing conflicts with master, seems something must be off here. We also ran into some conflicts related to custom fonts-- seems that not all commits are getting merged to master and as a result conflicts are appearing.

Can look into it more in the morning.

VWoeltjen · 2015-11-04T17:25:14Z

Looking at this now - this is another case where I see a commit (63798ff) labelled a merge in commit messages, but with only a single parent.

I'll see if I can resolve this using the pre-merge branch.

Resolve conflicts on #233 Conflicts: platform/commonUI/general/bundle.json platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff platform/commonUI/general/res/sass/_main.scss platform/commonUI/general/res/sass/user-environ/_layout.scss platform/commonUI/themes/espresso/res/css/theme-espresso.css platform/commonUI/themes/espresso/res/sass/_constants.scss platform/commonUI/themes/snow/res/css/theme-snow.css

VWoeltjen · 2015-11-04T19:33:45Z

Closing; relevant changes have been merged with #240

charlesh88 and others added 30 commits October 14, 2015 16:45

[Production] Updated symbols font to v25

821a1a4

open #188 Added icon-dataset e611;

[Frontend] Added new glyph

be79c10

prod-uisymbols Added e612 Save icon;

[Frontend] Manual re-do of collapse/expand panes

b98c1cd

open #90 Renamed BrowseTreeController to PaneController; Ensuring mobile functionality parity;

[Frontend] Manual re-do of collapse/expand panes

4f27104

open #90 Implementing PaneController; Added inspection pane and toggle button in browse-object.html;

[Frontend] Manual re-do of collapse/expand panes

536d561

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;

Merge remote-tracking branch 'github/prod-uisymbols' into open90

bf17b77

[Frontend] Manual re-do of collapse/expand panes

3687cc5

open #90 Fixed broken mobile styles; Removed commented out scss;

[Frontend] Manual re-do of collapse/expand panes

57f11a9

open #90 Refined positioning of .mini-tab elements when panes are collapsed;

[Frontend] Manual re-do of collapse/expand panes

a283a2a

open #90 Animation, styles, hide-show added panes and splitters; Finessed spacing; trans-prop* mixins normalized and added delay arg;

[Frontend] Manual re-do of collapse/expand panes

0c4d422

open #90 Refactored templates to move all split-pane elements into browse.html;

[Frontend] Manual integration of Inspector

2452b25

open #90 open #73 In-progress manual integrated Sarah Hale's work on ObjectInspector;

[Frontend] Manual integration of Inspector

1d3870d

open #90 open #73 Adding missed new files;

[Frontend] Inspector styling, in progress

a7ea4c3

open #90

[Frontend] Inspector styling, in progress

efd2098

open #90 Significant styling in object-inspector.html;

[Frontend] Expand/collapse styling

17b3378

open #90 Modding mini-tab look, just started;

[Frontend] Expand/collapse styling

aa3cf70

open #90 Significant styling on new mini-tabs; Main layout margins adjusted;

[Frontend] Splitter re-styling

94649b1

open #90 Significant redo of splitter styling;

[Frontend] Fixed mini-tab positioning algorithm

85809ae

open #90

[Frontend] Fixed mini-tab positioning algorithm

99c977c

open #90

[Frontend] Fixed spacing of panes and mini-tabs

8ee4fc9

open #90 Splitter spacing now being handled in CSS, so modded calcs in MCTSplitPane to not add space; CSS calcs adjusted; comments removed;

Frontend] More refining of collapsing treeview

fd582d4

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?

Frontend] More refining of collapsing treeview

7d42292

open #90 Treeview and search now transition properly when user collapses left pane while searching;

Frontend] More refining of collapsing treeview

f655346

open #90 Treeview and Inspector should be hidden by default when opening in a new tab;

Frontend] Normalizing styles for items and l-icon-link

77a1a90

open #90

Frontend] Treeview expand/collapse anim timing tweaks

498f854

open #90

Frontend] Tweaked sizes of mini-tabs and pane collapsed edge margin

daed6a5

open #90

[Frontend] Fixed and finessed mobile expand collapse

fc704b8

open #90 Fixed problem of right pane primary not going all the way left; Finessed timing of tree pane fade in / fade out;

[Frontend] type-icon evolving to universal t-item-icon

134d853

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;

charlesh88 added 3 commits November 2, 2015 11:08

Updated crosshair symbol for inspect

648cdcc

open #90 (cherry picked from commit 946a6d4)

[Frontend] Added icon to Inspector header

fe12cde

open #90 and updated icon;

[Frontend] Tweaked spacing in Inspector header

c8848b5

open #90

charlesh88 assigned VWoeltjen Nov 2, 2015

charlesh88 added this to the Ballard milestone Nov 2, 2015

Resolved CSS conflicts

09be193

open #90

charlesh88 force-pushed the open90 branch from 8b198cd to 09be193 Compare November 3, 2015 23:45

charlesh88 assigned charlesh88 and unassigned VWoeltjen Nov 3, 2015

charlesh88 added 2 commits November 3, 2015 16:45

Fixed missing window reference causing test to fail

9037787

open #90 open #233

Fixed JS var placement causing mvn to fail

2c7c7b9

open #90 open #233

charlesh88 assigned VWoeltjen and unassigned charlesh88 Nov 4, 2015

charlesh88 assigned charlesh88 and unassigned VWoeltjen Nov 4, 2015

charlesh88 assigned VWoeltjen and unassigned charlesh88 Nov 4, 2015

VWoeltjen mentioned this pull request Nov 4, 2015

[Inspector] Introduce inspector pane #240

Merged

VWoeltjen closed this Nov 4, 2015

larkin deleted the open90 branch April 27, 2017 20:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Review and integrate open90: Expand/collapse Treeview and Inspection #233

Review and integrate open90: Expand/collapse Treeview and Inspection #233

charlesh88 commented Nov 2, 2015

charlesh88 commented Nov 3, 2015

charlesh88 commented Nov 4, 2015

charlesh88 commented Nov 4, 2015

charlesh88 commented Nov 4, 2015

charlesh88 commented Nov 4, 2015

larkin commented Nov 4, 2015

VWoeltjen commented Nov 4, 2015

VWoeltjen commented Nov 4, 2015

Review and integrate open90: Expand/collapse Treeview and Inspection #233

Review and integrate open90: Expand/collapse Treeview and Inspection #233

Conversation

charlesh88 commented Nov 2, 2015

charlesh88 commented Nov 3, 2015

charlesh88 commented Nov 4, 2015

charlesh88 commented Nov 4, 2015

charlesh88 commented Nov 4, 2015

charlesh88 commented Nov 4, 2015

larkin commented Nov 4, 2015

VWoeltjen commented Nov 4, 2015

VWoeltjen commented Nov 4, 2015