Update ci.yml to match latest master

.github/workflows/periodic-snapshot.yml

@@ -2,7 +2,7 @@ name: Periodic Snapshot
 
 on:
   schedule:
-    - cron: '10 0 1 * *'  # 10 minutes after midnight on the first day of every month
+    - cron: '10 0 1 * *'  # 10 minutes after midnight on the first of every month
   workflow_dispatch:
     inputs:
       bump:
@@ -24,7 +24,6 @@ permissions:
 jobs:
   bump-version-and-tag:
     runs-on: ubuntu-latest
-    if: github.ref_name == github.event.repository.default_branch
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/preview-image.yml

@@ -32,9 +32,6 @@ jobs:
           elif [[ "${{ secrets.DOCKER_PASS }}" == '' ]]; then
             echo 'Docker password is empty. Skipping build+push'
             echo skip=true >> "$GITHUB_OUTPUT"
-          elif [[ "${{ vars.DOCKER_REPOSITORY }}" == '' ]]; then
-            echo 'Docker repository is empty. Skipping build+push'
-            echo skip=true >> "$GITHUB_OUTPUT"
           else
             echo 'Docker user and password are set and branch is `master`.'
             echo 'Building + pushing `preview` image.'
@@ -42,20 +39,7 @@ jobs:
           fi
 
   build-docker-image:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        arch:
-          - amd64
-          - arm64
-        include:
-          - arch: amd64
-            os: ubuntu-22.04
-          - arch: arm64
-            os: ubuntu-22.04-arm
-    outputs:
-      VERSION_TAG: ${{ steps.version.outputs.VERSION_TAG }}
+    runs-on: ubuntu-22.04
     needs:
       - build-skip-check
     if: needs.build-skip-check.outputs.skip == 'false'
@@ -70,6 +54,11 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'yarn'
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -80,8 +69,6 @@ jobs:
           password: ${{ secrets.DOCKER_PASS }}
 
       - name: Install Dependencies
-        env:
-          PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
         run: |
           npm install --global --force yarn@1.22.22
           yarn cache clean && yarn --frozen-lockfile --network-concurrency 1
@@ -94,92 +81,40 @@ jobs:
           VERSION_TAG=$(jq -r .version package.json)
           echo "VERSION_TAG=$VERSION_TAG" >> "$GITHUB_OUTPUT"
 
+      # TODO: We can use GitHub Actions's matrix option to reduce the build time.
       - name: Build and push preview image to Docker Hub
-        id: build-preview
         uses: docker/build-push-action@v4
         if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
         with:
+          push: true
           tags: |
-            ${{ vars.DOCKER_REPOSITORY }}/redash
-            ${{ vars.DOCKER_REPOSITORY }}/preview
+            redash/redash:preview
+            redash/preview:${{ steps.version.outputs.VERSION_TAG }}
           context: .
           build-args: |
             test_all_deps=true
-          outputs: type=image,push-by-digest=true,push=true
-          cache-from: type=gha,scope=${{ matrix.arch }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.arch }}
+          cache-from: type=gha,scope=multi-platform
+          cache-to: type=gha,mode=max,scope=multi-platform
+          platforms: linux/amd64,linux/arm64
         env:
           DOCKER_CONTENT_TRUST: true
 
       - name: Build and push release image to Docker Hub
-        id: build-release
         uses: docker/build-push-action@v4
         if: ${{ github.event.inputs.dockerRepository == 'redash' }}
         with:
+          push: true
           tags: |
-            ${{ vars.DOCKER_REPOSITORY }}/redash:${{ steps.version.outputs.VERSION_TAG }}
+            redash/redash:${{ steps.version.outputs.VERSION_TAG }}
           context: .
           build-args: |
             test_all_deps=true
-          outputs: type=image,push-by-digest=true,push=true
-          cache-from: type=gha,scope=${{ matrix.arch }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.arch }}
+          cache-from: type=gha,scope=multi-platform
+          cache-to: type=gha,mode=max,scope=multi-platform
+          platforms: linux/amd64,linux/arm64
         env:
           DOCKER_CONTENT_TRUST: true
 
       - name: "Failure: output container logs to console"
         if: failure()
         run: docker compose logs
-
-      - name: Export digest
-        run: |
-          mkdir -p ${{ runner.temp }}/digests
-          if [[ "${{ github.event.inputs.dockerRepository }}" == 'preview' || !github.event.workflow_run ]]; then
-            digest="${{ steps.build-preview.outputs.digest}}"
-          else
-            digest="${{ steps.build-release.outputs.digest}}"
-          fi
-          touch "${{ runner.temp }}/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-${{ matrix.arch }}
-          path: ${{ runner.temp }}/digests/*
-          if-no-files-found: error
-
-  merge-docker-image:
-    runs-on: ubuntu-22.04
-    needs: build-docker-image
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: ${{ runner.temp }}/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Create and push manifest for the preview image
-        if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/redash:preview \
-            $(printf '${{ vars.DOCKER_REPOSITORY }}/redash:preview@sha256:%s ' *)
-          docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
-            $(printf '${{ vars.DOCKER_REPOSITORY }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
-
-      - name: Create and push manifest for the release image
-        if: ${{ github.event.inputs.dockerRepository == 'redash' }}
-        working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
-            $(printf '${{ vars.DOCKER_REPOSITORY }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)

Makefile

@@ -34,7 +34,7 @@ clean:
 
 clean-all: clean
 	docker image rm --force \
-		redash/redash:latest redis:7-alpine maildev/maildev:latest \
+		redash/redash:10.1.0.b50633 redis:7-alpine maildev/maildev:latest \
 		pgautoupgrade/pgautoupgrade:15-alpine3.8 pgautoupgrade/pgautoupgrade:latest
 
 down:

client/app/components/PreviewCard.jsx

@@ -69,7 +69,7 @@ UserPreviewCard.defaultProps = {
 // DataSourcePreviewCard
 
 export function DataSourcePreviewCard({ dataSource, withLink, children, ...props }) {
-  const imageUrl = `/static/images/db-logos/${dataSource.type}.png`;
+  const imageUrl = `static/images/db-logos/${dataSource.type}.png`;
   const title = withLink ? <Link href={"data_sources/" + dataSource.id}>{dataSource.name}</Link> : dataSource.name;
   return (
     <PreviewCard {...props} imageUrl={imageUrl} title={title}>

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

@@ -96,7 +96,7 @@ function EmptyState({
   }, []);
 
   // Show if `onboardingMode=false` or any requested step not completed
-  const shouldShow = !onboardingMode || some(keys(isAvailable), (step) => isAvailable[step] && !isCompleted[step]);
+  const shouldShow = !onboardingMode || some(keys(isAvailable), step => isAvailable[step] && !isCompleted[step]);
 
   if (!shouldShow) {
     return null;
@@ -181,7 +181,7 @@ function EmptyState({
   ];
 
   const stepsItems = getStepsItems ? getStepsItems(defaultStepsItems) : defaultStepsItems;
-  const imageSource = illustrationPath ? illustrationPath : "/static/images/illustrations/" + illustration + ".svg";
+  const imageSource = illustrationPath ? illustrationPath : "static/images/illustrations/" + illustration + ".svg";
 
   return (
     <div className="empty-state-wrapper">
@@ -196,7 +196,7 @@ function EmptyState({
         </div>
         <div className="empty-state__steps">
           <h4>Let&apos;s get started</h4>
-          <ol>{stepsItems.map((item) => item.node)}</ol>
+          <ol>{stepsItems.map(item => item.node)}</ol>
           {helpMessage}
         </div>
       </div>

client/app/components/items-list/ItemsList.tsx

@@ -28,7 +28,6 @@ export interface Controller<I, P = any> {
   orderByField?: string;
   orderByReverse: boolean;
   toggleSorting: (orderByField: string) => void;
-  setSorting: (orderByField: string, orderByReverse: boolean) => void;
 
   // pagination
   page: number;
@@ -140,11 +139,10 @@ export function wrap<I, P = any>(
         this.props.onError!(error);
 
       const initialState = this.getState({ ...itemsSource.getState(), isLoaded: false });
-      const { updatePagination, toggleSorting, setSorting, updateSearch, updateSelectedTags, update, handleError } = itemsSource;
+      const { updatePagination, toggleSorting, updateSearch, updateSelectedTags, update, handleError } = itemsSource;
       this.state = {
         ...initialState,
         toggleSorting, // eslint-disable-line react/no-unused-state
-        setSorting, // eslint-disable-line react/no-unused-state
         updateSearch: debounce(updateSearch, 200), // eslint-disable-line react/no-unused-state
         updateSelectedTags, // eslint-disable-line react/no-unused-state
         updatePagination, // eslint-disable-line react/no-unused-state

client/app/components/items-list/classes/ItemsSource.js

@@ -39,12 +39,14 @@ export class ItemsSource {
     const customParams = {};
     const context = {
       ...this.getCallbackContext(),
-      setCustomParams: (params) => {
+      setCustomParams: params => {
         extend(customParams, params);
       },
     };
     return this._beforeUpdate().then(() => {
-      const fetchToken = Math.random().toString(36).substr(2);
+      const fetchToken = Math.random()
+        .toString(36)
+        .substr(2);
       this._currentFetchToken = fetchToken;
       return this._fetcher
         .fetch(changes, state, context)
@@ -57,7 +59,7 @@ export class ItemsSource {
             return this._afterUpdate();
           }
         })
-        .catch((error) => this.handleError(error));
+        .catch(error => this.handleError(error));
     });
   }
 
@@ -122,20 +124,13 @@ export class ItemsSource {
     });
   };
 
-  toggleSorting = (orderByField) => {
+  toggleSorting = orderByField => {
     this._sorter.toggleField(orderByField);
     this._savedOrderByField = this._sorter.field;
     this._changed({ sorting: true });
   };
 
-  setSorting = (orderByField, orderByReverse) => {
-    this._sorter.setField(orderByField);
-    this._sorter.setReverse(orderByReverse);
-    this._savedOrderByField = this._sorter.field;
-    this._changed({ sorting: true });
-  };
-
-  updateSearch = (searchTerm) => {
+  updateSearch = searchTerm => {
     // here we update state directly, but later `fetchData` will update it properly
     this._searchTerm = searchTerm;
     // in search mode ignore the ordering and use the ranking order
@@ -150,7 +145,7 @@ export class ItemsSource {
     this._changed({ search: true, pagination: { page: true } });
   };
 
-  updateSelectedTags = (selectedTags) => {
+  updateSelectedTags = selectedTags => {
     this._selectedTags = selectedTags;
     this._paginator.setPage(1);
     this._changed({ tags: true, pagination: { page: true } });
@@ -158,7 +153,7 @@ export class ItemsSource {
 
   update = () => this._changed();
 
-  handleError = (error) => {
+  handleError = error => {
     if (isFunction(this.onError)) {
       this.onError(error);
     }
@@ -177,7 +172,7 @@ export class ResourceItemsSource extends ItemsSource {
       processResults: (results, context) => {
         let processItem = getItemProcessor(context);
         processItem = isFunction(processItem) ? processItem : identity;
-        return map(results, (item) => processItem(item, context));
+        return map(results, item => processItem(item, context));
       },
     });
   }

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

@@ -44,7 +44,7 @@ export const Columns = {
   date(overrides) {
     return extend(
       {
-        render: (text) => formatDate(text),
+        render: text => formatDate(text),
       },
       overrides
     );
@@ -52,7 +52,7 @@ export const Columns = {
   dateTime(overrides) {
     return extend(
       {
-        render: (text) => formatDateTime(text),
+        render: text => formatDateTime(text),
       },
       overrides
     );
@@ -62,7 +62,7 @@ export const Columns = {
       {
         width: "1%",
         className: "text-nowrap",
-        render: (text) => durationHumanize(text),
+        render: text => durationHumanize(text),
       },
       overrides
     );
@@ -70,7 +70,7 @@ export const Columns = {
   timeAgo(overrides, timeAgoCustomProps = undefined) {
     return extend(
       {
-        render: (value) => <TimeAgo date={value} {...timeAgoCustomProps} />,
+        render: value => <TimeAgo date={value} {...timeAgoCustomProps} />,
       },
       overrides
     );
@@ -110,7 +110,6 @@ export default class ItemsTable extends React.Component {
     orderByField: PropTypes.string,
     orderByReverse: PropTypes.bool,
     toggleSorting: PropTypes.func,
-    setSorting: PropTypes.func,
     "data-test": PropTypes.string,
     rowKey: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
   };
@@ -128,15 +127,18 @@ export default class ItemsTable extends React.Component {
   };
 
   prepareColumns() {
-    const { orderByField, orderByReverse } = this.props;
+    const { orderByField, orderByReverse, toggleSorting } = this.props;
     const orderByDirection = orderByReverse ? "descend" : "ascend";
 
     return map(
       map(
-        filter(this.props.columns, (column) => (isFunction(column.isAvailable) ? column.isAvailable() : true)),
-        (column) => extend(column, { orderByField: column.orderByField || column.field })
+        filter(this.props.columns, column => (isFunction(column.isAvailable) ? column.isAvailable() : true)),
+        column => extend(column, { orderByField: column.orderByField || column.field })
       ),
       (column, index) => {
+        // Bind click events only to sortable columns
+        const onHeaderCell = column.sorter ? () => ({ onClick: () => toggleSorting(column.orderByField) }) : null;
+
         // Wrap render function to pass correct arguments
         const render = isFunction(column.render) ? (text, row) => column.render(text, row.item) : identity;
 
@@ -144,13 +146,14 @@ export default class ItemsTable extends React.Component {
           key: "column" + index,
           dataIndex: ["item", column.field],
           defaultSortOrder: column.orderByField === orderByField ? orderByDirection : null,
+          onHeaderCell,
           render,
         });
       }
     );
   }
 
-  getRowKey = (record) => {
+  getRowKey = record => {
     const { rowKey } = this.props;
     if (rowKey) {
       if (isFunction(rowKey)) {
@@ -169,43 +172,22 @@ export default class ItemsTable extends React.Component {
 
     // Bind events only if `onRowClick` specified
     const onTableRow = isFunction(this.props.onRowClick)
-      ? (row) => ({
-          onClick: (event) => {
+      ? row => ({
+          onClick: event => {
             this.props.onRowClick(event, row.item);
           },
         })
       : null;
 
-    const onChange = (pagination, filters, sorter, extra) => {
-      const action = extra?.action;
-      if (action === "sort") {
-        const propsColumn = this.props.columns.find((column) => column.field === sorter.field[1]);
-        if (!propsColumn.sorter) {
-          return;
-        }
-        let orderByField = propsColumn.orderByField;
-        const orderByReverse = sorter.order === "descend";
-
-        if (orderByReverse === undefined) {
-          orderByField = null;
-        }
-        if (this.props.setSorting) {
-          this.props.setSorting(orderByField, orderByReverse);
-        } else {
-          this.props.toggleSorting(orderByField);
-        }
-      }
-    };
-
     const { showHeader } = this.props;
     if (this.props.loading) {
       if (isEmpty(tableDataProps.dataSource)) {
-        tableDataProps.columns = tableDataProps.columns.map((column) => ({
+        tableDataProps.columns = tableDataProps.columns.map(column => ({
           ...column,
           sorter: false,
           render: () => <Skeleton active paragraph={false} />,
         }));
-        tableDataProps.dataSource = range(10).map((key) => ({ key: `${key}` }));
+        tableDataProps.dataSource = range(10).map(key => ({ key: `${key}` }));
       } else {
         tableDataProps.loading = { indicator: null };
       }
@@ -218,7 +200,6 @@ export default class ItemsTable extends React.Component {
         rowKey={this.getRowKey}
         pagination={false}
         onRow={onTableRow}
-        onChange={onChange}
         data-test={this.props["data-test"]}
         {...tableDataProps}
       />

client/app/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" translate="no">
+<html lang="en">
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />

client/app/pages/queries-list/QueriesList.jsx

@@ -160,15 +160,14 @@ function QueriesList({ controller }) {
                     orderByField={controller.orderByField}
                     orderByReverse={controller.orderByReverse}
                     toggleSorting={controller.toggleSorting}
-                    setSorting={controller.setSorting}
                   />
                   <Paginator
                     showPageSizeSelect
                     totalCount={controller.totalItemsCount}
                     pageSize={controller.itemsPerPage}
-                    onPageSizeChange={(itemsPerPage) => controller.updatePagination({ itemsPerPage })}
+                    onPageSizeChange={itemsPerPage => controller.updatePagination({ itemsPerPage })}
                     page={controller.page}
-                    onChange={(page) => controller.updatePagination({ page })}
+                    onChange={page => controller.updatePagination({ page })}
                   />
                 </div>
               </React.Fragment>
@@ -197,7 +196,7 @@ const QueriesListPage = itemsList(
         }[currentPage];
       },
       getItemProcessor() {
-        return (item) => new Query(item);
+        return item => new Query(item);
       },
     }),
   () => new UrlStateStorage({ orderByField: "created_at", orderByReverse: true })
@@ -208,7 +207,7 @@ routes.register(
   routeWithUserSession({
     path: "/queries",
     title: "Queries",
-    render: (pageProps) => <QueriesListPage {...pageProps} currentPage="all" />,
+    render: pageProps => <QueriesListPage {...pageProps} currentPage="all" />,
   })
 );
 routes.register(
@@ -216,7 +215,7 @@ routes.register(
   routeWithUserSession({
     path: "/queries/favorites",
     title: "Favorite Queries",
-    render: (pageProps) => <QueriesListPage {...pageProps} currentPage="favorites" />,
+    render: pageProps => <QueriesListPage {...pageProps} currentPage="favorites" />,
   })
 );
 routes.register(
@@ -224,7 +223,7 @@ routes.register(
   routeWithUserSession({
     path: "/queries/archive",
     title: "Archived Queries",
-    render: (pageProps) => <QueriesListPage {...pageProps} currentPage="archive" />,
+    render: pageProps => <QueriesListPage {...pageProps} currentPage="archive" />,
   })
 );
 routes.register(
@@ -232,6 +231,6 @@ routes.register(
   routeWithUserSession({
     path: "/queries/my",
     title: "My Queries",
-    render: (pageProps) => <QueriesListPage {...pageProps} currentPage="my" />,
+    render: pageProps => <QueriesListPage {...pageProps} currentPage="my" />,
   })
 );

client/app/pages/queries/components/QuerySourceTypeIcon.jsx

@@ -2,7 +2,7 @@ import PropTypes from "prop-types";
 import React from "react";
 
 export function QuerySourceTypeIcon(props) {
-  return <img src={`/static/images/db-logos/${props.type}.png`} width="20" alt={props.alt} />;
+  return <img src={`static/images/db-logos/${props.type}.png`} width="20" alt={props.alt} />;
 }
 
 QuerySourceTypeIcon.propTypes = {

client/app/pages/queries/components/QueryVisualizationTabs.jsx

@@ -18,7 +18,7 @@ function EmptyState({ title, message, refreshButton }) {
     <div className="query-results-empty-state">
       <div className="empty-state-content">
         <div>
-          <img src="/static/images/illustrations/no-query-results.svg" alt="No Query Results Illustration" />
+          <img src="static/images/illustrations/no-query-results.svg" alt="No Query Results Illustration" />
         </div>
         <h3>{title}</h3>
         <div className="m-b-20">{message}</div>
@@ -40,7 +40,7 @@ EmptyState.defaultProps = {
 
 function TabWithDeleteButton({ visualizationName, canDelete, onDelete, ...props }) {
   const handleDelete = useCallback(
-    (e) => {
+    e => {
       e.stopPropagation();
       Modal.confirm({
         title: "Delete Visualization",
@@ -111,8 +111,7 @@ export default function QueryVisualizationTabs({
         className="add-visualization-button"
         data-test="NewVisualization"
         type="link"
-        onClick={() => onAddVisualization()}
-      >
+        onClick={() => onAddVisualization()}>
         <i className="fa fa-plus" aria-hidden="true" />
         <span className="m-l-5 hidden-xs">Add Visualization</span>
       </Button>
@@ -120,7 +119,7 @@ export default function QueryVisualizationTabs({
   }
 
   const orderedVisualizations = useMemo(() => orderBy(visualizations, ["id"]), [visualizations]);
-  const isFirstVisualization = useCallback((visId) => visId === orderedVisualizations[0].id, [orderedVisualizations]);
+  const isFirstVisualization = useCallback(visId => visId === orderedVisualizations[0].id, [orderedVisualizations]);
   const isMobile = useMedia({ maxWidth: 768 });
 
   const [filters, setFilters] = useState([]);
@@ -133,10 +132,9 @@ export default function QueryVisualizationTabs({
       data-test="QueryPageVisualizationTabs"
       animated={false}
       tabBarGutter={0}
-      onChange={(activeKey) => onChangeTab(+activeKey)}
-      destroyInactiveTabPane
-    >
-      {orderedVisualizations.map((visualization) => (
+      onChange={activeKey => onChangeTab(+activeKey)}
+      destroyInactiveTabPane>
+      {orderedVisualizations.map(visualization => (
         <TabPane
           key={`${visualization.id}`}
           tab={
@@ -146,8 +144,7 @@ export default function QueryVisualizationTabs({
               visualizationName={visualization.name}
               onDelete={() => onDeleteVisualization(visualization.id)}
             />
-          }
-        >
+          }>
           {queryResult ? (
             <VisualizationRenderer
               visualization={visualization}

client/app/pages/queries/hooks/useAutocompleteFlags.js

@@ -1,11 +1,16 @@
 import { useCallback, useMemo, useState } from "react";
+import { reduce } from "lodash";
 import localOptions from "@/lib/localOptions";
 
+function calculateTokensCount(schema) {
+  return reduce(schema, (totalLength, table) => totalLength + table.columns.length, 0);
+}
+
 export default function useAutocompleteFlags(schema) {
-  const isAvailable = true;
+  const isAvailable = useMemo(() => calculateTokensCount(schema) <= 5000, [schema]);
   const [isEnabled, setIsEnabled] = useState(localOptions.get("liveAutocomplete", true));
 
-  const toggleAutocomplete = useCallback((state) => {
+  const toggleAutocomplete = useCallback(state => {
     setIsEnabled(state);
     localOptions.set("liveAutocomplete", state);
   }, []);

client/app/services/data-source.js

@@ -4,19 +4,19 @@ import { fetchDataFromJob } from "@/services/query-result";
 
 export const SCHEMA_NOT_SUPPORTED = 1;
 export const SCHEMA_LOAD_ERROR = 2;
-export const IMG_ROOT = "/static/images/db-logos";
+export const IMG_ROOT = "static/images/db-logos";
 
 function mapSchemaColumnsToObject(columns) {
-  return map(columns, (column) => (isObject(column) ? column : { name: column }));
+  return map(columns, column => (isObject(column) ? column : { name: column }));
 }
 
 const DataSource = {
   query: () => axios.get("api/data_sources"),
   get: ({ id }) => axios.get(`api/data_sources/${id}`),
   types: () => axios.get("api/data_sources/types"),
-  create: (data) => axios.post(`api/data_sources`, data),
-  save: (data) => axios.post(`api/data_sources/${data.id}`, data),
-  test: (data) => axios.post(`api/data_sources/${data.id}/test`),
+  create: data => axios.post(`api/data_sources`, data),
+  save: data => axios.post(`api/data_sources/${data.id}`, data),
+  test: data => axios.post(`api/data_sources/${data.id}/test`),
   delete: ({ id }) => axios.delete(`api/data_sources/${id}`),
   fetchSchema: (data, refresh = false) => {
     const params = {};
@@ -27,15 +27,15 @@ const DataSource = {
 
     return axios
       .get(`api/data_sources/${data.id}/schema`, { params })
-      .then((data) => {
+      .then(data => {
         if (has(data, "job")) {
-          return fetchDataFromJob(data.job.id).catch((error) =>
+          return fetchDataFromJob(data.job.id).catch(error =>
             error.code === SCHEMA_NOT_SUPPORTED ? [] : Promise.reject(new Error(data.job.error))
           );
         }
         return has(data, "schema") ? data.schema : Promise.reject();
       })
-      .then((tables) => map(tables, (table) => ({ ...table, columns: mapSchemaColumnsToObject(table.columns) })));
+      .then(tables => map(tables, table => ({ ...table, columns: mapSchemaColumnsToObject(table.columns) })));
   },
 };
 

client/app/services/query-result.js

@@ -9,7 +9,7 @@ const logger = debug("redash:services:QueryResult");
 const filterTypes = ["filter", "multi-filter", "multiFilter"];
 
 function defer() {
-  const result = { onStatusChange: (status) => {} };
+  const result = { onStatusChange: status => {} };
   result.promise = new Promise((resolve, reject) => {
     result.resolve = resolve;
     result.reject = reject;
@@ -40,13 +40,13 @@ function getColumnNameWithoutType(column) {
 }
 
 function getColumnFriendlyName(column) {
-  return getColumnNameWithoutType(column).replace(/(?:^|\s)\S/g, (a) => a.toUpperCase());
+  return getColumnNameWithoutType(column).replace(/(?:^|\s)\S/g, a => a.toUpperCase());
 }
 
-const createOrSaveUrl = (data) => (data.id ? `api/query_results/${data.id}` : "api/query_results");
+const createOrSaveUrl = data => (data.id ? `api/query_results/${data.id}` : "api/query_results");
 const QueryResultResource = {
   get: ({ id }) => axios.get(`api/query_results/${id}`),
-  post: (data) => axios.post(createOrSaveUrl(data), data),
+  post: data => axios.post(createOrSaveUrl(data), data),
 };
 
 export const ExecutionStatus = {
@@ -97,11 +97,11 @@ function handleErrorResponse(queryResult, error) {
 }
 
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise(resolve => setTimeout(resolve, ms));
 }
 
 export function fetchDataFromJob(jobId, interval = 1000) {
-  return axios.get(`api/jobs/${jobId}`).then((data) => {
+  return axios.get(`api/jobs/${jobId}`).then(data => {
     const status = statuses[data.job.status];
     if (status === ExecutionStatus.WAITING || status === ExecutionStatus.PROCESSING) {
       return sleep(interval).then(() => fetchDataFromJob(data.job.id));
@@ -146,7 +146,7 @@ class QueryResult {
       // TODO: we should stop manipulating incoming data, and switch to relaying
       // on the column type set by the backend. This logic is prone to errors,
       // and better be removed. Kept for now, for backward compatability.
-      each(this.query_result.data.rows, (row) => {
+      each(this.query_result.data.rows, row => {
         forOwn(row, (v, k) => {
           let newType = null;
           if (isNumber(v)) {
@@ -173,7 +173,7 @@ class QueryResult {
         });
       });
 
-      each(this.query_result.data.columns, (column) => {
+      each(this.query_result.data.columns, column => {
         column.name = "" + column.name;
         if (columnTypes[column.name]) {
           if (column.type == null || column.type === "string") {
@@ -265,14 +265,14 @@ class QueryResult {
 
   getColumnNames() {
     if (this.columnNames === undefined && this.query_result.data) {
-      this.columnNames = this.query_result.data.columns.map((v) => v.name);
+      this.columnNames = this.query_result.data.columns.map(v => v.name);
     }
 
     return this.columnNames;
   }
 
   getColumnFriendlyNames() {
-    return this.getColumnNames().map((col) => getColumnFriendlyName(col));
+    return this.getColumnNames().map(col => getColumnFriendlyName(col));
   }
 
   getTruncated() {
@@ -286,7 +286,7 @@ class QueryResult {
 
     const filters = [];
 
-    this.getColumns().forEach((col) => {
+    this.getColumns().forEach(col => {
       const name = col.name;
       const type = name.split("::")[1] || name.split("__")[1];
       if (includes(filterTypes, type)) {
@@ -302,8 +302,8 @@ class QueryResult {
       }
     }, this);
 
-    this.getRawData().forEach((row) => {
-      filters.forEach((filter) => {
+    this.getRawData().forEach(row => {
+      filters.forEach(filter => {
         filter.values.push(row[filter.name]);
         if (filter.values.length === 1) {
           if (filter.multiple) {
@@ -315,8 +315,8 @@ class QueryResult {
       });
     });
 
-    filters.forEach((filter) => {
-      filter.values = uniqBy(filter.values, (v) => {
+    filters.forEach(filter => {
+      filter.values = uniqBy(filter.values, v => {
         if (moment.isMoment(v)) {
           return v.unix();
         }
@@ -345,12 +345,12 @@ class QueryResult {
 
     axios
       .get(`api/queries/${queryId}/results/${id}.json`)
-      .then((response) => {
+      .then(response => {
         // Success handler
         queryResult.isLoadingResult = false;
         queryResult.update(response);
       })
-      .catch((error) => {
+      .catch(error => {
         // Error handler
         queryResult.isLoadingResult = false;
         handleErrorResponse(queryResult, error);
@@ -362,10 +362,10 @@ class QueryResult {
   loadLatestCachedResult(queryId, parameters) {
     axios
       .post(`api/queries/${queryId}/results`, { queryId, parameters })
-      .then((response) => {
+      .then(response => {
         this.update(response);
       })
-      .catch((error) => {
+      .catch(error => {
         handleErrorResponse(this, error);
       });
   }
@@ -375,11 +375,11 @@ class QueryResult {
     this.deferred.onStatusChange(ExecutionStatus.LOADING_RESULT);
 
     QueryResultResource.get({ id: this.job.query_result_id })
-      .then((response) => {
+      .then(response => {
         this.update(response);
         this.isLoadingResult = false;
       })
-      .catch((error) => {
+      .catch(error => {
         if (tryCount === undefined) {
           tryCount = 0;
         }
@@ -394,12 +394,9 @@ class QueryResult {
           });
           this.isLoadingResult = false;
         } else {
-          setTimeout(
-            () => {
-              this.loadResult(tryCount + 1);
-            },
-            1000 * Math.pow(2, tryCount)
-          );
+          setTimeout(() => {
+            this.loadResult(tryCount + 1);
+          }, 1000 * Math.pow(2, tryCount));
         }
       });
   }
@@ -413,26 +410,19 @@ class QueryResult {
       : axios.get(`api/queries/${query}/jobs/${this.job.id}`);
 
     request
-      .then((jobResponse) => {
+      .then(jobResponse => {
         this.update(jobResponse);
 
         if (this.getStatus() === "processing" && this.job.query_result_id && this.job.query_result_id !== "None") {
           loadResult();
         } else if (this.getStatus() !== "failed") {
-          let waitTime;
-          if (tryNumber <= 10) {
-            waitTime = 500;
-          } else if (tryNumber <= 50) {
-            waitTime = 1000;
-          } else {
-            waitTime = 3000;
-          }
+          const waitTime = tryNumber > 10 ? 3000 : 500;
           setTimeout(() => {
             this.refreshStatus(query, parameters, tryNumber + 1);
           }, waitTime);
         }
       })
-      .catch((error) => {
+      .catch(error => {
         logger("Connection error", error);
         // TODO: use QueryResultError, or better yet: exception/reject of promise.
         this.update({
@@ -461,14 +451,14 @@ class QueryResult {
 
     axios
       .post(`api/queries/${id}/results`, { id, parameters, apply_auto_limit: applyAutoLimit, max_age: maxAge })
-      .then((response) => {
+      .then(response => {
         queryResult.update(response);
 
         if ("job" in response) {
           queryResult.refreshStatus(id, parameters);
         }
       })
-      .catch((error) => {
+      .catch(error => {
         handleErrorResponse(queryResult, error);
       });
 
@@ -491,14 +481,14 @@ class QueryResult {
     }
 
     QueryResultResource.post(params)
-      .then((response) => {
+      .then(response => {
         queryResult.update(response);
 
         if ("job" in response) {
           queryResult.refreshStatus(query, parameters);
         }
       })
-      .catch((error) => {
+      .catch(error => {
         handleErrorResponse(queryResult, error);
       });
 

client/cypress/cypress.js

@@ -63,7 +63,7 @@ function runCypressCI() {
     CYPRESS_OPTIONS, // eslint-disable-line no-unused-vars
   } = process.env;
 
-  if (GITHUB_REPOSITORY === "getredash/redash" && process.env.CYPRESS_RECORD_KEY) {
+  if (GITHUB_REPOSITORY === "getredash/redash") {
     process.env.CYPRESS_OPTIONS = "--record";
   }
 

client/cypress/support/visualizations/chart.js

@@ -3,26 +3,36 @@
  * @param should Passed to should expression after plot points are captured
  */
 export function assertPlotPreview(should = "exist") {
-  cy.getByTestId("VisualizationPreview").find("g.overplot").should("exist").find("g.points").should(should);
+  cy.getByTestId("VisualizationPreview")
+    .find("g.plot")
+    .should("exist")
+    .find("g.points")
+    .should(should);
 }
 
 export function createChartThroughUI(chartName, chartSpecificAssertionFn = () => {}) {
   cy.getByTestId("NewVisualization").click();
   cy.getByTestId("VisualizationType").selectAntdOption("VisualizationType.CHART");
-  cy.getByTestId("VisualizationName").clear().type(chartName);
+  cy.getByTestId("VisualizationName")
+    .clear()
+    .type(chartName);
 
   chartSpecificAssertionFn();
 
   cy.server();
   cy.route("POST", "**/api/visualizations").as("SaveVisualization");
 
-  cy.getByTestId("EditVisualizationDialog").contains("button", "Save").click();
+  cy.getByTestId("EditVisualizationDialog")
+    .contains("button", "Save")
+    .click();
 
-  cy.getByTestId("QueryPageVisualizationTabs").contains("span", chartName).should("exist");
+  cy.getByTestId("QueryPageVisualizationTabs")
+    .contains("span", chartName)
+    .should("exist");
 
   cy.wait("@SaveVisualization").should("have.property", "status", 200);
 
-  return cy.get("@SaveVisualization").then((xhr) => {
+  return cy.get("@SaveVisualization").then(xhr => {
     const { id, name, options } = xhr.response.body;
     return cy.wrap({ id, name, options });
   });
@@ -32,13 +42,19 @@ export function assertTabbedEditor(chartSpecificTabbedEditorAssertionFn = () =>
   cy.getByTestId("Chart.GlobalSeriesType").should("exist");
 
   cy.getByTestId("VisualizationEditor.Tabs.Series").click();
-  cy.getByTestId("VisualizationEditor").find("table").should("exist");
+  cy.getByTestId("VisualizationEditor")
+    .find("table")
+    .should("exist");
 
   cy.getByTestId("VisualizationEditor.Tabs.Colors").click();
-  cy.getByTestId("VisualizationEditor").find("table").should("exist");
+  cy.getByTestId("VisualizationEditor")
+    .find("table")
+    .should("exist");
 
   cy.getByTestId("VisualizationEditor.Tabs.DataLabels").click();
-  cy.getByTestId("VisualizationEditor").getByTestId("Chart.DataLabels.ShowDataLabels").should("exist");
+  cy.getByTestId("VisualizationEditor")
+    .getByTestId("Chart.DataLabels.ShowDataLabels")
+    .should("exist");
 
   chartSpecificTabbedEditorAssertionFn();
 
@@ -47,29 +63,39 @@ export function assertTabbedEditor(chartSpecificTabbedEditorAssertionFn = () =>
 
 export function assertAxesAndAddLabels(xaxisLabel, yaxisLabel) {
   cy.getByTestId("VisualizationEditor.Tabs.XAxis").click();
-  cy.getByTestId("Chart.XAxis.Type").contains(".ant-select-selection-item", "Auto Detect").should("exist");
+  cy.getByTestId("Chart.XAxis.Type")
+    .contains(".ant-select-selection-item", "Auto Detect")
+    .should("exist");
 
-  cy.getByTestId("Chart.XAxis.Name").clear().type(xaxisLabel);
+  cy.getByTestId("Chart.XAxis.Name")
+    .clear()
+    .type(xaxisLabel);
 
   cy.getByTestId("VisualizationEditor.Tabs.YAxis").click();
-  cy.getByTestId("Chart.LeftYAxis.Type").contains(".ant-select-selection-item", "Linear").should("exist");
+  cy.getByTestId("Chart.LeftYAxis.Type")
+    .contains(".ant-select-selection-item", "Linear")
+    .should("exist");
 
-  cy.getByTestId("Chart.LeftYAxis.Name").clear().type(yaxisLabel);
+  cy.getByTestId("Chart.LeftYAxis.Name")
+    .clear()
+    .type(yaxisLabel);
 
-  cy.getByTestId("Chart.LeftYAxis.TickFormat").clear().type("+");
+  cy.getByTestId("Chart.LeftYAxis.TickFormat")
+    .clear()
+    .type("+");
 
   cy.getByTestId("VisualizationEditor.Tabs.General").click();
 }
 
 export function createDashboardWithCharts(title, chartGetters, widgetsAssertionFn = () => {}) {
-  cy.createDashboard(title).then((dashboard) => {
+  cy.createDashboard(title).then(dashboard => {
     const dashboardUrl = `/dashboards/${dashboard.id}`;
-    const widgetGetters = chartGetters.map((chartGetter) => `${chartGetter}Widget`);
+    const widgetGetters = chartGetters.map(chartGetter => `${chartGetter}Widget`);
 
     chartGetters.forEach((chartGetter, i) => {
       const position = { autoHeight: false, sizeY: 8, sizeX: 3, col: (i % 2) * 3 };
       cy.get(`@${chartGetter}`)
-        .then((chart) => cy.addWidget(dashboard.id, chart.id, { position }))
+        .then(chart => cy.addWidget(dashboard.id, chart.id, { position }))
         .as(widgetGetters[i]);
     });
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "25.07.0-dev",
+  "version": "25.1.0",
   "description": "The frontend part of Redash.",
   "main": "index.js",
   "scripts": {
@@ -143,7 +143,6 @@
     "react-refresh": "^0.14.0",
     "react-test-renderer": "^16.14.0",
     "request-cookies": "^1.1.0",
-    "source-map-loader": "^1.1.3",
     "style-loader": "^2.0.0",
     "typescript": "^4.1.2",
     "url-loader": "^4.1.1",

pyproject.toml

@@ -12,7 +12,7 @@ force-exclude = '''
 
 [tool.poetry]
 name = "redash"
-version = "25.07.0-dev"
+version = "25.1.0"
 description = "Make Your Company Data Driven. Connect to any data source, easily visualize, dashboard and share your data."
 authors = ["Arik Fraimovich <arik@redash.io>"]
 # to be added to/removed from the mailing list, please reach out to Arik via the above email or Discord
@@ -88,14 +88,13 @@ tzlocal = "4.3.1"
 pyodbc = "5.1.0"
 debugpy = "^1.8.9"
 paramiko = "3.4.1"
-oracledb = "2.5.1"
 
 [tool.poetry.group.all_ds]
 optional = true
 
 [tool.poetry.group.all_ds.dependencies]
 atsd-client = "3.0.5"
-azure-kusto-data = "5.0.1"
+azure-kusto-data = "0.0.35"
 boto3 = "1.28.8"
 botocore = "1.31.8"
 cassandra-driver = "3.21.0"
@@ -110,11 +109,11 @@ influxdb = "5.2.3"
 influxdb-client = "1.38.0"
 memsql = "3.2.0"
 mysqlclient = "2.1.1"
-numpy = "1.24.4"
 nzalchemy = "^11.0.2"
 nzpy = ">=1.15"
 oauth2client = "4.1.3"
 openpyxl = "3.0.7"
+oracledb = "2.1.2"
 pandas = "1.3.4"
 phoenixdb = "0.7"
 pinotdb = ">=0.4.5"

redash/__init__.py

@@ -14,7 +14,7 @@ from redash.app import create_app  # noqa
 from redash.destinations import import_destinations
 from redash.query_runner import import_query_runners
 
-__version__ = "25.07.0-dev"
+__version__ = "25.1.0"
 
 
 if os.environ.get("REMOTE_DEBUG"):

redash/destinations/webex.py

@@ -1,5 +1,3 @@
-import html
-import json
 import logging
 from copy import deepcopy
 
@@ -39,129 +37,6 @@ class Webex(BaseDestination):
 
     @staticmethod
     def formatted_attachments_template(subject, description, query_link, alert_link):
-        # Attempt to parse the description to find a 2D array
-        try:
-            # Extract the part of the description that looks like a JSON array
-            start_index = description.find("[")
-            end_index = description.rfind("]") + 1
-            json_array_str = description[start_index:end_index]
-
-            # Decode HTML entities
-            json_array_str = html.unescape(json_array_str)
-
-            # Replace single quotes with double quotes for valid JSON
-            json_array_str = json_array_str.replace("'", '"')
-
-            # Load the JSON array
-            data_array = json.loads(json_array_str)
-
-            # Check if it's a 2D array
-            if isinstance(data_array, list) and all(isinstance(i, list) for i in data_array):
-                # Create a table for the Adaptive Card
-                table_rows = []
-                for row in data_array:
-                    table_rows.append(
-                        {
-                            "type": "ColumnSet",
-                            "columns": [
-                                {"type": "Column", "items": [{"type": "TextBlock", "text": str(item), "wrap": True}]}
-                                for item in row
-                            ],
-                        }
-                    )
-
-                # Create the body of the card with the table
-                body = (
-                    [
-                        {
-                            "type": "TextBlock",
-                            "text": f"{subject}",
-                            "weight": "bolder",
-                            "size": "medium",
-                            "wrap": True,
-                        },
-                        {
-                            "type": "TextBlock",
-                            "text": f"{description[:start_index]}",
-                            "isSubtle": True,
-                            "wrap": True,
-                        },
-                    ]
-                    + table_rows
-                    + [
-                        {
-                            "type": "TextBlock",
-                            "text": f"Click [here]({query_link}) to check your query!",
-                            "wrap": True,
-                            "isSubtle": True,
-                        },
-                        {
-                            "type": "TextBlock",
-                            "text": f"Click [here]({alert_link}) to check your alert!",
-                            "wrap": True,
-                            "isSubtle": True,
-                        },
-                    ]
-                )
-            else:
-                # Fallback to the original description if no valid 2D array is found
-                body = [
-                    {
-                        "type": "TextBlock",
-                        "text": f"{subject}",
-                        "weight": "bolder",
-                        "size": "medium",
-                        "wrap": True,
-                    },
-                    {
-                        "type": "TextBlock",
-                        "text": f"{description}",
-                        "isSubtle": True,
-                        "wrap": True,
-                    },
-                    {
-                        "type": "TextBlock",
-                        "text": f"Click [here]({query_link}) to check your query!",
-                        "wrap": True,
-                        "isSubtle": True,
-                    },
-                    {
-                        "type": "TextBlock",
-                        "text": f"Click [here]({alert_link}) to check your alert!",
-                        "wrap": True,
-                        "isSubtle": True,
-                    },
-                ]
-        except json.JSONDecodeError:
-            # If parsing fails, fallback to the original description
-            body = [
-                {
-                    "type": "TextBlock",
-                    "text": f"{subject}",
-                    "weight": "bolder",
-                    "size": "medium",
-                    "wrap": True,
-                },
-                {
-                    "type": "TextBlock",
-                    "text": f"{description}",
-                    "isSubtle": True,
-                    "wrap": True,
-                },
-                {
-                    "type": "TextBlock",
-                    "text": f"Click [here]({query_link}) to check your query!",
-                    "wrap": True,
-                    "isSubtle": True,
-                },
-                {
-                    "type": "TextBlock",
-                    "text": f"Click [here]({alert_link}) to check your alert!",
-                    "wrap": True,
-                    "isSubtle": True,
-                },
-            ]
-
         return [
             {
                 "contentType": "application/vnd.microsoft.card.adaptive",
@@ -169,7 +44,44 @@ class Webex(BaseDestination):
                     "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
                     "type": "AdaptiveCard",
                     "version": "1.0",
-                    "body": body,
+                    "body": [
+                        {
+                            "type": "ColumnSet",
+                            "columns": [
+                                {
+                                    "type": "Column",
+                                    "width": 4,
+                                    "items": [
+                                        {
+                                            "type": "TextBlock",
+                                            "text": {subject},
+                                            "weight": "bolder",
+                                            "size": "medium",
+                                            "wrap": True,
+                                        },
+                                        {
+                                            "type": "TextBlock",
+                                            "text": {description},
+                                            "isSubtle": True,
+                                            "wrap": True,
+                                        },
+                                        {
+                                            "type": "TextBlock",
+                                            "text": f"Click [here]({query_link}) to check your query!",
+                                            "wrap": True,
+                                            "isSubtle": True,
+                                        },
+                                        {
+                                            "type": "TextBlock",
+                                            "text": f"Click [here]({alert_link}) to check your alert!",
+                                            "wrap": True,
+                                            "isSubtle": True,
+                                        },
+                                    ],
+                                },
+                            ],
+                        }
+                    ],
                 },
             }
         ]
@@ -204,10 +116,6 @@ class Webex(BaseDestination):
 
             # destinations is guaranteed to be a comma-separated string
             for destination_id in destinations.split(","):
-                destination_id = destination_id.strip()  # Remove any leading or trailing whitespace
-                if not destination_id:  # Check if the destination_id is empty or blank
-                    continue  # Skip to the next iteration if it's empty or blank
-
                 payload = deepcopy(template_payload)
                 payload[payload_tag] = destination_id
                 self.post_message(payload, headers)

redash/models/__init__.py

@@ -908,7 +908,6 @@ def next_state(op, value, threshold):
         # boolean value is Python specific and most likely will be confusing to
         # users.
         value = str(value).lower()
-        value_is_number = False
     else:
         try:
             value = float(value)

redash/query_runner/__init__.py

@@ -288,10 +288,7 @@ class BaseSQLQueryRunner(BaseQueryRunner):
         return True
 
     def query_is_select_no_limit(self, query):
-        parsed_query_list = sqlparse.parse(query)
-        if len(parsed_query_list) == 0:
-            return False
-        parsed_query = parsed_query_list[0]
+        parsed_query = sqlparse.parse(query)[0]
         last_keyword_idx = find_last_keyword_idx(parsed_query)
         # Either invalid query or query that is not select
         if last_keyword_idx == -1 or parsed_query.tokens[0].value.upper() != "SELECT":

redash/query_runner/azure_kusto.py

@@ -11,12 +11,12 @@ from redash.query_runner import (
 from redash.utils import json_loads
 
 try:
-    from azure.kusto.data import (
+    from azure.kusto.data.exceptions import KustoServiceError
+    from azure.kusto.data.request import (
         ClientRequestProperties,
         KustoClient,
         KustoConnectionStringBuilder,
     )
-    from azure.kusto.data.exceptions import KustoServiceError
 
     enabled = True
 except ImportError:
@@ -37,34 +37,6 @@ TYPES_MAP = {
 }
 
 
-def _get_data_scanned(kusto_response):
-    try:
-        metadata_table = next(
-            (table for table in kusto_response.tables if table.table_name == "QueryCompletionInformation"),
-            None,
-        )
-
-        if metadata_table:
-            resource_usage_json = next(
-                (row["Payload"] for row in metadata_table.rows if row["EventTypeName"] == "QueryResourceConsumption"),
-                "{}",
-            )
-            resource_usage = json_loads(resource_usage_json).get("resource_usage", {})
-
-        data_scanned = (
-            resource_usage["cache"]["shards"]["cold"]["hitbytes"]
-            + resource_usage["cache"]["shards"]["cold"]["missbytes"]
-            + resource_usage["cache"]["shards"]["hot"]["hitbytes"]
-            + resource_usage["cache"]["shards"]["hot"]["missbytes"]
-            + resource_usage["cache"]["shards"]["bypassbytes"]
-        )
-
-    except Exception:
-        data_scanned = 0
-
-    return int(data_scanned)
-
-
 class AzureKusto(BaseQueryRunner):
     should_annotate_query = False
     noop_query = "let noop = datatable (Noop:string)[1]; noop"
@@ -72,6 +44,8 @@ class AzureKusto(BaseQueryRunner):
     def __init__(self, configuration):
         super(AzureKusto, self).__init__(configuration)
         self.syntax = "custom"
+        self.client_request_properties = ClientRequestProperties()
+        self.client_request_properties.application = "redash"
 
     @classmethod
     def configuration_schema(cls):
@@ -86,14 +60,12 @@ class AzureKusto(BaseQueryRunner):
                 },
                 "azure_ad_tenant_id": {"type": "string", "title": "Azure AD Tenant Id"},
                 "database": {"type": "string"},
-                "msi": {"type": "boolean", "title": "Use Managed Service Identity"},
-                "user_msi": {
-                    "type": "string",
-                    "title": "User-assigned managed identity client ID",
-                },
             },
             "required": [
                 "cluster",
+                "azure_ad_client_id",
+                "azure_ad_client_secret",
+                "azure_ad_tenant_id",
                 "database",
             ],
             "order": [
@@ -119,48 +91,18 @@ class AzureKusto(BaseQueryRunner):
         return "Azure Data Explorer (Kusto)"
 
     def run_query(self, query, user):
-        cluster = self.configuration["cluster"]
-        msi = self.configuration.get("msi", False)
-        # Managed Service Identity(MSI)
-        if msi:
-            # If user-assigned managed identity is used, the client ID must be provided
-            if self.configuration.get("user_msi"):
-                kcsb = KustoConnectionStringBuilder.with_aad_managed_service_identity_authentication(
-                    cluster,
-                    client_id=self.configuration["user_msi"],
-                )
-            else:
-                kcsb = KustoConnectionStringBuilder.with_aad_managed_service_identity_authentication(cluster)
-        # Service Principal auth
-        else:
-            aad_app_id = self.configuration.get("azure_ad_client_id")
-            app_key = self.configuration.get("azure_ad_client_secret")
-            authority_id = self.configuration.get("azure_ad_tenant_id")
-
-            if not (aad_app_id and app_key and authority_id):
-                raise ValueError(
-                    "Azure AD Client ID, Client Secret, and Tenant ID are required for Service Principal authentication."
-                )
-
-            kcsb = KustoConnectionStringBuilder.with_aad_application_key_authentication(
-                connection_string=cluster,
-                aad_app_id=aad_app_id,
-                app_key=app_key,
-                authority_id=authority_id,
-            )
+        kcsb = KustoConnectionStringBuilder.with_aad_application_key_authentication(
+            connection_string=self.configuration["cluster"],
+            aad_app_id=self.configuration["azure_ad_client_id"],
+            app_key=self.configuration["azure_ad_client_secret"],
+            authority_id=self.configuration["azure_ad_tenant_id"],
+        )
 
         client = KustoClient(kcsb)
 
-        request_properties = ClientRequestProperties()
-        request_properties.application = "redash"
-
-        if user:
-            request_properties.user = user.email
-            request_properties.set_option("request_description", user.email)
-
         db = self.configuration["database"]
         try:
-            response = client.execute(db, query, request_properties)
+            response = client.execute(db, query, self.client_request_properties)
 
             result_cols = response.primary_results[0].columns
             result_rows = response.primary_results[0].rows
@@ -181,15 +123,14 @@ class AzureKusto(BaseQueryRunner):
                 rows.append(row.to_dict())
 
             error = None
-            data = {
-                "columns": columns,
-                "rows": rows,
-                "metadata": {"data_scanned": _get_data_scanned(response)},
-            }
+            data = {"columns": columns, "rows": rows}
 
         except KustoServiceError as err:
             data = None
-            error = str(err)
+            try:
+                error = err.args[1][0]["error"]["@message"]
+            except (IndexError, KeyError):
+                error = err.args[1]
 
         return data, error
 
@@ -202,10 +143,7 @@ class AzureKusto(BaseQueryRunner):
             self._handle_run_query_error(error)
 
         schema_as_json = json_loads(results["rows"][0]["DatabaseSchema"])
-        tables_list = [
-            *(schema_as_json["Databases"][self.configuration["database"]]["Tables"].values()),
-            *(schema_as_json["Databases"][self.configuration["database"]]["MaterializedViews"].values()),
-        ]
+        tables_list = schema_as_json["Databases"][self.configuration["database"]]["Tables"].values()
 
         schema = {}
 
@@ -216,9 +154,7 @@ class AzureKusto(BaseQueryRunner):
                 schema[table_name] = {"name": table_name, "columns": []}
 
             for column in table["OrderedColumns"]:
-                schema[table_name]["columns"].append(
-                    {"name": column["Name"], "type": TYPES_MAP.get(column["CslType"], None)}
-                )
+                schema[table_name]["columns"].append(column["Name"])
 
         return list(schema.values())
 

redash/query_runner/big_query.py

@@ -12,7 +12,7 @@ from redash.query_runner import (
     TYPE_FLOAT,
     TYPE_INTEGER,
     TYPE_STRING,
-    BaseSQLQueryRunner,
+    BaseQueryRunner,
     InterruptException,
     JobTimeoutException,
     register,
@@ -86,7 +86,7 @@ def _get_query_results(jobs, project_id, location, job_id, start_index):
     ).execute()
     logging.debug("query_reply %s", query_reply)
     if not query_reply["jobComplete"]:
-        time.sleep(1)
+        time.sleep(10)
         return _get_query_results(jobs, project_id, location, job_id, start_index)
 
     return query_reply
@@ -98,7 +98,7 @@ def _get_total_bytes_processed_for_resp(bq_response):
     return int(bq_response.get("totalBytesProcessed", "0"))
 
 
-class BigQuery(BaseSQLQueryRunner):
+class BigQuery(BaseQueryRunner):
     noop_query = "SELECT 1"
 
     def __init__(self, configuration):
@@ -304,7 +304,7 @@ class BigQuery(BaseSQLQueryRunner):
         datasets = self._get_project_datasets(project_id)
 
         query_base = """
-        SELECT table_schema, table_name, field_path, data_type
+        SELECT table_schema, table_name, field_path
         FROM `{dataset_id}`.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS
         WHERE table_schema NOT IN ('information_schema')
         """
@@ -325,7 +325,7 @@ class BigQuery(BaseSQLQueryRunner):
             table_name = "{0}.{1}".format(row["table_schema"], row["table_name"])
             if table_name not in schema:
                 schema[table_name] = {"name": table_name, "columns": []}
-            schema[table_name]["columns"].append({"name": row["field_path"], "type": row["data_type"]})
+            schema[table_name]["columns"].append(row["field_path"])
 
         return list(schema.values())
 

redash/query_runner/elasticsearch.py

@@ -92,7 +92,7 @@ class BaseElasticSearch(BaseQueryRunner):
             logger.setLevel(logging.DEBUG)
 
         self.server_url = self.configuration.get("server", "")
-        if self.server_url and self.server_url[-1] == "/":
+        if self.server_url[-1] == "/":
             self.server_url = self.server_url[:-1]
 
         basic_auth_user = self.configuration.get("basic_auth_user", None)

redash/query_runner/mysql.py

@@ -152,7 +152,7 @@ class Mysql(BaseSQLQueryRunner):
                col.table_name as table_name,
                col.column_name as column_name
         FROM `information_schema`.`columns` col
-        WHERE LOWER(col.table_schema) NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys');
+        WHERE col.table_schema NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys');
         """
 
         results, error = self.run_query(query, None)

redash/security.py

@@ -1,6 +1,6 @@
 import functools
 
-from flask import request, session
+from flask import session
 from flask_login import current_user
 from flask_talisman import talisman
 from flask_wtf.csrf import CSRFProtect, generate_csrf
@@ -35,15 +35,6 @@ def init_app(app):
 
         @app.before_request
         def check_csrf():
-            # BEGIN workaround until https://github.com/lepture/flask-wtf/pull/419 is merged
-            if request.blueprint in csrf._exempt_blueprints:
-                return
-
-            view = app.view_functions.get(request.endpoint)
-            if view is not None and f"{view.__module__}.{view.__name__}" in csrf._exempt_views:
-                return
-            # END workaround
-
             if not current_user.is_authenticated or "user_id" in session:
                 csrf.protect()
 

redash/utils/__init__.py

@@ -6,7 +6,6 @@ import decimal
 import hashlib
 import io
 import json
-import math
 import os
 import random
 import re
@@ -121,17 +120,6 @@ def json_loads(data, *args, **kwargs):
     return json.loads(data, *args, **kwargs)
 
 
-# Convert NaN, Inf, and -Inf to None, as they are not valid JSON values.
-def _sanitize_data(data):
-    if isinstance(data, dict):
-        return {k: _sanitize_data(v) for k, v in data.items()}
-    if isinstance(data, list):
-        return [_sanitize_data(v) for v in data]
-    if isinstance(data, float) and (math.isnan(data) or math.isinf(data)):
-        return None
-    return data
-
-
 def json_dumps(data, *args, **kwargs):
     """A custom JSON dumping function which passes all parameters to the
     json.dumps function."""
@@ -140,7 +128,7 @@ def json_dumps(data, *args, **kwargs):
     # Float value nan or inf in Python should be render to None or null in json.
     # Using allow_nan = True will make Python render nan as NaN, leading to parse error in front-end
     kwargs.setdefault("allow_nan", False)
-    return json.dumps(_sanitize_data(data), *args, **kwargs)
+    return json.dumps(data, *args, **kwargs)
 
 
 def mustache_render(template, context=None, **kwargs):

redash/utils/query_order.py

@@ -33,7 +33,7 @@ from sqlalchemy.orm import mapperlib
 from sqlalchemy.orm.properties import ColumnProperty
 from sqlalchemy.orm.query import _ColumnEntity
 from sqlalchemy.orm.util import AliasedInsp
-from sqlalchemy.sql.expression import asc, desc, nullslast
+from sqlalchemy.sql.expression import asc, desc
 
 
 def get_query_descriptor(query, entity, attr):
@@ -225,7 +225,7 @@ class QuerySorter:
     def assign_order_by(self, entity, attr, func):
         expr = get_query_descriptor(self.query, entity, attr)
         if expr is not None:
-            return self.query.order_by(nullslast(func(expr)))
+            return self.query.order_by(func(expr))
         if not self.silent:
             raise QuerySorterException("Could not sort query with expression '%s'" % attr)
         return self.query

tests/handlers/test_destinations.py

@@ -261,19 +261,15 @@ def test_webex_notify_calls_requests_post():
     alert.name = "Test Alert"
     alert.custom_subject = "Test custom subject"
     alert.custom_body = "Test custom body"
-    alert.render_template = mock.Mock(return_value={"Rendered": "template"})
 
+    alert.render_template = mock.Mock(return_value={"Rendered": "template"})
     query = mock.Mock()
     query.id = 1
 
     user = mock.Mock()
     app = mock.Mock()
     host = "https://localhost:5000"
-    options = {
-        "webex_bot_token": "abcd",
-        "to_room_ids": "1234,5678",
-        "to_person_emails": "example1@test.com,example2@test.com",
-    }
+    options = {"webex_bot_token": "abcd", "to_room_ids": "1234"}
     metadata = {"Scheduled": False}
 
     new_state = Alert.TRIGGERED_STATE
@@ -281,7 +277,7 @@ def test_webex_notify_calls_requests_post():
 
     with mock.patch("redash.destinations.webex.requests.post") as mock_post:
         mock_response = mock.Mock()
-        mock_response.status_code = 200
+        mock_response.status_code = 204
         mock_post.return_value = mock_response
 
         destination.notify(alert, query, user, new_state, app, host, metadata, options)
@@ -289,111 +285,13 @@ def test_webex_notify_calls_requests_post():
         query_link = f"{host}/queries/{query.id}"
         alert_link = f"{host}/alerts/{alert.id}"
 
-        expected_attachments = Webex.formatted_attachments_template(
-            alert.custom_subject, alert.custom_body, query_link, alert_link
-        )
-
-        expected_payload_room = {
-            "markdown": alert.custom_subject + "\n" + alert.custom_body,
-            "attachments": expected_attachments,
-            "roomId": "1234",
-        }
-
-        expected_payload_email = {
-            "markdown": alert.custom_subject + "\n" + alert.custom_body,
-            "attachments": expected_attachments,
-            "toPersonEmail": "example1@test.com",
-        }
-
-        # Check that requests.post was called for both roomId and toPersonEmail destinations
-        mock_post.assert_any_call(
-            destination.api_base_url,
-            json=expected_payload_room,
-            headers={"Authorization": "Bearer abcd"},
-            timeout=5.0,
-        )
-
-        mock_post.assert_any_call(
-            destination.api_base_url,
-            json=expected_payload_email,
-            headers={"Authorization": "Bearer abcd"},
-            timeout=5.0,
-        )
-
-        assert mock_response.status_code == 200
-
-
-def test_webex_notify_handles_blank_entries():
-    alert = mock.Mock(spec_set=["id", "name", "custom_subject", "custom_body", "render_template"])
-    alert.id = 1
-    alert.name = "Test Alert"
-    alert.custom_subject = "Test custom subject"
-    alert.custom_body = "Test custom body"
-    alert.render_template = mock.Mock(return_value={"Rendered": "template"})
-
-    query = mock.Mock()
-    query.id = 1
-
-    user = mock.Mock()
-    app = mock.Mock()
-    host = "https://localhost:5000"
-    options = {
-        "webex_bot_token": "abcd",
-        "to_room_ids": "",
-        "to_person_emails": "",
-    }
-    metadata = {"Scheduled": False}
-
-    new_state = Alert.TRIGGERED_STATE
-    destination = Webex(options)
-
-    with mock.patch("redash.destinations.webex.requests.post") as mock_post:
-        destination.notify(alert, query, user, new_state, app, host, metadata, options)
-
-        # Ensure no API calls are made when destinations are blank
-        mock_post.assert_not_called()
-
-
-def test_webex_notify_handles_2d_array():
-    alert = mock.Mock(spec_set=["id", "name", "custom_subject", "custom_body", "render_template"])
-    alert.id = 1
-    alert.name = "Test Alert"
-    alert.custom_subject = "Test custom subject"
-    alert.custom_body = "Test custom body with table [['Col1', 'Col2'], ['Val1', 'Val2']]"
-    alert.render_template = mock.Mock(return_value={"Rendered": "template"})
-
-    query = mock.Mock()
-    query.id = 1
-
-    user = mock.Mock()
-    app = mock.Mock()
-    host = "https://localhost:5000"
-    options = {
-        "webex_bot_token": "abcd",
-        "to_room_ids": "1234",
-    }
-    metadata = {"Scheduled": False}
-
-    new_state = Alert.TRIGGERED_STATE
-    destination = Webex(options)
-
-    with mock.patch("redash.destinations.webex.requests.post") as mock_post:
-        mock_response = mock.Mock()
-        mock_response.status_code = 200
-        mock_post.return_value = mock_response
-
-        destination.notify(alert, query, user, new_state, app, host, metadata, options)
-
-        query_link = f"{host}/queries/{query.id}"
-        alert_link = f"{host}/alerts/{alert.id}"
-
-        expected_attachments = Webex.formatted_attachments_template(
+        formatted_attachments = Webex.formatted_attachments_template(
             alert.custom_subject, alert.custom_body, query_link, alert_link
         )
 
         expected_payload = {
             "markdown": alert.custom_subject + "\n" + alert.custom_body,
-            "attachments": expected_attachments,
+            "attachments": formatted_attachments,
             "roomId": "1234",
         }
 
@@ -404,60 +302,7 @@ def test_webex_notify_handles_2d_array():
             timeout=5.0,
         )
 
-        assert mock_response.status_code == 200
-
-
-def test_webex_notify_handles_1d_array():
-    alert = mock.Mock(spec_set=["id", "name", "custom_subject", "custom_body", "render_template"])
-    alert.id = 1
-    alert.name = "Test Alert"
-    alert.custom_subject = "Test custom subject"
-    alert.custom_body = "Test custom body with 1D array, however unlikely ['Col1', 'Col2']"
-    alert.render_template = mock.Mock(return_value={"Rendered": "template"})
-
-    query = mock.Mock()
-    query.id = 1
-
-    user = mock.Mock()
-    app = mock.Mock()
-    host = "https://localhost:5000"
-    options = {
-        "webex_bot_token": "abcd",
-        "to_room_ids": "1234",
-    }
-    metadata = {"Scheduled": False}
-
-    new_state = Alert.TRIGGERED_STATE
-    destination = Webex(options)
-
-    with mock.patch("redash.destinations.webex.requests.post") as mock_post:
-        mock_response = mock.Mock()
-        mock_response.status_code = 200
-        mock_post.return_value = mock_response
-
-        destination.notify(alert, query, user, new_state, app, host, metadata, options)
-
-        query_link = f"{host}/queries/{query.id}"
-        alert_link = f"{host}/alerts/{alert.id}"
-
-        expected_attachments = Webex.formatted_attachments_template(
-            alert.custom_subject, alert.custom_body, query_link, alert_link
-        )
-
-        expected_payload = {
-            "markdown": alert.custom_subject + "\n" + alert.custom_body,
-            "attachments": expected_attachments,
-            "roomId": "1234",
-        }
-
-        mock_post.assert_called_once_with(
-            destination.api_base_url,
-            json=expected_payload,
-            headers={"Authorization": "Bearer abcd"},
-            timeout=5.0,
-        )
-
-        assert mock_response.status_code == 200
+        assert mock_response.status_code == 204
 
 
 def test_datadog_notify_calls_requests_post():

tests/query_runner/test_azure_kusto.py

@@ -1,42 +0,0 @@
-from unittest import TestCase
-from unittest.mock import patch
-
-from redash.query_runner.azure_kusto import AzureKusto
-
-
-class TestAzureKusto(TestCase):
-    def setUp(self):
-        self.configuration = {
-            "cluster": "https://example.kusto.windows.net",
-            "database": "sample_db",
-            "azure_ad_client_id": "client_id",
-            "azure_ad_client_secret": "client_secret",
-            "azure_ad_tenant_id": "tenant_id",
-        }
-        self.kusto = AzureKusto(self.configuration)
-
-    @patch.object(AzureKusto, "run_query")
-    def test_get_schema(self, mock_run_query):
-        mock_response = {
-            "rows": [
-                {
-                    "DatabaseSchema": '{"Databases":{"sample_db":{"Tables":{"Table1":{"Name":"Table1","OrderedColumns":[{"Name":"Column1","Type":"System.String","CslType":"string"},{"Name":"Column2","Type":"System.DateTime","CslType":"datetime"}]}},"MaterializedViews":{"View1":{"Name":"View1","OrderedColumns":[{"Name":"Column1","Type":"System.String","CslType":"string"},{"Name":"Column2","Type":"System.DateTime","CslType":"datetime"}]}}}}}'
-                }
-            ]
-        }
-        mock_run_query.return_value = (mock_response, None)
-
-        expected_schema = [
-            {
-                "name": "Table1",
-                "columns": [{"name": "Column1", "type": "string"}, {"name": "Column2", "type": "datetime"}],
-            },
-            {
-                "name": "View1",
-                "columns": [{"name": "Column1", "type": "string"}, {"name": "Column2", "type": "datetime"}],
-            },
-        ]
-
-        schema = self.kusto.get_schema()
-        print(schema)
-        self.assertEqual(schema, expected_schema)

tests/utils/test_json_dumps.py

@@ -1,31 +0,0 @@
-from redash.utils import json_dumps, json_loads
-from tests import BaseTestCase
-
-
-class TestJsonDumps(BaseTestCase):
-    """
-    NaN, Inf, and -Inf are sanitized to None.
-    """
-
-    def test_data_with_nan_is_sanitized(self):
-        input_data = {
-            "columns": [
-                {"name": "_col0", "friendly_name": "_col0", "type": "float"},
-                {"name": "_col1", "friendly_name": "_col1", "type": "float"},
-                {"name": "_col2", "friendly_name": "_col1", "type": "float"},
-                {"name": "_col3", "friendly_name": "_col1", "type": "float"},
-            ],
-            "rows": [{"_col0": 1.0, "_col1": float("nan"), "_col2": float("inf"), "_col3": float("-inf")}],
-        }
-        expected_output_data = {
-            "columns": [
-                {"name": "_col0", "friendly_name": "_col0", "type": "float"},
-                {"name": "_col1", "friendly_name": "_col1", "type": "float"},
-                {"name": "_col2", "friendly_name": "_col1", "type": "float"},
-                {"name": "_col3", "friendly_name": "_col1", "type": "float"},
-            ],
-            "rows": [{"_col0": 1.0, "_col1": None, "_col2": None, "_col3": None}],
-        }
-        json_data = json_dumps(input_data)
-        actual_output_data = json_loads(json_data)
-        self.assertEqual(actual_output_data, expected_output_data)

viz-lib/package.json

@@ -46,7 +46,7 @@
     "@types/jest": "^26.0.18",
     "@types/leaflet": "^1.5.19",
     "@types/numeral": "0.0.28",
-    "@types/plotly.js": "^2.35.2",
+    "@types/plotly.js": "^1.54.22",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "@types/tinycolor2": "^1.4.2",
@@ -91,7 +91,7 @@
     "leaflet.markercluster": "^1.1.0",
     "lodash": "^4.17.10",
     "numeral": "^2.0.6",
-    "plotly.js": "2.35.3",
+    "plotly.js": "1.58.5",
     "react-pivottable": "^0.9.0",
     "react-sortable-hoc": "^1.10.1",
     "tinycolor2": "^1.4.1",

viz-lib/src/visualizations/chart/plotly/fixtures/prepareLayout/box-single-axis.json

@@ -27,17 +27,15 @@
         "automargin": true,
         "showticklabels": true,
         "title": null,
-        "tickformat": null,
         "type": "-"
       },
       "yaxis": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null
-      },
+      },    
       "hoverlabel": {
         "namelength": -1
       }

viz-lib/src/visualizations/chart/plotly/fixtures/prepareLayout/box-with-second-axis.json

@@ -30,13 +30,11 @@
         "automargin": true,
         "showticklabels": true,
         "title": null,
-        "tickformat": null,
         "type": "-"
       },
       "yaxis": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null
@@ -44,13 +42,12 @@
       "yaxis2": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null,
         "overlaying": "y",
         "side": "right"
-      },
+      },    
       "hoverlabel": {
         "namelength": -1
       }

viz-lib/src/visualizations/chart/plotly/fixtures/prepareLayout/default-single-axis.json

@@ -25,21 +25,18 @@
         "automargin": true,
         "showticklabels": true,
         "title": null,
-        "tickformat": null,
         "type": "-"
       },
       "yaxis": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null
-      },
+      },    
       "hoverlabel": {
         "namelength": -1
-      },
-      "hovermode": "x"
+      }
     }
   }
 }

viz-lib/src/visualizations/chart/plotly/fixtures/prepareLayout/default-with-second-axis.json

@@ -28,13 +28,11 @@
         "automargin": true,
         "showticklabels": true,
         "title": null,
-        "tickformat": null,
         "type": "-"
       },
       "yaxis": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null
@@ -42,17 +40,15 @@
       "yaxis2": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null,
         "overlaying": "y",
         "side": "right"
-      },
+      },    
       "hoverlabel": {
         "namelength": -1
-      },
-      "hovermode": "x"
+      }
     }
   }
 }

viz-lib/src/visualizations/chart/plotly/fixtures/prepareLayout/default-with-stacking.json

@@ -24,21 +24,18 @@
         "automargin": true,
         "showticklabels": true,
         "title": null,
-        "tickformat": null,
         "type": "-"
       },
       "yaxis": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null
-      },
+      },    
       "hoverlabel": {
         "namelength": -1
-      },
-      "hovermode": "x"
+      }
     }
   }
 }

viz-lib/src/visualizations/chart/plotly/fixtures/prepareLayout/default-without-legend.json

@@ -23,21 +23,18 @@
         "automargin": true,
         "showticklabels": true,
         "title": null,
-        "tickformat": null,
         "type": "-"
       },
       "yaxis": {
         "automargin": true,
         "title": null,
-        "tickformat": null,
         "type": "linear",
         "autorange": true,
         "range": null
-      },
+      },    
       "hoverlabel": {
         "namelength": -1
-      },
-      "hovermode": "x"
+      }
     }
   }
 }

viz-lib/src/visualizations/chart/plotly/index.ts

@@ -1,6 +1,5 @@
 import * as Plotly from "plotly.js";
 
-import "./locales"
 import prepareData from "./prepareData";
 import prepareLayout from "./prepareLayout";
 import updateData from "./updateData";
@@ -11,8 +10,6 @@ import { prepareCustomChartData, createCustomChartRenderer } from "./customChart
 // @ts-expect-error ts-migrate(2339) FIXME: Property 'setPlotConfig' does not exist on type 't... Remove this comment to see the full error message
 Plotly.setPlotConfig({
   modeBarButtonsToRemove: ["sendDataToCloud"],
-  modeBarButtonsToAdd: ["togglespikelines", "v1hovermode"],
-  locale: window.navigator.language,
 });
 
 export {

viz-lib/src/visualizations/chart/plotly/locales.ts

@@ -1,230 +0,0 @@
-import * as Plotly from "plotly.js";
-
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeAf from "plotly.js/lib/locales/af";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeAm from "plotly.js/lib/locales/am";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeAr_dz from "plotly.js/lib/locales/ar-dz";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeAr_eg from "plotly.js/lib/locales/ar-eg";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeAr from "plotly.js/lib/locales/ar";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeAz from "plotly.js/lib/locales/az";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeBg from "plotly.js/lib/locales/bg";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeBs from "plotly.js/lib/locales/bs";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeCa from "plotly.js/lib/locales/ca";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeCs from "plotly.js/lib/locales/cs";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeCy from "plotly.js/lib/locales/cy";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeDa from "plotly.js/lib/locales/da";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeDe_ch from "plotly.js/lib/locales/de-ch";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeDe from "plotly.js/lib/locales/de";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEl from "plotly.js/lib/locales/el";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEo from "plotly.js/lib/locales/eo";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEs_ar from "plotly.js/lib/locales/es-ar";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEs_pe from "plotly.js/lib/locales/es-pe";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEs from "plotly.js/lib/locales/es";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEt from "plotly.js/lib/locales/et";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeEu from "plotly.js/lib/locales/eu";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeFa from "plotly.js/lib/locales/fa";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeFi from "plotly.js/lib/locales/fi";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeFo from "plotly.js/lib/locales/fo";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeFr_ch from "plotly.js/lib/locales/fr-ch";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeFr from "plotly.js/lib/locales/fr";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeGl from "plotly.js/lib/locales/gl";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeGu from "plotly.js/lib/locales/gu";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeHe from "plotly.js/lib/locales/he";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeHi_in from "plotly.js/lib/locales/hi-in";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeHr from "plotly.js/lib/locales/hr";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeHu from "plotly.js/lib/locales/hu";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeHy from "plotly.js/lib/locales/hy";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeId from "plotly.js/lib/locales/id";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeIs from "plotly.js/lib/locales/is";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeIt from "plotly.js/lib/locales/it";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeJa from "plotly.js/lib/locales/ja";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeKa from "plotly.js/lib/locales/ka";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeKm from "plotly.js/lib/locales/km";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeKo from "plotly.js/lib/locales/ko";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeLt from "plotly.js/lib/locales/lt";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeLv from "plotly.js/lib/locales/lv";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeMe_me from "plotly.js/lib/locales/me-me";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeMe from "plotly.js/lib/locales/me";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeMk from "plotly.js/lib/locales/mk";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeMl from "plotly.js/lib/locales/ml";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeMs from "plotly.js/lib/locales/ms";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeMt from "plotly.js/lib/locales/mt";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeNl_be from "plotly.js/lib/locales/nl-be";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeNl from "plotly.js/lib/locales/nl";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeNo from "plotly.js/lib/locales/no";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localePa from "plotly.js/lib/locales/pa";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localePl from "plotly.js/lib/locales/pl";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localePt_br from "plotly.js/lib/locales/pt-br";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localePt_pt from "plotly.js/lib/locales/pt-pt";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeRm from "plotly.js/lib/locales/rm";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeRo from "plotly.js/lib/locales/ro";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeRu from "plotly.js/lib/locales/ru";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSk from "plotly.js/lib/locales/sk";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSl from "plotly.js/lib/locales/sl";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSq from "plotly.js/lib/locales/sq";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSr_sr from "plotly.js/lib/locales/sr-sr";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSr from "plotly.js/lib/locales/sr";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSv from "plotly.js/lib/locales/sv";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeSw from "plotly.js/lib/locales/sw";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeTa from "plotly.js/lib/locales/ta";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeTh from "plotly.js/lib/locales/th";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeTr from "plotly.js/lib/locales/tr";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeTt from "plotly.js/lib/locales/tt";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeUk from "plotly.js/lib/locales/uk";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeUr from "plotly.js/lib/locales/ur";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeVi from "plotly.js/lib/locales/vi";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeZh_cn from "plotly.js/lib/locales/zh-cn";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeZh_hk from "plotly.js/lib/locales/zh-hk";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module
-import localeZh_tw from "plotly.js/lib/locales/zh-tw";
-
-(Plotly as any).register([
-    localeAf,
-    localeAm,
-    localeAr_dz,
-    localeAr_eg,
-    localeAr,
-    localeAz,
-    localeBg,
-    localeBs,
-    localeCa,
-    localeCs,
-    localeCy,
-    localeDa,
-    localeDe_ch,
-    localeDe,
-    localeEl,
-    localeEo,
-    localeEs_ar,
-    localeEs_pe,
-    localeEs,
-    localeEt,
-    localeEu,
-    localeFa,
-    localeFi,
-    localeFo,
-    localeFr_ch,
-    localeFr,
-    localeGl,
-    localeGu,
-    localeHe,
-    localeHi_in,
-    localeHr,
-    localeHu,
-    localeHy,
-    localeId,
-    localeIs,
-    localeIt,
-    localeJa,
-    localeKa,
-    localeKm,
-    localeKo,
-    localeLt,
-    localeLv,
-    localeMe_me,
-    localeMe,
-    localeMk,
-    localeMl,
-    localeMs,
-    localeMt,
-    localeNl_be,
-    localeNl,
-    localeNo,
-    localePa,
-    localePl,
-    localePt_br,
-    localePt_pt,
-    localeRm,
-    localeRo,
-    localeRu,
-    localeSk,
-    localeSl,
-    localeSq,
-    localeSr_sr,
-    localeSr,
-    localeSv,
-    localeSw,
-    localeTa,
-    localeTh,
-    localeTr,
-    localeTt,
-    localeUk,
-    localeUr,
-    localeVi,
-    localeZh_cn,
-    localeZh_hk,
-    localeZh_tw,
-]);

viz-lib/src/visualizations/chart/plotly/prepareDefaultData.ts

@@ -29,8 +29,6 @@ function prepareBarSeries(series: any, options: any, additionalOptions: any) {
   series.offsetgroup = toString(additionalOptions.index);
   if (options.showDataLabels) {
     series.textposition = "inside";
-  } else {
-    series.textposition = "none";
   }
   return series;
 }
@@ -101,8 +99,8 @@ function prepareSeries(series: any, options: any, numSeries: any, additionalOpti
       };
 
   const sourceData = new Map();
-  const xValues: any[] = [];
-  const yValues: any[] = [];
+
+  const labelsValuesMap = new Map();
 
   const yErrorValues: any = [];
   each(data, row => {
@@ -110,20 +108,27 @@ function prepareSeries(series: any, options: any, numSeries: any, additionalOpti
     const y = cleanYValue(row.y, seriesYAxis === "y2" ? options.yAxis[1].type : options.yAxis[0].type); // depends on series type!
     const yError = cleanNumber(row.yError); // always number
     const size = cleanNumber(row.size); // always number
+    if (labelsValuesMap.has(x)) {
+      labelsValuesMap.set(x, labelsValuesMap.get(x) + y);
+    } else {
+      labelsValuesMap.set(x, y);
+    }
+    const aggregatedY = labelsValuesMap.get(x);
 
     sourceData.set(x, {
       x,
-      y,
+      y: aggregatedY,
       yError,
       size,
       yPercent: null, // will be updated later
       row,
     });
-    xValues.push(x);
-    yValues.push(y);
     yErrorValues.push(yError);
   });
 
+  const xValues = Array.from(labelsValuesMap.keys());
+  const yValues = Array.from(labelsValuesMap.values());
+
   const plotlySeries = {
     visible: true,
     hoverinfo: hoverInfoPattern,

viz-lib/src/visualizations/chart/plotly/prepareLayout.ts

@@ -21,7 +21,7 @@ function prepareXAxis(axisOptions: any, additionalOptions: any) {
     title: getAxisTitle(axisOptions),
     type: getAxisScaleType(axisOptions),
     automargin: true,
-    tickformat: axisOptions.tickFormat ?? null,
+    tickformat: axisOptions.tickFormat,
   };
 
   if (additionalOptions.sortX && axis.type === "category") {
@@ -49,7 +49,7 @@ function prepareYAxis(axisOptions: any) {
     automargin: true,
     autorange: true,
     range: null,
-    tickformat: axisOptions.tickFormat ?? null,
+    tickformat: axisOptions.tickFormat,
   };
 }
 
@@ -109,7 +109,7 @@ function prepareBoxLayout(layout: any, options: any, data: any) {
 }
 
 export default function prepareLayout(element: any, options: any, data: any) {
-  const layout: any = {
+  const layout = {
     margin: { l: 10, r: 10, b: 5, t: 20, pad: 4 },
     // plot size should be at least 5x5px
     width: Math.max(5, Math.floor(element.offsetWidth)),
@@ -124,10 +124,6 @@ export default function prepareLayout(element: any, options: any, data: any) {
     },
   };
 
-  if (["line", "area", "column"].includes(options.globalSeriesType)) {
-    layout.hovermode = options.swappedAxes ? 'y' : 'x';
-  }
-
   switch (options.globalSeriesType) {
     case "pie":
       return preparePieLayout(layout, options, data);

viz-lib/src/visualizations/table/Editor/__snapshots__/ColumnsSettings.test.tsx.snap

@@ -5,7 +5,7 @@ Object {
   "columns": Array [
     Object {
       "alignContent": "right",
-      "allowHTML": false,
+      "allowHTML": true,
       "allowSearch": false,
       "booleanValues": Array [
         "false",
@@ -38,7 +38,7 @@ Object {
   "columns": Array [
     Object {
       "alignContent": "left",
-      "allowHTML": false,
+      "allowHTML": true,
       "allowSearch": false,
       "booleanValues": Array [
         "false",
@@ -71,7 +71,7 @@ Object {
   "columns": Array [
     Object {
       "alignContent": "left",
-      "allowHTML": false,
+      "allowHTML": true,
       "allowSearch": false,
       "booleanValues": Array [
         "false",
@@ -104,7 +104,7 @@ Object {
   "columns": Array [
     Object {
       "alignContent": "left",
-      "allowHTML": false,
+      "allowHTML": true,
       "allowSearch": true,
       "booleanValues": Array [
         "false",
@@ -137,7 +137,7 @@ Object {
   "columns": Array [
     Object {
       "alignContent": "left",
-      "allowHTML": false,
+      "allowHTML": true,
       "allowSearch": false,
       "booleanValues": Array [
         "false",

viz-lib/src/visualizations/table/getOptions.ts

@@ -54,7 +54,7 @@ function getDefaultColumnsOptions(columns: any) {
     allowSearch: false,
     alignContent: getColumnContentAlignment(col.type),
     // `string` cell options
-    allowHTML: false,
+    allowHTML: true,
     highlightLinks: false,
   }));
 }

webpack.config.js

@@ -133,11 +133,6 @@ const config = {
   },
   module: {
     rules: [
-      {
-        test: /\.js$/,
-        enforce: "pre",
-        use: ["source-map-loader"],
-      },
       {
         test: /\.(t|j)sx?$/,
         exclude: /node_modules/,