diff --git a/superset-frontend/logs b/superset-frontend/logs deleted file mode 100644 index 9b6bb21636112..0000000000000 --- a/superset-frontend/logs +++ /dev/null @@ -1,84 +0,0 @@ -[2022-06-21 13:53:39 +0000] [14] [INFO] Starting gunicorn 20.1.0 -[2022-06-21 13:53:39 +0000] [14] [INFO] Listening at: http://0.0.0.0:8088 (14) -[2022-06-21 13:53:39 +0000] [14] [INFO] Using worker: gthread -[2022-06-21 13:53:39 +0000] [16] [INFO] Booting worker with pid: 16 -logging was configured successfully -2022-06-21 13:53:40,535:INFO:superset.utils.logging_configurator:logging was configured successfully -{"levelname": "INFO", "name": "cccs_config.logger", "message": "JSON formatted logging successfully configured.", "filename": "logger.py", "funcName": "configure_logging", "module": "logger"} -{"levelname": "INFO", "name": "root", "message": "Configured event logger of type ", "filename": "log.py", "funcName": "get_event_logger_from_cfg_value", "module": "log"} -{"levelname": "WARNING", "name": "superset.utils.cache_manager", "message": "Falling back to the built-in cache, that stores data in the metadata database, for the followinng cache: `FILTER_STATE_CACHE_CONFIG`. It is recommended to use `RedisCache`, `MemcachedCache` or another dedicated caching backend for production deployments", "filename": "cache_manager.py", "funcName": "_init_cache", "module": "cache_manager"} -{"levelname": "WARNING", "name": "superset.utils.cache_manager", "message": "Falling back to the built-in cache, that stores data in the metadata database, for the followinng cache: `EXPLORE_FORM_DATA_CACHE_CONFIG`. It is recommended to use `RedisCache`, `MemcachedCache` or another dedicated caching backend for production deployments", "filename": "cache_manager.py", "funcName": "_init_cache", "module": "cache_manager"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -Loaded your LOCAL configuration at [/app/pythonpath/superset_config.py] -127.0.0.1 - - [21/Jun/2022:13:53:45 +0000] "GET /login/ HTTP/1.1" 200 24912 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:53:46 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819327, 'nbf': 1655819327, 'exp': 1655823227, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': 'ubZTwXL6pEiSVLaMgOyTAA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:53:47 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P-oZFsEIY629EwmBASUGj8bODtul53a-EKDWNSjLwtSS6JYcLyMMDpN1pgyhZ6oMvXuwdQUOXhy1kYiqxUeZmwWcQuvjJz_fcU6BzU8iQb7jFjN_7w-9qw3t17ycDwPd33d-0urRwkKc59sP-uuQ-DIKmxDNnnMtmK76nLQeaECVVgBZxuscInyjtIe_Xts_3xftyuq4Q6IPNZvkcMxrYJ2wDWDM06KIfylO395dUacpwo1vEgV7wwXOKZ0e3FxObTc5LOhaYZK8PQE_eKxAQvzrFlWb5qH--ivhD3nGAfXF4rrOL88UwjufzxdSrw0po69wbHG84A5yFoLe2eZgIqHAibH6CqRW0ShM_cw_E0fuW8ORv37QX7Uw74se7sdIpaAnyYPWqA9nZNnvNNU8Ot3rCLzPhNiMytltYwIb-sF3oqddgMW1tt3CCsXKBpzzqrXguQKtGg55JRmAeb3ylIF52lgtFKeuamoQQtQchrk24Gc56wyQEyssMjzZMALfMXgn12XPOnQP8Vfp7b4l54jWNNfOwEqIQu2nAXQuKpWQ0aWCjJeF6WQFDz1suzYFkDPgcgk6MwaLUGVjzdlabyWrq8YoRDq1L4NmJwIsMryBlM_1hi5OdVc_Gm3MNeT_oi3wkB7ErpAK2FtNU_HT0qblGPQ-akrJJ2MTzlz6QAGIMGPx5xpIE8UBTEcnRPukXE4Jvr69GWUhoUf69uLS516ABYXJYpUAP_EiMXQ0pQbUJtbRdFc1uPql8ard4s1TzKlul-YHL4Zug&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:53:47 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:53:49 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819329, 'nbf': 1655819329, 'exp': 1655823229, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': 'NdlOeo0BiEKT8KwmH2d0AA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:53:49 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P9iCxX_9fXCmlWiCny4bIsh6IyeM5YOWdXZqeaE0heSxYt40KIgL77rMcV8Mukp6iYZTOE-IkzM9Z1P3toYMFybKBIJtKsJ_ozKvIaW1o2OwfMV7ecFR-g099rlEopYsi7v0cU-WShtyOhOQ7zKUW8DWRCNqySO-NuJJ5AN-TYD-mmSgBiBTkCNV4ol3hmuTFzqh7WMclU12BGwNRUtKJxgXo8i5KpA2BZhQ69xsPlPQjikj71zOALCR2SUWzkKsUaQCPmH-KCIw6u40DWZ0RP8zj7dfAXCRWOQP2HAhq-poDGi7aaSeZMAgDI5qNglWEF1LkCVbvVAXg7F6YG7J7HH8yRJNoYEca_USx_kZbemLdwlj3rQUADdF66O3QVubcWEuDS03Y-DExcHQOm4z--VEfqX5M0JhvnNEixbJeHfTO8YCuIdTqerzD4bjeF3EkR0OH3MtQWvFDhrFGMcaKIVYZur5ZskaqMIpvFz7wlptxmBZS5-T2L4hMPARLn0zN0O1XpoGCQtgZKANrnAgLGE4patFzdS1M0N5z-HE1Tb168P6EW493QMRVu-njeZJToOATFcDLebm_VTaAo7oYnOzfhHYastvbCOsQF33Mkb_foNpY4-Cj4I-ONvLCo_yLbBHi3svuC37uBymRp7_Ll08xDNY282WwTCPC8rY12asYFoax1KFiYhTHWL58dQcNqLemoN6w49uVripHd9n6R_JMw8YqpeZAT9sZ3eVLFNo5jF3QuEdZu383NJfh5OUrZRgRXW1TTUzEA&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:53:49 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:53:52 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819332, 'nbf': 1655819332, 'exp': 1655823232, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': 'sfEfHo5jEEaUy5M3d32zAA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:53:52 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P9DPzmwg1840EhbQv_TEFCLOI6WID7HsKsgk_4CU6siNo2nyYjITVtCPdG4K_FVrl8Ks4B6gBdjY7pNDivO9b5yw3i15iGev_ZQdQFeVZdnl1G_xsaw2uqiYch0dwVivWvipW-tI9U_kle_lLUl8zq8x45ix2QVNtge7RiRKW3H9kWSfJmBOK_BD0o3y_mnerXEcmvBc9-blf8HP6rye01a-OWUt1X6LDLyCx5RYpi6gQpxpAfl4XlChoqpNEiFGriwYjP7OI5Ndnhtl-fVUvUOSLUV1h9IvmypqzHbelJWvW5SvkPe3ZwNq6PYRFbKEpVEIa7H3ipb_0AMrwK-gdrFmhx3weIBd3eGTvrhVnukDMO362lXyyNatb03QKB17r3jfiW_eaJOC0bzGHz8J2iurOXQpQLC_CGbERuwGE_Oj4sCGvea3pVty6liIQiw6RPCQXX3Leh-OPDCT0iFzV6knZxxycCB2k_Q8cBXwIE6lHX8kpfmFxlDcxX1lSSWboZ4K4XgzDAGC4yvIWOR3zS6MCrZuY5-slbe1SFPSZhPRO7apTux8-XxGZTHRF99Z1Vv88EvQSVmppxuLVhvw3ZZ0KHRxJcYS0FO-5oHwqELQaja2lQsrjH3Fmro3FGQr3BC5845V-QfeYWQsLoNgizlycnFRLC4BVnKLC34CNwpDI5HgPRW5atF2QUyvCkTiA_s5my8Kxx5JWdG52n10kBPbHBI3QNQ8hq9lC6iwXd-OwBkWkKoFG_LWae-i6d9ZZ6PvxdiFqW3&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:53:52 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:53:55 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819336, 'nbf': 1655819336, 'exp': 1655823236, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': '-88j_z01pkivKz3qcSu9AA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:53:56 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P-bsnsUrFxD7sbFMwG_dpH94H04QX7NG3R7yUI3AVEa4xMR6Q2Z49TrBAFOWwdfH856mlYwIQ02alQI3-hVo217digMIncmfocfS2jIVJO2481pX8jI_qWP4OLYttKwRtVqwJ8rIWAjWWk8XhFgO29eC6QO8kVUjoHaBy_uzrOXco3DrZRTPjp6xMGhXO7yH_c0Zpb3hXeZAJbd4lkpZHbMiFkscNcFEd88mGM__GILVeOn2zQaHFIFsDKMQh9M4vI0eesaEZI9sEec2oG_yIGEYxQSmyVcUDsor1YcS2lF_v9O0INmJMh0_OUWiJfLSxbX66keVRNzrKkROVQ5rUISI0lJelDb3W521bsy4xFimHkznkXkv--b3Ljt6DZyIe1ttX14SyOtR8X_fvIP40pJJ4hhO661-tfk_nZsGID8BXreucBOq1E-5kEp34Dt6A0s_Fn3Sg5kFTA1Nr1W24n3DiS7WzFho91ks3jvjtqLiScSikAD3zhIBq3ipPoReVTJGcrKho9K-wwdZyg_ETBzxnfWhhindaAr-ow56wXhtPi48d01npSR5iSdMrFFopF5wySA2YKcpH0scUv7ezEuAyjNHOxs3ng8kJ5ilTpul5iO76TMwEjGK_CkyQeUDuhsLYFasgbSopGnwWyeE45W2irDqWvGr-bp7uei8ynn4jeZLSeAeP1MELHr83nsopTYnuudNvQOCvIw3GxDmiwz2iDjJFyY5UAjk-gvrCGCs9bU01zToibxaiT59GRDPPTk016RtQrLqvE&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:53:56 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:53:58 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819339, 'nbf': 1655819339, 'exp': 1655823239, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': 'DdCSm7lqhU6SkHZPcmqvAA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:53:59 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P_yORZsRHyLxTOU1GqKfMWNJqsPrdTIQnU9zFqrf_Fralmk74B7xcvDD25HpqfH-YxXvTnbbWKk-ljYRVbXQZRqlU6AFC1CE6i6BgmoQynlSqbQUC4wqaQbVjNxlRy9uQP-psh8GyiQ7j_KVQs6iJz3F3ykF6MrLnr4Bqa1CR4FlIIYV-pdoM83h_ZpiSo18TBjAEzgpC9HG8ISuNzfS9UGJtIyF7MLvrXRV3Su_EUplQ5A-5i7SOhUidpWsyHQsDoluYVObl6VzmgouKAbg5_wlBhqtDSjZeBbTTs2lCesqtRVys89ziO6M56-2yQMeEbrT21trlrqvj27zMaBs_BIsiG0YAU_HwDl-kdahodCFO9j1m5xjnaE6k_MOA0weyplZzwPOVTXTL8pvoZGhmp8uGZNd5TxUIQryrskDNMbHYdQVboyXHAidLrmZA919F-LIPQyTVAi3U-66sf_6WGY70hgzWfDnesx6tM0RiV9rKBV1KMPMrd8Ka_8Km9r9veQ9_BYkWNJ3_8sU9iW-vP_DKOWOOtnT2xyEp_PUSrJmpRAiV6wMQfLdWr0B8an8A82e_RcZNk4ddPR6_KUj8D-4LXOt6umejfIkZ3KlX70vQ1hR80Duj6Ulav84LRheY20ukNJi6l-lPtehHPuLn5C0XNqQUrvvBNDtdU52HFp06_85zJ_iZNQ2kE0FDbnAbn8gOnhoSQRZ3ApxK7nCxLikIRRkOG2UFJeiWN7JuAUVNzpgF7OMpdyvRcJQweG3TJ78YqvUB1fAw&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:53:59 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:54:34 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819374, 'nbf': 1655819374, 'exp': 1655823274, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': '5qdpWheSYkm0GiXrKZtFAA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:54:34 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P804A0E_TTMijwM2q5qn2mkjR7zkxOL6Wals1SbFKGGDAYHx_DKQA4G_pueM4v6CmUZWkWzf1H67jxIiDtSQ486rqgS2gy-9CcC6o8hjsuCrNYSoFTh890RYqBy2WzznVCeWEDyGddWSsdkhulfMEG83AsQ8I9HA-bnbWyqD7TZNUlaoMptLfqiF5cjNTcKbkAKC7GgRbYMZJfD5Blm7ygmuB3Jm67jR263MMWRdPVkmhZu2LBGouPzNkLfn4_8H13SLsOOHVAAt9HuWcidD2m2ZzH7j7E779a0LB7TAS0UopTtmTsJo71gg2E_Eb6_eebnVi1bcIn5ibAenLsOgWuTOz5ud_ceyWlhHLhiSNUGADBDCLBRgPtPKvnV8Gpof0S34sPpTKkIR-Xc3ySBDcYhfdCJeoZNETtM4iwwbBw3Jfj5W84cuXXmRkHYSm5JFoIIGjFI7XfJgmezBxbAhchTUccmqE8TmPo1A9piJjV64-DdZJR7iGK0BjNlv7TL1o43cKes_MY7oQrNwTuRub5PdZBd9EQzDhmRfEo9yxaGLNl4vCppUQyWro_7kLdpxqhGmZCLEQNbL7hL9Hf_ywtHNikptFGBYWgQFO7dWi3iViHtfr7hTzg8pEMCVWcxnZEii-eIuSyAFRO4NAWvuDG06UDd3tTlXNAh9w9v2DDpXD-3fbqfCgqXBdomnyMriPHO_2OXBsvncn_nubDdKZws5oMLSd0gGewmA4mqu92P1FHhDyYXZUKZts6nMTD5Wxs73r_nTXZH&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:54:34 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:54:37 +0000] "GET /login/ HTTP/1.1" 200 24912 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -127.0.0.1 - - [21/Jun/2022:13:54:38 +0000] "GET /login/azure?next= HTTP/1.1" 302 1157 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/login/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "INFO", "name": "cccs_config.security_manager", "message": "Parse JWT token : {'aud': '47311ce1-ebcc-4449-b8ba-3b398f5b9548', 'iss': 'https://login.microsoftonline.com/da9cbe40-ec1e-4997-afb3-17d87574571a/v2.0', 'iat': 1655819379, 'nbf': 1655819379, 'exp': 1655823279, 'email': 'Dustin.Doucette@cyber.gc.ca', 'family_name': 'Doucette', 'given_name': 'Dustin', 'name': 'Doucette, Dustin E.', 'oid': 'd6bc5212-8458-4b7f-bf70-b4573abf1a2a', 'preferred_username': 'Dustin.Doucette@cse-cst.gc.ca', 'rh': '0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.', 'sub': 'YlZXELybOToCQYytOdnpJHXZOYEu7pMzCeJT13t36vc', 'tid': 'da9cbe40-ec1e-4997-afb3-17d87574571a', 'uti': 'mAKrCjKDP0e7GQb-siifAA', 'ver': '2.0'}", "filename": "security_manager.py", "funcName": "oauth_user_info", "module": "security_manager"} -{"levelname": "ERROR", "name": "flask_appbuilder.security.views", "message": "Error returning OAuth user info: int() argument must be a string, a bytes-like object or a number, not 'NoneType'", "filename": "views.py", "funcName": "oauth_authorized", "module": "views"} -127.0.0.1 - - [21/Jun/2022:13:54:39 +0000] "GET /oauth-authorized/azure?code=0.ASwAQL6c2h7sl0mvsxfYdXRXGuEcMUfM60lEuLo7OY9blUgsAFQ.AgABAAIAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P8cuyGyBYgwTzaotu575q4cWGMbVmOqFLh3tqQttjvPEtbOeXv_MXS_Yp2oxpxiMpvGsQ0cqHhRfUJs6lYr4UBlvxQ8AGC1ql8Bgg80KWwJ8p50T-akNcKp4AaJyQOuQH9O3CdjkKC4dPzvb3eJRH_JXtCySAaPxCeZLFobsOIi0uPv5rbfK8RAjGtqakb5EzHMFsJ9mSZbFik-ElDdstVwXE50gmAxPLqADVhCMrFK0oDONvUFfi0fF36ecW4N8orFWJSw2Cc3qQasoKZIhkycPAC7ThVv77VRodXOkKHpNiCYTksMQ2Q5SZMFGZ6G7kbmcEdNfOwQtaA7DG3UQMSikT54xbQPQ-fEu3BSUeZsq9vOJa33TGzvxTCnzEDjREX4Bfz09x-P8RtcProJAqOfzf1vl29y4kJ0THNClDQykBs1kwj3l5TRJNaflkROwDgwBY2rwDzqqSwmyrn1jnwHjUvu14f4QtT4tIJHaeUCD3SBUSxt7Gx08bWwQIDfd7-90LpqLMXWkltaulnYuxOmoWi2QqGRg4-bLO7NnVLlzLImlXTLMxON991-CgXfNcRK4ReU_y82vKxvmXrIwZeb0AY4xR0h98cQaz22dDfOaqqgQ_pwBoKnswUj4t7aibe8f8HWAayAFuNImuLU7n0ZxHC5uoXm4ug0yP7zzXnm8uPgjNctQZDt_ysP23f7dStMo37TF6qOBnTx5LWBSL2RepAuFrm43BFojMjkIZIYRJ5kQknVAy0u94-1qyE6Sa_Xrv0foCcqRVaQ&state=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJuZXh0IjpbIiJdfQ.n7bK6E4Se3txtDn-rNsDO7tkvMh1e0MX2bQ0iyUtMOY&session_state=3c46f5d0-964b-491b-9ff8-fd2513069b2f HTTP/1.1" 302 221 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : cannot import name 'RequestsHttpConnection' from 'elasticsearch' (/usr/local/lib/python3.8/site-packages/elasticsearch/__init__.py)", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -{"levelname": "WARNING", "name": "superset.db_engine_specs", "message": "Unable to load SQLAlchemy dialect : No module named 'sqlalchemy_trino'", "filename": "__init__.py", "funcName": "get_available_engine_specs", "module": "__init__"} -127.0.0.1 - - [21/Jun/2022:13:54:39 +0000] "GET /login/ HTTP/1.1" 200 24973 "https://superset-stg.hogwarts.pb.azure.chimera.cyber.gc.ca/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0" diff --git a/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/controlPanel.tsx b/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/controlPanel.tsx index 66e2b1adbe483..e9f55c01be301 100644 --- a/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/controlPanel.tsx +++ b/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/controlPanel.tsx @@ -402,13 +402,20 @@ const config: ControlPanelConfig = { ], [ { - name: 'order_desc', + name: 'order_by_cols', config: { - type: 'CheckboxControl', - label: t('Sort descending'), - default: true, - description: t('Whether to sort descending or ascending'), - visibility: isAggMode, + type: 'SelectControl', + label: t('Ordering'), + description: t('Order results by selected columns'), + multi: true, + default: [], + mapStateToProps: ({ datasource }) => ({ + choices: datasource?.hasOwnProperty('order_by_choices') + ? (datasource as Dataset)?.order_by_choices + : datasource?.columns || [], + }), + visibility: isRawMode, + resetOnHide: false, }, }, ], diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx index 94dd1241b0eb2..3354d9d42122a 100644 --- a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx +++ b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx @@ -44,6 +44,7 @@ import SpatialControl from 'src/explore/components/controls/SpatialControl'; import withToasts from 'src/components/MessageToasts/withToasts'; import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags'; import Icons from 'src/components/Icons'; +import { bootstrapData } from 'src/preamble'; import CollectionTable from './CollectionTable'; import Fieldset from './Fieldset'; import Field from './Field'; @@ -279,9 +280,17 @@ function ColumnCollectionTable({ fieldKey="advanced_data_type" label={t('Advanced data type')} control={ - ({ + value: v.id, + label: v.verbose_name, + }), + )} /> } /> diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx index c24282f09efc3..cb432318bbc12 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx @@ -115,6 +115,7 @@ export interface AdvancedDataTypesState { parsedAdvancedDataType: string; advancedDataTypeOperatorList: string[]; errorMessage: string; + useDefaultOperators: boolean; } export const useSimpleTabFilterProps = (props: Props) => { @@ -268,7 +269,7 @@ const AdhocFilterEditPopoverSimpleTabContent: React.FC = props => { } = useAdvancedDataTypes(props.validHandler); // TODO: This does not need to exist, just use the advancedTypeOperatorList list const isOperatorRelevantWrapper = (operator: Operators, subject: string) => - subjectAdvancedDataType + subjectAdvancedDataType && !advancedDataTypesState.useDefaultOperators ? isOperatorRelevant(operator, subject) && advancedDataTypesState.advancedDataTypeOperatorList.includes(operator) : isOperatorRelevant(operator, subject); diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/useAdvancedDataTypes.ts b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/useAdvancedDataTypes.ts index 8440b1416dda6..206a4e42f047d 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/useAdvancedDataTypes.ts +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/useAdvancedDataTypes.ts @@ -26,6 +26,7 @@ const INITIAL_ADVANCED_DATA_TYPES_STATE: AdvancedDataTypesState = { parsedAdvancedDataType: '', advancedDataTypeOperatorList: [], errorMessage: '', + useDefaultOperators: false, }; const useAdvancedDataTypes = (validHandler: (isValid: boolean) => void) => { @@ -58,6 +59,7 @@ const useAdvancedDataTypes = (validHandler: (isValid: boolean) => void) => { parsedAdvancedDataType: json.result.display_value, advancedDataTypeOperatorList: json.result.valid_filter_operators, errorMessage: json.result.error_message, + useDefaultOperators: false, }); // Changed due to removal of status field validHandler(!json.result.error_message); @@ -68,8 +70,9 @@ const useAdvancedDataTypes = (validHandler: (isValid: boolean) => void) => { advancedDataTypeOperatorList: advancedDataTypesState.advancedDataTypeOperatorList, errorMessage: t('Failed to retrieve advanced type'), + useDefaultOperators: true, }); - validHandler(false); + validHandler(true); }); }, 600)(); }, diff --git a/superset/advanced_data_type/api.py b/superset/advanced_data_type/api.py index 0fd3375ca0d30..87a820e4410c1 100644 --- a/superset/advanced_data_type/api.py +++ b/superset/advanced_data_type/api.py @@ -91,9 +91,9 @@ def get(self, **kwargs: Any) -> Response: $ref: '#/components/responses/500' """ item = kwargs["rison"] - advanced_data_type = item["type"] + advanced_data_type: str = item["type"] values = item["values"] - addon = ADVANCED_DATA_TYPES.get(advanced_data_type) + addon = ADVANCED_DATA_TYPES.get(advanced_data_type.lower()) if not addon: return self.response( 400, diff --git a/superset/advanced_data_type/schemas.py b/superset/advanced_data_type/schemas.py index 2175541b31ac1..25252b282e209 100644 --- a/superset/advanced_data_type/schemas.py +++ b/superset/advanced_data_type/schemas.py @@ -26,7 +26,7 @@ "values": { "type": "array", "items": {"default": "http"}, - "minItems": 1, + "minItems": 0, }, }, "required": ["type", "values"], diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py index 6d94d65baddaa..860667af65862 100644 --- a/superset/connectors/sqla/models.py +++ b/superset/connectors/sqla/models.py @@ -1519,7 +1519,7 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma utils.FilterOperator.NOT_IN.value, ) - col_advanced_data_type = col_obj.advanced_data_type if col_obj else "" + col_advanced_data_type: str = col_obj.advanced_data_type if col_obj else "" if col_spec and not col_advanced_data_type: target_generic_type = col_spec.generic_type @@ -1535,14 +1535,15 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma ) if ( col_advanced_data_type != "" + and col_advanced_data_type and feature_flag_manager.is_feature_enabled( "ENABLE_ADVANCED_DATA_TYPES" ) - and col_advanced_data_type in ADVANCED_DATA_TYPES + and col_advanced_data_type.lower() in ADVANCED_DATA_TYPES ): values = eq if is_list_target else [eq] # type: ignore bus_resp: AdvancedDataTypeResponse = ADVANCED_DATA_TYPES[ - col_advanced_data_type + col_advanced_data_type.lower() ].translate_type( { "type": col_advanced_data_type, diff --git a/superset/views/base.py b/superset/views/base.py index 9f52404200d4c..d7c0fb52ed3d4 100644 --- a/superset/views/base.py +++ b/superset/views/base.py @@ -387,6 +387,17 @@ def common_bootstrap_payload() -> Dict[str, Any]: "theme_overrides": conf["THEME_OVERRIDES"], "menu_data": menu_data(), "datahub_url": conf.get("DATAHUB_URL", ""), + "advanced_data_types": list( + map( + lambda v: { + "id": v[0], + "verbose_name": v[1].verbose_name, + "description": v[1].description, + "valid_data_types": v[1].valid_data_types, + }, + config["ADVANCED_DATA_TYPES"].items(), + ) + ), } bootstrap_data.update(conf["COMMON_BOOTSTRAP_OVERRIDES_FUNC"](bootstrap_data)) return bootstrap_data