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

Convert query control dropdown button to React #3698

Merged
merged 2 commits into from
May 1, 2019
Merged

Convert query control dropdown button to React #3698

merged 2 commits into from
May 1, 2019

Conversation

openjck
Copy link
Contributor

@openjck openjck commented Apr 10, 2019

This conversion needs to happen before we can easily modify it with the
extension API.

What type of PR is this? (check all applicable)

Refactor

@openjck
Copy link
Contributor Author

openjck commented Apr 10, 2019

cc @washort

ranbena
ranbena suggested changes Apr 11, 2019
View reviewed changes
Copy link
Contributor

@ranbena ranbena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. In our react migration effort we convert components to Ant Design. So, plz convert it to AntD Dropdown+Menu (like we do here) and to keep visual consistency, also convert the button next to it "Edit Visualization" to an AntD Button
  2. The menu items don't work properly. Plz test your code.

@ranbena
Copy link
Contributor

ranbena commented Apr 11, 2019

@openjck wdym "extension API"? What does your follow up do?

@openjck
Copy link
Contributor Author

openjck commented Apr 11, 2019

Thanks for the tip about ant. I'll do that. It might take some time as I need to hop on another project for the next few days.

@openjck wdym "extension API"? What does your follow up do?

That may not be the correct term. We use the redash-stmo extensions in our instance of Redash.

@openjck
Copy link
Contributor Author

openjck commented Apr 11, 2019

It also may be the case that extensions are only supported in our fork. @washort should know the answer to that.

@openjck openjck force-pushed the query-control-dropdown-react branch from 78efd63 to 2e9e85e Compare April 19, 2019 21:34
@openjck
Copy link
Contributor Author

openjck commented Apr 19, 2019

Updated to use Ant. The buttons are working for me, but let me know if your have any issues.

@openjck openjck force-pushed the query-control-dropdown-react branch from 2e9e85e to 57d8d9a Compare April 19, 2019 21:38
ranbena
ranbena suggested changes Apr 20, 2019
View reviewed changes
Copy link
Contributor

@ranbena ranbena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @openjck!
Got a few comments in there.
Also, notice a specific test embed/share_embed_spec.js fails.

@openjck openjck force-pushed the query-control-dropdown-react branch from 57d8d9a to 1c9fd18 Compare April 21, 2019 04:13
@openjck
Copy link
Contributor Author

openjck commented Apr 21, 2019

Good tips. Updated. 😃

@openjck openjck force-pushed the query-control-dropdown-react branch from 1c9fd18 to 654e3ba Compare April 21, 2019 06:12
@ranbena
Copy link
Contributor

ranbena commented Apr 21, 2019

The download links aren't workin'...
That's cause their Angular versions have the query-result-link directive which adds onclick logic (queries/query-results-link.js), so make sure to port that as well.

Regarding the failed Cypress tests - I'll send you a fix when this PR is ready.

@openjck openjck force-pushed the query-control-dropdown-react branch 2 times, most recently from c756f54 to 8983849 Compare April 25, 2019 17:55
@openjck
Copy link
Contributor Author

openjck commented Apr 25, 2019 •
edited
Loading

Updated! 😃

@openjck
Copy link
Contributor Author

openjck commented Apr 25, 2019

Percy seems great, but I'm not seeing the changes that it's reporting.

ranbena
ranbena suggested changes Apr 26, 2019
View reviewed changes
Copy link
Contributor

@ranbena ranbena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lookin good. Just a few last requests:

  1. I think Percy diff is cuz branch not updated to latest. Plz rebase.
  2. To tidy things up plz put all components in one folder:
  • app/components
    • EditVisualizationButton
      • index.jsx (currently EditVisualizationButton.jsx)
      • QueryControlDropdown.jsx
      • QueryResultsLink.jsx

@arikfr plz give this a quick look to make sure we didn't forget anything.

@openjck openjck force-pushed the query-control-dropdown-react branch from 8983849 to a320687 Compare April 27, 2019 00:19
@openjck
Copy link
Contributor Author

openjck commented Apr 27, 2019

Updated 😃

@ranbena
Copy link
Contributor

ranbena commented Apr 27, 2019

Sent you some code changes openjck#1

@openjck
Copy link
Contributor Author

openjck commented Apr 30, 2019

Merged your PR. Thanks!

@openjck openjck force-pushed the query-control-dropdown-react branch from b00b8ca to 84702e0 Compare April 30, 2019 18:09
ranbena
ranbena approved these changes Apr 30, 2019
View reviewed changes
Copy link
Contributor

@ranbena ranbena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Plz resolve conflicts (rebase I assume) and it's good to go.

@openjck openjck force-pushed the query-control-dropdown-react branch from 84702e0 to 219c3e9 Compare April 30, 2019 19:11
openjck and others added 2 commits April 30, 2019 16:17
@openjck
Convert query control dropdown button to React
f7905f0 
This conversion needs to happen before we can easily modify it with the
extension API.
@ranbena @openjck
Test fix and some code refactoring
ab7048a
@openjck openjck force-pushed the query-control-dropdown-react branch from 219c3e9 to ab7048a Compare April 30, 2019 20:17
@openjck
Copy link
Contributor Author

openjck commented Apr 30, 2019

Rebased 😃

@ranbena ranbena merged commit fbff4f9 into getredash:master May 1, 2019
@weekly-digest weekly-digest bot mentioned this pull request May 6, 2019
Closed
harveyrendell pushed a commit to pushpay/redash that referenced this pull request Nov 14, 2019
@openjck @harveyrendell
Convert query control dropdown button to React (getredash#3698)
5c74035
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ranbena ranbena ranbena approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@openjck @ranbena