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

Migrate DynamicForm to React #3209

Merged
merged 24 commits into from
Jan 15, 2019
Merged

Migrate DynamicForm to React #3209

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
aea545f
create DynamicForm React component
gabrieldutra Dec 20, 2018
4aa9ca3
Render fields based on target in DynamicForm
gabrieldutra Dec 23, 2018
9fd2cf2
Add missing title property to fields
gabrieldutra Dec 23, 2018
53f3443
Fix style properties in DynamicForm
gabrieldutra Dec 23, 2018
3e671ba
Render File fields in DynamicForm
gabrieldutra Dec 23, 2018
6816e24
Use React for middle component instead of Angular
gabrieldutra Dec 25, 2018
70f3a4b
Functional save button
gabrieldutra Dec 26, 2018
a5f7f14
Update label style
gabrieldutra Dec 26, 2018
b65c43c
Render functional actions
gabrieldutra Dec 27, 2018
553aea1
Handle file inputs
gabrieldutra Dec 30, 2018
d5c185b
Update render methods to fix code climate issues
gabrieldutra Dec 30, 2018
969a97f
Merge remote-tracking branch 'master' into dynamic-form
gabrieldutra Dec 30, 2018
e4d65bf
Fix ant input number showing duplicate arrows
gabrieldutra Dec 30, 2018
c5d82bd
Update DynamicForm style to be vertical
gabrieldutra Jan 5, 2019
211a188
Separate imports from antd in DynamicForm
gabrieldutra Jan 5, 2019
9e452c3
Merge remote-tracking branch 'master' into dynamic-form
gabrieldutra Jan 6, 2019
5e33181
Add Feedback Icons to DynamicForm
gabrieldutra Jan 6, 2019
4dc0ed6
Change Action props on DynamicForm
gabrieldutra Jan 6, 2019
8a2016e
Remove setDefaults method from DynamicForm fields
gabrieldutra Jan 7, 2019
980c1e0
Merge remote-tracking branch 'master' into dynamic-form
gabrieldutra Jan 13, 2019
d72ad8f
Update antd version
gabrieldutra Jan 13, 2019
1efd2ac
Merge remote-tracking branch 'master' into dynamic-form
gabrieldutra Jan 15, 2019
f74d1d3
Remove unnecessary class selectors
gabrieldutra Jan 15, 2019
e4998b7
Remove another unnecessary class selector
gabrieldutra Jan 15, 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
33 changes: 33 additions & 0 deletions client/app/assets/less/redash/ant.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
@import '~antd/lib/style/core/iconfont.less';
@import '~antd/lib/style/core/motion.less';
@import '~antd/lib/input/style/index.less';
@import '~antd/lib/input-number/style/index.less';
@import '~antd/lib/date-picker/style/index.less';
@import '~antd/lib/modal/style/index.less';
@import '~antd/lib/tooltip/style/index.less';
@import '~antd/lib/select/style/index.less';
@import '~antd/lib/checkbox/style/index.less';
@import '~antd/lib/upload/style/index.less';
@import '~antd/lib/form/style/index.less';
@import '~antd/lib/button/style/index.less';
@import '~antd/lib/radio/style/index.less';
@import '~antd/lib/time-picker/style/index.less';
Expand Down Expand Up @@ -40,3 +44,32 @@
.ant-dropdown-in-bootstrap-modal {
z-index: 1050;
}

// Make Ant labels more Redash like
.ant-form-item-label label {
color: inherit;
ranbena marked this conversation as resolved.
Show resolved Hide resolved
}

// Fix ant input number showing duplicate arrows
.ant-input-number-input::-webkit-outer-spin-button,
.ant-input-number-input::-webkit-inner-spin-button {
-webkit-appearance: none;
Copy link
Contributor

@ranbena ranbena Jan 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Looking at the InputNumer page on chrome nor firefox, I don't see a duplicate button. Then why is this happening in Redash?

Copy link
Member Author

Choose a reason for hiding this comment

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

Might be related to our antd version, I'll test it once I try to update our version

margin: 0;
}

.ant-input-number-input {
-moz-appearance: textfield;
}

// Fix for text becoming black on disabled buttons
.btn-danger, .btn-primary, .btn-success, .btn-info {
&[disabled] {
color: @white !important;
}
}
ranbena marked this conversation as resolved.
Show resolved Hide resolved

// Remove green border from Ant inputs
.has-success .ant-input,
.has-success .ant-input:hover {
border-color: @border-color-base !important;
}
ranbena marked this conversation as resolved.
Show resolved Hide resolved
41 changes: 0 additions & 41 deletions client/app/components/dynamic-form.html
View file
Open in desktop

This file was deleted.

124 changes: 0 additions & 124 deletions client/app/components/dynamic-form.js
View file
Open in desktop

This file was deleted.

Loading