[incubator-superset] 01/03: fix pagination for list views (#9425)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 0.36
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 4783c84d1d66525fcc080849ea9a0f886dda9e0b
Author: ʈᵃᵢ
AuthorDate: Wed Apr 1 09:20:17 2020 -0700
fix pagination for list views (#9425)
---
superset-frontend/package-lock.json| 283 +++--
superset-frontend/package.json | 2 +
.../components/ListView/ListView_spec.jsx | 10 +-
.../views/dashboardList/DashboardList_spec.jsx | 3 +-
.../src/components/ListView/ListView.tsx | 21 +-
.../src/components/ListView/Pagination.tsx | 53
6 files changed, 224 insertions(+), 148 deletions(-)
diff --git a/superset-frontend/package-lock.json
b/superset-frontend/package-lock.json
index 4478e07..ca4ca8e 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -8817,6 +8817,15 @@
"@types/react": "*"
}
},
+"@types/react-ultimate-pagination": {
+ "version": "1.2.0",
+ "resolved":
"https://registry.npmjs.org/@types/react-ultimate-pagination/-/react-ultimate-pagination-1.2.0.tgz;,
+ "integrity":
"sha512-xFyJn6Jl26Q0bi+QTnLo4W5tCDKOGNU5Gn9iCg+Y6J+VqtuKuJ1wcP1Ax+nXAu5HF9qTgApI/hRn7ceCDC6TAA==",
+ "dev": true,
+ "requires": {
+"@types/react": "*"
+ }
+},
"@types/react-virtualized": {
"version": "9.21.8",
"resolved":
"https://registry.npmjs.org/@types/react-virtualized/-/react-virtualized-9.21.8.tgz;,
@@ -11492,28 +11501,28 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz;,
"integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
},
"ansi-regex": {
"version": "2.1.1",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz;,
"integrity":
"sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz;,
"integrity":
"sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
@@ -11524,14 +11533,14 @@
},
"balanced-match": {
"version": "1.0.0",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz;,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz;,
"integrity":
"sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
@@ -11542,42 +11551,42 @@
},
"chownr": {
"version": "1.1.1",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz;,
"integrity":
"sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz;,
"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
- "resolved": false,
+ "resolved":
"https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz;,
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
"dev": true,
[incubator-superset] branch 0.36 updated (7933e6a -> 26ce954)
This is an automated email from the ASF dual-hosted git repository. villebro pushed a change to branch 0.36 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git. from 7933e6a bump changelog new 4783c84 fix pagination for list views (#9425) new 2825482 [fix]some translation not work better (#9428) new 26ce954 Add check for SSL certificate and add form validators (#9436) The 3 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: superset-frontend/package-lock.json| 283 +++-- superset-frontend/package.json | 2 + .../components/ListView/ListView_spec.jsx | 10 +- .../views/dashboardList/DashboardList_spec.jsx | 3 +- .../src/components/ListView/ListView.tsx | 21 +- .../src/components/ListView/Pagination.tsx | 53 superset/exceptions.py | 4 +- superset/translations/utils.py | 2 +- superset/views/core.py | 12 +- superset/views/database/mixins.py | 10 +- superset/views/database/views.py | 17 +- 11 files changed, 249 insertions(+), 168 deletions(-) create mode 100644 superset-frontend/src/components/ListView/Pagination.tsx
[incubator-superset] 02/03: [fix]some translation not work better (#9428)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 0.36
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 28254825481cf5e096bc32c2a6af1ab66ee1f278
Author: venter
AuthorDate: Wed Apr 1 19:00:23 2020 -0500
[fix]some translation not work better (#9428)
---
superset/translations/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/superset/translations/utils.py b/superset/translations/utils.py
index 2e50cc7..bfb12bb 100644
--- a/superset/translations/utils.py
+++ b/superset/translations/utils.py
@@ -36,7 +36,7 @@ def get_language_pack(locale):
if not pack:
filename = DIR + "/{}/LC_MESSAGES/messages.json".format(locale)
try:
-with open(filename) as f:
+with open(filename, encoding="utf8") as f:
pack = json.load(f)
ALL_LANGUAGE_PACKS[locale] = pack
except Exception: # pylint: disable=broad-except
[incubator-superset] 03/03: Add check for SSL certificate and add form validators (#9436)
This is an automated email from the ASF dual-hosted git repository.
villebro pushed a commit to branch 0.36
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 26ce95455b2a5e54e8d0a085524157b1b1014c8c
Author: Ville Brofeldt <33317356+ville...@users.noreply.github.com>
AuthorDate: Thu Apr 2 08:17:17 2020 +0300
Add check for SSL certificate and add form validators (#9436)
* Add check for server_cert falsy and add form validators
* Address comments
---
superset/exceptions.py| 4 +++-
superset/views/core.py| 12 ++--
superset/views/database/mixins.py | 10 +++---
superset/views/database/views.py | 17 -
4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/superset/exceptions.py b/superset/exceptions.py
index c6b08a1..7564dec 100644
--- a/superset/exceptions.py
+++ b/superset/exceptions.py
@@ -16,6 +16,8 @@
# under the License.
from typing import Optional
+from flask_babel import gettext as _
+
class SupersetException(Exception):
status = 500
@@ -61,7 +63,7 @@ class SpatialException(SupersetException):
class CertificateException(SupersetException):
-pass
+message = _("Invalid certificate")
class DatabaseNotFound(SupersetException):
diff --git a/superset/views/core.py b/superset/views/core.py
index 40ecc6b..6c5497d 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -1369,16 +1369,8 @@ class Superset(BaseSupersetView):
conn.scalar(select([1]))
return json_success('"OK"')
except CertificateException as e:
-logger.info("Invalid certificate %s", e)
-return json_error_response(
-_(
-"Invalid certificate. "
-"Please make sure the certificate begins with\n"
-"-BEGIN CERTIFICATE-\n"
-"and ends with \n"
-"-END CERTIFICATE-"
-)
-)
+logger.info(e.message)
+return json_error_response(e.message)
except NoSuchModuleError as e:
logger.info("Invalid driver %s", e)
driver_name = make_url(uri).drivername
diff --git a/superset/views/database/mixins.py
b/superset/views/database/mixins.py
index f754ced..7f115dc 100644
--- a/superset/views/database/mixins.py
+++ b/superset/views/database/mixins.py
@@ -21,7 +21,7 @@ from flask_babel import lazy_gettext as _
from sqlalchemy import MetaData
from superset import app, security_manager
-from superset.exceptions import CertificateException, SupersetException
+from superset.exceptions import SupersetException
from superset.security.analytics_db_safety import check_sqlalchemy_uri
from superset.utils import core as utils
from superset.views.database.filters import DatabaseFilter
@@ -204,10 +204,8 @@ class DatabaseMixin:
check_sqlalchemy_uri(database.sqlalchemy_uri)
self.check_extra(database)
self.check_encrypted_extra(database)
-utils.parse_ssl_cert(database.server_cert)
-database.server_cert = (
-database.server_cert.strip() if database.server_cert else ""
-)
+if database.server_cert:
+utils.parse_ssl_cert(database.server_cert)
database.set_sqlalchemy_uri(database.sqlalchemy_uri)
security_manager.add_permission_view_menu("database_access",
database.perm)
# adding a new database we always want to force refresh schema list
@@ -236,8 +234,6 @@ class DatabaseMixin:
# this will check whether json.loads(extra) can succeed
try:
extra = database.get_extra()
-except CertificateException:
-raise Exception(_("Invalid certificate"))
except Exception as e:
raise Exception(
_("Extra field cannot be decoded by JSON. %{msg}s", msg=str(e))
diff --git a/superset/views/database/views.py b/superset/views/database/views.py
index 94912e9..794b3e7 100644
--- a/superset/views/database/views.py
+++ b/superset/views/database/views.py
@@ -29,6 +29,7 @@ import superset.models.core as models
from superset import app, db
from superset.connectors.sqla.models import SqlaTable
from superset.constants import RouteMethod
+from superset.exceptions import CertificateException
from superset.utils import core as utils
from superset.views.base import DeleteMixin, SupersetModelView, YamlExportMixin
@@ -50,6 +51,17 @@ def sqlalchemy_uri_form_validator(_, field: StringField) ->
None:
sqlalchemy_uri_validator(field.data, exception=ValidationError)
+def certificate_form_validator(_, field: StringField) -> None:
+"""
+Check if user has submitted a valid SSL certificate
+"""
+if field.data:
+try:
+utils.parse_ssl_cert(field.data)
+except CertificateException as ex:
+raise ValidationError(ex.message)
+
+
def
[incubator-superset] branch 0.36 updated (26ce954 -> 2cd8ca9)
This is an automated email from the ASF dual-hosted git repository. villebro pushed a change to branch 0.36 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git. from 26ce954 Add check for SSL certificate and add form validators (#9436) add 2cd8ca9 Add rc3 commits to CHANGELOG No new revisions were added by this update. Summary of changes: CHANGELOG.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[incubator-superset] tag 0.36.0rc3 created (now 2cd8ca9)
This is an automated email from the ASF dual-hosted git repository. villebro pushed a change to tag 0.36.0rc3 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git. at 2cd8ca9 (commit) This tag includes the following new commits: new 2cd8ca9 Add rc3 commits to CHANGELOG The 1 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.
[incubator-superset] 01/01: Add rc3 commits to CHANGELOG
This is an automated email from the ASF dual-hosted git repository. villebro pushed a commit to tag 0.36.0rc3 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git commit 2cd8ca94c8923c4320e305f92d74d282390646a5 Author: Ville Brofeldt AuthorDate: Thu Apr 2 11:02:00 2020 +0300 Add rc3 commits to CHANGELOG --- CHANGELOG.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e14be39..31868df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,10 @@ under the License. --> ## Change Log -### 0.36.0 (2020/03/07 06:46 +00:00) +### 0.36.0 (2020/04/02 07:57 +00:00) +- [#9436](https://github.com/apache/incubator-superset/pull/9436) Add check for SSL certificate and add form validators (#9436) (@villebro) +- [#9428](https://github.com/apache/incubator-superset/pull/9428) [fix]some translation not work better (#9428) (@venter-zhu) +- [#9425](https://github.com/apache/incubator-superset/pull/9425) fix pagination for list views (#9425) (@nytai) - [#9401](https://github.com/apache/incubator-superset/pull/9401) [fix] dashboard filter indicator no showing single number value (#9401) (@graceguo-supercat) - [#9408](https://github.com/apache/incubator-superset/pull/9408) [fix] allow force refresh for No Results chart (#9408) (@graceguo-supercat) - [#9400](https://github.com/apache/incubator-superset/pull/9400) Build: fix hot reload for charts (#9400) (@ktmud)
[incubator-superset] branch master updated: Enforcing linting of LESS (#9356)
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new c53bc4d Enforcing linting of LESS (#9356)
c53bc4d is described below
commit c53bc4ddf9808a8bb6916bbe3cb31935d33a2420
Author: Evan Rusackas
AuthorDate: Thu Apr 2 10:10:10 2020 -0700
Enforcing linting of LESS (#9356)
* linting some LESS
* enforce linting
* moving font binaries out of stylesheets to fonts folder.
* renaming font specimen sheet directory.
---
.../{stylesheets => }/fonts/FiraCode/specimen.less | 0
.../fonts/FiraCode/woff/FiraCode-Bold.woff | Bin
.../fonts/FiraCode/woff/FiraCode-Light.woff| Bin
.../fonts/FiraCode/woff/FiraCode-Medium.woff | Bin
.../fonts/FiraCode/woff/FiraCode-Regular.woff | Bin
.../fonts/FiraCode/woff/FiraCode-Retina.woff | Bin
.../fonts/FiraCode/woff/FiraCode-VF.woff | Bin
.../fonts/FiraCode/woff2/FiraCode-Bold.woff2 | Bin
.../fonts/FiraCode/woff2/FiraCode-Light.woff2 | Bin
.../fonts/FiraCode/woff2/FiraCode-Medium.woff2 | Bin
.../fonts/FiraCode/woff2/FiraCode-Regular.woff2| Bin
.../fonts/FiraCode/woff2/FiraCode-Retina.woff2 | Bin
.../fonts/FiraCode/woff2/FiraCode-VF.woff2 | Bin
.../fonts/InterUI/Inter-Black.woff | Bin
.../fonts/InterUI/Inter-Black.woff2| Bin
.../fonts/InterUI/Inter-BlackItalic.woff | Bin
.../fonts/InterUI/Inter-BlackItalic.woff2 | Bin
.../fonts/InterUI/Inter-Bold.woff | Bin
.../fonts/InterUI/Inter-Bold.woff2 | Bin
.../fonts/InterUI/Inter-BoldItalic.woff| Bin
.../fonts/InterUI/Inter-BoldItalic.woff2 | Bin
.../fonts/InterUI/Inter-ExtraBold.woff | Bin
.../fonts/InterUI/Inter-ExtraBold.woff2| Bin
.../fonts/InterUI/Inter-ExtraBoldItalic.woff | Bin
.../fonts/InterUI/Inter-ExtraBoldItalic.woff2 | Bin
.../fonts/InterUI/Inter-ExtraLight.woff| Bin
.../fonts/InterUI/Inter-ExtraLight.woff2 | Bin
.../fonts/InterUI/Inter-ExtraLightItalic.woff | Bin
.../fonts/InterUI/Inter-ExtraLightItalic.woff2 | Bin
.../fonts/InterUI/Inter-Italic.woff| Bin
.../fonts/InterUI/Inter-Italic.woff2 | Bin
.../fonts/InterUI/Inter-Light.woff | Bin
.../fonts/InterUI/Inter-Light.woff2| Bin
.../fonts/InterUI/Inter-LightItalic.woff | Bin
.../fonts/InterUI/Inter-LightItalic.woff2 | Bin
.../fonts/InterUI/Inter-Medium.woff| Bin
.../fonts/InterUI/Inter-Medium.woff2 | Bin
.../fonts/InterUI/Inter-MediumItalic.woff | Bin
.../fonts/InterUI/Inter-MediumItalic.woff2 | Bin
.../fonts/InterUI/Inter-Regular.woff | Bin
.../fonts/InterUI/Inter-Regular.woff2 | Bin
.../fonts/InterUI/Inter-SemiBold.woff | Bin
.../fonts/InterUI/Inter-SemiBold.woff2 | Bin
.../fonts/InterUI/Inter-SemiBoldItalic.woff| Bin
.../fonts/InterUI/Inter-SemiBoldItalic.woff2 | Bin
.../fonts/InterUI/Inter-Thin.woff | Bin
.../fonts/InterUI/Inter-Thin.woff2 | Bin
.../fonts/InterUI/Inter-ThinItalic.woff| Bin
.../fonts/InterUI/Inter-ThinItalic.woff2 | Bin
.../fonts/InterUI/Inter-italic.var.woff2 | Bin
.../fonts/InterUI/Inter-roman.var.woff2| Bin
.../fonts/InterUI/Inter.var.woff2 | Bin
superset-frontend/package.json | 2 +-
.../stylesheets/fonts/InterUI/specimen.less| 210 ---
.../stylesheets/less/font_specimens/fira_code.less | 63 ++
.../stylesheets/less/font_specimens/inter_ui.less | 225 +
superset-frontend/stylesheets/less/fonts.less | 5 +-
superset-frontend/stylesheets/less/variables.less | 12 +-
58 files changed, 299 insertions(+), 218 deletions(-)
diff --git a/superset-frontend/stylesheets/fonts/FiraCode/specimen.less
b/superset-frontend/fonts/FiraCode/specimen.less
similarity index 100%
rename from superset-frontend/stylesheets/fonts/FiraCode/specimen.less
rename to superset-frontend/fonts/FiraCode/specimen.less
diff --git
a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Bold.woff
b/superset-frontend/fonts/FiraCode/woff/FiraCode-Bold.woff
similarity index 100%
rename from superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Bold.woff
rename to superset-frontend/fonts/FiraCode/woff/FiraCode-Bold.woff
diff --git
a/superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Light.woff
b/superset-frontend/fonts/FiraCode/woff/FiraCode-Light.woff
similarity index 100%
rename from
superset-frontend/stylesheets/fonts/FiraCode/woff/FiraCode-Light.woff
rename to
[incubator-superset] branch master updated: migrating unique controls (#9446)
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new c003189 migrating unique controls (#9446)
c003189 is described below
commit c003189d0dd6af9766af273f17174a1d3ca02f88
Author: Evan Rusackas
AuthorDate: Thu Apr 2 09:26:52 2020 -0700
migrating unique controls (#9446)
---
CONTRIBUTING.md| 7 -
.../src/explore/controlPanels/DeckGeojson.js | 34 -
.../src/explore/controlPanels/DeckHex.js | 35 -
.../src/explore/controlPanels/DeckMulti.js | 31 -
.../src/explore/controlPanels/DeckPolygon.js | 64 -
.../src/explore/controlPanels/DeckScatter.js | 58 -
superset-frontend/src/explore/controls.jsx | 145 -
7 files changed, 213 insertions(+), 161 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d6a93a9..38c76ab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1118,7 +1118,6 @@ Note the `y_axis_format` is defined under various section
for some charts.
| `contribution` | _N/A_ | |
| `country_fieldtype` | _N/A_ | |
| `date_filter` | _N/A_ | |
-| `deck_slices` | _N/A_ | |
| `default_filters` | _N/A_ | |
| `dimension` | _N/A_ | |
| `end_spatial` | _N/A_ | |
@@ -1141,7 +1140,6 @@ Note the `y_axis_format` is defined under various section
for some charts.
| `grid_size` | _N/A_ | |
| `import_time` | _N/A_ | |
| `instant_filtering` | _N/A_ | |
-| `js_agg_function` | _N/A_ | |
| `js_columns`| _N/A_ | |
| `label` | _N/A_ | |
| `labels_outside`| _N/A_ | |
@@ -1160,14 +1158,11 @@ Note the `y_axis_format` is defined under various
section for some charts.
| `marker_lines` | _N/A_ | |
| `markers` | _N/A_ | |
| `markup_type` | _N/A_ | |
-| `max_radius`| _N/A_ | |
| `min_periods` | _N/A_ | |
-| `min_radius`| _N/A_ | |
| `multiplier`| _N/A_ | |
| `new_dashboard_name`| _N/A_ | |
| `new_slice_name`| _N/A_ | |
| `normalize_across` | _N/A_ | |
-| `num_buckets` | _N/A_ | |
| `num_period_compare`| _N/A_ | |
| `order_bars`| _N/A_ | |
| `order_desc`| _N/A_ | |
@@ -1175,7 +1170,6 @@ Note the `y_axis_format` is defined under various section
for some charts.
| `period_ratio_type` | _N/A_ | |
| `perm` | _N/A_ | |
| `point_radius_fixed`| _N/A_ | |
-| `point_unit`| _N/A_ | |
| `prefix_metric_with_slice_name` | _N/A_ | |
| `range_labels` | _N/A_ | |
| `ranges`| _N/A_ | |
@@ -1216,7 +1210,6 @@ Note the `y_axis_format` is defined under various section
for some charts.
| `table_filter` | _N/A_ | |
| `time_compare` | _N/A_ | |
| `timed_refresh_immune_slices` | _N/A_ | |
-| `toggle_polygons` | _N/A_ | |
| `url` | _N/A_ | |
| `userid`| _N/A_ | |
| `viewport` | _N/A_ | |
diff --git a/superset-frontend/src/explore/controlPanels/DeckGeojson.js
b/superset-frontend/src/explore/controlPanels/DeckGeojson.js
index 63dd8e0..e41c3e3 100644
--- a/superset-frontend/src/explore/controlPanels/DeckGeojson.js
+++ b/superset-frontend/src/explore/controlPanels/DeckGeojson.js
@@ -17,6 +17,9 @@
* under the License.
*/
import { t } from '@superset-ui/translation';
+import { nonEmpty, integer } from '../validators';
+import { formatSelectOptions } from '../../modules/utils';
+import { columnChoices } from '../controls';
export default {
requiresTime: true,
@@ -25,7 +28,21 @@ export default {
label: t('Query'),
expanded: true,
controlSetRows: [
-['geojson', null],
+[
+ {
+name: 'geojson',
+config: {
+ type: 'SelectControl',
+ label: t('GeoJson Column'),
+ validators: [nonEmpty],
+ description: t('Select the geojson column'),
+ mapStateToProps: state => ({
+choices: columnChoices(state.datasource),
+ }),
+},
+ },
+
svn commit: r38778 - in /dev/incubator/superset/0.36.0rc3: ./ apache-superset-incubating-0.36.0rc3-source.tar.gz apache-superset-incubating-0.36.0rc3-source.tar.gz.asc apache-superset-incubating-0.36.
Author: villebro Date: Thu Apr 2 10:25:56 2020 New Revision: 38778 Log: Release 0.36.0rc3 Added: dev/incubator/superset/0.36.0rc3/ dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz (with props) dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.asc dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.sha512 Added: dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz == Binary file - no diff available. Propchange: dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz -- svn:mime-type = application/octet-stream Added: dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.asc == --- dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.asc (added) +++ dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.asc Thu Apr 2 10:25:56 2020 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQFIBAABCAAyFiEE91al5Odv7Ftw0dAOPG1R6/JstFEFAl6FnEcUHHZpbGxlYnJv +QGFwYWNoZS5vcmcACgkQPG1R6/JstFFJjAf+J9Re+a26qaErSVrU8Ufet5RXugzh +pUItF7OWZHXJJQKNJ+yenkLkA2M2qS4V0dNzdKre0WAXVX4REoKV45E0suc5GeWU +Jz5yUmAxvWo4mfuZF+9FBxNF6hwElraCtTtnOfDp9L88sIZg8zxpEPjhhcDN7KyI +8jsjudFOk7Fr+CGnJSc90+DnfPpI+cnhIgDnlsRQkByrbnM6brGTv6im+uw1mhKQ +x+vyXRJTqtyGHRGpraUkMvwJ3gIXKNaFbtSqdWC4ZqdZeuLj+QcIn+rKWVA92jLU +II7+LWD2rBDPYPXFccafr/yN87asjiKrMWdIdxvGdmRwzQNY+Jiqn2iqZw== +=lnm/ +-END PGP SIGNATURE- Added: dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.sha512 == --- dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.sha512 (added) +++ dev/incubator/superset/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz.sha512 Thu Apr 2 10:25:56 2020 @@ -0,0 +1,3 @@ +/Users/ville/svn/superset_dev/0.36.0rc3/apache-superset-incubating-0.36.0rc3-source.tar.gz: +CA91ED81 576E4833 ED8B0F03 56056F6F 07BAF86A 615EC1E5 94ADF683 2305A8E7 120706FD + 9E902399 1F950649 59D9C663 BB1C150F 407A16D8 8AC65C48 3D3911AB
[incubator-superset] branch master updated: Migrating unique bigNumber(total) controls (#9440)
This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 9e79cf3 Migrating unique bigNumber(total) controls (#9440)
9e79cf3 is described below
commit 9e79cf37f8bd735f362318e8d477f17cf556c4ef
Author: Evan Rusackas
AuthorDate: Thu Apr 2 10:52:32 2020 -0700
Migrating unique bigNumber(total) controls (#9440)
* migrating options controls
* lint :sparkles:
* baby steps...
* shared BigNumber controls file
* capitalization matters
---
CONTRIBUTING.md| 15 ---
.../src/explore/controlPanels/BigNumber.jsx| 55 +++-
.../src/explore/controlPanels/BigNumberTotal.js| 22 ++-
.../src/explore/controlPanels/Shared_BigNumber.js | 89 +
.../src/explore/controlPanels/sections.jsx | 60 -
superset-frontend/src/explore/controls.jsx | 147 -
6 files changed, 212 insertions(+), 176 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 38c76ab..82c23fd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1036,15 +1036,6 @@ The `metric` (or equivalent) and
`timeseries_limit_metric` fields are all compos
The filter-box configuration references column names (via the `column` key)
and optionally metric names (via the `metric` key) if sorting is defined.
-### Options
-
-| Field | Type | Notes|
-| -- | - | |
-| `compare_lag` | _number_ | The **Comparison Period Lag** widget |
-| `compare_suffix` | _string_ | The **Comparison suffix** widget |
-| `show_trend_line` | _boolean_ | The **Show Trend Line** widget |
-| `start_y_axis_at_zero` | _boolean_ | The **Start y-axis at 0** widget |
-
### Chart Options
| Field | Type | Notes
|
@@ -1052,7 +1043,6 @@ The filter-box configuration references column names (via
the `column` key) and
| `color_picker`| _object_ | The **Fixed Color** widget
|
| `donut` | _boolean_ | The **Donut** widget
|
| `global_opacity` | _number_ | The **Opacity** widget
|
-| `header_font_size`| _number_ | The **Big Number Font Size** widget (or
similar) |
| `label_colors`| _object_ | The **Color Scheme** widget
|
| `labels_outside` | _boolean_ | The **Put labels outside** widget
|
| `line_interpolation` | _string_ | The **Line Style** widget
|
@@ -1065,7 +1055,6 @@ The filter-box configuration references column names (via
the `column` key) and
| `show_brush` | _string_ | The **Show Range Filter** widget
|
| `show_legend` | _boolean_ | The **Legend** widget
|
| `show_markers`| _string_ | The **Show Markers** widget
|
-| `subheader_font_size` | _number_ | The **Subheader Font Size** widget
|
### X Axis
@@ -1179,8 +1168,6 @@ Note the `y_axis_format` is defined under various section
for some charts.
| `remote_id` | _N/A_ | |
| `resample_fillmethod` | _N/A_ | |
| `resample_how` | _N/A_ | |
-| `resample_method` | _N/A_ | |
-| `resample_rule` | _N/A_ | |
| `reverse_long_lat` | _N/A_ | |
| `rolling_periods` | _N/A_ | |
| `rolling_type` | _N/A_ | |
@@ -1206,9 +1193,7 @@ Note the `y_axis_format` is defined under various section
for some charts.
| `stroke_color_picker` | _N/A_ | |
| `stroke_width` | _N/A_ | |
| `stroked` | _N/A_ | |
-| `subheader` | _N/A_ | |
| `table_filter` | _N/A_ | |
-| `time_compare` | _N/A_ | |
| `timed_refresh_immune_slices` | _N/A_ | |
| `url` | _N/A_ | |
| `userid`| _N/A_ | |
diff --git a/superset-frontend/src/explore/controlPanels/BigNumber.jsx
b/superset-frontend/src/explore/controlPanels/BigNumber.jsx
index 940eae8..a42ae4e 100644
--- a/superset-frontend/src/explore/controlPanels/BigNumber.jsx
+++ b/superset-frontend/src/explore/controlPanels/BigNumber.jsx
@@ -18,6 +18,7 @@
*/
import { t } from '@superset-ui/translation';
import React from 'react';
+import { headerFontSize, subheaderFontSize } from './Shared_BigNumber';
export default {
controlPanelSections: [
@@ -30,9 +31,52 @@ export
