diff --git a/circle.yml b/circle.yml
index a570c7ca303fe4ef7f6e1d541642539b3852feaa..42dfbb60e542d70d1f534ac92abe1c4ebbafde7f 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,7 +5,7 @@ machine:
version:
openjdk7
node:
- version: 8.4.0
+ version: 6.7.0
services:
- docker
dependencies:
diff --git a/docs/operations-guide/running-metabase-on-debian.md b/docs/operations-guide/running-metabase-on-debian.md
new file mode 100644
index 0000000000000000000000000000000000000000..2fa2a4ac96115a488caebd2773597b6ad6b6008c
--- /dev/null
+++ b/docs/operations-guide/running-metabase-on-debian.md
@@ -0,0 +1,193 @@
+# Running Metabase on Debian as a service with nginx
+
+For those people who don't (or can't) use Docker in their infrastructure, there's still a need to easily setup and deploy Metabase in production. On Debian-based systems, this means registering Metabase as a service that can be started/stopped/uninstalled.
+
+**Note:** This is just a *bare-bones recipe* to get you started. Anyone can take it from here to do what they need to do on their systems, and should follow best practices for setting up and securing the rest of their server.
+
+#### Assumptions
+
+The core assumption in this guide:
+
+* You will run Metabase using the `metabase.jar` file
+* You already have `nginx` and `postgres` (or another supported database) running on your server
+* You will use environment variables to configure your Metabase instance
+* You have `sudo` access on your server
+
+### Create a Metabase Service
+
+Every service needs a script that tells `systemd` how to manage it, and what capabilities it supports. Services are typically registered at `etc/init.d/<service-name>`. So, a Metabase service should live at `/etc/init.d/metabase`.
+
+#### The Metabase service file
+
+Create the `/etc/init.d/metabase` service file and open it in your editor:
+
+ $ sudo touch /etc/init.d/metabase
+ $ sudo <your-editor> /etc/init.d/metabase
+
+In `/etc/init.d/metabase`, replace configurable items (they look like `<some-var-name>`) with values sensible for your system. The Metabase script below has extra comments to help you know what everything is for.
+
+
+ #!/bin/sh
+ # /etc/init.d/metabase
+ ### BEGIN INIT INFO
+ # Provides: Metabase
+ # Required-Start: $local_fs $network $named $time $syslog
+ # Required-Stop: $local_fs $network $named $time $syslog
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Description: Metabase analytics and intelligence platform
+ ### END INIT INFO
+
+ # where is the Metabase jar located?
+ METABASE=</your/path/to/>metabase.jar
+
+ # where will our environment variables be stored?
+ METABASE_CONFIG=/etc/default/metabase
+
+ # which (unprivileged) user should we run Metabase as?
+ RUNAS=<your_deploy_user>
+
+ # where should we store the pid/log files?
+ PIDFILE=/var/run/metabase.pid
+ LOGFILE=/var/log/metabase.log
+
+ start() {
+ # ensure we only run 1 Metabase instance
+ if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE"); then
+ echo 'Metabase already running' >&2
+ return 1
+ fi
+ echo 'Starting Metabase...' >&2
+ # execute the Metabase jar and send output to our log
+ local CMD="nohup java -jar \"$METABASE\" &> \"$LOGFILE\" & echo \$!"
+ # load Metabase config before we start so our env vars are available
+ . "$METABASE_CONFIG"
+ # run our Metabase cmd as unprivileged user
+ su -c "$CMD" $RUNAS > "$PIDFILE"
+ echo 'Metabase started.' >&2
+ }
+
+ stop() {
+ # ensure Metabase is running
+ if [ ! -f "$PIDFILE" ] || ! kill -0 $(cat "$PIDFILE"); then
+ echo 'Metabase not running' >&2
+ return 1
+ fi
+ echo 'Stopping Metabase ...' >&2
+ # send Metabase TERM signal
+ kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
+ echo 'Metabase stopped.' >&2
+ }
+
+ uninstall() {
+ echo -n "Are you really sure you want to uninstall Metabase? That cannot be undone. [yes|No] "
+ local SURE
+ read SURE
+ if [ "$SURE" = "yes" ]; then
+ stop
+ rm -f "$PIDFILE"
+ rm -f "$METABASE_CONFIG"
+ # keep logfile around
+ echo "Notice: log file is not be removed: '$LOGFILE'" >&2
+ update-rc.d -f metabase remove
+ rm -fv "$0"
+ fi
+ }
+
+ case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ uninstall)
+ uninstall
+ ;;
+ retart)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|uninstall}"
+ esac
+
+
+### Environment Variables for Metabase
+
+Environment variables provide a good way to customize and configure your Metabase instance on your server. On Debian systems, services typically expect to have accompanying configs inside `etc/default/<service-name>`.
+
+#### The Metabase config file
+
+Create your `/etc/default/metabase` environment config file and open it in your editor:
+
+ $ sudo touch /etc/default/metabase
+ $ sudo <your-editor> /etc/default/metabase
+
+In `/etc/default/metabase`, replace configurable items (they look like `<some-var-name>`) with values sensible for your system. Some Metabase configs have available options, some of which are shown below, separated by `|` symbols:
+
+
+ #!/bin/sh
+ # /etc/default/metabase
+ export MB_PASSWORD_COMPLEXITY=<weak|normal|strong>
+ export MB_PASSWORD_LENGTH=<10>
+ export MB_JETTY_HOST=<0.0.0.0>
+ export MB_JETTY_PORT=<12345>
+ export MB_DB_TYPE=<postgres|mysql|h2>
+ export MB_DB_DBNAME=<your_metabase_db_name>
+ export MB_DB_PORT=<5432>
+ export MB_DB_USER=<your_metabase_db_user>
+ export MB_DB_PASS=<ssshhhh>
+ export MB_DB_HOST=<localhost>
+ export MB_EMOJI_IN_LOGS=<true|false>
+ # any other env vars you want available to Metabase
+
+### Final Steps
+
+The best part of setting up Metabase as a service on a Debian-based system is to be confident it will start up at every system boot. We only have a few more quick steps to finish registering our service and having Metabase up and running.
+
+#### Ensure your database is ready
+
+If you're running `postgres` or some other database, you need to ensure you've already followed the instructions for your database system to create a database for Metabase, as well as a user that can access that database. These values should match what you've set in your Metabase config for the `MB_DB_TYPE`, `MB_DB_DBNAME`, `MB_DB_USER`, and `MB_DB_PASS` environment variables. If you don't have your database properly configured, Metabase won't be able to start.
+
+#### Ensure `nginx` is setup to proxy requests to Metabase
+
+Getting into too much detail about configuring `nginx` is well outside the scope of this guide, but here's a quick `nginx.conf` file that will get you up and running.
+
+**Note:** The `nginx.conf` below assumes you are accepting incoming traffic on port 80 and want to proxy requests to Metabase, and that your Metabase instance is configured to run on `localhost` at port `3000`. There are several proxy directives you may care about, so you should check those out further in the [Official `nginx` docs](https://nginx.org/en/docs/).
+
+ # sample nginx.conf
+ # proxy requests to Metabase instance
+ server {
+ listen 80;
+ listen [::]:80;
+ server_name your.domain.com;
+ location / {
+ proxy_pass http://127.0.0.1:3000;
+ }
+ }
+
+#### Register your Metabase service
+
+Now, it's time to register our Metabase service with `systemd` so it will start up at system boot. We'll also ensure our log file is created and owned by the unprivileged user our service runs the `metabase.jar` as.
+
+ # ensure our metabase script is executable
+ $ sudo chmod +x /etc/init.d/metabase
+
+ # create the log file we declared in /etc/init.d/metabase
+ $ sudo touch /var/log/metabase.log
+
+ # ensure unprivileged deploy user owns log (or it won't be able to write)
+ $ sudo chown <your_deploy_user>:<your_deploy_user> /var/log/metabase.log
+
+ # add to default services
+ $ sudo update-rc.d metabase defaults
+
+#### That's it!
+
+Now, whenever you need to start, stop, or restart Metabase, all you need to do is:
+
+ $ sudo service metabase start
+ $ sudo service metabase stop
+ $ sudo service metabase restart
+
diff --git a/docs/operations-guide/start.md b/docs/operations-guide/start.md
index aa620b8a18b8d3acdbe0a125c9cd78764947d0e8..074a9ae52a203d444260ad549691ec5f05d4be40 100644
--- a/docs/operations-guide/start.md
+++ b/docs/operations-guide/start.md
@@ -26,9 +26,6 @@ Metabase provides a binary Mac OS X application for users who are interested in
#### [Running on Docker](running-metabase-on-docker.md)
If you are using Docker containers and prefer to manage your Metabase installation that way then we've got you covered. This guide discusses how to use the Metabase Docker image to launch a container running Metabase.
-
-
-
### Cloud Platforms
#### [Running on AWS Elastic Beanstalk](running-metabase-on-elastic-beanstalk.md)
@@ -40,6 +37,9 @@ Currently in beta. We've run Metabase on Heroku and it works just fine, but it'
#### [Running on Cloud66](running-metabase-on-cloud66.md)
Community support only at this time, but we have reports of Metabase instances running on Cloud66!
+#### [Running on Debian as a service](running-metabase-on-debian.md)
+Community support only at this time, but learn how to deploy Metabase as a service on Debian (and Debian-based) systems. Simple, guided, step-by-step approach that will work on any VPS.
+
# Upgrading Metabase
Before you attempt to upgrade Metabase, you should make a backup of the application database just in case. While it is unlikely you will need to roll back, it will do wonders for your peace of mind.
diff --git a/docs/users-guide/13-sql-parameters.md b/docs/users-guide/13-sql-parameters.md
index b2824bea8465eef2314698f9c4f32ae3db5171c6..bc36b96f8a3541764434a35e0fc3ddd193f19cb1 100644
--- a/docs/users-guide/13-sql-parameters.md
+++ b/docs/users-guide/13-sql-parameters.md
@@ -20,8 +20,10 @@ FROM products
WHERE category = {% raw %}{{cat}}{% endraw %}
```
-#### The `Field filter` variable type
-Giving a variable the `Field filter` type allows you to connect SQL cards to dashboard filter widgets. A field filter variable inserts SQL similar to that generated by the GUI query builder when adding filters on existing columns. This is useful because it lets you do things like insert dynamic date range filters into your native query. When adding a field filter, you should link that variable to a specific column. Field filter variables should be used inside of a `WHERE` clause.
+#### The Field Filter variable type
+Setting a variable to the `field filter` type allows you to map it to a field in any table in the current database, and lets you display a dropdown filter widget filled with the values of the field you connected it to. Field filter variables also allow you to connect your SQL question to a dashboard filter if you put it in a dashboard.
+
+A field filter variable inserts SQL similar to that generated by the GUI query builder when adding filters on existing columns. This is useful because it lets you do things like insert dynamic date range filters into your native query. When adding a field filter, you should link that variable to a specific column. Field filter variables should be used inside of a `WHERE` clause.
Example:
@@ -31,6 +33,41 @@ FROM products
WHERE {% raw %}{{created_at}}{% endraw %}
```
+##### Creating SQL question filters using field filter variables
+First, insert a variable tag in your SQL, like `{{my_var}}`. Then, in the side panel, select the `Field Filter` variable type, and choose which field to map your variable to. In order to display a filter widget, you'll have to choose a field whose Type in the Data Model section of the Admin Panel is one of the following:
+- Category
+- City
+- Entity Key
+- Entity Name
+- Foreign Key
+- State
+- UNIX Timestamp (Seconds)
+- UNIX Timestamp (Milliseconds)
+- ZIP or Postal Code
+The field can also be a datetime one (which can be left as `No special type` in the Data Model).
+
+You'll then see a dropdown labeled `Widget`, which will let you choose the kind of filter widget you want on your question, which is especially useful for datetime fields (you can select `None` if you don't want a widget at all). **Note:** If you're not seeing the option to display a filter widget, make sure the mapped field is set to one of the above types, and then try manually syncing your database from the Databases section of the Admin Panel to force Metabase to scan and cache the field's values.
+
+Filter widgets **can't** be displayed if the variable is mapped to a field marked as:
+- Avatar Image URL
+- Description
+- Email
+- Enum
+- Field containing JSON
+- Image URL
+- Number
+- Latitude
+- Longitude
+- URL
+
+##### Setting a default value
+If you input a default value for your field filter, this value will be selected in the filter whenever you come back to this question. If you clear out the filter, though, no value will be passed (i.e., not even the default value). The default value has no effect on the behavior of your SQL question when viewed in a dashboard.
+
+##### Connecting a SQL question to a dashboard filter
+In order for a saved SQL question to be usable with a dashboard filter, it must contain at least one field filter. The kind of dashboard filter that can be used with the SQL question depends on the field that you map to the question's field filter(s). For example, if you have a field filter called `{{var}}` and you map it to a State field, you can map a Location dashboard filter to your SQL question. In this example, you'd create a new dashboard or go to an existing one, click the Edit button, and the SQL question that contains your State field filter, add a new dashboard filter or edit an existing Location filter, then click the dropdown on the SQL question card to see the State field filter. [Learn more about dashboard filters here](08-dashboard-filters.md).
+
+
+
### Optional Clauses
To make an optional clause in your native query, type `[[brackets around a {% raw %}{{variable}}{% endraw %}]]`. If `variable` is given a value, then the entire clause is placed into the template. If not, then the entire clause is ignored.
@@ -58,4 +95,3 @@ WHERE True
## That’s it!
If you still have questions, or want to share Metabase tips and tricks, head over to our [discussion board](http://discourse.metabase.com/). See you there!
-
diff --git a/docs/users-guide/images/sql-parameters/state-field-filter.png b/docs/users-guide/images/sql-parameters/state-field-filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d8c7ccc6dacb3b7fe1c82ecff0d87150834994c
Binary files /dev/null and b/docs/users-guide/images/sql-parameters/state-field-filter.png differ
diff --git a/frontend/src/metabase-lib/lib/Mode.js b/frontend/src/metabase-lib/lib/Mode.js
index 3560bc40b899c095684ec3679b0edde0a97c036d..385a5ffba4befdf3fb0a280b6fef48c0b13680db 100644
--- a/frontend/src/metabase-lib/lib/Mode.js
+++ b/frontend/src/metabase-lib/lib/Mode.js
@@ -39,17 +39,17 @@ export default class Mode {
return this._queryMode.name;
}
- actions(): ClickAction[] {
+ actions(settings): ClickAction[] {
return _.flatten(
this._queryMode.actions.map(actionCreator =>
- actionCreator({ question: this._question }))
+ actionCreator({ question: this._question, settings }))
);
}
- actionsForClick(clicked: ?ClickObject): ClickAction[] {
+ actionsForClick(clicked: ?ClickObject, settings): ClickAction[] {
return _.flatten(
this._queryMode.drills.map(actionCreator =>
- actionCreator({ question: this._question, clicked }))
+ actionCreator({ question: this._question, settings, clicked }))
);
}
}
diff --git a/frontend/src/metabase/admin/settings/components/SettingsXrayForm.jsx b/frontend/src/metabase/admin/settings/components/SettingsXrayForm.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..6675349c9d31158b933f9e8ca7be8522f81886df
--- /dev/null
+++ b/frontend/src/metabase/admin/settings/components/SettingsXrayForm.jsx
@@ -0,0 +1,69 @@
+import React from 'react'
+import SettingsSetting from 'metabase/admin/settings/components/SettingsSetting'
+import cx from 'classnames'
+
+import Icon from 'metabase/components/Icon'
+
+import COSTS from 'metabase/xray/costs'
+
+const SettingsXrayForm = ({ settings, elements, updateSetting }) => {
+ let maxCost = Object.assign({}, ...elements.filter(e => e.key === 'xray-max-cost',))
+ const enabled = Object.assign({}, ...elements.filter(e => e.key === 'enable-xrays',))
+
+ // handle the current behavior of the default
+ if(maxCost.value == null) {
+ maxCost.value = 'extended'
+ }
+
+ return (
+ <div>
+ <div className="mx2">
+ <h2>X-Rays and Comparisons</h2>
+ </div>
+
+ <ol className="mt4">
+ <SettingsSetting
+ key={enabled.key}
+ setting={enabled}
+ updateSetting={(value) => updateSetting(enabled, value)}
+ />
+ </ol>
+
+ <div className="mx2 text-measure">
+ <h3>Maximum Cost</h3>
+ <p className="m0 text-paragraph">
+ If you're having performance issues related to x-ray usage you can cap how expensive x-rays are allowed to be.
+ </p>
+ <ol className="mt4">
+ { Object.keys(COSTS).map(key => {
+ const cost = COSTS[key]
+ return (
+ <li
+ className={cx(
+ 'flex align-center mb2 cursor-pointer text-brand-hover',
+ { 'text-brand' : maxCost.value === key }
+ )}
+ key={key}
+ onClick={() => updateSetting(maxCost, key)}
+ >
+ <Icon
+ className="flex-no-shrink"
+ name={cost.icon}
+ size={24}
+ />
+ <div className="ml2">
+ <h4>{cost.display_name}</h4>
+ <p className="m0 text-paragraph">
+ {cost.description}
+ </p>
+ </div>
+ </li>
+ )
+ })}
+ </ol>
+ </div>
+ </div>
+ )
+}
+
+export default SettingsXrayForm
diff --git a/frontend/src/metabase/admin/settings/containers/SettingsEditorApp.jsx b/frontend/src/metabase/admin/settings/containers/SettingsEditorApp.jsx
index 1ca126d97073360adb479a6ba36f8f24f2e07e42..d0e636b56d8a1bfff8fecadbbcdb68da90ebd8a2 100644
--- a/frontend/src/metabase/admin/settings/containers/SettingsEditorApp.jsx
+++ b/frontend/src/metabase/admin/settings/containers/SettingsEditorApp.jsx
@@ -16,6 +16,7 @@ import SettingsSetupList from "../components/SettingsSetupList.jsx";
import SettingsUpdatesForm from "../components/SettingsUpdatesForm.jsx";
import SettingsSingleSignOnForm from "../components/SettingsSingleSignOnForm.jsx";
import SettingsAuthenticationOptions from "../components/SettingsAuthenticationOptions.jsx";
+import SettingsXrayForm from "../components/SettingsXrayForm.jsx";
import { prepareAnalyticsValue } from 'metabase/admin/settings/utils'
@@ -165,6 +166,14 @@ export default class SettingsEditorApp extends Component {
} else {
return (<SettingsAuthenticationOptions />)
}
+ } else if (activeSection.name === "X-Rays") {
+ return (
+ <SettingsXrayForm
+ settings={this.props.settings}
+ elements={activeSection.settings}
+ updateSetting={this.updateSetting.bind(this)}
+ />
+ )
} else {
return (
<ul>
diff --git a/frontend/src/metabase/admin/settings/selectors.js b/frontend/src/metabase/admin/settings/selectors.js
index c44aceaa723f71ea959f17a6266a65b9e44f979b..bfd342f465af8aed9b5329661ea794b1d9887668 100644
--- a/frontend/src/metabase/admin/settings/selectors.js
+++ b/frontend/src/metabase/admin/settings/selectors.js
@@ -365,6 +365,23 @@ const SECTIONS = [
allowValueCollection: true
}
]
+ },
+ {
+ name: "X-Rays",
+ settings: [
+ {
+ key: "enable-xrays",
+ display_name: "Enable X-Rays",
+ type: "boolean",
+ allowValueCollection: true
+ },
+ {
+ key: "xray-max-cost",
+ type: "string",
+ allowValueCollection: true
+
+ }
+ ]
}
];
for (const section of SECTIONS) {
diff --git a/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx b/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx
index d89b9d9f227d834b0cc7fa2a4717eca42306ac72..840d1a03e8f7cc3f10c6b77e7b4eb84c2341b222 100644
--- a/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx
+++ b/frontend/src/metabase/components/LoadingAndErrorWrapper.jsx
@@ -7,15 +7,24 @@ import LoadingSpinner from "metabase/components/LoadingSpinner.jsx";
import cx from "classnames";
export default class LoadingAndErrorWrapper extends Component {
+
+ state = {
+ messageIndex: 0,
+ sceneIndex: 0,
+ }
+
static propTypes = {
- className: PropTypes.string,
- error: PropTypes.any,
- loading: PropTypes.any,
- noBackground: PropTypes.bool,
- noWrapper: PropTypes.bool,
- children: PropTypes.any,
- style: PropTypes.object,
- showSpinner: PropTypes.bool
+ className: PropTypes.string,
+ error: PropTypes.any,
+ loading: PropTypes.any,
+ noBackground: PropTypes.bool,
+ noWrapper: PropTypes.bool,
+ children: PropTypes.any,
+ style: PropTypes.object,
+ showSpinner: PropTypes.bool,
+ loadingMessages: PropTypes.array,
+ messageInterval: PropTypes.number,
+ loadingScenes: PropTypes.array
};
static defaultProps = {
@@ -24,7 +33,9 @@ export default class LoadingAndErrorWrapper extends Component {
loading: false,
noBackground: false,
noWrapper: false,
- showSpinner: true
+ showSpinner: true,
+ loadingMessages: ['Loading...'],
+ messageInterval: 6000,
};
getErrorMessage() {
@@ -38,6 +49,29 @@ export default class LoadingAndErrorWrapper extends Component {
);
}
+ componentDidMount () {
+ const { loadingMessages, messageInterval } = this.props;
+ // only start cycling if multiple messages are provided
+ if(loadingMessages.length > 1) {
+ this.cycle = setInterval(this.loadingInterval, messageInterval)
+ }
+ }
+
+ componentWillUnmount () {
+ clearInterval(this.cycle)
+ }
+
+ loadingInterval = () => {
+ this.cycleLoadingMessage()
+ if(this.props.loadingScenes) {
+ this.cycleLoadingScenes()
+ }
+ }
+
+ cycleLoadingScenes = () => {
+
+ }
+
getChildren() {
function resolveChild(child) {
if (Array.isArray(child)) {
@@ -51,11 +85,41 @@ export default class LoadingAndErrorWrapper extends Component {
return resolveChild(this.props.children);
}
+ cycleLoadingMessage = () => {
+ this.setState({
+ messageIndex: this.state.messageIndex + 1 < this.props.loadingMessages.length -1
+ ? this.state.messageIndex + 1
+ : 0
+
+ })
+ }
+
+ cycleLoadingScenes = () => {
+ this.setState({
+ sceneIndex: this.state.sceneIndex + 1 < this.props.loadingScenes.length -1
+ ? this.state.sceneIndex + 1
+ : 0
+ })
+ }
+
render() {
- const { loading, error, noBackground, noWrapper, showSpinner } = this.props;
- const contentClassName = cx("wrapper py4 text-brand text-centered flex-full flex flex-column layout-centered", {
- "bg-white": !noBackground
- });
+ const {
+ loading,
+ error,
+ noBackground,
+ noWrapper,
+ showSpinner,
+ loadingMessages,
+ loadingScenes
+ } = this.props;
+
+ const { messageIndex, sceneIndex } = this.state;
+
+ const contentClassName = cx(
+ "wrapper py4 text-brand text-centered flex-full flex flex-column layout-centered",
+ { "bg-white": !noBackground }
+ );
+
if (noWrapper && !error && !loading) {
return React.Children.only(this.getChildren());
}
@@ -66,10 +130,12 @@ export default class LoadingAndErrorWrapper extends Component {
<h2 className="text-normal text-grey-2 ie-wrap-content-fix">{this.getErrorMessage()}</h2>
</div>
: loading ?
- showSpinner &&
<div className={contentClassName}>
- <LoadingSpinner />
- <h2 className="text-normal text-grey-2 mt1">Loading...</h2>
+ { loadingScenes && loadingScenes[sceneIndex] }
+ { !loadingScenes && showSpinner && <LoadingSpinner /> }
+ <h2 className="text-normal text-grey-2 mt1">
+ {loadingMessages[messageIndex]}
+ </h2>
</div>
:
diff --git a/frontend/src/metabase/css/core/base.css b/frontend/src/metabase/css/core/base.css
index bc19008d1e96161ddebe4eb394d30987483a7059..50633810bb8846ec366881b4abc6cb5e193c137e 100644
--- a/frontend/src/metabase/css/core/base.css
+++ b/frontend/src/metabase/css/core/base.css
@@ -77,3 +77,12 @@ textarea {
.undefined {
border: 1px solid red !important;
}
+
+@keyframes spin {
+ 100% { transform: rotate(360deg); }
+}
+
+@keyframes spin-reverse {
+ 100% { transform: rotate(-360deg); }
+}
+
diff --git a/frontend/src/metabase/css/core/link.css b/frontend/src/metabase/css/core/link.css
index 53a073b2989fcf7f456374fff4e8048ee5648e82..7618593680c342f625c93a7d2f242def97b707ce 100644
--- a/frontend/src/metabase/css/core/link.css
+++ b/frontend/src/metabase/css/core/link.css
@@ -17,6 +17,9 @@
.link--nohover:hover {
text-decoration: none;
}
+.link--wrappable {
+ word-break: break-all;
+}
.expand-clickable {
display: inline-block;
diff --git a/frontend/src/metabase/dashboard/selectors.js b/frontend/src/metabase/dashboard/selectors.js
index 680cd0bea51db64e0b328cc26289f0c3f16d3075..e74666a5f889ddcee7bf93a85c1626857caf8db8 100644
--- a/frontend/src/metabase/dashboard/selectors.js
+++ b/frontend/src/metabase/dashboard/selectors.js
@@ -161,7 +161,7 @@ export const getParameters = createSelector(
.value();
return {
...parameter,
- field_id: fieldIds.length === 1 ? fieldIds[0] : null
+ field_ids: fieldIds
}
})
)
diff --git a/frontend/src/metabase/dashboards/components/DashboardList.jsx b/frontend/src/metabase/dashboards/components/DashboardList.jsx
index 7e8ab788f08034e4386b39ef10369fdb71d97fa9..12b26bc32713a0603ca2de62b63f01400e181843 100644
--- a/frontend/src/metabase/dashboards/components/DashboardList.jsx
+++ b/frontend/src/metabase/dashboards/components/DashboardList.jsx
@@ -20,7 +20,7 @@ type DashboardListItemProps = {
setArchived: (dashId: number, archived: boolean) => void
}
-class DashboardListItem extends Component {
+export class DashboardListItem extends Component {
props: DashboardListItemProps
state = {
diff --git a/frontend/src/metabase/lib/formatting.js b/frontend/src/metabase/lib/formatting.js
index 7f409d705c976a7423c0650e25ad438e6145a4f6..245a18ecf467855b31051ee5cc25155863dd36c0 100644
--- a/frontend/src/metabase/lib/formatting.js
+++ b/frontend/src/metabase/lib/formatting.js
@@ -209,7 +209,7 @@ const URL_WHITELIST_REGEX = /^(https?|mailto):\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:
export function formatUrl(value: Value, { jsx }: FormattingOptions = {}) {
const url = String(value);
if (jsx && URL_WHITELIST_REGEX.test(url)) {
- return <ExternalLink href={url}>{url}</ExternalLink>;
+ return <ExternalLink className="link link--wrappable" href={url}>{url}</ExternalLink>;
} else {
return url;
}
diff --git a/frontend/src/metabase/meta/types/Card.js b/frontend/src/metabase/meta/types/Card.js
index 104f0a00681fb477868ce7e117454036c36d7a3a..97fef51e191b924f23575f58e5a1a8d002e770f5 100644
--- a/frontend/src/metabase/meta/types/Card.js
+++ b/frontend/src/metabase/meta/types/Card.js
@@ -31,7 +31,7 @@ export type Card = {
public_uuid: string,
// Not part of the card API contract, a field used by query builder for showing lineage
- original_card_id?: CardId
+ original_card_id?: CardId,
};
export type StructuredDatasetQuery = {
diff --git a/frontend/src/metabase/meta/types/Visualization.js b/frontend/src/metabase/meta/types/Visualization.js
index 8effdb1ec7266ff58b5f2a844680ba73ebedb175..e56f6bbe58b40bbf09c64bb62df174698df4efd7 100644
--- a/frontend/src/metabase/meta/types/Visualization.js
+++ b/frontend/src/metabase/meta/types/Visualization.js
@@ -50,7 +50,11 @@ export type ClickAction = {
export type ClickActionProps = {
question: Question,
- clicked?: ClickObject
+ clicked?: ClickObject,
+ settings: {
+ 'enable_xrays': boolean,
+ 'xray_max_cost': string
+ }
}
export type OnChangeCardAndRun = ({ nextCard: Card, previousCard?: ?Card }) => void
diff --git a/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx b/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx
index e96e4560c64a3d34d27609a55a3c47fa42637f7a..db204bdbfd1ea084d4a32e4fc9de5b9da969afd4 100644
--- a/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx
+++ b/frontend/src/metabase/new_query/containers/NewQueryOptions.jsx
@@ -105,9 +105,9 @@ export class NewQueryOptions extends Component {
}
render() {
- const { query, metadataFetched, isAdmin, metricSearchUrl, segmentSearchUrl } = this.props
- const { showMetricOption, showSegmentOption, showSQLOption } = this.state
- const showCustomInsteadOfNewQuestionText = showMetricOption || showSegmentOption
+ const { query, metadataFetched, isAdmin, metricSearchUrl } = this.props
+ const { showMetricOption, showSQLOption } = this.state
+ const showCustomInsteadOfNewQuestionText = showMetricOption
if (!query || (!isAdmin && (!metadataFetched.metrics || !metadataFetched.segments))) {
return <LoadingAndErrorWrapper loading={true}/>
@@ -117,7 +117,7 @@ export class NewQueryOptions extends Component {
<div className="full-height flex">
<div className="wrapper wrapper--trim lg-wrapper--trim xl-wrapper--trim flex-full px1 mt4 mb2 align-center">
<div className="flex align-center justify-center" style={{minHeight: "100%"}}>
- <ol className="flex-full Grid Grid--guttersXl Grid--full small-Grid--1of2 large-Grid--normal">
+ <ol className="flex-full Grid Grid--guttersXl Grid--full sm-Grid--normal">
{ showMetricOption &&
<li className="Grid-cell">
<NewQueryOption
@@ -128,17 +128,6 @@ export class NewQueryOptions extends Component {
/>
</li>
}
- { showSegmentOption &&
- <li className="Grid-cell">
- <NewQueryOption
- image="/app/img/list_illustration"
- title="Segments"
- description="Explore tables and see what’s going on underneath your charts."
- width={180}
- to={segmentSearchUrl}
- />
- </li>
- }
<li className="Grid-cell">
{/*TODO: Move illustrations to the new location in file hierarchy. At the same time put an end to the equal-size-@2x ridicule. */}
<NewQueryOption
diff --git a/frontend/src/metabase/new_query/containers/SegmentSearch.jsx b/frontend/src/metabase/new_query/containers/SegmentSearch.jsx
deleted file mode 100644
index 52751b8b04785f9b2c165853086141b9cd8e9a9a..0000000000000000000000000000000000000000
--- a/frontend/src/metabase/new_query/containers/SegmentSearch.jsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
-import _ from 'underscore'
-
-import { fetchDatabases, fetchSegments } from "metabase/redux/metadata";
-import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper";
-import EntitySearch from "metabase/containers/EntitySearch";
-import { getMetadata, getMetadataFetched } from "metabase/selectors/metadata";
-
-import Metadata from "metabase-lib/lib/metadata/Metadata";
-import type { Segment } from "metabase/meta/types/Segment";
-import EmptyState from "metabase/components/EmptyState";
-
-import type { StructuredQuery } from "metabase/meta/types/Query";
-import { getCurrentQuery } from "metabase/new_query/selectors";
-import { resetQuery } from '../new_query'
-
-const mapStateToProps = state => ({
- query: getCurrentQuery(state),
- metadata: getMetadata(state),
- metadataFetched: getMetadataFetched(state)
-})
-const mapDispatchToProps = {
- fetchSegments,
- fetchDatabases,
- resetQuery
-}
-
-@connect(mapStateToProps, mapDispatchToProps)
-export default class SegmentSearch extends Component {
- props: {
- getUrlForQuery: (StructuredQuery) => void,
- backButtonUrl: string,
-
- query: StructuredQuery,
- metadata: Metadata,
- metadataFetched: any,
- fetchSegments: () => void,
- fetchDatabases: () => void,
- resetQuery: () => void
- }
-
- componentDidMount() {
- this.props.fetchDatabases() // load databases if not loaded yet
- this.props.fetchSegments(true) // segments may change more often so always reload them
- this.props.resetQuery();
- }
-
- getUrlForSegment = (segment: Segment) => {
- const updatedQuery = this.props.query
- .setDatabase(segment.table.database)
- .setTable(segment.table)
- .addFilter(segment.filterClause())
-
- return this.props.getUrlForQuery(updatedQuery);
- }
-
- render() {
- const { backButtonUrl, metadataFetched, metadata } = this.props;
-
- const isLoading = !metadataFetched.segments || !metadataFetched.databases
-
- return (
- <LoadingAndErrorWrapper loading={isLoading}>
- {() => {
- // TODO Atte Keinänen 8/22/17: If you call `/api/table/:id/table_metadata` it returns
- // all segments (also retired ones) and they are missing both `is_active` and `creator` props. Currently this
- // filters them out but we should definitely update the endpoints in the upcoming metadata API refactoring.
- const sortedActiveSegments = _.chain(metadata.segmentsList())
- // Segment shouldn't be retired and it should refer to an existing table
- .filter((segment) => segment.isActive() && segment.table)
- .sortBy(({name}) => name.toLowerCase())
- .value()
-
- if (sortedActiveSegments.length > 0) {
- return <EntitySearch
- title="Which segment?"
- entities={sortedActiveSegments}
- getUrlForEntity={this.getUrlForSegment}
- backButtonUrl={backButtonUrl}
- />
- } else {
- return (
- <div className="mt2 flex-full flex align-center justify-center">
- <EmptyState
- message={<span>Defining common segments for your team makes it even easier to ask questions</span>}
- image="/app/img/segments_illustration"
- action="How to create segments"
- link="http://www.metabase.com/docs/latest/administration-guide/07-segments-and-metrics.html"
- className="mt2"
- imageClassName="mln2"
- />
- </div>
- )
- }
- }}
- </LoadingAndErrorWrapper>
- )
- }
-
-}
-
diff --git a/frontend/src/metabase/new_query/router_wrappers.js b/frontend/src/metabase/new_query/router_wrappers.js
index 922717de1384d8b9df6fd412f1929b0e0fe8ef26..3176c08daae86addc35488922992b0206dc9fe4d 100644
--- a/frontend/src/metabase/new_query/router_wrappers.js
+++ b/frontend/src/metabase/new_query/router_wrappers.js
@@ -5,7 +5,6 @@ import { push } from "react-router-redux";
import { withBackground } from 'metabase/hoc/Background'
import NewQueryOptions from "./containers/NewQueryOptions";
-import SegmentSearch from "./containers/SegmentSearch";
import MetricSearch from "./containers/MetricSearch";
@connect(null, { onChangeLocation: push })
@@ -42,20 +41,3 @@ export class NewQuestionMetricSearch extends Component {
)
}
}
-
-@connect(null, { onChangeLocation: push })
-@withBackground('bg-slate-extra-light')
-export class NewQuestionSegmentSearch extends Component {
- getUrlForQuery = (query) => {
- return query.question().getUrl()
- }
-
- render() {
- return (
- <SegmentSearch
- getUrlForQuery={this.getUrlForQuery}
- backButtonUrl="/question/new"
- />
- )
- }
-}
diff --git a/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx b/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx
index 8ab0733679ce63b76cc13566999d748c895947b6..19a9d0efac7a601c15216e4220ec53dcfa9b7415 100644
--- a/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx
+++ b/frontend/src/metabase/parameters/components/ParameterValueWidget.jsx
@@ -31,17 +31,21 @@ const DATE_WIDGETS = {
}
import { fetchFieldValues } from "metabase/redux/metadata";
-import { getParameterFieldValues } from "metabase/selectors/metadata";
-
-const mapStateToProps = (state, props) => ({
- values: getParameterFieldValues(state, props),
-})
+import { makeGetMergedParameterFieldValues } from "metabase/selectors/metadata";
+
+const makeMapStateToProps = () => {
+ const getMergedParameterFieldValues = makeGetMergedParameterFieldValues();
+ const mapStateToProps = (state, props) => ({
+ values: getMergedParameterFieldValues(state, props),
+ })
+ return mapStateToProps;
+}
const mapDispatchToProps = {
fetchFieldValues
}
-@connect(mapStateToProps, mapDispatchToProps)
+@connect(makeMapStateToProps, mapDispatchToProps)
export default class ParameterValueWidget extends Component {
static propTypes = {
diff --git a/frontend/src/metabase/qb/components/actions/XRayCard.jsx b/frontend/src/metabase/qb/components/actions/XRayCard.jsx
index cc59d679915d88dcde919b272cdd5f92beae45c7..36cd5da501a839c48a677f0ecdd9ab4c19dd3675 100644
--- a/frontend/src/metabase/qb/components/actions/XRayCard.jsx
+++ b/frontend/src/metabase/qb/components/actions/XRayCard.jsx
@@ -5,8 +5,13 @@ import type {
ClickActionProps
} from "metabase/meta/types/Visualization";
-export default ({ question }: ClickActionProps): ClickAction[] => {
- if (question.card().id) {
+export default ({ question, settings }: ClickActionProps): ClickAction[] => {
+ // currently time series xrays require the maximum fidelity
+ if (
+ question.card().id &&
+ settings["enable_xrays"] &&
+ settings["xray_max_cost"] === "extended"
+ ) {
return [
{
name: "xray-card",
diff --git a/frontend/src/metabase/qb/components/actions/XRaySegment.jsx b/frontend/src/metabase/qb/components/actions/XRaySegment.jsx
index f0ba0bccaa1a0ea4249e443ecf4c737e2c6637d8..39eec07735dd22596df0f89421d2de49ee724cc4 100644
--- a/frontend/src/metabase/qb/components/actions/XRaySegment.jsx
+++ b/frontend/src/metabase/qb/components/actions/XRaySegment.jsx
@@ -7,8 +7,8 @@ import type {
import { isSegmentFilter } from "metabase/lib/query/filter";
-export default ({ question }: ClickActionProps): ClickAction[] => {
- if (question.card().id) {
+export default ({ question, settings }: ClickActionProps): ClickAction[] => {
+ if (question.card().id && settings["enable_xrays"]) {
return question
.query()
.filters()
diff --git a/frontend/src/metabase/qb/components/drill/ZoomDrill.jsx b/frontend/src/metabase/qb/components/drill/ZoomDrill.jsx
index 5e1e45280f3d1ebf6f193171697b45dce69c98d2..7c6d5d2365ee1a173168ba5c7136fec330b230b4 100644
--- a/frontend/src/metabase/qb/components/drill/ZoomDrill.jsx
+++ b/frontend/src/metabase/qb/components/drill/ZoomDrill.jsx
@@ -7,7 +7,9 @@ import type {
ClickActionProps
} from "metabase/meta/types/Visualization";
-export default ({ question, clicked }: ClickActionProps): ClickAction[] => {
+export default (
+ { question, clicked, settings }: ClickActionProps
+): ClickAction[] => {
const dimensions = (clicked && clicked.dimensions) || [];
const drilldown = drillDownForDimensions(dimensions, question.metadata());
if (!drilldown) {
diff --git a/frontend/src/metabase/qb/components/modes/SegmentMode.jsx b/frontend/src/metabase/qb/components/modes/SegmentMode.jsx
index db0ada763a45a36d4b3cf566f6f1e2b30df460e6..35cac1ba624cb2871839bd47e85d1e1c41e2d850 100644
--- a/frontend/src/metabase/qb/components/modes/SegmentMode.jsx
+++ b/frontend/src/metabase/qb/components/modes/SegmentMode.jsx
@@ -19,9 +19,9 @@ const SegmentMode: QueryMode = {
name: "segment",
actions: [
...DEFAULT_ACTIONS,
- XRaySegment,
CommonMetricsAction,
CountByTimeAction,
+ XRaySegment,
SummarizeBySegmentMetricAction
// commenting this out until we sort out viz settings in QB2
// PlotSegmentField
diff --git a/frontend/src/metabase/qb/components/modes/TimeseriesMode.jsx b/frontend/src/metabase/qb/components/modes/TimeseriesMode.jsx
index 736794a2860d43ae8b2d97a392b2ea88d04375f5..e1ff31247d8aeaf577a9663a2e898c870a93d8b2 100644
--- a/frontend/src/metabase/qb/components/modes/TimeseriesMode.jsx
+++ b/frontend/src/metabase/qb/components/modes/TimeseriesMode.jsx
@@ -47,9 +47,9 @@ export const TimeseriesModeFooter = (props: Props) => {
const TimeseriesMode: QueryMode = {
name: "timeseries",
actions: [
- XRayCard,
PivotByCategoryAction,
PivotByLocationAction,
+ XRayCard,
...DEFAULT_ACTIONS
],
drills: [PivotByCategoryDrill, PivotByLocationDrill, ...DEFAULT_DRILLS],
diff --git a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
index a5534492c742a348873b1e523dbd402025be2c11..a8d76411c612e88d2201a92ece3c2a4eee530c4d 100644
--- a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
@@ -22,7 +22,8 @@ type Props = {
navigateToNewCardInsideQB: (any) => void,
router: {
push: (string) => void
- }
+ },
+ instanceSettings: {}
};
type State = {
@@ -98,10 +99,10 @@ export default class ActionsWidget extends Component {
}
handleActionClick = (index: number) => {
- const { question, router } = this.props;
+ const { question, router, instanceSettings } = this.props;
const mode = question.mode()
if (mode) {
- const action = mode.actions()[index];
+ const action = mode.actions(instanceSettings)[index];
if (action && action.popover) {
this.setState({ selectedActionIndex: index });
} else if (action && action.question) {
@@ -119,15 +120,16 @@ export default class ActionsWidget extends Component {
}
};
render() {
- const { className, question } = this.props;
+ const { className, question, instanceSettings } = this.props;
const { popoverIsOpen, iconIsVisible, selectedActionIndex } = this.state;
const mode = question.mode();
- const actions = mode ? mode.actions() : [];
+ const actions = mode ? mode.actions(instanceSettings) : [];
if (actions.length === 0) {
return null;
}
+
const selectedAction: ?ClickAction = selectedActionIndex == null ? null :
actions[selectedActionIndex];
let PopoverComponent = selectedAction && selectedAction.popover;
diff --git a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.jsx b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.jsx
index b622cd89104bdee359e6c6a0b6b2514c4e37a4f9..e465b38d3c673c6267a45f243893fdfb175935ad 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.jsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.jsx
@@ -126,7 +126,7 @@ export default class TagEditorParam extends Component {
{ tag.type === "dimension" &&
<div className="pb1">
- <h5 className="pb1 text-normal">Field</h5>
+ <h5 className="pb1 text-normal">Field to map to</h5>
<Select
className="border-med bg-white block"
value={Array.isArray(tag.dimension) ? tag.dimension[1] : null}
@@ -151,7 +151,7 @@ export default class TagEditorParam extends Component {
{ widgetOptions && widgetOptions.length > 0 &&
<div className="pb1">
- <h5 className="pb1 text-normal">Widget</h5>
+ <h5 className="pb1 text-normal">Filter widget type</h5>
<Select
className="border-med bg-white block"
value={tag.widget_type}
@@ -177,7 +177,7 @@ export default class TagEditorParam extends Component {
{ ((tag.type !== "dimension" && tag.required) || (tag.type === "dimension" || tag.widget_type)) &&
<div className="pb1">
- <h5 className="pb1 text-normal">Default value</h5>
+ <h5 className="pb1 text-normal">Default filter widget value</h5>
<ParameterValueWidget
parameter={{
type: tag.widget_type || (tag.type === "date" ? "date/single" : null)
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx
index 1dd5ec9d967b320ef901df06b3792c15d381204e..23a04ece6dbc4179302ae4322fb864bc7007d2e7 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx
@@ -46,7 +46,8 @@ import {
getMode,
getQuery,
getQuestion,
- getOriginalQuestion
+ getOriginalQuestion,
+ getSettings
} from "../selectors";
import { getMetadata, getDatabasesList } from "metabase/selectors/metadata";
@@ -116,6 +117,7 @@ const mapStateToProps = (state, props) => {
loadTableAndForeignKeysFn: loadTableAndForeignKeys,
autocompleteResultsFn: (prefix) => autocompleteResults(state.qb.card, prefix),
+ instanceSettings: getSettings(state)
}
}
@@ -202,7 +204,7 @@ export default class QueryBuilder extends Component {
class LegacyQueryBuilder extends Component {
render() {
- const { query, card, isDirty, databases, uiControls, mode } = this.props;
+ const { query, card, isDirty, databases, uiControls, mode, } = this.props;
// if we don't have a card at all or no databases then we are initializing, so keep it simple
if (!card || !databases) {
diff --git a/frontend/src/metabase/query_builder/selectors.js b/frontend/src/metabase/query_builder/selectors.js
index be79650aa595ee7c52ec3899572e23a2e431935e..6dffe0319d318cc42c64259115363f4ea9c79f12 100644
--- a/frontend/src/metabase/query_builder/selectors.js
+++ b/frontend/src/metabase/query_builder/selectors.js
@@ -29,6 +29,10 @@ export const getParameterValues = state => state.qb.parameterValues;
export const getQueryResult = state => state.qb.queryResult;
export const getQueryResults = state => state.qb.queryResults;
+// get instance settings, used for determining whether to display certain actions,
+// currently used only for xrays
+export const getSettings = state => state.settings.values
+
export const getIsDirty = createSelector(
[getCard, getOriginalCard],
(card, originalCard) => {
diff --git a/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx b/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx
index cba6872401902ebcdbcded640cfee49b4fbd2799..6fc99cb2c95876a3adbf3cc755f3f9fe56f957bc 100644
--- a/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx
+++ b/frontend/src/metabase/reference/databases/FieldDetailContainer.jsx
@@ -19,13 +19,16 @@ import {
getIsEditing
} from '../selectors';
+import { getXrayEnabled } from 'metabase/xray/selectors'
+
const mapStateToProps = (state, props) => ({
- database: getDatabase(state, props),
- table: getTable(state, props),
- field: getField(state, props),
+ database: getDatabase(state, props),
+ table: getTable(state, props),
+ field: getField(state, props),
databaseId: getDatabaseId(state, props),
isEditing: getIsEditing(state, props),
- metadata: getMetadata(state, props)
+ metadata: getMetadata(state, props),
+ showXray: getXrayEnabled(state)
});
const mapDispatchToProps = {
@@ -43,7 +46,8 @@ export default class FieldDetailContainer extends Component {
table: PropTypes.object.isRequired,
field: PropTypes.object.isRequired,
isEditing: PropTypes.bool,
- metadata: PropTypes.object
+ metadata: PropTypes.object,
+ showXray: PropTypes.bool
};
async fetchContainerData(){
@@ -68,14 +72,15 @@ export default class FieldDetailContainer extends Component {
database,
table,
field,
- isEditing
+ isEditing,
+ showXray
} = this.props;
return (
<SidebarLayout
className="flex-full relative"
style={ isEditing ? { paddingTop: '43px' } : {}}
- sidebar={<FieldSidebar database={database} table={table} field={field}/>}
+ sidebar={<FieldSidebar database={database} table={table} field={field} showXray={showXray}/>}
>
<FieldDetail {...this.props} />
</SidebarLayout>
diff --git a/frontend/src/metabase/reference/databases/FieldSidebar.jsx b/frontend/src/metabase/reference/databases/FieldSidebar.jsx
index da708d17e4bf8d0a08edf9dc9497f681f48df6a1..f2e66b1c4879cf4e07ab585d1e78b9a340901375 100644
--- a/frontend/src/metabase/reference/databases/FieldSidebar.jsx
+++ b/frontend/src/metabase/reference/databases/FieldSidebar.jsx
@@ -14,7 +14,8 @@ const FieldSidebar =({
table,
field,
style,
- className
+ className,
+ showXray
}) =>
<div className={cx(S.sidebar, className)} style={style}>
<ul>
@@ -28,23 +29,27 @@ const FieldSidebar =({
placeholder="Data Reference"
/>
</div>
- <SidebarItem key={`/reference/databases/${database.id}/tables/${table.id}/fields/${field.id}`}
- href={`/reference/databases/${database.id}/tables/${table.id}/fields/${field.id}`}
- icon="document"
- name="Details" />
- <SidebarItem key={`/xray/field/${field.id}/approximate`}
- href={`/xray/field/${field.id}/approximate`}
- icon="document"
- name="X-ray this Field" />
+ <SidebarItem key={`/reference/databases/${database.id}/tables/${table.id}/fields/${field.id}`}
+ href={`/reference/databases/${database.id}/tables/${table.id}/fields/${field.id}`}
+ icon="document"
+ name="Details" />
+ { showXray && (
+ <SidebarItem
+ key={`/xray/field/${field.id}/approximate`}
+ href={`/xray/field/${field.id}/approximate`}
+ icon="beaker"
+ name="X-ray this Field" />
+ )}
</ul>
</div>
FieldSidebar.propTypes = {
- database: PropTypes.object,
+ database: PropTypes.object,
table: PropTypes.object,
field: PropTypes.object,
className: PropTypes.string,
style: PropTypes.object,
+ showXray: PropTypes.bool
};
export default pure(FieldSidebar);
diff --git a/frontend/src/metabase/reference/databases/TableDetailContainer.jsx b/frontend/src/metabase/reference/databases/TableDetailContainer.jsx
index e20d0c95c0de80e030f16d3fd4c1cccfc19a9ed3..6c7c0fb62ca3002c0f08229122db56704a8ca8b5 100644
--- a/frontend/src/metabase/reference/databases/TableDetailContainer.jsx
+++ b/frontend/src/metabase/reference/databases/TableDetailContainer.jsx
@@ -17,12 +17,15 @@ import {
getIsEditing
} from '../selectors';
+import { getXrayEnabled } from 'metabase/xray/selectors'
+
const mapStateToProps = (state, props) => ({
- database: getDatabase(state, props),
- table: getTable(state, props),
+ database: getDatabase(state, props),
+ table: getTable(state, props),
databaseId: getDatabaseId(state, props),
- isEditing: getIsEditing(state, props)
+ isEditing: getIsEditing(state, props),
+ showXray: getXrayEnabled(state)
});
const mapDispatchToProps = {
@@ -38,7 +41,8 @@ export default class TableDetailContainer extends Component {
database: PropTypes.object.isRequired,
databaseId: PropTypes.number.isRequired,
table: PropTypes.object.isRequired,
- isEditing: PropTypes.bool
+ isEditing: PropTypes.bool,
+ showXray: PropTypes.bool
};
async fetchContainerData(){
@@ -62,14 +66,16 @@ export default class TableDetailContainer extends Component {
const {
database,
table,
- isEditing
+ isEditing,
+ showXray
} = this.props;
return (
<SidebarLayout
className="flex-full relative"
style={ isEditing ? { paddingTop: '43px' } : {}}
- sidebar={<TableSidebar database={database} table={table}/>}
+
+ sidebar={<TableSidebar database={database} table={table} showXray={showXray}/>}
>
<TableDetail {...this.props} />
</SidebarLayout>
diff --git a/frontend/src/metabase/reference/databases/TableSidebar.jsx b/frontend/src/metabase/reference/databases/TableSidebar.jsx
index e09aeeb5d987dc94a788a486b0c682041293402a..edd315ea0ec38d9299489c44ecce0ed818c06cc1 100644
--- a/frontend/src/metabase/reference/databases/TableSidebar.jsx
+++ b/frontend/src/metabase/reference/databases/TableSidebar.jsx
@@ -13,7 +13,8 @@ const TableSidebar = ({
database,
table,
style,
- className
+ className,
+ showXray
}) =>
<div className={cx(S.sidebar, className)} style={style}>
<div className={S.breadcrumbs}>
@@ -39,18 +40,21 @@ const TableSidebar = ({
href={`/reference/databases/${database.id}/tables/${table.id}/questions`}
icon="all"
name="Questions about this table" />
- <SidebarItem key={`/xray/table/${table.id}/approximate`}
- href={`/xray/table/${table.id}/approximate`}
- icon="all"
- name="X-ray this table" />
+ { showXray && (
+ <SidebarItem key={`/xray/table/${table.id}/approximate`}
+ href={`/xray/table/${table.id}/approximate`}
+ icon="beaker"
+ name="X-ray this table" />
+ )}
</ol>
</div>
TableSidebar.propTypes = {
- database: PropTypes.object,
+ database: PropTypes.object,
table: PropTypes.object,
className: PropTypes.string,
style: PropTypes.object,
+ showXray: PropTypes.bool
};
export default pure(TableSidebar);
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index 605cb8b3dee247a86b4e23d1cc664fbc2cff9ae0..0215a485ffe5de0705b6e13c9769c3e15cdbc888 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -42,7 +42,7 @@ import SetupApp from "metabase/setup/containers/SetupApp.jsx";
import UserSettingsApp from "metabase/user/containers/UserSettingsApp.jsx";
// new question
-import { NewQuestionStart, NewQuestionMetricSearch, NewQuestionSegmentSearch } from "metabase/new_query/router_wrappers";
+import { NewQuestionStart, NewQuestionMetricSearch } from "metabase/new_query/router_wrappers";
// admin containers
import DatabaseListApp from "metabase/admin/databases/containers/DatabaseListApp.jsx";
@@ -205,7 +205,6 @@ export const getRoutes = (store) =>
<Route path="new" title="New Question">
<IndexRoute component={NewQuestionStart} />
<Route path="metric" title="Metrics" component={NewQuestionMetricSearch} />
- <Route path="segment" title="Segments" component={NewQuestionSegmentSearch} />
</Route>
</Route>
<Route path="/question/:cardId" component={QueryBuilder} />
diff --git a/frontend/src/metabase/selectors/metadata.js b/frontend/src/metabase/selectors/metadata.js
index 1b6bda217a42d1feccf73be2e8a207faacc9aec5..426d5d5e75ebf26b9661579b7b9bfd4e158765ca 100644
--- a/frontend/src/metabase/selectors/metadata.js
+++ b/frontend/src/metabase/selectors/metadata.js
@@ -1,6 +1,6 @@
/* @flow weak */
-import { createSelector } from "reselect";
+import { createSelector, createSelectorCreator, defaultMemoize } from "reselect";
import Metadata from "metabase-lib/lib/metadata/Metadata";
import Database from "metabase-lib/lib/metadata/Database";
@@ -9,7 +9,8 @@ import Field from "metabase-lib/lib/metadata/Field";
import Metric from "metabase-lib/lib/metadata/Metric";
import Segment from "metabase-lib/lib/metadata/Segment";
-import { getIn } from "icepick";
+import _ from "underscore";
+import { shallowEqual } from "recompose";
import { getFieldValues } from "metabase/lib/query/field";
import {
@@ -17,6 +18,7 @@ import {
getBreakouts,
getAggregatorsWithFields
} from "metabase/lib/schema_metadata";
+import { getIn } from "icepick";
export const getNormalizedMetadata = state => state.metadata;
@@ -123,22 +125,75 @@ export const getSegments = createSelector(
({ segments }) => segments
);
-// MISC
-
-export const getParameterFieldValues = (state, props) => {
- const fieldValues = getFieldValues(getIn(state, ["metadata", "fields", props.parameter.field_id]));
+// FIELD VALUES FOR DASHBOARD FILTERS / SQL QUESTION PARAMETERS
+
+// Returns a dictionary of field id:s mapped to matching field values
+// Currently this assumes that you are passing the props of <ParameterValueWidget> which contain the
+// `field_ids` array inside `parameter` prop.
+const getParameterFieldValuesByFieldId = (state, props) => {
+ // NOTE Atte Keinänen 9/14/17: Reading the state directly instead of using `getFields` selector
+ // because `getMetadata` doesn't currently work with fields of public dashboards
+ return _.chain(getIn(state, ["metadata", "fields"]))
+ // SQL template tags provide `field_id` instead of `field_ids`
+ .pick(...(props.parameter.field_ids || [props.parameter.field_id]))
+ .mapObject(getFieldValues)
+ .value()
+}
- // HACK Atte Keinänen 7/27/17: Currently the field value analysis code only returns a single value for booleans,
- // this will be addressed in analysis sync refactor
+// Custom equality selector for checking if two field value dictionaries contain same fields and field values
+// Currently we simply check if fields match and the lengths of field value arrays are equal which makes the comparison fast
+// See https://github.com/reactjs/reselect#customize-equalitycheck-for-defaultmemoize
+const createFieldValuesEqualSelector = createSelectorCreator(defaultMemoize, (a, b) => {
+// TODO: Why can't we use plain shallowEqual, i.e. why the field value arrays change very often?
+ return shallowEqual(_.mapObject(a, (values) => values.length), _.mapObject(b, (values) => values.length));
+})
+
+// HACK Atte Keinänen 7/27/17: Currently the field value analysis code only returns a single value for booleans,
+// this will be addressed in analysis sync refactor
+const patchBooleanFieldValues_HACK = (valueArray) => {
const isBooleanFieldValues =
- fieldValues && fieldValues.length === 1 && fieldValues[0] && typeof(fieldValues[0][0]) === "boolean"
+ valueArray && valueArray.length === 1 && valueArray[0] && typeof(valueArray[0][0]) === "boolean"
+
if (isBooleanFieldValues) {
return [[true], [false]];
} else {
- return fieldValues;
+ return valueArray;
}
}
+// Merges the field values of fields linked to a parameter and removes duplicates
+// We want that we have a distinct selector for each field id combination, and for that reason
+// we export a method that creates a new selector; see
+// https://github.com/reactjs/reselect#sharing-selectors-with-props-across-multiple-components
+// TODO Atte Keinänen 7/20/17: Should we have any thresholds if the count of field values is high or we have many (>2?) fields?
+export const makeGetMergedParameterFieldValues = () => {
+ return createFieldValuesEqualSelector(getParameterFieldValuesByFieldId, (fieldValues) => {
+ const fieldIds = Object.keys(fieldValues)
+
+ if (fieldIds.length === 0) {
+ // If we have no fields for the parameter, don't return any field values
+ return [];
+ } else if (fieldIds.length === 1) {
+ // We have just a single field so we can return the field values almost as-is,
+ // only address the boolean bug for now
+ const singleFieldValues = fieldValues[fieldIds[0]]
+ return patchBooleanFieldValues_HACK(singleFieldValues);
+ } else {
+ // We have multiple fields, so let's merge their values to a single array
+ const sortedMergedValues = _.chain(Object.values(fieldValues))
+ .flatten(true)
+ .sortBy(fieldValue => {
+ const valueIsRemapped = fieldValue.length === 2
+ return valueIsRemapped ? fieldValue[1] : fieldValue[0]
+ })
+ .value()
+
+ // run the uniqueness comparision always against a non-remapped value
+ return _.uniq(sortedMergedValues, false, (fieldValue) => fieldValue[0]);
+ }
+ });
+}
+
// UTILS:
// clone each object in the provided mapping of objects
diff --git a/frontend/src/metabase/visualizations/components/Visualization.jsx b/frontend/src/metabase/visualizations/components/Visualization.jsx
index 97750266e04ac634a4d953d86714c6df98759abc..f336f993a9ce5ee9f22143bf55bbe44ae423d67a 100644
--- a/frontend/src/metabase/visualizations/components/Visualization.jsx
+++ b/frontend/src/metabase/visualizations/components/Visualization.jsx
@@ -204,7 +204,7 @@ export default class Visualization extends Component {
const card = series[seriesIndex].card;
const question = new Question(metadata, card);
const mode = question.mode();
- return mode ? mode.actionsForClick(clicked) : [];
+ return mode ? mode.actionsForClick(clicked, {}) : [];
}
visualizationIsClickable = (clicked: ClickObject) => {
diff --git a/frontend/src/metabase/xray/SimpleStat.jsx b/frontend/src/metabase/xray/SimpleStat.jsx
index 46c9b81ebbc2da7e6bcacece8cfbe2ede8033450..e291a7ffb814876e45b365d9f7da9b7c84849672 100644
--- a/frontend/src/metabase/xray/SimpleStat.jsx
+++ b/frontend/src/metabase/xray/SimpleStat.jsx
@@ -5,7 +5,7 @@ import Icon from 'metabase/components/Icon'
const SimpleStat = ({ stat, showDescription }) =>
<div>
<div className="flex align-center">
- <h3 className="mr1 text-grey-4">{stat.label}</h3>
+ <h3 className="mr4 text-grey-4">{stat.label}</h3>
{ showDescription && (
<Tooltip tooltip={stat.description}>
<Icon name='infooutlined' />
@@ -19,4 +19,3 @@ const SimpleStat = ({ stat, showDescription }) =>
</div>
export default SimpleStat
-
diff --git a/frontend/src/metabase/xray/components/CostSelect.jsx b/frontend/src/metabase/xray/components/CostSelect.jsx
index ea27ae309dbaf906a58a777ee9912510a45fe7b9..58f90af02eddf94f2528745357d291bbdaa0cfec 100644
--- a/frontend/src/metabase/xray/components/CostSelect.jsx
+++ b/frontend/src/metabase/xray/components/CostSelect.jsx
@@ -1,13 +1,28 @@
import React from 'react'
import cx from 'classnames'
import { Link, withRouter } from 'react-router'
+import { connect } from 'react-redux'
+import { getMaxCost } from 'metabase/xray/selectors'
import Icon from 'metabase/components/Icon'
import Tooltip from 'metabase/components/Tooltip'
import COSTS from 'metabase/xray/costs'
-const CostSelect = ({ currentCost, location }) => {
+const mapStateToProps = (state) => ({
+ maxCost: getMaxCost(state)
+})
+
+const getDisabled = (maxCost) => {
+ if(maxCost === 'approximate') {
+ return ['extended', 'exact']
+ } else if (maxCost === 'exact') {
+ return ['extended']
+ }
+ return []
+}
+
+const CostSelect = ({ currentCost, location, maxCost }) => {
const urlWithoutCost = location.pathname.substr(0, location.pathname.lastIndexOf('/'))
return (
<ol className="bordered rounded shadowed bg-white flex align-center overflow-hidden">
@@ -16,14 +31,17 @@ const CostSelect = ({ currentCost, location }) => {
return (
<Link
to={`${urlWithoutCost}/${cost}`}
- className="no-decoration"
+ className={cx(
+ 'no-decoration',
+ { 'disabled': getDisabled(maxCost).indexOf(cost) >= 0}
+ )}
key={cost}
>
<li
key={cost}
className={cx(
"flex align-center justify-center cursor-pointer bg-brand-hover text-white-hover transition-background transition-text text-grey-2",
- { 'bg-brand text-white': currentCost === cost }
+ { 'bg-brand text-white': currentCost === cost },
)}
>
<Tooltip
@@ -43,4 +61,4 @@ const CostSelect = ({ currentCost, location }) => {
)
}
-export default withRouter(CostSelect)
+export default connect(mapStateToProps)(withRouter(CostSelect))
diff --git a/frontend/src/metabase/xray/components/LoadingAnimation.jsx b/frontend/src/metabase/xray/components/LoadingAnimation.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..487c6e8c0749fcb387e0976695d72544bfddf6f4
--- /dev/null
+++ b/frontend/src/metabase/xray/components/LoadingAnimation.jsx
@@ -0,0 +1,30 @@
+import React from 'react'
+import Icon from 'metabase/components/Icon'
+
+const RotatingGear = ({name, speed, size, delay }) =>
+ <div style={{
+ animation: `${name} ${speed}ms linear ${delay}ms infinite`
+ }}>
+ <Icon name='gear' size={size} />
+ </div>
+
+RotatingGear.defaultProps = {
+ name: 'spin',
+ delay: 0,
+ speed: 5000
+}
+
+const LoadingAnimation = () =>
+ <div className="relative" style={{ width: 300, height: 180 }}>
+ <div className="absolute" style={{ top: 20, left: 135 }}>
+ <RotatingGear size={90} />
+ </div>
+ <div className="absolute" style={{ top: 60, left: 80 }}>
+ <RotatingGear name='spin-reverse' size={60} speed={6000} />
+ </div>
+ <div className="absolute" style={{ top: 110, left: 125 }}>
+ <RotatingGear speed={7000} size={45} />
+ </div>
+ </div>
+
+export default LoadingAnimation
diff --git a/frontend/src/metabase/xray/containers/CardXRay.jsx b/frontend/src/metabase/xray/containers/CardXRay.jsx
index 6f2041cf879ab93f38100ad9c5753ea25f4ca4db..d128e9ab552cc9f68d7be9a32f301c79f8739b97 100644
--- a/frontend/src/metabase/xray/containers/CardXRay.jsx
+++ b/frontend/src/metabase/xray/containers/CardXRay.jsx
@@ -5,6 +5,7 @@ import { connect } from 'react-redux'
import { saturated } from 'metabase/lib/colors'
import { fetchCardXray } from 'metabase/xray/xray'
+import { getLoadingStatus } from 'metabase/xray/selectors'
import Icon from 'metabase/components/Icon'
import Tooltip from 'metabase/components/Tooltip'
import LoadingAndErrorWrapper from 'metabase/components/LoadingAndErrorWrapper'
@@ -13,8 +14,12 @@ import Visualization from 'metabase/visualizations/components/Visualization'
import { XRayPageWrapper, Heading } from 'metabase/xray/components/XRayLayout'
import Periodicity from 'metabase/xray/components/Periodicity'
+import { hasXray, loadingMessages } from 'metabase/xray/utils'
+import LoadingAnimation from 'metabase/xray/components/LoadingAnimation'
+
type Props = {
fetchCardXray: () => void,
+ isLoading: boolean,
xray: {}
}
@@ -57,10 +62,16 @@ class CardXRay extends Component {
render () {
- const { xray } = this.props
+ const { xray, isLoading } = this.props
const { error } = this.state
return (
- <LoadingAndErrorWrapper loading={!xray} error={error}>
+ <LoadingAndErrorWrapper
+ loading={isLoading || !hasXray(xray)}
+ error={error}
+ noBackground
+ loadingMessages={loadingMessages}
+ loadingScenes={[<LoadingAnimation />]}
+ >
{ () =>
<XRayPageWrapper>
<div className="mt4 mb2">
@@ -180,7 +191,8 @@ class CardXRay extends Component {
}
const mapStateToProps = state => ({
- xray: state.xray.cardXray,
+ xray: state.xray.xray,
+ isLoading: getLoadingStatus(state)
})
const mapDispatchToProps = {
diff --git a/frontend/src/metabase/xray/containers/FieldXray.jsx b/frontend/src/metabase/xray/containers/FieldXray.jsx
index f8a6072287d85a79c8b0100a9dc4d604c96e2f0c..1f72c6c7cd96264ca7591a14e0bc31461a4f6b7d 100644
--- a/frontend/src/metabase/xray/containers/FieldXray.jsx
+++ b/frontend/src/metabase/xray/containers/FieldXray.jsx
@@ -7,7 +7,7 @@ import { Link } from 'react-router'
import { isDate } from 'metabase/lib/schema_metadata'
import { fetchFieldXray } from 'metabase/xray/xray'
-import { getFieldXray } from 'metabase/xray/selectors'
+import { getFieldXray, getLoadingStatus } from 'metabase/xray/selectors'
import COSTS from 'metabase/xray/costs'
@@ -24,13 +24,17 @@ import StatGroup from 'metabase/xray/components/StatGroup'
import Histogram from 'metabase/xray/Histogram'
import { Heading, XRayPageWrapper } from 'metabase/xray/components/XRayLayout'
+import { hasXray, loadingMessages } from 'metabase/xray/utils'
+
import Periodicity from 'metabase/xray/components/Periodicity'
+import LoadingAnimation from 'metabase/xray/components/LoadingAnimation'
import type { Field } from 'metabase/meta/types/Field'
import type { Table } from 'metabase/meta/types/Table'
type Props = {
fetchFieldXray: () => void,
+ isLoading: boolean,
xray: {
table: Table,
field: Field,
@@ -45,7 +49,8 @@ type Props = {
}
const mapStateToProps = state => ({
- xray: getFieldXray(state)
+ xray: getFieldXray(state),
+ isLoading: getLoadingStatus(state)
})
const mapDispatchToProps = {
@@ -83,13 +88,18 @@ class FieldXRay extends Component {
}
render () {
- const { xray, params } = this.props
+ const { xray, params, isLoading } = this.props
const { error } = this.state
+
+ console.log(hasXray(xray))
+
return (
<LoadingAndErrorWrapper
- loading={!xray}
+ loading={isLoading || !hasXray(xray)}
error={error}
noBackground
+ loadingMessages={loadingMessages}
+ loadingScenes={[<LoadingAnimation />]}
>
{ () =>
<XRayPageWrapper>
diff --git a/frontend/src/metabase/xray/containers/SegmentComparison.jsx b/frontend/src/metabase/xray/containers/SegmentComparison.jsx
index c5c67a95d1408703cc9e3030d5946d557b5b09c9..9323b791c66ca69cf29a7ce4159dbb6607cdace9 100644
--- a/frontend/src/metabase/xray/containers/SegmentComparison.jsx
+++ b/frontend/src/metabase/xray/containers/SegmentComparison.jsx
@@ -10,19 +10,23 @@ import {
getComparisonFields,
getComparisonContributors,
getSegmentItem,
- getTitle
+ getTitle,
+ getLoadingStatus
} from 'metabase/xray/selectors'
-
import LoadingAndErrorWrapper from 'metabase/components/LoadingAndErrorWrapper'
import XRayComparison from 'metabase/xray/components/XRayComparison'
+import LoadingAnimation from 'metabase/xray/components/LoadingAnimation'
+
+import { hasComparison, loadingMessages } from 'metabase/xray/utils'
const mapStateToProps = (state) => ({
- comparison: getComparison(state),
- fields: getComparisonFields(state),
- contributors: getComparisonContributors(state),
- itemA: getSegmentItem(state, 0),
- itemB: getSegmentItem(state, 1)
+ comparison: getComparison(state),
+ fields: getComparisonFields(state),
+ contributors: getComparisonContributors(state),
+ itemA: getSegmentItem(state, 0),
+ itemB: getSegmentItem(state, 1),
+ isLoading: getLoadingStatus(state)
})
const mapDispatchToProps = {
@@ -42,6 +46,7 @@ class SegmentComparison extends Component {
try {
await this.props.fetchSegmentComparison(segmentId1, segmentId2, cost)
} catch (error) {
+ console.log('error', error)
this.setState({ error })
}
}
@@ -53,16 +58,19 @@ class SegmentComparison extends Component {
comparison,
fields,
itemA,
- itemB
+ itemB,
+ isLoading
} = this.props
const { error } = this.state
return (
<LoadingAndErrorWrapper
- loading={!comparison}
+ loading={isLoading || !hasComparison(comparison)}
error={error}
noBackground
+ loadingMessages={loadingMessages}
+ loadingScenes={[<LoadingAnimation />]}
>
{ () =>
diff --git a/frontend/src/metabase/xray/containers/SegmentTableComparison.jsx b/frontend/src/metabase/xray/containers/SegmentTableComparison.jsx
index 4a63733f0d59c42c7e1f435c0b25d51b91ad245a..bf48923483882868a6e4322b8a3b20c6690f5ab0 100644
--- a/frontend/src/metabase/xray/containers/SegmentTableComparison.jsx
+++ b/frontend/src/metabase/xray/containers/SegmentTableComparison.jsx
@@ -10,17 +10,21 @@ import {
getComparisonFields,
getSegmentItem,
getTableItem,
- getTitle
+ getTitle,
+ getLoadingStatus
} from 'metabase/xray/selectors'
import LoadingAndErrorWrapper from 'metabase/components/LoadingAndErrorWrapper'
import XRayComparison from 'metabase/xray/components/XRayComparison'
+import { hasComparison, loadingMessages } from 'metabase/xray/utils'
+import LoadingAnimation from 'metabase/xray/components/LoadingAnimation'
const mapStateToProps = state => ({
comparison: getComparison(state),
fields: getComparisonFields(state),
itemA: getSegmentItem(state),
- itemB: getTableItem(state)
+ itemB: getTableItem(state),
+ isLoading: getLoadingStatus(state)
})
const mapDispatchToProps = {
@@ -45,13 +49,15 @@ class SegmentTableComparison extends Component {
}
render () {
- const { params, fields, comparison, itemA, itemB } = this.props
+ const { params, fields, comparison, itemA, itemB, isLoading } = this.props
const { error } = this.state
return (
<LoadingAndErrorWrapper
- loading={!comparison}
+ loading={isLoading || !hasComparison(comparison)}
error={error}
noBackground
+ loadingMessages={loadingMessages}
+ loadingScenes={[<LoadingAnimation />]}
>
{ () =>
<XRayComparison
diff --git a/frontend/src/metabase/xray/containers/SegmentXRay.jsx b/frontend/src/metabase/xray/containers/SegmentXRay.jsx
index 52e7050dfea1072957291c50a02664f3a27d75ad..4077b9a1636b0edb529b6ba1dcaaec7034a0f058 100644
--- a/frontend/src/metabase/xray/containers/SegmentXRay.jsx
+++ b/frontend/src/metabase/xray/containers/SegmentXRay.jsx
@@ -15,7 +15,8 @@ import CostSelect from 'metabase/xray/components/CostSelect'
import {
getSegmentConstituents,
- getSegmentXray
+ getSegmentXray,
+ getLoadingStatus
} from 'metabase/xray/selectors'
import Constituent from 'metabase/xray/components/Constituent'
@@ -23,6 +24,8 @@ import Constituent from 'metabase/xray/components/Constituent'
import type { Table } from 'metabase/meta/types/Table'
import type { Segment } from 'metabase/meta/types/Segment'
+import { hasXray } from 'metabase/xray/utils'
+
type Props = {
fetchSegmentXray: () => void,
constituents: [],
@@ -33,12 +36,14 @@ type Props = {
params: {
segmentId: number,
cost: string,
- }
+ },
+ isLoading: boolean
}
const mapStateToProps = state => ({
xray: getSegmentXray(state),
- constituents: getSegmentConstituents(state)
+ constituents: getSegmentConstituents(state),
+ isLoading: getLoadingStatus(state)
})
const mapDispatchToProps = {
@@ -76,12 +81,12 @@ class SegmentXRay extends Component {
}
render () {
- const { constituents, xray, params } = this.props
+ const { constituents, xray, params, isLoading } = this.props
const { error } = this.state
return (
<XRayPageWrapper>
<LoadingAndErrorWrapper
- loading={!constituents}
+ loading={isLoading || !hasXray(xray)}
error={error}
noBackground
>
diff --git a/frontend/src/metabase/xray/containers/TableXRay.jsx b/frontend/src/metabase/xray/containers/TableXRay.jsx
index e09cb0ad24816dcbd896f66e314f8e93b28d5b14..981caf93fab35ffea21622b77137e5f1f4c4b13e 100644
--- a/frontend/src/metabase/xray/containers/TableXRay.jsx
+++ b/frontend/src/metabase/xray/containers/TableXRay.jsx
@@ -14,17 +14,22 @@ import Constituent from 'metabase/xray/components/Constituent'
import {
getTableConstituents,
- getTableXray
+ getTableXray,
+ getLoadingStatus
} from 'metabase/xray/selectors'
import Icon from 'metabase/components/Icon'
import LoadingAndErrorWrapper from 'metabase/components/LoadingAndErrorWrapper'
+import LoadingAnimation from 'metabase/xray/components/LoadingAnimation'
import type { Table } from 'metabase/meta/types/Table'
+import { hasXray, loadingMessages } from 'metabase/xray/utils'
+
type Props = {
constituents: [],
fetchTableXray: () => void,
+ isLoading: boolean,
xray: {
table: Table
},
@@ -36,7 +41,8 @@ type Props = {
const mapStateToProps = state => ({
xray: getTableXray(state),
- constituents: getTableConstituents(state)
+ constituents: getTableConstituents(state),
+ isLoading: getLoadingStatus(state)
})
const mapDispatchToProps = {
@@ -74,15 +80,17 @@ class TableXRay extends Component {
}
render () {
- const { constituents, xray, params } = this.props
+ const { constituents, xray, params, isLoading } = this.props
const { error } = this.state
return (
<XRayPageWrapper>
<LoadingAndErrorWrapper
- loading={!constituents}
+ loading={isLoading || !hasXray(xray)}
error={error}
noBackground
+ loadingMessages={loadingMessages}
+ loadingScenes={[<LoadingAnimation />]}
>
{ () =>
<div className="full">
diff --git a/frontend/src/metabase/xray/selectors.js b/frontend/src/metabase/xray/selectors.js
index 556af3f2f8d64fc4f4c265f8400c59f0da9c23c2..11dc215ab1ffdbe828ab7385c60120a04a3d6435 100644
--- a/frontend/src/metabase/xray/selectors.js
+++ b/frontend/src/metabase/xray/selectors.js
@@ -1,30 +1,35 @@
import { createSelector } from 'reselect'
import { normal } from 'metabase/lib/colors'
+export const getLoadingStatus = (state) =>
+ state.xray.loading
+
+/* TODO - these can be collapsed into getXray */
export const getFieldXray = (state) =>
- state.xray.fieldXray && state.xray.fieldXray.features
+ state.xray.xray && state.xray.xray.features
export const getTableXray = (state) =>
- state.xray.tableXray && state.xray.tableXray.features
+ state.xray.xray && state.xray.xray.features
export const getSegmentXray = (state) =>
- state.xray.segmentXray && state.xray.segmentXray.features
+ state.xray.xray && state.xray.xray.features
+/* TODO - these can be collapsed into getConstituents */
export const getTableConstituents = (state) =>
- state.xray.tableXray && (
- Object.keys(state.xray.tableXray.constituents).map(key =>
- state.xray.tableXray.constituents[key]
+ state.xray.xray && (
+ Object.keys(state.xray.xray.constituents).map(key =>
+ state.xray.xray.constituents[key]
)
)
export const getSegmentConstituents = (state) =>
- state.xray.segmentXray && (
- Object.keys(state.xray.segmentXray.constituents).map(key =>
- state.xray.segmentXray.constituents[key]
+ state.xray.xray && (
+ Object.keys(state.xray.xray.constituents).map(key =>
+ state.xray.xray.constituents[key]
)
)
-export const getComparison = (state) => state.xray.comparison && state.xray.comparison
+export const getComparison = (state) => state.xray.comparison
export const getComparisonFields = createSelector(
[getComparison],
@@ -114,3 +119,14 @@ export const getTableItem = (state, index = 1) => createSelector(
export const getComparisonForField = createSelector
+// see if xrays are enabled. unfortunately enabled can equal null so its enabled if its not false
+export const getXrayEnabled = state => {
+ const enabled = state.settings.values && state.settings.values['enable_xrays']
+ if(enabled == null || enabled == true) {
+ return true
+ }
+ return false
+}
+
+export const getMaxCost = state => state.settings.values['xray_max_cost']
+
diff --git a/frontend/src/metabase/xray/utils.js b/frontend/src/metabase/xray/utils.js
index 7350f823e16d07010d37627c50f2ae7181e1ca5f..f5257b309354b626321045c44139ee094848f8c3 100644
--- a/frontend/src/metabase/xray/utils.js
+++ b/frontend/src/metabase/xray/utils.js
@@ -12,3 +12,17 @@ export const distanceToPhrase = (distance) => {
return 'Very similar'
}
}
+
+// Small utilities to determine whether we have an entity yet or not,
+// used for loading status
+function has (entity) {
+ return typeof entity !== 'undefined' ? true : false
+}
+
+export const hasXray = has
+export const hasComparison = has
+
+export const loadingMessages = [
+ 'Generating your comparison...',
+ 'Still working...',
+]
diff --git a/frontend/src/metabase/xray/xray.js b/frontend/src/metabase/xray/xray.js
index f464f051cd859366070203db8d2205e372b4dfee..b5ae41b00c4a46b0f3d4b9fa6ae4bee46b3e48fa 100644
--- a/frontend/src/metabase/xray/xray.js
+++ b/frontend/src/metabase/xray/xray.js
@@ -1,4 +1,4 @@
-import { assoc } from 'icepick'
+import { chain, assoc } from 'icepick'
import COSTS from 'metabase/xray/costs'
@@ -12,10 +12,11 @@ import { XRayApi } from 'metabase/services'
export const FETCH_FIELD_XRAY = 'metabase/xray/FETCH_FIELD_XRAY'
export const fetchFieldXray = createThunkAction(FETCH_FIELD_XRAY, (fieldId, cost) =>
- async () => {
+ async (dispatch) => {
+ dispatch(startLoad())
try {
const xray = await XRayApi.field_xray({ fieldId, ...cost.method })
- return xray
+ return dispatch(loadXray(xray))
} catch (error) {
console.error(error)
}
@@ -24,10 +25,11 @@ export const fetchFieldXray = createThunkAction(FETCH_FIELD_XRAY, (fieldId, cost
export const FETCH_TABLE_XRAY = 'metabase/xray/FETCH_TABLE_XRAY'
export const fetchTableXray = createThunkAction(FETCH_TABLE_XRAY, (tableId, cost) =>
- async () => {
+ async (dispatch) => {
+ dispatch(startLoad())
try {
const xray = await XRayApi.table_xray({ tableId, ...cost.method })
- return xray
+ return dispatch(loadXray(xray))
} catch (error) {
console.error(error)
}
@@ -37,10 +39,11 @@ export const fetchTableXray = createThunkAction(FETCH_TABLE_XRAY, (tableId, cost
export const FETCH_SEGMENT_XRAY = 'metabase/xray/FETCH_SEGMENT_XRAY'
export const fetchSegmentXray = createThunkAction(FETCH_SEGMENT_XRAY, (segmentId, cost) =>
- async () => {
+ async (dispatch) => {
+ dispatch(startLoad())
try {
const xray = await XRayApi.segment_xray({ segmentId, ...cost.method })
- return xray
+ return dispatch(loadXray(xray))
} catch (error) {
console.error(error)
}
@@ -49,51 +52,26 @@ export const fetchSegmentXray = createThunkAction(FETCH_SEGMENT_XRAY, (segmentId
export const FETCH_CARD_XRAY = 'metabase/xray/FETCH_CARD_XRAY';
export const fetchCardXray = createThunkAction(FETCH_CARD_XRAY, (cardId, cost) =>
- async () => {
+ async (dispatch) => {
+ const c = COSTS[cost]
+ dispatch(startLoad())
try {
- const c = COSTS[cost]
const xray = await XRayApi.card_xray({ cardId, ...c.method });
- return xray;
+ dispatch(loadXray(xray));
+ return false
} catch (error) {
console.error(error);
}
}
)
-export const FETCH_FIELD_COMPARISON = 'metabase/xray/FETCH_FIELD_COMPARISON';
-export const fetchFieldComparison = createThunkAction(
- FETCH_FIELD_COMPARISON,
- (fieldId1, fieldId2) =>
- async (dispatch) => {
- try {
- const comparison = await XRayApi.field_compare({ fieldId1, fieldId2 })
- dispatch(loadComparison(comparison))
- return false
- } catch (error) {
- console.error(error)
- }
- }
-)
-const FETCH_TABLE_COMPARISON = 'metabase/xray/FETCH_TABLE_COMPARISON';
-export const fetchTableComparison = createThunkAction(
- FETCH_TABLE_COMPARISON,
- (tableId1, tableId2) =>
- async () => {
- try {
- const comparison = await XRayApi.table_compare({ tableId1, tableId2 })
- return comparison
- } catch (error) {
- console.error(error)
- }
- }
-)
-
export const FETCH_SEGMENT_COMPARISON = 'metabase/xray/FETCH_SEGMENT_COMPARISON';
export const fetchSegmentComparison = createThunkAction(
FETCH_SEGMENT_COMPARISON,
(segmentId1, segmentId2, cost) =>
async (dispatch) => {
const c = COSTS[cost]
+ dispatch(startLoad())
try {
const comparison = await XRayApi.segment_compare({ segmentId1, segmentId2, ...c.method })
return dispatch(loadComparison(comparison))
@@ -109,6 +87,7 @@ export const fetchSegmentTableComparison = createThunkAction(
(segmentId, tableId, cost) =>
async (dispatch) => {
const c = COSTS[cost]
+ dispatch(startLoad())
try {
const comparison = await XRayApi.segment_table_compare({ segmentId, tableId, ...c.method })
return dispatch(loadComparison(comparison))
@@ -118,29 +97,66 @@ export const fetchSegmentTableComparison = createThunkAction(
}
)
-export const FETCH_METRIC_COMPARISON = 'metabase/xray/FETCH_METRIC_COMPARISON';
-export const fetchMetricComparison = createThunkAction(FETCH_METRIC_COMPARISON, function(metricId1, metricId2) {
+const FETCH_TABLE_COMPARISON = 'metabase/xray/FETCH_TABLE_COMPARISON';
+export const fetchTableComparison = createThunkAction(
+ FETCH_TABLE_COMPARISON,
+ (tableId1, tableId2) =>
+ async () => {
+ try {
+ const comparison = await XRayApi.table_compare({ tableId1, tableId2 })
+ return comparison
+ } catch (error) {
+ console.error(error)
+ }
+ }
+)
+
+export const FETCH_CARD_COMPARISON = 'metabase/xray/FETCH_CARD_COMPARISON';
+export const fetchCardComparison = createThunkAction(FETCH_CARD_COMPARISON, (cardId1, cardId2) =>
async () => {
try {
- const comparison = await XRayApi.metric_compare({ metricId1, metricId2 })
+ const comparison = await XRayApi.card_compare({ cardId1, cardId2 })
return comparison
} catch (error) {
console.error(error)
}
}
-})
+)
-export const FETCH_CARD_COMPARISON = 'metabase/xray/FETCH_CARD_COMPARISON';
-export const fetchCardComparison = createThunkAction(FETCH_CARD_COMPARISON, (cardId1, cardId2) =>
+export const FETCH_FIELD_COMPARISON = 'metabase/xray/FETCH_FIELD_COMPARISON';
+export const fetchFieldComparison = createThunkAction(
+ FETCH_FIELD_COMPARISON,
+ (fieldId1, fieldId2) =>
+ async (dispatch) => {
+ try {
+ const comparison = await XRayApi.field_compare({ fieldId1, fieldId2 })
+ dispatch(loadComparison(comparison))
+ return false
+ } catch (error) {
+ console.error(error)
+ }
+ }
+)
+
+/*
+ * NOTE Kyle Doherty 9/8/17 - future comparisons
+
+
+export const FETCH_METRIC_COMPARISON = 'metabase/xray/FETCH_METRIC_COMPARISON';
+export const fetchMetricComparison = createThunkAction(FETCH_METRIC_COMPARISON, function(metricId1, metricId2) {
async () => {
try {
- const comparison = await XRayApi.card_compare({ cardId1, cardId2 })
+ const comparison = await XRayApi.metric_compare({ metricId1, metricId2 })
return comparison
} catch (error) {
console.error(error)
}
}
-)
+})
+
+
+
+*/
export const FETCH_SEGMENT_TABLE_FIELD_COMPARISON = 'metabase/xray/FETCH_SEGMENT_TABLE_FIELD_COMPARISON';
export const fetchSegmentTableFieldComparison = createThunkAction(
@@ -148,6 +164,7 @@ export const fetchSegmentTableFieldComparison = createThunkAction(
(requestParams) =>
async (dispatch) => {
requestParams.cost = COSTS[requestParams.cost].method
+ dispatch(startLoad())
try {
const comparison = await XRayApi.segment_table_field_compare(requestParams)
return dispatch(loadComparison(comparison))
@@ -163,6 +180,7 @@ export const fetchSegmentFieldComparison = createThunkAction(
(requestParams) =>
async (dispatch) => {
requestParams.cost = COSTS[requestParams.cost].method
+ dispatch(startLoad())
try {
const comparison = await XRayApi.segment_field_compare(requestParams)
return dispatch(loadComparison(comparison))
@@ -172,27 +190,34 @@ export const fetchSegmentFieldComparison = createThunkAction(
}
)
+export const START_LOAD = 'metabase/xray/START_LOAD'
+export const startLoad = createAction(START_LOAD)
+
+export const LOAD_XRAY = 'metabase/xray/LOAD_XRAY'
+export const loadXray = createAction(LOAD_XRAY)
+
export const LOAD_COMPARISON = 'metabase/xray/LOAD_COMPARISON'
export const loadComparison = createAction(LOAD_COMPARISON)
export default handleActions({
- [FETCH_FIELD_XRAY]: {
- next: (state, { payload }) => assoc(state, 'fieldXray', payload)
- },
- [FETCH_TABLE_XRAY]: {
- next: (state, { payload }) => assoc(state, 'tableXray', payload)
- },
- [FETCH_CARD_XRAY]: {
- next: (state, { payload }) => assoc(state, 'cardXray', payload)
+ [START_LOAD]: {
+ next: (state, { payload }) => assoc(state, 'loading', true)
},
- [FETCH_SEGMENT_XRAY]: {
- next: (state, { payload }) => assoc(state, 'segmentXray', payload)
- },
- [FETCH_FIELD_COMPARISON]: {
- next: (state, { payload }) => assoc(state, 'fieldComparison', payload)
+ [LOAD_XRAY]: {
+ next: (state, { payload }) =>
+ chain(state)
+ .assoc('xray', payload)
+ .assoc('loading', false)
+ .value()
},
[LOAD_COMPARISON]: {
- next: (state, { payload }) => assoc(state, 'comparison', payload)
+ next: (state, { payload }) =>
+ chain(state)
+ .assoc('comparison', payload)
+ .assoc('loading', false)
+ .value()
}
-}, {})
+}, {
+ loading: false
+})
diff --git a/frontend/test/__support__/integrated_tests.js b/frontend/test/__support__/integrated_tests.js
index 2ad04fd77af5a1bdeee2b12526d2a7ea0c0f41a6..fa936d68c4ec545fa63f007f98bd42698aff5366 100644
--- a/frontend/test/__support__/integrated_tests.js
+++ b/frontend/test/__support__/integrated_tests.js
@@ -40,6 +40,8 @@ let hasFinishedCreatingStore = false
let loginSession = null; // Stores the current login session
let previousLoginSession = null;
let simulateOfflineMode = false;
+let apiRequestCompletedCallback = null;
+let skippedApiRequests = [];
/**
* Login to the Metabase test instance with default credentials
@@ -324,6 +326,33 @@ export const createSavedQuestion = async (unsavedQuestion) => {
return savedQuestion
}
+/**
+ * Waits for a API request with a given method (GET/POST/PUT...) and a url which matches the given regural expression.
+ * Useful in those relatively rare situations where React components do API requests inline instead of using Redux actions.
+ */
+export const waitForRequestToComplete = (method, urlRegex, { timeout = 5000 } = {}) => {
+ skippedApiRequests = []
+ return new Promise((resolve, reject) => {
+ const completionTimeoutId = setTimeout(() => {
+ reject(
+ new Error(
+ `API request ${method} ${urlRegex} wasn't completed within ${timeout}ms.\n` +
+ `Other requests during that time period:\n${skippedApiRequests.join("\n") || "No requests"}`
+ )
+ )
+ }, timeout)
+
+ apiRequestCompletedCallback = (requestMethod, requestUrl) => {
+ if (requestMethod === method && urlRegex.test(requestUrl)) {
+ clearTimeout(completionTimeoutId)
+ resolve()
+ } else {
+ skippedApiRequests.push(`${requestMethod} ${requestUrl}`)
+ }
+ }
+ })
+}
+
// Patches the metabase/lib/api module so that all API queries contain the login credential cookie.
// Needed because we are not in a real web browser environment.
api._makeRequest = async (method, url, headers, requestBody, data, options) => {
@@ -361,6 +390,7 @@ api._makeRequest = async (method, url, headers, requestBody, data, options) => {
resultBody = JSON.parse(resultBody);
} catch (e) {}
+ apiRequestCompletedCallback && setTimeout(() => apiRequestCompletedCallback(method, url), 0)
if (result.status >= 200 && result.status <= 299) {
if (options.transformResponse) {
@@ -376,6 +406,7 @@ api._makeRequest = async (method, url, headers, requestBody, data, options) => {
console.log(`The original request: ${method} ${url}`);
if (requestBody) console.log(`Original payload: ${requestBody}`);
}
+
throw error
}
}
diff --git a/frontend/test/admin/datamodel/FieldApp.integ.spec.js b/frontend/test/admin/datamodel/FieldApp.integ.spec.js
index cb4b6e6cfd84ca0eb771f0a9f01b8cfc50f73dd5..d39765569eb51c5be73ecd282b61aa3e3ea28527 100644
--- a/frontend/test/admin/datamodel/FieldApp.integ.spec.js
+++ b/frontend/test/admin/datamodel/FieldApp.integ.spec.js
@@ -331,7 +331,7 @@ describe("FieldApp", () => {
expect(section.find(RemappingNamingTip).length).toBe(1)
dispatchBrowserEvent('mousedown', { e: { target: document.documentElement }})
- await delay(10); // delay needed because of setState in FieldApp
+ await delay(300); // delay needed because of setState in FieldApp; app.update() does not work for whatever reason
expect(section.find(".text-danger").length).toBe(1) // warning that you should choose a column
})
diff --git a/frontend/test/dashboard/dashboard.integ.spec.js b/frontend/test/dashboard/dashboard.integ.spec.js
index 186582917e07455089dbd6deaebd460c8847100e..b43f2fc00caa641908dd6a391fb49b738c696e1a 100644
--- a/frontend/test/dashboard/dashboard.integ.spec.js
+++ b/frontend/test/dashboard/dashboard.integ.spec.js
@@ -9,7 +9,7 @@ import {
import { DashboardApi, PublicApi } from "metabase/services";
import * as Urls from "metabase/lib/urls";
-import { getParameterFieldValues } from "metabase/selectors/metadata";
+import { makeGetMergedParameterFieldValues } from "metabase/selectors/metadata";
import { ADD_PARAM_VALUES } from "metabase/redux/metadata";
import { mount } from "enzyme";
import {
@@ -87,14 +87,14 @@ describe("Dashboard", () => {
await store.dispatch(fetchDashboard('6e59cc97-3b6a-4bb6-9e7a-5efeee27e40f'));
await store.waitForActions(ADD_PARAM_VALUES)
- const fieldValues = await getParameterFieldValues(store.getState(), { parameter: { field_id: 21 }});
+ const getMergedParameterFieldValues = makeGetMergedParameterFieldValues();
+ const fieldValues = await getMergedParameterFieldValues(store.getState(), { parameter: { field_ids: [ 21 ] }});
expect(fieldValues).toEqual([["Doohickey"], ["Gadget"], ["Gizmo"], ["Widget"]]);
})
})
})
// Converted from Selenium E2E test
-
describe("dashboard page", () => {
let dashboardId = null;
@@ -123,7 +123,7 @@ describe("Dashboard", () => {
clickButton(app.find(EditBar).find(".Button--primary.Button"));
await store.waitForActions([SAVE_DASHBOARD_AND_CARDS, FETCH_DASHBOARD])
- await delay(200)
+ await delay(500)
expect(app.find(DashboardHeader).text()).toMatch(/Customer Analysis Paralysis/)
});
diff --git a/frontend/test/dashboard/selectors.unit.spec.js b/frontend/test/dashboard/selectors.unit.spec.js
index f82406887e8e5009aae93c81e36b910ed05e6401..4f1b3ba5dc80fcaf1d61553cd31088cce79e0f50 100644
--- a/frontend/test/dashboard/selectors.unit.spec.js
+++ b/frontend/test/dashboard/selectors.unit.spec.js
@@ -42,7 +42,7 @@ describe("dashboard/selectors", () => {
.value();
expect(getParameters(state)).toEqual([{
id: 1,
- field_id: null
+ field_ids: []
}]);
})
it("should not include field id with one mapping, no field id", () => {
@@ -56,7 +56,7 @@ describe("dashboard/selectors", () => {
.value();
expect(getParameters(state)).toEqual([{
id: 1,
- field_id: null
+ field_ids: []
}]);
})
it("should include field id with one mappings, with field id", () => {
@@ -70,7 +70,7 @@ describe("dashboard/selectors", () => {
.value();
expect(getParameters(state)).toEqual([{
id: 1,
- field_id: 1
+ field_ids: [1]
}]);
})
it("should include field id with two mappings, with same field id", () => {
@@ -89,7 +89,7 @@ describe("dashboard/selectors", () => {
.value();
expect(getParameters(state)).toEqual([{
id: 1,
- field_id: 1
+ field_ids: [1]
}]);
})
it("should include field id with two mappings, one with field id, one without", () => {
@@ -108,10 +108,10 @@ describe("dashboard/selectors", () => {
.value();
expect(getParameters(state)).toEqual([{
id: 1,
- field_id: 1
+ field_ids: [1]
}]);
})
- it("should not include field id with two mappings, with different field ids", () => {
+ it("should include all field ids with two mappings, with different field ids", () => {
const state = chain(STATE)
.assocIn(["dashboard", "dashboards", 0, "parameters", 0], { id: 1 })
.assocIn(["dashboard", "dashcards", 0, "parameter_mappings", 0], {
@@ -127,7 +127,7 @@ describe("dashboard/selectors", () => {
.value();
expect(getParameters(state)).toEqual([{
id: 1,
- field_id: null
+ field_ids: [1, 2]
}]);
})
})
diff --git a/frontend/test/dashboards/dashboards.integ.spec.js b/frontend/test/dashboards/dashboards.integ.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..6df983d47973ee0dafef2950506b7a115d4e18e9
--- /dev/null
+++ b/frontend/test/dashboards/dashboards.integ.spec.js
@@ -0,0 +1,122 @@
+import {
+ createTestStore,
+ login
+} from "__support__/integrated_tests";
+import {
+ click,
+ clickButton,
+ setInputValue
+} from "__support__/enzyme_utils"
+
+import { mount } from "enzyme";
+import { FETCH_ARCHIVE, FETCH_DASHBOARDS, SET_ARCHIVED, SET_FAVORITED } from "metabase/dashboards/dashboards";
+import CreateDashboardModal from "metabase/components/CreateDashboardModal";
+import { FETCH_DASHBOARD } from "metabase/dashboard/dashboard";
+import { DashboardApi } from "metabase/services";
+import { DashboardListItem } from "metabase/dashboards/components/DashboardList";
+import SearchHeader from "metabase/components/SearchHeader";
+import EmptyState from "metabase/components/EmptyState";
+import Dashboard from "metabase/dashboard/components/Dashboard";
+import ListFilterWidget from "metabase/components/ListFilterWidget";
+import ArchivedItem from "metabase/components/ArchivedItem";
+
+describe("dashboards list", () => {
+ beforeAll(async () => {
+ await login();
+ })
+
+ afterAll(async () => {
+ const dashboardIds = (await DashboardApi.list())
+ .filter((dash) => !dash.archived)
+ .map((dash) => dash.id)
+
+ await Promise.all(dashboardIds.map((id) => DashboardApi.update({ id, archived: true })))
+ })
+
+ it("should let you create a dashboard when there are no existing dashboards", async () => {
+ const store = await createTestStore();
+ store.pushPath("/dashboards")
+ const app = mount(store.getAppContainer());
+
+ await store.waitForActions([FETCH_DASHBOARDS])
+
+ // // Create a new dashboard in the empty state (EmptyState react component)
+ click(app.find(".Button.Button--primary"))
+ // click(app.find(".Icon.Icon-add"))
+
+ const modal = app.find(CreateDashboardModal)
+
+ setInputValue(modal.find('input[name="name"]'), "Customer Feedback Analysis")
+ setInputValue(modal.find('input[name="description"]'), "For seeing the usual response times, feedback topics, our response rate, how often customers are directed to our knowledge base instead of providing a customized response")
+ clickButton(modal.find(".Button--primary"))
+
+ // should navigate to dashboard page
+ await store.waitForActions(FETCH_DASHBOARD)
+ expect(app.find(Dashboard).length).toBe(1)
+ })
+
+ it("should let you create a dashboard when there are existing dashboards", async () => {
+ // Return to the dashboard list and check that we see an expected list item
+ const store = await createTestStore();
+ store.pushPath("/dashboards")
+ const app = mount(store.getAppContainer());
+
+ await store.waitForActions([FETCH_DASHBOARDS])
+ expect(app.find(DashboardListItem).length).toBe(1)
+
+ // Create another one
+ click(app.find(".Icon.Icon-add"))
+ const modal2 = app.find(CreateDashboardModal)
+ setInputValue(modal2.find('input[name="name"]'), "Some Excessively Long Dashboard Title Just For Fun")
+ setInputValue(modal2.find('input[name="description"]'), "")
+ clickButton(modal2.find(".Button--primary"))
+
+ await store.waitForActions(FETCH_DASHBOARD)
+ })
+
+ it("should let you search form both title and description", async () => {
+ const store = await createTestStore();
+ store.pushPath("/dashboards")
+ const app = mount(store.getAppContainer());
+ await store.waitForActions([FETCH_DASHBOARDS])
+
+ setInputValue(app.find(SearchHeader).find("input"), "this should produce no results")
+ expect(app.find(EmptyState).length).toBe(1)
+
+ // Should search from both title and description
+ setInputValue(app.find(SearchHeader).find("input"), "usual response times")
+ expect(app.find(DashboardListItem).text()).toMatch(/Customer Feedback Analysis/)
+ })
+
+ it("should let you favorite and unfavorite dashboards", async () => {
+ const store = await createTestStore();
+ store.pushPath("/dashboards")
+ const app = mount(store.getAppContainer());
+ await store.waitForActions([FETCH_DASHBOARDS])
+
+ click(app.find(DashboardListItem).first().find(".Icon-staroutline"));
+ await store.waitForActions([SET_FAVORITED])
+ click(app.find(ListFilterWidget))
+
+ click(app.find(".TestPopover").find('h4[children="Favorites"]'))
+
+ click(app.find(DashboardListItem).first().find(".Icon-star").first());
+ await store.waitForActions([SET_FAVORITED])
+ expect(app.find(EmptyState).length).toBe(1)
+ })
+
+ it("should let you archive and unarchive dashboards", async () => {
+ const store = await createTestStore();
+ store.pushPath("/dashboards")
+ const app = mount(store.getAppContainer());
+ await store.waitForActions([FETCH_DASHBOARDS])
+
+ click(app.find(DashboardListItem).first().find(".Icon-archive"));
+ await store.waitForActions([SET_ARCHIVED])
+
+ click(app.find(".Icon-viewArchive"))
+ await store.waitForActions([FETCH_ARCHIVE])
+ expect(app.find(ArchivedItem).length).toBeGreaterThan(0)
+ });
+
+});
diff --git a/frontend/test/legacy-selenium/dashboards/dashboards.spec.js b/frontend/test/legacy-selenium/dashboards/dashboards.spec.js
deleted file mode 100644
index 673cd3870032a4bbcd61c7d8412aa387df864ad9..0000000000000000000000000000000000000000
--- a/frontend/test/legacy-selenium/dashboards/dashboards.spec.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* eslint-disable */
-// NOTE Atte Keinänen 28/8/17: Should be converted to Jest/Enzyme, should be pretty straight-forward.
-import {
- ensureLoggedIn,
- describeE2E
-} from "../support/utils";
-
-import {
- createDashboardInEmptyState, getLatestDashboardUrl, getPreviousDashboardUrl,
- incrementDashboardCount, removeCurrentDash
-} from "./dashboards.utils"
-
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
-
-describeE2E("dashboards/dashboards", () => {
- describe("dashboards list", () => {
- beforeEach(async () => {
- await ensureLoggedIn(server, driver, "bob@metabase.com", "12341234");
- });
-
- // TODO Atte Keinänen 6/22/17: Failing test, disabled until converted to use Jest and Enzyme
- xit("should let you create new dashboards, see them, filter them and enter them", async () => {
- await d.get("/dashboards");
- await d.screenshot("screenshots/dashboards.png");
-
- await createDashboardInEmptyState();
-
- // Return to the dashboard list and re-enter the card through the list item
- await driver.get(`${server.host}/dashboards`);
- await d.select(".Grid-cell > a").wait().click();
- await d.waitUrl(getLatestDashboardUrl());
-
- // Create another one
- await d.get(`${server.host}/dashboards`);
- await d.select(".Icon.Icon-add").wait().click();
- await d.select("#CreateDashboardModal input[name='name']").wait().sendKeys("Some Excessively Long Dashboard Title Just For Fun");
- await d.select("#CreateDashboardModal input[name='description']").wait().sendKeys("");
- await d.select("#CreateDashboardModal .Button--primary").wait().click();
- incrementDashboardCount();
- await d.waitUrl(getLatestDashboardUrl());
-
- // Test filtering
- await d.get(`${server.host}/dashboards`);
- await d.select("input[type='text']").wait().sendKeys("this should produce no results");
- await d.select("img[src*='empty_dashboard']");
-
- // Should search from both title and description
- await d.select("input[type='text']").wait().clear().sendKeys("usual response times");
- await d.select(".Grid-cell > a").wait().click();
- await d.waitUrl(getPreviousDashboardUrl(1));
-
- // Should be able to favorite and unfavorite dashboards
- await d.get("/dashboards")
- await d.select(".Grid-cell > a .favoriting-button").wait().click();
-
- await d.select(":react(ListFilterWidget)").wait().click();
- await d.select(".PopoverBody--withArrow li > h4:contains(Favorites)").wait().click();
- await d.select(".Grid-cell > a .favoriting-button").wait().click();
- await d.select("img[src*='empty_dashboard']");
-
- await d.select(":react(ListFilterWidget)").wait().click();
- await d.select(".PopoverBody--withArrow li > h4:contains(All dashboards)").wait().click();
-
- // Should be able to archive and unarchive dashboards
- // TODO: How to test objects that are in hover?
- // await d.select(".Grid-cell > a .archival-button").wait().click();
- // await d.select(".Icon.Icon-viewArchive").wait().click();
-
- // Remove the created dashboards to prevent clashes with other tests
- await d.get(getPreviousDashboardUrl(1));
- await removeCurrentDash();
- // Should return to dashboard page where only one dash left
- await d.select(".Grid-cell > a").wait().click();
- await removeCurrentDash();
- });
-
- });
-});
diff --git a/frontend/test/legacy-selenium/dashboards/dashboards.utils.js b/frontend/test/legacy-selenium/dashboards/dashboards.utils.js
deleted file mode 100644
index 726e4072fb979f9ea8ed764263920f8ca41fece8..0000000000000000000000000000000000000000
--- a/frontend/test/legacy-selenium/dashboards/dashboards.utils.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint-disable */
-export var dashboardCount = 0
-export const incrementDashboardCount = () => {
- dashboardCount += 1;
-}
-export const getLatestDashboardUrl = () => {
- return `/dashboard/${dashboardCount}`
-}
-export const getPreviousDashboardUrl = (nFromLatest) => {
- return `/dashboard/${dashboardCount - nFromLatest}`
-}
-
-export const createDashboardInEmptyState = async () => {
- await d.get("/dashboards");
-
- // Create a new dashboard in the empty state (EmptyState react component)
- await d.select(".Button.Button--primary").wait().click();
- await d.select("#CreateDashboardModal input[name='name']").wait().sendKeys("Customer Feedback Analysis");
- await d.select("#CreateDashboardModal input[name='description']").wait().sendKeys("For seeing the usual response times, feedback topics, our response rate, how often customers are directed to our knowledge base instead of providing a customized response");
- await d.select("#CreateDashboardModal .Button--primary").wait().click();
-
- incrementDashboardCount();
- await d.waitUrl(getLatestDashboardUrl());
-
-}
-
-export const removeCurrentDash = async () => {
- await d.select(".Icon.Icon-pencil").wait().click();
- await d.select(".EditHeader .flex-align-right a:nth-of-type(2)").wait().click();
- await d.select(".Button.Button--danger").wait().click();
-}
\ No newline at end of file
diff --git a/frontend/test/parameters/parameters.integ.spec.js b/frontend/test/parameters/parameters.integ.spec.js
index f3676b6befcf9afb02d7550ae7845364241c73aa..4fa3d350303b94c4ae3c01ac2ebce87a47b5797d 100644
--- a/frontend/test/parameters/parameters.integ.spec.js
+++ b/frontend/test/parameters/parameters.integ.spec.js
@@ -3,7 +3,8 @@ import {
login,
logout,
createTestStore,
- restorePreviousLogin
+ restorePreviousLogin,
+ waitForRequestToComplete
} from "__support__/integrated_tests";
import {
click, clickButton,
@@ -138,7 +139,7 @@ describe("parameters", () => {
await store.waitForActions([UPDATE_TEMPLATE_TAG]);
- await delay(100);
+ await delay(500);
setInputValue(tagEditorSidebar.find(".TestPopoverBody .AdminSelect").first(), "cat")
const categoryRow = tagEditorSidebar.find(".TestPopoverBody .ColumnarSelector-row").first();
@@ -173,7 +174,7 @@ describe("parameters", () => {
click(app.find('#QuestionSavedModal .Button[children="Not now"]'))
// wait for modal to close :'(
- await delay(200);
+ await delay(500);
// open sharing panel
click(app.find(".Icon-share"));
@@ -186,7 +187,7 @@ describe("parameters", () => {
click(app.find(".TestPopoverBody .Icon-pencil"))
- await delay(200);
+ await delay(500);
click(app.find("div[children='Publish']"));
await store.waitForActions([UPDATE_ENABLE_EMBEDDING, UPDATE_EMBEDDING_PARAMS])
@@ -208,40 +209,42 @@ describe("parameters", () => {
describe("as an anonymous user", () => {
beforeAll(() => logout());
- async function runSharedQuestionTests(store, questionUrl) {
+ async function runSharedQuestionTests(store, questionUrl, apiRegex) {
store.pushPath(questionUrl);
const app = mount(store.getAppContainer())
await store.waitForActions([ADD_PARAM_VALUES]);
- // Loading the query results is done in PublicQuestion itself so we have to add a delay here
- await delay(200);
-
- expect(app.find(Scalar).text()).toBe(COUNT_ALL + "sql parametrized");
+ // Loading the query results is done in PublicQuestion itself so we have to listen to API request instead of Redux action
+ await waitForRequestToComplete("GET", apiRegex)
+ // use `update()` because of setState
+ expect(app.update().find(Scalar).text()).toBe(COUNT_ALL + "sql parametrized");
// manually click parameter (sadly the query results loading happens inline again)
click(app.find(Parameters).find("a").first());
click(app.find(CategoryWidget).find('li[children="Doohickey"]'));
- await delay(200);
- expect(app.find(Scalar).text()).toBe(COUNT_DOOHICKEY + "sql parametrized");
+
+ await waitForRequestToComplete("GET", apiRegex)
+ expect(app.update().find(Scalar).text()).toBe(COUNT_DOOHICKEY + "sql parametrized");
// set parameter via url
store.pushPath("/"); // simulate a page reload by visiting other page
store.pushPath(questionUrl + "?category=Gadget");
- await delay(500);
- expect(app.find(Scalar).text()).toBe(COUNT_GADGET + "sql parametrized");
+ await waitForRequestToComplete("GET", apiRegex)
+ // use `update()` because of setState
+ expect(app.update().find(Scalar).text()).toBe(COUNT_GADGET + "sql parametrized");
}
it("should allow seeing an embedded question", async () => {
if (!embedUrl) throw new Error("This test fails because previous tests didn't produce an embed url.")
const embedUrlTestStore = await createTestStore({ embedApp: true });
- await runSharedQuestionTests(embedUrlTestStore, embedUrl)
+ await runSharedQuestionTests(embedUrlTestStore, embedUrl, new RegExp("/api/embed/card/.*/query"))
})
it("should allow seeing a public question", async () => {
if (!publicUrl) throw new Error("This test fails because previous tests didn't produce a public url.")
const publicUrlTestStore = await createTestStore({ publicApp: true });
- await runSharedQuestionTests(publicUrlTestStore, publicUrl)
+ await runSharedQuestionTests(publicUrlTestStore, publicUrl, new RegExp("/api/public/card/.*/query"))
})
// I think it's cleanest to restore the login here so that there are no surprises if you want to add tests
diff --git a/frontend/test/query_builder/new_question.integ.spec.js b/frontend/test/query_builder/new_question.integ.spec.js
index fd551acfdd6ec4cf9890ccdeedb69cf805873eb4..02beb54193a15875c46bd0579bfadcc1200c3e2b 100644
--- a/frontend/test/query_builder/new_question.integ.spec.js
+++ b/frontend/test/query_builder/new_question.integ.spec.js
@@ -10,7 +10,6 @@ import EntitySearch, {
SearchResultsGroup
} from "metabase/containers/EntitySearch";
-import FilterWidget from "metabase/query_builder/components/filters/FilterWidget";
import AggregationWidget from "metabase/query_builder/components/AggregationWidget";
import {
@@ -86,7 +85,7 @@ describe("new question flow", async () => {
await store.waitForActions([RESET_QUERY, FETCH_METRICS, FETCH_SEGMENTS]);
await store.waitForActions([SET_REQUEST_STATE]);
- expect(app.find(NewQueryOption).length).toBe(4)
+ expect(app.find(NewQueryOption).length).toBe(3)
});
it("lets you start a custom gui question", async () => {
const store = await createTestStore()
@@ -156,36 +155,6 @@ describe("new question flow", async () => {
app.find(AggregationWidget).find(".View-section-aggregation").text()
).toBe("A Metric")
})
-
- it("lets you start a question from a segment", async () => {
- const store = await createTestStore()
-
- store.pushPath(Urls.newQuestion());
- const app = mount(store.getAppContainer());
- await store.waitForActions([RESET_QUERY, FETCH_METRICS, FETCH_SEGMENTS]);
- await store.waitForActions([SET_REQUEST_STATE]);
-
- click(app.find(NewQueryOption).filterWhere((c) => c.prop('title') === "Segments"))
- await store.waitForActions(FETCH_DATABASES);
- await store.waitForActions([SET_REQUEST_STATE]);
- expect(store.getPath()).toBe("/question/new/segment")
-
- const entitySearch = app.find(EntitySearch)
- const viewByTable = entitySearch.find(SearchGroupingOption).at(1)
- expect(viewByTable.text()).toBe("Table");
- click(viewByTable)
- expect(store.getPath()).toBe("/question/new/segment?grouping=table")
-
- const group = entitySearch.find(SearchResultsGroup)
- .filterWhere((group) => group.prop('groupName') === "Orders")
-
- const metricSearchResult = group.find(SearchResultListItem)
- .filterWhere((item) => /A Segment/.test(item.text()))
- click(metricSearchResult.childAt(0))
-
- await store.waitForActions([INITIALIZE_QB, QUERY_COMPLETED]);
- expect(app.find(FilterWidget).find(".Filter-section-value").text()).toBe("A Segment")
- })
})
describe("a newer instance", () => {
diff --git a/frontend/test/query_builder/query_builder.integ.spec.js b/frontend/test/query_builder/query_builder.integ.spec.js
index a0256f2e68d16aa3bf46baee0bc96e37bda4fef8..bd12ac131a14366fb42263b745b1f0f31bbcca53 100644
--- a/frontend/test/query_builder/query_builder.integ.spec.js
+++ b/frontend/test/query_builder/query_builder.integ.spec.js
@@ -90,10 +90,6 @@ describe("QueryBuilder", () => {
await login()
})
- /**
- * Simple tests for seeing if the query builder renders without errors
- */
-
describe("visualization settings", () => {
it("lets you hide a field for a raw data table", async () => {
const { store, qb } = await initQBWithReviewsTable();
diff --git a/frontend/test/reference/guide.integ.spec.js b/frontend/test/reference/guide.integ.spec.js
index 36f56bc79f6e3eb6485c57a7489a2d20b7eb4a34..6800143c1c841a681da02550b7e133cad4c85ba2 100644
--- a/frontend/test/reference/guide.integ.spec.js
+++ b/frontend/test/reference/guide.integ.spec.js
@@ -21,10 +21,10 @@ import GettingStartedGuideContainer from "metabase/reference/guide/GettingStarte
describe("The Reference Section", () => {
// Test data
const segmentDef = {name: "A Segment", description: "I did it!", table_id: 1, show_in_getting_started: true,
- definition: {database: 1, query: {filter: ["abc"]}}}
+ definition: { source_table: 1, filter: ["time-interval", ["field-id", 1], -30, "day"] }}
const anotherSegmentDef = {name: "Another Segment", description: "I did it again!", table_id: 1, show_in_getting_started: true,
- definition:{database: 1, query: {filter: ["def"]}}}
+ definition: { source_table: 1, filter: ["time-interval", ["field-id", 1], -30, "day"] } }
const metricDef = {name: "A Metric", description: "I did it!", table_id: 1,show_in_getting_started: true,
definition: {database: 1, query: {aggregation: ["count"]}}}
diff --git a/frontend/test/reference/segments.integ.spec.js b/frontend/test/reference/segments.integ.spec.js
index c455caefa324b6c7cfe58f9ea57a9f122beb8050..2e0897ba9b8b0aa0fd16fc327302dd2a69c737f8 100644
--- a/frontend/test/reference/segments.integ.spec.js
+++ b/frontend/test/reference/segments.integ.spec.js
@@ -28,12 +28,12 @@ import SegmentFieldDetailContainer from "metabase/reference/segments/SegmentFiel
describe("The Reference Section", () => {
// Test data
const segmentDef = {name: "A Segment", description: "I did it!", table_id: 1, show_in_getting_started: true,
- definition: {database: 1, query: {filter: ["abc"]}}}
+ definition: {source_table: 1, filter: ["time-interval", ["field-id", 1], -30, "day"]}}
const anotherSegmentDef = {name: "Another Segment", description: "I did it again!", table_id: 1, show_in_getting_started: true,
- definition:{database: 1, query: {filter: ["def"]}}}
+ definition:{source_table: 1, filter: ["time-interval", ["field-id", 1], -15, "day"]}}
- const segmentCardDef = { name :"A card", display: "scalar",
+ const segmentCardDef = { name :"A card", display: "scalar",
dataset_query: {database: 1, table_id: 1, type: "query", query: {source_table: 1, "aggregation": ["count"], "filter": ["segment", 1]}},
visualization_settings: {}}
diff --git a/frontend/test/selectors/metadata.integ.spec.js b/frontend/test/selectors/metadata.integ.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2b8c43480ed863615d41c2e8342030b0ae0bdfb
--- /dev/null
+++ b/frontend/test/selectors/metadata.integ.spec.js
@@ -0,0 +1,76 @@
+import { createTestStore, login } from "__support__/integrated_tests";
+import {
+ deleteFieldDimension, fetchTableMetadata,
+ updateFieldDimension,
+ updateFieldValues,
+} from "metabase/redux/metadata";
+import { makeGetMergedParameterFieldValues } from "metabase/selectors/metadata";
+
+const REVIEW_RATING_ID = 33;
+const PRODUCT_CATEGORY_ID = 21;
+
+// NOTE Atte Keinänen 9/14/17: A hybrid of an integration test and a method unit test
+// I wanted to use a real state tree and have a realistic field remapping scenario
+
+describe('makeGetMergedParameterFieldValues', () => {
+ beforeAll(async () => {
+ await login();
+
+ // add remapping
+ const store = await createTestStore()
+
+ await store.dispatch(updateFieldDimension(REVIEW_RATING_ID, {
+ type: "internal",
+ name: "Rating Description",
+ human_readable_field_id: null
+ }));
+ await store.dispatch(updateFieldValues(REVIEW_RATING_ID, [
+ [1, 'Awful'], [2, 'Unpleasant'], [3, 'Meh'], [4, 'Enjoyable'], [5, 'Perfecto']
+ ]));
+ })
+
+ afterAll(async () => {
+ const store = await createTestStore()
+
+ await store.dispatch(deleteFieldDimension(REVIEW_RATING_ID));
+ await store.dispatch(updateFieldValues(REVIEW_RATING_ID, [
+ [1, '1'], [2, '2'], [3, '3'], [4, '4'], [5, '5']
+ ]));
+ })
+
+ it("should return empty array if no field ids", async () => {
+ const store = await createTestStore()
+ await store.dispatch(fetchTableMetadata(3))
+
+ const getMergedParameterFieldValues = makeGetMergedParameterFieldValues()
+ expect(
+ getMergedParameterFieldValues(store.getState(), { parameter: { field_ids: [] } })
+ ).toEqual([])
+
+ })
+
+ it("should return the original field values if a single field id", async () => {
+ const store = await createTestStore()
+ await store.dispatch(fetchTableMetadata(3))
+
+ const getMergedParameterFieldValues = makeGetMergedParameterFieldValues()
+ expect(
+ getMergedParameterFieldValues(store.getState(), { parameter: { field_ids: [PRODUCT_CATEGORY_ID] } })
+ ).toEqual([ [ 'Doohickey' ], [ 'Gadget' ], [ 'Gizmo' ], [ 'Widget' ] ])
+ })
+
+ it("should merge and sort field values if multiple field ids", async () => {
+ const store = await createTestStore()
+ await store.dispatch(fetchTableMetadata(3))
+ await store.dispatch(fetchTableMetadata(4))
+
+ const getMergedParameterFieldValues = makeGetMergedParameterFieldValues()
+ expect(
+ getMergedParameterFieldValues(store.getState(), { parameter: { field_ids: [PRODUCT_CATEGORY_ID, REVIEW_RATING_ID] } })
+ ).toEqual([
+ [1, 'Awful'], ['Doohickey'], [4, 'Enjoyable'], ['Gadget'],
+ ['Gizmo'], [3, 'Meh'], [5, 'Perfecto'], [2, 'Unpleasant'], ['Widget']
+ ])
+ })
+})
+
diff --git a/frontend/test/setup/signup.integ.spec.js b/frontend/test/setup/signup.integ.spec.js
index 1206b3d9fd33622982bc9717e761bb5689a7f20e..aa8fa3eddcf96c53aac314b1c9302cf80a445daf 100644
--- a/frontend/test/setup/signup.integ.spec.js
+++ b/frontend/test/setup/signup.integ.spec.js
@@ -85,7 +85,7 @@ describe("setup wizard", () => {
setInputValue(userStep.find('input[name="password_confirm"]'), strongPassword)
// Due to the chained setState calls in UserStep we have to add a tiny delay here
- await delay(50);
+ await delay(500);
expect(nextButton.props().disabled).toBe(false)
clickButton(nextButton);
@@ -105,6 +105,9 @@ describe("setup wizard", () => {
})
it("should allow you to set connection settings for a new database", async () => {
+ // Try to address a rare test failure where `chooseSelectOption` fails because it couldn't find its parent option
+ app.update()
+
const databaseStep = app.find(DatabaseConnectionStep)
expect(databaseStep.find('.SetupStep--active').length).toBe(1)
diff --git a/frontend/test/xray/xray.integ.spec.js b/frontend/test/xray/xray.integ.spec.js
index c1745d1a3624463d5106507503f415cdebbdbdeb..dab7771614392ddeac6888c576eb53ffa8660bed 100644
--- a/frontend/test/xray/xray.integ.spec.js
+++ b/frontend/test/xray/xray.integ.spec.js
@@ -8,10 +8,10 @@ import {
} from "__support__/enzyme_utils"
import { mount } from "enzyme";
-import { CardApi, SegmentApi } from "metabase/services";
+import { CardApi, SegmentApi, SettingsApi } from "metabase/services";
import { delay } from "metabase/lib/promise";
-import { FETCH_CARD_XRAY, FETCH_SEGMENT_XRAY, FETCH_TABLE_XRAY } from "metabase/xray/xray";
+import { FETCH_CARD_XRAY, FETCH_SEGMENT_XRAY, FETCH_TABLE_XRAY, LOAD_XRAY } from "metabase/xray/xray";
import TableXRay from "metabase/xray/containers/TableXRay";
import CostSelect from "metabase/xray/components/CostSelect";
import Constituent from "metabase/xray/components/Constituent";
@@ -22,6 +22,17 @@ import * as Urls from "metabase/lib/urls";
import { INITIALIZE_QB, QUERY_COMPLETED } from "metabase/query_builder/actions";
import ActionsWidget from "metabase/query_builder/components/ActionsWidget";
+// settings related actions for testing xray administration
+import { INITIALIZE_SETTINGS, UPDATE_SETTING } from "metabase/admin/settings/settings";
+import { LOAD_CURRENT_USER } from "metabase/redux/user";
+import { END_LOADING } from "metabase/reference/reference";
+
+import { getXrayEnabled, getMaxCost } from "metabase/xray/selectors";
+
+import Icon from "metabase/components/Icon"
+import Toggle from "metabase/components/Toggle"
+import SettingsXrayForm from "metabase/admin/settings/components/SettingsXrayForm";
+
describe("xray integration tests", () => {
let segmentId = null;
let timeBreakoutQuestion = null;
@@ -31,7 +42,7 @@ describe("xray integration tests", () => {
await login()
const segmentDef = {name: "A Segment", description: "For testing xrays", table_id: 1, show_in_getting_started: true,
- definition: {database: 1, source_table: 1, query: {filter: ["time-interval", ["field-id", 1], -30, "day"]}}}
+ definition: { source_table: 1, filter: ["time-interval", ["field-id", 1], -30, "day"] }}
segmentId = (await SegmentApi.create(segmentDef)).id;
timeBreakoutQuestion = await createSavedQuestion(
@@ -58,6 +69,7 @@ describe("xray integration tests", () => {
await SegmentApi.delete({ segmentId, revision_message: "Sadly this segment didn't enjoy a long life either" })
await CardApi.delete({cardId: timeBreakoutQuestion.id()})
await CardApi.delete({cardId: segmentQuestion.id()})
+ await SettingsApi.put({ key: 'enable-xrays' }, true)
})
describe("for table xray", async () => {
@@ -66,7 +78,7 @@ describe("xray integration tests", () => {
store.pushPath(`/xray/table/1/approximate`);
const app = mount(store.getAppContainer());
- await store.waitForActions(FETCH_TABLE_XRAY, { timeout: 20000 })
+ await store.waitForActions(FETCH_TABLE_XRAY, LOAD_XRAY, { timeout: 20000 })
const tableXRay = app.find(TableXRay)
expect(tableXRay.length).toBe(1)
@@ -81,7 +93,10 @@ describe("xray integration tests", () => {
describe("query builder actions", async () => {
it("let you see card xray for a timeseries question", async () => {
+ await SettingsApi.put({ key: 'enable-xrays', value: 'true' })
+ await SettingsApi.put({ key: 'xray-max-cost', value: 'extended' })
const store = await createTestStore()
+ // make sure xrays are on and at the proper cost
store.pushPath(Urls.question(timeBreakoutQuestion.id()))
const app = mount(store.getAppContainer());
@@ -95,7 +110,7 @@ describe("xray integration tests", () => {
click(xrayOptionIcon);
- await store.waitForActions(FETCH_CARD_XRAY, {timeout: 5000})
+ await store.waitForActions(FETCH_CARD_XRAY, LOAD_XRAY, {timeout: 5000})
expect(store.getPath()).toBe(`/xray/card/${timeBreakoutQuestion.id()}/extended`)
const cardXRay = app.find(CardXRay)
@@ -104,6 +119,7 @@ describe("xray integration tests", () => {
})
it("let you see segment xray for a question containing a segment", async () => {
+ await SettingsApi.put({ key: 'enable-xrays', value: true })
const store = await createTestStore()
store.pushPath(Urls.question(segmentQuestion.id()))
const app = mount(store.getAppContainer());
@@ -115,7 +131,7 @@ describe("xray integration tests", () => {
const xrayOptionIcon = actionsWidget.find('.Icon.Icon-beaker')
click(xrayOptionIcon);
- await store.waitForActions(FETCH_SEGMENT_XRAY, { timeout: 5000 })
+ await store.waitForActions(FETCH_SEGMENT_XRAY, LOAD_XRAY, { timeout: 5000 })
expect(store.getPath()).toBe(`/xray/segment/${segmentId}/approximate`)
const segmentXRay = app.find(SegmentXRay)
@@ -125,7 +141,147 @@ describe("xray integration tests", () => {
})
})
+ describe("admin management of xrays", async () => {
+ it("should allow an admin to manage xrays", async () => {
+ let app;
+
+ const store = await createTestStore()
+
+ store.pushPath('/admin/settings/x_rays')
+
+ app = mount(store.getAppContainer())
+
+ await store.waitForActions([LOAD_CURRENT_USER, INITIALIZE_SETTINGS])
+
+ const xraySettings = app.find(SettingsXrayForm)
+ const xrayToggle = xraySettings.find(Toggle)
+
+ // there should be a toggle
+ expect(xrayToggle.length).toEqual(1)
+
+ // things should be on
+ expect(getXrayEnabled(store.getState())).toEqual(true)
+ // the toggle should be on by default
+ expect(xrayToggle.props().value).toEqual(true)
+
+ // toggle the... toggle
+ click(xrayToggle)
+ await store.waitForActions([UPDATE_SETTING])
+
+ expect(getXrayEnabled(store.getState())).toEqual(false)
+
+ // navigate to a previosuly x-ray-able entity
+ store.pushPath(Urls.question(timeBreakoutQuestion.id()))
+ await store.waitForActions(INITIALIZE_QB, QUERY_COMPLETED)
+
+ // for some reason a delay is needed to get the full action suite
+ await delay(500);
+
+ const actionsWidget = app.find(ActionsWidget)
+ click(actionsWidget.childAt(0))
+
+ // there should not be an xray option
+ const xrayOptionIcon = actionsWidget.find('.Icon.Icon-beaker')
+ expect(xrayOptionIcon.length).toEqual(0)
+ })
+
+ it("should not show xray options for segments when xrays are disabled", async () => {
+ // turn off xrays
+ await SettingsApi.put({ key: 'enable-xrays', value: false })
+
+ const store = await createTestStore()
+
+ store.pushPath(Urls.question(segmentQuestion.id()))
+ const app = mount(store.getAppContainer())
+
+ await store.waitForActions(INITIALIZE_QB, QUERY_COMPLETED)
+ await delay(500);
+
+ const actionsWidget = app.find(ActionsWidget)
+ click(actionsWidget.childAt(0))
+ const xrayOptionIcon = actionsWidget.find('.Icon.Icon-beaker')
+ expect(xrayOptionIcon.length).toEqual(0)
+ })
+
+ it("should properly reflect the an admin set the max cost of xrays", async () => {
+ await SettingsApi.put({ key: 'enable-xrays', value: true })
+ const store = await createTestStore()
+
+ store.pushPath('/admin/settings/x_rays')
+
+ const app = mount(store.getAppContainer())
+
+ await store.waitForActions([LOAD_CURRENT_USER, INITIALIZE_SETTINGS])
+
+ const xraySettings = app.find(SettingsXrayForm)
+
+ expect(xraySettings.find(Icon).length).toEqual(3)
+
+ const approximate = xraySettings.find('.text-measure li').first()
+
+ click(approximate)
+ await store.waitForActions([UPDATE_SETTING])
+
+ expect(approximate.hasClass('text-brand')).toEqual(true)
+ expect(getMaxCost(store.getState())).toEqual('approximate')
+
+ store.pushPath(`/xray/table/1/approximate`);
+
+ await store.waitForActions(FETCH_TABLE_XRAY, { timeout: 20000 })
+ await delay(200)
+
+ const tableXRay = app.find(TableXRay)
+ expect(tableXRay.length).toBe(1)
+ expect(tableXRay.find(CostSelect).length).toBe(1)
+ // there should be two disabled states
+ expect(tableXRay.find('a.disabled').length).toEqual(2)
+ })
+
+ })
+ describe("data reference entry", async () => {
+ it("should be possible to access an Xray from the data reference", async () => {
+ // ensure xrays are on
+ await SettingsApi.put({ key: 'enable-xrays', value: true })
+ const store = await createTestStore()
+
+ store.pushPath('/reference/databases/1/tables/1')
+
+ const app = mount(store.getAppContainer())
+
+ await store.waitForActions([END_LOADING])
+
+ const xrayTableSideBarItem = app.find('.Icon.Icon-beaker')
+ expect(xrayTableSideBarItem.length).toEqual(1)
+
+ store.pushPath('/reference/databases/1/tables/1/fields/1')
+
+ await store.waitForActions([END_LOADING])
+ const xrayFieldSideBarItem = app.find('.Icon.Icon-beaker')
+ expect(xrayFieldSideBarItem.length).toEqual(1)
+ })
+
+ it("should not be possible to access an Xray from the data reference if xrays are disabled", async () => {
+ // turn off xrays
+ await SettingsApi.put({ key: 'enable-xrays', value: false })
+ const store = await createTestStore()
+
+ const app = mount(store.getAppContainer())
+
+ store.pushPath('/reference/databases/1/tables/1')
+
+ await store.waitForActions([END_LOADING])
+
+ const xrayTableSideBarItem = app.find('.Icon.Icon-beaker')
+ expect(xrayTableSideBarItem.length).toEqual(0)
+
+ store.pushPath('/reference/databases/1/tables/1/fields/1')
+ await store.waitForActions([END_LOADING])
+ const xrayFieldSideBarItem = app.find('.Icon.Icon-beaker')
+ expect(xrayFieldSideBarItem.length).toEqual(0)
+ })
+ })
+
afterAll(async () => {
await delay(2000)
})
-});
\ No newline at end of file
+});
diff --git a/frontend/test/xray/xray.unit.spec.js b/frontend/test/xray/xray.unit.spec.js
index bab35d45f096136110fa4e584ad562b2ec9eeda1..90d9a71a1905847d405c102ef7e5de0fe34b3ddf 100644
--- a/frontend/test/xray/xray.unit.spec.js
+++ b/frontend/test/xray/xray.unit.spec.js
@@ -15,7 +15,8 @@ describe('xray', () => {
const expected = {
comparison: {
features: {}
- }
+ },
+ loading: false
}
expect(reducer({}, action)).toEqual(expected)
diff --git a/package.json b/package.json
index a15ac706800c24e6bd1f1dc8992cae00381d4608..e90b593094a64b4437d85657968dd02a7024f735 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"repository": "https://github.com/metabase/metabase",
"license": "private",
"engines": {
- "node": "8.4.0",
+ "node": ">=6.7.0",
"npm": "2.15.9"
},
"dependencies": {
diff --git a/src/metabase/api/embed.clj b/src/metabase/api/embed.clj
index f1b9d8baff37e3a346ba14f5ad87cfa343679810..41e1276225963f599a29c2432656928a5ce67af8 100644
--- a/src/metabase/api/embed.clj
+++ b/src/metabase/api/embed.clj
@@ -164,7 +164,11 @@
[dashboard-id dashcard-id card-id]
(let [param-id->param (u/key-by :id (db/select-one-field :parameters Dashboard :id dashboard-id))]
;; throw a 404 if there's no matching DashboardCard so people can't get info about other Cards that aren't in this Dashboard
- (for [param-mapping (api/check-404 (db/select-one-field :parameter_mappings DashboardCard :id dashcard-id, :dashboard_id dashboard-id, :card_id card-id))
+ ;; we don't need to check that card-id matches the DashboardCard because we might be trying to get param info for
+ ;; a series belonging to this dashcard (card-id might be for a series)
+ (for [param-mapping (api/check-404 (db/select-one-field :parameter_mappings DashboardCard
+ :id dashcard-id
+ :dashboard_id dashboard-id))
:when (= (:card_id param-mapping) card-id)
:let [param (get param-id->param (:parameter_id param-mapping))]
:when param]
diff --git a/src/metabase/api/x_ray.clj b/src/metabase/api/x_ray.clj
index d249e093f3cbb7c5ee024099cb71545ea1179099..408d47abcf78625af79857a88ac7f8cf10628e3a 100644
--- a/src/metabase/api/x_ray.clj
+++ b/src/metabase/api/x_ray.clj
@@ -1,16 +1,18 @@
(ns metabase.api.x-ray
- (:require [compojure.core :refer [GET]]
+ (:require [compojure.core :refer [GET PUT]]
[metabase.api.common :as api]
[metabase.feature-extraction
[async :as async]
[core :as fe]]
+ [costs :as costs]
[metabase.models
[card :refer [Card]]
[computation-job :refer [ComputationJob]]
[field :refer [Field]]
[metric :refer [Metric]]
[segment :refer [Segment]]
- [table :refer [Table]]]
+ [table :refer [Table]]
+ [setting :as setting]]
[schema.core :as s]))
;; See metabase.feature-extraction.core/extract-features for description of
@@ -28,14 +30,16 @@
(defn- max-cost
[query computation]
- {:query (keyword query)
- :computation (keyword computation)})
+ (costs/apply-global-cost-cap
+ {:query (keyword query)
+ :computation (keyword computation)}))
(api/defendpoint GET "/field/:id"
"Get x-ray for a `Field` with ID."
[id max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> id
(api/read-check Field)
(fe/extract-features {:max-cost (max-cost max_query_cost
@@ -47,6 +51,7 @@
[id max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> id
(api/read-check Table)
(fe/extract-features {:max-cost (max-cost max_query_cost
@@ -58,6 +63,7 @@
[id max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(let [table (api/read-check Table id)]
{:job-id (async/compute
#(->> table
@@ -77,6 +83,7 @@
[id max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> id
(api/read-check Segment)
(fe/extract-features {:max-cost (max-cost max_query_cost
@@ -88,6 +95,7 @@
[id max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> id
(api/read-check Card)
(fe/extract-features {:max-cost (max-cost max_query_cost
@@ -99,6 +107,7 @@
[id1 id2 max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> [id1 id2]
(map #(api/read-check Field (Integer/parseInt %)))
(apply fe/compare-features
@@ -110,6 +119,7 @@
[id1 id2 max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> [id1 id2]
(map #(api/read-check Table (Integer/parseInt %)))
(apply fe/compare-features
@@ -122,6 +132,7 @@
[id1 id2 field max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(let [{:keys [comparison constituents]}
(->> [id1 id2]
(map #(api/read-check Table (Integer/parseInt %)))
@@ -148,6 +159,7 @@
[id1 id2 max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(->> [id1 id2]
(map #(api/read-check Segment (Integer/parseInt %)))
(apply fe/compare-features
@@ -160,6 +172,7 @@
[id1 id2 field max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(let [{:keys [comparison constituents]}
(->> [id1 id2]
(map #(api/read-check Segment (Integer/parseInt %)))
@@ -175,6 +188,7 @@
[sid tid max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(fe/x-ray
(fe/compare-features
{:max-cost (max-cost max_query_cost max_computation_cost)}
@@ -187,6 +201,7 @@
[sid tid field max_query_cost max_computation_cost]
{max_query_cost MaxQueryCost
max_computation_cost MaxComputationCost}
+ (api/check-403 (costs/enable-xrays))
(let [{:keys [comparison constituents]}
(fe/x-ray
(fe/compare-features
diff --git a/src/metabase/driver/crate.clj b/src/metabase/driver/crate.clj
index 8785821ce112cc8454ea243516def1315a1d945f..dfc579b876aee944a2a60e4f81db8ef7f3e4db81 100644
--- a/src/metabase/driver/crate.clj
+++ b/src/metabase/driver/crate.clj
@@ -48,7 +48,8 @@
:as details}]
(merge {:classname "io.crate.client.jdbc.CrateDriver" ; must be in classpath
:subprotocol "crate"
- :subname (str "//" hosts "/")}
+ :subname (str "//" hosts)
+ :user "crate"}
(dissoc details :hosts)))
(defn- can-connect? [details]
@@ -107,7 +108,7 @@
:describe-table describe-table
:details-fields (constantly [{:name "hosts"
:display-name "Hosts"
- :default "localhost:5432"}])
+ :default "localhost:5432/"}])
:features (comp (u/rpartial disj :foreign-keys) sql/features)
:current-db-time (driver/make-current-db-time-fn crate-date-formatter crate-db-time-query)})
sql/ISQLDriver
diff --git a/src/metabase/driver/druid/query_processor.clj b/src/metabase/driver/druid/query_processor.clj
index f72d43e1b3cafe48af4c3f85ee25b6b48eb64e45..c67db71992d269fcf91e4a2ff163c3c47ed981d0 100644
--- a/src/metabase/driver/druid/query_processor.clj
+++ b/src/metabase/driver/druid/query_processor.clj
@@ -720,14 +720,31 @@
(defmulti ^:private post-process query-type-dispatch-fn)
-(defmethod post-process ::select [_ results] (->> results first :result :events (map :event)))
-(defmethod post-process ::total [_ results] (map :result results))
-(defmethod post-process ::topN [_ results] (-> results first :result))
-(defmethod post-process ::groupBy [_ results] (map :event results))
+(defn- post-process-map [projections results]
+ {:projections projections
+ :results results})
-(defmethod post-process ::timeseries [_ results]
- (for [event results]
- (conj {:timestamp (:timestamp event)} (:result event))))
+(defmethod post-process ::select [_ projections results]
+ (->> results
+ first
+ :result
+ :events
+ (map :event)
+ (post-process-map projections)))
+
+(defmethod post-process ::total [_ projections results]
+ (post-process-map projections (map :result results)))
+
+(defmethod post-process ::topN [_ projections results]
+ (post-process-map projections (-> results first :result)))
+
+(defmethod post-process ::groupBy [_ projections results]
+ (post-process-map projections (map :event results)))
+
+(defmethod post-process ::timeseries [_ projections results]
+ (post-process-map (conj projections :timestamp)
+ (for [event results]
+ (conj {:timestamp (:timestamp event)} (:result event)))))
(defn post-process-native
"Post-process the results of a *native* Druid query.
@@ -778,24 +795,25 @@
"Execute a query for a Druid DB."
[do-query {database :database, {:keys [query query-type mbql? projections]} :native}]
{:pre [database query]}
- (let [details (:details database)
- query (if (string? query)
- (json/parse-string query keyword)
- query)
- query-type (or query-type (keyword "metabase.driver.druid.query-processor" (name (:queryType query))))
- results (->> query
- (do-query details)
- (post-process query-type))
- columns (if mbql?
- (->> projections
- remove-bonus-keys
- vec)
- (keys (first results)))
- getters (columns->getter-fns columns)]
+ (let [details (:details database)
+ query (if (string? query)
+ (json/parse-string query keyword)
+ query)
+ query-type (or query-type (keyword "metabase.driver.druid.query-processor" (name (:queryType query))))
+ post-proc-map (->> query
+ (do-query details)
+ (post-process query-type projections))
+ columns (if mbql?
+ (->> post-proc-map
+ :projections
+ remove-bonus-keys
+ vec)
+ (-> post-proc-map :results first keys))
+ getters (columns->getter-fns columns)]
;; rename any occurances of `:timestamp___int` to `:timestamp` in the results so the user doesn't know about our behind-the-scenes conversion
;; and apply any other post-processing on the value such as parsing some units to int and rounding up approximate cardinality values.
{:columns (vec (replace {:timestamp___int :timestamp :distinct___count :count} columns))
- :rows (for [row results]
+ :rows (for [row (:results post-proc-map)]
(for [getter getters]
(getter row)))
:annotate? mbql?}))
diff --git a/src/metabase/feature_extraction/core.clj b/src/metabase/feature_extraction/core.clj
index ec7860eb6499bdeb7127a6594bbc9b16359cda2a..1b893e32d79e40fc5468df2ac6711bbeaf4a2372 100644
--- a/src/metabase/feature_extraction/core.clj
+++ b/src/metabase/feature_extraction/core.clj
@@ -57,21 +57,21 @@
(defn- sampled?
[{:keys [max-cost] :as opts} dataset]
- (and (costs/sample-only? max-cost)
+ (and (not (costs/full-scan? max-cost))
(= (count (:rows dataset dataset)) max-sample-size)))
(defn- extract-query-opts
[{:keys [max-cost]}]
(cond-> {}
- (costs/sample-only? max-cost) (assoc :limit max-sample-size)))
+ (not (costs/full-scan? max-cost)) (assoc :limit max-sample-size)))
(defmethod extract-features (type Field)
[opts field]
- (let [dataset (values/field-values field (extract-query-opts opts))]
- {:features (->> dataset
+ (let [{:keys [field row]} (values/field-values field (extract-query-opts opts))]
+ {:features (->> row
(field->features opts field)
(merge {:table (Table (:table_id field))}))
- :sample? (sampled? opts dataset)}))
+ :sample? (sampled? opts row)}))
(defmethod extract-features (type Table)
[opts table]
diff --git a/src/metabase/feature_extraction/costs.clj b/src/metabase/feature_extraction/costs.clj
index 38458000e632fecdea3060a5540e9f256effbeda..5a4d591d11bff1d8bd7c8e433c0a65ed385e9096 100644
--- a/src/metabase/feature_extraction/costs.clj
+++ b/src/metabase/feature_extraction/costs.clj
@@ -1,46 +1,94 @@
(ns metabase.feature-extraction.costs
"Predicates for limiting resource expanditure during feature extraction."
- (:require [metabase.models
- [card :refer [Card]]
- [database :refer [Database]]
- [field :refer [Field]]
- [metric :refer [Metric]]
- [segment :refer [Segment]]
- [table :refer [Table]]]
- [metabase.sync.fetch-metadata :as fetch-metadata]
+ (:require [metabase.models.setting :refer [defsetting] :as setting]
[schema.core :as s]))
+(def ^:private query-costs {:cache 1
+ :sample 2
+ :full-scan 3
+ :joins 4
+ nil 3})
+
+(def ^:private computation-costs {:linear 1
+ :unbounded 2
+ :yolo 3
+ nil 2})
+
(def MaxCost
- "Schema for max-cost parameter."
- {:computation (s/enum :linear :unbounded :yolo)
- :query (s/enum :cache :sample :full-scan :joins)})
+ "Schema for `max-cost` parameter."
+ {:computation (apply s/enum (keys computation-costs))
+ :query (s/enum (keys query-costs))})
+
+(def MaxCostBundles
+ "Predefined `max-cost` bundles."
+ (s/maybe (s/enum "exact" "approximate" "extended")))
+
+(defsetting xray-max-cost
+ "Cap resorce expanditure for all x-rays. (exact, approximate, or extended)"
+ :type :string
+ :default "extended"
+ :setter (fn [new-value]
+ (s/validate MaxCostBundles new-value)
+ (setting/set-string! :xray-max-cost new-value)))
+
+(def ^:private max-cost-bundles {"exact" {:query :full-scan
+ :computation :unbounded}
+ "approximate" {:query :sample
+ :computation :linear}
+ "extended" {:query :joins
+ :computation :unbounded}})
+
+(defn apply-global-cost-cap
+ "Cap given cost specification with `xray-max-cost`."
+ [max-cost]
+ (let [max-cost-cap (max-cost-bundles (xray-max-cost))]
+ {:query (:query
+ (if (> (-> max-cost :query query-costs)
+ (-> max-cost-cap :query query-costs ))
+ max-cost-cap
+ max-cost))
+ :computation (:computation
+ (if (> (-> max-cost :computation computation-costs)
+ (-> max-cost-cap :computation computation-costs ))
+ max-cost-cap
+ max-cost))}))
+
+(defsetting enable-xrays
+ "Should x-raying be available at all?"
+ :type :boolean
+ :default true)
+
+(defn- min-cost
+ [costs min-cost]
+ (fn [cost]
+ (<= (costs min-cost) (costs cost))))
(def ^{:arglists '([max-cost])} linear-computation?
"Limit computation to O(n) or better."
- (comp #{:linear} :computation))
+ (comp (min-cost computation-costs :linear) :computation))
(def ^{:arglists '([max-cost])} unbounded-computation?
- "Alow unbounded but always convergent computation.
+ "Allow unbounded but always convergent computation.
Default if no cost limit is specified."
- (comp (partial contains? #{:unbounded :yolo nil}) :computation))
+ (comp (min-cost computation-costs :unbounded) :computation))
(def ^{:arglists '([max-cost])} yolo-computation?
- "Alow any computation including full blown machine learning."
- (comp #{:yolo} :computation))
+ "Allow any computation including full blown machine learning."
+ (comp (min-cost computation-costs :yolo) :computation))
(def ^{:arglists '([max-cost])} cache-only?
"Use cached data only."
- (comp #{:cache} :query))
+ (comp (min-cost query-costs :cache) :query))
(def ^{:arglists '([max-cost])} sample-only?
"Only sample data."
- (comp #{:sample} :query))
+ (comp (min-cost query-costs :sample) :query))
(def ^{:arglists '([max-cost])} full-scan?
- "Alow full table scans.
+ "Allow full table scans.
Default if no cost limit is specified."
- (comp (partial contains? #{:full-scan :joins nil}) :query))
+ (comp (min-cost query-costs :full-scan) :query))
-(def ^{:arglists '([max-cost])} alow-joins?
- "Alow bringing in data from other tables if needed."
- (comp #{:joins} :query))
+(def ^{:arglists '([max-cost])} allow-joins?
+ "Allow bringing in data from other tables if needed."
+ (comp (min-cost query-costs :joins) :query))
diff --git a/src/metabase/feature_extraction/feature_extractors.clj b/src/metabase/feature_extraction/feature_extractors.clj
index 61c515529adc1c66999fb9de2cfff104d6f33907..c48422f5974564a2ebc4930e5b57c8ffa1c71131 100644
--- a/src/metabase/feature_extraction/feature_extractors.clj
+++ b/src/metabase/feature_extraction/feature_extractors.clj
@@ -400,7 +400,7 @@
(when (and resolution
(costs/unbounded-computation? max-cost))
(decompose-timeseries resolution series))}
- (when (and (costs/alow-joins? max-cost)
+ (when (and (costs/allow-joins? max-cost)
(:aggregation query))
{:YoY (rolling-window-growth 365 query)
:MoM (rolling-window-growth 30 query)
@@ -503,9 +503,7 @@
(#{:day :month :year :quarter :week} unit))
{:histogram-hour (redux/pre-step
h/histogram-categorical
- ;; TOFIX: this is an ugly workaround
- #(when (and % (not (instance? java.sql.Date %)))
- (.getHours ^java.util.Date %)))})))
+ (somef (memfn ^java.util.Date getHours)))})))
(merge-juxt
histogram-extractor
(field-metadata-extractor field)
diff --git a/src/metabase/feature_extraction/values.clj b/src/metabase/feature_extraction/values.clj
index 590976ea4e531ef5055d6de2c74a83561fec7562..702db8e683033b51f9fb6cbdf2ba7a2707e37155 100644
--- a/src/metabase/feature_extraction/values.clj
+++ b/src/metabase/feature_extraction/values.clj
@@ -7,16 +7,16 @@
(defn field-values
"Return all the values of FIELD for QUERY."
[{:keys [id table_id] :as field} query]
- (->> (qp/process-query
- {:type :query
- :database (metadata/db-id field)
- :query (-> query
- (ql/source-table table_id)
- (ql/fields id))
- :middleware {:format-rows? false}})
- :data
- :rows
- (map first)))
+ (let [{:keys [rows cols]} (->> (qp/process-query
+ {:type :query
+ :database (metadata/db-id field)
+ :query (-> query
+ (ql/source-table table_id)
+ (ql/fields id))
+ :middleware {:format-rows? false}})
+ :data)]
+ {:row (map first rows)
+ :field (first cols)}))
(defn query-values
"Return all values for QUERY."
diff --git a/src/metabase/public_settings.clj b/src/metabase/public_settings.clj
index 497e494f14c19b72c04110870a2b4cdc5721c7fd..c9f6a3582ca3c459bbdf2b99c2db85e80de0f0dd 100644
--- a/src/metabase/public_settings.clj
+++ b/src/metabase/public_settings.clj
@@ -137,6 +137,7 @@
:embedding (enable-embedding)
:enable_query_caching (enable-query-caching)
:enable_nested_queries (enable-nested-queries)
+ :enable_xrays (setting/get :enable-xrays)
:engines ((resolve 'metabase.driver/available-drivers))
:ga_code "UA-60817802-1"
:google_auth_client_id (setting/get :google-auth-client-id)
@@ -152,4 +153,5 @@
:timezone_short (short-timezone-name (setting/get :report-timezone))
:timezones common/timezones
:types (types/types->parents)
- :version config/mb-version-info})
+ :version config/mb-version-info
+ :xray_max_cost (setting/get :xray-max-cost)})
diff --git a/src/metabase/pulse.clj b/src/metabase/pulse.clj
index 9efd988d3270c641aeee9c1fcf34dae5f3d22354..4ae37a77bf415b1b17f93c6fa6fb3bc5770849ba 100644
--- a/src/metabase/pulse.clj
+++ b/src/metabase/pulse.clj
@@ -32,11 +32,15 @@
(catch Throwable t
(log/warn (format "Error running card query (%n)" card-id) t))))))
+(defn- database-id [card]
+ (or (:database_id card)
+ (get-in card [:dataset_query :database])))
+
(s/defn defaulted-timezone :- TimeZone
"Returns the timezone for the given `CARD`. Either the report
timezone (if applicable) or the JVM timezone."
[card :- Card]
- (let [^String timezone-str (or (-> card :database_id driver/database-id->driver driver/report-timezone-if-supported)
+ (let [^String timezone-str (or (some-> card database-id driver/database-id->driver driver/report-timezone-if-supported)
(System/getProperty "user.timezone"))]
(TimeZone/getTimeZone timezone-str)))
diff --git a/src/metabase/pulse/render.clj b/src/metabase/pulse/render.clj
index b5cbe024b67d91b73d7cc6e4e1b25996e011a86e..56468aeec02e8844b0751d3ca217edf2164f36bf 100644
--- a/src/metabase/pulse/render.clj
+++ b/src/metabase/pulse/render.clj
@@ -352,7 +352,7 @@
(defn- render:scalar
[timezone card {:keys [cols rows]}]
[:div {:style (style scalar-style)}
- (-> rows first first (format-cell timezone (first cols)) h)])
+ (h (format-cell timezone (ffirst rows) (first cols)))])
(defn- render-sparkline-to-png
"Takes two arrays of numbers between 0 and 1 and plots them as a sparkline"
diff --git a/src/metabase/query_processor/middleware/catch_exceptions.clj b/src/metabase/query_processor/middleware/catch_exceptions.clj
index c3de96317638fb8f666cf23068f31fbdb2424480..835d7bc4035461ff54505cccb6f77ecea1100290 100644
--- a/src/metabase/query_processor/middleware/catch_exceptions.clj
+++ b/src/metabase/query_processor/middleware/catch_exceptions.clj
@@ -23,7 +23,7 @@
(dissoc :database :driver)
u/ignore-exceptions))}
(when-let [data (ex-data e)]
- {:ex-data data})
+ {:ex-data (dissoc data :schema)})
additional-info))
(defn- explain-schema-validation-error
diff --git a/src/metabase/query_processor/middleware/expand_macros.clj b/src/metabase/query_processor/middleware/expand_macros.clj
index c825ccaae400e27530cfec1c2f90864ba04a3383..0cd9805b840c28c46dea66c948747f728a6a3f67 100644
--- a/src/metabase/query_processor/middleware/expand_macros.clj
+++ b/src/metabase/query_processor/middleware/expand_macros.clj
@@ -54,8 +54,14 @@
(segment-parse-filter-subclause form))))
(defn- expand-segments [query-dict]
- (if (non-empty-clause? (get-in query-dict [:query :filter]))
+ (cond
+ (non-empty-clause? (get-in query-dict [:query :filter]))
(update-in query-dict [:query :filter] segment-parse-filter)
+
+ (non-empty-clause? (get-in query-dict [:query :source-query :filter]))
+ (update-in query-dict [:query :source-query :filter] segment-parse-filter)
+
+ :else
query-dict))
diff --git a/src/metabase/sync/analyze/fingerprint/number.clj b/src/metabase/sync/analyze/fingerprint/number.clj
index 242261ab3dbcbc4e907ed9a4759535194fc0509d..b4bcbd7f73c22ece66fddcf634a685acda1e199f 100644
--- a/src/metabase/sync/analyze/fingerprint/number.clj
+++ b/src/metabase/sync/analyze/fingerprint/number.clj
@@ -1,17 +1,12 @@
(ns metabase.sync.analyze.fingerprint.number
"Logic for generating a `NumberFingerprint` from a sequence of values for a `:type/Number` Field."
- (:require [metabase.sync.interface :as i]
+ (:require [kixi.stats.core :as stats]
+ [metabase.sync.interface :as i]
[schema.core :as s]))
-(s/defn ^:private ^:always-validate average :- s/Num
- "Return the average of VALUES."
- [values :- i/FieldSample]
- (/ (double (reduce + values))
- (double (count values))))
-
(s/defn ^:always-validate number-fingerprint :- i/NumberFingerprint
"Generate a fingerprint containing information about values that belong to a `:type/Number` Field."
[values :- i/FieldSample]
{:min (apply min values)
:max (apply max values)
- :avg (average values)})
+ :avg (transduce (map double) stats/mean values)})
diff --git a/test/metabase/api/embed_test.clj b/test/metabase/api/embed_test.clj
index 4be9dd90f5aa193645130ecb4002a7402aece2fc..a01303374e3f5119fdfc0d61e45149b7fe6cd161 100644
--- a/test/metabase/api/embed_test.clj
+++ b/test/metabase/api/embed_test.clj
@@ -6,11 +6,14 @@
[metabase
[http-client :as http]
[util :as u]]
- [metabase.api.public-test :as public-test]
+ [metabase.api
+ [embed :as embed-api]
+ [public-test :as public-test]]
[metabase.models
[card :refer [Card]]
[dashboard :refer [Dashboard]]
- [dashboard-card :refer [DashboardCard]]]
+ [dashboard-card :refer [DashboardCard]]
+ [dashboard-card-series :refer [DashboardCardSeries]]]
[metabase.test
[data :as data]
[util :as tu]]
@@ -413,10 +416,20 @@
;;; ------------------------------------------------------------ Other Tests ------------------------------------------------------------
-(tu/resolve-private-vars metabase.api.embed
- remove-locked-and-disabled-params)
-
;; parameters that are not in the `embedding-params` map at all should get removed by `remove-locked-and-disabled-params`
(expect
{:parameters []}
- (remove-locked-and-disabled-params {:parameters {:slug "foo"}} {}))
+ (#'embed-api/remove-locked-and-disabled-params {:parameters {:slug "foo"}} {}))
+
+;; make sure that multiline series word as expected (#4768)
+(expect
+ "completed"
+ (with-embedding-enabled-and-new-secret-key
+ (tt/with-temp Card [series-card {:dataset_query {:database (data/id)
+ :type :query
+ :query {:source-table (data/id :venues)}}}]
+ (with-temp-dashcard [dashcard {:dash {:enable_embedding true}}]
+ (tt/with-temp DashboardCardSeries [series {:dashboardcard_id (u/get-id dashcard)
+ :card_id (u/get-id series-card)
+ :position 0}]
+ (:status (http/client :get 200 (str (dashcard-url (assoc dashcard :card_id (u/get-id series-card)))))))))))
diff --git a/test/metabase/api/table_test.clj b/test/metabase/api/table_test.clj
index a5b31782617ef9edabc7483ecb0f72ca7fdb51d2..594b7ddf16290e202a69462b2de6f2bcb1d0cb80 100644
--- a/test/metabase/api/table_test.clj
+++ b/test/metabase/api/table_test.clj
@@ -7,7 +7,9 @@
[driver :as driver]
[http-client :as http]
[middleware :as middleware]
+ [query-processor-test :as qpt]
[sync :as sync]
+ [timeseries-query-processor-test :as timeseries-qp-test]
[util :as u]]
[metabase.api.table :as table-api]
[metabase.models
@@ -27,10 +29,7 @@
[toucan
[db :as db]
[hydrate :as hydrate]]
- [toucan.util.test :as tt]
- [metabase.query-processor-test :as qpt]
- [metabase.timeseries-query-processor-test :as timeseries-qp-test]
- [metabase.test.data.datasets :as datasets :refer [*driver* *engine*]]))
+ [toucan.util.test :as tt]))
;; ## /api/org/* AUTHENTICATION Tests
;; We assume that all endpoints for a given context are enforced by the same middleware, so we don't run the same
diff --git a/test/metabase/feature_extraction/costs_test.clj b/test/metabase/feature_extraction/costs_test.clj
index b84f0f23ff957a3e4883be612308abb726e2b183..c3c1f17c0b964d361cbe82f66d3b5b8a36dd6528 100644
--- a/test/metabase/feature_extraction/costs_test.clj
+++ b/test/metabase/feature_extraction/costs_test.clj
@@ -7,7 +7,7 @@
true
true
true
- false
+ true
false
true
true
@@ -27,7 +27,21 @@
(-> {:query :sample} sample-only? boolean)
(-> {:query :full-scan} full-scan? boolean)
(-> {:query :joins} full-scan? boolean)
- (-> {:query :joins} alow-joins? boolean)
+ (-> {:query :joins} allow-joins? boolean)
(-> nil full-scan? boolean)
- (-> nil alow-joins? boolean)
+ (-> nil allow-joins? boolean)
(-> {:query :sample} full-scan? boolean)])
+
+(expect
+ [true
+ true
+ false
+ false]
+ (let [xray-max-cost (constantly {:query :full-scan
+ :computation :linear})
+ max-cost (apply-global-cost-cap {:computation :unbounded
+ :query :sample})]
+ [(-> max-cost unbounded-computation?)
+ (-> max-cost linear-computation?)
+ (-> max-cost full-scan?)
+ (-> max-cost allow-joins? )]))
diff --git a/test/metabase/pulse/render_test.clj b/test/metabase/pulse/render_test.clj
index 0b7588e46cb53490b1af8b2cdb9ba952d1a0bede..ba25f3160ad6e094c72e20df8ff7ebe43d04d288 100644
--- a/test/metabase/pulse/render_test.clj
+++ b/test/metabase/pulse/render_test.clj
@@ -5,7 +5,7 @@
[metabase.test.util :as tu])
(:import java.util.TimeZone))
-(tu/resolve-private-vars metabase.pulse.render prep-for-html-rendering render-truncation-warning)
+(tu/resolve-private-vars metabase.pulse.render prep-for-html-rendering render-truncation-warning render:scalar)
(def pacific-tz (TimeZone/getTimeZone "America/Los_Angeles"))
@@ -133,3 +133,34 @@
{:bar-width nil, :row ["2" "34.04" "Dec 5, 2014" "The Apple Pan"]}
{:bar-width nil, :row ["3" "34.05" "Aug 1, 2014" "The Gorbals"]}]
(rest (prep-for-html-rendering pacific-tz test-columns-with-date-special-type test-data nil nil (count test-columns))))
+
+(expect
+ "10"
+ (last (render:scalar pacific-tz nil {:cols [{:name "ID",
+ :display_name "ID",
+ :base_type :type/BigInteger
+ :special_type nil}]
+ :rows [[10]]})))
+
+(expect
+ "10.12"
+ (last (render:scalar pacific-tz nil {:cols [{:name "floatnum",
+ :display_name "FLOATNUM",
+ :base_type :type/Float
+ :special_type nil}]
+ :rows [[10.12345]]})))
+
+(expect
+ "foo"
+ (last (render:scalar pacific-tz nil {:cols [{:name "stringvalue",
+ :display_name "STRINGVALUE",
+ :base_type :type/Text
+ :special_type nil}]
+ :rows [["foo"]]})))
+(expect
+ "Apr 1, 2014"
+ (last (render:scalar pacific-tz nil {:cols [{:name "date",
+ :display_name "DATE",
+ :base_type :type/DateTime
+ :special_type nil}]
+ :rows [["2014-04-01T08:30:00.0000"]]})))
diff --git a/test/metabase/query_processor/expand_resolve_test.clj b/test/metabase/query_processor/expand_resolve_test.clj
index 3311b6ed3158a89907db46d449e87c7ca27f016f..a2daf8cb270e28900ac954bdc7798ba4a91a3667 100644
--- a/test/metabase/query_processor/expand_resolve_test.clj
+++ b/test/metabase/query_processor/expand_resolve_test.clj
@@ -1,15 +1,18 @@
(ns metabase.query-processor.expand-resolve-test
"Tests query expansion/resolution"
- (:require [expectations :refer :all]
+ (:require [clojure.string :as str]
+ [expectations :refer :all]
+ [metabase
+ [query-processor :as qp]
+ [util :as u]]
[metabase.query-processor.middleware
[expand :as ql]
[resolve :as resolve]
[source-table :as source-table]]
[metabase.test
- [data :refer :all]
+ [data :as data :refer :all]
[util :as tu]]
- [metabase.test.data.dataset-definitions :as defs]
- [metabase.util :as u]))
+ [metabase.test.data.dataset-definitions :as defs]))
;; this is here because expectations has issues comparing and object w/ a map and most of the output
;; below has objects for the various place holders in the expanded/resolved query
@@ -321,3 +324,16 @@
(tu/boolean-ids-and-timestamps
(mapv obj->map [expanded-form
(resolve' expanded-form)]))))
+
+;; check that a schema invalidation error produces a reasonably-sized exception, < 50 lines.
+;; previously the entire schema was being dumped which resulted in a ~5200 line exception (#5978)
+(expect
+ (-> (qp/process-query
+ {:database (data/id)
+ :type :query
+ :query {:source-table (data/id :venues)
+ :filter [:and nil]}})
+ u/pprint-to-str
+ str/split-lines
+ count
+ (< 50)))
diff --git a/test/metabase/query_processor_test/nested_queries_test.clj b/test/metabase/query_processor_test/nested_queries_test.clj
index 93d8f94e5c77d1f682a8e968fa488a77d97076f7..34575bb63d5902dad7fb1b6a4678cd19d15e8bba 100644
--- a/test/metabase/query_processor_test/nested_queries_test.clj
+++ b/test/metabase/query_processor_test/nested_queries_test.clj
@@ -12,6 +12,7 @@
[card :refer [Card]]
[database :as database]
[field :refer [Field]]
+ [segment :refer [Segment]]
[table :refer [Table]]]
[metabase.test.data :as data]
[metabase.test.data.datasets :as datasets]
@@ -444,3 +445,16 @@
"2014-05-01T00:00:00-07:00"])
qp/process-query
:status)))
+
+;; Make sure that macro expansion works inside of a neested query, when using a compound filter clause (#5974)
+(expect
+ [[22]]
+ (tt/with-temp* [Segment [segment {:table_id (data/id :venues)
+ :definition {:filter [:= (data/id :venues :price) 1]}}]
+ Card [card (mbql-card-def
+ :source-table (data/id :venues)
+ :filter [:and [:segment (u/get-id segment)]])]]
+ (-> (query-with-source-card card
+ :aggregation [:count])
+ qp/process-query
+ rows)))
diff --git a/test/metabase/sync/analyze/fingerprint/number_test.clj b/test/metabase/sync/analyze/fingerprint/number_test.clj
new file mode 100644
index 0000000000000000000000000000000000000000..06d7da0df1e00c2e40b36ed8551e4533038cfa63
--- /dev/null
+++ b/test/metabase/sync/analyze/fingerprint/number_test.clj
@@ -0,0 +1,7 @@
+(ns metabase.sync.analyze.fingerprint.number-test
+ (:require [expectations :refer :all]
+ [metabase.sync.analyze.fingerprint.number :as number]))
+
+(expect
+ (approximately (double Long/MAX_VALUE))
+ (:avg (number/number-fingerprint [Long/MAX_VALUE Long/MAX_VALUE])))
diff --git a/test/metabase/test/data/crate.clj b/test/metabase/test/data/crate.clj
index 65115ab6ba93aee9eb4e7acb8833a844c1b8d051..278407ad9a87e4ff6103b7ab89bd6ab1c8faedc0 100644
--- a/test/metabase/test/data/crate.clj
+++ b/test/metabase/test/data/crate.clj
@@ -51,7 +51,8 @@
(insert! rows))))
(def ^:private database->connection-details
- (constantly {:hosts "localhost:5200"}))
+ (constantly {:hosts "localhost:5200/"
+ :user "crate"}))
(extend CrateDriver
generic/IGenericSQLTestExtensions
diff --git a/test/metabase/timeseries_query_processor_test.clj b/test/metabase/timeseries_query_processor_test.clj
index 0d1e282be33cbdcae6f487e6ab3952290345bff8..599c0fde15e26a38dbcf1a2bac4ef142f997e204 100644
--- a/test/metabase/timeseries_query_processor_test.clj
+++ b/test/metabase/timeseries_query_processor_test.clj
@@ -595,6 +595,23 @@
(ql/breakout (ql/datetime-field $timestamp :month))
(ql/limit 5))))
+;; This test is similar to the above query but doesn't use a limit
+;; clause which causes the query to be a grouped timeseries query
+;; rather than a topN query. The dates below are formatted incorrectly
+;; due to https://github.com/metabase/metabase/issues/5969.
+(expect-with-timeseries-dbs
+ {:columns ["timestamp" "count"]
+ :rows [["2013-01-01T00:00:00.000Z" 8]
+ ["2013-02-01T00:00:00.000Z" 11]
+ ["2013-03-01T00:00:00.000Z" 21]
+ ["2013-04-01T00:00:00.000Z" 26]
+ ["2013-05-01T00:00:00.000Z" 23]]}
+ (-> (data/run-query checkins
+ (ql/aggregation (ql/count))
+ (ql/breakout (ql/datetime-field $timestamp :month)))
+ data
+ (update :rows #(take 5 %))))
+
;;; date bucketing - month-of-year
(expect-with-timeseries-dbs
{:columns ["timestamp" "count"]