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.

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

Sort #395

Merged
merged 33 commits into from Aug 16, 2016
Merged

Sort #395

merged 33 commits into from Aug 16, 2016

Commits on Jul 15, 2016

  1. Copy the full SHA
    ec9f330 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    671c90c View commit details
    Browse the repository at this point in the history
  3. made more edits to the datatable.jsx in the process of creating a new…

    … component for full field
    mattwchun committed Jul 15, 2016
    Copy the full SHA
    a67ba71 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Copy the full SHA
    6693381 View commit details
    Browse the repository at this point in the history
  2. Added icon for sorting in data table. May need a new icon since has a…

    …uthor's name in the svg icon. Next created component but component has some binding warnings and proptype errors
    mattwchun committed Jul 19, 2016
    Copy the full SHA
    c167c30 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. Copy the full SHA
    2ac578e View commit details
    Browse the repository at this point in the history
  2. still getting error: warning.js:45 Warning: Failed propType: Invalid …

    …prop of type supplied to , expected . Check the render method of .
    mattwchun committed Jul 20, 2016
    Copy the full SHA
    1f8f634 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. deleted extra decreasingSort svg and editted with comments the decrea…

    …singSort.svg in assets to be styled better in datatable
    mattwchun committed Jul 22, 2016
    Copy the full SHA
    be32b19 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    49a4150 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2016

  1. added new transformReducer. Dispatched custom action that will need t…

    …o make action creator in the future
    mattwchun committed Jul 27, 2016
    Copy the full SHA
    16f6d7b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a45f041 View commit details
    Browse the repository at this point in the history
  3. started working on function in export.js that would take new state an…

    …d edit the vega spec with the added transform to sort the values
    mattwchun committed Jul 27, 2016
    Copy the full SHA
    6845336 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. added action creator, reducer, and exporter function. However, still …

    …need to figure out how to adjust view now
    mattwchun committed Jul 28, 2016
    Copy the full SHA
    a093ab1 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    265d145 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2016

  1. Added an getSort() function that takes a dataset. This function const…

    …ructs the transform part of the vega spec that will be returned in export.dataset(). This function is meant to be used as a helper function for export.dataset(). This is ultimately used to add the sort feature to the DataTable
    mattwchun committed Jul 29, 2016
    Copy the full SHA
    d923158 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2016

  1. Added another action to the vegaReducer invalidating actions to spawn…

    … a refresh of the dataset after add transform to the spec. Sort feature seems to be working but will need to test now
    mattwchun committed Aug 4, 2016
    Copy the full SHA
    6df2b6e View commit details
    Browse the repository at this point in the history
  2. changed the increasingSort and decreasingSort svg icons. These icons …

    …are toggled when click on sort. Found a bug. When click on the icon, only after the hoverField is unhovered the DataTable is updated.
    mattwchun committed Aug 4, 2016
    Copy the full SHA
    d263e41 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2016

  1. merged with updated lyra2 branch. Working sort feature just need to e…

    …xtra out the changing sort icon into its own component to modularize the code better
    mattwchun committed Aug 5, 2016
    Copy the full SHA
    c51c253 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. deleted transformReducer that isn't used anymore. Was used when first…

    … started working on the sort feature
    mattwchun committed Aug 10, 2016
    Copy the full SHA
    0d2b1e7 View commit details
    Browse the repository at this point in the history
  2. added test to vegaReducer tests to test if store is flagged as invali…

    …d when sort action dispatched
    mattwchun committed Aug 10, 2016
    Copy the full SHA
    e085082 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Added some simple tests for datasetReducer. Tests include one that te…

    …sts to see if datasetReducer is a function, returns the original state if not an action it accepts, and takes an SORT_DATASET action and updates the store correctly
    mattwchun committed Aug 11, 2016
    Copy the full SHA
    3d43f61 View commit details
    Browse the repository at this point in the history
  2. Created test file to test datasetActions action creator method sortDa…

    …taset. Tested that all the properties are set in the action returned from sortDataset and the action creator returns an object
    mattwchun committed Aug 11, 2016
    Copy the full SHA
    8f5836d View commit details
    Browse the repository at this point in the history
  3. added header comments to the getSort() function in export.js that cre…

    …ates the vega data transform code to be appended to to the spec returned in exporter dataset that will sort the dataset.
    mattwchun committed Aug 11, 2016
    Copy the full SHA
    daae9f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Copy the full SHA
    84c9d10 View commit details
    Browse the repository at this point in the history
  2. Added a test to test the correct data transform spec is added to the …

    …vega spec returned from exporter dataset. This therefore tests the getSort() function added to exporter which is called in exporter dataset.
    mattwchun committed Aug 12, 2016
    Copy the full SHA
    1957288 View commit details
    Browse the repository at this point in the history
  3. Renamed the tests for exporter dataset. Wrote 2 total new tests which…

    … consist of an increasing and decreasing sort. This is to test if the correct data transform vega code is added to the spec returned in exporter dataset
    mattwchun committed Aug 12, 2016
    Copy the full SHA
    0bf27d4 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Deleted increasingSort.svg and decreasingSort.svg and added 4 new ico…

    …ns from FontAwesome. Created new component for SortField. Sort feature not completely functional since SortField will sort values but when unhover the values get sorted back to what they were. Also fixed stylistic errors in export.js. Also need to still run npm run lit to test the style
    mattwchun committed Aug 16, 2016
    Copy the full SHA
    e50f0b7 View commit details
    Browse the repository at this point in the history
  2. Removed store.getState() and moved to mapStateToProps. Also removed I…

    …con require in HoverField since moved SortField into its own component
    mattwchun committed Aug 16, 2016
    Copy the full SHA
    09fca7b View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    937eab0 View commit details
    Browse the repository at this point in the history
  4. Fixed more style issues in exporter tests. Fixed isSortAsc to check i…

    …f sort.sortOrder property in store is asc or desc instead of checking if sort is asc or desc
    mattwchun committed Aug 16, 2016
    Copy the full SHA
    56ab88c View commit details
    Browse the repository at this point in the history
  5. Changed SortField so that when sort one field the icon changes to a s…

    …pecific sort icon but the other rows don't show that they are sorted
    mattwchun committed Aug 16, 2016
    Copy the full SHA
    4fb1b9e View commit details
    Browse the repository at this point in the history
  6. Refine sort field functionality.

    Simplify code paths in the SortField component, move hardcoded strings to
    constant files, and make stored state more concise.
    arvind committed Aug 16, 2016
    Copy the full SHA
    bf80429 View commit details
    Browse the repository at this point in the history
  7. Only re-render DataTable once Vega is done parsing.

    Previously, the sort action would trigger a DataTable re-render before Vega
    was done parsing causing the dataset's *input* values being temporarily used.
    arvind committed Aug 16, 2016
    Copy the full SHA
    84af8c4 View commit details
    Browse the repository at this point in the history