You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2024/03/04 15:59:52 UTC
(superset) branch 3.1 updated (039afe8c99 -> a45f27eb9c)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a change to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git
from 039afe8c99 chore: bump cryptography minimum to 42.0.4 (#27281)
new d8c4a7a067 fix(dashboard): table chart drag preview overflowing container (#27308)
new 6ddaf1cf02 fix: Heatmap numeric sorting (#27360)
new 16e5eddeb6 chore: numexpr to fix CVE-2023-39631 (2.8.4 => 2.9.0) (#27187)
new a45f27eb9c fix: Results section in Explore shows an infinite spinner (#27366)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
requirements/base.in | 1 +
requirements/base.txt | 9 +++++----
requirements/development.txt | 11 ++++++++++-
requirements/testing.txt | 2 --
.../plugins/legacy-plugin-chart-heatmap/src/Heatmap.js | 15 ++++++---------
.../legacy-plugin-chart-heatmap/src/transformProps.js | 8 ++++++--
.../src/dashboard/components/dnd/DragDroppable.jsx | 6 ++++++
.../explore/components/DataTablesPane/DataTablesPane.tsx | 3 ++-
8 files changed, 36 insertions(+), 19 deletions(-)
(superset) 04/04: fix: Results section in Explore shows an infinite spinner (#27366)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit a45f27eb9ce1f00ac51b4f7eca0e6e2b834a0396
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Mon Mar 4 08:15:55 2024 -0500
fix: Results section in Explore shows an infinite spinner (#27366)
(cherry picked from commit 231e659b56617fcdefa7534e14ffcfe50a8c084c)
---
.../src/explore/components/DataTablesPane/DataTablesPane.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
index 726f3ea468..60b65c6ffc 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
@@ -123,7 +123,8 @@ export const DataTablesPane = ({
if (
panelOpen &&
activeTabKey.startsWith(ResultTypes.Results) &&
- chartStatus === 'rendered'
+ chartStatus &&
+ chartStatus !== 'loading'
) {
setIsRequest({
results: true,
(superset) 02/04: fix: Heatmap numeric sorting (#27360)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 6ddaf1cf023c8cca074a9c4e89b564eda7eb1ca1
Author: Michael S. Molina <70...@users.noreply.github.com>
AuthorDate: Fri Mar 1 13:08:30 2024 -0500
fix: Heatmap numeric sorting (#27360)
(cherry picked from commit fe2f5a7be9fb6218aa72ab9173481fd21fa40b20)
---
.../plugins/legacy-plugin-chart-heatmap/src/Heatmap.js | 15 ++++++---------
.../legacy-plugin-chart-heatmap/src/transformProps.js | 8 ++++++--
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js
index 18493f0602..ef2c76ad68 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/Heatmap.js
@@ -177,15 +177,12 @@ function Heatmap(element, props) {
}
}
- function ordScale(k, rangeBands, sortMethod) {
+ function ordScale(k, rangeBands, sortMethod, formatter) {
let domain = {};
- const actualKeys = {}; // hack to preserve type of keys when number
records.forEach(d => {
domain[d[k]] = (domain[d[k]] || 0) + d.v;
- actualKeys[d[k]] = d[k];
});
- // Not using object.keys() as it converts to strings
- const keys = Object.keys(actualKeys).map(s => actualKeys[s]);
+ const keys = Object.keys(domain).map(k => formatter(k));
if (sortMethod === 'alpha_asc') {
domain = keys.sort(cmp);
} else if (sortMethod === 'alpha_desc') {
@@ -252,10 +249,10 @@ function Heatmap(element, props) {
const fp = getNumberFormatter(NumberFormats.PERCENT_2_POINT);
- const xScale = ordScale('x', null, sortXAxis);
- const yScale = ordScale('y', null, sortYAxis);
- const xRbScale = ordScale('x', [0, hmWidth], sortXAxis);
- const yRbScale = ordScale('y', [hmHeight, 0], sortYAxis);
+ const xScale = ordScale('x', null, sortXAxis, xAxisFormatter);
+ const yScale = ordScale('y', null, sortYAxis, yAxisFormatter);
+ const xRbScale = ordScale('x', [0, hmWidth], sortXAxis, xAxisFormatter);
+ const yRbScale = ordScale('y', [hmHeight, 0], sortYAxis, yAxisFormatter);
const X = 0;
const Y = 1;
const heatmapDim = [xRbScale.domain().length, yRbScale.domain().length];
diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js
index fa531ef9da..f58c58b724 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js
@@ -57,11 +57,15 @@ export default function transformProps(chartProps) {
const xAxisFormatter =
coltypes[0] === GenericDataType.TEMPORAL
? getTimeFormatter(timeFormat)
- : String;
+ : coltypes[0] === GenericDataType.Numeric
+ ? Number
+ : String;
const yAxisFormatter =
coltypes[1] === GenericDataType.TEMPORAL
? getTimeFormatter(timeFormat)
- : String;
+ : coltypes[1] === GenericDataType.Numeric
+ ? Number
+ : String;
return {
width,
height,
(superset) 03/04: chore: numexpr to fix CVE-2023-39631 (2.8.4 => 2.9.0) (#27187)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 16e5eddeb6d648cf4738ca2f0bcf5422d4e6bcb1
Author: nigzak <10...@users.noreply.github.com>
AuthorDate: Fri Mar 1 19:50:17 2024 +0100
chore: numexpr to fix CVE-2023-39631 (2.8.4 => 2.9.0) (#27187)
Co-authored-by: Stefan Arnold <st...@mercedes-benz.com>
---
requirements/base.in | 1 +
requirements/base.txt | 9 +++++----
requirements/development.txt | 11 ++++++++++-
requirements/testing.txt | 2 --
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/requirements/base.in b/requirements/base.in
index dc632a096a..b1c67b936a 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -18,3 +18,4 @@
#
-e file:.
urllib3>=1.26.18
+numexpr>=2.9.0
diff --git a/requirements/base.txt b/requirements/base.txt
index 2df0f87695..de25938a01 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:89ce10cd392b720033db86b747e77633711a8b5f
+# SHA1:f8f2c882290c71f27b1d9f3263cf0c523cb88ad6
#
# This file is autogenerated by pip-compile-multi
# To update, run:
@@ -211,8 +211,10 @@ nh3==0.2.11
# via apache-superset
numba==0.57.1
# via pandas
-numexpr==2.8.4
- # via pandas
+numexpr==2.9.0
+ # via
+ # -r requirements/base.in
+ # pandas
numpy==1.23.5
# via
# apache-superset
@@ -346,7 +348,6 @@ typing-extensions==4.4.0
# apache-superset
# cattrs
# flask-limiter
- # kombu
# limits
# shillelagh
tzdata==2023.3
diff --git a/requirements/development.txt b/requirements/development.txt
index 58dd97a753..ca80cd60ed 100644
--- a/requirements/development.txt
+++ b/requirements/development.txt
@@ -82,6 +82,10 @@ ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
+pure-sasl==0.6.2
+ # via
+ # pyhive
+ # thrift-sasl
pyasn1==0.5.0
# via
# pyasn1-modules
@@ -111,7 +115,12 @@ tableschema==1.20.2
tabulator==1.53.5
# via tableschema
thrift==0.16.0
- # via apache-superset
+ # via
+ # apache-superset
+ # pyhive
+ # thrift-sasl
+thrift-sasl==0.4.3
+ # via pyhive
tomli==2.0.1
# via pylint
tomlkit==0.11.8
diff --git a/requirements/testing.txt b/requirements/testing.txt
index 382e3bee4b..fce953f8e4 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -118,8 +118,6 @@ pyee==9.0.4
# via playwright
pyfakefs==5.2.2
# via -r requirements/testing.in
-pyhive[presto]==0.7.0
- # via apache-superset
pytest==7.3.1
# via
# -r requirements/testing.in
(superset) 01/04: fix(dashboard): table chart drag preview overflowing container (#27308)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/superset.git
commit d8c4a7a067734c83c61a2e7338c0337500c29fa3
Author: Ross Mabbett <92...@users.noreply.github.com>
AuthorDate: Thu Feb 29 17:37:55 2024 -0500
fix(dashboard): table chart drag preview overflowing container (#27308)
(cherry picked from commit ad3995daf62984bc0652c155643e0aca3a2840a0)
---
superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx b/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
index 6a49f98875..92a3ab5636 100644
--- a/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
+++ b/superset-frontend/src/dashboard/components/dnd/DragDroppable.jsx
@@ -77,6 +77,12 @@ const defaultProps = {
const DragDroppableStyles = styled.div`
${({ theme }) => css`
position: relative;
+ /*
+ Next line is a workaround for a bug in react-dnd where the drag
+ preview expands outside of the bounds of the drag source card, see:
+ https://github.com/react-dnd/react-dnd/issues/832#issuecomment-442071628
+ */
+ transform: translate3d(0, 0, 0);
&.dragdroppable--dragging {
opacity: 0.2;