Pin Cypress version (#4284)

* Stop building tarballs.

* Update version reference.

* CHANGELOG for 8.0.0-beta.2

.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

@@ -1,25 +1,18 @@
 version: 2.0
 
-build-docker-image-job: &build-docker-image-job
+flake8-steps: &steps
-  docker:
+  - checkout
-    - image: circleci/node:12
+  - run: sudo pip install flake8
-  steps:
+  - run: ./bin/flake8_tests.sh
-    - 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
-    - run: npm run bundle
-    - run: .circleci/docker_build
 jobs:
-  backend-lint:
+  python-flake8-tests:
     docker:
       - image: circleci/python:3.7.0
-    steps:
+    steps: *steps
-      - checkout
+  legacy-python-flake8-tests:
-      - run: sudo pip install flake8
+    docker:
-      - run: ./bin/flake8_tests.sh
+      - image: circleci/python:2.7.15
+    steps: *steps
   backend-unit-tests:
     environment:
       COMPOSE_FILE: .circleci/docker-compose.circle.yml
@@ -33,15 +26,12 @@ 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:
           name: Create Test Database
           command: docker-compose run --rm postgres psql -h postgres -U postgres -c "create database tests;"
-      - run:
-          name: List Enabled Query Runners
-          command: docker-compose run --rm redash manage ds list_types
       - run:
           name: Run Tests
           command: docker-compose run --name tests redash tests --junitxml=junit.xml --cov-report xml --cov=redash --cov-config .coveragerc tests/
@@ -51,43 +41,30 @@ jobs:
             mkdir -p /tmp/test-results/unit-tests
             docker cp tests:/app/coverage.xml ./coverage.xml
             docker cp tests:/app/junit.xml /tmp/test-results/unit-tests/results.xml
-          when: always
       - store_test_results:
           path: /tmp/test-results
       - 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 python-pip
-      - run: sudo apt install python3-pip
+      - run: sudo pip install -r requirements_bundles.txt
-      - run: sudo pip3 install -r requirements_bundles.txt
+      - run: npm install
-      - run: npm ci
       - 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,72 +73,48 @@ 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:
+  build-docker-image:
-          name: "Failure: output container logs to console"
+    docker:
-          command: |
+      - image: circleci/node:8
-            docker-compose logs
+    steps:
-          when: on_fail
+      - setup_remote_docker
-      - run:
+      - checkout
-          name: Copy Code Coverage results
+      - run: sudo apt install python-pip
-          command: |
+      - run: sudo pip install -r requirements_bundles.txt
-            docker cp cypress:/usr/src/app/coverage ./coverage || true
+      - run: .circleci/update_version
-          when: always
+      - run: npm run bundle
-      - store_artifacts:
+      - run: .circleci/docker_build
-          path: coverage
-  build-docker-image: *build-docker-image-job
-  build-preview-docker-image: *build-docker-image-job
 workflows:
   version: 2
   build:
     jobs:
-      - backend-lint
+      - python-flake8-tests
-      - backend-unit-tests:
+      - legacy-python-flake8-tests
-          requires:
+      - backend-unit-tests
-            - backend-lint
       - frontend-lint
       - frontend-unit-tests:
           requires:
-            - backend-lint
             - frontend-lint
       - frontend-e2e-tests:
           requires:
             - frontend-lint
-      - build-preview-docker-image:
-          requires:
-            - backend-unit-tests
-            - frontend-unit-tests
-            - frontend-e2e-tests
-          filters:
-            branches:
-              only:
-                - master
       - hold:
           type: approval
           requires:
@@ -171,6 +124,8 @@ workflows:
           filters:
             branches:
               only:
+                - master
+                - preview-image
                 - /release\/.*/
       - build-docker-image:
           requires:

.circleci/docker-compose.circle.yml

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

.circleci/docker-compose.cypress.yml

@@ -1,62 +1,45 @@
-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
+    command: dev_server
     depends_on:
       - postgres
       - redis
     ports:
       - "5000:5000"
     environment:
-      <<: *redash-environment
       PYTHONUNBUFFERED: 0
-  scheduler:
+      REDASH_LOG_LEVEL: "INFO"
-    <<: *redash-service
+      REDASH_REDIS_URL: "redis://redis:6379/0"
+      REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+      REDASH_RATELIMIT_ENABLED: "false"
+  worker:
+    build: ../
     command: scheduler
     depends_on:
       - server
     environment:
-      <<: *redash-environment
-  worker:
-    <<: *redash-service
-    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"
+      QUEUES: "queries,scheduled_queries,celery,schemas"
+      WORKERS_COUNT: 2
   cypress:
-    ipc: host
     build:
       context: ../
       dockerfile: .circleci/Dockerfile.cypress
     depends_on:
       - server
       - worker
-      - scheduler
     environment:
       CYPRESS_baseUrl: "http://server:5000"
-      CYPRESS_coverage: ${CODE_COVERAGE}
       PERCY_TOKEN: ${PERCY_TOKEN}
       PERCY_BRANCH: ${CIRCLE_BRANCH}
       PERCY_COMMIT: ${CIRCLE_SHA1}
       PERCY_PULL_REQUEST: ${CIRCLE_PR_NUMBER}
       COMMIT_INFO_BRANCH: ${CIRCLE_BRANCH}
-      COMMIT_INFO_MESSAGE: ${COMMIT_INFO_MESSAGE}
       COMMIT_INFO_AUTHOR: ${CIRCLE_USERNAME}
       COMMIT_INFO_SHA: ${CIRCLE_SHA1}
       COMMIT_INFO_REMOTE: ${CIRCLE_REPOSITORY_URL}

.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
 

.codeclimate.yml

@@ -0,0 +1,32 @@
+version: "2"
+checks:
+  complex-logic:
+    enabled: false
+  file-lines:
+    enabled: false
+  method-complexity:
+    enabled: false
+  method-count:
+    enabled: false
+  method-lines:
+    config:
+      threshold: 100
+  nested-control-flow:
+    enabled: false
+  identical-code:
+    enabled: false
+  similar-code:
+    enabled: false
+plugins:
+  pep8:
+    enabled: true
+  eslint:
+    enabled: false
+exclude_patterns:
+  - "tests/**/*.py"
+  - "migrations/**/*.py"
+  - "setup/**/*"
+  - "bin/**/*"
+  - "**/node_modules/"
+  - "client/dist/"
+  - "**/*.pyc"

.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

@@ -1,63 +0,0 @@
-enabled: true
-
-auto: false
-
-# Open Restyle PRs?
-pull_requests: true
-
-# Leave comments on the original PR linking to the Restyle PR?
-comments: true
-
-# Set commit statuses on the original PR?
-statuses:
-  # Red status in the case of differences found
-  differences: true
-  # Green status in the case of no differences found
-  no_differences: true
-  # Red status if we encounter errors restyling
-  error: true
-
-# Request review on the Restyle PR?
-#
-# Possible values:
-#
-#   author: From the author of the original PR
-#   owner: From the owner of the repository
-#   none: Don't
-#
-# One value will apply to both origin and forked PRs, but you can also specify
-# separate values.
-#
-#   request_review:
-#     origin: author
-#     forked: owner
-#
-request_review: author
-
-# Add labels to any created Restyle PRs
-#
-# These can be used to tell other automation to avoid our PRs.
-#
-labels: ["Skip CI"]
-
-# Labels to ignore
-#
-# PRs with any of these labels will be ignored by Restyled.
-#
-# ignore_labels:
-#   - restyled-ignore
-
-# 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
-      - client/cypress/**/*.js

CHANGELOG.md

@@ -1,174 +1,27 @@
 # 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.
-
 ## v8.0.0-beta.2 - 2019-09-16
 
 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.
+    - 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.
@@ -182,10 +35,10 @@ This release was made possible by contributions from over 40 people: @aidarbek,
 ### Parameters
 
 - Parameter UI improvements:
-  - Support for multi-select in dropdown (and query dropdown) parameters.
+    - Support for multi-select in dropdown (and query dropdown) parameters.
-  - Support for dynamic values in date and date-range parameters.
+    - Support for dynamic values in date and date-range parameters.
-  - Search dropdown parameter values.
+    - Search dropdown parameter values.
-  - New UX for applying parameter changes in queries and dashboards.
+    - New UX for applying parameter changes in queries and dashboards.
 - Allow using Safe Parameters in visualization embeds and public dashboards. Safe Parameters are any parameter type except for the a text parameter (dropdowns are safe).
 
 ### Data Sources
@@ -195,19 +48,19 @@ This release was made possible by contributions from over 40 people: @aidarbek,
 - Snowflake: update connector to latest version.
 - PostgreSQL: show only accessible tables in schema.
 - BigQuery:
-  - Correctly handle NaN values.
+    - Correctly handle NaN values.
-  - Treat repeated fields as rrays.
+    - Treat repeated fields as rrays.
-  - [BigQuery] Fix: in some queries there is no mode field
+    - [BigQuery] Fix: in some queries there is no mode field
 - DynamoDB:
-  - Support for Unicode in queries.
+    - Support for Unicode in queries.
-  - Safe loading of schema.
+    - Safe loading of schema.
 - Rockset: better handling of query errors.
 - Google Sheets:
-  - Support for Team Drive.
+    - Support for Team Drive.
-  - Friendlier error message in case of an API error and more reliable test connection.
+    - Friendlier error message in case of an API error and more reliable test connection.
-- MySQL:
+- MySQL: 
-  - Support for calling Stored Procedures and better handling of query cancellation.
+    - Support for calling Stored Procedures and better handling of query cancellation.
-  - Switch to using `mysqlclient` (a maintained fork of `Python-MySQL`).
+    - Switch to using `mysqlclient` (a maintained fork of `Python-MySQL`).
 - MongoDB: Support serializing Decimal128 values.
 - Presto: support for passwords in connection settings.
 - Amazon Athena: allow to specify custom work group.
@@ -218,15 +71,15 @@ This release was made possible by contributions from over 40 people: @aidarbek,
 ### Visualizations
 
 - Charts:
-  - Fix: legend overlapping chart on small screens.
+    - Fix: legend overlapping chart on small screens.
-  - Fix: Pie chart not rendering when series doesn't exist in options.
+    - Fix: Pie chart not rendering when series doesn't exist in options.
-  - Pie Chart: add option to set direction of slices.
+    - Pie Chart: add option to set direction of slices.
 - WordCloud: rewritten to support new options (provide frequency in query, limits), scale when resizing, handle long words and more.
 - Pivot Table: support hiding totals.
 - Counters: apply formatting to target value.
 - Maps:
-  - Ability to customize marker icon and color.
+    - Ability to customize marker icon and color.
-  - Customization options for Choropleth maps.
+    - Customization options for Choropleth maps.
 - New Visualization: Details View.
 
 ### **UX**

CONTRIBUTING.md

@@ -46,8 +46,8 @@ When creating a new bug report, please make sure to:
 
 If you would like to suggest an enhancement or ask for a new feature:
 
-- Please check [the forum](https://discuss.redash.io/c/feature-requests/5) for existing threads about what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
+- Please check [the roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap) for existing Trello card for what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
-- If there is no open thread, you're welcome to start one to have a discussion about what you want to suggest. Try to provide as much details and context as possible and include information about *the problem you want to solve* rather only *your proposed solution*.
+- If there is no existing card, open a thread in [the forum](https://discuss.redash.io/c/feature-requests) to start a discussion about what you want to suggest. Try to provide as much details and context as possible and include information about *the problem you want to solve* rather only *your proposed solution*.
 
 ### Pull Requests
 
@@ -55,9 +55,9 @@ If you would like to suggest an enhancement or ask for a new feature:
 - Include screenshots and animated GIFs in your pull request whenever possible.
 - Please add [documentation](#documentation) for new features or changes in functionality along with the code.
 - Please follow existing code style:
-  - Python: we use [Black](https://github.com/psf/black) to auto format the code.
+  - Python: we use PEP8 for Python.
-  - Javascript: we use [Prettier](https://github.com/prettier/prettier) to auto-format the code.
+  - Javascript: we use Airbnb's style guides for [JavaScript](https://github.com/airbnb/javascript#naming-conventions) and [React](https://github.com/airbnb/javascript/blob/master/react) (currently we don't follow Airbnb's convention for naming files, but we're gradually fixing this). To make it automatic and easy, we recommend using [Prettier](https://github.com/prettier/prettier).
-  
+
 ### Documentation
 
 The project's documentation can be found at [https://redash.io/help/](https://redash.io/help/). The [documentation sources](https://github.com/getredash/website/tree/master/src/pages/kb) are hosted on GitHub. To contribute edits / new pages, you can use GitHub's interface. Click the "Edit on GitHub" link on the documentation page to quickly open the edit interface.
@@ -66,9 +66,9 @@ The project's documentation can be found at [https://redash.io/help/](https://re
 
 ### Release Method
 
-We publish a stable release every ~3-4 months, although the goal is to get to a stable release every month. 
+We publish a stable release every ~2 months, although the goal is to get to a stable release every month. You can see the change log on [GitHub releases page](https://github.com/getredash/redash/releases).
 
-Every build of the master branch updates the *redash/redash:preview* Docker Image. These releases are usually stable, but might contain regressions and therefore recommended for "advanced users" only.
+Every build of the master branch updates the latest *RC release*. These releases are usually stable, but might contain regressions and therefore recommended for "advanced users" only.
 
 When we release a new stable release, we also update the *latest* Docker image tag, the EC2 AMIs and GCE images.
 

Dockerfile

@@ -1,88 +1,22 @@
-FROM node:12 as frontend-builder
+FROM node:10 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
+FROM redash/base:debian
-
-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
-
-# Ubuntu packages
-RUN apt-get update && \
-  apt-get install -y \
-    curl \
-    gnupg \
-    build-essential \
-    pwgen \
-    libffi-dev \
-    sudo \
-    git-core \
-    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 \
-    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

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2020, Arik Fraimovich.
+Copyright (c) 2013-2019, Arik Fraimovich.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

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

@@ -1,13 +1,14 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """Copy bundle extension files to the client/app/extension directory"""
 import logging
 import os
-from pathlib import Path
+from pathlib2 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 +18,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 +26,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 +78,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():
+        with path(module, BUNDLE_DIRECTORY) as bundle_dir:
-            logger.error(
+            bundles[entry_point.name] = list(bundle_dir.rglob("*"))
-                'Redash bundle directory "%s" could not be found or is not a directory: "%s"',
+
-                entry_point.name,
-                bundle_dir,
-            )
-            continue
-        bundles[entry_point.name] = list(bundle_dir.rglob("*"))
     return bundles
 
 
 bundles = load_bundles().items()
 if bundles:
-    print("Number of extension bundles found: {}".format(len(bundles)))
+    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

@@ -1,31 +1,33 @@
 #!/bin/bash
 set -e
 
-scheduler() {
-  echo "Starting RQ scheduler..."
-
-  exec /app/manage.py rq scheduler
-}
-
-dev_scheduler() {
-  echo "Starting dev RQ scheduler..."
-
-  exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- ./manage.py rq scheduler
-}
-
 worker() {
-  echo "Starting RQ worker..."
+  WORKERS_COUNT=${WORKERS_COUNT:-2}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
+  WORKER_EXTRA_OPTIONS=${WORKER_EXTRA_OPTIONS:-}
 
-  export WORKERS_COUNT=${WORKERS_COUNT:-2}
+  echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
-  export QUEUES=${QUEUES:-}
+  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair $WORKER_EXTRA_OPTIONS
+}
 
-  exec supervisord -c worker.conf
+scheduler() {
+  WORKERS_COUNT=${WORKERS_COUNT:-1}
+  QUEUES=${QUEUES:-celery}
+  SCHEDULE_DB=${SCHEDULE_DB:-celerybeat-schedule}
+
+  echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
+
+  exec /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair
 }
 
 dev_worker() {
-  echo "Starting dev RQ worker..."
+  WORKERS_COUNT=${WORKERS_COUNT:-2}
+  QUEUES=${QUEUES:-queries,scheduled_queries,celery,schemas}
+  SCHEDULE_DB=${SCHEDULE_DB:-celerybeat-schedule}
 
-  exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- ./manage.py rq worker $QUEUES
+  echo "Starting dev scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
+
+  exec watchmedo auto-restart --directory=./redash/ --pattern=*.py --recursive -- /usr/local/bin/celery worker --app=redash.worker --beat -s$SCHEDULE_DB -c$WORKERS_COUNT -Q$QUEUES -linfo --max-tasks-per-child=10 -Ofair
 }
 
 server() {
@@ -39,6 +41,10 @@ create_db() {
   exec /app/manage.py database create_tables
 }
 
+celery_healthcheck() {
+  exec /usr/local/bin/celery inspect ping --app=redash.worker -d celery@$HOSTNAME
+}
+
 help() {
   echo "Redash Docker."
   echo ""
@@ -46,10 +52,10 @@ help() {
   echo ""
 
   echo "server -- start Redash server (with gunicorn)"
-  echo "worker -- start a single RQ worker"
+  echo "worker -- start Celery worker"
-  echo "dev_worker -- start a single RQ worker with code reloading"
+  echo "scheduler -- start Celery worker with a beat (scheduler) process"
-  echo "scheduler -- start an rq-scheduler instance"
+  echo "dev_worker  -- start Celery worker with a beat (scheduler) process which picks up code changes and reloads"
-  echo "dev_scheduler -- start an rq-scheduler instance with code reloading"
+  echo "celery_healthcheck -- runs a Celery healthcheck. Useful for Docker's HEALTHCHECK mechanism."
   echo ""
   echo "shell -- open shell"
   echo "dev_server -- start Flask development server with debugger and auto reload"
@@ -83,18 +89,10 @@ case "$1" in
     shift
     scheduler
     ;;
-  dev_scheduler)
-    shift
-    dev_scheduler
-    ;;
   dev_worker)
     shift
     dev_worker
     ;;
-  celery_healthcheck)
-    shift
-    echo "DEPRECATED: Celery has been replaced with RQ and now performs healthchecks autonomously as part of the 'worker' entrypoint."
-    ;;
   dev_server)
     export FLASK_DEBUG=1
     exec /app/manage.py runserver --debugger --reload -h 0.0.0.0
@@ -126,3 +124,4 @@ case "$1" in
     exec "$@"
     ;;
 esac
+

bin/get_changes.py

@@ -1,10 +1,9 @@
-#!/bin/env python3
+#!/bin/env python
-
+from __future__ import print_function
 import sys
 import re
 import subprocess
 
-
 def get_change_log(previous_sha):
     args = ['git', '--no-pager', 'log', '--merges', '--grep', 'Merge pull request', '--pretty=format:"%h|%s|%b|%p"', 'master...{}'.format(previous_sha)]
     log = subprocess.check_output(args)
@@ -34,4 +33,4 @@ if __name__ == '__main__':
     changes = get_change_log(previous_sha)
 
     for change in changes:
-        print(change)
+        print(change)

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

bin/release_manager.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+from __future__ import print_function
 import os
 import sys
 import re

bin/upgrade

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import urllib
 import argparse
 import os
@@ -27,7 +27,7 @@ def run(cmd, cwd=None):
 
 
 def confirm(question):
-    reply = str(input(question + ' (y/n): ')).lower().strip()
+    reply = str(raw_input(question + ' (y/n): ')).lower().strip()
 
     if reply[0] == 'y':
         return True

client/.babelrc

@@ -1,29 +1,20 @@
 {
   "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"
+      "useBuiltIns": "usage"
-      }
+    }],
-    ],
+    "@babel/preset-react"
-    "@babel/preset-react",
-    "@babel/preset-typescript"
   ],
   "plugins": [
+    "angularjs-annotate",
     "@babel/plugin-proposal-class-properties",
     "@babel/plugin-transform-object-assign",
-    [
+    ["babel-plugin-transform-builtin-extend", {
-      "babel-plugin-transform-builtin-extend",
+      "globals": ["Error"]
-      {
+    }]
-        "globals": ["Error"]
+  ]
-      }
-    ]
-  ],
-  "env": {
-    "test": {
-      "plugins": ["istanbul"]
-    }
-  }
 }

client/.eslintignore

@@ -1,4 +1,3 @@
 build/*.js
-dist
 config/*.js
 client/dist

client/.eslintrc.js

@@ -1,57 +1,66 @@
 module.exports = {
   root: true,
-  parser: "@typescript-eslint/parser",
+  extends: ["airbnb", "plugin:compat/recommended"],
-  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"
   },
+  parser: "babel-eslint",
   env: {
     browser: true,
-    node: true,
+    node: true
   },
   rules: {
     // allow debugger during development
     "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
+    "no-param-reassign": 0,
+    "no-mixed-operators": 0,
+    "no-underscore-dangle": 0,
+    "no-use-before-define": ["error", "nofunc"],
+    "prefer-destructuring": "off",
+    "prefer-template": "off",
+    "no-restricted-properties": "off",
+    "no-restricted-globals": "off",
+    "no-multi-assign": "off",
+    "no-lonely-if": "off",
+    "consistent-return": "off",
+    "no-control-regex": "off",
+    "no-multiple-empty-lines": "warn",
+    "no-only-tests/no-only-tests": "error",
+    "operator-linebreak": "off",
+    "react/destructuring-assignment": "off",
+    "react/jsx-filename-extension": "off",
+    "react/jsx-one-expression-per-line": "off",
+    "react/jsx-uses-react": "error",
+    "react/jsx-uses-vars": "error",
+    "react/jsx-wrap-multilines": "warn",
+    "react/no-access-state-in-setstate": "warn",
+    "react/prefer-stateless-function": "warn",
+    "react/forbid-prop-types": "warn",
+    "react/prop-types": "warn",
     "jsx-a11y/anchor-is-valid": "off",
-    "no-restricted-imports": [
+    "jsx-a11y/click-events-have-key-events": "off",
-      "error",
+    "jsx-a11y/label-has-associated-control": [
+      "warn",
       {
-        paths: [
+        controlComponents: true
-          {
+      }
-            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.",
-          },
-        ],
-      },
     ],
-  },
+    "jsx-a11y/label-has-for": "off",
-  overrides: [
+    "jsx-a11y/no-static-element-interactions": "off",
-    {
+    "max-len": [
-      // Only run typescript-eslint on TS files
+      "error",
-      files: ["*.ts", "*.tsx", ".*.ts", ".*.tsx"],
+      120,
-      extends: ["plugin:@typescript-eslint/recommended"],
+      2,
-      rules: {
+      {
-        // Do not require functions (especially react components) to have explicit returns
+        ignoreUrls: true,
-        "@typescript-eslint/explicit-function-return-type": "off",
+        ignoreComments: false,
-        // Do not require to type every import from a JS file to speed up development
+        ignoreRegExpLiterals: true,
-        "@typescript-eslint/no-explicit-any": "off",
+        ignoreStrings: true,
-        // Do not complain about useless contructors in declaration files
+        ignoreTemplateLiterals: true
-        "no-useless-constructor": "off",
+      }
-        "@typescript-eslint/no-useless-constructor": "error",
+    ],
-        // Many API fields and generated types use camelcase
+    "no-else-return": ["error", { allowElseIf: true }],
-        "@typescript-eslint/camelcase": "off",
+    "object-curly-newline": ["error", { consistent: true }]
-      },
+  }
-    },
-  ],
 };

client/app/.eslintrc.js

@@ -7,4 +7,4 @@ module.exports = {
   rules: {
     "jest/no-focused-tests": "off",
   },
-};
+};

client/app/__tests__/enzyme_setup.js

@@ -1,4 +1,4 @@
-import { configure } from "enzyme";
+import { configure } from 'enzyme';
-import Adapter from "enzyme-adapter-react-16";
+import Adapter from 'enzyme-adapter-react-16';
 
 configure({ adapter: new Adapter() });

client/app/__tests__/mocks.js

@@ -1,5 +1,5 @@
-import MockDate from "mockdate";
+import MockDate from 'mockdate';
 
-const date = new Date("2000-01-01T02:00:00.000");
+const date = new Date('2000-01-01T02:00:00.000');
 
 MockDate.set(date);

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;
@@ -48,7 +47,6 @@
 @zindex-dropdown: 2050;
 @zindex-picker: 2050;
 @zindex-tooltip: 2060;
-@item-hover-bg: #e5f8ff;
 
 .@{drawer-prefix-cls} {
   &.help-drawer {
@@ -62,11 +60,6 @@
   font-weight: normal;
 }
 
-.ant-select-dropdown-menu-item em {
-  color: @input-color-placeholder;
-  font-size: 11px;
-}
-
 // Fix for disabled button styles inside Tooltip component.
 // Tooltip wraps disabled buttons with `<span>` and moves all styles
 // and classes to that `<span>`. This resets all button styles and
@@ -87,11 +80,6 @@
 // Button overrides
 .@{btn-prefix-cls} {
   transition-duration: 150ms;
-
-  &.icon-button {
-    width: 32px;
-    padding: 0 10px;
-  }
 }
 
 // Fix ant input number showing duplicate arrows
@@ -238,11 +226,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;
@@ -332,7 +320,7 @@
 }
 
 .@{btn-prefix-cls} .@{iconfont-css-prefix}-ellipsis {
-  margin: 0 -7px 0 -8px;
+  margin: 0 -7px;
 }
 
 // Collapse
@@ -368,47 +356,10 @@
     top: auto !important;
     bottom: 8px;
 
-    // makes the icon white instead of see-through
+     // makes the icon white instead of see-through
     & svg {
       background: white;
       border-radius: 50%;
     }
   }
-
+}
-  // for form items that contain text
-  &.form-item-line-height-normal .@{form-prefix-cls}-item-control {
-    line-height: 20px;
-    margin-top: 9px;
-  }
-}
-
-.@{menu-prefix-cls} {
-  // invert stripe position with class .invert-stripe-position
-  &-inline.invert-stripe-position {
-    .@{menu-prefix-cls}-item {
-      &::after {
-        right: auto;
-        left: 0;
-      }
-    }
-  }
-}
-
-// overrides for 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/ace-editor.less

@@ -1,25 +1,7 @@
 .ace_editor {
-  border: 1px solid fade(@redash-gray, 15%);
+  border: 1px solid #eee;
   height: 100%;
   margin-bottom: 10px;
-
-  &.ace_autocomplete .ace_completion-highlight {
-    text-shadow: none !important;
-    background: #ffff005e;
-    font-weight: 600;
-  }
-
-  &.ace-tm {
-    .ace_gutter {
-      background: #fff !important;
-    }
-
-    .ace_gutter-active-line {
-      background-color: fade(@redash-gray, 20%) !important;
-    }
-
-    .ace_marker-layer .ace_active-line {
-      background: fade(@redash-gray, 9%) !important;
-    }
-  }
 }
+
+

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

@@ -1,49 +1,44 @@
-.alert-page h3 {
+.alert {
-  flex-grow: 1;
+    padding: 15px;
-
+    
-  input {
+    span {
-    margin: -0.2em 0;
+        cursor: pointer;
-    width: 100%;
+    }
-    min-width: 170px;
-  }
 }
 
-.btn-create-alert[disabled] {
+.alert-dismissable,
-  display: block;
+.alert-dismissible {
-  margin-top: -20px;
+    padding-right: 44px;
+} 
+
+.alert-inverse {
+    .alert-variant(@alert-inverse-bg; @alert-inverse-border; @alert-inverse-text);
 }
 
-.alert-state {
+.alert-link {
-  border-bottom: 1px solid @input-border;
+    color: #fff !important;
-  padding-bottom: 30px;
+    font-weight: normal !important;
-
+    text-decoration: underline;
-  .alert-state-indicator {
-    text-transform: uppercase;
-    font-size: 14px;
-    padding: 5px 8px;
-  }
-
-  .ant-form-item-explain {
-    margin-top: 10px;
-  }
-
-  .alert-last-triggered {
-    color: @headings-color;
-  }
 }
 
-.alert-query-selector {
+.growl-animated {
-  min-width: 250px;
+    &.alert-inverse {
-  width: auto !important;
+        box-shadow: 0 0 5px fade(@alert-inverse-bg, 50%);
-}
+    }
+    
+    &.alert-info {
+        box-shadow: 0 0 5px fade(@alert-info-bg, 50%);
+    }
 
-// allow form item labels to gracefully break line
+    &.alert-success {
-.alert-form-item label {
+        box-shadow: 0 0 5px fade(@alert-success-bg, 50%);
-  white-space: initial;
+    }
-  padding-right: 8px;
-  line-height: 21px;
 
-  &::after {
+    &.alert-warning {
-    margin-right: 0 !important;
+        box-shadow: 0 0 5px fade(@alert-warning-bg, 50%);
-  }
+    }
+
+    &.alert-danger {
+        box-shadow: 0 0 5px fade(@alert-danger-bg, 50%);
+    }
 }

client/app/assets/less/inc/angular.less

@@ -0,0 +1,8 @@
+a[ng-click] {
+  cursor: pointer;
+}
+
+/* Immediately apply ng-cloak, instead of waiting for angular.js to load: */
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+  display: none !important;
+}

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,31 +12,40 @@
 /* --------------------------------------------------------
     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-no-number: @redash-font;
+@font-family:                          @redash-font;
-@font-family: @redash-font;
+@code-family:                          @redash-font;
-@code-family: @redash-font;
+@font-size-base:                       13px;
-@font-size-base: 13px;
+
 
 /* --------------------------------------------------------
     Borders
 -----------------------------------------------------------*/
-@border-color-split: #f0f0f0;
+@border-color-split:                   #f0f0f0;
+
 
 /* --------------------------------------------------------
     Typograpgy
 -----------------------------------------------------------*/
-@text-color: #595959;
+@text-color:                           #595959;
+
 
 /* --------------------------------------------------------
     Form
 -----------------------------------------------------------*/
-@input-height-base: 35px;
+@input-height-base:                    35px;
-@input-color: #595959;
+@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
@@ -45,13 +54,14 @@
 @pagination-font-family: @redash-font;
 @pagination-font-weight-active: normal;
 
-@pagination-bg: fade(@redash-gray, 15%);
+@pagination-bg:                         fade(@redash-gray, 15%);
-@pagination-color: #7e7e7e;
+@pagination-color:                      #7E7E7E;
-@pagination-active-bg: @lightblue;
+@pagination-active-bg:                  @lightblue;
-@pagination-active-color: #fff;
+@pagination-active-color:               #FFF;
-@pagination-disabled-bg: fade(@redash-gray, 15%);
+@pagination-disabled-bg:                fade(@redash-gray, 15%);
-@pagination-hover-color: #333;
+@pagination-hover-color:                #333;
-@pagination-hover-bg: fade(@redash-gray, 25%);
+@pagination-hover-bg:                   fade(@redash-gray, 25%);
+
 
 /* --------------------------------------------------------
     Table

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

@@ -1,227 +1,272 @@
-*,
+*, button, input, i, a {
-button,
+    -webkit-font-smoothing: antialiased;
-input,
-i,
-a {
-  -webkit-font-smoothing: antialiased;
 }
 
 *,
 *:active,
 *:hover {
-  outline: none !important;
+    outline: none !important;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
 }
 
 html {
-  overflow-x: ~"hidden\0/";
+    overflow-x: ~"hidden\0/";
-  -ms-overflow-style: auto;
+    -ms-overflow-style: auto;
 }
 
-html,
+html, body {
-body {
+    min-height: 100vh;
-  min-height: 100vh;
 }
 
 body {
-  padding-top: 0;
+    padding-top: 0;
-  background: #f6f8f9;
+    background: #F6F8F9;
-  font-family: @redash-font;
+    font-family: @redash-font;
-  position: relative;
+    position: relative;
-
+    
-  #application-root {
+    &.headless {
-    padding-bottom: 15px;
+        padding-top: 10px;
-  }
+        
+        .nav.app-header, .navbar {
+            display: none;
+        }
+    }
 }
 
-#application-root {
+app-view {
-  min-height: 100vh;
+    min-height: 100vh;
 }
 
-#application-root,
+app-view, #app-content {
-#app-content {
+    display: flex;
-  display: flex;
+    flex-direction: column;
-  flex-direction: column;
+    flex-grow: 1;
-  flex-grow: 1;
 }
 
 strong {
-  font-weight: 500;
+    font-weight: 500;
 }
 
 #content {
-  position: relative;
+    position: relative;
-  padding-top: 30px;
+    padding-top: 30px;
-  padding-bottom: 30px;
+    padding-bottom: 30px;
-
+    
-  @media (min-width: (@screen-sm-min + 1)) {
+    @media (min-width: (@screen-sm-min + 1)) {
-    padding-right: 15px;
+        padding-right: 15px;
-    padding-left: 15px;
+        padding-left: 15px;
-  }
+    }
-
+    
-  @media (min-width: (@screen-lg-min + 80px)) {
+    @media (min-width: (@screen-lg-min + 80px)) {
-    margin-left: @sidebar-left-width;
+        margin-left: @sidebar-left-width;
-  }
+    }
-
+    
-  @media (min-width: @screen-sm-min) and (max-width: (@screen-md-max + 80px)) {
+    @media (min-width: @screen-sm-min) and (max-width: (@screen-md-max + 80px)) {
-    margin-left: @sidebar-left-mid-width;
+        margin-left: @sidebar-left-mid-width;
-  }
+    }
-
+    
-  @media (max-width: (@screen-sm-min)) {
+    @media (max-width: (@screen-sm-min)) {
-    margin-left: 0;
+        margin-left: 0;
-  }
+    }
 }
 
 .container {
-  &.c-boxed {
+    &.c-boxed {
-    max-width: @boxed-width;
+        max-width: @boxed-width;
-  }
+    }
 }
 
-.settings-screen,
+// Fixed width layout for specific pages
-.home-page,
+@media (min-width: 768px) {
-.page-dashboard-list,
+    settings-screen, home-page, page-dashboard-list, page-queries-list, page-alerts-list, alert-page, queries-search-results-page, .fixed-container {
-.page-queries-list,
+        .container {
-.page-alerts-list,
+            width: 750px;
-.alert-page,
+        }
-.admin-page-layout {
+    }
-  .container {
+}
-    width: 100%;
+
-    max-width: none;
+@media (min-width: 992px) {
-  }
+    settings-screen, home-page, page-dashboard-list, page-queries-list, page-alerts-list, alert-page, queries-search-results-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, queries-search-results-page, .fixed-container {
+        .container {
+            width: 1170px;
+        }
+    }
 }
 
 .scrollbox {
-  overflow: auto;
+    overflow: auto;
-  position: relative;
+    position: relative;
 }
 
 .clickable {
-  cursor: pointer;
+    cursor: pointer;
 }
 
 .resize-vertical {
-  resize: vertical !important;
+    resize: vertical !important;
-  transition: height 0s !important;
+    transition: height 0s !important;
 }
 .resize-horizontal {
-  resize: horizontal !important;
+    resize: horizontal !important;
-  transition: width 0s !important;
+    transition: width 0s !important;
 }
 .resize-both,
 .resize-vertical.resize-horizontal {
-  resize: both !important;
+    resize: both !important;
-  transition: height 0s, width 0s !important;
+    transition: height 0s, width 0s !important;
+}
+
+// Ace Editor
+.ace_editor {
+    border: 1px solid fade(@redash-gray, 15%) !important;
+}
+
+.ace-tm {
+    .ace_gutter {
+        background: #fff !important;
+    }
+    
+    .ace_gutter-active-line {
+        background-color: fade(@redash-gray, 20%) !important;
+    }
+    
+    .ace_marker-layer .ace_active-line {
+        background: fade(@redash-gray, 9%) !important;
+    }
 }
 
 .bg-ace {
-  background-color: fade(@redash-gray, 12%) !important;
+    background-color: fade(@redash-gray, 12%) !important;
 }
 
 // resizeable
-.rg-top span,
+.rg-top span, .rg-bottom span {
-.rg-bottom span {
+    height: 3px;
-  height: 3px;
+    border-color: #b1c1ce; // TODO: variable
-  border-color: #b1c1ce; // TODO: variable
 }
 
 .rg-bottom {
-  bottom: 15px;
+    bottom: 15px;
-
+    
-  span {
+    span {
-    margin: 1.5px 0 0 -10px;
+        margin: 1.5px 0 0 -10px;
-  }
+    }
 }
 
 // Plotly
 text.slicetext {
-  text-shadow: 1px 1px 5px #333;
+    text-shadow: 1px 1px 5px #333;
 }
 
 // markdown
 .markdown strong {
-  font-weight: bold;
+    font-weight: bold;
 }
 
 .markdown img {
-  max-width: 100%;
+    max-width: 100%;
 }
 
-.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-.dropdown-menu > li > a:focus {
+    background-color: fade(@redash-gray, 15%);
-  background-color: fade(@redash-gray, 15%);
+    color: #111;
-  color: #111;
 }
 
-.profile__image--sidebar {
+.profile__image--navbar {
-  border-radius: 100%;
+    border-radius: 100%;
-  margin-right: 3px;
+    margin-right: 3px;
-  margin-top: -2px;
+    margin-top: -2px;
 }
 
 .profile__image--settings {
-  border-radius: 100%;
+    border-radius: 100%;
 }
 
 .profile__image_thumb {
-  border-radius: 100%;
+    border-radius: 100%;
-  margin-right: 3px;
+    margin-right: 3px;
-  margin-top: -2px;
+    margin-top: -2px;
-  width: 20px;
+    width: 20px;
-  height: 20px;
+    height: 20px;
 }
 
+
 // Error state
 .error-state {
-  display: flex;
+    display: flex;
-  flex-direction: column;
+    flex-direction: column;
-  justify-content: flex-start;
+    justify-content: flex-start;
-  text-align: center;
+    text-align: center;
-  margin-top: 25vh;
+    margin-top: 25vh;
-  padding: 35px;
+    padding: 35px;
-  font-size: 14px;
+    font-size: 14px;
-  line-height: 21px;
+    line-height: 21px;
-
+    
-  .error-state__icon {
+    .error-state__icon {
-    .zmdi {
+        .zmdi {
-      font-size: 64px;
+            font-size: 64px;
-      color: @redash-gray;
+            color: @redash-gray;
+        }
+    }
+    
+    @media (max-width: 767px) {
+        margin-top: 10vh;
     }
-  }
-
-  @media (max-width: 767px) {
-    margin-top: 10vh;
-  }
-}
-
-.warning-icon-danger {
-  color: @red !important;
 }
 
 // page
-.page-title {
+.page-header--new .btn-favourite, .page-header--new .btn-archive {
-  display: flex;
-  align-items: center;
-
-  .label {
-    margin-top: 3px;
-    display: inline-block;
-  }
-
-  .favorites-control {
     font-size: 19px;
-    margin-right: 10px;
   }
-}
+  
-
+  .page-title {
-.page-header--new {
+    display: flex;
-  h3 {
+    align-items: center;
-    margin: 0.2em 0;
+  
-    line-height: 1.3;
+    h3 {
-    font-weight: 500;
+      margin-right: 5px !important;
+    }
+  
+    .label {
+      margin-top: 3px;
+      display: inline-block;
+    }
+  
+    favorites-control {
+      margin-right: 5px;
+    }
+  
+    @media (max-width: 767px) {
+      display: block;
+  
+      favorites-control {
+        float: left;
+      }
+  
+      h3 {
+        width: 100%;
+        margin-bottom: 5px !important;
+        display: block !important;
+      }
+    }
+  }
+  
+  .page-header-wrapper, .page-header--new {
+    h3 {
+      margin: 0.2em 0;
+      line-height: 1.3;
+      font-weight: 500;
+    }
   }
-}
 
-.select-option-divider {
+  .select-option-divider {
-  margin: 10px 0 !important;
+    margin: 10px 0 !important;
-}
+  }

client/app/assets/less/inc/edit-in-place.less

@@ -7,7 +7,6 @@
 }
 
 .edit-in-place span.editable {
-  display: inline-block;
   cursor: pointer;
 }
 
@@ -24,3 +23,32 @@
 .edit-in-place {
   display: inline-block;
 }
+
+.edit-in-place {
+  .rd-form-control {
+    padding: 0px 6px;
+    width: 30vw;
+  }
+
+  &.active {
+    textarea.rd-form-control {
+      height: 29px;
+      width: 40vw;
+    }
+  }
+}
+
+
+@media (max-width: 880px) {
+  .edit-in-place {
+    .rd-form-control {
+      width: 50vw;
+    }
+
+    &.active {
+      textarea.rd-form-control {
+        width: 50vw;
+      }
+    }
+  }
+}

client/app/assets/less/inc/form.less

@@ -1,9 +1,9 @@
 label {
-  font-weight: 500;
+    font-weight: 500;
 }
 
 textarea.v-resizable {
-  resize: vertical;
+    resize: vertical;
 }
 
 .form-group {
@@ -29,266 +29,285 @@ textarea.v-resizable {
   }
 }
 
+/* light version of bootstrap's form-control */
+.rd-form-control {
+  display: block;
+  padding: 6px 12px;
+  line-height: 1.428571429;
+  color: #555555;
+  vertical-align: middle;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  width: 90%;
+}
+
+
 /* --------------------------------------------------------
     Input Fields
 -----------------------------------------------------------*/
 .form-control {
-  .transition(all);
+    .transition(all);
-  .transition-duration(300ms);
+    .transition-duration(300ms);
-  resize: none;
+    resize: none;
-  box-shadow: 0 0 0 40px rgba(0, 0, 0, 0) !important;
+    box-shadow: 0 0 0 40px rgba(0, 0, 0, 0) !important;
-  border-radius: @redash-input-radius;
+    border-radius: @redash-input-radius;
 
-  &:focus {
+    &:focus {
-    box-shadow: none !important;
+        box-shadow: none !important;
-    border-color: @blue;
+        border-color: @blue;
-  }
+    }
-  &:hover {
+    &:hover {
-    border-color: @blue;
+        border-color: @blue;
-  }
+    }
 }
 
 /* --------------------------------------------------------
     Custom Checkbox + Radio
 -----------------------------------------------------------*/
 .cra-validatation(@color) {
-  input[type="checkbox"],
+    input[type="checkbox"], input[type="radio"] {
-  input[type="radio"] {
+        & + .input-helper {
-    & + .input-helper {
+            border-color: @color;
-      border-color: @color;
+        }
-    }
 
-    &:checked + .input-helper:before {
+        &:checked + .input-helper:before {
-      background: @color;
+            background: @color;
+        }
     }
-  }
 }
 
 .cr-alt {
-  position: relative;
-  padding-top: 0;
-  margin: 0;
-
-  label {
     position: relative;
-    padding-left: 28px;
+    padding-top: 0;
-  }
-
-  &.has-success {
-    .cra-validatation(@green);
-  }
-
-  &.has-warning {
-    .cra-validatation(@orange);
-  }
-
-  &.has-error {
-    .cra-validatation(@red);
-  }
-
-  input[type="checkbox"],
-  input[type="radio"] {
-    .opacity(0);
-    width: 20px;
-    height: 20px;
-    position: absolute;
-    z-index: 10;
     margin: 0;
-    top: 0;
-    left: 0;
-    cursor: pointer;
 
-    & + .input-helper {
+    label {
-      border: 1px solid @input-border;
+        position: relative;
-      width: 19px;
+        padding-left: 28px;
-      height: 19px;
-      background: #fff;
-      position: absolute;
-      left: 0;
-      top: -1px;
-      cursor: pointer;
     }
 
-    &:checked + .input-helper:before {
+    &.has-success {
-      content: "";
+        .cra-validatation(@green);
-      width: 9px;
-      height: 9px;
-      background: #31acff;
-      position: absolute;
-      left: 4px;
-      top: 4px;
-    }
-  }
-
-  input[type="radio"] {
-    & + i {
-      border-radius: 50%;
     }
 
-    &:checked + i:before {
+    &.has-warning {
-      border-radius: 50%;
+        .cra-validatation(@orange);
-    }
-  }
 
-  &.disabled {
+    }
-    .opacity(0.7);
+
-  }
+    &.has-error {
+        .cra-validatation(@red);
+
+    }
+
+    input[type="checkbox"], input[type="radio"] {
+        .opacity(0);
+        width: 20px;
+        height: 20px;
+        position: absolute;
+        z-index: 10;
+        margin: 0;
+        top: 0;
+        left: 0;
+        cursor: pointer;
+
+        & + .input-helper {
+            border: 1px solid @input-border;
+            width: 19px;
+            height: 19px;
+            background: #fff;
+            position: absolute;
+            left: 0;
+            top: -1px;
+            cursor: pointer;
+        }
+
+        &:checked + .input-helper:before {
+            content: "";
+            width: 9px;
+            height: 9px;
+            background: #31ACFF;
+            position: absolute;
+            left: 4px;
+            top: 4px;
+        }
+    }
+
+    input[type="radio"] {
+        & + i {
+            border-radius: 50%;
+        }
+
+        &:checked + i:before {
+            border-radius: 50%;
+        }
+    }
+
+    &.disabled {
+        .opacity(0.7);
+    }
 }
 
 .checkbox-inline,
 .radio-inline {
-  padding-left: 27px;
+    padding-left: 27px;
 }
 
+
 /* --------------------------------------------------------
     Input Addon
 -----------------------------------------------------------*/
 .input-group {
-  .input-group-addon {
-    min-width: 40px;
-    color: #333;
-    padding: 0;
-  }
-
-  &:not([class*="input-group-"]) {
     .input-group-addon {
-      font-size: 15px;
+        min-width: 40px;
+        color: #333;
+        padding: 0;
+    }
+
+    &:not([class*="input-group-"]) {
+        .input-group-addon {
+            font-size: 15px;
+        }
     }
-  }
 }
 
+
 /* --------------------------------------------------------
     Toggle Switch
 -----------------------------------------------------------*/
-.ts-color(@color) {
+.ts-color(@color){
-  input {
+    input {
-    &:not(:disabled) {
+        &:not(:disabled) {
-      &:checked {
+            &:checked {
-        & + .ts-helper {
+                & + .ts-helper {
-          background: fade(@color, 50%);
+                    background: fade(@color, 50%);
 
-          &:before {
+                    &:before {
-            background: @color;
+                        background: @color;
-          }
+                    }
 
-          &:active {
+                    &:active {
-            &:before {
+                        &:before {
-              box-shadow: 0 2px 8px rgba(0, 0, 0, 0.28), 0 0 0 20px fade(@color, 20%);
+                            box-shadow: 0 2px 8px rgba(0,0,0,0.28), 0 0 0 20px fade(@color, 20%);
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 
 .toggle-switch {
-  display: inline-block;
-  vertical-align: top;
-  .user-select(none);
-
-  .ts-label {
     display: inline-block;
-    margin: 0 20px 0 0;
     vertical-align: top;
-    -webkit-transition: color 0.56s cubic-bezier(0.4, 0, 0.2, 1);
+    .user-select(none);
-    transition: color 0.56s cubic-bezier(0.4, 0, 0.2, 1);
-  }
 
-  .ts-helper {
+    .ts-label {
-    display: inline-block;
+        display: inline-block;
-    position: relative;
+        margin: 0 20px 0 0;
-    width: 40px;
+        vertical-align: top;
-    height: 16px;
+        -webkit-transition: color 0.56s cubic-bezier(0.4, 0, 0.2, 1);
-    border-radius: 8px;
+        transition: color 0.56s cubic-bezier(0.4, 0, 0.2, 1);
-    background: rgba(0, 0, 0, 0.26);
-    -webkit-transition: background 0.28s cubic-bezier(0.4, 0, 0.2, 1);
-    transition: background 0.28s cubic-bezier(0.4, 0, 0.2, 1);
-    vertical-align: middle;
-    cursor: pointer;
-
-    &:before {
-      content: "";
-      position: absolute;
-      top: -4px;
-      left: -4px;
-      width: 24px;
-      height: 24px;
-      background: #fafafa;
-      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.28);
-      border-radius: 50%;
-      webkit-transition: left 0.28s cubic-bezier(0.4, 0, 0.2, 1), background 0.28s cubic-bezier(0.4, 0, 0.2, 1),
-        box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
-      transition: left 0.28s cubic-bezier(0.4, 0, 0.2, 1), background 0.28s cubic-bezier(0.4, 0, 0.2, 1),
-        box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
     }
-  }
 
-  &:not(.disabled) {
     .ts-helper {
-      &:active {
+        display: inline-block;
+        position: relative;
+        width: 40px;
+        height: 16px;
+        border-radius: 8px;
+        background: rgba(0,0,0,0.26);
+        -webkit-transition: background 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+        transition: background 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+        vertical-align: middle;
+        cursor: pointer;
+
         &:before {
-          box-shadow: 0 2px 8px rgba(0, 0, 0, 0.28), 0 0 0 20px rgba(128, 128, 128, 0.1);
+            content: '';
+            position: absolute;
+            top: -4px;
+            left: -4px;
+            width: 24px;
+            height: 24px;
+            background: #fafafa;
+            box-shadow: 0 2px 8px rgba(0,0,0,0.28);
+            border-radius: 50%;
+            webkit-transition: left 0.28s cubic-bezier(0.4, 0, 0.2, 1), background 0.28s cubic-bezier(0.4, 0, 0.2, 1), box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
+            transition: left 0.28s cubic-bezier(0.4, 0, 0.2, 1), background 0.28s cubic-bezier(0.4, 0, 0.2, 1), box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
         }
-      }
     }
-  }
 
-  input {
+    &:not(.disabled) {
-    position: absolute;
+        .ts-helper {
-    z-index: 1;
+            &:active {
-    width: 46px;
+                &:before {
-    margin: 0 0 0 -4px;
+                    box-shadow: 0 2px 8px rgba(0,0,0,0.28), 0 0 0 20px rgba(128,128,128,0.1);
-    height: 24px;
+                }
-    .opacity(0);
+            }
-    cursor: pointer;
-
-    &:checked {
-      & + .ts-helper {
-        &:before {
-          left: 20px;
         }
-      }
     }
-  }
 
-  &:not([data-ts-color]) {
+    input {
-    .ts-color(@teal);
+        position: absolute;
-  }
+        z-index: 1;
+        width: 46px;
+        margin: 0 0 0 -4px;
+        height: 24px;
+        .opacity(0);
+        cursor: pointer;
 
-  &.disabled {
+        &:checked {
-    .opacity(0.6);
+            & + .ts-helper {
-  }
+                &:before {
+                    left: 20px;
+                }
+            }
+        }
+    }
 
-  &[data-ts-color="red"] {
+    &:not([data-ts-color]){
-    .ts-color(@red);
+        .ts-color(@teal);
-  }
+    }
 
-  &[data-ts-color="blue"] {
+    &.disabled {
-    .ts-color(@blue);
+        .opacity(0.6);
-  }
+    }
 
-  &[data-ts-color="amber"] {
+    &[data-ts-color="red"] {
-    .ts-color(@amber);
+        .ts-color(@red);
-  }
+    }
 
-  &[data-ts-color="purple"] {
+    &[data-ts-color="blue"] {
-    .ts-color(@purple);
+        .ts-color(@blue);
-  }
+    }
 
-  &[data-ts-color="pink"] {
+    &[data-ts-color="amber"] {
-    .ts-color(@pink);
+        .ts-color(@amber);
-  }
+    }
 
-  &[data-ts-color="lime"] {
+    &[data-ts-color="purple"] {
-    .ts-color(@lime);
+        .ts-color(@purple);
-  }
+    }
 
-  &[data-ts-color="cyan"] {
+    &[data-ts-color="pink"] {
-    .ts-color(@cyan);
+        .ts-color(@pink);
-  }
+    }
+
+    &[data-ts-color="lime"] {
+        .ts-color(@lime);
+    }
+
+    &[data-ts-color="cyan"] {
+        .ts-color(@cyan);
+    }
+
+    &[data-ts-color="green"] {
+        .ts-color(@green);
+    }
 
-  &[data-ts-color="green"] {
-    .ts-color(@green);
-  }
 }

client/app/assets/less/inc/generics.less

@@ -76,8 +76,6 @@
 
 .font-size(20, 8px, 8);
 
-.f-inherit { font-size: inherit !important; }
-
 
 /* --------------------------------------------------------
     Font Weight

client/app/assets/less/inc/growl.less

@@ -0,0 +1,28 @@
+/* angular-growl */
+.growl {
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  float: right;
+  width: 250px;
+  z-index: 10000;
+}
+
+.growl-item.ng-enter,
+.growl-item.ng-leave {
+  -webkit-transition: 0.5s linear all;
+  -moz-transition: 0.5s linear all;
+  -o-transition: 0.5s linear all;
+  transition: 0.5s linear all;
+}
+
+.growl-item.ng-enter,
+.growl-item.ng-leave.ng-leave-active {
+  opacity: 0;
+}
+
+.growl-item.ng-leave,
+.growl-item.ng-enter.ng-enter-active {
+  opacity: 1;
+
+}

client/app/assets/less/inc/list-group.less

@@ -17,6 +17,31 @@
     }
 }
 
+tags-list {
+  a {
+    line-height: 1.1;
+  }
+}
+
+.tags-list__name {
+  display: inline-block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 88%;
+  line-height: 1.3;
+}
+
+.tags-list {
+  .badge-light {
+    background: fade(@redash-gray, 10%);
+    color: fade(@redash-gray, 75%);
+  }
+  
+  a:hover {
+    cursor: pointer;
+  }
+}
+
 .max-character {
   .text-overflow();
 }

client/app/assets/less/inc/misc.less

@@ -234,9 +234,4 @@
     .hide-in-percy, .pace {
         visibility: hidden;
     }
-
-    // hide tooltips in Percy
-    .ant-tooltip {
-        display: none !important;
-    }
 }

client/app/assets/less/inc/navbar.less

@@ -0,0 +1,295 @@
+a.navbar-brand {
+  padding: 5px 5px 0px 0px;
+}
+
+.navbar .fa {
+  font-size: 18px;
+}
+
+.navbar .collapse.in {
+  background: #222;
+}
+
+a.navbar-brand img {
+  height: 40px;
+}
+
+.avatar {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+.avatar img {
+  width: 40px;
+  height: 40px;
+}
+
+#logout {
+  color: white;
+  position: relative;
+  left: -9px;
+  bottom: -11px;
+}
+
+.caret--nav {
+  border-top: none;
+}
+
+.caret--nav:after {
+  content: "";
+  position: absolute;
+  right: 5px;
+  top: 9px;
+  width: 13px;
+  height: 13px;
+  display: block;
+  background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='11px' height='6px' viewBox='0 0 11 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 42 %2836781%29 - http://www.bohemiancoding.com/sketch --%3E%3Ctitle%3EShape%3C/title%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M5.296,4.288 L9.382,0.2 C9.66086822,-0.0716916976 10.1065187,-0.068122925 10.381,0.208 C10.661,0.488 10.661,0.932 10.388,1.206 L5.792,5.803 C5.6602899,5.93388911 5.48167943,6.00662966 5.296,6.005 C5.10997499,6.00689786 4.93095449,5.93413702 4.799,5.803 L0.204,1.207 C0.072163111,1.07394937 -0.00121750401,0.893846387 9.62313189e-05,0.706545264 C0.00140996665,0.519244142 0.0773097323,0.340188219 0.211,0.209 C0.485365732,-0.0664648737 0.930253538,-0.0700311086 1.209,0.201 L5.296,4.288 L5.296,4.288 Z' id='Shape' fill='%23000000'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
+  background-size: 100% 100%;
+  transition: transform .2s cubic-bezier(.75,0,.25,1);
+}
+
+.navbar .caret--nav:after {
+  top: 19px;
+}
+
+.dropdown--profile .caret--nav:after {
+  right: 8px;
+}
+
+.btn--create {
+  padding-right: 20px;
+
+  .caret--nav:after {
+    top: 10px;
+    right: 10px;
+    background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg width='11px' height='6px' viewBox='0 0 11 6' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3C!-- Generator: Sketch 42 %2836781%29 - http://www.bohemiancoding.com/sketch --%3E%3Ctitle%3EShape%3C/title%3E%3Cdesc%3ECreated with Sketch.%3C/desc%3E%3Cdefs%3E%3C/defs%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cpath d='M5.29592111,4.28945339 L9.38192111,0.201453387 C9.66078932,-0.0702383105 10.1064398,-0.0666695379 10.3809211,0.209453387 C10.6609211,0.489453387 10.6609211,0.933453387 10.3879211,1.20745339 L5.79192111,5.80445339 C5.66021101,5.9353425 5.48160054,6.00808305 5.29592111,6.00645339 C5.1098961,6.00835125 4.9308756,5.9355904 4.79892111,5.80445339 L0.203921109,1.20845339 C0.0720842204,1.07540275 -0.00129639464,0.895299774 1.73406884e-05,0.707998651 C0.00133107602,0.520697529 0.0772308417,0.341641606 0.210921109,0.210453387 C0.485286842,-0.0650114866 0.930174648,-0.0685777215 1.20892111,0.202453387 L5.29592111,4.28945339 L5.29592111,4.28945339 Z' id='Shape' fill='%23FCFCFC'%3E%3C/path%3E%3C/g%3E%3C/svg%3E");
+  }
+}
+
+.dropdown.open .caret--nav:after {
+  transform: rotate(180deg);
+}
+
+.navbar {
+  box-shadow: fade(@redash-gray, 15%) 0px 4px 9px -3px;
+
+  .navbar-collapse {
+    padding-left: 0;
+  }
+
+  a.dropdown--profile {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    line-height: 2.35;
+  }
+
+  .navbar-inverse {
+    background-color: @redash-gray;
+    border: none;
+  }
+}
+
+.navbar-btn {
+  margin-top: 10px;
+  margin-bottom: 9px;
+}
+
+.navbar-brand {
+  position: absolute;
+  left: 50%;
+  margin-left: -25px !important; // center
+  display: block;
+  zoom: 0.9;
+}
+
+.menu-search {
+  margin-top: 2px;
+}
+
+.dropdown-menu--profile {
+  li {
+    width: 200px;
+  }
+}
+
+.navbar .collapse.in {
+  background: #fff;
+  position: relative;
+  z-index: 999;
+  padding: 0 10px 0 10px;
+}
+.navbar {
+  min-height: initial;
+  height: 50px;
+  border: 1px solid #fff;
+  border-top: none;
+  border-radius: 0;
+  background: #fff;
+  margin-bottom: 10px;
+
+  .btn-group.open .dropdown-toggle {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+
+  .btn-group .btn:active {
+    box-shadow: none;
+  }
+}
+
+.navbar-link-ANGULAR_REMOVE_ME {
+  line-height: 18px;
+  padding: 10px 15px;
+  display: block;
+
+  @media (min-width: 768px) {
+    padding-top: 16px;
+    padding-bottom: 16px;
+  }
+}
+
+.navbar-link-ANGULAR_REMOVE_ME,
+.navbar-default .navbar-nav > li > a {
+  color: #000;
+  font-weight: 500;
+
+  &:active, &:hover, &:focus {
+    color: #000;
+  }
+}
+
+.navbar-default .btn__new button {
+  font-weight: 500;
+}
+
+.btn__new {
+  margin-left: 15px;
+}
+
+.navbar-default .navbar-nav > li > a:hover {
+  //background-color: fade(@redash-gray, 10%);
+  //text-decoration: underline;
+  //border-radius: 0;
+}
+
+.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus {
+  background-color: fade(@redash-gray, 15%);
+  color: #111;
+}
+
+
+// Responsive fixes
+@media (max-width: 767px) {
+  .navbar-brand {
+    left: 2%;
+    margin-left: 0 !important;
+  }
+
+  //Fix navbar collapse
+  .navbar .collapse.in {
+    border: none;
+
+    .dropdown-menu--profile {
+      li {
+        width: auto;
+      }
+    }
+
+    .dropdown--profile {
+      .caret--nav:after {
+        right: initial !important;
+      }
+    }
+
+    .dropdown--profile__username {
+      display: inline-block;
+    }
+
+    .nav__main li a {
+      padding: 10px 15px;
+      display: block;
+      text-align: left;
+      float: none !important;
+    }
+
+    .navbar-form {
+      margin-bottom: 0;
+      margin-top: 0;
+    }
+
+    .navbar-right {
+      margin-bottom: 0;
+    }
+  }
+}
+
+@media (min-width: 768px) {
+  @media (max-width: 880px) {
+    .navbar-link-ANGULAR_REMOVE_ME,
+    .navbar-default .navbar-nav > li > a,
+    .navbar-form {
+      padding-left: 10px !important;
+      padding-right: 10px !important;
+    }
+
+    a.navbar-brand {
+      margin-left: -15px !important;
+    }
+  }
+
+  @media (max-width: 810px) {
+    .menu-search {
+      width: 175px;
+    }
+
+    a.navbar-brand {
+      margin-left: 13px !important;
+    }
+  }
+}
+
+@media (max-width: 1084px) {
+  .dropdown--profile__username {
+    display: none;
+  }
+}
+
+
+
+
+// Cross-browser fixes
+
+// Firefox
+@-moz-document url-prefix() {
+  .caret--nav::after {
+    height: 7px;
+  }
+
+  .navbar .caret--nav::after {
+    top: 22px;
+  }
+
+  .navbar .btn--create .caret--nav::after {
+    top: 12px;
+  }
+}
+
+// IE10+
+@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+  .caret--nav::after {
+    height: 7px;
+  }
+
+  .navbar .caret--nav::after {
+    top: 22px;
+  }
+
+  .navbar .btn--create .caret--nav::after {
+    top: 12px;
+  }
+}
+
+
+.navbar li a .btn-favourite .fa, .navbar li a .btn-archive .fa {
+  font-size: 100%;
+}

client/app/assets/less/inc/overlay.less

@@ -0,0 +1,11 @@
+.overlay {
+  background-color: #808080;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 0;
+  z-index: 1000;
+  opacity: 0.8;
+}

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,18 +27,10 @@ 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 +55,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;
@@ -89,12 +72,11 @@ div.table-name {
 
 .schema-control {
   display: flex;
-  flex-wrap: nowrap;
   padding: 0;
 
-  .ant-btn {
+ .form-control {
-    height: auto;
+   margin-right: 5px;
-  }
+ }
 }
 
 .parameter-label {

client/app/assets/less/inc/tab.less

@@ -0,0 +1,146 @@
+.tab-nav {
+    list-style: none;
+    padding: 0;
+    white-space: nowrap;
+    margin: 0 0 10px 0;
+    overflow: auto;
+    box-shadow: inset 0 -2px 0 0 #eee;
+
+    & > li {
+        display: inline-block;
+        vertical-align: top;
+
+        & > a {
+            display: inline-block;
+            color: #7a7a7a;
+            text-transform: uppercase;
+            position: relative;
+            width: 100%;
+            font-weight: 500;
+
+            &:after {
+                content: "";
+                height: 2px;
+                position: absolute;
+                width: 100%;
+                left: 0;
+                bottom: 0;
+                display: none;
+            }
+
+            @media (min-width: @screen-sm-min) {
+                padding: 15px;
+            }
+
+            @media (max-width: @screen-sm-min) {
+                padding: 15px 8px;
+            }
+        }
+
+        &.active {
+            & > a {
+                color: #000;
+
+                &:after {
+                    display: block;
+                }
+            }
+        }
+    }
+
+    &.tab-nav-right {
+        text-align: right;
+    }
+
+    &.tn-justified {
+        & > li {
+            display: table-cell;
+            width: 1%;
+            text-align: center;
+        }
+    }
+
+    &.tn-icon {
+        & > li {
+            .zmdi {
+                font-size: 22px;
+                line-height: 100%;
+                min-height: 25px;
+            }
+        }
+    }
+
+    &:not([data-tab-color]) {
+        & > li > a:after {
+            background: @blue;
+        }
+    }
+
+    &[data-tab-color="green"] {
+        & > li > a:after {
+            background: @green;
+        }
+    }
+
+    &[data-tab-color="red"] {
+        & > li > a:after {
+            background: @red;
+        }
+    }
+
+    &[data-tab-color="teal"] {
+        & > li > a:after {
+            background: @teal;
+        }
+    }
+
+    &[data-tab-color="amber"] {
+        & > li > a:after {
+            background: @amber;
+        }
+    }
+
+    &[data-tab-color="black"] {
+        & > li > a:after {
+            background: @black;
+        }
+    }
+
+    &[data-tab-color="cyan"] {
+        & > li > a:after {
+            background: @cyan;
+        }
+    }
+}
+
+.tab-content {
+    padding: 20px 0;
+}
+
+.rd-tab {
+  .remove {
+    cursor: pointer;
+    color: #A09797;
+    padding: 0 3px 1px 4px;
+    font-size: 11px;
+    &:hover {
+      color: white;
+      background-color: #FF8080;
+      border-radius: 50%;
+    }
+  }
+}
+
+.tab-nav {
+  margin-bottom: 0px;
+
+  > li.rd-tab-btn {
+    float: right;
+    padding-right: 10px;
+    padding-top: 10px;
+  }
+  
+  > li > a {
+    text-transform: capitalize;
+  }
+}

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

@@ -1,153 +1,149 @@
 .table {
-  margin-bottom: 0;
+    margin-bottom: 0;
-
+    
-  th.sortable-column {
+    th.sortable-column {
-    cursor: pointer;
+        cursor: pointer;
-  }
-
-  &:not(.table-striped) > thead > tr > th {
-    background-color: #fafafa;
-  }
-
-  [class*="bg-"] {
-    & > tr > th {
-      color: #fff;
-      border-bottom: 0;
-      background: transparent !important;
     }
-
+    
-    & + tbody > tr:first-child > td {
+    &:not(.table-striped) > thead > tr > th {
-      border-top: 0;
+        background-color: #FAFAFA;
     }
-  }
+    
-
+    [class*="bg-"] {
-  & > thead > tr > th {
+        & > tr > th {
-    vertical-align: middle;
+            color: #fff;
-    font-weight: 500;
+            border-bottom: 0;
-    color: #333;
+            background: transparent !important;
-    border-width: 1px;
+        }
-    text-transform: uppercase;
+        
-    padding: 15px 10px;
+        & + tbody > tr:first-child > td {
-  }
+            border-top: 0;
-
+        }
-  & > thead > tr,
+    }
-  & > tbody > tr,
+    
-  & > tfoot > tr {
+    & > thead > tr > th {
-    & > th,
+        vertical-align: middle;
-    & > td {
+        font-weight: 500;
-      &:first-child {
+        color: #333;
-        padding-left: 30px;
+        border-width: 1px;
-      }
+        text-transform: uppercase;
-
+        padding: 15px 10px;
-      &:last-child {
+    }
-        padding-right: 30px;
+    
-      }
+    & > thead > tr,
+    & > tbody > tr,
+    & > tfoot > tr {
+        
+        & > th, & > td {
+            
+            &:first-child {
+                padding-left: 30px;
+            }
+            
+            &:last-child {
+                padding-right: 30px;
+            }
+            
+        }
+    }
+    
+    tbody > tr:last-child > td {
+        padding-bottom: 20px;
     }
-  }
-
-  tbody > tr:last-child > td {
-    padding-bottom: 20px;
-  }
 }
 
 .table-bordered {
-  border: 0;
+    border: 0;
-
+    
-  & > tbody > tr {
+    & > tbody > tr {
-    & > td,
+        & > td, & > th {
-    & > th {
+            border-bottom: 0;
-      border-bottom: 0;
+            border-left: 0;
-      border-left: 0;
+            
-
+            &:last-child {
-      &:last-child {
+                border-right: 0;
-        border-right: 0;
+            }
-      }
+        }
     }
-  }
+    
-
+    & > thead > tr > th {
-  & > thead > tr > th {
+        border-left: 0;
-    border-left: 0;
+        
-
+        &:last-child {
-    &:last-child {
+            border-right: 0;
-      border-right: 0;
+        }
     }
-  }
 }
 
 .table-vmiddle {
-  td {
+    td {
-    vertical-align: middle !important;
+        vertical-align: middle !important;
-  }
+    }
 }
 
 .table-responsive {
-  border: 0;
+    border: 0;
 }
 
-.tile .table {
+.tile .table  {
-  & > thead:not([class*="bg-"]) > tr > th {
+    
-    border-top: 1px solid @table-border-color;
+    & > thead:not([class*="bg-"]) > tr > th {
-  }
+        border-top: 1px solid @table-border-color;
+        
+    }
 }
 
 .table-hover > tbody > tr:hover {
-  background-color: #f4f4f4;
+    background-color: #f4f4f4;
 }
 
 .table-data {
-  thead > tr > th {
+    tbody > tr > td {
-    white-space: nowrap;
+        padding-top: 5px !important;
-  }
+    }
-
+    
-  tbody > tr > td {
+    .btn-favourite, .btn-archive {
-    padding-top: 5px !important;
+        font-size: 15px;
-  }
+    }
-
-  .btn-favourite,
-  .btn-archive {
-    font-size: 15px;
-  }
 }
 
 .table-main-title {
-  font-weight: 500;
+    font-weight: 500;
-  line-height: 1.7 !important;
+    line-height: 1.7 !important;
 }
 
 .btn-favourite {
-  color: #d4d4d4;
+    color: #d4d4d4;
-  transition: all 0.25s ease-in-out;
+    transition: all .25s ease-in-out;
-
+    
-  &:hover,
+    &:hover, &:focus {
-  &:focus {
+        color: @yellow-darker;
-    color: @yellow-darker;
+        cursor: pointer;
-    cursor: pointer;
+    }
-  }
+    
-
+    .fa-star {
-  .fa-star {
+        color: @yellow-darker;
-    color: @yellow-darker;
+    }
-  }
 }
 
 .btn-archive {
-  color: #d4d4d4;
+    color: #d4d4d4;
-  transition: all 0.25s ease-in-out;
+    transition: all .25s ease-in-out;
-
+    
-  &:hover,
+    &:hover, &:focus {
-  &:focus {
+        color: @gray-light;
-    color: @gray-light;
+    }
-  }
+    
-
+    .fa-archive {
-  .fa-archive {
+        color: @gray-light;
-    color: @gray-light;
+    }
-  }
 }
 
 .table > thead > tr > th {
-  text-transform: none;
+    text-transform: none;
 }
 
 .table-data .label-tag {
-  display: inline-block;
+    display: inline-block;
-  max-width: 135px;
+    max-width: 135px;
-}
+  }

client/app/assets/less/inc/toast.less

@@ -0,0 +1,29 @@
+#toast-container .toast {
+  margin: 0 6px 6px 0;
+  box-shadow: none;
+  color: #ffffff;
+  opacity: 0.75;
+  border-radius: 2px;
+  transition: opacity 0.35s ease-in-out;
+}
+#toast-container .toast:hover {
+  box-shadow: none;
+  opacity: 1;
+  cursor: pointer;
+}
+
+.toast {
+  background-color: #030303;
+}
+.toast-success {
+  background-color: #3BD973;
+}
+.toast-error {
+  background-color: #E92828;
+}
+.toast-info {
+  background-color: #356AFF;
+}
+.toast-warning {
+  background-color: #FB8D3D;
+}

client/app/assets/less/inc/vendor-overrides/bootgrid.less

@@ -0,0 +1,125 @@
+.bootgrid-table {
+    margin: 0;
+    box-shadow: none;
+}
+
+.bootgrid-footer .infoBar,
+.bootgrid-header .actionBar {
+    text-align: left;
+}
+
+.bootgrid-footer .search,
+.bootgrid-header .search {
+    vertical-align: top;
+}
+
+.bootgrid-header {
+    margin: 0;
+    padding: 25px;
+
+    .search {
+        border: 1px solid @input-border;
+
+        .form-control, .input-group-addon {
+            border: 0;
+        }
+
+        .input-group-addon {
+            font-size: 18px;
+            color: #333;
+            padding-right: 0 !important;
+            min-width: 26px;
+            text-align: right;
+        }
+
+        @media (min-width: @screen-xs-min) {
+            width: 300px;
+        }
+
+        @media (max-width: @screen-xs-min) {
+            width: 100%;
+            padding-right: 90px;
+        }
+
+
+    }
+
+    .actions {
+        box-shadow: none;
+
+        .btn-group {
+            .btn {
+                height: 37px;
+                background: #fff;
+                border-radius: 0;
+                border: 1px solid @input-border;
+            }
+
+            .dropdown-menu {
+                @media (min-width: @screen-sm-min) {
+                    left: 0;
+                    margin-top: 1px;
+                }
+
+                .dropdown-item {
+                    padding: 5px 10px;
+
+                    .input-helper {
+                        top: 5px;
+                    }
+                }
+            }
+
+            .caret {
+                display: none;
+            }
+
+            .zmdi {
+                line-height: 100%;
+                font-size: 18px;
+                vertical-align: top;
+            }
+
+        }
+
+        @media (max-width: @screen-xs-min) {
+            position: absolute;
+            top: 0;
+            right: 15px;
+        }
+    }
+}
+
+.bootgrid-footer {
+    border-top: 1px solid @table-border-color;
+    margin-top: 0;
+
+    .col-sm-6 {
+        padding: 25px;
+
+        @media (max-width: @screen-sm-min) {
+            text-align: center;
+        }
+    }
+
+    .infoBar {
+        @media (max-width: @screen-sm-min) {
+            display: none;
+        }
+
+            .infos {
+                border: 1px solid #EEE;
+                display: inline-block;
+                float: right;
+                padding: 7px 30px;
+                font-size: 12px;
+                margin-top: 3px;
+            }
+    }
+}
+
+.select-cell .checkbox {
+    margin: 0px 0 0 -19px;
+    top: 3px;
+}
+

client/app/assets/less/inc/vendor-overrides/bootstrap-datetimepicker.less

@@ -0,0 +1,215 @@
+.bootstrap-datetimepicker-widget {
+    padding: 0 !important;
+    margin: 0 !important;
+    width: auto !important;
+    
+    &:after, &:before { display: none !important; }
+    
+    table td {
+        text-shadow: none;
+        
+        span {
+            margin: 0;
+            
+            &:hover { background: transparent; }
+        }
+    }
+    
+    .glyphicon { font-family: @font-icon; font-size: 18px; }
+    .glyphicon-chevron-left:before { content: "\f2ff"; }
+    .glyphicon-chevron-right:before { content: "\f301"; }
+    .glyphicon-time:before { content: "\f337"; }
+    .glyphicon-calendar:before { content: "\f32e"; }
+    .glyphicon-chevron-up:before { content: "\f1e5"; }
+    .glyphicon-chevron-down:before { content: "\f1e4"; }
+    
+    [data-action="togglePicker"] span {
+        font-size: 25px;
+        color: #ccc;
+        
+        &:hover {
+            color: #333;
+        }
+    }
+    
+    a[data-action] {
+        color: @blue;
+    }
+}
+
+.timepicker-picker {
+    .btn { box-shadow: none !important; }
+    
+    table {
+        tbody tr + tr:not(:last-child) {
+            background: @blue;
+            color: #fff;
+            
+            td {
+                border-radius: 0;
+            }
+        }
+    }
+    
+    .btn {
+        background: #fff; 
+        color: #333; 
+    }
+}
+
+.datepicker {    
+    &.top {
+        .transform-origin(0 100%) !important;
+    }
+     
+    table {
+        thead {
+            tr {
+                th {
+                    border-radius: 0;
+                    color: #fff;
+                    
+                    .glyphicon {
+                        width: 30px;
+                        height: 30px;
+                        border-radius: 50%;
+                        line-height: 29px;
+                    }
+                    
+                    &:hover .glyphicon {
+                        background: rgba(0, 0, 0, 0.2);
+                    }
+                }
+                
+                &:first-child {
+                    th {
+                        background: @blue;
+                        padding: 20px 0;
+                        
+                        &:hover {
+                            background: @blue;
+                        }
+                        
+                        &.picker-switch { 
+                            font-size: 16px;
+                            font-weight: 400;
+                            text-transform: uppercase;
+                        }
+                    }
+                }
+                
+                &:last-child {
+                    th {
+                        &:first-child { padding-left: 20px; }
+                        &:last-child { padding-right: 20px; }
+                        
+                        text-transform: uppercase;
+                        font-weight: normal;
+                        font-size: 11px;
+                    }
+                    
+                    &:not(:only-child) {
+                        background: darken(@blue, 3%);  
+                    }
+                }
+            } 
+        }
+        
+        tbody {
+            tr {
+                &:last-child {
+                    td {
+                        padding-bottom: 25px;
+                    }
+                }
+                    
+                td {
+                    &:first-child {
+                        padding-left: 13px;
+                    }
+                    
+                    &:last-child {
+                        padding-right: 13px;
+                    } 
+                }
+            }
+        }
+        
+        td {
+    
+            &.day {
+                width: 35px;
+                height: 35px;
+                line-height: 20px;
+                color: #333;
+                position: relative;
+                padding: 0;
+                background: transparent;
+                
+                &:hover {
+                    background: none;
+                }
+                
+                &:before {
+                    content: "";
+                    width: 35px;
+                    height: 35px;
+                    border-radius: 50%;
+                    margin-bottom: -33px;
+                    display: inline-block;
+                    background: transparent;
+                    position: static;
+                    text-shadow: none;
+                }
+                
+                &.old, &.new {
+                    color: #CDCDCD;
+                }
+            }
+            
+            &:not(.today):not(.active) {
+                &:hover:before {
+                    background: #F0F0F0;
+                }
+            }
+            
+            &.today {
+                color: #333;
+                
+                &:before {
+                    background-color: #E2E2E2;
+                }
+            }
+            
+            &.active {
+                color: #fff;
+                
+                &:before {
+                    background-color: @blue;
+                }
+            }
+        }
+    }
+}
+
+.datepicker-months .month,
+.datepicker-years .year,
+.timepicker-minutes .minute,
+.timepicker-hours .hour {
+    border-radius: 50%;
+    
+    &:not(.active) {
+        &:hover {
+            background: #F0F0F0;
+        }
+    }
+    
+    &.active {
+        background: @blue;
+    }
+}
+
+.timepicker-minutes .minute,
+.timepicker-hours .hour {
+    padding: 0;
+}

client/app/assets/less/inc/vendor-overrides/bootstrap-select.less

@@ -0,0 +1,72 @@
+.bootstrap-select {    
+
+    .bs-searchbox {
+        padding: 0 18px;
+        margin: 5px 0 10px;
+        position: relative;
+        
+        &:before {
+            position: absolute;
+            left: 14px;
+            top: 2px;
+            width: 30px;
+            height: 100%;
+            content: "\f1c3";
+            font-family: @font-icon;
+            font-size: 25px;
+        }
+        
+        input {
+            padding-left: 25px;
+            border: 0;
+        }
+    }
+    
+    &.btn-group {
+        .dropdown-menu li a.opt {
+            padding-left: 17px;
+        }
+    }
+    
+    .check-mark {
+        margin-top: -5px !important;
+        font-size: 19px;
+        display: none;
+        position: absolute;
+        top: 11px;
+        right: 15px; 
+        
+        &:before {
+            content: "\f26b";
+            font-family: @font-icon;
+        }
+    }
+    
+    .selected {
+        .check-mark {
+            display: block !important;
+        }
+    }
+    
+    .notify {
+        bottom: 0 !important;
+        margin: 0 !important;
+        width: 100% !important;
+        border: 0 !important;
+        background: @red !important;
+        color: #fff !important;
+        text-align: center;
+    }
+    
+    &:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
+        width: 100%;
+    }
+    
+    .btn-default {
+        background-color: #fff;
+        border-radius: 0;
+        border: 1px solid @input-border;
+    }
+}
+
+

client/app/assets/less/inc/vendor-overrides/chosen.less

@@ -0,0 +1,114 @@
+.chosen-container {
+    .chosen-drop {
+        border-color: @input-border;
+        border-radius: 0;
+    }
+    
+    .chosen-results {
+        margin: 10px 0 0 0;
+        padding: 0;
+        
+        li {
+            padding: 10px 17px;
+            width: 100%;
+            
+            &.highlighted {
+                background: @dropdown-link-hover-bg;
+                color: @dropdown-link-hover-color;
+            }
+            
+            &.result-selected {
+                background: @lightblue;
+                color: @white;
+                position: relative;
+                
+                &:before {
+                    content: "\f26b";
+                    font-family: @font-icon;
+                    position: absolute;
+                    right: 15px;
+                    top: 10px;
+                    font-size: 19px;
+                }
+            }
+            
+            &.group-result {
+                &:not(:first-child) {
+                    border-top: 1px solid #eee;
+                }
+                
+                color: #B2B2B2;
+                font-weight: normal;
+                padding: 16px 15px 6px;
+                margin-top: 9px;
+            }
+        }
+    }
+}
+
+.chosen-container-single {
+    .chosen-single { 
+        border-radius: 0;
+        height: 35px;
+        padding: 7px 12px 6px;
+        line-height: 1.42857143;
+        border-color: @input-border;
+    }
+    
+    .chosen-search {
+        padding: 5px 12px;
+        
+        &:before {
+            content: "\f1c3";
+            font-family: @font-icon;
+            position: absolute;
+            left: 25px;
+            top: 9px;
+            font-size: 19px;
+        }
+        
+        input[type=text] {
+            border-color: @input-border;
+            padding: 8px 10px 8px 35px;
+        }
+    }
+}
+
+.chosen-container-multi {
+    .chosen-choices {
+        padding: 0 4px;
+        border-color: @input-border;
+        
+        li { 
+            &.search-choice {
+                border-radius: 0;
+                margin: 4px 4px 0 0;
+                background: @blue; 
+                border-color: @blue;
+                color: #fff;
+                padding: 5px 23px 5px 8px;
+
+                .search-choice-close {
+                    &:before {
+                        display: inline-block;
+                        font-family: @font-icon;
+                        content: "\f135";
+                        position: relative;
+                        top: 1px;
+                        color: #fff;
+                        z-index: 2;
+                        font-size: 12px;
+                    }
+                }
+            }
+            
+            &.search-field {
+                input[type=text] {
+                    padding: 0 8px;
+                    height: 31px;
+                }
+            }
+        }        
+    }
+}
+

client/app/assets/less/inc/vendor-overrides/farbtastic.less

@@ -0,0 +1,25 @@
+.cp-container {
+    position: relative;
+    
+    & > .input-group {
+        
+        input.cp-value {
+            color: #000 !important;
+            background: transparent !important;
+        }
+        
+        .dropdown-menu {
+            padding: 20px;
+            margin-top: 30px;
+        }
+    }
+    
+    i.cp-value {
+        width: 25px;
+        height: 25px;
+        border-radius: 50%;
+        position: absolute;
+        top: 5px;
+        right: 5px;
+    }
+} 

client/app/assets/less/inc/vendor-overrides/fileinput.less

@@ -0,0 +1,51 @@
+.fileinput {
+    position: relative;
+    padding-right: 35px;
+    
+    .close {
+          position: absolute;
+          top: 5px;
+          font-size: 12px;
+          float: none;
+          opacity: 1;
+          font-weight: 500;
+          border: 1px solid #ccc;
+          width: 19px;
+          text-align: center;
+          height: 19px;
+          line-height: 15px;
+          border-radius: 50%;
+          right: 0;
+        
+          &:hover {
+            background: #eee;
+          }
+    }
+     
+    .btn-file {
+        
+    }
+    
+    .input-group-addon {
+        padding: 0 10px;
+        vertical-align: middle; 
+    }
+    
+    .fileinput-preview {
+        width: 200px;
+        height: 150px;
+        position: relative;
+        
+        img {
+            display: inline-block;
+            vertical-align: middle;
+            margin-top: -13px;
+        }
+        
+        &:after {
+            content: "";
+            display: inline-block;
+            vertical-align: middle;
+        }
+    }
+} 

client/app/assets/less/inc/vendor-overrides/fullcalendar.less

@@ -0,0 +1,207 @@
+/** CALENDAR WIDGET **/
+#calendar-widget {
+    margin-bottom: 30px;
+    box-shadow: 0 1px 1px rgba(0,0,0,.15);
+}
+
+#fc-actions {
+	position: absolute;
+	bottom: 23px;
+	right: 22px;
+    
+    & > li > a {
+        font-size: 20px;
+        color: #fff;
+        width: 30px;
+        height: 30px;
+        border-radius: 50%;
+        line-height: 30px; 
+        
+        
+    }
+    
+    & > li.open > a,
+    & > li > a:hover {
+        background: darken(@teal, 7%);
+    }
+}
+
+.fc {
+	background-color: #fff;
+	margin-bottom: 20px;
+
+	td {
+		border-color: @table-border-color !important;
+	}
+    
+	th {
+	    background: darken(@teal, 7%);
+	    color: #fff;
+	    font-weight: 400;
+	    padding: 6px 0;
+	}
+
+	table tr {
+		& > td:first-child {
+			border-left-width: 0;
+		}
+	}
+
+	.ui-widget-header {
+		border-width: 0;
+	}
+    
+    .fc-day-number {
+        color: #CCC;
+    }
+    
+    .fc-event-container {
+        padding: 0 2px 2px;
+    }
+}
+
+.fc-toolbar {
+    background: @teal;
+    margin-bottom: 0;
+    padding: 25px 7px 25px;
+    position: relative;
+    .user-select(none);
+    
+    &:before {
+        content: "";
+        bottom: -30px;
+        height: 30px;
+        width: 100%;
+        background: darken(@teal, 7%);
+        position: absolute;
+        left: 0;
+        z-index: 0;
+    }
+    
+    h2 {
+		color: rgba(255, 255, 255, 0.9);
+		margin-top: 7px;
+		font-size: 19px;
+		font-weight: 400;
+    }
+    
+    .ui-button  {
+		border: 0;
+		background: 0 0;
+		padding: 0;
+		outline: none !important;
+		text-align: center;
+		
+		& > span {
+		    position: relative;
+		    font-family: @font-icon;
+		    font-size: 20px;
+		    color: #FFF;
+		    line-height: 100%;
+		    width: 31px;
+            height: 31px;
+            border-radius: 50%;
+		    padding-top: 6px;
+		    display: block;
+		    margin-top: 2px;
+		    
+		    &:before {
+				position: relative;
+				z-index: 1;
+		    }
+		    
+		    &.ui-icon-circle-triangle-w:before {
+				content: "\f2fa";
+		    }
+		    
+		    &.ui-icon-circle-triangle-e:before {
+				content: "\f2fb"; 
+		    }
+            
+            &:hover {
+                background: darken(@teal, 7%);
+                color: #fff;
+            }
+		}
+    }
+}
+.fc-event {
+	padding: 0;
+    font-size: 11px;
+    border-radius: 0;
+    border: 0;
+    
+    .fc-title {
+		padding: 3px 5px 2px;
+		display: block;
+    }
+    
+    .fc-time {
+		float: left;
+		background: rgba(0, 0, 0, 0.2);
+		padding: 2px 6px;
+		margin: 0 0 0 -1px;
+    }
+}
+
+.fc-view, .fc-view > table {
+    border: 0;
+    overflow: hidden;
+}
+
+.fc-content-skeleton {
+    table {
+        background: transparent;
+    }
+}
+
+#calendar {
+    .fc-day-number {
+        @media screen and (min-width: @screen-sm-max) {
+            font-size: 25px;
+            letter-spacing: -2px; 
+        }
+    
+        padding-left: 10px !important;
+        text-align: left !important;
+        
+    }
+}
+
+
+/* Even Tag Color */
+.event-tag {
+    margin-top: 5px;
+    
+    & > span {
+	border-radius: 50%;
+	width: 30px;
+	height: 30px;
+    margin-right: 3px;
+	position: relative;
+	display: inline-block; 
+	cursor: pointer;
+	
+	&:hover {
+	    .opacity(0.8);
+	}
+	
+	&.selected {
+	    &:before {
+            font-family: @font-icon;
+            content: "\f26b";
+            position: absolute;
+            text-align: center;
+            top: 3px;
+            width: 100%;
+            font-size: 17px;
+            color: #FFF;
+            }
+        }
+    }
+}
+
+/* Height Fix */
+.fc-day-grid-container {
+    height: auto !important;
+}

client/app/assets/less/inc/vendor-overrides/light-gallery.less

@@ -0,0 +1,69 @@
+.lg-outer .lg-item {
+    background-image: none;
+}
+
+.lg-slide {    
+    &:after {
+        content: "";
+        -webkit-animation-fill-mode: both;
+        animation-fill-mode: both;
+        height: 50px;
+        width: 50px;
+        border-radius: 100%;
+        border: 2px solid @white;
+        -webkit-animation: ball-scale-ripple 1s 0s infinite cubic-bezier(0.21, 0.53, 0.56, 0.8);
+        animation: ball-scale-ripple 1s 0s infinite cubic-bezier(0.21, 0.53, 0.56, 0.8);
+        position: absolute;
+        left: 50%;
+        margin-left: -25px;
+        top: 50%;
+        margin-top: -25px;
+        z-index: -1;
+    }
+    
+    em {
+        font-style: normal;
+        display: block;
+        margin-bottom: 20px;
+        
+        h3 {
+            margin-bottom: 5px;
+            color: #D2D2D2;
+            font-weight: 100;
+        }
+        
+        p {
+            color: #6B6B6B;
+        }
+    }
+}
+@-webkit-keyframes ball-scale-ripple {
+  0% {
+    -webkit-transform: scale(0.1);
+            transform: scale(0.1);
+    opacity: 1; }
+
+  70% {
+    -webkit-transform: scale(1);
+            transform: scale(1);
+    opacity: 0.7; }
+
+  100% {
+    opacity: 0.0; } 
+}
+
+@keyframes ball-scale-ripple {
+  0% {
+    -webkit-transform: scale(0.1);
+            transform: scale(0.1);
+    opacity: 1; }
+
+  70% {
+    -webkit-transform: scale(1);
+            transform: scale(1);
+    opacity: 0.7; }
+
+  100% {
+    opacity: 0.0; } 
+}
+

client/app/assets/less/inc/vendor-overrides/malihu-custom-scrollbar.less

@@ -0,0 +1,25 @@
+.mCSB_container,
+.mCustomScrollBox {
+    overflow: visible;
+}
+
+.mCSB_scrollTools {
+    width: 12px;
+    
+    .mCSB_draggerRail,
+    .mCSB_dragger .mCSB_dragger_bar {
+        border-radius: 0;
+    }
+    
+    .mCSB_draggerRail {
+        background: transparent !important;
+    }
+}
+
+.mCS-dark.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar {
+    background: rgba(0,0,0,0.4); 
+}
+
+.mCSB_inside > .mCSB_container {
+    margin-right: 0;
+}

client/app/assets/less/inc/vendor-overrides/noUiSlider.less

@@ -0,0 +1,172 @@
+.noUi-target {
+    border-radius: 0;
+    box-shadow: none;
+    border: 0;
+}
+
+.noUi-background {
+    background: #d4d4d4;
+    box-shadow: none;
+}
+
+.noUi-horizontal {
+    height: 3px;
+    
+    .noUi-handle {
+        top: -8px;
+    }
+}
+
+.noUi-vertical {
+    width: 3px;
+}
+
+.noUi-horizontal,
+.noUi-vertical {
+    .noUi-handle {
+        width: 19px;
+        height: 19px;
+        border: 0;
+        border-radius: 100%;
+        box-shadow: none;
+        .transition(box-shadow);
+        .transition-duration(200ms);
+        cursor: pointer;
+        position: relative;
+        
+        &:before,
+        &:after {
+            display: none;
+        }
+        
+        &:active {
+            background: #ccc !important;
+        }
+        
+        .is-tooltip {
+            position: absolute;
+            bottom: 32px;
+            height: 35px;
+            border-radius: 2px;
+            color: #fff;
+            text-align: center;
+            line-height: 33px;
+            width: 50px;
+            left: 50%;
+            margin-left: -25px;
+            padding: 0 10px;
+            .transition(all);
+            .transition-duration(200ms);
+            .backface-visibility(hidden);
+            .opacity(0);
+            .scale(0);
+            
+            &:after {
+                width: 0;
+                height: 0;
+                border-style: solid;
+                border-width: 15px 10px 0 10px;
+                position: absolute;
+                bottom: -8px;
+                left: 50%;
+                margin-left: -9px;
+                content: "";
+
+            }
+        }
+    }
+    
+    .noUi-active {
+        box-shadow: 0 0 0 13px rgba(0,0,0,0.1);
+        
+        .is-tooltip {
+            .scale(1);
+            bottom: 40px;
+            .opacity(1);
+        }
+    }
+}  
+
+.input-slider,
+.input-slider-range,
+.input-slider-values {
+    &:not([data-is-color]) {
+        .noUi-handle,
+        .noUi-connect, {
+            background: @teal !important;
+        }
+        
+        .is-tooltip {
+            background: @teal;
+            
+            &:after {
+                border-color: @teal transparent transparent transparent;
+            }
+        }
+    }
+    
+    &[data-is-color=red] {
+        .is-color-handle(@red);
+    }
+    
+    &[data-is-color=blue] {
+        .is-color-handle(@blue);
+    }
+    
+    &[data-is-color=cyan] {
+        .is-color-handle(@cyan);
+    }
+    
+    &[data-is-color=amber] {
+        .is-color-handle(@amber);
+    }
+    
+    &[data-is-color=green] {
+        .is-color-handle(@green);
+    }
+}
+
+.input-slider {
+    .noUi-origin {
+        background: #d4d4d4;
+    }
+    
+    &:not([data-is-color]) {
+        .noUi-base {
+            background: @teal !important;
+        }
+    }
+    
+    &[data-is-color=red] {
+        .is-color-base(@red);
+    }
+    
+    &[data-is-color=blue] {
+        .is-color-base(@blue);
+    }
+    
+    &[data-is-color=cyan] {
+        .is-color-base(@cyan);
+    }
+    
+    &[data-is-color=amber] {
+        .is-color-base(@amber);
+    }
+    
+    &[data-is-color=green] {
+        .is-color-base(@green);
+    }
+}
+
+.is-color-handle(@color) {
+    .noUi-handle,
+    .noUi-connect {
+        background: @color !important;
+    }
+}
+
+.is-color-base(@color) {
+    .noUi-base {
+        background: @color !important;
+    }
+}

client/app/assets/less/inc/vendor-overrides/summernote.less

@@ -0,0 +1,194 @@
+.note-editor,
+.note-popover {
+    .note-toolbar,
+    .popover-content {
+        background: #fff;
+        border-color: #e4e4e4;
+        margin: 0;
+        padding: 10px 0 15px;
+        text-align: center;
+        
+        & > .btn-group {
+            display: inline-block;
+            float: none;
+            box-shadow: none;
+            
+            .btn {
+                margin: 0 1px;
+                border: 0;
+            }
+            
+            & > .active {
+                background: @cyan;
+                color: #fff;
+            }
+        }
+        
+            
+        .btn {
+            height: 40px;
+            border-radius: 2px !important;
+            box-shadow: none !important;
+            background: #fff;
+            
+            &:active {
+                box-shadow: none;
+            }
+        }
+
+        .note-palette-title {
+            margin: 0 !important;
+            padding: 10px 0 !important;
+            font-size: 13px !important;
+            text-align: center !important;  
+            border: 0 !important;
+        }
+        
+        .note-color-reset {
+            padding: 0 0 10px !important;
+            margin: 0 !important;
+            background: none;
+            text-align: center;
+        }
+         
+        .note-color {
+            .dropdown-menu {
+                min-width: 335px;
+            }
+        }
+    }
+    
+    .note-statusbar {
+        .note-resizebar {
+            border-color: #E8E8E8;
+            
+            .note-icon-bar {
+                border-color: #BCBCBC;
+            }
+        }
+    }
+    
+    .fa {
+        font-style: normal;
+        font-size: 20px;
+        vertical-align: middle;
+        
+        &:before {
+            font-family: @font-icon;
+        }
+        
+        &.fa-magic:before {
+            content: "\f16a";
+        }
+        
+        &.fa-bold:before {
+            content: "\f23d";
+        }
+        
+        &.fa-italic:before {
+            content: "\f245";
+        }
+        
+        &.fa-underline:before {
+            content: "\f24f";
+        }
+        
+        &.fa-font:before {
+            content: "\f242";
+        }
+        
+        &.fa-list-ul:before {
+            content: "\f247";
+        }
+        
+        &.fa-list-ol:before {
+            content: "\f248";
+        }
+
+        &.fa-align-left:before {
+            content: "\f23b";
+        }
+        
+        &.fa-align-right:before {
+            content: "\f23c";
+        }
+
+        &.fa-align-center:before {
+            content: "\f239";
+        }
+
+        &.fa-align-justify:before {
+            content: "\f23a";
+        }
+        
+        &.fa-indent:before {
+            content: "\f244";
+        }
+        
+        &.fa-outdent:before {
+            content: "\f243";
+        }
+        
+        &.fa-text-height:before {
+            content: "\f246";
+        }
+        
+        &.fa-table:before {
+            content: "\f320";
+        }
+        
+        &.fa-link:before {
+            content: "\f18e";
+        }
+        
+        &.fa-picture-o:before {
+            content: "\f17f";
+        }
+        
+        &.fa-minus:before {
+            content: "\f22f";
+        }
+        
+        &.fa-arrows-alt:before {
+            content: "\f16d";
+        }
+        
+        &.fa-code:before {
+            content: "\f13a";
+        }
+        
+        &.fa-question:before {
+            content: "\f1f5";
+        }
+        
+        &.fa-eraser:before {
+            content: "\f23f";
+        }
+        
+        &.fa-square:before {
+            content: "\f279";
+        }
+        
+        &.fa-circle-o:before {
+            content: "\f26c";
+        }
+        
+        &.fa-times:before {
+            content: "\f136";
+        }
+    }
+    
+    .note-air-popover {
+        .arrow {
+            left: 20px;
+        }
+    }
+}
+
+.note-editor {
+    border: 1px solid #e4e4e4;
+
+    .note-editable {
+        padding: 20px 23px;
+    }
+}

client/app/assets/less/inc/vendor-overrides/sweetalert.less

@@ -0,0 +1,21 @@
+.sweet-alert {
+    border-radius: 2px;
+    padding: 10px 30px;
+    
+    h2 {
+        font-size: 16px;
+        font-weight: 400;
+        position: relative;
+        z-index: 1;
+    }
+    
+    .lead {
+        font-size: 13px;
+    }
+    
+    .btn {
+        padding: 6px 12px; 
+        font-size: 13px;
+        margin: 20px 2px 0;
+    }
+}

client/app/assets/less/inc/vendor-overrides/typeahead.less

@@ -0,0 +1,24 @@
+.twitter-typeahead {
+    width: 100%;
+    
+    .tt-menu {
+        min-width: 200px;
+        background: #fff;
+        box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+    }
+    
+    .tt-suggestion:hover,
+    .tt-cursor {
+        background-color: rgba(0,0,0,0.075);
+    }
+    
+    .tt-suggestion {
+        padding: 8px 17px;
+        color: #333;
+        cursor: pointer;
+    }
+    
+    .tt-hint {
+        color: #818181 !important;
+    }
+}

client/app/assets/less/inc/vendor-overrides/ui-select.less

@@ -0,0 +1,35 @@
+/* ui-select adjustments for SuperFlat */
+.clearable button {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+
+/* Same definition as .form-control */
+.ui-select-toggle.btn-default {
+  height: 35px;
+  padding: 6px 12px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #9E9E9E;
+  background: #fff;
+  border: 1px solid #e8e8e8;
+  border-radius: 2px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+
+  &:hover, &:active, &.active, &:focus, &.focus {
+    background: #fff;
+  }
+}
+
+.btn-default-focus {
+  outline: none;
+  outline-offset: 0;
+  box-shadow: none;
+  background: none;
+}
+

client/app/assets/less/inc/visualizations/cohort.less

@@ -0,0 +1,28 @@
+cohort-renderer {
+  display: block;
+}
+
+.cornelius-container {
+  padding: 0;
+  margin: 0;
+
+  .cornelius-table {
+    width: 100%;
+    margin: 0;
+    box-shadow: none;
+    border-radius: 0;
+    background: transparent;
+
+    tr, th, td {
+      border-color: @table-border-color;
+    }
+
+    td {
+      border-radius: 0 !important;
+    }
+
+    .cornelius-time, .cornelius-label, .cornelius-people {
+      background-color: fade(@redash-gray, 3%) !important;
+    }
+  }
+}

client/app/assets/less/inc/visualizations/editor.less

@@ -0,0 +1,15 @@
+.col-table .missing-value {
+  color: #b94a48;
+}
+
+.col-table .super-small-input {
+  padding-left: 3px;
+  height: 24px;
+}
+
+.col-table .ui-select-toggle, .col-table .ui-select-search {
+  padding: 2px;
+  padding-left: 5px;
+  height: 24px;
+}
+

client/app/assets/less/inc/visualizations/map.less

@@ -6,9 +6,32 @@
     height: 100%;
     z-index: 0;
   }
-}
 
-.leaflet-popup-content img {
+  .map-custom-control.leaflet-bar {
-  max-width: 100%;
+    background: #fff;
-  height: auto;
+    padding: 10px;
+    margin: 10px;
+    position: absolute;
+    z-index: 1;
+
+    &.top-left {
+      left: 0;
+      top: 0;
+    }
+
+    &.top-right {
+      right: 0;
+      top: 0;
+    }
+
+    &.bottom-left {
+      left: 0;
+      bottom: 0;
+    }
+
+    &.bottom-right {
+      right: 0;
+      bottom: 0;
+    }
+  }
 }

client/app/assets/less/inc/visualizations/misc.less

@@ -1,4 +1,4 @@
-.visualization-renderer {
+visualization-renderer {
   display: block;
 
   .pagination,

client/app/assets/less/inc/visualizations/pivot-table.less

@@ -1,4 +1,4 @@
-.pivot-table-visualization-container > table,
+.pivot-table-renderer > table,
-.visualization-renderer > .visualization-renderer-wrapper {
+visualization-renderer > .visualization-renderer-wrapper {
   overflow: auto;
 }

client/app/assets/less/main.less

@@ -1,56 +1,78 @@
 /** LESS Plugins **/
-@import "inc/less-plugins/for";
+@import 'inc/less-plugins/for';
 
 /** Load Main Bootstrap LESS files **/
-@import "~bootstrap/less/bootstrap";
+@import '~bootstrap/less/bootstrap';
 
 /** Load Vendors Dependencies **/
-@import "~font-awesome/less/font-awesome";
+@import '~font-awesome/less/font-awesome';
-@import "~material-design-iconic-font/dist/css/material-design-iconic-font.css";
+@import '~ui-select/dist/select.css';
+@import '~angular-resizable/src/angular-resizable.css';
+@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/angular';
-@import "inc/mixins";
+@import 'inc/variables';
-@import "inc/font";
+@import 'inc/mixins';
-@import "inc/print";
+@import 'inc/font';
+@import 'inc/print';
 
-@import "inc/bootstrap-overrides";
+@import 'inc/bootstrap-overrides';
-@import "inc/base";
+@import 'inc/base';
-@import "inc/generics";
+@import 'inc/generics';
-@import "inc/form";
+@import 'inc/form';
-@import "inc/button";
+@import 'inc/button';
-@import "inc/list";
+@import 'inc/list';
-@import "inc/header";
+@import 'inc/header';
-@import "inc/tile";
+@import 'inc/tile';
-@import "inc/label";
+@import 'inc/label';
-@import "inc/dropdown";
+@import 'inc/dropdown';
-@import "inc/list-group";
+@import 'inc/list-group';
-@import "inc/misc";
+@import 'inc/misc';
-@import "inc/progress-bar";
+@import 'inc/progress-bar';
-@import "inc/widgets";
+@import 'inc/widgets';
-@import "inc/table";
+@import 'inc/table';
-@import "inc/alert";
+@import 'inc/alert';
-@import "inc/media";
+@import 'inc/media';
-@import "inc/modal";
+@import 'inc/modal';
-@import "inc/panel";
+@import 'inc/tab';
-@import "inc/tooltips";
+@import 'inc/panel';
-@import "inc/popover";
+@import 'inc/tooltips';
-@import "inc/breadcrumb";
+@import 'inc/popover';
-@import "inc/jumbotron";
+@import 'inc/breadcrumb';
-@import "inc/profile";
+@import 'inc/jumbotron';
-@import "inc/404";
+@import 'inc/profile';
-@import "inc/ie-warning";
+@import 'inc/404';
-@import "inc/edit-in-place";
+@import 'inc/ie-warning';
-@import "inc/flex";
+@import 'inc/navbar';
-@import "inc/ace-editor";
+@import 'inc/edit-in-place';
-@import "inc/schema-browser";
+@import 'inc/growl';
-@import "inc/visualizations/box";
+@import 'inc/flex';
-@import "inc/visualizations/pivot-table";
+@import 'inc/ace-editor';
-@import "inc/visualizations/map";
+@import 'inc/overlay';
-@import "inc/visualizations/misc";
+@import 'inc/schema-browser';
+@import 'inc/toast';
+@import 'inc/visualizations/box';
+@import 'inc/visualizations/sankey';
+@import 'inc/visualizations/pivot-table';
+@import 'inc/visualizations/map';
+@import 'inc/visualizations/sunburst';
+@import 'inc/visualizations/cohort';
+@import 'inc/visualizations/misc';
+
+/** VENDOR OVERRIDES **/
+@import 'inc/vendor-overrides/bootstrap-select';
+@import 'inc/vendor-overrides/bootstrap-datetimepicker';
+@import 'inc/vendor-overrides/typeahead';
+@import 'inc/vendor-overrides/sweetalert';
+@import 'inc/vendor-overrides/ui-select';
 
 /** REDASH STYLING **/
-@import "redash/redash-table";
+@import 'redash/redash-table';
-@import "redash/query";
+@import 'redash/query';
-@import "redash/tags-control";
+@import 'redash/tags-control';
-@import "redash/css-logo";
+@import 'redash/css-logo';
-@import "redash/loading-indicator";
+@import 'redash/loading-indicator';
+
+
+

client/app/assets/less/redash/loading-indicator.less

@@ -39,8 +39,8 @@
   }
 }
 
-// hide indicator when application has content
+// hide indicator when app-view has content
-#application-root:not(:empty) ~ .loading-indicator {
+app-view:not(:empty) ~ .loading-indicator {
   opacity: 0;
   transform: scale(0.9);
   pointer-events: none;
@@ -48,4 +48,4 @@
   * {
     animation: none !important;
   }
-}
+}

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

@@ -2,22 +2,59 @@ body.fixed-layout {
   padding: 0;
   overflow: hidden;
 
-  #application-root {
+  app-view {
     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;
     }
   }
 }
 
+.tab-nav .tab-new-vis {
+  margin: 0 5px;
+
+  > a {
+    color: @headings-color;
+    margin-top: 8px;
+    padding: 7px;
+    font-weight: 400;
+  }
+}
+
+.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;
+ padding-bottom: 60px !important;
 }
 
 .bottom-controller-container {
@@ -27,11 +64,91 @@ body.fixed-layout {
   flex-shrink: 0;
 }
 
+.query-metadata__bottom {
+  margin: 0 10px;
+}
+
+.bottom-controller, .bottom-controller-container {
+  .query-metadata__property {
+    margin-right: 5px;
+  }
+}
+
 // Editor
+edit-in-place p, span.editable {
+  display: inline-block;
+}
+
+edit-in-place p.editable:hover {
+  display: inline-block;
+}
+
+.editor__control {
+  margin-top: 10px;
+
+  .dropdown-toggle {
+    margin-right: 0;
+  }
+}
+
 .filter-container {
   margin-bottom: 5px;
 }
 
+.ace_editor.ace_autocomplete .ace_completion-highlight {
+  text-shadow: none !important;
+  background: #ffff005e;
+  font-weight: 600;
+}
+
+.query-metadata {
+  background: #fff;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+
+  table {
+    width: 100%;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+
+    td {
+      padding: 3px 0;
+      vertical-align: top;
+    }
+
+    tr {
+      td:first-of-type {
+        padding-right: 5px;
+      }
+    }
+  }
+
+  p {
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .query-metadata__property {
+    width: 60px;
+    display: inline-block;
+  }
+
+  ._query-metadata__time {
+
+  }
+}
+
+.editor__control {
+  .form-control {
+    height: 30px;
+  }
+}
+
 .schema-container {
   background: transparent;
   flex-grow: 1;
@@ -41,7 +158,7 @@ body.fixed-layout {
 
 .editor__left {
   height: 100% !important;
-  width: calc(~"25% - 10px");
+  width: calc(~'25% - 10px');
   margin-right: 10px;
 
   .form-control {
@@ -72,6 +189,10 @@ body.fixed-layout {
   }
 }
 
+.embed__vis {
+
+}
+
 .query__vis {
   table {
     border: 1px solid #f0f0f0;
@@ -90,7 +211,6 @@ body.fixed-layout {
 .embed__vis {
   display: flex;
   flex-flow: column;
-  width: 100%;
 }
 
 .embed-heading {
@@ -109,14 +229,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 +239,14 @@ body.fixed-layout {
   }
 }
 
+.page-header--query {
+  .page-title {
+    display: block;
+    margin-left: 15px;
+    margin-right: 15px;
+  }
+}
+
 a.label-tag {
   background: fade(@redash-gray, 15%);
   color: darken(@redash-gray, 15%);
@@ -137,11 +257,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,23 +273,9 @@ 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 {
+  .tile, .tiled {
-    .react-resizable-handle-horizontal {
-      border-right: 1px solid #efefef;
-    }
-
-    .react-resizable-handle-vertical {
-      border-bottom: 1px solid #efefef;
-    }
-  }
-
-  .query-metadata.query-metadata-horizontal {
-    border-bottom: 1px solid #efefef;
-  }
-
-  .tile,
-  .tiled {
     box-shadow: none;
     padding: 15px 0 !important;
   }
@@ -181,26 +290,22 @@ a.label-tag {
     min-width: 10px;
     overflow-x: hidden;
 
+    .schema-container {
+    }
+
     .editor__left__data-source,
     .schema-control,
+    .query-metadata--history,
     .editor {
       flex-shrink: 0;
     }
 
-    .editor__left__schema,
+    .query-metadata {
-    .editor__left__data-source {
+      border-top: 1px solid #efefef;
-      padding: 15px;
     }
 
-    .editor__left__data-source {
+    .query-metadata, .editor__left__schema, .editor__left__data-source {
-      .ant-select {
+      padding: 15px;
-        .ant-select-selection-selected-value {
-          img,
-          span {
-            vertical-align: middle;
-          }
-        }
-      }
     }
 
     .editor__left__schema {
@@ -211,7 +316,7 @@ a.label-tag {
       padding-top: 0 !important;
       position: relative;
 
-      .schema-container {
+      schema-browser {
         position: absolute;
         left: 15px;
         top: 0;
@@ -220,6 +325,10 @@ a.label-tag {
       }
     }
   }
+  main {
+    display: flex;
+    height: 100%;
+  }
   .content {
     background: #fff;
     flex-grow: 1;
@@ -229,9 +338,23 @@ a.label-tag {
     align-content: space-around;
     padding: 0;
     overflow-x: hidden;
+
+    .editor {
+      border-bottom: 1px solid #efefef;
+    }
+
+    .pivot-table-renderer > table,
+    visualization-renderer > .visualization-renderer-wrapper {
+      overflow: visible;
+    }
+
+    .tab-nav {
+      flex-shrink: 0;
+    }
   }
   .row {
     background: #fff;
+    z-index: 9;
     min-height: 50px;
 
     &.resizable {
@@ -244,10 +367,6 @@ a.label-tag {
       justify-content: space-around;
       align-content: space-around;
       overflow: hidden;
-
-      min-height: 10px;
-      max-height: 70vh;
-      flex: 0 0 300px;
     }
 
     .row {
@@ -274,10 +393,7 @@ a.label-tag {
       transition: none !important;
     }
   }
-  .rg-right,
+  .rg-right, .rg-left, .rg-top, .rg-bottom {
-  .rg-left,
-  .rg-top,
-  .rg-bottom {
     display: block;
     width: 10px;
     height: 10px;
@@ -292,34 +408,32 @@ a.label-tag {
       border: 1px solid #ccc;
     }
   }
-  .rg-right,
+  .rg-right, .rg-left {
-  .rg-left {
     span {
       border-width: 0 1px;
       top: 50%;
-      margin: -10px 0 0 @spacing / 4;
+      margin: -10px 0 0 @spacing/4;
       height: 20px;
       width: 3px;
     }
   }
-  .rg-top,
+  .rg-top, .rg-bottom {
-  .rg-bottom {
     span {
       border-width: 1px 0;
       left: 50%;
-      margin: @spacing / 4 0 0 -10px;
+      margin: @spacing/4 0 0 -10px;
       width: 20px;
       height: 3px;
     }
   }
-  .rg-top {
+  .rg-top     {
     cursor: row-resize;
     width: 100%;
     top: 0;
     left: 0;
-    margin-top: -@spacing / 2;
+    margin-top: -@spacing/2;
   }
-  .rg-right {
+  .rg-right   {
     cursor: col-resize;
     border-right: 1px solid #efefef;
     height: 100%;
@@ -331,7 +445,7 @@ a.label-tag {
       background: fade(@redash-gray, 6%);
     }
   }
-  .rg-bottom {
+  .rg-bottom  {
     cursor: row-resize;
     background: #fff;
     width: 100%;
@@ -343,7 +457,7 @@ a.label-tag {
       background: fade(@redash-gray, 6%);
     }
   }
-  .rg-left {
+  .rg-left    {
     cursor: col-resize;
     height: 100%;
     left: 0;
@@ -356,6 +470,11 @@ a.label-tag {
   visibility: hidden;
 }
 
+.query-fullscreen .query-metadata__mobile {
+  display: none;
+}
+
+
 // Visualization editor
 .modal-xl .modal-content {
   border: none;
@@ -392,13 +511,42 @@ nav .rg-bottom {
   visibility: hidden;
 }
 
+.query-metadata--description {
+  max-height: 125px;
+  overflow-y: auto;
+
+  .edit-in-place.active {
+    width: 100% !important;
+  }
+
+  .edit-in-place .rd-form-control {
+    width: 100% !important;
+  }
+}
+
+.query-metadata--refresh {
+  height: 50px;
+  border: none !important;
+
+  .query-metadata__property {
+    width: auto;
+  }
+
+  p {
+    display: block;
+  }
+}
+
 .query-tags {
   display: inline-block;
   vertical-align: middle;
+  margin-top: -3px; // padding-top of tags
 }
 
 .query-tags__mobile {
   display: none;
+  margin: -5px 0 0 0;
+  padding: 0 0 0 23px;
 }
 
 .table--permission {
@@ -412,20 +560,27 @@ nav .rg-bottom {
 }
 
 .edit-visualization {
-  margin-right: 5px;
+    margin-right: 5px;
-}
-
-@media (min-width: 880px) {
-  .query-fullscreen {
-    .query-metadata.query-metadata-horizontal {
-      display: none;
-    }
-  }
 }
 
 // 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;
@@ -435,6 +590,10 @@ nav .rg-bottom {
     display: none;
   }
 
+  .tab-nav .tab-new-vis {
+    display: none;
+  }
+
   .query-fullscreen {
     flex-direction: column;
     overflow: hidden;
@@ -447,6 +606,25 @@ nav .rg-bottom {
       display: none;
     }
 
+    .query-metadata__mobile {
+      border-bottom: 1px solid #efefef;
+      min-height: 0 !important;
+      flex-shrink: 0;
+      padding: 10px 15px;
+      display: flex;
+      flex-wrap: nowrap;
+      justify-content: space-between;
+      align-items: center;
+
+      .profile__image_thumb {
+        margin: 0 5px 0 0;
+      }
+
+      .query-metadata__property {
+        white-space: nowrap;
+      }
+    }
+
     main {
       flex-direction: column-reverse;
 
@@ -479,14 +657,20 @@ nav .rg-bottom {
     }
   }
 
+  .query-page-wrapper {
+    .container {
+      margin-left: 0;
+      margin-right: 0;
+    }
+  }
+
   .datasource-small {
     visibility: visible;
   }
 }
 
 @media (max-width: 768px) {
-  .editor__left__schema,
+  .editor__left__schema, .editor__left__data-source {
-  .editor__left__data-source {
     display: none;
   }
 
@@ -494,3 +678,16 @@ nav .rg-bottom {
     padding-right: 0;
   }
 }
+
+// Responsive fixes
+@media (max-width: 767px) {
+  .query-page-wrapper {
+    h3 {
+      font-size: 18px;
+    }
+
+    favorites-control {
+      margin-top: -3px;
+    }
+  }
+}

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

@@ -10,11 +10,13 @@
     display: inline-block;
   }
 
-  .tag-separator {
-    margin: 4px 3px 0 0;
-  }
-
   &.disabled {
     opacity: 0.4;
   }
 }
+
+// This is for using .inline-tags-control in Angular which renders
+// a little differently than React (e.g. in Alert.html)
+.inline-tags-control .tags-control {
+  display: inline-block;
+}

client/app/components/AceEditorInput.jsx

@@ -1,11 +1,11 @@
-import React, { forwardRef } from "react";
+import React, { forwardRef } from 'react';
-import AceEditor from "react-ace";
+import AceEditor from 'react-ace';
 
-import "./AceEditorInput.less";
+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/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,69 +0,0 @@
-import { get, isObject } 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:
-      return "It seems like the page you're looking for cannot be found.";
-    case 401:
-    case 403:
-      return "It seems like you don’t have permission to see this page.";
-    default:
-      return defaultMessage;
-  }
-}
-
-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
-    if (error.isAxiosError && isObject(error.response)) {
-      return getErrorMessageByStatus(error.response.status, get(error, "response.data.message", message));
-    }
-    // Router errors
-    if (error.status) {
-      return getErrorMessageByStatus(error.status, message);
-    }
-  }
-  return message;
-}
-
-export default function ErrorMessage({ error, message }) {
-  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="error-state bg-white tiled">
-        <div className="error-state__icon">
-          <i className="zmdi zmdi-alert-circle-o" />
-        </div>
-        <div className="error-state__details">
-          <DynamicComponent
-            name="ErrorMessageDetails"
-            fallback={<ErrorMessageDetails {...errorDetailsProps} />}
-            {...errorDetailsProps}
-          />
-        </div>
-      </div>
-    </div>
-  );
-}
-
-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,145 +0,0 @@
-import { isFunction, startsWith, trimStart, trimEnd } from "lodash";
-import React, { useState, useEffect, useRef, useContext } from "react";
-import PropTypes from "prop-types";
-import UniversalRouter from "universal-router";
-import ErrorBoundary from "@redash/viz/lib/components/ErrorBoundary";
-import location from "@/services/location";
-import url from "@/services/url";
-
-import ErrorMessage from "./ErrorMessage";
-
-function generateRouteKey() {
-  return Math.random()
-    .toString(32)
-    .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
-  // start with resolved root) - return false. Otherwise
-  // strip root and return relative url.
-
-  const baseHref = trimEnd(url.normalize(""), "/") + "/";
-  href = url.normalize(href);
-
-  if (startsWith(href, baseHref)) {
-    return "/" + trimStart(href.substr(baseHref.length), "/");
-  }
-
-  return false;
-}
-
-export default function Router({ routes, onRouteChange }) {
-  const [currentRoute, setCurrentRoute] = useState(null);
-
-  const currentPathRef = useRef(null);
-  const errorHandlerRef = useRef();
-
-  useEffect(() => {
-    let isAbandoned = false;
-
-    const router = new UniversalRouter(routes, {
-      resolveRoute({ route }, routeParams) {
-        if (isFunction(route.render)) {
-          return { ...route, routeParams };
-        }
-      },
-    });
-
-    function resolve(action) {
-      if (!isAbandoned) {
-        if (errorHandlerRef.current) {
-          errorHandlerRef.current.reset();
-        }
-
-        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
-        // when user navigated to another path while current one was still resolving.
-        // Note: this lock uses only `path` fragment of URL to distinguish routes because currently
-        // all pages depend only on this fragment and handle search/hash on their own. If router
-        // should reload page on search/hash change - this fragment (and few checks below) should be updated
-        if (pathname === currentPathRef.current) {
-          return;
-        }
-        currentPathRef.current = pathname;
-
-        // Don't reload controller if URL was replaced
-        if (action === "REPLACE") {
-          return;
-        }
-
-        router
-          .resolve({ pathname })
-          .then(route => {
-            if (!isAbandoned && currentPathRef.current === pathname) {
-              setCurrentRoute({ ...route, key: generateRouteKey() });
-            }
-          })
-          .catch(error => {
-            if (!isAbandoned && currentPathRef.current === pathname) {
-              setCurrentRoute({
-                render: currentRoute => <ErrorMessage {...currentRoute.routeParams} />,
-                routeParams: { error },
-              });
-            }
-          });
-      }
-    }
-
-    resolve("PUSH");
-
-    const unlisten = location.listen((unused, action) => resolve(action));
-
-    return () => {
-      isAbandoned = true;
-      currentPathRef.current = null;
-      unlisten();
-    };
-  }, [routes]);
-
-  useEffect(() => {
-    onRouteChange(currentRoute);
-  }, [currentRoute, onRouteChange]);
-
-  if (!currentRoute) {
-    return null;
-  }
-
-  return (
-    <CurrentRouteContext.Provider value={currentRoute}>
-      <ErrorBoundary ref={errorHandlerRef} renderError={error => <ErrorMessage error={error} />}>
-        {currentRoute.render(currentRoute)}
-      </ErrorBoundary>
-    </CurrentRouteContext.Provider>
-  );
-}
-
-Router.propTypes = {
-  routes: PropTypes.arrayOf(
-    PropTypes.shape({
-      path: PropTypes.string.isRequired,
-      render: PropTypes.func, // (routeParams: PropTypes.object; currentRoute; location) => PropTypes.node
-      // Additional props to be injected into route component.
-      // Object keys are props names. Object values will become prop values:
-      // - if value is a function - it will be called without arguments, and result will be used; otherwise value will be used;
-      // - after previous step, if value is a promise - router will wait for it to resolve; resolved value then will be used;
-      //   otherwise value will be used directly.
-      resolve: PropTypes.objectOf(PropTypes.any),
-    })
-  ),
-  onRouteChange: PropTypes.func,
-};
-
-Router.defaultProps = {
-  routes: [],
-  onRouteChange: () => {},
-};

client/app/components/ApplicationArea/handleNavigationIntent.js

@@ -1,29 +0,0 @@
-import { isString } from "lodash";
-import navigateTo from "./navigateTo";
-
-export default function handleNavigationIntent(event) {
-  let element = event.target;
-  while (element) {
-    if (element.tagName === "A") {
-      break;
-    }
-    element = element.parentNode;
-  }
-  if (!element || !element.hasAttribute("href") || element.hasAttribute("download") || element.dataset.skipRouter) {
-    return;
-  }
-
-  // Keep some default behaviour
-  if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) {
-    return;
-  }
-
-  const target = element.getAttribute("target");
-  if (isString(target) && target.toLowerCase() === "_blank") {
-    return;
-  }
-
-  event.preventDefault();
-
-  navigateTo(element.href);
-}

client/app/components/ApplicationArea/index.jsx

@@ -1,37 +0,0 @@
-import React, { useState, useEffect } from "react";
-import routes from "@/services/routes";
-import Router from "./Router";
-import handleNavigationIntent from "./handleNavigationIntent";
-import ErrorMessage from "./ErrorMessage";
-
-export default function ApplicationArea() {
-  const [currentRoute, setCurrentRoute] = useState(null);
-  const [unhandledError, setUnhandledError] = useState(null);
-
-  useEffect(() => {
-    if (currentRoute && currentRoute.title) {
-      document.title = currentRoute.title;
-    }
-  }, [currentRoute]);
-
-  useEffect(() => {
-    function globalErrorHandler(event) {
-      event.preventDefault();
-      setUnhandledError(event.error);
-    }
-
-    document.body.addEventListener("click", handleNavigationIntent, false);
-    window.addEventListener("error", globalErrorHandler, false);
-
-    return () => {
-      document.body.removeEventListener("click", handleNavigationIntent, false);
-      window.removeEventListener("error", globalErrorHandler, false);
-    };
-  }, []);
-
-  if (unhandledError) {
-    return <ErrorMessage error={unhandledError} />;
-  }
-
-  return <Router routes={routes.items} onRouteChange={setCurrentRoute} />;
-}

client/app/components/ApplicationArea/navigateTo.js

@@ -1,25 +0,0 @@
-import location from "@/services/location";
-import url from "@/services/url";
-import { stripBase } from "./Router";
-
-// When `replace` is set to `true` - it will just replace current URL
-// without reloading current page (router will skip this location change)
-export default function navigateTo(href, replace = false) {
-  // Allow calling chain to roll up, and then navigate
-  setTimeout(() => {
-    const isExternal = stripBase(href) === false;
-    if (isExternal) {
-      window.location = href;
-      return;
-    }
-    href = url.parse(href);
-    location.update(
-      {
-        path: href.pathname,
-        search: href.search,
-        hash: href.hash,
-      },
-      replace
-    );
-  }, 10);
-}

client/app/components/ApplicationArea/routeWithApiKeySession.jsx

@@ -1,63 +0,0 @@
-import React, { useEffect, useState, useContext } from "react";
-import PropTypes from "prop-types";
-import { ErrorBoundaryContext } from "@redash/viz/lib/components/ErrorBoundary";
-import { Auth, clientConfig } from "@/services/auth";
-
-// 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
-// - `apiKey` field
-
-function ApiKeySessionWrapper({ apiKey, currentRoute, renderChildren }) {
-  const [isAuthenticated, setIsAuthenticated] = useState(false);
-  const { handleError } = useContext(ErrorBoundaryContext);
-
-  useEffect(() => {
-    let isCancelled = false;
-    Auth.setApiKey(apiKey);
-    Auth.loadConfig()
-      .then(() => {
-        if (!isCancelled) {
-          setIsAuthenticated(true);
-        }
-      })
-      .catch(() => {
-        if (!isCancelled) {
-          setIsAuthenticated(false);
-        }
-      });
-    return () => {
-      isCancelled = true;
-    };
-  }, [apiKey]);
-
-  if (!isAuthenticated || clientConfig.disablePublicUrls) {
-    return null;
-  }
-
-  return (
-    <React.Fragment key={currentRoute.key}>
-      {renderChildren({ ...currentRoute.routeParams, pageTitle: currentRoute.title, onError: handleError, apiKey })}
-    </React.Fragment>
-  );
-}
-
-ApiKeySessionWrapper.propTypes = {
-  apiKey: PropTypes.string.isRequired,
-  renderChildren: PropTypes.func,
-};
-
-ApiKeySessionWrapper.defaultProps = {
-  renderChildren: () => null,
-};
-
-export default function routeWithApiKeySession({ render, getApiKey, ...rest }) {
-  return {
-    ...rest,
-    render: currentRoute => (
-      <ApiKeySessionWrapper apiKey={getApiKey(currentRoute)} 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/AutocompleteToggle.jsx

@@ -0,0 +1,43 @@
+import React from 'react';
+import Tooltip from 'antd/lib/tooltip';
+import PropTypes from 'prop-types';
+import '@/redash-font/style.less';
+import recordEvent from '@/services/recordEvent';
+
+export default function AutocompleteToggle({ state, disabled, onToggle }) {
+  let tooltipMessage = 'Live Autocomplete Enabled';
+  let icon = 'icon-flash';
+  if (!state) {
+    tooltipMessage = 'Live Autocomplete Disabled';
+    icon = 'icon-flash-off';
+  }
+
+  if (disabled) {
+    tooltipMessage = 'Live Autocomplete Not Available (Use Ctrl+Space to Trigger)';
+    icon = 'icon-flash-off';
+  }
+
+  const toggle = (newState) => {
+    recordEvent('toggle_autocomplete', 'screen', 'query_editor', { state: newState });
+    onToggle(newState);
+  };
+
+  return (
+    <Tooltip placement="top" title={tooltipMessage}>
+      <button
+        type="button"
+        className={'btn btn-default m-r-5' + (disabled ? ' disabled' : '')}
+        onClick={() => toggle(!state)}
+        disabled={disabled}
+      >
+        <i className={'icon ' + icon} />
+      </button>
+    </Tooltip>
+  );
+}
+
+AutocompleteToggle.propTypes = {
+  state: PropTypes.bool.isRequired,
+  disabled: PropTypes.bool.isRequired,
+  onToggle: PropTypes.func.isRequired,
+};

client/app/components/BeaconConsent.jsx

@@ -1,16 +1,16 @@
-import React, { useState } from "react";
+import React, { useState } from 'react';
-import Card from "antd/lib/card";
+import { react2angular } from 'react2angular';
-import Button from "antd/lib/button";
+import Card from 'antd/lib/card';
-import Typography from "antd/lib/typography";
+import Button from 'antd/lib/button';
-import { clientConfig } from "@/services/auth";
+import Typography from 'antd/lib/typography';
-import Link from "@/components/Link";
+import { clientConfig } from '@/services/auth';
-import HelpTrigger from "@/components/HelpTrigger";
+import { HelpTrigger } from '@/components/HelpTrigger';
-import DynamicComponent from "@/components/DynamicComponent";
+import DynamicComponent from '@/components/DynamicComponent';
-import OrgSettings from "@/services/organizationSettings";
+import OrgSettings from '@/services/organizationSettings';
 
 const Text = Typography.Text;
 
-function BeaconConsent() {
+export function BeaconConsent() {
   const [hide, setHide] = useState(false);
 
   if (!clientConfig.showBeaconConsentMessage || hide) {
@@ -22,11 +22,11 @@ function BeaconConsent() {
     setHide(true);
   };
 
-  const confirmConsent = confirm => {
+  const confirmConsent = (confirm) => {
-    let message = "🙏 Thank you.";
+    let message = '🙏 Thank you.';
 
     if (!confirm) {
-      message = "Settings Saved.";
+      message = 'Settings Saved.';
     }
 
     OrgSettings.save({ beacon_consent: confirm }, message)
@@ -41,13 +41,14 @@ function BeaconConsent() {
     <DynamicComponent name="BeaconConsent">
       <div className="m-t-10 tiled">
         <Card
-          title={
+          title={(
             <>
-              Would you be ok with sharing anonymous usage data with the Redash team?{" "}
+              Would you be ok with sharing anonymous usage data with the Redash team?{' '}
               <HelpTrigger type="USAGE_DATA_SHARING" />
             </>
-          }
+          )}
-          bordered={false}>
+          bordered={false}
+        >
           <Text>Help Redash improve by automatically sending anonymous usage data:</Text>
           <div className="m-t-5">
             <ul>
@@ -66,8 +67,7 @@ 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> page.
-              <Link href="settings/organization">Organization Settings</Link> page.
             </Text>
           </div>
         </Card>
@@ -76,4 +76,8 @@ function BeaconConsent() {
   );
 }
 
-export default BeaconConsent;
+export default function init(ngModule) {
+  ngModule.component('beaconConsent', react2angular(BeaconConsent));
+}
+
+init.init = true;

client/app/components/BigMessage.jsx

@@ -1,11 +1,12 @@
-import React from "react";
+import React from 'react';
-import PropTypes from "prop-types";
+import PropTypes from 'prop-types';
+import { react2angular } from 'react2angular';
 
-function BigMessage({ message, icon, children, className }) {
+export function BigMessage({ message, icon, children, className }) {
   return (
-    <div className={"p-15 text-center " + className}>
+    <div className={'p-15 text-center ' + className}>
       <h3 className="m-t-0 m-b-0">
-        <i className={"fa " + icon} />
+        <i className={'fa ' + icon} />
       </h3>
       <br />
       {message}
@@ -22,9 +23,13 @@ BigMessage.propTypes = {
 };
 
 BigMessage.defaultProps = {
-  message: "",
+  message: '',
   children: null,
-  className: "tiled bg-white",
+  className: 'tiled bg-white',
 };
 
-export default BigMessage;
+export default function init(ngModule) {
+  ngModule.component('bigMessage', react2angular(BigMessage));
+}
+
+init.init = true;