mirror of
https://github.com/getredash/redash.git
synced 2025-12-25 01:03:20 -05:00
Compare commits
64 Commits
25.03.0-de
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2b6027cc0 | ||
|
|
b353057f9a | ||
|
|
8747d02bbe | ||
|
|
5b463b0d83 | ||
|
|
ea589ad477 | ||
|
|
617124850b | ||
|
|
1cc200843c | ||
|
|
e0410e2ffe | ||
|
|
7e39b3668d | ||
|
|
92f15a3ccb | ||
|
|
9a1d33381c | ||
|
|
56c06adc24 | ||
|
|
5e8915afe5 | ||
|
|
b8ebf49436 | ||
|
|
59951eda3d | ||
|
|
777153e7a0 | ||
|
|
47b1309f13 | ||
|
|
120250152f | ||
|
|
ac81f0b223 | ||
|
|
7838058953 | ||
|
|
f95156e924 | ||
|
|
74de676bdf | ||
|
|
2762f1fc85 | ||
|
|
438efd0826 | ||
|
|
e586ab708b | ||
|
|
24ca5135aa | ||
|
|
fae354fcce | ||
|
|
4ae372f022 | ||
|
|
0b5907f12b | ||
|
|
00a97d9266 | ||
|
|
35afe880a1 | ||
|
|
a6298f2753 | ||
|
|
e69283f488 | ||
|
|
09ed3c4b81 | ||
|
|
f5e2a4c0fc | ||
|
|
4e200b4a08 | ||
|
|
5ae1f70d9e | ||
|
|
3f781d262b | ||
|
|
a34c1591e3 | ||
|
|
9f76fda18c | ||
|
|
d8ae679937 | ||
|
|
f3b0b60abd | ||
|
|
df8be91a07 | ||
|
|
c9ddd2a7d6 | ||
|
|
6b1e910126 | ||
|
|
14550a9a6c | ||
|
|
b80c5f6a7c | ||
|
|
e46d44f208 | ||
|
|
a1a4bc9d3e | ||
|
|
0900178d24 | ||
|
|
5d31429ca8 | ||
|
|
2f35ceb803 | ||
|
|
8e6c02ecde | ||
|
|
231fd36d46 | ||
|
|
0b6a53a079 | ||
|
|
6167edf97c | ||
|
|
4ed0ad3c9c | ||
|
|
2375f0b05f | ||
|
|
eced377ae4 | ||
|
|
84262fe143 | ||
|
|
612eb8c630 | ||
|
|
866fb48afb | ||
|
|
353776e8e1 | ||
|
|
594e2f24ef |
@@ -18,7 +18,7 @@ services:
|
||||
image: redis:7-alpine
|
||||
restart: unless-stopped
|
||||
postgres:
|
||||
image: pgautoupgrade/pgautoupgrade:latest
|
||||
image: postgres:18-alpine
|
||||
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
|
||||
@@ -66,7 +66,7 @@ services:
|
||||
image: redis:7-alpine
|
||||
restart: unless-stopped
|
||||
postgres:
|
||||
image: pgautoupgrade/pgautoupgrade:latest
|
||||
image: postgres:18-alpine
|
||||
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
|
||||
3
.github/workflows/periodic-snapshot.yml
vendored
3
.github/workflows/periodic-snapshot.yml
vendored
@@ -2,7 +2,7 @@ name: Periodic Snapshot
|
||||
|
||||
on:
|
||||
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:
|
||||
inputs:
|
||||
bump:
|
||||
@@ -24,6 +24,7 @@ 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:
|
||||
|
||||
23
.github/workflows/preview-image.yml
vendored
23
.github/workflows/preview-image.yml
vendored
@@ -32,6 +32,9 @@ 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.'
|
||||
@@ -97,8 +100,8 @@ jobs:
|
||||
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
|
||||
with:
|
||||
tags: |
|
||||
${{ vars.DOCKER_USER }}/redash
|
||||
${{ vars.DOCKER_USER }}/preview
|
||||
${{ vars.DOCKER_REPOSITORY }}/redash
|
||||
${{ vars.DOCKER_REPOSITORY }}/preview
|
||||
context: .
|
||||
build-args: |
|
||||
test_all_deps=true
|
||||
@@ -114,11 +117,11 @@ jobs:
|
||||
if: ${{ github.event.inputs.dockerRepository == 'redash' }}
|
||||
with:
|
||||
tags: |
|
||||
${{ vars.DOCKER_USER }}/redash:${{ steps.version.outputs.VERSION_TAG }}
|
||||
${{ vars.DOCKER_REPOSITORY }}/redash:${{ steps.version.outputs.VERSION_TAG }}
|
||||
context: .
|
||||
build-args: |
|
||||
test_all_deps=true
|
||||
outputs: type=image,push-by-digest=true,push=true
|
||||
outputs: type=image,push-by-digest=false,push=true
|
||||
cache-from: type=gha,scope=${{ matrix.arch }}
|
||||
cache-to: type=gha,mode=max,scope=${{ matrix.arch }}
|
||||
env:
|
||||
@@ -169,14 +172,14 @@ jobs:
|
||||
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
|
||||
working-directory: ${{ runner.temp }}/digests
|
||||
run: |
|
||||
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/redash:preview \
|
||||
$(printf '${{ vars.DOCKER_USER }}/redash:preview@sha256:%s ' *)
|
||||
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
|
||||
$(printf '${{ vars.DOCKER_USER }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
|
||||
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_USER }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
|
||||
$(printf '${{ vars.DOCKER_USER }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
|
||||
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 ' *)
|
||||
|
||||
@@ -95,7 +95,7 @@ EOF
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
ENV POETRY_VERSION=1.8.3
|
||||
ENV POETRY_VERSION=2.1.4
|
||||
ENV POETRY_HOME=/etc/poetry
|
||||
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||
RUN curl -sSL https://install.python-poetry.org | python3 -
|
||||
|
||||
7
Makefile
7
Makefile
@@ -1,4 +1,4 @@
|
||||
.PHONY: compose_build up test_db create_database clean clean-all down tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
|
||||
.PHONY: compose_build up test_db create_database clean down tests lint backend-unit-tests frontend-unit-tests test build watch start redis-cli bash
|
||||
|
||||
compose_build: .env
|
||||
COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
|
||||
@@ -32,11 +32,6 @@ clean:
|
||||
docker image prune --force
|
||||
docker volume prune --force
|
||||
|
||||
clean-all: clean
|
||||
docker image rm --force \
|
||||
redash/redash:latest redis:7-alpine maildev/maildev:latest \
|
||||
pgautoupgrade/pgautoupgrade:15-alpine3.8 pgautoupgrade/pgautoupgrade:latest
|
||||
|
||||
down:
|
||||
docker compose down
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ server() {
|
||||
MAX_REQUESTS=${MAX_REQUESTS:-1000}
|
||||
MAX_REQUESTS_JITTER=${MAX_REQUESTS_JITTER:-100}
|
||||
TIMEOUT=${REDASH_GUNICORN_TIMEOUT:-60}
|
||||
exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app --max-requests $MAX_REQUESTS --max-requests-jitter $MAX_REQUESTS_JITTER --timeout $TIMEOUT
|
||||
exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app --max-requests $MAX_REQUESTS --max-requests-jitter $MAX_REQUESTS_JITTER --timeout $TIMEOUT --limit-request-line ${REDASH_GUNICORN_LIMIT_REQUEST_LINE:-0}
|
||||
}
|
||||
|
||||
create_db() {
|
||||
|
||||
@@ -15,7 +15,7 @@ body {
|
||||
display: table;
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
height: calc(100vh - 116px);
|
||||
height: calc(100% - 116px);
|
||||
}
|
||||
|
||||
@media (min-width: 992px) {
|
||||
|
||||
BIN
client/app/assets/images/db-logos/duckdb.png
Normal file
BIN
client/app/assets/images/db-logos/duckdb.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
@@ -20,7 +20,7 @@ html {
|
||||
|
||||
html,
|
||||
body {
|
||||
min-height: 100vh;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
@@ -35,7 +35,7 @@ body {
|
||||
}
|
||||
|
||||
#application-root {
|
||||
min-height: 100vh;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#application-root,
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
vertical-align: middle;
|
||||
display: inline-block;
|
||||
width: 1px;
|
||||
height: 100vh;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -135,4 +135,4 @@
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ body.fixed-layout {
|
||||
padding-bottom: 0;
|
||||
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
height: 100%;
|
||||
|
||||
.application-layout-content > div {
|
||||
display: flex;
|
||||
@@ -90,7 +90,7 @@ body.fixed-layout {
|
||||
.embed__vis {
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
height: calc(~'100vh - 25px');
|
||||
height: calc(~'100% - 25px');
|
||||
|
||||
> .embed-heading {
|
||||
flex: 0 0 auto;
|
||||
|
||||
@@ -7,10 +7,10 @@ body #application-root {
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
padding-bottom: 0 !important;
|
||||
height: 100vh;
|
||||
height: 100%;
|
||||
|
||||
.application-layout-side-menu {
|
||||
height: 100vh;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
|
||||
@media @mobileBreakpoint {
|
||||
@@ -47,6 +47,10 @@ body #application-root {
|
||||
}
|
||||
}
|
||||
|
||||
body > section {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
body.fixed-layout #application-root {
|
||||
.application-layout-content {
|
||||
padding-bottom: 0;
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
right: 0;
|
||||
background: linear-gradient(to bottom, transparent, transparent 2px, #f6f8f9 2px, #f6f8f9 5px),
|
||||
linear-gradient(to left, #b3babf, #b3babf 1px, transparent 1px, transparent);
|
||||
background-size: calc((100% + 15px) / 6) 5px;
|
||||
background-size: calc((100% + 15px) / 12) 5px;
|
||||
background-position: -7px 1px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,10 @@ export interface PaginationOptions {
|
||||
itemsPerPage?: number;
|
||||
}
|
||||
|
||||
export interface SearchOptions {
|
||||
isServerSideFTS?: boolean;
|
||||
}
|
||||
|
||||
export interface Controller<I, P = any> {
|
||||
params: P; // TODO: Find out what params is (except merging with props)
|
||||
|
||||
@@ -18,7 +22,7 @@ export interface Controller<I, P = any> {
|
||||
|
||||
// search
|
||||
searchTerm?: string;
|
||||
updateSearch: (searchTerm: string) => void;
|
||||
updateSearch: (searchTerm: string, searchOptions?: SearchOptions) => void;
|
||||
|
||||
// tags
|
||||
selectedTags: string[];
|
||||
@@ -28,6 +32,7 @@ export interface Controller<I, P = any> {
|
||||
orderByField?: string;
|
||||
orderByReverse: boolean;
|
||||
toggleSorting: (orderByField: string) => void;
|
||||
setSorting: (orderByField: string, orderByReverse: boolean) => void;
|
||||
|
||||
// pagination
|
||||
page: number;
|
||||
@@ -93,7 +98,7 @@ export interface ItemsListWrappedComponentProps<I, P = any> {
|
||||
export function wrap<I, P = any>(
|
||||
WrappedComponent: React.ComponentType<ItemsListWrappedComponentProps<I>>,
|
||||
createItemsSource: () => ItemsSource,
|
||||
createStateStorage: () => StateStorage
|
||||
createStateStorage: ( { ...props }) => StateStorage
|
||||
) {
|
||||
class ItemsListWrapper extends React.Component<ItemsListWrapperProps, ItemsListWrapperState<I, P>> {
|
||||
private _itemsSource: ItemsSource;
|
||||
@@ -116,7 +121,7 @@ export function wrap<I, P = any>(
|
||||
constructor(props: ItemsListWrapperProps) {
|
||||
super(props);
|
||||
|
||||
const stateStorage = createStateStorage();
|
||||
const stateStorage = createStateStorage({ ...props });
|
||||
const itemsSource = createItemsSource();
|
||||
this._itemsSource = itemsSource;
|
||||
|
||||
@@ -139,11 +144,33 @@ export function wrap<I, P = any>(
|
||||
this.props.onError!(error);
|
||||
|
||||
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;
|
||||
|
||||
let isRunningUpdateSearch = false;
|
||||
let pendingUpdateSearchParams: any[] | null = null;
|
||||
const debouncedUpdateSearch = debounce(async (...params) => {
|
||||
// Avoid running multiple updateSerch concurrently.
|
||||
// If an updateSearch is already running, we save the params for the latest call.
|
||||
// When the current updateSearch is finished, we call debouncedUpdateSearch again with the saved params.
|
||||
if (isRunningUpdateSearch) {
|
||||
pendingUpdateSearchParams = params;
|
||||
return;
|
||||
}
|
||||
isRunningUpdateSearch = true;
|
||||
await updateSearch(...params);
|
||||
isRunningUpdateSearch = false;
|
||||
if (pendingUpdateSearchParams) {
|
||||
const pendingParams = pendingUpdateSearchParams;
|
||||
pendingUpdateSearchParams = null;
|
||||
debouncedUpdateSearch(...pendingParams);
|
||||
}
|
||||
}, 200);
|
||||
|
||||
this.state = {
|
||||
...initialState,
|
||||
toggleSorting, // eslint-disable-line react/no-unused-state
|
||||
updateSearch: debounce(updateSearch, 200), // eslint-disable-line react/no-unused-state
|
||||
setSorting, // eslint-disable-line react/no-unused-state
|
||||
updateSearch: debouncedUpdateSearch, // eslint-disable-line react/no-unused-state
|
||||
updateSelectedTags, // eslint-disable-line react/no-unused-state
|
||||
updatePagination, // eslint-disable-line react/no-unused-state
|
||||
update, // eslint-disable-line react/no-unused-state
|
||||
|
||||
@@ -39,14 +39,12 @@ 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)
|
||||
@@ -59,7 +57,7 @@ export class ItemsSource {
|
||||
return this._afterUpdate();
|
||||
}
|
||||
})
|
||||
.catch(error => this.handleError(error));
|
||||
.catch((error) => this.handleError(error));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -124,28 +122,35 @@ export class ItemsSource {
|
||||
});
|
||||
};
|
||||
|
||||
toggleSorting = orderByField => {
|
||||
toggleSorting = (orderByField) => {
|
||||
this._sorter.toggleField(orderByField);
|
||||
this._savedOrderByField = this._sorter.field;
|
||||
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, options) => {
|
||||
// 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
|
||||
// provided by the server-side FTS backend instead, unless it was
|
||||
// requested by the user by actively ordering in search mode
|
||||
if (searchTerm === "") {
|
||||
if (searchTerm === "" || !options?.isServerSideFTS) {
|
||||
this._sorter.setField(this._savedOrderByField); // restore ordering
|
||||
} else {
|
||||
this._sorter.setField(null);
|
||||
}
|
||||
this._paginator.setPage(1);
|
||||
this._changed({ search: true, pagination: { page: true } });
|
||||
return 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 } });
|
||||
@@ -153,7 +158,7 @@ export class ItemsSource {
|
||||
|
||||
update = () => this._changed();
|
||||
|
||||
handleError = error => {
|
||||
handleError = (error) => {
|
||||
if (isFunction(this.onError)) {
|
||||
this.onError(error);
|
||||
}
|
||||
@@ -172,7 +177,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));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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,6 +110,7 @@ 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]),
|
||||
};
|
||||
@@ -127,18 +128,15 @@ export default class ItemsTable extends React.Component {
|
||||
};
|
||||
|
||||
prepareColumns() {
|
||||
const { orderByField, orderByReverse, toggleSorting } = this.props;
|
||||
const { orderByField, orderByReverse } = 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;
|
||||
|
||||
@@ -146,14 +144,13 @@ 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)) {
|
||||
@@ -172,22 +169,43 @@ 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 };
|
||||
}
|
||||
@@ -200,6 +218,7 @@ export default class ItemsTable extends React.Component {
|
||||
rowKey={this.getRowKey}
|
||||
pagination={false}
|
||||
onRow={onTableRow}
|
||||
onChange={onChange}
|
||||
data-test={this.props["data-test"]}
|
||||
{...tableDataProps}
|
||||
/>
|
||||
|
||||
@@ -47,20 +47,30 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
|
||||
return (
|
||||
<div {...props}>
|
||||
<div className="schema-list-item">
|
||||
<PlainButton className="table-name" onClick={onToggle}>
|
||||
<i className="fa fa-table m-r-5" aria-hidden="true" />
|
||||
<strong>
|
||||
<span title={item.name}>{tableDisplayName}</span>
|
||||
{!isNil(item.size) && <span> ({item.size})</span>}
|
||||
</strong>
|
||||
</PlainButton>
|
||||
<Tooltip
|
||||
title={item.description}
|
||||
mouseEnterDelay={0}
|
||||
mouseLeaveDelay={0}
|
||||
placement="rightTop"
|
||||
trigger={item.description ? "hover" : ""}
|
||||
overlayStyle={{ whiteSpace: "pre-line" }}
|
||||
>
|
||||
<PlainButton className="table-name" onClick={onToggle}>
|
||||
<i className="fa fa-table m-r-5" aria-hidden="true" />
|
||||
<strong>
|
||||
<span title={item.name}>{tableDisplayName}</span>
|
||||
{!isNil(item.size) && <span> ({item.size})</span>}
|
||||
</strong>
|
||||
</PlainButton>
|
||||
</Tooltip>
|
||||
<Tooltip
|
||||
title="Insert table name into query text"
|
||||
mouseEnterDelay={0}
|
||||
mouseLeaveDelay={0}
|
||||
placement="topRight"
|
||||
arrowPointAtCenter>
|
||||
<PlainButton className="copy-to-editor" onClick={e => handleSelect(e, item.name)}>
|
||||
arrowPointAtCenter
|
||||
>
|
||||
<PlainButton className="copy-to-editor" onClick={(e) => handleSelect(e, item.name)}>
|
||||
<i className="fa fa-angle-double-right" aria-hidden="true" />
|
||||
</PlainButton>
|
||||
</Tooltip>
|
||||
@@ -70,16 +80,23 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
|
||||
{item.loading ? (
|
||||
<div className="table-open">Loading...</div>
|
||||
) : (
|
||||
map(item.columns, column => {
|
||||
map(item.columns, (column) => {
|
||||
const columnName = get(column, "name");
|
||||
const columnType = get(column, "type");
|
||||
const columnDescription = get(column, "description");
|
||||
return (
|
||||
<Tooltip
|
||||
title="Insert column name into query text"
|
||||
title={"Insert column name into query text" + (columnDescription ? "\n" + columnDescription : "")}
|
||||
mouseEnterDelay={0}
|
||||
mouseLeaveDelay={0}
|
||||
placement="rightTop">
|
||||
<PlainButton key={columnName} className="table-open-item" onClick={e => handleSelect(e, columnName)}>
|
||||
placement="rightTop"
|
||||
overlayStyle={{ whiteSpace: "pre-line" }}
|
||||
>
|
||||
<PlainButton
|
||||
key={columnName}
|
||||
className="table-open-item"
|
||||
onClick={(e) => handleSelect(e, columnName)}
|
||||
>
|
||||
<div>
|
||||
{columnName} {columnType && <span className="column-type">{columnType}</span>}
|
||||
</div>
|
||||
@@ -168,7 +185,7 @@ export function SchemaList({ loading, schema, expandedFlags, onTableExpand, onIt
|
||||
}
|
||||
|
||||
export function applyFilterOnSchema(schema, filterString) {
|
||||
const filters = filter(filterString.toLowerCase().split(/\s+/), s => s.length > 0);
|
||||
const filters = filter(filterString.toLowerCase().split(/\s+/), (s) => s.length > 0);
|
||||
|
||||
// Empty string: return original schema
|
||||
if (filters.length === 0) {
|
||||
@@ -181,9 +198,9 @@ export function applyFilterOnSchema(schema, filterString) {
|
||||
const columnFilter = filters[0];
|
||||
return filter(
|
||||
schema,
|
||||
item =>
|
||||
(item) =>
|
||||
includes(item.name.toLowerCase(), nameFilter) ||
|
||||
some(item.columns, column => includes(get(column, "name").toLowerCase(), columnFilter))
|
||||
some(item.columns, (column) => includes(get(column, "name").toLowerCase(), columnFilter))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -191,11 +208,11 @@ export function applyFilterOnSchema(schema, filterString) {
|
||||
const nameFilter = filters[0];
|
||||
const columnFilter = filters[1];
|
||||
return filter(
|
||||
map(schema, item => {
|
||||
map(schema, (item) => {
|
||||
if (includes(item.name.toLowerCase(), nameFilter)) {
|
||||
item = {
|
||||
...item,
|
||||
columns: filter(item.columns, column => includes(get(column, "name").toLowerCase(), columnFilter)),
|
||||
columns: filter(item.columns, (column) => includes(get(column, "name").toLowerCase(), columnFilter)),
|
||||
};
|
||||
return item.columns.length > 0 ? item : null;
|
||||
}
|
||||
@@ -243,7 +260,7 @@ export default function SchemaBrowser({
|
||||
placeholder="Search schema..."
|
||||
aria-label="Search schema"
|
||||
disabled={schema.length === 0}
|
||||
onChange={event => handleFilterChange(event.target.value)}
|
||||
onChange={(event) => handleFilterChange(event.target.value)}
|
||||
/>
|
||||
|
||||
<Tooltip title="Refresh Schema">
|
||||
|
||||
@@ -59,6 +59,7 @@ function wrapComponentWithSettings(WrappedComponent) {
|
||||
"dateTimeFormat",
|
||||
"integerFormat",
|
||||
"floatFormat",
|
||||
"nullValue",
|
||||
"booleanValues",
|
||||
"tableCellMaxJSONSize",
|
||||
"allowCustomJSVisualizations",
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
export default {
|
||||
columns: 6, // grid columns count
|
||||
columns: 12, // grid columns count
|
||||
rowHeight: 50, // grid row height (incl. bottom padding)
|
||||
margins: 15, // widget margins
|
||||
mobileBreakPoint: 800,
|
||||
// defaults for widgets
|
||||
defaultSizeX: 3,
|
||||
defaultSizeX: 6,
|
||||
defaultSizeY: 3,
|
||||
minSizeX: 1,
|
||||
maxSizeX: 6,
|
||||
minSizeY: 1,
|
||||
minSizeX: 2,
|
||||
maxSizeX: 12,
|
||||
minSizeY: 2,
|
||||
maxSizeY: 1000,
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<html lang="en" translate="no">
|
||||
<head>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta charset="UTF-8" />
|
||||
|
||||
@@ -81,12 +81,19 @@ function DashboardListExtraActions(props) {
|
||||
}
|
||||
|
||||
function DashboardList({ controller }) {
|
||||
let usedListColumns = listColumns;
|
||||
if (controller.params.currentPage === "favorites") {
|
||||
usedListColumns = [
|
||||
...usedListColumns,
|
||||
Columns.dateTime.sortable({ title: "Starred At", field: "starred_at", width: "1%" }),
|
||||
];
|
||||
}
|
||||
const {
|
||||
areExtraActionsAvailable,
|
||||
listColumns: tableColumns,
|
||||
Component: ExtraActionsComponent,
|
||||
selectedItems,
|
||||
} = useItemsListExtraActions(controller, listColumns, DashboardListExtraActions);
|
||||
} = useItemsListExtraActions(controller, usedListColumns, DashboardListExtraActions);
|
||||
|
||||
return (
|
||||
<div className="page-dashboard-list">
|
||||
@@ -139,9 +146,9 @@ function DashboardList({ controller }) {
|
||||
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>
|
||||
@@ -170,10 +177,10 @@ const DashboardListPage = itemsList(
|
||||
}[currentPage];
|
||||
},
|
||||
getItemProcessor() {
|
||||
return item => new Dashboard(item);
|
||||
return (item) => new Dashboard(item);
|
||||
},
|
||||
}),
|
||||
() => new UrlStateStorage({ orderByField: "created_at", orderByReverse: true })
|
||||
({ ...props }) => new UrlStateStorage({ orderByField: props.orderByField ?? "created_at", orderByReverse: true })
|
||||
);
|
||||
|
||||
routes.register(
|
||||
@@ -181,7 +188,7 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/dashboards",
|
||||
title: "Dashboards",
|
||||
render: pageProps => <DashboardListPage {...pageProps} currentPage="all" />,
|
||||
render: (pageProps) => <DashboardListPage {...pageProps} currentPage="all" />,
|
||||
})
|
||||
);
|
||||
routes.register(
|
||||
@@ -189,7 +196,7 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/dashboards/favorites",
|
||||
title: "Favorite Dashboards",
|
||||
render: pageProps => <DashboardListPage {...pageProps} currentPage="favorites" />,
|
||||
render: (pageProps) => <DashboardListPage {...pageProps} currentPage="favorites" orderByField="starred_at" />,
|
||||
})
|
||||
);
|
||||
routes.register(
|
||||
@@ -197,6 +204,6 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/dashboards/my",
|
||||
title: "My Dashboards",
|
||||
render: pageProps => <DashboardListPage {...pageProps} currentPage="my" />,
|
||||
render: (pageProps) => <DashboardListPage {...pageProps} currentPage="my" />,
|
||||
})
|
||||
);
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
}
|
||||
|
||||
> .container {
|
||||
min-height: calc(100vh - 95px);
|
||||
min-height: calc(100% - 95px);
|
||||
}
|
||||
|
||||
.loading-message {
|
||||
|
||||
@@ -15,7 +15,7 @@ export function FavoriteList({ title, resource, itemUrl, emptyState }) {
|
||||
useEffect(() => {
|
||||
setLoading(true);
|
||||
resource
|
||||
.favorites()
|
||||
.favorites({ order: "-starred_at" })
|
||||
.then(({ results }) => setItems(results))
|
||||
.finally(() => setLoading(false));
|
||||
}, [resource]);
|
||||
@@ -28,7 +28,7 @@ export function FavoriteList({ title, resource, itemUrl, emptyState }) {
|
||||
</div>
|
||||
{!isEmpty(items) && (
|
||||
<div role="list" className="list-group">
|
||||
{items.map(item => (
|
||||
{items.map((item) => (
|
||||
<Link key={itemUrl(item)} role="listitem" className="list-group-item" href={itemUrl(item)}>
|
||||
<span className="btn-favorite m-r-5">
|
||||
<i className="fa fa-star" aria-hidden="true" />
|
||||
@@ -61,7 +61,7 @@ export function DashboardAndQueryFavoritesList() {
|
||||
<FavoriteList
|
||||
title="Favorite Dashboards"
|
||||
resource={Dashboard}
|
||||
itemUrl={dashboard => dashboard.url}
|
||||
itemUrl={(dashboard) => dashboard.url}
|
||||
emptyState={
|
||||
<p>
|
||||
<span className="btn-favorite m-r-5">
|
||||
@@ -76,7 +76,7 @@ export function DashboardAndQueryFavoritesList() {
|
||||
<FavoriteList
|
||||
title="Favorite Queries"
|
||||
resource={Query}
|
||||
itemUrl={query => `queries/${query.id}`}
|
||||
itemUrl={(query) => `queries/${query.id}`}
|
||||
emptyState={
|
||||
<p>
|
||||
<span className="btn-favorite m-r-5">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useRef } from "react";
|
||||
import React, { useCallback, useEffect, useRef } from "react";
|
||||
import cx from "classnames";
|
||||
|
||||
import routeWithUserSession from "@/components/ApplicationArea/routeWithUserSession";
|
||||
@@ -20,7 +20,7 @@ import ItemsTable, { Columns } from "@/components/items-list/components/ItemsTab
|
||||
import Layout from "@/components/layouts/ContentWithSidebar";
|
||||
|
||||
import { Query } from "@/services/query";
|
||||
import { currentUser } from "@/services/auth";
|
||||
import { clientConfig, currentUser } from "@/services/auth";
|
||||
import location from "@/services/location";
|
||||
import routes from "@/services/routes";
|
||||
|
||||
@@ -95,25 +95,39 @@ function QueriesList({ controller }) {
|
||||
const controllerRef = useRef();
|
||||
controllerRef.current = controller;
|
||||
|
||||
const updateSearch = useCallback(
|
||||
(searchTemm) => {
|
||||
controller.updateSearch(searchTemm, { isServerSideFTS: !clientConfig.multiByteSearchEnabled });
|
||||
},
|
||||
[controller]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const unlistenLocationChanges = location.listen((unused, action) => {
|
||||
const searchTerm = location.search.q || "";
|
||||
if (action === "PUSH" && searchTerm !== controllerRef.current.searchTerm) {
|
||||
controllerRef.current.updateSearch(searchTerm);
|
||||
updateSearch(searchTerm);
|
||||
}
|
||||
});
|
||||
|
||||
return () => {
|
||||
unlistenLocationChanges();
|
||||
};
|
||||
}, []);
|
||||
}, [updateSearch]);
|
||||
|
||||
let usedListColumns = listColumns;
|
||||
if (controller.params.currentPage === "favorites") {
|
||||
usedListColumns = [
|
||||
...usedListColumns,
|
||||
Columns.dateTime.sortable({ title: "Starred At", field: "starred_at", width: "1%" }),
|
||||
];
|
||||
}
|
||||
const {
|
||||
areExtraActionsAvailable,
|
||||
listColumns: tableColumns,
|
||||
Component: ExtraActionsComponent,
|
||||
selectedItems,
|
||||
} = useItemsListExtraActions(controller, listColumns, QueriesListExtraActions);
|
||||
} = useItemsListExtraActions(controller, usedListColumns, QueriesListExtraActions);
|
||||
|
||||
return (
|
||||
<div className="page-queries-list">
|
||||
@@ -135,7 +149,7 @@ function QueriesList({ controller }) {
|
||||
placeholder="Search Queries..."
|
||||
label="Search queries"
|
||||
value={controller.searchTerm}
|
||||
onChange={controller.updateSearch}
|
||||
onChange={updateSearch}
|
||||
/>
|
||||
<Sidebar.Menu items={sidebarMenu} selected={controller.params.currentPage} />
|
||||
<Sidebar.Tags url="api/queries/tags" onChange={controller.updateSelectedTags} showUnselectAll />
|
||||
@@ -160,14 +174,15 @@ 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>
|
||||
@@ -196,10 +211,10 @@ const QueriesListPage = itemsList(
|
||||
}[currentPage];
|
||||
},
|
||||
getItemProcessor() {
|
||||
return item => new Query(item);
|
||||
return (item) => new Query(item);
|
||||
},
|
||||
}),
|
||||
() => new UrlStateStorage({ orderByField: "created_at", orderByReverse: true })
|
||||
({ ...props }) => new UrlStateStorage({ orderByField: props.orderByField ?? "created_at", orderByReverse: true })
|
||||
);
|
||||
|
||||
routes.register(
|
||||
@@ -207,7 +222,7 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/queries",
|
||||
title: "Queries",
|
||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="all" />,
|
||||
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="all" />,
|
||||
})
|
||||
);
|
||||
routes.register(
|
||||
@@ -215,7 +230,7 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/queries/favorites",
|
||||
title: "Favorite Queries",
|
||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="favorites" />,
|
||||
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="favorites" orderByField="starred_at" />,
|
||||
})
|
||||
);
|
||||
routes.register(
|
||||
@@ -223,7 +238,7 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/queries/archive",
|
||||
title: "Archived Queries",
|
||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="archive" />,
|
||||
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="archive" />,
|
||||
})
|
||||
);
|
||||
routes.register(
|
||||
@@ -231,6 +246,6 @@ routes.register(
|
||||
routeWithUserSession({
|
||||
path: "/queries/my",
|
||||
title: "My Queries",
|
||||
render: pageProps => <QueriesListPage {...pageProps} currentPage="my" />,
|
||||
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="my" />,
|
||||
})
|
||||
);
|
||||
|
||||
@@ -9,7 +9,7 @@ function normalizeLocation(rawLocation) {
|
||||
const result = {};
|
||||
|
||||
result.path = pathname;
|
||||
result.search = mapValues(qs.parse(search), value => (isNil(value) ? true : value));
|
||||
result.search = mapValues(qs.parse(search), (value) => (isNil(value) ? true : value));
|
||||
result.hash = trimStart(hash, "#");
|
||||
result.url = `${pathname}${search}${hash}`;
|
||||
|
||||
@@ -27,7 +27,7 @@ const location = {
|
||||
|
||||
confirmChange(handler) {
|
||||
if (isFunction(handler)) {
|
||||
return history.block(nextLocation => {
|
||||
return history.block((nextLocation) => {
|
||||
return handler(normalizeLocation(nextLocation), location);
|
||||
});
|
||||
} else {
|
||||
@@ -60,12 +60,18 @@ const location = {
|
||||
// serialize search and keep existing search parameters (!)
|
||||
if (isObject(newLocation.search)) {
|
||||
newLocation.search = omitBy(extend({}, location.search, newLocation.search), isNil);
|
||||
newLocation.search = mapValues(newLocation.search, value => (value === true ? null : value));
|
||||
newLocation.search = mapValues(newLocation.search, (value) => (value === true ? null : value));
|
||||
newLocation.search = qs.stringify(newLocation.search);
|
||||
}
|
||||
}
|
||||
if (replace) {
|
||||
history.replace(newLocation);
|
||||
if (
|
||||
newLocation.pathname !== location.path ||
|
||||
newLocation.search !== qs.stringify(location.search) ||
|
||||
newLocation.hash !== location.hash
|
||||
) {
|
||||
history.replace(newLocation);
|
||||
}
|
||||
} else {
|
||||
history.push(newLocation);
|
||||
}
|
||||
|
||||
@@ -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,9 +394,12 @@ 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)
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -410,19 +413,26 @@ 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") {
|
||||
const waitTime = tryNumber > 10 ? 3000 : 500;
|
||||
let waitTime;
|
||||
if (tryNumber <= 10) {
|
||||
waitTime = 500;
|
||||
} else if (tryNumber <= 50) {
|
||||
waitTime = 1000;
|
||||
} else {
|
||||
waitTime = 3000;
|
||||
}
|
||||
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({
|
||||
@@ -451,14 +461,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);
|
||||
});
|
||||
|
||||
@@ -481,14 +491,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);
|
||||
});
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ describe("Dashboard", () => {
|
||||
cy.getByTestId("DashboardSaveButton").click();
|
||||
});
|
||||
|
||||
cy.wait("@NewDashboard").then(xhr => {
|
||||
cy.wait("@NewDashboard").then((xhr) => {
|
||||
const id = Cypress._.get(xhr, "response.body.id");
|
||||
assert.isDefined(id, "Dashboard api call returns id");
|
||||
|
||||
@@ -40,13 +40,9 @@ describe("Dashboard", () => {
|
||||
|
||||
cy.getByTestId("DashboardMoreButton").click();
|
||||
|
||||
cy.getByTestId("DashboardMoreButtonMenu")
|
||||
.contains("Archive")
|
||||
.click();
|
||||
cy.getByTestId("DashboardMoreButtonMenu").contains("Archive").click();
|
||||
|
||||
cy.get(".ant-modal .ant-btn")
|
||||
.contains("Archive")
|
||||
.click({ force: true });
|
||||
cy.get(".ant-modal .ant-btn").contains("Archive").click({ force: true });
|
||||
cy.get(".label-tag-archived").should("exist");
|
||||
|
||||
cy.visit("/dashboards");
|
||||
@@ -60,7 +56,7 @@ describe("Dashboard", () => {
|
||||
cy.server();
|
||||
cy.route("GET", "**/api/dashboards/*").as("LoadDashboard");
|
||||
cy.createDashboard("Dashboard multiple urls").then(({ id, slug }) => {
|
||||
[`/dashboards/${id}`, `/dashboards/${id}-anything-here`, `/dashboard/${slug}`].forEach(url => {
|
||||
[`/dashboards/${id}`, `/dashboards/${id}-anything-here`, `/dashboard/${slug}`].forEach((url) => {
|
||||
cy.visit(url);
|
||||
cy.wait("@LoadDashboard");
|
||||
cy.getByTestId(`DashboardId${id}Container`).should("exist");
|
||||
@@ -72,7 +68,7 @@ describe("Dashboard", () => {
|
||||
});
|
||||
|
||||
context("viewport width is at 800px", () => {
|
||||
before(function() {
|
||||
before(function () {
|
||||
cy.login();
|
||||
cy.createDashboard("Foo Bar")
|
||||
.then(({ id }) => {
|
||||
@@ -80,49 +76,42 @@ describe("Dashboard", () => {
|
||||
this.dashboardEditUrl = `/dashboards/${id}?edit`;
|
||||
return cy.addTextbox(id, "Hello World!").then(getWidgetTestId);
|
||||
})
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
cy.getByTestId(elTestId).as("textboxEl");
|
||||
});
|
||||
});
|
||||
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
cy.login();
|
||||
cy.visit(this.dashboardUrl);
|
||||
cy.viewport(800 + menuWidth, 800);
|
||||
});
|
||||
|
||||
it("shows widgets with full width", () => {
|
||||
cy.get("@textboxEl").should($el => {
|
||||
cy.get("@textboxEl").should(($el) => {
|
||||
expect($el.width()).to.eq(770);
|
||||
});
|
||||
|
||||
cy.viewport(801 + menuWidth, 800);
|
||||
cy.get("@textboxEl").should($el => {
|
||||
expect($el.width()).to.eq(378);
|
||||
cy.get("@textboxEl").should(($el) => {
|
||||
expect($el.width()).to.eq(182);
|
||||
});
|
||||
});
|
||||
|
||||
it("hides edit option", () => {
|
||||
cy.getByTestId("DashboardMoreButton")
|
||||
.click()
|
||||
.should("be.visible");
|
||||
cy.getByTestId("DashboardMoreButton").click().should("be.visible");
|
||||
|
||||
cy.getByTestId("DashboardMoreButtonMenu")
|
||||
.contains("Edit")
|
||||
.as("editButton")
|
||||
.should("not.be.visible");
|
||||
cy.getByTestId("DashboardMoreButtonMenu").contains("Edit").as("editButton").should("not.be.visible");
|
||||
|
||||
cy.viewport(801 + menuWidth, 800);
|
||||
cy.get("@editButton").should("be.visible");
|
||||
});
|
||||
|
||||
it("disables edit mode", function() {
|
||||
it("disables edit mode", function () {
|
||||
cy.viewport(801 + menuWidth, 800);
|
||||
cy.visit(this.dashboardEditUrl);
|
||||
cy.contains("button", "Done Editing")
|
||||
.as("saveButton")
|
||||
.should("exist");
|
||||
cy.contains("button", "Done Editing").as("saveButton").should("exist");
|
||||
|
||||
cy.viewport(800 + menuWidth, 800);
|
||||
cy.contains("button", "Done Editing").should("not.exist");
|
||||
@@ -130,14 +119,14 @@ describe("Dashboard", () => {
|
||||
});
|
||||
|
||||
context("viewport width is at 767px", () => {
|
||||
before(function() {
|
||||
before(function () {
|
||||
cy.login();
|
||||
cy.createDashboard("Foo Bar").then(({ id }) => {
|
||||
this.dashboardUrl = `/dashboards/${id}`;
|
||||
});
|
||||
});
|
||||
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
cy.visit(this.dashboardUrl);
|
||||
cy.viewport(767, 800);
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@ import { getWidgetTestId, editDashboard, resizeBy } from "../../support/dashboar
|
||||
const menuWidth = 80;
|
||||
|
||||
describe("Grid compliant widgets", () => {
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
cy.login();
|
||||
cy.viewport(1215 + menuWidth, 800);
|
||||
cy.createDashboard("Foo Bar")
|
||||
@@ -13,7 +13,7 @@ describe("Grid compliant widgets", () => {
|
||||
this.dashboardUrl = `/dashboards/${id}`;
|
||||
return cy.addTextbox(id, "Hello World!").then(getWidgetTestId);
|
||||
})
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
cy.getByTestId(elTestId).as("textboxEl");
|
||||
});
|
||||
@@ -27,7 +27,7 @@ describe("Grid compliant widgets", () => {
|
||||
|
||||
it("stays put when dragged under snap threshold", () => {
|
||||
cy.get("@textboxEl")
|
||||
.dragBy(90)
|
||||
.dragBy(30)
|
||||
.invoke("offset")
|
||||
.should("have.property", "left", 15 + menuWidth); // no change, 15 -> 15
|
||||
});
|
||||
@@ -36,14 +36,14 @@ describe("Grid compliant widgets", () => {
|
||||
cy.get("@textboxEl")
|
||||
.dragBy(110)
|
||||
.invoke("offset")
|
||||
.should("have.property", "left", 215 + menuWidth); // moved by 200, 15 -> 215
|
||||
.should("have.property", "left", 115 + menuWidth); // moved by 100, 15 -> 115
|
||||
});
|
||||
|
||||
it("moves two columns when dragged over snap threshold", () => {
|
||||
cy.get("@textboxEl")
|
||||
.dragBy(330)
|
||||
.dragBy(200)
|
||||
.invoke("offset")
|
||||
.should("have.property", "left", 415 + menuWidth); // moved by 400, 15 -> 415
|
||||
.should("have.property", "left", 215 + menuWidth); // moved by 200, 15 -> 215
|
||||
});
|
||||
});
|
||||
|
||||
@@ -52,7 +52,7 @@ describe("Grid compliant widgets", () => {
|
||||
cy.route("POST", "**/api/widgets/*").as("WidgetSave");
|
||||
|
||||
editDashboard();
|
||||
cy.get("@textboxEl").dragBy(330);
|
||||
cy.get("@textboxEl").dragBy(100);
|
||||
cy.wait("@WidgetSave");
|
||||
});
|
||||
});
|
||||
@@ -64,24 +64,24 @@ describe("Grid compliant widgets", () => {
|
||||
});
|
||||
|
||||
it("stays put when dragged under snap threshold", () => {
|
||||
resizeBy(cy.get("@textboxEl"), 90)
|
||||
resizeBy(cy.get("@textboxEl"), 30)
|
||||
.then(() => cy.get("@textboxEl"))
|
||||
.invoke("width")
|
||||
.should("eq", 585); // no change, 585 -> 585
|
||||
.should("eq", 285); // no change, 285 -> 285
|
||||
});
|
||||
|
||||
it("moves one column when dragged over snap threshold", () => {
|
||||
resizeBy(cy.get("@textboxEl"), 110)
|
||||
.then(() => cy.get("@textboxEl"))
|
||||
.invoke("width")
|
||||
.should("eq", 785); // resized by 200, 585 -> 785
|
||||
.should("eq", 385); // resized by 200, 185 -> 385
|
||||
});
|
||||
|
||||
it("moves two columns when dragged over snap threshold", () => {
|
||||
resizeBy(cy.get("@textboxEl"), 400)
|
||||
.then(() => cy.get("@textboxEl"))
|
||||
.invoke("width")
|
||||
.should("eq", 985); // resized by 400, 585 -> 985
|
||||
.should("eq", 685); // resized by 400, 285 -> 685
|
||||
});
|
||||
});
|
||||
|
||||
@@ -101,16 +101,16 @@ describe("Grid compliant widgets", () => {
|
||||
resizeBy(cy.get("@textboxEl"), 0, 30)
|
||||
.then(() => cy.get("@textboxEl"))
|
||||
.invoke("height")
|
||||
.should("eq", 185); // resized by 50, , 135 -> 185
|
||||
.should("eq", 185);
|
||||
});
|
||||
|
||||
it("shrinks to minimum", () => {
|
||||
cy.get("@textboxEl")
|
||||
.then($el => resizeBy(cy.get("@textboxEl"), -$el.width(), -$el.height())) // resize to 0,0
|
||||
.then(($el) => resizeBy(cy.get("@textboxEl"), -$el.width(), -$el.height())) // resize to 0,0
|
||||
.then(() => cy.get("@textboxEl"))
|
||||
.should($el => {
|
||||
.should(($el) => {
|
||||
expect($el.width()).to.eq(185); // min textbox width
|
||||
expect($el.height()).to.eq(35); // min textbox height
|
||||
expect($el.height()).to.eq(85); // min textbox height
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import { getWidgetTestId, editDashboard } from "../../support/dashboard";
|
||||
|
||||
describe("Textbox", () => {
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
cy.login();
|
||||
cy.createDashboard("Foo Bar").then(({ id }) => {
|
||||
this.dashboardId = id;
|
||||
@@ -12,12 +12,10 @@ describe("Textbox", () => {
|
||||
});
|
||||
|
||||
const confirmDeletionInModal = () => {
|
||||
cy.get(".ant-modal .ant-btn")
|
||||
.contains("Delete")
|
||||
.click({ force: true });
|
||||
cy.get(".ant-modal .ant-btn").contains("Delete").click({ force: true });
|
||||
};
|
||||
|
||||
it("adds textbox", function() {
|
||||
it("adds textbox", function () {
|
||||
cy.visit(this.dashboardUrl);
|
||||
editDashboard();
|
||||
cy.getByTestId("AddTextboxButton").click();
|
||||
@@ -29,10 +27,10 @@ describe("Textbox", () => {
|
||||
cy.get(".widget-text").should("exist");
|
||||
});
|
||||
|
||||
it("removes textbox by X button", function() {
|
||||
it("removes textbox by X button", function () {
|
||||
cy.addTextbox(this.dashboardId, "Hello World!")
|
||||
.then(getWidgetTestId)
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
editDashboard();
|
||||
|
||||
@@ -45,32 +43,30 @@ describe("Textbox", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("removes textbox by menu", function() {
|
||||
it("removes textbox by menu", function () {
|
||||
cy.addTextbox(this.dashboardId, "Hello World!")
|
||||
.then(getWidgetTestId)
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
cy.getByTestId(elTestId).within(() => {
|
||||
cy.getByTestId("WidgetDropdownButton").click();
|
||||
});
|
||||
cy.getByTestId("WidgetDropdownButtonMenu")
|
||||
.contains("Remove from Dashboard")
|
||||
.click();
|
||||
cy.getByTestId("WidgetDropdownButtonMenu").contains("Remove from Dashboard").click();
|
||||
|
||||
confirmDeletionInModal();
|
||||
cy.getByTestId(elTestId).should("not.exist");
|
||||
});
|
||||
});
|
||||
|
||||
it("allows opening menu after removal", function() {
|
||||
it("allows opening menu after removal", function () {
|
||||
let elTestId1;
|
||||
cy.addTextbox(this.dashboardId, "txb 1")
|
||||
.then(getWidgetTestId)
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
elTestId1 = elTestId;
|
||||
return cy.addTextbox(this.dashboardId, "txb 2").then(getWidgetTestId);
|
||||
})
|
||||
.then(elTestId2 => {
|
||||
.then((elTestId2) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
editDashboard();
|
||||
|
||||
@@ -97,10 +93,10 @@ describe("Textbox", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("edits textbox", function() {
|
||||
it("edits textbox", function () {
|
||||
cy.addTextbox(this.dashboardId, "Hello World!")
|
||||
.then(getWidgetTestId)
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
cy.getByTestId(elTestId)
|
||||
.as("textboxEl")
|
||||
@@ -108,17 +104,13 @@ describe("Textbox", () => {
|
||||
cy.getByTestId("WidgetDropdownButton").click();
|
||||
});
|
||||
|
||||
cy.getByTestId("WidgetDropdownButtonMenu")
|
||||
.contains("Edit")
|
||||
.click();
|
||||
cy.getByTestId("WidgetDropdownButtonMenu").contains("Edit").click();
|
||||
|
||||
const newContent = "[edited]";
|
||||
cy.getByTestId("TextboxDialog")
|
||||
.should("exist")
|
||||
.within(() => {
|
||||
cy.get("textarea")
|
||||
.clear()
|
||||
.type(newContent);
|
||||
cy.get("textarea").clear().type(newContent);
|
||||
cy.contains("button", "Save").click();
|
||||
});
|
||||
|
||||
@@ -126,7 +118,7 @@ describe("Textbox", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it("renders textbox according to position configuration", function() {
|
||||
it("renders textbox according to position configuration", function () {
|
||||
const id = this.dashboardId;
|
||||
const txb1Pos = { col: 0, row: 0, sizeX: 3, sizeY: 2 };
|
||||
const txb2Pos = { col: 1, row: 1, sizeX: 3, sizeY: 4 };
|
||||
@@ -135,15 +127,15 @@ describe("Textbox", () => {
|
||||
cy.addTextbox(id, "x", { position: txb1Pos })
|
||||
.then(() => cy.addTextbox(id, "x", { position: txb2Pos }))
|
||||
.then(getWidgetTestId)
|
||||
.then(elTestId => {
|
||||
.then((elTestId) => {
|
||||
cy.visit(this.dashboardUrl);
|
||||
return cy.getByTestId(elTestId);
|
||||
})
|
||||
.should($el => {
|
||||
.should(($el) => {
|
||||
const { top, left } = $el.offset();
|
||||
expect(top).to.be.oneOf([162, 162.015625]);
|
||||
expect(left).to.eq(282);
|
||||
expect($el.width()).to.eq(545);
|
||||
expect(left).to.eq(188);
|
||||
expect($el.width()).to.eq(265);
|
||||
expect($el.height()).to.eq(185);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -3,36 +3,26 @@
|
||||
* @param should Passed to should expression after plot points are captured
|
||||
*/
|
||||
export function assertPlotPreview(should = "exist") {
|
||||
cy.getByTestId("VisualizationPreview")
|
||||
.find("g.plot")
|
||||
.should("exist")
|
||||
.find("g.points")
|
||||
.should(should);
|
||||
cy.getByTestId("VisualizationPreview").find("g.overplot").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 });
|
||||
});
|
||||
@@ -42,19 +32,13 @@ 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();
|
||||
|
||||
@@ -63,39 +47,29 @@ 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]);
|
||||
});
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ services:
|
||||
image: redis:7-alpine
|
||||
restart: unless-stopped
|
||||
postgres:
|
||||
image: pgautoupgrade/pgautoupgrade:latest
|
||||
image: postgres:18-alpine
|
||||
ports:
|
||||
- "15432:5432"
|
||||
# The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3
|
||||
|
||||
26
migrations/versions/1655999df5e3_default_alert_selector.py
Normal file
26
migrations/versions/1655999df5e3_default_alert_selector.py
Normal file
@@ -0,0 +1,26 @@
|
||||
"""set default alert selector
|
||||
|
||||
Revision ID: 1655999df5e3
|
||||
Revises: 9e8c841d1a30
|
||||
Create Date: 2025-07-09 14:44:00
|
||||
|
||||
"""
|
||||
|
||||
from alembic import op
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '1655999df5e3'
|
||||
down_revision = '9e8c841d1a30'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
op.execute("""
|
||||
UPDATE alerts
|
||||
SET options = jsonb_set(options, '{selector}', '"first"')
|
||||
WHERE options->>'selector' IS NULL;
|
||||
""")
|
||||
|
||||
def downgrade():
|
||||
pass
|
||||
@@ -0,0 +1,34 @@
|
||||
"""12-column dashboard layout
|
||||
|
||||
Revision ID: db0aca1ebd32
|
||||
Revises: 1655999df5e3
|
||||
Create Date: 2025-03-31 13:45:43.160893
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = 'db0aca1ebd32'
|
||||
down_revision = '1655999df5e3'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
op.execute("""
|
||||
UPDATE widgets
|
||||
SET options = jsonb_set(options, '{position,col}', to_json((options->'position'->>'col')::int * 2)::jsonb);
|
||||
UPDATE widgets
|
||||
SET options = jsonb_set(options, '{position,sizeX}', to_json((options->'position'->>'sizeX')::int * 2)::jsonb);
|
||||
""")
|
||||
|
||||
|
||||
def downgrade():
|
||||
op.execute("""
|
||||
UPDATE widgets
|
||||
SET options = jsonb_set(options, '{position,col}', to_json((options->'position'->>'col')::int / 2)::jsonb);
|
||||
UPDATE widgets
|
||||
SET options = jsonb_set(options, '{position,sizeX}', to_json((options->'position'->>'sizeX')::int / 2)::jsonb);
|
||||
""")
|
||||
23
package.json
23
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "redash-client",
|
||||
"version": "25.03.0-dev",
|
||||
"version": "25.10.0-dev",
|
||||
"description": "The frontend part of Redash.",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
@@ -46,8 +46,8 @@
|
||||
"dependencies": {
|
||||
"@ant-design/icons": "^4.2.1",
|
||||
"@redash/viz": "file:viz-lib",
|
||||
"ace-builds": "^1.4.12",
|
||||
"antd": "^4.4.3",
|
||||
"ace-builds": "^1.43.3",
|
||||
"antd": "4.4.3",
|
||||
"axios": "0.27.2",
|
||||
"axios-auth-refresh": "3.3.6",
|
||||
"bootstrap": "^3.4.1",
|
||||
@@ -68,7 +68,7 @@
|
||||
"prop-types": "^15.6.1",
|
||||
"query-string": "^6.9.0",
|
||||
"react": "16.14.0",
|
||||
"react-ace": "^9.1.1",
|
||||
"react-ace": "^14.0.1",
|
||||
"react-dom": "^16.14.0",
|
||||
"react-grid-layout": "^0.18.2",
|
||||
"react-resizable": "^1.10.1",
|
||||
@@ -100,6 +100,7 @@
|
||||
"@types/sql-formatter": "^2.3.0",
|
||||
"@typescript-eslint/eslint-plugin": "^2.10.0",
|
||||
"@typescript-eslint/parser": "^2.10.0",
|
||||
"assert": "^2.1.0",
|
||||
"atob": "^2.1.2",
|
||||
"babel-eslint": "^10.0.3",
|
||||
"babel-jest": "^24.1.0",
|
||||
@@ -138,20 +139,24 @@
|
||||
"mini-css-extract-plugin": "^1.6.2",
|
||||
"mockdate": "^2.0.2",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^1.19.1",
|
||||
"prettier": "3.3.2",
|
||||
"process": "^0.11.10",
|
||||
"raw-loader": "^0.5.1",
|
||||
"react-refresh": "^0.14.0",
|
||||
"react-test-renderer": "^16.14.0",
|
||||
"request-cookies": "^1.1.0",
|
||||
"source-map-loader": "^1.1.3",
|
||||
"stream-browserify": "^3.0.0",
|
||||
"style-loader": "^2.0.0",
|
||||
"typescript": "^4.1.2",
|
||||
"typescript": "4.1.2",
|
||||
"url": "^0.11.4",
|
||||
"url-loader": "^4.1.1",
|
||||
"webpack": "^4.46.0",
|
||||
"webpack-build-notifier": "^2.3.0",
|
||||
"webpack": "^5.101.3",
|
||||
"webpack-build-notifier": "^3.0.1",
|
||||
"webpack-bundle-analyzer": "^4.9.0",
|
||||
"webpack-cli": "^4.10.0",
|
||||
"webpack-dev-server": "^4.15.1",
|
||||
"webpack-manifest-plugin": "^2.0.4"
|
||||
"webpack-manifest-plugin": "^5.0.1"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "^2.3.2"
|
||||
|
||||
3091
poetry.lock
generated
3091
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,17 @@
|
||||
[project]
|
||||
name = "redash"
|
||||
version = "25.10.0-dev"
|
||||
requires-python = ">=3.8"
|
||||
description = "Make Your Company Data Driven. Connect to any data source, easily visualize, dashboard and share your data."
|
||||
authors = [
|
||||
{ name = "Arik Fraimovich", email = "<arik@redash.io>" }
|
||||
]
|
||||
# to be added to/removed from the mailing list, please reach out to Arik via the above email or Discord
|
||||
maintainers = [
|
||||
{ name = "Redash maintainers and contributors", email = "<maintainers@redash.io>" }
|
||||
]
|
||||
readme = "README.md"
|
||||
dependencies = []
|
||||
|
||||
[tool.black]
|
||||
target-version = ['py38']
|
||||
@@ -10,17 +22,6 @@ force-exclude = '''
|
||||
)/
|
||||
'''
|
||||
|
||||
[tool.poetry]
|
||||
name = "redash"
|
||||
version = "25.03.0-dev"
|
||||
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
|
||||
maintainers = [
|
||||
"Redash maintainers and contributors <maintainers@redash.io>",
|
||||
]
|
||||
readme = "README.md"
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = ">=3.8,<3.11"
|
||||
advocate = "1.0.0"
|
||||
@@ -95,7 +96,7 @@ optional = true
|
||||
|
||||
[tool.poetry.group.all_ds.dependencies]
|
||||
atsd-client = "3.0.5"
|
||||
azure-kusto-data = "0.0.35"
|
||||
azure-kusto-data = "5.0.1"
|
||||
boto3 = "1.28.8"
|
||||
botocore = "1.31.8"
|
||||
cassandra-driver = "3.21.0"
|
||||
@@ -103,6 +104,7 @@ certifi = ">=2019.9.11"
|
||||
cmem-cmempy = "21.2.3"
|
||||
databend-py = "0.4.6"
|
||||
databend-sqlalchemy = "0.2.4"
|
||||
duckdb = "1.3.2"
|
||||
google-api-python-client = "1.7.11"
|
||||
gspread = "5.11.2"
|
||||
impyla = "0.16.0"
|
||||
@@ -110,6 +112,7 @@ 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"
|
||||
|
||||
@@ -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.03.0-dev"
|
||||
__version__ = "25.10.0-dev"
|
||||
|
||||
|
||||
if os.environ.get("REMOTE_DEBUG"):
|
||||
|
||||
@@ -4,7 +4,7 @@ import requests
|
||||
from authlib.integrations.flask_client import OAuth
|
||||
from flask import Blueprint, flash, redirect, request, session, url_for
|
||||
|
||||
from redash import models
|
||||
from redash import models, settings
|
||||
from redash.authentication import (
|
||||
create_and_login_user,
|
||||
get_next_path,
|
||||
@@ -29,6 +29,41 @@ def verify_profile(org, profile):
|
||||
return False
|
||||
|
||||
|
||||
def get_user_profile(access_token, logger):
|
||||
headers = {"Authorization": f"OAuth {access_token}"}
|
||||
response = requests.get("https://www.googleapis.com/oauth2/v1/userinfo", headers=headers)
|
||||
|
||||
if response.status_code == 401:
|
||||
logger.warning("Failed getting user profile (response code 401).")
|
||||
return None
|
||||
|
||||
return response.json()
|
||||
|
||||
|
||||
def build_redirect_uri():
|
||||
scheme = settings.GOOGLE_OAUTH_SCHEME_OVERRIDE or None
|
||||
return url_for(".callback", _external=True, _scheme=scheme)
|
||||
|
||||
|
||||
def build_next_path(org_slug=None):
|
||||
next_path = request.args.get("next")
|
||||
if not next_path:
|
||||
if org_slug is None:
|
||||
org_slug = session.get("org_slug")
|
||||
|
||||
scheme = None
|
||||
if settings.GOOGLE_OAUTH_SCHEME_OVERRIDE:
|
||||
scheme = settings.GOOGLE_OAUTH_SCHEME_OVERRIDE
|
||||
|
||||
next_path = url_for(
|
||||
"redash.index",
|
||||
org_slug=org_slug,
|
||||
_external=True,
|
||||
_scheme=scheme,
|
||||
)
|
||||
return next_path
|
||||
|
||||
|
||||
def create_google_oauth_blueprint(app):
|
||||
oauth = OAuth(app)
|
||||
|
||||
@@ -36,23 +71,12 @@ def create_google_oauth_blueprint(app):
|
||||
blueprint = Blueprint("google_oauth", __name__)
|
||||
|
||||
CONF_URL = "https://accounts.google.com/.well-known/openid-configuration"
|
||||
oauth = OAuth(app)
|
||||
oauth.register(
|
||||
name="google",
|
||||
server_metadata_url=CONF_URL,
|
||||
client_kwargs={"scope": "openid email profile"},
|
||||
)
|
||||
|
||||
def get_user_profile(access_token):
|
||||
headers = {"Authorization": "OAuth {}".format(access_token)}
|
||||
response = requests.get("https://www.googleapis.com/oauth2/v1/userinfo", headers=headers)
|
||||
|
||||
if response.status_code == 401:
|
||||
logger.warning("Failed getting user profile (response code 401).")
|
||||
return None
|
||||
|
||||
return response.json()
|
||||
|
||||
@blueprint.route("/<org_slug>/oauth/google", endpoint="authorize_org")
|
||||
def org_login(org_slug):
|
||||
session["org_slug"] = current_org.slug
|
||||
@@ -60,9 +84,9 @@ def create_google_oauth_blueprint(app):
|
||||
|
||||
@blueprint.route("/oauth/google", endpoint="authorize")
|
||||
def login():
|
||||
redirect_uri = url_for(".callback", _external=True)
|
||||
redirect_uri = build_redirect_uri()
|
||||
|
||||
next_path = request.args.get("next", url_for("redash.index", org_slug=session.get("org_slug")))
|
||||
next_path = build_next_path()
|
||||
logger.debug("Callback url: %s", redirect_uri)
|
||||
logger.debug("Next is: %s", next_path)
|
||||
|
||||
@@ -86,7 +110,7 @@ def create_google_oauth_blueprint(app):
|
||||
flash("Validation error. Please retry.")
|
||||
return redirect(url_for("redash.login"))
|
||||
|
||||
profile = get_user_profile(access_token)
|
||||
profile = get_user_profile(access_token, logger)
|
||||
if profile is None:
|
||||
flash("Validation error. Please retry.")
|
||||
return redirect(url_for("redash.login"))
|
||||
@@ -110,7 +134,9 @@ def create_google_oauth_blueprint(app):
|
||||
if user is None:
|
||||
return logout_and_redirect_to_index()
|
||||
|
||||
unsafe_next_path = session.get("next_url") or url_for("redash.index", org_slug=org.slug)
|
||||
unsafe_next_path = session.get("next_url")
|
||||
if not unsafe_next_path:
|
||||
unsafe_next_path = build_next_path(org.slug)
|
||||
next_path = get_next_path(unsafe_next_path)
|
||||
|
||||
return redirect(next_path)
|
||||
|
||||
@@ -255,6 +255,12 @@ def number_format_config():
|
||||
}
|
||||
|
||||
|
||||
def null_value_config():
|
||||
return {
|
||||
"nullValue": current_org.get_setting("null_value"),
|
||||
}
|
||||
|
||||
|
||||
def client_config():
|
||||
if not current_user.is_api_user() and current_user.is_authenticated:
|
||||
client_config = {
|
||||
@@ -272,6 +278,7 @@ def client_config():
|
||||
"showPermissionsControl": current_org.get_setting("feature_show_permissions_control"),
|
||||
"hidePlotlyModeBar": current_org.get_setting("hide_plotly_mode_bar"),
|
||||
"disablePublicUrls": current_org.get_setting("disable_public_urls"),
|
||||
"multiByteSearchEnabled": current_org.get_setting("multi_byte_search_enabled"),
|
||||
"allowCustomJSVisualizations": settings.FEATURE_ALLOW_CUSTOM_JS_VISUALIZATIONS,
|
||||
"autoPublishNamedQueries": settings.FEATURE_AUTO_PUBLISH_NAMED_QUERIES,
|
||||
"extendedAlertOptions": settings.FEATURE_EXTENDED_ALERT_OPTIONS,
|
||||
@@ -289,6 +296,7 @@ def client_config():
|
||||
client_config.update({"basePath": base_href()})
|
||||
client_config.update(date_time_format_config())
|
||||
client_config.update(number_format_config())
|
||||
client_config.update(null_value_config())
|
||||
|
||||
return client_config
|
||||
|
||||
|
||||
@@ -26,6 +26,8 @@ order_map = {
|
||||
"-name": "-lowercase_name",
|
||||
"created_at": "created_at",
|
||||
"-created_at": "-created_at",
|
||||
"starred_at": "favorites-created_at",
|
||||
"-starred_at": "-favorites-created_at",
|
||||
}
|
||||
|
||||
order_results = partial(_order_results, default_order="-created_at", allowed_orders=order_map)
|
||||
|
||||
@@ -44,6 +44,8 @@ order_map = {
|
||||
"-executed_at": "-query_results-retrieved_at",
|
||||
"created_by": "users-name",
|
||||
"-created_by": "-users-name",
|
||||
"starred_at": "favorites-created_at",
|
||||
"-starred_at": "-favorites-created_at",
|
||||
}
|
||||
|
||||
order_results = partial(_order_results, default_order="-created_at", allowed_orders=order_map)
|
||||
|
||||
@@ -228,7 +228,7 @@ class DataSource(BelongsToOrgMixin, db.Model):
|
||||
|
||||
def _sort_schema(self, schema):
|
||||
return [
|
||||
{"name": i["name"], "columns": sorted(i["columns"], key=lambda x: x["name"] if isinstance(x, dict) else x)}
|
||||
{**i, "columns": sorted(i["columns"], key=lambda x: x["name"] if isinstance(x, dict) else x)}
|
||||
for i in sorted(schema, key=lambda x: x["name"])
|
||||
]
|
||||
|
||||
@@ -564,7 +564,7 @@ class Query(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model):
|
||||
db.session.query(tag_column, usage_count)
|
||||
.group_by(tag_column)
|
||||
.filter(Query.id.in_(queries.options(load_only("id"))))
|
||||
.order_by(usage_count.desc())
|
||||
.order_by(tag_column)
|
||||
)
|
||||
return query
|
||||
|
||||
@@ -1137,7 +1137,7 @@ class Dashboard(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model
|
||||
db.session.query(tag_column, usage_count)
|
||||
.group_by(tag_column)
|
||||
.filter(Dashboard.id.in_(dashboards.options(load_only("id"))))
|
||||
.order_by(usage_count.desc())
|
||||
.order_by(tag_column)
|
||||
)
|
||||
return query
|
||||
|
||||
@@ -1145,15 +1145,19 @@ class Dashboard(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model
|
||||
def favorites(cls, user, base_query=None):
|
||||
if base_query is None:
|
||||
base_query = cls.all(user.org, user.group_ids, user.id)
|
||||
return base_query.join(
|
||||
(
|
||||
Favorite,
|
||||
and_(
|
||||
Favorite.object_type == "Dashboard",
|
||||
Favorite.object_id == Dashboard.id,
|
||||
),
|
||||
return (
|
||||
base_query.distinct(cls.lowercase_name, Dashboard.created_at, Dashboard.slug, Favorite.created_at)
|
||||
.join(
|
||||
(
|
||||
Favorite,
|
||||
and_(
|
||||
Favorite.object_type == "Dashboard",
|
||||
Favorite.object_id == Dashboard.id,
|
||||
),
|
||||
)
|
||||
)
|
||||
).filter(Favorite.user_id == user.id)
|
||||
.filter(Favorite.user_id == user.id)
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def by_user(cls, user):
|
||||
|
||||
@@ -288,7 +288,10 @@ class BaseSQLQueryRunner(BaseQueryRunner):
|
||||
return True
|
||||
|
||||
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)
|
||||
# Either invalid query or query that is not 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
|
||||
|
||||
try:
|
||||
from azure.kusto.data.exceptions import KustoServiceError
|
||||
from azure.kusto.data.request import (
|
||||
from azure.kusto.data import (
|
||||
ClientRequestProperties,
|
||||
KustoClient,
|
||||
KustoConnectionStringBuilder,
|
||||
)
|
||||
from azure.kusto.data.exceptions import KustoServiceError
|
||||
|
||||
enabled = True
|
||||
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):
|
||||
should_annotate_query = False
|
||||
noop_query = "let noop = datatable (Noop:string)[1]; noop"
|
||||
@@ -44,8 +72,6 @@ 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):
|
||||
@@ -60,12 +86,14 @@ 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": [
|
||||
@@ -91,18 +119,48 @@ class AzureKusto(BaseQueryRunner):
|
||||
return "Azure Data Explorer (Kusto)"
|
||||
|
||||
def run_query(self, query, user):
|
||||
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"],
|
||||
)
|
||||
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,
|
||||
)
|
||||
|
||||
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, self.client_request_properties)
|
||||
response = client.execute(db, query, request_properties)
|
||||
|
||||
result_cols = response.primary_results[0].columns
|
||||
result_rows = response.primary_results[0].rows
|
||||
@@ -123,14 +181,15 @@ class AzureKusto(BaseQueryRunner):
|
||||
rows.append(row.to_dict())
|
||||
|
||||
error = None
|
||||
data = {"columns": columns, "rows": rows}
|
||||
data = {
|
||||
"columns": columns,
|
||||
"rows": rows,
|
||||
"metadata": {"data_scanned": _get_data_scanned(response)},
|
||||
}
|
||||
|
||||
except KustoServiceError as err:
|
||||
data = None
|
||||
try:
|
||||
error = err.args[1][0]["error"]["@message"]
|
||||
except (IndexError, KeyError):
|
||||
error = err.args[1]
|
||||
error = str(err)
|
||||
|
||||
return data, error
|
||||
|
||||
@@ -143,7 +202,10 @@ 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()
|
||||
tables_list = [
|
||||
*(schema_as_json["Databases"][self.configuration["database"]]["Tables"].values()),
|
||||
*(schema_as_json["Databases"][self.configuration["database"]]["MaterializedViews"].values()),
|
||||
]
|
||||
|
||||
schema = {}
|
||||
|
||||
@@ -154,7 +216,9 @@ class AzureKusto(BaseQueryRunner):
|
||||
schema[table_name] = {"name": table_name, "columns": []}
|
||||
|
||||
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())
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ from redash.query_runner import (
|
||||
TYPE_FLOAT,
|
||||
TYPE_INTEGER,
|
||||
TYPE_STRING,
|
||||
BaseQueryRunner,
|
||||
BaseSQLQueryRunner,
|
||||
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(10)
|
||||
time.sleep(1)
|
||||
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(BaseQueryRunner):
|
||||
class BigQuery(BaseSQLQueryRunner):
|
||||
noop_query = "SELECT 1"
|
||||
|
||||
def __init__(self, configuration):
|
||||
@@ -156,6 +156,11 @@ class BigQuery(BaseQueryRunner):
|
||||
"secret": ["jsonKeyFile"],
|
||||
}
|
||||
|
||||
def annotate_query(self, query, metadata):
|
||||
# Remove "Job ID" before annotating the query to avoid cache misses
|
||||
metadata = {k: v for k, v in metadata.items() if k != "Job ID"}
|
||||
return super().annotate_query(query, metadata)
|
||||
|
||||
def _get_bigquery_service(self):
|
||||
socket.setdefaulttimeout(settings.BIGQUERY_HTTP_TIMEOUT)
|
||||
|
||||
@@ -215,11 +220,12 @@ class BigQuery(BaseQueryRunner):
|
||||
job_data = self._get_job_data(query)
|
||||
insert_response = jobs.insert(projectId=project_id, body=job_data).execute()
|
||||
self.current_job_id = insert_response["jobReference"]["jobId"]
|
||||
self.current_job_location = insert_response["jobReference"]["location"]
|
||||
current_row = 0
|
||||
query_reply = _get_query_results(
|
||||
jobs,
|
||||
project_id=project_id,
|
||||
location=self._get_location(),
|
||||
location=self.current_job_location,
|
||||
job_id=self.current_job_id,
|
||||
start_index=current_row,
|
||||
)
|
||||
@@ -236,13 +242,11 @@ class BigQuery(BaseQueryRunner):
|
||||
|
||||
query_result_request = {
|
||||
"projectId": project_id,
|
||||
"jobId": query_reply["jobReference"]["jobId"],
|
||||
"jobId": self.current_job_id,
|
||||
"startIndex": current_row,
|
||||
"location": self.current_job_location,
|
||||
}
|
||||
|
||||
if self._get_location():
|
||||
query_result_request["location"] = self._get_location()
|
||||
|
||||
query_reply = jobs.getQueryResults(**query_result_request).execute()
|
||||
|
||||
columns = [
|
||||
@@ -304,28 +308,70 @@ class BigQuery(BaseQueryRunner):
|
||||
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, data_type, description
|
||||
FROM `{dataset_id}`.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS
|
||||
WHERE table_schema NOT IN ('information_schema')
|
||||
"""
|
||||
|
||||
table_query_base = """
|
||||
SELECT table_schema, table_name, JSON_VALUE(option_value) as table_description
|
||||
FROM `{dataset_id}`.INFORMATION_SCHEMA.TABLE_OPTIONS
|
||||
WHERE table_schema NOT IN ('information_schema')
|
||||
AND option_name = 'description'
|
||||
"""
|
||||
|
||||
location_dataset_ids = {}
|
||||
schema = {}
|
||||
queries = []
|
||||
for dataset in datasets:
|
||||
dataset_id = dataset["datasetReference"]["datasetId"]
|
||||
query = query_base.format(dataset_id=dataset_id)
|
||||
queries.append(query)
|
||||
location = dataset["location"]
|
||||
if self._get_location() and location != self._get_location():
|
||||
logger.debug("dataset location is different: %s", location)
|
||||
continue
|
||||
|
||||
query = "\nUNION ALL\n".join(queries)
|
||||
results, error = self.run_query(query, None)
|
||||
if error is not None:
|
||||
self._handle_run_query_error(error)
|
||||
if location not in location_dataset_ids:
|
||||
location_dataset_ids[location] = []
|
||||
location_dataset_ids[location].append(dataset_id)
|
||||
|
||||
for row in results["rows"]:
|
||||
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"]})
|
||||
for location, datasets in location_dataset_ids.items():
|
||||
queries = []
|
||||
for dataset_id in datasets:
|
||||
query = query_base.format(dataset_id=dataset_id)
|
||||
queries.append(query)
|
||||
|
||||
query = "\nUNION ALL\n".join(queries)
|
||||
results, error = self.run_query(query, None)
|
||||
if error is not None:
|
||||
self._handle_run_query_error(error)
|
||||
|
||||
for row in results["rows"]:
|
||||
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"],
|
||||
"description": row["description"],
|
||||
}
|
||||
)
|
||||
|
||||
table_queries = []
|
||||
for dataset_id in datasets:
|
||||
table_query = table_query_base.format(dataset_id=dataset_id)
|
||||
table_queries.append(table_query)
|
||||
|
||||
table_query = "\nUNION ALL\n".join(table_queries)
|
||||
results, error = self.run_query(table_query, None)
|
||||
if error is not None:
|
||||
self._handle_run_query_error(error)
|
||||
|
||||
for row in results["rows"]:
|
||||
table_name = "{0}.{1}".format(row["table_schema"], row["table_name"])
|
||||
if table_name not in schema:
|
||||
schema[table_name] = {"name": table_name, "columns": []}
|
||||
if "table_description" in row:
|
||||
schema[table_name]["description"] = row["table_description"]
|
||||
|
||||
return list(schema.values())
|
||||
|
||||
@@ -359,7 +405,7 @@ class BigQuery(BaseQueryRunner):
|
||||
self._get_bigquery_service().jobs().cancel(
|
||||
projectId=self._get_project_id(),
|
||||
jobId=self.current_job_id,
|
||||
location=self._get_location(),
|
||||
location=self.current_job_location,
|
||||
).execute()
|
||||
|
||||
raise
|
||||
|
||||
@@ -77,7 +77,11 @@ class ClickHouse(BaseSQLQueryRunner):
|
||||
self._url = self._url._replace(netloc="{}:{}".format(self._url.hostname, port))
|
||||
|
||||
def _get_tables(self, schema):
|
||||
query = "SELECT database, table, name FROM system.columns WHERE database NOT IN ('system')"
|
||||
query = """
|
||||
SELECT database, table, name, type as data_type
|
||||
FROM system.columns
|
||||
WHERE database NOT IN ('system', 'information_schema', 'INFORMATION_SCHEMA')
|
||||
"""
|
||||
|
||||
results, error = self.run_query(query, None)
|
||||
|
||||
@@ -90,7 +94,7 @@ class ClickHouse(BaseSQLQueryRunner):
|
||||
if table_name not in schema:
|
||||
schema[table_name] = {"name": table_name, "columns": []}
|
||||
|
||||
schema[table_name]["columns"].append(row["name"])
|
||||
schema[table_name]["columns"].append({"name": row["name"], "type": row["data_type"]})
|
||||
|
||||
return list(schema.values())
|
||||
|
||||
|
||||
174
redash/query_runner/duckdb.py
Normal file
174
redash/query_runner/duckdb.py
Normal file
@@ -0,0 +1,174 @@
|
||||
import logging
|
||||
|
||||
from redash.query_runner import (
|
||||
TYPE_BOOLEAN,
|
||||
TYPE_DATE,
|
||||
TYPE_DATETIME,
|
||||
TYPE_FLOAT,
|
||||
TYPE_INTEGER,
|
||||
TYPE_STRING,
|
||||
BaseSQLQueryRunner,
|
||||
InterruptException,
|
||||
register,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
try:
|
||||
import duckdb
|
||||
|
||||
enabled = True
|
||||
except ImportError:
|
||||
enabled = False
|
||||
|
||||
# Map DuckDB types to Redash column types
|
||||
TYPES_MAP = {
|
||||
"BOOLEAN": TYPE_BOOLEAN,
|
||||
"TINYINT": TYPE_INTEGER,
|
||||
"SMALLINT": TYPE_INTEGER,
|
||||
"INTEGER": TYPE_INTEGER,
|
||||
"BIGINT": TYPE_INTEGER,
|
||||
"HUGEINT": TYPE_INTEGER,
|
||||
"REAL": TYPE_FLOAT,
|
||||
"DOUBLE": TYPE_FLOAT,
|
||||
"DECIMAL": TYPE_FLOAT,
|
||||
"VARCHAR": TYPE_STRING,
|
||||
"BLOB": TYPE_STRING,
|
||||
"DATE": TYPE_DATE,
|
||||
"TIMESTAMP": TYPE_DATETIME,
|
||||
"TIMESTAMP WITH TIME ZONE": TYPE_DATETIME,
|
||||
"TIME": TYPE_DATETIME,
|
||||
"INTERVAL": TYPE_STRING,
|
||||
"UUID": TYPE_STRING,
|
||||
"JSON": TYPE_STRING,
|
||||
"STRUCT": TYPE_STRING,
|
||||
"MAP": TYPE_STRING,
|
||||
"UNION": TYPE_STRING,
|
||||
}
|
||||
|
||||
|
||||
class DuckDB(BaseSQLQueryRunner):
|
||||
noop_query = "SELECT 1"
|
||||
|
||||
def __init__(self, configuration):
|
||||
super().__init__(configuration)
|
||||
self.dbpath = configuration.get("dbpath", ":memory:")
|
||||
exts = configuration.get("extensions", "")
|
||||
self.extensions = [e.strip() for e in exts.split(",") if e.strip()]
|
||||
self._connect()
|
||||
|
||||
@classmethod
|
||||
def configuration_schema(cls):
|
||||
return {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"dbpath": {
|
||||
"type": "string",
|
||||
"title": "Database Path",
|
||||
"default": ":memory:",
|
||||
},
|
||||
"extensions": {"type": "string", "title": "Extensions (comma separated)"},
|
||||
},
|
||||
"order": ["dbpath", "extensions"],
|
||||
"required": ["dbpath"],
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def enabled(cls) -> bool:
|
||||
return enabled
|
||||
|
||||
def _connect(self) -> None:
|
||||
self.con = duckdb.connect(self.dbpath)
|
||||
for ext in self.extensions:
|
||||
try:
|
||||
if "." in ext:
|
||||
prefix, name = ext.split(".", 1)
|
||||
if prefix == "community":
|
||||
self.con.execute(f"INSTALL {name} FROM community")
|
||||
self.con.execute(f"LOAD {name}")
|
||||
else:
|
||||
raise Exception("Unknown extension prefix.")
|
||||
else:
|
||||
self.con.execute(f"INSTALL {ext}")
|
||||
self.con.execute(f"LOAD {ext}")
|
||||
except Exception as e:
|
||||
logger.warning("Failed to load extension %s: %s", ext, e)
|
||||
|
||||
def run_query(self, query, user) -> tuple:
|
||||
try:
|
||||
cursor = self.con.cursor()
|
||||
cursor.execute(query)
|
||||
columns = self.fetch_columns(
|
||||
[(d[0], TYPES_MAP.get(d[1].upper(), TYPE_STRING)) for d in cursor.description]
|
||||
)
|
||||
rows = [dict(zip((col["name"] for col in columns), row)) for row in cursor.fetchall()]
|
||||
data = {"columns": columns, "rows": rows}
|
||||
return data, None
|
||||
except duckdb.InterruptException:
|
||||
raise InterruptException("Query cancelled by user.")
|
||||
except Exception as e:
|
||||
logger.exception("Error running query: %s", e)
|
||||
return None, str(e)
|
||||
|
||||
def get_schema(self, get_stats=False) -> list:
|
||||
tables_query = """
|
||||
SELECT table_schema, table_name FROM information_schema.tables
|
||||
WHERE table_schema NOT IN ('information_schema', 'pg_catalog');
|
||||
"""
|
||||
tables_results, error = self.run_query(tables_query, None)
|
||||
if error:
|
||||
raise Exception(f"Failed to get tables: {error}")
|
||||
|
||||
schema = {}
|
||||
for table_row in tables_results["rows"]:
|
||||
full_table_name = f"{table_row['table_schema']}.{table_row['table_name']}"
|
||||
schema[full_table_name] = {"name": full_table_name, "columns": []}
|
||||
|
||||
describe_query = f'DESCRIBE "{table_row["table_schema"]}"."{table_row["table_name"]}";'
|
||||
columns_results, error = self.run_query(describe_query, None)
|
||||
if error:
|
||||
logger.warning("Failed to describe table %s: %s", full_table_name, error)
|
||||
continue
|
||||
|
||||
for col_row in columns_results["rows"]:
|
||||
col = {"name": col_row["column_name"], "type": col_row["column_type"]}
|
||||
schema[full_table_name]["columns"].append(col)
|
||||
|
||||
if col_row["column_type"].startswith("STRUCT("):
|
||||
schema[full_table_name]["columns"].extend(
|
||||
self._expand_struct_fields(col["name"], col_row["column_type"])
|
||||
)
|
||||
|
||||
return list(schema.values())
|
||||
|
||||
def _expand_struct_fields(self, base_name: str, struct_type: str) -> list:
|
||||
"""Recursively expand STRUCT(...) definitions into pseudo-columns."""
|
||||
fields = []
|
||||
# strip STRUCT( ... )
|
||||
inner = struct_type[len("STRUCT(") : -1].strip()
|
||||
# careful: nested structs, so parse comma-separated parts properly
|
||||
depth, current, parts = 0, [], []
|
||||
for c in inner:
|
||||
if c == "(":
|
||||
depth += 1
|
||||
elif c == ")":
|
||||
depth -= 1
|
||||
if c == "," and depth == 0:
|
||||
parts.append("".join(current).strip())
|
||||
current = []
|
||||
else:
|
||||
current.append(c)
|
||||
if current:
|
||||
parts.append("".join(current).strip())
|
||||
|
||||
for part in parts:
|
||||
# each part looks like: "fieldname TYPE"
|
||||
fname, ftype = part.split(" ", 1)
|
||||
colname = f"{base_name}.{fname}"
|
||||
fields.append({"name": colname, "type": ftype})
|
||||
if ftype.startswith("STRUCT("):
|
||||
fields.extend(self._expand_struct_fields(colname, ftype))
|
||||
return fields
|
||||
|
||||
|
||||
register(DuckDB)
|
||||
@@ -34,9 +34,13 @@ class ResultSet:
|
||||
|
||||
def parse_issue(issue, field_mapping): # noqa: C901
|
||||
result = OrderedDict()
|
||||
result["key"] = issue["key"]
|
||||
|
||||
for k, v in issue["fields"].items(): #
|
||||
# Handle API v3 response format: key field may be missing, use id as fallback
|
||||
result["key"] = issue.get("key", issue.get("id", "unknown"))
|
||||
|
||||
# Handle API v3 response format: fields may be missing
|
||||
fields = issue.get("fields", {})
|
||||
for k, v in fields.items(): #
|
||||
output_name = field_mapping.get_output_field_name(k)
|
||||
member_names = field_mapping.get_dict_members(k)
|
||||
|
||||
@@ -98,7 +102,9 @@ def parse_issues(data, field_mapping):
|
||||
|
||||
def parse_count(data):
|
||||
results = ResultSet()
|
||||
results.add_row({"count": data["total"]})
|
||||
# API v3 may not return 'total' field, fallback to counting issues
|
||||
count = data.get("total", len(data.get("issues", [])))
|
||||
results.add_row({"count": count})
|
||||
return results
|
||||
|
||||
|
||||
@@ -160,18 +166,26 @@ class JiraJQL(BaseHTTPQueryRunner):
|
||||
self.syntax = "json"
|
||||
|
||||
def run_query(self, query, user):
|
||||
jql_url = "{}/rest/api/2/search".format(self.configuration["url"])
|
||||
# Updated to API v3 endpoint, fix double slash issue
|
||||
jql_url = "{}/rest/api/3/search/jql".format(self.configuration["url"].rstrip("/"))
|
||||
|
||||
query = json_loads(query)
|
||||
query_type = query.pop("queryType", "select")
|
||||
field_mapping = FieldMapping(query.pop("fieldMapping", {}))
|
||||
|
||||
# API v3 requires mandatory jql parameter with restrictions
|
||||
if "jql" not in query or not query["jql"]:
|
||||
query["jql"] = "created >= -30d order by created DESC"
|
||||
|
||||
if query_type == "count":
|
||||
query["maxResults"] = 1
|
||||
query["fields"] = ""
|
||||
else:
|
||||
query["maxResults"] = query.get("maxResults", 1000)
|
||||
|
||||
if "fields" not in query:
|
||||
query["fields"] = "*all"
|
||||
|
||||
response, error = self.get_response(jql_url, params=query)
|
||||
if error is not None:
|
||||
return None, error
|
||||
@@ -182,17 +196,15 @@ class JiraJQL(BaseHTTPQueryRunner):
|
||||
results = parse_count(data)
|
||||
else:
|
||||
results = parse_issues(data, field_mapping)
|
||||
index = data["startAt"] + data["maxResults"]
|
||||
|
||||
while data["total"] > index:
|
||||
query["startAt"] = index
|
||||
# API v3 uses token-based pagination instead of startAt/total
|
||||
while not data.get("isLast", True) and "nextPageToken" in data:
|
||||
query["nextPageToken"] = data["nextPageToken"]
|
||||
response, error = self.get_response(jql_url, params=query)
|
||||
if error is not None:
|
||||
return None, error
|
||||
|
||||
data = response.json()
|
||||
index = data["startAt"] + data["maxResults"]
|
||||
|
||||
addl_results = parse_issues(data, field_mapping)
|
||||
results.merge(addl_results)
|
||||
|
||||
|
||||
@@ -215,10 +215,10 @@ class MongoDB(BaseQueryRunner):
|
||||
if readPreference:
|
||||
kwargs["readPreference"] = readPreference
|
||||
|
||||
if "username" in self.configuration:
|
||||
if self.configuration.get("username"):
|
||||
kwargs["username"] = self.configuration["username"]
|
||||
|
||||
if "password" in self.configuration:
|
||||
if self.configuration.get("password"):
|
||||
kwargs["password"] = self.configuration["password"]
|
||||
|
||||
db_connection = pymongo.MongoClient(self.configuration["connectionString"], **kwargs)
|
||||
|
||||
@@ -150,7 +150,9 @@ class Mysql(BaseSQLQueryRunner):
|
||||
query = """
|
||||
SELECT col.table_schema as table_schema,
|
||||
col.table_name as table_name,
|
||||
col.column_name as column_name
|
||||
col.column_name as column_name,
|
||||
col.data_type as data_type,
|
||||
col.column_comment as column_comment
|
||||
FROM `information_schema`.`columns` col
|
||||
WHERE LOWER(col.table_schema) NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys');
|
||||
"""
|
||||
@@ -169,7 +171,38 @@ class Mysql(BaseSQLQueryRunner):
|
||||
if table_name not in schema:
|
||||
schema[table_name] = {"name": table_name, "columns": []}
|
||||
|
||||
schema[table_name]["columns"].append(row["column_name"])
|
||||
schema[table_name]["columns"].append(
|
||||
{
|
||||
"name": row["column_name"],
|
||||
"type": row["data_type"],
|
||||
"description": row["column_comment"],
|
||||
}
|
||||
)
|
||||
|
||||
table_query = """
|
||||
SELECT col.table_schema as table_schema,
|
||||
col.table_name as table_name,
|
||||
col.table_comment as table_comment
|
||||
FROM `information_schema`.`tables` col
|
||||
WHERE LOWER(col.table_schema) NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys'); \
|
||||
"""
|
||||
|
||||
results, error = self.run_query(table_query, None)
|
||||
|
||||
if error is not None:
|
||||
self._handle_run_query_error(error)
|
||||
|
||||
for row in results["rows"]:
|
||||
if row["table_schema"] != self.configuration["db"]:
|
||||
table_name = "{}.{}".format(row["table_schema"], row["table_name"])
|
||||
else:
|
||||
table_name = row["table_name"]
|
||||
|
||||
if table_name not in schema:
|
||||
schema[table_name] = {"name": table_name, "columns": []}
|
||||
|
||||
if "table_comment" in row and row["table_comment"]:
|
||||
schema[table_name]["description"] = row["table_comment"]
|
||||
|
||||
return list(schema.values())
|
||||
|
||||
|
||||
@@ -205,24 +205,15 @@ class PostgreSQL(BaseSQLQueryRunner):
|
||||
|
||||
def _get_tables(self, schema):
|
||||
"""
|
||||
relkind constants per https://www.postgresql.org/docs/10/static/catalog-pg-class.html
|
||||
r = regular table
|
||||
v = view
|
||||
relkind constants from https://www.postgresql.org/docs/current/catalog-pg-class.html
|
||||
m = materialized view
|
||||
f = foreign table
|
||||
p = partitioned table (new in 10)
|
||||
---
|
||||
i = index
|
||||
S = sequence
|
||||
t = TOAST table
|
||||
c = composite type
|
||||
"""
|
||||
|
||||
query = """
|
||||
SELECT s.nspname as table_schema,
|
||||
c.relname as table_name,
|
||||
a.attname as column_name,
|
||||
null as data_type
|
||||
SELECT s.nspname AS table_schema,
|
||||
c.relname AS table_name,
|
||||
a.attname AS column_name,
|
||||
NULL AS data_type
|
||||
FROM pg_class c
|
||||
JOIN pg_namespace s
|
||||
ON c.relnamespace = s.oid
|
||||
@@ -231,7 +222,7 @@ class PostgreSQL(BaseSQLQueryRunner):
|
||||
ON a.attrelid = c.oid
|
||||
AND a.attnum > 0
|
||||
AND NOT a.attisdropped
|
||||
WHERE c.relkind IN ('m', 'f', 'p')
|
||||
WHERE c.relkind = 'm'
|
||||
AND has_table_privilege(s.nspname || '.' || c.relname, 'select')
|
||||
AND has_schema_privilege(s.nspname, 'usage')
|
||||
|
||||
@@ -243,6 +234,8 @@ class PostgreSQL(BaseSQLQueryRunner):
|
||||
data_type
|
||||
FROM information_schema.columns
|
||||
WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
|
||||
AND has_table_privilege(table_schema || '.' || table_name, 'select')
|
||||
AND has_schema_privilege(table_schema, 'usage')
|
||||
"""
|
||||
|
||||
self._get_definitions(schema, query)
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
try:
|
||||
import snowflake.connector
|
||||
from cryptography.hazmat.primitives.serialization import load_pem_private_key
|
||||
|
||||
enabled = True
|
||||
except ImportError:
|
||||
enabled = False
|
||||
|
||||
|
||||
from base64 import b64decode
|
||||
|
||||
from redash import __version__
|
||||
from redash.query_runner import (
|
||||
TYPE_BOOLEAN,
|
||||
@@ -43,6 +46,8 @@ class Snowflake(BaseSQLQueryRunner):
|
||||
"account": {"type": "string"},
|
||||
"user": {"type": "string"},
|
||||
"password": {"type": "string"},
|
||||
"private_key_File": {"type": "string"},
|
||||
"private_key_pwd": {"type": "string"},
|
||||
"warehouse": {"type": "string"},
|
||||
"database": {"type": "string"},
|
||||
"region": {"type": "string", "default": "us-west"},
|
||||
@@ -57,13 +62,15 @@ class Snowflake(BaseSQLQueryRunner):
|
||||
"account",
|
||||
"user",
|
||||
"password",
|
||||
"private_key_File",
|
||||
"private_key_pwd",
|
||||
"warehouse",
|
||||
"database",
|
||||
"region",
|
||||
"host",
|
||||
],
|
||||
"required": ["user", "password", "account", "database", "warehouse"],
|
||||
"secret": ["password"],
|
||||
"required": ["user", "account", "database", "warehouse"],
|
||||
"secret": ["password", "private_key_File", "private_key_pwd"],
|
||||
"extra_options": [
|
||||
"host",
|
||||
],
|
||||
@@ -88,7 +95,7 @@ class Snowflake(BaseSQLQueryRunner):
|
||||
if region == "us-west":
|
||||
region = None
|
||||
|
||||
if self.configuration.__contains__("host"):
|
||||
if self.configuration.get("host"):
|
||||
host = self.configuration.get("host")
|
||||
else:
|
||||
if region:
|
||||
@@ -96,14 +103,29 @@ class Snowflake(BaseSQLQueryRunner):
|
||||
else:
|
||||
host = "{}.snowflakecomputing.com".format(account)
|
||||
|
||||
connection = snowflake.connector.connect(
|
||||
user=self.configuration["user"],
|
||||
password=self.configuration["password"],
|
||||
account=account,
|
||||
region=region,
|
||||
host=host,
|
||||
application="Redash/{} (Snowflake)".format(__version__.split("-")[0]),
|
||||
)
|
||||
params = {
|
||||
"user": self.configuration["user"],
|
||||
"account": account,
|
||||
"region": region,
|
||||
"host": host,
|
||||
"application": "Redash/{} (Snowflake)".format(__version__.split("-")[0]),
|
||||
}
|
||||
|
||||
if self.configuration.get("password"):
|
||||
params["password"] = self.configuration["password"]
|
||||
elif self.configuration.get("private_key_File"):
|
||||
private_key_b64 = self.configuration.get("private_key_File")
|
||||
private_key_bytes = b64decode(private_key_b64)
|
||||
if self.configuration.get("private_key_pwd"):
|
||||
private_key_pwd = self.configuration.get("private_key_pwd").encode()
|
||||
else:
|
||||
private_key_pwd = None
|
||||
private_key_pem = load_pem_private_key(private_key_bytes, private_key_pwd)
|
||||
params["private_key"] = private_key_pem
|
||||
else:
|
||||
raise Exception("Neither password nor private_key_b64 is set.")
|
||||
|
||||
connection = snowflake.connector.connect(**params)
|
||||
|
||||
return connection
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import functools
|
||||
|
||||
from flask import session
|
||||
from flask import request, session
|
||||
from flask_login import current_user
|
||||
from flask_talisman import talisman
|
||||
from flask_wtf.csrf import CSRFProtect, generate_csrf
|
||||
@@ -25,6 +25,7 @@ def init_app(app):
|
||||
app.config["WTF_CSRF_CHECK_DEFAULT"] = False
|
||||
app.config["WTF_CSRF_SSL_STRICT"] = False
|
||||
app.config["WTF_CSRF_TIME_LIMIT"] = settings.CSRF_TIME_LIMIT
|
||||
app.config["SESSION_COOKIE_NAME"] = settings.SESSION_COOKIE_NAME
|
||||
|
||||
@app.after_request
|
||||
def inject_csrf_token(response):
|
||||
@@ -35,6 +36,15 @@ 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()
|
||||
|
||||
|
||||
@@ -82,9 +82,19 @@ class QuerySerializer(Serializer):
|
||||
else:
|
||||
result = [serialize_query(query, **self.options) for query in self.object_or_list]
|
||||
if self.options.get("with_favorite_state", True):
|
||||
favorite_ids = models.Favorite.are_favorites(current_user.id, self.object_or_list)
|
||||
queries = list(self.object_or_list)
|
||||
favorites = models.Favorite.query.filter(
|
||||
models.Favorite.object_id.in_([o.id for o in queries]),
|
||||
models.Favorite.object_type == "Query",
|
||||
models.Favorite.user_id == current_user.id,
|
||||
)
|
||||
favorites_dict = {fav.object_id: fav for fav in favorites}
|
||||
|
||||
for query in result:
|
||||
query["is_favorite"] = query["id"] in favorite_ids
|
||||
favorite = favorites_dict.get(query["id"])
|
||||
query["is_favorite"] = favorite is not None
|
||||
if favorite:
|
||||
query["starred_at"] = favorite.created_at
|
||||
|
||||
return result
|
||||
|
||||
@@ -263,9 +273,19 @@ class DashboardSerializer(Serializer):
|
||||
else:
|
||||
result = [serialize_dashboard(obj, **self.options) for obj in self.object_or_list]
|
||||
if self.options.get("with_favorite_state", True):
|
||||
favorite_ids = models.Favorite.are_favorites(current_user.id, self.object_or_list)
|
||||
for obj in result:
|
||||
obj["is_favorite"] = obj["id"] in favorite_ids
|
||||
dashboards = list(self.object_or_list)
|
||||
favorites = models.Favorite.query.filter(
|
||||
models.Favorite.object_id.in_([o.id for o in dashboards]),
|
||||
models.Favorite.object_type == "Dashboard",
|
||||
models.Favorite.user_id == current_user.id,
|
||||
)
|
||||
favorites_dict = {fav.object_id: fav for fav in favorites}
|
||||
|
||||
for query in result:
|
||||
favorite = favorites_dict.get(query["id"])
|
||||
query["is_favorite"] = favorite is not None
|
||||
if favorite:
|
||||
query["starred_at"] = favorite.created_at
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@@ -82,6 +82,7 @@ SESSION_COOKIE_SECURE = parse_boolean(os.environ.get("REDASH_SESSION_COOKIE_SECU
|
||||
# Whether the session cookie is set HttpOnly.
|
||||
SESSION_COOKIE_HTTPONLY = parse_boolean(os.environ.get("REDASH_SESSION_COOKIE_HTTPONLY", "true"))
|
||||
SESSION_EXPIRY_TIME = int(os.environ.get("REDASH_SESSION_EXPIRY_TIME", 60 * 60 * 6))
|
||||
SESSION_COOKIE_NAME = os.environ.get("REDASH_SESSION_COOKIE_NAME", "session")
|
||||
|
||||
# Whether the session cookie is set to secure.
|
||||
REMEMBER_COOKIE_SECURE = parse_boolean(os.environ.get("REDASH_REMEMBER_COOKIE_SECURE") or str(COOKIES_SECURE))
|
||||
@@ -135,6 +136,13 @@ FEATURE_POLICY = os.environ.get("REDASH_FEATURE_POLICY", "")
|
||||
|
||||
MULTI_ORG = parse_boolean(os.environ.get("REDASH_MULTI_ORG", "false"))
|
||||
|
||||
# If Redash is behind a proxy it might sometimes receive a X-Forwarded-Proto of HTTP
|
||||
# even if your actual Redash URL scheme is HTTPS. This will cause Flask to build
|
||||
# the OAuth redirect URL incorrectly thus failing auth. This is especially common if
|
||||
# you're behind a SSL/TCP configured AWS ELB or similar.
|
||||
# This setting will force the URL scheme.
|
||||
GOOGLE_OAUTH_SCHEME_OVERRIDE = os.environ.get("REDASH_GOOGLE_OAUTH_SCHEME_OVERRIDE", "")
|
||||
|
||||
GOOGLE_CLIENT_ID = os.environ.get("REDASH_GOOGLE_CLIENT_ID", "")
|
||||
GOOGLE_CLIENT_SECRET = os.environ.get("REDASH_GOOGLE_CLIENT_SECRET", "")
|
||||
GOOGLE_OAUTH_ENABLED = bool(GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET)
|
||||
@@ -340,6 +348,7 @@ default_query_runners = [
|
||||
"redash.query_runner.oracle",
|
||||
"redash.query_runner.e6data",
|
||||
"redash.query_runner.risingwave",
|
||||
"redash.query_runner.duckdb",
|
||||
]
|
||||
|
||||
enabled_query_runners = array_from_string(
|
||||
|
||||
@@ -27,6 +27,7 @@ DATE_FORMAT = os.environ.get("REDASH_DATE_FORMAT", "DD/MM/YY")
|
||||
TIME_FORMAT = os.environ.get("REDASH_TIME_FORMAT", "HH:mm")
|
||||
INTEGER_FORMAT = os.environ.get("REDASH_INTEGER_FORMAT", "0,0")
|
||||
FLOAT_FORMAT = os.environ.get("REDASH_FLOAT_FORMAT", "0,0.00")
|
||||
NULL_VALUE = os.environ.get("REDASH_NULL_VALUE", "null")
|
||||
MULTI_BYTE_SEARCH_ENABLED = parse_boolean(os.environ.get("MULTI_BYTE_SEARCH_ENABLED", "false"))
|
||||
|
||||
JWT_LOGIN_ENABLED = parse_boolean(os.environ.get("REDASH_JWT_LOGIN_ENABLED", "false"))
|
||||
@@ -59,6 +60,7 @@ settings = {
|
||||
"time_format": TIME_FORMAT,
|
||||
"integer_format": INTEGER_FORMAT,
|
||||
"float_format": FLOAT_FORMAT,
|
||||
"null_value": NULL_VALUE,
|
||||
"multi_byte_search_enabled": MULTI_BYTE_SEARCH_ENABLED,
|
||||
"auth_jwt_login_enabled": JWT_LOGIN_ENABLED,
|
||||
"auth_jwt_auth_issuer": JWT_AUTH_ISSUER,
|
||||
|
||||
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)
|
||||
@@ -20,7 +20,7 @@ class TestBigQueryQueryRunner(unittest.TestCase):
|
||||
query = "SELECT a FROM tbl"
|
||||
expect = (
|
||||
"/* Username: username, query_id: adhoc, "
|
||||
"Job ID: job-id, Query Hash: query-hash, "
|
||||
"Query Hash: query-hash, "
|
||||
"Scheduled: False */ SELECT a FROM tbl"
|
||||
)
|
||||
|
||||
|
||||
107
tests/query_runner/test_duckdb.py
Normal file
107
tests/query_runner/test_duckdb.py
Normal file
@@ -0,0 +1,107 @@
|
||||
from unittest import TestCase
|
||||
from unittest.mock import patch
|
||||
|
||||
from redash.query_runner.duckdb import DuckDB
|
||||
|
||||
|
||||
class TestDuckDBSchema(TestCase):
|
||||
def setUp(self) -> None:
|
||||
self.runner = DuckDB({"dbpath": ":memory:"})
|
||||
|
||||
@patch.object(DuckDB, "run_query")
|
||||
def test_simple_schema_build(self, mock_run_query) -> None:
|
||||
# Simulate queries: first for tables, then for DESCRIBE
|
||||
mock_run_query.side_effect = [
|
||||
(
|
||||
{"rows": [{"table_schema": "main", "table_name": "users"}]},
|
||||
None,
|
||||
),
|
||||
(
|
||||
{
|
||||
"rows": [
|
||||
{"column_name": "id", "column_type": "INTEGER"},
|
||||
{"column_name": "name", "column_type": "VARCHAR"},
|
||||
]
|
||||
},
|
||||
None,
|
||||
),
|
||||
]
|
||||
|
||||
schema = self.runner.get_schema()
|
||||
self.assertEqual(len(schema), 1)
|
||||
self.assertEqual(schema[0]["name"], "main.users")
|
||||
self.assertListEqual(
|
||||
schema[0]["columns"],
|
||||
[{"name": "id", "type": "INTEGER"}, {"name": "name", "type": "VARCHAR"}],
|
||||
)
|
||||
|
||||
@patch.object(DuckDB, "run_query")
|
||||
def test_struct_column_expansion(self, mock_run_query) -> None:
|
||||
# First call to run_query -> tables list
|
||||
mock_run_query.side_effect = [
|
||||
(
|
||||
{"rows": [{"table_schema": "main", "table_name": "events"}]},
|
||||
None,
|
||||
),
|
||||
# Second call -> DESCRIBE output
|
||||
(
|
||||
{
|
||||
"rows": [
|
||||
{
|
||||
"column_name": "payload",
|
||||
"column_type": "STRUCT(a INTEGER, b VARCHAR)",
|
||||
}
|
||||
]
|
||||
},
|
||||
None,
|
||||
),
|
||||
]
|
||||
|
||||
schema_list = self.runner.get_schema()
|
||||
self.assertEqual(len(schema_list), 1)
|
||||
schema = schema_list[0]
|
||||
|
||||
# Ensure both raw and expanded struct fields are present
|
||||
self.assertIn("main.events", schema["name"])
|
||||
self.assertListEqual(
|
||||
schema["columns"],
|
||||
[
|
||||
{"name": "payload", "type": "STRUCT(a INTEGER, b VARCHAR)"},
|
||||
{"name": "payload.a", "type": "INTEGER"},
|
||||
{"name": "payload.b", "type": "VARCHAR"},
|
||||
],
|
||||
)
|
||||
|
||||
def test_nested_struct_expansion(self) -> None:
|
||||
runner = DuckDB({"dbpath": ":memory:"})
|
||||
runner.con.execute(
|
||||
"""
|
||||
CREATE TABLE sample_struct_table (
|
||||
id INTEGER,
|
||||
info STRUCT(
|
||||
name VARCHAR,
|
||||
metrics STRUCT(score DOUBLE, rank INTEGER),
|
||||
tags STRUCT(primary_tag VARCHAR, secondary_tag VARCHAR)
|
||||
)
|
||||
);
|
||||
"""
|
||||
)
|
||||
|
||||
schema = runner.get_schema()
|
||||
table = next(t for t in schema if t["name"] == "main.sample_struct_table")
|
||||
colnames = [c["name"] for c in table["columns"]]
|
||||
|
||||
assert "info" in colnames
|
||||
assert 'info."name"' in colnames
|
||||
assert "info.metrics" in colnames
|
||||
assert "info.metrics.score" in colnames
|
||||
assert "info.metrics.rank" in colnames
|
||||
assert "info.tags.primary_tag" in colnames
|
||||
assert "info.tags.secondary_tag" in colnames
|
||||
|
||||
@patch.object(DuckDB, "run_query")
|
||||
def test_error_propagation(self, mock_run_query) -> None:
|
||||
mock_run_query.return_value = (None, "boom")
|
||||
with self.assertRaises(Exception) as ctx:
|
||||
self.runner.get_schema()
|
||||
self.assertIn("boom", str(ctx.exception))
|
||||
@@ -28,4 +28,4 @@ class TestJsonDumps(BaseTestCase):
|
||||
}
|
||||
json_data = json_dumps(input_data)
|
||||
actual_output_data = json_loads(json_data)
|
||||
self.assertEquals(actual_output_data, expected_output_data)
|
||||
self.assertEqual(actual_output_data, expected_output_data)
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
"@types/jest": "^26.0.18",
|
||||
"@types/leaflet": "^1.5.19",
|
||||
"@types/numeral": "0.0.28",
|
||||
"@types/plotly.js": "^1.54.22",
|
||||
"@types/plotly.js": "^3.0.3",
|
||||
"@types/react": "^17.0.0",
|
||||
"@types/react-dom": "^17.0.0",
|
||||
"@types/tinycolor2": "^1.4.2",
|
||||
@@ -62,7 +62,7 @@
|
||||
"less-loader": "^11.1.3",
|
||||
"less-plugin-autoprefix": "^2.0.0",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"prettier": "^1.19.1",
|
||||
"prettier": "3.3.2",
|
||||
"prop-types": "^15.7.2",
|
||||
"style-loader": "^3.3.3",
|
||||
"ts-migrate": "^0.1.35",
|
||||
@@ -75,7 +75,7 @@
|
||||
"lib"
|
||||
],
|
||||
"dependencies": {
|
||||
"axios": "0.28.0",
|
||||
"axios": "0.30.2",
|
||||
"axios-auth-refresh": "3.3.6",
|
||||
"beautifymarker": "^1.0.7",
|
||||
"chroma-js": "^1.3.6",
|
||||
@@ -91,7 +91,7 @@
|
||||
"leaflet.markercluster": "^1.1.0",
|
||||
"lodash": "^4.17.10",
|
||||
"numeral": "^2.0.6",
|
||||
"plotly.js": "1.58.5",
|
||||
"plotly.js": "3.1.0",
|
||||
"react-pivottable": "^0.9.0",
|
||||
"react-sortable-hoc": "^1.10.1",
|
||||
"tinycolor2": "^1.4.1",
|
||||
|
||||
@@ -5,6 +5,7 @@ import numeral from "numeral";
|
||||
import { isString, isArray, isUndefined, isFinite, isNil, toString } from "lodash";
|
||||
import { visualizationsSettings } from "@/visualizations/visualizationsSettings";
|
||||
|
||||
|
||||
numeral.options.scalePercentBy100 = false;
|
||||
|
||||
// eslint-disable-next-line
|
||||
@@ -12,9 +13,16 @@ const urlPattern = /(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019
|
||||
|
||||
const hasOwnProperty = Object.prototype.hasOwnProperty;
|
||||
|
||||
function NullValueComponent() {
|
||||
return <span className="display-as-null">{visualizationsSettings.nullValue}</span>;
|
||||
}
|
||||
|
||||
export function createTextFormatter(highlightLinks: any) {
|
||||
if (highlightLinks) {
|
||||
return (value: any) => {
|
||||
if (value === null) {
|
||||
return <NullValueComponent/>
|
||||
}
|
||||
if (isString(value)) {
|
||||
const Link = visualizationsSettings.LinkComponent;
|
||||
value = value.replace(urlPattern, (unused, prefix, href) => {
|
||||
@@ -29,7 +37,7 @@ export function createTextFormatter(highlightLinks: any) {
|
||||
return toString(value);
|
||||
};
|
||||
}
|
||||
return (value: any) => toString(value);
|
||||
return (value: any) => value === null ? <NullValueComponent/> : toString(value);
|
||||
}
|
||||
|
||||
function toMoment(value: any) {
|
||||
@@ -46,11 +54,14 @@ function toMoment(value: any) {
|
||||
export function createDateTimeFormatter(format: any) {
|
||||
if (isString(format) && format !== "") {
|
||||
return (value: any) => {
|
||||
if (value === null) {
|
||||
return <NullValueComponent/>;
|
||||
}
|
||||
const wrapped = toMoment(value);
|
||||
return wrapped.isValid() ? wrapped.format(format) : toString(value);
|
||||
};
|
||||
}
|
||||
return (value: any) => toString(value);
|
||||
return (value: any) => value === null ? <NullValueComponent/> : toString(value);
|
||||
}
|
||||
|
||||
export function createBooleanFormatter(values: any) {
|
||||
@@ -58,6 +69,9 @@ export function createBooleanFormatter(values: any) {
|
||||
if (values.length >= 2) {
|
||||
// Both `true` and `false` specified
|
||||
return (value: any) => {
|
||||
if (value === null) {
|
||||
return <NullValueComponent/>;
|
||||
}
|
||||
if (isNil(value)) {
|
||||
return "";
|
||||
}
|
||||
@@ -69,6 +83,9 @@ export function createBooleanFormatter(values: any) {
|
||||
}
|
||||
}
|
||||
return (value: any) => {
|
||||
if (value === null) {
|
||||
return <NullValueComponent/>;
|
||||
}
|
||||
if (isNil(value)) {
|
||||
return "";
|
||||
}
|
||||
@@ -76,12 +93,20 @@ export function createBooleanFormatter(values: any) {
|
||||
};
|
||||
}
|
||||
|
||||
export function createNumberFormatter(format: any) {
|
||||
export function createNumberFormatter(format: any, canReturnHTMLElement: boolean = false) {
|
||||
if (isString(format) && format !== "") {
|
||||
const n = numeral(0); // cache `numeral` instance
|
||||
return (value: any) => (value === null || value === "" ? "" : n.set(value).format(format));
|
||||
return (value: any) => {
|
||||
if (canReturnHTMLElement && value === null) {
|
||||
return <NullValueComponent/>;
|
||||
}
|
||||
if (value === "" || value === null) {
|
||||
return "";
|
||||
}
|
||||
return n.set(value).format(format);
|
||||
}
|
||||
}
|
||||
return (value: any) => toString(value);
|
||||
return (value: any) => (canReturnHTMLElement && value === null) ? <NullValueComponent/> : toString(value);
|
||||
}
|
||||
|
||||
export function formatSimpleTemplate(str: any, data: any) {
|
||||
|
||||
@@ -336,7 +336,7 @@ export default function GeneralSettings({ options, data, onOptionsChange }: any)
|
||||
</Section>
|
||||
)}
|
||||
|
||||
{!includes(["custom", "heatmap", "bubble", "scatter"], options.globalSeriesType) && (
|
||||
{!includes(["custom", "heatmap", "bubble"], options.globalSeriesType) && (
|
||||
// @ts-expect-error ts-migrate(2745) FIXME: This JSX tag's 'children' prop expects type 'never... Remove this comment to see the full error message
|
||||
<Section>
|
||||
<Select
|
||||
|
||||
@@ -10,7 +10,7 @@ export default {
|
||||
Renderer,
|
||||
Editor,
|
||||
|
||||
defaultColumns: 3,
|
||||
defaultColumns: 6,
|
||||
defaultRows: 8,
|
||||
minColumns: 1,
|
||||
minRows: 5,
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
"series": [
|
||||
{
|
||||
"visible": true,
|
||||
"offsetgroup": "0",
|
||||
"type": "bar",
|
||||
"name": "a",
|
||||
"x": ["x1", "x2", "x3", "x4"],
|
||||
@@ -64,7 +63,6 @@
|
||||
},
|
||||
{
|
||||
"visible": true,
|
||||
"offsetgroup": "1",
|
||||
"type": "bar",
|
||||
"name": "b",
|
||||
"x": ["x1", "x2", "x3", "x4"],
|
||||
|
||||
@@ -48,7 +48,6 @@
|
||||
"series": [
|
||||
{
|
||||
"visible": true,
|
||||
"offsetgroup": "0",
|
||||
"type": "bar",
|
||||
"name": "a",
|
||||
"x": ["x1", "x2", "x3", "x4"],
|
||||
@@ -64,7 +63,6 @@
|
||||
},
|
||||
{
|
||||
"visible": true,
|
||||
"offsetgroup": "1",
|
||||
"type": "bar",
|
||||
"name": "b",
|
||||
"x": ["x1", "x2", "x3", "x4"],
|
||||
|
||||
@@ -27,15 +27,17 @@
|
||||
"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
|
||||
}
|
||||
|
||||
@@ -30,11 +30,13 @@
|
||||
"automargin": true,
|
||||
"showticklabels": true,
|
||||
"title": null,
|
||||
"tickformat": null,
|
||||
"type": "-"
|
||||
},
|
||||
"yaxis": {
|
||||
"automargin": true,
|
||||
"title": null,
|
||||
"tickformat": null,
|
||||
"type": "linear",
|
||||
"autorange": true,
|
||||
"range": null
|
||||
@@ -42,12 +44,13 @@
|
||||
"yaxis2": {
|
||||
"automargin": true,
|
||||
"title": null,
|
||||
"tickformat": null,
|
||||
"type": "linear",
|
||||
"autorange": true,
|
||||
"range": null,
|
||||
"overlaying": "y",
|
||||
"side": "right"
|
||||
},
|
||||
},
|
||||
"hoverlabel": {
|
||||
"namelength": -1
|
||||
}
|
||||
|
||||
@@ -25,18 +25,21 @@
|
||||
"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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,11 +28,13 @@
|
||||
"automargin": true,
|
||||
"showticklabels": true,
|
||||
"title": null,
|
||||
"tickformat": null,
|
||||
"type": "-"
|
||||
},
|
||||
"yaxis": {
|
||||
"automargin": true,
|
||||
"title": null,
|
||||
"tickformat": null,
|
||||
"type": "linear",
|
||||
"autorange": true,
|
||||
"range": null
|
||||
@@ -40,15 +42,17 @@
|
||||
"yaxis2": {
|
||||
"automargin": true,
|
||||
"title": null,
|
||||
"tickformat": null,
|
||||
"type": "linear",
|
||||
"autorange": true,
|
||||
"range": null,
|
||||
"overlaying": "y",
|
||||
"side": "right"
|
||||
},
|
||||
},
|
||||
"hoverlabel": {
|
||||
"namelength": -1
|
||||
}
|
||||
},
|
||||
"hovermode": "x"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,18 +24,21 @@
|
||||
"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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,18 +23,21 @@
|
||||
"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"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as Plotly from "plotly.js";
|
||||
|
||||
import "./locales"
|
||||
import prepareData from "./prepareData";
|
||||
import prepareLayout from "./prepareLayout";
|
||||
import updateData from "./updateData";
|
||||
@@ -7,9 +8,31 @@ import updateAxes from "./updateAxes";
|
||||
import updateChartSize from "./updateChartSize";
|
||||
import { prepareCustomChartData, createCustomChartRenderer } from "./customChartUtils";
|
||||
|
||||
// @ts-expect-error ts-migrate(2339) FIXME: Property 'setPlotConfig' does not exist on type 't... Remove this comment to see the full error message
|
||||
const rangeSliderIcon = {
|
||||
'width': 400,
|
||||
'height': 400,
|
||||
'path': 'M50 180h300a20 20 0 0 1 0 40H50a20 20 0 0 1 0-40z M160 200a40 40 0 1 0 -80 0a40 40 0 1 0 80 0 M320 200a40 40 0 1 0 -80 0a40 40 0 1 0 80 0',
|
||||
};
|
||||
|
||||
Plotly.setPlotConfig({
|
||||
modeBarButtonsToRemove: ["sendDataToCloud"],
|
||||
modeBarButtonsToAdd: ["togglespikelines", "v1hovermode",
|
||||
{
|
||||
name: 'toggleRangeslider',
|
||||
title: 'Toggle rangeslider',
|
||||
icon: rangeSliderIcon,
|
||||
click: function(gd: any) {
|
||||
if(gd?.layout?.xaxis) {
|
||||
let newRangeslider: any = {};
|
||||
if (gd.layout.xaxis?.rangeslider) {
|
||||
newRangeslider = null;
|
||||
}
|
||||
(Plotly.relayout as any)(gd, 'xaxis.rangeslider', newRangeslider);
|
||||
}
|
||||
}
|
||||
},
|
||||
],
|
||||
locale: window.navigator.language,
|
||||
});
|
||||
|
||||
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,
|
||||
]);
|
||||
@@ -26,9 +26,13 @@ function getHoverInfoPattern(options: any) {
|
||||
|
||||
function prepareBarSeries(series: any, options: any, additionalOptions: any) {
|
||||
series.type = "bar";
|
||||
series.offsetgroup = toString(additionalOptions.index);
|
||||
if (!options.series.stacking) {
|
||||
series.offsetgroup = toString(additionalOptions.index);
|
||||
}
|
||||
if (options.showDataLabels) {
|
||||
series.textposition = "inside";
|
||||
} else {
|
||||
series.textposition = "none";
|
||||
}
|
||||
return series;
|
||||
}
|
||||
@@ -92,7 +96,10 @@ function prepareSeries(series: any, options: any, numSeries: any, additionalOpti
|
||||
// For bubble/scatter charts `y` may be any (similar to `x`) - numeric is only bubble size;
|
||||
// for other types `y` is always number
|
||||
const cleanYValue = includes(["bubble", "scatter"], seriesOptions.type)
|
||||
? normalizeValue
|
||||
? (v: any, axixType: any) => {
|
||||
v = normalizeValue(v, axixType);
|
||||
return includes(["scatter"], seriesOptions.type) && options.missingValuesAsZero && isNil(v) ? 0.0 : v;
|
||||
}
|
||||
: (v: any) => {
|
||||
v = cleanNumber(v);
|
||||
return options.missingValuesAsZero && isNil(v) ? 0.0 : v;
|
||||
|
||||
@@ -21,7 +21,7 @@ function prepareXAxis(axisOptions: any, additionalOptions: any) {
|
||||
title: getAxisTitle(axisOptions),
|
||||
type: getAxisScaleType(axisOptions),
|
||||
automargin: true,
|
||||
tickformat: axisOptions.tickFormat,
|
||||
tickformat: axisOptions.tickFormat ?? null,
|
||||
};
|
||||
|
||||
if (additionalOptions.sortX && axis.type === "category") {
|
||||
@@ -49,7 +49,7 @@ function prepareYAxis(axisOptions: any) {
|
||||
automargin: true,
|
||||
autorange: true,
|
||||
range: null,
|
||||
tickformat: axisOptions.tickFormat,
|
||||
tickformat: axisOptions.tickFormat ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ function prepareBoxLayout(layout: any, options: any, data: any) {
|
||||
}
|
||||
|
||||
export default function prepareLayout(element: any, options: any, data: any) {
|
||||
const layout = {
|
||||
const layout: any = {
|
||||
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,6 +124,10 @@ 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);
|
||||
|
||||
@@ -9,7 +9,7 @@ export default {
|
||||
Renderer,
|
||||
Editor,
|
||||
|
||||
defaultColumns: 3,
|
||||
defaultColumns: 6,
|
||||
defaultRows: 8,
|
||||
minColumns: 2,
|
||||
};
|
||||
|
||||
@@ -22,6 +22,6 @@ export default {
|
||||
Renderer,
|
||||
Editor,
|
||||
|
||||
defaultColumns: 2,
|
||||
defaultColumns: 4,
|
||||
defaultRows: 5,
|
||||
};
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
import React, { useState } from "react";
|
||||
import { map, mapValues, keyBy } from "lodash";
|
||||
import moment from "moment";
|
||||
import { RendererPropTypes } from "@/visualizations/prop-types";
|
||||
import { visualizationsSettings } from "@/visualizations/visualizationsSettings";
|
||||
import Descriptions from "antd/lib/descriptions";
|
||||
import Pagination from "antd/lib/pagination";
|
||||
|
||||
import "./details.less";
|
||||
|
||||
function renderValue(value: any, type: any) {
|
||||
const formats = {
|
||||
date: visualizationsSettings.dateFormat,
|
||||
datetime: visualizationsSettings.dateTimeFormat,
|
||||
};
|
||||
|
||||
if (type === "date" || type === "datetime") {
|
||||
if (moment.isMoment(value)) {
|
||||
// @ts-expect-error ts-migrate(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
|
||||
return value.format(formats[type]);
|
||||
}
|
||||
}
|
||||
|
||||
return "" + value;
|
||||
}
|
||||
|
||||
export default function DetailsRenderer({ data }: any) {
|
||||
const [page, setPage] = useState(0);
|
||||
|
||||
if (!data || !data.rows || data.rows.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const types = mapValues(keyBy(data.columns, "name"), "type");
|
||||
|
||||
// We use columsn to maintain order of columns in the view.
|
||||
const columns = data.columns.map((column: any) => column.name);
|
||||
const row = data.rows[page];
|
||||
|
||||
return (
|
||||
<div className="details-viz">
|
||||
<Descriptions size="small" column={1} bordered>
|
||||
{map(columns, key => (
|
||||
<Descriptions.Item key={key} label={key}>
|
||||
{renderValue(row[key], types[key])}
|
||||
</Descriptions.Item>
|
||||
))}
|
||||
</Descriptions>
|
||||
{data.rows.length > 1 && (
|
||||
<div className="paginator-container">
|
||||
<Pagination
|
||||
showSizeChanger={false}
|
||||
current={page + 1}
|
||||
defaultPageSize={1}
|
||||
total={data.rows.length}
|
||||
onChange={p => setPage(p - 1)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
DetailsRenderer.propTypes = RendererPropTypes;
|
||||
31
viz-lib/src/visualizations/details/Editor/ColumnEditor.tsx
Normal file
31
viz-lib/src/visualizations/details/Editor/ColumnEditor.tsx
Normal file
@@ -0,0 +1,31 @@
|
||||
import React from "react";
|
||||
import SharedColumnEditor from "../../shared/components/ColumnEditor";
|
||||
|
||||
type OwnProps = {
|
||||
column: {
|
||||
name: string;
|
||||
title?: string;
|
||||
visible?: boolean;
|
||||
alignContent?: "left" | "center" | "right";
|
||||
displayAs?: any;
|
||||
description?: string;
|
||||
};
|
||||
onChange?: (...args: any[]) => any;
|
||||
};
|
||||
|
||||
type Props = OwnProps & typeof ColumnEditor.defaultProps;
|
||||
|
||||
export default function ColumnEditor({ column, onChange }: Props) {
|
||||
return (
|
||||
<SharedColumnEditor
|
||||
column={column}
|
||||
onChange={onChange}
|
||||
variant="details"
|
||||
showSearch={false}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
ColumnEditor.defaultProps = {
|
||||
onChange: (...args: any[]) => {},
|
||||
};
|
||||
@@ -0,0 +1,98 @@
|
||||
import React from "react";
|
||||
import enzyme from "enzyme";
|
||||
|
||||
import getOptions from "../getOptions";
|
||||
import ColumnsSettings from "./ColumnsSettings";
|
||||
|
||||
function findByTestID(wrapper: any, testId: any) {
|
||||
return wrapper.find(`[data-test="${testId}"]`);
|
||||
}
|
||||
|
||||
function mount(options: any, done: any) {
|
||||
const data = {
|
||||
columns: [
|
||||
{ name: "id", type: "integer" },
|
||||
{ name: "name", type: "string" },
|
||||
{ name: "created_at", type: "datetime" },
|
||||
],
|
||||
rows: [{ id: 1, name: "test", created_at: "2023-01-01T00:00:00Z" }],
|
||||
};
|
||||
options = getOptions(options, data);
|
||||
return enzyme.mount(
|
||||
<ColumnsSettings
|
||||
visualizationName="Details"
|
||||
data={data}
|
||||
options={options}
|
||||
onOptionsChange={changedOptions => {
|
||||
expect(changedOptions).toMatchSnapshot();
|
||||
done();
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
describe("Visualizations -> Details -> Editor -> Columns Settings", () => {
|
||||
test("Toggles column visibility", done => {
|
||||
const el = mount({}, done);
|
||||
|
||||
findByTestID(el, "Details.Column.id.Visibility")
|
||||
.last()
|
||||
.simulate("click");
|
||||
});
|
||||
|
||||
test("Changes column title", done => {
|
||||
const el = mount({}, done);
|
||||
findByTestID(el, "Details.Column.name.Name")
|
||||
.last()
|
||||
.simulate("click"); // expand settings
|
||||
|
||||
findByTestID(el, "Details.Column.name.Title")
|
||||
.last()
|
||||
.simulate("change", { target: { value: "Full Name" } });
|
||||
});
|
||||
|
||||
test("Changes column alignment", done => {
|
||||
const el = mount({}, done);
|
||||
findByTestID(el, "Details.Column.id.Name")
|
||||
.last()
|
||||
.simulate("click"); // expand settings
|
||||
|
||||
findByTestID(el, "Details.Column.id.TextAlignment")
|
||||
.last()
|
||||
.find('[data-test="TextAlignmentSelect.Center"] input')
|
||||
.simulate("change", { target: { checked: true } });
|
||||
});
|
||||
|
||||
test("Changes column description", done => {
|
||||
const el = mount({}, done);
|
||||
findByTestID(el, "Details.Column.name.Name")
|
||||
.last()
|
||||
.simulate("click"); // expand settings
|
||||
|
||||
findByTestID(el, "Details.Column.name.Description")
|
||||
.last()
|
||||
.simulate("change", { target: { value: "User full name" } });
|
||||
});
|
||||
|
||||
test("Changes column display type", done => {
|
||||
const el = mount({}, done);
|
||||
findByTestID(el, "Details.Column.created_at.Name")
|
||||
.last()
|
||||
.simulate("click"); // expand settings
|
||||
|
||||
findByTestID(el, "Details.Column.created_at.DisplayAs")
|
||||
.last()
|
||||
.simulate("mouseDown");
|
||||
findByTestID(el, "Details.Column.created_at.DisplayAs.string")
|
||||
.last()
|
||||
.simulate("click");
|
||||
});
|
||||
|
||||
test("Hides multiple columns", done => {
|
||||
const el = mount({}, done);
|
||||
|
||||
findByTestID(el, "Details.Column.id.Visibility")
|
||||
.last()
|
||||
.simulate("click");
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,15 @@
|
||||
import React from "react";
|
||||
import SharedColumnsSettings from "../../shared/components/ColumnsSettings";
|
||||
import { EditorPropTypes } from "@/visualizations/prop-types";
|
||||
|
||||
export default function ColumnsSettings({ options, onOptionsChange, data }: any) {
|
||||
return (
|
||||
<SharedColumnsSettings
|
||||
options={options}
|
||||
onOptionsChange={onOptionsChange}
|
||||
variant="details"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
ColumnsSettings.propTypes = EditorPropTypes;
|
||||
@@ -0,0 +1,529 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`Visualizations -> Details -> Editor -> Columns Settings Changes column alignment 1`] = `
|
||||
Object {
|
||||
"columns": Array [
|
||||
Object {
|
||||
"alignContent": "center",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "number",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "id",
|
||||
"nullValue": "null",
|
||||
"numberFormat": "0,0",
|
||||
"order": 100000,
|
||||
"title": "id",
|
||||
"type": "integer",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "name",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100001,
|
||||
"title": "name",
|
||||
"type": "string",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": "DD/MM/YYYY HH:mm",
|
||||
"description": "",
|
||||
"displayAs": "datetime",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "created_at",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100002,
|
||||
"title": "created_at",
|
||||
"type": "datetime",
|
||||
"visible": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
`;
|
||||
|
||||
exports[`Visualizations -> Details -> Editor -> Columns Settings Changes column description 1`] = `
|
||||
Object {
|
||||
"columns": Array [
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "number",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "id",
|
||||
"nullValue": "null",
|
||||
"numberFormat": "0,0",
|
||||
"order": 100000,
|
||||
"title": "id",
|
||||
"type": "integer",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "User full name",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "name",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100001,
|
||||
"title": "name",
|
||||
"type": "string",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": "DD/MM/YYYY HH:mm",
|
||||
"description": "",
|
||||
"displayAs": "datetime",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "created_at",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100002,
|
||||
"title": "created_at",
|
||||
"type": "datetime",
|
||||
"visible": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
`;
|
||||
|
||||
exports[`Visualizations -> Details -> Editor -> Columns Settings Changes column display type 1`] = `
|
||||
Object {
|
||||
"columns": Array [
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "number",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "id",
|
||||
"nullValue": "null",
|
||||
"numberFormat": "0,0",
|
||||
"order": 100000,
|
||||
"title": "id",
|
||||
"type": "integer",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "name",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100001,
|
||||
"title": "name",
|
||||
"type": "string",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": "DD/MM/YYYY HH:mm",
|
||||
"description": "",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "created_at",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100002,
|
||||
"title": "created_at",
|
||||
"type": "datetime",
|
||||
"visible": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
`;
|
||||
|
||||
exports[`Visualizations -> Details -> Editor -> Columns Settings Changes column title 1`] = `
|
||||
Object {
|
||||
"columns": Array [
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "number",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "id",
|
||||
"nullValue": "null",
|
||||
"numberFormat": "0,0",
|
||||
"order": 100000,
|
||||
"title": "id",
|
||||
"type": "integer",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "name",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100001,
|
||||
"title": "Full Name",
|
||||
"type": "string",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": "DD/MM/YYYY HH:mm",
|
||||
"description": "",
|
||||
"displayAs": "datetime",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "created_at",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100002,
|
||||
"title": "created_at",
|
||||
"type": "datetime",
|
||||
"visible": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
`;
|
||||
|
||||
exports[`Visualizations -> Details -> Editor -> Columns Settings Hides multiple columns 1`] = `
|
||||
Object {
|
||||
"columns": Array [
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "number",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "id",
|
||||
"nullValue": "null",
|
||||
"numberFormat": "0,0",
|
||||
"order": 100000,
|
||||
"title": "id",
|
||||
"type": "integer",
|
||||
"visible": false,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "name",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100001,
|
||||
"title": "name",
|
||||
"type": "string",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": "DD/MM/YYYY HH:mm",
|
||||
"description": "",
|
||||
"displayAs": "datetime",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "created_at",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100002,
|
||||
"title": "created_at",
|
||||
"type": "datetime",
|
||||
"visible": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
`;
|
||||
|
||||
exports[`Visualizations -> Details -> Editor -> Columns Settings Toggles column visibility 1`] = `
|
||||
Object {
|
||||
"columns": Array [
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "number",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "id",
|
||||
"nullValue": "null",
|
||||
"numberFormat": "0,0",
|
||||
"order": 100000,
|
||||
"title": "id",
|
||||
"type": "integer",
|
||||
"visible": false,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": undefined,
|
||||
"description": "",
|
||||
"displayAs": "string",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "name",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100001,
|
||||
"title": "name",
|
||||
"type": "string",
|
||||
"visible": true,
|
||||
},
|
||||
Object {
|
||||
"alignContent": "left",
|
||||
"allowHTML": false,
|
||||
"booleanValues": Array [
|
||||
"false",
|
||||
"true",
|
||||
],
|
||||
"dateTimeFormat": "DD/MM/YYYY HH:mm",
|
||||
"description": "",
|
||||
"displayAs": "datetime",
|
||||
"highlightLinks": false,
|
||||
"imageHeight": "",
|
||||
"imageTitleTemplate": "{{ @ }}",
|
||||
"imageUrlTemplate": "{{ @ }}",
|
||||
"imageWidth": "",
|
||||
"linkOpenInNewTab": true,
|
||||
"linkTextTemplate": "{{ @ }}",
|
||||
"linkTitleTemplate": "{{ @ }}",
|
||||
"linkUrlTemplate": "{{ @ }}",
|
||||
"name": "created_at",
|
||||
"nullValue": "null",
|
||||
"numberFormat": undefined,
|
||||
"order": 100002,
|
||||
"title": "created_at",
|
||||
"type": "datetime",
|
||||
"visible": true,
|
||||
},
|
||||
],
|
||||
}
|
||||
`;
|
||||
33
viz-lib/src/visualizations/details/Editor/editor.less
Normal file
33
viz-lib/src/visualizations/details/Editor/editor.less
Normal file
@@ -0,0 +1,33 @@
|
||||
.details-visualization-editor-columns {
|
||||
.ant-collapse {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.ant-collapse-item {
|
||||
background: #ffffff;
|
||||
|
||||
.drag-handle {
|
||||
height: 20px;
|
||||
margin-left: -16px;
|
||||
padding: 0 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.details-editor-columns-dragged-item {
|
||||
z-index: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.details-visualization-editor-column {
|
||||
padding-left: 6px;
|
||||
|
||||
.image-dimension-selector {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.image-dimension-selector-spacer {
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
9
viz-lib/src/visualizations/details/Editor/index.tsx
Normal file
9
viz-lib/src/visualizations/details/Editor/index.tsx
Normal file
@@ -0,0 +1,9 @@
|
||||
import createTabbedEditor from "@/components/visualizations/editor/createTabbedEditor";
|
||||
|
||||
import ColumnsSettings from "./ColumnsSettings";
|
||||
|
||||
import "./editor.less";
|
||||
|
||||
export default createTabbedEditor([
|
||||
{ key: "Columns", title: "Columns", component: ColumnsSettings },
|
||||
]);
|
||||
179
viz-lib/src/visualizations/details/Renderer.test.tsx
Normal file
179
viz-lib/src/visualizations/details/Renderer.test.tsx
Normal file
@@ -0,0 +1,179 @@
|
||||
import React from "react";
|
||||
import enzyme from "enzyme";
|
||||
import moment from "moment";
|
||||
|
||||
import Renderer from "./Renderer";
|
||||
import getOptions from "./getOptions";
|
||||
|
||||
function mount(data: any, options: any = {}) {
|
||||
options = getOptions(options, data);
|
||||
return enzyme.mount(<Renderer data={data} options={options} />);
|
||||
}
|
||||
|
||||
describe("Visualizations -> Details -> Renderer", () => {
|
||||
const sampleData = {
|
||||
columns: [
|
||||
{ name: "id", type: "integer" },
|
||||
{ name: "name", type: "string" },
|
||||
{ name: "created_at", type: "datetime" },
|
||||
{ name: "active", type: "boolean" },
|
||||
],
|
||||
rows: [
|
||||
{
|
||||
id: 1,
|
||||
name: "John Doe",
|
||||
created_at: moment("2023-01-01T12:00:00Z"),
|
||||
active: true,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
name: "Jane Smith",
|
||||
created_at: moment("2023-02-01T12:00:00Z"),
|
||||
active: false,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
test("Renders all columns when no options provided", () => {
|
||||
const el = mount(sampleData);
|
||||
|
||||
// Check that the component renders with expected data
|
||||
expect(el.text()).toContain("id");
|
||||
expect(el.text()).toContain("name");
|
||||
expect(el.text()).toContain("created_at");
|
||||
expect(el.text()).toContain("active");
|
||||
expect(el.text()).toContain("1"); // id value
|
||||
expect(el.text()).toContain("John Doe"); // name value
|
||||
});
|
||||
|
||||
test("Renders only visible columns", () => {
|
||||
const options = {
|
||||
columns: [
|
||||
{ name: "id", visible: true, order: 0 },
|
||||
{ name: "name", visible: false, order: 1 },
|
||||
{ name: "created_at", visible: true, order: 2 },
|
||||
{ name: "active", visible: false, order: 3 },
|
||||
],
|
||||
};
|
||||
|
||||
const el = mount(sampleData, options);
|
||||
|
||||
// Should show id and created_at, but not name and active
|
||||
expect(el.text()).toContain("id");
|
||||
expect(el.text()).toContain("created_at");
|
||||
expect(el.text()).not.toContain("name");
|
||||
expect(el.text()).not.toContain("active");
|
||||
});
|
||||
|
||||
test("Respects column order", () => {
|
||||
const options = {
|
||||
columns: [
|
||||
{ name: "active", visible: true, order: 0 },
|
||||
{ name: "name", visible: true, order: 1 },
|
||||
{ name: "created_at", visible: true, order: 2 },
|
||||
{ name: "id", visible: true, order: 3 },
|
||||
],
|
||||
};
|
||||
|
||||
const el = mount(sampleData, options);
|
||||
|
||||
// Get all description item labels in order
|
||||
const labels = el.find('.ant-descriptions-item-label').map(node => node.text());
|
||||
|
||||
// Should appear in order: active (0), name (1), created_at (2), id (3)
|
||||
expect(labels).toEqual(['active', 'name', 'created_at', 'id']);
|
||||
});
|
||||
|
||||
test("Uses custom column titles", () => {
|
||||
const options = {
|
||||
columns: [
|
||||
{ name: "id", visible: true, title: "User ID", order: 0 },
|
||||
{ name: "name", visible: true, title: "Full Name", order: 1 },
|
||||
],
|
||||
};
|
||||
|
||||
const el = mount(sampleData, options);
|
||||
|
||||
expect(el.text()).toContain("User ID");
|
||||
expect(el.text()).toContain("Full Name");
|
||||
});
|
||||
|
||||
test("Applies text alignment", () => {
|
||||
const options = {
|
||||
columns: [
|
||||
{ name: "id", visible: true, alignContent: "center", order: 0 },
|
||||
{ name: "name", visible: true, alignContent: "right", order: 1 },
|
||||
],
|
||||
};
|
||||
|
||||
const el = mount(sampleData, options);
|
||||
|
||||
// Check that alignment styles are applied
|
||||
const alignedDivs = el.find('div[style]');
|
||||
expect(alignedDivs.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
test("Shows pagination for multiple rows", () => {
|
||||
const el = mount(sampleData);
|
||||
|
||||
// Check that pagination is present - look for pagination elements
|
||||
const paginationElements = el.find('[className*="paginator"]');
|
||||
expect(paginationElements.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
test("Hides pagination for single row", () => {
|
||||
const singleRowData = {
|
||||
...sampleData,
|
||||
rows: [sampleData.rows[0]],
|
||||
};
|
||||
|
||||
const el = mount(singleRowData);
|
||||
|
||||
// Check that pagination is not present for single row
|
||||
const paginationElements = el.find('[className*="paginator"]');
|
||||
expect(paginationElements.length).toBe(0);
|
||||
});
|
||||
|
||||
test("Handles empty data", () => {
|
||||
const emptyData = {
|
||||
columns: [],
|
||||
rows: [],
|
||||
};
|
||||
|
||||
const el = mount(emptyData);
|
||||
|
||||
expect(el.html()).toBeNull();
|
||||
});
|
||||
|
||||
test("Handles null data", () => {
|
||||
// Suppress PropTypes warning for this test
|
||||
const originalError = console.error;
|
||||
console.error = jest.fn();
|
||||
|
||||
// Test the component directly with null data instead of using mount helper
|
||||
const el = enzyme.mount(<Renderer data={null as any} options={{}} />);
|
||||
|
||||
expect(el.html()).toBeNull();
|
||||
|
||||
// Restore console.error
|
||||
console.error = originalError;
|
||||
});
|
||||
|
||||
test("Navigates between rows with pagination", () => {
|
||||
const el = mount(sampleData);
|
||||
|
||||
// Check first row is displayed
|
||||
expect(el.text()).toContain("John Doe");
|
||||
expect(el.text()).not.toContain("Jane Smith");
|
||||
|
||||
// Find and click next button
|
||||
const nextButton = el.find('button').filterWhere(n => n.text().includes('Next') || n.prop('aria-label') === 'Next Page');
|
||||
if (nextButton.length > 0) {
|
||||
nextButton.first().simulate("click");
|
||||
|
||||
// Check second row is displayed after state update
|
||||
el.update();
|
||||
expect(el.text()).toContain("Jane Smith");
|
||||
}
|
||||
});
|
||||
});
|
||||
82
viz-lib/src/visualizations/details/Renderer.tsx
Normal file
82
viz-lib/src/visualizations/details/Renderer.tsx
Normal file
@@ -0,0 +1,82 @@
|
||||
import React, { useState, useMemo } from "react";
|
||||
import { map, filter, sortBy } from "lodash";
|
||||
import { RendererPropTypes } from "@/visualizations/prop-types";
|
||||
import Descriptions from "antd/lib/descriptions";
|
||||
import Pagination from "antd/lib/pagination";
|
||||
import Tooltip from "antd/lib/tooltip";
|
||||
|
||||
import ColumnTypes from "../shared/columns";
|
||||
import "./details.less";
|
||||
|
||||
|
||||
export default function Renderer({ data, options }: any) {
|
||||
const [page, setPage] = useState(0);
|
||||
|
||||
const visibleColumns = useMemo(() => {
|
||||
if (!options?.columns) return [];
|
||||
|
||||
const columns = sortBy(filter(options.columns, "visible"), "order");
|
||||
|
||||
return columns.map((column: any) => {
|
||||
// @ts-expect-error ts-migrate(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
|
||||
const ColumnType = ColumnTypes[column.displayAs] || ColumnTypes.string;
|
||||
const Component = ColumnType(column);
|
||||
|
||||
return {
|
||||
...column,
|
||||
Component,
|
||||
};
|
||||
});
|
||||
}, [options?.columns]);
|
||||
|
||||
if (!data || !data.rows || data.rows.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const row = data.rows[page];
|
||||
|
||||
return (
|
||||
<div className="details-viz">
|
||||
<Descriptions size="small" column={1} bordered>
|
||||
{map(visibleColumns, column => {
|
||||
const { Component } = column;
|
||||
|
||||
return (
|
||||
<Descriptions.Item
|
||||
key={column.name}
|
||||
label={
|
||||
<React.Fragment>
|
||||
{column.description && (
|
||||
<span style={{ paddingRight: 5 }}>
|
||||
<Tooltip placement="top" title={column.description}>
|
||||
<i className="fa fa-info-circle" aria-hidden="true"></i>
|
||||
</Tooltip>
|
||||
</span>
|
||||
)}
|
||||
{column.title || column.name}
|
||||
</React.Fragment>
|
||||
}
|
||||
>
|
||||
<div style={{ textAlign: column.alignContent || "left" }}>
|
||||
<Component row={row} />
|
||||
</div>
|
||||
</Descriptions.Item>
|
||||
);
|
||||
})}
|
||||
</Descriptions>
|
||||
{data.rows.length > 1 && (
|
||||
<div className="paginator-container">
|
||||
<Pagination
|
||||
showSizeChanger={false}
|
||||
current={page + 1}
|
||||
defaultPageSize={1}
|
||||
total={data.rows.length}
|
||||
onChange={p => setPage(p - 1)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Renderer.propTypes = RendererPropTypes;
|
||||
160
viz-lib/src/visualizations/details/getOptions.test.ts
Normal file
160
viz-lib/src/visualizations/details/getOptions.test.ts
Normal file
@@ -0,0 +1,160 @@
|
||||
import getOptions from "./getOptions";
|
||||
|
||||
describe("Visualizations -> Details -> getOptions", () => {
|
||||
const sampleData = {
|
||||
columns: [
|
||||
{ name: "id", type: "integer" },
|
||||
{ name: "name", type: "string" },
|
||||
{ name: "created_at", type: "datetime" },
|
||||
{ name: "is_active", type: "boolean" },
|
||||
{ name: "score", type: "float" },
|
||||
],
|
||||
};
|
||||
|
||||
test("Returns default options when no options provided", () => {
|
||||
const result = getOptions({}, sampleData);
|
||||
|
||||
expect(result.columns).toHaveLength(5);
|
||||
expect(result.columns[0]).toEqual(
|
||||
expect.objectContaining({
|
||||
name: "id",
|
||||
type: "integer",
|
||||
displayAs: "number",
|
||||
visible: true,
|
||||
alignContent: "left",
|
||||
title: "id",
|
||||
description: "",
|
||||
allowHTML: false,
|
||||
highlightLinks: false,
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
test("Preserves existing column options", () => {
|
||||
const existingOptions = {
|
||||
columns: [
|
||||
{
|
||||
name: "id",
|
||||
visible: false,
|
||||
title: "User ID",
|
||||
alignContent: "center",
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const result = getOptions(existingOptions, sampleData);
|
||||
|
||||
const idColumn = result.columns.find((col: any) => col.name === "id");
|
||||
expect(idColumn).toEqual(
|
||||
expect.objectContaining({
|
||||
visible: false,
|
||||
title: "User ID",
|
||||
alignContent: "center",
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
test("Sets correct default display types", () => {
|
||||
const result = getOptions({}, sampleData);
|
||||
|
||||
const columnsByName = result.columns.reduce((acc: any, col: any) => {
|
||||
acc[col.name] = col;
|
||||
return acc;
|
||||
}, {} as any);
|
||||
|
||||
expect(columnsByName.id.displayAs).toBe("number");
|
||||
expect(columnsByName.name.displayAs).toBe("string");
|
||||
expect(columnsByName.created_at.displayAs).toBe("datetime");
|
||||
expect(columnsByName.is_active.displayAs).toBe("boolean");
|
||||
expect(columnsByName.score.displayAs).toBe("number");
|
||||
});
|
||||
|
||||
test("Sets correct default alignments", () => {
|
||||
const result = getOptions({}, sampleData);
|
||||
|
||||
const columnsByName = result.columns.reduce((acc: any, col: any) => {
|
||||
acc[col.name] = col;
|
||||
return acc;
|
||||
}, {} as any);
|
||||
|
||||
expect(columnsByName.id.alignContent).toBe("left");
|
||||
expect(columnsByName.name.alignContent).toBe("left");
|
||||
expect(columnsByName.created_at.alignContent).toBe("left");
|
||||
expect(columnsByName.is_active.alignContent).toBe("left");
|
||||
expect(columnsByName.score.alignContent).toBe("left");
|
||||
});
|
||||
|
||||
test("Handles column name type suffixes", () => {
|
||||
const dataWithTypeSuffixes = {
|
||||
columns: [
|
||||
{ name: "user::filter", type: "string" },
|
||||
{ name: "amount__multiFilter", type: "float" },
|
||||
{ name: "::date_field", type: "date" },
|
||||
],
|
||||
};
|
||||
|
||||
const result = getOptions({}, dataWithTypeSuffixes);
|
||||
|
||||
expect(result.columns[0].title).toBe("user");
|
||||
expect(result.columns[1].title).toBe("amount");
|
||||
expect(result.columns[2].title).toBe("date_field");
|
||||
});
|
||||
|
||||
test("Maintains column order from existing options", () => {
|
||||
const existingOptions = {
|
||||
columns: [
|
||||
{ name: "name", order: 0 },
|
||||
{ name: "id", order: 1 },
|
||||
],
|
||||
};
|
||||
|
||||
const result = getOptions(existingOptions, sampleData);
|
||||
|
||||
expect(result.columns[0].name).toBe("name");
|
||||
expect(result.columns[1].name).toBe("id");
|
||||
});
|
||||
|
||||
test("Handles missing columns in existing options", () => {
|
||||
const existingOptions = {
|
||||
columns: [
|
||||
{ name: "id", visible: false },
|
||||
{ name: "nonexistent", visible: true },
|
||||
],
|
||||
};
|
||||
|
||||
const result = getOptions(existingOptions, sampleData);
|
||||
|
||||
// Should include all data columns
|
||||
expect(result.columns).toHaveLength(5);
|
||||
|
||||
// Should preserve settings for existing columns
|
||||
const idColumn = result.columns.find((col: any) => col.name === "id");
|
||||
expect(idColumn.visible).toBe(false);
|
||||
});
|
||||
|
||||
test("Includes default format options", () => {
|
||||
const result = getOptions({}, sampleData);
|
||||
|
||||
const column = result.columns[0];
|
||||
expect(column).toEqual(
|
||||
expect.objectContaining({
|
||||
booleanValues: ["false", "true"],
|
||||
imageUrlTemplate: "{{ @ }}",
|
||||
imageTitleTemplate: "{{ @ }}",
|
||||
imageWidth: "",
|
||||
imageHeight: "",
|
||||
linkUrlTemplate: "{{ @ }}",
|
||||
linkTextTemplate: "{{ @ }}",
|
||||
linkTitleTemplate: "{{ @ }}",
|
||||
linkOpenInNewTab: true,
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
test("Handles empty data", () => {
|
||||
const emptyData = { columns: [] };
|
||||
const result = getOptions({}, emptyData);
|
||||
|
||||
expect(result.columns).toEqual([]);
|
||||
});
|
||||
});
|
||||
17
viz-lib/src/visualizations/details/getOptions.ts
Normal file
17
viz-lib/src/visualizations/details/getOptions.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
import _ from "lodash";
|
||||
import {
|
||||
getDefaultFormatOptions,
|
||||
getColumnsOptions,
|
||||
} from "@/visualizations/shared/columnUtils";
|
||||
|
||||
const DEFAULT_OPTIONS = {};
|
||||
|
||||
|
||||
export default function getOptions(options: any, { columns }: any) {
|
||||
options = { ...DEFAULT_OPTIONS, ...options };
|
||||
options.columns = _.map(getColumnsOptions(columns, options.columns, { alignContent: "left" }), col => ({
|
||||
...getDefaultFormatOptions(col),
|
||||
...col,
|
||||
}));
|
||||
return options;
|
||||
}
|
||||
@@ -1,15 +1,13 @@
|
||||
import DetailsRenderer from "./DetailsRenderer";
|
||||
|
||||
const DEFAULT_OPTIONS = {};
|
||||
import getOptions from "./getOptions";
|
||||
import Renderer from "./Renderer";
|
||||
import Editor from "./Editor";
|
||||
|
||||
export default {
|
||||
type: "DETAILS",
|
||||
name: "Details View",
|
||||
getOptions: (options: any) => ({
|
||||
...DEFAULT_OPTIONS,
|
||||
...options,
|
||||
}),
|
||||
Renderer: DetailsRenderer,
|
||||
defaultColumns: 2,
|
||||
getOptions,
|
||||
Renderer,
|
||||
Editor,
|
||||
defaultColumns: 4,
|
||||
defaultRows: 2,
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@ export default {
|
||||
Renderer,
|
||||
Editor,
|
||||
|
||||
defaultColumns: 3,
|
||||
defaultColumns: 6,
|
||||
defaultRows: 8,
|
||||
minColumns: 2,
|
||||
};
|
||||
|
||||
@@ -23,6 +23,6 @@ export default {
|
||||
Editor,
|
||||
|
||||
defaultRows: 10,
|
||||
defaultColumns: 3,
|
||||
defaultColumns: 6,
|
||||
minColumns: 2,
|
||||
};
|
||||
|
||||
126
viz-lib/src/visualizations/shared/columnUtils.ts
Normal file
126
viz-lib/src/visualizations/shared/columnUtils.ts
Normal file
@@ -0,0 +1,126 @@
|
||||
import _ from "lodash";
|
||||
import { visualizationsSettings } from "@/visualizations/visualizationsSettings";
|
||||
|
||||
const filterTypes = ["filter", "multi-filter", "multiFilter"];
|
||||
|
||||
export function getColumnNameWithoutType(column: any) {
|
||||
let typeSplit;
|
||||
if (column.indexOf("::") !== -1) {
|
||||
typeSplit = "::";
|
||||
} else if (column.indexOf("__") !== -1) {
|
||||
typeSplit = "__";
|
||||
} else {
|
||||
return column;
|
||||
}
|
||||
|
||||
const parts = column.split(typeSplit);
|
||||
if (parts[0] === "" && parts.length === 2) {
|
||||
return parts[1];
|
||||
}
|
||||
|
||||
if (!_.includes(filterTypes, parts[1])) {
|
||||
return column;
|
||||
}
|
||||
|
||||
return parts[0];
|
||||
}
|
||||
|
||||
export function getColumnContentAlignment(type: any) {
|
||||
return ["integer", "float", "boolean", "date", "datetime"].indexOf(type) >= 0 ? "right" : "left";
|
||||
}
|
||||
|
||||
export function getDefaultColumnsOptions(columns: any, extraFields = {}) {
|
||||
const displayAs = {
|
||||
integer: "number",
|
||||
float: "number",
|
||||
boolean: "boolean",
|
||||
date: "datetime",
|
||||
datetime: "datetime",
|
||||
};
|
||||
|
||||
const defaultFields = {
|
||||
// `string` cell options
|
||||
allowHTML: false,
|
||||
highlightLinks: false,
|
||||
};
|
||||
|
||||
return _.map(columns, (col, index) => ({
|
||||
name: col.name,
|
||||
type: col.type,
|
||||
// @ts-expect-error ts-migrate(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
|
||||
displayAs: displayAs[col.type] || "string",
|
||||
visible: true,
|
||||
order: 100000 + index,
|
||||
title: getColumnNameWithoutType(col.name),
|
||||
alignContent: getColumnContentAlignment(col.type),
|
||||
description: "",
|
||||
...defaultFields,
|
||||
...extraFields,
|
||||
}));
|
||||
}
|
||||
|
||||
export function getDefaultFormatOptions(column: any) {
|
||||
const dateTimeFormat = {
|
||||
date: visualizationsSettings.dateFormat || "DD/MM/YYYY",
|
||||
datetime: visualizationsSettings.dateTimeFormat || "DD/MM/YYYY HH:mm",
|
||||
};
|
||||
const numberFormat = {
|
||||
integer: visualizationsSettings.integerFormat || "0,0",
|
||||
float: visualizationsSettings.floatFormat || "0,0.00",
|
||||
};
|
||||
return {
|
||||
// @ts-expect-error ts-migrate(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
|
||||
dateTimeFormat: dateTimeFormat[column.type],
|
||||
// @ts-expect-error ts-migrate(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
|
||||
numberFormat: numberFormat[column.type],
|
||||
nullValue: visualizationsSettings.nullValue,
|
||||
booleanValues: visualizationsSettings.booleanValues || ["false", "true"],
|
||||
// `image` cell options
|
||||
imageUrlTemplate: "{{ @ }}",
|
||||
imageTitleTemplate: "{{ @ }}",
|
||||
imageWidth: "",
|
||||
imageHeight: "",
|
||||
// `link` cell options
|
||||
linkUrlTemplate: "{{ @ }}",
|
||||
linkTextTemplate: "{{ @ }}",
|
||||
linkTitleTemplate: "{{ @ }}",
|
||||
linkOpenInNewTab: true,
|
||||
};
|
||||
}
|
||||
|
||||
export function wereColumnsReordered(queryColumns: any, visualizationColumns: any) {
|
||||
queryColumns = _.map(queryColumns, col => col.name);
|
||||
visualizationColumns = _.map(visualizationColumns, col => col.name);
|
||||
|
||||
// Some columns may be removed - so skip them (but keep original order)
|
||||
visualizationColumns = _.filter(visualizationColumns, col => _.includes(queryColumns, col));
|
||||
// Pick query columns that were previously saved with viz (but keep order too)
|
||||
queryColumns = _.filter(queryColumns, col => _.includes(visualizationColumns, col));
|
||||
|
||||
// Both array now have the same size as they both contains only common columns
|
||||
// (in fact, it was an intersection, that kept order of items on both arrays).
|
||||
// Now check for equality item-by-item; if common columns are in the same order -
|
||||
// they were not reordered in editor
|
||||
for (let i = 0; i < queryColumns.length; i += 1) {
|
||||
if (visualizationColumns[i] !== queryColumns[i]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
export function getColumnsOptions(columns: any, visualizationColumns: any, extraFields = {}) {
|
||||
const options = getDefaultColumnsOptions(columns, extraFields);
|
||||
|
||||
if (wereColumnsReordered(columns, visualizationColumns)) {
|
||||
visualizationColumns = _.fromPairs(
|
||||
_.map(visualizationColumns, (col, index) => [col.name, _.extend({}, col, { order: index })])
|
||||
);
|
||||
} else {
|
||||
visualizationColumns = _.fromPairs(_.map(visualizationColumns, col => [col.name, _.omit(col, "order")]));
|
||||
}
|
||||
|
||||
_.each(options, col => _.extend(col, visualizationColumns[col.name]));
|
||||
|
||||
return _.sortBy(options, "order");
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user