Skip to content

Migrate Dashboards/Queries/Users list pages to React #3381

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

Merged
merged 40 commits into from
Feb 5, 2019
Merged

Migrate Dashboards/Queries/Users list pages to React #3381

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
8e6d6b6
Refine existing implementation of dashboards/queries/users lists and …
kravets-levko Jan 30, 2019
0dff4a5
Migrate common list page controller to React and refactor it's logic
kravets-levko Jan 31, 2019
ec5d46f
Migrate Dashboard list page to React
kravets-levko Jan 31, 2019
77ce09d
Migrate Queries list page to React
kravets-levko Jan 31, 2019
88297f7
Migrate Users list page to React
kravets-levko Jan 31, 2019
efed0e0
Merge branch 'master' into feature/react-list-controllers
kravets-levko Jan 31, 2019
7c82ab4
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 2, 2019
02bd99d
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 2, 2019
fb8f624
Remove react-timeago dependency
kravets-levko Feb 2, 2019
834f942
Use composition instead of inheritance
kravets-levko Feb 2, 2019
d92df5c
Refine implementation
kravets-levko Feb 2, 2019
a75d63c
Merge sidebar into single component
kravets-levko Feb 3, 2019
683e75a
Refine column definitions
kravets-levko Feb 3, 2019
72c0099
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 3, 2019
78ebb21
Use simple controller instead of React context
kravets-levko Feb 3, 2019
1b013d3
Refine implementation
kravets-levko Feb 3, 2019
ccf3deb
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 3, 2019
5171317
Restore changes from getredash/redash#2888
kravets-levko Feb 3, 2019
01e999a
Tweak Users list page
kravets-levko Feb 3, 2019
2d3aed6
Ability to render dynamically defined components
kravets-levko Feb 4, 2019
ef7436d
Tweak users list page
kravets-levko Feb 4, 2019
aaaf894
User list page for non-admins
kravets-levko Feb 4, 2019
8a57ded
Fix: ItemsTable ignores isAvailable field
kravets-levko Feb 4, 2019
6412859
Refine implementation
kravets-levko Feb 4, 2019
c419340
Refine implementation
kravets-levko Feb 4, 2019
e40b266
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 4, 2019
1785a8c
Implement LiveItemsList as higher order component
kravets-levko Feb 5, 2019
f8445f3
Some fixes
kravets-levko Feb 5, 2019
dcf22cd
Move some definitions to a better place
kravets-levko Feb 5, 2019
e56d2f6
Some fixes
kravets-levko Feb 5, 2019
b0b1873
Refine components
kravets-levko Feb 5, 2019
fcdd864
Refine UsersList page
kravets-levko Feb 5, 2019
706e4bc
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 5, 2019
26bff4a
More comments for a god of comments
kravets-levko Feb 5, 2019
b9fb9d0
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 5, 2019
3b1055c
Fix wrong tables size on smaller screens
kravets-levko Feb 5, 2019
73bbeab
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 5, 2019
64bc61f
Tweak tables
kravets-levko Feb 5, 2019
3fef4ad
Merge branch 'master' into feature/react-list-controllers
arikfr Feb 5, 2019
7e9eea9
Merge branch 'master' into feature/react-list-controllers
kravets-levko Feb 5, 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
Fix wrong tables size on smaller screens
  • Loading branch information
@kravets-levko
kravets-levko committed Feb 5, 2019
commit 3b1055c2ac519b880b4d161ad5eafa5fad075457
3 changes: 0 additions & 3 deletions client/app/components/items-list/components/ItemsTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export const Columns = {
dateTime(overrides) {
return extend({
width: '1%',
className: 'text-nowrap',
render: text => formatDateTime(text),
}, overrides);
},
Expand All @@ -51,14 +50,12 @@ export const Columns = {
timeAgo(overrides) {
return extend({
width: '1%',
className: 'text-nowrap',
render: value => <TimeAgo date={value} />,
}, overrides);
},
custom(render, overrides) {
return extend({
width: '1%',
className: 'text-nowrap',
render,
}, overrides);
},
Expand Down
2 changes: 1 addition & 1 deletion client/app/pages/dashboards/DashboardList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class DashboardList extends React.Component {
}
{
controller.isLoaded && !controller.isEmpty && (
<div className="bg-white tiled">
<div className="bg-white tiled table-responsive">
<ItemsTable
items={controller.pageItems}
columns={this.listColumns}
Expand Down
2 changes: 1 addition & 1 deletion client/app/pages/queries-list/QueriesList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class QueriesList extends React.Component {
}
{
controller.isLoaded && !controller.isEmpty && (
<div className="bg-white tiled">
<div className="bg-white tiled table-responsive">
<ItemsTable
items={controller.pageItems}
columns={this.listColumns}
Expand Down
6 changes: 3 additions & 3 deletions client/app/pages/users/UsersList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class UsersList extends React.Component {
title: 'Groups',
field: 'groups',
}),
Columns.timeAgo.sortable({ title: 'Joined', field: 'created_at' }),
Columns.timeAgo.sortable({ title: 'Last Active At', field: 'active_at' }),
Columns.timeAgo.sortable({ title: 'Joined', field: 'created_at', className: 'text-nowrap' }),
Columns.timeAgo.sortable({ title: 'Last Active At', field: 'active_at', className: 'text-nowrap' }),
Columns.custom((text, user) => <UsersListActions user={user} actions={this.props.controller.actions} />, {
isAvailable: () => currentUser.isAdmin,
}),
Expand Down Expand Up @@ -168,7 +168,7 @@ class UsersList extends React.Component {
{controller.isLoaded && controller.isEmpty && <EmptyState className="" />}
{
controller.isLoaded && !controller.isEmpty && (
<div>
<div className="table-responsive">
<ItemsTable
items={controller.pageItems}
columns={this.listColumns}
Expand Down