From 09aaf508fb422364643f86f6fade6b7400f8eb1f Mon Sep 17 00:00:00 2001
From: Mike Williams
Date: Tue, 22 Apr 2025 15:19:52 -0400
Subject: [PATCH 01/18] replace everything but CI with upstream
---
.ci/Dockerfile.cypress | 12 +
.ci/compose.ci.yaml | 25 +
.ci/compose.cypress.yaml | 73 +
.ci/docker_build | 39 +
.ci/pack | 9 +
.ci/update_version | 6 +
.dockerignore | 1 -
.github/ISSUE_TEMPLATE/---bug_report.md | 6 +-
.github/ISSUE_TEMPLATE/--anything_else.md | 10 +-
.github/PULL_REQUEST_TEMPLATE.md | 17 +-
.github/support.yml | 23 -
.gitignore | 3 +
.npmrc | 1 +
.nvmrc | 1 +
.pre-commit-config.yaml | 10 +
.restyled.yaml | 11 +-
.yarn/.gitignore | 2 +
tests/extensions/__init__.py => .yarnrc | 0
CHANGELOG.md | 147 +
CONTRIBUTING.md | 60 +-
Dockerfile | 113 +-
LICENSE.borders | 3 +
Makefile | 79 +-
README.md | 42 +-
bin/bundle-extensions | 115 -
bin/docker-entrypoint | 30 +-
bin/dockerflow-version | 13 -
bin/flake8_tests.sh | 9 -
bin/get_changes.py | 25 +-
bin/migrations-graph | 83 -
bin/release_manager.py | 94 +-
bin/upgrade | 242 -
client/.babelrc | 34 +-
client/.eslintrc.js | 66 +-
.../app/assets/images/db-logos/arangodb.png | Bin 0 -> 99239 bytes
.../images/db-logos/corporate_memory.png | Bin 0 -> 1578 bytes
.../app/assets/images/db-logos/databend.png | Bin 0 -> 3304 bytes
.../app/assets/images/db-logos/databricks.png | Bin 2562 -> 2884 bytes
.../assets/images/db-logos/dynamodb_sql.png | Bin 12572 -> 0 bytes
client/app/assets/images/db-logos/e6data.png | Bin 0 -> 5373 bytes
.../assets/images/db-logos/elasticsearch2.png | Bin 0 -> 16596 bytes
...sticsearch2_OpenDistroSQLElasticSearch.png | Bin 0 -> 16596 bytes
.../elasticsearch2_XPackSQLElasticSearch.png | Bin 0 -> 16596 bytes
client/app/assets/images/db-logos/excel.png | Bin 0 -> 3712 bytes
.../app/assets/images/db-logos/firebolt.png | Bin 0 -> 12706 bytes
.../images/db-logos/google_analytics4.png | Bin 0 -> 14670 bytes
.../images/db-logos/google_search_console.png | Bin 0 -> 14406 bytes
client/app/assets/images/db-logos/ignite.png | Bin 0 -> 18667 bytes
.../app/assets/images/db-logos/influxdbv2.png | Bin 0 -> 18953 bytes
client/app/assets/images/db-logos/nz.png | Bin 0 -> 1278 bytes
client/app/assets/images/db-logos/pinot.png | Bin 0 -> 29662 bytes
client/app/assets/images/db-logos/qubole.png | Bin 2428 -> 0 bytes
.../app/assets/images/db-logos/risingwave.png | Bin 0 -> 9913 bytes
.../images/db-logos/sparql_endpoint.png | Bin 0 -> 31764 bytes
.../app/assets/images/db-logos/tinybird.png | Bin 0 -> 18169 bytes
client/app/assets/images/db-logos/trino.png | Bin 0 -> 23773 bytes
.../assets/images/db-logos/yandex_disk.png | Bin 0 -> 8745 bytes
.../app/assets/images/destinations/asana.png | Bin 0 -> 12655 bytes
.../assets/images/destinations/datadog.png | Bin 0 -> 45797 bytes
.../assets/images/destinations/discord.png | Bin 0 -> 7202 bytes
.../assets/images/destinations/hipchat.png | Bin 11742 -> 0 bytes
.../destinations/microsoft_teams_webhook.png | Bin 0 -> 4206 bytes
.../app/assets/images/destinations/webex.png | Bin 0 -> 22705 bytes
client/app/assets/less/ant.less | 35 +-
client/app/assets/less/inc/alert.less | 4 +
client/app/assets/less/inc/base.less | 12 +-
client/app/assets/less/inc/edit-in-place.less | 31 +-
client/app/assets/less/inc/generics.less | 255 +-
client/app/assets/less/inc/popover.less | 4 +-
.../app/assets/less/inc/schema-browser.less | 162 +-
client/app/assets/less/inc/table.less | 229 +-
client/app/assets/less/redash/query.less | 39 +-
.../ApplicationLayout/DesktopNavbar.jsx | 169 +-
.../ApplicationLayout/DesktopNavbar.less | 123 +-
.../ApplicationLayout/MobileNavbar.jsx | 25 +-
.../ApplicationLayout/VersionInfo.jsx | 9 +-
.../ApplicationLayout/index.jsx | 26 +-
.../ApplicationArea/ErrorMessage.jsx | 22 +-
.../ApplicationArea/ErrorMessageDetails.jsx | 11 +
.../app/components/ApplicationArea/Router.jsx | 18 +-
.../ApplicationArea/handleNavigationIntent.js | 2 +-
.../app/components/ApplicationArea/index.jsx | 7 +
.../routeWithApiKeySession.jsx | 4 +-
.../ApplicationArea/routeWithUserSession.jsx | 81 -
.../ApplicationArea/routeWithUserSession.tsx | 110 +
client/app/components/BeaconConsent.jsx | 9 +-
client/app/components/BigMessage.jsx | 15 +-
client/app/components/CodeBlock.jsx | 5 +-
client/app/components/CodeBlock.less | 2 +-
client/app/components/CreateSourceDialog.jsx | 23 +-
client/app/components/DialogWrapper.d.ts | 30 +
client/app/components/DynamicComponent.jsx | 8 +-
client/app/components/EditInPlace.jsx | 1 +
.../EditParameterSettingsDialog.jsx | 75 +-
.../EditParameterSettingsDialog.less | 3 +
.../QueryControlDropdown.jsx | 40 +-
.../QueryResultsLink.jsx | 5 +-
.../EditVisualizationButton/index.jsx | 4 +-
.../app/components/EmailSettingsWarning.jsx | 15 +-
client/app/components/FavoritesControl.jsx | 8 +-
client/app/components/Filters.jsx | 4 +-
client/app/components/HelpTrigger.jsx | 412 +-
client/app/components/HelpTrigger.less | 5 +-
client/app/components/InputWithCopy.jsx | 10 +-
client/app/components/Link.tsx | 61 +
client/app/components/Paginator.jsx | 22 +-
.../app/components/ParameterApplyButton.jsx | 15 +-
.../app/components/ParameterMappingInput.jsx | 99 +-
.../app/components/ParameterMappingInput.less | 5 +-
client/app/components/ParameterValueInput.jsx | 68 +-
.../app/components/ParameterValueInput.less | 7 +-
client/app/components/Parameters.jsx | 84 +-
client/app/components/Parameters.less | 4 +-
.../PermissionsEditorDialog/index.jsx | 30 +-
client/app/components/PlainButton.less | 22 +
client/app/components/PlainButton.tsx | 20 +
client/app/components/PreviewCard.jsx | 5 +-
.../components/QueryBasedParameterInput.jsx | 20 +-
client/app/components/QueryLink.jsx | 7 +-
client/app/components/QuerySelector.jsx | 34 +-
client/app/components/Resizable/index.jsx | 3 +
client/app/components/SelectItemsDialog.jsx | 12 +-
client/app/components/SelectItemsDialog.less | 9 +
.../components/SelectWithVirtualScroll.tsx | 46 +
client/app/components/SettingsWrapper.jsx | 5 +-
client/app/components/TagsList.jsx | 82 -
client/app/components/TagsList.less | 55 +-
client/app/components/TagsList.tsx | 108 +
client/app/components/TimeAgo.jsx | 12 +-
client/app/components/Tooltip.tsx | 13 +
client/app/components/UserGroups.jsx | 32 +
client/app/components/UserGroups.less | 7 +
client/app/components/admin/Layout.jsx | 27 +-
client/app/components/admin/RQStatus.jsx | 10 +-
client/app/components/admin/layout.less | 16 +-
.../app/components/cards-list/CardsList.jsx | 83 -
.../app/components/cards-list/CardsList.less | 11 +-
.../app/components/cards-list/CardsList.tsx | 89 +
.../components/dashboards/AddWidgetDialog.jsx | 12 +-
.../dashboards/CreateDashboardDialog.jsx | 7 +-
.../components/dashboards/DashboardGrid.jsx | 14 +-
.../dashboards/ExpandedWidgetDialog.jsx | 9 +-
.../components/dashboards/TextboxDialog.jsx | 11 +-
.../components/dashboards/dashboard-grid.less | 43 +-
.../dashboard-widget/VisualizationWidget.jsx | 103 +-
.../dashboards/dashboard-widget/Widget.jsx | 18 +-
.../dashboards/dashboard-widget/Widget.less | 48 +-
.../components/dynamic-form/DynamicForm.jsx | 469 +-
.../components/dynamic-form/DynamicForm.less | 2 +-
.../dynamic-form/DynamicFormField.jsx | 82 +
.../dynamic-form/dynamicFormHelper.js | 8 -
.../dynamic-form/fields/AceEditorField.jsx | 6 +
.../dynamic-form/fields/CheckboxField.jsx | 8 +
.../dynamic-form/fields/ContentField.jsx | 3 +
.../dynamic-form/fields/FileField.jsx | 18 +
.../dynamic-form/fields/InputField.jsx | 6 +
.../dynamic-form/fields/NumberField.jsx | 6 +
.../dynamic-form/fields/SelectField.jsx | 21 +
.../dynamic-form/fields/TextAreaField.jsx | 6 +
.../components/dynamic-form/fields/index.js | 8 +
.../components/dynamic-form/getFieldLabel.js | 6 +
.../dynamic-parameters/DateParameter.jsx | 115 +-
.../dynamic-parameters/DateRangeParameter.jsx | 118 +-
.../dynamic-parameters/DynamicButton.jsx | 25 +-
.../dynamic-parameters/DynamicButton.less | 6 +
.../dynamic-parameters/DynamicDatePicker.jsx | 112 +
.../DynamicDateRangePicker.jsx | 115 +
.../dynamic-parameters/DynamicParameters.less | 45 +-
.../components/empty-state/EmptyState.d.ts | 50 +
.../app/components/empty-state/EmptyState.jsx | 228 +-
.../components/empty-state/empty-state.less | 39 +-
.../components/groups/CreateGroupDialog.jsx | 1 +
.../components/groups/DeleteGroupButton.jsx | 2 +-
.../components/groups/DetailsPageSidebar.jsx | 10 +-
.../app/components/groups/ListItemAddon.jsx | 27 +-
.../{ItemsList.jsx => ItemsList.tsx} | 94 +-
.../items-list/classes/ItemsSource.d.ts | 51 +
.../items-list/classes/ItemsSource.js | 56 +-
.../components/items-list/classes/Sorter.js | 8 +-
.../items-list/components/ItemsTable.jsx | 90 +-
.../items-list/components/Sidebar.jsx | 54 +-
.../hooks/useItemsListExtraActions.js | 77 +
.../components/layouts/ContentWithSidebar.jsx | 2 +-
.../layouts/content-with-sidebar.less | 12 +-
client/app/components/proptypes.js | 72 +-
.../queries/AddToDashboardDialog.jsx | 24 +-
.../components/queries/ApiKeyDialog/index.jsx | 21 +-
.../components/queries/EmbedQueryDialog.jsx | 17 +-
.../components/queries/EmbedQueryDialog.less | 2 +-
.../queries/QueryEditor/AutoLimitCheckbox.jsx | 37 +
.../QueryEditor/AutocompleteToggle.jsx | 10 +-
.../QueryEditor/QueryEditorControls.jsx | 10 +-
.../QueryEditor/QueryEditorControls.less | 6 +
.../app/components/queries/QueryEditor/ace.js | 16 +-
.../components/queries/QueryEditor/index.jsx | 29 +-
.../app/components/queries/ScheduleDialog.jsx | 22 +-
.../components/queries/ScheduleDialog.test.js | 19 +-
.../app/components/queries/SchedulePhrase.jsx | 7 +-
.../app/components/queries/SchemaBrowser.jsx | 216 +-
client/app/components/queries/SchemaData.jsx | 141 -
.../__snapshots__/ScheduleDialog.test.js.snap | 10917 ++++++---
.../queries/add-to-dashboard-dialog.less | 5 +-
.../databricks/DatabricksSchemaBrowser.jsx | 51 +-
.../databricks/DatabricksSchemaBrowser.less | 28 +-
.../databricks/useDatabricksSchema.js | 136 +-
.../queries/editor-components/index.js | 5 +-
.../query-snippets/QuerySnippetDialog.jsx | 13 +-
.../components/tags-control/TagsControl.jsx | 17 +-
.../EditVisualizationDialog.jsx | 16 +-
.../visualizations/VisualizationRenderer.jsx | 39 +-
.../visualizationComponents.jsx | 33 +
client/app/config/antd-spinner.jsx | 7 +-
client/app/index.html | 27 +-
client/app/lib/accessibility.ts | 45 +
client/app/lib/calculateTextWidth.ts | 20 +
client/app/lib/hooks/useLazyRef.ts | 11 +
client/app/lib/hooks/useUniqueId.ts | 7 +
client/app/lib/queryFormat.test.js | 56 +
client/app/lib/queryFormat.ts | 23 +
client/app/lib/useQueryResultData.js | 1 +
client/app/lib/utils.js | 89 +-
client/app/multi_org.html | 4 +-
client/app/pages/admin/OutdatedQueries.jsx | 59 +-
client/app/pages/alert/Alert.jsx | 44 +-
client/app/pages/alert/AlertEdit.jsx | 18 +-
client/app/pages/alert/AlertNew.jsx | 10 +-
client/app/pages/alert/AlertView.jsx | 42 +-
.../alert/components/AlertDestinations.jsx | 25 +-
.../app/pages/alert/components/Criteria.jsx | 93 +-
.../app/pages/alert/components/Criteria.less | 22 +-
.../app/pages/alert/components/MenuButton.jsx | 21 +-
.../alert/components/NotificationTemplate.jsx | 8 +-
client/app/pages/alert/components/Query.jsx | 27 +-
client/app/pages/alert/components/Query.less | 9 +-
client/app/pages/alert/components/Title.jsx | 3 +
client/app/pages/alerts/AlertsList.jsx | 64 +-
client/app/pages/dashboards/DashboardList.jsx | 249 +-
client/app/pages/dashboards/DashboardPage.jsx | 81 +-
.../app/pages/dashboards/DashboardPage.less | 2 +-
.../pages/dashboards/PublicDashboardPage.jsx | 7 +-
.../dashboards/components/DashboardHeader.jsx | 113 +-
.../components/DashboardHeader.less | 11 +-
.../components/DashboardListEmptyState.jsx | 34 -
.../components/DashboardListEmptyState.tsx | 61 +
.../components/ShareDashboardDialog.jsx | 9 +-
.../app/pages/dashboards/dashboard-list.css | 7 +-
.../pages/dashboards/hooks/useDashboard.js | 23 +-
.../pages/dashboards/hooks/useDataSources.js | 28 +
.../dashboards/hooks/useDuplicateDashboard.js | 40 +
.../pages/data-sources/DataSourcesList.jsx | 67 +-
.../app/pages/data-sources/EditDataSource.jsx | 15 +-
.../schema-table-components/EditableTable.jsx | 83 -
.../schema-table-components/QueryListItem.jsx | 40 -
.../QuerySearchDialog.jsx | 106 -
.../SampleQueryList.jsx | 85 -
.../schema-table-components/SchemaTable.jsx | 276 -
.../TableVisibilityCheckbox.jsx | 24 -
.../schema-table-components/schema-table.css | 20 -
.../pages/destinations/DestinationsList.jsx | 7 +-
client/app/pages/groups/GroupDataSources.jsx | 12 +-
client/app/pages/groups/GroupMembers.jsx | 6 +-
client/app/pages/groups/GroupsList.jsx | 13 +-
client/app/pages/home/Home.jsx | 136 +-
.../pages/home/components/FavoritesList.jsx | 94 +
client/app/pages/queries-list/QueriesList.jsx | 273 +-
.../queries-list/QueriesListEmptyState.jsx | 40 +-
.../app/pages/queries-list/queries-list.css | 8 +-
client/app/pages/queries/QuerySource.jsx | 69 +-
client/app/pages/queries/QuerySource.less | 5 +-
client/app/pages/queries/QueryView.jsx | 56 +-
client/app/pages/queries/QueryView.less | 2 +-
.../app/pages/queries/VisualizationEmbed.jsx | 33 +-
.../components/QueryExecutionMetadata.jsx | 21 +-
.../queries/components/QueryPageHeader.jsx | 31 +-
.../queries/components/QueryPageHeader.less | 9 +-
.../queries/components/QuerySourceAlerts.jsx | 27 +-
.../components/QuerySourceDropdown.jsx | 38 +
.../components/QuerySourceDropdownItem.jsx | 24 +
.../components/QuerySourceTypeIcon.jsx | 11 +
.../components/QueryVisualizationTabs.jsx | 52 +-
.../components/QueryVisualizationTabs.less | 47 +-
.../pages/queries/hooks/useAutoLimitFlags.js | 24 +
.../queries/hooks/useAutocompleteFlags.js | 9 +-
.../pages/queries/hooks/useDuplicateQuery.js | 17 +-
.../app/pages/queries/hooks/useFormatQuery.js | 19 -
client/app/pages/queries/hooks/useQuery.js | 9 +-
.../queries/hooks/useQueryDataSources.js | 10 +-
.../app/pages/queries/hooks/useQueryFlags.js | 4 +-
.../pages/queries/hooks/useUpdateQuery.jsx | 4 +-
.../query-snippets/QuerySnippetsList.jsx | 21 +-
.../query-snippets/QuerySnippetsList.less | 21 +
.../pages/settings/OrganizationSettings.jsx | 99 +-
.../AuthSettings/PasswordLoginSettings.jsx | 37 +-
.../components/AuthSettings/SAMLSettings.jsx | 98 +-
.../GeneralSettings/BeaconConsentSettings.jsx | 32 +-
.../GeneralSettings/FeatureFlagsSettings.jsx | 62 +-
.../GeneralSettings/FormatSettings.jsx | 45 +-
.../GeneralSettings/PlotlySettings.jsx | 19 +-
.../pages/settings/components/prop-types.js | 2 +
.../settings/hooks/useOrganizationSettings.js | 65 +
client/app/pages/users/UsersList.jsx | 25 +-
.../app/pages/users/components/ApiKeyForm.jsx | 4 +-
.../users/components/CreateUserDialog.jsx | 55 +-
.../PasswordForm/PasswordLinkAlert.jsx | 2 +-
.../users/components/ReadOnlyUserProfile.jsx | 2 +-
.../app/pages/users/components/UserGroups.jsx | 29 -
.../pages/users/components/UserInfoForm.jsx | 5 +-
client/app/redash-font/style.less | 21 +-
client/app/services/alert.js | 1 +
client/app/services/auth.js | 29 +-
client/app/services/auth.test.js | 41 +
client/app/services/axios.js | 38 +-
client/app/services/dashboard.js | 42 +-
client/app/services/data-source.js | 33 +-
client/app/services/databricks-data-source.js | 41 +-
client/app/services/destination.js | 2 +-
client/app/services/notification.d.ts | 19 +
.../app/services/parameters/DateParameter.js | 2 +-
.../services/parameters/DateRangeParameter.js | 73 +-
.../parameters/TextPatternParameter.js | 29 +
client/app/services/parameters/index.js | 4 +
.../parameters/tests/Parameter.test.js | 2 +
.../tests/TextPatternParameter.test.js | 21 +
client/app/services/policy/DefaultPolicy.js | 10 +-
client/app/services/query-result.js | 20 +-
client/app/services/query-result.test.js | 17 +
client/app/services/query.js | 29 +-
client/app/services/restoreSession.jsx | 91 +
client/app/services/routes.js | 42 -
client/app/services/routes.ts | 63 +
client/app/services/sanitize.js | 2 +
client/app/services/widget.js | 44 +-
client/app/styles/formStyle.less | 10 +
client/app/styles/formStyle.ts | 18 +
client/cypress/cypress.js | 74 +-
.../integration/alert/create_alert_spec.js | 4 +-
.../integration/alert/edit_alert_spec.js | 14 +-
.../integration/alert/view_alert_spec.js | 31 +-
.../integration/dashboard/dashboard_list.js | 24 +
.../integration/dashboard/dashboard_spec.js | 45 +-
.../dashboard/dashboard_tags_spec.js | 9 +-
.../integration/dashboard/filters_spec.js | 11 +-
.../dashboard/grid_compliant_widgets_spec.js | 13 +-
...eter_mapping_spec.js => parameter_spec.js} | 80 +-
.../integration/dashboard/sharing_spec.js | 40 +-
.../integration/dashboard/textbox_spec.js | 21 +-
.../integration/dashboard/widget_spec.js | 13 +-
.../data-source/create_data_source_spec.js | 20 +-
.../destination/create_destination_spec.js | 10 +-
.../integration/embed/share_embed_spec.js | 42 +-
.../integration/query/create_query_spec.js | 4 +-
.../cypress/integration/query/filters_spec.js | 53 +-
.../integration/query/parameter_spec.js | 332 +-
.../integration/query/query_tags_spec.js | 9 +-
.../settings/organization_settings_spec.js | 34 +-
.../settings/settings_tabs_spec.js | 6 +-
.../integration/user/create_user_spec.js | 28 +
.../visualizations/box_plot_spec.js | 6 +-
.../integration/visualizations/chart_spec.js | 140 +
.../visualizations/choropleth_spec.js | 18 +-
.../integration/visualizations/cohort_spec.js | 12 +-
.../visualizations/counter_spec.js | 38 +-
.../edit_visualization_dialog_spec.js | 4 +-
.../integration/visualizations/funnel_spec.js | 8 +-
.../integration/visualizations/map_spec.js | 6 +-
.../integration/visualizations/pivot_spec.js | 50 +-
.../visualizations/sankey_sunburst_spec.js | 33 +-
.../visualizations/table/table_spec.js | 68 +-
.../visualizations/word_cloud_spec.js | 18 +-
client/cypress/plugins/index.js | 5 -
client/cypress/support/commands.js | 51 +-
client/cypress/support/dashboard/index.js | 7 +-
client/cypress/support/index.js | 13 +
client/cypress/support/parameters.js | 13 +
client/cypress/support/redash-api/index.js | 131 +-
client/cypress/support/tags/index.js | 3 +-
.../cypress/support/visualizations/chart.js | 78 +
.../cypress/support/visualizations/table.js | 8 +-
client/cypress/tsconfig.json | 7 +
client/jsconfig.json | 9 -
client/tsconfig.json | 28 +
codecov.yml | 6 +
docker-compose.yml => compose.yaml | 25 +-
cypress.config.js | 22 +
cypress.json | 15 -
manage.py | 2 +-
migrations/alembic.ini | 1 -
migrations/env.py | 32 +-
migrations/versions/0ec979123ba4_.py | 28 +
...ake_case_insensitive_hash_of_query_text.py | 51 +
migrations/versions/118aa16f565b_.py | 38 -
migrations/versions/151a4c333e96_.py | 24 -
migrations/versions/280daa582976_.py | 59 -
migrations/versions/640888ce445d_.py | 15 +-
...c2387a07_match_column_name_length_to_bq.py | 34 -
migrations/versions/6adb92e75691_.py | 27 -
...hange_type_of_json_fields_from_varchar_.py | 135 +
.../73beceabb948_bring_back_null_schedule.py | 5 +-
...reate_sqlalchemy_searchable_expressions.py | 25 +
.../89bc7873a3e0_fix_multiple_heads.py | 24 +
migrations/versions/969126bd800f_.py | 8 +-
...2_add_encrypted_options_to_data_sources.py | 5 +-
migrations/versions/9e8c841d1a30_fix_hash.py | 64 +
.../versions/a92d92aa678e_inline_tags.py | 6 +-
migrations/versions/ba150362b02e_.py | 26 -
migrations/versions/cf135a57332e_.py | 32 -
...d7d747033183_encrypt_alert_destinations.py | 64 +
.../da6767746e76_add_more_db_indexes.py | 101 -
...f8a917aa8e_add_user_details_json_column.py | 4 +-
migrations/versions/fd4fc850d7ea_.py | 60 +
netlify.toml | 11 +-
package-lock.json | 18326 ----------------
package.json | 145 +-
poetry.lock | 5496 +++++
pyproject.toml | 178 +
pytest.ini | 3 +
redash/__init__.py | 28 +-
redash/app.py | 8 +-
redash/authentication/__init__.py | 66 +-
redash/authentication/account.py | 5 +-
redash/authentication/google_oauth.py | 182 +-
redash/authentication/jwt_auth.py | 62 +-
redash/authentication/ldap_auth.py | 16 +-
redash/authentication/remote_user_auth.py | 12 +-
redash/authentication/saml_auth.py | 60 +-
redash/cli/__init__.py | 52 +-
redash/cli/data_sources.py | 65 +-
redash/cli/database.py | 104 +-
redash/cli/groups.py | 18 +-
redash/cli/organization.py | 37 +-
redash/cli/queries.py | 20 +-
redash/cli/rq.py | 60 +-
redash/cli/users.py | 34 +-
redash/destinations/__init__.py | 6 +-
redash/destinations/asana.py | 64 +
redash/destinations/chatwork.py | 32 +-
redash/destinations/datadog.py | 93 +
redash/destinations/discord.py | 70 +
redash/destinations/email.py | 21 +-
redash/destinations/hangoutschat.py | 32 +-
redash/destinations/hipchat.py | 61 -
redash/destinations/mattermost.py | 20 +-
.../destinations/microsoft_teams_webhook.py | 114 +
redash/destinations/pagerduty.py | 9 +-
redash/destinations/slack.py | 41 +-
redash/destinations/webex.py | 230 +
redash/destinations/webhook.py | 22 +-
redash/extensions.py | 107 -
redash/handlers/__init__.py | 8 +-
redash/handlers/admin.py | 14 +-
redash/handlers/alerts.py | 86 +-
redash/handlers/api.py | 132 +-
redash/handlers/authentication.py | 82 +-
redash/handlers/base.py | 20 +-
redash/handlers/dashboards.py | 140 +-
redash/handlers/data_sources.py | 133 +-
redash/handlers/databricks.py | 90 +-
redash/handlers/destinations.py | 20 +-
redash/handlers/embed.py | 11 +-
redash/handlers/events.py | 6 +-
redash/handlers/favorites.py | 35 +-
redash/handlers/groups.py | 54 +-
redash/handlers/organization.py | 12 +-
redash/handlers/permissions.py | 10 +-
redash/handlers/queries.py | 96 +-
redash/handlers/query_results.py | 183 +-
redash/handlers/query_snippets.py | 31 +-
redash/handlers/settings.py | 8 +-
redash/handlers/setup.py | 14 +-
redash/handlers/static.py | 7 +-
redash/handlers/users.py | 119 +-
redash/handlers/visualizations.py | 21 +-
redash/handlers/webpack.py | 9 +-
redash/handlers/widgets.py | 19 +-
redash/metrics/database.py | 8 +-
redash/metrics/request.py | 12 +-
redash/models/__init__.py | 862 +-
redash/models/base.py | 28 +-
redash/models/changes.py | 13 +-
redash/models/mixins.py | 6 +-
redash/models/organizations.py | 17 +-
redash/models/parameterized_query.py | 78 +-
redash/models/types.py | 27 +-
redash/models/users.py | 98 +-
redash/monitor.py | 15 +-
redash/permissions.py | 6 +-
redash/query_runner/__init__.py | 229 +-
redash/query_runner/amazon_elasticsearch.py | 9 +-
redash/query_runner/arango.py | 90 +
redash/query_runner/athena.py | 127 +-
redash/query_runner/axibase_tsd.py | 31 +-
redash/query_runner/azure_kusto.py | 32 +-
redash/query_runner/big_query.py | 300 +-
redash/query_runner/big_query_gce.py | 18 +-
redash/query_runner/cass.py | 51 +-
redash/query_runner/clickhouse.py | 129 +-
redash/query_runner/cloudwatch.py | 9 +-
redash/query_runner/cloudwatch_insights.py | 20 +-
redash/query_runner/corporate_memory.py | 270 +
redash/query_runner/couchbase.py | 25 +-
redash/query_runner/csv.py | 115 +
redash/query_runner/databend.py | 145 +
redash/query_runner/databricks.py | 100 +-
redash/query_runner/db2.py | 40 +-
redash/query_runner/dgraph.py | 16 +-
redash/query_runner/drill.py | 28 +-
redash/query_runner/druid.py | 25 +-
redash/query_runner/dynamodb_sql.py | 150 -
redash/query_runner/e6data.py | 152 +
redash/query_runner/elasticsearch.py | 139 +-
redash/query_runner/elasticsearch2.py | 308 +
redash/query_runner/exasol.py | 19 +-
redash/query_runner/excel.py | 113 +
.../files/rds-combined-ca-bundle.pem | 3132 ++-
redash/query_runner/google_analytics.py | 85 +-
redash/query_runner/google_analytics4.py | 181 +
redash/query_runner/google_search_console.py | 164 +
redash/query_runner/google_spreadsheets.py | 123 +-
redash/query_runner/graphite.py | 24 +-
redash/query_runner/hive_ds.py | 44 +-
redash/query_runner/ignite.py | 174 +
redash/query_runner/impala_ds.py | 49 +-
redash/query_runner/influx_db.py | 51 +-
redash/query_runner/influx_db_v2.py | 214 +
redash/query_runner/jql.py | 20 +-
redash/query_runner/json_ds.py | 150 +-
redash/query_runner/kylin.py | 21 +-
redash/query_runner/mapd.py | 109 -
redash/query_runner/memsql_ds.py | 41 +-
redash/query_runner/mongodb.py | 246 +-
redash/query_runner/mssql.py | 43 +-
redash/query_runner/mssql_odbc.py | 71 +-
redash/query_runner/mysql.py | 96 +-
redash/query_runner/nz.py | 173 +
redash/query_runner/oracle.py | 111 +-
redash/query_runner/pg.py | 221 +-
redash/query_runner/phoenix.py | 41 +-
redash/query_runner/pinot.py | 143 +
redash/query_runner/presto.py | 53 +-
redash/query_runner/prometheus.py | 144 +-
redash/query_runner/python.py | 151 +-
redash/query_runner/qubole.py | 181 -
redash/query_runner/query_results.py | 77 +-
redash/query_runner/risingwave.py | 45 +
redash/query_runner/rockset.py | 60 +-
redash/query_runner/salesforce.py | 31 +-
redash/query_runner/script.py | 18 +-
redash/query_runner/snowflake.py | 72 +-
redash/query_runner/sparql_endpoint.py | 217 +
redash/query_runner/sqlite.py | 36 +-
redash/query_runner/tinybird.py | 113 +
redash/query_runner/treasuredata.py | 45 +-
redash/query_runner/trino.py | 172 +
redash/query_runner/uptycs.py | 37 +-
redash/query_runner/vertica.py | 47 +-
redash/query_runner/yandex_disk.py | 165 +
redash/query_runner/yandex_metrica.py | 47 +-
redash/security.py | 36 +-
redash/serializers/__init__.py | 148 +-
redash/serializers/query_result.py | 9 +-
redash/settings/__init__.py | 303 +-
redash/settings/dynamic_settings.py | 6 +
redash/settings/helpers.py | 7 +
redash/settings/organization.py | 40 +-
redash/tasks/__init__.py | 34 +-
redash/tasks/alerts.py | 37 +-
redash/tasks/databricks.py | 46 +-
redash/tasks/failure_report.py | 19 +-
redash/tasks/general.py | 54 +-
redash/tasks/queries/__init__.py | 8 +-
redash/tasks/queries/execution.py | 119 +-
redash/tasks/queries/maintenance.py | 209 +-
redash/tasks/queries/samples.py | 128 -
redash/tasks/schedule.py | 48 +-
redash/tasks/worker.py | 89 +-
redash/templates/emails/alert.html | 92 +
redash/templates/emails/layout.html | 4 +-
redash/templates/forgot.html | 1 +
redash/templates/invite.html | 1 +
redash/templates/login.html | 6 +-
redash/templates/reset.html | 1 +
redash/templates/setup.html | 1 +
redash/utils/__init__.py | 83 +-
redash/utils/configuration.py | 3 +-
redash/utils/human_time.py | 5 +-
redash/utils/pandas.py | 47 +
redash/utils/query_order.py | 310 +
redash/utils/requests_session.py | 10 +-
redash/utils/sentry.py | 10 +-
redash/version_check.py | 24 +-
redash/worker.py | 18 +-
requirements.txt | 68 -
requirements_all_ds.txt | 38 -
requirements_bundles.txt | 10 -
requirements_dev.txt | 13 -
requirements_oracle_ds.txt | 4 -
scripts/README.md | 44 +
setup.cfg | 7 -
tests/__init__.py | 35 +-
tests/extensions/redash-dummy/.gitignore | 2 -
tests/extensions/redash-dummy/MANIFEST.in | 2 -
tests/extensions/redash-dummy/README.md | 22 -
.../redash_dummy.egg-info/PKG-INFO | 10 -
.../redash_dummy.egg-info/SOURCES.txt | 12 -
.../dependency_links.txt | 1 -
.../redash_dummy.egg-info/entry_points.txt | 13 -
.../redash_dummy.egg-info/top_level.txt | 1 -
.../redash-dummy/redash_dummy/__init__.py | 0
.../redash_dummy/bundle/WideFooter.jsx | 9 -
.../redash-dummy/redash_dummy/extension.py | 11 -
.../redash-dummy/redash_dummy/jobs.py | 14 -
tests/extensions/redash-dummy/setup.py | 25 -
tests/extensions/test_extensions.py | 79 -
tests/factories.py | 48 +-
tests/handlers/test_alerts.py | 37 +-
tests/handlers/test_authentication.py | 27 +-
tests/handlers/test_dashboards.py | 96 +-
tests/handlers/test_data_sources.py | 82 +-
tests/handlers/test_destinations.py | 461 +-
tests/handlers/test_embed.py | 18 +-
tests/handlers/test_groups.py | 33 +-
tests/handlers/test_order_results.py | 91 +
tests/handlers/test_paginate.py | 23 +-
tests/handlers/test_permissions.py | 39 +-
tests/handlers/test_queries.py | 107 +-
tests/handlers/test_query_results.py | 211 +-
tests/handlers/test_query_snippets.py | 12 +-
tests/handlers/test_settings.py | 12 +-
tests/handlers/test_users.py | 118 +-
tests/handlers/test_visualizations.py | 27 +-
tests/handlers/test_widgets.py | 6 +-
tests/metrics/test_database.py | 3 +-
tests/metrics/test_request.py | 5 +-
tests/models/test_alerts.py | 154 +-
tests/models/test_api_keys.py | 2 +-
tests/models/test_changes.py | 3 +-
tests/models/test_dashboards.py | 58 +-
tests/models/test_data_sources.py | 107 +-
tests/models/test_parameterized_query.py | 38 +-
tests/models/test_permissions.py | 16 +-
tests/models/test_queries.py | 136 +-
tests/models/test_query_results.py | 57 +-
tests/models/test_users.py | 38 +-
tests/query_runner/test_athena.py | 162 +-
tests/query_runner/test_basequeryrunner.py | 34 +
.../query_runner/test_basesql_queryrunner.py | 134 +
tests/query_runner/test_bigquery.py | 77 +-
tests/query_runner/test_cass.py | 10 +-
tests/query_runner/test_clickhouse.py | 184 +
tests/query_runner/test_databricks.py | 123 +
tests/query_runner/test_drill.py | 2 +-
tests/query_runner/test_e6data.py | 89 +
tests/query_runner/test_elasticsearch2.py | 150 +
tests/query_runner/test_get_schema_format.py | 70 -
tests/query_runner/test_google_analytics4.py | 194 +
.../test_google_search_console.py | 169 +
.../query_runner/test_google_spreadsheets.py | 98 +-
tests/query_runner/test_http.py | 24 +-
tests/query_runner/test_ignite.py | 61 +
tests/query_runner/test_influx_db.py | 56 +
tests/query_runner/test_influx_db_v2.py | 339 +
tests/query_runner/test_jql.py | 17 +-
tests/query_runner/test_json_ds.py | 89 +
tests/query_runner/test_mongodb.py | 170 +-
tests/query_runner/test_oracle.py | 30 +
tests/query_runner/test_pg.py | 32 +-
tests/query_runner/test_prometheus.py | 477 +-
tests/query_runner/test_python.py | 103 +
tests/query_runner/test_query_results.py | 62 +-
tests/query_runner/test_script.py | 24 +-
tests/query_runner/test_tinybird.py | 123 +
tests/query_runner/test_trino.py | 60 +
tests/query_runner/test_utils.py | 2 +-
tests/query_runner/test_yandex_disk.py | 245 +
tests/query_runner/test_yandex_metrica.py | 110 +
tests/serializers/test_query_results.py | 16 +-
tests/tasks/__init__.py | 1 -
tests/tasks/test_alerts.py | 19 +-
tests/tasks/test_empty_schedule.py | 10 +-
tests/tasks/test_failure_report.py | 25 +-
tests/tasks/test_queries.py | 151 +-
tests/tasks/test_refresh_queries.py | 146 +-
tests/tasks/test_refresh_schemas.py | 363 +-
tests/tasks/test_schedule.py | 8 +-
tests/tasks/test_worker.py | 23 +-
tests/test_authentication.py | 160 +-
tests/test_cli.py | 84 +-
tests/test_configuration.py | 9 +-
tests/test_handlers.py | 82 +-
tests/test_migrations.py | 21 +
tests/test_models.py | 137 +-
tests/test_monitor.py | 23 +
tests/test_permissions.py | 19 +-
tests/test_utils.py | 86 +-
tests/utils/test_json_dumps.py | 31 +
viz-lib/.babelrc | 9 +-
viz-lib/README.md | 2 +-
viz-lib/__tests__/mocks.js | 14 +
viz-lib/jsconfig.json | 9 -
viz-lib/package-lock.json | 12732 -----------
viz-lib/package.json | 71 +-
.../ColorPicker/{Input.jsx => Input.tsx} | 35 +-
.../ColorPicker/{Label.jsx => Label.tsx} | 25 +-
.../ColorPicker/{Swatch.jsx => Swatch.tsx} | 23 +-
.../ColorPicker/{index.jsx => index.tsx} | 82 +-
.../ColorPicker/{utils.js => utils.ts} | 4 +-
.../{ErrorBoundary.jsx => ErrorBoundary.tsx} | 38 +-
.../{HtmlContent.jsx => HtmlContent.tsx} | 3 +
.../{index.jsx => index.tsx} | 25 +-
...nteractive.jsx => JsonViewInteractive.tsx} | 17 +-
.../sortable/{index.jsx => index.tsx} | 41 +-
.../{ContextHelp.jsx => ContextHelp.tsx} | 34 +-
.../editor/{Section.jsx => Section.tsx} | 31 +-
.../editor/{Switch.jsx => Switch.tsx} | 18 +-
.../editor/{TextArea.jsx => TextArea.tsx} | 2 +-
.../editor/createTabbedEditor.jsx | 51 -
.../editor/createTabbedEditor.tsx | 57 +
.../editor/{index.js => index.ts} | 0
...hControlLabel.jsx => withControlLabel.tsx} | 27 +-
viz-lib/src/{index.js => index.ts} | 0
...und.js => chooseTextColorForBackground.ts} | 2 +-
...epCompare.js => useMemoWithDeepCompare.ts} | 3 +-
viz-lib/src/lib/referenceCountingCache.ts | 46 +
viz-lib/src/lib/{utils.js => utils.ts} | 6 +-
viz-lib/src/lib/value-format.js | 86 -
.../src/lib/value-format.tsx | 43 +-
.../{resizeObserver.js => resizeObserver.ts} | 2 +-
.../src/services/{sanitize.js => sanitize.ts} | 2 +
viz-lib/src/visualizations/ColorPalette.js | 38 -
viz-lib/src/visualizations/ColorPalette.ts | 105 +
.../visualizations/{Editor.jsx => Editor.tsx} | 17 +-
.../{Renderer.jsx => Renderer.tsx} | 23 +-
.../box-plot/{Editor.jsx => Editor.tsx} | 12 +-
.../box-plot/{Renderer.jsx => Renderer.tsx} | 22 +-
.../box-plot/{d3box.js => d3box.ts} | 40 +-
.../box-plot/{index.js => index.ts} | 4 +-
.../chart/Editor/AxisSettings.jsx | 110 -
.../chart/Editor/AxisSettings.tsx | 143 +
.../chart/Editor/ChartTypeSelect.jsx | 36 -
.../chart/Editor/ChartTypeSelect.tsx | 54 +
...ttings.test.js => ColorsSettings.test.tsx} | 10 +-
...{ColorsSettings.jsx => ColorsSettings.tsx} | 3 +-
...pingSelect.jsx => ColumnMappingSelect.tsx} | 35 +-
.../chart/Editor/CustomChartSettings.jsx | 48 -
.../chart/Editor/CustomChartSettings.tsx | 60 +
...gs.test.js => DataLabelsSettings.test.tsx} | 4 +-
...elsSettings.jsx => DataLabelsSettings.tsx} | 16 +-
.../chart/Editor/DefaultColorsSettings.jsx | 66 -
.../chart/Editor/DefaultColorsSettings.tsx | 93 +
.../chart/Editor/GeneralSettings.jsx | 274 -
...tings.test.js => GeneralSettings.test.tsx} | 51 +-
.../chart/Editor/GeneralSettings.tsx | 419 +
...Settings.jsx => HeatmapColorsSettings.tsx} | 15 +-
.../chart/Editor/PieColorsSettings.jsx | 76 -
.../chart/Editor/PieColorsSettings.tsx | 103 +
...ttings.test.js => SeriesSettings.test.tsx} | 6 +-
...{SeriesSettings.jsx => SeriesSettings.tsx} | 58 +-
.../chart/Editor/XAxisSettings.jsx | 47 -
...ettings.test.js => XAxisSettings.test.tsx} | 20 +-
.../chart/Editor/XAxisSettings.tsx | 63 +
.../chart/Editor/YAxisSettings.jsx | 65 -
...ettings.test.js => YAxisSettings.test.tsx} | 24 +-
.../chart/Editor/YAxisSettings.tsx | 99 +
...t.js.snap => ColorsSettings.test.tsx.snap} | 2 +-
....snap => DataLabelsSettings.test.tsx.snap} | 0
....js.snap => GeneralSettings.test.tsx.snap} | 14 +
...t.js.snap => SeriesSettings.test.tsx.snap} | 0
...st.js.snap => XAxisSettings.test.tsx.snap} | 12 +
...st.js.snap => YAxisSettings.test.tsx.snap} | 15 +
.../Editor/{index.test.js => index.test.tsx} | 6 +-
.../chart/Editor/{index.jsx => index.tsx} | 20 +-
...mPlotlyChart.jsx => CustomPlotlyChart.tsx} | 5 +-
.../{PlotlyChart.jsx => PlotlyChart.tsx} | 17 +-
.../chart/Renderer/{index.jsx => index.tsx} | 2 +-
.../Renderer/{initChart.js => initChart.ts} | 62 +-
...ChartData.test.js => getChartData.test.ts} | 0
.../{getChartData.js => getChartData.ts} | 20 +-
.../chart/{getOptions.js => getOptions.ts} | 11 +-
.../chart/{index.js => index.ts} | 0
...ustomChartUtils.js => customChartUtils.ts} | 13 +-
.../fixtures/prepareData/bar/default.json | 1 +
.../fixtures/prepareData/bar/normalized.json | 2 +
.../fixtures/prepareData/bar/stacked.json | 2 +
.../fixtures/prepareData/heatmap/default.json | 5 +-
.../prepareData/heatmap/reversed.json | 5 +-
.../prepareData/heatmap/sorted-reversed.json | 5 +-
.../fixtures/prepareData/heatmap/sorted.json | 5 +-
.../prepareData/heatmap/with-labels.json | 9 +-
.../prepareData/pie/custom-tooltip.json | 6 +-
.../fixtures/prepareData/pie/default.json | 6 +-
.../prepareData/pie/without-labels.json | 6 +-
.../fixtures/prepareData/pie/without-x.json | 16 +-
.../prepareLayout/box-single-axis.json | 5 +
.../prepareLayout/box-with-second-axis.json | 6 +
.../prepareLayout/default-single-axis.json | 8 +-
.../default-with-second-axis.json | 9 +-
.../prepareLayout/default-with-stacking.json | 8 +-
.../prepareLayout/default-without-legend.json | 8 +-
.../prepareLayout/pie-multiple-series.json | 3 +
.../pie-without-annotations.json | 3 +
.../plotly/fixtures/prepareLayout/pie.json | 3 +
.../chart/plotly/{index.js => index.ts} | 14 +-
...repareData.test.js => prepareData.test.ts} | 4 +-
.../plotly/{prepareData.js => prepareData.ts} | 3 +-
...reDefaultData.js => prepareDefaultData.ts} | 55 +-
...reHeatmapData.js => prepareHeatmapData.ts} | 32 +-
...reLayout.test.js => prepareLayout.test.ts} | 0
.../{prepareLayout.js => prepareLayout.ts} | 34 +-
.../chart/plotly/preparePieData.js | 118 -
.../chart/plotly/preparePieData.ts | 149 +
.../visualizations/chart/plotly/updateAxes.ts | 118 +
...{updateChartSize.js => updateChartSize.ts} | 12 +-
.../plotly/{updateData.js => updateData.ts} | 45 +-
.../chart/plotly/updateYRanges.js | 44 -
.../chart/plotly/{utils.js => utils.ts} | 7 +-
.../{ColorPalette.js => ColorPalette.ts} | 0
.../choropleth/Editor/BoundsSettings.jsx | 67 -
.../choropleth/Editor/BoundsSettings.tsx | 105 +
.../choropleth/Editor/ColorsSettings.jsx | 116 -
.../choropleth/Editor/ColorsSettings.tsx | 134 +
.../choropleth/Editor/FormatSettings.jsx | 184 -
.../choropleth/Editor/FormatSettings.tsx | 193 +
.../choropleth/Editor/GeneralSettings.jsx | 102 -
.../choropleth/Editor/GeneralSettings.tsx | 108 +
.../choropleth/Editor/{index.js => index.ts} | 0
.../visualizations/choropleth/Editor/utils.js | 38 -
.../visualizations/choropleth/Editor/utils.ts | 34 +
.../Renderer/{Legend.jsx => Legend.tsx} | 24 +-
.../choropleth/Renderer/index.jsx | 77 -
.../choropleth/Renderer/index.tsx | 60 +
.../{initChoropleth.js => initChoropleth.tsx} | 73 +-
.../Renderer/{utils.js => utils.ts} | 35 +-
.../visualizations/choropleth/getOptions.js | 37 -
.../visualizations/choropleth/getOptions.ts | 64 +
.../choropleth/hooks/useLoadGeoJson.ts | 40 +
.../choropleth/{index.js => index.ts} | 0
.../choropleth/maps/convert-projection.ts | 43 +
.../choropleth/maps/countries.geo.json | 2 +-
.../maps/japan.prefectures.geo.json | 55 +-
.../choropleth/maps/usa-albers.geo.json | 1 +
.../choropleth/maps/usa.geo.json | 1 +
.../cohort/{Cornelius.jsx => Cornelius.tsx} | 82 +-
...nceSettings.jsx => AppearanceSettings.tsx} | 23 +-
...{ColorsSettings.jsx => ColorsSettings.tsx} | 15 +-
.../cohort/Editor/ColumnsSettings.jsx | 72 -
.../cohort/Editor/ColumnsSettings.tsx | 84 +
...ptionsSettings.jsx => OptionsSettings.tsx} | 12 +-
.../cohort/Editor/{index.js => index.ts} | 0
.../cohort/{Renderer.jsx => Renderer.tsx} | 2 +-
.../cohort/{getOptions.js => getOptions.ts} | 2 +-
.../cohort/{index.js => index.ts} | 0
.../cohort/{prepareData.js => prepareData.ts} | 30 +-
...{FormatSettings.jsx => FormatSettings.tsx} | 24 +-
.../counter/Editor/GeneralSettings.jsx | 85 -
.../counter/Editor/GeneralSettings.tsx | 100 +
.../counter/Editor/{index.js => index.ts} | 0
.../counter/{Renderer.jsx => Renderer.tsx} | 14 +-
.../counter/{index.js => index.ts} | 5 +-
.../src/visualizations/counter/render.less | 1 +
.../counter/{utils.test.js => utils.test.ts} | 2 +-
.../counter/{utils.js => utils.ts} | 28 +-
...etailsRenderer.jsx => DetailsRenderer.tsx} | 15 +-
.../details/{index.js => index.ts} | 5 +-
...nceSettings.jsx => AppearanceSettings.tsx} | 17 +-
...eneralSettings.jsx => GeneralSettings.tsx} | 31 +-
.../funnel/Editor/{index.js => index.ts} | 0
.../Renderer/{FunnelBar.jsx => FunnelBar.tsx} | 21 +-
.../funnel/Renderer/{index.jsx => index.tsx} | 16 +-
.../{prepareData.js => prepareData.ts} | 7 +-
.../funnel/{getOptions.js => getOptions.ts} | 2 +-
.../funnel/{index.js => index.ts} | 0
.../src/visualizations/{index.js => index.ts} | 0
...{FormatSettings.jsx => FormatSettings.tsx} | 11 +-
...eneralSettings.jsx => GeneralSettings.tsx} | 19 +-
...{GroupsSettings.jsx => GroupsSettings.tsx} | 13 +-
.../{StyleSettings.jsx => StyleSettings.tsx} | 44 +-
.../map/Editor/{index.js => index.ts} | 0
.../map/{Renderer.jsx => Renderer.tsx} | 12 +-
.../map/{getOptions.js => getOptions.ts} | 29 +-
.../visualizations/map/{index.js => index.ts} | 0
.../map/{initMap.js => initMap.ts} | 34 +-
.../map/{prepareData.js => prepareData.ts} | 3 +-
viz-lib/src/visualizations/pivot/Editor.jsx | 42 -
viz-lib/src/visualizations/pivot/Editor.tsx | 58 +
.../pivot/{Renderer.jsx => Renderer.tsx} | 7 +-
.../pivot/{index.js => index.ts} | 2 +-
.../{prop-types.js => prop-types.ts} | 23 +-
...zations.js => registeredVisualizations.ts} | 32 +-
.../sankey/{Editor.jsx => Editor.tsx} | 0
.../sankey/{Renderer.jsx => Renderer.tsx} | 9 +-
.../sankey/{d3sankey.js => d3sankey.ts} | 120 +-
viz-lib/src/visualizations/sankey/index.js | 12 -
viz-lib/src/visualizations/sankey/index.ts | 26 +
.../sankey/{initSankey.js => initSankey.ts} | 127 +-
.../sunburst/{Editor.jsx => Editor.tsx} | 2 +
.../sunburst/{Renderer.jsx => Renderer.tsx} | 3 +-
.../sunburst/{index.js => index.ts} | 4 +-
.../{initSunburst.js => initSunburst.ts} | 66 +-
.../table/Editor/ColumnEditor.jsx | 89 -
.../table/Editor/ColumnEditor.tsx | 100 +
...tings.test.js => ColumnsSettings.test.tsx} | 6 +-
...olumnsSettings.jsx => ColumnsSettings.tsx} | 31 +-
...Settings.test.js => GridSettings.test.tsx} | 6 +-
.../{GridSettings.jsx => GridSettings.tsx} | 7 +-
....js.snap => ColumnsSettings.test.tsx.snap} | 10 +-
...est.js.snap => GridSettings.test.tsx.snap} | 0
.../table/Editor/{index.jsx => index.tsx} | 0
.../table/{Renderer.jsx => Renderer.tsx} | 40 +-
...ean.test.js.snap => boolean.test.tsx.snap} | 0
...me.test.js.snap => datetime.test.tsx.snap} | 0
...image.test.js.snap => image.test.tsx.snap} | 0
.../{link.test.js.snap => link.test.tsx.snap} | 0
...mber.test.js.snap => number.test.tsx.snap} | 0
.../{text.test.js.snap => text.test.tsx.snap} | 0
.../{boolean.test.js => boolean.test.tsx} | 5 +-
.../columns/{boolean.jsx => boolean.tsx} | 36 +-
.../{datetime.test.js => datetime.test.tsx} | 5 +-
.../columns/{datetime.jsx => datetime.tsx} | 28 +-
.../columns/{image.test.js => image.test.tsx} | 5 +-
.../table/columns/{image.jsx => image.tsx} | 54 +-
.../table/columns/{index.js => index.ts} | 0
.../table/columns/{json.jsx => json.tsx} | 6 +-
.../columns/{link.test.js => link.test.tsx} | 5 +-
.../table/columns/{link.jsx => link.tsx} | 47 +-
.../{number.test.js => number.test.tsx} | 5 +-
.../table/columns/{number.jsx => number.tsx} | 28 +-
.../columns/{text.test.js => text.test.tsx} | 5 +-
.../table/columns/{text.jsx => text.tsx} | 29 +-
.../table/{getOptions.js => getOptions.ts} | 19 +-
.../table/{index.js => index.ts} | 0
.../src/visualizations/table/renderer.less | 30 +-
.../table/{utils.js => utils.tsx} | 87 +-
...Settings.js => visualizationsSettings.tsx} | 26 +-
.../src/visualizations/word-cloud/Editor.jsx | 95 -
.../src/visualizations/word-cloud/Editor.tsx | 109 +
.../word-cloud/{Renderer.jsx => Renderer.tsx} | 38 +-
.../word-cloud/{index.js => index.ts} | 2 +-
viz-lib/tsconfig.json | 22 +
viz-lib/webpack.config.js | 27 +-
viz-lib/yarn.lock | 9945 +++++++++
webpack.config.js | 125 +-
worker.conf | 1 +
yarn.lock | 15046 +++++++++++++
943 files changed, 68875 insertions(+), 50868 deletions(-)
create mode 100644 .ci/Dockerfile.cypress
create mode 100644 .ci/compose.ci.yaml
create mode 100644 .ci/compose.cypress.yaml
create mode 100755 .ci/docker_build
create mode 100755 .ci/pack
create mode 100755 .ci/update_version
delete mode 100644 .github/support.yml
create mode 100644 .npmrc
create mode 100644 .nvmrc
create mode 100644 .pre-commit-config.yaml
create mode 100644 .yarn/.gitignore
rename tests/extensions/__init__.py => .yarnrc (100%)
create mode 100644 LICENSE.borders
delete mode 100755 bin/bundle-extensions
delete mode 100755 bin/dockerflow-version
delete mode 100755 bin/flake8_tests.sh
delete mode 100755 bin/migrations-graph
delete mode 100755 bin/upgrade
create mode 100644 client/app/assets/images/db-logos/arangodb.png
create mode 100644 client/app/assets/images/db-logos/corporate_memory.png
create mode 100644 client/app/assets/images/db-logos/databend.png
delete mode 100644 client/app/assets/images/db-logos/dynamodb_sql.png
create mode 100644 client/app/assets/images/db-logos/e6data.png
create mode 100644 client/app/assets/images/db-logos/elasticsearch2.png
create mode 100644 client/app/assets/images/db-logos/elasticsearch2_OpenDistroSQLElasticSearch.png
create mode 100644 client/app/assets/images/db-logos/elasticsearch2_XPackSQLElasticSearch.png
create mode 100644 client/app/assets/images/db-logos/excel.png
create mode 100644 client/app/assets/images/db-logos/firebolt.png
create mode 100644 client/app/assets/images/db-logos/google_analytics4.png
create mode 100644 client/app/assets/images/db-logos/google_search_console.png
create mode 100644 client/app/assets/images/db-logos/ignite.png
create mode 100644 client/app/assets/images/db-logos/influxdbv2.png
create mode 100644 client/app/assets/images/db-logos/nz.png
create mode 100644 client/app/assets/images/db-logos/pinot.png
delete mode 100644 client/app/assets/images/db-logos/qubole.png
create mode 100644 client/app/assets/images/db-logos/risingwave.png
create mode 100644 client/app/assets/images/db-logos/sparql_endpoint.png
create mode 100644 client/app/assets/images/db-logos/tinybird.png
create mode 100644 client/app/assets/images/db-logos/trino.png
create mode 100644 client/app/assets/images/db-logos/yandex_disk.png
create mode 100644 client/app/assets/images/destinations/asana.png
create mode 100644 client/app/assets/images/destinations/datadog.png
create mode 100644 client/app/assets/images/destinations/discord.png
delete mode 100644 client/app/assets/images/destinations/hipchat.png
create mode 100644 client/app/assets/images/destinations/microsoft_teams_webhook.png
create mode 100644 client/app/assets/images/destinations/webex.png
create mode 100644 client/app/components/ApplicationArea/ErrorMessageDetails.jsx
delete mode 100644 client/app/components/ApplicationArea/routeWithUserSession.jsx
create mode 100644 client/app/components/ApplicationArea/routeWithUserSession.tsx
create mode 100644 client/app/components/DialogWrapper.d.ts
create mode 100644 client/app/components/EditParameterSettingsDialog.less
create mode 100644 client/app/components/Link.tsx
create mode 100644 client/app/components/PlainButton.less
create mode 100644 client/app/components/PlainButton.tsx
create mode 100644 client/app/components/SelectItemsDialog.less
create mode 100644 client/app/components/SelectWithVirtualScroll.tsx
delete mode 100644 client/app/components/TagsList.jsx
create mode 100644 client/app/components/TagsList.tsx
create mode 100644 client/app/components/Tooltip.tsx
create mode 100644 client/app/components/UserGroups.jsx
create mode 100644 client/app/components/UserGroups.less
delete mode 100644 client/app/components/cards-list/CardsList.jsx
create mode 100644 client/app/components/cards-list/CardsList.tsx
create mode 100644 client/app/components/dynamic-form/DynamicFormField.jsx
create mode 100644 client/app/components/dynamic-form/fields/AceEditorField.jsx
create mode 100644 client/app/components/dynamic-form/fields/CheckboxField.jsx
create mode 100644 client/app/components/dynamic-form/fields/ContentField.jsx
create mode 100644 client/app/components/dynamic-form/fields/FileField.jsx
create mode 100644 client/app/components/dynamic-form/fields/InputField.jsx
create mode 100644 client/app/components/dynamic-form/fields/NumberField.jsx
create mode 100644 client/app/components/dynamic-form/fields/SelectField.jsx
create mode 100644 client/app/components/dynamic-form/fields/TextAreaField.jsx
create mode 100644 client/app/components/dynamic-form/fields/index.js
create mode 100644 client/app/components/dynamic-form/getFieldLabel.js
create mode 100644 client/app/components/dynamic-parameters/DynamicDatePicker.jsx
create mode 100644 client/app/components/dynamic-parameters/DynamicDateRangePicker.jsx
create mode 100644 client/app/components/empty-state/EmptyState.d.ts
rename client/app/components/items-list/{ItemsList.jsx => ItemsList.tsx} (57%)
create mode 100644 client/app/components/items-list/classes/ItemsSource.d.ts
create mode 100644 client/app/components/items-list/hooks/useItemsListExtraActions.js
create mode 100644 client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx
delete mode 100644 client/app/components/queries/SchemaData.jsx
create mode 100644 client/app/lib/accessibility.ts
create mode 100644 client/app/lib/calculateTextWidth.ts
create mode 100644 client/app/lib/hooks/useLazyRef.ts
create mode 100644 client/app/lib/hooks/useUniqueId.ts
create mode 100644 client/app/lib/queryFormat.test.js
create mode 100644 client/app/lib/queryFormat.ts
delete mode 100644 client/app/pages/dashboards/components/DashboardListEmptyState.jsx
create mode 100644 client/app/pages/dashboards/components/DashboardListEmptyState.tsx
create mode 100644 client/app/pages/dashboards/hooks/useDataSources.js
create mode 100644 client/app/pages/dashboards/hooks/useDuplicateDashboard.js
delete mode 100644 client/app/pages/data-sources/schema-table-components/EditableTable.jsx
delete mode 100644 client/app/pages/data-sources/schema-table-components/QueryListItem.jsx
delete mode 100644 client/app/pages/data-sources/schema-table-components/QuerySearchDialog.jsx
delete mode 100644 client/app/pages/data-sources/schema-table-components/SampleQueryList.jsx
delete mode 100644 client/app/pages/data-sources/schema-table-components/SchemaTable.jsx
delete mode 100644 client/app/pages/data-sources/schema-table-components/TableVisibilityCheckbox.jsx
delete mode 100644 client/app/pages/data-sources/schema-table-components/schema-table.css
create mode 100644 client/app/pages/home/components/FavoritesList.jsx
create mode 100644 client/app/pages/queries/components/QuerySourceDropdown.jsx
create mode 100644 client/app/pages/queries/components/QuerySourceDropdownItem.jsx
create mode 100644 client/app/pages/queries/components/QuerySourceTypeIcon.jsx
create mode 100644 client/app/pages/queries/hooks/useAutoLimitFlags.js
delete mode 100644 client/app/pages/queries/hooks/useFormatQuery.js
create mode 100644 client/app/pages/settings/hooks/useOrganizationSettings.js
delete mode 100644 client/app/pages/users/components/UserGroups.jsx
create mode 100644 client/app/services/auth.test.js
create mode 100644 client/app/services/notification.d.ts
create mode 100644 client/app/services/parameters/TextPatternParameter.js
create mode 100644 client/app/services/parameters/tests/TextPatternParameter.test.js
create mode 100644 client/app/services/query-result.test.js
create mode 100644 client/app/services/restoreSession.jsx
delete mode 100644 client/app/services/routes.js
create mode 100644 client/app/services/routes.ts
create mode 100644 client/app/styles/formStyle.less
create mode 100644 client/app/styles/formStyle.ts
create mode 100644 client/cypress/integration/dashboard/dashboard_list.js
rename client/cypress/integration/dashboard/{parameter_mapping_spec.js => parameter_spec.js} (53%)
create mode 100644 client/cypress/integration/user/create_user_spec.js
create mode 100644 client/cypress/integration/visualizations/chart_spec.js
delete mode 100644 client/cypress/plugins/index.js
create mode 100644 client/cypress/support/parameters.js
create mode 100644 client/cypress/support/visualizations/chart.js
create mode 100644 client/cypress/tsconfig.json
delete mode 100644 client/jsconfig.json
create mode 100644 client/tsconfig.json
create mode 100644 codecov.yml
rename docker-compose.yml => compose.yaml (79%)
create mode 100644 cypress.config.js
delete mode 100644 cypress.json
create mode 100644 migrations/versions/0ec979123ba4_.py
create mode 100644 migrations/versions/1038c2174f5d_make_case_insensitive_hash_of_query_text.py
delete mode 100644 migrations/versions/118aa16f565b_.py
delete mode 100644 migrations/versions/151a4c333e96_.py
delete mode 100644 migrations/versions/280daa582976_.py
delete mode 100644 migrations/versions/65a9c2387a07_match_column_name_length_to_bq.py
delete mode 100644 migrations/versions/6adb92e75691_.py
create mode 100644 migrations/versions/7205816877ec_change_type_of_json_fields_from_varchar_.py
create mode 100644 migrations/versions/7ce5925f832b_create_sqlalchemy_searchable_expressions.py
create mode 100644 migrations/versions/89bc7873a3e0_fix_multiple_heads.py
create mode 100644 migrations/versions/9e8c841d1a30_fix_hash.py
delete mode 100644 migrations/versions/ba150362b02e_.py
delete mode 100644 migrations/versions/cf135a57332e_.py
create mode 100644 migrations/versions/d7d747033183_encrypt_alert_destinations.py
delete mode 100644 migrations/versions/da6767746e76_add_more_db_indexes.py
create mode 100644 migrations/versions/fd4fc850d7ea_.py
delete mode 100644 package-lock.json
create mode 100644 poetry.lock
create mode 100644 pyproject.toml
create mode 100644 redash/destinations/asana.py
create mode 100644 redash/destinations/datadog.py
create mode 100644 redash/destinations/discord.py
delete mode 100644 redash/destinations/hipchat.py
create mode 100644 redash/destinations/microsoft_teams_webhook.py
create mode 100644 redash/destinations/webex.py
delete mode 100644 redash/extensions.py
create mode 100644 redash/query_runner/arango.py
create mode 100644 redash/query_runner/corporate_memory.py
create mode 100644 redash/query_runner/csv.py
create mode 100644 redash/query_runner/databend.py
delete mode 100644 redash/query_runner/dynamodb_sql.py
create mode 100644 redash/query_runner/e6data.py
create mode 100644 redash/query_runner/elasticsearch2.py
create mode 100644 redash/query_runner/excel.py
create mode 100644 redash/query_runner/google_analytics4.py
create mode 100644 redash/query_runner/google_search_console.py
create mode 100644 redash/query_runner/ignite.py
create mode 100644 redash/query_runner/influx_db_v2.py
delete mode 100644 redash/query_runner/mapd.py
create mode 100644 redash/query_runner/nz.py
create mode 100644 redash/query_runner/pinot.py
delete mode 100644 redash/query_runner/qubole.py
create mode 100644 redash/query_runner/risingwave.py
create mode 100644 redash/query_runner/sparql_endpoint.py
create mode 100644 redash/query_runner/tinybird.py
create mode 100644 redash/query_runner/trino.py
create mode 100644 redash/query_runner/yandex_disk.py
delete mode 100644 redash/tasks/queries/samples.py
create mode 100644 redash/templates/emails/alert.html
create mode 100644 redash/utils/pandas.py
create mode 100644 redash/utils/query_order.py
delete mode 100644 requirements.txt
delete mode 100644 requirements_all_ds.txt
delete mode 100644 requirements_bundles.txt
delete mode 100644 requirements_dev.txt
delete mode 100644 requirements_oracle_ds.txt
create mode 100644 scripts/README.md
delete mode 100644 setup.cfg
delete mode 100644 tests/extensions/redash-dummy/.gitignore
delete mode 100644 tests/extensions/redash-dummy/MANIFEST.in
delete mode 100644 tests/extensions/redash-dummy/README.md
delete mode 100644 tests/extensions/redash-dummy/redash_dummy.egg-info/PKG-INFO
delete mode 100644 tests/extensions/redash-dummy/redash_dummy.egg-info/SOURCES.txt
delete mode 100644 tests/extensions/redash-dummy/redash_dummy.egg-info/dependency_links.txt
delete mode 100644 tests/extensions/redash-dummy/redash_dummy.egg-info/entry_points.txt
delete mode 100644 tests/extensions/redash-dummy/redash_dummy.egg-info/top_level.txt
delete mode 100644 tests/extensions/redash-dummy/redash_dummy/__init__.py
delete mode 100644 tests/extensions/redash-dummy/redash_dummy/bundle/WideFooter.jsx
delete mode 100644 tests/extensions/redash-dummy/redash_dummy/extension.py
delete mode 100644 tests/extensions/redash-dummy/redash_dummy/jobs.py
delete mode 100644 tests/extensions/redash-dummy/setup.py
delete mode 100644 tests/extensions/test_extensions.py
create mode 100644 tests/handlers/test_order_results.py
create mode 100644 tests/query_runner/test_basequeryrunner.py
create mode 100644 tests/query_runner/test_basesql_queryrunner.py
create mode 100644 tests/query_runner/test_clickhouse.py
create mode 100644 tests/query_runner/test_databricks.py
create mode 100644 tests/query_runner/test_e6data.py
create mode 100644 tests/query_runner/test_elasticsearch2.py
delete mode 100644 tests/query_runner/test_get_schema_format.py
create mode 100644 tests/query_runner/test_google_analytics4.py
create mode 100644 tests/query_runner/test_google_search_console.py
create mode 100644 tests/query_runner/test_ignite.py
create mode 100644 tests/query_runner/test_influx_db.py
create mode 100644 tests/query_runner/test_influx_db_v2.py
create mode 100644 tests/query_runner/test_json_ds.py
create mode 100644 tests/query_runner/test_oracle.py
create mode 100644 tests/query_runner/test_python.py
create mode 100644 tests/query_runner/test_tinybird.py
create mode 100644 tests/query_runner/test_trino.py
create mode 100644 tests/query_runner/test_yandex_disk.py
create mode 100644 tests/query_runner/test_yandex_metrica.py
create mode 100644 tests/test_migrations.py
create mode 100644 tests/test_monitor.py
create mode 100644 tests/utils/test_json_dumps.py
delete mode 100644 viz-lib/jsconfig.json
delete mode 100644 viz-lib/package-lock.json
rename viz-lib/src/components/ColorPicker/{Input.jsx => Input.tsx} (79%)
rename viz-lib/src/components/ColorPicker/{Label.jsx => Label.tsx} (61%)
rename viz-lib/src/components/ColorPicker/{Swatch.jsx => Swatch.tsx} (61%)
rename viz-lib/src/components/ColorPicker/{index.jsx => index.tsx} (59%)
rename viz-lib/src/components/ColorPicker/{utils.js => utils.ts} (71%)
rename viz-lib/src/components/{ErrorBoundary.jsx => ErrorBoundary.tsx} (51%)
rename viz-lib/src/components/{HtmlContent.jsx => HtmlContent.tsx} (51%)
rename viz-lib/src/components/TextAlignmentSelect/{index.jsx => index.tsx} (67%)
rename viz-lib/src/components/json-view-interactive/{JsonViewInteractive.jsx => JsonViewInteractive.tsx} (91%)
rename viz-lib/src/components/sortable/{index.jsx => index.tsx} (61%)
rename viz-lib/src/components/visualizations/editor/{ContextHelp.jsx => ContextHelp.tsx} (56%)
rename viz-lib/src/components/visualizations/editor/{Section.jsx => Section.tsx} (50%)
rename viz-lib/src/components/visualizations/editor/{Switch.jsx => Switch.tsx} (76%)
rename viz-lib/src/components/visualizations/editor/{TextArea.jsx => TextArea.tsx} (85%)
delete mode 100644 viz-lib/src/components/visualizations/editor/createTabbedEditor.jsx
create mode 100644 viz-lib/src/components/visualizations/editor/createTabbedEditor.tsx
rename viz-lib/src/components/visualizations/editor/{index.js => index.ts} (100%)
rename viz-lib/src/components/visualizations/editor/{withControlLabel.jsx => withControlLabel.tsx} (76%)
rename viz-lib/src/{index.js => index.ts} (100%)
rename viz-lib/src/lib/{chooseTextColorForBackground.js => chooseTextColorForBackground.ts} (85%)
rename viz-lib/src/lib/hooks/{useMemoWithDeepCompare.js => useMemoWithDeepCompare.ts} (52%)
create mode 100644 viz-lib/src/lib/referenceCountingCache.ts
rename viz-lib/src/lib/{utils.js => utils.ts} (83%)
delete mode 100644 viz-lib/src/lib/value-format.js
rename client/app/lib/value-format.js => viz-lib/src/lib/value-format.tsx (57%)
rename viz-lib/src/services/{resizeObserver.js => resizeObserver.ts} (92%)
rename viz-lib/src/services/{sanitize.js => sanitize.ts} (96%)
delete mode 100644 viz-lib/src/visualizations/ColorPalette.js
create mode 100644 viz-lib/src/visualizations/ColorPalette.ts
rename viz-lib/src/visualizations/{Editor.jsx => Editor.tsx} (59%)
rename viz-lib/src/visualizations/{Renderer.jsx => Renderer.tsx} (75%)
rename viz-lib/src/visualizations/box-plot/{Editor.jsx => Editor.tsx} (54%)
rename viz-lib/src/visualizations/box-plot/{Renderer.jsx => Renderer.tsx} (73%)
rename viz-lib/src/visualizations/box-plot/{d3box.js => d3box.ts} (78%)
rename viz-lib/src/visualizations/box-plot/{index.js => index.ts} (79%)
delete mode 100644 viz-lib/src/visualizations/chart/Editor/AxisSettings.jsx
create mode 100644 viz-lib/src/visualizations/chart/Editor/AxisSettings.tsx
delete mode 100644 viz-lib/src/visualizations/chart/Editor/ChartTypeSelect.jsx
create mode 100644 viz-lib/src/visualizations/chart/Editor/ChartTypeSelect.tsx
rename viz-lib/src/visualizations/chart/Editor/{ColorsSettings.test.js => ColorsSettings.test.tsx} (92%)
rename viz-lib/src/visualizations/chart/Editor/{ColorsSettings.jsx => ColorsSettings.tsx} (70%)
rename viz-lib/src/visualizations/chart/Editor/{ColumnMappingSelect.jsx => ColumnMappingSelect.tsx} (51%)
delete mode 100644 viz-lib/src/visualizations/chart/Editor/CustomChartSettings.jsx
create mode 100644 viz-lib/src/visualizations/chart/Editor/CustomChartSettings.tsx
rename viz-lib/src/visualizations/chart/Editor/{DataLabelsSettings.test.js => DataLabelsSettings.test.tsx} (95%)
rename viz-lib/src/visualizations/chart/Editor/{DataLabelsSettings.jsx => DataLabelsSettings.tsx} (71%)
delete mode 100644 viz-lib/src/visualizations/chart/Editor/DefaultColorsSettings.jsx
create mode 100644 viz-lib/src/visualizations/chart/Editor/DefaultColorsSettings.tsx
delete mode 100644 viz-lib/src/visualizations/chart/Editor/GeneralSettings.jsx
rename viz-lib/src/visualizations/chart/Editor/{GeneralSettings.test.js => GeneralSettings.test.tsx} (79%)
create mode 100644 viz-lib/src/visualizations/chart/Editor/GeneralSettings.tsx
rename viz-lib/src/visualizations/chart/Editor/{HeatmapColorsSettings.jsx => HeatmapColorsSettings.tsx} (60%)
delete mode 100644 viz-lib/src/visualizations/chart/Editor/PieColorsSettings.jsx
create mode 100644 viz-lib/src/visualizations/chart/Editor/PieColorsSettings.tsx
rename viz-lib/src/visualizations/chart/Editor/{SeriesSettings.test.js => SeriesSettings.test.tsx} (93%)
rename viz-lib/src/visualizations/chart/Editor/{SeriesSettings.jsx => SeriesSettings.tsx} (62%)
delete mode 100644 viz-lib/src/visualizations/chart/Editor/XAxisSettings.jsx
rename viz-lib/src/visualizations/chart/Editor/{XAxisSettings.test.js => XAxisSettings.test.tsx} (83%)
create mode 100644 viz-lib/src/visualizations/chart/Editor/XAxisSettings.tsx
delete mode 100644 viz-lib/src/visualizations/chart/Editor/YAxisSettings.jsx
rename viz-lib/src/visualizations/chart/Editor/{YAxisSettings.test.js => YAxisSettings.test.tsx} (83%)
create mode 100644 viz-lib/src/visualizations/chart/Editor/YAxisSettings.tsx
rename viz-lib/src/visualizations/chart/Editor/__snapshots__/{ColorsSettings.test.js.snap => ColorsSettings.test.tsx.snap} (97%)
rename viz-lib/src/visualizations/chart/Editor/__snapshots__/{DataLabelsSettings.test.js.snap => DataLabelsSettings.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/chart/Editor/__snapshots__/{GeneralSettings.test.js.snap => GeneralSettings.test.tsx.snap} (79%)
rename viz-lib/src/visualizations/chart/Editor/__snapshots__/{SeriesSettings.test.js.snap => SeriesSettings.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/chart/Editor/__snapshots__/{XAxisSettings.test.js.snap => XAxisSettings.test.tsx.snap} (80%)
rename viz-lib/src/visualizations/chart/Editor/__snapshots__/{YAxisSettings.test.js.snap => YAxisSettings.test.tsx.snap} (83%)
rename viz-lib/src/visualizations/chart/Editor/{index.test.js => index.test.tsx} (93%)
rename viz-lib/src/visualizations/chart/Editor/{index.jsx => index.tsx} (62%)
rename viz-lib/src/visualizations/chart/Renderer/{CustomPlotlyChart.jsx => CustomPlotlyChart.tsx} (71%)
rename viz-lib/src/visualizations/chart/Renderer/{PlotlyChart.jsx => PlotlyChart.tsx} (63%)
rename viz-lib/src/visualizations/chart/Renderer/{index.jsx => index.tsx} (89%)
rename viz-lib/src/visualizations/chart/Renderer/{initChart.js => initChart.ts} (54%)
rename viz-lib/src/visualizations/chart/{getChartData.test.js => getChartData.test.ts} (100%)
rename viz-lib/src/visualizations/chart/{getChartData.js => getChartData.ts} (54%)
rename viz-lib/src/visualizations/chart/{getOptions.js => getOptions.ts} (86%)
rename viz-lib/src/visualizations/chart/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/chart/plotly/{customChartUtils.js => customChartUtils.ts} (52%)
rename viz-lib/src/visualizations/chart/plotly/{index.js => index.ts} (57%)
rename viz-lib/src/visualizations/chart/plotly/{prepareData.test.js => prepareData.test.ts} (98%)
rename viz-lib/src/visualizations/chart/plotly/{prepareData.js => prepareData.ts} (77%)
rename viz-lib/src/visualizations/chart/plotly/{prepareDefaultData.js => prepareDefaultData.ts} (63%)
rename viz-lib/src/visualizations/chart/plotly/{prepareHeatmapData.js => prepareHeatmapData.ts} (56%)
rename viz-lib/src/visualizations/chart/plotly/{prepareLayout.test.js => prepareLayout.test.ts} (100%)
rename viz-lib/src/visualizations/chart/plotly/{prepareLayout.js => prepareLayout.ts} (62%)
delete mode 100644 viz-lib/src/visualizations/chart/plotly/preparePieData.js
create mode 100644 viz-lib/src/visualizations/chart/plotly/preparePieData.ts
create mode 100644 viz-lib/src/visualizations/chart/plotly/updateAxes.ts
rename viz-lib/src/visualizations/chart/plotly/{updateChartSize.js => updateChartSize.ts} (89%)
rename viz-lib/src/visualizations/chart/plotly/{updateData.js => updateData.ts} (74%)
delete mode 100644 viz-lib/src/visualizations/chart/plotly/updateYRanges.js
rename viz-lib/src/visualizations/chart/plotly/{utils.js => utils.ts} (64%)
rename viz-lib/src/visualizations/choropleth/{ColorPalette.js => ColorPalette.ts} (100%)
delete mode 100644 viz-lib/src/visualizations/choropleth/Editor/BoundsSettings.jsx
create mode 100644 viz-lib/src/visualizations/choropleth/Editor/BoundsSettings.tsx
delete mode 100644 viz-lib/src/visualizations/choropleth/Editor/ColorsSettings.jsx
create mode 100644 viz-lib/src/visualizations/choropleth/Editor/ColorsSettings.tsx
delete mode 100644 viz-lib/src/visualizations/choropleth/Editor/FormatSettings.jsx
create mode 100644 viz-lib/src/visualizations/choropleth/Editor/FormatSettings.tsx
delete mode 100644 viz-lib/src/visualizations/choropleth/Editor/GeneralSettings.jsx
create mode 100644 viz-lib/src/visualizations/choropleth/Editor/GeneralSettings.tsx
rename viz-lib/src/visualizations/choropleth/Editor/{index.js => index.ts} (100%)
delete mode 100644 viz-lib/src/visualizations/choropleth/Editor/utils.js
create mode 100644 viz-lib/src/visualizations/choropleth/Editor/utils.ts
rename viz-lib/src/visualizations/choropleth/Renderer/{Legend.jsx => Legend.tsx} (60%)
delete mode 100644 viz-lib/src/visualizations/choropleth/Renderer/index.jsx
create mode 100644 viz-lib/src/visualizations/choropleth/Renderer/index.tsx
rename viz-lib/src/visualizations/choropleth/Renderer/{initChoropleth.js => initChoropleth.tsx} (59%)
rename viz-lib/src/visualizations/choropleth/Renderer/{utils.js => utils.ts} (59%)
delete mode 100644 viz-lib/src/visualizations/choropleth/getOptions.js
create mode 100644 viz-lib/src/visualizations/choropleth/getOptions.ts
create mode 100644 viz-lib/src/visualizations/choropleth/hooks/useLoadGeoJson.ts
rename viz-lib/src/visualizations/choropleth/{index.js => index.ts} (100%)
create mode 100644 viz-lib/src/visualizations/choropleth/maps/convert-projection.ts
create mode 100644 viz-lib/src/visualizations/choropleth/maps/usa-albers.geo.json
create mode 100644 viz-lib/src/visualizations/choropleth/maps/usa.geo.json
rename viz-lib/src/visualizations/cohort/{Cornelius.jsx => Cornelius.tsx} (63%)
rename viz-lib/src/visualizations/cohort/Editor/{AppearanceSettings.jsx => AppearanceSettings.tsx} (56%)
rename viz-lib/src/visualizations/cohort/Editor/{ColorsSettings.jsx => ColorsSettings.tsx} (59%)
delete mode 100644 viz-lib/src/visualizations/cohort/Editor/ColumnsSettings.jsx
create mode 100644 viz-lib/src/visualizations/cohort/Editor/ColumnsSettings.tsx
rename viz-lib/src/visualizations/cohort/Editor/{OptionsSettings.jsx => OptionsSettings.tsx} (54%)
rename viz-lib/src/visualizations/cohort/Editor/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/cohort/{Renderer.jsx => Renderer.tsx} (95%)
rename viz-lib/src/visualizations/cohort/{getOptions.js => getOptions.ts} (92%)
rename viz-lib/src/visualizations/cohort/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/cohort/{prepareData.js => prepareData.ts} (68%)
rename viz-lib/src/visualizations/counter/Editor/{FormatSettings.jsx => FormatSettings.tsx} (50%)
delete mode 100644 viz-lib/src/visualizations/counter/Editor/GeneralSettings.jsx
create mode 100644 viz-lib/src/visualizations/counter/Editor/GeneralSettings.tsx
rename viz-lib/src/visualizations/counter/Editor/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/counter/{Renderer.jsx => Renderer.tsx} (65%)
rename viz-lib/src/visualizations/counter/{index.js => index.ts} (83%)
rename viz-lib/src/visualizations/counter/{utils.test.js => utils.test.ts} (99%)
rename viz-lib/src/visualizations/counter/{utils.js => utils.ts} (57%)
rename viz-lib/src/visualizations/details/{DetailsRenderer.jsx => DetailsRenderer.tsx} (72%)
rename viz-lib/src/visualizations/details/{index.js => index.ts} (72%)
rename viz-lib/src/visualizations/funnel/Editor/{AppearanceSettings.jsx => AppearanceSettings.tsx} (60%)
rename viz-lib/src/visualizations/funnel/Editor/{GeneralSettings.jsx => GeneralSettings.tsx} (50%)
rename viz-lib/src/visualizations/funnel/Editor/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/funnel/Renderer/{FunnelBar.jsx => FunnelBar.tsx} (68%)
rename viz-lib/src/visualizations/funnel/Renderer/{index.jsx => index.tsx} (78%)
rename viz-lib/src/visualizations/funnel/Renderer/{prepareData.js => prepareData.ts} (68%)
rename viz-lib/src/visualizations/funnel/{getOptions.js => getOptions.ts} (94%)
rename viz-lib/src/visualizations/funnel/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/map/Editor/{FormatSettings.jsx => FormatSettings.tsx} (68%)
rename viz-lib/src/visualizations/map/Editor/{GeneralSettings.jsx => GeneralSettings.tsx} (53%)
rename viz-lib/src/visualizations/map/Editor/{GroupsSettings.jsx => GroupsSettings.tsx} (61%)
rename viz-lib/src/visualizations/map/Editor/{StyleSettings.jsx => StyleSettings.tsx} (60%)
rename viz-lib/src/visualizations/map/Editor/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/map/{Renderer.jsx => Renderer.tsx} (65%)
rename viz-lib/src/visualizations/map/{getOptions.js => getOptions.ts} (50%)
rename viz-lib/src/visualizations/map/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/map/{initMap.js => initMap.ts} (70%)
rename viz-lib/src/visualizations/map/{prepareData.js => prepareData.ts} (80%)
delete mode 100644 viz-lib/src/visualizations/pivot/Editor.jsx
create mode 100644 viz-lib/src/visualizations/pivot/Editor.tsx
rename viz-lib/src/visualizations/pivot/{Renderer.jsx => Renderer.tsx} (88%)
rename viz-lib/src/visualizations/pivot/{index.js => index.ts} (86%)
rename viz-lib/src/visualizations/{prop-types.js => prop-types.ts} (53%)
rename viz-lib/src/visualizations/{registeredVisualizations.js => registeredVisualizations.ts} (64%)
rename viz-lib/src/visualizations/sankey/{Editor.jsx => Editor.tsx} (100%)
rename viz-lib/src/visualizations/sankey/{Renderer.jsx => Renderer.tsx} (61%)
rename viz-lib/src/visualizations/sankey/{d3sankey.js => d3sankey.ts} (63%)
delete mode 100644 viz-lib/src/visualizations/sankey/index.js
create mode 100644 viz-lib/src/visualizations/sankey/index.ts
rename viz-lib/src/visualizations/sankey/{initSankey.js => initSankey.ts} (57%)
rename viz-lib/src/visualizations/sunburst/{Editor.jsx => Editor.tsx} (82%)
rename viz-lib/src/visualizations/sunburst/{Renderer.jsx => Renderer.tsx} (77%)
rename viz-lib/src/visualizations/sunburst/{index.js => index.ts} (76%)
rename viz-lib/src/visualizations/sunburst/{initSunburst.js => initSunburst.ts} (72%)
delete mode 100644 viz-lib/src/visualizations/table/Editor/ColumnEditor.jsx
create mode 100644 viz-lib/src/visualizations/table/Editor/ColumnEditor.tsx
rename viz-lib/src/visualizations/table/Editor/{ColumnsSettings.test.js => ColumnsSettings.test.tsx} (94%)
rename viz-lib/src/visualizations/table/Editor/{ColumnsSettings.jsx => ColumnsSettings.tsx} (62%)
rename viz-lib/src/visualizations/table/Editor/{GridSettings.test.js => GridSettings.test.tsx} (87%)
rename viz-lib/src/visualizations/table/Editor/{GridSettings.jsx => GridSettings.tsx} (58%)
rename viz-lib/src/visualizations/table/Editor/__snapshots__/{ColumnsSettings.test.js.snap => ColumnsSettings.test.tsx.snap} (96%)
rename viz-lib/src/visualizations/table/Editor/__snapshots__/{GridSettings.test.js.snap => GridSettings.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/Editor/{index.jsx => index.tsx} (100%)
rename viz-lib/src/visualizations/table/{Renderer.jsx => Renderer.tsx} (60%)
rename viz-lib/src/visualizations/table/columns/__snapshots__/{boolean.test.js.snap => boolean.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/columns/__snapshots__/{datetime.test.js.snap => datetime.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/columns/__snapshots__/{image.test.js.snap => image.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/columns/__snapshots__/{link.test.js.snap => link.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/columns/__snapshots__/{number.test.js.snap => number.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/columns/__snapshots__/{text.test.js.snap => text.test.tsx.snap} (100%)
rename viz-lib/src/visualizations/table/columns/{boolean.test.js => boolean.test.tsx} (82%)
rename viz-lib/src/visualizations/table/columns/{boolean.jsx => boolean.tsx} (55%)
rename viz-lib/src/visualizations/table/columns/{datetime.test.js => datetime.test.tsx} (77%)
rename viz-lib/src/visualizations/table/columns/{datetime.jsx => datetime.tsx} (65%)
rename viz-lib/src/visualizations/table/columns/{image.test.js => image.test.tsx} (88%)
rename viz-lib/src/visualizations/table/columns/{image.jsx => image.tsx} (52%)
rename viz-lib/src/visualizations/table/columns/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/table/columns/{json.jsx => json.tsx} (88%)
rename viz-lib/src/visualizations/table/columns/{link.test.js => link.test.tsx} (88%)
rename viz-lib/src/visualizations/table/columns/{link.jsx => link.tsx} (54%)
rename viz-lib/src/visualizations/table/columns/{number.test.js => number.test.tsx} (76%)
rename viz-lib/src/visualizations/table/columns/{number.jsx => number.tsx} (64%)
rename viz-lib/src/visualizations/table/columns/{text.test.js => text.test.tsx} (82%)
rename viz-lib/src/visualizations/table/columns/{text.jsx => text.tsx} (67%)
rename viz-lib/src/visualizations/table/{getOptions.js => getOptions.ts} (80%)
rename viz-lib/src/visualizations/table/{index.js => index.ts} (100%)
rename viz-lib/src/visualizations/table/{utils.js => utils.tsx} (53%)
rename viz-lib/src/visualizations/{visualizationsSettings.js => visualizationsSettings.tsx} (71%)
delete mode 100644 viz-lib/src/visualizations/word-cloud/Editor.jsx
create mode 100644 viz-lib/src/visualizations/word-cloud/Editor.tsx
rename viz-lib/src/visualizations/word-cloud/{Renderer.jsx => Renderer.tsx} (68%)
rename viz-lib/src/visualizations/word-cloud/{index.js => index.ts} (84%)
create mode 100644 viz-lib/tsconfig.json
create mode 100644 viz-lib/yarn.lock
create mode 100644 yarn.lock
diff --git a/.ci/Dockerfile.cypress b/.ci/Dockerfile.cypress
new file mode 100644
index 0000000000..e595fcc1ba
--- /dev/null
+++ b/.ci/Dockerfile.cypress
@@ -0,0 +1,12 @@
+FROM cypress/browsers:node18.12.0-chrome106-ff106
+
+ENV APP /usr/src/app
+WORKDIR $APP
+
+COPY package.json yarn.lock .yarnrc $APP/
+COPY viz-lib $APP/viz-lib
+RUN npm install yarn@1.22.22 -g && yarn --frozen-lockfile --network-concurrency 1 > /dev/null
+
+COPY . $APP
+
+RUN ./node_modules/.bin/cypress verify
diff --git a/.ci/compose.ci.yaml b/.ci/compose.ci.yaml
new file mode 100644
index 0000000000..7c056d0f26
--- /dev/null
+++ b/.ci/compose.ci.yaml
@@ -0,0 +1,25 @@
+services:
+ redash:
+ build: ../
+ command: manage version
+ depends_on:
+ - postgres
+ - redis
+ ports:
+ - "5000:5000"
+ environment:
+ PYTHONUNBUFFERED: 0
+ REDASH_LOG_LEVEL: "INFO"
+ REDASH_REDIS_URL: "redis://redis:6379/0"
+ POSTGRES_PASSWORD: "FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb"
+ REDASH_DATABASE_URL: "postgresql://postgres:FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb@postgres/postgres"
+ REDASH_COOKIE_SECRET: "2H9gNG9obnAQ9qnR9BDTQUph6CbXKCzF"
+ redis:
+ image: redis:7-alpine
+ restart: unless-stopped
+ postgres:
+ image: pgautoupgrade/pgautoupgrade:latest
+ command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
+ restart: unless-stopped
+ environment:
+ POSTGRES_HOST_AUTH_METHOD: "trust"
diff --git a/.ci/compose.cypress.yaml b/.ci/compose.cypress.yaml
new file mode 100644
index 0000000000..7f769ab3ef
--- /dev/null
+++ b/.ci/compose.cypress.yaml
@@ -0,0 +1,73 @@
+x-redash-service: &redash-service
+ build:
+ context: ../
+ args:
+ install_groups: "main"
+ code_coverage: ${CODE_COVERAGE}
+x-redash-environment: &redash-environment
+ REDASH_LOG_LEVEL: "INFO"
+ REDASH_REDIS_URL: "redis://redis:6379/0"
+ POSTGRES_PASSWORD: "FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb"
+ REDASH_DATABASE_URL: "postgresql://postgres:FmTKs5vX52ufKR1rd8tn4MoSP7zvCJwb@postgres/postgres"
+ REDASH_RATELIMIT_ENABLED: "false"
+ REDASH_ENFORCE_CSRF: "true"
+ REDASH_COOKIE_SECRET: "2H9gNG9obnAQ9qnR9BDTQUph6CbXKCzF"
+services:
+ server:
+ <<: *redash-service
+ command: server
+ depends_on:
+ - postgres
+ - redis
+ ports:
+ - "5000:5000"
+ environment:
+ <<: *redash-environment
+ PYTHONUNBUFFERED: 0
+ scheduler:
+ <<: *redash-service
+ command: scheduler
+ depends_on:
+ - server
+ environment:
+ <<: *redash-environment
+ worker:
+ <<: *redash-service
+ command: worker
+ depends_on:
+ - server
+ environment:
+ <<: *redash-environment
+ PYTHONUNBUFFERED: 0
+ cypress:
+ ipc: host
+ build:
+ context: ../
+ dockerfile: .ci/Dockerfile.cypress
+ depends_on:
+ - server
+ - worker
+ - scheduler
+ environment:
+ CYPRESS_baseUrl: "http://server:5000"
+ CYPRESS_coverage: ${CODE_COVERAGE}
+ PERCY_TOKEN: ${PERCY_TOKEN}
+ PERCY_BRANCH: ${CIRCLE_BRANCH}
+ PERCY_COMMIT: ${CIRCLE_SHA1}
+ PERCY_PULL_REQUEST: ${CIRCLE_PR_NUMBER}
+ COMMIT_INFO_BRANCH: ${CIRCLE_BRANCH}
+ COMMIT_INFO_MESSAGE: ${COMMIT_INFO_MESSAGE}
+ COMMIT_INFO_AUTHOR: ${CIRCLE_USERNAME}
+ COMMIT_INFO_SHA: ${CIRCLE_SHA1}
+ COMMIT_INFO_REMOTE: ${CIRCLE_REPOSITORY_URL}
+ CYPRESS_PROJECT_ID: ${CYPRESS_PROJECT_ID}
+ CYPRESS_RECORD_KEY: ${CYPRESS_RECORD_KEY}
+ redis:
+ image: redis:7-alpine
+ restart: unless-stopped
+ postgres:
+ image: pgautoupgrade/pgautoupgrade:latest
+ command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
+ restart: unless-stopped
+ environment:
+ POSTGRES_HOST_AUTH_METHOD: "trust"
diff --git a/.ci/docker_build b/.ci/docker_build
new file mode 100755
index 0000000000..324c7e996e
--- /dev/null
+++ b/.ci/docker_build
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# This script only needs to run on the main Redash repo
+
+if [ "${GITHUB_REPOSITORY}" != "getredash/redash" ]; then
+ echo "Skipping image build for Docker Hub, as this isn't the main Redash repository"
+ exit 0
+fi
+
+if [ "${GITHUB_REF_NAME}" != "master" ] && [ "${GITHUB_REF_NAME}" != "preview-image" ]; then
+ echo "Skipping image build for Docker Hub, as this isn't the 'master' nor 'preview-image' branch"
+ exit 0
+fi
+
+if [ "x${DOCKER_USER}" = "x" ] || [ "x${DOCKER_PASS}" = "x" ]; then
+ echo "Skipping image build for Docker Hub, as the login details aren't available"
+ exit 0
+fi
+
+set -e
+VERSION=$(jq -r .version package.json)
+VERSION_TAG="$VERSION.b${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}"
+
+export DOCKER_BUILDKIT=1
+export COMPOSE_DOCKER_CLI_BUILD=1
+
+docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}"
+
+DOCKERHUB_REPO="redash/redash"
+DOCKER_TAGS="-t redash/redash:preview -t redash/preview:${VERSION_TAG}"
+
+# Build the docker container
+docker build --build-arg install_groups="main,all_ds,dev" ${DOCKER_TAGS} .
+
+# Push the container to the preview build locations
+docker push "${DOCKERHUB_REPO}:preview"
+docker push "redash/preview:${VERSION_TAG}"
+
+echo "Built: ${VERSION_TAG}"
diff --git a/.ci/pack b/.ci/pack
new file mode 100755
index 0000000000..16223c5a9b
--- /dev/null
+++ b/.ci/pack
@@ -0,0 +1,9 @@
+#!/bin/bash
+NAME=redash
+VERSION=$(jq -r .version package.json)
+FULL_VERSION=$VERSION+b$CIRCLE_BUILD_NUM
+FILENAME=$NAME.$FULL_VERSION.tar.gz
+
+mkdir -p /tmp/artifacts/
+
+tar -zcv -f /tmp/artifacts/$FILENAME --exclude=".git" --exclude="optipng*" --exclude="cypress" --exclude="*.pyc" --exclude="*.pyo" --exclude="venv" *
diff --git a/.ci/update_version b/.ci/update_version
new file mode 100755
index 0000000000..53b537208c
--- /dev/null
+++ b/.ci/update_version
@@ -0,0 +1,6 @@
+#!/bin/bash
+VERSION=$(jq -r .version package.json)
+FULL_VERSION=${VERSION}+b${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}
+
+sed -ri "s/^__version__ = '([A-Za-z0-9.-]*)'/__version__ = '${FULL_VERSION}'/" redash/__init__.py
+sed -i "s/dev/${GITHUB_SHA}/" client/app/version.json
diff --git a/.dockerignore b/.dockerignore
index 8e3dfae173..b5a2c33ebb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
client/.tmp/
-client/dist/
node_modules/
viz-lib/node_modules/
.tmp/
diff --git a/.github/ISSUE_TEMPLATE/---bug_report.md b/.github/ISSUE_TEMPLATE/---bug_report.md
index f376d6f1ce..1399ef7791 100644
--- a/.github/ISSUE_TEMPLATE/---bug_report.md
+++ b/.github/ISSUE_TEMPLATE/---bug_report.md
@@ -7,10 +7,10 @@ about: Report reproducible software issues so we can improve
We use GitHub only for bug reports 🐛
-Anything else should be posted to https://discuss.redash.io 👫
+Anything else should be a discussion: https://github.com/getredash/redash/discussions/ 👫
-🚨For support, help & questions use https://discuss.redash.io/c/support
-💡For feature requests & ideas use https://discuss.redash.io/c/feature-requests
+🚨For support, help & questions use https://github.com/getredash/redash/discussions/categories/q-a
+💡For feature requests & ideas use https://github.com/getredash/redash/discussions/categories/ideas
**Found a security vulnerability?** Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use this PGP key.
diff --git a/.github/ISSUE_TEMPLATE/--anything_else.md b/.github/ISSUE_TEMPLATE/--anything_else.md
index 9db411b781..d6886cc4ce 100644
--- a/.github/ISSUE_TEMPLATE/--anything_else.md
+++ b/.github/ISSUE_TEMPLATE/--anything_else.md
@@ -1,17 +1,17 @@
---
name: "\U0001F4A1Anything else"
-about: "For help, support, features & ideas - please use https://discuss.redash.io \U0001F46B "
+about: "For help, support, features & ideas - please use Discussions \U0001F46B "
labels: "Support Question"
---
We use GitHub only for bug reports 🐛
-Anything else should be posted to https://discuss.redash.io 👫
+Anything else should be a discussion: https://github.com/getredash/redash/discussions/ 👫
-🚨For support, help & questions use https://discuss.redash.io/c/support
-💡For feature requests & ideas use https://discuss.redash.io/c/feature-requests
+🚨For support, help & questions use https://github.com/getredash/redash/discussions/categories/q-a
+💡For feature requests & ideas use https://github.com/getredash/redash/discussions/categories/ideas
Alternatively, check out these resources below. Thanks! 😁.
-- [Forum](https://disucss.redash.io)
+- [Discussions](https://github.com/getredash/redash/discussions/)
- [Knowledge Base](https://redash.io/help)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a4e1d25210..8b6e58a6f2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,26 @@
-## What type of PR is this? (check all applicable)
-
+## What type of PR is this?
+
- [ ] Refactor
- [ ] Feature
- [ ] Bug Fix
-- [ ] New Query Runner (Data Source)
+- [ ] New Query Runner (Data Source)
- [ ] New Alert Destination
- [ ] Other
## Description
+
+
+## How is this tested?
+
+- [ ] Unit tests (pytest, jest)
+- [ ] E2E Tests (Cypress)
+- [ ] Manually
+- [ ] N/A
+
+
## Related Tickets & Documents
+
## Mobile & Desktop Screenshots/Recordings (if there are UI changes)
diff --git a/.github/support.yml b/.github/support.yml
deleted file mode 100644
index 164b588b36..0000000000
--- a/.github/support.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration for Support Requests - https://github.com/dessant/support-requests
-
-# Label used to mark issues as support requests
-supportLabel: Support Question
-
-# Comment to post on issues marked as support requests, `{issue-author}` is an
-# optional placeholder. Set to `false` to disable
-supportComment: >
- :wave: @{issue-author}, we use the issue tracker exclusively for bug reports
- and planned work. However, this issue appears to be a support request.
- Please use [our forum](https://discuss.redash.io) to get help.
-
-# Close issues marked as support requests
-close: true
-
-# Lock issues marked as support requests
-lock: false
-
-# Assign `off-topic` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Repository to extend settings from
-# _extends: repo
diff --git a/.gitignore b/.gitignore
index ec0a379187..3fba4897ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ venv/
.coveralls.yml
.idea
*.pyc
+.nyc_output
+coverage
.coverage
coverage.xml
client/dist
@@ -15,6 +17,7 @@ client/dist
_build
.vscode
.env
+.tool-versions
dump.rdb
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000000..c42da845b4
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+engine-strict = true
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000000..3f430af82b
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v18
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000..e8e6795c5e
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+repos:
+ - repo: https://github.com/psf/black
+ rev: 23.1.0
+ hooks:
+ - id: black
+ language_version: python3
+ - repo: https://github.com/charliermarsh/ruff-pre-commit
+ rev: "v0.0.287"
+ hooks:
+ - id: ruff
diff --git a/.restyled.yaml b/.restyled.yaml
index 9a9537ce7a..ddb249dab0 100644
--- a/.restyled.yaml
+++ b/.restyled.yaml
@@ -38,7 +38,9 @@ request_review: author
#
# These can be used to tell other automation to avoid our PRs.
#
-labels: ["Skip CI"]
+labels:
+ - restyled
+ - "Skip CI"
# Labels to ignore
#
@@ -50,13 +52,16 @@ labels: ["Skip CI"]
# Restylers to run, and how
restylers:
- name: black
- image: restyled/restyler-black:v19.10b0
+ image: restyled/restyler-black:v24.4.2
include:
- redash
- tests
- migrations/versions
- name: prettier
- image: restyled/restyler-prettier:v1.19.1-2
+ image: restyled/restyler-prettier:v3.3.2-2
+ command:
+ - prettier
+ - --write
include:
- client/app/**/*.js
- client/app/**/*.jsx
diff --git a/.yarn/.gitignore b/.yarn/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/.yarn/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/tests/extensions/__init__.py b/.yarnrc
similarity index 100%
rename from tests/extensions/__init__.py
rename to .yarnrc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16d33956ba..9c53e7b7f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,152 @@
# Change Log
+## V10.1.0 - 2021-11-23
+
+This release includes patches for three security vulnerabilities:
+
+- Insecure default configuration affects installations where REDASH_COOKIE_SECRET is not set explicitly (CVE-2021-41192)
+- SSRF vulnerability affects installations that enabled URL-loading data sources (CVE-2021-43780)
+- Incorrect usage of state parameter in OAuth client code affects installations where Google Login is enabled (CVE-2021-43777)
+
+And a couple features that didn't merge in time for 10.0.0
+
+- Big Query: Speed up schema loading (#5632)
+- Add support for Firebolt data source (#5606)
+- Fix: Loading schema for Sqlite DB with "Order" column name fails (#5623)
+
+## v10.0.0 - 2021-10-01
+
+A few changes were merged during the V10 beta period.
+
+- New Data Source: CSV/Excel Files
+- Fix: Edit Source button disappeared for users without CanEdit permissions
+- We pinned our docker base image to Python3.7-slim-buster to avoid build issues
+- Fix: dashboard list pagination didn't work
+
+## v10.0.0-beta - 2021-06-16
+
+Just over a year since our last release, the V10 beta is ready. Since we never made a non-beta release of V9, we expect many users will upgrade directly from V8 -> V10. This will bring a lot of exciting features. Please check out the V9 beta release notes below to learn more.
+
+This V10 beta incorporates fixes for the feedback we received on the V9 beta along with a few long-requested features (horizontal bar charts!) and other changes to improve UX and reliability.
+
+This release was made possible by contributions from 35+ people (the Github API didn't let us pull handles this time around): Alex Kovar, Alexander Rusanov, Arik Fraimovich, Ben Amor, Christopher Grant, Đặng Minh Dũng, Daniel Lang, deecay, Elad Ossadon, Gabriel Dutra, iwakiriK, Jannis Leidel, Jerry, Jesse Whitehouse, Jiajie Zhong, Jim Sparkman, Jonathan Hult, Josh Bohde, Justin Talbot, koooge, Lei Ni, Levko Kravets, Lingkai Kong, max-voronov, Mike Nason, Nolan Nichols, Omer Lachish, Patrick Yang, peterlee, Rafael Wendel, Sebastian Tramp, simonschneider-db, Tim Gates, Tobias Macey, Vipul Mathur, and Vladislav Denisov
+
+Our special thanks to [Sohail Ahmed](https://pk.linkedin.com/in/sohail-ahmed-755776184) for reporting a vulnerability in our "forgot password" page (#5425)
+
+### Upgrading
+
+(This section is duplicated from the previous release - since many users will upgrade directly from V8 -> V10)
+
+Typically, if you are running your own instance of Redash and wish to upgrade, you would simply modify the Docker tag in your `docker-compose.yml` file. Since RQ has replaced Celery in this version, there are a couple extra modifications that need to be done in your `docker-compose.yml`:
+
+1. Under `services/scheduler/environment`, omit `QUEUES` and `WORKERS_COUNT` (and omit `environment` altogether if it is empty).
+2. Under `services`, add a new service for general RQ jobs:
+
+```yaml
+worker:
+ <<: *redash-service
+ command: worker
+ environment:
+ QUEUES: "periodic emails default"
+ WORKERS_COUNT: 1
+```
+
+Following that, force a recreation of your containers with `docker-compose up --force-recreate --build` and you should be good to go.
+### UX
+- Redash now uses a vertical navbar
+- Dashboard list now includes “My Dashboards” filter
+- Dashboard parameters can now be re-ordered
+- Queries can now be executed with Shift + Enter on all platforms.
+- Added New Dashboard/Query/Alert buttons to corresponding list pages
+- Dashboard text widgets now prompt to confirm before closing the text editor
+- A plus sign is now shown between tags used for search
+- On the queries list view “My Queries” has moved above “Archived”
+- Improved behavior for filtering by tags in list views
+- When a user’s session expires for inactivity, they are prompted to log-in with a pop-up so they don’t lose their place in the app
+- Numerous accessibility changes towards the a11y standard
+- Hide the “Create” menu button if current user doesn’t have permission to any data sources
+
+### Visualizations
+- Feature: Added support for horizontal box plots
+- Feature: Added support for horizontal bar charts
+- Feature: Added “Reverse” option for Chart visualization legend
+- Feature: Added option to align Chart Y-axes at zero
+- Feature: The table visualization header is now fixed when scrolling
+- Feature: Added USA map to choropleth visualization
+- Fix: Selected filters were reset when switching visualizations
+- Fix: Stacked bar chart showed the wrong Y-axis range in some cases
+- Fix: Bar chart with second y axis overlapped data series
+- Fix: Y-axis autoscale failed when min or max was set
+- Fix: Custom JS visualization was broken because of a typo
+- Fix: Too large visualization caused filters block to collapse
+- Fix: Sankey visualization looked inconsistent if the data source returned VARCHAR instead of numeric types
+
+### Structural Updates
+- Redash now prevents CSRF attacks
+- Migration to TypeScript
+- Upgrade to Antd version 4
+### Data Sources
+- New Data Sources: SPARQL Endpoint, Eccenca Corporate Memory, TrinoDB
+- Databricks
+ - Custom Schema Browser that allows switching between databases
+ - Option added to truncate large results
+ - Support for multiple-statement queries
+ - Schema browser can now use eventlet instead of RQ
+- MongoDB:
+ - Moved Username and Password out of the connection string so that password can be stored secretly
+- Oracle:
+ - Fix: Annotated queries always failed. Annotation is now disabled
+- Postgres/CockroachDB:
+ - SSL certfile/keyfile fields are now handled as secret
+- Python:
+ - Feature: Custom built-ins are now supported
+ - Fix: Query runner was not compatible with Python 3
+- Snowflake:
+ - Data source now accepts a custom host address (for use with proxies)
+- TreasureData:
+ - API key field is now handled as secret
+- Yandex:
+ - OAuth token field is now handled as secret
+
+### Alerts
+- Feature: Added ability to mute alerts without deleting them
+- Change: Non-email alert destination details are now obfuscated to avoid leaking sensitive information (webhook URLs, tokens etc.)
+- Fix: numerical comparisons failed if value from query was a string
+
+### Parameters
+- Added “Last 12 months” option for dynamic date ranges
+
+### Bug Fixes
+- Fix: Private addresses were not allowed even when enforcing was disabled
+- Fix: Python query runner wasn’t updated for Python 3
+- Fix: Sorting queries by schedule returned the wrong order
+- Fix: Counter visualization was enormous in some cases
+- Fix: Dashboard URL will now change when the dashboard title changes
+- Fix: URL parameters were removed when forking a query
+- Fix: Create link on data sources page was broken
+- Fix: Queries could be reassigned to read-only data sources
+- Fix: Multi-select dropdown was very slow if there were 1k+ options
+- Fix: Search Input couldn’t be focused or updated while editing a dashboard
+- Fix: The CLI command for “status” did not work
+- Fix: The dashboard list screen displayed too few items under certain pagination configurations
+
+### Other
+- Added an environment variable to disable public sharing links for queries and dashboards
+- Alert destinations are now encrypted at the database
+- The base query runner now has stubs to implement result truncating for other data sources
+- Static SAML configuration and assertion encryption are now supported
+- Adds new component for adding extra actions to the query and dashboard pages
+- Non-admins with at least view_only permission on a dashboard can now make GET requests to the data source resource
+- Added a BLOCKED_DOMAINS setting to prevent sign-ups from emails at specific domains
+- Added a rate limit to the “forgot password” page
+- RQ workers will now shutdown gracefully for known error codes
+- Scheduled execution failure counter now resets following a successful ad hoc execution
+- Redash now deletes locks for cancelled queries
+- Upgraded Ace Editor from v6 to v9
+- Added a periodic job to remove ghost locks
+- Removed content width limit on all pages
+- Introduce a React component
+
## v9.0.0-beta - 2020-06-11
This release was long time in the making and has several major changes:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e9c28e6bc6..e090a0f8fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,19 +4,7 @@ Thank you for taking the time to contribute! :tada::+1:
The following is a set of guidelines for contributing to Redash. These are guidelines, not rules, please use your best judgement and feel free to propose changes to this document in a pull request.
-## Quick Links:
-
-- [Feature Requests](https://discuss.redash.io/c/feature-requests)
-- [Documentation](https://redash.io/help/)
-- [Blog](https://blog.redash.io/)
-- [Twitter](https://twitter.com/getredash)
-
----
-:star: If you already here and love the project, please make sure to press the Star button. :star:
-
----
-
-
+:star: If you're already here and love the project, please make sure to press the Star button. :star:
## Table of Contents
[How can I contribute?](#how-can-i-contribute)
@@ -32,6 +20,13 @@ The following is a set of guidelines for contributing to Redash. These are guide
- [Release Method](#release-method)
- [Code of Conduct](#code-of-conduct)
+## Quick Links:
+
+- [User Forum](https://github.com/getredash/redash/discussions)
+- [Documentation](https://redash.io/help/)
+
+
+---
## How can I contribute?
### Reporting Bugs
@@ -39,25 +34,54 @@ The following is a set of guidelines for contributing to Redash. These are guide
When creating a new bug report, please make sure to:
- Search for existing issues first. If you find a previous report of your issue, please update the existing issue with additional information instead of creating a new one.
-- If you are not sure if your issue is really a bug or just some configuration/setup problem, please start a discussion in [the support forum](https://discuss.redash.io/c/support) first. Unless you can provide clear steps to reproduce, it's probably better to start with a thread in the forum and later to open an issue.
+- If you are not sure if your issue is really a bug or just some configuration/setup problem, please start a [Q&A discussion](https://github.com/getredash/redash/discussions/new?category=q-a) first. Unless you can provide clear steps to reproduce, it's probably better to start with a discussion and later to open an issue.
- If you still decide to open an issue, please review the template and guidelines and include as much details as possible.
### Suggesting Enhancements / Feature Requests
If you would like to suggest an enhancement or ask for a new feature:
-- Please check [the forum](https://discuss.redash.io/c/feature-requests/5) for existing threads about what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
+- Please check [the Ideas discussions](https://github.com/getredash/redash/discussions/categories/ideas) for existing threads about what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
- If there is no open thread, you're welcome to start one to have a discussion about what you want to suggest. Try to provide as much details and context as possible and include information about *the problem you want to solve* rather only *your proposed solution*.
### Pull Requests
-- **Code contributions are welcomed**. For big changes or significant features, it's usually better to reach out first and discuss what you want to implement and how (we recommend reading: [Pull Request First](https://medium.com/practical-blend/pull-request-first-f6bb667a9b6#.ozlqxvj36)). This to make sure that what you want to implement is aligned with our goals for the project and that no one else is already working on it.
-- Include screenshots and animated GIFs in your pull request whenever possible.
+**Code contributions are welcomed**. For big changes or significant features, it's usually better to reach out first and discuss what you want to implement and how (we recommend reading: [Pull Request First](https://medium.com/practical-blend/pull-request-first-f6bb667a9b6#.ozlqxvj36)). This is to make sure that what you want to implement is aligned with our goals for the project and that no one else is already working on it.
+
+#### Criteria for Review / Merging
+
+When you open your pull request, please follow this repository’s PR template carefully:
+
+- Indicate the type of change
+ - If you implement multiple unrelated features, bug fixes, or refactors please split them into individual pull requests.
+- Describe the change
+- If fixing a bug, please describe the bug or link to an existing github issue / forum discussion
+- Include UI screenshots / GIFs whenever possible
- Please add [documentation](#documentation) for new features or changes in functionality along with the code.
- Please follow existing code style:
- Python: we use [Black](https://github.com/psf/black) to auto format the code.
- Javascript: we use [Prettier](https://github.com/prettier/prettier) to auto-format the code.
-
+
+#### Initial Review (1 week)
+
+During this phase, a team member will apply the “Team Review” label if a pull request meets our criteria or a “Needs More Information” label if not. If more information is required, the team member will comment which criteria have not been met.
+
+If your pull request receives the “Needs More Information” label, please make the requested changes and then remove the label. This resets the 1 week timer for an initial review.
+
+Stale pull requests that remain untouched in “Needs More Information” for more than 4 weeks will be closed.
+
+If a team member closes your pull request, you may reopen it after you have made the changes requested during initial review. After you make these changes, remove the “Needs More Information” label. This again resets the timer for another initial review.
+
+#### Full Review (2 weeks)
+
+After the “Team Review” label is applied, a member of the core team will review the PR within 2 weeks.
+
+Reviews will approve, request changes, or ask questions to discuss areas of uncertainty. After you’ve responded, a member of the team will re-review within one week.
+
+#### Merging (1 week)
+
+After your pull request has been approved, a member of the core team will merge the pull request within a week.
+
### Documentation
The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/src/pages/kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
diff --git a/Dockerfile b/Dockerfile
index 488305b7be..850638edd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,30 +1,52 @@
-FROM node:12 as frontend-builder
+FROM node:18-bookworm AS frontend-builder
+
+RUN npm install --global --force yarn@1.22.22
# Controls whether to build the frontend assets
ARG skip_frontend_build
+ENV CYPRESS_INSTALL_BINARY=0
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
+
+RUN useradd -m -d /frontend redash
+USER redash
+
WORKDIR /frontend
-COPY package.json package-lock.json /frontend/
-COPY viz-lib /frontend/viz-lib
-RUN if [ "x$skip_frontend_build" = "x" ] ; then npm ci --unsafe-perm; fi
+COPY --chown=redash package.json yarn.lock .yarnrc /frontend/
+COPY --chown=redash viz-lib /frontend/viz-lib
+COPY --chown=redash scripts /frontend/scripts
-COPY client /frontend/client
-COPY webpack.config.js /frontend/
-RUN if [ "x$skip_frontend_build" = "x" ] ; then npm run build; else mkdir -p /frontend/client/dist && touch /frontend/client/dist/multi_org.html && touch /frontend/client/dist/index.html; fi
-FROM python:3.7-slim-buster
+# Controls whether to instrument code for coverage information
+ARG code_coverage
+ENV BABEL_ENV=${code_coverage:+test}
-EXPOSE 5000
+# Avoid issues caused by lags in disk and network I/O speeds when working on top of QEMU emulation for multi-platform image building.
+RUN yarn config set network-timeout 300000
+
+RUN if [ "x$skip_frontend_build" = "x" ] ; then yarn --frozen-lockfile --network-concurrency 1; fi
-# Controls whether to install extra dependencies needed for all data sources.
-ARG skip_ds_deps
-# Controls whether to install dev dependencies.
-ARG skip_dev_deps
+COPY --chown=redash client /frontend/client
+COPY --chown=redash webpack.config.js /frontend/
+RUN < /etc/apt/sources.list.d/mssql-release.list && \
- apt-get update && \
- ACCEPT_EULA=Y apt-get install -y msodbcsql17 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
-ARG databricks_odbc_driver_url=https://databricks.com/wp-content/uploads/2.6.10.1010-2/SimbaSparkODBC-2.6.10.1010-2-Debian-64bit.zip
-ADD $databricks_odbc_driver_url /tmp/simba_odbc.zip
-RUN unzip /tmp/simba_odbc.zip -d /tmp/ \
- && dpkg -i /tmp/SimbaSparkODBC-*/*.deb \
- && echo "[Simba]\nDriver = /opt/simba/spark/lib/64/libsparkodbc_sb64.so" >> /etc/odbcinst.ini \
- && rm /tmp/simba_odbc.zip \
- && rm -rf /tmp/SimbaSparkODBC*
+
+ARG TARGETPLATFORM
+ARG databricks_odbc_driver_url=https://databricks-bi-artifacts.s3.us-east-2.amazonaws.com/simbaspark-drivers/odbc/2.6.26/SimbaSparkODBC-2.6.26.1045-Debian-64bit.zip
+RUN < /etc/apt/sources.list.d/mssql-release.list
+ apt-get update
+ ACCEPT_EULA=Y apt-get install -y --no-install-recommends msodbcsql18
+ apt-get clean
+ rm -rf /var/lib/apt/lists/*
+ curl "$databricks_odbc_driver_url" --location --output /tmp/simba_odbc.zip
+ chmod 600 /tmp/simba_odbc.zip
+ unzip /tmp/simba_odbc.zip -d /tmp/simba
+ dpkg -i /tmp/simba/*.deb
+ printf "[Simba]\nDriver = /opt/simba/spark/lib/64/libsparkodbc_sb64.so" >> /etc/odbcinst.ini
+ rm /tmp/simba_odbc.zip
+ rm -rf /tmp/simba
+ fi
+EOF
WORKDIR /app
-# Disalbe PIP Cache and Version Check
-ENV PIP_DISABLE_PIP_VERSION_CHECK=1
-ENV PIP_NO_CACHE_DIR=1
+ENV POETRY_VERSION=1.8.3
+ENV POETRY_HOME=/etc/poetry
+ENV POETRY_VIRTUALENVS_CREATE=false
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# Avoid crashes, including corrupted cache artifacts, when building multi-platform images with GitHub Actions.
+RUN /etc/poetry/bin/poetry cache clear pypi --all
+
+COPY pyproject.toml poetry.lock ./
-# We first copy only the requirements file, to avoid rebuilding on every file
-# change.
-COPY requirements.txt requirements_bundles.txt requirements_dev.txt requirements_all_ds.txt ./
-RUN if [ "x$skip_dev_deps" = "x" ] ; then pip install -r requirements.txt -r requirements_dev.txt; else pip install -r requirements.txt; fi
-RUN if [ "x$skip_ds_deps" = "x" ] ; then pip install -r requirements_all_ds.txt ; else echo "Skipping pip install -r requirements_all_ds.txt" ; fi
+ARG POETRY_OPTIONS="--no-root --no-interaction --no-ansi"
+# for LDAP authentication, install with `ldap3` group
+# disabled by default due to GPL license conflict
+ARG install_groups="main,all_ds,dev"
+RUN /etc/poetry/bin/poetry install --only $install_groups $POETRY_OPTIONS
-COPY . /app
-COPY --from=frontend-builder /frontend/client/dist /app/client/dist
-RUN chown -R redash /app
+COPY --chown=redash . /app
+COPY --from=frontend-builder --chown=redash /frontend/client/dist /app/client/dist
+RUN chown redash /app
USER redash
ENTRYPOINT ["/app/bin/docker-entrypoint"]
diff --git a/LICENSE.borders b/LICENSE.borders
new file mode 100644
index 0000000000..f9e6eff226
--- /dev/null
+++ b/LICENSE.borders
@@ -0,0 +1,3 @@
+The Bahrain map data used in Redash was downloaded from
+https://cartographyvectors.com/map/857-bahrain-detailed-boundary in PR #6192.
+* Free for personal and commercial purpose with attribution.
diff --git a/Makefile b/Makefile
index 7bc3849190..c5abda5656 100644
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,80 @@
-.PHONY: compose_build up test_db create_database clean down bundle tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
+.PHONY: compose_build up test_db create_database clean clean-all down tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
-compose_build:
- docker-compose build
+compose_build: .env
+ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
up:
- docker-compose up -d --build
+ docker compose up -d redis postgres --remove-orphans
+ docker compose exec -u postgres postgres psql postgres --csv \
+ -1tqc "SELECT table_name FROM information_schema.tables WHERE table_name = 'organizations'" 2> /dev/null \
+ | grep -q "organizations" || make create_database
+ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose up -d --build --remove-orphans
test_db:
@for i in `seq 1 5`; do \
- if (docker-compose exec postgres sh -c 'psql -U postgres -c "select 1;"' 2>&1 > /dev/null) then break; \
+ if (docker compose exec postgres sh -c 'psql -U postgres -c "select 1;"' 2>&1 > /dev/null) then break; \
else echo "postgres initializing..."; sleep 5; fi \
done
- docker-compose exec postgres sh -c 'psql -U postgres -c "drop database if exists tests;" && psql -U postgres -c "create database tests;"'
+ docker compose exec postgres sh -c 'psql -U postgres -c "drop database if exists tests;" && psql -U postgres -c "create database tests;"'
-create_database:
- docker-compose run server create_db
+create_database: .env
+ docker compose run server create_db
clean:
- docker-compose down && docker-compose rm
+ docker compose down
+ docker compose --project-name cypress down
+ docker compose rm --stop --force
+ docker compose --project-name cypress rm --stop --force
+ docker image rm --force \
+ cypress-server:latest cypress-worker:latest cypress-scheduler:latest \
+ redash-server:latest redash-worker:latest redash-scheduler:latest
+ docker container prune --force
+ docker image prune --force
+ docker volume prune --force
+
+clean-all: clean
+ docker image rm --force \
+ redash/redash:latest redis:7-alpine maildev/maildev:latest \
+ pgautoupgrade/pgautoupgrade:15-alpine3.8 pgautoupgrade/pgautoupgrade:latest
down:
- docker-compose down
+ docker compose down
-bundle:
- docker-compose run server bin/bundle-extensions
+.env:
+ printf "REDASH_COOKIE_SECRET=`pwgen -1s 32`\nREDASH_SECRET_KEY=`pwgen -1s 32`\n" >> .env
+
+env: .env
+
+format:
+ pre-commit run --all-files
tests:
- docker-compose run server tests
+ docker compose run server tests
lint:
- ./bin/flake8_tests.sh
+ ruff check .
+ black --check . --diff
backend-unit-tests: up test_db
- docker-compose run --rm --name tests server tests
+ docker compose run --rm --name tests server tests
-frontend-unit-tests: bundle
- npm ci
- npm run bundle
- npm test
+frontend-unit-tests:
+ CYPRESS_INSTALL_BINARY=0 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 yarn --frozen-lockfile
+ yarn test
-test: lint backend-unit-tests frontend-unit-tests
+test: backend-unit-tests frontend-unit-tests lint
-build: bundle
- npm run build
+build:
+ yarn build
-watch: bundle
- npm run watch
+watch:
+ yarn watch
-start: bundle
- npm run start
+start:
+ yarn start
redis-cli:
- docker-compose run --rm redis redis-cli -h redis
+ docker compose run --rm redis redis-cli -h redis
bash:
- docker-compose run --rm server bash
+ docker compose run --rm server bash
diff --git a/README.md b/README.md
index b7b487c2b3..15c09ee0f7 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
[](https://redash.io/help/)
-[](https://circleci.com/gh/getredash/redash/tree/master)
+[](https://github.com/getredash/redash/actions)
Redash is designed to enable anyone, regardless of the level of technical sophistication, to harness the power of data big and small. SQL users leverage Redash to explore, query, visualize, and share data from any data sources. Their work in turn enables anybody in their organization to use the data. Every day, millions of users at thousands of organizations around the world use Redash to develop insights and make data-driven decisions.
@@ -31,48 +31,71 @@ Redash features:
Redash supports more than 35 SQL and NoSQL [data sources](https://redash.io/help/data-sources/supported-data-sources). It can also be extended to support more. Below is a list of built-in sources:
- Amazon Athena
+- Amazon CloudWatch / Insights
- Amazon DynamoDB
- Amazon Redshift
+- ArangoDB
- Axibase Time Series Database
-- Cassandra
+- Apache Cassandra
- ClickHouse
- CockroachDB
+- Couchbase
- CSV
-- Databricks (Apache Spark)
+- Databricks
- DB2 by IBM
-- Druid
+- Dgraph
+- Apache Drill
+- Apache Druid
+- e6data
+- Eccenca Corporate Memory
- Elasticsearch
+- Exasol
+- Microsoft Excel
+- Firebolt
+- Databend
- Google Analytics
- Google BigQuery
- Google Spreadsheets
- Graphite
- Greenplum
-- Hive
-- Impala
+- Apache Hive
+- Apache Impala
- InfluxDB
-- JIRA
+- InfluxDBv2
+- IBM Netezza Performance Server
+- JIRA (JQL)
- JSON
- Apache Kylin
- OmniSciDB (Formerly MapD)
+- MariaDB
- MemSQL
- Microsoft Azure Data Warehouse / Synapse
- Microsoft Azure SQL Database
+- Microsoft Azure Data Explorer / Kusto
- Microsoft SQL Server
- MongoDB
- MySQL
- Oracle
+- Apache Phoenix
+- Apache Pinot
- PostgreSQL
- Presto
- Prometheus
- Python
- Qubole
- Rockset
+- RisingWave
- Salesforce
- ScyllaDB
- Shell Scripts
- Snowflake
+- SPARQL
- SQLite
+- TiDB
+- Tinybird
- TreasureData
+- Trino
+- Uptycs
- Vertica
- Yandex AppMetrrica
- Yandex Metrica
@@ -80,12 +103,13 @@ Redash supports more than 35 SQL and NoSQL [data sources](https://redash.io/help
## Getting Help
* Issues: https://github.com/getredash/redash/issues
-* Discussion Forum: https://discuss.redash.io/
+* Discussion Forum: https://github.com/getredash/redash/discussions/
+* Development Discussion: https://discord.gg/tN5MdmfGBp
## Reporting Bugs and Contributing Code
* Want to report a bug or request a feature? Please open [an issue](https://github.com/getredash/redash/issues/new).
-* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://redash.io/help-onpremise/dev/guide.html) and make a pull request. We need all the help we can get!
+* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://github.com/getredash/redash/wiki/Local-development-setup) and make a pull request. We need all the help we can get!
## Security
diff --git a/bin/bundle-extensions b/bin/bundle-extensions
deleted file mode 100755
index ce0e300854..0000000000
--- a/bin/bundle-extensions
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env python3
-"""Copy bundle extension files to the client/app/extension directory"""
-import logging
-import os
-from pathlib import Path
-from shutil import copy
-from collections import OrderedDict as odict
-
-import importlib_metadata
-import importlib_resources
-
-# Name of the subdirectory
-BUNDLE_DIRECTORY = "bundle"
-
-logger = logging.getLogger(__name__)
-
-
-# Make a directory for extensions and set it as an environment variable
-# to be picked up by webpack.
-extensions_relative_path = Path("client", "app", "extensions")
-extensions_directory = Path(__file__).parent.parent / extensions_relative_path
-
-if not extensions_directory.exists():
- extensions_directory.mkdir()
-os.environ["EXTENSIONS_DIRECTORY"] = str(extensions_relative_path)
-
-
-def entry_point_module(entry_point):
- """Returns the dotted module path for the given entry point"""
- return entry_point.pattern.match(entry_point.value).group("module")
-
-
-def load_bundles():
- """"Load bundles as defined in Redash extensions.
-
- The bundle entry point can be defined as a dotted path to a module
- or a callable, but it won't be called but just used as a means
- to find the files under its file system path.
-
- The name of the directory it looks for files in is "bundle".
-
- So a Python package with an extension bundle could look like this::
-
- my_extensions/
- ├── __init__.py
- └── wide_footer
- ├── __init__.py
- └── bundle
- ├── extension.js
- └── styles.css
-
- and would then need to register the bundle with an entry point
- under the "redash.bundles" group, e.g. in your setup.py::
-
- setup(
- # ...
- entry_points={
- "redash.bundles": [
- "wide_footer = my_extensions.wide_footer",
- ]
- # ...
- },
- # ...
- )
-
- """
- bundles = odict()
- for entry_point in importlib_metadata.entry_points().get("redash.bundles", []):
- logger.info('Loading Redash bundle "%s".', entry_point.name)
- module = entry_point_module(entry_point)
- # Try to get a list of bundle files
- try:
- bundle_dir = importlib_resources.files(module).joinpath(BUNDLE_DIRECTORY)
- except (ImportError, TypeError):
- # Module isn't a package, so can't have a subdirectory/-package
- logger.error(
- 'Redash bundle module "%s" could not be imported: "%s"',
- entry_point.name,
- module,
- )
- continue
- if not bundle_dir.is_dir():
- logger.error(
- 'Redash bundle directory "%s" could not be found or is not a directory: "%s"',
- entry_point.name,
- bundle_dir,
- )
- continue
- bundles[entry_point.name] = list(bundle_dir.rglob("*"))
- return bundles
-
-
-bundles = load_bundles().items()
-if bundles:
- print("Number of extension bundles found: {}".format(len(bundles)))
-else:
- print("No extension bundles found.")
-
-for bundle_name, paths in bundles:
- # Shortcut in case not paths were found for the bundle
- if not paths:
- print('No paths found for bundle "{}".'.format(bundle_name))
- continue
-
- # The destination for the bundle files with the entry point name as the subdirectory
- destination = Path(extensions_directory, bundle_name)
- if not destination.exists():
- destination.mkdir()
-
- # Copy the bundle directory from the module to its destination.
- print('Copying "{}" bundle to {}:'.format(bundle_name, destination.resolve()))
- for src_path in paths:
- dest_path = destination / src_path.name
- print(" - {} -> {}".format(src_path, dest_path))
- copy(str(src_path), str(dest_path))
diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index 052e8cba37..2f570aba3b 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -2,42 +2,51 @@
set -e
scheduler() {
- /app/manage.py db upgrade
echo "Starting RQ scheduler..."
exec /app/manage.py rq scheduler
}
dev_scheduler() {
- /app/manage.py db upgrade
echo "Starting dev RQ scheduler..."
exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- ./manage.py rq scheduler
}
worker() {
- /app/manage.py db upgrade
echo "Starting RQ worker..."
export WORKERS_COUNT=${WORKERS_COUNT:-2}
export QUEUES=${QUEUES:-}
- supervisord -c worker.conf
+ exec supervisord -c worker.conf
+}
+
+workers_healthcheck() {
+ WORKERS_COUNT=${WORKERS_COUNT}
+ echo "Checking active workers count against $WORKERS_COUNT..."
+ ACTIVE_WORKERS_COUNT=`echo $(rq info --url $REDASH_REDIS_URL -R | grep workers | grep -oP ^[0-9]+)`
+ if [ "$ACTIVE_WORKERS_COUNT" -lt "$WORKERS_COUNT" ]; then
+ echo "$ACTIVE_WORKERS_COUNT workers are active, Exiting"
+ exit 1
+ else
+ echo "$ACTIVE_WORKERS_COUNT workers are active"
+ exit 0
+ fi
}
dev_worker() {
- /app/manage.py db upgrade
echo "Starting dev RQ worker..."
exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- ./manage.py rq worker $QUEUES
}
server() {
- /app/manage.py db upgrade
# Recycle gunicorn workers every n-th request. See http://docs.gunicorn.org/en/stable/settings.html#max-requests for more details.
MAX_REQUESTS=${MAX_REQUESTS:-1000}
MAX_REQUESTS_JITTER=${MAX_REQUESTS_JITTER:-100}
- exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app --max-requests $MAX_REQUESTS --max-requests-jitter $MAX_REQUESTS_JITTER
+ TIMEOUT=${REDASH_GUNICORN_TIMEOUT:-60}
+ exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app --max-requests $MAX_REQUESTS --max-requests-jitter $MAX_REQUESTS_JITTER --timeout $TIMEOUT
}
create_db() {
@@ -58,7 +67,7 @@ help() {
echo ""
echo "shell -- open shell"
echo "dev_server -- start Flask development server with debugger and auto reload"
- echo "debug -- start Flask development server with remote debugger via ptvsd"
+ echo "debug -- start Flask development server with remote debugger via debugpy"
echo "create_db -- create database tables"
echo "manage -- CLI to manage redash"
echo "tests -- run tests"
@@ -80,6 +89,10 @@ case "$1" in
shift
worker
;;
+ workers_healthcheck)
+ shift
+ workers_healthcheck
+ ;;
server)
shift
server
@@ -131,4 +144,3 @@ case "$1" in
exec "$@"
;;
esac
-
diff --git a/bin/dockerflow-version b/bin/dockerflow-version
deleted file mode 100755
index 027d61971f..0000000000
--- a/bin/dockerflow-version
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-VERSION="$1"
-
-printf '{"commit":"%s","version":"%s","source":"https://github.com/%s/%s","build":"%s"}\n' \
- "$CIRCLE_SHA1" \
- "$VERSION" \
- "$CIRCLE_PROJECT_USERNAME" \
- "$CIRCLE_PROJECT_REPONAME" \
- "$CIRCLE_BUILD_URL" \
-> version.json
diff --git a/bin/flake8_tests.sh b/bin/flake8_tests.sh
deleted file mode 100755
index 3c27f7fee2..0000000000
--- a/bin/flake8_tests.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -o errexit # fail the build if any task fails
-
-flake8 --version ; pip --version
-# stop the build if there are Python syntax errors or undefined names
-flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
diff --git a/bin/get_changes.py b/bin/get_changes.py
index 60091bb772..aad1223837 100644
--- a/bin/get_changes.py
+++ b/bin/get_changes.py
@@ -1,35 +1,44 @@
#!/bin/env python3
-import sys
import re
import subprocess
+import sys
def get_change_log(previous_sha):
- args = ['git', '--no-pager', 'log', '--merges', '--grep', 'Merge pull request', '--pretty=format:"%h|%s|%b|%p"', 'master...{}'.format(previous_sha)]
+ args = [
+ "git",
+ "--no-pager",
+ "log",
+ "--merges",
+ "--grep",
+ "Merge pull request",
+ '--pretty=format:"%h|%s|%b|%p"',
+ "master...{}".format(previous_sha),
+ ]
log = subprocess.check_output(args)
changes = []
- for line in log.split('\n'):
+ for line in log.split("\n"):
try:
- sha, subject, body, parents = line[1:-1].split('|')
+ sha, subject, body, parents = line[1:-1].split("|")
except ValueError:
continue
try:
- pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
+ pull_request = re.match(r"Merge pull request #(\d+)", subject).groups()[0]
pull_request = " #{}".format(pull_request)
- except Exception as ex:
+ except Exception:
pull_request = ""
- author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
+ author = subprocess.check_output(["git", "log", "-1", '--pretty=format:"%an"', parents.split(" ")[-1]])[1:-1]
changes.append("{}{}: {} ({})".format(sha, pull_request, body.strip(), author))
return changes
-if __name__ == '__main__':
+if __name__ == "__main__":
previous_sha = sys.argv[1]
changes = get_change_log(previous_sha)
diff --git a/bin/migrations-graph b/bin/migrations-graph
deleted file mode 100755
index 5998d4233d..0000000000
--- a/bin/migrations-graph
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-"""
-A quick helper script to print the Alembic migration history
-via Graphiz and show it via GraphvizOnline on
-https://dreampuf.github.io/GraphvizOnline/.
-
-This requires the Graphviz Python library:
-
- $ pip install --user graphviz
-
-Then run it with the path to the Alembic config file:
-
- $ migrations-graph --config migrations/alembic.ini
-
-"""
-import os
-import sys
-import urllib.parse
-import urllib.request
-
-import click
-from alembic import util
-from alembic.script import ScriptDirectory
-from alembic.config import Config
-from alembic.util import CommandError
-from graphviz import Digraph
-
-# Make sure redash can be imported in the migration files
-sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
-
-
-def get_revisions(config, rev_range=None):
- script = ScriptDirectory.from_config(config)
-
- if rev_range is not None:
- if ":" not in rev_range:
- raise util.CommandError(
- "History range requires [start]:[end], [start]:, or :[end]"
- )
- base, head = rev_range.strip().split(":")
- else:
- base = head = None
-
- return script.walk_revisions(base=base or "base", head=head or "heads")
-
-
-def generate_revision_graph(revisions):
- dot = Digraph()
- for revision in revisions:
- dot.node(revision.revision)
- if revision.down_revision is None:
- dot.edge("base", revision.revision)
- continue
- if isinstance(revision.down_revision, str):
- dot.edge(revision.down_revision, revision.revision)
- continue
- for down_revision in revision.down_revision:
- dot.edge(down_revision, revision.revision)
- return dot
-
-
-@click.command()
-@click.option("--config", default="alembic.ini", help="path to alembic config file")
-@click.option("--name", default="alembic", help="name of the alembic ini section")
-def cli(config, name):
- """
- Generates a simple Graphviz dot file and creates a link to
- view it online via https://dreampuf.github.io/GraphvizOnline/.
- """
- alembic_config = Config(file_=config, ini_section=name)
- try:
- revisions = get_revisions(alembic_config)
- except CommandError as e:
- sys.exit(e)
-
- dot = generate_revision_graph(revisions)
- encoded_dot = urllib.parse.quote(bytes(dot.source, "utf-8"))
- viz_url = "https://dreampuf.github.io/GraphvizOnline/#%s" % encoded_dot
- print("Generated graph for migration history in %s: %s " % (config, viz_url))
-
-
-if __name__ == "__main__":
- cli()
diff --git a/bin/release_manager.py b/bin/release_manager.py
index 3d9b21c895..bd2200d523 100644
--- a/bin/release_manager.py
+++ b/bin/release_manager.py
@@ -1,17 +1,20 @@
#!/usr/bin/env python3
import os
-import sys
import re
import subprocess
+import sys
+from urllib.parse import urlparse
+
import requests
import simplejson
-github_token = os.environ['GITHUB_TOKEN']
-auth = (github_token, 'x-oauth-basic')
-repo = 'getredash/redash'
+github_token = os.environ["GITHUB_TOKEN"]
+auth = (github_token, "x-oauth-basic")
+repo = "getredash/redash"
+
def _github_request(method, path, params=None, headers={}):
- if not path.startswith('https://api.github.com'):
+ if urlparse(path).hostname != "api.github.com":
url = "https://api.github.com/{}".format(path)
else:
url = path
@@ -22,15 +25,18 @@ def _github_request(method, path, params=None, headers={}):
response = requests.request(method, url, data=params, auth=auth)
return response
+
def exception_from_error(message, response):
- return Exception("({}) {}: {}".format(response.status_code, message, response.json().get('message', '?')))
+ return Exception("({}) {}: {}".format(response.status_code, message, response.json().get("message", "?")))
+
def rc_tag_name(version):
return "v{}-rc".format(version)
+
def get_rc_release(version):
tag = rc_tag_name(version)
- response = _github_request('get', 'repos/{}/releases/tags/{}'.format(repo, tag))
+ response = _github_request("get", "repos/{}/releases/tags/{}".format(repo, tag))
if response.status_code == 404:
return None
@@ -39,84 +45,101 @@ def get_rc_release(version):
raise exception_from_error("Unknown error while looking RC release: ", response)
+
def create_release(version, commit_sha):
tag = rc_tag_name(version)
params = {
- 'tag_name': tag,
- 'name': "{} - RC".format(version),
- 'target_commitish': commit_sha,
- 'prerelease': True
+ "tag_name": tag,
+ "name": "{} - RC".format(version),
+ "target_commitish": commit_sha,
+ "prerelease": True,
}
- response = _github_request('post', 'repos/{}/releases'.format(repo), params)
+ response = _github_request("post", "repos/{}/releases".format(repo), params)
if response.status_code != 201:
raise exception_from_error("Failed creating new release", response)
return response.json()
+
def upload_asset(release, filepath):
- upload_url = release['upload_url'].replace('{?name,label}', '')
- filename = filepath.split('/')[-1]
+ upload_url = release["upload_url"].replace("{?name,label}", "")
+ filename = filepath.split("/")[-1]
with open(filepath) as file_content:
- headers = {'Content-Type': 'application/gzip'}
- response = requests.post(upload_url, file_content, params={'name': filename}, headers=headers, auth=auth, verify=False)
+ headers = {"Content-Type": "application/gzip"}
+ response = requests.post(
+ upload_url, file_content, params={"name": filename}, headers=headers, auth=auth, verify=False
+ )
if response.status_code != 201: # not 200/201/...
- raise exception_from_error('Failed uploading asset', response)
+ raise exception_from_error("Failed uploading asset", response)
return response
+
def remove_previous_builds(release):
- for asset in release['assets']:
- response = _github_request('delete', asset['url'])
+ for asset in release["assets"]:
+ response = _github_request("delete", asset["url"])
if response.status_code != 204:
raise exception_from_error("Failed deleting asset", response)
+
def get_changelog(commit_sha):
- latest_release = _github_request('get', 'repos/{}/releases/latest'.format(repo))
+ latest_release = _github_request("get", "repos/{}/releases/latest".format(repo))
if latest_release.status_code != 200:
- raise exception_from_error('Failed getting latest release', latest_release)
+ raise exception_from_error("Failed getting latest release", latest_release)
latest_release = latest_release.json()
- previous_sha = latest_release['target_commitish']
-
- args = ['git', '--no-pager', 'log', '--merges', '--grep', 'Merge pull request', '--pretty=format:"%h|%s|%b|%p"', '{}...{}'.format(previous_sha, commit_sha)]
+ previous_sha = latest_release["target_commitish"]
+
+ args = [
+ "git",
+ "--no-pager",
+ "log",
+ "--merges",
+ "--grep",
+ "Merge pull request",
+ '--pretty=format:"%h|%s|%b|%p"',
+ "{}...{}".format(previous_sha, commit_sha),
+ ]
log = subprocess.check_output(args)
- changes = ["Changes since {}:".format(latest_release['name'])]
+ changes = ["Changes since {}:".format(latest_release["name"])]
- for line in log.split('\n'):
+ for line in log.split("\n"):
try:
- sha, subject, body, parents = line[1:-1].split('|')
+ sha, subject, body, parents = line[1:-1].split("|")
except ValueError:
continue
try:
- pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
+ pull_request = re.match(r"Merge pull request #(\d+)", subject).groups()[0]
pull_request = " #{}".format(pull_request)
- except Exception as ex:
+ except Exception:
pull_request = ""
- author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
+ author = subprocess.check_output(["git", "log", "-1", '--pretty=format:"%an"', parents.split(" ")[-1]])[1:-1]
changes.append("{}{}: {} ({})".format(sha, pull_request, body.strip(), author))
return "\n".join(changes)
+
def update_release_commit_sha(release, commit_sha):
params = {
- 'target_commitish': commit_sha,
+ "target_commitish": commit_sha,
}
- response = _github_request('patch', 'repos/{}/releases/{}'.format(repo, release['id']), params)
+ response = _github_request("patch", "repos/{}/releases/{}".format(repo, release["id"]), params)
if response.status_code != 200:
raise exception_from_error("Failed updating commit sha for existing release", response)
return response.json()
+
def update_release(version, build_filepath, commit_sha):
try:
release = get_rc_release(version)
@@ -125,21 +148,22 @@ def update_release(version, build_filepath, commit_sha):
else:
release = create_release(version, commit_sha)
- print("Using release id: {}".format(release['id']))
+ print("Using release id: {}".format(release["id"]))
remove_previous_builds(release)
response = upload_asset(release, build_filepath)
changelog = get_changelog(commit_sha)
- response = _github_request('patch', release['url'], {'body': changelog})
+ response = _github_request("patch", release["url"], {"body": changelog})
if response.status_code != 200:
raise exception_from_error("Failed updating release description", response)
except Exception as ex:
print(ex)
-if __name__ == '__main__':
+
+if __name__ == "__main__":
commit_sha = sys.argv[1]
version = sys.argv[2]
filepath = sys.argv[3]
diff --git a/bin/upgrade b/bin/upgrade
deleted file mode 100755
index 376866f1ed..0000000000
--- a/bin/upgrade
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/usr/bin/env python3
-import urllib
-import argparse
-import os
-import subprocess
-import sys
-from collections import namedtuple
-from fnmatch import fnmatch
-
-import requests
-
-try:
- import semver
-except ImportError:
- print("Missing required library: semver.")
- exit(1)
-
-REDASH_HOME = os.environ.get('REDASH_HOME', '/opt/redash')
-CURRENT_VERSION_PATH = '{}/current'.format(REDASH_HOME)
-
-
-def run(cmd, cwd=None):
- if not cwd:
- cwd = REDASH_HOME
-
- return subprocess.check_output(cmd, cwd=cwd, shell=True, stderr=subprocess.STDOUT)
-
-
-def confirm(question):
- reply = str(input(question + ' (y/n): ')).lower().strip()
-
- if reply[0] == 'y':
- return True
- if reply[0] == 'n':
- return False
- else:
- return confirm("Please use 'y' or 'n'")
-
-
-def version_path(version_name):
- return "{}/{}".format(REDASH_HOME, version_name)
-
-END_CODE = '\033[0m'
-
-
-def colored_string(text, color):
- if sys.stdout.isatty():
- return "{}{}{}".format(color, text, END_CODE)
- else:
- return text
-
-
-def h1(text):
- print(colored_string(text, '\033[4m\033[1m'))
-
-
-def green(text):
- print(colored_string(text, '\033[92m'))
-
-
-def red(text):
- print(colored_string(text, '\033[91m'))
-
-
-class Release(namedtuple('Release', ('version', 'download_url', 'filename', 'description'))):
- def v1_or_newer(self):
- return semver.compare(self.version, '1.0.0-alpha') >= 0
-
- def is_newer(self, version):
- return semver.compare(self.version, version) > 0
-
- @property
- def version_name(self):
- return self.filename.replace('.tar.gz', '')
-
-
-def get_latest_release_from_ci():
- response = requests.get('https://circleci.com/api/v1.1/project/github/getredash/redash/latest/artifacts?branch=master')
-
- if response.status_code != 200:
- exit("Failed getting releases (status code: %s)." % response.status_code)
-
- tarball_asset = filter(lambda asset: asset['url'].endswith('.tar.gz'), response.json())[0]
- filename = urllib.unquote(tarball_asset['pretty_path'].split('/')[-1])
- version = filename.replace('redash.', '').replace('.tar.gz', '')
-
- release = Release(version, tarball_asset['url'], filename, '')
-
- return release
-
-
-def get_release(channel):
- if channel == 'ci':
- return get_latest_release_from_ci()
-
- response = requests.get('https://version.redash.io/api/releases?channel={}'.format(channel))
- release = response.json()[0]
-
- filename = release['download_url'].split('/')[-1]
- release = Release(release['version'], release['download_url'], filename, release['description'])
-
- return release
-
-
-def link_to_current(version_name):
- green("Linking to current version...")
- run('ln -nfs {} {}'.format(version_path(version_name), CURRENT_VERSION_PATH))
-
-
-def restart_services():
- # We're doing this instead of simple 'supervisorctl restart all' because
- # otherwise it won't notice that /opt/redash/current pointing at a different
- # directory.
- green("Restarting...")
- try:
- run('sudo /etc/init.d/redash_supervisord restart')
- except subprocess.CalledProcessError as e:
- run('sudo service supervisor restart')
-
-
-def update_requirements(version_name):
- green("Installing new Python packages (if needed)...")
- new_requirements_file = '{}/requirements.txt'.format(version_path(version_name))
-
- install_requirements = False
-
- try:
- run('diff {}/requirements.txt {}'.format(CURRENT_VERSION_PATH, new_requirements_file)) != 0
- except subprocess.CalledProcessError as e:
- if e.returncode != 0:
- install_requirements = True
-
- if install_requirements:
- run('sudo pip install -r {}'.format(new_requirements_file))
-
-
-def apply_migrations(release):
- green("Running migrations (if needed)...")
- if not release.v1_or_newer():
- return apply_migrations_pre_v1(release.version_name)
-
- run("sudo -u redash bin/run ./manage.py db upgrade", cwd=version_path(release.version_name))
-
-
-def find_migrations(version_name):
- current_migrations = set([f for f in os.listdir("{}/migrations".format(CURRENT_VERSION_PATH)) if fnmatch(f, '*_*.py')])
- new_migrations = sorted([f for f in os.listdir("{}/migrations".format(version_path(version_name))) if fnmatch(f, '*_*.py')])
-
- return [m for m in new_migrations if m not in current_migrations]
-
-
-def apply_migrations_pre_v1(version_name):
- new_migrations = find_migrations(version_name)
-
- if new_migrations:
- green("New migrations to run: ")
- print(', '.join(new_migrations))
- else:
- print("No new migrations in this version.")
-
- if new_migrations and confirm("Apply new migrations? (make sure you have backup)"):
- for migration in new_migrations:
- print("Applying {}...".format(migration))
- run("sudo sudo -u redash PYTHONPATH=. bin/run python migrations/{}".format(migration), cwd=version_path(version_name))
-
-
-def download_and_unpack(release):
- directory_name = release.version_name
-
- green("Downloading release tarball...")
- run('sudo wget --header="Accept: application/octet-stream" -O {} {}'.format(release.filename, release.download_url))
- green("Unpacking to: {}...".format(directory_name))
- run('sudo mkdir -p {}'.format(directory_name))
- run('sudo tar -C {} -xvf {}'.format(directory_name, release.filename))
-
- green("Changing ownership to redash...")
- run('sudo chown redash {}'.format(directory_name))
-
- green("Linking .env file...")
- run('sudo ln -nfs {}/.env {}/.env'.format(REDASH_HOME, version_path(directory_name)))
-
-
-def current_version():
- real_current_path = os.path.realpath(CURRENT_VERSION_PATH).replace('.b', '+b')
- return real_current_path.replace(REDASH_HOME + '/', '').replace('redash.', '')
-
-
-def verify_minimum_version():
- green("Current version: " + current_version())
- if semver.compare(current_version(), '0.12.0') < 0:
- red("You need to have Redash v0.12.0 or newer to upgrade to post v1.0.0 releases.")
- green("To upgrade to v0.12.0, run the upgrade script set to the legacy channel (--channel legacy).")
- exit(1)
-
-
-def show_description_and_confirm(description):
- if description:
- print(description)
-
- if not confirm("Continue with upgrade?"):
- red("Cancelling upgrade.")
- exit(1)
-
-
-def verify_newer_version(release):
- if not release.is_newer(current_version()):
- red("The found release is not newer than your current deployed release ({}).".format(current_version()))
- if not confirm("Continue with upgrade?"):
- red("Cancelling upgrade.")
- exit(1)
-
-
-def deploy_release(channel):
- h1("Starting Redash upgrade:")
-
- release = get_release(channel)
- green("Found version: {}".format(release.version))
-
- if release.v1_or_newer():
- verify_minimum_version()
-
- verify_newer_version(release)
- show_description_and_confirm(release.description)
-
- try:
- download_and_unpack(release)
- update_requirements(release.version_name)
- apply_migrations(release)
- link_to_current(release.version_name)
- restart_services()
- green("Done! Enjoy.")
- except subprocess.CalledProcessError as e:
- red("Failed running: {}".format(e.cmd))
- red("Exit status: {}\nOutput:\n{}".format(e.returncode, e.output))
-
-
-if __name__ == '__main__':
- parser = argparse.ArgumentParser()
- parser.add_argument("--channel", help="The channel to get release from (default: stable).", default='stable')
- args = parser.parse_args()
-
- deploy_release(args.channel)
diff --git a/client/.babelrc b/client/.babelrc
index 0fe25a043c..e8b6be2c9b 100644
--- a/client/.babelrc
+++ b/client/.babelrc
@@ -1,19 +1,29 @@
{
"presets": [
- ["@babel/preset-env", {
- "exclude": [
- "@babel/plugin-transform-async-to-generator",
- "@babel/plugin-transform-arrow-functions"
- ],
- "useBuiltIns": "usage"
- }],
- "@babel/preset-react"
+ [
+ "@babel/preset-env",
+ {
+ "exclude": ["@babel/plugin-transform-async-to-generator", "@babel/plugin-transform-arrow-functions"],
+ "corejs": "2",
+ "useBuiltIns": "usage"
+ }
+ ],
+ "@babel/preset-react",
+ "@babel/preset-typescript"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-object-assign",
- ["babel-plugin-transform-builtin-extend", {
- "globals": ["Error"]
- }]
- ]
+ [
+ "babel-plugin-transform-builtin-extend",
+ {
+ "globals": ["Error"]
+ }
+ ]
+ ],
+ "env": {
+ "test": {
+ "plugins": ["istanbul"]
+ }
+ }
}
diff --git a/client/.eslintrc.js b/client/.eslintrc.js
index 152bf9ca3d..d1bb2599a1 100644
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -1,17 +1,71 @@
module.exports = {
root: true,
- extends: ["react-app", "plugin:compat/recommended", "prettier"],
- plugins: ["jest", "compat", "no-only-tests"],
+ parser: "@typescript-eslint/parser",
+ extends: [
+ "react-app",
+ "plugin:compat/recommended",
+ "prettier",
+ "plugin:jsx-a11y/recommended",
+ // Remove any typescript-eslint rules that would conflict with prettier
+ "prettier/@typescript-eslint",
+ ],
+ plugins: ["jest", "compat", "no-only-tests", "@typescript-eslint", "jsx-a11y"],
settings: {
- "import/resolver": "webpack"
+ "import/resolver": "webpack",
},
env: {
browser: true,
- node: true
+ node: true,
},
rules: {
// allow debugger during development
"no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
- "jsx-a11y/anchor-is-valid": "off",
- }
+ "jsx-a11y/anchor-is-valid": [
+ // TMP
+ "off",
+ {
+ components: ["Link"],
+ aspects: ["noHref", "invalidHref", "preferButton"],
+ },
+ ],
+ "jsx-a11y/no-redundant-roles": "error",
+ "jsx-a11y/no-autofocus": "off",
+ "jsx-a11y/click-events-have-key-events": "off", // TMP
+ "jsx-a11y/no-static-element-interactions": "off", // TMP
+ "jsx-a11y/no-noninteractive-element-interactions": "off", // TMP
+ "no-console": ["warn", { allow: ["warn", "error"] }],
+ "no-restricted-imports": [
+ "error",
+ {
+ paths: [
+ {
+ name: "antd",
+ message: "Please use 'import XXX from antd/lib/XXX' import instead.",
+ },
+ {
+ name: "antd/lib",
+ message: "Please use 'import XXX from antd/lib/XXX' import instead.",
+ },
+ ],
+ },
+ ],
+ },
+ overrides: [
+ {
+ // Only run typescript-eslint on TS files
+ files: ["*.ts", "*.tsx", ".*.ts", ".*.tsx"],
+ extends: ["plugin:@typescript-eslint/recommended"],
+ rules: {
+ // Do not require functions (especially react components) to have explicit returns
+ "@typescript-eslint/explicit-function-return-type": "off",
+ // Do not require to type every import from a JS file to speed up development
+ "@typescript-eslint/no-explicit-any": "off",
+ // Do not complain about useless contructors in declaration files
+ "no-useless-constructor": "off",
+ "@typescript-eslint/no-useless-constructor": "error",
+ // Many API fields and generated types use camelcase
+ "@typescript-eslint/camelcase": "off",
+ },
+ },
+ ],
};
diff --git a/client/app/assets/images/db-logos/arangodb.png b/client/app/assets/images/db-logos/arangodb.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b2defd2d6bf383f8607417a5f317a6b29943622
GIT binary patch
literal 99239
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