Merge branch 'master' into choropleth-custom-map

.circleci/Dockerfile.cypress

@@ -1,12 +1,12 @@
-FROM cypress/browsers:node14.0.0-chrome84
+FROM cypress/browsers:chrome67
 
 ENV APP /usr/src/app
 WORKDIR $APP
 
-COPY package.json package-lock.json $APP/
+COPY package.json $APP/package.json
-COPY viz-lib $APP/viz-lib
+RUN npm run cypress:install > /dev/null
-RUN npm ci > /dev/null
 
-COPY . $APP
+COPY client/cypress $APP/client/cypress
+COPY cypress.json $APP/cypress.json
 
 RUN ./node_modules/.bin/cypress verify

.circleci/config.yml

@@ -2,11 +2,10 @@ version: 2.0
 
 build-docker-image-job: &build-docker-image-job
   docker:
-    - image: circleci/node:12
+    - image: circleci/node:8
   steps:
     - setup_remote_docker
     - checkout
-    - run: sudo apt update
     - run: sudo apt install python3-pip
     - run: sudo pip3 install -r requirements_bundles.txt
     - run: .circleci/update_version
@@ -33,7 +32,7 @@ jobs:
           name: Build Docker Images
           command: |
             set -x
-            docker-compose build --build-arg skip_ds_deps=true --build-arg skip_frontend_build=true
+            docker-compose build --build-arg skip_ds_deps=true
             docker-compose up -d
             sleep 10
       - run:
@@ -57,37 +56,25 @@ jobs:
       - store_artifacts:
           path: coverage.xml
   frontend-lint:
-    environment:
-      CYPRESS_INSTALL_BINARY: 0
-      PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:8
     steps:
       - checkout
       - run: mkdir -p /tmp/test-results/eslint
-      - run: npm ci
+      - run: npm install
       - run: npm run lint:ci
       - store_test_results:
           path: /tmp/test-results
   frontend-unit-tests:
-    environment:
-      CYPRESS_INSTALL_BINARY: 0
-      PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:8
     steps:
       - checkout
-      - run: sudo apt update
       - run: sudo apt install python3-pip
       - run: sudo pip3 install -r requirements_bundles.txt
-      - run: npm ci
+      - run: npm install
       - run: npm run bundle
-      - run:
+      - run: npm test
-          name: Run App Tests
-          command: npm test
-      - run:
-          name: Run Visualizations Tests
-          command: (cd viz-lib && npm test)
       - run: npm run lint
   frontend-e2e-tests:
     environment:
@@ -96,45 +83,23 @@ jobs:
       PERCY_TOKEN_ENCODED: ZGRiY2ZmZDQ0OTdjMzM5ZWE0ZGQzNTZiOWNkMDRjOTk4Zjg0ZjMxMWRmMDZiM2RjOTYxNDZhOGExMjI4ZDE3MA==
       CYPRESS_PROJECT_ID_ENCODED: OTI0Y2th
       CYPRESS_RECORD_KEY_ENCODED: YzA1OTIxMTUtYTA1Yy00NzQ2LWEyMDMtZmZjMDgwZGI2ODgx
-      CYPRESS_INSTALL_BINARY: 0
-      PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1
     docker:
-      - image: circleci/node:12
+      - image: circleci/node:8
     steps:
       - setup_remote_docker
       - checkout
-      - run:
-          name: Enable Code Coverage report for master branch
-          command: |
-            if [ "$CIRCLE_BRANCH" = "master" ]; then
-              echo 'export CODE_COVERAGE=true' >> $BASH_ENV
-              source $BASH_ENV
-            fi
       - run:
           name: Install npm dependencies
           command: |
-            npm ci
+            npm install
       - run:
           name: Setup Redash server
           command: |
-            npm run cypress build
+            npm run cypress start
-            npm run cypress start -- --skip-db-seed
             docker-compose run cypress npm run cypress db-seed
       - run:
           name: Execute Cypress tests
           command: npm run cypress run-ci
-      - run:
-          name: "Failure: output container logs to console"
-          command: |
-            docker-compose logs
-          when: on_fail
-      - run:
-          name: Copy Code Coverage results
-          command: |
-            docker cp cypress:/usr/src/app/coverage ./coverage || true
-          when: always
-      - store_artifacts:
-          path: coverage
   build-docker-image: *build-docker-image-job
   build-preview-docker-image: *build-docker-image-job
 workflows:

.circleci/docker-compose.circle.yml

@@ -1,4 +1,4 @@
-version: '2.2'
+version: '3'
 services:
   redash:
     build: ../

.circleci/docker-compose.cypress.yml

@@ -1,20 +1,7 @@
-version: "2.2"
+version: '3'
-x-redash-service: &redash-service
-  build:
-    context: ../
-    args:
-      skip_dev_deps: "true"
-      skip_ds_deps: "true"
-      code_coverage: ${CODE_COVERAGE}
-x-redash-environment: &redash-environment
-  REDASH_LOG_LEVEL: "INFO"
-  REDASH_REDIS_URL: "redis://redis:6379/0"
-  REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
-  REDASH_RATELIMIT_ENABLED: "false"
-  REDASH_ENFORCE_CSRF: "true"
 services:
   server:
-    <<: *redash-service
+    build: ../
     command: server
     depends_on:
       - postgres
@@ -22,25 +9,29 @@ services:
     ports:
       - "5000:5000"
     environment:
-      <<: *redash-environment
       PYTHONUNBUFFERED: 0
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+      REDASH_RATELIMIT_ENABLED: "false"
   scheduler:
-    <<: *redash-service
+    build: ../
     command: scheduler
     depends_on:
       - server
     environment:
-      <<: *redash-environment
+      REDASH_REDIS_URL: "redis://redis:6379/0"
   worker:
-    <<: *redash-service
+    build: ../
     command: worker
     depends_on:
       - server
     environment:
-      <<: *redash-environment
       PYTHONUNBUFFERED: 0
+      REDASH_LOG_LEVEL: "INFO"
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
   cypress:
-    ipc: host
     build:
       context: ../
       dockerfile: .circleci/Dockerfile.cypress
@@ -50,13 +41,11 @@ services:
       - 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}

.circleci/docker_build

@@ -6,11 +6,11 @@ docker login -u $DOCKER_USER -p $DOCKER_PASS
 
 if [ $CIRCLE_BRANCH = master ] || [ $CIRCLE_BRANCH = preview-image ]
 then
-    docker build --build-arg skip_dev_deps=true -t redash/redash:preview -t redash/preview:$VERSION_TAG .
+    docker build -t redash/redash:preview -t redash/preview:$VERSION_TAG .
     docker push redash/redash:preview
     docker push redash/preview:$VERSION_TAG
 else
-    docker build --build-arg skip_dev_deps=true -t redash/redash:$VERSION_TAG .
+    docker build -t redash/redash:$VERSION_TAG .
     docker push redash/redash:$VERSION_TAG
 fi
 

.dockerignore

@@ -1,7 +1,6 @@
 client/.tmp/
 client/dist/
 node_modules/
-viz-lib/node_modules/
 .tmp/
 .venv/
 venv/

.gitignore

@@ -5,12 +5,11 @@ venv/
 .coveralls.yml
 .idea
 *.pyc
-.nyc_output
-coverage
 .coverage
 coverage.xml
 client/dist
 .DS_Store
+celerybeat-schedule*
 .#*
 \#*#
 *~

.restyled.yaml

@@ -50,13 +50,11 @@ labels: ["Skip CI"]
 # Restylers to run, and how
 restylers:
   - name: black
-    image: restyled/restyler-black:v19.10b0
     include:
       - redash
       - tests
       - migrations/versions
   - name: prettier
-    image: restyled/restyler-prettier:v1.19.1-2
     include:
       - client/app/**/*.js
       - client/app/**/*.jsx

CHANGELOG.md

@@ -1,149 +1,5 @@
 # Change Log
 
-## v9.0.0-beta - 2020-06-11
-
-This release was long time in the making and has several major changes:
-
-- Our backend code was updated to support Python 3 and we no longer support Python 2. If you're using our Docker images, this should be a transparent change for you.
-- We replaced Celery with RQ for background jobs processing. This will require some setup updates -- see instructions below.
-- The frontend code is now 100% React and we removed all the Angular dependencies.
-
-This release was made possible by contributions from over 50 people: @ari-e, @ariarijp, @arihantsurana, @arikfr, @atharvai, @cemremengu, @chulucninh09, @citrin, @daniellangnet, @DavidHernandez, @deecay, @dmudro, @erans, @erels, @ezkl, @gabrieldutra, @gstaykov, @ialeinikov, @ikenji, @Jakdaw, @jezdez, @juanvasquezreyes, @koooge, @kravets-levko, @kykrueger, @leibowitz, @leosunmo, @lihan, @loganprice, @mickeey2525, @mnoorenberghe, @monicagangwar, @NicolasLM, @p-yang, @Ralnoc, @ranbena, @randyzwitch, @rauchy, @rxin, @saravananselvamohan, @satyamkrishna, @shinsuke-nara, @stefan-mees, @stevebuckingham, @susodapop, @taminif, @thewarpaint, @tsuyoshizawa, @uncletimmy3, @wengkham.
-
-### Upgrading
-
-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
-
-- Redesigned Query Results page:
-  - Completely new layout is easier to read for non-technical Redash users.
-  - Empty query results are clearly displayed. User is now prompted to edit or execute the query.
-- Mobile Experience Improvements:
-  - UI element spacing has been redesigned for clarity
-  - Admin pages now honor max-width. Tables scroll independent of the top menu.
-  - Large legends no longer shrink the visualization on small screens.
-  - Fix: it was sometimes impossible to scroll pages with dashboards because the visualizations captured every touch event.
-  - Fix: Visualizations on small screens would not always show horizontal scroll bars.
-- Dashboards can now be un-archived using the API.
-- Dashboard UI performance was improved.
-- List pages were changed to show a user's name instead of avatar.
-- Search-enabled tables now show a prompt for which columns will be searched.
-- In the visualization editor, the settings pane now scrolls independent of the visualization preview.
-- Tokens in the schema viewer now sort alphabetically.
-- Links to settings panes that require Admin privileges are now hidden from non-Admins.
-- The Admin page now remembers which tab you were viewing after a page reload.
-
-### Visualizations
-
-- Feature: Allow bubble size control with either coefficient or sizemode.
-- Feature: Table visualization now treats Unix timestamps in query results as timestamps.
-- Feature: It's now possible to provide a description to each Table column, appearing in UI as a tooltip.
-- Feature: Added tooltip and popover templating to the map with markers visualization.
-- Feature: Added an organization setting to hide the Plotly mode bar on all visualizations.
-- Feature: Cohort visualization now has appearance settings.
-- Feature: Add option to explicitly set Chart legend position.
-- Change: Deprecated visualizations are now hidden.
-- Change: Table settings editor now extends vertically instead of horizontally.
-- Change: The maximum table pagination is now 500.
-- Change: Pie chart labels maintain contrast against lighter slices.
-- Fix: Chart series switched places when picking Y axis.
-- Fix: Third column was not selectable for Bubble and Heatmap charts.
-- Fix: On the counter visualizations, the “count rows” option showed an empty string instead of 0.
-- Fix: Table visualization with column named "children" rendered +/- buttons.
-- Fix: Sankey visualization now correctly occupies all available area even with fewer stages.
-- Fix: Pie chart ignores series labels.
-
-### Data Sources
-
-- New Data Sources: Amazon Cloudwatch, Amazon CloudWatch Logs Insights, Azure Kusto, Exasol.
-- Athena:
-  - Added the option to specify a base cost in settings, displaying a price for each query when executed.
-- BigQuery:
-  - Fix: large jobs continued running after the user clicked “Cancel” query execution.
-- Cassandra:
-  - Updated driver to 3.21.0 which dramatically reduces Docker build times.
-  - SSL options are now available.
-- Clickhouse:
-  - You can now choose whether to verify the SSL certificate.
-- Databricks:
-  - Databricks now use an ODBC-based connector.
-  - Fix: Date column was coerced to DateTime in the front-end.
-- Druid:
-  - Added username and password authentication option.
-- Microsoft SQL Server
-  - Added support for ODBC connections via pyodbc. There are now two MSSQL data source types. One using TDS. The other is using ODBC.
-- MongoDB:
-  - Added support for running queries on secondary in replicaset mode.
-  - Fix: Connection test always succeeded.
-- Oracle:
-  - Fix: Connection would fail if username or password contained special characters.
-  - Fix: Comparisons would fail if scale was None.
-- RDS:
-  - Updated rds-combined-ca-bundle.pem to the latest CA.
-- Redshift:
-  - Added the ability to use IAM Roles and Users.
-  - Fix: Redshift was unable to have its schema refreshed.
-- Rockset:
-  - Fix: Allow Redash to load collections in all workspaces.
-- Snowflake:
-  - You can now refresh the snowflake schema without waking the cluster.
-  - Added support for all of Snowflake’s datetime types. Otherwise certain timestamps would only appear as strings in the front-end.
-- TreasureData:
-  - Fix: API calls would fail when setting a non-default region.
-
-### Alerts
-
-- Feature: Added ability to mute alerts without deleting them.
-- Fix: numerical comparisons failed if value from query was a string.
-
-### Parameters
-
-- Added Last x Days options for date range parameters.
-- Fix: Parameters added in empty queries were always added as text parameters
-
-### Bug Fixes
-
-- Fix: Alembic migration schema was preventing v4 users from upgrading. In v5 we started encrypting data source credentials in the database.
-- Fix: System admin dashboard would not show correct database size if non-default name was used.
-- Fix: refresh_queries job would break if any query had a bad schedule object.
-- Fix: Orgs with LDAP enabled couldn’t disable password login.
-- Fix: SSL mode was sometimes sent as an empty string to the database instead of omitted entirely.
-- Fix: When creating new Map visualization with clustering disabled, map would crash on save.
-- Fix: It was possible on the New Query page to click “Save” multiple times, causing multiple new query records to be created.
-- Fix: Visualization render errors on a dashboard would crash the entire page.
-- Fix: A scheduled execution failure would modify the query’s “updated_at” timestamp.
-- Fix: Parameter UI would wrap awkwardly during some drag operations.
-- Fix: In dashboard edit mode, users couldn’t modify widgets.
-- Fix: Frontend error when parsing a NaN float.
-
-### Other
-
-- Added TSV as a download format (in addition to CSV and Excel).
-- Added maildev settings (helps with automated settings).
-- Refine permissions usage in Redash to allow for guest users
-- The query results API now explicitly handles 404 errors.
-- Forked queries now retain the tags of the original query.
-- We now allow setting custom Sentry environments.
-- Started using Black linter for our Python source code
-- Added CLI command to re-encrypt data source details with new secret key.
-- Favorites list is now loaded on menu click instead of on page load.
-- Administrators can now allow connections to private IP addresses.
-
 ## v8.0.0 - 2019-10-27
 
 There were no changes in this release since `v8.0.0-beta.2`. This is just to mark a stable release.
@@ -152,23 +8,24 @@ There were no changes in this release since `v8.0.0-beta.2`. This is just to mar
 
 This is an update to the previous beta release, which includes:
 
-- Add options for users to share anonymous usage information with us (see [docs](https://redash.io/help/open-source/admin-guide/usage-data) for details).
+* Add options for users to share anonymous usage information with us (see [docs](https://redash.io/help/open-source/admin-guide/usage-data) for details).
-- Visualizations:
+* Visualizations:
     - Allow the user to decide how to handle null values in charts.
-- Upgrade Sentry-SDK to latest version.
+* Upgrade Sentry-SDK to latest version.
-- Make horizontal table scroll visible in dashboard widgets without scrolling.
+* Make horizontal table scroll visible in dashboard widgets without scrolling.
-- Data Sources:
+* Data Sources:
-  - Add support for Azure Data Explorer (Kusto).
+    * Add support for Azure Data Explorer (Kusto).
-  - MySQL: fix connections without SSL configuration failing.
+    * MySQL: fix connections without SSL configuration failing.
-  - Amazon Redshift: option to set query group for adhoc/scheduled queries.
+    * Amazon Redshift: option to set query group for adhoc/scheduled queries.
-  - Hive: make error message more friendly.
+    * Hive: make error message more friendly.
-  - Qubole: add support to run Quantum queries.
+    * Qubole: add support to run Quantum queries.
-- Display data source icon in query editor.
+* Display data source icon in query editor.
-- Fix: allow users with view only acces to use the queries in Query Results
+* Fix: allow users with view only acces to use the queries in Query Results
-- Dashboard: when updating parameters refersh only widgets that use those parameters.
+* Dashboard: when updating parameters refersh only widgets that use those parameters.
 
 This release had contributions from 12 people: @arikfr, @cclauss, @gabrieldutra, @justinclift, @kravets-levko, @ranbena, @rauchy, @sandeepV2, @shinsuke-nara, @spacentropy, @sphenlee, @swfz.
 
+
 ## v8.0.0-beta - 2019-08-18
 
 After months of being heads down with hard work, it's finally time to wrap up the V8 release 🤩 This release includes many long awaited improvements to parameters, UX improvements, further React migration and other changes, fixes and improvements.

Dockerfile

@@ -1,35 +1,19 @@
 FROM node:12 as frontend-builder
 
-# 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 --chown=redash package.json package-lock.json /frontend/
+COPY package.json package-lock.json /frontend/
-COPY --chown=redash viz-lib /frontend/viz-lib
+RUN npm install
 
-# Controls whether to instrument code for coverage information
+COPY client /frontend/client
-ARG code_coverage
+COPY webpack.config.js /frontend/
-ENV BABEL_ENV=${code_coverage:+test}
+RUN npm run build
 
-RUN if [ "x$skip_frontend_build" = "x" ] ; then npm ci --unsafe-perm; fi
-
-COPY --chown=redash client /frontend/client
-COPY --chown=redash 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
 
 EXPOSE 5000
 
 # 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
 
 RUN useradd --create-home redash
 
@@ -46,43 +30,22 @@ RUN apt-get update && \
     wget \
     # Postgres client
     libpq-dev \
-    # ODBC support:
-    g++ unixodbc-dev \
     # for SAML
     xmlsec1 \
     # Additional packages required for data sources:
     libssl-dev \
     default-libmysqlclient-dev \
     freetds-dev \
-    libsasl2-dev \
+    libsasl2-dev && \
-    unzip \
-    libsasl2-modules-gssapi-mit && \
-  # MSSQL ODBC Driver:  
-  curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - && \
-  curl https://packages.microsoft.com/config/debian/10/prod.list > /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*
-
 WORKDIR /app
 
-# Disalbe PIP Cache and Version Check
-ENV PIP_DISABLE_PIP_VERSION_CHECK=1
-ENV PIP_NO_CACHE_DIR=1
-
 # 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 pip install -r requirements.txt -r requirements_dev.txt
 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
 
 COPY . /app

Makefile

@@ -35,7 +35,7 @@ backend-unit-tests: up test_db
 	docker-compose run --rm --name tests server tests
 
 frontend-unit-tests: bundle
-	CYPRESS_INSTALL_BINARY=0 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 npm ci
+	npm install
 	npm run bundle
 	npm test
 

README.md

@@ -6,77 +6,28 @@
 [![Datree](https://s3.amazonaws.com/catalog.static.datree.io/datree-badge-20px.svg)](https://datree.io/?src=badge)
 [![Build Status](https://circleci.com/gh/getredash/redash.png?style=shield&circle-token=8a695aa5ec2cbfa89b48c275aea298318016f040)](https://circleci.com/gh/getredash/redash/tree/master)
 
-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.
+**_Redash_** is our take on freeing the data within our company in a way that will better fit our culture and usage patterns.
 
-Redash features:
+Prior to **_Redash_**, we tried to use traditional BI suites and discovered a set of bloated, technically challenged and slow tools/flows. What we were looking for was a more hacker'ish way to look at data, so we built one.
 
-1. **Browser-based**: Everything in your browser, with a shareable URL.
+**_Redash_** was built to allow fast and easy access to billions of records, that we process and collect using Amazon Redshift ("petabyte scale data warehouse" that "speaks" PostgreSQL).
-2. **Ease-of-use**: Become immediately productive with data without the need to master complex software.
+Today **_Redash_** has support for querying multiple databases, including: Redshift, Google BigQuery, PostgreSQL, MySQL, Graphite, Presto, Google Spreadsheets, Cloudera Impala, Hive and custom scripts.
-3. **Query editor**: Quickly compose SQL and NoSQL queries with a schema browser and auto-complete.
+
-4. **Visualization and dashboards**: Create [beautiful visualizations](https://redash.io/help/user-guide/visualizations/visualization-types) with drag and drop, and combine them into a single dashboard.
+**_Redash_** consists of two parts:
-5. **Sharing**: Collaborate easily by sharing visualizations and their associated queries, enabling peer review of reports and queries.
+
-6. **Schedule refreshes**: Automatically update your charts and dashboards at regular intervals you define.
+1. **Query Editor**: think of [JS Fiddle](https://jsfiddle.net) for SQL queries. It's your way to share data in the organization in an open way, by sharing both the dataset and the query that generated it. This way everyone can peer review not only the resulting dataset but also the process that generated it. Also it's possible to fork it and generate new datasets and reach new insights.
-7. **Alerts**: Define conditions and be alerted instantly when your data changes.
+2. **Visualizations and Dashboards**: once you have a dataset, you can create different visualizations out of it, and then combine several visualizations into a single dashboard. Currently Redash supports charts, pivot table, cohorts and [more](https://redash.io/help/user-guide/visualizations/visualization-types).
-8. **REST API**: Everything that can be done in the UI is also available through REST API.
-9. **Broad support for data sources**: Extensible data source API with native support for a long list of common databases and platforms.
 
 <img src="https://raw.githubusercontent.com/getredash/website/8e820cd02c73a8ddf4f946a9d293c54fd3fb08b9/website/_assets/images/redash-anim.gif" width="80%"/>
 
 ## Getting Started
 
-* [Setting up Redash instance](https://redash.io/help/open-source/setup) (includes links to ready-made AWS/GCE images).
+* [Setting up 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
 
-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:
+Redash supports more than 35 [data sources](https://redash.io/help/data-sources/supported-data-sources). 
-
-- Amazon Athena
-- Amazon DynamoDB
-- Amazon Redshift
-- Axibase Time Series Database
-- Cassandra
-- ClickHouse
-- CockroachDB
-- CSV
-- Databricks (Apache Spark)
-- DB2 by IBM
-- Druid
-- Elasticsearch
-- Google Analytics
-- Google BigQuery
-- Google Spreadsheets
-- Graphite
-- Greenplum
-- Hive
-- Impala
-- InfluxDB
-- JIRA
-- JSON
-- Apache Kylin
-- OmniSciDB (Formerly MapD)
-- MemSQL
-- Microsoft Azure Data Warehouse / Synapse
-- Microsoft Azure SQL Database
-- Microsoft SQL Server
-- MongoDB
-- MySQL
-- Oracle
-- PostgreSQL
-- Presto
-- Prometheus
-- Python
-- Qubole
-- Rockset
-- Salesforce
-- ScyllaDB
-- Shell Scripts
-- Snowflake
-- SQLite
-- TreasureData
-- Vertica
-- Yandex AppMetrrica
-- Yandex Metrica
 
 ## Getting Help
 
@@ -86,7 +37,7 @@ Redash supports more than 35 SQL and NoSQL [data sources](https://redash.io/help
 ## 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://redash.io/help-onpremise/dev/guide.html), and make a pull request. We need all the help we can get!
 
 ## Security
 

bin/bundle-extensions

@@ -6,8 +6,8 @@ from pathlib import Path
 from shutil import copy
 from collections import OrderedDict as odict
 
-import importlib_metadata
+from importlib_metadata import entry_points
-import importlib_resources
+from importlib_resources import contents, is_resource, path
 
 # Name of the subdirectory
 BUNDLE_DIRECTORY = "bundle"
@@ -17,7 +17,7 @@ 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_relative_path = Path('client', 'app', 'extensions')
 extensions_directory = Path(__file__).parent.parent / extensions_relative_path
 
 if not extensions_directory.exists():
@@ -25,6 +25,18 @@ if not extensions_directory.exists():
 os.environ["EXTENSIONS_DIRECTORY"] = str(extensions_relative_path)
 
 
+def resource_isdir(module, resource):
+    """Whether a given resource is a directory in the given module
+
+    https://importlib-resources.readthedocs.io/en/latest/migration.html#pkg-resources-resource-isdir
+    """
+    try:
+        return resource in contents(module) and not is_resource(module, resource)
+    except (ImportError, TypeError):
+        # module isn't a package, so can't have a subdirectory/-package
+        return False
+
+
 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")
@@ -65,36 +77,26 @@ def load_bundles():
 
     """
     bundles = odict()
-    for entry_point in importlib_metadata.entry_points().get("redash.bundles", []):
+    for entry_point in 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:
+        if not resource_isdir(module, BUNDLE_DIRECTORY):
-            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"',
+                'Redash bundle directory "%s" could not be found.', entry_point.name
-                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
+        with path(module, BUNDLE_DIRECTORY) as bundle_dir:
             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)))
+    print('Number of extension bundles found: {}'.format(len(bundles)))
 else:
-    print("No extension bundles found.")
+    print('No extension bundles found.')
 
 for bundle_name, paths in bundles:
     # Shortcut in case not paths were found for the bundle

bin/docker-entrypoint

@@ -19,7 +19,7 @@ worker() {
   export WORKERS_COUNT=${WORKERS_COUNT:-2}
   export QUEUES=${QUEUES:-}
   
-  exec supervisord -c worker.conf
+  supervisord -c worker.conf
 }
 
 dev_worker() {
@@ -39,6 +39,10 @@ create_db() {
   exec /app/manage.py database create_tables
 }
 
+rq_healthcheck() {
+  exec /app/manage.py rq healthcheck
+}
+
 help() {
   echo "Redash Docker."
   echo ""
@@ -50,6 +54,7 @@ help() {
   echo "dev_worker -- start a single RQ worker with code reloading"
   echo "scheduler -- start an rq-scheduler instance"
   echo "dev_scheduler -- start an rq-scheduler instance with code reloading"
+  echo "rq_healthcheck -- runs a RQ healthcheck that verifies that all local workers are active. Useful for Docker's HEALTHCHECK mechanism."
   echo ""
   echo "shell -- open shell"
   echo "dev_server -- start Flask development server with debugger and auto reload"
@@ -91,9 +96,9 @@ case "$1" in
     shift
     dev_worker
     ;;
-  celery_healthcheck)
+  rq_healthcheck)
     shift
-    echo "DEPRECATED: Celery has been replaced with RQ and now performs healthchecks autonomously as part of the 'worker' entrypoint."
+    rq_healthcheck
     ;;
   dev_server)
     export FLASK_DEBUG=1
@@ -126,3 +131,4 @@ case "$1" in
     exec "$@"
     ;;
 esac
+

bin/pre_compile

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Heroku pre_compile script
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+pushd $DIR/..
+
+# heroku requires cffi to be in requirements.txt in order for libffi to be installed.
+# https://github.com/heroku/heroku-buildpack-python/blob/master/bin/steps/cryptography
+# to avoid making it a requirement for other build systems, we'll inject it now
+# into the requirements.txt file
+
+# Remove Heroku unsupported Python packages:
+grep -v -E "^(pymssql|thrift|sasl|pyhive)" requirements_all_ds.txt >> requirements.txt
+
+# make the heroku Procfile the active one
+cp Procfile.heroku Procfile
+
+popd

client/.babelrc

@@ -1,29 +1,19 @@
 {
   "presets": [
-    [
+    ["@babel/preset-env", {
-      "@babel/preset-env",
+      "exclude": [
-      {
+        "@babel/plugin-transform-async-to-generator",
-        "exclude": ["@babel/plugin-transform-async-to-generator", "@babel/plugin-transform-arrow-functions"],
+        "@babel/plugin-transform-arrow-functions"
-        "corejs": "2",
-        "useBuiltIns": "usage"
-      }
       ],
-    "@babel/preset-react",
+      "useBuiltIns": "usage"
-    "@babel/preset-typescript"
+    }],
+    "@babel/preset-react"
   ],
   "plugins": [
     "@babel/plugin-proposal-class-properties",
     "@babel/plugin-transform-object-assign",
-    [
+    ["babel-plugin-transform-builtin-extend", {
-      "babel-plugin-transform-builtin-extend",
-      {
       "globals": ["Error"]
-      }
+    }]
   ]
-  ],
-  "env": {
-    "test": {
-      "plugins": ["istanbul"]
-    }
-  }
 }

client/.eslintrc.js

@@ -1,57 +1,17 @@
 module.exports = {
   root: true,
-  parser: "@typescript-eslint/parser",
+  extends: ["react-app", "plugin:compat/recommended", "prettier"],
-  extends: [
+  plugins: ["jest", "compat", "no-only-tests"],
-    "react-app",
-    "plugin:compat/recommended",
-    "prettier",
-    // Remove any typescript-eslint rules that would conflict with prettier
-    "prettier/@typescript-eslint",
-  ],
-  plugins: ["jest", "compat", "no-only-tests", "@typescript-eslint"],
   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",
-    "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",
-      },
-    },
-  ],
 };

client/app/assets/images/illustrations/no-query-results.svg

@@ -1,13 +0,0 @@
-<svg width="274" height="199" viewBox="0 0 274 199" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.5" d="M57.9111 49.2668L202.769 30" stroke="#F2F2F2" stroke-width="59" stroke-linecap="round"/>
-<path opacity="0.5" d="M39.2842 92.7371L244.24 64.886" stroke="#F2F2F2" stroke-width="59" stroke-linecap="round"/>
-<path opacity="0.5" d="M30 136.299L232.813 107.734" stroke="#F2F2F2" stroke-width="59" stroke-linecap="round"/>
-<path opacity="0.5" d="M86.4541 169.149L234.166 150.596" stroke="#F2F2F2" stroke-width="59" stroke-linecap="round"/>
-<path d="M167.829 69.1349H96.458L117.605 51.9531H183.028L167.829 69.1349Z" fill="#C0D5FF"/>
-<path d="M171.133 70.4566H92.4933V85.6559V143.149H171.133V70.4566Z" fill="#E8F4FF"/>
-<path d="M190.298 48.6489L171.133 70.4566L186.993 94.9076L192.28 89.9514L206.818 73.7608L190.298 48.6489Z" fill="#E8F4FF"/>
-<path d="M171.133 70.4566V143.149L192.28 118.037V89.9514L186.993 94.9076L171.133 70.4566Z" fill="#E8F4FF"/>
-<path d="M92.4933 70.4566L81.9199 89.9514L92.4933 85.6559V70.4566Z" fill="#E8F4FF"/>
-<path d="M92.4933 70.4566H171.133M92.4933 70.4566L118.927 48.6489H190.298M92.4933 70.4566L81.9199 89.9514L92.4933 85.6559M92.4933 70.4566V85.6559M171.133 70.4566V143.149M171.133 70.4566L190.298 48.6489M171.133 70.4566L186.993 94.9076L192.28 89.9514M171.133 143.149H92.4933V85.6559M171.133 143.149L192.28 118.037V89.9514M190.298 48.6489L206.818 73.7608L192.28 89.9514" stroke="black" stroke-width="3" stroke-linejoin="round"/>
-<path d="M117.605 89.6208H147.343" stroke="black" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

client/app/assets/less/ant.less

@@ -1,43 +1,42 @@
-@import "~antd/lib/style/core/iconfont";
+@import '~antd/lib/style/core/iconfont';
-@import "~antd/lib/style/core/motion";
+@import '~antd/lib/style/core/motion';
-@import "~antd/lib/alert/style/index";
+@import '~antd/lib/alert/style/index';
-@import "~antd/lib/input/style/index";
+@import '~antd/lib/input/style/index';
-@import "~antd/lib/input-number/style/index";
+@import '~antd/lib/input-number/style/index';
-@import "~antd/lib/date-picker/style/index";
+@import '~antd/lib/date-picker/style/index';
-@import "~antd/lib/modal/style/index";
+@import '~antd/lib/modal/style/index';
-@import "~antd/lib/tooltip/style/index";
+@import '~antd/lib/tooltip/style/index';
-@import "~antd/lib/select/style/index";
+@import '~antd/lib/select/style/index';
-@import "~antd/lib/checkbox/style/index";
+@import '~antd/lib/checkbox/style/index';
-@import "~antd/lib/upload/style/index";
+@import '~antd/lib/upload/style/index';
-@import "~antd/lib/form/style/index";
+@import '~antd/lib/form/style/index';
-@import "~antd/lib/button/style/index";
+@import '~antd/lib/button/style/index';
-@import "~antd/lib/radio/style/index";
+@import '~antd/lib/radio/style/index';
-@import "~antd/lib/time-picker/style/index";
+@import '~antd/lib/time-picker/style/index';
-@import "~antd/lib/pagination/style/index";
+@import '~antd/lib/pagination/style/index';
-@import "~antd/lib/table/style/index";
+@import '~antd/lib/table/style/index';
-@import "~antd/lib/popover/style/index";
+@import '~antd/lib/popover/style/index';
-@import "~antd/lib/tag/style/index";
+@import '~antd/lib/icon/style/index';
-@import "~antd/lib/grid/style/index";
+@import '~antd/lib/tag/style/index';
-@import "~antd/lib/switch/style/index";
+@import '~antd/lib/grid/style/index';
-@import "~antd/lib/empty/style/index";
+@import '~antd/lib/switch/style/index';
-@import "~antd/lib/drawer/style/index";
+@import '~antd/lib/empty/style/index';
-@import "~antd/lib/card/style/index";
+@import '~antd/lib/drawer/style/index';
-@import "~antd/lib/steps/style/index";
+@import '~antd/lib/card/style/index';
-@import "~antd/lib/divider/style/index";
+@import '~antd/lib/steps/style/index';
-@import "~antd/lib/dropdown/style/index";
+@import '~antd/lib/divider/style/index';
-@import "~antd/lib/menu/style/index";
+@import '~antd/lib/dropdown/style/index';
-@import "~antd/lib/list/style/index";
+@import '~antd/lib/menu/style/index';
+@import '~antd/lib/list/style/index';
 @import "~antd/lib/badge/style/index";
 @import "~antd/lib/card/style/index";
 @import "~antd/lib/spin/style/index";
-@import "~antd/lib/skeleton/style/index";
 @import "~antd/lib/tabs/style/index";
 @import "~antd/lib/notification/style/index";
 @import "~antd/lib/collapse/style/index";
 @import "~antd/lib/progress/style/index";
 @import "~antd/lib/typography/style/index";
-@import "~antd/lib/descriptions/style/index";
+@import 'inc/ant-variables';
-@import "inc/ant-variables";
 
 // Increase z-indexes to avoid conflicts with some other libraries (e.g. Plotly)
 @zindex-modal: 2000;
@@ -238,11 +237,11 @@
   &-item {
     // custom rule
     &.selected {
-      background-color: #f6f8f9;
+      background-color: #F6F8F9;
     }
 
     &.disabled {
-      background-color: fade(#f6f8f9, 40%);
+      background-color: fade(#F6F8F9, 40%);
 
       & > * {
         opacity: 0.4;
@@ -395,20 +394,9 @@
 }
 
 // overrides for checkbox
-@checkbox-prefix-cls: ~"@{ant-prefix}-checkbox";
+@checkbox-prefix-cls: ~'@{ant-prefix}-checkbox';
 
 .@{checkbox-prefix-cls}-wrapper + span,
 .@{checkbox-prefix-cls} + span {
   padding-right: 0;
 }
-
-// make sure Multiple select has room for icons
-.@{select-prefix-cls}-multiple {
-  &.@{select-prefix-cls}-show-arrow,
-  &.@{select-prefix-cls}-show-search,
-  &.@{select-prefix-cls}-loading {
-    .@{select-prefix-cls}-selector {
-      padding-right: 30px;
-    }
-  }
-}

client/app/assets/less/inc/alert.less

@@ -23,10 +23,6 @@
         padding: 5px 8px;
     }
 
-  .ant-form-item-explain {
-    margin-top: 10px;
-  }
-
     .alert-last-triggered {
         color: @headings-color;
     }
@@ -47,3 +43,11 @@
         margin-right: 0 !important;
     }
 }
+
+.alert-actions {
+    flex-grow: 1;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin-right: -15px;
+}

client/app/assets/less/inc/ant-variables.less

@@ -1,8 +1,8 @@
 /* --------------------------------------------------------
     Colors
 -----------------------------------------------------------*/
-@lightblue: #03a9f4;
+@lightblue:                             #03A9F4;
-@primary-color: #2196f3;
+@primary-color:                        #2196F3;
 
 @redash-gray: rgba(102, 136, 153, 1);
 @redash-orange: rgba(255, 120, 100, 1);
@@ -12,23 +12,25 @@
 /* --------------------------------------------------------
     Font
 -----------------------------------------------------------*/
-@redash-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue",
+@redash-font:                          -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  sans-serif;
 @font-family-no-number:                @redash-font;
 @font-family:                          @redash-font;
 @code-family:                          @redash-font;
 @font-size-base:                       13px;
 
+
 /* --------------------------------------------------------
     Borders
 -----------------------------------------------------------*/
 @border-color-split:                   #f0f0f0;
 
+
 /* --------------------------------------------------------
     Typograpgy
 -----------------------------------------------------------*/
 @text-color:                           #595959;
 
+
 /* --------------------------------------------------------
     Form
 -----------------------------------------------------------*/
@@ -36,7 +38,15 @@
 @input-color:                          #595959;
 @input-color-placeholder:               #b4b4b4;
 @border-radius-base: 2px;
-@border-color-base: #e8e8e8;
+@border-color-base:                    #E8E8E8;
+
+
+/* --------------------------------------------------------
+    Button
+-----------------------------------------------------------*/
+@btn-danger-bg: fade(@redash-gray, 10%);
+@btn-danger-border: fade(@redash-gray, 15%);
+
 
 /* --------------------------------------------------------
     Pagination
@@ -46,13 +56,14 @@
 @pagination-font-weight-active: normal;
 
 @pagination-bg:                         fade(@redash-gray, 15%);
-@pagination-color: #7e7e7e;
+@pagination-color:                      #7E7E7E;
 @pagination-active-bg:                  @lightblue;
-@pagination-active-color: #fff;
+@pagination-active-color:               #FFF;
 @pagination-disabled-bg:                fade(@redash-gray, 15%);
 @pagination-hover-color:                #333;
 @pagination-hover-bg:                   fade(@redash-gray, 25%);
 
+
 /* --------------------------------------------------------
     Table
 -----------------------------------------------------------*/

client/app/assets/less/inc/base.less

@@ -32,6 +32,17 @@ body {
   #application-root {
     padding-bottom: 15px;
   }
+
+  &.headless {
+    #application-root {
+      padding-top: 10px;
+      padding-bottom: 0;
+    }
+
+    .app-header-wrapper {
+      display: none;
+    }
+  }
 }
 
 #application-root {
@@ -78,16 +89,46 @@ strong {
   }
 }
 
+// Fixed width layout for specific pages
+@media (min-width: 768px) {
   .settings-screen,
   .home-page,
   .page-dashboard-list,
   .page-queries-list,
   .page-alerts-list,
   .alert-page,
-.admin-page-layout {
+  .fixed-container {
     .container {
-    width: 100%;
+      width: 750px;
-    max-width: none;
+    }
+  }
+}
+
+@media (min-width: 992px) {
+  .settings-screen,
+  .home-page,
+  .page-dashboard-list,
+  .page-queries-list,
+  .page-alerts-list,
+  .alert-page,
+  .fixed-container {
+    .container {
+      width: 970px;
+    }
+  }
+}
+
+@media (min-width: 1200px) {
+  .settings-screen,
+  .home-page,
+  .page-dashboard-list,
+  .page-queries-list,
+  .page-alerts-list,
+  .alert-page,
+  .fixed-container {
+    .container {
+      width: 1170px;
+    }
   }
 }
 
@@ -203,6 +244,10 @@ text.slicetext {
   display: flex;
   align-items: center;
 
+  h3 {
+    margin-right: 5px !important;
+  }
+
   .label {
     margin-top: 3px;
     display: inline-block;
@@ -210,10 +255,11 @@ text.slicetext {
 
   .favorites-control {
     font-size: 19px;
-    margin-right: 10px;
+    margin-right: 5px;
   }
 }
 
+.page-header-wrapper,
 .page-header--new {
   h3 {
     margin: 0.2em 0;

client/app/assets/less/inc/schema-browser.less

@@ -6,7 +6,6 @@ div.table-name {
   padding: 2px 22px 2px 10px;
   border-radius: @redash-radius;
   position: relative;
-  height: 22px;
 
   .copy-to-editor {
     display: none;
@@ -28,19 +27,13 @@ div.table-name {
 }
 
 .schema-browser {
-  overflow: hidden;
+  overflow-y: auto;
+  overflow-x: hidden;
   border: none;
-  padding-top: 10px;
+  margin-top: 10px;
   position: relative;
   height: 100%;
 
-  .schema-loading-state {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-  }
-
   .collapse.in {
     background: transparent;
   }
@@ -64,14 +57,6 @@ div.table-name {
     text-overflow: ellipsis;
     white-space: nowrap;
     position: relative;
-    height: 18px;
-
-    .column-type {
-      color: fade(@text-color, 80%);
-      font-size: 10px;
-      margin-left: 2px;
-      text-transform: uppercase;
-    }
 
     .copy-to-editor {
       display: none;

client/app/assets/less/inc/table.less

@@ -6,7 +6,7 @@
     }
     
     &:not(.table-striped) > thead > tr > th {
-    background-color: #fafafa;
+        background-color: #FAFAFA;
     }
     
     [class*="bg-"] {
@@ -33,8 +33,9 @@
     & > thead > tr,
     & > tbody > tr,
     & > tfoot > tr {
-    & > th,
+        
-    & > td {
+        & > th, & > td {
+            
             &:first-child {
                 padding-left: 30px;
             }
@@ -42,6 +43,7 @@
             &:last-child {
                 padding-right: 30px;
             }
+            
         }
     }
     
@@ -54,8 +56,7 @@
     border: 0;
     
     & > tbody > tr {
-    & > td,
+        & > td, & > th {
-    & > th {
             border-bottom: 0;
             border-left: 0;
             
@@ -85,8 +86,10 @@
 }
 
 .tile .table  {
+    
     & > thead:not([class*="bg-"]) > tr > th {
         border-top: 1px solid @table-border-color;
+        
     }
 }
 
@@ -95,16 +98,11 @@
 }
 
 .table-data {
-  thead > tr > th {
-    white-space: nowrap;
-  }
-
     tbody > tr > td {
         padding-top: 5px !important;
     }
     
-  .btn-favourite,
+    .btn-favourite, .btn-archive {
-  .btn-archive {
         font-size: 15px;
     }
 }
@@ -116,10 +114,9 @@
 
 .btn-favourite {
     color: #d4d4d4;
-  transition: all 0.25s ease-in-out;
+    transition: all .25s ease-in-out;
     
-  &:hover,
+    &:hover, &:focus {
-  &:focus {
         color: @yellow-darker;
         cursor: pointer;
     }
@@ -131,10 +128,9 @@
 
 .btn-archive {
     color: #d4d4d4;
-  transition: all 0.25s ease-in-out;
+    transition: all .25s ease-in-out;
     
-  &:hover,
+    &:hover, &:focus {
-  &:focus {
         color: @gray-light;
     }
     

client/app/assets/less/main.less

@@ -7,6 +7,7 @@
 /** Load Vendors Dependencies **/
 @import "~font-awesome/less/font-awesome";
 @import "~material-design-iconic-font/dist/css/material-design-iconic-font.css";
+@import "~pace-progress/themes/blue/pace-theme-minimal.css";
 
 @import "inc/variables";
 @import "inc/mixins";

client/app/assets/less/redash/query.less

@@ -4,18 +4,47 @@ body.fixed-layout {
 
   #application-root {
     display: flex;
-    flex-direction: row;
+    flex-direction: column;
     padding-bottom: 0;
 
     width: 100vw;
     height: 100vh;
 
-    .application-layout-content > div {
+    > div {
+      flex-grow: 1;
       display: flex;
     }
   }
 }
 
+.bottom-controller {
+  padding: 10px 15px;
+  background: #fff;
+  display: flex;
+  align-items: center;
+
+  button,
+  div,
+  span {
+    position: relative;
+  }
+
+  div:last-child {
+    flex-grow: 1;
+    text-align: right;
+  }
+
+  &:before {
+    content: "";
+    height: 50px;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    pointer-events: none;
+    left: 0;
+  }
+}
+
 .p-b-60 {
   padding-bottom: 60px !important;
 }
@@ -72,6 +101,9 @@ body.fixed-layout {
   }
 }
 
+.embed__vis {
+}
+
 .query__vis {
   table {
     border: 1px solid #f0f0f0;
@@ -90,7 +122,6 @@ body.fixed-layout {
 .embed__vis {
   display: flex;
   flex-flow: column;
-  width: 100%;
 }
 
 .embed-heading {
@@ -109,14 +140,6 @@ body.fixed-layout {
   }
 }
 
-// Don't let filters take all visualization space on query fixed layout
-.query-fixed-layout {
-  .filters-wrapper {
-    max-height: 40%;
-    overflow: auto;
-  }
-}
-
 .page-header--new {
   .query-tags,
   .query-tags__mobile {
@@ -127,6 +150,25 @@ body.fixed-layout {
   }
 }
 
+.page-header--query {
+  .page-title {
+    display: block;
+    margin-left: 15px;
+    margin-right: 15px;
+  }
+
+  .tags-control a {
+    opacity: 0;
+    transition: opacity 0.2s ease-in-out;
+  }
+
+  &:hover {
+    .tags-control a {
+      opacity: 1;
+    }
+  }
+}
+
 a.label-tag {
   background: fade(@redash-gray, 15%);
   color: darken(@redash-gray, 15%);
@@ -137,11 +179,14 @@ a.label-tag {
   }
 }
 
+.schema-browser {
+  overflow-y: auto;
+}
+
 .query-page-wrapper {
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  position: relative;
 }
 
 .query-fullscreen {
@@ -150,6 +195,7 @@ a.label-tag {
   box-shadow: rgba(102, 136, 153, 0.15) 0 4px 9px -3px;
   flex-grow: 1;
   display: flex;
+  width: 100vw;
 
   .resizable-component.react-resizable {
     .react-resizable-handle-horizontal {
@@ -229,6 +275,11 @@ a.label-tag {
     align-content: space-around;
     padding: 0;
     overflow-x: hidden;
+
+    .pivot-table-visualization-container > table,
+    .visualization-renderer > .visualization-renderer-wrapper {
+      overflow: visible;
+    }
   }
   .row {
     background: #fff;
@@ -395,10 +446,12 @@ nav .rg-bottom {
 .query-tags {
   display: inline-block;
   vertical-align: middle;
+  margin-top: -3px; // padding-top of tags
 }
 
 .query-tags__mobile {
   display: none;
+  padding: 0 0 0 23px;
 }
 
 .table--permission {
@@ -426,6 +479,21 @@ nav .rg-bottom {
 // Smaller screens
 
 @media (max-width: 880px) {
+  .page-header--query {
+    .page-title {
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+
+  .query-tags:not(.query-tags__empty) {
+    display: none;
+  }
+
+  .query-tags__mobile:not(.query-tags__empty) {
+    display: block;
+  }
+
   .btn--showhide,
   .query-actions-menu .dropdown-toggle {
     margin-bottom: 5px;
@@ -479,6 +547,13 @@ nav .rg-bottom {
     }
   }
 
+  .query-page-wrapper {
+    .container {
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+
   .datasource-small {
     visibility: visible;
   }
@@ -494,3 +569,12 @@ nav .rg-bottom {
     padding-right: 0;
   }
 }
+
+// Responsive fixes
+@media (max-width: 767px) {
+  .query-page-wrapper {
+    h3 {
+      font-size: 18px;
+    }
+  }
+}

client/app/assets/less/redash/tags-control.less

@@ -10,10 +10,6 @@
     display: inline-block;
   }
 
-  .tag-separator {
-    margin: 4px 3px 0 0;
-  }
-
   &.disabled {
     opacity: 0.4;
   }

client/app/components/AceEditorInput.jsx

@@ -5,7 +5,7 @@ import "./AceEditorInput.less";
 
 function AceEditorInput(props, ref) {
   return (
-    <div className="ace-editor-input" data-test={props["data-test"]}>
+    <div className="ace-editor-input">
       <AceEditor
         ref={ref}
         mode="sql"

client/app/components/ApplicationArea/ApplicationHeader/FavoritesDropdown.jsx

@@ -0,0 +1,79 @@
+import React, { useState, useMemo, useCallback, useEffect } from "react";
+import PropTypes from "prop-types";
+import { isEmpty, template } from "lodash";
+
+import Dropdown from "antd/lib/dropdown";
+import Icon from "antd/lib/icon";
+import Menu from "antd/lib/menu";
+
+import HelpTrigger from "@/components/HelpTrigger";
+
+export default function FavoritesDropdown({ fetch, urlTemplate }) {
+  const [items, setItems] = useState();
+  const [loading, setLoading] = useState(false);
+
+  const noItems = isEmpty(items);
+  const urlCompiled = useMemo(() => template(urlTemplate), [urlTemplate]);
+
+  const fetchItems = useCallback(
+    (showLoadingState = true) => {
+      setLoading(showLoadingState);
+      fetch()
+        .then(({ results }) => {
+          setItems(results);
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    },
+    [fetch]
+  );
+
+  // fetch items on init
+  useEffect(() => {
+    fetchItems(false);
+  }, [fetchItems]);
+
+  // fetch items on click
+  const onVisibleChange = visible => visible && fetchItems();
+
+  const menu = (
+    <Menu className="favorites-dropdown">
+      {noItems ? (
+        <Menu.Item>
+          <span className="btn-favourite m-r-5">
+            <i className="fa fa-star" />
+          </span>
+          No favorites selected yet <HelpTrigger type="FAVORITES" />
+        </Menu.Item>
+      ) : (
+        items.map(item => (
+          <Menu.Item key={item.id}>
+            <a href={urlCompiled(item)}>
+              <span className="btn-favourite m-r-5">
+                <i className="fa fa-star" />
+              </span>
+              {item.name}
+            </a>
+          </Menu.Item>
+        ))
+      )}
+    </Menu>
+  );
+
+  return (
+    <Dropdown
+      disabled={loading}
+      trigger={["click"]}
+      placement="bottomLeft"
+      onVisibleChange={onVisibleChange}
+      overlay={menu}>
+      {loading ? <Icon type="loading" spin /> : <Icon type="down" />}
+    </Dropdown>
+  );
+}
+
+FavoritesDropdown.propTypes = {
+  fetch: PropTypes.func.isRequired,
+  urlTemplate: PropTypes.string.isRequired,
+};

client/app/components/ApplicationArea/ApplicationHeader/index.jsx

@@ -0,0 +1,262 @@
+/* eslint-disable no-template-curly-in-string */
+
+import React, { useCallback, useRef } from "react";
+
+import Dropdown from "antd/lib/dropdown";
+import Button from "antd/lib/button";
+import Icon from "antd/lib/icon";
+import Menu from "antd/lib/menu";
+import Input from "antd/lib/input";
+import Tooltip from "antd/lib/tooltip";
+
+import HelpTrigger from "@/components/HelpTrigger";
+import CreateDashboardDialog from "@/components/dashboards/CreateDashboardDialog";
+import navigateTo from "@/components/ApplicationArea/navigateTo";
+
+import { currentUser, Auth, clientConfig } from "@/services/auth";
+import { Dashboard } from "@/services/dashboard";
+import { Query } from "@/services/query";
+import frontendVersion from "@/version.json";
+import logoUrl from "@/assets/images/redash_icon_small.png";
+
+import FavoritesDropdown from "./FavoritesDropdown";
+import "./index.less";
+
+function onSearch(q) {
+  navigateTo(`queries?q=${encodeURIComponent(q)}`);
+}
+
+function DesktopNavbar() {
+  const showCreateDashboardDialog = useCallback(() => {
+    CreateDashboardDialog.showModal().result.catch(() => {}); // ignore dismiss
+  }, []);
+
+  return (
+    <div className="app-header" data-platform="desktop">
+      <div>
+        <Menu mode="horizontal" selectable={false}>
+          {currentUser.hasPermission("list_dashboards") && (
+            <Menu.Item key="dashboards" className="dropdown-menu-item">
+              <Button href="dashboards">Dashboards</Button>
+              <FavoritesDropdown fetch={Dashboard.favorites} urlTemplate="dashboard/${slug}" />
+            </Menu.Item>
+          )}
+          {currentUser.hasPermission("view_query") && (
+            <Menu.Item key="queries" className="dropdown-menu-item">
+              <Button href="queries">Queries</Button>
+              <FavoritesDropdown fetch={Query.favorites} urlTemplate="queries/${id}" />
+            </Menu.Item>
+          )}
+          {currentUser.hasPermission("list_alerts") && (
+            <Menu.Item key="alerts">
+              <Button href="alerts">Alerts</Button>
+            </Menu.Item>
+          )}
+        </Menu>
+        {currentUser.canCreate() && (
+          <Dropdown
+            trigger={["click"]}
+            overlay={
+              <Menu>
+                {currentUser.hasPermission("create_query") && (
+                  <Menu.Item key="new-query">
+                    <a href="queries/new">New Query</a>
+                  </Menu.Item>
+                )}
+                {currentUser.hasPermission("create_dashboard") && (
+                  <Menu.Item key="new-dashboard">
+                    <a onMouseUp={showCreateDashboardDialog}>New Dashboard</a>
+                  </Menu.Item>
+                )}
+                {currentUser.hasPermission("list_alerts") && (
+                  <Menu.Item key="new-alert">
+                    <a href="alerts/new">New Alert</a>
+                  </Menu.Item>
+                )}
+              </Menu>
+            }>
+            <Button type="primary" data-test="CreateButton">
+              Create <Icon type="down" />
+            </Button>
+          </Dropdown>
+        )}
+      </div>
+      <div className="header-logo">
+        <a href="./">
+          <img src={logoUrl} alt="Redash" />
+        </a>
+      </div>
+      <div>
+        <Input.Search
+          className="searchbar"
+          placeholder="Search queries..."
+          data-test="AppHeaderSearch"
+          onSearch={onSearch}
+        />
+        <Menu mode="horizontal" selectable={false}>
+          <Menu.Item key="help">
+            <HelpTrigger type="HOME" className="menu-item-button" />
+          </Menu.Item>
+          {currentUser.isAdmin && (
+            <Menu.Item key="settings">
+              <Tooltip title="Settings">
+                <Button href="data_sources" className="menu-item-button">
+                  <i className="fa fa-sliders" />
+                </Button>
+              </Tooltip>
+            </Menu.Item>
+          )}
+          <Menu.Item key="profile">
+            <Dropdown
+              overlayStyle={{ minWidth: 200 }}
+              placement="bottomRight"
+              trigger={["click"]}
+              overlay={
+                <Menu>
+                  <Menu.Item key="profile">
+                    <a href="users/me">Edit Profile</a>
+                  </Menu.Item>
+                  {currentUser.hasPermission("super_admin") && <Menu.Divider />}
+                  {currentUser.isAdmin && (
+                    <Menu.Item key="datasources">
+                      <a href="data_sources">Data Sources</a>
+                    </Menu.Item>
+                  )}
+                  {currentUser.hasPermission("list_users") && (
+                    <Menu.Item key="groups">
+                      <a href="groups">Groups</a>
+                    </Menu.Item>
+                  )}
+                  {currentUser.hasPermission("list_users") && (
+                    <Menu.Item key="users">
+                      <a href="users">Users</a>
+                    </Menu.Item>
+                  )}
+                  {currentUser.hasPermission("create_query") && (
+                    <Menu.Item key="snippets">
+                      <a href="query_snippets">Query Snippets</a>
+                    </Menu.Item>
+                  )}
+                  {currentUser.isAdmin && (
+                    <Menu.Item key="destinations">
+                      <a href="destinations">Alert Destinations</a>
+                    </Menu.Item>
+                  )}
+                  {currentUser.hasPermission("super_admin") && <Menu.Divider />}
+                  {currentUser.hasPermission("super_admin") && (
+                    <Menu.Item key="status">
+                      <a href="admin/status">System Status</a>
+                    </Menu.Item>
+                  )}
+                  <Menu.Divider />
+                  <Menu.Item key="logout" onClick={() => Auth.logout()}>
+                    Log out
+                  </Menu.Item>
+                  <Menu.Divider />
+                  <Menu.Item key="version" disabled>
+                    Version: {clientConfig.version}
+                    {frontendVersion !== clientConfig.version && ` (${frontendVersion.substring(0, 8)})`}
+                    {clientConfig.newVersionAvailable && currentUser.hasPermission("super_admin") && (
+                      <Tooltip title="Update Available" placement="rightTop">
+                        {" "}
+                        {/* eslint-disable react/jsx-no-target-blank */}
+                        <a
+                          href="https://version.redash.io/"
+                          className="update-available"
+                          target="_blank"
+                          rel="noopener">
+                          <i className="fa fa-arrow-circle-down" />
+                        </a>
+                      </Tooltip>
+                    )}
+                  </Menu.Item>
+                </Menu>
+              }>
+              <Button data-test="ProfileDropdown" className="profile-dropdown">
+                <img src={currentUser.profile_image_url} alt={currentUser.name} />
+                <span>{currentUser.name}</span>
+                <Icon type="down" />
+              </Button>
+            </Dropdown>
+          </Menu.Item>
+        </Menu>
+      </div>
+    </div>
+  );
+}
+
+function MobileNavbar() {
+  const ref = useRef();
+
+  return (
+    <div className="app-header" data-platform="mobile" ref={ref}>
+      <div className="header-logo">
+        <a href="./">
+          <img src={logoUrl} alt="Redash" />
+        </a>
+      </div>
+      <div>
+        <Dropdown
+          overlayStyle={{ minWidth: 200 }}
+          trigger={["click"]}
+          getPopupContainer={() => ref.current} // so the overlay menu stays with the fixed header when page scrolls
+          overlay={
+            <Menu mode="vertical" selectable={false}>
+              {currentUser.hasPermission("list_dashboards") && (
+                <Menu.Item key="dashboards">
+                  <a href="dashboards">Dashboards</a>
+                </Menu.Item>
+              )}
+              {currentUser.hasPermission("view_query") && (
+                <Menu.Item key="queries">
+                  <a href="queries">Queries</a>
+                </Menu.Item>
+              )}
+              {currentUser.hasPermission("list_alerts") && (
+                <Menu.Item key="alerts">
+                  <a href="alerts">Alerts</a>
+                </Menu.Item>
+              )}
+              <Menu.Item key="profile">
+                <a href="users/me">Edit Profile</a>
+              </Menu.Item>
+              <Menu.Divider />
+              {currentUser.isAdmin && (
+                <Menu.Item key="settings">
+                  <a href="data_sources">Settings</a>
+                </Menu.Item>
+              )}
+              {currentUser.hasPermission("super_admin") && (
+                <Menu.Item key="status">
+                  <a href="admin/status">System Status</a>
+                </Menu.Item>
+              )}
+              {currentUser.hasPermission("super_admin") && <Menu.Divider />}
+              <Menu.Item key="help">
+                {/* eslint-disable-next-line react/jsx-no-target-blank */}
+                <a href="https://redash.io/help" target="_blank" rel="noopener">
+                  Help
+                </a>
+              </Menu.Item>
+              <Menu.Item key="logout" onClick={() => Auth.logout()}>
+                Log out
+              </Menu.Item>
+            </Menu>
+          }>
+          <Button>
+            <Icon type="menu" />
+          </Button>
+        </Dropdown>
+      </div>
+    </div>
+  );
+}
+
+export default function ApplicationHeader() {
+  return (
+    <nav className="app-header-wrapper">
+      <DesktopNavbar />
+      <MobileNavbar />
+    </nav>
+  );
+}

client/app/components/ApplicationArea/ApplicationHeader/index.less

@@ -0,0 +1,207 @@
+@mobileBreakpoint: ~"(max-width: 767px)";
+
+nav .app-header {
+  height: 49px;
+  padding-bottom: 1px;
+  box-sizing: content-box;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
+  background: white;
+  box-shadow: 0 4px 9px -3px rgba(102, 136, 153, 0.15);
+
+  .darker {
+    color: #333 !important;
+
+    &:hover {
+      color: #2196f3 !important;
+    }
+  }
+
+  & > * {
+    display: flex;
+    align-items: center;
+  }
+
+  &[data-platform="mobile"] {
+    display: none;
+  }
+
+  .menu-item-button {
+    padding: 0 15px;
+    font-size: 18px;
+    .darker();
+  }
+
+  .ant-menu-root {
+    margin: 0 10px;
+    line-height: 50px;
+    height: 50px;
+    border-bottom: 0;
+  }
+
+  .ant-btn {
+    font-weight: 500;
+
+    .anticon {
+      margin-right: 0;
+    }
+  }
+
+  &[data-platform="desktop"] .ant-btn:not(.ant-btn-primary) {
+    border: 0;
+    box-shadow: none;
+    height: 40px;
+    line-height: 40px;
+    background-color: transparent; //so it doesn't interfere with click animation of adjacent buttons
+    .darker();
+  }
+
+  .ant-menu-item {
+    padding: 0;
+    height: 52px;
+    display: inline-flex;
+    align-items: center;
+
+    .anticon-down {
+      font-size: 13px !important;
+      transform: none;
+      position: relative;
+      top: 2px;
+
+      svg {
+        transition: transform 0.2s cubic-bezier(0.75, 0, 0.25, 1);
+      }
+    }
+
+    .ant-dropdown-open .anticon-down svg,
+    .anticon-down.ant-dropdown-open svg {
+      transform: rotate(180deg);
+    }
+  }
+
+  .dropdown-menu-item {
+    .ant-btn {
+      padding-right: 5px;
+      padding-left: 5px;
+      margin-right: 30px;
+      margin-left: 10px;
+      position: relative;
+      z-index: 1;
+    }
+
+    // this is a trick to get the dropdown menu to be placed at the bottom left
+    // of the menu item and not the dropdown trigger
+    .ant-dropdown-trigger {
+      position: absolute;
+      top: 5px;
+      right: 0;
+      left: 10px;
+      bottom: 5px;
+      text-align: right;
+      padding-top: 14px;
+      padding-right: 10px;
+      margin-right: 0;
+      user-select: none; // or else double clicking it causes the header logo to get selected
+      .darker();
+    }
+  }
+
+  .header-logo img {
+    height: 40px;
+    width: 40px;
+  }
+
+  .searchbar {
+    width: 185px;
+  }
+
+  .profile-dropdown {
+    display: flex;
+    align-items: center;
+
+    span {
+      max-width: 130px; // arbitrary, prevents layout mess up if username long
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+
+    img {
+      height: 20px;
+      width: 20px;
+      border-radius: 50%;
+      margin-right: 5px;
+    }
+  }
+
+  @media (max-width: 960px) {
+    .ant-btn,
+    .menu-item-button {
+      padding: 0 10px;
+    }
+
+    .ant-menu-root {
+      margin: 0 5px;
+    }
+
+    .profile-dropdown {
+      span {
+        display: none;
+      }
+
+      img {
+        margin-right: 0;
+      }
+    }
+  }
+
+  @media (max-width: 800px) {
+    .searchbar {
+      width: 140px;
+    }
+  }
+
+  @media @mobileBreakpoint {
+    &[data-platform="desktop"] {
+      display: none;
+    }
+
+    &[data-platform="mobile"] {
+      display: flex;
+      padding: 0 15px;
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100%;
+      box-sizing: border-box;
+      z-index: 1000;
+    }
+  }
+}
+
+@media @mobileBreakpoint {
+  .app-header-wrapper {
+    margin-top: 59px !important; // compensate for app header fixed position
+  }
+}
+
+.update-available {
+  display: inline !important;
+
+  .fa {
+    color: #52c41a;
+    vertical-align: text-bottom;
+    font-size: 16px;
+  }
+}
+
+.ant-dropdown-menu-item .help-trigger {
+  display: inline;
+  color: #2196f3;
+  vertical-align: bottom;
+}
+
+.ant-dropdown-menu.favorites-dropdown {
+  margin-left: -10px;
+}

client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.jsx

@@ -1,176 +0,0 @@
-import { first } from "lodash";
-import React, { useState } from "react";
-import Button from "antd/lib/button";
-import Menu from "antd/lib/menu";
-import Link from "@/components/Link";
-import HelpTrigger from "@/components/HelpTrigger";
-import CreateDashboardDialog from "@/components/dashboards/CreateDashboardDialog";
-import { Auth, currentUser } from "@/services/auth";
-import settingsMenu from "@/services/settingsMenu";
-import logoUrl from "@/assets/images/redash_icon_small.png";
-
-import DesktopOutlinedIcon from "@ant-design/icons/DesktopOutlined";
-import CodeOutlinedIcon from "@ant-design/icons/CodeOutlined";
-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 MenuUnfoldOutlinedIcon from "@ant-design/icons/MenuUnfoldOutlined";
-import MenuFoldOutlinedIcon from "@ant-design/icons/MenuFoldOutlined";
-
-import VersionInfo from "./VersionInfo";
-import "./DesktopNavbar.less";
-
-function NavbarSection({ inlineCollapsed, children, ...props }) {
-  return (
-    <Menu
-      selectable={false}
-      mode={inlineCollapsed ? "inline" : "vertical"}
-      inlineCollapsed={inlineCollapsed}
-      theme="dark"
-      {...props}>
-      {children}
-    </Menu>
-  );
-}
-
-export default function DesktopNavbar() {
-  const [collapsed, setCollapsed] = useState(true);
-
-  const firstSettingsTab = first(settingsMenu.getAvailableItems());
-
-  const canCreateQuery = currentUser.hasPermission("create_query");
-  const canCreateDashboard = currentUser.hasPermission("create_dashboard");
-  const canCreateAlert = currentUser.hasPermission("list_alerts");
-
-  return (
-    <div className="desktop-navbar">
-      <NavbarSection inlineCollapsed={collapsed} className="desktop-navbar-logo">
-        <div>
-          <Link href="./">
-            <img src={logoUrl} alt="Redash" />
-          </Link>
-        </div>
-      </NavbarSection>
-
-      <NavbarSection inlineCollapsed={collapsed}>
-        {currentUser.hasPermission("list_dashboards") && (
-          <Menu.Item key="dashboards">
-            <Link href="dashboards">
-              <DesktopOutlinedIcon />
-              <span>Dashboards</span>
-            </Link>
-          </Menu.Item>
-        )}
-        {currentUser.hasPermission("view_query") && (
-          <Menu.Item key="queries">
-            <Link href="queries">
-              <CodeOutlinedIcon />
-              <span>Queries</span>
-            </Link>
-          </Menu.Item>
-        )}
-        {currentUser.hasPermission("list_alerts") && (
-          <Menu.Item key="alerts">
-            <Link href="alerts">
-              <AlertOutlinedIcon />
-              <span>Alerts</span>
-            </Link>
-          </Menu.Item>
-        )}
-      </NavbarSection>
-
-      <NavbarSection inlineCollapsed={collapsed} className="desktop-navbar-spacer">
-        {(canCreateQuery || canCreateDashboard || canCreateAlert) && <Menu.Divider />}
-        {(canCreateQuery || canCreateDashboard || canCreateAlert) && (
-          <Menu.SubMenu
-            key="create"
-            popupClassName="desktop-navbar-submenu"
-            title={
-              <React.Fragment>
-                <span data-test="CreateButton">
-                  <PlusOutlinedIcon />
-                  <span>Create</span>
-                </span>
-              </React.Fragment>
-            }>
-            {canCreateQuery && (
-              <Menu.Item key="new-query">
-                <Link href="queries/new" data-test="CreateQueryMenuItem">
-                  New Query
-                </Link>
-              </Menu.Item>
-            )}
-            {canCreateDashboard && (
-              <Menu.Item key="new-dashboard">
-                <a data-test="CreateDashboardMenuItem" onMouseUp={() => CreateDashboardDialog.showModal()}>
-                  New Dashboard
-                </a>
-              </Menu.Item>
-            )}
-            {canCreateAlert && (
-              <Menu.Item key="new-alert">
-                <Link data-test="CreateAlertMenuItem" href="alerts/new">
-                  New Alert
-                </Link>
-              </Menu.Item>
-            )}
-          </Menu.SubMenu>
-        )}
-      </NavbarSection>
-
-      <NavbarSection inlineCollapsed={collapsed}>
-        <Menu.Item key="help">
-          <HelpTrigger showTooltip={false} type="HOME">
-            <QuestionCircleOutlinedIcon />
-            <span>Help</span>
-          </HelpTrigger>
-        </Menu.Item>
-        {firstSettingsTab && (
-          <Menu.Item key="settings">
-            <Link href={firstSettingsTab.path} data-test="SettingsLink">
-              <SettingOutlinedIcon />
-              <span>Settings</span>
-            </Link>
-          </Menu.Item>
-        )}
-        <Menu.Divider />
-      </NavbarSection>
-
-      <NavbarSection inlineCollapsed={collapsed} className="desktop-navbar-profile-menu">
-        <Menu.SubMenu
-          key="profile"
-          popupClassName="desktop-navbar-submenu"
-          title={
-            <span data-test="ProfileDropdown" className="desktop-navbar-profile-menu-title">
-              <img className="profile__image_thumb" src={currentUser.profile_image_url} alt={currentUser.name} />
-              <span>{currentUser.name}</span>
-            </span>
-          }>
-          <Menu.Item key="profile">
-            <Link href="users/me">Profile</Link>
-          </Menu.Item>
-          {currentUser.hasPermission("super_admin") && (
-            <Menu.Item key="status">
-              <Link href="admin/status">System Status</Link>
-            </Menu.Item>
-          )}
-          <Menu.Divider />
-          <Menu.Item key="logout">
-            <a data-test="LogOutButton" onClick={() => Auth.logout()}>
-              Log out
-            </a>
-          </Menu.Item>
-          <Menu.Divider />
-          <Menu.Item key="version" disabled className="version-info">
-            <VersionInfo />
-          </Menu.Item>
-        </Menu.SubMenu>
-      </NavbarSection>
-
-      <Button onClick={() => setCollapsed(!collapsed)} className="desktop-navbar-collapse-button">
-        {collapsed ? <MenuUnfoldOutlinedIcon /> : <MenuFoldOutlinedIcon />}
-      </Button>
-    </div>
-  );
-}

client/app/components/ApplicationArea/ApplicationLayout/DesktopNavbar.less

@@ -1,181 +0,0 @@
-@backgroundColor: #001529;
-@dividerColor: rgba(255, 255, 255, 0.5);
-@textColor: rgba(255, 255, 255, 0.75);
-
-.desktop-navbar {
-  background: @backgroundColor;
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-
-  &-spacer {
-    flex: 1 1 auto;
-  }
-
-  &-logo.ant-menu {
-    padding-top: 20px;
-    padding-bottom: 20px;
-    text-align: center;
-
-    img {
-      height: 40px;
-      transition: all 270ms;
-    }
-
-    &.ant-menu-inline-collapsed {
-      img {
-        height: 20px;
-      }
-    }
-  }
-
-  .help-trigger {
-    font: inherit;
-  }
-
-  .ant-menu {
-    &:not(.ant-menu-inline-collapsed) {
-      width: 170px;
-    }
-
-    &.ant-menu-inline-collapsed > .ant-menu-submenu-title span img + span,
-    &.ant-menu-inline-collapsed > .ant-menu-item i + span {
-      display: inline-block;
-      max-width: 0;
-      opacity: 0;
-    }
-
-    .ant-menu-item-divider {
-      background: @dividerColor;
-    }
-
-    .ant-menu-item,
-    .ant-menu-submenu {
-      font-weight: 500;
-      color: @textColor;
-
-      &.ant-menu-submenu-open,
-      &.ant-menu-submenu-active,
-      &:hover,
-      &:active {
-        color: #fff;
-      }
-
-      a,
-      span,
-      .anticon {
-        color: inherit;
-      }
-    }
-
-    .ant-menu-submenu-arrow {
-      display: none;
-    }
-  }
-
-  .ant-btn.desktop-navbar-collapse-button {
-    background-color: @backgroundColor;
-    border: 0;
-    border-radius: 0;
-    color: @textColor;
-
-    &:hover,
-    &:active {
-      color: #fff;
-    }
-
-    &:after {
-      animation: 0s !important;
-    }
-  }
-
-  .desktop-navbar-profile-menu {
-    .desktop-navbar-profile-menu-title {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      overflow: hidden;
-
-      .profile__image_thumb {
-        margin: 0;
-        vertical-align: middle;
-      }
-
-      .profile__image_thumb + span {
-        flex: 1 1 auto;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-
-        margin-left: 10px;
-        vertical-align: middle;
-        display: inline-block;
-
-        // styles from Antd
-        opacity: 1;
-        transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1),
-          margin-left 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-      }
-    }
-
-    &.ant-menu-inline-collapsed {
-      .ant-menu-submenu-title {
-        padding-left: 16px !important;
-        padding-right: 16px !important;
-      }
-
-      .desktop-navbar-profile-menu-title {
-        .profile__image_thumb + span {
-          opacity: 0;
-          max-width: 0;
-          margin-left: 0;
-        }
-      }
-    }
-  }
-}
-
-.desktop-navbar-submenu {
-  .ant-menu {
-    .ant-menu-item-divider {
-      background: @dividerColor;
-    }
-
-    .ant-menu-item {
-      font-weight: 500;
-      color: @textColor;
-
-      &:hover,
-      &:active {
-        color: #fff;
-      }
-
-      a,
-      span,
-      .anticon {
-        color: inherit;
-      }
-
-      .zmdi,
-      .fa {
-        margin-right: 5px;
-      }
-
-      &.version-info {
-        height: auto;
-        line-height: normal;
-        padding-top: 12px;
-        padding-bottom: 12px;
-
-        a {
-          color: rgba(255, 255, 255, 0.8);
-
-          &:hover,
-          &:active {
-            color: rgba(255, 255, 255, 1);
-          }
-        }
-      }
-    }
-  }
-}

client/app/components/ApplicationArea/ApplicationLayout/MobileNavbar.jsx

@@ -1,88 +0,0 @@
-import { first } from "lodash";
-import React from "react";
-import PropTypes from "prop-types";
-import Button from "antd/lib/button";
-import MenuOutlinedIcon from "@ant-design/icons/MenuOutlined";
-import Dropdown from "antd/lib/dropdown";
-import Menu from "antd/lib/menu";
-import Link from "@/components/Link";
-import { Auth, currentUser } from "@/services/auth";
-import settingsMenu from "@/services/settingsMenu";
-import logoUrl from "@/assets/images/redash_icon_small.png";
-
-import "./MobileNavbar.less";
-
-export default function MobileNavbar({ getPopupContainer }) {
-  const firstSettingsTab = first(settingsMenu.getAvailableItems());
-
-  return (
-    <div className="mobile-navbar">
-      <div className="mobile-navbar-logo">
-        <Link href="./">
-          <img src={logoUrl} alt="Redash" />
-        </Link>
-      </div>
-      <div>
-        <Dropdown
-          overlayStyle={{ minWidth: 200 }}
-          trigger={["click"]}
-          getPopupContainer={getPopupContainer} // so the overlay menu stays with the fixed header when page scrolls
-          overlay={
-            <Menu mode="vertical" theme="dark" selectable={false} className="mobile-navbar-menu">
-              {currentUser.hasPermission("list_dashboards") && (
-                <Menu.Item key="dashboards">
-                  <Link href="dashboards">Dashboards</Link>
-                </Menu.Item>
-              )}
-              {currentUser.hasPermission("view_query") && (
-                <Menu.Item key="queries">
-                  <Link href="queries">Queries</Link>
-                </Menu.Item>
-              )}
-              {currentUser.hasPermission("list_alerts") && (
-                <Menu.Item key="alerts">
-                  <Link href="alerts">Alerts</Link>
-                </Menu.Item>
-              )}
-              <Menu.Item key="profile">
-                <Link href="users/me">Edit Profile</Link>
-              </Menu.Item>
-              <Menu.Divider />
-              {firstSettingsTab && (
-                <Menu.Item key="settings">
-                  <Link href={firstSettingsTab.path}>Settings</Link>
-                </Menu.Item>
-              )}
-              {currentUser.hasPermission("super_admin") && (
-                <Menu.Item key="status">
-                  <Link href="admin/status">System Status</Link>
-                </Menu.Item>
-              )}
-              {currentUser.hasPermission("super_admin") && <Menu.Divider />}
-              <Menu.Item key="help">
-                {/* eslint-disable-next-line react/jsx-no-target-blank */}
-                <Link href="https://redash.io/help" target="_blank" rel="noopener">
-                  Help
-                </Link>
-              </Menu.Item>
-              <Menu.Item key="logout" onClick={() => Auth.logout()}>
-                Log out
-              </Menu.Item>
-            </Menu>
-          }>
-          <Button className="mobile-navbar-toggle-button" ghost>
-            <MenuOutlinedIcon />
-          </Button>
-        </Dropdown>
-      </div>
-    </div>
-  );
-}
-
-MobileNavbar.propTypes = {
-  getPopupContainer: PropTypes.func,
-};
-
-MobileNavbar.defaultProps = {
-  getPopupContainer: null,
-};

client/app/components/ApplicationArea/ApplicationLayout/MobileNavbar.less

@@ -1,35 +0,0 @@
-@backgroundColor: #001529;
-@dividerColor: rgba(255, 255, 255, 0.5);
-@textColor: rgba(255, 255, 255, 0.75);
-
-.mobile-navbar {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background: @backgroundColor;
-  box-shadow: 0 4px 9px -3px rgba(102, 136, 153, 0.15);
-  padding: 0 15px;
-  height: 100%;
-
-  &-logo {
-    img {
-      height: 40px;
-      width: 40px;
-    }
-  }
-
-  .ant-btn.mobile-navbar-toggle-button {
-    padding: 0 10px;
-  }
-}
-
-.mobile-navbar-menu {
-  .ant-dropdown-menu-item {
-    font-weight: 500;
-    color: @textColor;
-  }
-
-  .ant-dropdown-menu-item-divider {
-    background: @dividerColor;
-  }
-}

client/app/components/ApplicationArea/ApplicationLayout/VersionInfo.jsx

@@ -1,24 +0,0 @@
-import React from "react";
-import Link from "@/components/Link";
-import { clientConfig, currentUser } from "@/services/auth";
-import frontendVersion from "@/version.json";
-
-export default function VersionInfo() {
-  return (
-    <React.Fragment>
-      <div>
-        Version: {clientConfig.version}
-        {frontendVersion !== clientConfig.version && ` (${frontendVersion.substring(0, 8)})`}
-      </div>
-      {clientConfig.newVersionAvailable && currentUser.hasPermission("super_admin") && (
-        <div className="m-t-10">
-          {/* eslint-disable react/jsx-no-target-blank */}
-          <Link href="https://version.redash.io/" className="update-available" target="_blank" rel="noopener">
-            Update Available
-            <i className="fa fa-external-link m-l-5" />
-          </Link>
-        </div>
-      )}
-    </React.Fragment>
-  );
-}

client/app/components/ApplicationArea/ApplicationLayout/index.jsx

@@ -1,41 +0,0 @@
-import React, { useRef, useCallback } from "react";
-import PropTypes from "prop-types";
-import DynamicComponent from "@/components/DynamicComponent";
-import DesktopNavbar from "./DesktopNavbar";
-import MobileNavbar from "./MobileNavbar";
-
-import "./index.less";
-
-export default function ApplicationLayout({ children }) {
-  const mobileNavbarContainerRef = useRef();
-
-  const getMobileNavbarPopupContainer = useCallback(() => mobileNavbarContainerRef.current, []);
-
-  return (
-    <React.Fragment>
-      <DynamicComponent name="ApplicationWrapper">
-        <div className="application-layout-side-menu">
-          <DynamicComponent name="ApplicationDesktopNavbar">
-            <DesktopNavbar />
-          </DynamicComponent>
-        </div>
-        <div className="application-layout-content">
-          <nav className="application-layout-top-menu" ref={mobileNavbarContainerRef}>
-            <DynamicComponent name="ApplicationMobileNavbar" getPopupContainer={getMobileNavbarPopupContainer}>
-              <MobileNavbar getPopupContainer={getMobileNavbarPopupContainer} />
-            </DynamicComponent>
-          </nav>
-          {children}
-        </div>
-      </DynamicComponent>
-    </React.Fragment>
-  );
-}
-
-ApplicationLayout.propTypes = {
-  children: PropTypes.node,
-};
-
-ApplicationLayout.defaultProps = {
-  children: null,
-};

client/app/components/ApplicationArea/ApplicationLayout/index.less

@@ -1,81 +0,0 @@
-@mobileBreakpoint: ~"(max-width: 767px)";
-
-body #application-root {
-  @topMenuHeight: 49px;
-
-  display: flex;
-  flex-direction: row;
-  justify-content: stretch;
-  padding-bottom: 0 !important;
-  height: 100vh;
-
-  .application-layout-side-menu {
-    height: 100vh;
-    position: relative;
-
-    @media @mobileBreakpoint {
-      display: none;
-    }
-  }
-
-  .application-layout-top-menu {
-    height: @topMenuHeight;
-    display: none;
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    box-sizing: border-box;
-    z-index: 1000;
-
-    @media @mobileBreakpoint {
-      display: block;
-    }
-  }
-
-  .application-layout-content {
-    display: flex;
-    flex-direction: column;
-    overflow-y: auto;
-
-    flex: 1 1 auto;
-    padding-bottom: 15px;
-
-    @media @mobileBreakpoint {
-      margin-top: @topMenuHeight; // compensate for app header fixed position
-    }
-  }
-}
-
-body.fixed-layout #application-root {
-  .application-layout-content {
-    padding-bottom: 0;
-  }
-}
-
-body.headless #application-root {
-  .application-layout-side-menu,
-  .application-layout-top-menu {
-    display: none !important;
-  }
-
-  .application-layout-content {
-    margin-top: 0;
-  }
-}
-
-// Fixes for proper snapshots in Percy (move vertical scroll to body level
-// to capture entire page, otherwise it wll be cut by viewport)
-@media only percy {
-  body #application-root {
-    height: auto;
-
-    .application-layout-side-menu {
-      height: auto;
-    }
-
-    .application-layout-content {
-      overflow: visible;
-    }
-  }
-}

client/app/components/ApplicationArea/ErrorMessage.jsx

@@ -1,11 +1,7 @@
-import { get, isObject } from "lodash";
+import { isObject, get } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
 
-import "./ErrorMessage.less";
-import DynamicComponent from "@/components/DynamicComponent";
-import { ErrorMessageDetails } from "@/components/ApplicationArea/ErrorMessageDetails";
-
 function getErrorMessageByStatus(status, defaultMessage) {
   switch (status) {
     case 404:
@@ -18,7 +14,7 @@ function getErrorMessageByStatus(status, defaultMessage) {
   }
 }
 
-function getErrorMessage(error) {
+export function getErrorMessage(error) {
   const message = "It seems like we encountered an error. Try refreshing this page or contact your administrator.";
   if (isObject(error)) {
     // HTTP errors
@@ -33,30 +29,25 @@ function getErrorMessage(error) {
   return message;
 }
 
-export default function ErrorMessage({ error, message }) {
+export default function ErrorMessage({ error }) {
   if (!error) {
     return null;
   }
 
   console.error(error);
 
-  const errorDetailsProps = {
-    error,
-    message: message || getErrorMessage(error),
-  };
-
   return (
-    <div className="error-message-container" data-test="ErrorMessage" role="alert">
+    <div className="fixed-container" data-test="ErrorMessage">
+      <div className="container">
+        <div className="col-md-8 col-md-push-2">
           <div className="error-state bg-white tiled">
             <div className="error-state__icon">
               <i className="zmdi zmdi-alert-circle-o" />
             </div>
             <div className="error-state__details">
-          <DynamicComponent
+              <h4>{getErrorMessage(error)}</h4>
-            name="ErrorMessageDetails"
+            </div>
-            fallback={<ErrorMessageDetails {...errorDetailsProps} />}
+          </div>
-            {...errorDetailsProps}
-          />
         </div>
       </div>
     </div>
@@ -65,5 +56,4 @@ export default function ErrorMessage({ error, message }) {
 
 ErrorMessage.propTypes = {
   error: PropTypes.object.isRequired,
-  message: PropTypes.string,
 };

client/app/components/ApplicationArea/ErrorMessage.less

@@ -1,17 +0,0 @@
-.error-message-container {
-  width: 100%;
-  padding: 0 15px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: flex-start;
-
-  .error-state {
-    max-width: 1200px;
-    width: 100%;
-
-    @media (min-width: 768px) {
-      width: 65%;
-    }
-  }
-}

client/app/components/ApplicationArea/ErrorMessage.test.js

@@ -1,51 +0,0 @@
-import React from "react";
-import { mount } from "enzyme";
-import ErrorMessage from "./ErrorMessage";
-
-const ErrorMessages = {
-  UNAUTHORIZED: "It seems like you don’t have permission to see this page.",
-  NOT_FOUND: "It seems like the page you're looking for cannot be found.",
-  GENERIC: "It seems like we encountered an error. Try refreshing this page or contact your administrator.",
-};
-
-function mockAxiosError(status = 500, response = {}) {
-  const error = new Error(`Failed with code ${status}.`);
-  error.isAxiosError = true;
-  error.response = { status, ...response };
-  return error;
-}
-
-describe("Error Message", () => {
-  const spyError = jest.spyOn(console, "error");
-
-  beforeEach(() => {
-    spyError.mockReset();
-  });
-
-  function expectErrorMessageToBe(error, errorMessage) {
-    const component = mount(<ErrorMessage error={error} />);
-
-    expect(component.find(".error-state__details h4").text()).toBe(errorMessage);
-    expect(spyError).toHaveBeenCalledWith(error);
-  }
-
-  test("displays a generic message on adhoc errors", () => {
-    expectErrorMessageToBe(new Error("technical information"), ErrorMessages.GENERIC);
-  });
-
-  test("displays a not found message on axios errors with 404 code", () => {
-    expectErrorMessageToBe(mockAxiosError(404), ErrorMessages.NOT_FOUND);
-  });
-
-  test("displays a unauthorized message on axios errors with 401 code", () => {
-    expectErrorMessageToBe(mockAxiosError(401), ErrorMessages.UNAUTHORIZED);
-  });
-
-  test("displays a unauthorized message on axios errors with 403 code", () => {
-    expectErrorMessageToBe(mockAxiosError(403), ErrorMessages.UNAUTHORIZED);
-  });
-
-  test("displays a generic message on axios errors with 500 code", () => {
-    expectErrorMessageToBe(mockAxiosError(500), ErrorMessages.GENERIC);
-  });
-});

client/app/components/ApplicationArea/ErrorMessageDetails.jsx

@@ -1,11 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-
-export function ErrorMessageDetails(props) {
-  return <h4>{props.message}</h4>;
-}
-
-ErrorMessageDetails.propTypes = {
-  error: PropTypes.instanceOf(Error).isRequired,
-  message: PropTypes.string.isRequired,
-};

client/app/components/ApplicationArea/Router.jsx

@@ -1,8 +1,8 @@
-import { isFunction, startsWith, trimStart, trimEnd } from "lodash";
+import { isFunction, map, fromPairs, extend, startsWith, trimStart, trimEnd } from "lodash";
-import React, { useState, useEffect, useRef, useContext } from "react";
+import React, { useState, useEffect, useRef } from "react";
 import PropTypes from "prop-types";
 import UniversalRouter from "universal-router";
-import ErrorBoundary from "@redash/viz/lib/components/ErrorBoundary";
+import ErrorBoundary from "@/components/ErrorBoundary";
 import location from "@/services/location";
 import url from "@/services/url";
 
@@ -14,12 +14,6 @@ function generateRouteKey() {
     .substr(2);
 }
 
-export const CurrentRouteContext = React.createContext(null);
-
-export function useCurrentRoute() {
-  return useContext(CurrentRouteContext);
-}
-
 export function stripBase(href) {
   // Resolve provided link and '' (root) relative to document's base.
   // If provided href is not related to current document (does not
@@ -36,6 +30,18 @@ export function stripBase(href) {
   return false;
 }
 
+function resolveRouteDependencies(route) {
+  return Promise.all(
+    map(route.resolve, (value, key) => {
+      value = isFunction(value) ? value(route.routeParams, route, location) : value;
+      return Promise.resolve(value).then(result => [key, result]);
+    })
+  ).then(results => {
+    route.routeParams = extend(route.routeParams, fromPairs(results));
+    return route;
+  });
+}
+
 export default function Router({ routes, onRouteChange }) {
   const [currentRoute, setCurrentRoute] = useState(null);
 
@@ -59,7 +65,7 @@ export default function Router({ routes, onRouteChange }) {
           errorHandlerRef.current.reset();
         }
 
-        const pathname = stripBase(location.path) || "/";
+        const pathname = stripBase(location.path);
 
         // This is a optimization for route resolver: if current route was already resolved
         // from this path - do nothing. It also prevents router from using outdated route in a case
@@ -80,7 +86,10 @@ export default function Router({ routes, onRouteChange }) {
         router
           .resolve({ pathname })
           .then(route => {
-            if (!isAbandoned && currentPathRef.current === pathname) {
+            return isAbandoned || currentPathRef.current !== pathname ? null : resolveRouteDependencies(route);
+          })
+          .then(route => {
+            if (route) {
               setCurrentRoute({ ...route, key: generateRouteKey() });
             }
           })
@@ -101,7 +110,6 @@ export default function Router({ routes, onRouteChange }) {
 
     return () => {
       isAbandoned = true;
-      currentPathRef.current = null;
       unlisten();
     };
   }, [routes]);
@@ -115,11 +123,9 @@ export default function Router({ routes, onRouteChange }) {
   }
 
   return (
-    <CurrentRouteContext.Provider value={currentRoute}>
     <ErrorBoundary ref={errorHandlerRef} renderError={error => <ErrorMessage error={error} />}>
       {currentRoute.render(currentRoute)}
     </ErrorBoundary>
-    </CurrentRouteContext.Provider>
   );
 }
 

client/app/components/ApplicationArea/handleNavigationIntent.js

@@ -9,7 +9,7 @@ export default function handleNavigationIntent(event) {
     }
     element = element.parentNode;
   }
-  if (!element || !element.hasAttribute("href") || element.hasAttribute("download") || element.dataset.skipRouter) {
+  if (!element || !element.hasAttribute("href")) {
     return;
   }
 

client/app/components/ApplicationArea/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import routes from "@/services/routes";
+import routes from "@/pages";
 import Router from "./Router";
 import handleNavigationIntent from "./handleNavigationIntent";
 import ErrorMessage from "./ErrorMessage";
@@ -33,5 +33,5 @@ export default function ApplicationArea() {
     return <ErrorMessage error={unhandledError} />;
   }
 
-  return <Router routes={routes.items} onRouteChange={setCurrentRoute} />;
+  return <Router routes={routes} onRouteChange={setCurrentRoute} />;
 }

client/app/components/ApplicationArea/routeWithApiKeySession.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState, useContext } from "react";
 import PropTypes from "prop-types";
-import { ErrorBoundaryContext } from "@redash/viz/lib/components/ErrorBoundary";
+import { ErrorBoundaryContext } from "@/components/ErrorBoundary";
-import { Auth, clientConfig } from "@/services/auth";
+import { Auth } from "@/services/auth";
 
 // This wrapper modifies `route.render` function and instead of passing `currentRoute` passes an object
 // that contains:
@@ -33,7 +33,7 @@ function ApiKeySessionWrapper({ apiKey, currentRoute, renderChildren }) {
     };
   }, [apiKey]);
 
-  if (!isAuthenticated || clientConfig.disablePublicUrls) {
+  if (!isAuthenticated) {
     return null;
   }
 

client/app/components/ApplicationArea/routeWithUserSession.jsx

@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from "react";
+import PropTypes from "prop-types";
+import ErrorBoundary, { ErrorBoundaryContext } from "@/components/ErrorBoundary";
+import { Auth } from "@/services/auth";
+import organizationStatus from "@/services/organizationStatus";
+import ApplicationHeader from "./ApplicationHeader";
+import ErrorMessage from "./ErrorMessage";
+
+// This wrapper modifies `route.render` function and instead of passing `currentRoute` passes an object
+// that contains:
+// - `currentRoute.routeParams`
+// - `pageTitle` field which is equal to `currentRoute.title`
+// - `onError` field which is a `handleError` method of nearest error boundary
+
+function UserSessionWrapper({ bodyClass, currentRoute, renderChildren }) {
+  const [isAuthenticated, setIsAuthenticated] = useState(!!Auth.isAuthenticated());
+
+  useEffect(() => {
+    let isCancelled = false;
+    Promise.all([Auth.requireSession(), organizationStatus.refresh()])
+      .then(() => {
+        if (!isCancelled) {
+          setIsAuthenticated(!!Auth.isAuthenticated());
+        }
+      })
+      .catch(() => {
+        if (!isCancelled) {
+          setIsAuthenticated(false);
+        }
+      });
+    return () => {
+      isCancelled = true;
+    };
+  }, []);
+
+  useEffect(() => {
+    if (bodyClass) {
+      document.body.classList.toggle(bodyClass, true);
+      return () => {
+        document.body.classList.toggle(bodyClass, false);
+      };
+    }
+  }, [bodyClass]);
+
+  if (!isAuthenticated) {
+    return null;
+  }
+
+  return (
+    <React.Fragment>
+      <ApplicationHeader />
+      <React.Fragment key={currentRoute.key}>
+        <ErrorBoundary renderError={error => <ErrorMessage error={error} />}>
+          <ErrorBoundaryContext.Consumer>
+            {({ handleError }) =>
+              renderChildren({ ...currentRoute.routeParams, pageTitle: currentRoute.title, onError: handleError })
+            }
+          </ErrorBoundaryContext.Consumer>
+        </ErrorBoundary>
+      </React.Fragment>
+    </React.Fragment>
+  );
+}
+
+UserSessionWrapper.propTypes = {
+  bodyClass: PropTypes.string,
+  renderChildren: PropTypes.func,
+};
+
+UserSessionWrapper.defaultProps = {
+  bodyClass: null,
+  renderChildren: () => null,
+};
+
+export default function routeWithUserSession({ render, bodyClass, ...rest }) {
+  return {
+    ...rest,
+    render: currentRoute => (
+      <UserSessionWrapper bodyClass={bodyClass} currentRoute={currentRoute} renderChildren={render} />
+    ),
+  };
+}

client/app/components/ApplicationArea/routeWithUserSession.tsx

@@ -1,108 +0,0 @@
-import React, { useEffect, useState } from "react";
-// @ts-expect-error (Must be removed after adding @redash/viz typing)
-import ErrorBoundary, { ErrorBoundaryContext } from "@redash/viz/lib/components/ErrorBoundary";
-import { Auth } from "@/services/auth";
-import { policy } from "@/services/policy";
-import { CurrentRoute } from "@/services/routes";
-import organizationStatus from "@/services/organizationStatus";
-import DynamicComponent from "@/components/DynamicComponent";
-import ApplicationLayout from "./ApplicationLayout";
-import ErrorMessage from "./ErrorMessage";
-
-export type UserSessionWrapperRenderChildrenProps<P> = {
-  pageTitle?: string;
-  onError: (error: Error) => void;
-} & P;
-
-export interface UserSessionWrapperProps<P> {
-  render: (props: UserSessionWrapperRenderChildrenProps<P>) => React.ReactNode;
-  currentRoute: CurrentRoute<P>;
-  bodyClass?: string;
-}
-
-// This wrapper modifies `route.render` function and instead of passing `currentRoute` passes an object
-// that contains:
-// - `currentRoute.routeParams`
-// - `pageTitle` field which is equal to `currentRoute.title`
-// - `onError` field which is a `handleError` method of nearest error boundary
-
-export function UserSessionWrapper<P>({ bodyClass, currentRoute, render }: UserSessionWrapperProps<P>) {
-  const [isAuthenticated, setIsAuthenticated] = useState(!!Auth.isAuthenticated());
-  useEffect(() => {
-    let isCancelled = false;
-    Promise.all([Auth.requireSession(), organizationStatus.refresh(), policy.refresh()])
-      .then(() => {
-        if (!isCancelled) {
-          setIsAuthenticated(!!Auth.isAuthenticated());
-        }
-      })
-      .catch(() => {
-        if (!isCancelled) {
-          setIsAuthenticated(false);
-        }
-      });
-    return () => {
-      isCancelled = true;
-    };
-  }, []);
-
-  useEffect(() => {
-    if (bodyClass) {
-      document.body.classList.toggle(bodyClass, true);
-      return () => {
-        document.body.classList.toggle(bodyClass, false);
-      };
-    }
-  }, [bodyClass]);
-
-  if (!isAuthenticated) {
-    return null;
-  }
-
-  return (
-    <ApplicationLayout>
-      <React.Fragment key={currentRoute.key}>
-        <ErrorBoundary renderError={(error: Error) => <ErrorMessage error={error} />}>
-          <ErrorBoundaryContext.Consumer>
-            {({ handleError }: { handleError: UserSessionWrapperRenderChildrenProps<P>["onError"] }) =>
-              render({ ...currentRoute.routeParams, pageTitle: currentRoute.title, onError: handleError })
-            }
-          </ErrorBoundaryContext.Consumer>
-        </ErrorBoundary>
-      </React.Fragment>
-    </ApplicationLayout>
-  );
-}
-
-export type RouteWithUserSessionOptions<P> = {
-  render: (props: UserSessionWrapperRenderChildrenProps<P>) => React.ReactNode;
-  bodyClass?: string;
-  title: string;
-  path: string;
-};
-
-export const UserSessionWrapperDynamicComponentName = "UserSessionWrapper";
-
-export default function routeWithUserSession<P extends {} = {}>({
-  render: originalRender,
-  bodyClass,
-  ...rest
-}: RouteWithUserSessionOptions<P>) {
-  return {
-    ...rest,
-    render: (currentRoute: CurrentRoute<P>) => {
-      const props = {
-        render: originalRender,
-        bodyClass,
-        currentRoute,
-      };
-      return (
-        <DynamicComponent
-          {...props}
-          name={UserSessionWrapperDynamicComponentName}
-          fallback={<UserSessionWrapper {...props} />}
-        />
-      );
-    },
-  };
-}

client/app/components/BeaconConsent.jsx

@@ -3,7 +3,6 @@ import Card from "antd/lib/card";
 import Button from "antd/lib/button";
 import Typography from "antd/lib/typography";
 import { clientConfig } from "@/services/auth";
-import Link from "@/components/Link";
 import HelpTrigger from "@/components/HelpTrigger";
 import DynamicComponent from "@/components/DynamicComponent";
 import OrgSettings from "@/services/organizationSettings";
@@ -66,8 +65,8 @@ function BeaconConsent() {
           </div>
           <div className="m-t-15">
             <Text type="secondary">
-              You can change this setting anytime from the{" "}
+              You can change this setting anytime from the <a href="settings/organization">Organization Settings</a>{" "}
-              <Link href="settings/organization">Organization Settings</Link> page.
+              page.
             </Text>
           </div>
         </Card>

client/app/components/CodeBlock.jsx

@@ -2,7 +2,6 @@ import React from "react";
 import PropTypes from "prop-types";
 import Button from "antd/lib/button";
 import Tooltip from "antd/lib/tooltip";
-import CopyOutlinedIcon from "@ant-design/icons/CopyOutlined";
 import "./CodeBlock.less";
 
 export default class CodeBlock extends React.Component {
@@ -60,7 +59,7 @@ export default class CodeBlock extends React.Component {
 
     const copyButton = (
       <Tooltip title={this.state.copied || "Copy"}>
-        <Button icon={<CopyOutlinedIcon />} type="dashed" size="small" onClick={this.copy} />
+        <Button icon="copy" type="dashed" size="small" onClick={this.copy} />
       </Tooltip>
     );
 

client/app/components/ColorPicker/Swatch.jsx

@@ -6,13 +6,9 @@ import Tooltip from "antd/lib/tooltip";
 
 import "./swatch.less";
 
-export default function Swatch({ className, color, title, size, style, ...props }) {
+export default function Swatch({ className, color, title, size, ...props }) {
   const result = (
-    <span
+    <span className={cx("color-swatch", className)} style={{ backgroundColor: color, width: size }} {...props} />
-      className={cx("color-swatch", className)}
-      style={{ backgroundColor: color, width: size, ...style }}
-      {...props}
-    />
   );
 
   if (isString(title) && title !== "") {
@@ -27,7 +23,6 @@ export default function Swatch({ className, color, title, size, style, ...props
 
 Swatch.propTypes = {
   className: PropTypes.string,
-  style: PropTypes.object,
   title: PropTypes.string,
   color: PropTypes.string,
   size: PropTypes.number,
@@ -35,7 +30,6 @@ Swatch.propTypes = {
 
 Swatch.defaultProps = {
   className: null,
-  style: null,
   title: null,
   color: "transparent",
   size: 12,

client/app/components/ColorPicker/index.jsx

@@ -5,11 +5,9 @@ import cx from "classnames";
 import Popover from "antd/lib/popover";
 import Card from "antd/lib/card";
 import Tooltip from "antd/lib/tooltip";
+import Icon from "antd/lib/icon";
 import chooseTextColorForBackground from "@/lib/chooseTextColorForBackground";
 
-import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
-import CheckOutlinedIcon from "@ant-design/icons/CheckOutlined";
-
 import ColorInput from "./Input";
 import Swatch from "./Swatch";
 import Label from "./Label";
@@ -48,12 +46,12 @@ export default function ColorPicker({
   if (!interactive) {
     actions.push(
       <Tooltip key="cancel" title="Cancel">
-        <CloseOutlinedIcon onClick={handleCancel} />
+        <Icon type="close" onClick={handleCancel} />
       </Tooltip>
     );
     actions.push(
       <Tooltip key="apply" title="Apply">
-        <CheckOutlinedIcon onClick={handleApply} />
+        <Icon type="check" onClick={handleApply} />
       </Tooltip>
     );
   }
@@ -72,7 +70,7 @@ export default function ColorPicker({
   }, [validatedColor, visible]);
 
   return (
-    <span className="color-picker-wrapper">
+    <React.Fragment>
       {addonBefore}
       <Popover
         arrowPointAtCenter
@@ -112,7 +110,7 @@ export default function ColorPicker({
         )}
       </Popover>
       {addonAfter}
-    </span>
+    </React.Fragment>
   );
 }
 

client/app/components/ColorPicker/index.less

@@ -38,7 +38,3 @@
 .color-picker-trigger {
   cursor: pointer;
 }
-
-.color-picker-wrapper {
-  white-space: nowrap;
-}

client/app/components/CreateSourceDialog.jsx

@@ -1,13 +1,13 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { isEmpty, toUpper, includes, get } from "lodash";
+import { isEmpty, toUpper, includes } from "lodash";
 import Button from "antd/lib/button";
 import List from "antd/lib/list";
 import Modal from "antd/lib/modal";
 import Input from "antd/lib/input";
 import Steps from "antd/lib/steps";
+import { getErrorMessage } from "@/components/ApplicationArea/ErrorMessage";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
-import Link from "@/components/Link";
 import { PreviewCard } from "@/components/PreviewCard";
 import EmptyState from "@/components/items-list/components/EmptyState";
 import DynamicForm from "@/components/dynamic-form/DynamicForm";
@@ -67,7 +67,7 @@ class CreateSourceDialog extends React.Component {
         })
         .catch(error => {
           this.setState({ savingSource: false, currentStep: StepEnum.CONFIGURE_IT });
-          errorCallback(get(error, "response.data.message", "Failed saving."));
+          errorCallback(getErrorMessage(error.message));
         });
     }
   };
@@ -116,15 +116,6 @@ class CreateSourceDialog extends React.Component {
           )}
         </div>
         <DynamicForm id="sourceForm" fields={fields} onSubmit={this.createSource} feedbackIcons hideSubmitButton />
-        {selectedType.type === "databricks" && (
-          <small>
-            By using the Databricks Data Source you agree to the Databricks JDBC/ODBC{" "}
-            <Link href="https://databricks.com/spark/odbc-driver-download" target="_blank" rel="noopener noreferrer">
-              Driver Download Terms and Conditions
-            </Link>
-            .
-          </small>
-        )}
       </div>
     );
   }
@@ -133,12 +124,7 @@ class CreateSourceDialog extends React.Component {
     const { imageFolder } = this.props;
     return (
       <List.Item className="p-l-10 p-r-10 clickable" onClick={() => this.selectType(item)}>
-        <PreviewCard
+        <PreviewCard title={item.name} imageUrl={`${imageFolder}/${item.type}.png`} roundedImage={false}>
-          title={item.name}
-          imageUrl={`${imageFolder}/${item.type}.png`}
-          roundedImage={false}
-          data-test="PreviewItem"
-          data-test-type={item.type}>
           <i className="fa fa-angle-double-right" />
         </PreviewCard>
       </List.Item>
@@ -155,7 +141,7 @@ class CreateSourceDialog extends React.Component {
         footer={
           currentStep === StepEnum.SELECT_TYPE
             ? [
-                <Button key="cancel" onClick={() => dialog.dismiss()} data-test="CreateSourceCancelButton">
+                <Button key="cancel" onClick={() => dialog.dismiss()}>
                   Cancel
                 </Button>,
                 <Button key="submit" type="primary" disabled>
@@ -172,7 +158,7 @@ class CreateSourceDialog extends React.Component {
                   form="sourceForm"
                   type="primary"
                   loading={savingSource}
-                  data-test="CreateSourceSaveButton">
+                  data-test="CreateSourceButton">
                   Create
                 </Button>,
               ]

client/app/components/DialogWrapper.d.ts

@@ -1,30 +0,0 @@
-import { ModalProps } from "antd/lib/modal/Modal";
-
-export interface DialogProps<ROk, RCancel> {
-  props: ModalProps;
-  close: (result: ROk) => void;
-  dismiss: (result: RCancel) => void;
-}
-
-export type DialogWrapperChildProps<ROk, RCancel> = {
-  dialog: DialogProps<ROk, RCancel>;
-};
-
-export type DialogComponentType<ROk = void, P = {}, RCancel = void> = React.ComponentType<
-  DialogWrapperChildProps<ROk, RCancel> & P
->;
-
-export function wrap<ROk = void, P = {}, RCancel = void>(
-  DialogComponent: DialogComponentType<ROk, P, RCancel>
-): {
-  Component: DialogComponentType<ROk, P, RCancel>;
-  showModal: (
-    props?: P
-  ) => {
-    update: (props: P) => void;
-    onClose: (handler: (result: ROk) => Promise<void> | void) => void;
-    onDismiss: (handler: (result: RCancel) => Promise<void> | void) => void;
-    close: (result: ROk) => void;
-    dismiss: (result: RCancel) => void;
-  };
-};

client/app/components/DialogWrapper.jsx

@@ -14,10 +14,9 @@ import ReactDOM from "react-dom";
 
     {
       showModal: (dialogProps) => object({
+          result: Promise,
           close: (result) => void,
           dismiss: (reason) => void,
-          onClose: (handler) => this,
-          onDismiss: (handler) => this,
         }),
       Component: React.Component, // wrapped dialog component
     }
@@ -29,20 +28,15 @@ import ReactDOM from "react-dom";
 
     const dialog = SomeWrappedDialog.showModal({ greeting: 'Hello' })
 
-  To get result of modal, use `onClose`/`onDismiss` setters:
+  To get result of modal, use `result` property:
 
-    dialog
+    dialog.result
-      .onClose(result => { ... }) // pressed OK button or used `close` method
+      .then(...) // pressed OK button or used `close` method; resolved value is a result of dialog
-      .onDismiss(result => { ... }) // pressed Cancel button or used `dismiss` method
+      .catch(...) // pressed Cancel button or used `dismiss` method; optional argument is a rejection reason.
-
-  If `onClose`/`onDismiss` returns a promise - dialog wrapper will stop handling further close/dismiss
-  requests and will show loader on a corresponding button until that promise is fulfilled (either resolved or
-  rejected). If that promise will be rejected - dialog close/dismiss will be abandoned. Use promise returned
-  from `close`/`dismiss` methods to handle errors (if needed).
 
   Also, dialog has `close` and `dismiss` methods that allows to close dialog by caller. Passed arguments
-  will be passed to a corresponding handler. Both methods will return the promise returned from `onClose` and
+  will be used to resolve/reject `dialog.result` promise. `update` methods allows to pass new properties
- `onDismiss` callbacks. `update` method allows to pass new properties to dialog.
+  to dialog.
 
 
   Creating a dialog
@@ -94,6 +88,21 @@ import ReactDOM from "react-dom";
           <Modal {...dialog.props} onOk={() => this.customOkHandler()}>
         );
     }
+
+
+  Settings
+  ========
+
+  You can setup this wrapper to use custom `Promise` library (for example, Bluebird):
+
+    import DialogWrapper from 'path/to/DialogWrapper';
+    import Promise from 'bluebird';
+
+    DialogWrapper.Promise = Promise;
+
+  It could be useful to avoid `unhandledrejection` exception that would fire with native Promises,
+  or when some custom Promise library is used in application.
+
 */
 
 export const DialogPropType = PropTypes.shape({
@@ -107,12 +116,17 @@ export const DialogPropType = PropTypes.shape({
   dismiss: PropTypes.func.isRequired,
 });
 
+// default export of module
+const DialogWrapper = {
+  Promise,
+  DialogPropType,
+  wrap() {},
+};
+
 function openDialog(DialogComponent, props) {
   const dialog = {
     props: {
       visible: true,
-      okButtonProps: {},
-      cancelButtonProps: {},
       onOk: () => {},
       onCancel: () => {},
       afterClose: () => {},
@@ -121,11 +135,9 @@ function openDialog(DialogComponent, props) {
     dismiss: () => {},
   };
 
-  let pendingCloseTask = null;
+  const dialogResult = {
-
+    resolve: () => {},
-  const handlers = {
+    reject: () => {},
-    onClose: () => {},
-    onDismiss: () => {},
   };
 
   const container = document.createElement("div");
@@ -143,43 +155,16 @@ function openDialog(DialogComponent, props) {
     }, 10);
   }
 
-  function processDialogClose(result, setAdditionalDialogProps) {
-    dialog.props.okButtonProps = { disabled: true };
-    dialog.props.cancelButtonProps = { disabled: true };
-    setAdditionalDialogProps();
-    render();
-
-    return Promise.resolve(result)
-      .then(() => {
-        dialog.props.visible = false;
-      })
-      .finally(() => {
-        dialog.props.okButtonProps = {};
-        dialog.props.cancelButtonProps = {};
-        render();
-      });
-  }
-
   function closeDialog(result) {
-    if (!pendingCloseTask) {
+    dialogResult.resolve(result);
-      pendingCloseTask = processDialogClose(handlers.onClose(result), () => {
+    dialog.props.visible = false;
-        dialog.props.okButtonProps.loading = true;
+    render();
-      }).finally(() => {
-        pendingCloseTask = null;
-      });
-    }
-    return pendingCloseTask;
   }
 
-  function dismissDialog(result) {
+  function dismissDialog(reason) {
-    if (!pendingCloseTask) {
+    dialogResult.reject(reason);
-      pendingCloseTask = processDialogClose(handlers.onDismiss(result), () => {
+    dialog.props.visible = false;
-        dialog.props.cancelButtonProps.loading = true;
+    render();
-      }).finally(() => {
-        pendingCloseTask = null;
-      });
-    }
-    return pendingCloseTask;
   }
 
   dialog.props.onOk = closeDialog;
@@ -195,22 +180,20 @@ function openDialog(DialogComponent, props) {
       props = { ...props, ...newProps };
       render();
     },
-    onClose: handler => {
+    result: new DialogWrapper.Promise((resolve, reject) => {
-      if (isFunction(handler)) {
+      dialogResult.resolve = resolve;
-        handlers.onClose = handler;
+      dialogResult.reject = reject;
-      }
+    }),
-      return result;
-    },
-    onDismiss: handler => {
-      if (isFunction(handler)) {
-        handlers.onDismiss = handler;
-      }
-      return result;
-    },
   };
 
   render(); // show it only when all structures initialized to avoid unnecessary re-rendering
 
+  // Some known libraries support
+  // Bluebird: http://bluebirdjs.com/docs/api/suppressunhandledrejections.html
+  if (isFunction(result.result.suppressUnhandledRejections)) {
+    result.result.suppressUnhandledRejections();
+  }
+
   return result;
 }
 
@@ -221,7 +204,6 @@ export function wrap(DialogComponent) {
   };
 }
 
-export default {
+DialogWrapper.wrap = wrap;
-  DialogPropType,
+
-  wrap,
+export default DialogWrapper;
-};

client/app/components/DynamicComponent.jsx

@@ -1,4 +1,4 @@
-import { isFunction, isString, isUndefined } from "lodash";
+import { isFunction, isString } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
 
@@ -24,7 +24,6 @@ export function unregisterComponent(name) {
 export default class DynamicComponent extends React.Component {
   static propTypes = {
     name: PropTypes.string.isRequired,
-    fallback: PropTypes.node,
     children: PropTypes.node,
   };
 
@@ -41,11 +40,10 @@ export default class DynamicComponent extends React.Component {
   }
 
   render() {
-    const { name, children, fallback, ...props } = this.props;
+    const { name, children, ...props } = this.props;
     const RealComponent = componentsRegistry.get(name);
     if (!RealComponent) {
-      // return fallback if any, otherwise return children
+      return children;
-      return isUndefined(fallback) ? children : fallback;
     }
     return <RealComponent {...props}>{children}</RealComponent>;
   }

client/app/components/EditInPlace.jsx

@@ -11,10 +11,8 @@ export default class EditInPlace extends React.Component {
     placeholder: PropTypes.string,
     value: PropTypes.string,
     onDone: PropTypes.func.isRequired,
-    onStopEditing: PropTypes.func,
     multiline: PropTypes.bool,
     editorProps: PropTypes.object,
-    defaultEditing: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -22,22 +20,21 @@ export default class EditInPlace extends React.Component {
     isEditable: true,
     placeholder: "",
     value: "",
-    onStopEditing: () => {},
     multiline: false,
     editorProps: {},
-    defaultEditing: false,
   };
 
   constructor(props) {
     super(props);
     this.state = {
-      editing: props.defaultEditing,
+      editing: false,
     };
+    this.inputRef = React.createRef();
   }
 
   componentDidUpdate(_, prevState) {
-    if (!this.state.editing && prevState.editing) {
+    if (this.state.editing && !prevState.editing) {
-      this.props.onStopEditing();
+      this.inputRef.current.focus();
     }
   }
 
@@ -65,19 +62,14 @@ export default class EditInPlace extends React.Component {
     }
   };
 
-  renderNormal = () =>
+  renderNormal = () => (
-    this.props.value ? (
     <span
       role="presentation"
       onFocus={this.startEditing}
       onClick={this.startEditing}
       className={this.props.isEditable ? "editable" : ""}>
-        {this.props.value}
+      {this.props.value || this.props.placeholder}
     </span>
-    ) : (
-      <a className="clickable" onClick={this.startEditing}>
-        {this.props.placeholder}
-      </a>
   );
 
   renderEdit = () => {
@@ -85,10 +77,10 @@ export default class EditInPlace extends React.Component {
     const InputComponent = multiline ? Input.TextArea : Input;
     return (
       <InputComponent
+        ref={this.inputRef}
         defaultValue={value}
         onBlur={e => this.stopEditing(e.target.value)}
         onKeyDown={this.handleKeyDown}
-        autoFocus
         {...editorProps}
       />
     );

client/app/components/EditParameterSettingsDialog.jsx

@@ -1,5 +1,5 @@
-import { includes, words, capitalize, clone, isNull, map, get, find } from "lodash";
+import { includes, words, capitalize, clone, isNull } from "lodash";
-import React, { useState, useEffect, useRef, useMemo } from "react";
+import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import Checkbox from "antd/lib/checkbox";
 import Modal from "antd/lib/modal";
@@ -11,8 +11,6 @@ import Divider from "antd/lib/divider";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import QuerySelector from "@/components/QuerySelector";
 import { Query } from "@/services/query";
-import { QueryBasedParameterMappingType } from "@/services/parameters/QueryBasedDropdownParameter";
-import QueryBasedParameterMappingTable from "./query-based-parameter/QueryBasedParameterMappingTable";
 
 const { Option } = Select;
 const formItemProps = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
@@ -71,27 +69,17 @@ NameInput.propTypes = {
 function EditParameterSettingsDialog(props) {
   const [param, setParam] = useState(clone(props.parameter));
   const [isNameValid, setIsNameValid] = useState(true);
-  const [paramQuery, setParamQuery] = useState();
+  const [initialQuery, setInitialQuery] = useState();
-  const mappingParameters = useMemo(
-    () =>
-      map(paramQuery && paramQuery.getParametersDefs(), mappingParam => ({
-        mappingParam,
-        existingMapping: get(param.parameterMapping, mappingParam.name, {
-          mappingType: QueryBasedParameterMappingType.UNDEFINED,
-        }),
-      })),
-    [param.parameterMapping, paramQuery]
-  );
 
   const isNew = !props.parameter.name;
 
   // fetch query by id
-  const initialQueryId = useRef(props.parameter.queryId);
   useEffect(() => {
-    if (initialQueryId.current) {
+    const queryId = props.parameter.queryId;
-      Query.get({ id: initialQueryId.current }).then(setParamQuery);
+    if (queryId) {
+      Query.get({ id: queryId }).then(setInitialQuery);
     }
-  }, []);
+  }, [props.parameter.queryId]);
 
   function isFulfilled() {
     // name
@@ -105,20 +93,14 @@ function EditParameterSettingsDialog(props) {
     }
 
     // query
-    if (param.type === "query") {
+    if (param.type === "query" && !param.queryId) {
-      if (!param.queryId) {
       return false;
     }
 
-      if (find(mappingParameters, { existingMapping: { mappingType: QueryBasedParameterMappingType.UNDEFINED } })) {
-        return false;
-      }
-    }
-
     return true;
   }
 
-  function onConfirm() {
+  function onConfirm(e) {
     // update title to default
     if (!param.title) {
       // forced to do this cause param won't update in time for save
@@ -127,6 +109,8 @@ function EditParameterSettingsDialog(props) {
     }
 
     props.dialog.close(param);
+
+    e.preventDefault(); // stops form redirect
   }
 
   return (
@@ -148,7 +132,7 @@ function EditParameterSettingsDialog(props) {
           {isNew ? "Add Parameter" : "OK"}
         </Button>,
       ]}>
-      <Form layout="horizontal" onFinish={onConfirm} id="paramForm">
+      <Form layout="horizontal" onSubmit={onConfirm} id="paramForm">
         {isNew && (
           <NameInput
             name={param.name}
@@ -158,7 +142,7 @@ function EditParameterSettingsDialog(props) {
             type={param.type}
           />
         )}
-        <Form.Item required label="Title" {...formItemProps}>
+        <Form.Item label="Title" {...formItemProps}>
           <Input
             value={isNull(param.title) ? getDefaultTitle(param.name) : param.title}
             onChange={e => setParam({ ...param, title: e.target.value })}
@@ -205,28 +189,14 @@ function EditParameterSettingsDialog(props) {
           </Form.Item>
         )}
         {param.type === "query" && (
-          <Form.Item label="Query" help="Select query to load dropdown values from" required {...formItemProps}>
+          <Form.Item label="Query" help="Select query to load dropdown values from" {...formItemProps}>
             <QuerySelector
-              selectedQuery={paramQuery}
+              selectedQuery={initialQuery}
-              onChange={q => {
+              onChange={q => setParam({ ...param, queryId: q && q.id })}
-                if (q) {
-                  setParamQuery(q);
-                  setParam({ ...param, queryId: q.id, parameterMapping: {} });
-                }
-              }}
               type="select"
             />
           </Form.Item>
         )}
-        {param.type === "query" && paramQuery && paramQuery.hasParameters() && (
-          <Form.Item className="m-t-15 m-b-5" label="Parameters" required {...formItemProps}>
-            <QueryBasedParameterMappingTable
-              param={param}
-              mappingParameters={mappingParameters}
-              onChangeParam={setParam}
-            />
-          </Form.Item>
-        )}
         {(param.type === "enum" || param.type === "query") && (
           <Form.Item className="m-b-0" label=" " colon={false} {...formItemProps}>
             <Checkbox

client/app/components/EditParameterSettingsDialog/query-based-parameter/QueryBasedParameterMappingEditor.jsx

@@ -1,134 +0,0 @@
-import React, { useState, useEffect, useRef, useReducer } from "react";
-import PropTypes from "prop-types";
-import { values } from "lodash";
-import Button from "antd/lib/button";
-import Tooltip from "antd/lib/tooltip";
-import Radio from "antd/lib/radio";
-import Typography from "antd/lib/typography/Typography";
-import ParameterValueInput from "@/components/ParameterValueInput";
-import InputPopover from "@/components/InputPopover";
-import Form from "antd/lib/form";
-import { QueryBasedParameterMappingType } from "@/services/parameters/QueryBasedDropdownParameter";
-
-import QuestionCircleFilledIcon from "@ant-design/icons/QuestionCircleFilled";
-import EditOutlinedIcon from "@ant-design/icons/EditOutlined";
-
-const { Text } = Typography;
-
-const formItemProps = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
-export default function QueryBasedParameterMappingEditor({ parameter, mapping, searchAvailable, onChange }) {
-  const [showPopover, setShowPopover] = useState(false);
-  const [newMapping, setNewMapping] = useReducer((prevState, updates) => ({ ...prevState, ...updates }), mapping);
-
-  const newMappingRef = useRef(newMapping);
-  useEffect(() => {
-    if (
-      mapping.mappingType !== newMappingRef.current.mappingType ||
-      mapping.staticValue !== newMappingRef.current.staticValue
-    ) {
-      setNewMapping(mapping);
-    }
-  }, [mapping]);
-
-  const parameterRef = useRef(parameter);
-  useEffect(() => {
-    parameterRef.current.setValue(mapping.staticValue);
-  }, [mapping.staticValue]);
-
-  const onCancel = () => {
-    setNewMapping(mapping);
-    setShowPopover(false);
-  };
-
-  const onOk = () => {
-    onChange(newMapping);
-    setShowPopover(false);
-  };
-
-  let currentState = <Text type="secondary">Pick a type</Text>;
-  if (mapping.mappingType === QueryBasedParameterMappingType.DROPDOWN_SEARCH) {
-    currentState = "Dropdown Search";
-  } else if (mapping.mappingType === QueryBasedParameterMappingType.STATIC) {
-    currentState = `Value: ${mapping.staticValue}`;
-  }
-  return (
-    <>
-      {currentState}
-      <InputPopover
-        placement="left"
-        trigger="click"
-        header="Edit Parameter Source"
-        okButtonProps={{
-          disabled: newMapping.mappingType === QueryBasedParameterMappingType.STATIC && parameter.isEmpty,
-        }}
-        onOk={onOk}
-        onCancel={onCancel}
-        content={
-          <Form>
-            <Form.Item className="m-b-15" label="Source" {...formItemProps}>
-              <Radio.Group
-                value={newMapping.mappingType}
-                onChange={({ target }) => setNewMapping({ mappingType: target.value })}>
-                <Radio
-                  className="radio"
-                  value={QueryBasedParameterMappingType.DROPDOWN_SEARCH}
-                  disabled={!searchAvailable || parameter.type !== "text"}>
-                  Dropdown Search{" "}
-                  {(!searchAvailable || parameter.type !== "text") && (
-                    <Tooltip
-                      title={
-                        parameter.type !== "text"
-                          ? "Dropdown Search is only available for Text Parameters"
-                          : "There is already a parameter mapped with the Dropdown Search type."
-                      }>
-                      <QuestionCircleFilledIcon />
-                    </Tooltip>
-                  )}
-                </Radio>
-                <Radio className="radio" value={QueryBasedParameterMappingType.STATIC}>
-                  Static Value
-                </Radio>
-              </Radio.Group>
-            </Form.Item>
-            {newMapping.mappingType === QueryBasedParameterMappingType.STATIC && (
-              <Form.Item label="Value" required {...formItemProps}>
-                <ParameterValueInput
-                  type={parameter.type}
-                  value={parameter.normalizedValue}
-                  enumOptions={parameter.enumOptions}
-                  queryId={parameter.queryId}
-                  parameter={parameter}
-                  onSelect={value => {
-                    parameter.setValue(value);
-                    setNewMapping({ staticValue: parameter.getExecutionValue({ joinListValues: true }) });
-                  }}
-                />
-              </Form.Item>
-            )}
-          </Form>
-        }
-        visible={showPopover}
-        onVisibleChange={setShowPopover}>
-        <Button className="m-l-5" size="small" type="dashed">
-          <EditOutlinedIcon />
-        </Button>
-      </InputPopover>
-    </>
-  );
-}
-
-QueryBasedParameterMappingEditor.propTypes = {
-  parameter: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
-  mapping: PropTypes.shape({
-    mappingType: PropTypes.oneOf(values(QueryBasedParameterMappingType)),
-    staticValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  }),
-  searchAvailable: PropTypes.bool,
-  onChange: PropTypes.func,
-};
-
-QueryBasedParameterMappingEditor.defaultProps = {
-  mapping: { mappingType: QueryBasedParameterMappingType.UNDEFINED, staticValue: undefined },
-  searchAvailable: false,
-  onChange: () => {},
-};

client/app/components/EditParameterSettingsDialog/query-based-parameter/QueryBasedParameterMappingTable.jsx

@@ -1,56 +0,0 @@
-import React from "react";
-import { findKey } from "lodash";
-import PropTypes from "prop-types";
-import Table from "antd/lib/table";
-import { QueryBasedParameterMappingType } from "@/services/parameters/QueryBasedDropdownParameter";
-import QueryBasedParameterMappingEditor from "./QueryBasedParameterMappingEditor";
-
-export default function QueryBasedParameterMappingTable({ param, mappingParameters, onChangeParam }) {
-  return (
-    <Table
-      dataSource={mappingParameters}
-      size="middle"
-      pagination={false}
-      rowKey={({ mappingParam }) => `param${mappingParam.name}`}>
-      <Table.Column title="Title" key="title" render={({ mappingParam }) => mappingParam.getTitle()} />
-      <Table.Column
-        title="Keyword"
-        key="keyword"
-        className="keyword"
-        render={({ mappingParam }) => <code>{`{{ ${mappingParam.name} }}`}</code>}
-      />
-      <Table.Column
-        title="Value Source"
-        key="source"
-        render={({ mappingParam, existingMapping }) => (
-          <QueryBasedParameterMappingEditor
-            parameter={mappingParam.setValue(existingMapping.staticValue)}
-            mapping={existingMapping}
-            searchAvailable={
-              !findKey(param.parameterMapping, {
-                mappingType: QueryBasedParameterMappingType.DROPDOWN_SEARCH,
-              }) || existingMapping.mappingType === QueryBasedParameterMappingType.DROPDOWN_SEARCH
-            }
-            onChange={mapping =>
-              onChangeParam({
-                ...param,
-                parameterMapping: { ...param.parameterMapping, [mappingParam.name]: mapping },
-              })
-            }
-          />
-        )}
-      />
-    </Table>
-  );
-}
-
-QueryBasedParameterMappingTable.propTypes = {
-  param: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
-  mappingParameters: PropTypes.arrayOf(PropTypes.object), // eslint-disable-line react/forbid-prop-types
-  onChangeParam: PropTypes.func,
-};
-
-QueryBasedParameterMappingTable.defaultProps = {
-  mappingParameters: [],
-  onChangeParam: () => {},
-};

client/app/components/EditVisualizationButton/QueryControlDropdown.jsx

@@ -3,13 +3,7 @@ import PropTypes from "prop-types";
 import Dropdown from "antd/lib/dropdown";
 import Menu from "antd/lib/menu";
 import Button from "antd/lib/button";
-import { clientConfig } from "@/services/auth";
+import Icon from "antd/lib/icon";
-
-import PlusCircleFilledIcon from "@ant-design/icons/PlusCircleFilled";
-import ShareAltOutlinedIcon from "@ant-design/icons/ShareAltOutlined";
-import FileOutlinedIcon from "@ant-design/icons/FileOutlined";
-import FileExcelOutlinedIcon from "@ant-design/icons/FileExcelOutlined";
-import EllipsisOutlinedIcon from "@ant-design/icons/EllipsisOutlined";
 
 import QueryResultsLink from "./QueryResultsLink";
 
@@ -19,14 +13,14 @@ export default function QueryControlDropdown(props) {
       {!props.query.isNew() && (!props.query.is_draft || !props.query.is_archived) && (
         <Menu.Item>
           <a target="_self" onClick={() => props.openAddToDashboardForm(props.selectedTab)}>
-            <PlusCircleFilledIcon /> Add to Dashboard
+            <Icon type="plus-circle" theme="filled" /> Add to Dashboard
           </a>
         </Menu.Item>
       )}
-      {!clientConfig.disablePublicUrls && !props.query.isNew() && (
+      {!props.query.isNew() && (
         <Menu.Item>
           <a onClick={() => props.showEmbedDialog(props.query, props.selectedTab)} data-test="ShowEmbedDialogButton">
-            <ShareAltOutlinedIcon /> Embed Elsewhere
+            <Icon type="share-alt" /> Embed Elsewhere
           </a>
         </Menu.Item>
       )}
@@ -38,7 +32,7 @@ export default function QueryControlDropdown(props) {
           queryResult={props.queryResult}
           embed={props.embed}
           apiKey={props.apiKey}>
-          <FileOutlinedIcon /> Download as CSV File
+          <Icon type="file" /> Download as CSV File
         </QueryResultsLink>
       </Menu.Item>
       <Menu.Item>
@@ -49,7 +43,7 @@ export default function QueryControlDropdown(props) {
           queryResult={props.queryResult}
           embed={props.embed}
           apiKey={props.apiKey}>
-          <FileOutlinedIcon /> Download as TSV File
+          <Icon type="file" /> Download as TSV File
         </QueryResultsLink>
       </Menu.Item>
       <Menu.Item>
@@ -60,7 +54,7 @@ export default function QueryControlDropdown(props) {
           queryResult={props.queryResult}
           embed={props.embed}
           apiKey={props.apiKey}>
-          <FileExcelOutlinedIcon /> Download as Excel File
+          <Icon type="file-excel" /> Download as Excel File
         </QueryResultsLink>
       </Menu.Item>
     </Menu>
@@ -69,7 +63,7 @@ export default function QueryControlDropdown(props) {
   return (
     <Dropdown trigger={["click"]} overlay={menu} overlayClassName="query-control-dropdown-overlay">
       <Button data-test="QueryControlDropdownButton">
-        <EllipsisOutlinedIcon rotate={90} />
+        <Icon type="ellipsis" rotate={90} />
       </Button>
     </Dropdown>
   );

client/app/components/EditVisualizationButton/QueryResultsLink.jsx

@@ -1,6 +1,5 @@
 import React from "react";
 import PropTypes from "prop-types";
-import Link from "@/components/Link";
 
 export default function QueryResultsLink(props) {
   let href = "";
@@ -18,9 +17,9 @@ export default function QueryResultsLink(props) {
   }
 
   return (
-    <Link target="_blank" rel="noopener noreferrer" disabled={props.disabled} href={href} download>
+    <a target="_blank" rel="noopener noreferrer" disabled={props.disabled} href={href} download>
       {props.children}
-    </Link>
+    </a>
   );
 }
 

client/app/components/EditVisualizationButton/index.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
 import Button from "antd/lib/button";
-import FormOutlinedIcon from "@ant-design/icons/FormOutlined";
+import Icon from "antd/lib/icon";
 
 export default function EditVisualizationButton(props) {
   return (
@@ -9,7 +9,7 @@ export default function EditVisualizationButton(props) {
       data-test="EditVisualization"
       className="edit-visualization"
       onClick={() => props.openVisualizationEditor(props.selectedTab)}>
-      <FormOutlinedIcon />
+      <Icon type="form" />
       <span className="hidden-xs hidden-s hidden-m">Edit Visualization</span>
     </Button>
   );

client/app/components/ErrorBoundary.jsx

@@ -44,9 +44,6 @@ export default class ErrorBoundary extends React.Component {
   handleError = error => {
     this.setState(this.constructor.getDerivedStateFromError(error));
     this.componentDidCatch(error, null);
-    if (isFunction(window.handleException)) {
-      window.handleException(error);
-    }
   };
 
   reset = () => {

client/app/components/Filters.jsx

@@ -74,7 +74,7 @@ function Filters({ filters, onChange }) {
   onChange = createFilterChangeHandler(filters, onChange);
 
   return (
-    <div className="filters-wrapper" data-test="Filters">
+    <div className="filters-wrapper">
       <div className="container bg-white">
         <div className="row">
           {map(filters, filter => {
@@ -83,10 +83,7 @@ function Filters({ filters, onChange }) {
             ));
 
             return (
-              <div
+              <div key={filter.name} className="col-sm-6 p-l-0 filter-container">
-                key={filter.name}
-                className="col-sm-6 p-l-0 filter-container"
-                data-test={`FilterName-${filter.name}`}>
                 <label>{filter.friendlyName}</label>
                 {options.length === 0 && <Select className="w-100" disabled value="No values" />}
                 {options.length > 0 && (
@@ -105,17 +102,14 @@ function Filters({ filters, onChange }) {
                     allowClear={filter.multiple}
                     optionFilterProp="children"
                     showSearch
-                    maxTagCount={3}
-                    maxTagTextLength={10}
-                    maxTagPlaceholder={num => `+${num.length} more`}
                     onChange={values => onChange(filter, values)}>
                     {!filter.multiple && options}
                     {filter.multiple && [
-                      <Select.Option key={NONE_VALUES} data-test="ClearOption">
+                      <Select.Option key={NONE_VALUES}>
                         <i className="fa fa-square-o m-r-5" />
                         Clear
                       </Select.Option>,
-                      <Select.Option key={ALL_VALUES} data-test="SelectAllOption">
+                      <Select.Option key={ALL_VALUES}>
                         <i className="fa fa-check-square-o m-r-5" />
                         Select All
                       </Select.Option>,

client/app/components/HelpTrigger.jsx

@@ -1,13 +1,12 @@
-import { startsWith, get, some, mapValues } from "lodash";
+import { startsWith } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
 import cx from "classnames";
 import Tooltip from "antd/lib/tooltip";
 import Drawer from "antd/lib/drawer";
-import Link from "@/components/Link";
+import Icon from "antd/lib/icon";
-import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
 import BigMessage from "@/components/BigMessage";
-import DynamicComponent, { registerComponent } from "@/components/DynamicComponent";
+import DynamicComponent from "@/components/DynamicComponent";
 
 import "./HelpTrigger.less";
 
@@ -16,8 +15,7 @@ const HELP_PATH = "/help";
 const IFRAME_TIMEOUT = 20000;
 const IFRAME_URL_UPDATE_MESSAGE = "iframe_url";
 
-export const TYPES = mapValues(
+export const TYPES = {
-  {
   HOME: ["", "Help"],
   VALUE_SOURCE_OPTIONS: ["/user-guide/querying/query-parameters#Value-Source-Options", "Guide: Value Source Options"],
   SHARE_DASHBOARD: ["/user-guide/dashboards/sharing-dashboards", "Guide: Sharing and Embedding Dashboards"],
@@ -27,10 +25,7 @@ export const TYPES = mapValues(
   DS_BIGQUERY: ["/data-sources/bigquery-setup", "Guide: Help Setting up BigQuery"],
   DS_URL: ["/data-sources/querying-urls", "Guide: Help Setting up URL"],
   DS_MONGODB: ["/data-sources/mongodb-setup", "Guide: Help Setting up MongoDB"],
-    DS_GOOGLE_SPREADSHEETS: [
+  DS_GOOGLE_SPREADSHEETS: ["/data-sources/querying-a-google-spreadsheet", "Guide: Help Setting up Google Spreadsheets"],
-      "/data-sources/querying-a-google-spreadsheet",
-      "Guide: Help Setting up Google Spreadsheets",
-    ],
   DS_GOOGLE_ANALYTICS: ["/data-sources/google-analytics-setup", "Guide: Help Setting up Google Analytics"],
   DS_AXIBASETSD: ["/data-sources/axibase-time-series-database", "Guide: Help Setting up Axibase Time Series"],
   DS_RESULTS: ["/user-guide/querying/query-results-data-source", "Guide: Help Setting up Query Results"],
@@ -43,43 +38,22 @@ export const TYPES = mapValues(
     "Guide: Managing Query Permissions",
   ],
   NUMBER_FORMAT_SPECS: ["/user-guide/visualizations/formatting-numbers", "Formatting Numbers"],
-    GETTING_STARTED: ["/user-guide/getting-started", "Guide: Getting Started"],
+};
-    DASHBOARDS: ["/user-guide/dashboards", "Guide: Dashboards"],
-    QUERIES: ["/help/user-guide/querying", "Guide: Queries"],
-    ALERTS: ["/user-guide/alerts", "Guide: Alerts"],
-  },
-  ([url, title]) => [DOMAIN + HELP_PATH + url, title]
-);
 
-const HelpTriggerPropTypes = {
+export default class HelpTrigger extends React.Component {
-  type: PropTypes.string,
+  static propTypes = {
-  href: PropTypes.string,
+    type: PropTypes.oneOf(Object.keys(TYPES)).isRequired,
-  title: PropTypes.node,
     className: PropTypes.string,
     showTooltip: PropTypes.bool,
-  renderAsLink: PropTypes.bool,
     children: PropTypes.node,
   };
 
-const HelpTriggerDefaultProps = {
+  static defaultProps = {
-  type: null,
-  href: null,
-  title: null,
     className: null,
     showTooltip: true,
-  renderAsLink: false,
     children: <i className="fa fa-question-circle" />,
   };
 
-export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName = null) {
-  return class HelpTrigger extends React.Component {
-    static propTypes = {
-      ...HelpTriggerPropTypes,
-      type: PropTypes.oneOf(Object.keys(types)),
-    };
-
-    static defaultProps = HelpTriggerDefaultProps;
-
   iframeRef = React.createRef();
 
   iframeLoadingTimeout = null;
@@ -116,7 +90,7 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
   };
 
   onPostMessageReceived = event => {
-      if (!some(allowedDomains, domain => startsWith(event.origin, domain))) {
+    if (!startsWith(event.origin, DOMAIN)) {
       return;
     }
 
@@ -128,19 +102,13 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
     this.setState({ currentUrl });
   };
 
-    getUrl = () => {
+  openDrawer = () => {
-      const helpTriggerType = get(types, this.props.type);
-      return helpTriggerType ? helpTriggerType[0] : this.props.href;
-    };
-
-    openDrawer = e => {
-      // keep "open in new tab" behavior
-      if (!e.shiftKey && !e.ctrlKey && !e.metaKey) {
-        e.preventDefault();
     this.setState({ visible: true });
+    const [pagePath] = TYPES[this.props.type];
+    const url = DOMAIN + HELP_PATH + pagePath;
+
     // wait for drawer animation to complete so there's no animation jank
-        setTimeout(() => this.loadIframe(this.getUrl()), 300);
+    setTimeout(() => this.loadIframe(url), 300);
-      }
   };
 
   closeDrawer = event => {
@@ -152,43 +120,23 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
   };
 
   render() {
-      const targetUrl = this.getUrl();
+    const [, tooltip] = TYPES[this.props.type];
-      if (!targetUrl) {
-        return null;
-      }
-
-      const tooltip = get(types, `${this.props.type}[1]`, this.props.title);
     const className = cx("help-trigger", this.props.className);
     const url = this.state.currentUrl;
-      const isAllowedDomain = some(allowedDomains, domain => startsWith(url || targetUrl, domain));
-      const shouldRenderAsLink = this.props.renderAsLink || !isAllowedDomain;
 
     return (
       <React.Fragment>
-          <Tooltip
+        <Tooltip title={this.props.showTooltip ? tooltip : null}>
-            title={
+          <a onClick={this.openDrawer} className={className}>
-              this.props.showTooltip ? (
-                <>
-                  {tooltip}
-                  {shouldRenderAsLink && <i className="fa fa-external-link" style={{ marginLeft: 5 }} />}
-                </>
-              ) : null
-            }>
-            <Link
-              href={url || this.getUrl()}
-              className={className}
-              rel="noopener noreferrer"
-              target="_blank"
-              onClick={shouldRenderAsLink ? () => {} : this.openDrawer}>
             {this.props.children}
-            </Link>
+          </a>
         </Tooltip>
         <Drawer
           placement="right"
           closable={false}
           onClose={this.closeDrawer}
           visible={this.state.visible}
-            className={cx("help-drawer", drawerClassName)}
+          className="help-drawer"
           destroyOnClose
           width={400}>
           <div className="drawer-wrapper">
@@ -196,14 +144,14 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
               {url && (
                 <Tooltip title="Open page in a new window" placement="left">
                   {/* eslint-disable-next-line react/jsx-no-target-blank */}
-                    <Link href={url} target="_blank">
+                  <a href={url} target="_blank">
                     <i className="fa fa-external-link" />
-                    </Link>
+                  </a>
                 </Tooltip>
               )}
               <Tooltip title="Close" placement="bottom">
-                  <a onClick={this.closeDrawer}>
+                <a href="#" onClick={this.closeDrawer}>
-                    <CloseOutlinedIcon />
+                  <Icon type="close" />
                 </a>
               </Tooltip>
             </div>
@@ -212,7 +160,7 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
             {!this.state.error && (
               <iframe
                 ref={this.iframeRef}
-                  title="Usage Help"
+                title="Redash Help"
                 src="about:blank"
                 className={cx({ ready: !this.state.loading })}
                 onLoad={this.onIframeLoaded}
@@ -230,9 +178,9 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
                 Something went wrong.
                 <br />
                 {/* eslint-disable-next-line react/jsx-no-target-blank */}
-                  <Link href={this.state.error} target="_blank" rel="noopener">
+                <a href={this.state.error} target="_blank" rel="noopener">
                   Click here
-                  </Link>{" "}
+                </a>{" "}
                 to open the page in a new window.
               </BigMessage>
             )}
@@ -244,14 +192,4 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
       </React.Fragment>
     );
   }
-  };
 }
-
-registerComponent("HelpTrigger", helpTriggerWithTypes(TYPES, [DOMAIN]));
-
-export default function HelpTrigger(props) {
-  return <DynamicComponent {...props} name="HelpTrigger" />;
-}
-
-HelpTrigger.propTypes = HelpTriggerPropTypes;
-HelpTrigger.defaultProps = HelpTriggerDefaultProps;

client/app/components/HelpTrigger.less

@@ -1,4 +1,4 @@
-@import "~antd/lib/drawer/style/drawer";
+@import '~antd/lib/drawer/style/drawer';
 
 @help-doc-bg: #f7f7f7; // according to https://github.com/getredash/website/blob/13daff2d8b570956565f482236f6245042e8477f/src/scss/_components/_variables.scss#L15
 
@@ -34,7 +34,7 @@
     top: 13px;
     right: 13px;
     border-radius: 3px;
-    background: rgba(@help-doc-bg, 0.75); // makes it dissolve over help doc bg
+    background: rgba(@help-doc-bg, .75); // makes it dissolve over help doc bg
     border: 2px solid @help-doc-bg;
     display: flex;
 
@@ -47,7 +47,6 @@
       color: @text-color-secondary;
       transition: color @animation-duration-slow;
       position: relative;
-      cursor: pointer;
 
       &:hover {
         color: @icon-color-hover;
@@ -66,13 +65,13 @@
 
       // divider
       &:not(:first-child):before {
-        content: "";
+        content: '';
         position: absolute;
         width: 1px;
         height: 9px;
         left: 0;
         top: 9px;
-        border-left: 1px dotted rgba(0, 0, 0, 0.12);
+        border-left: 1px dotted rgba(0,0,0,.12);
       }
     }
   }

client/app/components/HtmlContent.jsx

@@ -1,15 +1,15 @@
 import React from "react";
 import PropTypes from "prop-types";
-import sanitize from "@/services/sanitize";
+import { sanitize } from "dompurify";
 
-const HtmlContent = React.memo(function HtmlContent({ children, ...props }) {
+export default function HtmlContent({ children, ...props }) {
   return (
     <div
       {...props}
       dangerouslySetInnerHTML={{ __html: sanitize(children) }} // eslint-disable-line react/no-danger
     />
   );
-});
+}
 
 HtmlContent.propTypes = {
   children: PropTypes.string,
@@ -18,5 +18,3 @@ HtmlContent.propTypes = {
 HtmlContent.defaultProps = {
   children: "",
 };
-
-export default HtmlContent;

client/app/components/InputPopover/index.jsx

@@ -1,57 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-import Button from "antd/lib/button";
-import Popover from "antd/lib/popover";
-
-import "./index.less";
-
-export default function InputPopover({
-  header,
-  content,
-  children,
-  okButtonProps,
-  cancelButtonProps,
-  onCancel,
-  onOk,
-  ...props
-}) {
-  return (
-    <Popover
-      {...props}
-      content={
-        <div className="input-popover-content" data-test="InputPopoverContent">
-          {header && <header>{header}</header>}
-          {content}
-          <footer>
-            <Button onClick={onCancel} {...cancelButtonProps}>
-              Cancel
-            </Button>
-            <Button onClick={onOk} type="primary" {...okButtonProps}>
-              OK
-            </Button>
-          </footer>
-        </div>
-      }>
-      {children}
-    </Popover>
-  );
-}
-
-InputPopover.propTypes = {
-  header: PropTypes.node,
-  content: PropTypes.node,
-  children: PropTypes.node,
-  okButtonProps: PropTypes.object,
-  cancelButtonProps: PropTypes.object,
-  onOk: PropTypes.func,
-  onCancel: PropTypes.func,
-};
-
-InputPopover.defaultProps = {
-  header: null,
-  children: null,
-  okButtonProps: null,
-  cancelButtonProps: null,
-  onOk: () => {},
-  onCancel: () => {},
-};

client/app/components/InputPopover/index.less

@@ -1,37 +0,0 @@
-@import "~antd/lib/modal/style/index"; // for ant @vars
-
-.input-popover-content {
-  width: 390px;
-
-  .radio {
-    display: block;
-    height: 30px;
-    line-height: 30px;
-  }
-
-  .form-item {
-    margin-bottom: 10px;
-  }
-
-  header {
-    padding: 0 16px 10px;
-    margin: 0 -16px 20px;
-    border-bottom: @border-width-base @border-style-base @border-color-split;
-    font-size: @font-size-lg;
-    font-weight: 500;
-    color: @heading-color;
-    display: flex;
-    justify-content: space-between;
-  }
-
-  footer {
-    border-top: @border-width-base @border-style-base @border-color-split;
-    padding: 10px 16px 0;
-    margin: 0 -16px;
-    text-align: right;
-
-    button {
-      margin-left: 8px;
-    }
-  }
-}

client/app/components/InputWithCopy.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import Input from "antd/lib/input";
-import CopyOutlinedIcon from "@ant-design/icons/CopyOutlined";
+import Icon from "antd/lib/icon";
 import Tooltip from "antd/lib/tooltip";
 
 export default class InputWithCopy extends React.Component {
@@ -42,7 +42,7 @@ export default class InputWithCopy extends React.Component {
   render() {
     const copyButton = (
       <Tooltip title={this.state.copied || "Copy"}>
-        <CopyOutlinedIcon style={{ cursor: "pointer" }} onClick={this.copy} />
+        <Icon type="copy" style={{ cursor: "pointer" }} onClick={this.copy} />
       </Tooltip>
     );
 

client/app/components/Link.jsx

@@ -1,26 +0,0 @@
-import React from "react";
-import Button from "antd/lib/button";
-
-function DefaultLinkComponent(props) {
-  return <a {...props} />; // eslint-disable-line jsx-a11y/anchor-has-content
-}
-
-function Link(props) {
-  return <Link.Component {...props} />;
-}
-
-Link.Component = DefaultLinkComponent;
-
-function DefaultButtonLinkComponent(props) {
-  return <Button role="button" {...props} />;
-}
-
-function ButtonLink(props) {
-  return <ButtonLink.Component {...props} />;
-}
-
-ButtonLink.Component = DefaultButtonLinkComponent;
-
-Link.Button = ButtonLink;
-
-export default Link;

client/app/components/NoTaggedObjectsFound.jsx

@@ -7,7 +7,7 @@ export default function NoTaggedObjectsFound({ objectType, tags }) {
   return (
     <BigMessage icon="fa-tags">
       No {objectType} found tagged with&nbsp;
-      <TagsControl className="inline-tags-control" tags={Array.from(tags)} tagSeparator={"+"} />.
+      <TagsControl className="inline-tags-control" tags={Array.from(tags)} />.
     </BigMessage>
   );
 }

client/app/components/PageHeader.jsx

@@ -0,0 +1,16 @@
+import React from "react";
+import PropTypes from "prop-types";
+
+export default function PageHeader({ title }) {
+  return (
+    <div className="page-header-wrapper row p-l-15 p-r-15 m-b-10 m-l-0 m-r-0">
+      <div className="col-sm-9 p-l-0 p-r-0">
+        <h3>{title}</h3>
+      </div>
+    </div>
+  );
+}
+
+PageHeader.propTypes = {
+  title: PropTypes.string.isRequired,
+};

client/app/components/PageHeader/index.jsx

@@ -1,23 +0,0 @@
-import React from "react";
-import PropTypes from "prop-types";
-
-import "./index.less";
-
-export default function PageHeader({ title, actions }) {
-  return (
-    <div className="page-header-wrapper">
-      <h3>{title}</h3>
-      {actions && <div className="page-header-actions">{actions}</div>}
-    </div>
-  );
-}
-
-PageHeader.propTypes = {
-  title: PropTypes.string,
-  actions: PropTypes.node,
-};
-
-PageHeader.defaultProps = {
-  title: "",
-  actions: null,
-};

client/app/components/PageHeader/index.less

@@ -1,20 +0,0 @@
-.page-header-wrapper {
-  margin: 15px 0 10px 0;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-items: center;
-  justify-content: stretch;
-
-  h3 {
-    margin: 0;
-    line-height: 1.3;
-    font-weight: 500;
-    flex: 1 1 auto;
-  }
-
-  .page-header-actions {
-    flex: 0 0 auto;
-    padding: 0 0 0 15px;
-  }
-}

client/app/components/Paginator.jsx

@@ -2,38 +2,24 @@ import React from "react";
 import PropTypes from "prop-types";
 import Pagination from "antd/lib/pagination";
 
-const MIN_ITEMS_PER_PAGE = 5;
+export default function Paginator({ page, itemsPerPage, totalCount, onChange }) {
-
+  if (totalCount <= itemsPerPage) {
-export default function Paginator({ page, showPageSizeSelect, pageSize, onPageSizeChange, totalCount, onChange }) {
-  if (totalCount <= (showPageSizeSelect ? MIN_ITEMS_PER_PAGE : pageSize)) {
     return null;
   }
   return (
     <div className="paginator-container">
-      <Pagination
+      <Pagination defaultCurrent={page} defaultPageSize={itemsPerPage} total={totalCount} onChange={onChange} />
-        showSizeChanger={showPageSizeSelect}
-        pageSizeOptions={["5", "10", "20", "50", "100"]}
-        onShowSizeChange={(_, size) => onPageSizeChange(size)}
-        defaultCurrent={page}
-        pageSize={pageSize}
-        total={totalCount}
-        onChange={onChange}
-      />
     </div>
   );
 }
 
 Paginator.propTypes = {
   page: PropTypes.number.isRequired,
-  showPageSizeSelect: PropTypes.bool,
+  itemsPerPage: PropTypes.number.isRequired,
-  pageSize: PropTypes.number.isRequired,
   totalCount: PropTypes.number.isRequired,
-  onPageSizeChange: PropTypes.func,
   onChange: PropTypes.func,
 };
 
 Paginator.defaultProps = {
-  showPageSizeSelect: false,
   onChange: () => {},
-  onPageSizeChange: () => {},
 };

client/app/components/ParameterMappingInput.jsx

@@ -8,6 +8,7 @@ import Select from "antd/lib/select";
 import Table from "antd/lib/table";
 import Popover from "antd/lib/popover";
 import Button from "antd/lib/button";
+import Icon from "antd/lib/icon";
 import Tag from "antd/lib/tag";
 import Input from "antd/lib/input";
 import Radio from "antd/lib/radio";
@@ -17,15 +18,11 @@ import ParameterValueInput from "@/components/ParameterValueInput";
 import { ParameterMappingType } from "@/services/widget";
 import { Parameter, cloneParameter } from "@/services/parameters";
 import HelpTrigger from "@/components/HelpTrigger";
-import InputPopover from "@/components/InputPopover";
-
-import QuestionCircleFilledIcon from "@ant-design/icons/QuestionCircleFilled";
-import EditOutlinedIcon from "@ant-design/icons/EditOutlined";
-import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
-import CheckOutlinedIcon from "@ant-design/icons/CheckOutlined";
 
 import "./ParameterMappingInput.less";
 
+const { Option } = Select;
+
 export const MappingType = {
   DashboardAddNew: "dashboard-add-new",
   DashboardMapToExisting: "dashboard-map-to-existing",
@@ -184,7 +181,7 @@ export class ParameterMappingInput extends React.Component {
           Existing dashboard parameter{" "}
           {noExisting ? (
             <Tooltip title="There are no dashboard parameters corresponding to this data type">
-              <QuestionCircleFilledIcon />
+              <Icon type="question-circle" theme="filled" />
             </Tooltip>
           ) : null}
         </Radio>
@@ -207,9 +204,19 @@ export class ParameterMappingInput extends React.Component {
 
   renderDashboardMapToExisting() {
     const { mapping, existingParamNames } = this.props;
-    const options = map(existingParamNames, paramName => ({ label: paramName, value: paramName }));
 
-    return <Select value={mapping.mapTo} onChange={mapTo => this.updateParamMapping({ mapTo })} options={options} />;
+    return (
+      <Select
+        value={mapping.mapTo}
+        onChange={mapTo => this.updateParamMapping({ mapTo })}
+        dropdownMatchSelectWidth={false}>
+        {map(existingParamNames, name => (
+          <Option value={name} key={name}>
+            {name}
+          </Option>
+        ))}
+      </Select>
+    );
   }
 
   renderStaticValue() {
@@ -314,34 +321,43 @@ class MappingEditor extends React.Component {
     this.setState({ visible: false });
   };
 
-  render() {
+  renderContent() {
-    const { visible, mapping, inputError } = this.state;
+    const { mapping, inputError } = this.state;
+
     return (
-      <InputPopover
+      <div className="parameter-mapping-editor" data-test="EditParamMappingPopover">
-        placement="left"
+        <header>
-        trigger="click"
-        header={
-          <>
           Edit Source and Value <HelpTrigger type="VALUE_SOURCE_OPTIONS" />
-          </>
+        </header>
-        }
-        content={
         <ParameterMappingInput
           mapping={mapping}
           existingParamNames={this.props.existingParamNames}
           onChange={this.onChange}
           inputError={inputError}
         />
+        <footer>
+          <Button onClick={this.hide}>Cancel</Button>
+          <Button onClick={this.save} disabled={!!inputError} type="primary">
+            OK
+          </Button>
+        </footer>
+      </div>
+    );
   }
-        onOk={this.save}
+
-        onCancel={this.hide}
+  render() {
-        okButtonProps={{ disabled: !!inputError }}
+    const { visible, mapping } = this.state;
+    return (
+      <Popover
+        placement="left"
+        trigger="click"
+        content={this.renderContent()}
         visible={visible}
         onVisibleChange={this.onVisibleChange}>
-        <Button size="small" type="dashed" data-test={`EditParamMappingButton-${mapping.param.name}`}>
+        <Button size="small" type="dashed" data-test={`EditParamMappingButon-${mapping.param.name}`}>
-          <EditOutlinedIcon />
+          <Icon type="edit" />
         </Button>
-      </InputPopover>
+      </Popover>
     );
   }
 }
@@ -418,10 +434,10 @@ class TitleEditor extends React.Component {
           autoFocus
         />
         <Button size="small" type="dashed" onClick={this.hide}>
-          <CloseOutlinedIcon />
+          <Icon type="close" />
         </Button>
         <Button size="small" type="dashed" onClick={this.save}>
-          <CheckOutlinedIcon />
+          <Icon type="check" />
         </Button>
       </div>
     );
@@ -444,7 +460,7 @@ class TitleEditor extends React.Component {
         visible={this.state.showPopup}
         onVisibleChange={this.onPopupVisibleChange}>
         <Button size="small" type="dashed">
-          <EditOutlinedIcon />
+          <Icon type="edit" />
         </Button>
       </Popover>
     );

client/app/components/ParameterMappingInput.less

@@ -1,4 +1,4 @@
-@import "~antd/lib/modal/style/index"; // for ant @vars
+@import '~antd/lib/modal/style/index'; // for ant @vars
 
 .parameters-mapping-list {
   .keyword {
@@ -22,13 +22,48 @@
   }
 }
 
+.parameter-mapping-editor {
+  width: 390px;
+
+  .radio {
+    display: block;
+    height: 30px;
+    line-height: 30px;
+  }
+
+  .form-item {
+    margin-bottom: 10px;
+  }
+
+  header {
+    padding: 0 16px 10px;
+    margin: 0 -16px 20px;
+    border-bottom: @border-width-base @border-style-base @border-color-split;
+    font-size: @font-size-lg;
+    font-weight: 500;
+    color: @heading-color;
+    display: flex;
+    justify-content: space-between;
+  }
+
+  footer {
+    border-top: @border-width-base @border-style-base @border-color-split;
+    padding: 10px 16px 0;
+    margin: 0 -16px;
+    text-align: right;
+
+    button {
+      margin-left: 8px;
+    }
+  }
+}
+
 .parameter-mapping-title {
   .text {
     margin-right: 3px;
   }
 
-  &.disabled,
+  &.disabled, .fa {
-  .fa {
     color: #a4a4a4;
   }
 

client/app/components/ParameterValueInput.jsx

@@ -1,7 +1,7 @@
-import { isEqual, isEmpty, map } from "lodash";
+import { isEqual } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
-import SelectWithVirtualScroll from "@/components/SelectWithVirtualScroll";
+import Select from "antd/lib/select";
 import Input from "antd/lib/input";
 import InputNumber from "antd/lib/input-number";
 import DateParameter from "@/components/dynamic-parameters/DateParameter";
@@ -10,6 +10,8 @@ import QueryBasedParameterInput from "./QueryBasedParameterInput";
 
 import "./ParameterValueInput.less";
 
+const { Option } = Select;
+
 const multipleValuesProps = {
   maxTagCount: 3,
   maxTagTextLength: 10,
@@ -96,20 +98,26 @@ class ParameterValueInput extends React.Component {
     const enumOptionsArray = enumOptions.split("\n").filter(v => v !== "");
     // Antd Select doesn't handle null in multiple mode
     const normalize = val => (parameter.multiValuesOptions && val === null ? [] : val);
-
     return (
-      <SelectWithVirtualScroll
+      <Select
         className={this.props.className}
         mode={parameter.multiValuesOptions ? "multiple" : "default"}
         optionFilterProp="children"
+        disabled={enumOptionsArray.length === 0}
         value={normalize(value)}
         onChange={this.onSelect}
-        options={map(enumOptionsArray, opt => ({ label: String(opt), value: opt }))}
+        dropdownMatchSelectWidth={false}
         showSearch
         showArrow
-        notFoundContent={isEmpty(enumOptionsArray) ? "No options available" : null}
+        style={{ minWidth: 60 }}
-        {...multipleValuesProps}
+        notFoundContent={null}
-      />
+        {...multipleValuesProps}>
+        {enumOptionsArray.map(option => (
+          <Option key={option} value={option}>
+            {option}
+          </Option>
+        ))}
+      </Select>
     );
   }
 

client/app/components/ParameterValueInput.less

@@ -1,4 +1,4 @@
-@import "~antd/lib/input-number/style/index"; // for ant @vars
+@import '~antd/lib/input-number/style/index'; // for ant @vars
 
 @input-dirty: #fffce1;
 
@@ -17,11 +17,10 @@
   }
 
   &[data-dirty] {
-    .@{ant-prefix}-input,
+    .@{ant-prefix}-input, // covers also ant date component
     .@{ant-prefix}-input-number,
-    .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-select-selection {
-    .@{ant-prefix}-picker {
+      background-color: @input-dirty;
-      background-color: @input-dirty !important;
     }
   }
 }

client/app/components/Parameters.jsx

@@ -1,12 +1,13 @@
 import { size, filter, forEach, extend } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
-import { SortableContainer, SortableElement, DragHandle } from "@redash/viz/lib/components/sortable";
+import { SortableContainer, SortableElement, DragHandle } from "@/components/sortable";
 import location from "@/services/location";
 import { Parameter, createParameter } from "@/services/parameters";
 import ParameterApplyButton from "@/components/ParameterApplyButton";
 import ParameterValueInput from "@/components/ParameterValueInput";
 import EditParameterSettingsDialog from "./EditParameterSettingsDialog";
+import { toHuman } from "@/lib/utils";
 
 import "./Parameters.less";
 
@@ -105,14 +106,16 @@ export default class Parameters extends React.Component {
 
   showParameterSettings = (parameter, index) => {
     const { onParametersEdit } = this.props;
-    EditParameterSettingsDialog.showModal({ parameter }).onClose(updated => {
+    EditParameterSettingsDialog.showModal({ parameter })
+      .result.then(updated => {
         this.setState(({ parameters }) => {
           const updatedParameter = extend(parameter, updated);
           parameters[index] = createParameter(updatedParameter, updatedParameter.parentQueryId);
           onParametersEdit();
           return { parameters };
         });
-    });
+      })
+      .catch(() => {}); // ignore dismiss
   };
 
   renderParameter(param, index) {
@@ -120,7 +123,7 @@ export default class Parameters extends React.Component {
     return (
       <div key={param.name} className="di-block" data-test={`ParameterName-${param.name}`}>
         <div className="parameter-heading">
-          <label>{param.getTitle()}</label>
+          <label>{param.title || toHuman(param.name)}</label>
           {editable && (
             <button
               className="btn btn-default btn-xs m-l-5"

client/app/components/Parameters.less

@@ -1,4 +1,4 @@
-@import "../assets/less/ant";
+@import '../assets/less/ant';
 
 .parameter-block {
   display: inline-block;
@@ -20,7 +20,6 @@
   }
 
   &.parameter-dragged {
-    z-index: 2;
     box-shadow:  0 4px 9px -3px rgba(102, 136, 153, 0.15);
   }
 }
@@ -61,7 +60,7 @@
       bottom: -36px;
       left: -15px;
       border-radius: 2px;
-      z-index: 2;
+      z-index: 1;
       transition: opacity 150ms ease-out;
       box-shadow: 0 4px 9px -3px rgba(102, 136, 153, 0.15);
       background-color: #ffffff;
@@ -89,9 +88,7 @@
         height: 27px;
       }
 
-      &:hover,
+      &:hover, &:focus, &:active {
-      &:focus,
-      &:active {
         background-color: #eef7fe;
       }
 

client/app/components/PreviewCard.jsx

@@ -1,7 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
 import classNames from "classnames";
-import Link from "@/components/Link";
 
 // PreviewCard
 
@@ -43,7 +42,7 @@ PreviewCard.defaultProps = {
 // UserPreviewCard
 
 export function UserPreviewCard({ user, withLink, children, ...props }) {
-  const title = withLink ? <Link href={"users/" + user.id}>{user.name}</Link> : user.name;
+  const title = withLink ? <a href={"users/" + user.id}>{user.name}</a> : user.name;
   return (
     <PreviewCard {...props} imageUrl={user.profile_image_url} title={title} body={user.email}>
       {children}
@@ -69,8 +68,8 @@ UserPreviewCard.defaultProps = {
 // DataSourcePreviewCard
 
 export function DataSourcePreviewCard({ dataSource, withLink, children, ...props }) {
-  const imageUrl = `static/images/db-logos/${dataSource.type}.png`;
+  const imageUrl = `/static/images/db-logos/${dataSource.type}.png`;
-  const title = withLink ? <Link href={"data_sources/" + dataSource.id}>{dataSource.name}</Link> : dataSource.name;
+  const title = withLink ? <a href={"data_sources/" + dataSource.id}>{dataSource.name}</a> : dataSource.name;
   return (
     <PreviewCard {...props} imageUrl={imageUrl} title={title}>
       {children}

client/app/components/QueryBasedParameterInput.jsx

@@ -1,18 +1,9 @@
-import { find, isArray, get, first, map, intersection, isEqual, isEmpty, trim, debounce, isNil } from "lodash";
+import { find, isArray, map, intersection, isEqual } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
-import SelectWithVirtualScroll from "@/components/SelectWithVirtualScroll";
+import Select from "antd/lib/select";
 
-const SEARCH_DEBOUNCE_TIME = 300;
+const { Option } = Select;
-
-function filterValuesThatAreNotInOptions(value, options) {
-  if (isArray(value)) {
-    const optionValues = map(options, option => option.value);
-    return intersection(value, optionValues);
-  }
-  const found = find(options, option => option.value === value) !== undefined;
-  return found ? value : get(first(options), "value");
-}
 
 export default class QueryBasedParameterInput extends React.Component {
   static propTypes = {
@@ -39,7 +30,6 @@ export default class QueryBasedParameterInput extends React.Component {
       options: [],
       value: null,
       loading: false,
-      currentSearchTerm: null,
     };
   }
 
@@ -48,10 +38,9 @@ export default class QueryBasedParameterInput extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (this.props.queryId !== prevProps.queryId || this.props.parameter !== prevProps.parameter) {
+    if (this.props.queryId !== prevProps.queryId) {
       this._loadOptions(this.props.queryId);
     }
-
     if (this.props.value !== prevProps.value) {
       this.setValue(this.props.value);
     }
@@ -59,26 +48,26 @@ export default class QueryBasedParameterInput extends React.Component {
 
   setValue(value) {
     const { options } = this.state;
-    const { mode, parameter } = this.props;
+    if (this.props.mode === "multiple") {
-
-    if (mode === "multiple") {
-      if (isNil(value)) {
-        value = [];
-      }
-
       value = isArray(value) ? value : [value];
+      const optionValues = map(options, option => option.value);
+      const validValues = intersection(value, optionValues);
+      this.setState({ value: validValues });
+      return validValues;
     }
-
+    const found = find(options, option => option.value === this.props.value) !== undefined;
-    // parameters with search don't have options available, so we trust what we get
+    value = found ? value : options[0].value;
-    if (!parameter.searchFunction) {
-      value = filterValuesThatAreNotInOptions(value, options);
-    }
-
     this.setState({ value });
     return value;
   }
 
-  updateOptions(options) {
+  async _loadOptions(queryId) {
+    if (queryId && queryId !== this.state.queryId) {
+      this.setState({ loading: true });
+      const options = await this.props.parameter.loadDropdownValues();
+
+      // stale queryId check
+      if (this.props.queryId === queryId) {
         this.setState({ options, loading: false }, () => {
           const updatedValue = this.setValue(this.props.value);
           if (!isEqual(updatedValue, this.props.value)) {
@@ -86,59 +75,33 @@ export default class QueryBasedParameterInput extends React.Component {
           }
         });
       }
-
-  async _loadOptions(queryId) {
-    if (queryId && queryId !== this.state.queryId) {
-      this.setState({ loading: true });
-      const options = await this.props.parameter.loadDropdownValues(this.state.currentSearchTerm);
-
-      // stale queryId check
-      if (this.props.queryId === queryId) {
-        this.updateOptions(options);
     }
   }
-  }
-
-  searchFunction = debounce(searchTerm => {
-    const { parameter } = this.props;
-    if (parameter.searchFunction && trim(searchTerm)) {
-      this.setState({ loading: true, currentSearchTerm: searchTerm });
-      parameter.searchFunction(searchTerm).then(options => {
-        if (this.state.currentSearchTerm === searchTerm) {
-          this.updateOptions(options);
-        }
-      });
-    }
-  }, SEARCH_DEBOUNCE_TIME);
 
   render() {
-    const { parameter, className, mode, onSelect, queryId, value, ...otherProps } = this.props;
+    const { className, value, mode, onSelect, ...otherProps } = this.props;
     const { loading, options } = this.state;
-    const selectProps = { ...otherProps };
-
-    if (parameter.searchColumn) {
-      selectProps.filterOption = false;
-      selectProps.onSearch = this.searchFunction;
-      selectProps.onChange = value => onSelect(parameter.normalizeValue(value));
-      selectProps.notFoundContent = null;
-      selectProps.labelInValue = true;
-    }
     return (
       <span>
-        <SelectWithVirtualScroll
+        <Select
           className={className}
-          disabled={!parameter.searchFunction && loading}
+          disabled={loading || options.length === 0}
           loading={loading}
           mode={mode}
-          value={this.state.value || undefined}
+          value={this.state.value}
           onChange={onSelect}
-          options={options}
+          dropdownMatchSelectWidth={false}
           optionFilterProp="children"
           showSearch
           showArrow
-          notFoundContent={isEmpty(options) ? "No options available" : null}
+          notFoundContent={null}
-          {...selectProps}
+          {...otherProps}>
-        />
+          {options.map(option => (
+            <Option value={option.value} key={option.value}>
+              {option.name}
+            </Option>
+          ))}
+        </Select>
       </span>
     );
   }

client/app/components/QueryLink.jsx

@@ -1,8 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { VisualizationType } from "@redash/viz/lib";
+import { VisualizationType } from "@/visualizations/prop-types";
-import Link from "@/components/Link";
+import VisualizationName from "@/visualizations/components/VisualizationName";
-import VisualizationName from "@/components/visualizations/VisualizationName";
 
 import "./QueryLink.less";
 
@@ -22,9 +21,9 @@ function QueryLink({ query, visualization, readOnly }) {
   };
 
   return (
-    <Link href={readOnly ? null : getUrl()} className="query-link">
+    <a href={readOnly ? null : getUrl()} className="query-link">
       <VisualizationName visualization={visualization} /> <span>{query.name}</span>
-    </Link>
+    </a>
   );
 }
 

client/app/components/QuerySelector.jsx

@@ -11,10 +11,6 @@ import useSearchResults from "@/lib/hooks/useSearchResults";
 
 const { Option } = Select;
 function search(term) {
-  if (term === null) {
-    return Promise.resolve(null);
-  }
-
   // get recent
   if (!term) {
     return Query.recent().then(results => results.filter(item => !item.is_draft)); // filter out draft

client/app/components/SelectItemsDialog.jsx

@@ -1,5 +1,5 @@
-import { filter, find, isEmpty, size } from "lodash";
+import { filter, debounce, find, isEmpty, size } from "lodash";
-import React, { useState, useCallback, useEffect } from "react";
+import React from "react";
 import PropTypes from "prop-types";
 import classNames from "classnames";
 import Modal from "antd/lib/modal";
@@ -8,155 +8,12 @@ import List from "antd/lib/list";
 import Button from "antd/lib/button";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import BigMessage from "@/components/BigMessage";
+
 import LoadingState from "@/components/items-list/components/LoadingState";
 import notification from "@/services/notification";
-import useSearchResults from "@/lib/hooks/useSearchResults";
 
-function ItemsList({ items, renderItem, onItemClick }) {
+class SelectItemsDialog extends React.Component {
-  const renderListItem = useCallback(
+  static propTypes = {
-    item => {
-      const { content, className, isDisabled } = renderItem(item);
-      return (
-        <List.Item
-          className={classNames("p-l-10", "p-r-10", { clickable: !isDisabled, disabled: isDisabled }, className)}
-          onClick={isDisabled ? null : () => onItemClick(item)}>
-          {content}
-        </List.Item>
-      );
-    },
-    [renderItem, onItemClick]
-  );
-
-  return <List size="small" dataSource={items} renderItem={renderListItem} />;
-}
-
-ItemsList.propTypes = {
-  items: PropTypes.array,
-  renderItem: PropTypes.func,
-  onItemClick: PropTypes.func,
-};
-
-ItemsList.defaultProps = {
-  items: [],
-  renderItem: () => {},
-  onItemClick: () => {},
-};
-
-function SelectItemsDialog({
-  dialog,
-  dialogTitle,
-  inputPlaceholder,
-  itemKey,
-  renderItem,
-  renderStagedItem,
-  searchItems,
-  selectedItemsTitle,
-  width,
-  showCount,
-  extraFooterContent,
-}) {
-  const [selectedItems, setSelectedItems] = useState([]);
-  const [search, items, isLoading] = useSearchResults(searchItems, { initialResults: [] });
-  const hasResults = items.length > 0;
-
-  useEffect(() => {
-    search();
-  }, [search]);
-
-  const isItemSelected = useCallback(
-    item => {
-      const key = itemKey(item);
-      return !!find(selectedItems, i => itemKey(i) === key);
-    },
-    [selectedItems, itemKey]
-  );
-
-  const toggleItem = useCallback(
-    item => {
-      if (isItemSelected(item)) {
-        const key = itemKey(item);
-        setSelectedItems(filter(selectedItems, i => itemKey(i) !== key));
-      } else {
-        setSelectedItems([...selectedItems, item]);
-      }
-    },
-    [selectedItems, itemKey, isItemSelected]
-  );
-
-  const save = useCallback(() => {
-    dialog.close(selectedItems).catch(error => {
-      if (error) {
-        notification.error("Failed to save some of selected items.");
-      }
-    });
-  }, [dialog, selectedItems]);
-
-  return (
-    <Modal
-      {...dialog.props}
-      className="select-items-dialog"
-      width={width}
-      title={dialogTitle}
-      footer={
-        <div className="d-flex align-items-center">
-          <span className="flex-fill m-r-5" style={{ textAlign: "left", color: "rgba(0, 0, 0, 0.5)" }}>
-            {extraFooterContent}
-          </span>
-          <Button {...dialog.props.cancelButtonProps} onClick={dialog.dismiss}>
-            Cancel
-          </Button>
-          <Button
-            {...dialog.props.okButtonProps}
-            onClick={save}
-            disabled={selectedItems.length === 0 || dialog.props.okButtonProps.disabled}
-            type="primary">
-            Save
-            {showCount && !isEmpty(selectedItems) ? ` (${size(selectedItems)})` : null}
-          </Button>
-        </div>
-      }>
-      <div className="d-flex align-items-center m-b-10">
-        <div className="flex-fill">
-          <Input.Search onChange={event => search(event.target.value)} placeholder={inputPlaceholder} autoFocus />
-        </div>
-        {renderStagedItem && (
-          <div className="w-50 m-l-20">
-            <h5 className="m-0">{selectedItemsTitle}</h5>
-          </div>
-        )}
-      </div>
-
-      <div className="d-flex align-items-stretch" style={{ minHeight: "30vh", maxHeight: "50vh" }}>
-        <div className="flex-fill scrollbox">
-          {isLoading && <LoadingState className="" />}
-          {!isLoading && !hasResults && (
-            <BigMessage icon="fa-search" message="No items match your search." className="" />
-          )}
-          {!isLoading && hasResults && (
-            <ItemsList
-              items={items}
-              renderItem={item => renderItem(item, { isSelected: isItemSelected(item) })}
-              onItemClick={toggleItem}
-            />
-          )}
-        </div>
-        {renderStagedItem && (
-          <div className="w-50 m-l-20 scrollbox">
-            {selectedItems.length > 0 && (
-              <ItemsList
-                items={selectedItems}
-                renderItem={item => renderStagedItem(item, { isSelected: true })}
-                onItemClick={toggleItem}
-              />
-            )}
-          </div>
-        )}
-      </div>
-    </Modal>
-  );
-}
-
-SelectItemsDialog.propTypes = {
     dialog: DialogPropType.isRequired,
     dialogTitle: PropTypes.string,
     inputPlaceholder: PropTypes.string,
@@ -172,21 +29,170 @@ SelectItemsDialog.propTypes = {
     renderItem: PropTypes.func,
     // right list; args/results save as for `renderItem`. if not specified - `renderItem` will be used
     renderStagedItem: PropTypes.func,
+    save: PropTypes.func, // (selectedItems[]) => Promise<any>
     width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     extraFooterContent: PropTypes.node,
     showCount: PropTypes.bool,
   };
 
-SelectItemsDialog.defaultProps = {
+  static defaultProps = {
     dialogTitle: "Add Items",
     inputPlaceholder: "Search...",
     selectedItemsTitle: "Selected items",
     itemKey: item => item.id,
     renderItem: () => "",
     renderStagedItem: null, // hidden by default
+    save: items => items,
     width: "80%",
     extraFooterContent: null,
     showCount: false,
   };
 
+  state = {
+    searchTerm: "",
+    loading: false,
+    items: [],
+    selected: [],
+    saveInProgress: false,
+  };
+
+  // eslint-disable-next-line react/sort-comp
+  loadItems = (searchTerm = "") => {
+    this.setState({ searchTerm, loading: true }, () => {
+      this.props
+        .searchItems(searchTerm)
+        .then(items => {
+          // If another search appeared while loading data - just reject this set
+          if (this.state.searchTerm === searchTerm) {
+            this.setState({ items, loading: false });
+          }
+        })
+        .catch(() => {
+          if (this.state.searchTerm === searchTerm) {
+            this.setState({ items: [], loading: false });
+          }
+        });
+    });
+  };
+
+  search = debounce(this.loadItems, 200);
+
+  componentDidMount() {
+    this.loadItems();
+  }
+
+  isSelected(item) {
+    const key = this.props.itemKey(item);
+    return !!find(this.state.selected, i => this.props.itemKey(i) === key);
+  }
+
+  toggleItem(item) {
+    if (this.isSelected(item)) {
+      const key = this.props.itemKey(item);
+      this.setState(({ selected }) => ({
+        selected: filter(selected, i => this.props.itemKey(i) !== key),
+      }));
+    } else {
+      this.setState(({ selected }) => ({
+        selected: [...selected, item],
+      }));
+    }
+  }
+
+  save() {
+    this.setState({ saveInProgress: true }, () => {
+      const selectedItems = this.state.selected;
+      Promise.resolve(this.props.save(selectedItems))
+        .then(() => {
+          this.props.dialog.close(selectedItems);
+        })
+        .catch(() => {
+          this.setState({ saveInProgress: false });
+          notification.error("Failed to save some of selected items.");
+        });
+    });
+  }
+
+  renderItem(item, isStagedList) {
+    const { renderItem, renderStagedItem } = this.props;
+    const isSelected = this.isSelected(item);
+    const render = isStagedList ? renderStagedItem : renderItem;
+
+    const { content, className, isDisabled } = render(item, { isSelected });
+
+    return (
+      <List.Item
+        className={classNames("p-l-10", "p-r-10", { clickable: !isDisabled, disabled: isDisabled }, className)}
+        onClick={isDisabled ? null : () => this.toggleItem(item)}>
+        {content}
+      </List.Item>
+    );
+  }
+
+  render() {
+    const { dialog, dialogTitle, inputPlaceholder } = this.props;
+    const { selectedItemsTitle, renderStagedItem, width, showCount } = this.props;
+    const { loading, saveInProgress, items, selected } = this.state;
+    const hasResults = items.length > 0;
+    return (
+      <Modal
+        {...dialog.props}
+        className="select-items-dialog"
+        width={width}
+        title={dialogTitle}
+        footer={
+          <div className="d-flex align-items-center">
+            <span className="flex-fill m-r-5" style={{ textAlign: "left", color: "rgba(0, 0, 0, 0.5)" }}>
+              {this.props.extraFooterContent}
+            </span>
+            <Button onClick={dialog.dismiss}>Cancel</Button>
+            <Button
+              onClick={() => this.save()}
+              loading={saveInProgress}
+              disabled={selected.length === 0}
+              type="primary">
+              Save
+              {showCount && !isEmpty(selected) ? ` (${size(selected)})` : null}
+            </Button>
+          </div>
+        }>
+        <div className="d-flex align-items-center m-b-10">
+          <div className="flex-fill">
+            <Input.Search
+              defaultValue={this.state.searchTerm}
+              onChange={event => this.search(event.target.value)}
+              placeholder={inputPlaceholder}
+              autoFocus
+            />
+          </div>
+          {renderStagedItem && (
+            <div className="w-50 m-l-20">
+              <h5 className="m-0">{selectedItemsTitle}</h5>
+            </div>
+          )}
+        </div>
+
+        <div className="d-flex align-items-stretch" style={{ minHeight: "30vh", maxHeight: "50vh" }}>
+          <div className="flex-fill scrollbox">
+            {loading && <LoadingState className="" />}
+            {!loading && !hasResults && (
+              <BigMessage icon="fa-search" message="No items match your search." className="" />
+            )}
+            {!loading && hasResults && (
+              <List size="small" dataSource={items} renderItem={item => this.renderItem(item, false)} />
+            )}
+          </div>
+          {renderStagedItem && (
+            <div className="w-50 m-l-20 scrollbox">
+              {selected.length > 0 && (
+                <List size="small" dataSource={selected} renderItem={item => this.renderItem(item, true)} />
+              )}
+            </div>
+          )}
+        </div>
+      </Modal>
+    );
+  }
+}
+
 export default wrapDialog(SelectItemsDialog);

client/app/components/SelectWithVirtualScroll.tsx

@@ -1,38 +0,0 @@
-import React, { useMemo } from "react";
-import { maxBy } from "lodash";
-import AntdSelect, { SelectProps, LabeledValue } from "antd/lib/select";
-import { calculateTextWidth } from "@/lib/calculateTextWidth";
-
-const MIN_LEN_FOR_VIRTUAL_SCROLL = 400;
-
-interface VirtualScrollLabeledValue extends LabeledValue {
-  label: string;
-}
-
-interface VirtualScrollSelectProps extends SelectProps<string> {
-  options: Array<VirtualScrollLabeledValue>;
-}
-function SelectWithVirtualScroll({ options, ...props }: VirtualScrollSelectProps): JSX.Element {
-  const dropdownMatchSelectWidth = useMemo<number | boolean>(() => {
-    if (options && options.length > MIN_LEN_FOR_VIRTUAL_SCROLL) {
-      const largestOpt = maxBy(options, "label.length");
-
-      if (largestOpt) {
-        const offset = 40;
-        const optionText = largestOpt.label;
-        const width = calculateTextWidth(optionText);
-        if (width) {
-          return width + offset;
-        }
-      }
-
-      return true;
-    }
-
-    return false;
-  }, [options]);
-
-  return <AntdSelect<string> dropdownMatchSelectWidth={dropdownMatchSelectWidth} options={options} {...props} />;
-}
-
-export default SelectWithVirtualScroll;

client/app/components/SettingsWrapper.jsx

@@ -1,12 +1,13 @@
 import React from "react";
 import Menu from "antd/lib/menu";
 import PageHeader from "@/components/PageHeader";
-import Link from "@/components/Link";
 import location from "@/services/location";
 import settingsMenu from "@/services/settingsMenu";
 
-function wrapSettingsTab(id, options, WrappedComponent) {
+function wrapSettingsTab(options, WrappedComponent) {
-  settingsMenu.add(id, options);
+  if (options) {
+    settingsMenu.add(options);
+  }
 
   return function SettingsTab(props) {
     const activeItem = settingsMenu.getActiveItem(location.path);
@@ -16,11 +17,13 @@ function wrapSettingsTab(id, options, WrappedComponent) {
           <PageHeader title="Settings" />
           <div className="bg-white tiled">
             <Menu selectedKeys={[activeItem && activeItem.title]} selectable={false} mode="horizontal">
-              {settingsMenu.getAvailableItems().map(item => (
+              {settingsMenu.items
+                .filter(item => item.isAvailable())
+                .map(item => (
                   <Menu.Item key={item.title}>
-                  <Link href={item.path} data-test="SettingsScreenItem">
+                    <a href={item.path} data-test="SettingsScreenItem">
                       {item.title}
-                  </Link>
+                    </a>
                   </Menu.Item>
                 ))}
             </Menu>