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

Refactor the data flow inside of Scaler #313

Closed
wants to merge 85 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
5aec1d8
Refactor the data flow inside of Scaler
May 30, 2019
95049e9
Moved the comment
May 31, 2019
abfa136
Update .bulldozer.yaml
Jun 11, 2019
d98b280
Things are kinda working
Jun 27, 2019
6133c66
Almost done ripping out ScalerContext
Jun 27, 2019
1e741ce
Hey neat things are even more kinda working
Jun 27, 2019
b037c99
Time-boxed
Jun 27, 2019
8644cbd
Whoa things are working
Jun 27, 2019
1b942c3
Porting LineChart.stories
Jun 27, 2019
2fc7af0
Basic lines seem to be working
Jun 27, 2019
7d59ecf
Starting a big refactor
Jun 27, 2019
68d7c61
Compiling cleanly, but some things are broken
Jun 28, 2019
57bbe86
Series working!
Jun 28, 2019
6835063
Collections mostly working, but the subdomains are off
Jun 28, 2019
11b5f70
Wow the scaling and everything works
Jun 28, 2019
272cb53
All of the domain + scaling stuff works!!
Jun 28, 2019
7ad63c4
Collection data domains working
Jun 28, 2019
c78c801
Added stories for the domain cases -- they're broken though
Jun 29, 2019
9731b84
Seems to work for series
Jun 29, 2019
9398e83
Collection domains working ... ?
Jun 29, 2019
66adb81
Everything works except the first collections domain case?
Jun 29, 2019
c1d3291
Fix the single-value story
Jun 29, 2019
e8c15d3
Fix the default accessors story
Jun 29, 2019
a3e8a02
Fix (& consolidate) min/max stories
Jun 29, 2019
e4ef764
Fix step series
Jun 29, 2019
5da6cb4
Fix the Q&L story
Jun 29, 2019
8544e09
Remove subdomains before going into the loader
Jun 29, 2019
ad99592
Clean up "Specify y domain" story
Jun 29, 2019
a68a781
Fix the zoomable story
Jun 29, 2019
75d3e7b
Clean up the [Dyanmic time domain] story
Jun 30, 2019
0c37ced
Live-loading is kinda-almost working.
Jun 30, 2019
f0cd974
Fixed the dynamic subdomains stories
Jul 7, 2019
1d3c594
Fix the ruler
Jul 7, 2019
180c64d
Reorganize the LineChart stories
Jul 7, 2019
d59ed69
Fix [Dynamic time domain] story
Jul 7, 2019
c79ec54
Move dynamic time subdomain story
Jul 10, 2019
f135d3c
Got liveloading working
Jul 10, 2019
66dcf00
remove griffDataItem
Jul 14, 2019
7daee0f
Remove old code
Jul 14, 2019
96f1d06
Get the domains things working again
Jul 14, 2019
cb2c0c3
Centralize ItemIdMap
Jul 14, 2019
d00d3c4
Replace the subdomains when they change externally
Jul 14, 2019
a81ba30
Wire up onUpdateDomains
Jul 14, 2019
0db06d9
Remove old propTypes & defaultProps
Jul 14, 2019
8f15fa5
Get AxisCollection stories rendering
Jul 14, 2019
eddad01
Fix the zoomable AxisCollection
Jul 14, 2019
9e15703
Get ToggleRenderer rendering
Jul 14, 2019
5c81fba
Get the Collection stories rendering
Jul 14, 2019
0abb03b
Get GridLines stories rendering
Jul 14, 2019
97f798c
Get ContextChart stories rendering
Jul 14, 2019
79efe40
Remove GriffDebugger
Jul 14, 2019
29a2ca1
Remove unused code from SeriesCollection stories
Jul 14, 2019
183dd09
Fix the x-axis placement stories
Jul 14, 2019
2660168
Get the Y-Axis placement stories rendering
Jul 14, 2019
64443c9
Get the Y-Axis modes stories rendering
Jul 14, 2019
8f801cf
Fix the ChartJS stories
Jul 14, 2019
561cda0
Fix the Plotly stories
Jul 14, 2019
395889f
Remove the Scaler stories
Jul 14, 2019
1ad3f3c
Remove unused import
Jul 14, 2019
8073132
Fix the XAxis stories
Jul 14, 2019
da3b08d
Fix the compilation errors on Scatterplot stories
Jul 14, 2019
91ed468
Get the Legacy API stories to not crash
Jul 14, 2019
acdf3bd
Make lint happy
Jul 15, 2019
64daf7c
Merge branch 'master' of github.com:cognitedata/griff-react into scal…
Jul 15, 2019
f7f2bac
Get yAxisDisplayMode working in AxisCollection
Jul 17, 2019
cdc0804
Cleaned up the axis collection stories
Jul 17, 2019
b5169ef
Fix axis placements
Jul 17, 2019
20df327
Fix the padding on the ruler tooltip
Jul 17, 2019
ae015c0
Fix the collection yAccessor
Jul 18, 2019
b30dd46
Normalize the collection IDs before leaving Griff
Jul 18, 2019
c248b45
Respect the zoomable ContextChart property
Jul 18, 2019
1384c11
Don't try to render GridLines without width & height
Jul 29, 2019
dea5093
Clean up some propTypes
Jul 29, 2019
a5003a8
Remove propTypes from Scaler
Jul 29, 2019
04cddb6
Fix scatterplots
Jul 29, 2019
0b69866
Disable the x-axis placeholder
Jul 29, 2019
8c38424
Fix the scatterplot function loader
Jul 29, 2019
c337375
Fix the function string IDs
Jul 29, 2019
2317f08
More RAM when building storybook
Jul 29, 2019
9e4065e
Run tsc before building storybook
Jul 29, 2019
fa471d9
Remove the legacy API
Aug 2, 2019
a361e1a
Remove unused Data
Aug 2, 2019
e60e1c8
Reuse logic
Aug 2, 2019
e76d2e1
Update README
Aug 2, 2019
f3077fd
Remove a console.log
Aug 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update .bulldozer.yaml
Tweak .bulldozer.yaml to:

  - Use the PR description & title when merging
  - Respect [auto-merge] and [auto-update] labels
  - Response [do-not-merge] and [do-not-update]
Evan Charlton committed Jun 11, 2019
commit abfa13688c042f1c4db05329a82e4ab87ac94867
36 changes: 36 additions & 0 deletions .bulldozer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# "version" is the configuration version, currently "1".
version: 1

# "merge" defines how and when pull requests are merged. If the section is
# missing, bulldozer will consider all pull requests and use default settings.
merge:
# "method" defines the merge method. The available options are "merge",
# "rebase", and "squash".
method: squash

# "options" defines additional options for the individual merge methods.
options:
# "squash" options are only used when the merge method is "squash"
squash:
# "title" defines how the title of the commit message is created when
# generating a squash commit. The options are "pull_request_title",
# "first_commit_title", and "github_default_title". The default is
# "pull_request_title".
title: pull_request_title

# "body" defines how the body of the commit message is created when
# generating a squash commit. The options are "pull_request_body",
# "summarize_commits", and "empty_body". The default is "empty_body".
body: pull_request_body

delete_after_merge: true
whitelist:
labels: ['auto-merge']
blacklist:
labels: ['do-not-merge']

update:
whitelist:
labels: ['auto-update']
blacklist:
labels: ['do-not-update']