Clear QueryBasedParameterInput

- Change searchTerm separator
- Add cy.wait

CHANGELOG.md

@@ -1,129 +1,5 @@
 # Change Log
 
-## v10.0.0-beta - 2021-06-16
-
-Just over a year since our last release, the V10 beta is ready. Since we never made a non-beta release of V9, we expect many users will upgrade directly from V8 -> V10. This will bring a lot of exciting features. Please check out the V9 beta release notes below to learn more.
-
-This V10 beta incorporates fixes for the feedback we received on the V9 beta along with a few long-requested features (horizontal bar charts!) and other changes to improve UX and reliability.
-
-This release was made possible by contributions from 35+ people (the Github API didn't let us pull handles this time around): Alex Kovar, Alexander Rusanov, Arik Fraimovich, Ben Amor, Christopher Grant, Đặng Minh Dũng, Daniel Lang, deecay, Elad Ossadon, Gabriel Dutra, iwakiriK, Jannis Leidel, Jerry, Jesse Whitehouse, Jiajie Zhong, Jim Sparkman, Jonathan Hult, Josh Bohde, Justin Talbot, koooge, Lei Ni, Levko Kravets, Lingkai Kong, max-voronov, Mike Nason, Nolan Nichols, Omer Lachish, Patrick Yang, peterlee, Rafael Wendel, Sebastian Tramp, simonschneider-db, Tim Gates, Tobias Macey, Vipul Mathur, and Vladislav Denisov
-
-Our special thanks to [Sohail Ahmed](https://pk.linkedin.com/in/sohail-ahmed-755776184) for reporting a vulnerability in our "forgot password" page (#5425)
-
-### Upgrading
-
-(This section is duplicated from the previous release - since many users will upgrade directly from V8 -> V10)
-
-Typically, if you are running your own instance of Redash and wish to upgrade, you would simply modify the Docker tag in your `docker-compose.yml` file. Since RQ has replaced Celery in this version, there are a couple extra modifications that need to be done in your `docker-compose.yml`:
-
-1. Under `services/scheduler/environment`, omit `QUEUES` and `WORKERS_COUNT` (and omit `environment` altogether if it is empty).
-2. Under `services`, add a new service for general RQ jobs:
-
-```yaml
-worker:
-  <<: *redash-service
-  command: worker
-  environment:
-    QUEUES: "periodic emails default"
-    WORKERS_COUNT: 1
-```
-
-Following that, force a recreation of your containers with `docker-compose up --force-recreate --build` and you should be good to go.
-### UX
-- Redash now uses a vertical navbar
-- Dashboard list now includes “My Dashboards” filter
-- Dashboard parameters can now be re-ordered
-- Queries can now be executed with Shift + Enter on all platforms.
-- Added New Dashboard/Query/Alert buttons to corresponding list pages
-- Dashboard text widgets now prompt to confirm before closing the text editor
-- A plus sign is now shown between tags used for search
-- On the queries list view “My Queries” has moved above “Archived”
-- Improved behavior for filtering by tags in list views
-- When a user’s session expires for inactivity, they are prompted to log-in with a pop-up so they don’t lose their place in the app
-- Numerous accessibility changes towards the a11y standard
-- Hide the “Create” menu button if current user doesn’t have permission to any data sources
-
-### Visualizations
-- Feature: Added support for horizontal box plots
-- Feature: Added support for horizontal bar charts
-- Feature: Added “Reverse” option for Chart visualization legend
-- Feature: Added option to align Chart Y-axes at zero
-- Feature: The table visualization header is now fixed when scrolling
-- Feature: Added USA map to choropleth visualization
-- Fix: Selected filters were reset when switching visualizations
-- Fix: Stacked bar chart showed the wrong Y-axis range in some cases
-- Fix: Bar chart with second y axis overlapped data series
-- Fix: Y-axis autoscale failed when min or max was set
-- Fix: Custom JS visualization was broken because of a typo
-- Fix: Too large visualization caused filters block to collapse
-- Fix: Sankey visualization looked inconsistent if the data source returned VARCHAR instead of numeric types
-
-### Structural Updates
-- Redash now prevents CSRF attacks
-- Migration to TypeScript
-- Upgrade to Antd version 4
-### Data Sources
-- New Data Sources: SPARQL Endpoint, Eccenca Corporate Memory, TrinoDB
-- Databricks
-  - Custom Schema Browser that allows switching between databases
-  - Option added to truncate large results
-  - Support for multiple-statement queries
-  - Schema browser can now use eventlet instead of RQ
-- MongoDB:
-  - Moved Username and Password out of the connection string so that password can be stored secretly
-- Oracle:
-  - Fix: Annotated queries always failed. Annotation is now disabled
-- Postgres/CockroachDB:
-  - SSL certfile/keyfile fields are now handled as secret
-- Python:
-  - Feature: Custom built-ins are now supported
-  - Fix: Query runner was not compatible with Python 3
-- Snowflake:
-  - Data source now accepts a custom host address (for use with proxies)
-- TreasureData:
-  - API key field is now handled as secret
-- Yandex:
-  - OAuth token field is now handled as secret
-
-### Alerts
-- Feature: Added ability to mute alerts without deleting them
-- Change: Non-email alert destination details are now obfuscated to avoid leaking sensitive information (webhook URLs, tokens etc.)
-- Fix: numerical comparisons failed if value from query was a string
-
-### Parameters
-- Added “Last 12 months” option for dynamic date ranges
-
-### Bug Fixes
-- Fix: Private addresses were not allowed even when enforcing was disabled 
-- Fix: Python query runner wasn’t updated for Python 3
-- Fix: Sorting queries by schedule returned the wrong order
-- Fix: Counter visualization was enormous in some cases
-- Fix: Dashboard URL will now change when the dashboard title changes
-- Fix: URL parameters were removed when forking a query
-- Fix: Create link on data sources page was broken
-- Fix: Queries could be reassigned to read-only data sources
-- Fix: Multi-select dropdown was very slow if there were 1k+ options
-- Fix: Search Input couldn’t be focused or updated while editing a dashboard
-- Fix: The CLI command for “status” did not work
-- Fix: The dashboard list screen displayed too few items under certain pagination configurations
-
-### Other
-- Added an environment variable to disable public sharing links for queries and dashboards
-- Alert destinations are now encrypted at the database
-- The base query runner now has stubs to implement result truncating for other data sources
-- Static SAML configuration and assertion encryption are now supported
-- Adds new component for adding extra actions to the query and dashboard pages
-- Non-admins with at least view_only permission on a dashboard can now make GET requests to the data source resource
-- Added a BLOCKED_DOMAINS setting to prevent sign-ups from emails at specific domains
-- Added a rate limit to the “forgot password” page
-- RQ workers will now shutdown gracefully for known error codes
-- Scheduled execution failure counter now resets following a successful ad hoc execution
-- Redash now deletes locks for cancelled queries
-- Upgraded Ace Editor from v6 to v9
-- Added a periodic job to remove ghost locks
-- Removed content width limit on all pages
-- Introduce a <Link> React component
-
 ## v9.0.0-beta - 2020-06-11
 
 This release was long time in the making and has several major changes:

Dockerfile

@@ -66,9 +66,8 @@ RUN apt-get update && \
   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
-RUN wget --quiet $databricks_odbc_driver_url -O /tmp/simba_odbc.zip \
-  && chmod 600 /tmp/simba_odbc.zip \
-  && unzip /tmp/simba_odbc.zip -d /tmp/ \
+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 \
@@ -80,19 +79,12 @@ WORKDIR /app
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 ENV PIP_NO_CACHE_DIR=1
 
-# rollback pip version to avoid legacy resolver problem
-RUN pip install pip==20.2.4;
-
-# We first copy only the requirements file, to avoid rebuilding on every file change.
-COPY requirements_all_ds.txt ./
+# We first copy only the requirements file, to avoid rebuilding on every file
+# change.
+COPY requirements.txt requirements_bundles.txt requirements_dev.txt requirements_all_ds.txt ./
+RUN if [ "x$skip_dev_deps" = "x" ] ; then pip install -r requirements.txt -r requirements_dev.txt; else pip install -r requirements.txt; fi
 RUN if [ "x$skip_ds_deps" = "x" ] ; then pip install -r requirements_all_ds.txt ; else echo "Skipping pip install -r requirements_all_ds.txt" ; fi
 
-COPY requirements_bundles.txt requirements_dev.txt ./
-RUN if [ "x$skip_dev_deps" = "x" ] ; then pip install -r requirements_dev.txt ; fi
-
-COPY requirements.txt ./
-RUN pip install -r requirements.txt
-
 COPY . /app
 COPY --from=frontend-builder /frontend/client/dist /app/client/dist
 RUN chown -R redash /app

README.md

@@ -73,7 +73,6 @@ Redash supports more than 35 SQL and NoSQL [data sources](https://redash.io/help
 - Shell Scripts
 - Snowflake
 - SQLite
-- TiDB
 - TreasureData
 - Vertica
 - Yandex AppMetrrica

client/.eslintrc.js

@@ -5,11 +5,10 @@ module.exports = {
     "react-app",
     "plugin:compat/recommended",
     "prettier",
-    "plugin:jsx-a11y/recommended",
     // Remove any typescript-eslint rules that would conflict with prettier
     "prettier/@typescript-eslint",
   ],
-  plugins: ["jest", "compat", "no-only-tests", "@typescript-eslint", "jsx-a11y"],
+  plugins: ["jest", "compat", "no-only-tests", "@typescript-eslint"],
   settings: {
     "import/resolver": "webpack",
   },
@@ -20,20 +19,7 @@ module.exports = {
   rules: {
     // allow debugger during development
     "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
-    "jsx-a11y/anchor-is-valid": [
-      // TMP
-      "off",
-      {
-        components: ["Link"],
-        aspects: ["noHref", "invalidHref", "preferButton"],
-      },
-    ],
-    "jsx-a11y/no-redundant-roles": "error",
-    "jsx-a11y/no-autofocus": "off",
-    "jsx-a11y/click-events-have-key-events": "off", // TMP
-    "jsx-a11y/no-static-element-interactions": "off", // TMP
-    "jsx-a11y/no-noninteractive-element-interactions": "off", // TMP
-    "no-console": ["warn", { allow: ["warn", "error"] }],
+    "jsx-a11y/anchor-is-valid": "off",
     "no-restricted-imports": [
       "error",
       {

client/app/assets/less/ant.less

@@ -225,16 +225,6 @@
     }
   }
 
-  &-tbody > tr&-row {
-    &:hover,
-    &:focus,
-    &:focus-within {
-      & > td {
-        background: @table-row-hover-bg;
-      }
-    }
-  }
-
   // Custom styles
 
   &-headerless &-tbody > tr:first-child > td {
@@ -401,18 +391,6 @@
         left: 0;
       }
     }
-
-    &:focus,
-    &:focus-within {
-      color: @menu-highlight-color;
-    }
-  }
-}
-
-.@{dropdown-prefix-cls}-menu-item {
-  &:focus,
-  &:focus-within {
-    background-color: @item-hover-bg;
   }
 }
 

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

@@ -98,10 +98,6 @@ strong {
 
 .clickable {
   cursor: pointer;
-
-  button&:disabled {
-    cursor: not-allowed;
-  }
 }
 
 .resize-vertical {

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

@@ -1,23 +1,26 @@
-.edit-in-place {
+.edit-in-place span {
   white-space: pre-line;
-  display: inline-block;
 
   p {
     margin-bottom: 0;
   }
-
-  .editable {
-    display: inline-block;
-    cursor: pointer;
-
-    &:hover {
-      background: @redash-yellow;
-      border-radius: @redash-radius;
-    }
-  }
-
-  &.active input,
-  &.active textarea {
-    display: inline-block;
-  }
+}
+
+.edit-in-place span.editable {
+  display: inline-block;
+  cursor: pointer;
+}
+
+.edit-in-place span.editable:hover {
+  background: @redash-yellow;
+  border-radius: @redash-radius;
+}
+
+.edit-in-place.active input,
+.edit-in-place.active textarea {
+  display: inline-block;
+}
+
+.edit-in-place {
+  display: inline-block;
 }

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

@@ -2,218 +2,163 @@
     Generate Margin Classes (0px - 25px)
     margin, margin-top, margin-bottom, margin-left, margin-right
 -----------------------------------------------------------*/
-.margin (@label, @size: 1, @key:1) when (@size =< 30) {
-  .m-@{key} {
-    margin: @size !important;
-  }
-
-  .m-t-@{key} {
-    margin-top: @size !important;
-  }
-
-  .m-b-@{key} {
-    margin-bottom: @size !important;
-  }
-
-  .m-l-@{key} {
-    margin-left: @size !important;
-  }
-
-  .m-r-@{key} {
-    margin-right: @size !important;
-  }
-
-  .margin(@label - 5; @size + 5; @key + 5);
+.margin (@label, @size: 1, @key:1) when (@size =< 30){
+    .m-@{key} {
+        margin: @size !important;
+    }
+    
+    .m-t-@{key} {
+        margin-top: @size !important;
+    }
+    
+    .m-b-@{key} {
+        margin-bottom: @size !important;
+    }
+    
+    .m-l-@{key} {
+        margin-left: @size !important;
+    }
+    
+    .m-r-@{key} {
+        margin-right: @size !important;
+    }
+    
+    .margin(@label - 5; @size + 5; @key + 5);
 }
 
 .margin(25, 0px, 0);
 
-.m-2 {
-  margin: 2px;
+.m-2{
+  margin:2px;
 }
 
 /* --------------------------------------------------------
     Generate Padding Classes (0px - 25px)
     padding, padding-top, padding-bottom, padding-left, padding-right
 -----------------------------------------------------------*/
-.padding (@label, @size: 1, @key:1) when (@size =< 30) {
-  .p-@{key} {
-    padding: @size !important;
-  }
-
-  .p-t-@{key} {
-    padding-top: @size !important;
-  }
-
-  .p-b-@{key} {
-    padding-bottom: @size !important;
-  }
-
-  .p-l-@{key} {
-    padding-left: @size !important;
-  }
-
-  .p-r-@{key} {
-    padding-right: @size !important;
-  }
-
-  .padding(@label - 5; @size + 5; @key + 5);
-}
+.padding (@label, @size: 1, @key:1) when (@size =< 30){
+    .p-@{key} {
+        padding: @size !important;
+    }
+    
+    .p-t-@{key} {
+        padding-top: @size !important;
+    }
+    
+    .p-b-@{key} {
+        padding-bottom: @size !important;
+    }
+    
+    .p-l-@{key} {
+        padding-left: @size !important;
+    }
+    
+    .p-r-@{key} {
+        padding-right: @size !important; 
+    }
+    
+    .padding(@label - 5; @size + 5; @key + 5);
+} 
 
 .padding(25, 0px, 0);
 
+
 /* --------------------------------------------------------
     Generate Font-Size Classes (8px - 20px)
 -----------------------------------------------------------*/
-.font-size (@label, @size: 8, @key:10) when (@size =< 20) {
-  .f-@{key} {
-    font-size: @size !important;
-  }
-
-  .font-size(@label - 1; @size + 1; @key + 1);
-}
+.font-size (@label, @size: 8, @key:10) when (@size =< 20){
+    .f-@{key} {
+        font-size: @size !important;
+    }
+    
+    .font-size(@label - 1; @size + 1; @key + 1);
+} 
 
 .font-size(20, 8px, 8);
 
-.f-inherit {
-  font-size: inherit !important;
-}
+.f-inherit { font-size: inherit !important; }
+
 
 /* --------------------------------------------------------
     Font Weight
 -----------------------------------------------------------*/
-.f-300 {
-  font-weight: 300 !important;
-}
-.f-400 {
-  font-weight: 400 !important;
-}
-.f-500 {
-  font-weight: 500 !important;
-}
-.f-700 {
-  font-weight: 700 !important;
-}
+.f-300 { font-weight: 300 !important; }
+.f-400 { font-weight: 400 !important; }
+.f-500 { font-weight: 500 !important; }
+.f-700 { font-weight: 700 !important; }
+
 
 /* --------------------------------------------------------
     Position
 -----------------------------------------------------------*/
-.p-relative {
-  position: relative !important;
-}
-.p-absolute {
-  position: absolute !important;
-}
-.p-fixed {
-  position: fixed !important;
-}
-.p-static {
-  position: static !important;
-}
+.p-relative { position: relative !important; }
+.p-absolute { position: absolute !important; }
+.p-fixed { position: fixed !important; }
+.p-static { position: static !important; }
+
 
 /* --------------------------------------------------------
     Overflow
 -----------------------------------------------------------*/
-.o-hidden {
-  overflow: hidden !important;
-}
-.o-visible {
-  overflow: visible !important;
-}
-.o-auto {
-  overflow: auto !important;
-}
+.o-hidden { overflow: hidden !important; }
+.o-visible { overflow: visible !important; }
+.o-auto { overflow: auto !important; }
+
 
 /* --------------------------------------------------------
     Display
 -----------------------------------------------------------*/
-.di-block {
-  display: inline-block !important;
-}
-.d-block {
-  display: block;
-}
+.di-block { display: inline-block !important; } 
+.d-block { display: block; }
 
 /* --------------------------------------------------------
     Background Colors and Colors
 -----------------------------------------------------------*/
-@array: c-white bg-white @white, c-ace bg-ace @ace, c-black bg-black @black, c-brown bg-brown @brown,
-  c-pink bg-pink @pink, c-red bg-red @red, c-blue bg-blue @blue, c-purple bg-purple @purple,
-  c-deeppurple bg-deeppurple @deeppurple, c-lightblue bg-lightblue @lightblue, c-cyan bg-cyan @cyan,
-  c-teal bg-teal @teal, c-green bg-green @green, c-lightgreen bg-lightgreen @lightgreen, c-lime bg-lime @lime,
-  c-yellow bg-yellow @yellow, c-amber bg-amber @amber, c-orange bg-orange @orange,
-  c-deeporange bg-deeporange @deeporange, c-gray bg-gray @gray, c-bluegray bg-bluegray @bluegray,
-  c-indigo bg-indigo @indigo;
+@array: c-white bg-white @white, c-ace bg-ace @ace, c-black bg-black @black, c-brown bg-brown @brown, c-pink bg-pink @pink, c-red bg-red @red, c-blue bg-blue @blue, c-purple bg-purple @purple, c-deeppurple bg-deeppurple @deeppurple, c-lightblue bg-lightblue @lightblue, c-cyan bg-cyan @cyan, c-teal bg-teal @teal, c-green bg-green @green, c-lightgreen bg-lightgreen @lightgreen, c-lime bg-lime @lime, c-yellow bg-yellow @yellow, c-amber bg-amber @amber, c-orange bg-orange @orange, c-deeporange bg-deeporange @deeporange, c-gray bg-gray @gray, c-bluegray bg-bluegray @bluegray, c-indigo bg-indigo @indigo;
 
-.for(@array);
-.-each(@value) {
-  @name: extract(@value, 1);
-  @name2: extract(@value, 2);
-  @color: extract(@value, 3);
-  &.@{name2} {
-    background-color: @color !important;
-  }
-
-  &.@{name} {
-    color: @color !important;
-  }
+.for(@array); .-each(@value) {
+    @name:  extract(@value, 1);
+    @name2:  extract(@value, 2);
+    @color: extract(@value, 3); 
+    &.@{name2} {
+        background-color: @color !important;
+    }
+    
+    &.@{name} {
+        color: @color !important;
+    }
 }
 
+
 /* --------------------------------------------------------
     Background Colors
 -----------------------------------------------------------*/
-.bg-brand {
-  background-color: @brand-bg;
-}
-.bg-black-trp {
-  background-color: rgba(0, 0, 0, 0.12) !important;
-}
+.bg-brand { background-color: @brand-bg; }
+.bg-black-trp { background-color: rgba(0,0,0,0.12) !important; }
+
+
 
 /* --------------------------------------------------------
     Borders
 -----------------------------------------------------------*/
-.b-0 {
-  border: 0 !important;
-}
+.b-0 { border: 0 !important; }
+
 
 /* --------------------------------------------------------
     Width
 -----------------------------------------------------------*/
-.w-100 {
-  width: 100% !important;
-}
-.w-50 {
-  width: 50% !important;
-}
-.w-25 {
-  width: 25% !important;
-}
+.w-100 { width: 100% !important; }
+.w-50 { width: 50% !important; }
+.w-25 { width: 25% !important; }
+
 
 /* --------------------------------------------------------
     Border Radius
 -----------------------------------------------------------*/
-.brd-2 {
-  border-radius: 2px;
-}
+.brd-2 { border-radius: 2px; }
+
 
 /* --------------------------------------------------------
     Alignment
 -----------------------------------------------------------*/
-.va-top {
-  vertical-align: top;
-}
-
-/* --------------------------------------------------------
-    Screen readers
------------------------------------------------------------*/
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  white-space: nowrap;
-  border-width: 0;
-}
+.va-top { vertical-align: top; }

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

@@ -1,107 +1,102 @@
+div.table-name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+  padding: 2px 22px 2px 10px;
+  border-radius: @redash-radius;
+  position: relative;
+  height: 22px;
+
+  .copy-to-editor {
+    display: none;
+  }
+
+  &:hover {
+    background: fade(@redash-gray, 10%);
+
+    .copy-to-editor {
+      display: flex;
+    }
+  }
+}
+
 .schema-container {
   height: 100%;
   z-index: 10;
   background-color: white;
+}
 
-  .schema-browser {
-    overflow: hidden;
-    border: none;
-    padding-top: 10px;
-    position: relative;
+.schema-browser {
+  overflow: hidden;
+  border: none;
+  padding-top: 10px;
+  position: relative;
+  height: 100%;
+
+  .schema-loading-state {
+    display: flex;
+    align-items: center;
+    justify-content: center;
     height: 100%;
+  }
 
-    .schema-loading-state {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 100%;
-    }
+  .collapse.in {
+    background: transparent;
+  }
 
-    .collapse.in {
-      background: transparent;
+  .copy-to-editor {
+    color: fade(@redash-gray, 90%);
+    cursor: pointer;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .table-open {
+    padding: 0 22px 0 26px;
+    overflow: hidden;
+    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 {
-      visibility: hidden;
-      color: fade(@redash-gray, 90%);
-      width: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      transition: none;
+      display: none;
     }
 
-    .schema-list-item {
-      display: flex;
-      border-radius: @redash-radius;
-      height: 22px;
+    &:hover {
+      background: fade(@redash-gray, 10%);
 
-      .table-name {
-        flex: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        cursor: pointer;
-        padding: 2px 22px 2px 10px;
-      }
-
-      &:hover,
-      &:focus,
-      &:focus-within {
-        background: fade(@redash-gray, 10%);
-
-        .copy-to-editor {
-          visibility: visible;
-        }
-      }
-    }
-
-    .table-open {
-      .table-open-item {
+      .copy-to-editor {
         display: flex;
-        height: 18px;
-        width: calc(100% - 22px);
-        padding-left: 22px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        transition: none;
-
-        div:first-child {
-          flex: 1;
-        }
-
-        .column-type {
-          color: fade(@text-color, 80%);
-          font-size: 10px;
-          margin-left: 2px;
-          text-transform: uppercase;
-        }
-
-        &:hover,
-        &:focus,
-        &:focus-within {
-          background: fade(@redash-gray, 10%);
-
-          .copy-to-editor {
-            visibility: visible;
-          }
-        }
       }
     }
   }
-
-  .schema-control {
-    display: flex;
-    flex-wrap: nowrap;
-    padding: 0;
-
-    .ant-btn {
-      height: auto;
-    }
-  }
-
-  .parameter-label {
-    display: block;
-  }
+}
+
+.schema-control {
+  display: flex;
+  flex-wrap: nowrap;
+  padding: 0;
+
+  .ant-btn {
+    height: auto;
+  }
+}
+
+.parameter-label {
+  display: block;
 }

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

@@ -103,7 +103,7 @@
     padding-top: 5px !important;
   }
 
-  .btn-favorite,
+  .btn-favourite,
   .btn-archive {
     font-size: 15px;
   }
@@ -114,23 +114,18 @@
   line-height: 1.7 !important;
 }
 
-.btn-favorite {
+.btn-favourite {
   color: #d4d4d4;
   transition: all 0.25s ease-in-out;
 
-  .fa-star {
-    color: @yellow-darker;
-  }
-
   &:hover,
   &:focus {
     color: @yellow-darker;
     cursor: pointer;
+  }
 
-    .fa-star {
-      filter: saturate(75%);
-      opacity: 0.75;
-    }
+  .fa-star {
+    color: @yellow-darker;
   }
 }
 

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

@@ -127,13 +127,11 @@ body.fixed-layout {
   }
 }
 
-.label-tag {
+a.label-tag {
   background: fade(@redash-gray, 15%);
   color: darken(@redash-gray, 15%);
 
-  &:hover,
-  &:focus,
-  &:active {
+  &:hover {
     color: darken(@redash-gray, 15%);
     background: fade(@redash-gray, 25%);
   }

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

@@ -1,11 +1,10 @@
-import React, { useMemo } from "react";
-import { first, includes } from "lodash";
+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 PlainButton from "@/components/PlainButton";
 import HelpTrigger from "@/components/HelpTrigger";
 import CreateDashboardDialog from "@/components/dashboards/CreateDashboardDialog";
-import { useCurrentRoute } from "@/components/ApplicationArea/Router";
 import { Auth, currentUser } from "@/services/auth";
 import settingsMenu from "@/services/settingsMenu";
 import logoUrl from "@/assets/images/redash_icon_small.png";
@@ -16,109 +15,83 @@ import AlertOutlinedIcon from "@ant-design/icons/AlertOutlined";
 import PlusOutlinedIcon from "@ant-design/icons/PlusOutlined";
 import QuestionCircleOutlinedIcon from "@ant-design/icons/QuestionCircleOutlined";
 import SettingOutlinedIcon from "@ant-design/icons/SettingOutlined";
-import VersionInfo from "./VersionInfo";
+import MenuUnfoldOutlinedIcon from "@ant-design/icons/MenuUnfoldOutlined";
+import MenuFoldOutlinedIcon from "@ant-design/icons/MenuFoldOutlined";
 
+import VersionInfo from "./VersionInfo";
 import "./DesktopNavbar.less";
 
-function NavbarSection({ children, ...props }) {
+function NavbarSection({ inlineCollapsed, children, ...props }) {
   return (
-    <Menu selectable={false} mode="vertical" theme="dark" {...props}>
+    <Menu
+      selectable={false}
+      mode={inlineCollapsed ? "inline" : "vertical"}
+      inlineCollapsed={inlineCollapsed}
+      theme="dark"
+      {...props}>
       {children}
     </Menu>
   );
 }
 
-function useNavbarActiveState() {
-  const currentRoute = useCurrentRoute();
-
-  return useMemo(
-    () => ({
-      dashboards: includes(
-        [
-          "Dashboards.List",
-          "Dashboards.Favorites",
-          "Dashboards.My",
-          "Dashboards.ViewOrEdit",
-          "Dashboards.LegacyViewOrEdit",
-        ],
-        currentRoute.id
-      ),
-      queries: includes(
-        [
-          "Queries.List",
-          "Queries.Favorites",
-          "Queries.Archived",
-          "Queries.My",
-          "Queries.View",
-          "Queries.New",
-          "Queries.Edit",
-        ],
-        currentRoute.id
-      ),
-      dataSources: includes(["DataSources.List"], currentRoute.id),
-      alerts: includes(["Alerts.List", "Alerts.New", "Alerts.View", "Alerts.Edit"], currentRoute.id),
-    }),
-    [currentRoute.id]
-  );
-}
-
 export default function DesktopNavbar() {
-  const firstSettingsTab = first(settingsMenu.getAvailableItems());
+  const [collapsed, setCollapsed] = useState(true);
 
-  const activeState = useNavbarActiveState();
+  const firstSettingsTab = first(settingsMenu.getAvailableItems());
 
   const canCreateQuery = currentUser.hasPermission("create_query");
   const canCreateDashboard = currentUser.hasPermission("create_dashboard");
   const canCreateAlert = currentUser.hasPermission("list_alerts");
 
   return (
-    <nav className="desktop-navbar">
-      <NavbarSection className="desktop-navbar-logo">
-        <div role="menuitem">
+    <div className="desktop-navbar">
+      <NavbarSection inlineCollapsed={collapsed} className="desktop-navbar-logo">
+        <div>
           <Link href="./">
             <img src={logoUrl} alt="Redash" />
           </Link>
         </div>
       </NavbarSection>
 
-      <NavbarSection>
+      <NavbarSection inlineCollapsed={collapsed}>
         {currentUser.hasPermission("list_dashboards") && (
-          <Menu.Item key="dashboards" className={activeState.dashboards ? "navbar-active-item" : null}>
+          <Menu.Item key="dashboards">
             <Link href="dashboards">
-              <DesktopOutlinedIcon aria-label="Dashboard navigation button" />
-              <span className="desktop-navbar-label">Dashboards</span>
+              <DesktopOutlinedIcon />
+              <span>Dashboards</span>
             </Link>
           </Menu.Item>
         )}
         {currentUser.hasPermission("view_query") && (
-          <Menu.Item key="queries" className={activeState.queries ? "navbar-active-item" : null}>
+          <Menu.Item key="queries">
             <Link href="queries">
-              <CodeOutlinedIcon aria-label="Queries navigation button" />
-              <span className="desktop-navbar-label">Queries</span>
+              <CodeOutlinedIcon />
+              <span>Queries</span>
             </Link>
           </Menu.Item>
         )}
         {currentUser.hasPermission("list_alerts") && (
-          <Menu.Item key="alerts" className={activeState.alerts ? "navbar-active-item" : null}>
+          <Menu.Item key="alerts">
             <Link href="alerts">
-              <AlertOutlinedIcon aria-label="Alerts navigation button" />
-              <span className="desktop-navbar-label">Alerts</span>
+              <AlertOutlinedIcon />
+              <span>Alerts</span>
             </Link>
           </Menu.Item>
         )}
       </NavbarSection>
 
-      <NavbarSection className="desktop-navbar-spacer">
+      <NavbarSection inlineCollapsed={collapsed} className="desktop-navbar-spacer">
+        {(canCreateQuery || canCreateDashboard || canCreateAlert) && <Menu.Divider />}
         {(canCreateQuery || canCreateDashboard || canCreateAlert) && (
           <Menu.SubMenu
             key="create"
             popupClassName="desktop-navbar-submenu"
-            data-test="CreateButton"
-            tabIndex={0}
             title={
               <React.Fragment>
-                <PlusOutlinedIcon />
-                <span className="desktop-navbar-label">Create</span>
+                <span data-test="CreateButton">
+                  <PlusOutlinedIcon />
+                  <span>Create</span>
+                </span>
               </React.Fragment>
             }>
             {canCreateQuery && (
@@ -130,9 +103,9 @@ export default function DesktopNavbar() {
             )}
             {canCreateDashboard && (
               <Menu.Item key="new-dashboard">
-                <PlainButton data-test="CreateDashboardMenuItem" onClick={() => CreateDashboardDialog.showModal()}>
+                <a data-test="CreateDashboardMenuItem" onMouseUp={() => CreateDashboardDialog.showModal()}>
                   New Dashboard
-                </PlainButton>
+                </a>
               </Menu.Item>
             )}
             {canCreateAlert && (
@@ -146,31 +119,32 @@ export default function DesktopNavbar() {
         )}
       </NavbarSection>
 
-      <NavbarSection>
+      <NavbarSection inlineCollapsed={collapsed}>
         <Menu.Item key="help">
-          <HelpTrigger showTooltip={false} type="HOME" tabIndex={0}>
+          <HelpTrigger showTooltip={false} type="HOME">
             <QuestionCircleOutlinedIcon />
-            <span className="desktop-navbar-label">Help</span>
+            <span>Help</span>
           </HelpTrigger>
         </Menu.Item>
         {firstSettingsTab && (
-          <Menu.Item key="settings" className={activeState.dataSources ? "navbar-active-item" : null}>
+          <Menu.Item key="settings">
             <Link href={firstSettingsTab.path} data-test="SettingsLink">
               <SettingOutlinedIcon />
-              <span className="desktop-navbar-label">Settings</span>
+              <span>Settings</span>
             </Link>
           </Menu.Item>
         )}
+        <Menu.Divider />
       </NavbarSection>
 
-      <NavbarSection className="desktop-navbar-profile-menu">
+      <NavbarSection inlineCollapsed={collapsed} className="desktop-navbar-profile-menu">
         <Menu.SubMenu
           key="profile"
           popupClassName="desktop-navbar-submenu"
-          tabIndex={0}
           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">
@@ -183,16 +157,20 @@ export default function DesktopNavbar() {
           )}
           <Menu.Divider />
           <Menu.Item key="logout">
-            <PlainButton data-test="LogOutButton" onClick={() => Auth.logout()}>
+            <a data-test="LogOutButton" onClick={() => Auth.logout()}>
               Log out
-            </PlainButton>
+            </a>
           </Menu.Item>
           <Menu.Divider />
-          <Menu.Item key="version" role="presentation" disabled className="version-info">
+          <Menu.Item key="version" disabled className="version-info">
             <VersionInfo />
           </Menu.Item>
         </Menu.SubMenu>
       </NavbarSection>
-    </nav>
+
+      <Button onClick={() => setCollapsed(!collapsed)} className="desktop-navbar-collapse-button">
+        {collapsed ? <MenuUnfoldOutlinedIcon /> : <MenuFoldOutlinedIcon />}
+      </Button>
+    </div>
   );
 }

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

@@ -1,17 +1,12 @@
 @backgroundColor: #001529;
 @dividerColor: rgba(255, 255, 255, 0.5);
 @textColor: rgba(255, 255, 255, 0.75);
-@brandColor: #ff7964; // Redash logo color
-@activeItemColor: @brandColor;
-@iconSize: 26px;
 
 .desktop-navbar {
   background: @backgroundColor;
   display: flex;
   flex-direction: column;
   height: 100%;
-  width: 80px;
-  overflow: hidden;
 
   &-spacer {
     flex: 1 1 auto;
@@ -26,6 +21,12 @@
       height: 40px;
       transition: all 270ms;
     }
+
+    &.ant-menu-inline-collapsed {
+      img {
+        height: 20px;
+      }
+    }
   }
 
   .help-trigger {
@@ -33,38 +34,33 @@
   }
 
   .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;
 
-      &.navbar-active-item {
-        box-shadow: inset 3px 0 0 @activeItemColor;
-
-        .anticon {
-          color: @activeItemColor;
-        }
-      }
-
       &.ant-menu-submenu-open,
       &.ant-menu-submenu-active,
       &:hover,
-      &:active,
-      &:focus,
-      &:focus-within {
+      &:active {
         color: #fff;
       }
 
-      .anticon {
-        font-size: @iconSize;
-        margin: 0;
-      }
-
-      .desktop-navbar-label {
-        margin-top: 4px;
-        font-size: 11px;
-      }
-
       a,
       span,
       .anticon {
@@ -75,33 +71,21 @@
     .ant-menu-submenu-arrow {
       display: none;
     }
+  }
 
-    .ant-menu-item,
-    .ant-menu-submenu {
-      padding: 0;
-      height: 60px;
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      justify-content: center;
+  .ant-btn.desktop-navbar-collapse-button {
+    background-color: @backgroundColor;
+    border: 0;
+    border-radius: 0;
+    color: @textColor;
+
+    &:hover,
+    &:active {
+      color: #fff;
     }
 
-    .ant-menu-submenu-title {
-      width: 100%;
-      padding: 0;
-    }
-
-    a,
-    &.ant-menu-vertical > .ant-menu-submenu > .ant-menu-submenu-title,
-    .ant-menu-submenu-title {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      line-height: normal;
-      height: auto;
-      background: none;
-      color: inherit;
+    &:after {
+      animation: 0s !important;
     }
   }
 
@@ -115,8 +99,37 @@
       .profile__image_thumb {
         margin: 0;
         vertical-align: middle;
-        width: @iconSize;
-        height: @iconSize;
+      }
+
+      .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;
+        }
       }
     }
   }
@@ -133,9 +146,7 @@
       color: @textColor;
 
       &:hover,
-      &:active,
-      &:focus,
-      &:focus-within {
+      &:active {
         color: #fff;
       }
 
@@ -160,9 +171,7 @@
           color: rgba(255, 255, 255, 0.8);
 
           &:hover,
-          &:active,
-          &:focus,
-          &:focus-within {
+          &:active {
             color: rgba(255, 255, 255, 1);
           }
         }

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

@@ -14,8 +14,8 @@ export default function VersionInfo() {
         <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" aria-hidden="true" />
-            <span className="sr-only">(opens in a new tab)</span>
+            Update Available
+            <i className="fa fa-external-link m-l-5" />
           </Link>
         </div>
       )}

client/app/components/ApplicationArea/ErrorMessage.jsx

@@ -49,7 +49,7 @@ export default function ErrorMessage({ error, message }) {
     <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" aria-hidden="true" />
+          <i className="zmdi zmdi-alert-circle-o" />
         </div>
         <div className="error-state__details">
           <DynamicComponent

client/app/components/ApplicationArea/routeWithUserSession.tsx

@@ -1,4 +1,5 @@
 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";
@@ -61,14 +62,11 @@ export function UserSessionWrapper<P>({ bodyClass, currentRoute, render }: UserS
   return (
     <ApplicationLayout>
       <React.Fragment key={currentRoute.key}>
-        {/* @ts-expect-error FIXME */}
         <ErrorBoundary renderError={(error: Error) => <ErrorMessage error={error} />}>
           <ErrorBoundaryContext.Consumer>
-            {(
-              {
-                handleError,
-              } /* : { handleError: UserSessionWrapperRenderChildrenProps<P>["onError"] } FIXME bring back type */
-            ) => render({ ...currentRoute.routeParams, pageTitle: currentRoute.title, onError: handleError })}
+            {({ handleError }: { handleError: UserSessionWrapperRenderChildrenProps<P>["onError"] }) =>
+              render({ ...currentRoute.routeParams, pageTitle: currentRoute.title, onError: handleError })
+            }
           </ErrorBoundaryContext.Consumer>
         </ErrorBoundary>
       </React.Fragment>

client/app/components/BigMessage.jsx

@@ -1,21 +1,14 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
-import cx from "classnames";
 
 function BigMessage({ message, icon, children, className }) {
-  const messageId = useUniqueId("bm-message");
   return (
-    <div
-      className={"big-message p-15 text-center " + className}
-      role="status"
-      aria-live="assertive"
-      aria-relevant="additions removals">
-      <h3 className="m-t-0 m-b-0" aria-labelledby={messageId}>
-        <i className={cx("fa", icon)} aria-hidden="true" />
+    <div className={"p-15 text-center " + className}>
+      <h3 className="m-t-0 m-b-0">
+        <i className={"fa " + icon} />
       </h3>
       <br />
-      <span id={messageId}>{message}</span>
+      {message}
       {children}
     </div>
   );

client/app/components/CodeBlock.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import PropTypes from "prop-types";
 import Button from "antd/lib/button";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import CopyOutlinedIcon from "@ant-design/icons/CopyOutlined";
 import "./CodeBlock.less";
 

client/app/components/CodeBlock.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import '~antd/lib/button/style/index';
 
 .code-block {
   background: rgba(0, 0, 0, 0.06);

client/app/components/CreateSourceDialog.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { isEmpty, toUpper, includes, get, uniqueId } from "lodash";
+import { isEmpty, toUpper, includes, get } from "lodash";
 import Button from "antd/lib/button";
 import List from "antd/lib/list";
 import Modal from "antd/lib/modal";
@@ -45,8 +45,6 @@ class CreateSourceDialog extends React.Component {
     currentStep: StepEnum.SELECT_TYPE,
   };
 
-  formId = uniqueId("sourceForm");
-
   selectType = selectedType => {
     this.setState({ selectedType, currentStep: StepEnum.CONFIGURE_IT });
   };
@@ -84,7 +82,6 @@ class CreateSourceDialog extends React.Component {
       <div className="m-t-10">
         <Search
           placeholder="Search..."
-          aria-label="Search"
           onChange={e => this.setState({ searchText: e.target.value })}
           autoFocus
           data-test="SearchSource"
@@ -114,12 +111,11 @@ class CreateSourceDialog extends React.Component {
         <div className="text-right">
           {HELP_TRIGGER_TYPES[helpTriggerType] && (
             <HelpTrigger className="f-13" type={helpTriggerType}>
-              Setup Instructions <i className="fa fa-question-circle" aria-hidden="true" />
-              <span className="sr-only">(help)</span>
+              Setup Instructions <i className="fa fa-question-circle" />
             </HelpTrigger>
           )}
         </div>
-        <DynamicForm id={this.formId} fields={fields} onSubmit={this.createSource} feedbackIcons hideSubmitButton />
+        <DynamicForm id="sourceForm" fields={fields} onSubmit={this.createSource} feedbackIcons hideSubmitButton />
         {selectedType.type === "databricks" && (
           <small>
             By using the Databricks Data Source you agree to the Databricks JDBC/ODBC{" "}
@@ -143,7 +139,7 @@ class CreateSourceDialog extends React.Component {
           roundedImage={false}
           data-test="PreviewItem"
           data-test-type={item.type}>
-          <i className="fa fa-angle-double-right" aria-hidden="true" />
+          <i className="fa fa-angle-double-right" />
         </PreviewCard>
       </List.Item>
     );
@@ -173,7 +169,7 @@ class CreateSourceDialog extends React.Component {
                 <Button
                   key="submit"
                   htmlType="submit"
-                  form={this.formId}
+                  form="sourceForm"
                   type="primary"
                   loading={savingSource}
                   data-test="CreateSourceSaveButton">

client/app/components/EditInPlace.jsx

@@ -86,7 +86,6 @@ export default class EditInPlace extends React.Component {
     return (
       <InputComponent
         defaultValue={value}
-        aria-label="Editing"
         onBlur={e => this.stopEditing(e.target.value)}
         onKeyDown={this.handleKeyDown}
         autoFocus

client/app/components/EditParameterSettingsDialog/index.jsx

@@ -1,5 +1,5 @@
-import { includes, words, capitalize, clone, isNull } from "lodash";
-import React, { useState, useEffect } from "react";
+import { includes, words, capitalize, clone, isNull, map, get, find } from "lodash";
+import React, { useState, useEffect, useRef, useMemo } from "react";
 import PropTypes from "prop-types";
 import Checkbox from "antd/lib/checkbox";
 import Modal from "antd/lib/modal";
@@ -11,7 +11,8 @@ import Divider from "antd/lib/divider";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import QuerySelector from "@/components/QuerySelector";
 import { Query } from "@/services/query";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
+import { QueryBasedParameterMappingType } from "@/services/parameters/QueryBasedDropdownParameter";
+import QueryBasedParameterMappingTable from "./query-based-parameter/QueryBasedParameterMappingTable";
 
 const { Option } = Select;
 const formItemProps = { labelCol: { span: 6 }, wrapperCol: { span: 16 } };
@@ -70,17 +71,27 @@ NameInput.propTypes = {
 function EditParameterSettingsDialog(props) {
   const [param, setParam] = useState(clone(props.parameter));
   const [isNameValid, setIsNameValid] = useState(true);
-  const [initialQuery, setInitialQuery] = useState();
+  const [paramQuery, setParamQuery] = useState();
+  const mappingParameters = useMemo(
+    () =>
+      map(paramQuery && paramQuery.getParametersDefs(), mappingParam => ({
+        mappingParam,
+        existingMapping: get(param.parameterMapping, mappingParam.name, {
+          mappingType: QueryBasedParameterMappingType.UNDEFINED,
+        }),
+      })),
+    [param.parameterMapping, paramQuery]
+  );
 
   const isNew = !props.parameter.name;
 
   // fetch query by id
+  const initialQueryId = useRef(props.parameter.queryId);
   useEffect(() => {
-    const queryId = props.parameter.queryId;
-    if (queryId) {
-      Query.get({ id: queryId }).then(setInitialQuery);
+    if (initialQueryId.current) {
+      Query.get({ id: initialQueryId.current }).then(setParamQuery);
     }
-  }, [props.parameter.queryId]);
+  }, []);
 
   function isFulfilled() {
     // name
@@ -94,8 +105,14 @@ function EditParameterSettingsDialog(props) {
     }
 
     // query
-    if (param.type === "query" && !param.queryId) {
-      return false;
+    if (param.type === "query") {
+      if (!param.queryId) {
+        return false;
+      }
+
+      if (find(mappingParameters, { existingMapping: { mappingType: QueryBasedParameterMappingType.UNDEFINED } })) {
+        return false;
+      }
     }
 
     return true;
@@ -112,8 +129,6 @@ function EditParameterSettingsDialog(props) {
     props.dialog.close(param);
   }
 
-  const paramFormId = useUniqueId("paramForm");
-
   return (
     <Modal
       {...props.dialog.props}
@@ -128,12 +143,12 @@ function EditParameterSettingsDialog(props) {
           htmlType="submit"
           disabled={!isFulfilled()}
           type="primary"
-          form={paramFormId}
+          form="paramForm"
           data-test="SaveParameterSettings">
           {isNew ? "Add Parameter" : "OK"}
         </Button>,
       ]}>
-      <Form layout="horizontal" onFinish={onConfirm} id={paramFormId}>
+      <Form layout="horizontal" onFinish={onConfirm} id="paramForm">
         {isNew && (
           <NameInput
             name={param.name}
@@ -190,14 +205,28 @@ function EditParameterSettingsDialog(props) {
           </Form.Item>
         )}
         {param.type === "query" && (
-          <Form.Item label="Query" help="Select query to load dropdown values from" {...formItemProps}>
+          <Form.Item label="Query" help="Select query to load dropdown values from" required {...formItemProps}>
             <QuerySelector
-              selectedQuery={initialQuery}
-              onChange={q => setParam({ ...param, queryId: q && q.id })}
+              selectedQuery={paramQuery}
+              onChange={q => {
+                if (q) {
+                  setParamQuery(q);
+                  setParam({ ...param, queryId: q.id, parameterMapping: {} });
+                }
+              }}
               type="select"
             />
           </Form.Item>
         )}
+        {param.type === "query" && paramQuery && paramQuery.hasParameters() && (
+          <Form.Item className="m-t-15 m-b-5" label="Parameters" required {...formItemProps}>
+            <QueryBasedParameterMappingTable
+              param={param}
+              mappingParameters={mappingParameters}
+              onChangeParam={setParam}
+            />
+          </Form.Item>
+        )}
         {(param.type === "enum" || param.type === "query") && (
           <Form.Item className="m-b-0" label=" " colon={false} {...formItemProps}>
             <Checkbox

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

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

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

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

client/app/components/EditVisualizationButton/QueryControlDropdown.jsx

@@ -3,7 +3,6 @@ import PropTypes from "prop-types";
 import Dropdown from "antd/lib/dropdown";
 import Menu from "antd/lib/menu";
 import Button from "antd/lib/button";
-import PlainButton from "@/components/PlainButton";
 import { clientConfig } from "@/services/auth";
 
 import PlusCircleFilledIcon from "@ant-design/icons/PlusCircleFilled";
@@ -19,18 +18,16 @@ export default function QueryControlDropdown(props) {
     <Menu>
       {!props.query.isNew() && (!props.query.is_draft || !props.query.is_archived) && (
         <Menu.Item>
-          <PlainButton onClick={() => props.openAddToDashboardForm(props.selectedTab)}>
+          <a target="_self" onClick={() => props.openAddToDashboardForm(props.selectedTab)}>
             <PlusCircleFilledIcon /> Add to Dashboard
-          </PlainButton>
+          </a>
         </Menu.Item>
       )}
       {!clientConfig.disablePublicUrls && !props.query.isNew() && (
         <Menu.Item>
-          <PlainButton
-            onClick={() => props.showEmbedDialog(props.query, props.selectedTab)}
-            data-test="ShowEmbedDialogButton">
+          <a onClick={() => props.showEmbedDialog(props.query, props.selectedTab)} data-test="ShowEmbedDialogButton">
             <ShareAltOutlinedIcon /> Embed Elsewhere
-          </PlainButton>
+          </a>
         </Menu.Item>
       )}
       <Menu.Item>

client/app/components/EmailSettingsWarning.jsx

@@ -1,14 +1,12 @@
 import React from "react";
 import PropTypes from "prop-types";
+import cx from "classnames";
 import { clientConfig, currentUser } from "@/services/auth";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import Alert from "antd/lib/alert";
 import HelpTrigger from "@/components/HelpTrigger";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
 
 export default function EmailSettingsWarning({ featureName, className, mode, adminOnly }) {
-  const messageDescriptionId = useUniqueId("sr-mail-description");
-
   if (!clientConfig.mailSettingsMissing) {
     return null;
   }
@@ -18,7 +16,7 @@ export default function EmailSettingsWarning({ featureName, className, mode, adm
   }
 
   const message = (
-    <span id={messageDescriptionId}>
+    <span>
       Your mail server isn&apos;t configured correctly, and is needed for {featureName} to work.{" "}
       <HelpTrigger type="MAIL_CONFIG" className="f-inherit" />
     </span>
@@ -26,11 +24,8 @@ export default function EmailSettingsWarning({ featureName, className, mode, adm
 
   if (mode === "icon") {
     return (
-      <Tooltip title={message} placement="topRight" arrowPointAtCenter>
-        {/* eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex */}
-        <span className={className} aria-label="Mail alert" aria-describedby={messageDescriptionId} tabIndex={0}>
-          <i className={"fa fa-exclamation-triangle"} aria-hidden="true" />
-        </span>
+      <Tooltip title={message}>
+        <i className={cx("fa fa-exclamation-triangle", className)} />
       </Tooltip>
     );
   }

client/app/components/FavoritesControl.jsx

@@ -1,6 +1,5 @@
 import React from "react";
 import PropTypes from "prop-types";
-import PlainButton from "@/components/PlainButton";
 
 export default class FavoritesControl extends React.Component {
   static propTypes = {
@@ -30,13 +29,12 @@ export default class FavoritesControl extends React.Component {
     const icon = item.is_favorite ? "fa fa-star" : "fa fa-star-o";
     const title = item.is_favorite ? "Remove from favorites" : "Add to favorites";
     return (
-      <PlainButton
+      <a
         title={title}
-        aria-label={title}
-        className="favorites-control btn-favorite"
+        className="favorites-control btn-favourite"
         onClick={event => this.toggleItem(event, item, onChange)}>
         <i className={icon} aria-hidden="true" />
-      </PlainButton>
+      </a>
     );
   }
 }

client/app/components/Filters.jsx

@@ -112,11 +112,11 @@ function Filters({ filters, onChange }) {
                     {!filter.multiple && options}
                     {filter.multiple && [
                       <Select.Option key={NONE_VALUES} data-test="ClearOption">
-                        <i className="fa fa-square-o m-r-5" aria-hidden="true" />
+                        <i className="fa fa-square-o m-r-5" />
                         Clear
                       </Select.Option>,
                       <Select.Option key={ALL_VALUES} data-test="SelectAllOption">
-                        <i className="fa fa-check-square-o m-r-5" aria-hidden="true" />
+                        <i className="fa fa-check-square-o m-r-5" />
                         Select All
                       </Select.Option>,
                       <Select.OptGroup key="Values" title="Values">

client/app/components/HelpTrigger.jsx

@@ -2,10 +2,9 @@ import { startsWith, get, some, mapValues } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
 import cx from "classnames";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import Drawer from "antd/lib/drawer";
 import Link from "@/components/Link";
-import PlainButton from "@/components/PlainButton";
 import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
 import BigMessage from "@/components/BigMessage";
 import DynamicComponent, { registerComponent } from "@/components/DynamicComponent";
@@ -46,7 +45,7 @@ export const TYPES = mapValues(
     NUMBER_FORMAT_SPECS: ["/user-guide/visualizations/formatting-numbers", "Formatting Numbers"],
     GETTING_STARTED: ["/user-guide/getting-started", "Guide: Getting Started"],
     DASHBOARDS: ["/user-guide/dashboards", "Guide: Dashboards"],
-    QUERIES: ["/user-guide/querying", "Guide: Queries"],
+    QUERIES: ["/help/user-guide/querying", "Guide: Queries"],
     ALERTS: ["/user-guide/alerts", "Guide: Alerts"],
   },
   ([url, title]) => [DOMAIN + HELP_PATH + url, title]
@@ -69,7 +68,7 @@ const HelpTriggerDefaultProps = {
   className: null,
   showTooltip: true,
   renderAsLink: false,
-  children: <i className="fa fa-question-circle" aria-hidden="true" />,
+  children: <i className="fa fa-question-circle" />,
 };
 
 export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName = null) {
@@ -171,13 +170,7 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
               this.props.showTooltip ? (
                 <>
                   {tooltip}
-                  {shouldRenderAsLink && (
-                    <>
-                      {" "}
-                      <i className="fa fa-external-link" style={{ marginLeft: 5 }} aria-hidden="true" />
-                      <span className="sr-only">(opens in a new tab)</span>
-                    </>
-                  )}
+                  {shouldRenderAsLink && <i className="fa fa-external-link" style={{ marginLeft: 5 }} />}
                 </>
               ) : null
             }>
@@ -204,15 +197,14 @@ export function helpTriggerWithTypes(types, allowedDomains = [], drawerClassName
                   <Tooltip title="Open page in a new window" placement="left">
                     {/* eslint-disable-next-line react/jsx-no-target-blank */}
                     <Link href={url} target="_blank">
-                      <i className="fa fa-external-link" aria-hidden="true" />
-                      <span className="sr-only">(opens in a new tab)</span>
+                      <i className="fa fa-external-link" />
                     </Link>
                   </Tooltip>
                 )}
                 <Tooltip title="Close" placement="bottom">
-                  <PlainButton onClick={this.closeDrawer}>
+                  <a onClick={this.closeDrawer}>
                     <CloseOutlinedIcon />
-                  </PlainButton>
+                  </a>
                 </Tooltip>
               </div>
 

client/app/components/HelpTrigger.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import "~antd/lib/drawer/style/drawer";
 
 @help-doc-bg: #f7f7f7; // according to https://github.com/getredash/website/blob/13daff2d8b570956565f482236f6245042e8477f/src/scss/_components/_variables.scss#L15
 
@@ -38,8 +38,7 @@
     border: 2px solid @help-doc-bg;
     display: flex;
 
-    a,
-    .plain-button {
+    a {
       height: 26px;
       width: 26px;
       display: flex;

client/app/components/InputPopover/index.jsx

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

client/app/components/InputPopover/index.less

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

client/app/components/InputWithCopy.jsx

@@ -1,8 +1,7 @@
 import React from "react";
 import Input from "antd/lib/input";
 import CopyOutlinedIcon from "@ant-design/icons/CopyOutlined";
-import Tooltip from "@/components/Tooltip";
-import PlainButton from "./PlainButton";
+import Tooltip from "antd/lib/tooltip";
 
 export default class InputWithCopy extends React.Component {
   constructor(props) {
@@ -43,10 +42,7 @@ export default class InputWithCopy extends React.Component {
   render() {
     const copyButton = (
       <Tooltip title={this.state.copied || "Copy"}>
-        <PlainButton onClick={this.copy}>
-          {/* TODO: lacks visual feedback */}
-          <CopyOutlinedIcon />
-        </PlainButton>
+        <CopyOutlinedIcon style={{ cursor: "pointer" }} onClick={this.copy} />
       </Tooltip>
     );
 

client/app/components/Link.jsx

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

client/app/components/Link.tsx

@@ -1,61 +0,0 @@
-import React from "react";
-import Button, { ButtonProps as AntdButtonProps } from "antd/lib/button";
-
-function DefaultLinkComponent({ children, ...props }: React.AnchorHTMLAttributes<HTMLAnchorElement>) {
-  return <a {...props}>{children}</a>;
-}
-
-Link.Component = DefaultLinkComponent;
-
-interface LinkProps extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "role" | "type" | "target"> {
-  href: string;
-}
-function Link({ children, ...props }: LinkProps) {
-  return <Link.Component {...props}>{children}</Link.Component>;
-}
-
-interface LinkWithIconProps extends LinkProps {
-  children: string;
-  icon: JSX.Element;
-  alt: string;
-  target?: "_self" | "_blank" | "_parent" | "_top";
-}
-
-function LinkWithIcon({ icon, alt, children, ...props }: LinkWithIconProps) {
-  return (
-    <Link.Component {...props}>
-      {children} {icon} <span className="sr-only">{alt}</span>
-    </Link.Component>
-  );
-}
-
-Link.WithIcon = LinkWithIcon;
-
-function ExternalLink({
-  icon = <i className="fa fa-external-link" aria-hidden="true" />,
-  alt = "(opens in a new tab)",
-  ...props
-}: Omit<LinkWithIconProps, "target">) {
-  return <Link.WithIcon target="_blank" rel="noopener noreferrer" icon={icon} alt={alt} {...props} />;
-}
-
-Link.External = ExternalLink;
-
-// Ant Button will render an <a> if href is present.
-function DefaultButtonLinkComponent(props: ButtonProps) {
-  return <Button {...props} />;
-}
-
-ButtonLink.Component = DefaultButtonLinkComponent;
-
-interface ButtonProps extends AntdButtonProps {
-  href: string;
-}
-
-function ButtonLink(props: ButtonProps) {
-  return <ButtonLink.Component {...props} />;
-}
-
-Link.Button = ButtonLink;
-
-export default Link;

client/app/components/ParameterApplyButton.jsx

@@ -2,26 +2,21 @@ import React from "react";
 import PropTypes from "prop-types";
 import Button from "antd/lib/button";
 import Badge from "antd/lib/badge";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import KeyboardShortcuts from "@/services/KeyboardShortcuts";
 
 function ParameterApplyButton({ paramCount, onClick }) {
   // show spinner when count is empty so the fade out is consistent
-  const icon = !paramCount ? (
-    <span role="status" aria-live="polite" aria-relevant="additions removals">
-      <i className="fa fa-spinner fa-pulse" aria-hidden="true" />
-      <span className="sr-only">Loading...</span>
-    </span>
-  ) : (
-    <i className="fa fa-check" aria-hidden="true" />
-  );
+  const icon = !paramCount ? "spinner fa-pulse" : "check";
 
   return (
     <div className="parameter-apply-button" data-show={!!paramCount} data-test="ParameterApplyButton">
       <Badge count={paramCount}>
         <Tooltip title={paramCount ? `${KeyboardShortcuts.modKey} + Enter` : null}>
           <span>
-            <Button onClick={onClick}>{icon} Apply Changes</Button>
+            <Button onClick={onClick}>
+              <i className={`fa fa-${icon}`} /> Apply Changes
+            </Button>
           </span>
         </Tooltip>
       </Badge>

client/app/components/ParameterMappingInput.jsx

@@ -12,11 +12,12 @@ import Tag from "antd/lib/tag";
 import Input from "antd/lib/input";
 import Radio from "antd/lib/radio";
 import Form from "antd/lib/form";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import ParameterValueInput from "@/components/ParameterValueInput";
 import { ParameterMappingType } from "@/services/widget";
 import { Parameter, cloneParameter } from "@/services/parameters";
 import HelpTrigger from "@/components/HelpTrigger";
+import InputPopover from "@/components/InputPopover";
 
 import QuestionCircleFilledIcon from "@ant-design/icons/QuestionCircleFilled";
 import EditOutlinedIcon from "@ant-design/icons/EditOutlined";
@@ -201,13 +202,7 @@ export class ParameterMappingInput extends React.Component {
     const {
       mapping: { mapTo },
     } = this.props;
-    return (
-      <Input
-        value={mapTo}
-        aria-label="Parameter name (key)"
-        onChange={e => this.updateParamMapping({ mapTo: e.target.value })}
-      />
-    );
+    return <Input value={mapTo} onChange={e => this.updateParamMapping({ mapTo: e.target.value })} />;
   }
 
   renderDashboardMapToExisting() {
@@ -319,43 +314,34 @@ class MappingEditor extends React.Component {
     this.setState({ visible: false });
   };
 
-  renderContent() {
-    const { mapping, inputError } = this.state;
-
-    return (
-      <div className="parameter-mapping-editor" data-test="EditParamMappingPopover">
-        <header>
-          Edit Source and Value <HelpTrigger type="VALUE_SOURCE_OPTIONS" />
-        </header>
-        <ParameterMappingInput
-          mapping={mapping}
-          existingParamNames={this.props.existingParamNames}
-          onChange={this.onChange}
-          inputError={inputError}
-        />
-        <footer>
-          <Button onClick={this.hide}>Cancel</Button>
-          <Button onClick={this.save} disabled={!!inputError} type="primary">
-            OK
-          </Button>
-        </footer>
-      </div>
-    );
-  }
-
   render() {
-    const { visible, mapping } = this.state;
+    const { visible, mapping, inputError } = this.state;
     return (
-      <Popover
+      <InputPopover
         placement="left"
         trigger="click"
-        content={this.renderContent()}
+        header={
+          <>
+            Edit Source and Value <HelpTrigger type="VALUE_SOURCE_OPTIONS" />
+          </>
+        }
+        content={
+          <ParameterMappingInput
+            mapping={mapping}
+            existingParamNames={this.props.existingParamNames}
+            onChange={this.onChange}
+            inputError={inputError}
+          />
+        }
+        onOk={this.save}
+        onCancel={this.hide}
+        okButtonProps={{ disabled: !!inputError }}
         visible={visible}
         onVisibleChange={this.onVisibleChange}>
         <Button size="small" type="dashed" data-test={`EditParamMappingButton-${mapping.param.name}`}>
           <EditOutlinedIcon />
         </Button>
-      </Popover>
+      </InputPopover>
     );
   }
 }
@@ -426,7 +412,6 @@ class TitleEditor extends React.Component {
           size="small"
           value={this.state.title}
           placeholder={paramTitle}
-          aria-label="Edit parameter title"
           onChange={this.onEditingTitleChange}
           onPressEnter={this.save}
           maxLength={100}
@@ -447,10 +432,7 @@ class TitleEditor extends React.Component {
     if (mapping.type === MappingType.StaticValue) {
       return (
         <Tooltip placement="right" title="Titles for static values don't appear in widgets">
-          {/* eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex */}
-          <span tabIndex={0}>
-            <i className="fa fa-eye-slash" aria-hidden="true" />
-          </span>
+          <i className="fa fa-eye-slash" />
         </Tooltip>
       );
     }

client/app/components/ParameterMappingInput.less

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

client/app/components/ParameterValueInput.jsx

@@ -101,6 +101,7 @@ class ParameterValueInput extends React.Component {
       <SelectWithVirtualScroll
         className={this.props.className}
         mode={parameter.multiValuesOptions ? "multiple" : "default"}
+        optionFilterProp="children"
         value={normalize(value)}
         onChange={this.onSelect}
         options={map(enumOptionsArray, opt => ({ label: String(opt), value: opt }))}
@@ -119,6 +120,7 @@ class ParameterValueInput extends React.Component {
       <QueryBasedParameterInput
         className={this.props.className}
         mode={parameter.multiValuesOptions ? "multiple" : "default"}
+        optionFilterProp="children"
         parameter={parameter}
         value={value}
         queryId={queryId}
@@ -136,12 +138,7 @@ class ParameterValueInput extends React.Component {
     const normalize = val => (isNaN(val) ? undefined : val);
 
     return (
-      <InputNumber
-        className={className}
-        value={normalize(value)}
-        aria-label="Parameter number value"
-        onChange={val => this.onSelect(normalize(val))}
-      />
+      <InputNumber className={className} value={normalize(value)} onChange={val => this.onSelect(normalize(val))} />
     );
   }
 
@@ -153,7 +150,6 @@ class ParameterValueInput extends React.Component {
       <Input
         className={className}
         value={value}
-        aria-label="Parameter text value"
         data-test="TextParamInput"
         onChange={e => this.onSelect(e.target.value)}
       />

client/app/components/ParameterValueInput.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant"; // for ant @vars
+@import "~antd/lib/input-number/style/index"; // for ant @vars
 
 @input-dirty: #fffce1;
 
@@ -21,7 +21,7 @@
     .@{ant-prefix}-input-number,
     .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker {
-      background-color: @input-dirty;
+      background-color: @input-dirty !important;
     }
   }
 }

client/app/components/Parameters.jsx

@@ -6,9 +6,7 @@ import location from "@/services/location";
 import { Parameter, createParameter } from "@/services/parameters";
 import ParameterApplyButton from "@/components/ParameterApplyButton";
 import ParameterValueInput from "@/components/ParameterValueInput";
-import PlainButton from "@/components/PlainButton";
 import EditParameterSettingsDialog from "./EditParameterSettingsDialog";
-import { toHuman } from "@/lib/utils";
 
 import "./Parameters.less";
 
@@ -24,23 +22,19 @@ export default class Parameters extends React.Component {
   static propTypes = {
     parameters: PropTypes.arrayOf(PropTypes.instanceOf(Parameter)),
     editable: PropTypes.bool,
-    sortable: PropTypes.bool,
     disableUrlUpdate: PropTypes.bool,
     onValuesChange: PropTypes.func,
     onPendingValuesChange: PropTypes.func,
     onParametersEdit: PropTypes.func,
-    appendSortableToParent: PropTypes.bool,
   };
 
   static defaultProps = {
     parameters: [],
     editable: false,
-    sortable: false,
     disableUrlUpdate: false,
     onValuesChange: () => {},
     onPendingValuesChange: () => {},
     onParametersEdit: () => {},
-    appendSortableToParent: true,
   };
 
   constructor(props) {
@@ -90,7 +84,7 @@ export default class Parameters extends React.Component {
     if (oldIndex !== newIndex) {
       this.setState(({ parameters }) => {
         parameters.splice(newIndex, 0, parameters.splice(oldIndex, 1)[0]);
-        onParametersEdit(parameters);
+        onParametersEdit();
         return { parameters };
       });
     }
@@ -115,7 +109,7 @@ export default class Parameters extends React.Component {
       this.setState(({ parameters }) => {
         const updatedParameter = extend(parameter, updated);
         parameters[index] = createParameter(updatedParameter, updatedParameter.parentQueryId);
-        onParametersEdit(parameters);
+        onParametersEdit();
         return { parameters };
       });
     });
@@ -126,16 +120,15 @@ export default class Parameters extends React.Component {
     return (
       <div key={param.name} className="di-block" data-test={`ParameterName-${param.name}`}>
         <div className="parameter-heading">
-          <label>{param.title || toHuman(param.name)}</label>
+          <label>{param.getTitle()}</label>
           {editable && (
-            <PlainButton
+            <button
               className="btn btn-default btn-xs m-l-5"
-              aria-label="Edit"
               onClick={() => this.showParameterSettings(param, index)}
               data-test={`ParameterSettings-${param.name}`}
               type="button">
-              <i className="fa fa-cog" aria-hidden="true" />
-            </PlainButton>
+              <i className="fa fa-cog" />
+            </button>
           )}
         </div>
         <ParameterValueInput
@@ -152,17 +145,15 @@ export default class Parameters extends React.Component {
 
   render() {
     const { parameters } = this.state;
-    const { sortable, appendSortableToParent } = this.props;
+    const { editable } = this.props;
     const dirtyParamCount = size(filter(parameters, "hasPendingValue"));
-
     return (
       <SortableContainer
-        disabled={!sortable}
+        disabled={!editable}
         axis="xy"
         useDragHandle
         lockToContainerEdges
         helperClass="parameter-dragged"
-        helperContainer={containerEl => (appendSortableToParent ? containerEl : document.body)}
         updateBeforeSortStart={this.onBeforeSortStart}
         onSortEnd={this.moveParameter}
         containerProps={{
@@ -171,11 +162,8 @@ export default class Parameters extends React.Component {
         }}>
         {parameters.map((param, index) => (
           <SortableElement key={param.name} index={index}>
-            <div
-              className="parameter-block"
-              data-editable={sortable || null}
-              data-test={`ParameterBlock-${param.name}`}>
-              {sortable && <DragHandle data-test={`DragHandle-${param.name}`} />}
+            <div className="parameter-block" data-editable={editable || null}>
+              {editable && <DragHandle data-test={`DragHandle-${param.name}`} />}
               {this.renderParameter(param, index)}
             </div>
           </SortableElement>

client/app/components/Parameters.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import "../assets/less/ant";
 
 .parameter-block {
   display: inline-block;
@@ -21,8 +21,6 @@
 
   &.parameter-dragged {
     z-index: 2;
-    margin: 4px 0 0 4px;
-    padding: 3px 6px 6px;
     box-shadow: 0 4px 9px -3px rgba(102, 136, 153, 0.15);
   }
 }

client/app/components/PermissionsEditorDialog/index.jsx

@@ -7,12 +7,11 @@ import List from "antd/lib/list";
 import Modal from "antd/lib/modal";
 import Select from "antd/lib/select";
 import Tag from "antd/lib/tag";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import { toHuman } from "@/lib/utils";
 import HelpTrigger from "@/components/HelpTrigger";
 import { UserPreviewCard } from "@/components/PreviewCard";
-import PlainButton from "@/components/PlainButton";
 import notification from "@/services/notification";
 import User from "@/services/user";
 
@@ -103,16 +102,7 @@ function UserSelect({ onSelect, shouldShowUser }) {
       placeholder="Add users..."
       showSearch
       onSearch={setSearchTerm}
-      suffixIcon={
-        loadingUsers ? (
-          <span role="status" aria-live="polite" aria-relevant="additions removals">
-            <i className="fa fa-spinner fa-pulse" aria-hidden="true" />
-            <span className="sr-only">Loading...</span>
-          </span>
-        ) : (
-          <i className="fa fa-search" aria-hidden="true" />
-        )
-      }
+      suffixIcon={loadingUsers ? <i className="fa fa-spinner fa-pulse" /> : <i className="fa fa-search" />}
       filterOption={false}
       notFoundContent={null}
       value={undefined}
@@ -166,12 +156,7 @@ function PermissionsEditorDialog({ dialog, author, context, aclUrl }) {
       />
       <div className="d-flex align-items-center m-t-5">
         <h5 className="flex-fill">Users with permissions</h5>
-        {loadingGrantees && (
-          <span role="status" aria-live="polite" aria-relevant="additions removals">
-            <i className="fa fa-spinner fa-pulse" aria-hidden="true" />
-            <span className="sr-only">Loading...</span>
-          </span>
-        )}
+        {loadingGrantees && <i className="fa fa-spinner fa-pulse" />}
       </div>
       <div className="scrollbox p-5" style={{ maxHeight: "40vh" }}>
         <List
@@ -184,11 +169,10 @@ function PermissionsEditorDialog({ dialog, author, context, aclUrl }) {
                   <Tag className="m-0">Author</Tag>
                 ) : (
                   <Tooltip title="Remove user permissions">
-                    <PlainButton
-                      aria-label="Remove permissions"
-                      onClick={() => removePermission(user.id).then(loadUsersWithPermissions)}>
-                      <i className="fa fa-remove clickable" aria-hidden="true" />
-                    </PlainButton>
+                    <i
+                      className="fa fa-remove clickable"
+                      onClick={() => removePermission(user.id).then(loadUsersWithPermissions)}
+                    />
                   </Tooltip>
                 )}
               </UserPreviewCard>

client/app/components/PlainButton.less

@@ -1,22 +0,0 @@
-@import (reference, less) "~@/assets/less/ant";
-
-.plain-button {
-  all: unset;
-  transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-
-  .@{dropdown-prefix-cls}-menu-item > & {
-    width: 100%;
-    margin: -5px -12px;
-    padding: 5px 12px;
-  }
-
-  .@{menu-prefix-cls}-item > & {
-    width: 100%;
-    margin: 0 -16px;
-    padding: 0 16px;
-  }
-}
-
-.plain-button-link {
-  .btn-link();
-}

client/app/components/PlainButton.tsx

@@ -1,20 +0,0 @@
-import classNames from "classnames";
-import React from "react";
-
-import "./PlainButton.less";
-
-export interface PlainButtonProps extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "type"> {
-  type?: "link" | "button";
-}
-
-function PlainButton({ className, type, ...rest }: PlainButtonProps) {
-  return (
-    <button
-      className={classNames("plain-button", "clickable", { "plain-button-link": type === "link" }, className)}
-      type="button"
-      {...rest}
-    />
-  );
-}
-
-export default PlainButton;

client/app/components/QueryBasedParameterInput.jsx

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

client/app/components/QueryLink.jsx

@@ -21,12 +21,10 @@ function QueryLink({ query, visualization, readOnly }) {
     return query.getUrl(false, hash);
   };
 
-  const QueryLinkWrapper = props => (readOnly ? <span {...props} /> : <Link href={getUrl()} {...props} />);
-
   return (
-    <QueryLinkWrapper className="query-link">
+    <Link href={readOnly ? null : getUrl()} className="query-link">
       <VisualizationName visualization={visualization} /> <span>{query.name}</span>
-    </QueryLinkWrapper>
+    </Link>
   );
 }
 

client/app/components/QuerySelector.jsx

@@ -5,7 +5,6 @@ import cx from "classnames";
 import Input from "antd/lib/input";
 import Select from "antd/lib/select";
 import { Query } from "@/services/query";
-import PlainButton from "@/components/PlainButton";
 import notification from "@/services/notification";
 import { QueryTagsControl } from "@/components/tags-control/TagsControl";
 import useSearchResults from "@/lib/hooks/useSearchResults";
@@ -31,21 +30,8 @@ export default function QuerySelector(props) {
   const [doSearch, searchResults, searching] = useSearchResults(search, { initialResults: [] });
 
   const placeholder = "Search a query by name";
-  const clearIcon = (
-    <i
-      className="fa fa-times hide-in-percy"
-      role="button"
-      tabIndex={0}
-      aria-label="Clear"
-      onClick={() => selectQuery(null)}
-    />
-  );
-  const spinIcon = (
-    <span role="status" aria-live="polite" aria-relevant="additions removals">
-      <i className={cx("fa fa-spinner fa-pulse hide-in-percy", { hidden: !searching })} aria-hidden="true" />
-      <span className="sr-only">Searching...</span>
-    </span>
-  );
+  const clearIcon = <i className="fa fa-times hide-in-percy" onClick={() => selectQuery(null)} />;
+  const spinIcon = <i className={cx("fa fa-spinner fa-pulse hide-in-percy", { hidden: !searching })} />;
 
   useEffect(() => {
     doSearch(searchTerm);
@@ -79,25 +65,22 @@ export default function QuerySelector(props) {
     }
 
     return (
-      <ul className="list-group">
+      <div className="list-group">
         {searchResults.map(q => (
-          <PlainButton
+          <a
             className={cx("query-selector-result", "list-group-item", { inactive: q.is_draft })}
             key={q.id}
-            role="listitem"
             onClick={() => selectQuery(q.id)}
             data-test={`QueryId${q.id}`}>
             {q.name} <QueryTagsControl isDraft={q.is_draft} tags={q.tags} className="inline-tags-control" />
-          </PlainButton>
+          </a>
         ))}
-      </ul>
+      </div>
     );
   }
 
   if (props.disabled) {
-    return (
-      <Input value={selectedQuery && selectedQuery.name} aria-label="Tied query" placeholder={placeholder} disabled />
-    );
+    return <Input value={selectedQuery && selectedQuery.name} placeholder={placeholder} disabled />;
   }
 
   if (props.type === "select") {
@@ -144,12 +127,11 @@ export default function QuerySelector(props) {
   return (
     <span data-test="QuerySelector">
       {selectedQuery ? (
-        <Input value={selectedQuery.name} aria-label="Tied query" suffix={clearIcon} readOnly />
+        <Input value={selectedQuery.name} suffix={clearIcon} readOnly />
       ) : (
         <Input
           placeholder={placeholder}
           value={searchTerm}
-          aria-label="Tied query"
           onChange={e => setSearchTerm(e.target.value)}
           suffix={spinIcon}
         />

client/app/components/Resizable/index.jsx

@@ -51,12 +51,9 @@ export default function Resizable({ toggleShortcut, direction, sizeAttribute, ch
 
   const resizeHandle = useMemo(
     () => (
-      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-noninteractive-element-interactions
       <span
         className={`react-resizable-handle react-resizable-handle-${direction}`}
-        role="separator"
         onClick={() => {
-          // TODO: add key controls
           // On desktops resize uses `mousedown`/`mousemove`/`mouseup` events, and there is a conflict
           // with this `click` handler: after user releases mouse - this handler will be executed.
           // So we use `wasResized` flag to check if there was actual resize or user just pressed and released

client/app/components/SelectItemsDialog.jsx

@@ -12,16 +12,13 @@ import LoadingState from "@/components/items-list/components/LoadingState";
 import notification from "@/services/notification";
 import useSearchResults from "@/lib/hooks/useSearchResults";
 
-import "./SelectItemsDialog.less";
-
 function ItemsList({ items, renderItem, onItemClick }) {
   const renderListItem = useCallback(
     item => {
       const { content, className, isDisabled } = renderItem(item);
-
       return (
         <List.Item
-          className={classNames("select-items-list", "w-100", "p-l-10", "p-r-10", { disabled: isDisabled }, className)}
+          className={classNames("p-l-10", "p-r-10", { clickable: !isDisabled, disabled: isDisabled }, className)}
           onClick={isDisabled ? null : () => onItemClick(item)}>
           {content}
         </List.Item>
@@ -120,12 +117,7 @@ function SelectItemsDialog({
       }>
       <div className="d-flex align-items-center m-b-10">
         <div className="flex-fill">
-          <Input.Search
-            onChange={event => search(event.target.value)}
-            placeholder={inputPlaceholder}
-            aria-label={inputPlaceholder}
-            autoFocus
-          />
+          <Input.Search onChange={event => search(event.target.value)} placeholder={inputPlaceholder} autoFocus />
         </div>
         {renderStagedItem && (
           <div className="w-50 m-l-20">

client/app/components/SelectItemsDialog.less

@@ -1,9 +0,0 @@
-.select-items-list {
-  &:hover,
-  &:focus,
-  &:focus-within {
-    color: #555;
-    background-color: #f5f5f5;
-    transition: all 150ms ease-in-out;
-  }
-}

client/app/components/SelectWithVirtualScroll.tsx

@@ -9,7 +9,7 @@ interface VirtualScrollLabeledValue extends LabeledValue {
   label: string;
 }
 
-interface VirtualScrollSelectProps extends Omit<SelectProps<string>, "optionFilterProp" | "children"> {
+interface VirtualScrollSelectProps extends SelectProps<string> {
   options: Array<VirtualScrollLabeledValue>;
 }
 function SelectWithVirtualScroll({ options, ...props }: VirtualScrollSelectProps): JSX.Element {
@@ -32,14 +32,7 @@ function SelectWithVirtualScroll({ options, ...props }: VirtualScrollSelectProps
     return false;
   }, [options]);
 
-  return (
-    <AntdSelect<string>
-      dropdownMatchSelectWidth={dropdownMatchSelectWidth}
-      options={options}
-      optionFilterProp="label" // as this component expects "options" prop
-      {...props}
-    />
-  );
+  return <AntdSelect<string> dropdownMatchSelectWidth={dropdownMatchSelectWidth} options={options} {...props} />;
 }
 
 export default SelectWithVirtualScroll;

client/app/components/TagsList.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import "~@/assets/less/ant";
 
 .tags-list {
   .tags-list-title {
@@ -7,14 +7,13 @@
     justify-content: space-between;
     align-items: center;
 
-    .tags-list-label {
+    label {
       display: block;
       white-space: nowrap;
       margin: 0;
     }
 
-    a,
-    .plain-button {
+    a {
       display: block;
       white-space: nowrap;
       cursor: pointer;
@@ -44,15 +43,5 @@
         color: white;
       }
     }
-
-    .ant-menu-item {
-      &:hover,
-      &:active,
-      &:focus,
-      &:focus-within {
-        color: @primary-color;
-        transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-      }
-    }
   }
 }

client/app/components/TagsList.tsx

@@ -4,7 +4,6 @@ import Badge from "antd/lib/badge";
 import Menu from "antd/lib/menu";
 import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
 import getTags from "@/services/getTags";
-import PlainButton from "@/components/PlainButton";
 
 import "./TagsList.less";
 
@@ -78,12 +77,12 @@ function TagsList({ tagsUrl, showUnselectAll = false, onUpdate }: TagsListProps)
   return (
     <div className="tags-list">
       <div className="tags-list-title">
-        <span className="tags-list-label">Tags</span>
+        <label>Tags</label>
         {showUnselectAll && selectedTags.length > 0 && (
-          <PlainButton type="link" onClick={unselectAll}>
+          <a onClick={unselectAll}>
             <CloseOutlinedIcon />
             clear selection
-          </PlainButton>
+          </a>
         )}
       </div>
 
@@ -91,12 +90,12 @@ function TagsList({ tagsUrl, showUnselectAll = false, onUpdate }: TagsListProps)
         <Menu className="invert-stripe-position" mode="inline" selectedKeys={selectedTags}>
           {map(allTags, tag => (
             <Menu.Item key={tag.name} className="m-0">
-              <PlainButton
+              <a
                 className="d-flex align-items-center justify-content-between"
                 onClick={event => toggleTag(event, tag.name)}>
                 <span className="max-character col-xs-11">{tag.name}</span>
                 <Badge count={tag.count} />
-              </PlainButton>
+              </a>
             </Menu.Item>
           ))}
         </Menu>

client/app/components/TimeAgo.jsx

@@ -4,7 +4,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import PropTypes from "prop-types";
 import { Moment } from "@/components/proptypes";
 import { clientConfig } from "@/services/auth";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 
 function toMoment(value) {
   value = !isNil(value) ? moment(value) : null;

client/app/components/Tooltip.tsx

@@ -1,13 +0,0 @@
-import React from "react";
-import AntTooltip, { TooltipProps } from "antd/lib/tooltip";
-import { isNil } from "lodash";
-
-export default function Tooltip({ title, ...restProps }: TooltipProps) {
-  const liveTitle = !isNil(title) ? (
-    <span role="status" aria-live="assertive" aria-relevant="additions">
-      {title}
-    </span>
-  ) : null;
-
-  return <AntTooltip trigger={["hover", "focus"]} title={liveTitle} {...restProps} />;
-}

client/app/components/admin/RQStatus.jsx

@@ -35,11 +35,11 @@ CounterCard.defaultProps = {
 
 const queryJobsColumns = [
   { title: "Queue", dataIndex: "origin" },
-  { title: "Query ID", dataIndex: ["meta", "query_id"] },
-  { title: "Org ID", dataIndex: ["meta", "org_id"] },
-  { title: "Data Source ID", dataIndex: ["meta", "data_source_id"] },
-  { title: "User ID", dataIndex: ["meta", "user_id"] },
-  Columns.custom(scheduled => scheduled.toString(), { title: "Scheduled", dataIndex: ["meta", "scheduled"] }),
+  { title: "Query ID", dataIndex: "meta.query_id" },
+  { title: "Org ID", dataIndex: "meta.org_id" },
+  { title: "Data Source ID", dataIndex: "meta.data_source_id" },
+  { title: "User ID", dataIndex: "meta.user_id" },
+  Columns.custom(scheduled => scheduled.toString(), { title: "Scheduled", dataIndex: "meta.scheduled" }),
   Columns.timeAgo({ title: "Start Time", dataIndex: "started_at" }),
   Columns.timeAgo({ title: "Enqueue Time", dataIndex: "enqueued_at" }),
 ];

client/app/components/cards-list/CardsList.less

@@ -1,4 +1,5 @@
-@import (reference, less) "~@/assets/less/inc/variables";
+
+@import '../../assets/less/inc/variables';
 
 .visual-card-list {
   width: 100%;
@@ -6,7 +7,7 @@
 }
 
 .visual-card {
-  background: #ffffff;
+  background: #FFFFFF;
   border: 1px solid fade(@redash-gray, 15%);
   border-radius: 3px;
   margin: 5px;
@@ -21,9 +22,7 @@
   display: flex;
   align-items: center;
 
-  &:hover,
-  &:focus,
-  &:focus-within {
+  &:hover {
     box-shadow: rgba(102, 136, 153, 0.15) 0px 4px 9px -3px;
   }
 
@@ -75,4 +74,4 @@
       height: 48px;
     }
   }
-}
+}

client/app/components/cards-list/CardsList.tsx

@@ -3,7 +3,6 @@ import PropTypes from "prop-types";
 import React, { useState } from "react";
 import Input from "antd/lib/input";
 import Link from "@/components/Link";
-import PlainButton from "@/components/PlainButton";
 import EmptyState from "@/components/items-list/components/EmptyState";
 
 import "./CardsList.less";
@@ -11,8 +10,8 @@ import "./CardsList.less";
 export interface CardsListItem {
   title: string;
   imgSrc: string;
+  onClick?: () => void;
   href?: string;
-  onClick?: React.MouseEventHandler<HTMLElement>;
 }
 
 export interface CardsListProps {
@@ -26,19 +25,12 @@ interface ListItemProps {
 }
 
 function ListItem({ item, keySuffix }: ListItemProps) {
-  const commonProps = {
-    key: `card${keySuffix}`,
-    className: "visual-card",
-    onClick: item.onClick,
-    children: (
-      <>
-        <img alt={item.title} src={item.imgSrc} />
-        <h3>{item.title}</h3>
-      </>
-    ),
-  };
-
-  return item.href ? <Link href={item.href} {...commonProps} /> : <PlainButton type="link" {...commonProps} />;
+  return (
+    <Link key={`card${keySuffix}`} className="visual-card" onClick={item.onClick} href={item.href}>
+      <img alt={item.title} src={item.imgSrc} />
+      <h3>{item.title}</h3>
+    </Link>
+  );
 }
 
 export default function CardsList({ items = [], showSearch = false }: CardsListProps) {
@@ -54,7 +46,6 @@ export default function CardsList({ items = [], showSearch = false }: CardsListP
           <div className="col-md-4 col-md-offset-4">
             <Input.Search
               placeholder="Search..."
-              aria-label="Search cards"
               onChange={(e: React.ChangeEvent<HTMLInputElement>) => setSearchText(e.target.value)}
               autoFocus
             />

client/app/components/dashboards/AddWidgetDialog.jsx

@@ -8,15 +8,12 @@ import { MappingType, ParameterMappingListInput } from "@/components/ParameterMa
 import QuerySelector from "@/components/QuerySelector";
 import notification from "@/services/notification";
 import { Query } from "@/services/query";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
 
 function VisualizationSelect({ query, visualization, onChange }) {
   const visualizationGroups = useMemo(() => {
     return query ? groupBy(query.visualizations, "type") : {};
   }, [query]);
 
-  const vizSelectId = useUniqueId("visualization-select");
-
   const handleChange = useCallback(
     visualizationId => {
       const selectedVisualization = query ? find(query.visualizations, { id: visualizationId }) : null;
@@ -32,9 +29,9 @@ function VisualizationSelect({ query, visualization, onChange }) {
   return (
     <div>
       <div className="form-group">
-        <label htmlFor={vizSelectId}>Choose Visualization</label>
+        <label htmlFor="choose-visualization">Choose Visualization</label>
         <Select
-          id={vizSelectId}
+          id="choose-visualization"
           className="w-100"
           value={visualization ? visualization.id : undefined}
           onChange={handleChange}>
@@ -111,7 +108,6 @@ function AddWidgetDialog({ dialog, dashboard }) {
   }, [dialog, selectedVisualization, parameterMappings]);
 
   const existingParams = dashboard.getParametersDefs();
-  const parameterMappingsId = useUniqueId("parameter-mappings");
 
   return (
     <Modal
@@ -136,12 +132,12 @@ function AddWidgetDialog({ dialog, dashboard }) {
         )}
 
         {parameterMappings.length > 0 && [
-          <label key="parameters-title" htmlFor={parameterMappingsId}>
+          <label key="parameters-title" htmlFor="parameter-mappings">
             Parameters
           </label>,
           <ParameterMappingListInput
             key="parameters-list"
-            id={parameterMappingsId}
+            id="parameter-mappings"
             mappings={parameterMappings}
             existingParams={existingParams}
             onChange={setParameterMappings}

client/app/components/dashboards/CreateDashboardDialog.jsx

@@ -60,7 +60,6 @@ function CreateDashboardDialog({ dialog }) {
           onChange={handleNameChange}
           onPressEnter={save}
           placeholder="Dashboard Name"
-          aria-label="Dashboard name"
           disabled={saveInProgress}
           autoFocus
         />

client/app/components/dashboards/DashboardGrid.jsx

@@ -41,7 +41,6 @@ const DashboardWidget = React.memo(
     onRefreshWidget,
     onRemoveWidget,
     onParameterMappingsChange,
-    isEditing,
     canEdit,
     isPublic,
     isLoading,
@@ -58,7 +57,6 @@ const DashboardWidget = React.memo(
           widget={widget}
           dashboard={dashboard}
           filters={filters}
-          isEditing={isEditing}
           canEdit={canEdit}
           isPublic={isPublic}
           isLoading={isLoading}
@@ -79,8 +77,7 @@ const DashboardWidget = React.memo(
     prevProps.canEdit === nextProps.canEdit &&
     prevProps.isPublic === nextProps.isPublic &&
     prevProps.isLoading === nextProps.isLoading &&
-    prevProps.filters === nextProps.filters &&
-    prevProps.isEditing === nextProps.isEditing
+    prevProps.filters === nextProps.filters
 );
 
 class DashboardGrid extends React.Component {
@@ -226,6 +223,7 @@ class DashboardGrid extends React.Component {
   });
 
   render() {
+    const className = cx("dashboard-wrapper", this.props.isEditing ? "editing-mode" : "preview-mode");
     const {
       onLoadWidget,
       onRefreshWidget,
@@ -234,21 +232,19 @@ class DashboardGrid extends React.Component {
       filters,
       dashboard,
       isPublic,
-      isEditing,
       widgets,
     } = this.props;
-    const className = cx("dashboard-wrapper", isEditing ? "editing-mode" : "preview-mode");
 
     return (
       <div className={className}>
         <ResponsiveGridLayout
-          draggableCancel="input,.sortable-container"
+          draggableCancel="input"
           className={cx("layout", { "disable-animations": this.state.disableAnimations })}
           cols={{ [MULTI]: cfg.columns, [SINGLE]: 1 }}
           rowHeight={cfg.rowHeight - cfg.margins}
           margin={[cfg.margins, cfg.margins]}
-          isDraggable={isEditing}
-          isResizable={isEditing}
+          isDraggable={this.props.isEditing}
+          isResizable={this.props.isEditing}
           onResizeStart={this.autoHeightCtrl.stop}
           onResizeStop={this.onWidgetResize}
           layouts={this.state.layouts}
@@ -270,7 +266,6 @@ class DashboardGrid extends React.Component {
                 filters={filters}
                 isPublic={isPublic}
                 isLoading={widget.loading}
-                isEditing={isEditing}
                 canEdit={dashboard.canEdit()}
                 onLoadWidget={onLoadWidget}
                 onRefreshWidget={onRefreshWidget}

client/app/components/dashboards/TextboxDialog.jsx

@@ -5,7 +5,7 @@ import PropTypes from "prop-types";
 import { useDebouncedCallback } from "use-debounce";
 import Modal from "antd/lib/modal";
 import Input from "antd/lib/input";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import Divider from "antd/lib/divider";
 import Link from "@/components/Link";
 import HtmlContent from "@redash/viz/lib/components/HtmlContent";
@@ -73,7 +73,6 @@ function TextboxDialog({ dialog, isNew, ...props }) {
           className="resize-vertical"
           rows="5"
           value={text}
-          aria-label="Textbox widget content"
           onChange={handleInputChange}
           autoFocus
           placeholder="This is where you write some text"

client/app/components/dashboards/dashboard-widget/VisualizationWidget.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import PropTypes from "prop-types";
-import { compact, isEmpty, invoke, map } from "lodash";
+import { compact, isEmpty, invoke } from "lodash";
 import { markdown } from "markdown";
 import cx from "classnames";
 import Menu from "antd/lib/menu";
@@ -15,11 +15,9 @@ import Timer from "@/components/Timer";
 import { Moment } from "@/components/proptypes";
 import QueryLink from "@/components/QueryLink";
 import { FiltersType } from "@/components/Filters";
-import PlainButton from "@/components/PlainButton";
 import ExpandedWidgetDialog from "@/components/dashboards/ExpandedWidgetDialog";
 import EditParameterMappingsDialog from "@/components/dashboards/EditParameterMappingsDialog";
 import VisualizationRenderer from "@/components/visualizations/VisualizationRenderer";
-
 import Widget from "./Widget";
 
 function visualizationWidgetMenuOptions({ widget, canEditDashboard, onParametersEdit }) {
@@ -76,8 +74,7 @@ function RefreshIndicator({ refreshStartedAt }) {
   return (
     <div className="refresh-indicator">
       <div className="refresh-icon">
-        <i className="zmdi zmdi-refresh zmdi-hc-spin" aria-hidden="true" />
-        <span className="sr-only">Refreshing...</span>
+        <i className="zmdi zmdi-refresh zmdi-hc-spin" />
       </div>
       <Timer from={refreshStartedAt} />
     </div>
@@ -87,14 +84,7 @@ function RefreshIndicator({ refreshStartedAt }) {
 RefreshIndicator.propTypes = { refreshStartedAt: Moment };
 RefreshIndicator.defaultProps = { refreshStartedAt: null };
 
-function VisualizationWidgetHeader({
-  widget,
-  refreshStartedAt,
-  parameters,
-  isEditing,
-  onParametersUpdate,
-  onParametersEdit,
-}) {
+function VisualizationWidgetHeader({ widget, refreshStartedAt, parameters, onParametersUpdate }) {
   const canViewQuery = currentUser.hasPermission("view_query");
 
   return (
@@ -114,13 +104,7 @@ function VisualizationWidgetHeader({
       </div>
       {!isEmpty(parameters) && (
         <div className="m-b-10">
-          <Parameters
-            parameters={parameters}
-            sortable={isEditing}
-            appendSortableToParent={false}
-            onValuesChange={onParametersUpdate}
-            onParametersEdit={onParametersEdit}
-          />
+          <Parameters parameters={parameters} onValuesChange={onParametersUpdate} />
         </div>
       )}
     </>
@@ -131,16 +115,12 @@ VisualizationWidgetHeader.propTypes = {
   widget: PropTypes.object.isRequired, // eslint-disable-line react/forbid-prop-types
   refreshStartedAt: Moment,
   parameters: PropTypes.arrayOf(PropTypes.object),
-  isEditing: PropTypes.bool,
   onParametersUpdate: PropTypes.func,
-  onParametersEdit: PropTypes.func,
 };
 
 VisualizationWidgetHeader.defaultProps = {
   refreshStartedAt: null,
   onParametersUpdate: () => {},
-  onParametersEdit: () => {},
-  isEditing: false,
   parameters: [],
 };
 
@@ -160,40 +140,34 @@ function VisualizationWidgetFooter({ widget, isPublic, onRefresh, onExpand }) {
     <>
       <span>
         {!isPublic && !!widgetQueryResult && (
-          <PlainButton
+          <a
             className="refresh-button hidden-print btn btn-sm btn-default btn-transparent"
             onClick={() => refreshWidget(1)}
             data-test="RefreshButton">
-            <i className={cx("zmdi zmdi-refresh", { "zmdi-hc-spin": refreshClickButtonId === 1 })} aria-hidden="true" />
-            <span className="sr-only">
-              {refreshClickButtonId === 1 ? "Refreshing, please wait. " : "Press to refresh. "}
-            </span>{" "}
+            <i className={cx("zmdi zmdi-refresh", { "zmdi-hc-spin": refreshClickButtonId === 1 })} />{" "}
             <TimeAgo date={updatedAt} />
-          </PlainButton>
+          </a>
         )}
         <span className="visible-print">
-          <i className="zmdi zmdi-time-restore" aria-hidden="true" /> {formatDateTime(updatedAt)}
+          <i className="zmdi zmdi-time-restore" /> {formatDateTime(updatedAt)}
         </span>
         {isPublic && (
           <span className="small hidden-print">
-            <i className="zmdi zmdi-time-restore" aria-hidden="true" /> <TimeAgo date={updatedAt} />
+            <i className="zmdi zmdi-time-restore" /> <TimeAgo date={updatedAt} />
           </span>
         )}
       </span>
       <span>
         {!isPublic && (
-          <PlainButton
+          <a
             className="btn btn-sm btn-default hidden-print btn-transparent btn__refresh"
             onClick={() => refreshWidget(2)}>
-            <i className={cx("zmdi zmdi-refresh", { "zmdi-hc-spin": refreshClickButtonId === 2 })} aria-hidden="true" />
-            <span className="sr-only">
-              {refreshClickButtonId === 2 ? "Refreshing, please wait." : "Press to refresh."}
-            </span>
-          </PlainButton>
+            <i className={cx("zmdi zmdi-refresh", { "zmdi-hc-spin": refreshClickButtonId === 2 })} />
+          </a>
         )}
-        <PlainButton className="btn btn-sm btn-default hidden-print btn-transparent btn__refresh" onClick={onExpand}>
-          <i className="zmdi zmdi-fullscreen" aria-hidden="true" />
-        </PlainButton>
+        <a className="btn btn-sm btn-default hidden-print btn-transparent btn__refresh" onClick={onExpand}>
+          <i className="zmdi zmdi-fullscreen" />
+        </a>
       </span>
     </>
   ) : null;
@@ -216,7 +190,6 @@ class VisualizationWidget extends React.Component {
     isPublic: PropTypes.bool,
     isLoading: PropTypes.bool,
     canEdit: PropTypes.bool,
-    isEditing: PropTypes.bool,
     onLoad: PropTypes.func,
     onRefresh: PropTypes.func,
     onDelete: PropTypes.func,
@@ -228,7 +201,6 @@ class VisualizationWidget extends React.Component {
     isPublic: false,
     isLoading: false,
     canEdit: false,
-    isEditing: false,
     onLoad: () => {},
     onRefresh: () => {},
     onDelete: () => {},
@@ -302,14 +274,9 @@ class VisualizationWidget extends React.Component {
         );
       default:
         return (
-          <div
-            className="body-row-auto spinner-container"
-            role="status"
-            aria-live="polite"
-            aria-relevant="additions removals">
+          <div className="body-row-auto spinner-container">
             <div className="spinner">
-              <i className="zmdi zmdi-refresh zmdi-hc-spin zmdi-hc-5x" aria-hidden="true" />
-              <span className="sr-only">Loading...</span>
+              <i className="zmdi zmdi-refresh zmdi-hc-spin zmdi-hc-5x" />
             </div>
           </div>
         );
@@ -317,15 +284,10 @@ class VisualizationWidget extends React.Component {
   }
 
   render() {
-    const { widget, isLoading, isPublic, canEdit, isEditing, onRefresh } = this.props;
+    const { widget, isLoading, isPublic, canEdit, onRefresh } = this.props;
     const { localParameters } = this.state;
     const widgetQueryResult = widget.getQueryResult();
     const isRefreshing = isLoading && !!(widgetQueryResult && widgetQueryResult.getStatus());
-    const onParametersEdit = parameters => {
-      const paramOrder = map(parameters, "name");
-      widget.options.paramOrder = paramOrder;
-      widget.save("options", { paramOrder });
-    };
 
     return (
       <Widget
@@ -341,9 +303,7 @@ class VisualizationWidget extends React.Component {
             widget={widget}
             refreshStartedAt={isRefreshing ? widget.refreshStartedAt : null}
             parameters={localParameters}
-            isEditing={isEditing}
             onParametersUpdate={onRefresh}
-            onParametersEdit={onParametersEdit}
           />
         }
         footer={

client/app/components/dashboards/dashboard-widget/Widget.jsx

@@ -7,7 +7,6 @@ import Modal from "antd/lib/modal";
 import Menu from "antd/lib/menu";
 import recordEvent from "@/services/recordEvent";
 import { Moment } from "@/components/proptypes";
-import PlainButton from "@/components/PlainButton";
 
 import "./Widget.less";
 
@@ -23,9 +22,9 @@ function WidgetDropdownButton({ extraOptions, showDeleteOption, onDelete }) {
   return (
     <div className="widget-menu-regular">
       <Dropdown overlay={WidgetMenu} placement="bottomRight" trigger={["click"]}>
-        <PlainButton className="action p-l-15 p-r-15" data-test="WidgetDropdownButton" aria-label="More options">
-          <i className="zmdi zmdi-more-vert" aria-hidden="true" />
-        </PlainButton>
+        <a className="action p-l-15 p-r-15" data-test="WidgetDropdownButton">
+          <i className="zmdi zmdi-more-vert" />
+        </a>
       </Dropdown>
     </div>
   );
@@ -46,14 +45,9 @@ WidgetDropdownButton.defaultProps = {
 function WidgetDeleteButton({ onClick }) {
   return (
     <div className="widget-menu-remove">
-      <PlainButton
-        className="action"
-        title="Remove From Dashboard"
-        onClick={onClick}
-        data-test="WidgetDeleteButton"
-        aria-label="Close">
-        <i className="zmdi zmdi-close" aria-hidden="true" />
-      </PlainButton>
+      <a className="action" title="Remove From Dashboard" onClick={onClick} data-test="WidgetDeleteButton">
+        <i className="zmdi zmdi-close" />
+      </a>
     </div>
   );
 }

client/app/components/dashboards/dashboard-widget/Widget.less

@@ -1,4 +1,12 @@
-@import (reference, less) "~@/assets/less/inc/variables";
+@import "../../../assets/less/inc/variables";
+
+.tile .t-header .th-title a.query-link {
+  color: rgba(0, 0, 0, 0.5);
+}
+
+.th-title p.hidden-print {
+  margin-bottom: 0;
+}
 
 .widget-wrapper {
   .widget-actions {
@@ -14,19 +22,10 @@
       line-height: 100%;
       display: block;
       padding: 4px 10px 3px;
+    }
 
-      &:focus {
-        background-color: rgba(0, 0, 0, 0.1);
-      }
-
-      &:hover {
-        background-color: transparent;
-        color: @blue;
-      }
-
-      &:active {
-        filter: brightness(75%);
-      }
+    .action:hover {
+      background-color: rgba(0, 0, 0, 0.1);
     }
   }
 
@@ -84,7 +83,7 @@
     display: block;
   }
 
-  .query-link {
+  a.query-link {
     pointer-events: none;
     cursor: move;
   }
@@ -191,18 +190,10 @@
     .th-title {
       padding-right: 23px; // no overlap on RefreshIndicator
 
-      .hidden-print {
-        margin-bottom: 0;
-      }
-
-      .query-link {
+      a {
         color: fade(@redash-black, 80%);
         font-size: 15px;
         font-weight: 500;
-
-        &:not(.visualization-name) {
-          color: fade(@redash-black, 50%);
-        }
       }
     }
 
@@ -221,10 +212,7 @@
     padding: 15px;
   }
 
-  &:hover,
-  &:focus,
-  &:active,
-  &:focus-within {
+  &:hover {
     .widget-menu-regular,
     .btn__refresh {
       opacity: 1 !important;
@@ -252,12 +240,10 @@
       }
     }
 
-    a,
-    .plain-button {
+    a {
       color: fade(@redash-black, 65%);
 
-      &:hover,
-      &:focus {
+      &:hover {
         color: fade(@redash-black, 95%);
       }
     }

client/app/components/dynamic-form/DynamicForm.jsx

@@ -201,10 +201,7 @@ export default function DynamicForm({
             className="extra-options-button"
             onClick={() => setShowExtraFields(currentShowExtraFields => !currentShowExtraFields)}>
             Additional Settings
-            <i
-              className={cx("fa m-l-5", { "fa-caret-up": showExtraFields, "fa-caret-down": !showExtraFields })}
-              aria-hidden="true"
-            />
+            <i className={cx("fa m-l-5", { "fa-caret-up": showExtraFields, "fa-caret-down": !showExtraFields })} />
           </Button>
           <Collapse collapsed={!showExtraFields} className="extra-options-content">
             <DynamicFormFields fields={extraFields} feedbackIcons={feedbackIcons} form={form} />

client/app/components/dynamic-form/DynamicForm.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import "~@/assets/less/ant";
 
 @btn-extra-options-bg: fade(@redash-gray, 10%);
 @btn-extra-options-border: fade(@redash-gray, 15%);

client/app/components/dynamic-parameters/DateParameter.jsx

@@ -23,13 +23,7 @@ const DYNAMIC_DATE_OPTIONS = [
 ];
 
 function DateParameter(props) {
-  return (
-    <DynamicDatePicker
-      dynamicButtonOptions={{ options: DYNAMIC_DATE_OPTIONS }}
-      {...props}
-      dateOptions={{ "aria-label": "Parameter date value" }}
-    />
-  );
+  return <DynamicDatePicker dynamicButtonOptions={{ options: DYNAMIC_DATE_OPTIONS }} {...props} />;
 }
 
 DateParameter.propTypes = {

client/app/components/dynamic-parameters/DynamicButton.jsx

@@ -42,7 +42,7 @@ function DynamicButton({ options, selectedDynamicValue, onSelect, enabled, stati
 
   return (
     <div ref={containerRef}>
-      <div role="presentation" onClick={e => e.stopPropagation()}>
+      <a onClick={e => e.stopPropagation()}>
         <Dropdown.Button
           overlay={menu}
           className="dynamic-button"
@@ -58,7 +58,7 @@ function DynamicButton({ options, selectedDynamicValue, onSelect, enabled, stati
           getPopupContainer={() => containerRef.current}
           data-test="DynamicButton"
         />
-      </div>
+      </a>
     </div>
   );
 }

client/app/components/dynamic-parameters/DynamicParameters.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/inc/variables";
+@import "../../assets/less/inc/variables";
 
 .date-range-parameter,
 .date-parameter {

client/app/components/empty-state/EmptyState.jsx

@@ -4,24 +4,23 @@ import PropTypes from "prop-types";
 import classNames from "classnames";
 import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
 import Link from "@/components/Link";
-import PlainButton from "@/components/PlainButton";
 import CreateDashboardDialog from "@/components/dashboards/CreateDashboardDialog";
 import HelpTrigger from "@/components/HelpTrigger";
 import { currentUser } from "@/services/auth";
 import organizationStatus from "@/services/organizationStatus";
-
 import "./empty-state.less";
 
-export function Step({ show, completed, text, url, urlText, onClick }) {
+export function Step({ show, completed, text, url, urlTarget, urlText, onClick }) {
   if (!show) {
     return null;
   }
 
-  const commonProps = { children: urlText, onClick };
-
   return (
     <li className={classNames({ done: completed })}>
-      {url ? <Link href={url} {...commonProps} /> : <PlainButton type="link" {...commonProps} />} {text}
+      <Link href={url} onClick={onClick} target={urlTarget}>
+        {urlText}
+      </Link>{" "}
+      {text}
     </li>
   );
 }
@@ -189,7 +188,7 @@ function EmptyState({
         <div className="empty-state__summary">
           {header && <h4>{header}</h4>}
           <h2>
-            <i className={icon} aria-hidden="true" />
+            <i className={icon} />
           </h2>
           <p>{description}</p>
           <img src={imageSource} alt={illustration + " Illustration"} width="75%" />
@@ -201,9 +200,9 @@ function EmptyState({
         </div>
       </div>
       {closable && (
-        <PlainButton className="close-button" aria-label="Close" onClick={onClose}>
+        <a className="close-button" onClick={onClose}>
           <CloseOutlinedIcon />
-        </PlainButton>
+        </a>
       )}
     </div>
   );

client/app/components/empty-state/empty-state.less

@@ -3,7 +3,7 @@
 // Empty states
 .empty-state {
   width: 100%;
-  margin: 0 auto 10px;
+  margin: 0px auto 10px;
   display: flex;
   flex-direction: row;
   justify-content: space-between;
@@ -18,7 +18,7 @@
   }
 
   .empty-state__steps {
-    padding-left: 0;
+    padding-left: 0px;
   }
 
   .empty-state__summary {
@@ -86,13 +86,8 @@
     cursor: pointer;
     transition: color @animation-duration-slow;
 
-    &:hover,
-    &:focus {
+    &:hover {
       color: @text-color;
     }
-
-    &:active {
-      filter: contrast(200%);
-    }
   }
 }

client/app/components/groups/CreateGroupDialog.jsx

@@ -28,7 +28,6 @@ class CreateGroupDialog extends React.Component {
           onChange={event => this.setState({ name: event.target.value })}
           onPressEnter={() => this.save()}
           placeholder="Group Name"
-          aria-label="Group name"
           autoFocus
         />
       </Modal>

client/app/components/groups/DeleteGroupButton.jsx

@@ -3,7 +3,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import Button from "antd/lib/button";
 import Modal from "antd/lib/modal";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import notification from "@/services/notification";
 import Group from "@/services/group";
 

client/app/components/groups/DetailsPageSidebar.jsx

@@ -26,13 +26,13 @@ export default function DetailsPageSidebar({
       <Sidebar.Menu items={items} selected={controller.params.currentPage} />
       {canAddMembers && (
         <Button className="w-100 m-t-5" type="primary" onClick={onAddMembersClick}>
-          <i className="fa fa-plus m-r-5" aria-hidden="true" />
+          <i className="fa fa-plus m-r-5" />
           Add Members
         </Button>
       )}
       {canAddDataSources && (
         <Button className="w-100 m-t-5" type="primary" onClick={onAddDataSourcesClick}>
-          <i className="fa fa-plus m-r-5" aria-hidden="true" />
+          <i className="fa fa-plus m-r-5" />
           Add Data Sources
         </Button>
       )}

client/app/components/groups/ListItemAddon.jsx

@@ -1,38 +1,19 @@
 import React from "react";
 import PropTypes from "prop-types";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 
 export default function ListItemAddon({ isSelected, isStaged, alreadyInGroup, deselectedIcon }) {
   if (isStaged) {
-    return (
-      <>
-        <i className="fa fa-remove" aria-hidden="true" />
-        <span className="sr-only">Remove</span>
-      </>
-    );
+    return <i className="fa fa-remove" />;
   }
   if (alreadyInGroup) {
     return (
       <Tooltip title="Already selected">
-        {/* eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex */}
-        <span tabIndex={0}>
-          <i className="fa fa-check" aria-hidden="true" />
-          <span className="sr-only">Already selected</span>
-        </span>
+        <i className="fa fa-check" />
       </Tooltip>
     );
   }
-  return isSelected ? (
-    <>
-      <i className="fa fa-check" aria-hidden="true" />
-      <span className="sr-only">Selected</span>
-    </>
-  ) : (
-    <>
-      <i className={`fa ${deselectedIcon}`} aria-hidden="true" />
-      <span className="sr-only">Select</span>
-    </>
-  );
+  return isSelected ? <i className="fa fa-check" /> : <i className={`fa ${deselectedIcon}`} />;
 }
 
 ListItemAddon.propTypes = {

client/app/components/items-list/components/Sidebar.jsx

@@ -10,7 +10,7 @@ import TagsList from "@/components/TagsList";
     SearchInput
  */
 
-export function SearchInput({ placeholder, value, showIcon, onChange, label }) {
+export function SearchInput({ placeholder, value, showIcon, onChange }) {
   const [currentValue, setCurrentValue] = useState(value);
 
   useEffect(() => {
@@ -29,29 +29,21 @@ export function SearchInput({ placeholder, value, showIcon, onChange, label }) {
   const InputControl = showIcon ? Input.Search : Input;
   return (
     <div className="m-b-10">
-      <InputControl
-        className="form-control"
-        placeholder={placeholder}
-        value={currentValue}
-        aria-label={label}
-        onChange={onInputChange}
-      />
+      <InputControl className="form-control" placeholder={placeholder} value={currentValue} onChange={onInputChange} />
     </div>
   );
 }
 
 SearchInput.propTypes = {
-  value: PropTypes.string.isRequired,
   placeholder: PropTypes.string,
+  value: PropTypes.string.isRequired,
   showIcon: PropTypes.bool,
   onChange: PropTypes.func.isRequired,
-  label: PropTypes.string,
 };
 
 SearchInput.defaultProps = {
   placeholder: "Search...",
   showIcon: false,
-  label: "Search",
 };
 
 /*
@@ -70,7 +62,7 @@ export function Menu({ items, selected }) {
           <AntdMenu.Item key={item.key} className="m-0">
             <Link href={item.href}>
               {isString(item.icon) && item.icon !== "" && (
-                <span className="btn-favorite m-r-5">
+                <span className="btn-favourite m-r-5">
                   <i className={item.icon} aria-hidden="true" />
                 </span>
               )}
@@ -108,7 +100,7 @@ Menu.defaultProps = {
 
 export function MenuIcon({ icon }) {
   return (
-    <span className="btn-favorite m-r-5">
+    <span className="btn-favourite m-r-5">
       <i className={icon} aria-hidden="true" />
     </span>
   );

client/app/components/queries/AddToDashboardDialog.jsx

@@ -5,7 +5,6 @@ import Modal from "antd/lib/modal";
 import Input from "antd/lib/input";
 import List from "antd/lib/list";
 import Link from "@/components/Link";
-import PlainButton from "@/components/PlainButton";
 import CloseOutlinedIcon from "@ant-design/icons/CloseOutlined";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import { QueryTagsControl } from "@/components/tags-control/TagsControl";
@@ -90,9 +89,7 @@ function AddToDashboardDialog({ dialog, visualization }) {
           value={searchTerm}
           onChange={event => setSearchTerm(event.target.value)}
           suffix={
-            <PlainButton className={searchTerm === "" ? "hidden" : null} onClick={() => setSearchTerm("")}>
-              <CloseOutlinedIcon />
-            </PlainButton>
+            <CloseOutlinedIcon className={searchTerm === "" ? "hidden" : null} onClick={() => setSearchTerm("")} />
           }
         />
       )}
@@ -107,15 +104,7 @@ function AddToDashboardDialog({ dialog, visualization }) {
           renderItem={d => (
             <List.Item
               key={`dashboard-${d.id}`}
-              actions={
-                selectedDashboard
-                  ? [
-                      <PlainButton onClick={() => setSelectedDashboard(null)}>
-                        <CloseOutlinedIcon />
-                      </PlainButton>,
-                    ]
-                  : []
-              }
+              actions={selectedDashboard ? [<CloseOutlinedIcon onClick={() => setSelectedDashboard(null)} />] : []}
               onClick={selectedDashboard ? null : () => setSelectedDashboard(d)}>
               <div className="add-to-dashboard-dialog-item-content">
                 {d.name}

client/app/components/queries/ApiKeyDialog/index.jsx

@@ -9,7 +9,6 @@ import CodeBlock from "@/components/CodeBlock";
 import { axios } from "@/services/axios";
 import { clientConfig } from "@/services/auth";
 import notification from "@/services/notification";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
 
 import "./index.less";
 import { policy } from "@/services/policy";
@@ -40,16 +39,13 @@ function ApiKeyDialog({ dialog, ...props }) {
     [query.id, query.api_key]
   );
 
-  const csvResultsLabelId = useUniqueId("csv-results-label");
-  const jsonResultsLabelId = useUniqueId("json-results-label");
-
   return (
     <Modal {...dialog.props} width={600} footer={<Button onClick={() => dialog.close(query)}>Close</Button>}>
       <div className="query-api-key-dialog-wrapper">
         <h5>API Key</h5>
         <div className="m-b-20">
           <Input.Group compact>
-            <Input readOnly value={query.api_key} aria-label="Query API Key" />
+            <Input readOnly value={query.api_key} />
             {policy.canEdit(query) && (
               <Button disabled={updatingApiKey} loading={updatingApiKey} onClick={regenerateQueryApiKey}>
                 Regenerate
@@ -60,16 +56,12 @@ function ApiKeyDialog({ dialog, ...props }) {
 
         <h5>Example API Calls:</h5>
         <div className="m-b-10">
-          <span id={csvResultsLabelId}>Results in CSV format:</span>
-          <CodeBlock aria-labelledby={csvResultsLabelId} copyable>
-            {csvUrl}
-          </CodeBlock>
+          <label>Results in CSV format:</label>
+          <CodeBlock copyable>{csvUrl}</CodeBlock>
         </div>
         <div>
-          <span id={jsonResultsLabelId}>Results in JSON format:</span>
-          <CodeBlock aria-labelledby={jsonResultsLabelId} copyable>
-            {jsonUrl}
-          </CodeBlock>
+          <label>Results in JSON format:</label>
+          <CodeBlock copyable>{jsonUrl}</CodeBlock>
         </div>
       </div>
     </Modal>

client/app/components/queries/EmbedQueryDialog.jsx

@@ -1,4 +1,3 @@
-import { uniqueId } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
 import Alert from "antd/lib/alert";
@@ -10,7 +9,6 @@ import Modal from "antd/lib/modal";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import { clientConfig } from "@/services/auth";
 import CodeBlock from "@/components/CodeBlock";
-
 import "./EmbedQueryDialog.less";
 
 class EmbedQueryDialog extends React.Component {
@@ -38,9 +36,6 @@ class EmbedQueryDialog extends React.Component {
     }
   }
 
-  urlEmbedLabelId = uniqueId("url-embed-label");
-  iframeEmbedLabelId = uniqueId("iframe-embed-label");
-
   render() {
     const { query, dialog } = this.props;
     const { enableChangeIframeSize, iframeWidth, iframeHeight } = this.state;
@@ -53,19 +48,15 @@ class EmbedQueryDialog extends React.Component {
         footer={<Button onClick={dialog.dismiss}>Close</Button>}>
         {query.is_safe ? (
           <React.Fragment>
-            <h5 id={this.urlEmbedLabelId} className="m-t-0">
-              Public URL
-            </h5>
+            <h5 className="m-t-0">Public URL</h5>
             <div className="m-b-30">
-              <CodeBlock aria-labelledby={this.urlEmbedLabelId} data-test="EmbedIframe" copyable>
+              <CodeBlock data-test="EmbedIframe" copyable>
                 {this.embedUrl}
               </CodeBlock>
             </div>
-            <h5 id={this.iframeEmbedLabelId} className="m-t-0">
-              IFrame Embed
-            </h5>
+            <h5 className="m-t-0">IFrame Embed</h5>
             <div>
-              <CodeBlock aria-labelledby={this.iframeEmbedLabelId} copyable>
+              <CodeBlock copyable>
                 {`<iframe src="${this.embedUrl}" width="${iframeWidth}" height="${iframeHeight}"></iframe>`}
               </CodeBlock>
               <Form className="m-t-10" layout="inline">

client/app/components/queries/EmbedQueryDialog.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import '~antd/lib/button/style/index';
 
 .embed-query-dialog {
   label {

client/app/components/queries/QueryEditor/AutoLimitCheckbox.jsx

@@ -2,7 +2,7 @@ import React, { useCallback } from "react";
 import PropTypes from "prop-types";
 import recordEvent from "@/services/recordEvent";
 import Checkbox from "antd/lib/checkbox";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 
 export default function AutoLimitCheckbox({ available, checked, onChange }) {
   const handleClick = useCallback(() => {

client/app/components/queries/QueryEditor/AutocompleteToggle.jsx

@@ -1,5 +1,5 @@
 import React, { useCallback } from "react";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import Button from "antd/lib/button";
 import PropTypes from "prop-types";
 import "@/redash-font/style.less";
@@ -25,12 +25,8 @@ export default function AutocompleteToggle({ available, enabled, onToggle }) {
 
   return (
     <Tooltip placement="top" title={tooltipMessage}>
-      <Button
-        className="query-editor-controls-button m-r-5"
-        disabled={!available}
-        onClick={handleClick}
-        aria-label={enabled ? "Disable live autocomplete" : "Enable live autocomplete"}>
-        <i className={"icon " + icon} aria-hidden="true" />
+      <Button className="query-editor-controls-button m-r-5" disabled={!available} onClick={handleClick}>
+        <i className={"icon " + icon} />
       </Button>
     </Tooltip>
   );

client/app/components/queries/QueryEditor/QueryEditorControls.jsx

@@ -1,7 +1,7 @@
 import { isFunction, map, filter, fromPairs, noop } from "lodash";
 import React, { useEffect } from "react";
 import PropTypes from "prop-types";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import Button from "antd/lib/button";
 import Select from "antd/lib/select";
 import KeyboardShortcuts, { humanReadableShortcut } from "@/services/KeyboardShortcuts";

client/app/components/queries/QueryEditor/index.jsx

@@ -2,7 +2,6 @@ import React, { useEffect, useMemo, useState, useCallback, useImperativeHandle }
 import PropTypes from "prop-types";
 import cx from "classnames";
 import { AceEditor, snippetsModule, updateSchemaCompleter } from "./ace";
-import { srNotify } from "@/lib/accessibility";
 import { SchemaItemType } from "@/components/queries/SchemaBrowser";
 import resizeObserver from "@/services/resizeObserver";
 import QuerySnippet from "@/services/query-snippet";
@@ -90,25 +89,6 @@ const QueryEditor = React.forwardRef(function(
     // Lineup only mac
     editor.commands.bindKey({ win: null, mac: "Ctrl+P" }, "golineup");
 
-    // Esc for exiting
-    editor.commands.bindKey({ win: "Esc", mac: "Esc" }, () => {
-      editor.blur();
-    });
-
-    let notificationCleanup = null;
-    editor.on("focus", () => {
-      notificationCleanup = srNotify({
-        text: "You've entered the SQL editor. To exit press the ESC key.",
-        politeness: "assertive",
-      });
-    });
-
-    editor.on("blur", () => {
-      if (notificationCleanup) {
-        notificationCleanup();
-      }
-    });
-
     // Reset Completer in case dot is pressed
     editor.commands.on("afterExec", e => {
       if (e.command.name === "insertstring" && e.args === "." && editor.completer) {

client/app/components/queries/SchedulePhrase.jsx

@@ -1,7 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import Tooltip from "@/components/Tooltip";
-import PlainButton from "@/components/PlainButton";
+import Tooltip from "antd/lib/tooltip";
 import { localizeTime, durationHumanize } from "@/lib/utils";
 import { RefreshScheduleType, RefreshScheduleDefault } from "../proptypes";
 
@@ -52,9 +51,9 @@ export default class SchedulePhrase extends React.Component {
     const content = full ? <Tooltip title={full}>{short}</Tooltip> : short;
 
     return this.props.isLink ? (
-      <PlainButton type="link" className="schedule-phrase" onClick={this.props.onClick} data-test="EditSchedule">
+      <a className="schedule-phrase" onClick={this.props.onClick} data-test="EditSchedule">
         {content}
-      </PlainButton>
+      </a>
     ) : (
       content
     );

client/app/components/queries/SchemaBrowser.jsx

@@ -5,10 +5,9 @@ import PropTypes from "prop-types";
 import { useDebouncedCallback } from "use-debounce";
 import Input from "antd/lib/input";
 import Button from "antd/lib/button";
+import Tooltip from "antd/lib/tooltip";
 import AutoSizer from "react-virtualized/dist/commonjs/AutoSizer";
 import List from "react-virtualized/dist/commonjs/List";
-import PlainButton from "@/components/PlainButton";
-import Tooltip from "@/components/Tooltip";
 import useDataSourceSchema from "@/pages/queries/hooks/useDataSourceSchema";
 import useImmutableCallback from "@/lib/hooks/useImmutableCallback";
 import LoadingState from "../items-list/components/LoadingState";
@@ -46,27 +45,23 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
 
   return (
     <div {...props}>
-      <div className="schema-list-item">
-        <PlainButton className="table-name" onClick={onToggle}>
-          <i className="fa fa-table m-r-5" aria-hidden="true" />
-          <strong>
-            <span title={item.name}>{tableDisplayName}</span>
-            {!isNil(item.size) && <span> ({item.size})</span>}
-          </strong>
-        </PlainButton>
-        <Tooltip
-          title="Insert table name into query text"
-          mouseEnterDelay={0}
-          mouseLeaveDelay={0}
-          placement="topRight"
-          arrowPointAtCenter>
-          <PlainButton className="copy-to-editor" onClick={e => handleSelect(e, item.name)}>
-            <i className="fa fa-angle-double-right" aria-hidden="true" />
-          </PlainButton>
+      <div className="table-name" onClick={onToggle}>
+        <i className="fa fa-table m-r-5" />
+        <strong>
+          <span title={item.name}>{tableDisplayName}</span>
+          {!isNil(item.size) && <span> ({item.size})</span>}
+        </strong>
+
+        <Tooltip title="Insert table name into query text" mouseEnterDelay={0} mouseLeaveDelay={0}>
+          <i
+            className="fa fa-angle-double-right copy-to-editor"
+            aria-hidden="true"
+            onClick={e => handleSelect(e, item.name)}
+          />
         </Tooltip>
       </div>
       {expanded && (
-        <div className="table-open">
+        <div>
           {item.loading ? (
             <div className="table-open">Loading...</div>
           ) : (
@@ -74,21 +69,16 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
               const columnName = get(column, "name");
               const columnType = get(column, "type");
               return (
-                <Tooltip
-                  title="Insert column name into query text"
-                  mouseEnterDelay={0}
-                  mouseLeaveDelay={0}
-                  placement="rightTop">
-                  <PlainButton key={columnName} className="table-open-item" onClick={e => handleSelect(e, columnName)}>
-                    <div>
-                      {columnName} {columnType && <span className="column-type">{columnType}</span>}
-                    </div>
-
-                    <div className="copy-to-editor">
-                      <i className="fa fa-angle-double-right" aria-hidden="true" />
-                    </div>
-                  </PlainButton>
-                </Tooltip>
+                <div key={columnName} className="table-open">
+                  {columnName} {columnType && <span className="column-type">{columnType}</span>}
+                  <Tooltip title="Insert column name into query text" mouseEnterDelay={0} mouseLeaveDelay={0}>
+                    <i
+                      className="fa fa-angle-double-right copy-to-editor"
+                      aria-hidden="true"
+                      onClick={e => handleSelect(e, columnName)}
+                    />
+                  </Tooltip>
+                </div>
               );
             })
           )}
@@ -241,15 +231,13 @@ export default function SchemaBrowser({
         <Input
           className="m-r-5"
           placeholder="Search schema..."
-          aria-label="Search schema"
           disabled={schema.length === 0}
           onChange={event => handleFilterChange(event.target.value)}
         />
 
         <Tooltip title="Refresh Schema">
           <Button onClick={() => refreshSchema(true)}>
-            <i className={cx("zmdi zmdi-refresh", { "zmdi-hc-spin": isLoading })} aria-hidden="true" />
-            <span className="sr-only">{isLoading ? "Loading, please wait." : "Press to refresh."}</span>
+            <i className={cx("zmdi zmdi-refresh", { "zmdi-hc-spin": isLoading })} />
           </Button>
         </Tooltip>
       </div>

client/app/components/queries/add-to-dashboard-dialog.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/main.less";
+@import (reference, less) '~@/assets/less/main.less';
 
 .ant-list {
   &.add-to-dashboard-dialog-search-results {
@@ -13,8 +13,7 @@
       padding: 12px;
       cursor: pointer;
 
-      &:hover,
-      &:active {
+      &:hover, &:active {
         @table-row-hover-bg: fade(@redash-gray, 5%);
         background-color: @table-row-hover-bg;
       }

client/app/components/queries/editor-components/databricks/DatabricksSchemaBrowser.jsx

@@ -6,7 +6,7 @@ import Button from "antd/lib/button";
 import SyncOutlinedIcon from "@ant-design/icons/SyncOutlined";
 import Input from "antd/lib/input";
 import Select from "antd/lib/select";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import { SchemaList, applyFilterOnSchema } from "@/components/queries/SchemaBrowser";
 import useImmutableCallback from "@/lib/hooks/useImmutableCallback";
 import useDatabricksSchema from "./useDatabricksSchema";
@@ -84,7 +84,6 @@ export default function DatabricksSchemaBrowser({
         <Input
           className={isDatabaseSelectOpen ? "database-select-open" : ""}
           placeholder="Filter tables & columns..."
-          aria-label="Search schema"
           disabled={loadingDatabases || loadingSchema}
           onChange={event => handleFilterChange(event.target.value)}
           addonBefore={
@@ -99,12 +98,12 @@ export default function DatabricksSchemaBrowser({
               onDropdownVisibleChange={setIsDatabaseSelectOpen}
               placeholder={
                 <>
-                  <i className="fa fa-database m-r-5" aria-hidden="true" /> Database
+                  <i className="fa fa-database m-r-5" /> Database
                 </>
               }>
               {filteredDatabases.map(database => (
                 <Select.Option key={database}>
-                  <i className="fa fa-database m-r-5" aria-hidden="true" />
+                  <i className="fa fa-database m-r-5" />
                   {database}
                 </Select.Option>
               ))}

client/app/components/queries/editor-components/databricks/DatabricksSchemaBrowser.less

@@ -1,4 +1,4 @@
-@import (reference, less) "~@/assets/less/ant";
+@import "~@/assets/less/ant";
 
 .databricks-schema-browser {
   .schema-control {

client/app/components/query-snippets/QuerySnippetDialog.jsx

@@ -5,7 +5,6 @@ import Button from "antd/lib/button";
 import Modal from "antd/lib/modal";
 import DynamicForm from "@/components/dynamic-form/DynamicForm";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
 
 function QuerySnippetDialog({ querySnippet, dialog, readOnly }) {
   const handleSubmit = useCallback(
@@ -32,8 +31,6 @@ function QuerySnippetDialog({ querySnippet, dialog, readOnly }) {
     { name: "snippet", title: "Snippet", type: "ace", required: true },
   ].map(field => ({ ...field, readOnly, initialValue: get(querySnippet, field.name, "") }));
 
-  const querySnippetsFormId = useUniqueId("querySnippetForm");
-
   return (
     <Modal
       {...dialog.props}
@@ -49,7 +46,7 @@ function QuerySnippetDialog({ querySnippet, dialog, readOnly }) {
             disabled={readOnly || dialog.props.okButtonProps.disabled}
             htmlType="submit"
             type="primary"
-            form={querySnippetsFormId}
+            form="querySnippetForm"
             data-test="SaveQuerySnippetButton">
             {isEditing ? "Save" : "Create"}
           </Button>
@@ -58,13 +55,7 @@ function QuerySnippetDialog({ querySnippet, dialog, readOnly }) {
       wrapProps={{
         "data-test": "QuerySnippetDialog",
       }}>
-      <DynamicForm
-        id={querySnippetsFormId}
-        fields={formFields}
-        onSubmit={handleSubmit}
-        hideSubmitButton
-        feedbackIcons
-      />
+      <DynamicForm id="querySnippetForm" fields={formFields} onSubmit={handleSubmit} hideSubmitButton feedbackIcons />
     </Modal>
   );
 }

client/app/components/tags-control/TagsControl.jsx

@@ -1,9 +1,8 @@
 import { map, trim } from "lodash";
 import React from "react";
 import PropTypes from "prop-types";
-import Tooltip from "@/components/Tooltip";
+import Tooltip from "antd/lib/tooltip";
 import EditTagsDialog from "./EditTagsDialog";
-import PlainButton from "@/components/PlainButton";
 
 export class TagsControl extends React.Component {
   static propTypes = {
@@ -35,23 +34,19 @@ export class TagsControl extends React.Component {
   renderEditButton() {
     const tags = map(this.props.tags, trim);
     return (
-      <PlainButton
+      <a
         className="label label-tag hidden-xs"
+        role="none"
         onClick={() => this.editTags(tags, this.props.getAvailableTags)}
         data-test="EditTagsButton">
         {tags.length === 0 && (
           <React.Fragment>
-            <i className="zmdi zmdi-plus m-r-5" aria-hidden="true" />
+            <i className="zmdi zmdi-plus m-r-5" />
             Add tag
           </React.Fragment>
         )}
-        {tags.length > 0 && (
-          <>
-            <i className="zmdi zmdi-edit" aria-hidden="true" />
-            <span className="sr-only">Edit</span>
-          </>
-        )}
-      </PlainButton>
+        {tags.length > 0 && <i className="zmdi zmdi-edit" />}
+      </a>
     );
   }
 

client/app/components/visualizations/EditVisualizationDialog.jsx

@@ -10,7 +10,6 @@ import notification from "@/services/notification";
 import Visualization from "@/services/visualization";
 import recordEvent from "@/services/recordEvent";
 import useQueryResultData from "@/lib/useQueryResultData";
-import { useUniqueId } from "@/lib/hooks/useUniqueId";
 import {
   registeredVisualizations,
   getDefaultVisualization,
@@ -157,9 +156,6 @@ function EditVisualizationDialog({ dialog, visualization, query, queryResult })
     ? filter(sortBy(registeredVisualizations, ["name"]), vis => !vis.isDeprecated)
     : pick(registeredVisualizations, [type]);
 
-  const vizTypeId = useUniqueId("visualization-type");
-  const vizNameId = useUniqueId("visualization-name");
-
   return (
     <Modal
       {...dialog.props}
@@ -176,10 +172,10 @@ function EditVisualizationDialog({ dialog, visualization, query, queryResult })
       <div className="edit-visualization-dialog">
         <div className="visualization-settings">
           <div className="m-b-15">
-            <label htmlFor={vizTypeId}>Visualization Type</label>
+            <label htmlFor="visualization-type">Visualization Type</label>
             <Select
               data-test="VisualizationType"
-              id={vizTypeId}
+              id="visualization-type"
               className="w-100"
               disabled={!isNew}
               value={type}
@@ -192,10 +188,10 @@ function EditVisualizationDialog({ dialog, visualization, query, queryResult })
             </Select>
           </div>
           <div className="m-b-15">
-            <label htmlFor={vizNameId}>Visualization Name</label>
+            <label htmlFor="visualization-name">Visualization Name</label>
             <Input
               data-test="VisualizationName"
-              id={vizNameId}
+              id="visualization-name"
               className="w-100"
               value={name}
               onChange={event => onNameChanged(event.target.value)}

client/app/config/antd-spinner.jsx

@@ -1,9 +1,4 @@
 import React from "react";
 import Spin from "antd/lib/spin";
 
-Spin.setDefaultIndicator(
-  <span role="status" aria-live="polite" aria-relevant="additions removals">
-    <i className="fa fa-spinner fa-pulse" aria-hidden="true" />
-    <span className="sr-only">Loading...</span>
-  </span>
-);
+Spin.setDefaultIndicator(<i className="fa fa-spinner fa-pulse" />);

client/app/lib/accessibility.ts

@@ -1,45 +0,0 @@
-import { HTMLAttributes } from "react";
-
-interface SrNotifyProps {
-  text: string;
-  expiry: number;
-  container: HTMLElement;
-  politeness: HTMLAttributes<HTMLDivElement>["aria-live"];
-}
-
-export function srNotify({ text, expiry = 1000, container = document.body, politeness = "polite" }: SrNotifyProps) {
-  const element = document.createElement("div");
-  const id = `speak-${Date.now()}`;
-
-  element.id = id;
-  element.className = "sr-only";
-  element.textContent = text;
-
-  element.setAttribute("role", "alert");
-  element.setAttribute("aria-live", politeness);
-
-  container.appendChild(element);
-
-  let timer: null | number = null;
-  let isDone = false;
-  const cleanupFn = () => {
-    if (isDone) {
-      return;
-    }
-    isDone = true;
-
-    try {
-      container.removeChild(element);
-    } catch (e) {
-      console.error(e);
-    }
-
-    if (timer) {
-      window.clearTimeout(timer);
-    }
-  };
-
-  timer = window.setTimeout(cleanupFn, expiry);
-
-  return cleanupFn;
-}

client/app/lib/hooks/useLazyRef.ts

@@ -1,11 +0,0 @@
-import { useRef } from "react";
-
-export function useLazyRef<T>(getInitialValue: () => T) {
-  const lazyRef = useRef<T>(null) as React.MutableRefObject<T>;
-
-  if (lazyRef.current === null) {
-    lazyRef.current = getInitialValue();
-  }
-
-  return lazyRef;
-}