mirror of
https://github.com/getredash/redash.git
synced 2025-12-19 17:37:19 -05:00
Compare commits
43 Commits
25.08.0-de
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
43ee21ac20 | ||
|
|
262d46f465 | ||
|
|
bc68b1c38b | ||
|
|
4353a82c7a | ||
|
|
761eb0b68b | ||
|
|
9743820efe | ||
|
|
9d49e0457f | ||
|
|
b5781a8ebe | ||
|
|
b6f4159be9 | ||
|
|
d5fbf547cf | ||
|
|
772b160a79 | ||
|
|
bac2160e2a | ||
|
|
c5aa5da6a2 | ||
|
|
9503cc9fb8 | ||
|
|
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 |
@@ -18,7 +18,7 @@ services:
|
|||||||
image: redis:7-alpine
|
image: redis:7-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
postgres:
|
postgres:
|
||||||
image: pgautoupgrade/pgautoupgrade:latest
|
image: postgres:18-alpine
|
||||||
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
|
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ services:
|
|||||||
image: redis:7-alpine
|
image: redis:7-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
postgres:
|
postgres:
|
||||||
image: pgautoupgrade/pgautoupgrade:latest
|
image: postgres:18-alpine
|
||||||
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
|
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ EOF
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENV POETRY_VERSION=1.8.3
|
ENV POETRY_VERSION=2.1.4
|
||||||
ENV POETRY_HOME=/etc/poetry
|
ENV POETRY_HOME=/etc/poetry
|
||||||
ENV POETRY_VIRTUALENVS_CREATE=false
|
ENV POETRY_VIRTUALENVS_CREATE=false
|
||||||
RUN curl -sSL https://install.python-poetry.org | python3 -
|
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_build: .env
|
||||||
COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
|
COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
|
||||||
@@ -32,11 +32,6 @@ clean:
|
|||||||
docker image prune --force
|
docker image prune --force
|
||||||
docker volume 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:
|
down:
|
||||||
docker compose down
|
docker compose down
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ server() {
|
|||||||
MAX_REQUESTS=${MAX_REQUESTS:-1000}
|
MAX_REQUESTS=${MAX_REQUESTS:-1000}
|
||||||
MAX_REQUESTS_JITTER=${MAX_REQUESTS_JITTER:-100}
|
MAX_REQUESTS_JITTER=${MAX_REQUESTS_JITTER:-100}
|
||||||
TIMEOUT=${REDASH_GUNICORN_TIMEOUT:-60}
|
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() {
|
create_db() {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ body {
|
|||||||
display: table;
|
display: table;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
height: calc(100vh - 116px);
|
height: calc(100% - 116px);
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-width: 992px) {
|
@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,
|
html,
|
||||||
body {
|
body {
|
||||||
min-height: 100vh;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@@ -35,7 +35,7 @@ body {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#application-root {
|
#application-root {
|
||||||
min-height: 100vh;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#application-root,
|
#application-root,
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 1px;
|
width: 1px;
|
||||||
height: 100vh;
|
height: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ body.fixed-layout {
|
|||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
|
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
height: 100vh;
|
height: 100%;
|
||||||
|
|
||||||
.application-layout-content > div {
|
.application-layout-content > div {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -90,7 +90,7 @@ body.fixed-layout {
|
|||||||
.embed__vis {
|
.embed__vis {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: column;
|
flex-flow: column;
|
||||||
height: calc(~'100vh - 25px');
|
height: calc(~'100% - 25px');
|
||||||
|
|
||||||
> .embed-heading {
|
> .embed-heading {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ body #application-root {
|
|||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: stretch;
|
justify-content: stretch;
|
||||||
padding-bottom: 0 !important;
|
padding-bottom: 0 !important;
|
||||||
height: 100vh;
|
height: 100%;
|
||||||
|
|
||||||
.application-layout-side-menu {
|
.application-layout-side-menu {
|
||||||
height: 100vh;
|
height: 100%;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
@media @mobileBreakpoint {
|
@media @mobileBreakpoint {
|
||||||
@@ -47,6 +47,10 @@ body #application-root {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
body > section {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
body.fixed-layout #application-root {
|
body.fixed-layout #application-root {
|
||||||
.application-layout-content {
|
.application-layout-content {
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
|
|||||||
@@ -9,121 +9,85 @@ const DYNAMIC_DATE_OPTIONS = [
|
|||||||
name: "This week",
|
name: "This week",
|
||||||
value: getDynamicDateRangeFromString("d_this_week"),
|
value: getDynamicDateRangeFromString("d_this_week"),
|
||||||
label: () =>
|
label: () =>
|
||||||
getDynamicDateRangeFromString("d_this_week")
|
getDynamicDateRangeFromString("d_this_week").value()[0].format("MMM D") +
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") +
|
|
||||||
" - " +
|
" - " +
|
||||||
getDynamicDateRangeFromString("d_this_week")
|
getDynamicDateRangeFromString("d_this_week").value()[1].format("MMM D"),
|
||||||
.value()[1]
|
|
||||||
.format("MMM D"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "This month",
|
name: "This month",
|
||||||
value: getDynamicDateRangeFromString("d_this_month"),
|
value: getDynamicDateRangeFromString("d_this_month"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_this_month").value()[0].format("MMMM"),
|
||||||
getDynamicDateRangeFromString("d_this_month")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMMM"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "This year",
|
name: "This year",
|
||||||
value: getDynamicDateRangeFromString("d_this_year"),
|
value: getDynamicDateRangeFromString("d_this_year"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_this_year").value()[0].format("YYYY"),
|
||||||
getDynamicDateRangeFromString("d_this_year")
|
|
||||||
.value()[0]
|
|
||||||
.format("YYYY"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last week",
|
name: "Last week",
|
||||||
value: getDynamicDateRangeFromString("d_last_week"),
|
value: getDynamicDateRangeFromString("d_last_week"),
|
||||||
label: () =>
|
label: () =>
|
||||||
getDynamicDateRangeFromString("d_last_week")
|
getDynamicDateRangeFromString("d_last_week").value()[0].format("MMM D") +
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") +
|
|
||||||
" - " +
|
" - " +
|
||||||
getDynamicDateRangeFromString("d_last_week")
|
getDynamicDateRangeFromString("d_last_week").value()[1].format("MMM D"),
|
||||||
.value()[1]
|
|
||||||
.format("MMM D"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last month",
|
name: "Last month",
|
||||||
value: getDynamicDateRangeFromString("d_last_month"),
|
value: getDynamicDateRangeFromString("d_last_month"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_month").value()[0].format("MMMM"),
|
||||||
getDynamicDateRangeFromString("d_last_month")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMMM"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last year",
|
name: "Last year",
|
||||||
value: getDynamicDateRangeFromString("d_last_year"),
|
value: getDynamicDateRangeFromString("d_last_year"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_year").value()[0].format("YYYY"),
|
||||||
getDynamicDateRangeFromString("d_last_year")
|
|
||||||
.value()[0]
|
|
||||||
.format("YYYY"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last 7 days",
|
name: "Last 7 days",
|
||||||
value: getDynamicDateRangeFromString("d_last_7_days"),
|
value: getDynamicDateRangeFromString("d_last_7_days"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_7_days").value()[0].format("MMM D") + " - Today",
|
||||||
getDynamicDateRangeFromString("d_last_7_days")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") + " - Today",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last 14 days",
|
name: "Last 14 days",
|
||||||
value: getDynamicDateRangeFromString("d_last_14_days"),
|
value: getDynamicDateRangeFromString("d_last_14_days"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_14_days").value()[0].format("MMM D") + " - Today",
|
||||||
getDynamicDateRangeFromString("d_last_14_days")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") + " - Today",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last 30 days",
|
name: "Last 30 days",
|
||||||
value: getDynamicDateRangeFromString("d_last_30_days"),
|
value: getDynamicDateRangeFromString("d_last_30_days"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_30_days").value()[0].format("MMM D") + " - Today",
|
||||||
getDynamicDateRangeFromString("d_last_30_days")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") + " - Today",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last 60 days",
|
name: "Last 60 days",
|
||||||
value: getDynamicDateRangeFromString("d_last_60_days"),
|
value: getDynamicDateRangeFromString("d_last_60_days"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_60_days").value()[0].format("MMM D") + " - Today",
|
||||||
getDynamicDateRangeFromString("d_last_60_days")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") + " - Today",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last 90 days",
|
name: "Last 90 days",
|
||||||
value: getDynamicDateRangeFromString("d_last_90_days"),
|
value: getDynamicDateRangeFromString("d_last_90_days"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_last_90_days").value()[0].format("MMM D") + " - Today",
|
||||||
getDynamicDateRangeFromString("d_last_90_days")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D") + " - Today",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Last 12 months",
|
name: "Last 12 months",
|
||||||
value: getDynamicDateRangeFromString("d_last_12_months"),
|
value: getDynamicDateRangeFromString("d_last_12_months"),
|
||||||
label: null,
|
label: null,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Last 10 years",
|
||||||
|
value: getDynamicDateRangeFromString("d_last_10_years"),
|
||||||
|
label: null,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const DYNAMIC_DATETIME_OPTIONS = [
|
const DYNAMIC_DATETIME_OPTIONS = [
|
||||||
{
|
{
|
||||||
name: "Today",
|
name: "Today",
|
||||||
value: getDynamicDateRangeFromString("d_today"),
|
value: getDynamicDateRangeFromString("d_today"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_today").value()[0].format("MMM D"),
|
||||||
getDynamicDateRangeFromString("d_today")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D"),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Yesterday",
|
name: "Yesterday",
|
||||||
value: getDynamicDateRangeFromString("d_yesterday"),
|
value: getDynamicDateRangeFromString("d_yesterday"),
|
||||||
label: () =>
|
label: () => getDynamicDateRangeFromString("d_yesterday").value()[0].format("MMM D"),
|
||||||
getDynamicDateRangeFromString("d_yesterday")
|
|
||||||
.value()[0]
|
|
||||||
.format("MMM D"),
|
|
||||||
},
|
},
|
||||||
...DYNAMIC_DATE_OPTIONS,
|
...DYNAMIC_DATE_OPTIONS,
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ export interface PaginationOptions {
|
|||||||
itemsPerPage?: number;
|
itemsPerPage?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface SearchOptions {
|
||||||
|
isServerSideFTS?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export interface Controller<I, P = any> {
|
export interface Controller<I, P = any> {
|
||||||
params: P; // TODO: Find out what params is (except merging with props)
|
params: P; // TODO: Find out what params is (except merging with props)
|
||||||
|
|
||||||
@@ -18,7 +22,7 @@ export interface Controller<I, P = any> {
|
|||||||
|
|
||||||
// search
|
// search
|
||||||
searchTerm?: string;
|
searchTerm?: string;
|
||||||
updateSearch: (searchTerm: string) => void;
|
updateSearch: (searchTerm: string, searchOptions?: SearchOptions) => void;
|
||||||
|
|
||||||
// tags
|
// tags
|
||||||
selectedTags: string[];
|
selectedTags: string[];
|
||||||
@@ -94,7 +98,7 @@ export interface ItemsListWrappedComponentProps<I, P = any> {
|
|||||||
export function wrap<I, P = any>(
|
export function wrap<I, P = any>(
|
||||||
WrappedComponent: React.ComponentType<ItemsListWrappedComponentProps<I>>,
|
WrappedComponent: React.ComponentType<ItemsListWrappedComponentProps<I>>,
|
||||||
createItemsSource: () => ItemsSource,
|
createItemsSource: () => ItemsSource,
|
||||||
createStateStorage: () => StateStorage
|
createStateStorage: ( { ...props }) => StateStorage
|
||||||
) {
|
) {
|
||||||
class ItemsListWrapper extends React.Component<ItemsListWrapperProps, ItemsListWrapperState<I, P>> {
|
class ItemsListWrapper extends React.Component<ItemsListWrapperProps, ItemsListWrapperState<I, P>> {
|
||||||
private _itemsSource: ItemsSource;
|
private _itemsSource: ItemsSource;
|
||||||
@@ -117,7 +121,7 @@ export function wrap<I, P = any>(
|
|||||||
constructor(props: ItemsListWrapperProps) {
|
constructor(props: ItemsListWrapperProps) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
const stateStorage = createStateStorage();
|
const stateStorage = createStateStorage({ ...props });
|
||||||
const itemsSource = createItemsSource();
|
const itemsSource = createItemsSource();
|
||||||
this._itemsSource = itemsSource;
|
this._itemsSource = itemsSource;
|
||||||
|
|
||||||
@@ -141,11 +145,32 @@ export function wrap<I, P = any>(
|
|||||||
|
|
||||||
const initialState = this.getState({ ...itemsSource.getState(), isLoaded: false });
|
const initialState = this.getState({ ...itemsSource.getState(), isLoaded: false });
|
||||||
const { updatePagination, toggleSorting, setSorting, 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 = {
|
this.state = {
|
||||||
...initialState,
|
...initialState,
|
||||||
toggleSorting, // eslint-disable-line react/no-unused-state
|
toggleSorting, // eslint-disable-line react/no-unused-state
|
||||||
setSorting, // eslint-disable-line react/no-unused-state
|
setSorting, // eslint-disable-line react/no-unused-state
|
||||||
updateSearch: debounce(updateSearch, 200), // eslint-disable-line react/no-unused-state
|
updateSearch: debouncedUpdateSearch, // eslint-disable-line react/no-unused-state
|
||||||
updateSelectedTags, // eslint-disable-line react/no-unused-state
|
updateSelectedTags, // eslint-disable-line react/no-unused-state
|
||||||
updatePagination, // eslint-disable-line react/no-unused-state
|
updatePagination, // eslint-disable-line react/no-unused-state
|
||||||
update, // eslint-disable-line react/no-unused-state
|
update, // eslint-disable-line react/no-unused-state
|
||||||
|
|||||||
@@ -135,19 +135,19 @@ export class ItemsSource {
|
|||||||
this._changed({ sorting: true });
|
this._changed({ sorting: true });
|
||||||
};
|
};
|
||||||
|
|
||||||
updateSearch = (searchTerm) => {
|
updateSearch = (searchTerm, options) => {
|
||||||
// here we update state directly, but later `fetchData` will update it properly
|
// here we update state directly, but later `fetchData` will update it properly
|
||||||
this._searchTerm = searchTerm;
|
this._searchTerm = searchTerm;
|
||||||
// in search mode ignore the ordering and use the ranking order
|
// in search mode ignore the ordering and use the ranking order
|
||||||
// provided by the server-side FTS backend instead, unless it was
|
// provided by the server-side FTS backend instead, unless it was
|
||||||
// requested by the user by actively ordering in search mode
|
// requested by the user by actively ordering in search mode
|
||||||
if (searchTerm === "") {
|
if (searchTerm === "" || !options?.isServerSideFTS) {
|
||||||
this._sorter.setField(this._savedOrderByField); // restore ordering
|
this._sorter.setField(this._savedOrderByField); // restore ordering
|
||||||
} else {
|
} else {
|
||||||
this._sorter.setField(null);
|
this._sorter.setField(null);
|
||||||
}
|
}
|
||||||
this._paginator.setPage(1);
|
this._paginator.setPage(1);
|
||||||
this._changed({ search: true, pagination: { page: true } });
|
return this._changed({ search: true, pagination: { page: true } });
|
||||||
};
|
};
|
||||||
|
|
||||||
updateSelectedTags = (selectedTags) => {
|
updateSelectedTags = (selectedTags) => {
|
||||||
|
|||||||
@@ -47,6 +47,14 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
|
|||||||
return (
|
return (
|
||||||
<div {...props}>
|
<div {...props}>
|
||||||
<div className="schema-list-item">
|
<div className="schema-list-item">
|
||||||
|
<Tooltip
|
||||||
|
title={item.description}
|
||||||
|
mouseEnterDelay={0}
|
||||||
|
mouseLeaveDelay={0}
|
||||||
|
placement="rightTop"
|
||||||
|
trigger={item.description ? "hover" : ""}
|
||||||
|
overlayStyle={{ whiteSpace: "pre-line" }}
|
||||||
|
>
|
||||||
<PlainButton className="table-name" onClick={onToggle}>
|
<PlainButton className="table-name" onClick={onToggle}>
|
||||||
<i className="fa fa-table m-r-5" aria-hidden="true" />
|
<i className="fa fa-table m-r-5" aria-hidden="true" />
|
||||||
<strong>
|
<strong>
|
||||||
@@ -54,13 +62,15 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
|
|||||||
{!isNil(item.size) && <span> ({item.size})</span>}
|
{!isNil(item.size) && <span> ({item.size})</span>}
|
||||||
</strong>
|
</strong>
|
||||||
</PlainButton>
|
</PlainButton>
|
||||||
|
</Tooltip>
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title="Insert table name into query text"
|
title="Insert table name into query text"
|
||||||
mouseEnterDelay={0}
|
mouseEnterDelay={0}
|
||||||
mouseLeaveDelay={0}
|
mouseLeaveDelay={0}
|
||||||
placement="topRight"
|
placement="topRight"
|
||||||
arrowPointAtCenter>
|
arrowPointAtCenter
|
||||||
<PlainButton className="copy-to-editor" onClick={e => handleSelect(e, item.name)}>
|
>
|
||||||
|
<PlainButton className="copy-to-editor" onClick={(e) => handleSelect(e, item.name)}>
|
||||||
<i className="fa fa-angle-double-right" aria-hidden="true" />
|
<i className="fa fa-angle-double-right" aria-hidden="true" />
|
||||||
</PlainButton>
|
</PlainButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
@@ -70,16 +80,23 @@ function SchemaItem({ item, expanded, onToggle, onSelect, ...props }) {
|
|||||||
{item.loading ? (
|
{item.loading ? (
|
||||||
<div className="table-open">Loading...</div>
|
<div className="table-open">Loading...</div>
|
||||||
) : (
|
) : (
|
||||||
map(item.columns, column => {
|
map(item.columns, (column) => {
|
||||||
const columnName = get(column, "name");
|
const columnName = get(column, "name");
|
||||||
const columnType = get(column, "type");
|
const columnType = get(column, "type");
|
||||||
|
const columnDescription = get(column, "description");
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title="Insert column name into query text"
|
title={"Insert column name into query text" + (columnDescription ? "\n" + columnDescription : "")}
|
||||||
mouseEnterDelay={0}
|
mouseEnterDelay={0}
|
||||||
mouseLeaveDelay={0}
|
mouseLeaveDelay={0}
|
||||||
placement="rightTop">
|
placement="rightTop"
|
||||||
<PlainButton key={columnName} className="table-open-item" onClick={e => handleSelect(e, columnName)}>
|
overlayStyle={{ whiteSpace: "pre-line" }}
|
||||||
|
>
|
||||||
|
<PlainButton
|
||||||
|
key={columnName}
|
||||||
|
className="table-open-item"
|
||||||
|
onClick={(e) => handleSelect(e, columnName)}
|
||||||
|
>
|
||||||
<div>
|
<div>
|
||||||
{columnName} {columnType && <span className="column-type">{columnType}</span>}
|
{columnName} {columnType && <span className="column-type">{columnType}</span>}
|
||||||
</div>
|
</div>
|
||||||
@@ -168,7 +185,7 @@ export function SchemaList({ loading, schema, expandedFlags, onTableExpand, onIt
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function applyFilterOnSchema(schema, filterString) {
|
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
|
// Empty string: return original schema
|
||||||
if (filters.length === 0) {
|
if (filters.length === 0) {
|
||||||
@@ -181,9 +198,9 @@ export function applyFilterOnSchema(schema, filterString) {
|
|||||||
const columnFilter = filters[0];
|
const columnFilter = filters[0];
|
||||||
return filter(
|
return filter(
|
||||||
schema,
|
schema,
|
||||||
item =>
|
(item) =>
|
||||||
includes(item.name.toLowerCase(), nameFilter) ||
|
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 nameFilter = filters[0];
|
||||||
const columnFilter = filters[1];
|
const columnFilter = filters[1];
|
||||||
return filter(
|
return filter(
|
||||||
map(schema, item => {
|
map(schema, (item) => {
|
||||||
if (includes(item.name.toLowerCase(), nameFilter)) {
|
if (includes(item.name.toLowerCase(), nameFilter)) {
|
||||||
item = {
|
item = {
|
||||||
...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;
|
return item.columns.length > 0 ? item : null;
|
||||||
}
|
}
|
||||||
@@ -243,7 +260,7 @@ export default function SchemaBrowser({
|
|||||||
placeholder="Search schema..."
|
placeholder="Search schema..."
|
||||||
aria-label="Search schema"
|
aria-label="Search schema"
|
||||||
disabled={schema.length === 0}
|
disabled={schema.length === 0}
|
||||||
onChange={event => handleFilterChange(event.target.value)}
|
onChange={(event) => handleFilterChange(event.target.value)}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Tooltip title="Refresh Schema">
|
<Tooltip title="Refresh Schema">
|
||||||
|
|||||||
@@ -81,12 +81,19 @@ function DashboardListExtraActions(props) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function DashboardList({ controller }) {
|
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 {
|
const {
|
||||||
areExtraActionsAvailable,
|
areExtraActionsAvailable,
|
||||||
listColumns: tableColumns,
|
listColumns: tableColumns,
|
||||||
Component: ExtraActionsComponent,
|
Component: ExtraActionsComponent,
|
||||||
selectedItems,
|
selectedItems,
|
||||||
} = useItemsListExtraActions(controller, listColumns, DashboardListExtraActions);
|
} = useItemsListExtraActions(controller, usedListColumns, DashboardListExtraActions);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="page-dashboard-list">
|
<div className="page-dashboard-list">
|
||||||
@@ -139,9 +146,9 @@ function DashboardList({ controller }) {
|
|||||||
showPageSizeSelect
|
showPageSizeSelect
|
||||||
totalCount={controller.totalItemsCount}
|
totalCount={controller.totalItemsCount}
|
||||||
pageSize={controller.itemsPerPage}
|
pageSize={controller.itemsPerPage}
|
||||||
onPageSizeChange={itemsPerPage => controller.updatePagination({ itemsPerPage })}
|
onPageSizeChange={(itemsPerPage) => controller.updatePagination({ itemsPerPage })}
|
||||||
page={controller.page}
|
page={controller.page}
|
||||||
onChange={page => controller.updatePagination({ page })}
|
onChange={(page) => controller.updatePagination({ page })}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
@@ -170,10 +177,10 @@ const DashboardListPage = itemsList(
|
|||||||
}[currentPage];
|
}[currentPage];
|
||||||
},
|
},
|
||||||
getItemProcessor() {
|
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(
|
routes.register(
|
||||||
@@ -181,7 +188,7 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/dashboards",
|
path: "/dashboards",
|
||||||
title: "Dashboards",
|
title: "Dashboards",
|
||||||
render: pageProps => <DashboardListPage {...pageProps} currentPage="all" />,
|
render: (pageProps) => <DashboardListPage {...pageProps} currentPage="all" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
routes.register(
|
routes.register(
|
||||||
@@ -189,7 +196,7 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/dashboards/favorites",
|
path: "/dashboards/favorites",
|
||||||
title: "Favorite Dashboards",
|
title: "Favorite Dashboards",
|
||||||
render: pageProps => <DashboardListPage {...pageProps} currentPage="favorites" />,
|
render: (pageProps) => <DashboardListPage {...pageProps} currentPage="favorites" orderByField="starred_at" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
routes.register(
|
routes.register(
|
||||||
@@ -197,6 +204,6 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/dashboards/my",
|
path: "/dashboards/my",
|
||||||
title: "My Dashboards",
|
title: "My Dashboards",
|
||||||
render: pageProps => <DashboardListPage {...pageProps} currentPage="my" />,
|
render: (pageProps) => <DashboardListPage {...pageProps} currentPage="my" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ function DashboardSettings({ dashboardConfiguration }) {
|
|||||||
<Checkbox
|
<Checkbox
|
||||||
checked={!!dashboard.dashboard_filters_enabled}
|
checked={!!dashboard.dashboard_filters_enabled}
|
||||||
onChange={({ target }) => updateDashboard({ dashboard_filters_enabled: target.checked })}
|
onChange={({ target }) => updateDashboard({ dashboard_filters_enabled: target.checked })}
|
||||||
data-test="DashboardFiltersCheckbox">
|
data-test="DashboardFiltersCheckbox"
|
||||||
|
>
|
||||||
Use Dashboard Level Filters
|
Use Dashboard Level Filters
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
</div>
|
</div>
|
||||||
@@ -90,9 +91,9 @@ function DashboardComponent(props) {
|
|||||||
|
|
||||||
const [pageContainer, setPageContainer] = useState(null);
|
const [pageContainer, setPageContainer] = useState(null);
|
||||||
const [bottomPanelStyles, setBottomPanelStyles] = useState({});
|
const [bottomPanelStyles, setBottomPanelStyles] = useState({});
|
||||||
const onParametersEdit = parameters => {
|
const onParametersEdit = (parameters) => {
|
||||||
const paramOrder = map(parameters, "name");
|
const paramOrder = map(parameters, "name");
|
||||||
updateDashboard({ options: { globalParamOrder: paramOrder } });
|
updateDashboard({ options: { ...dashboard.options, globalParamOrder: paramOrder } });
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -175,7 +176,7 @@ function DashboardPage({ dashboardSlug, dashboardId, onError }) {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
Dashboard.get({ id: dashboardId, slug: dashboardSlug })
|
Dashboard.get({ id: dashboardId, slug: dashboardSlug })
|
||||||
.then(dashboardData => {
|
.then((dashboardData) => {
|
||||||
recordEvent("view", "dashboard", dashboardData.id);
|
recordEvent("view", "dashboard", dashboardData.id);
|
||||||
setDashboard(dashboardData);
|
setDashboard(dashboardData);
|
||||||
|
|
||||||
@@ -207,7 +208,7 @@ routes.register(
|
|||||||
"Dashboards.LegacyViewOrEdit",
|
"Dashboards.LegacyViewOrEdit",
|
||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/dashboard/:dashboardSlug",
|
path: "/dashboard/:dashboardSlug",
|
||||||
render: pageProps => <DashboardPage {...pageProps} />,
|
render: (pageProps) => <DashboardPage {...pageProps} />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -215,6 +216,6 @@ routes.register(
|
|||||||
"Dashboards.ViewOrEdit",
|
"Dashboards.ViewOrEdit",
|
||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/dashboards/:dashboardId([^-]+)(-.*)?",
|
path: "/dashboards/:dashboardId([^-]+)(-.*)?",
|
||||||
render: pageProps => <DashboardPage {...pageProps} />,
|
render: (pageProps) => <DashboardPage {...pageProps} />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
> .container {
|
> .container {
|
||||||
min-height: calc(100vh - 95px);
|
min-height: calc(100% - 95px);
|
||||||
}
|
}
|
||||||
|
|
||||||
.loading-message {
|
.loading-message {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import { DashboardStatusEnum } from "../hooks/useDashboard";
|
|||||||
import "./DashboardHeader.less";
|
import "./DashboardHeader.less";
|
||||||
|
|
||||||
function getDashboardTags() {
|
function getDashboardTags() {
|
||||||
return getTags("api/dashboards/tags").then(tags => map(tags, t => t.name));
|
return getTags("api/dashboards/tags").then((tags) => map(tags, (t) => t.name));
|
||||||
}
|
}
|
||||||
|
|
||||||
function buttonType(value) {
|
function buttonType(value) {
|
||||||
@@ -38,7 +38,7 @@ function DashboardPageTitle({ dashboardConfiguration }) {
|
|||||||
<h3>
|
<h3>
|
||||||
<EditInPlace
|
<EditInPlace
|
||||||
isEditable={editingLayout}
|
isEditable={editingLayout}
|
||||||
onDone={name => updateDashboard({ name })}
|
onDone={(name) => updateDashboard({ name })}
|
||||||
value={dashboard.name}
|
value={dashboard.name}
|
||||||
ignoreBlanks
|
ignoreBlanks
|
||||||
/>
|
/>
|
||||||
@@ -53,7 +53,7 @@ function DashboardPageTitle({ dashboardConfiguration }) {
|
|||||||
isArchived={dashboard.is_archived}
|
isArchived={dashboard.is_archived}
|
||||||
canEdit={canEditDashboard}
|
canEdit={canEditDashboard}
|
||||||
getAvailableTags={getDashboardTags}
|
getAvailableTags={getDashboardTags}
|
||||||
onEdit={tags => updateDashboard({ tags })}
|
onEdit={(tags) => updateDashboard({ tags })}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -89,14 +89,15 @@ function RefreshButton({ dashboardConfiguration }) {
|
|||||||
placement="bottomRight"
|
placement="bottomRight"
|
||||||
overlay={
|
overlay={
|
||||||
<Menu onClick={onRefreshRateSelected} selectedKeys={[`${refreshRate}`]}>
|
<Menu onClick={onRefreshRateSelected} selectedKeys={[`${refreshRate}`]}>
|
||||||
{refreshRateOptions.map(option => (
|
{refreshRateOptions.map((option) => (
|
||||||
<Menu.Item key={`${option}`} disabled={!includes(allowedIntervals, option)}>
|
<Menu.Item key={`${option}`} disabled={!includes(allowedIntervals, option)}>
|
||||||
{durationHumanize(option)}
|
{durationHumanize(option)}
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
))}
|
))}
|
||||||
{refreshRate && <Menu.Item key={null}>Disable auto refresh</Menu.Item>}
|
{refreshRate && <Menu.Item key={null}>Disable auto refresh</Menu.Item>}
|
||||||
</Menu>
|
</Menu>
|
||||||
}>
|
}
|
||||||
|
>
|
||||||
<Button className="icon-button hidden-xs" type={buttonType(refreshRate)}>
|
<Button className="icon-button hidden-xs" type={buttonType(refreshRate)}>
|
||||||
<i className="fa fa-angle-down" aria-hidden="true" />
|
<i className="fa fa-angle-down" aria-hidden="true" />
|
||||||
<span className="sr-only">Split button!</span>
|
<span className="sr-only">Split button!</span>
|
||||||
@@ -166,7 +167,8 @@ function DashboardMoreOptionsButton({ dashboardConfiguration }) {
|
|||||||
<PlainButton onClick={archive}>Archive</PlainButton>
|
<PlainButton onClick={archive}>Archive</PlainButton>
|
||||||
</Menu.Item>
|
</Menu.Item>
|
||||||
</Menu>
|
</Menu>
|
||||||
}>
|
}
|
||||||
|
>
|
||||||
<Button className="icon-button m-l-5" data-test="DashboardMoreButton" aria-label="More actions">
|
<Button className="icon-button m-l-5" data-test="DashboardMoreButton" aria-label="More actions">
|
||||||
<EllipsisOutlinedIcon rotate={90} aria-hidden="true" />
|
<EllipsisOutlinedIcon rotate={90} aria-hidden="true" />
|
||||||
</Button>
|
</Button>
|
||||||
@@ -216,7 +218,8 @@ function DashboardControl({ dashboardConfiguration, headerExtra }) {
|
|||||||
type={buttonType(fullscreen)}
|
type={buttonType(fullscreen)}
|
||||||
className="icon-button m-l-5"
|
className="icon-button m-l-5"
|
||||||
onClick={toggleFullscreen}
|
onClick={toggleFullscreen}
|
||||||
aria-label="Toggle fullscreen display">
|
aria-label="Toggle fullscreen display"
|
||||||
|
>
|
||||||
<i className="zmdi zmdi-fullscreen" aria-hidden="true" />
|
<i className="zmdi zmdi-fullscreen" aria-hidden="true" />
|
||||||
</Button>
|
</Button>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
@@ -229,7 +232,8 @@ function DashboardControl({ dashboardConfiguration, headerExtra }) {
|
|||||||
type={buttonType(dashboard.publicAccessEnabled)}
|
type={buttonType(dashboard.publicAccessEnabled)}
|
||||||
onClick={showShareDashboardDialog}
|
onClick={showShareDashboardDialog}
|
||||||
data-test="OpenShareForm"
|
data-test="OpenShareForm"
|
||||||
aria-label="Share">
|
aria-label="Share"
|
||||||
|
>
|
||||||
<i className="zmdi zmdi-share" aria-hidden="true" />
|
<i className="zmdi zmdi-share" aria-hidden="true" />
|
||||||
</Button>
|
</Button>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
@@ -252,7 +256,11 @@ function DashboardEditControl({ dashboardConfiguration, headerExtra }) {
|
|||||||
doneBtnClickedWhileSaving,
|
doneBtnClickedWhileSaving,
|
||||||
dashboardStatus,
|
dashboardStatus,
|
||||||
retrySaveDashboardLayout,
|
retrySaveDashboardLayout,
|
||||||
|
saveDashboardParameters,
|
||||||
} = dashboardConfiguration;
|
} = dashboardConfiguration;
|
||||||
|
const handleDoneEditing = () => {
|
||||||
|
saveDashboardParameters().then(() => setEditingLayout(false));
|
||||||
|
};
|
||||||
let status;
|
let status;
|
||||||
if (dashboardStatus === DashboardStatusEnum.SAVED) {
|
if (dashboardStatus === DashboardStatusEnum.SAVED) {
|
||||||
status = <span className="save-status">Saved</span>;
|
status = <span className="save-status">Saved</span>;
|
||||||
@@ -277,7 +285,7 @@ function DashboardEditControl({ dashboardConfiguration, headerExtra }) {
|
|||||||
Retry
|
Retry
|
||||||
</Button>
|
</Button>
|
||||||
) : (
|
) : (
|
||||||
<Button loading={doneBtnClickedWhileSaving} type="primary" onClick={() => setEditingLayout(false)}>
|
<Button loading={doneBtnClickedWhileSaving} type="primary" onClick={handleDoneEditing}>
|
||||||
{!doneBtnClickedWhileSaving && <i className="fa fa-check m-r-5" aria-hidden="true" />} Done Editing
|
{!doneBtnClickedWhileSaving && <i className="fa fa-check m-r-5" aria-hidden="true" />} Done Editing
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -22,12 +22,12 @@ export { DashboardStatusEnum } from "./useEditModeHandler";
|
|||||||
|
|
||||||
function getAffectedWidgets(widgets, updatedParameters = []) {
|
function getAffectedWidgets(widgets, updatedParameters = []) {
|
||||||
return !isEmpty(updatedParameters)
|
return !isEmpty(updatedParameters)
|
||||||
? widgets.filter(widget =>
|
? widgets.filter((widget) =>
|
||||||
Object.values(widget.getParameterMappings())
|
Object.values(widget.getParameterMappings())
|
||||||
.filter(({ type }) => type === "dashboard-level")
|
.filter(({ type }) => type === "dashboard-level")
|
||||||
.some(({ mapTo }) =>
|
.some(({ mapTo }) =>
|
||||||
includes(
|
includes(
|
||||||
updatedParameters.map(p => p.name),
|
updatedParameters.map((p) => p.name),
|
||||||
mapTo
|
mapTo
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -50,7 +50,7 @@ function useDashboard(dashboardData) {
|
|||||||
[dashboard]
|
[dashboard]
|
||||||
);
|
);
|
||||||
const hasOnlySafeQueries = useMemo(
|
const hasOnlySafeQueries = useMemo(
|
||||||
() => every(dashboard.widgets, w => (w.getQuery() ? w.getQuery().is_safe : true)),
|
() => every(dashboard.widgets, (w) => (w.getQuery() ? w.getQuery().is_safe : true)),
|
||||||
[dashboard]
|
[dashboard]
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -67,19 +67,19 @@ function useDashboard(dashboardData) {
|
|||||||
|
|
||||||
const updateDashboard = useCallback(
|
const updateDashboard = useCallback(
|
||||||
(data, includeVersion = true) => {
|
(data, includeVersion = true) => {
|
||||||
setDashboard(currentDashboard => extend({}, currentDashboard, data));
|
setDashboard((currentDashboard) => extend({}, currentDashboard, data));
|
||||||
data = { ...data, id: dashboard.id };
|
data = { ...data, id: dashboard.id };
|
||||||
if (includeVersion) {
|
if (includeVersion) {
|
||||||
data = { ...data, version: dashboard.version };
|
data = { ...data, version: dashboard.version };
|
||||||
}
|
}
|
||||||
return Dashboard.save(data)
|
return Dashboard.save(data)
|
||||||
.then(updatedDashboard => {
|
.then((updatedDashboard) => {
|
||||||
setDashboard(currentDashboard => extend({}, currentDashboard, pick(updatedDashboard, keys(data))));
|
setDashboard((currentDashboard) => extend({}, currentDashboard, pick(updatedDashboard, keys(data))));
|
||||||
if (has(data, "name")) {
|
if (has(data, "name")) {
|
||||||
location.setPath(url.parse(updatedDashboard.url).pathname, true);
|
location.setPath(url.parse(updatedDashboard.url).pathname, true);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
const status = get(error, "response.status");
|
const status = get(error, "response.status");
|
||||||
if (status === 403) {
|
if (status === 403) {
|
||||||
notification.error("Dashboard update failed", "Permission Denied.");
|
notification.error("Dashboard update failed", "Permission Denied.");
|
||||||
@@ -102,25 +102,25 @@ function useDashboard(dashboardData) {
|
|||||||
|
|
||||||
const loadWidget = useCallback((widget, forceRefresh = false) => {
|
const loadWidget = useCallback((widget, forceRefresh = false) => {
|
||||||
widget.getParametersDefs(); // Force widget to read parameters values from URL
|
widget.getParametersDefs(); // Force widget to read parameters values from URL
|
||||||
setDashboard(currentDashboard => extend({}, currentDashboard));
|
setDashboard((currentDashboard) => extend({}, currentDashboard));
|
||||||
return widget
|
return widget
|
||||||
.load(forceRefresh)
|
.load(forceRefresh)
|
||||||
.catch(error => {
|
.catch((error) => {
|
||||||
// QueryResultErrors are expected
|
// QueryResultErrors are expected
|
||||||
if (error instanceof QueryResultError) {
|
if (error instanceof QueryResultError) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
})
|
})
|
||||||
.finally(() => setDashboard(currentDashboard => extend({}, currentDashboard)));
|
.finally(() => setDashboard((currentDashboard) => extend({}, currentDashboard)));
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const refreshWidget = useCallback(widget => loadWidget(widget, true), [loadWidget]);
|
const refreshWidget = useCallback((widget) => loadWidget(widget, true), [loadWidget]);
|
||||||
|
|
||||||
const removeWidget = useCallback(widgetId => {
|
const removeWidget = useCallback((widgetId) => {
|
||||||
setDashboard(currentDashboard =>
|
setDashboard((currentDashboard) =>
|
||||||
extend({}, currentDashboard, {
|
extend({}, currentDashboard, {
|
||||||
widgets: currentDashboard.widgets.filter(widget => widget.id !== undefined && widget.id !== widgetId),
|
widgets: currentDashboard.widgets.filter((widget) => widget.id !== undefined && widget.id !== widgetId),
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}, []);
|
}, []);
|
||||||
@@ -132,11 +132,11 @@ function useDashboard(dashboardData) {
|
|||||||
(forceRefresh = false, updatedParameters = []) => {
|
(forceRefresh = false, updatedParameters = []) => {
|
||||||
const affectedWidgets = getAffectedWidgets(dashboardRef.current.widgets, updatedParameters);
|
const affectedWidgets = getAffectedWidgets(dashboardRef.current.widgets, updatedParameters);
|
||||||
const loadWidgetPromises = compact(
|
const loadWidgetPromises = compact(
|
||||||
affectedWidgets.map(widget => loadWidget(widget, forceRefresh).catch(error => error))
|
affectedWidgets.map((widget) => loadWidget(widget, forceRefresh).catch((error) => error))
|
||||||
);
|
);
|
||||||
|
|
||||||
return Promise.all(loadWidgetPromises).then(() => {
|
return Promise.all(loadWidgetPromises).then(() => {
|
||||||
const queryResults = compact(map(dashboardRef.current.widgets, widget => widget.getQueryResult()));
|
const queryResults = compact(map(dashboardRef.current.widgets, (widget) => widget.getQueryResult()));
|
||||||
const updatedFilters = collectDashboardFilters(dashboardRef.current, queryResults, location.search);
|
const updatedFilters = collectDashboardFilters(dashboardRef.current, queryResults, location.search);
|
||||||
setFilters(updatedFilters);
|
setFilters(updatedFilters);
|
||||||
});
|
});
|
||||||
@@ -145,7 +145,7 @@ function useDashboard(dashboardData) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const refreshDashboard = useCallback(
|
const refreshDashboard = useCallback(
|
||||||
updatedParameters => {
|
(updatedParameters) => {
|
||||||
if (!refreshing) {
|
if (!refreshing) {
|
||||||
setRefreshing(true);
|
setRefreshing(true);
|
||||||
loadDashboard(true, updatedParameters).finally(() => setRefreshing(false));
|
loadDashboard(true, updatedParameters).finally(() => setRefreshing(false));
|
||||||
@@ -154,15 +154,30 @@ function useDashboard(dashboardData) {
|
|||||||
[refreshing, loadDashboard]
|
[refreshing, loadDashboard]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const saveDashboardParameters = useCallback(() => {
|
||||||
|
const currentDashboard = dashboardRef.current;
|
||||||
|
|
||||||
|
return updateDashboard({
|
||||||
|
options: {
|
||||||
|
...currentDashboard.options,
|
||||||
|
parameters: map(globalParameters, (p) => p.toSaveableObject()),
|
||||||
|
},
|
||||||
|
}).catch((error) => {
|
||||||
|
console.error("Failed to persist parameter values:", error);
|
||||||
|
notification.error("Parameter values could not be saved. Your changes may not be persisted.");
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
}, [globalParameters, updateDashboard]);
|
||||||
|
|
||||||
const archiveDashboard = useCallback(() => {
|
const archiveDashboard = useCallback(() => {
|
||||||
recordEvent("archive", "dashboard", dashboard.id);
|
recordEvent("archive", "dashboard", dashboard.id);
|
||||||
Dashboard.delete(dashboard).then(updatedDashboard =>
|
Dashboard.delete(dashboard).then((updatedDashboard) =>
|
||||||
setDashboard(currentDashboard => extend({}, currentDashboard, pick(updatedDashboard, ["is_archived"])))
|
setDashboard((currentDashboard) => extend({}, currentDashboard, pick(updatedDashboard, ["is_archived"])))
|
||||||
);
|
);
|
||||||
}, [dashboard]); // eslint-disable-line react-hooks/exhaustive-deps
|
}, [dashboard]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
const showShareDashboardDialog = useCallback(() => {
|
const showShareDashboardDialog = useCallback(() => {
|
||||||
const handleDialogClose = () => setDashboard(currentDashboard => extend({}, currentDashboard));
|
const handleDialogClose = () => setDashboard((currentDashboard) => extend({}, currentDashboard));
|
||||||
|
|
||||||
ShareDashboardDialog.showModal({
|
ShareDashboardDialog.showModal({
|
||||||
dashboard,
|
dashboard,
|
||||||
@@ -175,8 +190,8 @@ function useDashboard(dashboardData) {
|
|||||||
const showAddTextboxDialog = useCallback(() => {
|
const showAddTextboxDialog = useCallback(() => {
|
||||||
TextboxDialog.showModal({
|
TextboxDialog.showModal({
|
||||||
isNew: true,
|
isNew: true,
|
||||||
}).onClose(text =>
|
}).onClose((text) =>
|
||||||
dashboard.addWidget(text).then(() => setDashboard(currentDashboard => extend({}, currentDashboard)))
|
dashboard.addWidget(text).then(() => setDashboard((currentDashboard) => extend({}, currentDashboard)))
|
||||||
);
|
);
|
||||||
}, [dashboard]);
|
}, [dashboard]);
|
||||||
|
|
||||||
@@ -188,13 +203,13 @@ function useDashboard(dashboardData) {
|
|||||||
.addWidget(visualization, {
|
.addWidget(visualization, {
|
||||||
parameterMappings: editableMappingsToParameterMappings(parameterMappings),
|
parameterMappings: editableMappingsToParameterMappings(parameterMappings),
|
||||||
})
|
})
|
||||||
.then(widget => {
|
.then((widget) => {
|
||||||
const widgetsToSave = [
|
const widgetsToSave = [
|
||||||
widget,
|
widget,
|
||||||
...synchronizeWidgetTitles(widget.options.parameterMappings, dashboard.widgets),
|
...synchronizeWidgetTitles(widget.options.parameterMappings, dashboard.widgets),
|
||||||
];
|
];
|
||||||
return Promise.all(widgetsToSave.map(w => w.save())).then(() =>
|
return Promise.all(widgetsToSave.map((w) => w.save())).then(() =>
|
||||||
setDashboard(currentDashboard => extend({}, currentDashboard))
|
setDashboard((currentDashboard) => extend({}, currentDashboard))
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
@@ -238,6 +253,7 @@ function useDashboard(dashboardData) {
|
|||||||
setRefreshRate,
|
setRefreshRate,
|
||||||
disableRefreshRate,
|
disableRefreshRate,
|
||||||
...editModeHandler,
|
...editModeHandler,
|
||||||
|
saveDashboardParameters,
|
||||||
gridDisabled,
|
gridDisabled,
|
||||||
setGridDisabled,
|
setGridDisabled,
|
||||||
fullscreen,
|
fullscreen,
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export function FavoriteList({ title, resource, itemUrl, emptyState }) {
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
resource
|
resource
|
||||||
.favorites()
|
.favorites({ order: "-starred_at" })
|
||||||
.then(({ results }) => setItems(results))
|
.then(({ results }) => setItems(results))
|
||||||
.finally(() => setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
}, [resource]);
|
}, [resource]);
|
||||||
@@ -28,7 +28,7 @@ export function FavoriteList({ title, resource, itemUrl, emptyState }) {
|
|||||||
</div>
|
</div>
|
||||||
{!isEmpty(items) && (
|
{!isEmpty(items) && (
|
||||||
<div role="list" className="list-group">
|
<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)}>
|
<Link key={itemUrl(item)} role="listitem" className="list-group-item" href={itemUrl(item)}>
|
||||||
<span className="btn-favorite m-r-5">
|
<span className="btn-favorite m-r-5">
|
||||||
<i className="fa fa-star" aria-hidden="true" />
|
<i className="fa fa-star" aria-hidden="true" />
|
||||||
@@ -61,7 +61,7 @@ export function DashboardAndQueryFavoritesList() {
|
|||||||
<FavoriteList
|
<FavoriteList
|
||||||
title="Favorite Dashboards"
|
title="Favorite Dashboards"
|
||||||
resource={Dashboard}
|
resource={Dashboard}
|
||||||
itemUrl={dashboard => dashboard.url}
|
itemUrl={(dashboard) => dashboard.url}
|
||||||
emptyState={
|
emptyState={
|
||||||
<p>
|
<p>
|
||||||
<span className="btn-favorite m-r-5">
|
<span className="btn-favorite m-r-5">
|
||||||
@@ -76,7 +76,7 @@ export function DashboardAndQueryFavoritesList() {
|
|||||||
<FavoriteList
|
<FavoriteList
|
||||||
title="Favorite Queries"
|
title="Favorite Queries"
|
||||||
resource={Query}
|
resource={Query}
|
||||||
itemUrl={query => `queries/${query.id}`}
|
itemUrl={(query) => `queries/${query.id}`}
|
||||||
emptyState={
|
emptyState={
|
||||||
<p>
|
<p>
|
||||||
<span className="btn-favorite m-r-5">
|
<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 cx from "classnames";
|
||||||
|
|
||||||
import routeWithUserSession from "@/components/ApplicationArea/routeWithUserSession";
|
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 Layout from "@/components/layouts/ContentWithSidebar";
|
||||||
|
|
||||||
import { Query } from "@/services/query";
|
import { Query } from "@/services/query";
|
||||||
import { currentUser } from "@/services/auth";
|
import { clientConfig, currentUser } from "@/services/auth";
|
||||||
import location from "@/services/location";
|
import location from "@/services/location";
|
||||||
import routes from "@/services/routes";
|
import routes from "@/services/routes";
|
||||||
|
|
||||||
@@ -95,25 +95,39 @@ function QueriesList({ controller }) {
|
|||||||
const controllerRef = useRef();
|
const controllerRef = useRef();
|
||||||
controllerRef.current = controller;
|
controllerRef.current = controller;
|
||||||
|
|
||||||
|
const updateSearch = useCallback(
|
||||||
|
(searchTemm) => {
|
||||||
|
controller.updateSearch(searchTemm, { isServerSideFTS: !clientConfig.multiByteSearchEnabled });
|
||||||
|
},
|
||||||
|
[controller]
|
||||||
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const unlistenLocationChanges = location.listen((unused, action) => {
|
const unlistenLocationChanges = location.listen((unused, action) => {
|
||||||
const searchTerm = location.search.q || "";
|
const searchTerm = location.search.q || "";
|
||||||
if (action === "PUSH" && searchTerm !== controllerRef.current.searchTerm) {
|
if (action === "PUSH" && searchTerm !== controllerRef.current.searchTerm) {
|
||||||
controllerRef.current.updateSearch(searchTerm);
|
updateSearch(searchTerm);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
unlistenLocationChanges();
|
unlistenLocationChanges();
|
||||||
};
|
};
|
||||||
}, []);
|
}, [updateSearch]);
|
||||||
|
|
||||||
|
let usedListColumns = listColumns;
|
||||||
|
if (controller.params.currentPage === "favorites") {
|
||||||
|
usedListColumns = [
|
||||||
|
...usedListColumns,
|
||||||
|
Columns.dateTime.sortable({ title: "Starred At", field: "starred_at", width: "1%" }),
|
||||||
|
];
|
||||||
|
}
|
||||||
const {
|
const {
|
||||||
areExtraActionsAvailable,
|
areExtraActionsAvailable,
|
||||||
listColumns: tableColumns,
|
listColumns: tableColumns,
|
||||||
Component: ExtraActionsComponent,
|
Component: ExtraActionsComponent,
|
||||||
selectedItems,
|
selectedItems,
|
||||||
} = useItemsListExtraActions(controller, listColumns, QueriesListExtraActions);
|
} = useItemsListExtraActions(controller, usedListColumns, QueriesListExtraActions);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="page-queries-list">
|
<div className="page-queries-list">
|
||||||
@@ -135,7 +149,7 @@ function QueriesList({ controller }) {
|
|||||||
placeholder="Search Queries..."
|
placeholder="Search Queries..."
|
||||||
label="Search queries"
|
label="Search queries"
|
||||||
value={controller.searchTerm}
|
value={controller.searchTerm}
|
||||||
onChange={controller.updateSearch}
|
onChange={updateSearch}
|
||||||
/>
|
/>
|
||||||
<Sidebar.Menu items={sidebarMenu} selected={controller.params.currentPage} />
|
<Sidebar.Menu items={sidebarMenu} selected={controller.params.currentPage} />
|
||||||
<Sidebar.Tags url="api/queries/tags" onChange={controller.updateSelectedTags} showUnselectAll />
|
<Sidebar.Tags url="api/queries/tags" onChange={controller.updateSelectedTags} showUnselectAll />
|
||||||
@@ -200,7 +214,7 @@ const QueriesListPage = itemsList(
|
|||||||
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(
|
routes.register(
|
||||||
@@ -216,7 +230,7 @@ routes.register(
|
|||||||
routeWithUserSession({
|
routeWithUserSession({
|
||||||
path: "/queries/favorites",
|
path: "/queries/favorites",
|
||||||
title: "Favorite Queries",
|
title: "Favorite Queries",
|
||||||
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="favorites" />,
|
render: (pageProps) => <QueriesListPage {...pageProps} currentPage="favorites" orderByField="starred_at" />,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
routes.register(
|
routes.register(
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ export const urlForDashboard = ({ id, slug }) => `dashboards/${id}-${slug}`;
|
|||||||
|
|
||||||
export function collectDashboardFilters(dashboard, queryResults, urlParams) {
|
export function collectDashboardFilters(dashboard, queryResults, urlParams) {
|
||||||
const filters = {};
|
const filters = {};
|
||||||
_.each(queryResults, queryResult => {
|
_.each(queryResults, (queryResult) => {
|
||||||
const queryFilters = queryResult && queryResult.getFilters ? queryResult.getFilters() : [];
|
const queryFilters = queryResult && queryResult.getFilters ? queryResult.getFilters() : [];
|
||||||
_.each(queryFilters, queryFilter => {
|
_.each(queryFilters, (queryFilter) => {
|
||||||
const hasQueryStringValue = _.has(urlParams, queryFilter.name);
|
const hasQueryStringValue = _.has(urlParams, queryFilter.name);
|
||||||
|
|
||||||
if (!(hasQueryStringValue || dashboard.dashboard_filters_enabled)) {
|
if (!(hasQueryStringValue || dashboard.dashboard_filters_enabled)) {
|
||||||
@@ -44,7 +44,7 @@ function prepareWidgetsForDashboard(widgets) {
|
|||||||
const defaultWidgetSizeY =
|
const defaultWidgetSizeY =
|
||||||
Math.max(
|
Math.max(
|
||||||
_.chain(widgets)
|
_.chain(widgets)
|
||||||
.map(w => w.options.position.sizeY)
|
.map((w) => w.options.position.sizeY)
|
||||||
.max()
|
.max()
|
||||||
.value(),
|
.value(),
|
||||||
20
|
20
|
||||||
@@ -55,11 +55,11 @@ function prepareWidgetsForDashboard(widgets) {
|
|||||||
// 2. update position of widgets in each row - place it right below
|
// 2. update position of widgets in each row - place it right below
|
||||||
// biggest widget from previous row
|
// biggest widget from previous row
|
||||||
_.chain(widgets)
|
_.chain(widgets)
|
||||||
.sortBy(widget => widget.options.position.row)
|
.sortBy((widget) => widget.options.position.row)
|
||||||
.groupBy(widget => widget.options.position.row)
|
.groupBy((widget) => widget.options.position.row)
|
||||||
.reduce((row, widgetsAtRow) => {
|
.reduce((row, widgetsAtRow) => {
|
||||||
let height = 1;
|
let height = 1;
|
||||||
_.each(widgetsAtRow, widget => {
|
_.each(widgetsAtRow, (widget) => {
|
||||||
height = Math.max(
|
height = Math.max(
|
||||||
height,
|
height,
|
||||||
widget.options.position.autoHeight ? defaultWidgetSizeY : widget.options.position.sizeY
|
widget.options.position.autoHeight ? defaultWidgetSizeY : widget.options.position.sizeY
|
||||||
@@ -74,8 +74,8 @@ function prepareWidgetsForDashboard(widgets) {
|
|||||||
.value();
|
.value();
|
||||||
|
|
||||||
// Sort widgets by updated column and row value
|
// Sort widgets by updated column and row value
|
||||||
widgets = _.sortBy(widgets, widget => widget.options.position.col);
|
widgets = _.sortBy(widgets, (widget) => widget.options.position.col);
|
||||||
widgets = _.sortBy(widgets, widget => widget.options.position.row);
|
widgets = _.sortBy(widgets, (widget) => widget.options.position.row);
|
||||||
|
|
||||||
return widgets;
|
return widgets;
|
||||||
}
|
}
|
||||||
@@ -85,7 +85,7 @@ function calculateNewWidgetPosition(existingWidgets, newWidget) {
|
|||||||
|
|
||||||
// Find first free row for each column
|
// Find first free row for each column
|
||||||
const bottomLine = _.chain(existingWidgets)
|
const bottomLine = _.chain(existingWidgets)
|
||||||
.map(w => {
|
.map((w) => {
|
||||||
const options = _.extend({}, w.options);
|
const options = _.extend({}, w.options);
|
||||||
const position = _.extend({ row: 0, sizeY: 0 }, options.position);
|
const position = _.extend({ row: 0, sizeY: 0 }, options.position);
|
||||||
return {
|
return {
|
||||||
@@ -97,21 +97,24 @@ function calculateNewWidgetPosition(existingWidgets, newWidget) {
|
|||||||
height: position.sizeY,
|
height: position.sizeY,
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.reduce((result, item) => {
|
.reduce(
|
||||||
|
(result, item) => {
|
||||||
const from = Math.max(item.left, 0);
|
const from = Math.max(item.left, 0);
|
||||||
const to = Math.min(item.right, result.length + 1);
|
const to = Math.min(item.right, result.length + 1);
|
||||||
for (let i = from; i < to; i += 1) {
|
for (let i = from; i < to; i += 1) {
|
||||||
result[i] = Math.max(result[i], item.bottom);
|
result[i] = Math.max(result[i], item.bottom);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}, _.map(new Array(dashboardGridOptions.columns), _.constant(0)))
|
},
|
||||||
|
_.map(new Array(dashboardGridOptions.columns), _.constant(0))
|
||||||
|
)
|
||||||
.value();
|
.value();
|
||||||
|
|
||||||
// Go through columns, pick them by count necessary to hold new block,
|
// Go through columns, pick them by count necessary to hold new block,
|
||||||
// and calculate bottom-most free row per group.
|
// and calculate bottom-most free row per group.
|
||||||
// Choose group with the top-most free row (comparing to other groups)
|
// Choose group with the top-most free row (comparing to other groups)
|
||||||
return _.chain(_.range(0, dashboardGridOptions.columns - width + 1))
|
return _.chain(_.range(0, dashboardGridOptions.columns - width + 1))
|
||||||
.map(col => ({
|
.map((col) => ({
|
||||||
col,
|
col,
|
||||||
row: _.chain(bottomLine)
|
row: _.chain(bottomLine)
|
||||||
.slice(col, col + width)
|
.slice(col, col + width)
|
||||||
@@ -133,7 +136,7 @@ export function Dashboard(dashboard) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function prepareDashboardWidgets(widgets) {
|
function prepareDashboardWidgets(widgets) {
|
||||||
return prepareWidgetsForDashboard(_.map(widgets, widget => new Widget(widget)));
|
return prepareWidgetsForDashboard(_.map(widgets, (widget) => new Widget(widget)));
|
||||||
}
|
}
|
||||||
|
|
||||||
function transformSingle(dashboard) {
|
function transformSingle(dashboard) {
|
||||||
@@ -154,7 +157,7 @@ function transformResponse(data) {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
const saveOrCreateUrl = data => (data.id ? `api/dashboards/${data.id}` : "api/dashboards");
|
const saveOrCreateUrl = (data) => (data.id ? `api/dashboards/${data.id}` : "api/dashboards");
|
||||||
const DashboardService = {
|
const DashboardService = {
|
||||||
get: ({ id, slug }) => {
|
get: ({ id, slug }) => {
|
||||||
const params = {};
|
const params = {};
|
||||||
@@ -164,12 +167,12 @@ const DashboardService = {
|
|||||||
return axios.get(`api/dashboards/${id || slug}`, { params }).then(transformResponse);
|
return axios.get(`api/dashboards/${id || slug}`, { params }).then(transformResponse);
|
||||||
},
|
},
|
||||||
getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
|
getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
|
||||||
save: data => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
|
save: (data) => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
|
||||||
delete: ({ id }) => axios.delete(`api/dashboards/${id}`).then(transformResponse),
|
delete: ({ id }) => axios.delete(`api/dashboards/${id}`).then(transformResponse),
|
||||||
query: params => axios.get("api/dashboards", { params }).then(transformResponse),
|
query: (params) => axios.get("api/dashboards", { params }).then(transformResponse),
|
||||||
recent: params => axios.get("api/dashboards/recent", { params }).then(transformResponse),
|
recent: (params) => axios.get("api/dashboards/recent", { params }).then(transformResponse),
|
||||||
myDashboards: params => axios.get("api/dashboards/my", { params }).then(transformResponse),
|
myDashboards: (params) => axios.get("api/dashboards/my", { params }).then(transformResponse),
|
||||||
favorites: params => axios.get("api/dashboards/favorites", { params }).then(transformResponse),
|
favorites: (params) => axios.get("api/dashboards/favorites", { params }).then(transformResponse),
|
||||||
favorite: ({ id }) => axios.post(`api/dashboards/${id}/favorite`),
|
favorite: ({ id }) => axios.post(`api/dashboards/${id}/favorite`),
|
||||||
unfavorite: ({ id }) => axios.delete(`api/dashboards/${id}/favorite`),
|
unfavorite: ({ id }) => axios.delete(`api/dashboards/${id}/favorite`),
|
||||||
fork: ({ id }) => axios.post(`api/dashboards/${id}/fork`, { id }).then(transformResponse),
|
fork: ({ id }) => axios.post(`api/dashboards/${id}/fork`, { id }).then(transformResponse),
|
||||||
@@ -187,13 +190,13 @@ Dashboard.prototype.canEdit = function canEdit() {
|
|||||||
Dashboard.prototype.getParametersDefs = function getParametersDefs() {
|
Dashboard.prototype.getParametersDefs = function getParametersDefs() {
|
||||||
const globalParams = {};
|
const globalParams = {};
|
||||||
const queryParams = location.search;
|
const queryParams = location.search;
|
||||||
_.each(this.widgets, widget => {
|
_.each(this.widgets, (widget) => {
|
||||||
if (widget.getQuery()) {
|
if (widget.getQuery()) {
|
||||||
const mappings = widget.getParameterMappings();
|
const mappings = widget.getParameterMappings();
|
||||||
widget
|
widget
|
||||||
.getQuery()
|
.getQuery()
|
||||||
.getParametersDefs(false)
|
.getParametersDefs(false)
|
||||||
.forEach(param => {
|
.forEach((param) => {
|
||||||
const mapping = mappings[param.name];
|
const mapping = mappings[param.name];
|
||||||
if (mapping.type === Widget.MappingType.DashboardLevel) {
|
if (mapping.type === Widget.MappingType.DashboardLevel) {
|
||||||
// create global param
|
// create global param
|
||||||
@@ -210,15 +213,19 @@ Dashboard.prototype.getParametersDefs = function getParametersDefs() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
const mergedValues = {
|
||||||
|
..._.mapValues(globalParams, (p) => p.value),
|
||||||
|
...Object.fromEntries((this.options.parameters || []).map((param) => [param.name, param.value])),
|
||||||
|
};
|
||||||
const resultingGlobalParams = _.values(
|
const resultingGlobalParams = _.values(
|
||||||
_.each(globalParams, param => {
|
_.each(globalParams, (param) => {
|
||||||
param.setValue(param.value); // apply global param value to all locals
|
param.setValue(mergedValues[param.name]); // apply merged value
|
||||||
param.fromUrlParams(queryParams); // try to initialize from url (may do nothing)
|
param.fromUrlParams(queryParams); // allow param-specific parsing logic
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
// order dashboard params using paramOrder
|
// order dashboard params using paramOrder
|
||||||
return _.sortBy(resultingGlobalParams, param =>
|
return _.sortBy(resultingGlobalParams, (param) =>
|
||||||
_.includes(this.options.globalParamOrder, param.name)
|
_.includes(this.options.globalParamOrder, param.name)
|
||||||
? _.indexOf(this.options.globalParamOrder, param.name)
|
? _.indexOf(this.options.globalParamOrder, param.name)
|
||||||
: _.size(this.options.globalParamOrder)
|
: _.size(this.options.globalParamOrder)
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ function normalizeLocation(rawLocation) {
|
|||||||
const result = {};
|
const result = {};
|
||||||
|
|
||||||
result.path = pathname;
|
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.hash = trimStart(hash, "#");
|
||||||
result.url = `${pathname}${search}${hash}`;
|
result.url = `${pathname}${search}${hash}`;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ const location = {
|
|||||||
|
|
||||||
confirmChange(handler) {
|
confirmChange(handler) {
|
||||||
if (isFunction(handler)) {
|
if (isFunction(handler)) {
|
||||||
return history.block(nextLocation => {
|
return history.block((nextLocation) => {
|
||||||
return handler(normalizeLocation(nextLocation), location);
|
return handler(normalizeLocation(nextLocation), location);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
@@ -60,12 +60,18 @@ const location = {
|
|||||||
// serialize search and keep existing search parameters (!)
|
// serialize search and keep existing search parameters (!)
|
||||||
if (isObject(newLocation.search)) {
|
if (isObject(newLocation.search)) {
|
||||||
newLocation.search = omitBy(extend({}, location.search, newLocation.search), isNil);
|
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);
|
newLocation.search = qs.stringify(newLocation.search);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (replace) {
|
if (replace) {
|
||||||
|
if (
|
||||||
|
newLocation.pathname !== location.path ||
|
||||||
|
newLocation.search !== qs.stringify(location.search) ||
|
||||||
|
newLocation.hash !== location.hash
|
||||||
|
) {
|
||||||
history.replace(newLocation);
|
history.replace(newLocation);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
history.push(newLocation);
|
history.push(newLocation);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,9 @@ const DYNAMIC_PREFIX = "d_";
|
|||||||
* @param now {function(): moment.Moment=} moment - defaults to now
|
* @param now {function(): moment.Moment=} moment - defaults to now
|
||||||
* @returns {function(withNow: boolean): [moment.Moment, moment.Moment|undefined]}
|
* @returns {function(withNow: boolean): [moment.Moment, moment.Moment|undefined]}
|
||||||
*/
|
*/
|
||||||
const untilNow = (from, now = () => moment()) => (withNow = true) => [from(), withNow ? now() : undefined];
|
const untilNow =
|
||||||
|
(from, now = () => moment()) =>
|
||||||
|
(withNow = true) => [from(), withNow ? now() : undefined];
|
||||||
|
|
||||||
const DYNAMIC_DATE_RANGES = {
|
const DYNAMIC_DATE_RANGES = {
|
||||||
today: {
|
today: {
|
||||||
@@ -26,14 +28,7 @@ const DYNAMIC_DATE_RANGES = {
|
|||||||
},
|
},
|
||||||
yesterday: {
|
yesterday: {
|
||||||
name: "Yesterday",
|
name: "Yesterday",
|
||||||
value: () => [
|
value: () => [moment().subtract(1, "day").startOf("day"), moment().subtract(1, "day").endOf("day")],
|
||||||
moment()
|
|
||||||
.subtract(1, "day")
|
|
||||||
.startOf("day"),
|
|
||||||
moment()
|
|
||||||
.subtract(1, "day")
|
|
||||||
.endOf("day"),
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
this_week: {
|
this_week: {
|
||||||
name: "This week",
|
name: "This week",
|
||||||
@@ -49,36 +44,15 @@ const DYNAMIC_DATE_RANGES = {
|
|||||||
},
|
},
|
||||||
last_week: {
|
last_week: {
|
||||||
name: "Last week",
|
name: "Last week",
|
||||||
value: () => [
|
value: () => [moment().subtract(1, "week").startOf("week"), moment().subtract(1, "week").endOf("week")],
|
||||||
moment()
|
|
||||||
.subtract(1, "week")
|
|
||||||
.startOf("week"),
|
|
||||||
moment()
|
|
||||||
.subtract(1, "week")
|
|
||||||
.endOf("week"),
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
last_month: {
|
last_month: {
|
||||||
name: "Last month",
|
name: "Last month",
|
||||||
value: () => [
|
value: () => [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")],
|
||||||
moment()
|
|
||||||
.subtract(1, "month")
|
|
||||||
.startOf("month"),
|
|
||||||
moment()
|
|
||||||
.subtract(1, "month")
|
|
||||||
.endOf("month"),
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
last_year: {
|
last_year: {
|
||||||
name: "Last year",
|
name: "Last year",
|
||||||
value: () => [
|
value: () => [moment().subtract(1, "year").startOf("year"), moment().subtract(1, "year").endOf("year")],
|
||||||
moment()
|
|
||||||
.subtract(1, "year")
|
|
||||||
.startOf("year"),
|
|
||||||
moment()
|
|
||||||
.subtract(1, "year")
|
|
||||||
.endOf("year"),
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
last_hour: {
|
last_hour: {
|
||||||
name: "Last hour",
|
name: "Last hour",
|
||||||
@@ -94,63 +68,31 @@ const DYNAMIC_DATE_RANGES = {
|
|||||||
},
|
},
|
||||||
last_7_days: {
|
last_7_days: {
|
||||||
name: "Last 7 days",
|
name: "Last 7 days",
|
||||||
value: untilNow(
|
value: untilNow(() => moment().subtract(7, "days").startOf("day")),
|
||||||
() =>
|
|
||||||
moment()
|
|
||||||
.subtract(7, "days")
|
|
||||||
.startOf("day"),
|
|
||||||
() => moment().endOf("day")
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
last_14_days: {
|
last_14_days: {
|
||||||
name: "Last 14 days",
|
name: "Last 14 days",
|
||||||
value: untilNow(
|
value: untilNow(() => moment().subtract(14, "days").startOf("day")),
|
||||||
() =>
|
|
||||||
moment()
|
|
||||||
.subtract(14, "days")
|
|
||||||
.startOf("day"),
|
|
||||||
() => moment().endOf("day")
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
last_30_days: {
|
last_30_days: {
|
||||||
name: "Last 30 days",
|
name: "Last 30 days",
|
||||||
value: untilNow(
|
value: untilNow(() => moment().subtract(30, "days").startOf("day")),
|
||||||
() =>
|
|
||||||
moment()
|
|
||||||
.subtract(30, "days")
|
|
||||||
.startOf("day"),
|
|
||||||
() => moment().endOf("day")
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
last_60_days: {
|
last_60_days: {
|
||||||
name: "Last 60 days",
|
name: "Last 60 days",
|
||||||
value: untilNow(
|
value: untilNow(() => moment().subtract(60, "days").startOf("day")),
|
||||||
() =>
|
|
||||||
moment()
|
|
||||||
.subtract(60, "days")
|
|
||||||
.startOf("day"),
|
|
||||||
() => moment().endOf("day")
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
last_90_days: {
|
last_90_days: {
|
||||||
name: "Last 90 days",
|
name: "Last 90 days",
|
||||||
value: untilNow(
|
value: untilNow(() => moment().subtract(90, "days").startOf("day")),
|
||||||
() =>
|
|
||||||
moment()
|
|
||||||
.subtract(90, "days")
|
|
||||||
.startOf("day"),
|
|
||||||
() => moment().endOf("day")
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
last_12_months: {
|
last_12_months: {
|
||||||
name: "Last 12 months",
|
name: "Last 12 months",
|
||||||
value: untilNow(
|
value: untilNow(() => moment().subtract(12, "months").startOf("day")),
|
||||||
() =>
|
},
|
||||||
moment()
|
last_10_years: {
|
||||||
.subtract(12, "months")
|
name: "Last 10 years",
|
||||||
.startOf("day"),
|
value: untilNow(() => moment().subtract(10, "years").startOf("day")),
|
||||||
() => moment().endOf("day")
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -164,7 +106,7 @@ export function isDynamicDateRangeString(value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function getDynamicDateRangeStringFromName(dynamicRangeName) {
|
export function getDynamicDateRangeStringFromName(dynamicRangeName) {
|
||||||
const key = findKey(DYNAMIC_DATE_RANGES, range => range.name === dynamicRangeName);
|
const key = findKey(DYNAMIC_DATE_RANGES, (range) => range.name === dynamicRangeName);
|
||||||
return key ? DYNAMIC_PREFIX + key : undefined;
|
return key ? DYNAMIC_PREFIX + key : undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -233,7 +175,7 @@ class DateRangeParameter extends Parameter {
|
|||||||
|
|
||||||
getExecutionValue() {
|
getExecutionValue() {
|
||||||
if (this.hasDynamicValue) {
|
if (this.hasDynamicValue) {
|
||||||
const format = date => date.format(DATETIME_FORMATS[this.type]);
|
const format = (date) => date.format(DATETIME_FORMATS[this.type]);
|
||||||
const [start, end] = this.normalizedValue.value().map(format);
|
const [start, end] = this.normalizedValue.value().map(format);
|
||||||
return { start, end };
|
return { start, end };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ class Parameter {
|
|||||||
|
|
||||||
updateLocals() {
|
updateLocals() {
|
||||||
if (isArray(this.locals)) {
|
if (isArray(this.locals)) {
|
||||||
each(this.locals, local => {
|
each(this.locals, (local) => {
|
||||||
local.setValue(this.value);
|
local.setValue(this.value);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -117,7 +117,7 @@ class Parameter {
|
|||||||
|
|
||||||
/** Get a saveable version of the Parameter by omitting unnecessary props */
|
/** Get a saveable version of the Parameter by omitting unnecessary props */
|
||||||
toSaveableObject() {
|
toSaveableObject() {
|
||||||
return omit(this, ["$$value", "urlPrefix", "pendingValue", "parentQueryId"]);
|
return omit(this, ["$$value", "urlPrefix", "pendingValue", "parentQueryId", "locals"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ describe("Dashboard Filters", () => {
|
|||||||
name: "Query Filters",
|
name: "Query Filters",
|
||||||
query: `SELECT stage1 AS "stage1::filter", stage2, value FROM (${SQL}) q`,
|
query: `SELECT stage1 AS "stage1::filter", stage2, value FROM (${SQL}) q`,
|
||||||
};
|
};
|
||||||
cy.createDashboard("Dashboard Filters").then(dashboard => {
|
cy.createDashboard("Dashboard Filters").then((dashboard) => {
|
||||||
createQueryAndAddWidget(dashboard.id, queryData)
|
createQueryAndAddWidget(dashboard.id, queryData)
|
||||||
.as("widget1TestId")
|
.as("widget1TestId")
|
||||||
.then(() => createQueryAndAddWidget(dashboard.id, queryData, { position: { col: 4 } }))
|
.then(() => createQueryAndAddWidget(dashboard.id, queryData, { position: { col: 4 } }))
|
||||||
@@ -38,20 +38,17 @@ describe("Dashboard Filters", () => {
|
|||||||
cy.getByTestId("DashboardFiltersCheckbox").click();
|
cy.getByTestId("DashboardFiltersCheckbox").click();
|
||||||
|
|
||||||
cy.getByTestId("DashboardFilters").within(() => {
|
cy.getByTestId("DashboardFilters").within(() => {
|
||||||
cy.getByTestId("FilterName-stage1::filter")
|
cy.getByTestId("FilterName-stage1::filter").find(".ant-select-selection-item").should("have.text", "a");
|
||||||
.find(".ant-select-selection-item")
|
|
||||||
.should("have.text", "a");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
cy.getByTestId(this.widget1TestId).within(() => {
|
cy.getByTestId(this.widget1TestId).within(() => {
|
||||||
expectTableToHaveLength(4);
|
expectTableToHaveLength(4);
|
||||||
expectFirstColumnToHaveMembers(["a", "a", "a", "a"]);
|
expectFirstColumnToHaveMembers(["a", "a", "a", "a"]);
|
||||||
|
|
||||||
cy.getByTestId("FilterName-stage1::filter")
|
cy.getByTestId("FilterName-stage1::filter").find(".ant-select").click();
|
||||||
.find(".ant-select")
|
|
||||||
.click();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.contains(".ant-select-item-option-content:visible", "b").click();
|
cy.contains(".ant-select-item-option-content:visible", "b").click();
|
||||||
|
|
||||||
cy.getByTestId(this.widget1TestId).within(() => {
|
cy.getByTestId(this.widget1TestId).within(() => {
|
||||||
@@ -69,14 +66,13 @@ describe("Dashboard Filters", () => {
|
|||||||
// assert that changing a global filter affects all widgets
|
// assert that changing a global filter affects all widgets
|
||||||
|
|
||||||
cy.getByTestId("DashboardFilters").within(() => {
|
cy.getByTestId("DashboardFilters").within(() => {
|
||||||
cy.getByTestId("FilterName-stage1::filter")
|
cy.getByTestId("FilterName-stage1::filter").find(".ant-select").click();
|
||||||
.find(".ant-select")
|
|
||||||
.click();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.contains(".ant-select-item-option-content:visible", "c").click();
|
cy.contains(".ant-select-item-option-content:visible", "c").click();
|
||||||
|
|
||||||
[this.widget1TestId, this.widget2TestId].forEach(widgetTestId =>
|
[this.widget1TestId, this.widget2TestId].forEach((widgetTestId) =>
|
||||||
cy.getByTestId(widgetTestId).within(() => {
|
cy.getByTestId(widgetTestId).within(() => {
|
||||||
expectTableToHaveLength(4);
|
expectTableToHaveLength(4);
|
||||||
expectFirstColumnToHaveMembers(["c", "c", "c", "c"]);
|
expectFirstColumnToHaveMembers(["c", "c", "c", "c"]);
|
||||||
|
|||||||
@@ -5,8 +5,9 @@ describe("Embedded Queries", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("is unavailable when public urls feature is disabled", () => {
|
it("is unavailable when public urls feature is disabled", () => {
|
||||||
cy.createQuery({ query: "select name from users order by name" }).then(query => {
|
cy.createQuery({ query: "select name from users order by name" }).then((query) => {
|
||||||
cy.visit(`/queries/${query.id}/source`);
|
cy.visit(`/queries/${query.id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
cy.getByTestId("QueryPageVisualizationTabs", { timeout: 10000 }).should("exist");
|
cy.getByTestId("QueryPageVisualizationTabs", { timeout: 10000 }).should("exist");
|
||||||
cy.clickThrough(`
|
cy.clickThrough(`
|
||||||
@@ -15,7 +16,7 @@ describe("Embedded Queries", () => {
|
|||||||
`);
|
`);
|
||||||
cy.getByTestId("EmbedIframe")
|
cy.getByTestId("EmbedIframe")
|
||||||
.invoke("text")
|
.invoke("text")
|
||||||
.then(embedUrl => {
|
.then((embedUrl) => {
|
||||||
// disable the feature
|
// disable the feature
|
||||||
cy.updateOrgSettings({ disable_public_urls: true });
|
cy.updateOrgSettings({ disable_public_urls: true });
|
||||||
|
|
||||||
@@ -23,9 +24,7 @@ describe("Embedded Queries", () => {
|
|||||||
cy.visit(`/queries/${query.id}/source`);
|
cy.visit(`/queries/${query.id}/source`);
|
||||||
cy.getByTestId("QueryPageVisualizationTabs", { timeout: 10000 }).should("exist");
|
cy.getByTestId("QueryPageVisualizationTabs", { timeout: 10000 }).should("exist");
|
||||||
cy.getByTestId("QueryPageHeaderMoreButton").click();
|
cy.getByTestId("QueryPageHeaderMoreButton").click();
|
||||||
cy.get(".ant-dropdown-menu-item")
|
cy.get(".ant-dropdown-menu-item").should("exist").should("not.contain", "Show API Key");
|
||||||
.should("exist")
|
|
||||||
.should("not.contain", "Show API Key");
|
|
||||||
cy.getByTestId("QueryControlDropdownButton").click();
|
cy.getByTestId("QueryControlDropdownButton").click();
|
||||||
cy.get(".ant-dropdown-menu-item").should("exist");
|
cy.get(".ant-dropdown-menu-item").should("exist");
|
||||||
cy.getByTestId("ShowEmbedDialogButton").should("not.exist");
|
cy.getByTestId("ShowEmbedDialogButton").should("not.exist");
|
||||||
@@ -42,8 +41,9 @@ describe("Embedded Queries", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("can be shared without parameters", () => {
|
it("can be shared without parameters", () => {
|
||||||
cy.createQuery({ query: "select name from users order by name" }).then(query => {
|
cy.createQuery({ query: "select name from users order by name" }).then((query) => {
|
||||||
cy.visit(`/queries/${query.id}/source`);
|
cy.visit(`/queries/${query.id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
cy.getByTestId("QueryPageVisualizationTabs", { timeout: 10000 }).should("exist");
|
cy.getByTestId("QueryPageVisualizationTabs", { timeout: 10000 }).should("exist");
|
||||||
cy.clickThrough(`
|
cy.clickThrough(`
|
||||||
@@ -52,7 +52,7 @@ describe("Embedded Queries", () => {
|
|||||||
`);
|
`);
|
||||||
cy.getByTestId("EmbedIframe")
|
cy.getByTestId("EmbedIframe")
|
||||||
.invoke("text")
|
.invoke("text")
|
||||||
.then(embedUrl => {
|
.then((embedUrl) => {
|
||||||
cy.logout();
|
cy.logout();
|
||||||
cy.visit(embedUrl);
|
cy.visit(embedUrl);
|
||||||
cy.getByTestId("VisualizationEmbed", { timeout: 10000 }).should("exist");
|
cy.getByTestId("VisualizationEmbed", { timeout: 10000 }).should("exist");
|
||||||
@@ -90,7 +90,7 @@ describe("Embedded Queries", () => {
|
|||||||
|
|
||||||
cy.getByTestId("EmbedIframe")
|
cy.getByTestId("EmbedIframe")
|
||||||
.invoke("text")
|
.invoke("text")
|
||||||
.then(embedUrl => {
|
.then((embedUrl) => {
|
||||||
cy.logout();
|
cy.logout();
|
||||||
cy.visit(embedUrl);
|
cy.visit(embedUrl);
|
||||||
cy.getByTestId("VisualizationEmbed", { timeout: 10000 }).should("exist");
|
cy.getByTestId("VisualizationEmbed", { timeout: 10000 }).should("exist");
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ describe("Box Plot", () => {
|
|||||||
.then(({ id }) => cy.createVisualization(id, "BOXPLOT", "Boxplot (Deprecated)", {}))
|
.then(({ id }) => cy.createVisualization(id, "BOXPLOT", "Boxplot (Deprecated)", {}))
|
||||||
.then(({ id: visualizationId, query_id: queryId }) => {
|
.then(({ id: visualizationId, query_id: queryId }) => {
|
||||||
cy.visit(`queries/${queryId}/source#${visualizationId}`);
|
cy.visit(`queries/${queryId}/source#${visualizationId}`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -61,9 +62,7 @@ describe("Box Plot", () => {
|
|||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("svg").should("exist");
|
||||||
.find("svg")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
cy.percySnapshot("Visualizations - Box Plot", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Box Plot", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ describe("Chart", () => {
|
|||||||
|
|
||||||
it("creates Bar charts", function () {
|
it("creates Bar charts", function () {
|
||||||
cy.visit(`queries/${this.queryId}/source`);
|
cy.visit(`queries/${this.queryId}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
|
|
||||||
const getBarChartAssertionFunction =
|
const getBarChartAssertionFunction =
|
||||||
@@ -109,6 +110,7 @@ describe("Chart", () => {
|
|||||||
});
|
});
|
||||||
it("colors Bar charts", function () {
|
it("colors Bar charts", function () {
|
||||||
cy.visit(`queries/${this.queryId}/source`);
|
cy.visit(`queries/${this.queryId}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
cy.getByTestId("Chart.ColumnMapping.x").selectAntdOption("Chart.ColumnMapping.x.stage");
|
cy.getByTestId("Chart.ColumnMapping.x").selectAntdOption("Chart.ColumnMapping.x.stage");
|
||||||
@@ -123,6 +125,7 @@ describe("Chart", () => {
|
|||||||
});
|
});
|
||||||
it("colors Pie charts", function () {
|
it("colors Pie charts", function () {
|
||||||
cy.visit(`queries/${this.queryId}/source`);
|
cy.visit(`queries/${this.queryId}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
cy.getByTestId("Chart.GlobalSeriesType").click();
|
cy.getByTestId("Chart.GlobalSeriesType").click();
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ describe("Choropleth", () => {
|
|||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery({ query: SQL }).then(({ id }) => {
|
cy.createQuery({ query: SQL }).then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
@@ -76,9 +77,7 @@ describe("Choropleth", () => {
|
|||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".map-visualization-container.leaflet-container").should("exist");
|
||||||
.find(".map-visualization-container.leaflet-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
cy.percySnapshot("Visualizations - Choropleth", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Choropleth", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ describe("Cohort", () => {
|
|||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery({ query: SQL }).then(({ id }) => {
|
cy.createQuery({ query: SQL }).then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
@@ -51,9 +52,7 @@ describe("Cohort", () => {
|
|||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("table").should("exist");
|
||||||
.find("table")
|
|
||||||
.should("exist");
|
|
||||||
cy.percySnapshot("Visualizations - Cohort (simple)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Cohort (simple)", { widths: [viewportWidth] });
|
||||||
|
|
||||||
cy.clickThrough(`
|
cy.clickThrough(`
|
||||||
@@ -64,9 +63,7 @@ describe("Cohort", () => {
|
|||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("table").should("exist");
|
||||||
.find("table")
|
|
||||||
.should("exist");
|
|
||||||
cy.percySnapshot("Visualizations - Cohort (diagonal)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Cohort (diagonal)", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ describe("Counter", () => {
|
|||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery({ query: SQL }).then(({ id }) => {
|
cy.createQuery({ query: SQL }).then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
@@ -24,9 +25,7 @@ describe("Counter", () => {
|
|||||||
Counter.General.ValueColumn.a
|
Counter.General.ValueColumn.a
|
||||||
`);
|
`);
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -43,9 +42,7 @@ describe("Counter", () => {
|
|||||||
"Counter.General.Label": "Custom Label",
|
"Counter.General.Label": "Custom Label",
|
||||||
});
|
});
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -65,9 +62,7 @@ describe("Counter", () => {
|
|||||||
"Counter.General.TargetValueRowNumber": "2",
|
"Counter.General.TargetValueRowNumber": "2",
|
||||||
});
|
});
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -83,9 +78,7 @@ describe("Counter", () => {
|
|||||||
Counter.General.TargetValueColumn.b
|
Counter.General.TargetValueColumn.b
|
||||||
`);
|
`);
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -106,9 +99,7 @@ describe("Counter", () => {
|
|||||||
"Counter.General.TargetValueRowNumber": "2",
|
"Counter.General.TargetValueRowNumber": "2",
|
||||||
});
|
});
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -123,9 +114,7 @@ describe("Counter", () => {
|
|||||||
Counter.General.CountRows
|
Counter.General.CountRows
|
||||||
`);
|
`);
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -151,9 +140,7 @@ describe("Counter", () => {
|
|||||||
"Counter.Formatting.StringSuffix": "%",
|
"Counter.Formatting.StringSuffix": "%",
|
||||||
});
|
});
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -180,9 +167,7 @@ describe("Counter", () => {
|
|||||||
"Counter.Formatting.StringSuffix": "%",
|
"Counter.Formatting.StringSuffix": "%",
|
||||||
});
|
});
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".counter-visualization-container").should("exist");
|
||||||
.find(".counter-visualization-container")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
// wait a bit before taking snapshot
|
// wait a bit before taking snapshot
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
|
|||||||
@@ -5,34 +5,25 @@ describe("Edit visualization dialog", () => {
|
|||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery().then(({ id }) => {
|
cy.createQuery().then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it("opens New Visualization dialog", () => {
|
it("opens New Visualization dialog", () => {
|
||||||
cy.getByTestId("NewVisualization")
|
cy.getByTestId("NewVisualization").should("exist").click();
|
||||||
.should("exist")
|
|
||||||
.click();
|
|
||||||
cy.getByTestId("EditVisualizationDialog").should("exist");
|
cy.getByTestId("EditVisualizationDialog").should("exist");
|
||||||
// Default visualization should be selected
|
// Default visualization should be selected
|
||||||
cy.getByTestId("VisualizationType")
|
cy.getByTestId("VisualizationType").should("exist").should("contain", "Chart");
|
||||||
.should("exist")
|
cy.getByTestId("VisualizationName").should("exist").should("have.value", "Chart");
|
||||||
.should("contain", "Chart");
|
|
||||||
cy.getByTestId("VisualizationName")
|
|
||||||
.should("exist")
|
|
||||||
.should("have.value", "Chart");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("opens Edit Visualization dialog", () => {
|
it("opens Edit Visualization dialog", () => {
|
||||||
cy.getByTestId("EditVisualization").click();
|
cy.getByTestId("EditVisualization").click();
|
||||||
cy.getByTestId("EditVisualizationDialog").should("exist");
|
cy.getByTestId("EditVisualizationDialog").should("exist");
|
||||||
// Default `Table` visualization should be selected
|
// Default `Table` visualization should be selected
|
||||||
cy.getByTestId("VisualizationType")
|
cy.getByTestId("VisualizationType").should("exist").should("contain", "Table");
|
||||||
.should("exist")
|
cy.getByTestId("VisualizationName").should("exist").should("have.value", "Table");
|
||||||
.should("contain", "Table");
|
|
||||||
cy.getByTestId("VisualizationName")
|
|
||||||
.should("exist")
|
|
||||||
.should("have.value", "Table");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("creates visualization with custom name", () => {
|
it("creates visualization with custom name", () => {
|
||||||
@@ -44,15 +35,9 @@ describe("Edit visualization dialog", () => {
|
|||||||
VisualizationType.TABLE
|
VisualizationType.TABLE
|
||||||
`);
|
`);
|
||||||
|
|
||||||
cy.getByTestId("VisualizationName")
|
cy.getByTestId("VisualizationName").clear().type(visualizationName);
|
||||||
.clear()
|
|
||||||
.type(visualizationName);
|
|
||||||
|
|
||||||
cy.getByTestId("EditVisualizationDialog")
|
cy.getByTestId("EditVisualizationDialog").contains("button", "Save").click();
|
||||||
.contains("button", "Save")
|
cy.getByTestId("QueryPageVisualizationTabs").contains("span", visualizationName).should("exist");
|
||||||
.click();
|
|
||||||
cy.getByTestId("QueryPageVisualizationTabs")
|
|
||||||
.contains("span", visualizationName)
|
|
||||||
.should("exist");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ describe("Funnel", () => {
|
|||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery({ query: SQL }).then(({ id }) => {
|
cy.createQuery({ query: SQL }).then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -59,9 +60,7 @@ describe("Funnel", () => {
|
|||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("table").should("exist");
|
||||||
.find("table")
|
|
||||||
.should("exist");
|
|
||||||
cy.percySnapshot("Visualizations - Funnel (basic)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Funnel (basic)", { widths: [viewportWidth] });
|
||||||
|
|
||||||
cy.clickThrough(`
|
cy.clickThrough(`
|
||||||
@@ -81,9 +80,7 @@ describe("Funnel", () => {
|
|||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("table").should("exist");
|
||||||
.find("table")
|
|
||||||
.should("exist");
|
|
||||||
cy.percySnapshot("Visualizations - Funnel (extra options)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Funnel (extra options)", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ describe("Map (Markers)", () => {
|
|||||||
.then(({ id }) => cy.createVisualization(id, "MAP", "Map (Markers)", { mapTileUrl }))
|
.then(({ id }) => cy.createVisualization(id, "MAP", "Map (Markers)", { mapTileUrl }))
|
||||||
.then(({ id: visualizationId, query_id: queryId }) => {
|
.then(({ id: visualizationId, query_id: queryId }) => {
|
||||||
cy.visit(`queries/${queryId}/source#${visualizationId}`);
|
cy.visit(`queries/${queryId}/source#${visualizationId}`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -51,9 +52,7 @@ describe("Map (Markers)", () => {
|
|||||||
cy.fillInputs({ "ColorPicker.CustomColor": "blue{enter}" });
|
cy.fillInputs({ "ColorPicker.CustomColor": "blue{enter}" });
|
||||||
cy.getByTestId("ColorPicker.CustomColor").should("not.be.visible");
|
cy.getByTestId("ColorPicker.CustomColor").should("not.be.visible");
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".leaflet-control-zoom-in").click();
|
||||||
.find(".leaflet-control-zoom-in")
|
|
||||||
.click();
|
|
||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
@@ -85,9 +84,7 @@ describe("Map (Markers)", () => {
|
|||||||
cy.fillInputs({ "ColorPicker.CustomColor": "maroon{enter}" });
|
cy.fillInputs({ "ColorPicker.CustomColor": "maroon{enter}" });
|
||||||
cy.getByTestId("ColorPicker.CustomColor").should("not.be.visible");
|
cy.getByTestId("ColorPicker.CustomColor").should("not.be.visible");
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find(".leaflet-control-zoom-in").click();
|
||||||
.find(".leaflet-control-zoom-in")
|
|
||||||
.click();
|
|
||||||
|
|
||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(1000); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
|
|||||||
@@ -19,9 +19,7 @@ const SQL = `
|
|||||||
function createPivotThroughUI(visualizationName, options = {}) {
|
function createPivotThroughUI(visualizationName, options = {}) {
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
cy.getByTestId("VisualizationType").selectAntdOption("VisualizationType.PIVOT");
|
cy.getByTestId("VisualizationType").selectAntdOption("VisualizationType.PIVOT");
|
||||||
cy.getByTestId("VisualizationName")
|
cy.getByTestId("VisualizationName").clear().type(visualizationName);
|
||||||
.clear()
|
|
||||||
.type(visualizationName);
|
|
||||||
if (options.hideControls) {
|
if (options.hideControls) {
|
||||||
cy.getByTestId("PivotEditor.HideControls").click();
|
cy.getByTestId("PivotEditor.HideControls").click();
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview")
|
||||||
@@ -29,36 +27,30 @@ function createPivotThroughUI(visualizationName, options = {}) {
|
|||||||
.find(".pvtAxisContainer, .pvtRenderer, .pvtVals")
|
.find(".pvtAxisContainer, .pvtRenderer, .pvtVals")
|
||||||
.should("be.not.visible");
|
.should("be.not.visible");
|
||||||
}
|
}
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("table").should("exist");
|
||||||
.find("table")
|
cy.getByTestId("EditVisualizationDialog").contains("button", "Save").click();
|
||||||
.should("exist");
|
|
||||||
cy.getByTestId("EditVisualizationDialog")
|
|
||||||
.contains("button", "Save")
|
|
||||||
.click();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
describe("Pivot", () => {
|
describe("Pivot", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery({ name: "Pivot Visualization", query: SQL })
|
cy.createQuery({ name: "Pivot Visualization", query: SQL }).its("id").as("queryId");
|
||||||
.its("id")
|
|
||||||
.as("queryId");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("creates Pivot with controls", function () {
|
it("creates Pivot with controls", function () {
|
||||||
cy.visit(`queries/${this.queryId}/source`);
|
cy.visit(`queries/${this.queryId}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
|
|
||||||
const visualizationName = "Pivot";
|
const visualizationName = "Pivot";
|
||||||
createPivotThroughUI(visualizationName);
|
createPivotThroughUI(visualizationName);
|
||||||
|
|
||||||
cy.getByTestId("QueryPageVisualizationTabs")
|
cy.getByTestId("QueryPageVisualizationTabs").contains("span", visualizationName).should("exist");
|
||||||
.contains("span", visualizationName)
|
|
||||||
.should("exist");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("creates Pivot without controls", function () {
|
it("creates Pivot without controls", function () {
|
||||||
cy.visit(`queries/${this.queryId}/source`);
|
cy.visit(`queries/${this.queryId}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
|
|
||||||
const visualizationName = "Pivot";
|
const visualizationName = "Pivot";
|
||||||
@@ -86,8 +78,9 @@ describe("Pivot", () => {
|
|||||||
vals: ["value"],
|
vals: ["value"],
|
||||||
};
|
};
|
||||||
|
|
||||||
cy.createVisualization(this.queryId, "PIVOT", "Pivot", options).then(visualization => {
|
cy.createVisualization(this.queryId, "PIVOT", "Pivot", options).then((visualization) => {
|
||||||
cy.visit(`queries/${this.queryId}/source#${visualization.id}`);
|
cy.visit(`queries/${this.queryId}/source#${visualization.id}`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
|
|
||||||
// assert number of rows is 11
|
// assert number of rows is 11
|
||||||
@@ -104,9 +97,7 @@ describe("Pivot", () => {
|
|||||||
cy.wait(200);
|
cy.wait(200);
|
||||||
|
|
||||||
cy.getByTestId("SaveButton").click();
|
cy.getByTestId("SaveButton").click();
|
||||||
cy.getByTestId("ExecuteButton")
|
cy.getByTestId("ExecuteButton").should("be.enabled").click();
|
||||||
.should("be.enabled")
|
|
||||||
.click();
|
|
||||||
|
|
||||||
// assert number of rows is 12
|
// assert number of rows is 12
|
||||||
cy.getByTestId("PivotTableVisualization").contains(".pvtGrandTotal", "12");
|
cy.getByTestId("PivotTableVisualization").contains(".pvtGrandTotal", "12");
|
||||||
@@ -142,19 +133,20 @@ describe("Pivot", () => {
|
|||||||
];
|
];
|
||||||
|
|
||||||
cy.createDashboard("Pivot Visualization")
|
cy.createDashboard("Pivot Visualization")
|
||||||
.then(dashboard => {
|
.then((dashboard) => {
|
||||||
this.dashboardUrl = `/dashboards/${dashboard.id}`;
|
this.dashboardUrl = `/dashboards/${dashboard.id}`;
|
||||||
return cy.all(
|
return cy.all(
|
||||||
pivotTables.map(pivot => () =>
|
pivotTables.map(
|
||||||
|
(pivot) => () =>
|
||||||
cy
|
cy
|
||||||
.createVisualization(this.queryId, "PIVOT", pivot.name, pivot.options)
|
.createVisualization(this.queryId, "PIVOT", pivot.name, pivot.options)
|
||||||
.then(visualization => cy.addWidget(dashboard.id, visualization.id, { position: pivot.position }))
|
.then((visualization) => cy.addWidget(dashboard.id, visualization.id, { position: pivot.position }))
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.then(widgets => {
|
.then((widgets) => {
|
||||||
cy.visit(this.dashboardUrl);
|
cy.visit(this.dashboardUrl);
|
||||||
widgets.forEach(widget => {
|
widgets.forEach((widget) => {
|
||||||
cy.getByTestId(getWidgetTestId(widget)).within(() =>
|
cy.getByTestId(getWidgetTestId(widget)).within(() =>
|
||||||
cy.getByTestId("PivotTableVisualization").should("exist")
|
cy.getByTestId("PivotTableVisualization").should("exist")
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ describe("Sankey and Sunburst", () => {
|
|||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
cy.createQuery({ query: SQL }).then(({ id }) => {
|
cy.createQuery({ query: SQL }).then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
cy.getByTestId("NewVisualization").click();
|
cy.getByTestId("NewVisualization").click();
|
||||||
cy.getByTestId("VisualizationType").selectAntdOption("VisualizationType.SUNBURST_SEQUENCE");
|
cy.getByTestId("VisualizationType").selectAntdOption("VisualizationType.SUNBURST_SEQUENCE");
|
||||||
@@ -34,37 +35,21 @@ describe("Sankey and Sunburst", () => {
|
|||||||
it("creates Sunburst", () => {
|
it("creates Sunburst", () => {
|
||||||
const visualizationName = "Sunburst";
|
const visualizationName = "Sunburst";
|
||||||
|
|
||||||
cy.getByTestId("VisualizationName")
|
cy.getByTestId("VisualizationName").clear().type(visualizationName);
|
||||||
.clear()
|
cy.getByTestId("VisualizationPreview").find("svg").should("exist");
|
||||||
.type(visualizationName);
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
|
||||||
.find("svg")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
cy.getByTestId("EditVisualizationDialog")
|
cy.getByTestId("EditVisualizationDialog").contains("button", "Save").click();
|
||||||
.contains("button", "Save")
|
cy.getByTestId("QueryPageVisualizationTabs").contains("span", visualizationName).should("exist");
|
||||||
.click();
|
|
||||||
cy.getByTestId("QueryPageVisualizationTabs")
|
|
||||||
.contains("span", visualizationName)
|
|
||||||
.should("exist");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("creates Sankey", () => {
|
it("creates Sankey", () => {
|
||||||
const visualizationName = "Sankey";
|
const visualizationName = "Sankey";
|
||||||
|
|
||||||
cy.getByTestId("VisualizationName")
|
cy.getByTestId("VisualizationName").clear().type(visualizationName);
|
||||||
.clear()
|
cy.getByTestId("VisualizationPreview").find("svg").should("exist");
|
||||||
.type(visualizationName);
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
|
||||||
.find("svg")
|
|
||||||
.should("exist");
|
|
||||||
|
|
||||||
cy.getByTestId("EditVisualizationDialog")
|
cy.getByTestId("EditVisualizationDialog").contains("button", "Save").click();
|
||||||
.contains("button", "Save")
|
cy.getByTestId("QueryPageVisualizationTabs").contains("span", visualizationName).should("exist");
|
||||||
.click();
|
|
||||||
cy.getByTestId("QueryPageVisualizationTabs")
|
|
||||||
.contains("span", visualizationName)
|
|
||||||
.should("exist");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -93,20 +78,21 @@ describe("Sankey and Sunburst", () => {
|
|||||||
];
|
];
|
||||||
|
|
||||||
it("takes a snapshot with Sunburst (1 - 5 stages)", function () {
|
it("takes a snapshot with Sunburst (1 - 5 stages)", function () {
|
||||||
cy.createDashboard("Sunburst Visualization").then(dashboard => {
|
cy.createDashboard("Sunburst Visualization").then((dashboard) => {
|
||||||
this.dashboardUrl = `/dashboards/${dashboard.id}`;
|
this.dashboardUrl = `/dashboards/${dashboard.id}`;
|
||||||
return cy
|
return cy
|
||||||
.all(
|
.all(
|
||||||
STAGES_WIDGETS.map(sunburst => () =>
|
STAGES_WIDGETS.map(
|
||||||
|
(sunburst) => () =>
|
||||||
cy
|
cy
|
||||||
.createQuery({ name: `Sunburst with ${sunburst.name}`, query: sunburst.query })
|
.createQuery({ name: `Sunburst with ${sunburst.name}`, query: sunburst.query })
|
||||||
.then(queryData => cy.createVisualization(queryData.id, "SUNBURST_SEQUENCE", "Sunburst", {}))
|
.then((queryData) => cy.createVisualization(queryData.id, "SUNBURST_SEQUENCE", "Sunburst", {}))
|
||||||
.then(visualization => cy.addWidget(dashboard.id, visualization.id, { position: sunburst.position }))
|
.then((visualization) => cy.addWidget(dashboard.id, visualization.id, { position: sunburst.position }))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.then(widgets => {
|
.then((widgets) => {
|
||||||
cy.visit(this.dashboardUrl);
|
cy.visit(this.dashboardUrl);
|
||||||
widgets.forEach(widget => {
|
widgets.forEach((widget) => {
|
||||||
cy.getByTestId(getWidgetTestId(widget)).within(() => cy.get("svg").should("exist"));
|
cy.getByTestId(getWidgetTestId(widget)).within(() => cy.get("svg").should("exist"));
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -118,20 +104,21 @@ describe("Sankey and Sunburst", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it("takes a snapshot with Sankey (1 - 5 stages)", function () {
|
it("takes a snapshot with Sankey (1 - 5 stages)", function () {
|
||||||
cy.createDashboard("Sankey Visualization").then(dashboard => {
|
cy.createDashboard("Sankey Visualization").then((dashboard) => {
|
||||||
this.dashboardUrl = `/dashboards/${dashboard.id}`;
|
this.dashboardUrl = `/dashboards/${dashboard.id}`;
|
||||||
return cy
|
return cy
|
||||||
.all(
|
.all(
|
||||||
STAGES_WIDGETS.map(sankey => () =>
|
STAGES_WIDGETS.map(
|
||||||
|
(sankey) => () =>
|
||||||
cy
|
cy
|
||||||
.createQuery({ name: `Sankey with ${sankey.name}`, query: sankey.query })
|
.createQuery({ name: `Sankey with ${sankey.name}`, query: sankey.query })
|
||||||
.then(queryData => cy.createVisualization(queryData.id, "SANKEY", "Sankey", {}))
|
.then((queryData) => cy.createVisualization(queryData.id, "SANKEY", "Sankey", {}))
|
||||||
.then(visualization => cy.addWidget(dashboard.id, visualization.id, { position: sankey.position }))
|
.then((visualization) => cy.addWidget(dashboard.id, visualization.id, { position: sankey.position }))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.then(widgets => {
|
.then((widgets) => {
|
||||||
cy.visit(this.dashboardUrl);
|
cy.visit(this.dashboardUrl);
|
||||||
widgets.forEach(widget => {
|
widgets.forEach((widget) => {
|
||||||
cy.getByTestId(getWidgetTestId(widget)).within(() => cy.get("svg").should("exist"));
|
cy.getByTestId(getWidgetTestId(widget)).within(() => cy.get("svg").should("exist"));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ describe("Word Cloud", () => {
|
|||||||
cy.login();
|
cy.login();
|
||||||
cy.createQuery({ query: SQL }).then(({ id }) => {
|
cy.createQuery({ query: SQL }).then(({ id }) => {
|
||||||
cy.visit(`queries/${id}/source`);
|
cy.visit(`queries/${id}/source`);
|
||||||
|
cy.wait(1500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
cy.getByTestId("ExecuteButton").click();
|
cy.getByTestId("ExecuteButton").click();
|
||||||
});
|
});
|
||||||
cy.document().then(injectFont);
|
cy.document().then(injectFont);
|
||||||
@@ -80,9 +81,7 @@ describe("Word Cloud", () => {
|
|||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("svg text").should("have.length", 11);
|
||||||
.find("svg text")
|
|
||||||
.should("have.length", 11);
|
|
||||||
|
|
||||||
cy.percySnapshot("Visualizations - Word Cloud (Automatic word frequencies)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Word Cloud (Automatic word frequencies)", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
@@ -99,9 +98,7 @@ describe("Word Cloud", () => {
|
|||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("svg text").should("have.length", 5);
|
||||||
.find("svg text")
|
|
||||||
.should("have.length", 5);
|
|
||||||
|
|
||||||
cy.percySnapshot("Visualizations - Word Cloud (Frequencies from another column)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Word Cloud (Frequencies from another column)", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
@@ -125,9 +122,7 @@ describe("Word Cloud", () => {
|
|||||||
// Wait for proper initialization of visualization
|
// Wait for proper initialization of visualization
|
||||||
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
cy.wait(500); // eslint-disable-line cypress/no-unnecessary-waiting
|
||||||
|
|
||||||
cy.getByTestId("VisualizationPreview")
|
cy.getByTestId("VisualizationPreview").find("svg text").should("have.length", 2);
|
||||||
.find("svg text")
|
|
||||||
.should("have.length", 2);
|
|
||||||
|
|
||||||
cy.percySnapshot("Visualizations - Word Cloud (With filters)", { widths: [viewportWidth] });
|
cy.percySnapshot("Visualizations - Word Cloud (With filters)", { widths: [viewportWidth] });
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ services:
|
|||||||
image: redis:7-alpine
|
image: redis:7-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
postgres:
|
postgres:
|
||||||
image: pgautoupgrade/pgautoupgrade:latest
|
image: postgres:18-alpine
|
||||||
ports:
|
ports:
|
||||||
- "15432:5432"
|
- "15432:5432"
|
||||||
# The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3
|
# The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3
|
||||||
|
|||||||
20
package.json
20
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "redash-client",
|
"name": "redash-client",
|
||||||
"version": "25.08.0-dev",
|
"version": "25.12.0-dev",
|
||||||
"description": "The frontend part of Redash.",
|
"description": "The frontend part of Redash.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -46,8 +46,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@ant-design/icons": "^4.2.1",
|
"@ant-design/icons": "^4.2.1",
|
||||||
"@redash/viz": "file:viz-lib",
|
"@redash/viz": "file:viz-lib",
|
||||||
"ace-builds": "^1.4.12",
|
"ace-builds": "^1.43.3",
|
||||||
"antd": "^4.4.3",
|
"antd": "4.4.3",
|
||||||
"axios": "0.27.2",
|
"axios": "0.27.2",
|
||||||
"axios-auth-refresh": "3.3.6",
|
"axios-auth-refresh": "3.3.6",
|
||||||
"bootstrap": "^3.4.1",
|
"bootstrap": "^3.4.1",
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
"prop-types": "^15.6.1",
|
"prop-types": "^15.6.1",
|
||||||
"query-string": "^6.9.0",
|
"query-string": "^6.9.0",
|
||||||
"react": "16.14.0",
|
"react": "16.14.0",
|
||||||
"react-ace": "^9.1.1",
|
"react-ace": "^14.0.1",
|
||||||
"react-dom": "^16.14.0",
|
"react-dom": "^16.14.0",
|
||||||
"react-grid-layout": "^0.18.2",
|
"react-grid-layout": "^0.18.2",
|
||||||
"react-resizable": "^1.10.1",
|
"react-resizable": "^1.10.1",
|
||||||
@@ -100,6 +100,7 @@
|
|||||||
"@types/sql-formatter": "^2.3.0",
|
"@types/sql-formatter": "^2.3.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^2.10.0",
|
"@typescript-eslint/eslint-plugin": "^2.10.0",
|
||||||
"@typescript-eslint/parser": "^2.10.0",
|
"@typescript-eslint/parser": "^2.10.0",
|
||||||
|
"assert": "^2.1.0",
|
||||||
"atob": "^2.1.2",
|
"atob": "^2.1.2",
|
||||||
"babel-eslint": "^10.0.3",
|
"babel-eslint": "^10.0.3",
|
||||||
"babel-jest": "^24.1.0",
|
"babel-jest": "^24.1.0",
|
||||||
@@ -139,20 +140,23 @@
|
|||||||
"mockdate": "^2.0.2",
|
"mockdate": "^2.0.2",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"prettier": "3.3.2",
|
"prettier": "3.3.2",
|
||||||
|
"process": "^0.11.10",
|
||||||
"raw-loader": "^0.5.1",
|
"raw-loader": "^0.5.1",
|
||||||
"react-refresh": "^0.14.0",
|
"react-refresh": "^0.14.0",
|
||||||
"react-test-renderer": "^16.14.0",
|
"react-test-renderer": "^16.14.0",
|
||||||
"request-cookies": "^1.1.0",
|
"request-cookies": "^1.1.0",
|
||||||
"source-map-loader": "^1.1.3",
|
"source-map-loader": "^1.1.3",
|
||||||
|
"stream-browserify": "^3.0.0",
|
||||||
"style-loader": "^2.0.0",
|
"style-loader": "^2.0.0",
|
||||||
"typescript": "^4.1.2",
|
"typescript": "4.1.2",
|
||||||
|
"url": "^0.11.4",
|
||||||
"url-loader": "^4.1.1",
|
"url-loader": "^4.1.1",
|
||||||
"webpack": "^4.46.0",
|
"webpack": "^5.101.3",
|
||||||
"webpack-build-notifier": "^2.3.0",
|
"webpack-build-notifier": "^3.0.1",
|
||||||
"webpack-bundle-analyzer": "^4.9.0",
|
"webpack-bundle-analyzer": "^4.9.0",
|
||||||
"webpack-cli": "^4.10.0",
|
"webpack-cli": "^4.10.0",
|
||||||
"webpack-dev-server": "^4.15.1",
|
"webpack-dev-server": "^4.15.1",
|
||||||
"webpack-manifest-plugin": "^2.0.4"
|
"webpack-manifest-plugin": "^5.0.1"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"fsevents": "^2.3.2"
|
"fsevents": "^2.3.2"
|
||||||
|
|||||||
426
poetry.lock
generated
426
poetry.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,17 @@
|
|||||||
[project]
|
[project]
|
||||||
|
name = "redash"
|
||||||
|
version = "25.12.0-dev"
|
||||||
requires-python = ">=3.8"
|
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]
|
[tool.black]
|
||||||
target-version = ['py38']
|
target-version = ['py38']
|
||||||
@@ -10,17 +22,6 @@ force-exclude = '''
|
|||||||
)/
|
)/
|
||||||
'''
|
'''
|
||||||
|
|
||||||
[tool.poetry]
|
|
||||||
name = "redash"
|
|
||||||
version = "25.08.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]
|
[tool.poetry.dependencies]
|
||||||
python = ">=3.8,<3.11"
|
python = ">=3.8,<3.11"
|
||||||
advocate = "1.0.0"
|
advocate = "1.0.0"
|
||||||
@@ -89,6 +90,7 @@ pyodbc = "5.1.0"
|
|||||||
debugpy = "^1.8.9"
|
debugpy = "^1.8.9"
|
||||||
paramiko = "3.4.1"
|
paramiko = "3.4.1"
|
||||||
oracledb = "2.5.1"
|
oracledb = "2.5.1"
|
||||||
|
ibm-db = { version = "^3.2.7", markers = "platform_machine == 'x86_64' or platform_machine == 'AMD64'" }
|
||||||
|
|
||||||
[tool.poetry.group.all_ds]
|
[tool.poetry.group.all_ds]
|
||||||
optional = true
|
optional = true
|
||||||
@@ -103,6 +105,7 @@ certifi = ">=2019.9.11"
|
|||||||
cmem-cmempy = "21.2.3"
|
cmem-cmempy = "21.2.3"
|
||||||
databend-py = "0.4.6"
|
databend-py = "0.4.6"
|
||||||
databend-sqlalchemy = "0.2.4"
|
databend-sqlalchemy = "0.2.4"
|
||||||
|
duckdb = "1.3.2"
|
||||||
google-api-python-client = "1.7.11"
|
google-api-python-client = "1.7.11"
|
||||||
gspread = "5.11.2"
|
gspread = "5.11.2"
|
||||||
impyla = "0.16.0"
|
impyla = "0.16.0"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ from redash.app import create_app # noqa
|
|||||||
from redash.destinations import import_destinations
|
from redash.destinations import import_destinations
|
||||||
from redash.query_runner import import_query_runners
|
from redash.query_runner import import_query_runners
|
||||||
|
|
||||||
__version__ = "25.08.0-dev"
|
__version__ = "25.12.0-dev"
|
||||||
|
|
||||||
|
|
||||||
if os.environ.get("REMOTE_DEBUG"):
|
if os.environ.get("REMOTE_DEBUG"):
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class Webhook(BaseDestination):
|
|||||||
auth = HTTPBasicAuth(options.get("username"), options.get("password")) if options.get("username") else None
|
auth = HTTPBasicAuth(options.get("username"), options.get("password")) if options.get("username") else None
|
||||||
resp = requests.post(
|
resp = requests.post(
|
||||||
options.get("url"),
|
options.get("url"),
|
||||||
data=json_dumps(data),
|
data=json_dumps(data).encode("utf-8"),
|
||||||
auth=auth,
|
auth=auth,
|
||||||
headers=headers,
|
headers=headers,
|
||||||
timeout=5.0,
|
timeout=5.0,
|
||||||
|
|||||||
@@ -278,6 +278,7 @@ def client_config():
|
|||||||
"showPermissionsControl": current_org.get_setting("feature_show_permissions_control"),
|
"showPermissionsControl": current_org.get_setting("feature_show_permissions_control"),
|
||||||
"hidePlotlyModeBar": current_org.get_setting("hide_plotly_mode_bar"),
|
"hidePlotlyModeBar": current_org.get_setting("hide_plotly_mode_bar"),
|
||||||
"disablePublicUrls": current_org.get_setting("disable_public_urls"),
|
"disablePublicUrls": current_org.get_setting("disable_public_urls"),
|
||||||
|
"multiByteSearchEnabled": current_org.get_setting("multi_byte_search_enabled"),
|
||||||
"allowCustomJSVisualizations": settings.FEATURE_ALLOW_CUSTOM_JS_VISUALIZATIONS,
|
"allowCustomJSVisualizations": settings.FEATURE_ALLOW_CUSTOM_JS_VISUALIZATIONS,
|
||||||
"autoPublishNamedQueries": settings.FEATURE_AUTO_PUBLISH_NAMED_QUERIES,
|
"autoPublishNamedQueries": settings.FEATURE_AUTO_PUBLISH_NAMED_QUERIES,
|
||||||
"extendedAlertOptions": settings.FEATURE_EXTENDED_ALERT_OPTIONS,
|
"extendedAlertOptions": settings.FEATURE_EXTENDED_ALERT_OPTIONS,
|
||||||
|
|||||||
@@ -26,6 +26,8 @@ order_map = {
|
|||||||
"-name": "-lowercase_name",
|
"-name": "-lowercase_name",
|
||||||
"created_at": "created_at",
|
"created_at": "created_at",
|
||||||
"-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)
|
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",
|
"-executed_at": "-query_results-retrieved_at",
|
||||||
"created_by": "users-name",
|
"created_by": "users-name",
|
||||||
"-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)
|
order_results = partial(_order_results, default_order="-created_at", allowed_orders=order_map)
|
||||||
@@ -239,6 +241,8 @@ class QueryListResource(BaseQueryListResource):
|
|||||||
query = models.Query.create(**query_def)
|
query = models.Query.create(**query_def)
|
||||||
models.db.session.add(query)
|
models.db.session.add(query)
|
||||||
models.db.session.commit()
|
models.db.session.commit()
|
||||||
|
query.update_latest_result_by_query_hash()
|
||||||
|
models.db.session.commit()
|
||||||
|
|
||||||
self.record_event({"action": "create", "object_id": query.id, "object_type": "query"})
|
self.record_event({"action": "create", "object_id": query.id, "object_type": "query"})
|
||||||
|
|
||||||
@@ -362,6 +366,8 @@ class QueryResource(BaseResource):
|
|||||||
try:
|
try:
|
||||||
self.update_model(query, query_def)
|
self.update_model(query, query_def)
|
||||||
models.db.session.commit()
|
models.db.session.commit()
|
||||||
|
query.update_latest_result_by_query_hash()
|
||||||
|
models.db.session.commit()
|
||||||
except StaleDataError:
|
except StaleDataError:
|
||||||
abort(409)
|
abort(409)
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import calendar
|
|||||||
import datetime
|
import datetime
|
||||||
import logging
|
import logging
|
||||||
import numbers
|
import numbers
|
||||||
|
import re
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
@@ -228,7 +229,7 @@ class DataSource(BelongsToOrgMixin, db.Model):
|
|||||||
|
|
||||||
def _sort_schema(self, schema):
|
def _sort_schema(self, schema):
|
||||||
return [
|
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"])
|
for i in sorted(schema, key=lambda x: x["name"])
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -644,6 +645,43 @@ class Query(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model):
|
|||||||
|
|
||||||
return list(outdated_queries.values())
|
return list(outdated_queries.values())
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def _do_multi_byte_search(cls, all_queries, term, limit=None):
|
||||||
|
# term examples:
|
||||||
|
# - word
|
||||||
|
# - name:word
|
||||||
|
# - query:word
|
||||||
|
# - "multiple words"
|
||||||
|
# - name:"multiple words"
|
||||||
|
# - word1 word2 word3
|
||||||
|
# - word1 "multiple word" query:"select foo"
|
||||||
|
tokens = re.findall(r'(?:([^:\s]+):)?(?:"([^"]+)"|(\S+))', term)
|
||||||
|
conditions = []
|
||||||
|
for token in tokens:
|
||||||
|
key = None
|
||||||
|
if token[0]:
|
||||||
|
key = token[0]
|
||||||
|
|
||||||
|
if token[1]:
|
||||||
|
value = token[1]
|
||||||
|
else:
|
||||||
|
value = token[2]
|
||||||
|
|
||||||
|
pattern = f"%{value}%"
|
||||||
|
|
||||||
|
if key == "id" and value.isdigit():
|
||||||
|
conditions.append(cls.id.equal(int(value)))
|
||||||
|
elif key == "name":
|
||||||
|
conditions.append(cls.name.ilike(pattern))
|
||||||
|
elif key == "query":
|
||||||
|
conditions.append(cls.query_text.ilike(pattern))
|
||||||
|
elif key == "description":
|
||||||
|
conditions.append(cls.description.ilike(pattern))
|
||||||
|
else:
|
||||||
|
conditions.append(or_(cls.name.ilike(pattern), cls.description.ilike(pattern)))
|
||||||
|
|
||||||
|
return all_queries.filter(and_(*conditions)).order_by(Query.id).limit(limit)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def search(
|
def search(
|
||||||
cls,
|
cls,
|
||||||
@@ -664,12 +702,7 @@ class Query(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model):
|
|||||||
|
|
||||||
if multi_byte_search:
|
if multi_byte_search:
|
||||||
# Since tsvector doesn't work well with CJK languages, use `ilike` too
|
# Since tsvector doesn't work well with CJK languages, use `ilike` too
|
||||||
pattern = "%{}%".format(term)
|
return cls._do_multi_byte_search(all_queries, term, limit)
|
||||||
return (
|
|
||||||
all_queries.filter(or_(cls.name.ilike(pattern), cls.description.ilike(pattern)))
|
|
||||||
.order_by(Query.id)
|
|
||||||
.limit(limit)
|
|
||||||
)
|
|
||||||
|
|
||||||
# sort the result using the weight as defined in the search vector column
|
# sort the result using the weight as defined in the search vector column
|
||||||
return all_queries.search(term, sort=True).limit(limit)
|
return all_queries.search(term, sort=True).limit(limit)
|
||||||
@@ -678,13 +711,7 @@ class Query(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model):
|
|||||||
def search_by_user(cls, term, user, limit=None, multi_byte_search=False):
|
def search_by_user(cls, term, user, limit=None, multi_byte_search=False):
|
||||||
if multi_byte_search:
|
if multi_byte_search:
|
||||||
# Since tsvector doesn't work well with CJK languages, use `ilike` too
|
# Since tsvector doesn't work well with CJK languages, use `ilike` too
|
||||||
pattern = "%{}%".format(term)
|
return cls._do_multi_byte_search(cls.by_user(user), term, limit)
|
||||||
return (
|
|
||||||
cls.by_user(user)
|
|
||||||
.filter(or_(cls.name.ilike(pattern), cls.description.ilike(pattern)))
|
|
||||||
.order_by(Query.id)
|
|
||||||
.limit(limit)
|
|
||||||
)
|
|
||||||
|
|
||||||
return cls.by_user(user).search(term, sort=True).limit(limit)
|
return cls.by_user(user).search(term, sort=True).limit(limit)
|
||||||
|
|
||||||
@@ -726,6 +753,23 @@ class Query(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model):
|
|||||||
|
|
||||||
return db.session.execute(query, {"ids": tuple(query_ids)}).fetchall()
|
return db.session.execute(query, {"ids": tuple(query_ids)}).fetchall()
|
||||||
|
|
||||||
|
def update_latest_result_by_query_hash(self):
|
||||||
|
query_hash = self.query_hash
|
||||||
|
data_source_id = self.data_source_id
|
||||||
|
query_result = (
|
||||||
|
QueryResult.query.options(load_only("id"))
|
||||||
|
.filter(
|
||||||
|
QueryResult.query_hash == query_hash,
|
||||||
|
QueryResult.data_source_id == data_source_id,
|
||||||
|
)
|
||||||
|
.order_by(QueryResult.retrieved_at.desc())
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
if query_result:
|
||||||
|
latest_query_data_id = query_result.id
|
||||||
|
self.latest_query_data_id = latest_query_data_id
|
||||||
|
db.session.add(self)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def update_latest_result(cls, query_result):
|
def update_latest_result(cls, query_result):
|
||||||
# TODO: Investigate how big an impact this select-before-update makes.
|
# TODO: Investigate how big an impact this select-before-update makes.
|
||||||
@@ -1145,7 +1189,9 @@ class Dashboard(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model
|
|||||||
def favorites(cls, user, base_query=None):
|
def favorites(cls, user, base_query=None):
|
||||||
if base_query is None:
|
if base_query is None:
|
||||||
base_query = cls.all(user.org, user.group_ids, user.id)
|
base_query = cls.all(user.org, user.group_ids, user.id)
|
||||||
return base_query.join(
|
return (
|
||||||
|
base_query.distinct(cls.lowercase_name, Dashboard.created_at, Dashboard.slug, Favorite.created_at)
|
||||||
|
.join(
|
||||||
(
|
(
|
||||||
Favorite,
|
Favorite,
|
||||||
and_(
|
and_(
|
||||||
@@ -1153,7 +1199,9 @@ class Dashboard(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model
|
|||||||
Favorite.object_id == Dashboard.id,
|
Favorite.object_id == Dashboard.id,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
).filter(Favorite.user_id == user.id)
|
)
|
||||||
|
.filter(Favorite.user_id == user.id)
|
||||||
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def by_user(cls, user):
|
def by_user(cls, user):
|
||||||
|
|||||||
@@ -156,6 +156,11 @@ class BigQuery(BaseSQLQueryRunner):
|
|||||||
"secret": ["jsonKeyFile"],
|
"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):
|
def _get_bigquery_service(self):
|
||||||
socket.setdefaulttimeout(settings.BIGQUERY_HTTP_TIMEOUT)
|
socket.setdefaulttimeout(settings.BIGQUERY_HTTP_TIMEOUT)
|
||||||
|
|
||||||
@@ -215,11 +220,12 @@ class BigQuery(BaseSQLQueryRunner):
|
|||||||
job_data = self._get_job_data(query)
|
job_data = self._get_job_data(query)
|
||||||
insert_response = jobs.insert(projectId=project_id, body=job_data).execute()
|
insert_response = jobs.insert(projectId=project_id, body=job_data).execute()
|
||||||
self.current_job_id = insert_response["jobReference"]["jobId"]
|
self.current_job_id = insert_response["jobReference"]["jobId"]
|
||||||
|
self.current_job_location = insert_response["jobReference"]["location"]
|
||||||
current_row = 0
|
current_row = 0
|
||||||
query_reply = _get_query_results(
|
query_reply = _get_query_results(
|
||||||
jobs,
|
jobs,
|
||||||
project_id=project_id,
|
project_id=project_id,
|
||||||
location=self._get_location(),
|
location=self.current_job_location,
|
||||||
job_id=self.current_job_id,
|
job_id=self.current_job_id,
|
||||||
start_index=current_row,
|
start_index=current_row,
|
||||||
)
|
)
|
||||||
@@ -236,13 +242,11 @@ class BigQuery(BaseSQLQueryRunner):
|
|||||||
|
|
||||||
query_result_request = {
|
query_result_request = {
|
||||||
"projectId": project_id,
|
"projectId": project_id,
|
||||||
"jobId": query_reply["jobReference"]["jobId"],
|
"jobId": self.current_job_id,
|
||||||
"startIndex": current_row,
|
"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()
|
query_reply = jobs.getQueryResults(**query_result_request).execute()
|
||||||
|
|
||||||
columns = [
|
columns = [
|
||||||
@@ -304,19 +308,34 @@ class BigQuery(BaseSQLQueryRunner):
|
|||||||
datasets = self._get_project_datasets(project_id)
|
datasets = self._get_project_datasets(project_id)
|
||||||
|
|
||||||
query_base = """
|
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
|
FROM `{dataset_id}`.INFORMATION_SCHEMA.COLUMN_FIELD_PATHS
|
||||||
WHERE table_schema NOT IN ('information_schema')
|
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 = {}
|
schema = {}
|
||||||
queries = []
|
|
||||||
for dataset in datasets:
|
for dataset in datasets:
|
||||||
dataset_id = dataset["datasetReference"]["datasetId"]
|
dataset_id = dataset["datasetReference"]["datasetId"]
|
||||||
location = dataset["location"]
|
location = dataset["location"]
|
||||||
if self._get_location() and location != self._get_location():
|
if self._get_location() and location != self._get_location():
|
||||||
logger.debug("dataset location is different: %s", location)
|
logger.debug("dataset location is different: %s", location)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
if location not in location_dataset_ids:
|
||||||
|
location_dataset_ids[location] = []
|
||||||
|
location_dataset_ids[location].append(dataset_id)
|
||||||
|
|
||||||
|
for location, datasets in location_dataset_ids.items():
|
||||||
|
queries = []
|
||||||
|
for dataset_id in datasets:
|
||||||
query = query_base.format(dataset_id=dataset_id)
|
query = query_base.format(dataset_id=dataset_id)
|
||||||
queries.append(query)
|
queries.append(query)
|
||||||
|
|
||||||
@@ -329,7 +348,30 @@ class BigQuery(BaseSQLQueryRunner):
|
|||||||
table_name = "{0}.{1}".format(row["table_schema"], row["table_name"])
|
table_name = "{0}.{1}".format(row["table_schema"], row["table_name"])
|
||||||
if table_name not in schema:
|
if table_name not in schema:
|
||||||
schema[table_name] = {"name": table_name, "columns": []}
|
schema[table_name] = {"name": table_name, "columns": []}
|
||||||
schema[table_name]["columns"].append({"name": row["field_path"], "type": row["data_type"]})
|
schema[table_name]["columns"].append(
|
||||||
|
{
|
||||||
|
"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())
|
return list(schema.values())
|
||||||
|
|
||||||
@@ -363,7 +405,7 @@ class BigQuery(BaseSQLQueryRunner):
|
|||||||
self._get_bigquery_service().jobs().cancel(
|
self._get_bigquery_service().jobs().cancel(
|
||||||
projectId=self._get_project_id(),
|
projectId=self._get_project_id(),
|
||||||
jobId=self.current_job_id,
|
jobId=self.current_job_id,
|
||||||
location=self._get_location(),
|
location=self.current_job_location,
|
||||||
).execute()
|
).execute()
|
||||||
|
|
||||||
raise
|
raise
|
||||||
|
|||||||
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
|
def parse_issue(issue, field_mapping): # noqa: C901
|
||||||
result = OrderedDict()
|
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)
|
output_name = field_mapping.get_output_field_name(k)
|
||||||
member_names = field_mapping.get_dict_members(k)
|
member_names = field_mapping.get_dict_members(k)
|
||||||
|
|
||||||
@@ -98,7 +102,9 @@ def parse_issues(data, field_mapping):
|
|||||||
|
|
||||||
def parse_count(data):
|
def parse_count(data):
|
||||||
results = ResultSet()
|
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
|
return results
|
||||||
|
|
||||||
|
|
||||||
@@ -160,18 +166,26 @@ class JiraJQL(BaseHTTPQueryRunner):
|
|||||||
self.syntax = "json"
|
self.syntax = "json"
|
||||||
|
|
||||||
def run_query(self, query, user):
|
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 = json_loads(query)
|
||||||
query_type = query.pop("queryType", "select")
|
query_type = query.pop("queryType", "select")
|
||||||
field_mapping = FieldMapping(query.pop("fieldMapping", {}))
|
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":
|
if query_type == "count":
|
||||||
query["maxResults"] = 1
|
query["maxResults"] = 1
|
||||||
query["fields"] = ""
|
query["fields"] = ""
|
||||||
else:
|
else:
|
||||||
query["maxResults"] = query.get("maxResults", 1000)
|
query["maxResults"] = query.get("maxResults", 1000)
|
||||||
|
|
||||||
|
if "fields" not in query:
|
||||||
|
query["fields"] = "*all"
|
||||||
|
|
||||||
response, error = self.get_response(jql_url, params=query)
|
response, error = self.get_response(jql_url, params=query)
|
||||||
if error is not None:
|
if error is not None:
|
||||||
return None, error
|
return None, error
|
||||||
@@ -182,17 +196,15 @@ class JiraJQL(BaseHTTPQueryRunner):
|
|||||||
results = parse_count(data)
|
results = parse_count(data)
|
||||||
else:
|
else:
|
||||||
results = parse_issues(data, field_mapping)
|
results = parse_issues(data, field_mapping)
|
||||||
index = data["startAt"] + data["maxResults"]
|
|
||||||
|
|
||||||
while data["total"] > index:
|
# API v3 uses token-based pagination instead of startAt/total
|
||||||
query["startAt"] = index
|
while not data.get("isLast", True) and "nextPageToken" in data:
|
||||||
|
query["nextPageToken"] = data["nextPageToken"]
|
||||||
response, error = self.get_response(jql_url, params=query)
|
response, error = self.get_response(jql_url, params=query)
|
||||||
if error is not None:
|
if error is not None:
|
||||||
return None, error
|
return None, error
|
||||||
|
|
||||||
data = response.json()
|
data = response.json()
|
||||||
index = data["startAt"] + data["maxResults"]
|
|
||||||
|
|
||||||
addl_results = parse_issues(data, field_mapping)
|
addl_results = parse_issues(data, field_mapping)
|
||||||
results.merge(addl_results)
|
results.merge(addl_results)
|
||||||
|
|
||||||
|
|||||||
@@ -150,7 +150,9 @@ class Mysql(BaseSQLQueryRunner):
|
|||||||
query = """
|
query = """
|
||||||
SELECT col.table_schema as table_schema,
|
SELECT col.table_schema as table_schema,
|
||||||
col.table_name as table_name,
|
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
|
FROM `information_schema`.`columns` col
|
||||||
WHERE LOWER(col.table_schema) NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys');
|
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:
|
if table_name not in schema:
|
||||||
schema[table_name] = {"name": table_name, "columns": []}
|
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())
|
return list(schema.values())
|
||||||
|
|
||||||
|
|||||||
@@ -138,6 +138,15 @@ def _get_ssl_config(configuration):
|
|||||||
return ssl_config
|
return ssl_config
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_dsn(configuration):
|
||||||
|
standard_params = {"user", "password", "host", "port", "dbname"}
|
||||||
|
params = psycopg2.extensions.parse_dsn(configuration.get("dsn", ""))
|
||||||
|
overlap = standard_params.intersection(params.keys())
|
||||||
|
if overlap:
|
||||||
|
raise ValueError("Extra parameters may not contain {}".format(overlap))
|
||||||
|
return params
|
||||||
|
|
||||||
|
|
||||||
class PostgreSQL(BaseSQLQueryRunner):
|
class PostgreSQL(BaseSQLQueryRunner):
|
||||||
noop_query = "SELECT 1"
|
noop_query = "SELECT 1"
|
||||||
|
|
||||||
@@ -151,6 +160,7 @@ class PostgreSQL(BaseSQLQueryRunner):
|
|||||||
"host": {"type": "string", "default": "127.0.0.1"},
|
"host": {"type": "string", "default": "127.0.0.1"},
|
||||||
"port": {"type": "number", "default": 5432},
|
"port": {"type": "number", "default": 5432},
|
||||||
"dbname": {"type": "string", "title": "Database Name"},
|
"dbname": {"type": "string", "title": "Database Name"},
|
||||||
|
"dsn": {"type": "string", "default": "application_name=redash", "title": "Parameters"},
|
||||||
"sslmode": {
|
"sslmode": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"title": "SSL Mode",
|
"title": "SSL Mode",
|
||||||
@@ -205,24 +215,15 @@ class PostgreSQL(BaseSQLQueryRunner):
|
|||||||
|
|
||||||
def _get_tables(self, schema):
|
def _get_tables(self, schema):
|
||||||
"""
|
"""
|
||||||
relkind constants per https://www.postgresql.org/docs/10/static/catalog-pg-class.html
|
relkind constants from https://www.postgresql.org/docs/current/catalog-pg-class.html
|
||||||
r = regular table
|
|
||||||
v = view
|
|
||||||
m = materialized view
|
m = materialized view
|
||||||
f = foreign table
|
|
||||||
p = partitioned table (new in 10)
|
|
||||||
---
|
|
||||||
i = index
|
|
||||||
S = sequence
|
|
||||||
t = TOAST table
|
|
||||||
c = composite type
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
query = """
|
query = """
|
||||||
SELECT s.nspname as table_schema,
|
SELECT s.nspname AS table_schema,
|
||||||
c.relname as table_name,
|
c.relname AS table_name,
|
||||||
a.attname as column_name,
|
a.attname AS column_name,
|
||||||
null as data_type
|
NULL AS data_type
|
||||||
FROM pg_class c
|
FROM pg_class c
|
||||||
JOIN pg_namespace s
|
JOIN pg_namespace s
|
||||||
ON c.relnamespace = s.oid
|
ON c.relnamespace = s.oid
|
||||||
@@ -231,8 +232,8 @@ class PostgreSQL(BaseSQLQueryRunner):
|
|||||||
ON a.attrelid = c.oid
|
ON a.attrelid = c.oid
|
||||||
AND a.attnum > 0
|
AND a.attnum > 0
|
||||||
AND NOT a.attisdropped
|
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_table_privilege(quote_ident(s.nspname) || '.' || quote_ident(c.relname), 'select')
|
||||||
AND has_schema_privilege(s.nspname, 'usage')
|
AND has_schema_privilege(s.nspname, 'usage')
|
||||||
|
|
||||||
UNION
|
UNION
|
||||||
@@ -243,6 +244,8 @@ class PostgreSQL(BaseSQLQueryRunner):
|
|||||||
data_type
|
data_type
|
||||||
FROM information_schema.columns
|
FROM information_schema.columns
|
||||||
WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
|
WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
|
||||||
|
AND has_table_privilege(quote_ident(table_schema) || '.' || quote_ident(table_name), 'select')
|
||||||
|
AND has_schema_privilege(table_schema, 'usage')
|
||||||
"""
|
"""
|
||||||
|
|
||||||
self._get_definitions(schema, query)
|
self._get_definitions(schema, query)
|
||||||
@@ -251,6 +254,7 @@ class PostgreSQL(BaseSQLQueryRunner):
|
|||||||
|
|
||||||
def _get_connection(self):
|
def _get_connection(self):
|
||||||
self.ssl_config = _get_ssl_config(self.configuration)
|
self.ssl_config = _get_ssl_config(self.configuration)
|
||||||
|
self.dsn = _parse_dsn(self.configuration)
|
||||||
connection = psycopg2.connect(
|
connection = psycopg2.connect(
|
||||||
user=self.configuration.get("user"),
|
user=self.configuration.get("user"),
|
||||||
password=self.configuration.get("password"),
|
password=self.configuration.get("password"),
|
||||||
@@ -259,6 +263,7 @@ class PostgreSQL(BaseSQLQueryRunner):
|
|||||||
dbname=self.configuration.get("dbname"),
|
dbname=self.configuration.get("dbname"),
|
||||||
async_=True,
|
async_=True,
|
||||||
**self.ssl_config,
|
**self.ssl_config,
|
||||||
|
**self.dsn,
|
||||||
)
|
)
|
||||||
|
|
||||||
return connection
|
return connection
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
try:
|
try:
|
||||||
import snowflake.connector
|
import snowflake.connector
|
||||||
|
from cryptography.hazmat.primitives.serialization import load_pem_private_key
|
||||||
|
|
||||||
enabled = True
|
enabled = True
|
||||||
except ImportError:
|
except ImportError:
|
||||||
enabled = False
|
enabled = False
|
||||||
|
|
||||||
|
|
||||||
|
from base64 import b64decode
|
||||||
|
|
||||||
from redash import __version__
|
from redash import __version__
|
||||||
from redash.query_runner import (
|
from redash.query_runner import (
|
||||||
TYPE_BOOLEAN,
|
TYPE_BOOLEAN,
|
||||||
@@ -43,6 +46,8 @@ class Snowflake(BaseSQLQueryRunner):
|
|||||||
"account": {"type": "string"},
|
"account": {"type": "string"},
|
||||||
"user": {"type": "string"},
|
"user": {"type": "string"},
|
||||||
"password": {"type": "string"},
|
"password": {"type": "string"},
|
||||||
|
"private_key_File": {"type": "string"},
|
||||||
|
"private_key_pwd": {"type": "string"},
|
||||||
"warehouse": {"type": "string"},
|
"warehouse": {"type": "string"},
|
||||||
"database": {"type": "string"},
|
"database": {"type": "string"},
|
||||||
"region": {"type": "string", "default": "us-west"},
|
"region": {"type": "string", "default": "us-west"},
|
||||||
@@ -57,13 +62,15 @@ class Snowflake(BaseSQLQueryRunner):
|
|||||||
"account",
|
"account",
|
||||||
"user",
|
"user",
|
||||||
"password",
|
"password",
|
||||||
|
"private_key_File",
|
||||||
|
"private_key_pwd",
|
||||||
"warehouse",
|
"warehouse",
|
||||||
"database",
|
"database",
|
||||||
"region",
|
"region",
|
||||||
"host",
|
"host",
|
||||||
],
|
],
|
||||||
"required": ["user", "password", "account", "database", "warehouse"],
|
"required": ["user", "account", "database", "warehouse"],
|
||||||
"secret": ["password"],
|
"secret": ["password", "private_key_File", "private_key_pwd"],
|
||||||
"extra_options": [
|
"extra_options": [
|
||||||
"host",
|
"host",
|
||||||
],
|
],
|
||||||
@@ -88,7 +95,7 @@ class Snowflake(BaseSQLQueryRunner):
|
|||||||
if region == "us-west":
|
if region == "us-west":
|
||||||
region = None
|
region = None
|
||||||
|
|
||||||
if self.configuration.__contains__("host"):
|
if self.configuration.get("host"):
|
||||||
host = self.configuration.get("host")
|
host = self.configuration.get("host")
|
||||||
else:
|
else:
|
||||||
if region:
|
if region:
|
||||||
@@ -96,14 +103,29 @@ class Snowflake(BaseSQLQueryRunner):
|
|||||||
else:
|
else:
|
||||||
host = "{}.snowflakecomputing.com".format(account)
|
host = "{}.snowflakecomputing.com".format(account)
|
||||||
|
|
||||||
connection = snowflake.connector.connect(
|
params = {
|
||||||
user=self.configuration["user"],
|
"user": self.configuration["user"],
|
||||||
password=self.configuration["password"],
|
"account": account,
|
||||||
account=account,
|
"region": region,
|
||||||
region=region,
|
"host": host,
|
||||||
host=host,
|
"application": "Redash/{} (Snowflake)".format(__version__.split("-")[0]),
|
||||||
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
|
return connection
|
||||||
|
|
||||||
|
|||||||
@@ -82,9 +82,19 @@ class QuerySerializer(Serializer):
|
|||||||
else:
|
else:
|
||||||
result = [serialize_query(query, **self.options) for query in self.object_or_list]
|
result = [serialize_query(query, **self.options) for query in self.object_or_list]
|
||||||
if self.options.get("with_favorite_state", True):
|
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:
|
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
|
return result
|
||||||
|
|
||||||
@@ -263,9 +273,19 @@ class DashboardSerializer(Serializer):
|
|||||||
else:
|
else:
|
||||||
result = [serialize_dashboard(obj, **self.options) for obj in self.object_or_list]
|
result = [serialize_dashboard(obj, **self.options) for obj in self.object_or_list]
|
||||||
if self.options.get("with_favorite_state", True):
|
if self.options.get("with_favorite_state", True):
|
||||||
favorite_ids = models.Favorite.are_favorites(current_user.id, self.object_or_list)
|
dashboards = list(self.object_or_list)
|
||||||
for obj in result:
|
favorites = models.Favorite.query.filter(
|
||||||
obj["is_favorite"] = obj["id"] in favorite_ids
|
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
|
return result
|
||||||
|
|
||||||
|
|||||||
@@ -348,6 +348,7 @@ default_query_runners = [
|
|||||||
"redash.query_runner.oracle",
|
"redash.query_runner.oracle",
|
||||||
"redash.query_runner.e6data",
|
"redash.query_runner.e6data",
|
||||||
"redash.query_runner.risingwave",
|
"redash.query_runner.risingwave",
|
||||||
|
"redash.query_runner.duckdb",
|
||||||
]
|
]
|
||||||
|
|
||||||
enabled_query_runners = array_from_string(
|
enabled_query_runners = array_from_string(
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ from redash.models.parameterized_query import (
|
|||||||
QueryDetachedFromDataSourceError,
|
QueryDetachedFromDataSourceError,
|
||||||
)
|
)
|
||||||
from redash.monitor import rq_job_ids
|
from redash.monitor import rq_job_ids
|
||||||
|
from redash.query_runner import NotSupported
|
||||||
from redash.tasks.failure_report import track_failure
|
from redash.tasks.failure_report import track_failure
|
||||||
from redash.utils import json_dumps, sentry
|
from redash.utils import json_dumps, sentry
|
||||||
from redash.worker import get_job_logger, job
|
from redash.worker import get_job_logger, job
|
||||||
@@ -177,6 +178,8 @@ def refresh_schema(data_source_id):
|
|||||||
time.time() - start_time,
|
time.time() - start_time,
|
||||||
)
|
)
|
||||||
statsd_client.incr("refresh_schema.timeout")
|
statsd_client.incr("refresh_schema.timeout")
|
||||||
|
except NotSupported:
|
||||||
|
logger.debug("Datasource %s does not support schema refresh", ds.name)
|
||||||
except Exception:
|
except Exception:
|
||||||
logger.warning("Failed refreshing schema for the data source: %s", ds.name, exc_info=1)
|
logger.warning("Failed refreshing schema for the data source: %s", ds.name, exc_info=1)
|
||||||
statsd_client.incr("refresh_schema.error")
|
statsd_client.incr("refresh_schema.error")
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ def collect_parameters_from_request(args):
|
|||||||
|
|
||||||
def base_url(org):
|
def base_url(org):
|
||||||
if settings.MULTI_ORG:
|
if settings.MULTI_ORG:
|
||||||
return "https://{}/{}".format(settings.HOST, org.slug)
|
return "{}/{}".format(settings.HOST, org.slug)
|
||||||
|
|
||||||
return settings.HOST
|
return settings.HOST
|
||||||
|
|
||||||
|
|||||||
50
tests/destinations/test_webhook.py
Normal file
50
tests/destinations/test_webhook.py
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
import json
|
||||||
|
from unittest import mock
|
||||||
|
|
||||||
|
from redash.destinations.webhook import Webhook
|
||||||
|
from redash.models import Alert
|
||||||
|
|
||||||
|
|
||||||
|
def test_webhook_notify_handles_unicode():
|
||||||
|
# Create a mock alert with all the properties needed by serialize_alert
|
||||||
|
alert = mock.Mock()
|
||||||
|
alert.id = 1
|
||||||
|
alert.name = "Test Alert"
|
||||||
|
alert.custom_subject = "Test Subject With Unicode: 晨"
|
||||||
|
alert.custom_body = "Test Body"
|
||||||
|
alert.options = {}
|
||||||
|
alert.state = "ok"
|
||||||
|
alert.last_triggered_at = None
|
||||||
|
alert.updated_at = "2025-12-02T08:00:00Z"
|
||||||
|
alert.created_at = "2025-12-02T08:00:00Z"
|
||||||
|
alert.rearm = None
|
||||||
|
alert.query_id = 10
|
||||||
|
alert.user_id = 20
|
||||||
|
|
||||||
|
query = mock.Mock()
|
||||||
|
user = mock.Mock()
|
||||||
|
app = mock.Mock()
|
||||||
|
host = "http://redash.local"
|
||||||
|
options = {"url": "https://example.com/webhook", "username": "user", "password": "password"}
|
||||||
|
metadata = {}
|
||||||
|
new_state = Alert.TRIGGERED_STATE
|
||||||
|
destination = Webhook(options)
|
||||||
|
|
||||||
|
with mock.patch("redash.destinations.webhook.requests.post") as mock_post:
|
||||||
|
mock_response = mock.Mock()
|
||||||
|
mock_response.status_code = 200
|
||||||
|
mock_post.return_value = mock_response
|
||||||
|
|
||||||
|
destination.notify(alert, query, user, new_state, app, host, metadata, options)
|
||||||
|
|
||||||
|
# Get the data passed to the mock
|
||||||
|
call_args, call_kwargs = mock_post.call_args
|
||||||
|
sent_data = call_kwargs["data"]
|
||||||
|
|
||||||
|
# 1. Make sure we send bytes
|
||||||
|
assert isinstance(sent_data, bytes)
|
||||||
|
|
||||||
|
# 2. Make sure the bytes are the correct UTF-8 encoded JSON
|
||||||
|
decoded_data = json.loads(sent_data.decode("utf-8"))
|
||||||
|
assert decoded_data["alert"]["title"] == alert.custom_subject
|
||||||
|
assert "Test Subject With Unicode: 晨" in sent_data.decode("utf-8")
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import textwrap
|
import textwrap
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
from redash import settings
|
||||||
from redash.models import OPERATORS, Alert, db, next_state
|
from redash.models import OPERATORS, Alert, db, next_state
|
||||||
from tests import BaseTestCase
|
from tests import BaseTestCase
|
||||||
|
|
||||||
@@ -176,16 +177,18 @@ class TestAlertRenderTemplate(BaseTestCase):
|
|||||||
ALERT_CONDITION equals
|
ALERT_CONDITION equals
|
||||||
ALERT_THRESHOLD 5
|
ALERT_THRESHOLD 5
|
||||||
ALERT_NAME %s
|
ALERT_NAME %s
|
||||||
ALERT_URL https:///default/alerts/%d
|
ALERT_URL %s/default/alerts/%d
|
||||||
QUERY_NAME Query
|
QUERY_NAME Query
|
||||||
QUERY_URL https:///default/queries/%d
|
QUERY_URL %s/default/queries/%d
|
||||||
QUERY_RESULT_VALUE 1
|
QUERY_RESULT_VALUE 1
|
||||||
QUERY_RESULT_ROWS [{'foo': 1}]
|
QUERY_RESULT_ROWS [{'foo': 1}]
|
||||||
QUERY_RESULT_COLS [{'name': 'foo', 'type': 'STRING'}]
|
QUERY_RESULT_COLS [{'name': 'foo', 'type': 'STRING'}]
|
||||||
</pre>
|
</pre>
|
||||||
""" % (
|
""" % (
|
||||||
alert.name,
|
alert.name,
|
||||||
|
settings.HOST,
|
||||||
alert.id,
|
alert.id,
|
||||||
|
settings.HOST,
|
||||||
alert.query_id,
|
alert.query_id,
|
||||||
)
|
)
|
||||||
result = alert.render_template(textwrap.dedent(custom_alert))
|
result = alert.render_template(textwrap.dedent(custom_alert))
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ class TestBigQueryQueryRunner(unittest.TestCase):
|
|||||||
query = "SELECT a FROM tbl"
|
query = "SELECT a FROM tbl"
|
||||||
expect = (
|
expect = (
|
||||||
"/* Username: username, query_id: adhoc, "
|
"/* Username: username, query_id: adhoc, "
|
||||||
"Job ID: job-id, Query Hash: query-hash, "
|
"Query Hash: query-hash, "
|
||||||
"Scheduled: False */ SELECT a FROM tbl"
|
"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))
|
||||||
@@ -1,6 +1,16 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from redash.query_runner.pg import build_schema
|
from redash.query_runner.pg import _parse_dsn, build_schema
|
||||||
|
|
||||||
|
|
||||||
|
class TestParameters(TestCase):
|
||||||
|
def test_parse_dsn(self):
|
||||||
|
configuration = {"dsn": "application_name=redash connect_timeout=5"}
|
||||||
|
self.assertDictEqual(_parse_dsn(configuration), {"application_name": "redash", "connect_timeout": "5"})
|
||||||
|
|
||||||
|
def test_parse_dsn_not_permitted(self):
|
||||||
|
configuration = {"dsn": "password=xyz"}
|
||||||
|
self.assertRaises(ValueError, _parse_dsn, configuration)
|
||||||
|
|
||||||
|
|
||||||
class TestBuildSchema(TestCase):
|
class TestBuildSchema(TestCase):
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
"@types/jest": "^26.0.18",
|
"@types/jest": "^26.0.18",
|
||||||
"@types/leaflet": "^1.5.19",
|
"@types/leaflet": "^1.5.19",
|
||||||
"@types/numeral": "0.0.28",
|
"@types/numeral": "0.0.28",
|
||||||
"@types/plotly.js": "^2.35.2",
|
"@types/plotly.js": "^3.0.3",
|
||||||
"@types/react": "^17.0.0",
|
"@types/react": "^17.0.0",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@types/react-dom": "^17.0.0",
|
||||||
"@types/tinycolor2": "^1.4.2",
|
"@types/tinycolor2": "^1.4.2",
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
"leaflet.markercluster": "^1.1.0",
|
"leaflet.markercluster": "^1.1.0",
|
||||||
"lodash": "^4.17.10",
|
"lodash": "^4.17.10",
|
||||||
"numeral": "^2.0.6",
|
"numeral": "^2.0.6",
|
||||||
"plotly.js": "2.35.3",
|
"plotly.js": "3.1.0",
|
||||||
"react-pivottable": "^0.9.0",
|
"react-pivottable": "^0.9.0",
|
||||||
"react-sortable-hoc": "^1.10.1",
|
"react-sortable-hoc": "^1.10.1",
|
||||||
"tinycolor2": "^1.4.1",
|
"tinycolor2": "^1.4.1",
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { EditorPropTypes } from "@/visualizations/prop-types";
|
|||||||
const defaultCustomCode = trimStart(`
|
const defaultCustomCode = trimStart(`
|
||||||
// Available variables are x, ys, element, and Plotly
|
// Available variables are x, ys, element, and Plotly
|
||||||
// Type console.log(x, ys); for more info about x and ys
|
// Type console.log(x, ys); for more info about x and ys
|
||||||
// To plot your graph call Plotly.plot(element, ...)
|
// To plot your graph call Plotly.newPlot(element, ...)
|
||||||
// Plotly examples and docs: https://plot.ly/javascript/
|
// Plotly examples and docs: https://plot.ly/javascript/
|
||||||
`);
|
`);
|
||||||
|
|
||||||
|
|||||||
@@ -336,7 +336,39 @@ export default function GeneralSettings({ options, data, onOptionsChange }: any)
|
|||||||
</Section>
|
</Section>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{!includes(["custom", "heatmap", "bubble", "scatter"], options.globalSeriesType) && (
|
{includes(["line", "area"], 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
|
||||||
|
label="Line Shape"
|
||||||
|
data-test="Chart.LineShape"
|
||||||
|
defaultValue={options.lineShape}
|
||||||
|
onChange={(val: any) => onOptionsChange({ lineShape: val })}>
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
<Select.Option value="linear" data-test="Chart.LineShape.Linear">
|
||||||
|
Linear
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
</Select.Option>
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
<Select.Option value="spline" data-test="Chart.LineShape.Spline">
|
||||||
|
Spline
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
</Select.Option>
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
<Select.Option value="hv" data-test="Chart.LineShape.HorizontalVertical">
|
||||||
|
Horizontal-Vertical
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
</Select.Option>
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
<Select.Option value="vh" data-test="Chart.LineShape.VerticalHorizontal">
|
||||||
|
Vertical-Horizontal
|
||||||
|
{/* @ts-expect-error ts-migrate(2339) FIXME: Property 'Option' does not exist on type '({ class... Remove this comment to see the full error message */}
|
||||||
|
</Select.Option>
|
||||||
|
</Select>
|
||||||
|
</Section>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!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
|
// @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>
|
<Section>
|
||||||
<Select
|
<Select
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ const DEFAULT_OPTIONS = {
|
|||||||
coefficient: 1,
|
coefficient: 1,
|
||||||
piesort: true,
|
piesort: true,
|
||||||
color_scheme: "Redash",
|
color_scheme: "Redash",
|
||||||
|
lineShape: "linear",
|
||||||
|
|
||||||
// showDataLabels: false, // depends on chart type
|
// showDataLabels: false, // depends on chart type
|
||||||
numberFormat: "0,0[.]00000",
|
numberFormat: "0,0[.]00000",
|
||||||
|
|||||||
@@ -48,7 +48,6 @@
|
|||||||
"series": [
|
"series": [
|
||||||
{
|
{
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"offsetgroup": "0",
|
|
||||||
"type": "bar",
|
"type": "bar",
|
||||||
"name": "a",
|
"name": "a",
|
||||||
"x": ["x1", "x2", "x3", "x4"],
|
"x": ["x1", "x2", "x3", "x4"],
|
||||||
@@ -64,7 +63,6 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"offsetgroup": "1",
|
|
||||||
"type": "bar",
|
"type": "bar",
|
||||||
"name": "b",
|
"name": "b",
|
||||||
"x": ["x1", "x2", "x3", "x4"],
|
"x": ["x1", "x2", "x3", "x4"],
|
||||||
|
|||||||
@@ -48,7 +48,6 @@
|
|||||||
"series": [
|
"series": [
|
||||||
{
|
{
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"offsetgroup": "0",
|
|
||||||
"type": "bar",
|
"type": "bar",
|
||||||
"name": "a",
|
"name": "a",
|
||||||
"x": ["x1", "x2", "x3", "x4"],
|
"x": ["x1", "x2", "x3", "x4"],
|
||||||
@@ -64,7 +63,6 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"visible": true,
|
"visible": true,
|
||||||
"offsetgroup": "1",
|
|
||||||
"type": "bar",
|
"type": "bar",
|
||||||
"name": "b",
|
"name": "b",
|
||||||
"x": ["x1", "x2", "x3", "x4"],
|
"x": ["x1", "x2", "x3", "x4"],
|
||||||
|
|||||||
@@ -20,7 +20,8 @@
|
|||||||
"x": "x",
|
"x": "x",
|
||||||
"y1": "y"
|
"y1": "y"
|
||||||
},
|
},
|
||||||
"missingValuesAsZero": true
|
"missingValuesAsZero": true,
|
||||||
|
"lineShape": "linear"
|
||||||
},
|
},
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
@@ -46,6 +47,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "red" },
|
"marker": { "color": "red" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
|
|||||||
@@ -21,7 +21,8 @@
|
|||||||
"x": "x",
|
"x": "x",
|
||||||
"y1": "y"
|
"y1": "y"
|
||||||
},
|
},
|
||||||
"missingValuesAsZero": false
|
"missingValuesAsZero": false,
|
||||||
|
"lineShape": "linear"
|
||||||
},
|
},
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
@@ -54,6 +55,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "red" },
|
"marker": { "color": "red" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
@@ -68,6 +70,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["", "2 ± 0", "", "4 ± 0"],
|
"text": ["", "2 ± 0", "", "4 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "blue" },
|
"marker": { "color": "blue" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
|
|||||||
@@ -21,7 +21,8 @@
|
|||||||
"x": "x",
|
"x": "x",
|
||||||
"y1": "y"
|
"y1": "y"
|
||||||
},
|
},
|
||||||
"missingValuesAsZero": true
|
"missingValuesAsZero": true,
|
||||||
|
"lineShape": "linear"
|
||||||
},
|
},
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
@@ -54,6 +55,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "red" },
|
"marker": { "color": "red" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
@@ -68,6 +70,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["0", "2 ± 0", "0", "4 ± 0"],
|
"text": ["0", "2 ± 0", "0", "4 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "blue" },
|
"marker": { "color": "blue" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
|
|||||||
@@ -21,7 +21,8 @@
|
|||||||
"x": "x",
|
"x": "x",
|
||||||
"y1": "y"
|
"y1": "y"
|
||||||
},
|
},
|
||||||
"missingValuesAsZero": true
|
"missingValuesAsZero": true,
|
||||||
|
"lineShape": "linear"
|
||||||
},
|
},
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
@@ -56,6 +57,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["20% (10 ± 0)", "40% (20 ± 0)", "60% (30 ± 0)", "80% (40 ± 0)"],
|
"text": ["20% (10 ± 0)", "40% (20 ± 0)", "60% (30 ± 0)", "80% (40 ± 0)"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "red" },
|
"marker": { "color": "red" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
@@ -70,6 +72,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["80% (40 ± 0)", "60% (30 ± 0)", "40% (20 ± 0)", "20% (10 ± 0)"],
|
"text": ["80% (40 ± 0)", "60% (30 ± 0)", "40% (20 ± 0)", "20% (10 ± 0)"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "blue" },
|
"marker": { "color": "blue" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
|
|||||||
@@ -21,7 +21,8 @@
|
|||||||
"x": "x",
|
"x": "x",
|
||||||
"y1": "y"
|
"y1": "y"
|
||||||
},
|
},
|
||||||
"missingValuesAsZero": true
|
"missingValuesAsZero": true,
|
||||||
|
"lineShape": "linear"
|
||||||
},
|
},
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
@@ -56,6 +57,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["20% (10 ± 0)", "40% (20 ± 0)", "60% (30 ± 0)", "80% (40 ± 0)"],
|
"text": ["20% (10 ± 0)", "40% (20 ± 0)", "60% (30 ± 0)", "80% (40 ± 0)"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "red" },
|
"marker": { "color": "red" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
@@ -70,6 +72,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["80% (40 ± 0)", "60% (30 ± 0)", "40% (20 ± 0)", "20% (10 ± 0)"],
|
"text": ["80% (40 ± 0)", "60% (30 ± 0)", "40% (20 ± 0)", "20% (10 ± 0)"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "blue" },
|
"marker": { "color": "blue" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
|
|||||||
@@ -21,7 +21,8 @@
|
|||||||
"x": "x",
|
"x": "x",
|
||||||
"y1": "y"
|
"y1": "y"
|
||||||
},
|
},
|
||||||
"missingValuesAsZero": true
|
"missingValuesAsZero": true,
|
||||||
|
"lineShape": "linear"
|
||||||
},
|
},
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
@@ -56,6 +57,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
"text": ["10 ± 0", "20 ± 0", "30 ± 0", "40 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "red" },
|
"marker": { "color": "red" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
@@ -70,6 +72,7 @@
|
|||||||
"hoverinfo": "text+x+name",
|
"hoverinfo": "text+x+name",
|
||||||
"hover": [],
|
"hover": [],
|
||||||
"text": ["1 ± 0", "2 ± 0", "3 ± 0", "4 ± 0"],
|
"text": ["1 ± 0", "2 ± 0", "3 ± 0", "4 ± 0"],
|
||||||
|
"line": { "shape": "linear" },
|
||||||
"marker": { "color": "blue" },
|
"marker": { "color": "blue" },
|
||||||
"insidetextfont": { "color": "#ffffff" },
|
"insidetextfont": { "color": "#ffffff" },
|
||||||
"yaxis": "y"
|
"yaxis": "y"
|
||||||
|
|||||||
@@ -8,10 +8,30 @@ import updateAxes from "./updateAxes";
|
|||||||
import updateChartSize from "./updateChartSize";
|
import updateChartSize from "./updateChartSize";
|
||||||
import { prepareCustomChartData, createCustomChartRenderer } from "./customChartUtils";
|
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({
|
Plotly.setPlotConfig({
|
||||||
modeBarButtonsToRemove: ["sendDataToCloud"],
|
modeBarButtonsToRemove: ["sendDataToCloud"],
|
||||||
modeBarButtonsToAdd: ["togglespikelines", "v1hovermode"],
|
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,
|
locale: window.navigator.language,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,9 @@ function getHoverInfoPattern(options: any) {
|
|||||||
|
|
||||||
function prepareBarSeries(series: any, options: any, additionalOptions: any) {
|
function prepareBarSeries(series: any, options: any, additionalOptions: any) {
|
||||||
series.type = "bar";
|
series.type = "bar";
|
||||||
|
if (!options.series.stacking) {
|
||||||
series.offsetgroup = toString(additionalOptions.index);
|
series.offsetgroup = toString(additionalOptions.index);
|
||||||
|
}
|
||||||
if (options.showDataLabels) {
|
if (options.showDataLabels) {
|
||||||
series.textposition = "inside";
|
series.textposition = "inside";
|
||||||
} else {
|
} else {
|
||||||
@@ -37,11 +39,17 @@ function prepareBarSeries(series: any, options: any, additionalOptions: any) {
|
|||||||
|
|
||||||
function prepareLineSeries(series: any, options: any) {
|
function prepareLineSeries(series: any, options: any) {
|
||||||
series.mode = "lines" + (options.showDataLabels ? "+text" : "");
|
series.mode = "lines" + (options.showDataLabels ? "+text" : "");
|
||||||
|
series.line = {
|
||||||
|
shape: options.lineShape,
|
||||||
|
}
|
||||||
return series;
|
return series;
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareAreaSeries(series: any, options: any) {
|
function prepareAreaSeries(series: any, options: any) {
|
||||||
series.mode = "lines" + (options.showDataLabels ? "+text" : "");
|
series.mode = "lines" + (options.showDataLabels ? "+text" : "");
|
||||||
|
series.line = {
|
||||||
|
shape: options.lineShape,
|
||||||
|
}
|
||||||
series.fill = options.series.stacking ? "tonexty" : "tozeroy";
|
series.fill = options.series.stacking ? "tonexty" : "tozeroy";
|
||||||
return series;
|
return series;
|
||||||
}
|
}
|
||||||
@@ -94,7 +102,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 bubble/scatter charts `y` may be any (similar to `x`) - numeric is only bubble size;
|
||||||
// for other types `y` is always number
|
// for other types `y` is always number
|
||||||
const cleanYValue = includes(["bubble", "scatter"], seriesOptions.type)
|
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: any) => {
|
||||||
v = cleanNumber(v);
|
v = cleanNumber(v);
|
||||||
return options.missingValuesAsZero && isNil(v) ? 0.0 : v;
|
return options.missingValuesAsZero && isNil(v) ? 0.0 : v;
|
||||||
|
|||||||
@@ -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";
|
import getOptions from "./getOptions";
|
||||||
|
import Renderer from "./Renderer";
|
||||||
const DEFAULT_OPTIONS = {};
|
import Editor from "./Editor";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
type: "DETAILS",
|
type: "DETAILS",
|
||||||
name: "Details View",
|
name: "Details View",
|
||||||
getOptions: (options: any) => ({
|
getOptions,
|
||||||
...DEFAULT_OPTIONS,
|
Renderer,
|
||||||
...options,
|
Editor,
|
||||||
}),
|
|
||||||
Renderer: DetailsRenderer,
|
|
||||||
defaultColumns: 4,
|
defaultColumns: 4,
|
||||||
defaultRows: 2,
|
defaultRows: 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