mirror of
https://github.com/getredash/redash.git
synced 2025-12-19 17:37:19 -05:00
Compare commits
19 Commits
redis-lock
...
25.06.0-de
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b1e910126 | ||
|
|
14550a9a6c | ||
|
|
b80c5f6a7c | ||
|
|
e46d44f208 | ||
|
|
a1a4bc9d3e | ||
|
|
0900178d24 | ||
|
|
5d31429ca8 | ||
|
|
2f35ceb803 | ||
|
|
8e6c02ecde | ||
|
|
231fd36d46 | ||
|
|
0b6a53a079 | ||
|
|
6167edf97c | ||
|
|
4ed0ad3c9c | ||
|
|
2375f0b05f | ||
|
|
eced377ae4 | ||
|
|
84262fe143 | ||
|
|
612eb8c630 | ||
|
|
866fb48afb | ||
|
|
353776e8e1 |
3
.github/workflows/periodic-snapshot.yml
vendored
3
.github/workflows/periodic-snapshot.yml
vendored
@@ -2,7 +2,7 @@ name: Periodic Snapshot
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '10 0 1 * *' # 10 minutes after midnight on the first of every month
|
- cron: '10 0 1 * *' # 10 minutes after midnight on the first day of every month
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
bump:
|
bump:
|
||||||
@@ -24,6 +24,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
bump-version-and-tag:
|
bump-version-and-tag:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
if: github.ref_name == github.event.repository.default_branch
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
21
.github/workflows/preview-image.yml
vendored
21
.github/workflows/preview-image.yml
vendored
@@ -32,6 +32,9 @@ jobs:
|
|||||||
elif [[ "${{ secrets.DOCKER_PASS }}" == '' ]]; then
|
elif [[ "${{ secrets.DOCKER_PASS }}" == '' ]]; then
|
||||||
echo 'Docker password is empty. Skipping build+push'
|
echo 'Docker password is empty. Skipping build+push'
|
||||||
echo skip=true >> "$GITHUB_OUTPUT"
|
echo skip=true >> "$GITHUB_OUTPUT"
|
||||||
|
elif [[ "${{ vars.DOCKER_REPOSITORY }}" == '' ]]; then
|
||||||
|
echo 'Docker repository is empty. Skipping build+push'
|
||||||
|
echo skip=true >> "$GITHUB_OUTPUT"
|
||||||
else
|
else
|
||||||
echo 'Docker user and password are set and branch is `master`.'
|
echo 'Docker user and password are set and branch is `master`.'
|
||||||
echo 'Building + pushing `preview` image.'
|
echo 'Building + pushing `preview` image.'
|
||||||
@@ -97,8 +100,8 @@ jobs:
|
|||||||
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
|
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
|
||||||
with:
|
with:
|
||||||
tags: |
|
tags: |
|
||||||
${{ vars.DOCKER_USER }}/redash
|
${{ vars.DOCKER_REPOSITORY }}/redash
|
||||||
${{ vars.DOCKER_USER }}/preview
|
${{ vars.DOCKER_REPOSITORY }}/preview
|
||||||
context: .
|
context: .
|
||||||
build-args: |
|
build-args: |
|
||||||
test_all_deps=true
|
test_all_deps=true
|
||||||
@@ -114,7 +117,7 @@ jobs:
|
|||||||
if: ${{ github.event.inputs.dockerRepository == 'redash' }}
|
if: ${{ github.event.inputs.dockerRepository == 'redash' }}
|
||||||
with:
|
with:
|
||||||
tags: |
|
tags: |
|
||||||
${{ vars.DOCKER_USER }}/redash:${{ steps.version.outputs.VERSION_TAG }}
|
${{ vars.DOCKER_REPOSITORY }}/redash:${{ steps.version.outputs.VERSION_TAG }}
|
||||||
context: .
|
context: .
|
||||||
build-args: |
|
build-args: |
|
||||||
test_all_deps=true
|
test_all_deps=true
|
||||||
@@ -169,14 +172,14 @@ jobs:
|
|||||||
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
|
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
|
||||||
working-directory: ${{ runner.temp }}/digests
|
working-directory: ${{ runner.temp }}/digests
|
||||||
run: |
|
run: |
|
||||||
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/redash:preview \
|
docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/redash:preview \
|
||||||
$(printf '${{ vars.DOCKER_USER }}/redash:preview@sha256:%s ' *)
|
$(printf '${{ vars.DOCKER_REPOSITORY }}/redash:preview@sha256:%s ' *)
|
||||||
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
|
docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
|
||||||
$(printf '${{ vars.DOCKER_USER }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
|
$(printf '${{ vars.DOCKER_REPOSITORY }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
|
||||||
|
|
||||||
- name: Create and push manifest for the release image
|
- name: Create and push manifest for the release image
|
||||||
if: ${{ github.event.inputs.dockerRepository == 'redash' }}
|
if: ${{ github.event.inputs.dockerRepository == 'redash' }}
|
||||||
working-directory: ${{ runner.temp }}/digests
|
working-directory: ${{ runner.temp }}/digests
|
||||||
run: |
|
run: |
|
||||||
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
|
docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
|
||||||
$(printf '${{ vars.DOCKER_USER }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
|
$(printf '${{ vars.DOCKER_REPOSITORY }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export interface Controller<I, P = any> {
|
|||||||
orderByField?: string;
|
orderByField?: string;
|
||||||
orderByReverse: boolean;
|
orderByReverse: boolean;
|
||||||
toggleSorting: (orderByField: string) => void;
|
toggleSorting: (orderByField: string) => void;
|
||||||
|
setSorting: (orderByField: string, orderByReverse: boolean) => void;
|
||||||
|
|
||||||
// pagination
|
// pagination
|
||||||
page: number;
|
page: number;
|
||||||
@@ -139,10 +140,11 @@ export function wrap<I, P = any>(
|
|||||||
this.props.onError!(error);
|
this.props.onError!(error);
|
||||||
|
|
||||||
const initialState = this.getState({ ...itemsSource.getState(), isLoaded: false });
|
const initialState = this.getState({ ...itemsSource.getState(), isLoaded: false });
|
||||||
const { updatePagination, toggleSorting, updateSearch, updateSelectedTags, update, handleError } = itemsSource;
|
const { updatePagination, toggleSorting, setSorting, updateSearch, updateSelectedTags, update, handleError } = itemsSource;
|
||||||
this.state = {
|
this.state = {
|
||||||
...initialState,
|
...initialState,
|
||||||
toggleSorting, // eslint-disable-line react/no-unused-state
|
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
|
updateSearch: debounce(updateSearch, 200), // eslint-disable-line react/no-unused-state
|
||||||
updateSelectedTags, // eslint-disable-line react/no-unused-state
|
updateSelectedTags, // eslint-disable-line react/no-unused-state
|
||||||
updatePagination, // eslint-disable-line react/no-unused-state
|
updatePagination, // eslint-disable-line react/no-unused-state
|
||||||
|
|||||||
@@ -39,14 +39,12 @@ export class ItemsSource {
|
|||||||
const customParams = {};
|
const customParams = {};
|
||||||
const context = {
|
const context = {
|
||||||
...this.getCallbackContext(),
|
...this.getCallbackContext(),
|
||||||
setCustomParams: params => {
|
setCustomParams: (params) => {
|
||||||
extend(customParams, params);
|
extend(customParams, params);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
return this._beforeUpdate().then(() => {
|
return this._beforeUpdate().then(() => {
|
||||||
const fetchToken = Math.random()
|
const fetchToken = Math.random().toString(36).substr(2);
|
||||||
.toString(36)
|
|
||||||
.substr(2);
|
|
||||||
this._currentFetchToken = fetchToken;
|
this._currentFetchToken = fetchToken;
|
||||||
return this._fetcher
|
return this._fetcher
|
||||||
.fetch(changes, state, context)
|
.fetch(changes, state, context)
|
||||||
@@ -59,7 +57,7 @@ export class ItemsSource {
|
|||||||
return this._afterUpdate();
|
return this._afterUpdate();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => this.handleError(error));
|
.catch((error) => this.handleError(error));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,13 +122,20 @@ export class ItemsSource {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
toggleSorting = orderByField => {
|
toggleSorting = (orderByField) => {
|
||||||
this._sorter.toggleField(orderByField);
|
this._sorter.toggleField(orderByField);
|
||||||
this._savedOrderByField = this._sorter.field;
|
this._savedOrderByField = this._sorter.field;
|
||||||
this._changed({ sorting: true });
|
this._changed({ sorting: true });
|
||||||
};
|
};
|
||||||
|
|
||||||
updateSearch = searchTerm => {
|
setSorting = (orderByField, orderByReverse) => {
|
||||||
|
this._sorter.setField(orderByField);
|
||||||
|
this._sorter.setReverse(orderByReverse);
|
||||||
|
this._savedOrderByField = this._sorter.field;
|
||||||
|
this._changed({ sorting: true });
|
||||||
|
};
|
||||||
|
|
||||||
|
updateSearch = (searchTerm) => {
|
||||||
// here we update state directly, but later `fetchData` will update it properly
|
// here we update state directly, but later `fetchData` will update it properly
|
||||||
this._searchTerm = searchTerm;
|
this._searchTerm = searchTerm;
|
||||||
// in search mode ignore the ordering and use the ranking order
|
// in search mode ignore the ordering and use the ranking order
|
||||||
@@ -145,7 +150,7 @@ export class ItemsSource {
|
|||||||
this._changed({ search: true, pagination: { page: true } });
|
this._changed({ search: true, pagination: { page: true } });
|
||||||
};
|
};
|
||||||
|
|
||||||
updateSelectedTags = selectedTags => {
|
updateSelectedTags = (selectedTags) => {
|
||||||
this._selectedTags = selectedTags;
|
this._selectedTags = selectedTags;
|
||||||
this._paginator.setPage(1);
|
this._paginator.setPage(1);
|
||||||
this._changed({ tags: true, pagination: { page: true } });
|
this._changed({ tags: true, pagination: { page: true } });
|
||||||
@@ -153,7 +158,7 @@ export class ItemsSource {
|
|||||||
|
|
||||||
update = () => this._changed();
|
update = () => this._changed();
|
||||||
|
|
||||||
handleError = error => {
|
handleError = (error) => {
|
||||||
if (isFunction(this.onError)) {
|
if (isFunction(this.onError)) {
|
||||||
this.onError(error);
|
this.onError(error);
|
||||||
}
|
}
|
||||||
@@ -172,7 +177,7 @@ export class ResourceItemsSource extends ItemsSource {
|
|||||||
processResults: (results, context) => {
|
processResults: (results, context) => {
|
||||||
let processItem = getItemProcessor(context);
|
let processItem = getItemProcessor(context);
|
||||||
processItem = isFunction(processItem) ? processItem : identity;
|
processItem = isFunction(processItem) ? processItem : identity;
|
||||||
return map(results, item => processItem(item, context));
|
return map(results, (item) => processItem(item, context));
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export const Columns = {
|
|||||||
date(overrides) {
|
date(overrides) {
|
||||||
return extend(
|
return extend(
|
||||||
{
|
{
|
||||||
render: text => formatDate(text),
|
render: (text) => formatDate(text),
|
||||||
},
|
},
|
||||||
overrides
|
overrides
|
||||||
);
|
);
|
||||||
@@ -52,7 +52,7 @@ export const Columns = {
|
|||||||
dateTime(overrides) {
|
dateTime(overrides) {
|
||||||
return extend(
|
return extend(
|
||||||
{
|
{
|
||||||
render: text => formatDateTime(text),
|
render: (text) => formatDateTime(text),
|
||||||
},
|
},
|
||||||
overrides
|
overrides
|
||||||
);
|
);
|
||||||
@@ -62,7 +62,7 @@ export const Columns = {
|
|||||||
{
|
{
|
||||||
width: "1%",
|
width: "1%",
|
||||||
className: "text-nowrap",
|
className: "text-nowrap",
|
||||||
render: text => durationHumanize(text),
|
render: (text) => durationHumanize(text),
|
||||||
},
|
},
|
||||||
overrides
|
overrides
|
||||||
);
|
);
|
||||||
@@ -70,7 +70,7 @@ export const Columns = {
|
|||||||
timeAgo(overrides, timeAgoCustomProps = undefined) {
|
timeAgo(overrides, timeAgoCustomProps = undefined) {
|
||||||
return extend(
|
return extend(
|
||||||
{
|
{
|
||||||
render: value => <TimeAgo date={value} {...timeAgoCustomProps} />,
|
render: (value) => <TimeAgo date={value} {...timeAgoCustomProps} />,
|
||||||
},
|
},
|
||||||
overrides
|
overrides
|
||||||
);
|
);
|
||||||
@@ -110,6 +110,7 @@ export default class ItemsTable extends React.Component {
|
|||||||
orderByField: PropTypes.string,
|
orderByField: PropTypes.string,
|
||||||
orderByReverse: PropTypes.bool,
|
orderByReverse: PropTypes.bool,
|
||||||
toggleSorting: PropTypes.func,
|
toggleSorting: PropTypes.func,
|
||||||
|
setSorting: PropTypes.func,
|
||||||
"data-test": PropTypes.string,
|
"data-test": PropTypes.string,
|
||||||
rowKey: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
|
rowKey: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
|
||||||
};
|
};
|
||||||
@@ -127,18 +128,15 @@ export default class ItemsTable extends React.Component {
|
|||||||
};
|
};
|
||||||
|
|
||||||
prepareColumns() {
|
prepareColumns() {
|
||||||
const { orderByField, orderByReverse, toggleSorting } = this.props;
|
const { orderByField, orderByReverse } = this.props;
|
||||||
const orderByDirection = orderByReverse ? "descend" : "ascend";
|
const orderByDirection = orderByReverse ? "descend" : "ascend";
|
||||||
|
|
||||||
return map(
|
return map(
|
||||||
map(
|
map(
|
||||||
filter(this.props.columns, column => (isFunction(column.isAvailable) ? column.isAvailable() : true)),
|
filter(this.props.columns, (column) => (isFunction(column.isAvailable) ? column.isAvailable() : true)),
|
||||||
column => extend(column, { orderByField: column.orderByField || column.field })
|
(column) => extend(column, { orderByField: column.orderByField || column.field })
|
||||||
),
|
),
|
||||||
(column, index) => {
|
(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
|
// Wrap render function to pass correct arguments
|
||||||
const render = isFunction(column.render) ? (text, row) => column.render(text, row.item) : identity;
|
const render = isFunction(column.render) ? (text, row) => column.render(text, row.item) : identity;
|
||||||
|
|
||||||
@@ -146,14 +144,13 @@ export default class ItemsTable extends React.Component {
|
|||||||
key: "column" + index,
|
key: "column" + index,
|
||||||
dataIndex: ["item", column.field],
|
dataIndex: ["item", column.field],
|
||||||
defaultSortOrder: column.orderByField === orderByField ? orderByDirection : null,
|
defaultSortOrder: column.orderByField === orderByField ? orderByDirection : null,
|
||||||
onHeaderCell,
|
|
||||||
render,
|
render,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
getRowKey = record => {
|
getRowKey = (record) => {
|
||||||
const { rowKey } = this.props;
|
const { rowKey } = this.props;
|
||||||
if (rowKey) {
|
if (rowKey) {
|
||||||
if (isFunction(rowKey)) {
|
if (isFunction(rowKey)) {
|
||||||
@@ -172,22 +169,43 @@ export default class ItemsTable extends React.Component {
|
|||||||
|
|
||||||
// Bind events only if `onRowClick` specified
|
// Bind events only if `onRowClick` specified
|
||||||
const onTableRow = isFunction(this.props.onRowClick)
|
const onTableRow = isFunction(this.props.onRowClick)
|
||||||
? row => ({
|
? (row) => ({
|
||||||
onClick: event => {
|
onClick: (event) => {
|
||||||
this.props.onRowClick(event, row.item);
|
this.props.onRowClick(event, row.item);
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
: null;
|
: 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;
|
const { showHeader } = this.props;
|
||||||
if (this.props.loading) {
|
if (this.props.loading) {
|
||||||
if (isEmpty(tableDataProps.dataSource)) {
|
if (isEmpty(tableDataProps.dataSource)) {
|
||||||
tableDataProps.columns = tableDataProps.columns.map(column => ({
|
tableDataProps.columns = tableDataProps.columns.map((column) => ({
|
||||||
...column,
|
...column,
|
||||||
sorter: false,
|
sorter: false,
|
||||||
render: () => <Skeleton active paragraph={false} />,
|
render: () => <Skeleton active paragraph={false} />,
|
||||||
}));
|
}));
|
||||||
tableDataProps.dataSource = range(10).map(key => ({ key: `${key}` }));
|
tableDataProps.dataSource = range(10).map((key) => ({ key: `${key}` }));
|
||||||
} else {
|
} else {
|
||||||
tableDataProps.loading = { indicator: null };
|
tableDataProps.loading = { indicator: null };
|
||||||
}
|
}
|
||||||
@@ -200,6 +218,7 @@ export default class ItemsTable extends React.Component {
|
|||||||
rowKey={this.getRowKey}
|
rowKey={this.getRowKey}
|
||||||
pagination={false}
|
pagination={false}
|
||||||
onRow={onTableRow}
|
onRow={onTableRow}
|
||||||
|
onChange={onChange}
|
||||||
data-test={this.props["data-test"]}
|
data-test={this.props["data-test"]}
|
||||||
{...tableDataProps}
|
{...tableDataProps}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en" translate="no">
|
||||||
<head>
|
<head>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
|
|||||||
@@ -160,14 +160,15 @@ function QueriesList({ controller }) {
|
|||||||
orderByField={controller.orderByField}
|
orderByField={controller.orderByField}
|
||||||
orderByReverse={controller.orderByReverse}
|
orderByReverse={controller.orderByReverse}
|
||||||
toggleSorting={controller.toggleSorting}
|
toggleSorting={controller.toggleSorting}
|
||||||
|
setSorting={controller.setSorting}
|
||||||
/>
|
/>
|
||||||
<Paginator
|
<Paginator
|
||||||
showPageSizeSelect
|
showPageSizeSelect
|
||||||
totalCount={controller.totalItemsCount}
|
totalCount={controller.totalItemsCount}
|
||||||
pageSize={controller.itemsPerPage}
|
pageSize={controller.itemsPerPage}
|
||||||
onPageSizeChange={itemsPerPage => controller.updatePagination({ itemsPerPage })}
|
onPageSizeChange={(itemsPerPage) => controller.updatePagination({ itemsPerPage })}
|
||||||
page={controller.page}
|
page={controller.page}
|
||||||
onChange={page => controller.updatePagination({ page })}
|
onChange={(page) => controller.updatePagination({ page })}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
@@ -196,7 +197,7 @@ const QueriesListPage = itemsList(
|
|||||||
}[currentPage];
|
}[currentPage];
|
||||||
},
|
},
|
||||||
getItemProcessor() {
|
getItemProcessor() {
|
||||||
return item => new Query(item);
|
return (item) => new Query(item);
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
() => new UrlStateStorage({ orderByField: "created_at", orderByReverse: true })
|
() => new UrlStateStorage({ orderByField: "created_at", orderByReverse: true })
|
||||||
@@ -207,7 +208,7 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/queries",
|
path: "/queries",
|
||||||
title: "Queries",
|
title: "Queries",
|
||||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="all" />,
|
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="all" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
routes.register(
|
routes.register(
|
||||||
@@ -215,7 +216,7 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/queries/favorites",
|
path: "/queries/favorites",
|
||||||
title: "Favorite Queries",
|
title: "Favorite Queries",
|
||||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="favorites" />,
|
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="favorites" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
routes.register(
|
routes.register(
|
||||||
@@ -223,7 +224,7 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/queries/archive",
|
path: "/queries/archive",
|
||||||
title: "Archived Queries",
|
title: "Archived Queries",
|
||||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="archive" />,
|
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="archive" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
routes.register(
|
routes.register(
|
||||||
@@ -231,6 +232,6 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/queries/my",
|
path: "/queries/my",
|
||||||
title: "My Queries",
|
title: "My Queries",
|
||||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="my" />,
|
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="my" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ const logger = debug("redash:services:QueryResult");
|
|||||||
const filterTypes = ["filter", "multi-filter", "multiFilter"];
|
const filterTypes = ["filter", "multi-filter", "multiFilter"];
|
||||||
|
|
||||||
function defer() {
|
function defer() {
|
||||||
const result = { onStatusChange: status => {} };
|
const result = { onStatusChange: (status) => {} };
|
||||||
result.promise = new Promise((resolve, reject) => {
|
result.promise = new Promise((resolve, reject) => {
|
||||||
result.resolve = resolve;
|
result.resolve = resolve;
|
||||||
result.reject = reject;
|
result.reject = reject;
|
||||||
@@ -40,13 +40,13 @@ function getColumnNameWithoutType(column) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getColumnFriendlyName(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 = {
|
const QueryResultResource = {
|
||||||
get: ({ id }) => axios.get(`api/query_results/${id}`),
|
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 = {
|
export const ExecutionStatus = {
|
||||||
@@ -97,11 +97,11 @@ function handleErrorResponse(queryResult, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function sleep(ms) {
|
function sleep(ms) {
|
||||||
return new Promise(resolve => setTimeout(resolve, ms));
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
}
|
}
|
||||||
|
|
||||||
export function fetchDataFromJob(jobId, interval = 1000) {
|
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];
|
const status = statuses[data.job.status];
|
||||||
if (status === ExecutionStatus.WAITING || status === ExecutionStatus.PROCESSING) {
|
if (status === ExecutionStatus.WAITING || status === ExecutionStatus.PROCESSING) {
|
||||||
return sleep(interval).then(() => fetchDataFromJob(data.job.id));
|
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
|
// 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,
|
// on the column type set by the backend. This logic is prone to errors,
|
||||||
// and better be removed. Kept for now, for backward compatability.
|
// 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) => {
|
forOwn(row, (v, k) => {
|
||||||
let newType = null;
|
let newType = null;
|
||||||
if (isNumber(v)) {
|
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;
|
column.name = "" + column.name;
|
||||||
if (columnTypes[column.name]) {
|
if (columnTypes[column.name]) {
|
||||||
if (column.type == null || column.type === "string") {
|
if (column.type == null || column.type === "string") {
|
||||||
@@ -265,14 +265,14 @@ class QueryResult {
|
|||||||
|
|
||||||
getColumnNames() {
|
getColumnNames() {
|
||||||
if (this.columnNames === undefined && this.query_result.data) {
|
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;
|
return this.columnNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
getColumnFriendlyNames() {
|
getColumnFriendlyNames() {
|
||||||
return this.getColumnNames().map(col => getColumnFriendlyName(col));
|
return this.getColumnNames().map((col) => getColumnFriendlyName(col));
|
||||||
}
|
}
|
||||||
|
|
||||||
getTruncated() {
|
getTruncated() {
|
||||||
@@ -286,7 +286,7 @@ class QueryResult {
|
|||||||
|
|
||||||
const filters = [];
|
const filters = [];
|
||||||
|
|
||||||
this.getColumns().forEach(col => {
|
this.getColumns().forEach((col) => {
|
||||||
const name = col.name;
|
const name = col.name;
|
||||||
const type = name.split("::")[1] || name.split("__")[1];
|
const type = name.split("::")[1] || name.split("__")[1];
|
||||||
if (includes(filterTypes, type)) {
|
if (includes(filterTypes, type)) {
|
||||||
@@ -302,8 +302,8 @@ class QueryResult {
|
|||||||
}
|
}
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
this.getRawData().forEach(row => {
|
this.getRawData().forEach((row) => {
|
||||||
filters.forEach(filter => {
|
filters.forEach((filter) => {
|
||||||
filter.values.push(row[filter.name]);
|
filter.values.push(row[filter.name]);
|
||||||
if (filter.values.length === 1) {
|
if (filter.values.length === 1) {
|
||||||
if (filter.multiple) {
|
if (filter.multiple) {
|
||||||
@@ -315,8 +315,8 @@ class QueryResult {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
filters.forEach(filter => {
|
filters.forEach((filter) => {
|
||||||
filter.values = uniqBy(filter.values, v => {
|
filter.values = uniqBy(filter.values, (v) => {
|
||||||
if (moment.isMoment(v)) {
|
if (moment.isMoment(v)) {
|
||||||
return v.unix();
|
return v.unix();
|
||||||
}
|
}
|
||||||
@@ -345,12 +345,12 @@ class QueryResult {
|
|||||||
|
|
||||||
axios
|
axios
|
||||||
.get(`api/queries/${queryId}/results/${id}.json`)
|
.get(`api/queries/${queryId}/results/${id}.json`)
|
||||||
.then(response => {
|
.then((response) => {
|
||||||
// Success handler
|
// Success handler
|
||||||
queryResult.isLoadingResult = false;
|
queryResult.isLoadingResult = false;
|
||||||
queryResult.update(response);
|
queryResult.update(response);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
// Error handler
|
// Error handler
|
||||||
queryResult.isLoadingResult = false;
|
queryResult.isLoadingResult = false;
|
||||||
handleErrorResponse(queryResult, error);
|
handleErrorResponse(queryResult, error);
|
||||||
@@ -362,10 +362,10 @@ class QueryResult {
|
|||||||
loadLatestCachedResult(queryId, parameters) {
|
loadLatestCachedResult(queryId, parameters) {
|
||||||
axios
|
axios
|
||||||
.post(`api/queries/${queryId}/results`, { queryId, parameters })
|
.post(`api/queries/${queryId}/results`, { queryId, parameters })
|
||||||
.then(response => {
|
.then((response) => {
|
||||||
this.update(response);
|
this.update(response);
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
handleErrorResponse(this, error);
|
handleErrorResponse(this, error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -375,11 +375,11 @@ class QueryResult {
|
|||||||
this.deferred.onStatusChange(ExecutionStatus.LOADING_RESULT);
|
this.deferred.onStatusChange(ExecutionStatus.LOADING_RESULT);
|
||||||
|
|
||||||
QueryResultResource.get({ id: this.job.query_result_id })
|
QueryResultResource.get({ id: this.job.query_result_id })
|
||||||
.then(response => {
|
.then((response) => {
|
||||||
this.update(response);
|
this.update(response);
|
||||||
this.isLoadingResult = false;
|
this.isLoadingResult = false;
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
if (tryCount === undefined) {
|
if (tryCount === undefined) {
|
||||||
tryCount = 0;
|
tryCount = 0;
|
||||||
}
|
}
|
||||||
@@ -394,9 +394,12 @@ class QueryResult {
|
|||||||
});
|
});
|
||||||
this.isLoadingResult = false;
|
this.isLoadingResult = false;
|
||||||
} else {
|
} else {
|
||||||
setTimeout(() => {
|
setTimeout(
|
||||||
this.loadResult(tryCount + 1);
|
() => {
|
||||||
}, 1000 * Math.pow(2, tryCount));
|
this.loadResult(tryCount + 1);
|
||||||
|
},
|
||||||
|
1000 * Math.pow(2, tryCount)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -410,19 +413,26 @@ class QueryResult {
|
|||||||
: axios.get(`api/queries/${query}/jobs/${this.job.id}`);
|
: axios.get(`api/queries/${query}/jobs/${this.job.id}`);
|
||||||
|
|
||||||
request
|
request
|
||||||
.then(jobResponse => {
|
.then((jobResponse) => {
|
||||||
this.update(jobResponse);
|
this.update(jobResponse);
|
||||||
|
|
||||||
if (this.getStatus() === "processing" && this.job.query_result_id && this.job.query_result_id !== "None") {
|
if (this.getStatus() === "processing" && this.job.query_result_id && this.job.query_result_id !== "None") {
|
||||||
loadResult();
|
loadResult();
|
||||||
} else if (this.getStatus() !== "failed") {
|
} else if (this.getStatus() !== "failed") {
|
||||||
const waitTime = tryNumber > 10 ? 3000 : 500;
|
let waitTime;
|
||||||
|
if (tryNumber <= 10) {
|
||||||
|
waitTime = 500;
|
||||||
|
} else if (tryNumber <= 50) {
|
||||||
|
waitTime = 1000;
|
||||||
|
} else {
|
||||||
|
waitTime = 3000;
|
||||||
|
}
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.refreshStatus(query, parameters, tryNumber + 1);
|
this.refreshStatus(query, parameters, tryNumber + 1);
|
||||||
}, waitTime);
|
}, waitTime);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
logger("Connection error", error);
|
logger("Connection error", error);
|
||||||
// TODO: use QueryResultError, or better yet: exception/reject of promise.
|
// TODO: use QueryResultError, or better yet: exception/reject of promise.
|
||||||
this.update({
|
this.update({
|
||||||
@@ -451,14 +461,14 @@ class QueryResult {
|
|||||||
|
|
||||||
axios
|
axios
|
||||||
.post(`api/queries/${id}/results`, { id, parameters, apply_auto_limit: applyAutoLimit, max_age: maxAge })
|
.post(`api/queries/${id}/results`, { id, parameters, apply_auto_limit: applyAutoLimit, max_age: maxAge })
|
||||||
.then(response => {
|
.then((response) => {
|
||||||
queryResult.update(response);
|
queryResult.update(response);
|
||||||
|
|
||||||
if ("job" in response) {
|
if ("job" in response) {
|
||||||
queryResult.refreshStatus(id, parameters);
|
queryResult.refreshStatus(id, parameters);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
handleErrorResponse(queryResult, error);
|
handleErrorResponse(queryResult, error);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -481,14 +491,14 @@ class QueryResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
QueryResultResource.post(params)
|
QueryResultResource.post(params)
|
||||||
.then(response => {
|
.then((response) => {
|
||||||
queryResult.update(response);
|
queryResult.update(response);
|
||||||
|
|
||||||
if ("job" in response) {
|
if ("job" in response) {
|
||||||
queryResult.refreshStatus(query, parameters);
|
queryResult.refreshStatus(query, parameters);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
handleErrorResponse(queryResult, error);
|
handleErrorResponse(queryResult, error);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "redash-client",
|
"name": "redash-client",
|
||||||
"version": "25.03.0-dev",
|
"version": "25.06.0-dev",
|
||||||
"description": "The frontend part of Redash.",
|
"description": "The frontend part of Redash.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -143,6 +143,7 @@
|
|||||||
"react-refresh": "^0.14.0",
|
"react-refresh": "^0.14.0",
|
||||||
"react-test-renderer": "^16.14.0",
|
"react-test-renderer": "^16.14.0",
|
||||||
"request-cookies": "^1.1.0",
|
"request-cookies": "^1.1.0",
|
||||||
|
"source-map-loader": "^1.1.3",
|
||||||
"style-loader": "^2.0.0",
|
"style-loader": "^2.0.0",
|
||||||
"typescript": "^4.1.2",
|
"typescript": "^4.1.2",
|
||||||
"url-loader": "^4.1.1",
|
"url-loader": "^4.1.1",
|
||||||
|
|||||||
2753
poetry.lock
generated
2753
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -12,7 +12,7 @@ force-exclude = '''
|
|||||||
|
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "redash"
|
name = "redash"
|
||||||
version = "25.03.0-dev"
|
version = "25.06.0-dev"
|
||||||
description = "Make Your Company Data Driven. Connect to any data source, easily visualize, dashboard and share your data."
|
description = "Make Your Company Data Driven. Connect to any data source, easily visualize, dashboard and share your data."
|
||||||
authors = ["Arik Fraimovich <arik@redash.io>"]
|
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
|
# to be added to/removed from the mailing list, please reach out to Arik via the above email or Discord
|
||||||
@@ -95,7 +95,7 @@ optional = true
|
|||||||
|
|
||||||
[tool.poetry.group.all_ds.dependencies]
|
[tool.poetry.group.all_ds.dependencies]
|
||||||
atsd-client = "3.0.5"
|
atsd-client = "3.0.5"
|
||||||
azure-kusto-data = "0.0.35"
|
azure-kusto-data = "5.0.1"
|
||||||
boto3 = "1.28.8"
|
boto3 = "1.28.8"
|
||||||
botocore = "1.31.8"
|
botocore = "1.31.8"
|
||||||
cassandra-driver = "3.21.0"
|
cassandra-driver = "3.21.0"
|
||||||
@@ -110,6 +110,7 @@ influxdb = "5.2.3"
|
|||||||
influxdb-client = "1.38.0"
|
influxdb-client = "1.38.0"
|
||||||
memsql = "3.2.0"
|
memsql = "3.2.0"
|
||||||
mysqlclient = "2.1.1"
|
mysqlclient = "2.1.1"
|
||||||
|
numpy = "1.24.4"
|
||||||
nzalchemy = "^11.0.2"
|
nzalchemy = "^11.0.2"
|
||||||
nzpy = ">=1.15"
|
nzpy = ">=1.15"
|
||||||
oauth2client = "4.1.3"
|
oauth2client = "4.1.3"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ from redash.app import create_app # noqa
|
|||||||
from redash.destinations import import_destinations
|
from redash.destinations import import_destinations
|
||||||
from redash.query_runner import import_query_runners
|
from redash.query_runner import import_query_runners
|
||||||
|
|
||||||
__version__ = "25.03.0-dev"
|
__version__ = "25.06.0-dev"
|
||||||
|
|
||||||
|
|
||||||
if os.environ.get("REMOTE_DEBUG"):
|
if os.environ.get("REMOTE_DEBUG"):
|
||||||
|
|||||||
@@ -288,7 +288,10 @@ class BaseSQLQueryRunner(BaseQueryRunner):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
def query_is_select_no_limit(self, query):
|
def query_is_select_no_limit(self, query):
|
||||||
parsed_query = sqlparse.parse(query)[0]
|
parsed_query_list = sqlparse.parse(query)
|
||||||
|
if len(parsed_query_list) == 0:
|
||||||
|
return False
|
||||||
|
parsed_query = parsed_query_list[0]
|
||||||
last_keyword_idx = find_last_keyword_idx(parsed_query)
|
last_keyword_idx = find_last_keyword_idx(parsed_query)
|
||||||
# Either invalid query or query that is not select
|
# Either invalid query or query that is not select
|
||||||
if last_keyword_idx == -1 or parsed_query.tokens[0].value.upper() != "SELECT":
|
if last_keyword_idx == -1 or parsed_query.tokens[0].value.upper() != "SELECT":
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ from redash.query_runner import (
|
|||||||
from redash.utils import json_loads
|
from redash.utils import json_loads
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from azure.kusto.data.exceptions import KustoServiceError
|
from azure.kusto.data import (
|
||||||
from azure.kusto.data.request import (
|
|
||||||
ClientRequestProperties,
|
ClientRequestProperties,
|
||||||
KustoClient,
|
KustoClient,
|
||||||
KustoConnectionStringBuilder,
|
KustoConnectionStringBuilder,
|
||||||
)
|
)
|
||||||
|
from azure.kusto.data.exceptions import KustoServiceError
|
||||||
|
|
||||||
enabled = True
|
enabled = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
@@ -37,6 +37,34 @@ 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):
|
class AzureKusto(BaseQueryRunner):
|
||||||
should_annotate_query = False
|
should_annotate_query = False
|
||||||
noop_query = "let noop = datatable (Noop:string)[1]; noop"
|
noop_query = "let noop = datatable (Noop:string)[1]; noop"
|
||||||
@@ -44,8 +72,6 @@ class AzureKusto(BaseQueryRunner):
|
|||||||
def __init__(self, configuration):
|
def __init__(self, configuration):
|
||||||
super(AzureKusto, self).__init__(configuration)
|
super(AzureKusto, self).__init__(configuration)
|
||||||
self.syntax = "custom"
|
self.syntax = "custom"
|
||||||
self.client_request_properties = ClientRequestProperties()
|
|
||||||
self.client_request_properties.application = "redash"
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def configuration_schema(cls):
|
def configuration_schema(cls):
|
||||||
@@ -60,12 +86,14 @@ class AzureKusto(BaseQueryRunner):
|
|||||||
},
|
},
|
||||||
"azure_ad_tenant_id": {"type": "string", "title": "Azure AD Tenant Id"},
|
"azure_ad_tenant_id": {"type": "string", "title": "Azure AD Tenant Id"},
|
||||||
"database": {"type": "string"},
|
"database": {"type": "string"},
|
||||||
|
"msi": {"type": "boolean", "title": "Use Managed Service Identity"},
|
||||||
|
"user_msi": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "User-assigned managed identity client ID",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"required": [
|
"required": [
|
||||||
"cluster",
|
"cluster",
|
||||||
"azure_ad_client_id",
|
|
||||||
"azure_ad_client_secret",
|
|
||||||
"azure_ad_tenant_id",
|
|
||||||
"database",
|
"database",
|
||||||
],
|
],
|
||||||
"order": [
|
"order": [
|
||||||
@@ -91,18 +119,48 @@ class AzureKusto(BaseQueryRunner):
|
|||||||
return "Azure Data Explorer (Kusto)"
|
return "Azure Data Explorer (Kusto)"
|
||||||
|
|
||||||
def run_query(self, query, user):
|
def run_query(self, query, user):
|
||||||
kcsb = KustoConnectionStringBuilder.with_aad_application_key_authentication(
|
cluster = self.configuration["cluster"]
|
||||||
connection_string=self.configuration["cluster"],
|
msi = self.configuration.get("msi", False)
|
||||||
aad_app_id=self.configuration["azure_ad_client_id"],
|
# Managed Service Identity(MSI)
|
||||||
app_key=self.configuration["azure_ad_client_secret"],
|
if msi:
|
||||||
authority_id=self.configuration["azure_ad_tenant_id"],
|
# 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,
|
||||||
|
)
|
||||||
|
|
||||||
client = KustoClient(kcsb)
|
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"]
|
db = self.configuration["database"]
|
||||||
try:
|
try:
|
||||||
response = client.execute(db, query, self.client_request_properties)
|
response = client.execute(db, query, request_properties)
|
||||||
|
|
||||||
result_cols = response.primary_results[0].columns
|
result_cols = response.primary_results[0].columns
|
||||||
result_rows = response.primary_results[0].rows
|
result_rows = response.primary_results[0].rows
|
||||||
@@ -123,14 +181,15 @@ class AzureKusto(BaseQueryRunner):
|
|||||||
rows.append(row.to_dict())
|
rows.append(row.to_dict())
|
||||||
|
|
||||||
error = None
|
error = None
|
||||||
data = {"columns": columns, "rows": rows}
|
data = {
|
||||||
|
"columns": columns,
|
||||||
|
"rows": rows,
|
||||||
|
"metadata": {"data_scanned": _get_data_scanned(response)},
|
||||||
|
}
|
||||||
|
|
||||||
except KustoServiceError as err:
|
except KustoServiceError as err:
|
||||||
data = None
|
data = None
|
||||||
try:
|
error = str(err)
|
||||||
error = err.args[1][0]["error"]["@message"]
|
|
||||||
except (IndexError, KeyError):
|
|
||||||
error = err.args[1]
|
|
||||||
|
|
||||||
return data, error
|
return data, error
|
||||||
|
|
||||||
@@ -143,7 +202,10 @@ class AzureKusto(BaseQueryRunner):
|
|||||||
self._handle_run_query_error(error)
|
self._handle_run_query_error(error)
|
||||||
|
|
||||||
schema_as_json = json_loads(results["rows"][0]["DatabaseSchema"])
|
schema_as_json = json_loads(results["rows"][0]["DatabaseSchema"])
|
||||||
tables_list = schema_as_json["Databases"][self.configuration["database"]]["Tables"].values()
|
tables_list = [
|
||||||
|
*(schema_as_json["Databases"][self.configuration["database"]]["Tables"].values()),
|
||||||
|
*(schema_as_json["Databases"][self.configuration["database"]]["MaterializedViews"].values()),
|
||||||
|
]
|
||||||
|
|
||||||
schema = {}
|
schema = {}
|
||||||
|
|
||||||
@@ -154,7 +216,9 @@ class AzureKusto(BaseQueryRunner):
|
|||||||
schema[table_name] = {"name": table_name, "columns": []}
|
schema[table_name] = {"name": table_name, "columns": []}
|
||||||
|
|
||||||
for column in table["OrderedColumns"]:
|
for column in table["OrderedColumns"]:
|
||||||
schema[table_name]["columns"].append(column["Name"])
|
schema[table_name]["columns"].append(
|
||||||
|
{"name": column["Name"], "type": TYPES_MAP.get(column["CslType"], None)}
|
||||||
|
)
|
||||||
|
|
||||||
return list(schema.values())
|
return list(schema.values())
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ from redash.query_runner import (
|
|||||||
TYPE_FLOAT,
|
TYPE_FLOAT,
|
||||||
TYPE_INTEGER,
|
TYPE_INTEGER,
|
||||||
TYPE_STRING,
|
TYPE_STRING,
|
||||||
BaseQueryRunner,
|
BaseSQLQueryRunner,
|
||||||
InterruptException,
|
InterruptException,
|
||||||
JobTimeoutException,
|
JobTimeoutException,
|
||||||
register,
|
register,
|
||||||
@@ -86,7 +86,7 @@ def _get_query_results(jobs, project_id, location, job_id, start_index):
|
|||||||
).execute()
|
).execute()
|
||||||
logging.debug("query_reply %s", query_reply)
|
logging.debug("query_reply %s", query_reply)
|
||||||
if not query_reply["jobComplete"]:
|
if not query_reply["jobComplete"]:
|
||||||
time.sleep(10)
|
time.sleep(1)
|
||||||
return _get_query_results(jobs, project_id, location, job_id, start_index)
|
return _get_query_results(jobs, project_id, location, job_id, start_index)
|
||||||
|
|
||||||
return query_reply
|
return query_reply
|
||||||
@@ -98,7 +98,7 @@ def _get_total_bytes_processed_for_resp(bq_response):
|
|||||||
return int(bq_response.get("totalBytesProcessed", "0"))
|
return int(bq_response.get("totalBytesProcessed", "0"))
|
||||||
|
|
||||||
|
|
||||||
class BigQuery(BaseQueryRunner):
|
class BigQuery(BaseSQLQueryRunner):
|
||||||
noop_query = "SELECT 1"
|
noop_query = "SELECT 1"
|
||||||
|
|
||||||
def __init__(self, configuration):
|
def __init__(self, configuration):
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import functools
|
import functools
|
||||||
|
|
||||||
from flask import session
|
from flask import request, session
|
||||||
from flask_login import current_user
|
from flask_login import current_user
|
||||||
from flask_talisman import talisman
|
from flask_talisman import talisman
|
||||||
from flask_wtf.csrf import CSRFProtect, generate_csrf
|
from flask_wtf.csrf import CSRFProtect, generate_csrf
|
||||||
@@ -35,6 +35,15 @@ def init_app(app):
|
|||||||
|
|
||||||
@app.before_request
|
@app.before_request
|
||||||
def check_csrf():
|
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:
|
if not current_user.is_authenticated or "user_id" in session:
|
||||||
csrf.protect()
|
csrf.protect()
|
||||||
|
|
||||||
|
|||||||
42
tests/query_runner/test_azure_kusto.py
Normal file
42
tests/query_runner/test_azure_kusto.py
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
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)
|
||||||
@@ -28,4 +28,4 @@ class TestJsonDumps(BaseTestCase):
|
|||||||
}
|
}
|
||||||
json_data = json_dumps(input_data)
|
json_data = json_dumps(input_data)
|
||||||
actual_output_data = json_loads(json_data)
|
actual_output_data = json_loads(json_data)
|
||||||
self.assertEquals(actual_output_data, expected_output_data)
|
self.assertEqual(actual_output_data, expected_output_data)
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import * as Plotly from "plotly.js";
|
import * as Plotly from "plotly.js";
|
||||||
|
|
||||||
|
import "./locales"
|
||||||
import prepareData from "./prepareData";
|
import prepareData from "./prepareData";
|
||||||
import prepareLayout from "./prepareLayout";
|
import prepareLayout from "./prepareLayout";
|
||||||
import updateData from "./updateData";
|
import updateData from "./updateData";
|
||||||
@@ -11,6 +12,7 @@ import { prepareCustomChartData, createCustomChartRenderer } from "./customChart
|
|||||||
Plotly.setPlotConfig({
|
Plotly.setPlotConfig({
|
||||||
modeBarButtonsToRemove: ["sendDataToCloud"],
|
modeBarButtonsToRemove: ["sendDataToCloud"],
|
||||||
modeBarButtonsToAdd: ["togglespikelines", "v1hovermode"],
|
modeBarButtonsToAdd: ["togglespikelines", "v1hovermode"],
|
||||||
|
locale: window.navigator.language,
|
||||||
});
|
});
|
||||||
|
|
||||||
export {
|
export {
|
||||||
|
|||||||
230
viz-lib/src/visualizations/chart/plotly/locales.ts
Normal file
230
viz-lib/src/visualizations/chart/plotly/locales.ts
Normal file
@@ -0,0 +1,230 @@
|
|||||||
|
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,
|
||||||
|
]);
|
||||||
@@ -29,6 +29,8 @@ function prepareBarSeries(series: any, options: any, additionalOptions: any) {
|
|||||||
series.offsetgroup = toString(additionalOptions.index);
|
series.offsetgroup = toString(additionalOptions.index);
|
||||||
if (options.showDataLabels) {
|
if (options.showDataLabels) {
|
||||||
series.textposition = "inside";
|
series.textposition = "inside";
|
||||||
|
} else {
|
||||||
|
series.textposition = "none";
|
||||||
}
|
}
|
||||||
return series;
|
return series;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -133,6 +133,11 @@ const config = {
|
|||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
rules: [
|
rules: [
|
||||||
|
{
|
||||||
|
test: /\.js$/,
|
||||||
|
enforce: "pre",
|
||||||
|
use: ["source-map-loader"],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
test: /\.(t|j)sx?$/,
|
test: /\.(t|j)sx?$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
|
|||||||
31
yarn.lock
31
yarn.lock
@@ -2624,7 +2624,7 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
|
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
|
||||||
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
|
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
|
||||||
|
|
||||||
abab@^2.0.0:
|
abab@^2.0.0, abab@^2.0.5:
|
||||||
version "2.0.6"
|
version "2.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
|
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
|
||||||
integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
|
integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
|
||||||
@@ -7745,6 +7745,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
|
|||||||
dependencies:
|
dependencies:
|
||||||
safer-buffer ">= 2.1.2 < 3"
|
safer-buffer ">= 2.1.2 < 3"
|
||||||
|
|
||||||
|
iconv-lite@^0.6.2:
|
||||||
|
version "0.6.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
|
||||||
|
integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
|
||||||
|
dependencies:
|
||||||
|
safer-buffer ">= 2.1.2 < 3.0.0"
|
||||||
|
|
||||||
icss-utils@^5.0.0, icss-utils@^5.1.0:
|
icss-utils@^5.0.0, icss-utils@^5.1.0:
|
||||||
version "5.1.0"
|
version "5.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
|
resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
|
||||||
@@ -12650,7 +12657,7 @@ safe-regex@^1.1.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
ret "~0.1.10"
|
ret "~0.1.10"
|
||||||
|
|
||||||
"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
|
"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
|
||||||
version "2.1.2"
|
version "2.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
|
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
|
||||||
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
|
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
|
||||||
@@ -13069,6 +13076,18 @@ source-map-js@^1.2.1:
|
|||||||
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
|
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
|
||||||
integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
|
integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
|
||||||
|
|
||||||
|
source-map-loader@^1.1.3:
|
||||||
|
version "1.1.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.3.tgz#7dbc2fe7ea09d3e43c51fd9fc478b7f016c1f820"
|
||||||
|
integrity sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==
|
||||||
|
dependencies:
|
||||||
|
abab "^2.0.5"
|
||||||
|
iconv-lite "^0.6.2"
|
||||||
|
loader-utils "^2.0.0"
|
||||||
|
schema-utils "^3.0.0"
|
||||||
|
source-map "^0.6.1"
|
||||||
|
whatwg-mimetype "^2.3.0"
|
||||||
|
|
||||||
source-map-resolve@^0.5.0:
|
source-map-resolve@^0.5.0:
|
||||||
version "0.5.3"
|
version "0.5.3"
|
||||||
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
|
resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
|
||||||
@@ -13685,9 +13704,9 @@ tapable@^1.0.0, tapable@^1.1.3:
|
|||||||
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
|
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
|
||||||
|
|
||||||
tar-fs@^2.0.0:
|
tar-fs@^2.0.0:
|
||||||
version "2.1.1"
|
version "2.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
|
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.2.tgz#425f154f3404cb16cb8ff6e671d45ab2ed9596c5"
|
||||||
integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
|
integrity sha512-EsaAXwxmx8UB7FRKqeozqEPop69DXcmYwTQwXvyAPF352HJsPdkVhvTaDPYqfNgruveJIJy3TA2l+2zj8LJIJA==
|
||||||
dependencies:
|
dependencies:
|
||||||
chownr "^1.1.1"
|
chownr "^1.1.1"
|
||||||
mkdirp-classic "^0.5.2"
|
mkdirp-classic "^0.5.2"
|
||||||
@@ -14714,7 +14733,7 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
|
|||||||
dependencies:
|
dependencies:
|
||||||
iconv-lite "0.4.24"
|
iconv-lite "0.4.24"
|
||||||
|
|
||||||
whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
|
whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
|
||||||
version "2.3.0"
|
version "2.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
|
resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
|
||||||
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
|
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
|
||||||
|
|||||||
Reference in New Issue
Block a user