From ca891a2bb4809d9cf0697aada93191e57e028605 Mon Sep 17 00:00:00 2001 From: Aleksandra Sikora Date: Mon, 20 Apr 2020 14:32:47 +0200 Subject: [PATCH 1/3] console: use querySelectorAll on a current ref --- console/src/components/Common/TableCommon/DragFoldTable.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/console/src/components/Common/TableCommon/DragFoldTable.js b/console/src/components/Common/TableCommon/DragFoldTable.js index 7a732b4396995..35d31ed4cd2fb 100644 --- a/console/src/components/Common/TableCommon/DragFoldTable.js +++ b/console/src/components/Common/TableCommon/DragFoldTable.js @@ -16,10 +16,13 @@ class DragFoldTable extends Component { trigger: 0, folded: props.defaultCollapsed || {}, }; + this.tableRef = React.createRef(); } mountEvents() { + if (!this.tableRef.current) return; + const headers = Array.prototype.slice.call( - document.querySelectorAll('.draggable-header') + this.tableRef.current.querySelectorAll('.draggable-header') ); headers.forEach((header, i) => { @@ -88,7 +91,7 @@ class DragFoldTable extends Component { //render return ( -
+
Date: Mon, 20 Apr 2020 14:49:11 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c739664a5745..bef9b81ee2ca6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The order, collapsed state of columns and page size is now persisted across page - console: decouple data rows and count fetch in data browser to account for really large tables (close #3793) (#4269) - console: update cookie policy for API calls to "same-origin" - console: redirect to /:table/browse from /:table (close #4330) (#4374) +- console: fix columns reordering for relationship tables (#4483) - docs: add One-Click Render deployment guide (close #3683) (#4209) - server: reserved keywords in column references break parser (fix #3597) #3927 - server: fix postgres specific error message that exposed database type on invalid query parameters (#4294) From a34cd1038f0cb37b226ca1d4c8d127171c4f8a18 Mon Sep 17 00:00:00 2001 From: Rikin Kachhia <54616969+rikinsk@users.noreply.github.com> Date: Tue, 21 Apr 2020 13:57:08 +0530 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10a218e767841..2eb1204cb81bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - server: add support for `_inc` on `real`, `double`, `numeric` and `money` (fix #3573) - server: support special characters in JSON path query argument with bracket `[]` notation, e.g `obj['Hello World!']` (#3890) (#4482) +- console: change react ace editor theme to eclipse (close #4437) +- console: fix columns reordering for relationship tables in data browser (#4483) ## `v1.2.0-beta.4` @@ -37,8 +39,6 @@ The order, collapsed state of columns and page size is now persisted across page - console: redirect to /:table/browse from /:table (close #4330) (#4374) - console: surround string type column default value with quotes (close #4371) (#4423) - console: add undefined check to fix error (close #4444) (#4445) -- console: change react ace editor theme to eclipse (close #4437) -- console: fix columns reordering for relationship tables (#4483) - docs: add One-Click Render deployment guide (close #3683) (#4209) - server: reserved keywords in column references break parser (fix #3597) #3927 - server: fix postgres specific error message that exposed database type on invalid query parameters (#4294)