## Getting Started
-* [Setting up Redash instance](https://redash.io/help/open-source/setup) (includes links to ready-made AWS/GCE images).
+* [Setting up a Redash instance](https://redash.io/help/open-source/setup) (includes links to ready-made AWS/GCE images).
* [Documentation](https://redash.io/help/).
## Supported Data Sources
@@ -32,61 +31,85 @@ 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 AppMetrica
- Yandex Metrica
## 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 b5d7b0ac17..d78c7b383e 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -22,6 +22,19 @@ worker() {
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() {
echo "Starting dev RQ worker..."
@@ -32,7 +45,9 @@ server() {
# 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}
+ BIND_ADDRESS=${REDASH_GUNICORN_BIND:-[::]:5000}
+ exec /usr/local/bin/gunicorn -b "$BIND_ADDRESS" --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app --max-requests $MAX_REQUESTS --max-requests-jitter $MAX_REQUESTS_JITTER --timeout $TIMEOUT --limit-request-line ${REDASH_GUNICORN_LIMIT_REQUEST_LINE:-0}
}
create_db() {
@@ -53,7 +68,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"
@@ -75,6 +90,10 @@ case "$1" in
shift
worker
;;
+ workers_healthcheck)
+ shift
+ workers_healthcheck
+ ;;
server)
shift
server
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/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 e8b6be2c9b..391c9446ac 100644
--- a/client/.babelrc
+++ b/client/.babelrc
@@ -12,7 +12,7 @@
"@babel/preset-typescript"
],
"plugins": [
- "@babel/plugin-proposal-class-properties",
+ "@babel/plugin-transform-class-properties",
"@babel/plugin-transform-object-assign",
[
"babel-plugin-transform-builtin-extend",
diff --git a/client/.eslintrc.js b/client/.eslintrc.js
index 45644f6d19..6a3a925417 100644
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -5,12 +5,15 @@ module.exports = {
"react-app",
"plugin:compat/recommended",
"prettier",
- // Remove any typescript-eslint rules that would conflict with prettier
- "prettier/@typescript-eslint",
+ "plugin:jsx-a11y/recommended",
],
- plugins: ["jest", "compat", "no-only-tests", "@typescript-eslint"],
+ plugins: ["jest", "compat", "no-only-tests", "@typescript-eslint", "jsx-a11y"],
settings: {
"import/resolver": "webpack",
+ polyfills: [
+ "document.body",
+ "Notification",
+ ],
},
env: {
browser: true,
@@ -19,7 +22,23 @@ module.exports = {
rules: {
// allow debugger during development
"no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
- "jsx-a11y/anchor-is-valid": "off",
+ // Pre-existing patterns - anonymous default exports are used throughout
+ "import/no-anonymous-default-export": "off",
+ // Some tests verify no-throw behavior without explicit assertions
+ "jest/expect-expect": "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",
@@ -51,7 +70,25 @@ module.exports = {
"no-useless-constructor": "off",
"@typescript-eslint/no-useless-constructor": "error",
// Many API fields and generated types use camelcase
- "@typescript-eslint/camelcase": "off",
+ camelcase: "off",
+ // Allow {} type - used extensively in existing codebase
+ "@typescript-eslint/ban-types": ["error", { types: { "{}": false } }],
+ },
+ },
+ {
+ // Cypress test files
+ files: ["**/cypress/**/*.js"],
+ extends: ["plugin:cypress/recommended"],
+ plugins: ["cypress", "chai-friendly"],
+ env: {
+ "cypress/globals": true,
+ },
+ rules: {
+ "no-redeclare": "off",
+ "cypress/unsafe-to-chain-command": "off",
+ "func-names": ["error", "never"],
+ "no-unused-expressions": "off",
+ "chai-friendly/no-unused-expressions": "error",
},
},
],
diff --git a/client/app/assets/css/login.css b/client/app/assets/css/login.css
index cf46eefb0c..1120ec1e7c 100644
--- a/client/app/assets/css/login.css
+++ b/client/app/assets/css/login.css
@@ -15,7 +15,7 @@ body {
display: table;
width: 100%;
padding: 10px;
- height: calc(100vh - 116px);
+ height: calc(100% - 116px);
}
@media (min-width: 992px) {
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 0000000000..1b2defd2d6
Binary files /dev/null and b/client/app/assets/images/db-logos/arangodb.png differ
diff --git a/client/app/assets/images/db-logos/corporate_memory.png b/client/app/assets/images/db-logos/corporate_memory.png
new file mode 100644
index 0000000000..f168b02ecd
Binary files /dev/null and b/client/app/assets/images/db-logos/corporate_memory.png differ
diff --git a/client/app/assets/images/db-logos/databend.png b/client/app/assets/images/db-logos/databend.png
new file mode 100644
index 0000000000..dec146f4cb
Binary files /dev/null and b/client/app/assets/images/db-logos/databend.png differ
diff --git a/client/app/assets/images/db-logos/duckdb.png b/client/app/assets/images/db-logos/duckdb.png
new file mode 100644
index 0000000000..d2c5b31e50
Binary files /dev/null and b/client/app/assets/images/db-logos/duckdb.png differ
diff --git a/client/app/assets/images/db-logos/dynamodb_sql.png b/client/app/assets/images/db-logos/dynamodb_sql.png
deleted file mode 100644
index 22d9e6430b..0000000000
Binary files a/client/app/assets/images/db-logos/dynamodb_sql.png and /dev/null differ
diff --git a/client/app/assets/images/db-logos/e6data.png b/client/app/assets/images/db-logos/e6data.png
new file mode 100644
index 0000000000..af5cf71c4b
Binary files /dev/null and b/client/app/assets/images/db-logos/e6data.png differ
diff --git a/client/app/assets/images/db-logos/elasticsearch2.png b/client/app/assets/images/db-logos/elasticsearch2.png
new file mode 100644
index 0000000000..e7cb9c8345
Binary files /dev/null and b/client/app/assets/images/db-logos/elasticsearch2.png differ
diff --git a/client/app/assets/images/db-logos/elasticsearch2_OpenDistroSQLElasticSearch.png b/client/app/assets/images/db-logos/elasticsearch2_OpenDistroSQLElasticSearch.png
new file mode 100644
index 0000000000..e7cb9c8345
Binary files /dev/null and b/client/app/assets/images/db-logos/elasticsearch2_OpenDistroSQLElasticSearch.png differ
diff --git a/client/app/assets/images/db-logos/elasticsearch2_XPackSQLElasticSearch.png b/client/app/assets/images/db-logos/elasticsearch2_XPackSQLElasticSearch.png
new file mode 100644
index 0000000000..e7cb9c8345
Binary files /dev/null and b/client/app/assets/images/db-logos/elasticsearch2_XPackSQLElasticSearch.png differ
diff --git a/client/app/assets/images/db-logos/excel.png b/client/app/assets/images/db-logos/excel.png
new file mode 100644
index 0000000000..0015044885
Binary files /dev/null and b/client/app/assets/images/db-logos/excel.png differ
diff --git a/client/app/assets/images/db-logos/firebolt.png b/client/app/assets/images/db-logos/firebolt.png
new file mode 100644
index 0000000000..7b6c02a66d
Binary files /dev/null and b/client/app/assets/images/db-logos/firebolt.png differ
diff --git a/client/app/assets/images/db-logos/google_analytics4.png b/client/app/assets/images/db-logos/google_analytics4.png
new file mode 100644
index 0000000000..eaddd9d569
Binary files /dev/null and b/client/app/assets/images/db-logos/google_analytics4.png differ
diff --git a/client/app/assets/images/db-logos/google_search_console.png b/client/app/assets/images/db-logos/google_search_console.png
new file mode 100644
index 0000000000..a302ca590f
Binary files /dev/null and b/client/app/assets/images/db-logos/google_search_console.png differ
diff --git a/client/app/assets/images/db-logos/ignite.png b/client/app/assets/images/db-logos/ignite.png
new file mode 100644
index 0000000000..046e381012
Binary files /dev/null and b/client/app/assets/images/db-logos/ignite.png differ
diff --git a/client/app/assets/images/db-logos/influxdbv2.png b/client/app/assets/images/db-logos/influxdbv2.png
new file mode 100644
index 0000000000..f3846cb199
Binary files /dev/null and b/client/app/assets/images/db-logos/influxdbv2.png differ
diff --git a/client/app/assets/images/db-logos/nz.png b/client/app/assets/images/db-logos/nz.png
new file mode 100644
index 0000000000..663687470c
Binary files /dev/null and b/client/app/assets/images/db-logos/nz.png differ
diff --git a/client/app/assets/images/db-logos/pinot.png b/client/app/assets/images/db-logos/pinot.png
new file mode 100644
index 0000000000..7527e7b157
Binary files /dev/null and b/client/app/assets/images/db-logos/pinot.png differ
diff --git a/client/app/assets/images/db-logos/qubole.png b/client/app/assets/images/db-logos/qubole.png
deleted file mode 100644
index dfdc2fa2e2..0000000000
Binary files a/client/app/assets/images/db-logos/qubole.png and /dev/null differ
diff --git a/client/app/assets/images/db-logos/risingwave.png b/client/app/assets/images/db-logos/risingwave.png
new file mode 100644
index 0000000000..ae4a13f129
Binary files /dev/null and b/client/app/assets/images/db-logos/risingwave.png differ
diff --git a/client/app/assets/images/db-logos/sparql_endpoint.png b/client/app/assets/images/db-logos/sparql_endpoint.png
new file mode 100644
index 0000000000..31ac155d44
Binary files /dev/null and b/client/app/assets/images/db-logos/sparql_endpoint.png differ
diff --git a/client/app/assets/images/db-logos/tinybird.png b/client/app/assets/images/db-logos/tinybird.png
new file mode 100644
index 0000000000..129555e39f
Binary files /dev/null and b/client/app/assets/images/db-logos/tinybird.png differ
diff --git a/client/app/assets/images/db-logos/trino.png b/client/app/assets/images/db-logos/trino.png
new file mode 100644
index 0000000000..904db40bb5
Binary files /dev/null and b/client/app/assets/images/db-logos/trino.png differ
diff --git a/client/app/assets/images/db-logos/yandex_disk.png b/client/app/assets/images/db-logos/yandex_disk.png
new file mode 100644
index 0000000000..7b375648df
Binary files /dev/null and b/client/app/assets/images/db-logos/yandex_disk.png differ
diff --git a/client/app/assets/images/destinations/asana.png b/client/app/assets/images/destinations/asana.png
new file mode 100644
index 0000000000..42ea1ab9cc
Binary files /dev/null and b/client/app/assets/images/destinations/asana.png differ
diff --git a/client/app/assets/images/destinations/datadog.png b/client/app/assets/images/destinations/datadog.png
new file mode 100644
index 0000000000..0c1cd4e583
Binary files /dev/null and b/client/app/assets/images/destinations/datadog.png differ
diff --git a/client/app/assets/images/destinations/discord.png b/client/app/assets/images/destinations/discord.png
new file mode 100644
index 0000000000..0781b84ce1
Binary files /dev/null and b/client/app/assets/images/destinations/discord.png differ
diff --git a/client/app/assets/images/destinations/hipchat.png b/client/app/assets/images/destinations/hipchat.png
deleted file mode 100644
index 88ac512102..0000000000
Binary files a/client/app/assets/images/destinations/hipchat.png and /dev/null differ
diff --git a/client/app/assets/images/destinations/microsoft_teams_webhook.png b/client/app/assets/images/destinations/microsoft_teams_webhook.png
new file mode 100644
index 0000000000..8ada5c8c69
Binary files /dev/null and b/client/app/assets/images/destinations/microsoft_teams_webhook.png differ
diff --git a/client/app/assets/images/destinations/webex.png b/client/app/assets/images/destinations/webex.png
new file mode 100644
index 0000000000..bea8fd1cad
Binary files /dev/null and b/client/app/assets/images/destinations/webex.png differ
diff --git a/client/app/assets/less/ant.less b/client/app/assets/less/ant.less
index 37c8c3b84d..925840b2fe 100644
--- a/client/app/assets/less/ant.less
+++ b/client/app/assets/less/ant.less
@@ -225,6 +225,16 @@
}
}
+ &-tbody > tr&-row {
+ &:hover,
+ &:focus,
+ &:focus-within {
+ & > td {
+ background: @table-row-hover-bg;
+ }
+ }
+ }
+
// Custom styles
&-headerless &-tbody > tr:first-child > td {
@@ -391,6 +401,18 @@
left: 0;
}
}
+
+ &:focus,
+ &:focus-within {
+ color: @menu-highlight-color;
+ }
+ }
+}
+
+.@{dropdown-prefix-cls}-menu-item {
+ &:focus,
+ &:focus-within {
+ background-color: @item-hover-bg;
}
}
diff --git a/client/app/assets/less/inc/base.less b/client/app/assets/less/inc/base.less
index 9a6b88ab37..80dc02e81d 100755
--- a/client/app/assets/less/inc/base.less
+++ b/client/app/assets/less/inc/base.less
@@ -20,7 +20,7 @@ html {
html,
body {
- min-height: 100vh;
+ height: 100%;
}
body {
@@ -35,7 +35,7 @@ body {
}
#application-root {
- min-height: 100vh;
+ height: 100%;
}
#application-root,
@@ -98,6 +98,10 @@ strong {
.clickable {
cursor: pointer;
+
+ button&:disabled {
+ cursor: not-allowed;
+ }
}
.resize-vertical {
diff --git a/client/app/assets/less/inc/edit-in-place.less b/client/app/assets/less/inc/edit-in-place.less
index 1afd359a48..cf7ef5bd8a 100755
--- a/client/app/assets/less/inc/edit-in-place.less
+++ b/client/app/assets/less/inc/edit-in-place.less
@@ -1,26 +1,23 @@
-.edit-in-place span {
+.edit-in-place {
white-space: pre-line;
+ display: inline-block;
p {
margin-bottom: 0;
}
-}
-.edit-in-place span.editable {
- display: inline-block;
- cursor: pointer;
-}
-
-.edit-in-place span.editable:hover {
- background: @redash-yellow;
- border-radius: @redash-radius;
-}
+ .editable {
+ display: inline-block;
+ cursor: pointer;
-.edit-in-place.active input,
-.edit-in-place.active textarea {
- display: inline-block;
-}
+ &:hover {
+ background: @redash-yellow;
+ border-radius: @redash-radius;
+ }
+ }
-.edit-in-place {
- display: inline-block;
+ &.active input,
+ &.active textarea {
+ display: inline-block;
+ }
}
diff --git a/client/app/assets/less/inc/generics.less b/client/app/assets/less/inc/generics.less
index d7f484da0a..4896b3b372 100755
--- a/client/app/assets/less/inc/generics.less
+++ b/client/app/assets/less/inc/generics.less
@@ -2,163 +2,218 @@
Generate Margin Classes (0px - 25px)
margin, margin-top, margin-bottom, margin-left, margin-right
-----------------------------------------------------------*/
-.margin (@label, @size: 1, @key:1) when (@size =< 30){
- .m-@{key} {
- margin: @size !important;
- }
-
- .m-t-@{key} {
- margin-top: @size !important;
- }
-
- .m-b-@{key} {
- margin-bottom: @size !important;
- }
-
- .m-l-@{key} {
- margin-left: @size !important;
- }
-
- .m-r-@{key} {
- margin-right: @size !important;
- }
-
- .margin(@label - 5; @size + 5; @key + 5);
+.margin (@label, @size: 1, @key:1) when (@size =< 30) {
+ .m-@{key} {
+ margin: @size !important;
+ }
+
+ .m-t-@{key} {
+ margin-top: @size !important;
+ }
+
+ .m-b-@{key} {
+ margin-bottom: @size !important;
+ }
+
+ .m-l-@{key} {
+ margin-left: @size !important;
+ }
+
+ .m-r-@{key} {
+ margin-right: @size !important;
+ }
+
+ .margin(@label - 5; @size + 5; @key + 5);
}
.margin(25, 0px, 0);
-.m-2{
- margin:2px;
+.m-2 {
+ margin: 2px;
}
/* --------------------------------------------------------
Generate Padding Classes (0px - 25px)
padding, padding-top, padding-bottom, padding-left, padding-right
-----------------------------------------------------------*/
-.padding (@label, @size: 1, @key:1) when (@size =< 30){
- .p-@{key} {
- padding: @size !important;
- }
-
- .p-t-@{key} {
- padding-top: @size !important;
- }
-
- .p-b-@{key} {
- padding-bottom: @size !important;
- }
-
- .p-l-@{key} {
- padding-left: @size !important;
- }
-
- .p-r-@{key} {
- padding-right: @size !important;
- }
-
- .padding(@label - 5; @size + 5; @key + 5);
-}
+.padding (@label, @size: 1, @key:1) when (@size =< 30) {
+ .p-@{key} {
+ padding: @size !important;
+ }
-.padding(25, 0px, 0);
+ .p-t-@{key} {
+ padding-top: @size !important;
+ }
+
+ .p-b-@{key} {
+ padding-bottom: @size !important;
+ }
+ .p-l-@{key} {
+ padding-left: @size !important;
+ }
+
+ .p-r-@{key} {
+ padding-right: @size !important;
+ }
+
+ .padding(@label - 5; @size + 5; @key + 5);
+}
+
+.padding(25, 0px, 0);
/* --------------------------------------------------------
Generate Font-Size Classes (8px - 20px)
-----------------------------------------------------------*/
-.font-size (@label, @size: 8, @key:10) when (@size =< 20){
- .f-@{key} {
- font-size: @size !important;
- }
-
- .font-size(@label - 1; @size + 1; @key + 1);
-}
+.font-size (@label, @size: 8, @key:10) when (@size =< 20) {
+ .f-@{key} {
+ font-size: @size !important;
+ }
-.font-size(20, 8px, 8);
+ .font-size(@label - 1; @size + 1; @key + 1);
+}
-.f-inherit { font-size: inherit !important; }
+.font-size(20, 8px, 8);
+.f-inherit {
+ font-size: inherit !important;
+}
/* --------------------------------------------------------
Font Weight
-----------------------------------------------------------*/
-.f-300 { font-weight: 300 !important; }
-.f-400 { font-weight: 400 !important; }
-.f-500 { font-weight: 500 !important; }
-.f-700 { font-weight: 700 !important; }
-
+.f-300 {
+ font-weight: 300 !important;
+}
+.f-400 {
+ font-weight: 400 !important;
+}
+.f-500 {
+ font-weight: 500 !important;
+}
+.f-700 {
+ font-weight: 700 !important;
+}
/* --------------------------------------------------------
Position
-----------------------------------------------------------*/
-.p-relative { position: relative !important; }
-.p-absolute { position: absolute !important; }
-.p-fixed { position: fixed !important; }
-.p-static { position: static !important; }
-
+.p-relative {
+ position: relative !important;
+}
+.p-absolute {
+ position: absolute !important;
+}
+.p-fixed {
+ position: fixed !important;
+}
+.p-static {
+ position: static !important;
+}
/* --------------------------------------------------------
Overflow
-----------------------------------------------------------*/
-.o-hidden { overflow: hidden !important; }
-.o-visible { overflow: visible !important; }
-.o-auto { overflow: auto !important; }
-
+.o-hidden {
+ overflow: hidden !important;
+}
+.o-visible {
+ overflow: visible !important;
+}
+.o-auto {
+ overflow: auto !important;
+}
/* --------------------------------------------------------
Display
-----------------------------------------------------------*/
-.di-block { display: inline-block !important; }
-.d-block { display: block; }
+.di-block {
+ display: inline-block !important;
+}
+.d-block {
+ display: block;
+}
/* --------------------------------------------------------
Background Colors and Colors
-----------------------------------------------------------*/
-@array: c-white bg-white @white, c-ace bg-ace @ace, c-black bg-black @black, c-brown bg-brown @brown, c-pink bg-pink @pink, c-red bg-red @red, c-blue bg-blue @blue, c-purple bg-purple @purple, c-deeppurple bg-deeppurple @deeppurple, c-lightblue bg-lightblue @lightblue, c-cyan bg-cyan @cyan, c-teal bg-teal @teal, c-green bg-green @green, c-lightgreen bg-lightgreen @lightgreen, c-lime bg-lime @lime, c-yellow bg-yellow @yellow, c-amber bg-amber @amber, c-orange bg-orange @orange, c-deeporange bg-deeporange @deeporange, c-gray bg-gray @gray, c-bluegray bg-bluegray @bluegray, c-indigo bg-indigo @indigo;
-
-.for(@array); .-each(@value) {
- @name: extract(@value, 1);
- @name2: extract(@value, 2);
- @color: extract(@value, 3);
- &.@{name2} {
- background-color: @color !important;
- }
-
- &.@{name} {
- color: @color !important;
- }
+@array: c-white bg-white @white, c-ace bg-ace @ace, c-black bg-black @black, c-brown bg-brown @brown,
+ c-pink bg-pink @pink, c-red bg-red @red, c-blue bg-blue @blue, c-purple bg-purple @purple,
+ c-deeppurple bg-deeppurple @deeppurple, c-lightblue bg-lightblue @lightblue, c-cyan bg-cyan @cyan,
+ c-teal bg-teal @teal, c-green bg-green @green, c-lightgreen bg-lightgreen @lightgreen, c-lime bg-lime @lime,
+ c-yellow bg-yellow @yellow, c-amber bg-amber @amber, c-orange bg-orange @orange,
+ c-deeporange bg-deeporange @deeporange, c-gray bg-gray @gray, c-bluegray bg-bluegray @bluegray,
+ c-indigo bg-indigo @indigo;
+
+.for(@array);
+.-each(@value) {
+ @name: extract(@value, 1);
+ @name2: extract(@value, 2);
+ @color: extract(@value, 3);
+ &.@{name2} {
+ background-color: @color !important;
+ }
+
+ &.@{name} {
+ color: @color !important;
+ }
}
-
/* --------------------------------------------------------
Background Colors
-----------------------------------------------------------*/
-.bg-brand { background-color: @brand-bg; }
-.bg-black-trp { background-color: rgba(0,0,0,0.12) !important; }
-
-
+.bg-brand {
+ background-color: @brand-bg;
+}
+.bg-black-trp {
+ background-color: rgba(0, 0, 0, 0.12) !important;
+}
/* --------------------------------------------------------
Borders
-----------------------------------------------------------*/
-.b-0 { border: 0 !important; }
-
+.b-0 {
+ border: 0 !important;
+}
/* --------------------------------------------------------
Width
-----------------------------------------------------------*/
-.w-100 { width: 100% !important; }
-.w-50 { width: 50% !important; }
-.w-25 { width: 25% !important; }
-
+.w-100 {
+ width: 100% !important;
+}
+.w-50 {
+ width: 50% !important;
+}
+.w-25 {
+ width: 25% !important;
+}
/* --------------------------------------------------------
Border Radius
-----------------------------------------------------------*/
-.brd-2 { border-radius: 2px; }
-
+.brd-2 {
+ border-radius: 2px;
+}
/* --------------------------------------------------------
Alignment
-----------------------------------------------------------*/
-.va-top { vertical-align: top; }
\ No newline at end of file
+.va-top {
+ vertical-align: top;
+}
+
+/* --------------------------------------------------------
+ Screen readers
+-----------------------------------------------------------*/
+.sr-only {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ padding: 0;
+ margin: -1px;
+ overflow: hidden;
+ clip: rect(0, 0, 0, 0);
+ white-space: nowrap;
+ border-width: 0;
+}
diff --git a/client/app/assets/less/inc/login.less b/client/app/assets/less/inc/login.less
index 81ee077790..a820159350 100755
--- a/client/app/assets/less/inc/login.less
+++ b/client/app/assets/less/inc/login.less
@@ -10,7 +10,7 @@
vertical-align: middle;
display: inline-block;
width: 1px;
- height: 100vh;
+ height: 100%;
}
}
@@ -135,4 +135,4 @@
}
}
-
\ No newline at end of file
+
diff --git a/client/app/assets/less/inc/schema-browser.less b/client/app/assets/less/inc/schema-browser.less
index 3f2e66f28d..f005239758 100644
--- a/client/app/assets/less/inc/schema-browser.less
+++ b/client/app/assets/less/inc/schema-browser.less
@@ -1,102 +1,107 @@
-div.table-name {
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- cursor: pointer;
- padding: 2px 22px 2px 10px;
- border-radius: @redash-radius;
- position: relative;
- height: 22px;
-
- .copy-to-editor {
- display: none;
- }
-
- &:hover {
- background: fade(@redash-gray, 10%);
-
- .copy-to-editor {
- display: flex;
- }
- }
-}
-
.schema-container {
height: 100%;
z-index: 10;
background-color: white;
-}
-.schema-browser {
- overflow: hidden;
- border: none;
- padding-top: 10px;
- position: relative;
- height: 100%;
-
- .schema-loading-state {
- display: flex;
- align-items: center;
- justify-content: center;
- height: 100%;
- }
-
- .collapse.in {
- background: transparent;
- }
-
- .copy-to-editor {
- color: fade(@redash-gray, 90%);
- cursor: pointer;
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- width: 20px;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .table-open {
- padding: 0 22px 0 26px;
+ .schema-browser {
overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ border: none;
+ padding-top: 10px;
position: relative;
- height: 18px;
+ height: 100%;
- .column-type {
- color: fade(@text-color, 80%);
- font-size: 10px;
- margin-left: 2px;
- text-transform: uppercase;
+ .schema-loading-state {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+ }
+
+ .collapse.in {
+ background: transparent;
}
.copy-to-editor {
- display: none;
+ visibility: hidden;
+ color: fade(@redash-gray, 90%);
+ width: 20px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ transition: none;
}
- &:hover {
- background: fade(@redash-gray, 10%);
+ .schema-list-item {
+ display: flex;
+ border-radius: @redash-radius;
+ height: 22px;
+
+ .table-name {
+ flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ cursor: pointer;
+ padding: 2px 22px 2px 10px;
+ }
+
+ &:hover,
+ &:focus,
+ &:focus-within {
+ background: fade(@redash-gray, 10%);
- .copy-to-editor {
+ .copy-to-editor {
+ visibility: visible;
+ }
+ }
+ }
+
+ .table-open {
+ .table-open-item {
display: flex;
+ height: 18px;
+ width: calc(100% - 22px);
+ padding-left: 22px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ transition: none;
+
+ div:first-child {
+ flex: 1;
+ }
+
+ .column-type {
+ color: fade(@text-color, 80%);
+ font-size: 10px;
+ margin-left: 2px;
+ text-transform: uppercase;
+ }
+
+ &:hover,
+ &:focus,
+ &:focus-within {
+ background: fade(@redash-gray, 10%);
+
+ .copy-to-editor {
+ visibility: visible;
+ }
+ }
}
}
}
-}
-.schema-control {
- display: flex;
- flex-wrap: nowrap;
- padding: 0;
+ .schema-control {
+ display: flex;
+ flex-wrap: nowrap;
+ padding: 0;
- .ant-btn {
- height: auto;
+ .ant-btn {
+ height: auto;
+ }
}
-}
-.parameter-label {
- display: block;
+ .parameter-label {
+ display: block;
+ }
}
diff --git a/client/app/assets/less/inc/table.less b/client/app/assets/less/inc/table.less
index 9b562f1f01..b610686925 100755
--- a/client/app/assets/less/inc/table.less
+++ b/client/app/assets/less/inc/table.less
@@ -103,7 +103,7 @@
padding-top: 5px !important;
}
- .btn-favourite,
+ .btn-favorite,
.btn-archive {
font-size: 15px;
}
@@ -114,18 +114,23 @@
line-height: 1.7 !important;
}
-.btn-favourite {
+.btn-favorite {
color: #d4d4d4;
transition: all 0.25s ease-in-out;
+ .fa-star {
+ color: @yellow-darker;
+ }
+
&:hover,
&:focus {
color: @yellow-darker;
cursor: pointer;
- }
- .fa-star {
- color: @yellow-darker;
+ .fa-star {
+ filter: saturate(75%);
+ opacity: 0.75;
+ }
}
}
diff --git a/client/app/assets/less/redash/query.less b/client/app/assets/less/redash/query.less
index 03f7400402..6a5e872fc6 100644
--- a/client/app/assets/less/redash/query.less
+++ b/client/app/assets/less/redash/query.less
@@ -8,7 +8,7 @@ body.fixed-layout {
padding-bottom: 0;
width: 100vw;
- height: 100vh;
+ height: 100%;
.application-layout-content > div {
display: flex;
@@ -90,6 +90,23 @@ body.fixed-layout {
.embed__vis {
display: flex;
flex-flow: column;
+ height: calc(~'100% - 25px');
+
+ > .embed-heading {
+ flex: 0 0 auto;
+ }
+
+ > .query__vis {
+ flex: 1 1 auto;
+
+ .chart-visualization-container, .visualization-renderer-wrapper, .visualization-renderer {
+ height: 100%
+ }
+ }
+
+ > .tile__bottom-control {
+ flex: 0 0 auto;
+ }
width: 100%;
}
@@ -127,11 +144,13 @@ body.fixed-layout {
}
}
-a.label-tag {
+.label-tag {
background: fade(@redash-gray, 15%);
color: darken(@redash-gray, 15%);
- &:hover {
+ &:hover,
+ &:focus,
+ &:active {
color: darken(@redash-gray, 15%);
background: fade(@redash-gray, 25%);
}
@@ -204,6 +223,7 @@ a.label-tag {
}
.editor__left__schema {
+ min-height: 120px;
flex-grow: 1;
display: flex;
flex-direction: column;
diff --git a/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx b/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx
index 4576cdc447..a1550f60dc 100644
--- a/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx
+++ b/client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx
@@ -2,6 +2,7 @@ import React, { useMemo } from "react";
import { first, includes } from "lodash";
import Menu from "antd/lib/menu";
import Link from "@/components/Link";
+import PlainButton from "@/components/PlainButton";
import HelpTrigger from "@/components/HelpTrigger";
import CreateDashboardDialog from "@/components/dashboards/CreateDashboardDialog";
import { useCurrentRoute } from "@/components/ApplicationArea/Router";
@@ -15,8 +16,8 @@ import AlertOutlinedIcon from "@ant-design/icons/AlertOutlined";
import PlusOutlinedIcon from "@ant-design/icons/PlusOutlined";
import QuestionCircleOutlinedIcon from "@ant-design/icons/QuestionCircleOutlined";
import SettingOutlinedIcon from "@ant-design/icons/SettingOutlined";
-
import VersionInfo from "./VersionInfo";
+
import "./DesktopNavbar.less";
function NavbarSection({ children, ...props }) {
@@ -71,9 +72,9 @@ export default function DesktopNavbar() {
const canCreateAlert = currentUser.hasPermission("list_alerts");
return (
-
+