feat(explore): time picker enhancement (apache#11418)

preset-io · Jan 7, 2021 · 7a9488f · 7a9488f
1 parent bc5b815
commit 7a9488f
Show file tree

Hide file tree

Showing 14 changed files with 1,522 additions and 92 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -24,6 +24,7 @@ chardet==3.0.4            # via aiohttp
 click==7.1.2              # via apache-superset, flask, flask-appbuilder
 colorama==0.4.4           # via apache-superset, flask-appbuilder
 contextlib2==0.6.0.post1  # via apache-superset
+convertdate==2.3.0        # via holidays
 cron-descriptor==1.2.24   # via apache-superset
 croniter==0.3.36          # via apache-superset
 cryptography==3.2.1       # via apache-superset
@@ -46,6 +47,7 @@ flask==1.1.2              # via apache-superset, flask-appbuilder, flask-babel,
 geographiclib==1.50       # via geopy
 geopy==2.0.0              # via apache-superset
 gunicorn==20.0.4          # via apache-superset
+holidays==0.10.3          # via apache-superset
 humanize==3.1.0           # via apache-superset
 idna==2.10                # via email-validator, yarl
 importlib-metadata==2.1.1  # via -r requirements/base.in, jsonschema, kombu, markdown
@@ -54,6 +56,7 @@ itsdangerous==1.1.0       # via flask, flask-wtf
 jinja2==2.11.2            # via flask, flask-babel
 jsonschema==3.2.0         # via flask-appbuilder
 kombu==4.6.11             # via celery
+korean-lunar-calendar==0.2.1  # via holidays
 mako==1.1.3               # via alembic
 markdown==3.3.3           # via apache-superset
 markupsafe==1.1.1         # via jinja2, mako, wtforms
@@ -75,20 +78,21 @@ py==1.9.0                 # via retry
 pyarrow==1.0.1            # via apache-superset
 pycparser==2.20           # via cffi
 pyjwt==1.7.1              # via flask-appbuilder, flask-jwt-extended
-pyparsing==2.4.7          # via packaging
+pymeeus==0.3.7            # via convertdate
+pyparsing==2.4.7          # via apache-superset, packaging
 pyrsistent==0.16.1        # via -r requirements/base.in, jsonschema
-python-dateutil==2.8.1    # via alembic, apache-superset, croniter, flask-appbuilder, pandas
+python-dateutil==2.8.1    # via alembic, apache-superset, croniter, flask-appbuilder, holidays, pandas
 python-dotenv==0.15.0     # via apache-superset
 python-editor==1.0.4      # via alembic
 python-geohash==0.8.5     # via apache-superset
 python3-openid==3.2.0     # via flask-openid
-pytz==2020.4              # via babel, celery, flask-babel, pandas
+pytz==2020.4              # via babel, celery, convertdate, flask-babel, pandas
 pyyaml==5.3.1             # via apache-superset, apispec
 redis==3.5.3              # via apache-superset
 retry==0.9.2              # via apache-superset
 selenium==3.141.0         # via apache-superset
 simplejson==3.17.2        # via apache-superset
-six==1.15.0               # via bleach, cryptography, flask-jwt-extended, flask-talisman, isodate, jsonschema, packaging, pathlib2, polyline, prison, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json
+six==1.15.0               # via bleach, cryptography, flask-jwt-extended, flask-talisman, holidays, isodate, jsonschema, pathlib2, polyline, prison, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json
 slackclient==2.5.0        # via apache-superset
 sqlalchemy-utils==0.36.8  # via apache-superset, flask-appbuilder
 sqlalchemy==1.3.20        # via alembic, apache-superset, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils

diff --git a/setup.cfg b/setup.cfg
@@ -30,7 +30,7 @@ combine_as_imports = true
 include_trailing_comma = true
 line_length = 88
 known_first_party = superset
-known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,cron_descriptor,croniter,cryptography,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,freezegun,geohash,geopy,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,msgpack,numpy,pandas,parameterized,parsedatetime,pathlib2,pgsanity,pkg_resources,polyline,prison,pyarrow,pyhive,pytest,pytz,redis,retry,selenium,setuptools,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,werkzeug,wtforms,wtforms_json,yaml
+known_third_party =alembic,apispec,backoff,bleach,cachelib,celery,click,colorama,contextlib2,cron_descriptor,croniter,cryptography,dateutil,flask,flask_appbuilder,flask_babel,flask_caching,flask_compress,flask_login,flask_migrate,flask_sqlalchemy,flask_talisman,flask_testing,flask_wtf,freezegun,geohash,geopy,holidays,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,msgpack,numpy,pandas,parameterized,parsedatetime,pathlib2,pgsanity,pkg_resources,polyline,prison,pyarrow,pyhive,pyparsing,pytest,pytz,redis,retry,selenium,setuptools,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,werkzeug,wtforms,wtforms_json,yaml
 multi_line_output = 3
 order_by_type = false
 

diff --git a/setup.py b/setup.py
@@ -106,6 +106,8 @@ def get_git_sha():
         "sqlalchemy-utils>=0.36.6,<0.37",
         "sqlparse==0.3.0",  # PINNED! see https://github.com/andialbrecht/sqlparse/issues/562
         "wtforms-json",
+        "pyparsing>=2.4.7, <3.0.0",
+        "holidays==0.10.3",  # PINNED! https://github.com/dr-prodigy/python-holidays/issues/406
     ],
     extras_require={
         "athena": ["pyathena>=1.10.8,<1.11"],

diff --git a/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/control.test.ts
@@ -138,20 +138,20 @@ describe('Time range filter', () => {
     cy.visitChartByParams(JSON.stringify(formData));
     cy.verifySliceSuccess({ waitAlias: '@postJson' });
 
-    cy.get('[data-test=time_range]').within(() => {
-      cy.get('span.label').click();
-    });
-
-    cy.get('#filter-popover').within(() => {
-      cy.get('div.ant-tabs-tabpane-active').within(() => {
-        cy.get('div.PopoverSection :not(.dimmed)').within(() => {
+    cy.get('[data-test=time-range-trigger]')
+      .click()
+      .then(() => {
+        cy.get('.ant-modal-footer')
+          .find('button')
+          .its('length')
+          .should('eq', 3);
+        cy.get('.ant-modal-body').within(() => {
           cy.get('input[value="100 years ago"]');
           cy.get('input[value="now"]');
         });
+        cy.get('[data-test=modal-cancel-button]').click();
+        cy.get('[data-test=time-range-modal]').should('not.be.visible');
       });
-    });
-    cy.get('#filter-popover button').contains('Ok').click();
-    cy.get('#filter-popover').should('not.be.visible');
   });
 });
 

diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
@@ -32,14 +32,17 @@ export {
   Avatar,
   Button,
   Card,
+  Col,
   DatePicker,
   Divider,
   Dropdown,
   Empty,
   Input,
+  InputNumber,
   Modal,
   Popover,
   Radio,
+  Row,
   Select,
   Skeleton,
   Switch,