diff --git a/README.md b/README.md
index 98437a7abbf4fa5609eaa0552d874e3acbd85d7e..781c195a5d446e4749272966bac6c79f2c47adbd 100644
--- a/README.md
+++ b/README.md
@@ -8,17 +8,15 @@ Metabase is the easy, open source way for everyone in your company to ask questi
[](https://circleci.com/gh/metabase/metabase)
[](https://jarkeeper.com/metabase/metabase)
[](https://david-dm.org/metabase/metabase)
-[](http://issuestats.com/github/metabase/metabase)
-[](http://issuestats.com/github/metabase/metabase)
# Features
- 5 minute [setup](http://www.metabase.com/docs/latest/setting-up-metabase) (We're not kidding)
-- Let anyone on your team [ask questions](http://www.metabase.com/docs/latest/users-guide/03-asking-questions) without knowing SQL
-- Rich beautiful [dashboards](http://www.metabase.com/docs/latest/users-guide/05-sharing-answers) with auto refresh and fullscreen
+- Let anyone on your team [ask questions](http://www.metabase.com/docs/latest/users-guide/04-asking-questions) without knowing SQL
+- Rich beautiful [dashboards](http://www.metabase.com/docs/latest/users-guide/06-sharing-answers) with auto refresh and fullscreen
- SQL Mode for analysts and data pros
- Create canonical [segments and metrics](http://www.metabase.com/docs/latest/administration-guide/07-segments-and-metrics) for your team to use
-- Send data to Slack or email on a schedule with [Pulses](http://www.metabase.com/docs/latest/users-guide/09-pulses)
-- View data in Slack anytime with [MetaBot](http://www.metabase.com/docs/latest/users-guide/10-metabot)
+- Send data to Slack or email on a schedule with [Pulses](http://www.metabase.com/docs/latest/users-guide/10-pulses)
+- View data in Slack anytime with [MetaBot](http://www.metabase.com/docs/latest/users-guide/11-metabot)
- [Humanize data](http://www.metabase.com/docs/latest/administration-guide/03-metadata-editing) for your team by renaming, annotating and hiding fields
For more information check out [metabase.com](http://www.metabase.com)
diff --git a/bin/aws-eb-docker/.ebextensions/01_metabase.config b/bin/aws-eb-docker/.ebextensions/01_metabase.config
index 01b1b7dad053dd8a5fead6d617d85032b3b0c9f4..eea4d292fd344712e8e59cd108898b45c960db46 100644
--- a/bin/aws-eb-docker/.ebextensions/01_metabase.config
+++ b/bin/aws-eb-docker/.ebextensions/01_metabase.config
@@ -22,7 +22,6 @@ container_commands:
02_server_https:
command: ".ebextensions/metabase_config/metabase-setup.sh server_https"
- test: test $NGINX_FORCE_SSL
ignoreErrors: true
03_log_x_real_ip:
diff --git a/bin/aws-eb-docker/.ebextensions/metabase_config/metabase-setup.sh b/bin/aws-eb-docker/.ebextensions/metabase_config/metabase-setup.sh
index 2f6a9eb1f14a93491269cec9318f4c778f336b5f..a976e37df35cdda28c457cdfe1690cd9c5fff399 100755
--- a/bin/aws-eb-docker/.ebextensions/metabase_config/metabase-setup.sh
+++ b/bin/aws-eb-docker/.ebextensions/metabase_config/metabase-setup.sh
@@ -49,8 +49,95 @@ server_name () {
# enable https redirect
server_https () {
cd /etc/nginx/sites-available/
- if [[ "$NGINX_FORCE_SSL" ]] && ! grep -q https elasticbeanstalk-nginx-docker-proxy.conf ; then
- sed -i 's|location \/ {|location \/ {\n\n if ($http_x_forwarded_proto != "https") {\n rewrite ^ https:\/\/$host$request_uri? permanent;\n }\n|' elasticbeanstalk-nginx-docker-proxy.conf
+ if [[ "x$NGINX_FORCE_SSL" == "x1" ]] # && ! grep -q https elasticbeanstalk-nginx-docker-proxy.conf ;
+ then
+ cat << 'EOF' > elasticbeanstalk-nginx-docker-proxy.conf
+map $http_upgrade $connection_upgrade {
+ default "upgrade";
+ "" "";
+}
+
+server {
+ listen 80;
+
+ gzip on;
+ gzip_comp_level 4;
+ gzip_types text/html text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+ if ($time_iso8601 ~ "^(\d{4})-(\d{2})-(\d{2})T(\d{2})") {
+ set $year $1;
+ set $month $2;
+ set $day $3;
+ set $hour $4;
+ }
+ access_log /var/log/nginx/healthd/application.log.$year-$month-$day-$hour healthd;
+
+ access_log /var/log/nginx/access.log;
+
+ location /api/health {
+ proxy_pass http://docker;
+ proxy_http_version 1.1;
+
+ proxy_set_header Connection $connection_upgrade;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
+
+
+ location / {
+ if ($http_x_forwarded_proto != "https") {
+ rewrite ^ https://$host$request_uri? permanent;
+ }
+
+ proxy_pass http://docker;
+ proxy_http_version 1.1;
+
+ proxy_set_header Connection $connection_upgrade;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
+}
+EOF
+ else
+ cat << 'EOF' > elasticbeanstalk-nginx-docker-proxy.conf
+map $http_upgrade $connection_upgrade {
+ default "upgrade";
+ "" "";
+}
+
+server {
+ listen 80;
+
+ gzip on;
+ gzip_comp_level 4;
+ gzip_types text/html text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+ if ($time_iso8601 ~ "^(\d{4})-(\d{2})-(\d{2})T(\d{2})") {
+ set $year $1;
+ set $month $2;
+ set $day $3;
+ set $hour $4;
+ }
+ access_log /var/log/nginx/healthd/application.log.$year-$month-$day-$hour healthd;
+
+ access_log /var/log/nginx/access.log;
+
+ location / {
+ proxy_pass http://docker;
+ proxy_http_version 1.1;
+
+ proxy_set_header Connection $connection_upgrade;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ }
+}
+EOF
fi
}
diff --git a/bin/osx-release b/bin/osx-release
index 868747e5ccc48f7c21adce59a7819fe7b1f42743..0165e4b915613d628c3e1b25a8c609e8d930525e 100755
--- a/bin/osx-release
+++ b/bin/osx-release
@@ -187,8 +187,10 @@ sub create_dmg_from_source_dir {
'-fs', 'HFS+',
'-fsargs', '-c c=64,a=16,e=16',
'-format', 'UDRW',
- '-size', '256MB', # it looks like this can be whatever size we want; compression slims it down
+ '-size', '512MB', # has to be big enough to hold everything uncompressed, but doesn't matter if there's extra space -- compression slims it down
$dmg_filename) == 0 or die $!;
+
+ announce "$dmg_filename created.";
}
# Mount the disk image, return the device name
diff --git a/bin/version b/bin/version
index 7e48a25994eaef6b81703067bd8ed5dec7a2c71e..8f8564b7acdd9298a03c847856b3540774b54092 100755
--- a/bin/version
+++ b/bin/version
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-VERSION="v0.24.2"
+VERSION="v0.25.0-snapshot"
# dynamically pull more interesting stuff from latest git commit
HASH=$(git show-ref --head --hash=7 head) # first 7 letters of hash should be enough; that's what GitHub uses
diff --git a/docs/README.md b/docs/README.md
index 464d749a42df1f06373817bbb1ef9c0b9f1fdd2f..459f4af932661d62a90e341df566d5b06faf70aa 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,5 +1,8 @@
## In-depth Guides
+#### [Troubleshooting Guide](troubleshooting-guide/index.md)
+Have a problem and need help? Start with our troubleshooting guide.
+
#### [Users Guide](users-guide/start.md)
This is the go-to guide on asking questions and sharing answers using Metabase. You'll learn in depth about how questions are expressed, how to chart answers, as well as how to share questions and create dashboards.
diff --git a/docs/administration-guide/01-managing-databases.md b/docs/administration-guide/01-managing-databases.md
index 803987a49bcf867806d015e7343422dbbde4c4bf..b93e927c5f6ee449c85adb72a6b304e8a11b2dc1 100644
--- a/docs/administration-guide/01-managing-databases.md
+++ b/docs/administration-guide/01-managing-databases.md
@@ -18,10 +18,12 @@ Now you’ll see a list of your databases. To connect another database to Metaba
* Postgres
* SQLite
* SQL Server
-* Driud
+* Druid
* [CrateDB](databases/cratedb.md)
* [Oracle](databases/oracle.md)
* [Vertica](databases/vertica.md)
+* Presto
+* Google Analytics
To add a database, you'll need its connection information.
diff --git a/docs/administration-guide/03-setting-up-email.md b/docs/administration-guide/02-setting-up-email.md
similarity index 100%
rename from docs/administration-guide/03-setting-up-email.md
rename to docs/administration-guide/02-setting-up-email.md
diff --git a/docs/administration-guide/05-setting-permissions.md b/docs/administration-guide/05-setting-permissions.md
index 99bfac686e9174409593c13be08db428d2f5920f..82662c684e25e0f7815eb0d1ac45329ea9a2d7f1 100644
--- a/docs/administration-guide/05-setting-permissions.md
+++ b/docs/administration-guide/05-setting-permissions.md
@@ -20,9 +20,9 @@ You’ll notice that you already have two default groups: Administrators and All
You’ll also see that you’re a member of the **Administrators** group — that’s why you were able to go to the Admin Panel in the first place. So, to make someone an admin of Metabase you just need to add them to this group. Metabase admins can log into the Admin Panel and make changes there, and they always have unrestricted access to all data that you have in your Metabase instance. So be careful who you add to the Administrator group!
-The **All Users** group is another special one. Every Metabase user is always a member of this group, though they can also be a member of as many other groups as you want. We recommend using the All Users group as a way to set default access levels for new Metabase users. If you have [Google single sign-on](09-single-sign-on.md) enabled, new users who join that way will be automatically added to the All Users group. (**Important note:** as we mentioned above, a user is given the *most permissive* setting she has for a given database/schema/table across *all* groups she is in. Because of that, it is important that your All Users group should never have *greater* access for an item than a group for which you're trying to restrict access — otherwise the more permissive setting will win out.)
+The **All Users** group is another special one. Every Metabase user is always a member of this group, though they can also be a member of as many other groups as you want. We recommend using the All Users group as a way to set default access levels for new Metabase users. If you have [Google single sign-on](10-single-sign-on.md) enabled, new users who join that way will be automatically added to the All Users group. (**Important note:** as we mentioned above, a user is given the *most permissive* setting she has for a given database/schema/table across *all* groups she is in. Because of that, it is important that your All Users group should never have *greater* access for an item than a group for which you're trying to restrict access — otherwise the more permissive setting will win out.)
-If you’ve set up the [Slack integration](08-setting-up-slack.md) and enabled [Metabot](../users-guide/10-metabot.md), you’ll also see a special **Metabot** group, which will allow you to restrict which questions your users will be able to access in Slack via Metabot.
+If you’ve set up the [Slack integration](09-setting-up-slack.md) and enabled [Metabot](../users-guide/11-metabot.md), you’ll also see a special **Metabot** group, which will allow you to restrict which questions your users will be able to access in Slack via Metabot.
#### Managing groups
diff --git a/docs/administration-guide/06-collections.md b/docs/administration-guide/06-collections.md
index 8682bf30d7f17c0add538aed7545fd653181356e..f7e504ca7974211939e85eef4c1615ef637e8466 100644
--- a/docs/administration-guide/06-collections.md
+++ b/docs/administration-guide/06-collections.md
@@ -3,7 +3,7 @@
Collections are a great way to organize your saved questions and decide who gets to see and edit things. Collections could be things like, "Important Metrics," "Marketing KPIs," or "Questions about users." Multiple [user groups](05-setting-permissions.md) can be given access to the same collections, so we don't necessarily recommend naming collections after user groups.
-This page will teach you how to create and manage your collections. For more information on organizing saved questions and using collections, [check out this section of the User's Guide](../users-guide/05-sharing-answers.md).
+This page will teach you how to create and manage your collections. For more information on organizing saved questions and using collections, [check out this section of the User's Guide](../users-guide/06-sharing-answers.md).
### Creating and editing collections
Only administrators of Metabase can create and edit collections. From the Questions section of Metabase, click on the `Create a collection` button. Give your collection a name, choose a color for it, and give it a description if you'd like.
diff --git a/docs/administration-guide/11-getting-started-guide.md b/docs/administration-guide/11-getting-started-guide.md
index 7ccce8be67de4b40ab373f1657058f63c021a213..1ed5c5fd879a1ee3eec37a0f53b517e09e2ff6d4 100644
--- a/docs/administration-guide/11-getting-started-guide.md
+++ b/docs/administration-guide/11-getting-started-guide.md
@@ -10,7 +10,7 @@ Before you've even created your guide, this page gives you some links that you c
-You can highlight your company's most important dashboard, [metrics](06-segments-and-metrics.md) that you commonly refer to (and the dimensions by which they're most often grouped), and tables and [segments](06-segments-and-metrics.md) that are useful or interesting. There's also a place to write a little bit more about "gotchas" or caveats with your data that your users should know about before they start exploring things and drawing conclusions. Lastly, you can optionally include an email address for your users to contact in case they're still confused about things.
+You can highlight your company's most important dashboard, [metrics](07-segments-and-metrics.md) that you commonly refer to (and the dimensions by which they're most often grouped), and tables and [segments](07-segments-and-metrics.md) that are useful or interesting. There's also a place to write a little bit more about "gotchas" or caveats with your data that your users should know about before they start exploring things and drawing conclusions. Lastly, you can optionally include an email address for your users to contact in case they're still confused about things.
If you click on a section, it'll expand and let you select the items that you want to include in that section:
diff --git a/docs/faq.md b/docs/faq.md
index e41be6ed3f4b9849738ca85cfdaed9eb610f5efd..d73266bf5b04b71f177d7ac9fac2fa7765f521c6 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -45,6 +45,7 @@ Metabase currently supports:
* MongoDB (version 3.0 or higher)
* MySQL (and MariaDB)
* PostgreSQL
+* Presto
* SQL Server
* SQLite
@@ -58,9 +59,9 @@ We welcome community contributions of database connectors. If you're able to hel
### Can Metabase connect to Google Analytics, Salesforce, etc.?
-No. Metabase is a fast and easy way for you to access and share information you have in a database. We do not currently offer a way to connect to third-party APIs or services directly. What people do instead in these situations is download data from these services into a database they control and then use Metabase to access that database directly. This can be done either by writing code or more commonly using a third-party service. There are a large number of these services, and you can ask other users and discuss pros and cons at our [user forum](https://discourse.metabase.com).
+Metabase currently supports Google Analytics as a data source. The connection can be set up by an admin the same way database connections are set. If you are using Google Analytics Premium, one of the features is direct access to a BigQuery database with your personal Google Analytics data. BigQuery is also supported by Metabase.
-One caveat is that if you are using Google Analytics Premium, one of the features is direct access to a BigQuery database with your personal Google Analytics data. In this situation, you can use Metabase with that BigQuery dataset directly.
+We do not currently offer a way to connect to other third-party APIs or services directly. What people do instead in these situations is download data from these services into a database they control and then use Metabase to access that database directly. This can be done either by writing code or more commonly using a third-party service. There are a large number of these services, and you can ask other users and discuss pros and cons at our [user forum](https://discourse.metabase.com).
### Can I upload data to Metabase?
@@ -80,4 +81,5 @@ We are experimenting with offering paid support to a limited number of companies
### Can I embed charts or dashboards in another application?
-Not yet. We're working on it however, and you should expect it in the near future. (Late summer/early fall 2016). Keep tabs on it at the main [tracking issue](https://github.com/metabase/metabase/issues/1380)
+Yes, Metabase offers two solutions for sharing charts and dashboards.
+[Public links](http://www.metabase.com/docs/latest/administration-guide/12-public-links.html) let you share or embed charts with simplicity. A powerful [application embedding](http://www.metabase.com/docs/latest/administration-guide/13-embedding.html) let you to embed and customize charts in your own web applications.
diff --git a/docs/operations-guide/running-metabase-on-heroku.md b/docs/operations-guide/running-metabase-on-heroku.md
index fa85e07f69198103930ae7af7498b2f16b19b087..d1fb6b320fe001ef497a04baa35e9146673b078f 100644
--- a/docs/operations-guide/running-metabase-on-heroku.md
+++ b/docs/operations-guide/running-metabase-on-heroku.md
@@ -56,6 +56,11 @@ cd metabase-deploy
git remote add heroku https://git.heroku.com/your-metabase-app.git
```
+* If you are upgrading from a version that is lower than 0.25, add the Metabase buildpack to your Heroku app:
+```
+heroku buildpacks:add https://github.com/metabase/metabase-heroku
+```
+
* Force push the new version to Heroku:
```bash
diff --git a/docs/troubleshooting-guide/bugs.md b/docs/troubleshooting-guide/bugs.md
new file mode 100644
index 0000000000000000000000000000000000000000..ae6620e4ac00737201e79059b32f6d6970c97bf3
--- /dev/null
+++ b/docs/troubleshooting-guide/bugs.md
@@ -0,0 +1,47 @@
+If you come across something that looks like a bug, we suggest collecting the following information to help us reproduce the issue.
+
+1. Server logs
+2. Javascript console logs
+3. Can it be reproduced on the sample dataset?
+4. Your Metabase version
+5. Where Metabase is running (Docker image, AWS Elastic Beanstalk, etc)
+6. What browser version
+
+## Helpful tidbits
+
+### Accessing the Metabase server logs
+While you can always look for the logs Metabase leaves on your server file system (or however you collect logs), if you are logged into Metabase with an admin account, you can also access them from the drop down menu in the upper right hand corner.
+
+
+
+### Checking for Javascript errors in Chrome
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Chrome by following the instructions at
+https://developers.google.com/web/tools/chrome-devtools/console/
+
+
+### Checking for Javascript errors in Firefox
+
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Mozilla by following the instructions at
+https://developer.mozilla.org/en-US/docs/Tools/Web_Console
+
+### Checking for Javascript errors in Safari
+
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Safari by following the instructions at
+
+https://developer.apple.com/library/content/documentation/AppleApplications/Conceptual/Safari_Developer_Guide/Introduction/Introduction.html
+
+### Checking for Javascript errors in Internet Explorer
+
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Internet Explorer by following the instructions at
+
+https://msdn.microsoft.com/en-us/library/gg589530(v=vs.85).aspx
+
+For many versions this can also be accessed by pressing the F12 key on your keyboard.
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/datawarehouse.md b/docs/troubleshooting-guide/datawarehouse.md
new file mode 100644
index 0000000000000000000000000000000000000000..17453df4794586dfe93cd47729e21be6a6547bf0
--- /dev/null
+++ b/docs/troubleshooting-guide/datawarehouse.md
@@ -0,0 +1,49 @@
+## Troubleshooting Process
+1. Verify that the data warehouse server is running
+2. Try connecting to the data warehouse using another client from a machine you know should have access
+3. Try connecting to the data warehouse from another client from the machine you're running Metabase on
+4. Add the connection in Metabase
+5. Examine the logs to verify that the sync process started and that no errors were thrown
+6. Run a native "SELECT 1" query to verify the connection to the data warehouse
+7. If the sync process has completed, attempt to do a "Raw data" query to verify that you are able to use the database
+
+## Specific Problems:
+
+### The Data Warehouse Server is not running:
+
+#### How to detect this -
+As silly as this sounds, occasionally database servers go down.
+
+If you are using a hosted database service, go to it's console and verify that its status is Green. If you have direct access to a command line interface, log in and make sure that it is up and running and accepting queries.
+
+#### How to fix this -
+It's out of the scope of this troubleshooting guide to get your data warehouse server back up. Check with whoever set it up for you!
+
+
+### The Data Warehouse Server is not accepting connections from your IP:
+
+#### How to detect this -
+
+If you are able to access the server from a bastion host, or another machine, use `nc` on linux (or your operating systems equivalent) to verify that you can connect to the host on a given port.
+
+
+The port a data warehouse server software is attached to varies, but an example for a default PostgreSQL configuration (which listens on port 5432) would be
+
+`nc -v your-db-host 5432`
+
+#### How to fix this -
+It's out of the scope of this troubleshooting guide to change your network configuration. Talk to whoever is responsible for the network your data warehouse is running on.
+
+
+### Incorrect credentials
+
+#### How to detect this -
+If you've verified that you can connect to the host and port on the data warehouse, the next step is to check your credentials.
+
+Again, connecting to a data warehouse depends on your database server software, but for PostgreSQL, the below uses a command line interface (`psql`) to connect to your data warehouse.
+`psql -h HOSTNAME -p PORT -d DATABASENAME -U DATABASEUSER`
+
+If your credentials are incorrect, you should see an error message letting you know if the database name or the user/password are incorrect.
+
+#### How to fix this -
+If the database name or the user/pass combination are incorrect, ask the person running your data warehouse for correct credentials.
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/docker.md b/docs/troubleshooting-guide/docker.md
new file mode 100644
index 0000000000000000000000000000000000000000..20a9a0005a437f8a33bbc7d588fa3c7d0ee70d23
--- /dev/null
+++ b/docs/troubleshooting-guide/docker.md
@@ -0,0 +1,143 @@
+
+While Docker simplifies a lot of aspects of running Metabase, there are a number of potential pitfalls to be keep in mind.
+
+If you are having issues with Metabase under Docker, we recommend going through the troubleshooting process below. Then look below for the details about the specific issue you've found.
+
+## Troubleshooting Process
+1. Check that the container is running
+2. Check that the server is running inside the container
+3. Check whether Metabase is using the correct application database
+4. Check that you can connect to the Docker host on the Metabase port
+5. Check that you can connect to the container from the Docker host
+6. Check that you can connect to the server from within the container
+
+
+## Specific Problems:
+
+### Metabase container exits without starting the server
+
+Run `docker ps` to see if the metabase container is currently running. If it is move on to the next step.
+
+If `docker ps` does not show the running container, then list the stopped containers by running
+
+`docker ps -a | grep metabase/metabase`
+
+And look for the container that exited most recently. Note the container id.
+Look at that containers logs with
+
+`Docker logs CONTAINER_ID`
+
+
+### Metabase Container is running but the Server is not
+#### How to detect this -
+Run `docker ps` to make sure the container is running
+
+The server should be logging to the docker container logs. Check this by running
+
+`docker logs CONTAINER_NAME`
+
+You should see a line like at the beginning
+```
+05-10 18:11:32 INFO metabase.util :: Loading Metabase...
+```
+
+and eventually
+```
+05-10 18:12:30 INFO metabase.core :: Metabase Initialization COMPLETE
+```
+
+If you see log lines from Metabase like the below
+
+If you see the below lines:
+```
+05-15 19:07:11 INFO metabase.core :: Metabase Shutting Down ...
+05-15 19:07:11 INFO metabase.core :: Metabase Shutdown COMPLETE
+```
+
+#### How to fix this -
+Check this for errors about connecting to the application database.
+Watch the logs to see if metabase is still being started:
+
+`Docker logs -f CONTAINER_ID`
+
+Will let you see the logs as they are printed.
+
+If the container is being killed before it finished starting it could be a health check timeout in the orchestration service used to start the container, such as docker cloud, or elastic beanstalk.
+
+If the container is not being killed from the outside, and is failing to start anyway, this problem is probably not specific to Docker. If you are using a Metabase supplied image, you should open a github issue at github.com/metabase/metabase/issues/new
+
+
+### Not connecting to a remote application database
+#### How to detect this
+If this is a new Metabase instance, then the database you specified via the environment variables will be empty.
+If this is an existing Metabase instance with incorrect environment parameters, the server will create a new H2 embedded database to use for application data and you’ll lines similar to the below.
+
+```
+05-10 18:11:40 INFO metabase.core :: Setting up and migrating Metabase DB. Please sit tight, this may take a minute...
+05-10 18:11:40 INFO metabase.db :: Verifying h2 Database Connection ...
+
+05-10 18:11:40 INFO metabase.db :: Verify Database Connection ... ✅
+```
+
+#### How to fix this -
+Double check you are passing environments to docker in the correct way.
+You can list the environment variables for a container with this command:
+
+`docker inspect some-postgres -f '{{ .Config.Env }}'`
+
+
+### The Metabase server isn’t able to connect to a MySQL or PostgreSQL
+#### How to detect this -
+The logs for the docker container return an error message after the “Verifying Database Connection†line.
+
+#### How to fix this -
+Try to connect with “mysql†or “psql†commands with the connection string parameters you are passing in via the environment variables http://www.metabase.com/docs/latest/operations-guide/start.html#configuring-the-metabase-application-database .
+
+If you can’t connect to the database, the problem is due to either the credentials or connectivity. Verify that the credentials are correct. If you are able to log in with those credentials from another machine then try to make the same connection from the host running the docker container.
+
+One easy way to run this is to use docker to start a container that has the appropriate client for your database. For postgres this would look like:
+
+`docker run --name postgres-client --rm -ti --entrypoint /bin/bash postgres`
+
+Then from within that container try connecting to the database host using the client command in the container such as `psql`
+If you are able to connect from another container on the same host, then try making that connection from within the metabase docker container itself.
+
+`docker exec -ti container-name bash`
+
+And try to connect to the database host using the `nc` command and check if the connection can be opened.
+
+`nc -v your-db-host 5432`
+
+This will make it clear if this is a network or authentication problem.
+
+### The Metabase application database is not being persisted
+
+#### How to detect this -
+This occurs if you get the Setup screen every time you start the application. The most common root cause is not giving the docker container a persistent filesystem mount to put the application database in.
+
+#### How to fix this -
+Make sure you are giving the container a persistent volume as per http://www.metabase.com/docs/latest/operations-guide/running-metabase-on-docker.html#mounting-a-mapped-file-storage-volume
+
+### The internal port isn’t being remapped correctly
+
+#### How to detect this -
+Run `docker ps` and look at the port mapping
+Run `curl http://localhost:port-number-here/api/health`. This should return a response with a json reponse like
+```
+{"status":"ok"}
+```
+
+#### How to fix this -
+Make sure you include a `-p 3000:3000` or similar remapping in the `docker run` command you execute to start the Metabase container image.
+
+
+## Helpful tidbits
+
+### How to get to the shell in the Metabase container
+
+`docker exec -ti CONTAINER_NAME bash`
+
+### How to get the logs for the Metabase container
+
+`docker logs -f CONTAINER_NAME`
+
diff --git a/docs/troubleshooting-guide/email.md b/docs/troubleshooting-guide/email.md
new file mode 100644
index 0000000000000000000000000000000000000000..564abd2f6b413f25f07747ef7a42c85e8ac57ca3
--- /dev/null
+++ b/docs/troubleshooting-guide/email.md
@@ -0,0 +1,12 @@
+
+## Troubleshooting Process
+1.
+
+## Specific Problems:
+
+### Specific Problem:
+
+### Metabase can't send email via Office365
+
+We see users report issues with sending email via Office365. We recommend using a different email delivery service if you can.
+https://github.com/metabase/metabase/issues/4272
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/images/ServerLogs.png b/docs/troubleshooting-guide/images/ServerLogs.png
new file mode 100644
index 0000000000000000000000000000000000000000..22b4c5bc1972efbd9a7d35004abbaedc8cfde863
Binary files /dev/null and b/docs/troubleshooting-guide/images/ServerLogs.png differ
diff --git a/docs/troubleshooting-guide/index.md b/docs/troubleshooting-guide/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..c78c521f65aeaeeb3d298f25b824f8815ad7c4fd
--- /dev/null
+++ b/docs/troubleshooting-guide/index.md
@@ -0,0 +1,12 @@
+## What are you having trouble with?
+
+### [Logging in?](loggingin.md)
+
+### [Running Metabase on Docker?](docker.md)
+
+
+### [Connecting to databases and data warehouses with Metabase?](datawarehouse.md)
+
+### [Incorrect results due to Timezones](timezones.md)
+
+### [I think I found a bug?](bugs.md)
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/installing.md b/docs/troubleshooting-guide/installing.md
new file mode 100644
index 0000000000000000000000000000000000000000..a0db941f4fbf5ee3c25aa50af01577e3f6540251
--- /dev/null
+++ b/docs/troubleshooting-guide/installing.md
@@ -0,0 +1,11 @@
+## Troubleshooting Process
+1.
+
+## Specific Problems:
+
+### Specific Problem:
+xxx
+#### How to detect this -
+xxx
+#### How to fix this -
+xxx
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/loggingin.md b/docs/troubleshooting-guide/loggingin.md
new file mode 100644
index 0000000000000000000000000000000000000000..39ed9525d2cd510d632bdb692a610c06ec8316ca
--- /dev/null
+++ b/docs/troubleshooting-guide/loggingin.md
@@ -0,0 +1,59 @@
+## Troubleshooting Process
+1. Try to log in with a local account
+2. Try to log in with a Google Auth SSO account
+3. Example Javascript and Server logs if you are not able to log in.
+
+## Specific Problems:
+
+
+### Invalid Google Auth Token:
+Sometimes your token from Google will expire.
+
+#### How to detect this -
+Open up the Javascript console. Try to log in with Google Auth, see if there are any error messages in the Javascript console indicating an invalid account.
+
+Also open up your server logs, and see if there are any errors related to authentication. If there are, try re-creating the token.
+
+#### How to fix this -
+Remove the old token from the Google Auth SSO tab in the Admin Panel, and create a new one. If the root cause was an invalid auth token, this should fix the problem.
+
+
+
+## Helpful tidbits
+
+### Accessing the Metabase server logs
+While you can always look for the logs Metabase leaves on your server file system (or however you collect logs), if you are logged into Metabase with an admin account, you can also access them from the drop down menu in the upper right hand corner.
+
+
+
+### Checking for Javascript errors in Chrome
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Chrome by following the instructions at
+https://developers.google.com/web/tools/chrome-devtools/console/
+
+
+### Checking for Javascript errors in Firefox
+
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Mozilla by following the instructions at
+https://developer.mozilla.org/en-US/docs/Tools/Web_Console
+
+### Checking for Javascript errors in Safari
+
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Safari by following the instructions at
+
+https://developer.apple.com/library/content/documentation/AppleApplications/Conceptual/Safari_Developer_Guide/Introduction/Introduction.html
+
+### Checking for Javascript errors in Internet Explorer
+
+Metabase will print debugging information and errors to your browsers Javascript Console.
+
+You can open the javascript console in Internet Explorer by following the instructions at
+
+https://msdn.microsoft.com/en-us/library/gg589530(v=vs.85).aspx
+
+For many versions this can also be accessed by pressing the F12 key on your keyboard.
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/running.md b/docs/troubleshooting-guide/running.md
new file mode 100644
index 0000000000000000000000000000000000000000..5261e3e82b161b10161ab88155fa09341e26ea63
--- /dev/null
+++ b/docs/troubleshooting-guide/running.md
@@ -0,0 +1,13 @@
+
+## Troubleshooting Process
+1.
+
+## Specific Problems:
+
+
+### Specific Problem:
+xxx
+#### How to detect this -
+xxx
+#### How to fix this -
+xxx
\ No newline at end of file
diff --git a/docs/troubleshooting-guide/timezones.md b/docs/troubleshooting-guide/timezones.md
new file mode 100644
index 0000000000000000000000000000000000000000..6da959dcb6a6263e69b20b8ff164e6569c900675
--- /dev/null
+++ b/docs/troubleshooting-guide/timezones.md
@@ -0,0 +1,60 @@
+## Overview
+Oftentimes the source of "wrong" numbers in charts or reports is due to an underlying timezone issue. They are extremely common, both in Metabase, and in many other analytics tools and services.
+
+
+## Troubleshooting Process
+
+When you suspect a timezone issue, you should collect a bit of information about your overall system.
+
+1. What is the timezone of the data you think is being displayed improperly? (Eg, in the database itself)
+2. Are you using an explicit timezone setting on each timestamp or are the timestamps being stored without a timestamp (eg, `Dec 1, 2019 00:00:00Z00` is an explicitly timestamped value vs `Dec 1, 2019` where the timezone is implied)
+2. What timezone is the database server set to?
+3. What timezone is the server that is running Metabase set to?
+4. What is your Reporting Timezone setting?
+5. What is your browser timezone setting?
+
+With this information collected, you can dig into the actual "mistakes" you are seeing. Most often these occur in an aggregation. It is useful simplifying the aggregation as much as you can while still seeing the "mistake". For example if you are looking at a "Net Negative Churn by Quarter" report that is based on an underlying table consisting of orders, see if the "count of orders by Quarter" has similarly incorrect behaviour. If so, troubleshoot the second, simpler question.
+
+Once you have simplified a question as much as possible, you can try to understand exactly what timezone conversion is causing the underlying problem. In the below, we assume that you are looking at a timeseries with daily values. If your error is happening with weeks, or other time granularities, perform the same sequence of steps but translating "day" to your specific granularity.
+
+1. Pick a specific day where you know the number is incorrect.
+2. Click on the data point in a chart or a cell in a result table and select "View these X".
+3. Open two other tabs in your browser with date filters changed such that one tab has the rows in the underlying table from the previous day, and the other table has the rows in the underlying table from the next day.
+4. Check that the date field being used to group the result in the underlying display is correct. If it is different from what you have stored in the database, or what you have in another tool, then the timestamp is being transformed across the board into something incorrect. This is often the case when you are using a date or time lacking an explicit timezone.
+5. If the underlying timestamps are correct (this is often the case if you are using dates or times with explicit timezones), it is likely that the individual times are being grouped into days in a different timezone than the one you want.
+6. To find out which timezone they are being transformed into, tweak the times on the date filters on the question you are looking at by moving the start time and start date backwards by an hour until you either get the correct number or you have gone back by 12 hours.
+7. If that doesn't work, try moving the start and end times forward by an hour until you either get the correct number of you've gone forward by 12 hours.
+8. Additionally, if any of your timezones include India, you will need to do this by half hour incremenets as well.
+9. If by this point you have reached a correct number, that means your timezone was converted by the number of hours forward or backwards you manually set the filter. If not, then the problem might not be a direct timezone issue.
+
+Now that you have the timezone adjustment, look at the lit of timezones in the first set of steps and think about where this could have occured.
+
+For example, lets say have a PST server timeszone, and a GMT reporting timezone. If you had to manually go back 9 hours to get correct numbers, that suggests that the conversion is not happening for some reason -- this suggests you are using timestamps without a timezone.
+
+You can see a number of common problems below, if none of them apply, please open a bug report at www.github.com/metabase/metabase/issues/new with the above information (timezones, and the results of the second troubleshooting process) as well as your Metabase, OS and web browser versions.
+
+## Specific Problems:
+
+### SQL queries are not respecting the Reporting Time Zone setting
+#### How to detect this -
+If you are not able to click on a cell in a result table or a chart.
+
+#### How to fix this -
+We do not currently apply a reporting timezone to the results of SQL queries, and you should manually set one.
+
+### Dates without an explicit timezone are being converted to another day
+#### How to detect this -
+This occurs when you are grouping by a date (vs a time) that does not have a timezone attached to it. Look at every time field your question uses in the Data Model Reference, and see if any of them is simply a "Date" field.
+
+#### How to fix this -
+You will need to make sure the server timezone reflects the reporting timezone, as when a query is run on Metabase, the server applies the timezone it is set to, to that date.
+
+
+### Mixing explicit and implicit timezones
+#### How to detect this -
+This often happens if you compare or perform arithmatic on two dates where one has an explicit timezone and one does not.
+
+This typically involves a question that uses multiple fields (eg, when you filter on one timestamp and group by another). Check the timezones of each of the dates or times you are using in your question.
+
+#### How to fix this -
+You will need to explicitly cast the timezone that does not have an explicit timezone. This will need to be done either in a SQL query or by transforming the data in your database to ensure both timestamps have timezones.
diff --git a/docs/users-guide/07-dashboards.md b/docs/users-guide/07-dashboards.md
index 8a2b19e5cbaec3e7f58188c5326f036157164a9a..841591df76b4b73b49574bab36672861b273b1c0 100644
--- a/docs/users-guide/07-dashboards.md
+++ b/docs/users-guide/07-dashboards.md
@@ -91,7 +91,7 @@ Some tips:
* Place the most important saved question cards near the top of the dashboard, and/or make them bigger than the other cards. That will help draw people’s attention to what matters most.
* If you have more than 10 cards on a dashboard, think about breaking the dashboard into two separate ones. You don't want to overwhelm people with too much information, and each dashboard should revolve around one theme or topic. Remember — you can make as many dashboards as you want, so you don’t have to cram everything into just one.
-* Consider [adding filters to your dashboard](06-dashboards.md#dashboard-filters) to make them more useful and flexible. For example, instead of your dashboard being full of questions that are restricted to a specific time span, you can make more general questions and use dashboard filters to change the time span you're looking at.
+* Consider [adding filters to your dashboard](07-dashboards.md#dashboard-filters) to make them more useful and flexible. For example, instead of your dashboard being full of questions that are restricted to a specific time span, you can make more general questions and use dashboard filters to change the time span you're looking at.
---
diff --git a/docs/users-guide/08-dashboard-filters.md b/docs/users-guide/08-dashboard-filters.md
index 9b4d234e590ee5205a5267e755a9a2ee22b85ff4..6328af63a8b7f864dc0aab16156ebaf0c897db6a 100644
--- a/docs/users-guide/08-dashboard-filters.md
+++ b/docs/users-guide/08-dashboard-filters.md
@@ -29,7 +29,7 @@ Now we’ve entered a new mode where we’ll need to wire up each card on our da
So here’s what we’re doing — when we pick a month and year with our new filter, the filter needs to know which field in the card to filter on. For example, if we have a `Total Orders` card, and each order has a `Date Ordered` as well as a `Date Delivered`, we have to pick which of those fields to filter — do we want to see all the orders *placed* in January, or do we want to see all the orders *delivered* in January? So, for each card on our dashboard, we’ll pick a date field to connect to the filter. If one of your cards says there aren’t any valid fields, that just means that card doesn’t contain any fields that match the kind of filter you chose.
#### Filtering SQL-based cards
-Note that if your dashboard includes cards that were created using the SQL/native query editor, you'll need to add a bit of additional markup to the SQL in those cards in order to use a dashboard filter on them. [Using SQL parameters](12-sql-parameters.md)
+Note that if your dashboard includes cards that were created using the SQL/native query editor, you'll need to add a bit of additional markup to the SQL in those cards in order to use a dashboard filter on them. [Using SQL parameters](13-sql-parameters.md)
diff --git a/docs/users-guide/10-pulses.md b/docs/users-guide/10-pulses.md
index 6786ee21b28e35d985fcbca2c4e1d9a6bf1b2be8..aff3ee85570abcdf3e494db7f6e9dc0df5f6ec8c 100644
--- a/docs/users-guide/10-pulses.md
+++ b/docs/users-guide/10-pulses.md
@@ -12,7 +12,7 @@ First, choose a name for your pulse. This will show up in the email subject line
### Pick Your Data
-Before you can create a pulse, you’ll need to have some [saved questions](05-sharing-answers.md). You can choose up to five of them to put into a single pulse. Click the dropdown to see a list of all your saved questions. You can type in the dropdown to help filter and find the question you’re looking for.
+Before you can create a pulse, you’ll need to have some [saved questions](06-sharing-answers.md). You can choose up to five of them to put into a single pulse. Click the dropdown to see a list of all your saved questions. You can type in the dropdown to help filter and find the question you’re looking for.
diff --git a/docs/users-guide/11-metabot.md b/docs/users-guide/11-metabot.md
index c7fd2b2608d427766668a05fa8776267d1171bb1..f1100861552b2c63d0d92db39de939e4a3bef973 100644
--- a/docs/users-guide/11-metabot.md
+++ b/docs/users-guide/11-metabot.md
@@ -1,6 +1,6 @@
## Getting answers in Slack with MetaBot
-You can already send data to Slack on a set schedule via [Pulses](09-pulses.md) but what about when you need an answer right now? Say hello to MetaBot.
+You can already send data to Slack on a set schedule via [Pulses](10-pulses.md) but what about when you need an answer right now? Say hello to MetaBot.
MetaBot helps add context to conversations you’re having in Slack by letting you insert results from Metabase.
@@ -37,7 +37,7 @@ If you don’t have a sense of which questions you want to view in Slack, you c
## To review
-- [Connect to Slack](09-pulses.md) to start using MetaBot.
+- [Connect to Slack](10-pulses.md) to start using MetaBot.
- Show data from Metabase in Slack using ```metabot show <question-id>```
- Search for questions by typing ```metabot show <search-term>```
- Get a list of questions by typing ```metabot list```
diff --git a/docs/users-guide/12-data-model-reference.md b/docs/users-guide/12-data-model-reference.md
index 90cdbd1af78d12f6a920bdae65b2ace8cc4daa8e..a142c49ddeb5fea1161bba837d215668dee3eba8 100644
--- a/docs/users-guide/12-data-model-reference.md
+++ b/docs/users-guide/12-data-model-reference.md
@@ -22,4 +22,4 @@ In addition to looking at a table's fields, you can also look at its connections
---
## Next: powering up your SQL questions with variables
-Find out [how to use variables in your native SQL queries](12-sql-parameters.md) to create powerful filter widgets and more.
+Find out [how to use variables in your native SQL queries](13-sql-parameters.md) to create powerful filter widgets and more.
diff --git a/docs/users-guide/images/Bookicon.png b/docs/users-guide/images/Bookicon.png
index d66303678346a60c269673fa01653cb7a59a9b1d..863d5ca70037ff3fcd9281ff227dfe856d012a22 100644
Binary files a/docs/users-guide/images/Bookicon.png and b/docs/users-guide/images/Bookicon.png differ
diff --git a/docs/users-guide/images/SQLButton.png b/docs/users-guide/images/SQLButton.png
index 382b63bacfd12ebd87fb59bbb2e9370c113fd223..57207acadd5bd0f72ba691593f4e06c3edef468d 100644
Binary files a/docs/users-guide/images/SQLButton.png and b/docs/users-guide/images/SQLButton.png differ
diff --git a/docs/users-guide/images/SQLInterface.png b/docs/users-guide/images/SQLInterface.png
index ae1ee771810e1d4c0e025bca3cc712fdbdeb9527..27dae4c39ae973e43a33ba68c02f88dc389afd44 100644
Binary files a/docs/users-guide/images/SQLInterface.png and b/docs/users-guide/images/SQLInterface.png differ
diff --git a/docs/users-guide/images/SaveCard.png b/docs/users-guide/images/SaveCard.png
index 2342568c44398b63e4c77ad0d9c748cbc96b249c..d98e9e548a7a26ff9314de20272ad55d688e3cdb 100644
Binary files a/docs/users-guide/images/SaveCard.png and b/docs/users-guide/images/SaveCard.png differ
diff --git a/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx b/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
index ac46b9c868c425a7e745338ba50f53746b3221bc..4a8610d171a5f9a4c7b10a7e427573d010e563fe 100644
--- a/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/PartialQueryBuilder.jsx
@@ -73,6 +73,7 @@ export default class PartialQueryBuilder extends Component {
databases={tableMetadata && [tableMetadata.db]}
setDatasetQuery={this.setDatasetQuery}
isShowingDataReference={false}
+ supportMultipleAggregations={false}
setDatabaseFn={null}
setSourceTableFn={null}
addQueryFilter={(filter) => onChange(Query.addFilter(datasetQuery.query, filter))}
diff --git a/frontend/src/metabase/admin/people/components/GroupsListing.jsx b/frontend/src/metabase/admin/people/components/GroupsListing.jsx
index 3e037e14736d9c92d05f55ab8aeda4ed2f658bb0..e37457761d356b532ec5b1a95ef0ddad30faa3f5 100644
--- a/frontend/src/metabase/admin/people/components/GroupsListing.jsx
+++ b/frontend/src/metabase/admin/people/components/GroupsListing.jsx
@@ -6,6 +6,7 @@ import cx from "classnames";
import MetabaseAnalytics from "metabase/lib/analytics";
import { isDefaultGroup, isAdminGroup } from "metabase/lib/groups";
+import { KEYCODE_ENTER } from "metabase/lib/keyboard";
import { PermissionsApi } from "metabase/services";
@@ -35,7 +36,7 @@ function AddGroupRow({ text, onCancelClicked, onCreateClicked, onTextChange }) {
placeholder="Justice League"
onChange={(e) => onTextChange(e.target.value)}
onKeyDown={(e) => {
- if (e.keyCode === 13) {
+ if (e.keyCode === KEYCODE_ENTER) {
onCreateClicked();
}
}}
diff --git a/frontend/src/metabase/admin/permissions/containers/DataPermissionsApp.jsx b/frontend/src/metabase/admin/permissions/containers/DataPermissionsApp.jsx
index 9cc8f3a18c0dce61951dfaea543326867ff59f81..1d881f1df35ed6fa9556969eb950d302fcaf07ee 100644
--- a/frontend/src/metabase/admin/permissions/containers/DataPermissionsApp.jsx
+++ b/frontend/src/metabase/admin/permissions/containers/DataPermissionsApp.jsx
@@ -4,12 +4,12 @@ import { connect } from "react-redux"
import PermissionsApp from "./PermissionsApp.jsx";
import { PermissionsApi } from "metabase/services";
-import { loadMetadata } from "../permissions";
+import { fetchDatabases } from "metabase/redux/metadata";
-@connect(null, { loadMetadata })
+@connect(null, { fetchDatabases })
export default class DataPermissionsApp extends Component {
componentWillMount() {
- this.props.loadMetadata();
+ this.props.fetchDatabases();
}
render() {
return (
diff --git a/frontend/src/metabase/admin/permissions/permissions.js b/frontend/src/metabase/admin/permissions/permissions.js
index 6fdc64cfe41699c360e012c638e3764502feb375..2dc9ecd15842e0492c44ea2d97377bc4101bdbdc 100644
--- a/frontend/src/metabase/admin/permissions/permissions.js
+++ b/frontend/src/metabase/admin/permissions/permissions.js
@@ -3,7 +3,7 @@ import { createAction, createThunkAction, handleActions, combineReducers } from
import { canEditPermissions } from "metabase/lib/groups";
import MetabaseAnalytics from "metabase/lib/analytics";
-import { MetabaseApi, PermissionsApi, CollectionsApi } from "metabase/services";
+import { PermissionsApi, CollectionsApi } from "metabase/services";
const RESET = "metabase/admin/permissions/RESET";
export const reset = createAction(RESET);
@@ -19,10 +19,6 @@ export const initialize = createThunkAction(INITIALIZE, (load, save) =>
}
);
-// TODO: move these to their respective ducks
-const LOAD_METADATA = "metabase/admin/permissions/LOAD_METADATA";
-export const loadMetadata = createAction(LOAD_METADATA, () => MetabaseApi.db_list_with_tables());
-
// TODO: move these to their respective ducks
const LOAD_COLLECTIONS = "metabase/admin/permissions/LOAD_COLLECTIONS";
export const loadCollections = createAction(LOAD_COLLECTIONS, () => CollectionsApi.list());
@@ -100,10 +96,6 @@ const groups = handleActions({
},
}, null);
-const databases = handleActions({
- [LOAD_METADATA]: { next: (state, { payload }) => payload },
-}, null);
-
const collections = handleActions({
[LOAD_COLLECTIONS]: { next: (state, { payload }) => payload },
}, null);
@@ -129,6 +121,5 @@ export default combineReducers({
revision,
groups,
- databases,
collections
});
diff --git a/frontend/src/metabase/admin/permissions/selectors.js b/frontend/src/metabase/admin/permissions/selectors.js
index a118a7f2321a3187fae3891089011aaac77ec9fd..7ec22a97101b9cc2fd5aad360b0ddd9c9baa1b25 100644
--- a/frontend/src/metabase/admin/permissions/selectors.js
+++ b/frontend/src/metabase/admin/permissions/selectors.js
@@ -4,14 +4,10 @@ import { createSelector } from 'reselect';
import { push } from "react-router-redux";
-import Metadata from "metabase/meta/metadata/Metadata";
import MetabaseAnalytics from "metabase/lib/analytics";
-import type { DatabaseId } from "metabase/meta/types/Database";
-import type { SchemaName } from "metabase/meta/types/Table";
-import type { Group, GroupsPermissions } from "metabase/meta/types/Permissions";
-
import { isDefaultGroup, isAdminGroup, isMetaBotGroup } from "metabase/lib/groups";
+
import _ from "underscore";
import { getIn, assocIn } from "icepick";
@@ -28,16 +24,19 @@ import {
inferAndUpdateEntityPermissions
} from "metabase/lib/permissions";
+import { getMeta } from "metabase/selectors/metadata";
+
+import Metadata from "metabase/meta/metadata/Metadata";
+import type { DatabaseId } from "metabase/meta/types/Database";
+import type { SchemaName } from "metabase/meta/types/Table";
+import type { Group, GroupsPermissions } from "metabase/meta/types/Permissions";
+
const getPermissions = (state) => state.admin.permissions.permissions;
const getOriginalPermissions = (state) => state.admin.permissions.originalPermissions;
const getDatabaseId = (state, props) => props.params.databaseId ? parseInt(props.params.databaseId) : null
const getSchemaName = (state, props) => props.params.schemaName
-const getMeta = createSelector(
- [(state) => state.admin.permissions.databases],
- (databases) => databases && new Metadata(databases)
-);
// reorder groups to be in this order
const SPECIAL_GROUP_FILTERS = [isAdminGroup, isDefaultGroup, isMetaBotGroup].reverse();
diff --git a/frontend/src/metabase/admin/permissions/selectors.spec.fixtures.js b/frontend/src/metabase/admin/permissions/selectors.spec.fixtures.js
index 1099dc9446356c813dc735810fe61d841f4f462e..e6e4109acd2a636a20a1ebb4a95a82d3544c0b2e 100644
--- a/frontend/src/metabase/admin/permissions/selectors.spec.fixtures.js
+++ b/frontend/src/metabase/admin/permissions/selectors.spec.fixtures.js
@@ -1,4 +1,3 @@
-import {getMetadata} from "metabase/selectors/metadata";
// Database 2 contains an imaginary multi-schema database (like Redshift for instance)
// Database 3 contains an imaginary database which doesn't have any schemas (like MySQL)
// (A single-schema database was originally Database 1 but it got removed as testing against it felt redundant)
@@ -92,4 +91,3 @@ export const normalizedMetadata = {
"databasesList": [2, 3]
};
-export const denormalizedMetadata = getMetadata({metadata: normalizedMetadata});
diff --git a/frontend/src/metabase/admin/permissions/selectors.spec.js b/frontend/src/metabase/admin/permissions/selectors.spec.js
index 2a96e47ec2dc09acf1eabc4f1b5bb33bfcd390e1..1b2b32e50005d88263c1c06b23630417013ef887 100644
--- a/frontend/src/metabase/admin/permissions/selectors.spec.js
+++ b/frontend/src/metabase/admin/permissions/selectors.spec.js
@@ -10,7 +10,7 @@ import { setIn } from "icepick";
jest.mock('metabase/lib/analytics');
import {GroupsPermissions} from "metabase/meta/types/Permissions";
-import { denormalizedMetadata } from "./selectors.spec.fixtures";
+import { normalizedMetadata } from "./selectors.spec.fixtures";
import { getTablesPermissionsGrid, getSchemasPermissionsGrid, getDatabasesPermissionsGrid } from "./selectors";
/******** INITIAL TEST STATE ********/
@@ -68,10 +68,10 @@ const initialState = {
permissions: {
permissions: initialPermissions,
originalPermissions: initialPermissions,
- groups,
- databases: denormalizedMetadata.databases
+ groups
}
- }
+ },
+ metadata: normalizedMetadata
};
var state = initialState;
diff --git a/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx b/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx
index b6b58ff722f001194d5e491afccd265dc3065511..8730041bb3bb9a60234ceaaae3efb12acb4c06d1 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsSetupList.jsx
@@ -2,6 +2,7 @@ import React, { Component } from "react";
import { Link } from "react-router";
import Icon from "metabase/components/Icon.jsx";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
+import { SetupApi } from "metabase/services";
const TaskList = ({tasks}) =>
<ol>
@@ -57,11 +58,11 @@ export default class SettingsSetupList extends Component {
}
async componentWillMount() {
- let response = await fetch("/api/setup/admin_checklist", { credentials: 'same-origin' });
- if (response.status !== 200) {
- this.setState({ error: await response.json() })
- } else {
- this.setState({ tasks: await response.json() });
+ try {
+ const tasks = await SetupApi.admin_checklist();
+ this.setState({ tasks: tasks });
+ } catch (e) {
+ this.setState({ error: e });
}
}
diff --git a/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx b/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx
index fb111c719574dc4977fa6a391735cc6b18ef4e56..221d5e6514ec57ed6526949da21fcfcdf2accf7d 100644
--- a/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx
+++ b/frontend/src/metabase/admin/settings/components/SettingsSlackForm.jsx
@@ -200,7 +200,7 @@ export default class SettingsSlackForm extends Component {
Metabase
<RetinaImage
className="mx1"
- src="/app/img/slack_emoji.png"
+ src="app/assets/img/slack_emoji.png"
width={79}
forceOriginalDimensions={false /* broken in React v0.13 */}
/>
diff --git a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx
index 5308fcd1cd408de0d28ea7ed4a9d872750b7403c..c60d36ce788cb8a551b088a4b3a9f9a6e7f3835b 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/CustomGeoJSONWidget.jsx
@@ -11,8 +11,9 @@ import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.j
import SettingHeader from "../SettingHeader.jsx";
+import { SettingsApi, GeoJSONApi } from "metabase/services";
+
import cx from "classnames";
-import fetch from 'isomorphic-fetch';
import LeafletChoropleth from "metabase/visualizations/components/LeafletChoropleth.jsx";
@@ -52,11 +53,9 @@ export default class CustomGeoJSONWidget extends Component {
delete value[id];
}
- await fetch("/api/setting/custom-geojson", {
- method: "PUT",
- headers: { "Content-Type": "application/json" },
- body: JSON.stringify({ value }),
- credentials: "same-origin",
+ await SettingsApi.put({
+ key: "custom-geojson",
+ value: value
});
await this.props.reloadSettings();
@@ -88,11 +87,9 @@ export default class CustomGeoJSONWidget extends Component {
geoJsonError: null,
});
await this._saveMap(map.id, map);
- let geoJsonResponse = await fetch("/api/geojson/" + map.id, {
- credentials: "same-origin"
- });
+ let geoJson = await GeoJSONApi.get({ id: map.id });
this.setState({
- geoJson: await geoJsonResponse.json(),
+ geoJson: geoJson,
geoJsonLoading: false,
geoJsonError: null,
});
diff --git a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing.jsx b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing.jsx
index 892ba549ca6aeb38110a651b9fa711153f6b7e2c..8e2d000e936987e87427bf8a971eca2180eb7abb 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/PublicLinksListing.jsx
@@ -20,10 +20,10 @@ type PublicLink = {
};
type Props = {
- load: () => Promise<PublicLink[]>,
- revoke: (link: PublicLink) => Promise<void>,
- getUrl: (link: PublicLink) => string,
- getPublicUrl: (link: PublicLink) => string,
+ load: () => Promise<PublicLink[]>,
+ revoke?: (link: PublicLink) => Promise<void>,
+ getUrl: (link: PublicLink) => string,
+ getPublicUrl?: (link: PublicLink) => string,
noLinksMessage: string,
type: string
};
@@ -33,7 +33,7 @@ type State = {
error: ?any
};
-export default class PublicLinksListing extends Component<*, Props, State> {
+export default class PublicLinksListing extends Component {
props: Props;
state: State;
@@ -59,6 +59,9 @@ export default class PublicLinksListing extends Component<*, Props, State> {
}
async revoke(link: PublicLink) {
+ if (!this.props.revoke) {
+ return;
+ }
try {
await this.props.revoke(link);
this.load();
@@ -152,7 +155,7 @@ export const PublicLinksDashboardListing = () =>
revoke={DashboardApi.deletePublicLink}
type='Public Dashboard Listing'
getUrl={({ id }) => Urls.dashboard(id)}
- getPublicUrl={({ public_uuid }) => window.location.origin + Urls.publicDashboard(public_uuid)}
+ getPublicUrl={({ public_uuid }) => Urls.publicDashboard(public_uuid)}
noLinksMessage="No dashboards have been publicly shared yet."
/>;
@@ -162,7 +165,7 @@ export const PublicLinksQuestionListing = () =>
revoke={CardApi.deletePublicLink}
type='Public Card Listing'
getUrl={({ id }) => Urls.question(id)}
- getPublicUrl={({ public_uuid }) => window.location.origin + Urls.publicCard(public_uuid)}
+ getPublicUrl={({ public_uuid }) => Urls.publicCard(public_uuid)}
noLinksMessage="No questions have been publicly shared yet."
/>;
diff --git a/frontend/src/metabase/admin/settings/components/widgets/SecretKeyWidget.jsx b/frontend/src/metabase/admin/settings/components/widgets/SecretKeyWidget.jsx
index 192e2b305c0ac13f82a81cd5db29eaf93175c8ad..3db15bf88fead47abbe09cbbce9d8c2e5dee7be7 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/SecretKeyWidget.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/SecretKeyWidget.jsx
@@ -13,7 +13,7 @@ type Props = {
setting: {}
};
-export default class SecretKeyWidget extends Component<*, Props, *> {
+export default class SecretKeyWidget extends Component {
props: Props;
_generateToken = async () => {
diff --git a/frontend/src/metabase/app-main.js b/frontend/src/metabase/app-main.js
index fa077d93f3d26c873c6f552bf80bfe6b9a032961..169ad090a05c8749f8c21dff82506369a2b95353 100644
--- a/frontend/src/metabase/app-main.js
+++ b/frontend/src/metabase/app-main.js
@@ -26,7 +26,7 @@ const WHITELIST_FORBIDDEN_URLS = [
init(reducers, getRoutes, (store) => {
// received a 401 response
api.on("401", (url) => {
- if (url === "/api/user/current") {
+ if (url.indexOf("/api/user/current") >= 0) {
return
}
store.dispatch(clearCurrentUser());
diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.js
index 57b95bb27fba89bca34c9f20f7aaf8d944443b6a..5cefe8294d390108453703d02b6d256ff8d348cf 100644
--- a/frontend/src/metabase/app.js
+++ b/frontend/src/metabase/app.js
@@ -10,13 +10,24 @@ import { Provider } from 'react-redux'
import MetabaseAnalytics, { registerAnalyticsClickListener } from "metabase/lib/analytics";
import MetabaseSettings from "metabase/lib/settings";
+import api from "metabase/lib/api";
+
import { getStore } from './store'
import { refreshSiteSettings } from "metabase/redux/settings";
-import { Router, browserHistory } from "react-router";
-import { syncHistoryWithStore } from 'react-router-redux'
+import { Router, useRouterHistory } from "react-router";
+import { createHistory } from 'history'
+import { syncHistoryWithStore } from 'react-router-redux';
+
+// remove trailing slash
+const BASENAME = window.MetabaseRoot.replace(/\/+$/, "");
+
+api.basename = BASENAME;
+const browserHistory = useRouterHistory(createHistory)({
+ basename: BASENAME
+});
function _init(reducers, getRoutes, callback) {
const store = getStore(reducers, browserHistory);
diff --git a/frontend/src/metabase/components/ActionButton.jsx b/frontend/src/metabase/components/ActionButton.jsx
index 168d2c71a6ee66d8c4c2f64f4258cf2f1b677033..148742f2575a23917698b6740c9787e6db1be09f 100644
--- a/frontend/src/metabase/components/ActionButton.jsx
+++ b/frontend/src/metabase/components/ActionButton.jsx
@@ -26,7 +26,8 @@ type State = {
result: null|"success"|"failed",
}
-export default class ActionButton extends Component<*, Props, State> {
+export default class ActionButton extends Component {
+ props: Props;
state: State;
timeout: ?any;
diff --git a/frontend/src/metabase/components/ConstrainToScreen.jsx b/frontend/src/metabase/components/ConstrainToScreen.jsx
index 354878bbc8ffb0e94c35b38c10e2e4e029facd70..aee7690bd1872e23a3a615809aab9ad2efa66d9b 100644
--- a/frontend/src/metabase/components/ConstrainToScreen.jsx
+++ b/frontend/src/metabase/components/ConstrainToScreen.jsx
@@ -11,7 +11,9 @@ type Props = {
children: React$Element<any>
};
-export default class ConstrainToScreen extends Component<*, Props, *> {
+export default class ConstrainToScreen extends Component {
+ props: Props;
+
static defaultProps = {
directions: ["top", "bottom"],
padding: 10
diff --git a/frontend/src/metabase/components/CopyButton.jsx b/frontend/src/metabase/components/CopyButton.jsx
index 76a51cbf5387694ebe4c529773908a2c75ff229a..996ba43d1c0322bce14f8af8a3836250d176fded 100644
--- a/frontend/src/metabase/components/CopyButton.jsx
+++ b/frontend/src/metabase/components/CopyButton.jsx
@@ -15,7 +15,7 @@ type State = {
copied: boolean
};
-export default class CopyWidget extends Component<*, Props, State> {
+export default class CopyWidget extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/components/CopyWidget.jsx b/frontend/src/metabase/components/CopyWidget.jsx
index 01a3b4854073bfe0fb3e9482b543fbd84020f392..62d5e963a2511a1a88f04c0635a853a10992e863 100644
--- a/frontend/src/metabase/components/CopyWidget.jsx
+++ b/frontend/src/metabase/components/CopyWidget.jsx
@@ -8,8 +8,9 @@ type Props = {
value: string
};
-export default class CopyWidget extends Component<*, Props, *> {
+export default class CopyWidget extends Component {
props: Props;
+
render() {
const { value } = this.props;
return (
diff --git a/frontend/src/metabase/components/DatabaseDetailsForm.jsx b/frontend/src/metabase/components/DatabaseDetailsForm.jsx
index c72bc0c2ec44840c164e09edb6458a2e46843165..3adc7254bd39e3781c24c8a4a222c92e28608f24 100644
--- a/frontend/src/metabase/components/DatabaseDetailsForm.jsx
+++ b/frontend/src/metabase/components/DatabaseDetailsForm.jsx
@@ -165,7 +165,7 @@ export default class DatabaseDetailsForm extends Component {
<div style={{maxWidth: "40rem"}} className="pt1">
Some database installations can only be accessed by connecting through an SSH bastion host.
This option also provides an extra layer of security when a VPN is not available.
- Enabling this is usually slower than a dirrect connection.
+ Enabling this is usually slower than a direct connection.
</div>
</div>
</div>
diff --git a/frontend/src/metabase/components/Logs.jsx b/frontend/src/metabase/components/Logs.jsx
index eb1521b1b217a7412375917ad9f1f5a9b0fc110d..c6acd12eec6228c4d9c8e3961f1cc27bd2304ab8 100644
--- a/frontend/src/metabase/components/Logs.jsx
+++ b/frontend/src/metabase/components/Logs.jsx
@@ -1,6 +1,7 @@
import React, { Component } from "react";
import ReactDOM from "react-dom";
-import fetch from 'isomorphic-fetch';
+
+import { UtilApi } from "metabase/services";
import LoadingAndErrorWrapper from "metabase/components/LoadingAndErrorWrapper.jsx";
@@ -32,7 +33,7 @@ export default class Logs extends Component {
componentWillMount() {
this.timer = setInterval(async () => {
- let response = await fetch("/api/util/logs", { credentials: 'same-origin' });
+ let response = await UtilApi.logs();
let logs = await response.json()
this.setState({ logs: logs.reverse() })
}, 1000);
diff --git a/frontend/src/metabase/components/OnClickOutsideWrapper.jsx b/frontend/src/metabase/components/OnClickOutsideWrapper.jsx
index 961382729f9324e365e1351207531c8ec5ae8c96..700ff3fa880ba49a609b6a4ebfc237eef8ffbfc3 100644
--- a/frontend/src/metabase/components/OnClickOutsideWrapper.jsx
+++ b/frontend/src/metabase/components/OnClickOutsideWrapper.jsx
@@ -2,11 +2,11 @@ import React, { Component } from "react";
import PropTypes from "prop-types";
import ReactDOM from "react-dom";
+import { KEYCODE_ESCAPE } from "metabase/lib/keyboard";
+
// keep track of the order popovers were opened so we only close the last one when clicked outside
const popoverStack = [];
-const ESC_KEY = 27;
-
export default class OnClickOutsideWrapper extends Component {
static propTypes = {
handleDismissal: PropTypes.func.isRequired
@@ -30,14 +30,14 @@ export default class OnClickOutsideWrapper extends Component {
document.addEventListener("keydown", this._handleKeyPress, false);
}
if (this.props.dismissOnClickOutside) {
- window.addEventListener("click", this._handleClick, true);
+ window.addEventListener("mousedown", this._handleClick, true);
}
}, 0);
}
componentWillUnmount() {
document.removeEventListener("keydown", this._handleKeyPress, false);
- window.removeEventListener("click", this._handleClick, true);
+ window.removeEventListener("mousedown", this._handleClick, true);
clearTimeout(this._timeout);
// remove from the stack after a delay, if it is removed through some other
@@ -57,7 +57,7 @@ export default class OnClickOutsideWrapper extends Component {
}
_handleKeyPress = (e) => {
- if (e.keyCode === ESC_KEY) {
+ if (e.keyCode === KEYCODE_ESCAPE) {
e.preventDefault();
this._handleDismissal();
}
diff --git a/frontend/src/metabase/components/ShrinkableList.jsx b/frontend/src/metabase/components/ShrinkableList.jsx
index 457841fd15c62d49a9945102ec96c4e89e03ade5..3bae345fb74b2ab3b774c8c616c29f21bf51a92c 100644
--- a/frontend/src/metabase/components/ShrinkableList.jsx
+++ b/frontend/src/metabase/components/ShrinkableList.jsx
@@ -17,7 +17,8 @@ type State = {
};
@ExplicitSize
-export default class ShrinkableList extends Component<*, Props, State> {
+export default class ShrinkableList extends Component {
+ props: Props;
state: State = {
isShrunk: null
}
diff --git a/frontend/src/metabase/components/StepIndicators.jsx b/frontend/src/metabase/components/StepIndicators.jsx
new file mode 100644
index 0000000000000000000000000000000000000000..d4ea90c44e3c93fab81e39793ca8c913bd820046
--- /dev/null
+++ b/frontend/src/metabase/components/StepIndicators.jsx
@@ -0,0 +1,43 @@
+/* @flow */
+import React from 'react'
+
+import { normal } from 'metabase/lib/colors'
+
+type Props = {
+ activeDotColor?: string,
+ currentStep: number,
+ dotSize?: number,
+ goToStep?: (step: number) => void,
+ steps: []
+}
+
+const StepIndicators = ({
+ activeDotColor = normal.blue,
+ currentStep = 0,
+ dotSize = 8,
+ goToStep,
+ steps,
+}: Props) =>
+ <ol className="flex">
+ {
+ steps.map((step, index) =>
+ <li
+ onClick={() => goToStep && goToStep(index + 1)}
+ style={{
+ width: dotSize,
+ height: dotSize,
+ borderRadius: 99,
+ cursor: 'pointer',
+ marginLeft: 2,
+ marginRight: 2,
+ backgroundColor: index + 1 === currentStep ? activeDotColor : '#D8D8D8',
+ transition: 'background 600ms ease-in'
+ }}
+ key={index}
+ >
+ </li>
+ )
+ }
+ </ol>
+
+export default StepIndicators;
diff --git a/frontend/src/metabase/components/StepIndicators.spec.js b/frontend/src/metabase/components/StepIndicators.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..11ac1d95345a33263569ccd61faeb345adacda1a
--- /dev/null
+++ b/frontend/src/metabase/components/StepIndicators.spec.js
@@ -0,0 +1,36 @@
+import React from 'react'
+import { shallow } from 'enzyme'
+import sinon from 'sinon'
+
+import { normal } from 'metabase/lib/colors'
+
+import StepIndicators from './StepIndicators'
+
+describe('Step indicators', () => {
+ let steps = [{}, {}, {}]
+
+ it('should render as many indicators as steps', () => {
+ const wrapper = shallow(<StepIndicators steps={steps} />)
+
+ expect(wrapper.find('li').length).toEqual(steps.length)
+ })
+
+ it('should indicate the current step', () => {
+ const wrapper = shallow(<StepIndicators steps={steps} currentStep={1} />)
+
+ expect(wrapper.find('li').get(0).props.style.backgroundColor).toEqual(normal.blue)
+ })
+
+ describe('goToStep', () => {
+ it('should call goToStep with the proper number when a step is clicked', () => {
+ const goToStep = sinon.spy()
+ const wrapper = shallow(
+ <StepIndicators steps={steps} goToStep={goToStep} currentStep={1} />
+ )
+
+ const targetIndicator = wrapper.find('li').first()
+ targetIndicator.simulate('click')
+ expect(goToStep.calledWith(1)).toEqual(true)
+ })
+ })
+})
diff --git a/frontend/src/metabase/css/core/inputs.css b/frontend/src/metabase/css/core/inputs.css
index 78240bd472d4ca71df4e3835e365cba313c9db78..6d03467c34408d71bedc11a816f776a3cf1d90a8 100644
--- a/frontend/src/metabase/css/core/inputs.css
+++ b/frontend/src/metabase/css/core/inputs.css
@@ -48,3 +48,9 @@
.no-focus:focus {
outline: 0;
}
+
+/* prevent safari from forcing type="search" styles - issue #5225 */
+.input[type="search"] {
+ -webkit-appearance: none;
+}
+
diff --git a/frontend/src/metabase/css/core/scroll.css b/frontend/src/metabase/css/core/scroll.css
index 12fccedf309f12c5fae4b8165ebb6f78ca64419d..97100825e9dbf59af557e271900d059a7f94521e 100644
--- a/frontend/src/metabase/css/core/scroll.css
+++ b/frontend/src/metabase/css/core/scroll.css
@@ -67,10 +67,12 @@
display: none; /* Safari and Chrome */
}
-.scroll-hide-all, .scroll-hide-all * {
+.scroll-hide-all,
+.scroll-hide-all * {
-ms-overflow-style: none; /* IE 10+ */
overflow: -moz-scrollbars-none; /* Firefox */
}
+.scroll-hide-all::-webkit-scrollbar,
.scroll-hide-all *::-webkit-scrollbar {
display: none; /* Safari and Chrome */
}
diff --git a/frontend/src/metabase/css/query_builder.css b/frontend/src/metabase/css/query_builder.css
index f298eff4caf824a7d90164dc5ec9cfb288b2c88e..b85584090cd85144d7b1c0b46300bc51eb79320e 100644
--- a/frontend/src/metabase/css/query_builder.css
+++ b/frontend/src/metabase/css/query_builder.css
@@ -243,25 +243,25 @@
.QueryError-image--noRows {
width: 120px;
height: 120px;
- background-image: url('/app/img/no_results.svg');
+ background-image: url('../assets/img/no_results.svg');
}
.QueryError-image--queryError {
width: 120px;
height: 120px;
- background-image: url('/app/img/no_understand.svg');
+ background-image: url('../assets/img/no_understand.svg');
}
.QueryError-image--serverError {
width: 120px;
height: 148px;
- background-image: url('/app/img/blown_up.svg');
+ background-image: url('../assets/img/blown_up.svg');
}
.QueryError-image--timeout {
width: 120px;
height: 120px;
- background-image: url('/app/img/stopwatch.svg');
+ background-image: url('../assets/img/stopwatch.svg');
}
.QueryError-message {
diff --git a/frontend/src/metabase/dashboard/components/DashCard.jsx b/frontend/src/metabase/dashboard/components/DashCard.jsx
index 0e9a9aca987eb11959df519613b268a2edc6ca85..6474eca68af3b13631a7b8811e5b11bedddd284c 100644
--- a/frontend/src/metabase/dashboard/components/DashCard.jsx
+++ b/frontend/src/metabase/dashboard/components/DashCard.jsx
@@ -170,7 +170,7 @@ const ChartSettingsButton = ({ series, onReplaceAllVisualizationSettings }) =>
</ModalWithTrigger>
const RemoveButton = ({ onRemove }) =>
- <a className="text-grey-2 text-grey-4-hover " data-metabase-event="Dashboard;Remove Card Modal" href="#" onClick={onRemove} style={HEADER_ACTION_STYLE}>
+ <a className="text-grey-2 text-grey-4-hover " data-metabase-event="Dashboard;Remove Card Modal" onClick={onRemove} style={HEADER_ACTION_STYLE}>
<Icon name="close" size={HEADER_ICON_SIZE} />
</a>
diff --git a/frontend/src/metabase/dashboard/components/Dashboard.jsx b/frontend/src/metabase/dashboard/components/Dashboard.jsx
index c41dc458bee52ceb9490fa8e03c745351a1c95be..ef76f09aad0989851e9965cacb57614e5a982ff7 100644
--- a/frontend/src/metabase/dashboard/components/Dashboard.jsx
+++ b/frontend/src/metabase/dashboard/components/Dashboard.jsx
@@ -18,7 +18,7 @@ import type { LocationDescriptor, ApiError, QueryParams } from "metabase/meta/ty
import type { Card, CardId, VisualizationSettings } from "metabase/meta/types/Card";
import type { DashboardWithCards, DashboardId, DashCardId } from "metabase/meta/types/Dashboard";
-import type { RevisionId } from "metabase/meta/types/Revision";
+import type { Revision, RevisionId } from "metabase/meta/types/Revision";
import type { Parameter, ParameterId, ParameterValues, ParameterOption } from "metabase/meta/types/Parameter";
type Props = {
@@ -27,7 +27,9 @@ type Props = {
dashboardId: DashboardId,
dashboard: DashboardWithCards,
cards: Card[],
+ revisions: { [key: string]: Revision[] },
+ isAdmin: boolean,
isEditable: boolean,
isEditing: boolean,
isEditingParameter: boolean,
@@ -48,7 +50,7 @@ type Props = {
setDashboardAttributes: ({ [attribute: string]: any }) => void,
fetchDashboardCardData: (options: { reload: bool, clear: bool }) => Promise<void>,
- setEditingParameter: (parameterId: ParameterId) => void,
+ setEditingParameter: (parameterId: ?ParameterId) => void,
setEditingDashboard: (isEditing: boolean) => void,
addParameter: (option: ParameterOption) => Promise<Parameter>,
@@ -59,9 +61,15 @@ type Props = {
editingParameter: ?Parameter,
+ refreshPeriod: number,
+ refreshElapsed: number,
isFullscreen: boolean,
isNightMode: boolean,
+
onRefreshPeriodChange: (?number) => void,
+ onNightModeChange: (boolean) => void,
+ onFullscreenChange: (boolean) => void,
+
loadDashboardParams: () => void,
onReplaceAllDashCardVisualizationSettings: (dashcardId: DashCardId, settings: VisualizationSettings) => void,
@@ -76,8 +84,9 @@ type State = {
}
@DashboardControls
-export default class Dashboard extends Component<*, Props, State> {
- state = {
+export default class Dashboard extends Component {
+ props: Props;
+ state: State = {
error: null,
};
@@ -197,7 +206,7 @@ export default class Dashboard extends Component<*, Props, State> {
onEditingChange={this.setEditing}
setDashboardAttribute={this.setDashboardAttribute}
addParameter={this.props.addParameter}
- parameters={parametersWidget}
+ parametersWidget={parametersWidget}
/>
</header>
{!isFullscreen && parametersWidget &&
diff --git a/frontend/src/metabase/dashboard/components/DashboardHeader.jsx b/frontend/src/metabase/dashboard/components/DashboardHeader.jsx
index 388589a93abe49b03bd048307910ff48f7f45d91..7e9a0cfcabc1665b18f8eb22d17e3772accba299 100644
--- a/frontend/src/metabase/dashboard/components/DashboardHeader.jsx
+++ b/frontend/src/metabase/dashboard/components/DashboardHeader.jsx
@@ -44,7 +44,7 @@ type Props = {
refreshPeriod: ?number,
refreshElapsed: ?number,
- parameters: React$Element<*>[],
+ parametersWidget: React$Element<*>,
addCardToDashboard: ({ dashId: DashCardId, cardId: CardId }) => void,
archiveDashboard: (dashboardId: DashboardId) => void,
@@ -58,7 +58,7 @@ type Props = {
addParameter: (option: ParameterOption) => Promise<Parameter>,
setEditingParameter: (parameterId: ?ParameterId) => void,
- onEditingChange: () => void,
+ onEditingChange: (isEditing: boolean) => void,
onRefreshPeriodChange: (?number) => void,
onNightModeChange: (boolean) => void,
onFullscreenChange: (boolean) => void,
@@ -70,8 +70,9 @@ type State = {
modal: null|"parameters",
}
-export default class DashboardHeader extends Component<*, Props, State> {
- state = {
+export default class DashboardHeader extends Component {
+ props: Props;
+ state: State = {
modal: null,
};
@@ -174,7 +175,7 @@ export default class DashboardHeader extends Component<*, Props, State> {
}
getHeaderButtons() {
- const { dashboard, parameters, isEditing, isFullscreen, isEditable, isAdmin } = this.props;
+ const { dashboard, parametersWidget, isEditing, isFullscreen, isEditable, isAdmin } = this.props;
const isEmpty = !dashboard || dashboard.ordered_cards.length === 0;
const canEdit = isEditable && !!dashboard;
@@ -183,8 +184,8 @@ export default class DashboardHeader extends Component<*, Props, State> {
const buttons = [];
- if (isFullscreen && parameters) {
- buttons.push(parameters);
+ if (isFullscreen && parametersWidget) {
+ buttons.push(parametersWidget);
}
if (isEditing) {
diff --git a/frontend/src/metabase/dashboard/containers/DashboardEmbedWidget.jsx b/frontend/src/metabase/dashboard/containers/DashboardEmbedWidget.jsx
index cd76a516159bb1b31fe14cd12ee93e2eaf917491..72dd16754d8024a047a8b6f72fb33fcfabac24c6 100644
--- a/frontend/src/metabase/dashboard/containers/DashboardEmbedWidget.jsx
+++ b/frontend/src/metabase/dashboard/containers/DashboardEmbedWidget.jsx
@@ -32,7 +32,7 @@ export default class DashboardEmbedWidget extends Component {
onDisablePublicLink={() => deletePublicLink(dashboard)}
onUpdateEnableEmbedding={(enableEmbedding) => updateEnableEmbedding(dashboard, enableEmbedding)}
onUpdateEmbeddingParams={(embeddingParams) => updateEmbeddingParams(dashboard, embeddingParams)}
- getPublicUrl={({ public_uuid }) => window.location.origin + Urls.publicDashboard(public_uuid)}
+ getPublicUrl={({ public_uuid }) => Urls.publicDashboard(public_uuid)}
/>
);
}
diff --git a/frontend/src/metabase/dashboard/hoc/DashboardControls.jsx b/frontend/src/metabase/dashboard/hoc/DashboardControls.jsx
index f291c2a50ad08acf4fd91e7ce0b095d367b7e2d6..37722f5dd897fd12e6783f31b41aa9058af7c81d 100644
--- a/frontend/src/metabase/dashboard/hoc/DashboardControls.jsx
+++ b/frontend/src/metabase/dashboard/hoc/DashboardControls.jsx
@@ -35,9 +35,10 @@ const TICK_PERIOD = 0.25; // seconds
*/
export default (ComposedComponent: ReactClass<any>) =>
connect(null, { replace })(
- class extends Component<*, Props, State> {
+ class extends Component {
static displayName = "DashboardControls["+(ComposedComponent.displayName || ComposedComponent.name)+"]";
+ props: Props;
state: State = {
isFullscreen: false,
isNightMode: false,
diff --git a/frontend/src/metabase/hoc/Typeahead.jsx b/frontend/src/metabase/hoc/Typeahead.jsx
index bbe356554a3f1f7e201288a67e8cf26aa99e3b34..b705eee7b683dbc23d9c7f3a577249660b0643fc 100644
--- a/frontend/src/metabase/hoc/Typeahead.jsx
+++ b/frontend/src/metabase/hoc/Typeahead.jsx
@@ -3,9 +3,7 @@ import PropTypes from "prop-types";
import _ from "underscore";
-const KEYCODE_ENTER = 13;
-const KEYCODE_UP = 38;
-const KEYCODE_DOWN = 40;
+import { KEYCODE_ENTER, KEYCODE_UP, KEYCODE_DOWN } from "metabase/lib/keyboard";
const DEFAULT_FILTER_OPTIONS = (value, option) => {
try {
diff --git a/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx b/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx
index 12e9b1c812fda901b8595a2b0df77ce893a4150f..6f004fd88be29d35141b2a7f3501c2208efc79c4 100644
--- a/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx
+++ b/frontend/src/metabase/home/components/NewUserOnboardingModal.jsx
@@ -1,97 +1,116 @@
+/* @flow */
import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { Link } from "react-router";
+import StepIndicators from 'metabase/components/StepIndicators';
+import RetinaImage from 'react-retina-image'
import MetabaseSettings from "metabase/lib/settings";
-import * as Urls from "metabase/lib/urls";
-export default class NewUserOnboardingModal extends Component {
- constructor(props, context) {
- super(props, context);
+type Props = {
+ onClose: () => void,
+}
- this.state = {step: 1};
- }
+type State = {
+ step: number
+}
- static propTypes = {
- onClose: PropTypes.func.isRequired,
- user: PropTypes.object.isRequired
- }
+const STEPS = [
+ {
+ title: 'Ask questions and explore',
+ text: 'Click on charts or tables to explore, or ask a new question using the easy interface or the powerful SQL editor.',
+ image: (
+ <RetinaImage
+ className="absolute full"
+ style={{ top: 30 }}
+ src={`app/assets/img/welcome-modal-1.png`}
+ />
+ )
+ },
+ {
+ title: 'Make your own charts',
+ text: 'Create line charts, scatter plots, maps, and more.',
+ image: (
+ <RetinaImage
+ className="absolute ml-auto mr-auto inline-block left right"
+ style={{ bottom: -20,}}
+ src={`app/assets/img/welcome-modal-2.png`}
+ />
+ )
+ },
+ {
+ title: 'Share what you find',
+ text: 'Create powerful and flexible dashboards, and send regular updates via email or Slack.',
+ image: (
+ <RetinaImage
+ className="absolute ml-auto mr-auto inline-block left right"
+ style={{ bottom: -30 }}
+ src={`app/assets/img/welcome-modal-3.png`}
+ />
+ )
+ },
+]
- getStepCount() {
- return MetabaseSettings.get("has_sample_dataset") ? 3 : 2
- }
- nextStep() {
- let nextStep = this.state.step + 1;
- if (nextStep <= this.getStepCount()) {
- this.setState({ step: this.state.step + 1 });
- } else {
- this.closeModal();
- }
- }
+export default class NewUserOnboardingModal extends Component {
- closeModal() {
- this.props.onClose();
+ props: Props
+ state: State = {
+ step: 1
}
- renderStep() {
- return <span>STEP {this.state.step} of {this.getStepCount()}</span>;
+ nextStep = () => {
+ const stepCount = MetabaseSettings.get("has_sample_dataset") ? 3 : 2
+ const nextStep = this.state.step + 1;
+
+ if (nextStep <= stepCount) {
+ this.setState({ step: nextStep });
+ } else {
+ this.props.onClose();
+ }
}
render() {
- const { user } = this.props;
const { step } = this.state;
+ const currentStep = STEPS[step -1]
return (
<div>
- { step === 1 ?
- <div className="bordered rounded shadowed">
- <div className="pl4 pr4 pt4 pb1 border-bottom">
- <h2>{user.first_name}, welcome to Metabase!</h2>
- <h2>Analytics you can use by yourself.</h2>
-
- <p>Metabase lets you find answers to your questions from data your company already has.</p>
-
- <p>It’s easy to use, because it’s designed so you don’t need any analytics knowledge to get started.</p>
- </div>
- <div className="px4 py2 text-grey-2 flex align-center">
- {this.renderStep()}
- <button className="Button Button--primary flex-align-right" onClick={() => (this.nextStep())}>Continue</button>
+ <OnboardingImages
+ currentStep={currentStep}
+ />
+ <div className="p4 pb3 text-centered">
+ <h2>{currentStep.title}</h2>
+ <p className="ml-auto mr-auto text-paragraph" style={{ maxWidth: 420 }}>
+ {currentStep.text}
+ </p>
+ <div className="flex align-center py2 relative">
+ <div className="ml-auto mr-auto">
+ <StepIndicators
+ currentStep={step}
+ steps={STEPS}
+ goToStep={step => this.setState({ step })}
+ />
</div>
+ <a
+ className="link flex-align-right text-bold absolute right"
+ onClick={() => (this.nextStep())}
+ >
+ { step === 3 ? 'Let\'s go' : 'Next' }
+ </a>
</div>
- : step === 2 ?
- <div className="bordered rounded shadowed">
- <div className="pl4 pr4 pt4 pb1 border-bottom">
- <h2>Just 3 things worth knowing</h2>
-
- <p className="clearfix pt1"><img className="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_tables.png" />All of your data is organized in Tables. Think of them in terms of Excel spreadsheets with columns and rows.</p>
-
- <p className="clearfix"><img className="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_questions.png" />To get answers, you Ask Questions by picking a table and a few other parameters. You can visualize the answer in many ways, including cool charts.</p>
-
- <p className="clearfix"><img className="float-left mr2" width="40" height="40" src="/app/home/partials/onboarding_illustration_dashboards.png" />You (and anyone on your team) can save answers in Dashboards, so you can check them often. It's a great way to quickly see a snapshot of your business.</p>
- </div>
- <div className="px4 py2 text-grey-2 flex align-center">
- {this.renderStep()}
- <button className="Button Button--primary flex-align-right" onClick={() => (this.nextStep())}>Continue</button>
- </div>
- </div>
- :
- <div className="bordered rounded shadowed">
- <div className="pl4 pr4 pt4 pb1 border-bottom">
- <h2>Let's try asking a question!</h2>
-
- <p>We'll take a quick look at the Query Builder, the main tool you'll use in Metabase to ask questions.</p>
- </div>
- <div className="px4 py2 text-grey-2 flex align-center">
- {this.renderStep()}
- <span className="flex-align-right">
- <a className="text-underline-hover cursor-pointer mr3" onClick={() => (this.closeModal())}>skip for now</a>
- <Link to={Urls.question(null, "?tutorial")} className="Button Button--primary">Let's do it!</Link>
- </span>
- </div>
- </div>
- }
+ </div>
</div>
);
}
}
+
+const OnboardingImages = ({ currentStep }, { currentStep: object }) =>
+ <div style={{
+ position: 'relative',
+ backgroundColor: '#F5F9FE',
+ borderBottom: '1px solid #DCE1E4',
+ height: 254,
+ paddingTop: '3em',
+ paddingBottom: '3em'
+ }}>
+ { currentStep.image }
+ </div>
diff --git a/frontend/src/metabase/home/components/NewUserOnboardingModal.spec.js b/frontend/src/metabase/home/components/NewUserOnboardingModal.spec.js
new file mode 100644
index 0000000000000000000000000000000000000000..38ae5dd4a689a7189159fddaf1b2d10b26c3da14
--- /dev/null
+++ b/frontend/src/metabase/home/components/NewUserOnboardingModal.spec.js
@@ -0,0 +1,33 @@
+import React from 'react'
+import { shallow } from 'enzyme'
+import sinon from 'sinon'
+import NewUserOnboardingModal from './NewUserOnboardingModal'
+
+describe('new user onboarding modal', () => {
+ describe('advance steps', () => {
+ it('should advance through steps properly', () => {
+ const wrapper = shallow(
+ <NewUserOnboardingModal />
+ )
+ const nextButton = wrapper.find('a')
+
+ expect(wrapper.state().step).toEqual(1)
+ nextButton.simulate('click')
+ expect(wrapper.state().step).toEqual(2)
+ })
+
+ it('should close if on the last step', () => {
+ const onClose = sinon.spy()
+ const wrapper = shallow(
+ <NewUserOnboardingModal onClose={onClose} />
+ )
+ // go to the last step
+ wrapper.setState({ step: 3 })
+
+ const nextButton = wrapper.find('a')
+ expect(nextButton.text()).toEqual('Let\'s go')
+ nextButton.simulate('click')
+ expect(onClose.called).toEqual(true)
+ })
+ })
+})
diff --git a/frontend/src/metabase/home/components/NextStep.jsx b/frontend/src/metabase/home/components/NextStep.jsx
index 95424080c7806ae205ac52eedfcc2c450582d26b..7f90bec8f3b6deaa6441360ec63cb9978718ad74 100644
--- a/frontend/src/metabase/home/components/NextStep.jsx
+++ b/frontend/src/metabase/home/components/NextStep.jsx
@@ -1,6 +1,6 @@
import React, { Component } from "react";
import { Link } from "react-router";
-import fetch from 'isomorphic-fetch';
+import { SetupApi } from "metabase/services";
import SidebarSection from "./SidebarSection.jsx";
@@ -13,15 +13,12 @@ export default class NextStep extends Component {
}
async componentWillMount() {
- let response = await fetch("/api/setup/admin_checklist", { credentials: 'same-origin' });
- if (response.status === 200) {
- let sections = await response.json();
- for (let section of sections) {
- for (let task of section.tasks) {
- if (task.is_next_step) {
- this.setState({ next: task });
- break;
- }
+ const sections = await SetupApi.admin_checklist(null, { noEvent: true });
+ for (let section of sections) {
+ for (let task of section.tasks) {
+ if (task.is_next_step) {
+ this.setState({ next: task });
+ break;
}
}
}
diff --git a/frontend/src/metabase/home/components/Smile.jsx b/frontend/src/metabase/home/components/Smile.jsx
index 1ab7fffc833e42bcba8a42943b20c8d0ee23c8e2..fedae4489c98220381f5452158b4a14cd0eed310 100644
--- a/frontend/src/metabase/home/components/Smile.jsx
+++ b/frontend/src/metabase/home/components/Smile.jsx
@@ -5,7 +5,7 @@ export default class Smile extends Component {
const styles = {
width: '48px',
height: '48px',
- backgroundImage: 'url("app/components/icons/assets/smile.svg")',
+ backgroundImage: 'url("app/assets/img/smile.svg")',
}
return <div style={styles}></div>
}
diff --git a/frontend/src/metabase/icon_paths.js b/frontend/src/metabase/icon_paths.js
index 6b55243deca7e0866774fdaae008857f769b3725..1d090d3c0340d3360a15f4d847738337cd514761 100644
--- a/frontend/src/metabase/icon_paths.js
+++ b/frontend/src/metabase/icon_paths.js
@@ -115,6 +115,7 @@ export var ICON_PATHS = {
attrs: { viewBox: "0 0 36 33" }
},
info: 'M16 0 A16 16 0 0 1 16 32 A16 16 0 0 1 16 0 M19 15 L13 15 L13 26 L19 26 z M16 6 A3 3 0 0 0 16 12 A3 3 0 0 0 16 6',
+ infooutlined: 'M16 29c7.18 0 13-5.82 13-13S23.18 3 16 3 3 8.82 3 16s5.82 13 13 13zm0 3C7.163 32 0 24.837 0 16S7.163 0 16 0s16 7.163 16 16-7.163 16-16 16zm1.697-20h-4.185v14h4.185V12zm.432-3.834c0-.342-.067-.661-.203-.958a2.527 2.527 0 0 0-1.37-1.31 2.613 2.613 0 0 0-.992-.188c-.342 0-.661.062-.959.189a2.529 2.529 0 0 0-1.33 1.309c-.13.297-.195.616-.195.958 0 .334.065.646.196.939.13.292.31.549.54.77.23.22.492.395.79.526.297.13.616.196.958.196.351 0 .682-.066.992-.196.31-.13.583-.306.817-.527a2.47 2.47 0 0 0 .553-.77c.136-.292.203-.604.203-.938z',
int: {
path: 'M15.141,15.512 L14.294,20 L13.051,20 C12.8309989,20 12.6403341,19.9120009 12.479,19.736 C12.3176659,19.5599991 12.237,19.343668 12.237,19.087 C12.237,19.0503332 12.2388333,19.0155002 12.2425,18.9825 C12.2461667,18.9494998 12.2516666,18.9146668 12.259,18.878 L12.908,15.512 L10.653,15.512 L10.015,19.01 C9.94899967,19.3620018 9.79866784,19.6149992 9.564,19.769 C9.32933216,19.9230008 9.06900143,20 8.783,20 L7.584,20 L8.42,15.512 L7.155,15.512 C6.92033216,15.512 6.74066729,15.4551672 6.616,15.3415 C6.49133271,15.2278328 6.429,15.0390013 6.429,14.775 C6.429,14.6723328 6.43999989,14.5550007 6.462,14.423 L6.605,13.554 L8.695,13.554 L9.267,10.518 L6.913,10.518 L7.122,9.385 C7.17333359,9.10633194 7.28699912,8.89916734 7.463,8.7635 C7.63900088,8.62783266 7.92499802,8.56 8.321,8.56 L9.542,8.56 L10.224,5.018 C10.282667,4.7246652 10.4183323,4.49733414 10.631,4.336 C10.8436677,4.17466586 11.0929986,4.094 11.379,4.094 L12.611,4.094 L11.775,8.56 L14.019,8.56 L14.866,4.094 L16.076,4.094 C16.3326679,4.094 16.5416659,4.1673326 16.703,4.314 C16.8643341,4.4606674 16.945,4.64766553 16.945,4.875 C16.945,4.9483337 16.9413334,5.00333315 16.934,5.04 L16.252,8.56 L18.485,8.56 L18.276,9.693 C18.2246664,9.97166806 18.1091676,10.1788327 17.9295,10.3145 C17.7498324,10.4501673 17.4656686,10.518 17.077,10.518 L15.977,10.518 L15.416,13.554 L16.978,13.554 C17.2126678,13.554 17.3904994,13.6108328 17.5115,13.7245 C17.6325006,13.8381672 17.693,14.0306653 17.693,14.302 C17.693,14.4046672 17.6820001,14.5219993 17.66,14.654 L17.528,15.512 L15.141,15.512 Z M10.928,13.554 L13.183,13.554 L13.744,10.518 L11.5,10.518 L10.928,13.554 Z',
attrs: { viewBox: '0 0 24, 24' }
@@ -207,7 +208,7 @@ export var ICON_PATHS = {
x: 'm11.271709,16 l-3.19744231e-13,4.728291 l4.728291,0 l16,11.271709 l27.271709,2.39808173e-13 l32,4.728291 l20.728291,16 l31.1615012,26.4332102 l26.4332102,31.1615012 l16,20.728291 l5.56678976,31.1615012 l0.838498756,26.4332102 l11.271709,16 z',
zoom: 'M12.416 12.454V8.37h3.256v4.083h4.07v3.266h-4.07v4.083h-3.256V15.72h-4.07v-3.266h4.07zm10.389 13.28c-5.582 4.178-13.543 3.718-18.632-1.37-5.58-5.581-5.595-14.615-.031-20.179 5.563-5.563 14.597-5.55 20.178.031 5.068 5.068 5.545 12.985 1.422 18.563l5.661 5.661a2.08 2.08 0 0 1 .003 2.949 2.085 2.085 0 0 1-2.95-.003l-5.651-5.652zm-1.486-4.371c3.895-3.895 3.885-10.218-.021-14.125-3.906-3.906-10.23-3.916-14.125-.021-3.894 3.894-3.885 10.218.022 14.124 3.906 3.907 10.23 3.916 14.124.022z',
"slack": {
- img: "/app/img/slack.png"
+ img: "app/assets/img/slack.png"
}
};
diff --git a/frontend/src/metabase/lib/api.js b/frontend/src/metabase/lib/api.js
index 53369187fac44790b8b79d009a1e9b01b8b2909e..9c88348055f62b042448f1c59a4ba534a70ff9d7 100644
--- a/frontend/src/metabase/lib/api.js
+++ b/frontend/src/metabase/lib/api.js
@@ -4,88 +4,115 @@ import querystring from "querystring";
import EventEmitter from "events";
-let events = new EventEmitter();
-
-type ParamsMap = { [key:string]: any };
type TransformFn = (o: any) => any;
-function makeMethod(method: string, hasBody: boolean = false) {
- return function(
- urlTemplate: string,
- params: ParamsMap|TransformFn = {},
- transformResponse: TransformFn = (o) => o
- ) {
- if (typeof params === "function") {
- transformResponse = params;
- params = {};
- }
- return function(
- data?: { [key:string]: any },
- options?: { [key:string]: any } = {}
- ): Promise<any> {
- let url = urlTemplate;
- data = { ...data };
- for (let tag of (url.match(/:\w+/g) || [])) {
- let value = data[tag.slice(1)];
- if (value === undefined) {
- console.warn("Warning: calling", method, "without", tag);
- value = "";
- }
- url = url.replace(tag, encodeURIComponent(data[tag.slice(1)]))
- delete data[tag.slice(1)];
- }
+type Options = {
+ noEvent?: boolean,
+ transformResponse?: TransformFn,
+ cancelled?: Promise<any>
+}
+type Data = {
+ [key:string]: any
+};
+
+const DEFAULT_OPTIONS: Options = {
+ noEvent: false,
+ transformResponse: (o) => o
+}
- let headers: { [key:string]: string } = {
- "Accept": "application/json",
- };
+class Api extends EventEmitter {
+ basename: "";
- let body;
- if (hasBody) {
- headers["Content-Type"] = "application/json";
- body = JSON.stringify(data);
- } else {
- let qs = querystring.stringify(data);
- if (qs) {
- url += (url.indexOf("?") >= 0 ? "&" : "?") + qs;
- }
- }
+ GET: (t: string, o?: Options|TransformFn) => (d?: Data, o?: Options) => Promise<any>;
+ POST: (t: string, o?: Options|TransformFn) => (d?: Data, o?: Options) => Promise<any>;
+ PUT: (t: string, o?: Options|TransformFn) => (d?: Data, o?: Options) => Promise<any>;
+ DELETE: (t: string, o?: Options|TransformFn) => (d?: Data, o?: Options) => Promise<any>;
- return new Promise((resolve, reject) => {
- let xhr = new XMLHttpRequest();
- xhr.open(method, url);
- for (let headerName in headers) {
- xhr.setRequestHeader(headerName, headers[headerName])
- }
- xhr.onreadystatechange = function() {
- // $FlowFixMe
- if (xhr.readyState === XMLHttpRequest.DONE) {
- let body = xhr.responseText;
- try { body = JSON.parse(body); } catch (e) {}
- if (xhr.status >= 200 && xhr.status <= 299) {
- resolve(transformResponse(body, { data }));
- } else {
- reject({
- status: xhr.status,
- data: body
- });
- }
- events.emit(xhr.status, url);
+ constructor() {
+ super();
+ this.GET = this._makeMethod("GET").bind(this);
+ this.DELETE = this._makeMethod("DELETE").bind(this);
+ this.POST = this._makeMethod("POST", true).bind(this);
+ this.PUT = this._makeMethod("PUT", true).bind(this);
+ }
+
+ _makeMethod(method: string, hasBody: boolean = false) {
+ return (
+ urlTemplate: string,
+ methodOptions?: Options|TransformFn = {}
+ ) => {
+ if (typeof methodOptions === "function") {
+ methodOptions = { transformResponse: methodOptions };
+ }
+ const defaultOptions = { ...DEFAULT_OPTIONS, ...methodOptions };
+ return (
+ data?: Data,
+ invocationOptions?: Options = {}
+ ): Promise<any> => {
+ const options: Options = { ...defaultOptions, ...invocationOptions };
+ let url = urlTemplate;
+ data = { ...data };
+ for (let tag of (url.match(/:\w+/g) || [])) {
+ let value = data[tag.slice(1)];
+ if (value === undefined) {
+ console.warn("Warning: calling", method, "without", tag);
+ value = "";
}
+ url = url.replace(tag, encodeURIComponent(data[tag.slice(1)]))
+ delete data[tag.slice(1)];
}
- xhr.send(body);
- if (options.cancelled) {
- options.cancelled.then(() => xhr.abort());
+ let headers: { [key:string]: string } = {
+ "Accept": "application/json",
+ };
+
+ let body;
+ if (hasBody) {
+ headers["Content-Type"] = "application/json";
+ body = JSON.stringify(data);
+ } else {
+ let qs = querystring.stringify(data);
+ if (qs) {
+ url += (url.indexOf("?") >= 0 ? "&" : "?") + qs;
+ }
}
- })
+ return new Promise((resolve, reject) => {
+ let xhr = new XMLHttpRequest();
+ xhr.open(method, this.basename + url);
+ for (let headerName in headers) {
+ xhr.setRequestHeader(headerName, headers[headerName])
+ }
+ xhr.onreadystatechange = () => {
+ // $FlowFixMe
+ if (xhr.readyState === XMLHttpRequest.DONE) {
+ let body = xhr.responseText;
+ try { body = JSON.parse(body); } catch (e) {}
+ if (xhr.status >= 200 && xhr.status <= 299) {
+ if (options.transformResponse) {
+ body = options.transformResponse(body, { data });
+ }
+ resolve(body);
+ } else {
+ reject({
+ status: xhr.status,
+ data: body
+ });
+ }
+ if (!options.noEvent) {
+ this.emit(xhr.status, url);
+ }
+ }
+ }
+ xhr.send(body);
+
+ if (options.cancelled) {
+ options.cancelled.then(() => xhr.abort());
+ }
+ });
+ }
}
}
}
-export const GET = makeMethod("GET");
-export const DELETE = makeMethod("DELETE");
-export const POST = makeMethod("POST", true);
-export const PUT = makeMethod("PUT", true);
-
-export default events;
+export default new Api();
diff --git a/frontend/src/metabase/lib/cookies.js b/frontend/src/metabase/lib/cookies.js
index 083ba20d512bc6e0f5b40cf481f9b1a5e3d8d943..705fd7bfd5a02882b4c02a7a32150e1570223c3d 100644
--- a/frontend/src/metabase/lib/cookies.js
+++ b/frontend/src/metabase/lib/cookies.js
@@ -10,7 +10,7 @@ var MetabaseCookies = {
// set the session cookie. if sessionId is null, clears the cookie
setSessionCookie: function(sessionId) {
const options = {
- path: '/',
+ path: window.MetabaseRoot || '/',
expires: 14,
secure: window.location.protocol === "https:"
};
diff --git a/frontend/src/metabase/lib/dom.js b/frontend/src/metabase/lib/dom.js
index c19646c28840c902e5d7fbe7b7f6537ac9579ab8..af5a76cbd5017d7a543328d49755f8bbe1e490a4 100644
--- a/frontend/src/metabase/lib/dom.js
+++ b/frontend/src/metabase/lib/dom.js
@@ -215,4 +215,19 @@ export function forceRedraw(domNode) {
domNode.style.display='none';
domNode.offsetHeight;
domNode.style.display='';
-}
\ No newline at end of file
+}
+
+export function moveToBack(element) {
+ if (element && element.parentNode) {
+ element.parentNode.insertBefore(
+ element,
+ element.parentNode.firstChild
+ );
+ }
+}
+
+export function moveToFront(element) {
+ if (element && element.parentNode) {
+ element.parentNode.appendChild(element);
+ }
+}
diff --git a/frontend/src/metabase/lib/keyboard.js b/frontend/src/metabase/lib/keyboard.js
new file mode 100644
index 0000000000000000000000000000000000000000..8e03f21b0bf10beae1c4c4439b416406fdf969c1
--- /dev/null
+++ b/frontend/src/metabase/lib/keyboard.js
@@ -0,0 +1,13 @@
+
+export const KEYCODE_BACKSPACE = 8;
+export const KEYCODE_TAB = 9;
+export const KEYCODE_ENTER = 13;
+export const KEYCODE_ESCAPE = 27;
+
+export const KEYCODE_LEFT = 37;
+export const KEYCODE_UP = 38;
+export const KEYCODE_RIGHT = 39;
+export const KEYCODE_DOWN = 40;
+
+export const KEYCODE_COMMA = 188;
+export const KEYCODE_FORWARD_SLASH = 191;
diff --git a/frontend/src/metabase/lib/urls.js b/frontend/src/metabase/lib/urls.js
index f63f47403069f448d5f6a7e1a4da1c7669420d5a..3a83c230e064af2ca68e7209d85f102577e56c48 100644
--- a/frontend/src/metabase/lib/urls.js
+++ b/frontend/src/metabase/lib/urls.js
@@ -1,4 +1,5 @@
import { serializeCardForUrl } from "metabase/lib/card";
+import MetabaseSettings from "metabase/lib/settings"
// provides functions for building urls to things we care about
@@ -69,11 +70,13 @@ export function label(label) {
}
export function publicCard(uuid, type = null) {
- return `/public/question/${uuid}` + (type ? `.${type}` : ``);
+ const siteUrl = MetabaseSettings.get("site-url");
+ return `${siteUrl}/public/question/${uuid}` + (type ? `.${type}` : ``);
}
export function publicDashboard(uuid) {
- return `/public/dashboard/${uuid}`;
+ const siteUrl = MetabaseSettings.get("site-url");
+ return `${siteUrl}/public/dashboard/${uuid}`;
}
export function embedCard(token, type = null) {
diff --git a/frontend/src/metabase/meta/types/Visualization.js b/frontend/src/metabase/meta/types/Visualization.js
index bc5b2132e500b6e8e182f167d87913e4e5317d51..2486a723541fd9063b3446fee0a099bcb7b8c70e 100644
--- a/frontend/src/metabase/meta/types/Visualization.js
+++ b/frontend/src/metabase/meta/types/Visualization.js
@@ -57,10 +57,8 @@ export type ClickActionPopoverProps = {
onClose: () => void,
}
-// type Visualization = Component<*, VisualizationProps, *>;
-
-// $FlowFixMe
-export type Series = { card: Card, data: DatasetData }[] & { _raw: Series }
+export type SingleSeries = { card: Card, data: DatasetData };
+export type Series = SingleSeries[] & { _raw: Series }
export type VisualizationProps = {
series: Series,
diff --git a/frontend/src/metabase/parameters/components/ParameterWidget.jsx b/frontend/src/metabase/parameters/components/ParameterWidget.jsx
index 203592849979719736b10a88c7482a3982cb2b18..29844509c1e401406815dab6ce4b10a8abeb5183 100644
--- a/frontend/src/metabase/parameters/components/ParameterWidget.jsx
+++ b/frontend/src/metabase/parameters/components/ParameterWidget.jsx
@@ -11,6 +11,8 @@ import _ from "underscore";
import FieldSet from "../../components/FieldSet";
+import { KEYCODE_ENTER, KEYCODE_ESCAPE } from "metabase/lib/keyboard";
+
export default class ParameterWidget extends Component {
state = {
isEditingName: false,
@@ -77,7 +79,7 @@ export default class ParameterWidget extends Component {
onChange={(e) => setName(e.target.value)}
onBlur={() => this.setState({ isEditingName: false })}
onKeyUp={(e) => {
- if (e.keyCode === 27 || e.keyCode === 13) {
+ if (e.keyCode === KEYCODE_ESCAPE || e.keyCode === KEYCODE_ENTER) {
e.target.blur();
}
}}
diff --git a/frontend/src/metabase/parameters/components/Parameters.jsx b/frontend/src/metabase/parameters/components/Parameters.jsx
index 22ab38f1d391edaea7f7e00527308b47fec1c8d6..9e9bfec2dc623624ffa52c4be7299e7b688061f9 100644
--- a/frontend/src/metabase/parameters/components/Parameters.jsx
+++ b/frontend/src/metabase/parameters/components/Parameters.jsx
@@ -14,8 +14,8 @@ type Props = {
className?: string,
parameters: Parameter[],
- editingParameter: ?Parameter,
- parameterValues: ParameterValues,
+ editingParameter?: ?Parameter,
+ parameterValues?: ParameterValues,
isFullscreen?: boolean,
isNightMode?: boolean,
@@ -24,16 +24,18 @@ type Props = {
vertical?: boolean,
commitImmediately?: boolean,
- query: QueryParams,
+ query?: QueryParams,
- setParameterName: (parameterId: ParameterId, name: string) => void,
- setParameterValue: (parameterId: ParameterId, value: string) => void,
- setParameterDefaultValue: (parameterId: ParameterId, defaultValue: string) => void,
- removeParameter: (parameterId: ParameterId) => void,
- setEditingParameter: (parameterId: ParameterId) => void,
+ setParameterName?: (parameterId: ParameterId, name: string) => void,
+ setParameterValue?: (parameterId: ParameterId, value: string) => void,
+ setParameterDefaultValue?: (parameterId: ParameterId, defaultValue: string) => void,
+ removeParameter?: (parameterId: ParameterId) => void,
+ setEditingParameter?: (parameterId: ParameterId) => void,
}
-export default class Parameters extends Component<*, Props, *> {
+export default class Parameters extends Component {
+ props: Props;
+
defaultProps = {
syncQueryString: false,
vertical: false,
@@ -43,11 +45,13 @@ export default class Parameters extends Component<*, Props, *> {
componentWillMount() {
// sync parameters from URL query string
const { parameters, setParameterValue, query } = this.props;
- for (const parameter of parameters) {
- if (query && query[parameter.slug] != null) {
- setParameterValue(parameter.id, query[parameter.slug]);
- } else if (parameter.default != null) {
- setParameterValue(parameter.id, parameter.default);
+ if (setParameterValue) {
+ for (const parameter of parameters) {
+ if (query && query[parameter.slug] != null) {
+ setParameterValue(parameter.id, query[parameter.slug]);
+ } else if (parameter.default != null) {
+ setParameterValue(parameter.id, parameter.default);
+ }
}
}
}
@@ -112,10 +116,10 @@ export default class Parameters extends Component<*, Props, *> {
editingParameter={editingParameter}
setEditingParameter={setEditingParameter}
- setName={(name) => setParameterName(parameter.id, name)}
- setValue={(value) => setParameterValue(parameter.id, value)}
- setDefaultValue={(value) => setParameterDefaultValue(parameter.id, value)}
- remove={() => removeParameter(parameter.id)}
+ setName={setParameterName && ((name) => setParameterName(parameter.id, name))}
+ setValue={setParameterValue && ((value) => setParameterValue(parameter.id, value))}
+ setDefaultValue={setParameterDefaultValue && ((value) => setParameterDefaultValue(parameter.id, value))}
+ remove={removeParameter && (() => removeParameter(parameter.id))}
commitImmediately={commitImmediately}
/>
diff --git a/frontend/src/metabase/parameters/components/widgets/CategoryWidget.jsx b/frontend/src/metabase/parameters/components/widgets/CategoryWidget.jsx
index c995b515c3a80d93ac30d063c311d73cd4f50c16..cd0ed8611693f42a081f469c89fc404fdbcbb814 100644
--- a/frontend/src/metabase/parameters/components/widgets/CategoryWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/CategoryWidget.jsx
@@ -19,7 +19,7 @@ type State = {
searchRegex: ?RegExp,
}
-export default class CategoryWidget extends Component<*, Props, State> {
+export default class CategoryWidget extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx b/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx
index c29fd85d6f76f2817f7e6a3e28286a4430fa7bff..8f8e0b4c8341e764a7fc803344c2c19ea1ddb92d 100644
--- a/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/DateAllOptionsWidget.jsx
@@ -61,7 +61,8 @@ type Props = {
type State = { filter: FieldFilter };
-export default class DateAllOptionsWidget extends Component<*, Props, State> {
+export default class DateAllOptionsWidget extends Component {
+ props: Props;
state: State;
constructor(props: Props) {
diff --git a/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx b/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx
index 553c01eaee5ac465b771c4a5dacafac797d7b4ab..132cbd1bac992129c37730f0b117f5d31164fd40 100644
--- a/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx
+++ b/frontend/src/metabase/parameters/components/widgets/TextWidget.jsx
@@ -2,6 +2,8 @@
import React, { Component } from "react";
import PropTypes from "prop-types";
+import { KEYCODE_ENTER, KEYCODE_ESCAPE } from "metabase/lib/keyboard";
+
export default class TextWidget extends Component {
constructor(props, context) {
super(props, context);
@@ -56,9 +58,9 @@ export default class TextWidget extends Component {
}
}}
onKeyUp={(e) => {
- if (e.keyCode === 27) {
+ if (e.keyCode === KEYCODE_ESCAPE) {
e.target.blur();
- } else if (e.keyCode === 13) {
+ } else if (e.keyCode === KEYCODE_ENTER) {
setValue(this.state.value || null);
e.target.blur();
}
diff --git a/frontend/src/metabase/public/components/EmbedFrame.jsx b/frontend/src/metabase/public/components/EmbedFrame.jsx
index 76c9443c931cdd4e0c6bf1d1b88a593e4e201cae..c302bba0c0fd2afb14e3a17fb65eae097ca04129 100644
--- a/frontend/src/metabase/public/components/EmbedFrame.jsx
+++ b/frontend/src/metabase/public/components/EmbedFrame.jsx
@@ -32,9 +32,14 @@ type Props = {
setParameterValue: (id: string, value: string) => void
}
+type State = {
+ innerScroll: boolean
+}
+
@withRouter
-export default class EmbedFrame extends Component<*, Props, *> {
- state = {
+export default class EmbedFrame extends Component {
+ props: Props;
+ state: State = {
innerScroll: true
}
diff --git a/frontend/src/metabase/public/components/widgets/AdvancedEmbedPane.jsx b/frontend/src/metabase/public/components/widgets/AdvancedEmbedPane.jsx
index cf40db04da529ba048b7f46e571f73421825c64a..91a3c6081c6aa856873e2c3b524a8a7123fc2bfe 100644
--- a/frontend/src/metabase/public/components/widgets/AdvancedEmbedPane.jsx
+++ b/frontend/src/metabase/public/components/widgets/AdvancedEmbedPane.jsx
@@ -11,7 +11,8 @@ import PreviewPane from "./PreviewPane";
import EmbedCodePane from "./EmbedCodePane";
import type { Parameter, ParameterId } from "metabase/meta/types/Parameter";
-import type { Pane, EmbedType, EmbeddableResource, EmbeddingParams, DisplayOptions } from "./EmbedModalContent";
+import type { Pane, EmbedType, DisplayOptions } from "./EmbedModalContent";
+import type { EmbeddableResource, EmbeddingParams } from "metabase/public/lib/types";
import _ from "underscore";
diff --git a/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx b/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx
index 79af697674fa352f5b211795bab1ef8206a35a42..858030f8ddc2e8e225df53cbf97ccb12d8d08979 100644
--- a/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx
+++ b/frontend/src/metabase/public/components/widgets/AdvancedSettingsPane.jsx
@@ -16,7 +16,8 @@ const getIconForParameter = (parameter) =>
parameter.type.indexOf("date/") === 0 ? "calendar" :
"unknown";
-import type { EmbedType, EmbeddableResource, EmbeddingParams, DisplayOptions } from "./EmbedModalContent";
+import type { EmbedType, DisplayOptions } from "./EmbedModalContent";
+import type { EmbeddableResource, EmbeddingParams } from "metabase/public/lib/types";
import type { Parameter, ParameterId } from "metabase/meta/types/Parameter";
type Props = {
diff --git a/frontend/src/metabase/public/components/widgets/CodeSample.jsx b/frontend/src/metabase/public/components/widgets/CodeSample.jsx
index f236fd875b1a1c91c9f6fa38f28bda6e6aa0e217..c998e9062982561d21b487a89f193e7b21200281 100644
--- a/frontend/src/metabase/public/components/widgets/CodeSample.jsx
+++ b/frontend/src/metabase/public/components/widgets/CodeSample.jsx
@@ -9,25 +9,21 @@ import AceEditor from "metabase/components/TextEditor";
import _ from "underscore";
-type CodeSampleOption = {
- name: string,
- value: string,
- source: () => string,
- mode: string
-};
+import type { CodeSampleOption } from "metabase/public/lib/code";
type Props = {
className?: string,
title?: string,
options?: Array<CodeSampleOption>,
- onChangeOption: (option: ?CodeSampleOption) => void
+ onChangeOption?: (option: ?CodeSampleOption) => void
};
type State = {
name: ?string,
};
-export default class CodeSample extends Component<*, Props, State> {
+export default class CodeSample extends Component {
+ props: Props;
state: State;
constructor(props: Props) {
diff --git a/frontend/src/metabase/public/components/widgets/EmbedCodePane.jsx b/frontend/src/metabase/public/components/widgets/EmbedCodePane.jsx
index 3958f551e00d797aed0d33242f430fbd199dcc3e..173b9f0ec1207bc7e9199218c870214745c62b3c 100644
--- a/frontend/src/metabase/public/components/widgets/EmbedCodePane.jsx
+++ b/frontend/src/metabase/public/components/widgets/EmbedCodePane.jsx
@@ -15,7 +15,8 @@ import "ace/mode-ruby";
import "ace/mode-html";
import "ace/mode-jsx";
-import type { EmbedType, EmbeddableResource, EmbeddingParams, DisplayOptions } from "./EmbedModalContent";
+import type { EmbedType, DisplayOptions } from "./EmbedModalContent";
+import type { EmbeddableResource, EmbeddingParams } from "metabase/public/lib/types";
type Props = {
className: string,
@@ -30,7 +31,9 @@ type Props = {
displayOptions: DisplayOptions
}
-export default class EmbedCodePane extends Component<*, Props, *> {
+export default class EmbedCodePane extends Component {
+ props: Props;
+
_embedSample: ?CodeSample;
render() {
diff --git a/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx b/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx
index 8e45a64699fdb94deee675e4f1903c6d780ca7a9..4133454a0d080b5918b9dc9a2f319f633b5b3fbd 100644
--- a/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx
+++ b/frontend/src/metabase/public/components/widgets/EmbedModalContent.jsx
@@ -14,36 +14,36 @@ import { getSignedPreviewUrl, getUnsignedPreviewUrl, getSignedToken } from "meta
import { getSiteUrl, getEmbeddingSecretKey, getIsPublicSharingEnabled, getIsApplicationEmbeddingEnabled } from "metabase/selectors/settings";
import { getUserIsAdmin } from "metabase/selectors/user";
-import type { Parameter, ParameterId } from "metabase/meta/types/Parameter";
-
import MetabaseAnalytics from "metabase/lib/analytics";
+import type { Parameter, ParameterId } from "metabase/meta/types/Parameter";
+import type { EmbeddableResource, EmbeddingParams } from "metabase/public/lib/types";
+
export type Pane = "preview"|"code";
export type EmbedType = null|"simple"|"application";
-export type EmbeddingParams = {
- [key: string]: string
-}
-
export type DisplayOptions = {
theme: ?string,
bordered: boolean,
titled: boolean,
}
-export type EmbeddableResource = {
- id: string,
- public_uuid: string,
- embedding_params: EmbeddingParams
-}
-
type Props = {
className?: string,
- siteUrl: string,
- secretKey: string,
resource: EmbeddableResource,
resourceType: string,
resourceParameters: Parameter[],
+
+ isAdmin: boolean,
+ siteUrl: string,
+ secretKey: string,
+
+ // Flow doesn't understand these are provided by @connect?
+ // isPublicSharingEnabled: bool,
+ // isApplicationEmbeddingEnabled: bool,
+
+ getPublicUrl: (resource: EmbeddableResource, extension: ?string) => string,
+
onUpdateEnableEmbedding: (enable_embedding: bool) => Promise<void>,
onUpdateEmbeddingParams: (embedding_params: EmbeddingParams) => Promise<void>,
onCreatePublicLink: () => Promise<void>,
@@ -56,10 +56,9 @@ type State = {
embedType: EmbedType,
embeddingParams: EmbeddingParams,
displayOptions: DisplayOptions,
- parameterValues: { [id: ParameterId]: string }
+ parameterValues: { [id: ParameterId]: string },
};
-
const mapStateToProps = (state, props) => ({
isAdmin: getUserIsAdmin(state, props),
siteUrl: getSiteUrl(state, props),
@@ -69,7 +68,8 @@ const mapStateToProps = (state, props) => ({
})
@connect(mapStateToProps)
-export default class EmbedModalContent extends Component<*, Props, State> {
+export default class EmbedModalContent extends Component {
+ props: Props;
state: State;
constructor(props: Props) {
@@ -168,6 +168,7 @@ export default class EmbedModalContent extends Component<*, Props, State> {
{/* Center only using margins because */}
<div className="ml-auto mr-auto" style={{maxWidth: 1040}}>
<SharingPane
+ // $FlowFixMe: Flow doesn't understand these are provided by @connect?
{...this.props}
publicUrl={getUnsignedPreviewUrl(siteUrl, resourceType, resource.public_uuid, displayOptions)}
iframeUrl={getUnsignedPreviewUrl(siteUrl, resourceType, resource.public_uuid, displayOptions)}
diff --git a/frontend/src/metabase/public/components/widgets/EmbedWidget.jsx b/frontend/src/metabase/public/components/widgets/EmbedWidget.jsx
index 05a759a4ba821eb7b8f3f1e96513bd805879ccfb..af42e388e7f16ba8b95483bb4788325d774d0bfa 100644
--- a/frontend/src/metabase/public/components/widgets/EmbedWidget.jsx
+++ b/frontend/src/metabase/public/components/widgets/EmbedWidget.jsx
@@ -12,12 +12,29 @@ import EmbedModalContent from "./EmbedModalContent";
import cx from "classnames";
+import type { EmbeddableResource, EmbeddingParams } from "metabase/public/lib/types";
+import type { Parameter } from "metabase/meta/types/Parameter";
+
type Props = {
className?: string,
- resourceType: string
+
+ resource: EmbeddableResource,
+ resourceType: string,
+ resourceParameters: Parameter[],
+
+ siteUrl: string,
+ secretKey: string,
+ isAdmin: boolean,
+
+ getPublicUrl: (resource: EmbeddableResource, extension: ?string) => string,
+
+ onUpdateEnableEmbedding: (enable_embedding: bool) => Promise<void>,
+ onUpdateEmbeddingParams: (embedding_params: EmbeddingParams) => Promise<void>,
+ onCreatePublicLink: () => Promise<void>,
+ onDisablePublicLink: () => Promise<void>,
};
-export default class EmbedWidget extends Component<*, Props, *> {
+export default class EmbedWidget extends Component {
props: Props;
_modal: ?ModalWithTrigger
@@ -38,7 +55,7 @@ export default class EmbedWidget extends Component<*, Props, *> {
>
<EmbedModalContent
{...this.props}
- onClose={() => this._modal && this._modal.close()}
+ onClose={() => { this._modal && this._modal.close() }}
className="full-height"
/>
</ModalWithTrigger>
diff --git a/frontend/src/metabase/public/components/widgets/SharingPane.jsx b/frontend/src/metabase/public/components/widgets/SharingPane.jsx
index 783a46001e5756099bcd572225f91f5b5a60d2c6..25100f1aec3b75938a02a9b857fdc9f8399f8820 100644
--- a/frontend/src/metabase/public/components/widgets/SharingPane.jsx
+++ b/frontend/src/metabase/public/components/widgets/SharingPane.jsx
@@ -12,7 +12,8 @@ import { getPublicEmbedHTML } from "metabase/public/lib/code";
import cx from "classnames";
-import type { EmbedType, EmbeddableResource } from "./EmbedModalContent";
+import type { EmbedType } from "./EmbedModalContent";
+import type { EmbeddableResource } from "metabase/public/lib/types";
import MetabaseAnalytics from "metabase/lib/analytics";
@@ -20,9 +21,12 @@ type Props = {
resourceType: string,
resource: EmbeddableResource,
extensions?: string[],
+
isAdmin: bool,
+
isPublicSharingEnabled: bool,
isApplicationEmbeddingEnabled: bool,
+
onCreatePublicLink: () => Promise<void>,
onDisablePublicLink: () => Promise<void>,
getPublicUrl: (resource: EmbeddableResource, extension: ?string) => string,
@@ -33,15 +37,11 @@ type State = {
extension: ?string,
};
-export default class SharingPane extends Component<*, Props, State> {
+export default class SharingPane extends Component {
props: Props;
- state: State;
- constructor(props: Props) {
- super(props);
- this.state = {
- extension: null
- };
- }
+ state: State = {
+ extension: null
+ };
static defaultProps = {
extensions: []
@@ -115,7 +115,7 @@ export default class SharingPane extends Component<*, Props, State> {
<div className={cx("mb4 flex align-center", { disabled: !resource.public_uuid })}>
<RetinaImage
width={98}
- src="/app/img/simple_embed.png"
+ src="app/assets/img/simple_embed.png"
forceOriginalDimensions={false}
/>
<div className="ml2 flex-full">
@@ -131,7 +131,7 @@ export default class SharingPane extends Component<*, Props, State> {
>
<RetinaImage
width={100}
- src="/app/img/secure_embed.png"
+ src="app/assets/img/secure_embed.png"
forceOriginalDimensions={false}
/>
<div className="ml2 flex-full">
diff --git a/frontend/src/metabase/public/containers/PublicApp.jsx b/frontend/src/metabase/public/containers/PublicApp.jsx
index 9405c6015ae048f78ea2c1ade05614d4034f5761..4d41faef88d229005fe3f320837f62fa3acd78b3 100644
--- a/frontend/src/metabase/public/containers/PublicApp.jsx
+++ b/frontend/src/metabase/public/containers/PublicApp.jsx
@@ -16,7 +16,9 @@ const mapStateToProps = (state, props) => ({
});
@connect(mapStateToProps)
-export default class PublicApp extends Component<*, Props, *> {
+export default class PublicApp extends Component {
+ props: Props;
+
render() {
const { children, errorPage } = this.props;
if (errorPage) {
diff --git a/frontend/src/metabase/public/containers/PublicDashboard.jsx b/frontend/src/metabase/public/containers/PublicDashboard.jsx
index 6fed2ce5ba6f1035d231652a7a52875345ef9397..aa9c4f505eff33089c89fa115eb751a5d582f26f 100644
--- a/frontend/src/metabase/public/containers/PublicDashboard.jsx
+++ b/frontend/src/metabase/public/containers/PublicDashboard.jsx
@@ -63,7 +63,9 @@ type Props = {
@connect(mapStateToProps, mapDispatchToProps)
@DashboardControls
-export default class PublicDashboard extends Component<*, Props, *> {
+export default class PublicDashboard extends Component {
+ props: Props;
+
// $FlowFixMe
async componentWillMount() {
const { initialize, fetchDashboard, fetchDashboardCardData, setErrorPage, location, params: { uuid, token }} = this.props;
diff --git a/frontend/src/metabase/public/containers/PublicQuestion.jsx b/frontend/src/metabase/public/containers/PublicQuestion.jsx
index 5e94aa74f8fbe4593875cea85ba73a33e96c53ac..1978c7c98dedb5d2b4acf6040fe739e85080f221 100644
--- a/frontend/src/metabase/public/containers/PublicQuestion.jsx
+++ b/frontend/src/metabase/public/containers/PublicQuestion.jsx
@@ -45,7 +45,7 @@ const mapDispatchToProps = {
@connect(null, mapDispatchToProps)
@ExplicitSize
-export default class PublicQuestion extends Component<*, Props, State> {
+export default class PublicQuestion extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/public/lib/code.js b/frontend/src/metabase/public/lib/code.js
index a0d5b217701f66286654ebd4a02ad3e63846d223..b1184956a38eb5a04c8c1cc4e468f2d743b25670 100644
--- a/frontend/src/metabase/public/lib/code.js
+++ b/frontend/src/metabase/public/lib/code.js
@@ -1,25 +1,33 @@
+/* @flow */
import { optionsToHashParams } from "./embed";
-export const getPublicEmbedOptions = ({ iframeUrl }) => [
+export type CodeSampleOption = {
+ name: string,
+ source: () => string,
+ mode?: string,
+ embedOption?: string
+};
+
+export const getPublicEmbedOptions = ({ iframeUrl }: { iframeUrl: string }): CodeSampleOption[] => [
{ name: "HTML", source: () => html({ iframeUrl: `"${iframeUrl}"` }), mode: "ace/mode/html" }
];
-export const getSignedEmbedOptions = () => [
+export const getSignedEmbedOptions = (): CodeSampleOption[] => [
{ name: "Mustache", source: () => html({ iframeUrl: `"{{iframeUrl}}"`, mode: "ace/mode/html" })},
{ name: "Pug / Jade", source: () => pug({ iframeUrl: `iframeUrl` })},
{ name: "ERB", source: () => html({ iframeUrl: `"<%= @iframe_url %>"` })},
{ name: "JSX", source: () => jsx({ iframeUrl: `{iframeUrl}`, mode: "ace/mode/jsx" })},
];
-export const getSignTokenOptions = (params) => [
+export const getSignTokenOptions = (params: any): CodeSampleOption[] => [
{ name: "Node.js", source: () => node(params), mode: "ace/mode/javascript", embedOption: "Pug / Jade" },
{ name: "Ruby", source: () => ruby(params), mode: "ace/mode/ruby", embedOption: "ERB" },
{ name: "Python", source: () => python(params), mode: "ace/mode/python" },
{ name: "Clojure", source: () => clojure(params), mode: "ace/mode/clojure" },
];
-export const getPublicEmbedHTML = (iframeUrl) => html({ iframeUrl: JSON.stringify(iframeUrl )});
+export const getPublicEmbedHTML = (iframeUrl: string): string => html({ iframeUrl: JSON.stringify(iframeUrl )});
const html = ({ iframeUrl }) =>
`<iframe
diff --git a/frontend/src/metabase/public/lib/types.js b/frontend/src/metabase/public/lib/types.js
new file mode 100644
index 0000000000000000000000000000000000000000..7aa0f3415243f9cd65dbc65ec380bb16af549716
--- /dev/null
+++ b/frontend/src/metabase/public/lib/types.js
@@ -0,0 +1,11 @@
+/* @flow */
+
+export type EmbeddingParams = {
+ [key: string]: string
+}
+
+export type EmbeddableResource = {
+ id: string,
+ public_uuid: string,
+ embedding_params: EmbeddingParams
+}
diff --git a/frontend/src/metabase/pulse/components/RecipientPicker.jsx b/frontend/src/metabase/pulse/components/RecipientPicker.jsx
index b53fba16aa3e68fbe5efedfbf9615c4a867a2405..df3c5cefb9291603c13c32d2bfbb6dc13cf286b2 100644
--- a/frontend/src/metabase/pulse/components/RecipientPicker.jsx
+++ b/frontend/src/metabase/pulse/components/RecipientPicker.jsx
@@ -8,6 +8,7 @@ import Popover from "metabase/components/Popover.jsx";
import UserAvatar from "metabase/components/UserAvatar.jsx";
import MetabaseAnalytics from "metabase/lib/analytics";
+import { KEYCODE_ESCAPE, KEYCODE_COMMA, KEYCODE_TAB, KEYCODE_UP, KEYCODE_DOWN, KEYCODE_BACKSPACE } from "metabase/lib/keyboard";
import _ from "underscore";
import cx from "classnames";
@@ -80,11 +81,11 @@ export default class RecipientPicker extends Component {
onInputKeyDown(e) {
// enter, tab, comma
- if (e.keyCode === 13 || e.keyCode === 9 || e.keyCode === 188) {
+ if (e.keyCode === KEYCODE_ESCAPE || e.keyCode === KEYCODE_TAB || e.keyCode === KEYCODE_COMMA) {
this.addCurrentRecipient();
}
// up arrow
- else if (e.keyCode === 38) {
+ else if (e.keyCode === KEYCODE_UP) {
e.preventDefault();
let index = _.findIndex(this.state.filteredUsers, (u) => u.id === this.state.selectedUser);
if (index > 0) {
@@ -92,7 +93,7 @@ export default class RecipientPicker extends Component {
}
}
// down arrow
- else if (e.keyCode === 40) {
+ else if (e.keyCode === KEYCODE_DOWN) {
e.preventDefault();
let index = _.findIndex(this.state.filteredUsers, (u) => u.id === this.state.selectedUser);
if (index >= 0 && index < this.state.filteredUsers.length - 1) {
@@ -100,7 +101,7 @@ export default class RecipientPicker extends Component {
}
}
// backspace
- else if (e.keyCode === 8) {
+ else if (e.keyCode === KEYCODE_BACKSPACE) {
let { recipients } = this.props;
if (!this.state.inputValue && recipients.length > 0) {
this.removeRecipient(recipients[recipients.length - 1])
diff --git a/frontend/src/metabase/pulse/components/WhatsAPulse.jsx b/frontend/src/metabase/pulse/components/WhatsAPulse.jsx
index 0d44604a99758b1ed9ba13be70b6a39cde1619f4..85ec9f8cef1816e9d139f6badfba3db75d329b4a 100644
--- a/frontend/src/metabase/pulse/components/WhatsAPulse.jsx
+++ b/frontend/src/metabase/pulse/components/WhatsAPulse.jsx
@@ -17,7 +17,7 @@ export default class WhatsAPulse extends Component {
<div className="mx4">
<RetinaImage
width={574}
- src="/app/img/pulse_empty_illustration.png"
+ src="app/assets/img/pulse_empty_illustration.png"
forceOriginalDimensions={false}
/>
</div>
diff --git a/frontend/src/metabase/qb/components/TimeseriesFilterWidget.jsx b/frontend/src/metabase/qb/components/TimeseriesFilterWidget.jsx
index 23a1601f49adf005b5e8c041c8ed18556741d4e8..a7bc8ac5372284d8957e00b74cb5bd2c2d9d8ead 100644
--- a/frontend/src/metabase/qb/components/TimeseriesFilterWidget.jsx
+++ b/frontend/src/metabase/qb/components/TimeseriesFilterWidget.jsx
@@ -30,7 +30,7 @@ import type { TableMetadata } from "metabase/meta/types/Metadata";
import type { FieldFilter } from "metabase/meta/types/Query";
type Props = {
- className: string,
+ className?: string,
card: CardObject,
tableMetadata: TableMetadata,
setDatasetQuery: (
@@ -45,8 +45,10 @@ type State = {
currentFilter: any
};
-export default class TimeseriesFilterWidget extends Component<*, Props, State> {
- state = {
+export default class TimeseriesFilterWidget extends Component {
+ props: Props;
+ state: State = {
+ // $FlowFixMe
filter: null,
filterIndex: -1,
currentFilter: null
diff --git a/frontend/src/metabase/qb/components/TimeseriesGroupingWidget.jsx b/frontend/src/metabase/qb/components/TimeseriesGroupingWidget.jsx
index c5adb221ad64d8e631cb9c2af8b044f59a937548..c037ce0f0976632c8da94a0fa9903ea129d69ed6 100644
--- a/frontend/src/metabase/qb/components/TimeseriesGroupingWidget.jsx
+++ b/frontend/src/metabase/qb/components/TimeseriesGroupingWidget.jsx
@@ -25,7 +25,9 @@ type Props = {
) => void
};
-export default class TimeseriesGroupingWidget extends Component<*, Props, *> {
+export default class TimeseriesGroupingWidget extends Component {
+ props: Props;
+
_popover: ?any;
render() {
diff --git a/frontend/src/metabase/qb/components/drill/CountByColumnDrill.js b/frontend/src/metabase/qb/components/drill/CountByColumnDrill.js
index f755db6470fbc9d17232b1956f1d40b54dc51233..eb81a81f9ec95cdc35a955c74414179232de186e 100644
--- a/frontend/src/metabase/qb/components/drill/CountByColumnDrill.js
+++ b/frontend/src/metabase/qb/components/drill/CountByColumnDrill.js
@@ -5,7 +5,7 @@ import React from "react";
import {
summarize,
pivot,
- getFieldClauseFromCol
+ getFieldRefFromColumn
} from "metabase/qb/lib/actions";
import * as Card from "metabase/meta/Card";
import { isCategory } from "metabase/lib/schema_metadata";
@@ -40,7 +40,7 @@ export default (
card: () =>
pivot(
summarize(card, ["count"], tableMetadata),
- getFieldClauseFromCol(column),
+ getFieldRefFromColumn(column),
tableMetadata
)
}
diff --git a/frontend/src/metabase/qb/components/drill/SummarizeColumnByTimeDrill.js b/frontend/src/metabase/qb/components/drill/SummarizeColumnByTimeDrill.js
index 2cd4003007a2a03470ad081440ec4bd08cba6933..85c78256fa31d6c7ab814a96b22316bc3f5a5242 100644
--- a/frontend/src/metabase/qb/components/drill/SummarizeColumnByTimeDrill.js
+++ b/frontend/src/metabase/qb/components/drill/SummarizeColumnByTimeDrill.js
@@ -5,7 +5,7 @@ import React from "react";
import {
pivot,
summarize,
- getFieldClauseFromCol
+ getFieldRefFromColumn
} from "metabase/qb/lib/actions";
import * as Card from "metabase/meta/Card";
import { isNumeric, isDate } from "metabase/lib/schema_metadata";
@@ -43,12 +43,12 @@ export default (
pivot(
summarize(
card,
- [aggregation, getFieldClauseFromCol(column)],
+ [aggregation, getFieldRefFromColumn(column)],
tableMetadata
),
[
"datetime-field",
- getFieldClauseFromCol(dateField),
+ getFieldRefFromColumn(dateField),
"as",
"day"
],
diff --git a/frontend/src/metabase/qb/components/drill/SummarizeColumnDrill.js b/frontend/src/metabase/qb/components/drill/SummarizeColumnDrill.js
index 352b6bb47448d6de96533e6beb1744c9e8d6a2c7..e4d5dcafc609777c09dbbbbd1bcbd2357806aa32 100644
--- a/frontend/src/metabase/qb/components/drill/SummarizeColumnDrill.js
+++ b/frontend/src/metabase/qb/components/drill/SummarizeColumnDrill.js
@@ -1,6 +1,6 @@
/* @flow */
-import { summarize, getFieldClauseFromCol } from "metabase/qb/lib/actions";
+import { summarize, getFieldRefFromColumn } from "metabase/qb/lib/actions";
import * as Card from "metabase/meta/Card";
import { isNumeric } from "metabase/lib/schema_metadata";
@@ -59,7 +59,7 @@ export default (
card: () =>
summarize(
card,
- [aggregation, getFieldClauseFromCol(column)],
+ [aggregation, getFieldRefFromColumn(column)],
tableMetadata
)
}));
diff --git a/frontend/src/metabase/qb/lib/actions.js b/frontend/src/metabase/qb/lib/actions.js
index e3578fc6d8ac5b2bcab242efd9b3fd350cc7c1a1..2eea6601f716b8dba58a420fd84e9e0efc0d7323 100644
--- a/frontend/src/metabase/qb/lib/actions.js
+++ b/frontend/src/metabase/qb/lib/actions.js
@@ -9,12 +9,15 @@ import * as Field from "metabase/lib/query/field";
import * as Filter from "metabase/lib/query/filter";
import { startNewCard } from "metabase/lib/card";
import { isDate, isState, isCountry } from "metabase/lib/schema_metadata";
+import Utils from "metabase/lib/utils";
import type { Card as CardObject } from "metabase/meta/types/Card";
import type { TableMetadata } from "metabase/meta/types/Metadata";
import type { StructuredQuery, FieldFilter } from "metabase/meta/types/Query";
import type { DimensionValue } from "metabase/meta/types/Visualization";
+// TODO: use icepick instead of mutation, make they handle frozen cards
+
export const toUnderlyingData = (card: CardObject): ?CardObject => {
const newCard = startNewCard("query");
newCard.dataset_query = card.dataset_query;
@@ -36,7 +39,7 @@ export const toUnderlyingRecords = (card: CardObject): ?CardObject => {
}
};
-export const getFieldClauseFromCol = col => {
+export const getFieldRefFromColumn = col => {
if (col.fk_field_id != null) {
return ["fk->", col.fk_field_id, col.id];
} else {
@@ -48,8 +51,8 @@ const clone = card => {
const newCard = startNewCard("query");
newCard.display = card.display;
- newCard.dataset_query = card.dataset_query;
- newCard.visualization_settings = card.visualization_settings;
+ newCard.dataset_query = Utils.copy(card.dataset_query);
+ newCard.visualization_settings = Utils.copy(card.visualization_settings);
return newCard;
};
@@ -60,7 +63,7 @@ export const filter = (card, operator, column, value) => {
// $FlowFixMe:
const filter: FieldFilter = [
operator,
- getFieldClauseFromCol(column),
+ getFieldRefFromColumn(column),
value
];
newCard.dataset_query.query = Query.addFilter(
@@ -71,30 +74,34 @@ export const filter = (card, operator, column, value) => {
};
const drillFilter = (card, value, column) => {
- let newCard = clone(card);
-
let filter;
if (isDate(column)) {
filter = [
"=",
[
"datetime-field",
- getFieldClauseFromCol(column),
+ getFieldRefFromColumn(column),
"as",
column.unit
],
moment(value).toISOString()
];
} else {
- filter = ["=", getFieldClauseFromCol(column), value];
+ filter = ["=", getFieldRefFromColumn(column), value];
}
+ return addOrUpdateFilter(card, filter);
+};
+
+export const addOrUpdateFilter = (card, filter) => {
+ let newCard = clone(card);
// replace existing filter, if it exists
let filters = Query.getFilters(newCard.dataset_query.query);
for (let index = 0; index < filters.length; index++) {
if (
Filter.isFieldFilter(filters[index]) &&
- Field.getFieldTargetId(filters[index][1]) === column.id
+ Field.getFieldTargetId(filters[index][1]) ===
+ Field.getFieldTargetId(filter[1])
) {
newCard.dataset_query.query = Query.updateFilter(
newCard.dataset_query.query,
@@ -113,7 +120,36 @@ const drillFilter = (card, value, column) => {
return newCard;
};
+export const addOrUpdateBreakout = (card, breakout) => {
+ let newCard = clone(card);
+ // replace existing breakout, if it exists
+ let breakouts = Query.getBreakouts(newCard.dataset_query.query);
+ for (let index = 0; index < breakouts.length; index++) {
+ if (
+ Field.getFieldTargetId(breakouts[index]) ===
+ Field.getFieldTargetId(breakout)
+ ) {
+ newCard.dataset_query.query = Query.updateBreakout(
+ newCard.dataset_query.query,
+ index,
+ breakout
+ );
+ return newCard;
+ }
+ }
+
+ // otherwise add a new breakout
+ newCard.dataset_query.query = Query.addBreakout(
+ newCard.dataset_query.query,
+ breakout
+ );
+ return newCard;
+};
+
const UNITS = ["minute", "hour", "day", "week", "month", "quarter", "year"];
+const getNextUnit = unit => {
+ return UNITS[Math.max(0, UNITS.indexOf(unit) - 1)];
+};
export const drillDownForDimensions = dimensions => {
const timeDimensions = dimensions.filter(
@@ -121,13 +157,13 @@ export const drillDownForDimensions = dimensions => {
);
if (timeDimensions.length === 1) {
const column = timeDimensions[0].column;
- let nextUnit = UNITS[Math.max(0, UNITS.indexOf(column.unit) - 1)];
+ let nextUnit = getNextUnit(column.unit);
if (nextUnit && nextUnit !== column.unit) {
return {
name: column.unit,
breakout: [
"datetime-field",
- getFieldClauseFromCol(column),
+ getFieldRefFromColumn(column),
"as",
nextUnit
]
@@ -197,6 +233,76 @@ export const breakout = (card, breakout, tableMetadata) => {
return newCard;
};
+// min number of points when switching units
+const MIN_INTERVALS = 4;
+
+export const updateDateTimeFilter = (card, column, start, end) => {
+ let newCard = clone(card);
+
+ let fieldRef = getFieldRefFromColumn(column);
+ start = moment(start);
+ end = moment(end);
+ if (column.unit) {
+ // start with the existing breakout unit
+ let unit = column.unit;
+
+ // clamp range to unit to ensure we select exactly what's represented by the dots/bars
+ start = start.add(1, unit).startOf(unit);
+ end = end.endOf(unit);
+
+ // find the largest unit with at least MIN_INTERVALS
+ while (
+ unit !== getNextUnit(unit) && end.diff(start, unit) < MIN_INTERVALS
+ ) {
+ unit = getNextUnit(unit);
+ }
+
+ // update the breakout
+ newCard = addOrUpdateBreakout(newCard, [
+ "datetime-field",
+ fieldRef,
+ "as",
+ unit
+ ]);
+
+ // round to start of the original unit
+ start = start.startOf(column.unit);
+ end = end.startOf(column.unit);
+
+ if (start.isAfter(end)) {
+ return card;
+ }
+ if (start.isSame(end, column.unit)) {
+ // is the start and end are the same (in whatever the original unit was) then just do an "="
+ return addOrUpdateFilter(newCard, [
+ "=",
+ ["datetime-field", fieldRef, "as", column.unit],
+ start.format()
+ ]);
+ } else {
+ // otherwise do a BETWEEN
+ return addOrUpdateFilter(newCard, [
+ "BETWEEN",
+ ["datetime-field", fieldRef, "as", column.unit],
+ start.format(),
+ end.format()
+ ]);
+ }
+ } else {
+ return addOrUpdateFilter(newCard, [
+ "BETWEEN",
+ fieldRef,
+ start.format(),
+ end.format()
+ ]);
+ }
+};
+
+export const updateNumericFilter = (card, column, start, end) => {
+ const fieldRef = getFieldRefFromColumn(column);
+ return addOrUpdateFilter(card, ["BETWEEN", fieldRef, start, end]);
+};
+
export const pivot = (
card: CardObject,
breakout,
diff --git a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
index eba3825141b79b5e1df080e34d80d6612c170acc..6e57f4eda6a21852562218ec6616b79ceb6f6a0b 100644
--- a/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/ActionsWidget.jsx
@@ -24,12 +24,19 @@ type Props = {
navigateToNewCardInsideQB: any => void
};
+type State = {
+ isVisible: boolean,
+ isOpen: boolean,
+ selectedActionIndex: ?number
+};
+
const CIRCLE_SIZE = 48;
const NEEDLE_SIZE = 20;
const POPOVER_WIDTH = 350;
-export default class ActionsWidget extends Component<*, Props, *> {
- state = {
+export default class ActionsWidget extends Component {
+ props: Props;
+ state: State = {
isVisible: false,
isOpen: false,
selectedActionIndex: null
diff --git a/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx b/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
index 9dee1e629a51b25e64a3275516e9f95a6f222f7d..647b4e7c53efb0dcd2549ff9beb94384313efd81 100644
--- a/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
+++ b/frontend/src/metabase/query_builder/components/GuiQueryEditor.jsx
@@ -35,7 +35,8 @@ export default class GuiQueryEditor extends Component {
setDatasetQuery: PropTypes.func.isRequired,
setDatabaseFn: PropTypes.func,
setSourceTableFn: PropTypes.func,
- features: PropTypes.object
+ features: PropTypes.object,
+ supportMultipleAggregations: PropTypes.bool
};
static defaultProps = {
@@ -46,7 +47,8 @@ export default class GuiQueryEditor extends Component {
breakout: true,
sort: true,
limit: true
- }
+ },
+ supportMultipleAggregations: true
};
renderAdd(text, onClick, targetRefName) {
@@ -134,7 +136,7 @@ export default class GuiQueryEditor extends Component {
}
renderAggregation() {
- const { datasetQuery: { query }, tableMetadata } = this.props;
+ const { datasetQuery: { query }, tableMetadata, supportMultipleAggregations } = this.props;
if (!this.props.features.aggregation) {
return;
@@ -152,7 +154,8 @@ export default class GuiQueryEditor extends Component {
const canRemoveAggregation = aggregations.length > 1;
- if (!isBareRows) {
+ if (supportMultipleAggregations && !isBareRows) {
+ // Placeholder aggregation for showing the add button
aggregations.push([]);
}
diff --git a/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx b/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx
index 2f9a29423a9c4f6cdcecf43b341e5268b132288e..b5532b94c8b21313e686cbe5b336dbb52764ccff 100644
--- a/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/QueryDownloadWidget.jsx
@@ -52,7 +52,7 @@ const QueryDownloadWidget = ({ className, card, result, uuid, token }) =>
const UnsavedQueryButton = ({ className, type, result: { json_query }, card }) =>
<DownloadButton
className={className}
- url={`/api/dataset/${type}`}
+ url={`api/dataset/${type}`}
params={{ query: JSON.stringify(_.omit(json_query, "constraints")) }}
extensions={[type]}
>
@@ -62,7 +62,7 @@ const UnsavedQueryButton = ({ className, type, result: { json_query }, card }) =
const SavedQueryButton = ({ className, type, result: { json_query }, card }) =>
<DownloadButton
className={className}
- url={`/api/card/${card.id}/query/${type}`}
+ url={`api/card/${card.id}/query/${type}`}
params={{ parameters: JSON.stringify(json_query.parameters) }}
extensions={[type]}
>
diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx
index 3c3c73f632db068d7dd0bdd69490ee3a1f325172..3d9a6ac0238d83db8e092fd1027e9c8ac0c8dde5 100644
--- a/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx
+++ b/frontend/src/metabase/query_builder/components/expressions/ExpressionEditorTextfield.jsx
@@ -9,6 +9,14 @@ import cx from "classnames";
import { compile, suggest } from "metabase/lib/expressions/parser";
import { format } from "metabase/lib/expressions/formatter";
import { setCaretPosition, getSelectionPosition } from "metabase/lib/dom";
+import {
+ KEYCODE_ENTER,
+ KEYCODE_ESCAPE,
+ KEYCODE_LEFT,
+ KEYCODE_UP,
+ KEYCODE_RIGHT,
+ KEYCODE_DOWN
+} from "metabase/lib/keyboard";
import Popover from "metabase/components/Popover.jsx";
@@ -16,14 +24,6 @@ import TokenizedInput from "./TokenizedInput.jsx";
import { isExpression } from "metabase/lib/expressions";
-
-const KEYCODE_ENTER = 13;
-const KEYCODE_ESC = 27;
-const KEYCODE_LEFT = 37;
-const KEYCODE_UP = 38;
-const KEYCODE_RIGHT = 39;
-const KEYCODE_DOWN = 40;
-
const MAX_SUGGESTIONS = 30;
export default class ExpressionEditorTextfield extends Component {
@@ -129,7 +129,7 @@ export default class ExpressionEditorTextfield extends Component {
setTimeout(() => this._triggerAutosuggest());
return;
}
- if (e.keyCode === KEYCODE_ESC) {
+ if (e.keyCode === KEYCODE_ESCAPE) {
e.stopPropagation();
e.preventDefault();
this.clearSuggestions();
diff --git a/frontend/src/metabase/query_builder/components/filters/DateOperatorSelector.jsx b/frontend/src/metabase/query_builder/components/filters/DateOperatorSelector.jsx
index 5aca73f9400d560f68e4dd0b1dddf7b17cf4fbfe..1ac002057af4f8edb52afd3b6173de838eb60257 100644
--- a/frontend/src/metabase/query_builder/components/filters/DateOperatorSelector.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/DateOperatorSelector.jsx
@@ -8,12 +8,10 @@ import { titleCase } from "humanize-plus";
import Icon from "metabase/components/Icon";
-type Operator = {
- name: string
-}
+import type { Operator } from "./pickers/DatePicker";
type Props = {
- operator: string,
+ operator: ?string,
operators: Operator[],
onOperatorChange: (o: Operator) => void,
hideTimeSelectors?: bool
@@ -23,7 +21,7 @@ type State = {
expanded: bool
};
-export default class DateOperatorSelector extends Component<*, Props, State> {
+export default class DateOperatorSelector extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/query_builder/components/filters/FilterList.jsx b/frontend/src/metabase/query_builder/components/filters/FilterList.jsx
index b83df09ce9e0deab83d87be6c1c39caeb5a2413e..b73ae5505d81857bcb44ca871d5e36bd7359b0c9 100644
--- a/frontend/src/metabase/query_builder/components/filters/FilterList.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/FilterList.jsx
@@ -6,21 +6,21 @@ import { findDOMNode } from 'react-dom';
import FilterWidget from './FilterWidget.jsx';
import type { Filter } from "metabase/meta/types/Query";
-import type { Table } from "metabase/meta/types/Table";
+import type { TableMetadata } from "metabase/meta/types/Metadata";
type Props = {
filters: Array<Filter>,
- tableMetadata: Table,
- removeFilter: (index: number) => void,
- updateFilter: (index: number, filter: Filter) => void,
- maxDisplayValues?: bool
+ tableMetadata: TableMetadata,
+ removeFilter?: (index: number) => void,
+ updateFilter?: (index: number, filter: Filter) => void,
+ maxDisplayValues?: number
};
type State = {
shouldScroll: bool
};
-export default class FilterList extends Component<*, Props, State> {
+export default class FilterList extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/query_builder/components/filters/FilterPopover.jsx b/frontend/src/metabase/query_builder/components/filters/FilterPopover.jsx
index e8aca1d20631655e237d17f8cd808536f9e35d66..fbca456e1b2c326399689b6fa72839ad5032bc94 100644
--- a/frontend/src/metabase/query_builder/components/filters/FilterPopover.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/FilterPopover.jsx
@@ -19,22 +19,22 @@ import { singularize } from "metabase/lib/formatting";
import cx from "classnames";
-import type { FieldFilter, ConcreteField, ExpressionClause } from "metabase/meta/types/Query";
+import type { Filter, FieldFilter, ConcreteField, ExpressionClause } from "metabase/meta/types/Query";
import type { TableMetadata, FieldMetadata, Operator } from "metabase/meta/types/Metadata";
type Props = {
- filter?: FieldFilter,
- onCommitFilter: () => void,
+ filter?: Filter,
+ onCommitFilter: (filter: Filter) => void,
onClose: () => void,
tableMetadata: TableMetadata,
- customFields: ExpressionClause
+ customFields?: ExpressionClause
}
type State = {
filter: FieldFilter
}
-export default class FilterPopover extends Component<*, Props, State> {
+export default class FilterPopover extends Component {
props: Props;
state: State;
@@ -199,7 +199,8 @@ export default class FilterPopover extends Component<*, Props, State> {
return (
<SelectPicker
options={operatorField.values}
- values={values}
+ // $FlowFixMe
+ values={(values: Array<string>)}
onValuesChange={onValuesChange}
placeholder={placeholder}
multi={operator.multi}
@@ -209,7 +210,8 @@ export default class FilterPopover extends Component<*, Props, State> {
} else if (operatorField.type === "text") {
return (
<TextPicker
- values={values}
+ // $FlowFixMe
+ values={(values: Array<string>)}
onValuesChange={onValuesChange}
placeholder={placeholder}
multi={operator.multi}
@@ -219,7 +221,8 @@ export default class FilterPopover extends Component<*, Props, State> {
} else if (operatorField.type === "number") {
return (
<NumberPicker
- values={values}
+ // $FlowFixMe
+ values={(values: Array<number|null>)}
onValuesChange={onValuesChange}
placeholder={placeholder}
multi={operator.multi}
diff --git a/frontend/src/metabase/query_builder/components/filters/FilterWidget.jsx b/frontend/src/metabase/query_builder/components/filters/FilterWidget.jsx
index 274faf29b88153bb0edfc9f561974b1780d1c30c..6da831633bd736360b07540a60ecd95635fcd59c 100644
--- a/frontend/src/metabase/query_builder/components/filters/FilterWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/FilterWidget.jsx
@@ -15,22 +15,23 @@ import { isDate } from "metabase/lib/schema_metadata";
import cx from "classnames";
import _ from "underscore";
-import type { FieldFilter } from "metabase/meta/types/Query";
+import type { Filter } from "metabase/meta/types/Query";
import type { TableMetadata } from "metabase/meta/types/Metadata";
type Props = {
- filter: FieldFilter,
+ filter: Filter,
tableMetadata: TableMetadata,
index: number,
- updateFilter: (index: number, field: FieldFilter) => void,
- removeFilter: (index: number) => void,
+ updateFilter?: (index: number, field: Filter) => void,
+ removeFilter?: (index: number) => void,
maxDisplayValues?: number
}
type State = {
isOpen: bool
}
-export default class FilterWidget extends Component<*, Props, State> {
+export default class FilterWidget extends Component {
+ props: Props;
state: State;
constructor(props: Props) {
@@ -144,7 +145,7 @@ export default class FilterWidget extends Component<*, Props, State> {
<FilterPopover
filter={this.props.filter}
tableMetadata={this.props.tableMetadata}
- onCommitFilter={(filter) => this.props.updateFilter(this.props.index, filter)}
+ onCommitFilter={(filter) => this.props.updateFilter && this.props.updateFilter(this.props.index, filter)}
onClose={this.close}
/>
</Popover>
diff --git a/frontend/src/metabase/query_builder/components/filters/OperatorSelector.jsx b/frontend/src/metabase/query_builder/components/filters/OperatorSelector.jsx
index e53ca0c199446fb427da4d22964788fbc0afe396..de0242e100d42785acc3bcdd6190ef520769556c 100644
--- a/frontend/src/metabase/query_builder/components/filters/OperatorSelector.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/OperatorSelector.jsx
@@ -22,7 +22,7 @@ type State = {
expanded: bool
};
-export default class OperatorSelector extends Component<*, Props, State> {
+export default class OperatorSelector extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker.jsx
index 241aaaea4de4b8fa4b3e46ba621e5c98b3c3e208..fd921191f55d5b0aa6d8a12203b39ce52332a2d1 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker.jsx
@@ -69,7 +69,7 @@ type CurrentPickerState = {
showUnits: boolean
};
-class CurrentPicker extends Component<*, CurrentPickerProps, CurrentPickerState> {
+class CurrentPicker extends Component {
props: CurrentPickerProps;
state: CurrentPickerState;
@@ -223,13 +223,21 @@ type Props = {
className?: string,
filter: FieldFilter,
onFilterChange: (filter: FieldFilter) => void,
- className: ?string,
- hideEmptinessOperators: boolean, // Don't show is empty / not empty dialog
+ hideEmptinessOperators?: boolean, // Don't show is empty / not empty dialog
hideTimeSelectors?: boolean,
includeAllTime?: boolean,
}
-export default class DatePicker extends Component<*, Props, *> {
+type State = {
+ operators: Operator[]
+}
+
+export default class DatePicker extends Component {
+ props: Props;
+ state: State = {
+ operators: []
+ };
+
static propTypes = {
filter: PropTypes.array.isRequired,
onFilterChange: PropTypes.func.isRequired,
@@ -244,7 +252,7 @@ export default class DatePicker extends Component<*, Props, *> {
const operator = this._getOperator(operators) || operators[0];
this.props.onFilterChange(operator.init(this.props.filter));
- this.setState({operators})
+ this.setState({ operators })
}
_getOperator(operators: Operator[]) {
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx
index 8fa6e7098ee5d13911898bdcb72c77c92139c8c0..763d79577fcde28a10b4a10eb99c488a58213cda 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx
@@ -7,9 +7,10 @@ import TextPicker from "./TextPicker.jsx";
type Props = {
values: Array<number|null>,
- onValuesChange: (values: Array<number|null>) => void,
+ onValuesChange: (values: any[]) => void,
placeholder?: string,
multi?: bool,
+ onCommit: () => void,
}
type State = {
@@ -17,7 +18,7 @@ type State = {
validations: bool[]
}
-export default class NumberPicker extends Component<*, Props, State> {
+export default class NumberPicker extends Component {
props: Props;
state: State;
@@ -60,10 +61,12 @@ export default class NumberPicker extends Component<*, Props, State> {
}
render() {
+ // $FlowFixMe
+ const values: Array<string|null> = this.state.stringValues.slice(0, this.props.values.length);
return (
<TextPicker
{...this.props}
- values={this.state.stringValues.slice(0, this.props.values.length)}
+ values={values}
validations={this.state.validations}
onValuesChange={(values) => this.onValuesChange(values)}
/>
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/RelativeDatePicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/RelativeDatePicker.jsx
index 50be208d1497dc3402dfa607edd617d965950537..0019b27ccd65bfa9477a9f4ffb28dc0cbdc101c3 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/RelativeDatePicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/RelativeDatePicker.jsx
@@ -35,7 +35,7 @@ type State = {
showUnits: bool
}
-export default class RelativeDatePicker extends Component<*, Props, State> {
+export default class RelativeDatePicker extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/SelectPicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/SelectPicker.jsx
index 040d960c5489e5592ed54c597d01b8bc44275693..b325ab9cafcce16af8c00b0d0f3819d80ac2ea79 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/SelectPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/SelectPicker.jsx
@@ -19,7 +19,7 @@ type SelectOption = {
type Props = {
options: Array<SelectOption>,
values: Array<string>,
- onValuesChange: (values: any) => void,
+ onValuesChange: (values: any[]) => void,
placeholder?: string,
multi?: bool
}
@@ -29,7 +29,7 @@ type State = {
searchRegex: ?RegExp,
}
-export default class SelectPicker extends Component<*, Props, State> {
+export default class SelectPicker extends Component {
state: State;
props: Props;
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/SpecificDatePicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/SpecificDatePicker.jsx
index 83d9ab5ae3a18deb2a86f772c2a31395a86a3b2a..4560c1febfdd3bd2239896cd113747a803d26834 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/SpecificDatePicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/SpecificDatePicker.jsx
@@ -27,7 +27,7 @@ type State = {
showCalendar: bool
}
-export default class SpecificDatePicker extends Component<*, Props, State> {
+export default class SpecificDatePicker extends Component {
props: Props;
state: State;
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx
index 29e58cb2e139783c01d7327e1500acf8287d4ae8..1009b1f28827daba841c867c9265382b977b2594 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/TextPicker.jsx
@@ -9,14 +9,21 @@ import _ from "underscore";
type Props = {
values: Array<string|null>,
- onValuesChange: (values: Array<string|null>) => void,
+ onValuesChange: (values: any[]) => void,
validations: bool[],
placeholder?: string,
multi?: bool,
onCommit: () => void,
};
-export default class TextPicker extends Component<*, Props, *> {
+type State = {
+ fieldString: string,
+}
+
+export default class TextPicker extends Component {
+ props: Props;
+ state: State;
+
static propTypes = {
values: PropTypes.array.isRequired,
onValuesChange: PropTypes.func.isRequired,
diff --git a/frontend/src/metabase/query_builder/containers/QuestionEmbedWidget.jsx b/frontend/src/metabase/query_builder/containers/QuestionEmbedWidget.jsx
index 072267f530518a6f57963585944334e61723a1eb..a96a68b57e4481a3d00510dfa422304e0e2f1470 100644
--- a/frontend/src/metabase/query_builder/containers/QuestionEmbedWidget.jsx
+++ b/frontend/src/metabase/query_builder/containers/QuestionEmbedWidget.jsx
@@ -32,7 +32,7 @@ export default class QuestionEmbedWidget extends Component {
onDisablePublicLink={() => deletePublicLink(card)}
onUpdateEnableEmbedding={(enableEmbedding) => updateEnableEmbedding(card, enableEmbedding)}
onUpdateEmbeddingParams={(embeddingParams) => updateEmbeddingParams(card, embeddingParams)}
- getPublicUrl={({ public_uuid }, extension) => window.location.origin + Urls.publicCard(public_uuid, extension)}
+ getPublicUrl={({ public_uuid }, extension) => Urls.publicCard(public_uuid, extension)}
extensions={["csv", "xlsx", "json"]}
/>
);
diff --git a/frontend/src/metabase/questions/components/CollectionButtons.jsx b/frontend/src/metabase/questions/components/CollectionButtons.jsx
index ce2b246ec29085b3738c6aaa597d7c423232a2a5..28bd7451991b48acbdf930d4d1a3f086f48245a9 100644
--- a/frontend/src/metabase/questions/components/CollectionButtons.jsx
+++ b/frontend/src/metabase/questions/components/CollectionButtons.jsx
@@ -10,12 +10,12 @@ const COLLECTION_ICON_SIZE = 64;
const COLLECTION_BOX_CLASSES = "relative block p4 hover-parent hover--visibility cursor-pointer text-centered transition-background";
const CollectionButtons = ({ collections, isAdmin, push }) =>
- <ol className="flex flex-wrap">
+ <ol className="Grid Grid--gutters Grid--fit small-Grid--1of3 md-Grid--1of4 large-Grid--guttersLg">
{ collections
.map(collection => <CollectionButton {...collection} push={push} isAdmin={isAdmin} />)
.concat(isAdmin ? [<NewCollectionButton push={push} />] : [])
.map((element, index) =>
- <li key={index} className="mr4 mb4">
+ <li key={index} className="Grid-cell">
{element}
</li>
)
@@ -40,8 +40,6 @@ class CollectionButton extends Component {
<div
className={cx(COLLECTION_BOX_CLASSES, 'text-white-hover')}
style={{
- width: 290,
- height: 180,
borderRadius: 10,
backgroundColor: this.state.hovered ? color : '#fafafa'
}}
@@ -71,8 +69,6 @@ const NewCollectionButton = ({ push }) =>
<div
className={cx(COLLECTION_BOX_CLASSES, 'bg-brand-hover', 'text-brand', 'text-white-hover', 'bg-grey-0')}
style={{
- width: 290,
- height: 180,
borderRadius: 10
}}
onClick={() => push(`/collections/create`)}
diff --git a/frontend/src/metabase/questions/components/ExpandingSearchField.jsx b/frontend/src/metabase/questions/components/ExpandingSearchField.jsx
index b2583c2c48d7af90b15fbb8df24049270b9a3825..a4f888509ebf9c722cf0a7aac7de3f21c0e46bee 100644
--- a/frontend/src/metabase/questions/components/ExpandingSearchField.jsx
+++ b/frontend/src/metabase/questions/components/ExpandingSearchField.jsx
@@ -9,9 +9,7 @@ import { Motion, spring } from "react-motion";
import Icon from "metabase/components/Icon";
-const KEYCODE_FORWARD_SLASH = 191; // focus search
-const KEYCODE_ESCAPE = 27; // blur search
-const KEYCODE_ENTER = 13; // execute search
+import { KEYCODE_FORWARD_SLASH, KEYCODE_ENTER, KEYCODE_ESCAPE } from "metabase/lib/keyboard";
export default class ExpandingSearchField extends Component {
constructor (props, context) {
diff --git a/frontend/src/metabase/questions/components/Item.jsx b/frontend/src/metabase/questions/components/Item.jsx
index d9979096454388417cd7bd8f7c84c2ce5764cc6d..93e4450e306d2101a5215889dfa9962e17ac1d4e 100644
--- a/frontend/src/metabase/questions/components/Item.jsx
+++ b/frontend/src/metabase/questions/components/Item.jsx
@@ -133,9 +133,9 @@ const ItemBody = pure(({ entity, id, name, description, labels, favorite, collec
<Tooltip tooltip={favorite ? "Unfavorite" : "Favorite"}>
<Icon
className={cx(
- "flex cursor-pointer text-brand-hover transition-color",
- {"hover-child text-light-blue": !favorite},
- {"visible text-brand": favorite}
+ "flex cursor-pointer",
+ {"hover-child text-light-blue text-brand-hover": !favorite},
+ {"visible text-gold": favorite}
)}
name={favorite ? "star" : "staroutline"}
size={ITEM_ICON_SIZE}
diff --git a/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx b/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx
index 346b08be2b47f5f40374b039263e8016f9f93d43..d0a637dcb108746d81f88279a5188131d8cfd869 100644
--- a/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx
+++ b/frontend/src/metabase/reference/containers/ReferenceGettingStartedGuide.jsx
@@ -285,7 +285,7 @@ export default class ReferenceGettingStartedGuide extends Component {
collapsedTitle="Do you have any commonly referenced metrics?"
collapsedIcon="ruler"
linkMessage="Learn how to define a metric"
- link="http://www.metabase.com/docs/latest/administration-guide/05-segments-and-metrics#creating-a-metric"
+ link="http://www.metabase.com/docs/latest/administration-guide/07-segments-and-metrics.html#creating-a-metric"
expand={() => important_metrics.addField({id: null, caveats: null, points_of_interest: null, important_fields: null})}
>
<div className="my2">
@@ -338,7 +338,7 @@ export default class ReferenceGettingStartedGuide extends Component {
collapsedTitle="Do you have any commonly referenced segments or tables?"
collapsedIcon="table2"
linkMessage="Learn how to create a segment"
- link="http://www.metabase.com/docs/latest/administration-guide/05-segments-and-metrics#creating-a-segment"
+ link="http://www.metabase.com/docs/latest/administration-guide/07-segments-and-metrics.html#creating-a-segment"
expand={() => important_segments_and_tables.addField({id: null, type: null, caveats: null, points_of_interest: null})}
>
<div>
diff --git a/frontend/src/metabase/reference/selectors.js b/frontend/src/metabase/reference/selectors.js
index f9f1a17b2f9401827d830793fc57ef6ab6bd5b2e..e8bc19961dbdf7191258f23e9e654afc8cdedcad 100644
--- a/frontend/src/metabase/reference/selectors.js
+++ b/frontend/src/metabase/reference/selectors.js
@@ -50,7 +50,7 @@ const referenceSections = {
title: "Metrics are the official numbers that your team cares about",
adminMessage: "Defining common metrics for your team makes it even easier to ask questions",
message: "Metrics will appear here once your admins have created some",
- image: "/app/img/metrics-list",
+ image: "app/assets/img/metrics-list",
adminAction: "Learn how to create metrics",
adminLink: "http://www.metabase.com/docs/latest/administration-guide/06-segments-and-metrics.html"
},
@@ -70,7 +70,7 @@ const referenceSections = {
title: "Segments are interesting subsets of tables",
adminMessage: "Defining common segments for your team makes it even easier to ask questions",
message: "Segments will appear here once your admins have created some",
- image: "/app/img/segments-list",
+ image: "app/assets/img/segments-list",
adminAction: "Learn how to create segments",
adminLink: "http://www.metabase.com/docs/latest/administration-guide/06-segments-and-metrics.html"
},
@@ -89,7 +89,7 @@ const referenceSections = {
title: "Metabase is no fun without any data",
adminMessage: "Your databses will appear here once you connect one",
message: "Databases will appear here once your admins have added some",
- image: "/app/img/databases-list",
+ image: "app/assets/img/databases-list",
adminAction: "Connect a database",
adminLink: "/admin/databases/create"
},
diff --git a/frontend/src/metabase/routes.jsx b/frontend/src/metabase/routes.jsx
index 3f227810f1a29b63227ea86c35f77158d845d779..2ef7fbfb05c7e85b604686a1e6d0bff60298d5c8 100644
--- a/frontend/src/metabase/routes.jsx
+++ b/frontend/src/metabase/routes.jsx
@@ -15,7 +15,8 @@ import App from "metabase/App.jsx";
// auth containers
import ForgotPasswordApp from "metabase/auth/containers/ForgotPasswordApp.jsx";
import LoginApp from "metabase/auth/containers/LoginApp.jsx";
-import LogoutApp from "metabase/auth/containers/LogoutApp.jsx"; import PasswordResetApp from "metabase/auth/containers/PasswordResetApp.jsx";
+import LogoutApp from "metabase/auth/containers/LogoutApp.jsx";
+import PasswordResetApp from "metabase/auth/containers/PasswordResetApp.jsx";
import GoogleNoAccount from "metabase/auth/components/GoogleNoAccount.jsx";
// main app containers
diff --git a/frontend/src/metabase/services.js b/frontend/src/metabase/services.js
index 89c74c9b490eb9ce141df480b8d49f6a3d6f8bec..dcac3910d58d2fc00017a8d0e6a8976396f69db6 100644
--- a/frontend/src/metabase/services.js
+++ b/frontend/src/metabase/services.js
@@ -1,6 +1,7 @@
/* @flow */
-import { GET, PUT, POST, DELETE } from "metabase/lib/api";
+import api from "metabase/lib/api";
+const { GET, PUT, POST, DELETE } = api;
import { IS_EMBED_PREVIEW } from "metabase/lib/embed";
@@ -208,6 +209,7 @@ export const GettingStartedApi = {
export const SetupApi = {
create: POST("/api/setup"),
validate_db: POST("/api/setup/validate"),
+ admin_checklist: GET("/api/setup/admin_checklist"),
};
export const UserApi = {
@@ -225,6 +227,11 @@ export const UserApi = {
export const UtilApi = {
password_check: POST("/api/util/password_check"),
random_token: GET("/api/util/random_token"),
+ logs: GET("/api/util/logs"),
+};
+
+export const GeoJSONApi = {
+ get: GET("/api/geojson/:id"),
};
global.services = exports;
diff --git a/frontend/src/metabase/setup/components/DatabaseStep.jsx b/frontend/src/metabase/setup/components/DatabaseStep.jsx
index 9ec39c01afd0de087400196c1d138cb70e9317f8..d847d74c6f11164cebf17d047b70ae3b40e441f5 100644
--- a/frontend/src/metabase/setup/components/DatabaseStep.jsx
+++ b/frontend/src/metabase/setup/components/DatabaseStep.jsx
@@ -151,7 +151,7 @@ export default class DatabaseStep extends Component {
: null }
<div className="Form-field Form-offset">
- <a className="link" href="#" onClick={this.skipDatabase.bind(this)}>I'll add my data later</a>
+ <a className="link" onClick={this.skipDatabase.bind(this)}>I'll add my data later</a>
</div>
</div>
</section>
diff --git a/frontend/src/metabase/tutorial/QueryBuilderTutorial.jsx b/frontend/src/metabase/tutorial/QueryBuilderTutorial.jsx
index 24638a3850d7ec602f9cc23d1af9a0047c4473cc..2dc826cae1a60e15f0ba3adaec321a47e2e396b7 100644
--- a/frontend/src/metabase/tutorial/QueryBuilderTutorial.jsx
+++ b/frontend/src/metabase/tutorial/QueryBuilderTutorial.jsx
@@ -11,7 +11,7 @@ const QUERY_BUILDER_STEPS = [
getPortalTarget: () => qs(".GuiBuilder"),
getModal: (props) =>
<div className="text-centered">
- <RetinaImage className="mb2" forceOriginalDimensions={false} src="/app/img/qb_tutorial/question_builder.png" width={186} />
+ <RetinaImage className="mb2" forceOriginalDimensions={false} src="app/assets/img/qb_tutorial/question_builder.png" width={186} />
<h3>Welcome to the Query Builder!</h3>
<p>The Query Builder lets you assemble questions (or "queries") to ask about your data.</p>
<a className="Button Button--primary" onClick={props.onNext}>Tell me more</a>
@@ -22,7 +22,7 @@ const QUERY_BUILDER_STEPS = [
getModalTarget: () => qs(".GuiBuilder-data"),
getModal: (props) =>
<div className="text-centered">
- <RetinaImage id="QB-TutorialTableImg" className="mb2" forceOriginalDimensions={false} src="/app/img/qb_tutorial/table.png" width={157} />
+ <RetinaImage id="QB-TutorialTableImg" className="mb2" forceOriginalDimensions={false} src="app/assets/img/qb_tutorial/table.png" width={157} />
<h3>Start by picking the table with the data that you have a question about.</h3>
<p>Go ahead and select the "Orders" table from the dropdown menu.</p>
</div>,
@@ -48,7 +48,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialFunnelImg"
- src="/app/img/qb_tutorial/funnel.png"
+ src="app/assets/img/qb_tutorial/funnel.png"
width={135}
/>
<h3>Filter your data to get just what you want.</h3>
@@ -81,7 +81,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialCalculatorImg"
- src="/app/img/qb_tutorial/calculator.png"
+ src="app/assets/img/qb_tutorial/calculator.png"
width={115}
/>
<h3>Here's where you can choose to add or average your data, count the number of rows in the table, or just view the raw data.</h3>
@@ -103,7 +103,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialBananaImg"
- src="/app/img/qb_tutorial/banana.png"
+ src="app/assets/img/qb_tutorial/banana.png"
width={232}
/>
<h3>Add a grouping to break out your results by category, day, month, and more.</h3>
@@ -131,7 +131,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialRocketImg"
- src="/app/img/qb_tutorial/rocket.png"
+ src="app/assets/img/qb_tutorial/rocket.png"
width={217}
/>
<h3>Run Your Query.</h3>
@@ -148,7 +148,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialChartImg"
- src="/app/img/qb_tutorial/chart.png"
+ src="app/assets/img/qb_tutorial/chart.png"
width={160}
/>
<h3>You can view your results as a chart instead of a table.</h3>
@@ -169,7 +169,7 @@ const QUERY_BUILDER_STEPS = [
className="mb2"
forceOriginalDimensions={false}
id="QB-TutorialBoatImg"
- src="/app/img/qb_tutorial/boat.png" width={190}
+ src="app/assets/img/qb_tutorial/boat.png" width={190}
/>
<h3>Well done!</h3>
<p>That's all! If you still have questions, check out our <a className="link" target="_blank" href="http://www.metabase.com/docs/latest/users-guide/start">User's Guide</a>. Have fun exploring your data!</p>
diff --git a/frontend/src/metabase/visualizations/components/ChartClickActions.jsx b/frontend/src/metabase/visualizations/components/ChartClickActions.jsx
index e2065002f6913ac87c419d10c3a1505e2077a9df..d5d5ed9808703cf1ebead874abb0c88fb129466b 100644
--- a/frontend/src/metabase/visualizations/components/ChartClickActions.jsx
+++ b/frontend/src/metabase/visualizations/components/ChartClickActions.jsx
@@ -51,7 +51,7 @@ Object.values(SECTIONS).map((section, index) => {
});
type Props = {
- clicked: ClickObject,
+ clicked: ?ClickObject,
clickActions: ?ClickAction[],
onChangeCardAndRun: (Object) => void,
onClose: () => void
@@ -61,7 +61,8 @@ type State = {
popoverAction: ?ClickAction;
}
-export default class ChartClickActions extends Component<*, Props, State> {
+export default class ChartClickActions extends Component {
+ props: Props;
state: State = {
popoverAction: null
};
diff --git a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
index d685c95e81c535cbe0aafa3ba32783b0b8adf5f1..a415d447fca4cefd734e833f8860dea050075168 100644
--- a/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
+++ b/frontend/src/metabase/visualizations/components/ChoroplethMap.jsx
@@ -92,7 +92,7 @@ export default class ChoroplethMap extends Component {
if (details.builtin) {
geoJsonPath = details.url;
} else {
- geoJsonPath = "/api/geojson/" + nextProps.settings["map.region"]
+ geoJsonPath = "api/geojson/" + nextProps.settings["map.region"]
}
if (this.state.geoJsonPath !== geoJsonPath) {
this.setState({
diff --git a/frontend/src/metabase/visualizations/components/FunnelBar.jsx b/frontend/src/metabase/visualizations/components/FunnelBar.jsx
index 1028592b93793e6032836dd598f2569d8dab1b0e..50eb5245c746322a06cb708d86ff5489e219b47c 100644
--- a/frontend/src/metabase/visualizations/components/FunnelBar.jsx
+++ b/frontend/src/metabase/visualizations/components/FunnelBar.jsx
@@ -9,7 +9,9 @@ import { assocIn } from "icepick";
import type { VisualizationProps } from "metabase/meta/types/Visualization";
-export default class BarFunnel extends Component<*, VisualizationProps, *> {
+export default class BarFunnel extends Component {
+ props: VisualizationProps;
+
render() {
return (
<BarChart
diff --git a/frontend/src/metabase/visualizations/components/FunnelNormal.jsx b/frontend/src/metabase/visualizations/components/FunnelNormal.jsx
index 104b44a799aeec7554a0e098aaf5393e78b03361..17f43b109c86cebd433956f7d684327c97099528 100644
--- a/frontend/src/metabase/visualizations/components/FunnelNormal.jsx
+++ b/frontend/src/metabase/visualizations/components/FunnelNormal.jsx
@@ -27,7 +27,9 @@ type StepInfo = {
clicked?: ClickObject,
};
-export default class Funnel extends Component<*, VisualizationProps, *> {
+export default class Funnel extends Component {
+ props: VisualizationProps;
+
render() {
const { className, series, gridSize, hovered, onHoverChange, onVisualizationClick, visualizationIsClickable } = this.props;
@@ -35,7 +37,7 @@ export default class Funnel extends Component<*, VisualizationProps, *> {
const metricIndex = 1;
const cols = series[0].data.cols;
// $FlowFixMe
- const rows = series.map(s => s.data.rows[0]);
+ const rows: number[][] = series.map(s => s.data.rows[0]);
const funnelSmallSize = gridSize && (gridSize.width < 7 || gridSize.height <= 5);
diff --git a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx
index fabd69a39fdf6b55a855ab6ea5593271ca5a7028..3518c697998b14156dee653bb525f5181569196c 100644
--- a/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx
+++ b/frontend/src/metabase/visualizations/components/LeafletMarkerPinMap.jsx
@@ -7,7 +7,7 @@ import L from "leaflet";
import { formatValue } from "metabase/lib/formatting";
const MARKER_ICON = L.icon({
- iconUrl: "/app/img/pin.png",
+ iconUrl: "app/assets/img/pin.png",
iconSize: [28, 32],
iconAnchor: [15, 24],
popupAnchor: [0, -13]
diff --git a/frontend/src/metabase/visualizations/components/LeafletTilePinMap.jsx b/frontend/src/metabase/visualizations/components/LeafletTilePinMap.jsx
index 9bcf98d86b3422035472c58b3a7969285904b916..d1862f14adf5bcf57b939465bc3dd5eed42df7d4 100644
--- a/frontend/src/metabase/visualizations/components/LeafletTilePinMap.jsx
+++ b/frontend/src/metabase/visualizations/components/LeafletTilePinMap.jsx
@@ -36,7 +36,7 @@ export default class LeafletTilePinMap extends LeafletMap {
return;
}
- return '/api/tiles/' + zoom + '/' + coord.x + '/' + coord.y + '/' +
+ return 'api/tiles/' + zoom + '/' + coord.x + '/' + coord.y + '/' +
latitudeField.id + '/' + longitudeField.id + '/' +
latitudeIndex + '/' + longitudeIndex + '/' +
'?query=' + encodeURIComponent(JSON.stringify(dataset_query))
diff --git a/frontend/src/metabase/visualizations/components/LineAreaBarChart.css b/frontend/src/metabase/visualizations/components/LineAreaBarChart.css
index a584964fd3a27bd14cd2c69b5d84e79f464fdf7e..8f2abd39f5df4347ede5d8d67b021e6391597c0b 100644
--- a/frontend/src/metabase/visualizations/components/LineAreaBarChart.css
+++ b/frontend/src/metabase/visualizations/components/LineAreaBarChart.css
@@ -58,6 +58,17 @@
display: none;
}
+/* disable pointer events on all chart elements while dragging to avoid weird interactions */
+.LineAreaBarChart .dc-chart .dragging .area,
+.LineAreaBarChart .dc-chart .dragging .bar,
+.LineAreaBarChart .dc-chart .dragging .line,
+.LineAreaBarChart .dc-chart .dragging .dot,
+.LineAreaBarChart .dc-chart .dragging .row,
+.LineAreaBarChart .dc-chart .dragging .bubble,
+.LineAreaBarChart .dc-chart .dragging .voronoi {
+ pointer-events: none !important;
+}
+
/* disable dc default behavior */
.LineAreaBarChart .dc-chart rect.bar:hover {
fill-opacity: 1;
@@ -73,7 +84,7 @@
opacity: 1 !important;
}
-.LineAreaBarChart .enable-dots .dc-tooltip circle.dot {
+.LineAreaBarChart .dc-chart .enable-dots .dc-tooltip .dot {
r: 3px !important;
fill: white;
stroke: currentColor;
@@ -88,13 +99,14 @@
stroke: white;
}
-.LineAreaBarChart .enable-dots .dc-tooltip circle.dot:hover,
-.LineAreaBarChart .enable-dots .dc-tooltip circle.dot.hover {
+.LineAreaBarChart .dc-chart .enable-dots .dc-tooltip .dot:hover,
+.LineAreaBarChart .dc-chart .enable-dots .dc-tooltip .dot.hover {
fill: currentColor;
}
-.LineAreaBarChart .enable-dots-onhover .dc-tooltip circle.dot:hover,
-.LineAreaBarChart .enable-dots-onhover .dc-tooltip circle.dot.hover {
+.LineAreaBarChart .dc-chart .dc-tooltip .dot.selected,
+.LineAreaBarChart .dc-chart .enable-dots-onhover .dc-tooltip .dot:hover,
+.LineAreaBarChart .dc-chart .enable-dots-onhover .dc-tooltip .dot.hover {
r: 3px !important;
fill: white;
stroke: currentColor;
@@ -102,6 +114,12 @@
fill-opacity: 1 !important;
stroke-opacity: 1 !important;
}
+.LineAreaBarChart .dc-chart .dc-tooltip .dot.deselected {
+ opacity: 0;
+}
+.LineAreaBarChart .dc-chart .line.deselected {
+ color: #ccc;
+}
.LineAreaBarChart .dc-chart .area,
.LineAreaBarChart .dc-chart .bar,
@@ -131,10 +149,22 @@
opacity: 0;
}
-.LineAreaBarChart .voronoi {
+.LineAreaBarChart .dc-chart .voronoi {
fill: transparent;
}
-/*.voronoi path {
- fill: rgba(255,0,0,0.05);
+/* we put the brush behind everything so this isn't necessary
+/*.LineAreaBarChart .dc-chart .brush {
+ pointer-events: none;
}*/
+
+/* grid lines aren't clickable, and get in the way of the brush */
+.LineAreaBarChart .dc-chart .grid-line {
+ pointer-events: none;
+}
+
+/* brush handles */
+.LineAreaBarChart .dc-chart .brush .resize path {
+ fill: #F9FBFC;
+ stroke: #9BA5B1;
+}
diff --git a/frontend/src/metabase/visualizations/components/LineAreaBarChart.jsx b/frontend/src/metabase/visualizations/components/LineAreaBarChart.jsx
index a30ae39db976c6efb3155c89650cdc3ab7f18844..a669b82448b11c1890a1961734a54d2f52dedf8d 100644
--- a/frontend/src/metabase/visualizations/components/LineAreaBarChart.jsx
+++ b/frontend/src/metabase/visualizations/components/LineAreaBarChart.jsx
@@ -43,7 +43,9 @@ for (let i = 0; i < MAX_SERIES; i++) {
import type { VisualizationProps } from "metabase/meta/types/Visualization";
-export default class LineAreaBarChart extends Component<*, VisualizationProps, *> {
+export default class LineAreaBarChart extends Component {
+ props: VisualizationProps;
+
static identifier: string;
static renderer: (element: Element, props: VisualizationProps) => any;
@@ -186,6 +188,7 @@ export default class LineAreaBarChart extends Component<*, VisualizationProps, *
let titleHeaderSeries, multiseriesHeaderSeries;
+ // $FlowFixMe
let originalSeries = series._raw || series;
let cardIds = _.uniq(originalSeries.map(s => s.card.id))
const isComposedOfMultipleQuestions = cardIds.length > 1;
diff --git a/frontend/src/metabase/visualizations/components/PinMap.jsx b/frontend/src/metabase/visualizations/components/PinMap.jsx
index e642709d999b9cdeebc9e4bfea810dbcca5b7951..a5f1371878b28fef983ad7c735b0cb68d19ff559 100644
--- a/frontend/src/metabase/visualizations/components/PinMap.jsx
+++ b/frontend/src/metabase/visualizations/components/PinMap.jsx
@@ -31,7 +31,10 @@ const MAP_COMPONENTS_BY_TYPE = {
"tiles": LeafletTilePinMap,
}
-export default class PinMap extends Component<*, Props, State> {
+export default class PinMap extends Component {
+ props: Props;
+ state: State;
+
static uiName = "Pin Map";
static identifier = "pin_map";
static iconName = "pinmap";
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive.css b/frontend/src/metabase/visualizations/components/TableInteractive.css
index fd07f661939a3007812ce5b59f3484223ede6b6a..42faf55c441d46e64c8f14bf33ccd062d370078f 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive.css
+++ b/frontend/src/metabase/visualizations/components/TableInteractive.css
@@ -6,13 +6,11 @@
font-weight: 700;
}
-.TableInteractive-headerCellData:hover {
- cursor: pointer;
+.TableInteractive-headerCellData .Icon {
+ opacity: 0;
}
-.TableInteractive-headerCellData .Icon { opacity: 0; }
-.TableInteractive-headerCellData:hover .Icon,
-.TableInteractive-headerCellData--sorted .Icon {
+.TableInteractive-headerCellData--sorted .Icon {
opacity: 1;
transition: opacity .3s linear;
}
diff --git a/frontend/src/metabase/visualizations/components/TableInteractive.jsx b/frontend/src/metabase/visualizations/components/TableInteractive.jsx
index 32e26d8220e2f1f81555286712350f57ff0cf300..8796ea2d4619982216240675d5c3069032badaa8 100644
--- a/frontend/src/metabase/visualizations/components/TableInteractive.jsx
+++ b/frontend/src/metabase/visualizations/components/TableInteractive.jsx
@@ -8,11 +8,9 @@ import "./TableInteractive.css";
import Icon from "metabase/components/Icon.jsx";
-import Value from "metabase/components/Value.jsx";
-
-import { capitalize } from "metabase/lib/formatting";
+import { formatValue, capitalize } from "metabase/lib/formatting";
import { getFriendlyName } from "metabase/visualizations/lib/utils";
-import { getTableCellClickedObject } from "metabase/visualizations/lib/table";
+import { getTableCellClickedObject, isColumnRightAligned } from "metabase/visualizations/lib/table";
import _ from "underscore";
import cx from "classnames";
@@ -21,8 +19,8 @@ import ExplicitSize from "metabase/components/ExplicitSize.jsx";
import { Grid, ScrollSync } from "react-virtualized";
import Draggable from "react-draggable";
-const HEADER_HEIGHT = 50;
-const ROW_HEIGHT = 35;
+const HEADER_HEIGHT = 36;
+const ROW_HEIGHT = 30;
const MIN_COLUMN_WIDTH = ROW_HEIGHT;
const RESIZE_HANDLE_WIDTH = 5;
@@ -49,7 +47,7 @@ type CellRendererProps = {
type GridComponent = Component<void, void, void> & { recomputeGridSize: () => void }
@ExplicitSize
-export default class TableInteractive extends Component<*, Props, State> {
+export default class TableInteractive extends Component {
state: State;
props: Props;
@@ -226,21 +224,23 @@ export default class TableInteractive extends Component<*, Props, State> {
return (
<div
key={key} style={style}
- className={cx("TableInteractive-cellWrapper cellData", {
+ className={cx("TableInteractive-cellWrapper", {
"TableInteractive-cellWrapper--firstColumn": columnIndex === 0,
- "cursor-pointer": isClickable
+ "cursor-pointer": isClickable,
+ "justify-end": isColumnRightAligned(column)
})}
onClick={isClickable && ((e) => {
onVisualizationClick({ ...clicked, element: e.currentTarget });
})}
>
- <Value
- className="link"
- type="cell"
- value={value}
- column={column}
- onResize={this.onCellResize.bind(this, columnIndex)}
- />
+ <div className="cellData">
+ {/* using formatValue instead of <Value> here for performance. The later wraps in an extra <span> */}
+ {formatValue(value, {
+ column: column,
+ type: "cell",
+ jsx: true
+ })}
+ </div>
</div>
);
}
@@ -271,6 +271,10 @@ export default class TableInteractive extends Component<*, Props, State> {
const isClickable = onVisualizationClick && visualizationIsClickable(clicked);
const isSortable = isClickable && column.source;
+ const isRightAligned = isColumnRightAligned(column);
+
+ const isSorted = sort && sort[0] && sort[0][0] === column.id;
+ const isAscending = sort && sort[0] && sort[0][1] === "ascending";
return (
<div
@@ -278,22 +282,21 @@ export default class TableInteractive extends Component<*, Props, State> {
style={{ ...style, overflow: "visible" /* ensure resize handle is visible */ }}
className={cx("TableInteractive-cellWrapper TableInteractive-headerCellData", {
"TableInteractive-cellWrapper--firstColumn": columnIndex === 0,
- "TableInteractive-headerCellData--sorted": (sort && sort[0] && sort[0][0] === column.id),
+ "TableInteractive-headerCellData--sorted": isSorted,
+ "cursor-pointer": isClickable,
+ "justify-end": isRightAligned
+ })}
+ onClick={isClickable && ((e) => {
+ onVisualizationClick({ ...clicked, element: e.currentTarget });
})}
>
- <div
- className={cx("cellData", { "cursor-pointer": isClickable })}
- onClick={isClickable && ((e) => {
- onVisualizationClick({ ...clicked, element: e.currentTarget });
- })}
- >
+ <div className="cellData">
+ {isSortable && isRightAligned &&
+ <Icon className="Icon mr1" name={isAscending ? "chevronup" : "chevrondown"} size={8} />
+ }
{columnTitle}
- {isSortable &&
- <Icon
- className="Icon ml1"
- name={sort && sort[0] && sort[0][1] === "ascending" ? "chevronup" : "chevrondown"}
- size={8}
- />
+ {isSortable && !isRightAligned &&
+ <Icon className="Icon ml1" name={isAscending ? "chevronup" : "chevrondown"} size={8} />
}
</div>
<Draggable
diff --git a/frontend/src/metabase/visualizations/components/TableSimple.jsx b/frontend/src/metabase/visualizations/components/TableSimple.jsx
index c79e17910203353dc917ec5be1f54ee02fce93b3..c8ac3e8f94375ab35ae15aeca098b63ada92649d 100644
--- a/frontend/src/metabase/visualizations/components/TableSimple.jsx
+++ b/frontend/src/metabase/visualizations/components/TableSimple.jsx
@@ -11,7 +11,7 @@ import Icon from "metabase/components/Icon.jsx";
import { formatValue } from "metabase/lib/formatting";
import { getFriendlyName } from "metabase/visualizations/lib/utils";
-import { getTableCellClickedObject } from "metabase/visualizations/lib/table";
+import { getTableCellClickedObject, isColumnRightAligned } from "metabase/visualizations/lib/table";
import cx from "classnames";
import _ from "underscore";
@@ -32,7 +32,8 @@ type State = {
}
@ExplicitSize
-export default class TableSimple extends Component<*, Props, State> {
+export default class TableSimple extends Component {
+ props: Props;
state: State;
constructor(props: Props) {
@@ -97,7 +98,14 @@ export default class TableSimple extends Component<*, Props, State> {
<thead ref="header">
<tr>
{cols.map((col, colIndex) =>
- <th key={colIndex} className={cx("TableInteractive-headerCellData cellData text-brand-hover", { "TableInteractive-headerCellData--sorted": sortColumn === colIndex })} onClick={() => this.setSort(colIndex)}>
+ <th
+ key={colIndex}
+ className={cx("TableInteractive-headerCellData cellData text-brand-hover", {
+ "TableInteractive-headerCellData--sorted": sortColumn === colIndex,
+ "text-right": isColumnRightAligned(col)
+ })}
+ onClick={() => this.setSort(colIndex)}
+ >
<div className="relative">
<Icon
name={sortDescending ? "chevrondown" : "chevronup"}
@@ -120,14 +128,16 @@ export default class TableSimple extends Component<*, Props, State> {
<td
key={columnIndex}
style={{ whiteSpace: "nowrap" }}
- className={cx("px1 border-bottom", {
- "cursor-pointer text-brand-hover": isClickable
- })}
- onClick={isClickable && ((e) => {
- onVisualizationClick({ ...clicked, element: e.currentTarget });
- })}
+ className={cx("px1 border-bottom", { "text-right": isColumnRightAligned(cols[columnIndex]) })}
>
- { cell == null ? "-" : formatValue(cell, { column: cols[columnIndex], jsx: true }) }
+ <span
+ className={cx({ "cursor-pointer text-brand-hover": isClickable })}
+ onClick={isClickable && ((e) => {
+ onVisualizationClick({ ...clicked, element: e.currentTarget });
+ })}
+ >
+ { cell == null ? "-" : formatValue(cell, { column: cols[columnIndex], jsx: true }) }
+ </span>
</td>
);
})}
diff --git a/frontend/src/metabase/visualizations/components/Visualization.jsx b/frontend/src/metabase/visualizations/components/Visualization.jsx
index c352b55afbad0fcaa97601c2ab4f60561f711bc7..141f8c8a2480954829a6dedb9252be1a450f301f 100644
--- a/frontend/src/metabase/visualizations/components/Visualization.jsx
+++ b/frontend/src/metabase/visualizations/components/Visualization.jsx
@@ -84,7 +84,7 @@ type Props = {
type State = {
series: ?Series,
- CardVisualization: ?(Component<*, VisualizationSettings, *> & {
+ CardVisualization: ?(Component<void, VisualizationSettings, void> & {
checkRenderable: (any, any) => void,
noHeader: boolean
}),
@@ -98,7 +98,7 @@ type State = {
}
@ExplicitSize
-export default class Visualization extends Component<*, Props, State> {
+export default class Visualization extends Component {
state: State;
props: Props;
@@ -338,7 +338,7 @@ export default class Visualization extends Component<*, Props, State> {
: isDashboard && noResults ?
<div className={"flex-full px1 pb1 text-centered flex flex-column layout-centered " + (isDashboard ? "text-slate-light" : "text-slate")}>
<Tooltip tooltip="No results!" isEnabled={small}>
- <img src="/app/img/no_results.svg" />
+ <img src="app/assets/img/no_results.svg" />
</Tooltip>
{ !small &&
<span className="h4 text-bold">
@@ -403,12 +403,14 @@ export default class Visualization extends Component<*, Props, State> {
series={series}
hovered={hovered}
/>
- <ChartClickActions
- clicked={clicked}
- clickActions={clickActions}
- onChangeCardAndRun={this.props.onChangeCardAndRun ? this.handleOnChangeCardAndRun : null}
- onClose={() => this.setState({ clicked: null })}
- />
+ { this.props.onChangeCardAndRun &&
+ <ChartClickActions
+ clicked={clicked}
+ clickActions={clickActions}
+ onChangeCardAndRun={this.handleOnChangeCardAndRun}
+ onClose={() => this.setState({ clicked: null })}
+ />
+ }
</div>
);
}
diff --git a/frontend/src/metabase/visualizations/index.js b/frontend/src/metabase/visualizations/index.js
index 0297c20a1cc69a0b886380efc8d5fdb3d7967ea5..f9d9595e62af91aaee477d559617309d1e8abcfa 100644
--- a/frontend/src/metabase/visualizations/index.js
+++ b/frontend/src/metabase/visualizations/index.js
@@ -62,6 +62,7 @@ export function getVisualizationTransformed(series: Series) {
series = CardVisualization.transformSeries(series);
}
if (series !== lastSeries) {
+ // $FlowFixMe
series = [...series];
// $FlowFixMe
series._raw = lastSeries;
diff --git a/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js b/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js
index 0752437e6581edd62b2ea3fa3169b2b85c2bc1d9..33de776c5e9fab6ff91304070f2d120aa5d0967c 100644
--- a/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js
+++ b/frontend/src/metabase/visualizations/lib/LineAreaBarRenderer.js
@@ -5,7 +5,7 @@ import d3 from "d3";
import dc from "dc";
import moment from "moment";
import _ from "underscore";
-import { updateIn } from "icepick";
+import { updateIn, getIn } from "icepick";
import {
getAvailableCanvasWidth,
@@ -32,10 +32,14 @@ import { determineSeriesIndexFromElement } from "./tooltip";
import { formatValue } from "metabase/lib/formatting";
import { parseTimestamp } from "metabase/lib/time";
+import { isStructured } from "metabase/meta/Card";
import { datasetContainsNoResults } from "metabase/lib/dataset";
+import { updateDateTimeFilter, updateNumericFilter } from "metabase/qb/lib/actions";
-import type { Series, ClickObject } from "metabase/meta/types/Visualization"
+import { initBrush } from "./graph/brush";
+
+import type { SingleSeries, ClickObject } from "metabase/meta/types/Visualization"
const MIN_PIXELS_PER_TICK = { x: 100, y: 32 };
const BAR_PADDING_RATIO = 0.2;
@@ -49,7 +53,7 @@ const DOT_OVERLAP_COUNT_LIMIT = 8;
const DOT_OVERLAP_RATIO = 0.10;
const DOT_OVERLAP_DISTANCE = 8;
-const VORONOI_TARGET_RADIUS = 50;
+const VORONOI_TARGET_RADIUS = 25;
const VORONOI_MAX_POINTS = 300;
// min margin
@@ -84,23 +88,27 @@ function adjustTicksIfNeeded(axis, axisSize: number, minPixelsPerTick: number) {
}
}
-function getDcjsChartType(cardType) {
+import { lineAddons } from "./graph/addons"
+
+function getDcjsChart(cardType, parent) {
switch (cardType) {
- case "line": return "lineChart";
- case "area": return "lineChart";
- case "bar": return "barChart";
- case "scatter": return "bubbleChart";
- default: return "barChart";
+ case "line": return lineAddons(dc.lineChart(parent));
+ case "area": return lineAddons(dc.lineChart(parent));
+ case "bar": return dc.barChart(parent);
+ case "scatter": return dc.bubbleChart(parent);
+ default: return dc.barChart(parent);
}
}
+
+
function initChart(chart, element) {
// set the bounds
chart.width(getAvailableCanvasWidth(element));
chart.height(getAvailableCanvasHeight(element));
// disable animations
chart.transitionDuration(0);
- // if the chart supports 'brushing' (brush-based range filter), disable this since it intercepts mouse hovers which means we can't see tooltips
+ // disable brush
if (chart.brushOn) {
chart.brushOn(false);
}
@@ -109,7 +117,7 @@ function initChart(chart, element) {
function applyChartTimeseriesXAxis(chart, settings, series, xValues, xDomain, xInterval) {
// find the first nonempty single series
// $FlowFixMe
- const firstSeries: Series = _.find(series, (s) => !datasetContainsNoResults(s.data));
+ const firstSeries: SingleSeries = _.find(series, (s) => !datasetContainsNoResults(s.data));
// setup an x-axis where the dimension is a timeseries
let dimensionColumn = firstSeries.data.cols[0];
@@ -170,7 +178,7 @@ function applyChartTimeseriesXAxis(chart, settings, series, xValues, xDomain, xI
function applyChartQuantitativeXAxis(chart, settings, series, xValues, xDomain, xInterval) {
// find the first nonempty single series
// $FlowFixMe
- const firstSeries: Series = _.find(series, (s) => !datasetContainsNoResults(s.data));
+ const firstSeries: SingleSeries = _.find(series, (s) => !datasetContainsNoResults(s.data));
const dimensionColumn = firstSeries.data.cols[0];
if (settings["graph.x_axis.labels_enabled"]) {
@@ -211,7 +219,7 @@ function applyChartQuantitativeXAxis(chart, settings, series, xValues, xDomain,
function applyChartOrdinalXAxis(chart, settings, series, xValues) {
// find the first nonempty single series
// $FlowFixMe
- const firstSeries: Series = _.find(series, (s) => !datasetContainsNoResults(s.data));
+ const firstSeries: SingleSeries = _.find(series, (s) => !datasetContainsNoResults(s.data));
const dimensionColumn = firstSeries.data.cols[0];
@@ -384,82 +392,86 @@ function applyChartTooltips(chart, series, isStacked, isScalarSeries, onHoverCha
}
if (onVisualizationClick) {
- chart.selectAll(".bar, .dot, .area, .bubble")
- .style({ "cursor": "pointer" })
- .on("mouseup", function(d) {
- const seriesIndex = determineSeriesIndexFromElement(this, isStacked);
- const card = series[seriesIndex].card;
- const isSingleSeriesBar = this.classList.contains("bar") && series.length === 1;
-
- let clicked: ?ClickObject;
- if (Array.isArray(d.key)) { // scatter
- clicked = {
- value: d.key[2],
- column: cols[2],
- dimensions: [
- { value: d.key[0], column: cols[0] },
- { value: d.key[1], column: cols[1] }
- ],
- origin: d.key._origin
- }
- } else if (isScalarSeries) {
- // special case for multi-series scalar series, which should be treated as scalars
- clicked = {
- value: d.data.value,
- column: series[seriesIndex].data.cols[1]
- };
- } else if (d.data) { // line, area, bar
- if (!isSingleSeriesBar) {
- cols = series[seriesIndex].data.cols;
- }
- clicked = {
- value: d.data.value,
- column: cols[1],
- dimensions: [
- { value: d.data.key, column: cols[0] }
- ]
- }
- } else {
- clicked = {
- dimensions: []
- };
+ const onClick = function(d) {
+ const seriesIndex = determineSeriesIndexFromElement(this, isStacked);
+ const card = series[seriesIndex].card;
+ const isSingleSeriesBar = this.classList.contains("bar") && series.length === 1;
+
+ let clicked: ?ClickObject;
+ if (Array.isArray(d.key)) { // scatter
+ clicked = {
+ value: d.key[2],
+ column: cols[2],
+ dimensions: [
+ { value: d.key[0], column: cols[0] },
+ { value: d.key[1], column: cols[1] }
+ ].filter(({ column }) =>
+ // don't include aggregations since we can't filter on them
+ column.source !== "aggregation"
+ ),
+ origin: d.key._origin
}
-
- // handle multiseries
- if (clicked && series.length > 1) {
- if (card._breakoutColumn) {
- // $FlowFixMe
- clicked.dimensions.push({
- value: card._breakoutValue,
- column: card._breakoutColumn
- });
- }
+ } else if (isScalarSeries) {
+ // special case for multi-series scalar series, which should be treated as scalars
+ clicked = {
+ value: d.data.value,
+ column: series[seriesIndex].data.cols[1]
+ };
+ } else if (d.data) { // line, area, bar
+ if (!isSingleSeriesBar) {
+ cols = series[seriesIndex].data.cols;
}
-
- if (card._seriesIndex != null) {
- // $FlowFixMe
- clicked.seriesIndex = card._seriesIndex;
+ clicked = {
+ value: d.data.value,
+ column: cols[1],
+ dimensions: [
+ { value: d.data.key, column: cols[0] }
+ ]
}
+ } else {
+ clicked = {
+ dimensions: []
+ };
+ }
- if (clicked) {
- const isLine = this.classList.contains("dot");
- onVisualizationClick({
- ...clicked,
- element: isLine ? this : null,
- event: isLine ? null : d3.event,
+ // handle multiseries
+ if (clicked && series.length > 1) {
+ if (card._breakoutColumn) {
+ // $FlowFixMe
+ clicked.dimensions.push({
+ value: card._breakoutValue,
+ column: card._breakoutColumn
});
}
- });
+ }
+
+ if (card._seriesIndex != null) {
+ // $FlowFixMe
+ clicked.seriesIndex = card._seriesIndex;
+ }
+
+ if (clicked) {
+ const isLine = this.classList.contains("dot");
+ onVisualizationClick({
+ ...clicked,
+ element: isLine ? this : null,
+ event: isLine ? null : d3.event,
+ });
+ }
+ }
+
+ // for some reason interaction with brush requires we use click for .dot and .bubble but mousedown for bar
+ chart.selectAll(".dot, .bubble")
+ .style({ "cursor": "pointer" })
+ .on("click", onClick);
+ chart.selectAll(".bar")
+ .style({ "cursor": "pointer" })
+ .on("mousedown", onClick);
}
});
}
function applyChartLineBarSettings(chart, settings, chartType) {
- // if the chart supports 'brushing' (brush-based range filter), disable this since it intercepts mouse hovers which means we can't see tooltips
- if (chart.brushOn) {
- chart.brushOn(false);
- }
-
// LINE/AREA:
// for chart types that have an 'interpolate' option (line/area charts), enable based on settings
if (chart.interpolate) {
@@ -587,9 +599,9 @@ function lineAndBarOnRender(chart, settings, onGoalHover, isSplitAxis, isStacked
dispatchUIEvent(e, "mouseleave");
d3.select(e).classed("hover", false);
})
- .on("mouseup", ({ point }) => {
+ .on("click", ({ point }) => {
let e = point[2];
- dispatchUIEvent(e, "mouseup");
+ dispatchUIEvent(e, "click");
})
.order();
@@ -849,16 +861,33 @@ function forceSortedGroupsOfGroups(groupsOfGroups: CrossfilterGroup[][], indexMa
}
-export default function lineAreaBar(element, { series, onHoverChange, onVisualizationClick, onRender, chartType, isScalarSeries, settings, maxSeries }) {
+export default function lineAreaBar(element, {
+ series,
+ onHoverChange,
+ onVisualizationClick,
+ onRender,
+ chartType,
+ isScalarSeries,
+ settings,
+ maxSeries,
+ onChangeCardAndRun
+}) {
const colors = settings["graph.colors"];
const isTimeseries = settings["graph.x_axis.scale"] === "timeseries";
const isQuantitative = ["linear", "log", "pow"].indexOf(settings["graph.x_axis.scale"]) >= 0;
const isOrdinal = !isTimeseries && !isQuantitative;
+ // is this a dashboard multiseries?
+ // TODO: better way to detect this?
+ const isMultiCardSeries = series.length > 1 &&
+ getIn(series, [0, "card", "id"]) !== getIn(series, [1, "card", "id"]);
+
+ const enableBrush = !!(onChangeCardAndRun && !isMultiCardSeries && isStructured(series[0].card));
+
// find the first nonempty single series
// $FlowFixMe
- const firstSeries: Series = _.find(series, (s) => !datasetContainsNoResults(s.data));
+ const firstSeries: SingleSeries = _.find(series, (s) => !datasetContainsNoResults(s.data));
const isDimensionTimeseries = dimensionIsTimeseries(firstSeries.data);
const isDimensionNumeric = dimensionIsNumeric(firstSeries.data);
@@ -1033,8 +1062,30 @@ export default function lineAreaBar(element, { series, onHoverChange, onVisualiz
let parent = dc.compositeChart(element);
initChart(parent, element);
+ let isBrushing = false;
+ const onBrushChange = () => {
+ isBrushing = true;
+ }
+ const onBrushEnd = (range) => {
+ isBrushing = false;
+ if (range) {
+ const column = series[0].data.cols[0];
+ const card = series[0].card;
+ const [start, end] = range;
+ if (isDimensionTimeseries) {
+ onChangeCardAndRun(updateDateTimeFilter(card, column, start, end));
+ } else {
+ onChangeCardAndRun(updateNumericFilter(card, column, start, end));
+ }
+ }
+ }
+
let charts = groups.map((group, index) => {
- let chart = dc[getDcjsChartType(chartType)](parent);
+ let chart = getDcjsChart(chartType, parent);
+
+ if (enableBrush) {
+ initBrush(parent, chart, onBrushChange, onBrushEnd);
+ }
// disable clicks
chart.onClick = () => {};
@@ -1178,7 +1229,8 @@ export default function lineAreaBar(element, { series, onHoverChange, onVisualiz
const isSplitAxis = (right && right.series.length) && (left && left.series.length > 0);
applyChartTooltips(parent, series, isStacked, isScalarSeries, (hovered) => {
- if (onHoverChange) {
+ // disable tooltips while brushing
+ if (onHoverChange && !isBrushing) {
// disable tooltips on lines
if (hovered && hovered.element && hovered.element.classList.contains("line")) {
delete hovered.element;
@@ -1228,11 +1280,16 @@ export function rowRenderer(
const colors = settings["graph.colors"];
- const dataset = crossfilter(series[0].data.rows);
+ // format the dimension axis
+ const rows = series[0].data.rows.map(row => [
+ formatValue(row[0], { column: cols[0], type: "axis" }),
+ row[1]
+ ]);
+ const dataset = crossfilter(rows);
const dimension = dataset.dimension(d => d[0]);
const group = dimension.group().reduceSum(d => d[1]);
- const xDomain = d3.extent(series[0].data.rows, d => d[1]);
- const yValues = series[0].data.rows.map(d => d[0]);
+ const xDomain = d3.extent(rows, d => d[1]);
+ const yValues = rows.map(d => d[0]);
forceSortedGroup(group, makeIndexMap(yValues));
@@ -1256,7 +1313,7 @@ export function rowRenderer(
}
if (onVisualizationClick) {
- chart.selectAll(".row rect").on("mouseup", function(d) {
+ chart.selectAll(".row rect").on("click", function(d) {
onVisualizationClick({
value: d.value,
column: cols[1],
diff --git a/frontend/src/metabase/visualizations/lib/graph/addons.js b/frontend/src/metabase/visualizations/lib/graph/addons.js
new file mode 100644
index 0000000000000000000000000000000000000000..93a149bc9a510a530c7018ab2d6e53233b6ed754
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/graph/addons.js
@@ -0,0 +1,48 @@
+/* @flow weak */
+
+import dc from "dc";
+import moment from "moment";
+
+export const lineAddons = _chart => {
+ _chart.fadeDeselectedArea = function() {
+ var dots = _chart.chartBodyG().selectAll(".dot");
+ var extent = _chart.brush().extent();
+
+ if (_chart.isOrdinal()) {
+ if (_chart.hasFilter()) {
+ dots.classed(dc.constants.SELECTED_CLASS, function(d) {
+ return _chart.hasFilter(d.x);
+ });
+ dots.classed(dc.constants.DESELECTED_CLASS, function(d) {
+ return !_chart.hasFilter(d.x);
+ });
+ } else {
+ dots.classed(dc.constants.SELECTED_CLASS, false);
+ dots.classed(dc.constants.DESELECTED_CLASS, false);
+ }
+ } else {
+ if (!_chart.brushIsEmpty(extent)) {
+ var start = extent[0];
+ var end = extent[1];
+ const isSelected = d => {
+ if (moment.isDate(start)) {
+ return !(moment(d.x).isBefore(start) ||
+ moment(d.x).isAfter(end));
+ } else {
+ return !(d.x < start || d.x >= end);
+ }
+ };
+ dots.classed(
+ dc.constants.DESELECTED_CLASS,
+ d => !isSelected(d)
+ );
+ dots.classed(dc.constants.SELECTED_CLASS, d => isSelected(d));
+ } else {
+ dots.classed(dc.constants.DESELECTED_CLASS, false);
+ dots.classed(dc.constants.SELECTED_CLASS, false);
+ }
+ }
+ };
+
+ return _chart;
+};
diff --git a/frontend/src/metabase/visualizations/lib/graph/brush.js b/frontend/src/metabase/visualizations/lib/graph/brush.js
new file mode 100644
index 0000000000000000000000000000000000000000..14a039fb86857c44b2049ecc35a7eb3e787d14dc
--- /dev/null
+++ b/frontend/src/metabase/visualizations/lib/graph/brush.js
@@ -0,0 +1,87 @@
+import { KEYCODE_ESCAPE } from "metabase/lib/keyboard";
+import { moveToBack, moveToFront } from "metabase/lib/dom";
+
+export function initBrush(parent, child, onBrushChange, onBrushEnd) {
+ if (!parent.brushOn || !child.brushOn) {
+ return;
+ }
+
+ // enable brush
+ parent.brushOn(true);
+ child.brushOn(true);
+
+ // normally dots are disabled if brush is on but we want them anyway
+ if (child.xyTipsOn) {
+ child.xyTipsOn("always");
+ }
+
+ // the brush has been cancelled by pressing escape
+ let cancelled = false;
+ // the last updated range when brushing
+ let range = null;
+
+ // start
+ parent.brush().on("brushstart.custom", () => {
+ // reset "range"
+ range = null;
+ // reset "cancelled" flag
+ cancelled = false;
+ // add "dragging" class to chart
+ parent.svg().classed("dragging", true);
+ // move the brush element to the front
+ moveToFront(parent.select(".brush").node());
+ // add an escape keydown listener
+ window.addEventListener("keydown", onKeyDown, true);
+ });
+
+ // change
+ child.addFilterHandler((filters, r) => {
+ // update "range" with new filter range
+ range = r;
+
+ // emit "onBrushChange" event
+ onBrushChange(range);
+
+ // fade deselected bars
+ parent.fadeDeselectedArea();
+
+ // return filters unmodified
+ return filters;
+ });
+
+ // end
+ parent.brush().on("brushend.custom", () => {
+ // remove the "dragging" classed
+ parent.svg().classed("dragging", false)
+ // reset brush opacity (if the brush was cancelled)
+ parent.select(".brush").style("opacity", 1);
+ // move the brush to the back
+ moveToBack(parent.select(".brush").node());
+ // remove the escape keydown listener
+ window.removeEventListener("keydown", onKeyDown, true);
+ // reset the fitler and redraw
+ child.filterAll();
+ parent.redraw();
+
+ // if not cancelled, emit the onBrushEnd event with the last filter range
+ onBrushEnd(cancelled ? null : range);
+ range = null;
+ });
+
+ // cancel
+ const onKeyDown = e => {
+ if (e.keyCode === KEYCODE_ESCAPE) {
+ // set the "cancelled" flag
+ cancelled = true;
+ // dispatch a mouseup to end brushing early
+ window.dispatchEvent(new MouseEvent("mouseup"));
+ }
+ };
+
+ parent.on("pretransition.custom", function(chart) {
+ // move brush to the back so tootips/clicks still work
+ moveToBack(chart.select(".brush").node());
+ // remove the handles since we can't adjust them anyway
+ chart.selectAll(".brush .resize").remove();
+ });
+}
diff --git a/frontend/src/metabase/visualizations/lib/table.js b/frontend/src/metabase/visualizations/lib/table.js
index 3e05c3cb8278037c17d38b37e09456021b142138..8203808bc944ae10cd35f03ef6df5a49e6df4930 100644
--- a/frontend/src/metabase/visualizations/lib/table.js
+++ b/frontend/src/metabase/visualizations/lib/table.js
@@ -1,7 +1,8 @@
/* @flow */
-import type { DatasetData } from "metabase/meta/types/Dataset";
+import type { DatasetData, Column } from "metabase/meta/types/Dataset";
import type { ClickObject } from "metabase/meta/types/Visualization";
+import { isNumber, isCoordinate } from "metabase/lib/schema_metadata";
export function getTableCellClickedObject(data: DatasetData, rowIndex: number, columnIndex: number, isPivoted: boolean): ClickObject {
const { rows, cols } = data;
@@ -35,3 +36,11 @@ export function getTableCellClickedObject(data: DatasetData, rowIndex: number, c
return { value, column };
}
}
+
+/*
+ * Returns whether the column should be right-aligned in a table.
+ * Includes numbers and lat/lon coordinates, but not zip codes, IDs, etc.
+ */
+export function isColumnRightAligned(column: Column) {
+ return isNumber(column) || isCoordinate(column);
+}
diff --git a/frontend/src/metabase/visualizations/lib/table.spec.js b/frontend/src/metabase/visualizations/lib/table.spec.js
index 9e89fa2f791c8f8758e4ca9074d1e67f264f3a6c..8b12d8c8480601951420d4273a8e93e889173607 100644
--- a/frontend/src/metabase/visualizations/lib/table.spec.js
+++ b/frontend/src/metabase/visualizations/lib/table.spec.js
@@ -1,4 +1,5 @@
-import { getTableCellClickedObject } from "./table";
+import { getTableCellClickedObject, isColumnRightAligned } from "./table";
+import { TYPE } from "metabase/lib/types";
const RAW_COLUMN = {
source: "fields"
@@ -40,4 +41,24 @@ describe("metabase/visualization/lib/table", () => {
// TODO:
})
})
+
+ describe("isColumnRightAligned", () => {
+ it("should return true for numeric columns without a special type", () => {
+ expect(isColumnRightAligned({ base_type: TYPE.Integer })).toBe(true);
+ });
+ it("should return true for numeric columns with special type Number", () => {
+ expect(isColumnRightAligned({ base_type: TYPE.Integer, special_type: TYPE.Number })).toBe(true);
+ });
+ it("should return true for numeric columns with special type latitude or longitude ", () => {
+ expect(isColumnRightAligned({ base_type: TYPE.Integer, special_type: TYPE.Latitude })).toBe(true);
+ expect(isColumnRightAligned({ base_type: TYPE.Integer, special_type: TYPE.Longitude })).toBe(true);
+ });
+ it("should return false for numeric columns with special type zip code", () => {
+ expect(isColumnRightAligned({ base_type: TYPE.Integer, special_type: TYPE.ZipCode })).toBe(false)
+ });
+ it("should return false for numeric columns with special type FK or PK", () => {
+ expect(isColumnRightAligned({ base_type: TYPE.Integer, special_type: TYPE.FK })).toBe(false);
+ expect(isColumnRightAligned({ base_type: TYPE.Integer, special_type: TYPE.FK })).toBe(false);
+ });
+ })
})
diff --git a/frontend/src/metabase/visualizations/visualizations/Funnel.jsx b/frontend/src/metabase/visualizations/visualizations/Funnel.jsx
index 4050d610c0598872d8bf6e52ca20a2ecded1d219..dd73f1a37a58e7afa166d00a76e36a222450d140 100644
--- a/frontend/src/metabase/visualizations/visualizations/Funnel.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Funnel.jsx
@@ -17,7 +17,9 @@ import cx from "classnames";
import type { VisualizationProps } from "metabase/meta/types/Visualization";
-export default class Funnel extends Component<*, VisualizationProps, *> {
+export default class Funnel extends Component {
+ props: VisualizationProps;
+
static uiName = "Funnel";
static identifier = "funnel";
static iconName = "funnel";
@@ -114,6 +116,7 @@ export default class Funnel extends Component<*, VisualizationProps, *> {
<div className={cx(className, "flex flex-column p1")}>
<LegendHeader
className="flex-no-shrink"
+ // $FlowFixMe
series={series._raw || series}
actionButtons={actionButtons}
onChangeCardAndRun={onChangeCardAndRun}
diff --git a/frontend/src/metabase/visualizations/visualizations/Map.jsx b/frontend/src/metabase/visualizations/visualizations/Map.jsx
index cd65132915a7cb0863a0df028997e4994fc99110..1be87044162d96b9792e73bdf28632e2455ad72b 100644
--- a/frontend/src/metabase/visualizations/visualizations/Map.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Map.jsx
@@ -14,7 +14,9 @@ import type { VisualizationProps } from "metabase/meta/types/Visualization";
import _ from "underscore";
-export default class Map extends Component<*, VisualizationProps, *> {
+export default class Map extends Component {
+ props: VisualizationProps;
+
static uiName = "Map";
static identifier = "map";
static iconName = "pinmap";
diff --git a/frontend/src/metabase/visualizations/visualizations/PieChart.jsx b/frontend/src/metabase/visualizations/visualizations/PieChart.jsx
index 73cc1b27ae737e7c4325093627a3154dd3f7f164..aa494237f81358b5025dd55ee22eafa99bc0bdba 100644
--- a/frontend/src/metabase/visualizations/visualizations/PieChart.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/PieChart.jsx
@@ -31,9 +31,9 @@ const PERCENT_REGEX = /percent/i;
import type { VisualizationProps } from "metabase/meta/types/Visualization";
-type Props = VisualizationProps;
+export default class PieChart extends Component {
+ props: VisualizationProps;
-export default class PieChart extends Component<*, Props, *> {
static uiName = "Pie";
static identifier = "pie";
static iconName = "pie";
diff --git a/frontend/src/metabase/visualizations/visualizations/Progress.jsx b/frontend/src/metabase/visualizations/visualizations/Progress.jsx
index 1cf8fa459e3724b283bb64da1805121b0af692ab..5141e68ec6ae539fb0ed1e6499fd7ccac08c9e56 100644
--- a/frontend/src/metabase/visualizations/visualizations/Progress.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Progress.jsx
@@ -17,7 +17,9 @@ const MAX_BAR_HEIGHT = 65;
import type { VisualizationProps } from "metabase/meta/types/Visualization";
-export default class Progress extends Component<*, VisualizationProps, *> {
+export default class Progress extends Component {
+ props: VisualizationProps;
+
static uiName = "Progress";
static identifier = "progress";
static iconName = "progress";
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar.jsx b/frontend/src/metabase/visualizations/visualizations/Scalar.jsx
index 730f9b614a93ac56b148a10d331bea4b7ce89e77..9608011fb23640ceefe4dbb0494bb6eaeaab9448 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar.jsx
@@ -16,7 +16,9 @@ import d3 from "d3";
import type { VisualizationProps } from "metabase/meta/types/Visualization";
-export default class Scalar extends Component<*, VisualizationProps, *> {
+export default class Scalar extends Component {
+ props: VisualizationProps;
+
static uiName = "Number";
static identifier = "scalar";
static iconName = "number";
@@ -191,7 +193,7 @@ export default class Scalar extends Component<*, VisualizationProps, *> {
{compactScalarValue}
</span>
</Ellipsified>
- <div className={styles.Title + " flex align-center"}>
+ <div className={styles.Title + " flex align-center relative"}>
<Ellipsified tooltip={card.name}>
<span
onClick={onChangeCardAndRun && (() => onChangeCardAndRun({ nextCard: card }))}
@@ -204,9 +206,12 @@ export default class Scalar extends Component<*, VisualizationProps, *> {
</Ellipsified>
{ description &&
- <div className="hover-child">
+ <div
+ className="absolute top bottom hover-child flex align-center justify-center"
+ style={{ right: -20, top: 2 }}
+ >
<Tooltip tooltip={description} maxWidth={'22em'}>
- <Icon name='info' />
+ <Icon name='infooutlined' />
</Tooltip>
</div>
}
diff --git a/frontend/src/metabase/visualizations/visualizations/Table.jsx b/frontend/src/metabase/visualizations/visualizations/Table.jsx
index d45ac9c86111bb8a0529872b0f51f694db5501af..07840ddd15ddf4d350a9fc6ecb1c6567262b22b9 100644
--- a/frontend/src/metabase/visualizations/visualizations/Table.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Table.jsx
@@ -29,7 +29,8 @@ type State = {
data: ?DatasetData
}
-export default class Table extends Component<*, Props, State> {
+export default class Table extends Component {
+ props: Props;
state: State;
static uiName = "Table";
@@ -126,7 +127,13 @@ export default class Table extends Component<*, Props, State> {
const sort = getIn(card, ["dataset_query", "query", "order_by"]) || null;
const isPivoted = settings["table.pivot"];
const TableComponent = isDashboard ? TableSimple : TableInteractive;
+
+ if (!data) {
+ return null;
+ }
+
return (
+ // $FlowFixMe
<TableComponent
{...this.props}
data={data}
diff --git a/frontend/test/unit/visualizations/lib/LineAreaBarRenderer.spec.js b/frontend/test/unit/visualizations/lib/LineAreaBarRenderer.spec.js
index 1da75bcb676fae7d98d123b3db7b37fcb420e63b..53565b9131c76462462322eae81c67641c38d007 100644
--- a/frontend/test/unit/visualizations/lib/LineAreaBarRenderer.spec.js
+++ b/frontend/test/unit/visualizations/lib/LineAreaBarRenderer.spec.js
@@ -237,6 +237,8 @@ describe("LineAreaBarRenderer", () => {
data: {
"cols" : [DateTimeColumn({ unit }), NumberColumn()],
"rows" : rows
+ },
+ card: {
}
})),
settings: {
@@ -256,6 +258,8 @@ describe("LineAreaBarRenderer", () => {
data: {
"cols" : [StringColumn(), NumberColumn()],
"rows" : [scalar]
+ },
+ card: {
}
})),
settings: {
diff --git a/package.json b/package.json
index b95511323528d9bffedd33103c45169ce39ef74d..9630e450d96765b9c01bdb12188158a1792a8188 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"d3": "^3.5.17",
"dc": "^2.0.0",
"diff": "^3.2.0",
- "history": "^4.5.0",
+ "history": "3",
"humanize-plus": "^1.8.1",
"icepick": "^1.1.0",
"iframe-resizer": "^3.5.11",
@@ -135,6 +135,7 @@
"react-test-renderer": "^15.5.4",
"sauce-connect-launcher": "^1.1.1",
"selenium-webdriver": "^2.53.3",
+ "sinon": "^2.3.1",
"style-loader": "^0.16.1",
"unused-files-webpack-plugin": "^3.0.0",
"webchauffeur": "^1.2.0",
diff --git a/project.clj b/project.clj
index d0ac83ab26ed9259318b337b7e43c3b3a7282461..db982ea4083b96cf23faf6cec520072d08129564 100644
--- a/project.clj
+++ b/project.clj
@@ -76,7 +76,8 @@
[postgresql "9.3-1102.jdbc41"] ; Postgres driver
[io.crate/crate-jdbc "2.1.6"] ; Crate JDBC driver
[prismatic/schema "1.1.5"] ; Data schema declaration and validation library
- [ring/ring-jetty-adapter "1.5.1"] ; Ring adapter using Jetty webserver (used to run a Ring server for unit tests)
+ [ring/ring-core "1.6.0"]
+ [ring/ring-jetty-adapter "1.6.0"] ; Ring adapter using Jetty webserver (used to run a Ring server for unit tests)
[ring/ring-json "0.4.0"] ; Ring middleware for reading/writing JSON automatically
[stencil "0.5.0"] ; Mustache templates for Clojure
[toucan "1.0.3" ; Model layer, hydration, and DB utilities
diff --git a/resources/frontend_client/app/charts/us-states.json b/resources/frontend_client/app/assets/geojson/us-states.json
similarity index 100%
rename from resources/frontend_client/app/charts/us-states.json
rename to resources/frontend_client/app/assets/geojson/us-states.json
diff --git a/resources/frontend_client/app/charts/world.json b/resources/frontend_client/app/assets/geojson/world.json
similarity index 100%
rename from resources/frontend_client/app/charts/world.json
rename to resources/frontend_client/app/assets/geojson/world.json
diff --git a/resources/frontend_client/app/img/.gitkeep b/resources/frontend_client/app/assets/img/.gitkeep
similarity index 100%
rename from resources/frontend_client/app/img/.gitkeep
rename to resources/frontend_client/app/assets/img/.gitkeep
diff --git a/resources/frontend_client/app/img/blown_up.svg b/resources/frontend_client/app/assets/img/blown_up.svg
similarity index 100%
rename from resources/frontend_client/app/img/blown_up.svg
rename to resources/frontend_client/app/assets/img/blown_up.svg
diff --git a/resources/frontend_client/app/components/icons/assets/dash_empty_state.svg b/resources/frontend_client/app/assets/img/dash_empty_state.svg
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/dash_empty_state.svg
rename to resources/frontend_client/app/assets/img/dash_empty_state.svg
diff --git a/resources/frontend_client/app/img/databases-list.png b/resources/frontend_client/app/assets/img/databases-list.png
similarity index 100%
rename from resources/frontend_client/app/img/databases-list.png
rename to resources/frontend_client/app/assets/img/databases-list.png
diff --git a/resources/frontend_client/app/img/databases-list@2x.png b/resources/frontend_client/app/assets/img/databases-list@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/databases-list@2x.png
rename to resources/frontend_client/app/assets/img/databases-list@2x.png
diff --git a/resources/frontend_client/app/img/disconnect.svg b/resources/frontend_client/app/assets/img/disconnect.svg
similarity index 100%
rename from resources/frontend_client/app/img/disconnect.svg
rename to resources/frontend_client/app/assets/img/disconnect.svg
diff --git a/resources/frontend_client/app/img/external_link.png b/resources/frontend_client/app/assets/img/external_link.png
similarity index 100%
rename from resources/frontend_client/app/img/external_link.png
rename to resources/frontend_client/app/assets/img/external_link.png
diff --git a/resources/frontend_client/app/img/external_link@2x.png b/resources/frontend_client/app/assets/img/external_link@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/external_link@2x.png
rename to resources/frontend_client/app/assets/img/external_link@2x.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_ask_question.png b/resources/frontend_client/app/assets/img/illustration_ask_question.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_ask_question.png
rename to resources/frontend_client/app/assets/img/illustration_ask_question.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_dashboard.png b/resources/frontend_client/app/assets/img/illustration_dashboard.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_dashboard.png
rename to resources/frontend_client/app/assets/img/illustration_dashboard.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_home.png b/resources/frontend_client/app/assets/img/illustration_home.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_home.png
rename to resources/frontend_client/app/assets/img/illustration_home.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_question.png b/resources/frontend_client/app/assets/img/illustration_question.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_question.png
rename to resources/frontend_client/app/assets/img/illustration_question.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_tables.png b/resources/frontend_client/app/assets/img/illustration_tables.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_tables.png
rename to resources/frontend_client/app/assets/img/illustration_tables.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_area.png b/resources/frontend_client/app/assets/img/illustration_visualization_area.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_area.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_area.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_bar.png b/resources/frontend_client/app/assets/img/illustration_visualization_bar.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_bar.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_bar.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_country.png b/resources/frontend_client/app/assets/img/illustration_visualization_country.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_country.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_country.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_line.png b/resources/frontend_client/app/assets/img/illustration_visualization_line.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_line.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_line.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_pie.png b/resources/frontend_client/app/assets/img/illustration_visualization_pie.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_pie.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_pie.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_scalar.png b/resources/frontend_client/app/assets/img/illustration_visualization_scalar.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_scalar.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_scalar.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_state.png b/resources/frontend_client/app/assets/img/illustration_visualization_state.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_state.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_state.png
diff --git a/resources/frontend_client/app/components/icons/assets/illustration_visualization_table.png b/resources/frontend_client/app/assets/img/illustration_visualization_table.png
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/illustration_visualization_table.png
rename to resources/frontend_client/app/assets/img/illustration_visualization_table.png
diff --git a/resources/frontend_client/app/img/lightbulb.png b/resources/frontend_client/app/assets/img/lightbulb.png
similarity index 100%
rename from resources/frontend_client/app/img/lightbulb.png
rename to resources/frontend_client/app/assets/img/lightbulb.png
diff --git a/resources/frontend_client/app/img/lightbulb@2x.png b/resources/frontend_client/app/assets/img/lightbulb@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/lightbulb@2x.png
rename to resources/frontend_client/app/assets/img/lightbulb@2x.png
diff --git a/resources/frontend_client/app/img/metrics-list.png b/resources/frontend_client/app/assets/img/metrics-list.png
similarity index 100%
rename from resources/frontend_client/app/img/metrics-list.png
rename to resources/frontend_client/app/assets/img/metrics-list.png
diff --git a/resources/frontend_client/app/img/metrics-list@2x.png b/resources/frontend_client/app/assets/img/metrics-list@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/metrics-list@2x.png
rename to resources/frontend_client/app/assets/img/metrics-list@2x.png
diff --git a/resources/frontend_client/app/img/no_results.svg b/resources/frontend_client/app/assets/img/no_results.svg
similarity index 100%
rename from resources/frontend_client/app/img/no_results.svg
rename to resources/frontend_client/app/assets/img/no_results.svg
diff --git a/resources/frontend_client/app/img/no_understand.svg b/resources/frontend_client/app/assets/img/no_understand.svg
similarity index 100%
rename from resources/frontend_client/app/img/no_understand.svg
rename to resources/frontend_client/app/assets/img/no_understand.svg
diff --git a/resources/frontend_client/app/home/partials/onboarding_illustration_dashboards.png b/resources/frontend_client/app/assets/img/onboarding_illustration_dashboards.png
similarity index 100%
rename from resources/frontend_client/app/home/partials/onboarding_illustration_dashboards.png
rename to resources/frontend_client/app/assets/img/onboarding_illustration_dashboards.png
diff --git a/resources/frontend_client/app/home/partials/onboarding_illustration_questions.png b/resources/frontend_client/app/assets/img/onboarding_illustration_questions.png
similarity index 100%
rename from resources/frontend_client/app/home/partials/onboarding_illustration_questions.png
rename to resources/frontend_client/app/assets/img/onboarding_illustration_questions.png
diff --git a/resources/frontend_client/app/home/partials/onboarding_illustration_tables.png b/resources/frontend_client/app/assets/img/onboarding_illustration_tables.png
similarity index 100%
rename from resources/frontend_client/app/home/partials/onboarding_illustration_tables.png
rename to resources/frontend_client/app/assets/img/onboarding_illustration_tables.png
diff --git a/resources/frontend_client/app/img/pin.png b/resources/frontend_client/app/assets/img/pin.png
similarity index 100%
rename from resources/frontend_client/app/img/pin.png
rename to resources/frontend_client/app/assets/img/pin.png
diff --git a/resources/frontend_client/app/img/pulse_empty_illustration.png b/resources/frontend_client/app/assets/img/pulse_empty_illustration.png
similarity index 100%
rename from resources/frontend_client/app/img/pulse_empty_illustration.png
rename to resources/frontend_client/app/assets/img/pulse_empty_illustration.png
diff --git a/resources/frontend_client/app/img/pulse_empty_illustration@2x.png b/resources/frontend_client/app/assets/img/pulse_empty_illustration@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/pulse_empty_illustration@2x.png
rename to resources/frontend_client/app/assets/img/pulse_empty_illustration@2x.png
diff --git a/resources/frontend_client/app/img/pulse_no_results.png b/resources/frontend_client/app/assets/img/pulse_no_results.png
similarity index 100%
rename from resources/frontend_client/app/img/pulse_no_results.png
rename to resources/frontend_client/app/assets/img/pulse_no_results.png
diff --git a/resources/frontend_client/app/img/pulse_no_results@2x.png b/resources/frontend_client/app/assets/img/pulse_no_results@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/pulse_no_results@2x.png
rename to resources/frontend_client/app/assets/img/pulse_no_results@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/banana.png b/resources/frontend_client/app/assets/img/qb_tutorial/banana.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/banana.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/banana.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/banana@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/banana@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/banana@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/banana@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/boat.png b/resources/frontend_client/app/assets/img/qb_tutorial/boat.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/boat.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/boat.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/boat@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/boat@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/boat@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/boat@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/calculator.png b/resources/frontend_client/app/assets/img/qb_tutorial/calculator.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/calculator.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/calculator.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/calculator@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/calculator@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/calculator@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/calculator@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/chart.png b/resources/frontend_client/app/assets/img/qb_tutorial/chart.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/chart.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/chart.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/chart@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/chart@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/chart@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/chart@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/funnel.png b/resources/frontend_client/app/assets/img/qb_tutorial/funnel.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/funnel.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/funnel.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/funnel@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/funnel@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/funnel@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/funnel@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/question_builder.png b/resources/frontend_client/app/assets/img/qb_tutorial/question_builder.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/question_builder.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/question_builder.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/question_builder@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/question_builder@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/question_builder@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/question_builder@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/rocket.png b/resources/frontend_client/app/assets/img/qb_tutorial/rocket.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/rocket.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/rocket.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/rocket@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/rocket@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/rocket@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/rocket@2x.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/table.png b/resources/frontend_client/app/assets/img/qb_tutorial/table.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/table.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/table.png
diff --git a/resources/frontend_client/app/img/qb_tutorial/table@2x.png b/resources/frontend_client/app/assets/img/qb_tutorial/table@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/qb_tutorial/table@2x.png
rename to resources/frontend_client/app/assets/img/qb_tutorial/table@2x.png
diff --git a/resources/frontend_client/app/img/secure_embed.png b/resources/frontend_client/app/assets/img/secure_embed.png
similarity index 100%
rename from resources/frontend_client/app/img/secure_embed.png
rename to resources/frontend_client/app/assets/img/secure_embed.png
diff --git a/resources/frontend_client/app/img/secure_embed@2x.png b/resources/frontend_client/app/assets/img/secure_embed@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/secure_embed@2x.png
rename to resources/frontend_client/app/assets/img/secure_embed@2x.png
diff --git a/resources/frontend_client/app/img/segments-list.png b/resources/frontend_client/app/assets/img/segments-list.png
similarity index 100%
rename from resources/frontend_client/app/img/segments-list.png
rename to resources/frontend_client/app/assets/img/segments-list.png
diff --git a/resources/frontend_client/app/img/segments-list@2x.png b/resources/frontend_client/app/assets/img/segments-list@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/segments-list@2x.png
rename to resources/frontend_client/app/assets/img/segments-list@2x.png
diff --git a/resources/frontend_client/app/img/simple_embed.png b/resources/frontend_client/app/assets/img/simple_embed.png
similarity index 100%
rename from resources/frontend_client/app/img/simple_embed.png
rename to resources/frontend_client/app/assets/img/simple_embed.png
diff --git a/resources/frontend_client/app/img/simple_embed@2x.png b/resources/frontend_client/app/assets/img/simple_embed@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/simple_embed@2x.png
rename to resources/frontend_client/app/assets/img/simple_embed@2x.png
diff --git a/resources/frontend_client/app/img/slack.png b/resources/frontend_client/app/assets/img/slack.png
similarity index 100%
rename from resources/frontend_client/app/img/slack.png
rename to resources/frontend_client/app/assets/img/slack.png
diff --git a/resources/frontend_client/app/img/slack@2x.png b/resources/frontend_client/app/assets/img/slack@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/slack@2x.png
rename to resources/frontend_client/app/assets/img/slack@2x.png
diff --git a/resources/frontend_client/app/img/slack_emoji.png b/resources/frontend_client/app/assets/img/slack_emoji.png
similarity index 100%
rename from resources/frontend_client/app/img/slack_emoji.png
rename to resources/frontend_client/app/assets/img/slack_emoji.png
diff --git a/resources/frontend_client/app/img/slack_emoji@2x.png b/resources/frontend_client/app/assets/img/slack_emoji@2x.png
similarity index 100%
rename from resources/frontend_client/app/img/slack_emoji@2x.png
rename to resources/frontend_client/app/assets/img/slack_emoji@2x.png
diff --git a/resources/frontend_client/app/components/icons/assets/smile.svg b/resources/frontend_client/app/assets/img/smile.svg
similarity index 100%
rename from resources/frontend_client/app/components/icons/assets/smile.svg
rename to resources/frontend_client/app/assets/img/smile.svg
diff --git a/resources/frontend_client/app/img/stopwatch.svg b/resources/frontend_client/app/assets/img/stopwatch.svg
similarity index 100%
rename from resources/frontend_client/app/img/stopwatch.svg
rename to resources/frontend_client/app/assets/img/stopwatch.svg
diff --git a/resources/frontend_client/app/assets/img/welcome-modal-1.png b/resources/frontend_client/app/assets/img/welcome-modal-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..03d33ede6d5a934bd5c2ae407defc664a0d18e22
Binary files /dev/null and b/resources/frontend_client/app/assets/img/welcome-modal-1.png differ
diff --git a/resources/frontend_client/app/assets/img/welcome-modal-1@2x.png b/resources/frontend_client/app/assets/img/welcome-modal-1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..755b1a28cbf18d3c4c4a86e57670de18543a7b24
Binary files /dev/null and b/resources/frontend_client/app/assets/img/welcome-modal-1@2x.png differ
diff --git a/resources/frontend_client/app/assets/img/welcome-modal-2.png b/resources/frontend_client/app/assets/img/welcome-modal-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..dca97655c194d23f4aee0ab80a90bcd306935f3e
Binary files /dev/null and b/resources/frontend_client/app/assets/img/welcome-modal-2.png differ
diff --git a/resources/frontend_client/app/assets/img/welcome-modal-2@2x.png b/resources/frontend_client/app/assets/img/welcome-modal-2@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c46a9046020c31acd63fa70ea914b0d1560cd80
Binary files /dev/null and b/resources/frontend_client/app/assets/img/welcome-modal-2@2x.png differ
diff --git a/resources/frontend_client/app/assets/img/welcome-modal-3.png b/resources/frontend_client/app/assets/img/welcome-modal-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..21d1a030b00d998e9294bb5fdef30e0745b2d395
Binary files /dev/null and b/resources/frontend_client/app/assets/img/welcome-modal-3.png differ
diff --git a/resources/frontend_client/app/assets/img/welcome-modal-3@2x.png b/resources/frontend_client/app/assets/img/welcome-modal-3@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8ba2208953eab24451edabdc7b66b57abd9d4af
Binary files /dev/null and b/resources/frontend_client/app/assets/img/welcome-modal-3@2x.png differ
diff --git a/resources/frontend_client/app/img/test/pin-map-reference-image1.png b/resources/frontend_client/app/img/test/pin-map-reference-image1.png
deleted file mode 100644
index 4b6bee6d07bd367b580d99af04312152501b5f04..0000000000000000000000000000000000000000
Binary files a/resources/frontend_client/app/img/test/pin-map-reference-image1.png and /dev/null differ
diff --git a/resources/frontend_client/index_template.html b/resources/frontend_client/index_template.html
index 573608b6bd9945517b89250107362f6c3607076a..c2c0924cc3ddadc6bb3b0702e99f00e40767b781 100644
--- a/resources/frontend_client/index_template.html
+++ b/resources/frontend_client/index_template.html
@@ -11,8 +11,34 @@
<title>Metabase</title>
+ <base href={{{base_href}}} />
+
<script type="text/javascript">
- window.MetabaseBootstrap = {{{bootstrap_json}}};
+ (function() {
+ window.MetabaseBootstrap = {{{bootstrap_json}}};
+
+ var configuredRoot = {{{base_href}}};
+ var actualRoot = "/";
+
+ // Add trailing slashes
+ var backendPathname = {{{uri}}}.replace(/\/*$/, "/");
+ // e.x. "/questions/"
+ var frontendPathname = window.location.pathname.replace(/\/*$/, "/");
+ // e.x. "/metabase/questions/"
+ if (backendPathname === frontendPathname.slice(-backendPathname.length)) {
+ // Remove the backend pathname from the end of the frontend pathname
+ actualRoot = frontendPathname.slice(0, -backendPathname.length) + "/";
+ // e.x. "/metabase/"
+ }
+
+ if (actualRoot !== configuredRoot) {
+ console.warn("Warning: the Metabase site URL basename \"" + configuredRoot + "\" does not match the actual basename \"" + actualRoot + "\".");
+ console.warn("You probably want to update the Site URL setting to \"" + window.location.origin + actualRoot + "\"");
+ document.getElementsByTagName("base")[0].href = actualRoot;
+ }
+
+ window.MetabaseRoot = actualRoot;
+ })();
</script>
</head>
diff --git a/src/metabase/api/card.clj b/src/metabase/api/card.clj
index 5863d4ebf813d986a1ba031eadd01c61f3696c35..12541c5dd35fff4213d8750dabf0008e5f72cc60 100644
--- a/src/metabase/api/card.clj
+++ b/src/metabase/api/card.clj
@@ -5,6 +5,7 @@
[compojure.core :refer [DELETE GET POST PUT]]
[metabase
[events :as events]
+ [middleware :as middleware]
[public-settings :as public-settings]
[query-processor :as qp]
[util :as u]]
@@ -12,6 +13,7 @@
[common :as api]
[dataset :as dataset-api]
[label :as label-api]]
+ [metabase.api.common.internal :refer [route-fn-name]]
[metabase.models
[card :as card :refer [Card]]
[card-favorite :refer [CardFavorite]]
@@ -467,5 +469,5 @@
(api/check-embedding-enabled)
(db/select [Card :name :id], :enable_embedding true, :archived false))
-
-(api/define-routes)
+(api/define-routes
+ (middleware/streaming-json-response (route-fn-name 'POST "/:card-id/query")))
diff --git a/src/metabase/api/common.clj b/src/metabase/api/common.clj
index 77f372fc2486a9f5bb0e2eb7bf71960495a43ebe..098ba60567ddd645eebc063b5c9f4d3c97695e04 100644
--- a/src/metabase/api/common.clj
+++ b/src/metabase/api/common.clj
@@ -268,7 +268,7 @@
(s/replace #"^metabase\." "")
(s/replace #"\." "/"))
(u/pprint-to-str (concat api-routes additional-routes))))
- ~@api-routes ~@additional-routes)))
+ ~@additional-routes ~@api-routes)))
;;; ------------------------------------------------------------ PERMISSIONS CHECKING HELPER FNS ------------------------------------------------------------
diff --git a/src/metabase/api/database.clj b/src/metabase/api/database.clj
index 49ea7918e3556534fe4503ffaaaa750406526bcb..e6e3808ee17a9df05d497388f9de07d93ddcf9bd 100644
--- a/src/metabase/api/database.clj
+++ b/src/metabase/api/database.clj
@@ -246,6 +246,7 @@
(sample-data/add-sample-dataset!)
(Database :is_sample true))
+
;;; ------------------------------------------------------------ PUT /api/database/:id ------------------------------------------------------------
(api/defendpoint PUT "/:id"
diff --git a/src/metabase/api/dataset.clj b/src/metabase/api/dataset.clj
index 548e15d97b8309c874967b1843ee4b2d1dcf9d1b..7666d83e7fd55382770e080c7339684a33fe9961 100644
--- a/src/metabase/api/dataset.clj
+++ b/src/metabase/api/dataset.clj
@@ -6,9 +6,11 @@
[compojure.core :refer [POST]]
[dk.ative.docjure.spreadsheet :as spreadsheet]
[metabase
+ [middleware :as middleware]
[query-processor :as qp]
[util :as u]]
[metabase.api.common :as api]
+ [metabase.api.common.internal :refer [route-fn-name]]
[metabase.models
[database :refer [Database]]
[query :as query]]
@@ -124,5 +126,5 @@
(qp/dataset-query (dissoc query :constraints)
{:executed-by api/*current-user-id*, :context (export-format->context export-format)}))))
-
-(api/define-routes)
+(api/define-routes
+ (middleware/streaming-json-response (route-fn-name 'POST "/")))
diff --git a/src/metabase/api/geojson.clj b/src/metabase/api/geojson.clj
index 1fc5e31143155fcb38318576a0c550c2806bd0bd..19494cd7be689705ed1926c8444477f5f043a851 100644
--- a/src/metabase/api/geojson.clj
+++ b/src/metabase/api/geojson.clj
@@ -17,11 +17,11 @@
true)
(defn- valid-json-resource?
- "Does this RELATIVE-PATH point to a valid local JSON resource? (RELATIVE-PATH is something like \"app/charts/us-states.json\".)"
+ "Does this RELATIVE-PATH point to a valid local JSON resource? (RELATIVE-PATH is something like \"app/assets/geojson/us-states.json\".)"
[relative-path]
(when-let [^java.net.URI uri (u/ignore-exceptions (java.net.URI. relative-path))]
(when-not (.isAbsolute uri)
- (valid-json? (io/resource (str "frontend_client" uri))))))
+ (valid-json? (io/resource (str "frontend_client/" uri))))))
(defn- valid-json-url?
"Is URL a valid HTTP URL and does it point to valid JSON?"
@@ -47,12 +47,12 @@
(def ^:private ^:const builtin-geojson
{:us_states {:name "United States"
- :url "/app/charts/us-states.json"
+ :url "app/assets/geojson/us-states.json"
:region_key "name"
:region_name "name"
:builtin true}
:world_countries {:name "World"
- :url "/app/charts/world.json"
+ :url "app/assets/geojson/world.json"
:region_key "ISO_A2"
:region_name "NAME"
:builtin true}})
diff --git a/src/metabase/api/public.clj b/src/metabase/api/public.clj
index ba3690a093f01c1281cd6926ef798c7383186510..996fbd43e7a0a959c7bb7aa722790da0ad29a051 100644
--- a/src/metabase/api/public.clj
+++ b/src/metabase/api/public.clj
@@ -88,11 +88,11 @@
(card-with-uuid uuid))
-
(defn run-query-for-card-with-id
"Run the query belonging to Card with CARD-ID with PARAMETERS and other query options (e.g. `:constraints`)."
[card-id parameters & options]
(u/prog1 (-> (let [parameters (if (string? parameters) (json/parse-string parameters keyword) parameters)]
+ ;; run this query with full superuser perms
(binding [api/*current-user-permissions-set* (atom #{"/"})
qp/*allow-queries-with-no-executor-id* true]
(apply card-api/run-query-for-card card-id, :parameters parameters, :context :public-question, options)))
diff --git a/src/metabase/api/table.clj b/src/metabase/api/table.clj
index 91909a555838eaa3ca3740920e2aeec92877faae..83354618e2af92ea5db48f8b3557830cbb0e4777 100644
--- a/src/metabase/api/table.clj
+++ b/src/metabase/api/table.clj
@@ -2,6 +2,7 @@
"/api/table endpoints."
(:require [clojure.tools.logging :as log]
[compojure.core :refer [GET PUT]]
+ [medley.core :as m]
[metabase
[sync-database :as sync-database]
[util :as u]]
@@ -87,6 +88,7 @@
{include_sensitive_fields (s/maybe su/BooleanString)}
(-> (api/read-check Table id)
(hydrate :db [:fields :target] :field_values :segments :metrics)
+ (m/dissoc-in [:db :details])
(update-in [:fields] (if (Boolean/parseBoolean include_sensitive_fields)
;; If someone passes include_sensitive_fields return hydrated :fields as-is
identity
diff --git a/src/metabase/core.clj b/src/metabase/core.clj
index c36cfe2750630b5b58c2ce441bb1605d12bcbe9e..16cc4c3c09a137e5a9ce566e60b7cc9b4344dcbc 100644
--- a/src/metabase/core.clj
+++ b/src/metabase/core.clj
@@ -37,7 +37,7 @@
(def ^:private app
"The primary entry point to the Ring HTTP server."
- (-> routes/routes
+ (-> #'routes/routes ; the #' is to allow tests to redefine endpoints
mb-middleware/log-api-call
mb-middleware/add-security-headers ; Add HTTP headers to API responses to prevent them from being cached
(wrap-json-body ; extracts json POST body and makes it avaliable on request
diff --git a/src/metabase/driver.clj b/src/metabase/driver.clj
index 80a4ff3bc61e8d445519c40c5af83f2af8784799..3eb090d1542e8e926eab35e62504005828fa29cf 100644
--- a/src/metabase/driver.clj
+++ b/src/metabase/driver.clj
@@ -323,6 +323,17 @@
(log/warn (format "Don't know how to map class '%s' to a Field base_type, falling back to :type/*." klass))
:type/*))
+(defn values->base-type
+ "Given a sequence of VALUES, return the most common base type."
+ [values]
+ (->> values
+ (filter (complement nil?)) ; filter out `nil` values
+ (take 1000) ; take up to 1000 values
+ (group-by (comp class->base-type class)) ; now group by their base-type
+ (sort-by (comp (partial * -1) count second)) ; sort the map into pairs of [base-type count] with highest count as first pair
+ ffirst)) ; take the base-type from the first pair
+
+
;; ## Driver Lookup
(defn engine->driver
diff --git a/src/metabase/driver/generic_sql.clj b/src/metabase/driver/generic_sql.clj
index 4d97cf543544b5688e00f50391b8d984e642c061..a2157fa9076811d95f4403b76c97ff81cd1f7d8d 100644
--- a/src/metabase/driver/generic_sql.clj
+++ b/src/metabase/driver/generic_sql.clj
@@ -220,6 +220,7 @@
(defn honeysql-form->sql+args
"Convert HONEYSQL-FORM to a vector of SQL string and params, like you'd pass to JDBC."
+ {:style/indent 1}
[driver honeysql-form]
{:pre [(map? honeysql-form)]}
(let [[sql & args] (try (binding [hformat/*subquery?* false]
diff --git a/src/metabase/driver/generic_sql/query_processor.clj b/src/metabase/driver/generic_sql/query_processor.clj
index 73e8c0623f9094d942fd950e367013bde8a276a7..e8c254dd6856d5a4a02953c76f42941590c1fee2 100644
--- a/src/metabase/driver/generic_sql/query_processor.clj
+++ b/src/metabase/driver/generic_sql/query_processor.clj
@@ -243,7 +243,7 @@
(h/limit items)
(h/offset (* items (dec page)))))
-(defn- apply-source-table [_ honeysql-form {{table-name :name, schema :schema} :source-table}]
+(defn- apply-source-table [honeysql-form {{table-name :name, schema :schema} :source-table}]
{:pre [table-name]}
(h/from honeysql-form (hx/qualify-and-escape-dots schema table-name)))
@@ -252,7 +252,7 @@
;; will get swapped around and we'll be left with old version of the function that nobody implements
;; 2) This is a vector rather than a map because the order the clauses get handled is important for some drivers.
;; For example, Oracle needs to wrap the entire query in order to apply its version of limit (`WHERE ROWNUM`).
- [:source-table apply-source-table
+ [:source-table (u/drop-first-arg apply-source-table)
:aggregation #'sql/apply-aggregation
:breakout #'sql/apply-breakout
:fields #'sql/apply-fields
diff --git a/src/metabase/driver/googleanalytics/query_processor.clj b/src/metabase/driver/googleanalytics/query_processor.clj
index 1424d4d7ae115dd6d4e63ad5d0af27b6be086d13..cc0990c380f4708b0309793958bdfd670b8c1f31 100644
--- a/src/metabase/driver/googleanalytics/query_processor.clj
+++ b/src/metabase/driver/googleanalytics/query_processor.clj
@@ -3,7 +3,7 @@
(:require [clojure.string :as s]
[clojure.tools.reader.edn :as edn]
[medley.core :as m]
- [metabase.query-processor.expand :as ql]
+ [metabase.query-processor.util :as qputil]
[metabase.util :as u])
(:import [com.google.api.services.analytics.model GaData GaData$ColumnHeaders]
[metabase.query_processor.interface AgFieldRef DateTimeField DateTimeValue Field RelativeDateTimeValue Value]))
@@ -251,7 +251,7 @@
[{query :query}]
(let [[aggregation-type metric-name] (first-aggregation query)]
(when (and aggregation-type
- (= :metric (ql/normalize-token aggregation-type))
+ (= :metric (qputil/normalize-token aggregation-type))
(string? metric-name))
metric-name)))
@@ -266,7 +266,7 @@
(defn- filter-type ^clojure.lang.Keyword [filter-clause]
(when (and (sequential? filter-clause)
(u/string-or-keyword? (first filter-clause)))
- (ql/normalize-token (first filter-clause))))
+ (qputil/normalize-token (first filter-clause))))
(defn- compound-filter? [filter-clause]
(contains? #{:and :or :not} (filter-type filter-clause)))
diff --git a/src/metabase/driver/mongo.clj b/src/metabase/driver/mongo.clj
index 81ac8f9710fbd36876ea5e57df4056c4d06d028f..3b51ad2964b71c8a3603da2ae268fed2dad8fcdb 100644
--- a/src/metabase/driver/mongo.clj
+++ b/src/metabase/driver/mongo.clj
@@ -47,7 +47,7 @@
#"^com.jcraft.jsch.JSchException: Auth fail$"
(driver/connection-error-messages :ssh-tunnel-auth-fail)
- #"j^ava.net.ConnectException: Connection refused (Connection refused)$"
+ #".*JSchException: java.net.ConnectException: Connection refused.*"
(driver/connection-error-messages :ssh-tunnel-connection-fail)
#".*" ; default
diff --git a/src/metabase/driver/mongo/util.clj b/src/metabase/driver/mongo/util.clj
index ce830438fdc750382d7300e46555b3cb9c8f79aa..c7a153a1a7c532606a3eb0f07749caca1b30182f 100644
--- a/src/metabase/driver/mongo/util.clj
+++ b/src/metabase/driver/mongo/util.clj
@@ -137,26 +137,3 @@
(if *mongo-connection*
(f# *mongo-connection*)
(-with-mongo-connection f# ~database))))
-
-;; TODO - this isn't neccesarily Mongo-specific; consider moving
-(defn values->base-type
- "Given a sequence of values, return `Field.base_type` in the most ghetto way possible.
- This just gets counts the types of *every* value and returns the `base_type` for class whose count was highest."
- [values-seq]
- {:pre [(sequential? values-seq)]}
- (or (->> values-seq
- ;; TODO - why not do a query to return non-nil values of this column instead
- (filter identity)
- ;; it's probably fine just to consider the first 1,000 *non-nil* values when trying to type a column instead
- ;; of iterating over the whole collection. (VALUES-SEQ should be up to 10,000 values, but we don't know how many are
- ;; nil)
- (take 1000)
- (group-by type)
- ;; create tuples like [Integer count].
- (map (fn [[klass valus]]
- [klass (count valus)]))
- (sort-by second)
- last ; last result will be tuple with highest count
- first ; keep just the type
- driver/class->base-type) ; convert to Field base_type
- :type/*))
diff --git a/src/metabase/middleware.clj b/src/metabase/middleware.clj
index a521f291aeee14404af9ccd4c6c5a8b1d2a0d07f..9ca52e30797b1ab6cade62ca6eda95ef22a6581a 100644
--- a/src/metabase/middleware.clj
+++ b/src/metabase/middleware.clj
@@ -1,6 +1,10 @@
(ns metabase.middleware
"Metabase-specific middleware functions & configuration."
- (:require [cheshire.generate :refer [add-encoder encode-nil encode-str]]
+ (:require [cheshire
+ [core :as json]
+ [generate :refer [add-encoder encode-nil encode-str]]]
+ [clojure.core.async :as async]
+ [clojure.java.io :as io]
[clojure.tools.logging :as log]
[metabase
[config :as config]
@@ -15,10 +19,13 @@
[setting :refer [defsetting]]
[user :as user :refer [User]]]
monger.json
+ [ring.core.protocols :as protocols]
+ [ring.util.response :as response]
[toucan
[db :as db]
[models :as models]])
- (:import com.fasterxml.jackson.core.JsonGenerator))
+ (:import com.fasterxml.jackson.core.JsonGenerator
+ java.io.OutputStream))
;;; # ------------------------------------------------------------ UTIL FNS ------------------------------------------------------------
@@ -93,17 +100,12 @@
"Return User ID and superuser status for Session with SESSION-ID if it is valid and not expired."
[session-id]
(when (and session-id (init-status/complete?))
- (when-let [session (or (session-with-id session-id)
- (println "no matching session with ID") ; DEBUG
- )]
- (if (session-expired? session)
- (printf "session-is-expired! %d min / %d min\n" (session-age-minutes session) (config/config-int :max-session-age)) ; DEBUG
+ (when-let [session (session-with-id session-id)]
+ (when-not (session-expired? session)
{:metabase-user-id (:user_id session)
:is-superuser? (:is_superuser session)}))))
(defn- add-current-user-info [{:keys [metabase-session-id], :as request}]
- (when-not (init-status/complete?)
- (println "Metabase is not initialized yet!")) ; DEBUG
(merge request (current-user-info-for-session metabase-session-id)))
(defn wrap-current-user-id
@@ -340,7 +342,7 @@
(try (binding [*automatically-catch-api-exceptions* false]
(handler request))
(catch Throwable e
- (log/error (.getMessage e))
+ (log/warn (.getMessage e))
{:status 400, :body "An error occurred."}))))
(defn message-only-exceptions
@@ -354,3 +356,75 @@
(handler request))
(catch Throwable e
{:status 400, :body (.getMessage e)}))))
+
+;;; ------------------------------------------------------------ EXCEPTION HANDLING ------------------------------------------------------------
+
+(def ^:private ^:const streaming-response-keep-alive-interval-ms
+ "Interval between sending newline characters to keep Heroku from terminating
+ requests like queries that take a long time to complete."
+ (* 1 1000))
+
+;; Handle ring response maps that contain a core.async chan in the :body key:
+;;
+;; {:status 200
+;; :body (async/chan)}
+;;
+;; and send each string sent to that queue back to the browser as it arrives
+;; this avoids output buffering in the default stream handling which was not sending
+;; any responses until ~5k characters where in the queue.
+(extend-protocol protocols/StreamableResponseBody
+ clojure.core.async.impl.channels.ManyToManyChannel
+ (write-body-to-stream [output-queue _ ^OutputStream output-stream]
+ (log/debug (u/format-color 'green "starting streaming request"))
+ (with-open [out (io/writer output-stream)]
+ (loop [chunk (async/<!! output-queue)]
+ (when-not (= chunk ::EOF)
+ (.write out (str chunk))
+ (try
+ (.flush out)
+ (catch org.eclipse.jetty.io.EofException e
+ (log/info (u/format-color 'yellow "connection closed, canceling request %s" (type e)))
+ (async/close! output-queue)
+ (throw e)))
+ (recur (async/<!! output-queue)))))))
+
+(defn streaming-json-response
+ "This midelware assumes handlers fail early or return success
+ Run the handler in a future and send newlines to keep the connection open
+ and help detect when the browser is no longer listening for the response.
+ Waits for one second to see if the handler responds immediately, If it does
+ then there is no need to stream the response and it is sent back directly.
+ In cases where it takes longer than a second, assume the eventual result will
+ be a success and start sending newlines to keep the connection open."
+ [handler]
+ (fn [request]
+ (let [response (future (handler request))
+ optimistic-response (deref response streaming-response-keep-alive-interval-ms ::no-immediate-response)]
+ (if (= optimistic-response ::no-immediate-response)
+ ;; if we didn't get a normal response in the first poling interval assume it's going to be slow
+ ;; and start sending keepalive packets.
+ (let [output (async/chan 1)]
+ ;; the output channel will be closed by the adapter when the incoming connection is closed.
+ (future
+ (loop []
+ (Thread/sleep streaming-response-keep-alive-interval-ms)
+ (when-not (realized? response)
+ (log/debug (u/format-color 'blue "Response not ready, writing one byte & sleeping..."))
+ ;; a newline padding character is used because it forces output flushing in jetty.
+ ;; if sending this character fails because the connection is closed, the chan will then close.
+ ;; Newlines are no-ops when reading JSON which this depends upon.
+ (when-not (async/>!! output "\n")
+ (log/info (u/format-color 'yellow "canceled request %s" (future-cancel response)))
+ (future-cancel response)) ;; try our best to kill the thread running the query.
+ (recur))))
+ (future
+ (try
+ ;; This is the part where we make this assume it's a JSON response we are sending.
+ (async/>!! output (json/encode (:body @response)))
+ (finally
+ (async/>!! output ::EOF)
+ (async/close! response))))
+ ;; here we assume a successful response will be written to the output channel.
+ (assoc (response/response output)
+ :content-type "applicaton/json"))
+ optimistic-response))))
diff --git a/src/metabase/pulse/render.clj b/src/metabase/pulse/render.clj
index e57965c17478cf74bcebafcec6a79d6ce22d9731..aeda60eff850892edae154ced2919ea14e104df0 100644
--- a/src/metabase/pulse/render.clj
+++ b/src/metabase/pulse/render.clj
@@ -376,7 +376,7 @@
(defn- render:empty [_ _]
[:div {:style (style {:text-align :center})}
[:img {:style (style {:width :104px})
- :src (render-image-with-filename "frontend_client/app/img/pulse_no_results@2x.png")}]
+ :src (render-image-with-filename "frontend_client/app/assets/img/pulse_no_results@2x.png")}]
[:div {:style (style {:margin-top :8px
:color color-gray-4})}
"No results"]])
@@ -426,7 +426,7 @@
(when *include-buttons*
[:img {:style (style {:width :16px})
:width 16
- :src (render-image-with-filename "frontend_client/app/img/external_link.png")}])]]]])
+ :src (render-image-with-filename "frontend_client/app/assets/img/external_link.png")}])]]]])
(try
(when error
(throw (Exception. (str "Card has errors: " error))))
diff --git a/src/metabase/query_processor/annotate.clj b/src/metabase/query_processor/annotate.clj
index 8200086f5f84f5c2c9945c3748d3cadc4d79765b..734e4bfc8ddeb102d6598eb8128380ab3dbeac06 100644
--- a/src/metabase/query_processor/annotate.clj
+++ b/src/metabase/query_processor/annotate.clj
@@ -134,16 +134,19 @@
(expression-aggregate-field-info ag)
(aggregate-field-info ag))))))
-
(defn- generic-info-for-missing-key
- "Return a set of bare-bones metadata for a Field named K when all else fails."
- [k]
- {:base-type :type/*
+ "Return a set of bare-bones metadata for a Field named K when all else fails.
+ Scan the INITIAL-VALUES of K in an attempt to determine the `base-type`."
+ [k & [initial-values]]
+ {:base-type (if (seq initial-values)
+ (driver/values->base-type initial-values)
+ :type/*)
:preview-display true
:special-type nil
:field-name k
:field-display-name k})
+
(defn- info-for-duplicate-field
"The Clojure JDBC driver automatically appends suffixes like `count_2` to duplicate columns if multiple columns come back with the same name;
since at this time we can't resolve those normally (#1786) fall back to using the metadata for the first column (e.g., `count`).
@@ -159,14 +162,14 @@
(defn- info-for-missing-key
"Metadata for a field named K, which we weren't able to resolve normally.
If possible, we work around This defaults to generic information "
- [fields k]
+ [fields k initial-values]
(or (info-for-duplicate-field fields k)
- (generic-info-for-missing-key k)))
+ (generic-info-for-missing-key k initial-values)))
(defn- add-unknown-fields-if-needed
"When create info maps for any fields we didn't expect to come back from the query.
Ideally, this should never happen, but on the off chance it does we still want to return it in the results."
- [actual-keys fields]
+ [actual-keys initial-rows fields]
{:pre [(set? actual-keys) (every? keyword? actual-keys)]}
(let [expected-keys (u/prog1 (set (map :field-name fields))
(assert (every? keyword? <>)))
@@ -175,7 +178,7 @@
(log/warn (u/format-color 'yellow "There are fields we weren't expecting in the results: %s\nExpected: %s\nActual: %s"
missing-keys expected-keys actual-keys)))
(concat fields (for [k missing-keys]
- (info-for-missing-key fields k)))))
+ (info-for-missing-key fields k (map k initial-rows))))))
(defn- convert-field-to-expected-format
"Rename keys, provide default values, etc. for FIELD so it is in the format expected by the frontend."
@@ -238,14 +241,14 @@
(defn- resolve-sort-and-format-columns
"Collect the Fields referenced in QUERY, sort them according to the rules at the top
of this page, format them as expected by the frontend, and return the results."
- [query result-keys]
+ [query result-keys initial-rows]
{:pre [(set? result-keys)]}
(when (seq result-keys)
(->> (collect-fields (dissoc query :expressions))
(map qualify-field-name)
(add-aggregate-fields-if-needed query)
(map (u/rpartial update :field-name keyword))
- (add-unknown-fields-if-needed result-keys)
+ (add-unknown-fields-if-needed result-keys initial-rows)
(sort/sort-fields query)
(map convert-field-to-expected-format)
(filter (comp (partial contains? result-keys) :name))
@@ -261,7 +264,7 @@
[query {:keys [columns rows], :as results}]
(let [row-maps (for [row rows]
(zipmap columns row))
- cols (resolve-sort-and-format-columns (:query query) (set columns))
+ cols (resolve-sort-and-format-columns (:query query) (set columns) (take 10 row-maps))
columns (mapv :name cols)]
(assoc results
:cols (vec (for [col cols]
diff --git a/src/metabase/query_processor/expand.clj b/src/metabase/query_processor/expand.clj
index a6a1d3c7bc8db4c8efebcfa0dd683ba1ab1b6191..97d22d5bc9a0a8d372d610c86f29b8393b6a6a32 100644
--- a/src/metabase/query_processor/expand.clj
+++ b/src/metabase/query_processor/expand.clj
@@ -2,25 +2,16 @@
"Converts a Query Dict as received by the API into an *expanded* one that contains extra information that will be needed to
construct the appropriate native Query, and perform various post-processing steps such as Field ordering."
(:refer-clojure :exclude [< <= > >= = != and or not filter count distinct sum min max + - / *])
- (:require [clojure
- [core :as core]
- [string :as str]]
+ (:require [clojure.core :as core]
[clojure.tools.logging :as log]
- [metabase.query-processor.interface :as i]
+ [metabase.query-processor
+ [interface :as i]
+ [util :as qputil]]
[metabase.util :as u]
[metabase.util.schema :as su]
[schema.core :as s])
- (:import [metabase.query_processor.interface AgFieldRef BetweenFilter ComparisonFilter CompoundFilter Expression ExpressionRef FieldPlaceholder RelativeDatetime StringFilter ValuePlaceholder]))
-
-;;; # ------------------------------------------------------------ Token dispatch ------------------------------------------------------------
-
-(s/defn ^:always-validate normalize-token :- s/Keyword
- "Convert a string or keyword in various cases (`lisp-case`, `snake_case`, or `SCREAMING_SNAKE_CASE`) to a lisp-cased keyword."
- [token :- su/KeywordOrString]
- (-> (name token)
- str/lower-case
- (str/replace #"_" "-")
- keyword))
+ (:import [metabase.query_processor.interface AgFieldRef BetweenFilter ComparisonFilter CompoundFilter Expression ExpressionRef
+ FieldPlaceholder RelativeDatetime StringFilter Value ValuePlaceholder]))
;;; # ------------------------------------------------------------ Clause Handlers ------------------------------------------------------------
@@ -38,7 +29,7 @@
[id :- su/IntGreaterThanZero]
(i/map->FieldPlaceholder {:field-id id}))
-(s/defn ^:private ^:always-validate field :- i/AnyFieldOrExpression
+(s/defn ^:private ^:always-validate field :- i/AnyField
"Generic reference to a `Field`. F can be an integer Field ID, or various other forms like `fk->` or `aggregation`."
[f]
(if (integer? f)
@@ -58,7 +49,7 @@
([f _ unit] (log/warn (u/format-color 'yellow (str "The syntax for datetime-field has changed in MBQL '98. [:datetime-field <field> :as <unit>] is deprecated. "
"Prefer [:datetime-field <field> <unit>] instead.")))
(datetime-field f unit))
- ([f unit] (assoc (field f) :datetime-unit (normalize-token unit))))
+ ([f unit] (assoc (field f) :datetime-unit (qputil/normalize-token unit))))
(s/defn ^:ql ^:always-validate fk-> :- FieldPlaceholder
"Reference to a `Field` that belongs to another `Table`. DEST-FIELD-ID is the ID of this Field, and FK-FIELD-ID is the ID of the foreign key field
@@ -72,11 +63,12 @@
(i/map->FieldPlaceholder {:fk-field-id fk-field-id, :field-id dest-field-id}))
-(s/defn ^:private ^:always-validate value :- ValuePlaceholder
+(s/defn ^:private ^:always-validate value :- (s/cond-pre Value ValuePlaceholder)
"Literal value. F is the `Field` it relates to, and V is `nil`, or a boolean, string, numerical, or datetime value."
[f v]
(cond
(instance? ValuePlaceholder v) v
+ (instance? Value v) v
:else (i/map->ValuePlaceholder {:field-placeholder (field f), :value v})))
(s/defn ^:private ^:always-validate field-or-value
@@ -94,11 +86,11 @@
(relative-datetime :current)
(relative-datetime -31 :day)"
- ([n] (s/validate (s/eq :current) (normalize-token n))
+ ([n] (s/validate (s/eq :current) (qputil/normalize-token n))
(relative-datetime 0 nil))
([n :- s/Int, unit] (i/map->RelativeDatetime {:amount n, :unit (if (nil? unit)
:day ; give :unit a default value so we can simplify the schema a bit and require a :unit
- (normalize-token unit))})))
+ (qputil/normalize-token unit))})))
(s/defn ^:ql ^:always-validate expression :- ExpressionRef
{:added "0.17.0"}
@@ -170,8 +162,8 @@
;; make sure the ag map is still typed correctly
(u/prog1 (cond
(:operator ag) (i/map->Expression ag)
- (:field ag) (i/map->AggregationWithField (update ag :aggregation-type normalize-token))
- :else (i/map->AggregationWithoutField (update ag :aggregation-type normalize-token)))
+ (:field ag) (i/map->AggregationWithField (update ag :aggregation-type qputil/normalize-token))
+ :else (i/map->AggregationWithoutField (update ag :aggregation-type qputil/normalize-token)))
(s/validate i/Aggregation <>)))))))
;; also handle varargs for convenience
@@ -288,7 +280,7 @@
(filter {} (time-interval (field-id 100) :current :day)) "
[f n unit]
(if-not (integer? n)
- (case (normalize-token n)
+ (case (qputil/normalize-token n)
:current (recur f 0 unit)
:last (recur f -1 unit)
:next (recur f 1 unit))
@@ -353,7 +345,7 @@
(map? subclause) subclause ; already parsed by `asc` or `desc`
(vector? subclause) (let [[f direction] subclause]
(log/warn (u/format-color 'yellow "The syntax for order-by has changed in MBQL '98. [<field> :ascending/:descending] is deprecated. Prefer [:asc/:desc <field>] instead."))
- (order-by-subclause (normalize-token direction) f))))
+ (order-by-subclause (qputil/normalize-token direction) f))))
(defn ^:ql order-by
"Specify how ordering should be done for this query.
@@ -432,7 +424,7 @@
(fn-for-token :starts-with) -> #'starts-with"
[token]
- (let [token (normalize-token token)]
+ (let [token (qputil/normalize-token token)]
(core/or (token->ql-fn token)
(throw (Exception. (str "Illegal clause (no matching fn found): " token))))))
@@ -506,4 +498,4 @@
(is-clause? :field-id [\"FIELD-ID\" 2000]) ; -> true"
[clause-keyword clause]
(core/and (sequential? clause)
- (core/= (normalize-token (first clause)) clause-keyword)))
+ (core/= (qputil/normalize-token (first clause)) clause-keyword)))
diff --git a/src/metabase/query_processor/interface.clj b/src/metabase/query_processor/interface.clj
index 05397e945ad9f5d7f28868ee2469e99540cca81a..c2aa5bee4fcdd20904c9fcf9a6d568332c1fe420 100644
--- a/src/metabase/query_processor/interface.clj
+++ b/src/metabase/query_processor/interface.clj
@@ -33,13 +33,21 @@
Not neccesarily bound when using various functions like `fk->` in the REPL."
nil)
+(defn driver-supports?
+ "Does the currently bound `*driver*` support FEATURE?
+ (This returns `nil` if `*driver*` is unbound. `*driver*` is always bound when running queries the normal way,
+ but may not be when calling this function directly from the REPL.)"
+ [feature]
+ (when *driver*
+ ((resolve 'metabase.driver/driver-supports?) *driver* feature)))
+
;; `assert-driver-supports` doesn't run check when `*driver*` is unbound (e.g., when used in the REPL)
;; Allows flexibility when composing queries for tests or interactive development
(defn assert-driver-supports
"When `*driver*` is bound, assert that is supports keyword FEATURE."
[feature]
(when *driver*
- (when-not (contains? ((resolve 'metabase.driver/features) *driver*) feature)
+ (when-not (driver-supports? feature)
(throw (Exception. (str (name feature) " is not supported by this driver."))))))
;; Expansion Happens in a Few Stages:
@@ -70,9 +78,11 @@
"Return a vector of name components of the form `[table-name parent-names... field-name]`"))
-;;; # ------------------------------------------------------------ "RESOLVED" TYPES: FIELD + VALUE ------------------------------------------------------------
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
+;;; | FIELDS |
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-;; Field is the expansion of a Field ID in the standard QL
+;; Field is the "expanded" form of a Field ID (field reference) in MBQL
(s/defrecord Field [field-id :- su/IntGreaterThanZero
field-name :- su/NonBlankString
field-display-name :- su/NonBlankString
@@ -98,6 +108,7 @@
[table-name])
field-name)))
+;;; DateTimeField
(def ^:const datetime-field-units
"Valid units for a `DateTimeField`."
@@ -122,7 +133,7 @@
(contains? relative-datetime-value-units (keyword unit)))
-;; wrapper around Field
+;; DateTimeField is just a simple wrapper around Field
(s/defrecord DateTimeField [field :- Field
unit :- DatetimeFieldUnit]
clojure.lang.Named
@@ -136,78 +147,53 @@
[nil expression-name]))
-;; Value is the expansion of a value within a QL clause
-;; Information about the associated Field is included for convenience
-(s/defrecord Value [value :- (s/maybe (s/cond-pre s/Bool s/Num su/NonBlankString))
- field :- (s/named (s/cond-pre Field ExpressionRef) ; TODO - Value doesn't need the whole field, just the relevant type info / units
- "field or expression reference")])
-
-;; e.g. an absolute point in time (literal)
-(s/defrecord DateTimeValue [value :- Timestamp
- field :- DateTimeField])
-
-(s/defrecord RelativeDateTimeValue [amount :- s/Int
- unit :- DatetimeValueUnit
- field :- DateTimeField])
-
-(defprotocol ^:private IDateTimeValue
- (unit [this]
- "Get the `unit` associated with a `DateTimeValue` or `RelativeDateTimeValue`.")
-
- (add-date-time-units [this n]
- "Return a new `DateTimeValue` or `RelativeDateTimeValue` with N `units` added to it."))
-
-(extend-protocol IDateTimeValue
- DateTimeValue
- (unit [this] (:unit (:field this)))
- (add-date-time-units [this n] (assoc this :value (u/relative-date (unit this) n (:value this))))
-
- RelativeDateTimeValue
- (unit [this] (:unit this))
- (add-date-time-units [this n] (update this :amount (partial + n))))
-
-
-;;; # ------------------------------------------------------------ PLACEHOLDER TYPES: FIELDPLACEHOLDER + VALUEPLACEHOLDER ------------------------------------------------------------
+;;; Placeholder Types
;; Replace Field IDs with these during first pass
(s/defrecord FieldPlaceholder [field-id :- su/IntGreaterThanZero
fk-field-id :- (s/maybe (s/constrained su/IntGreaterThanZero
- (fn [_] (or (assert-driver-supports :foreign-keys) true))
- "foreign-keys is not supported by this driver."))
+ (fn [_] (or (assert-driver-supports :foreign-keys) true)) ; assert-driver-supports will throw Exception if driver is bound
+ "foreign-keys is not supported by this driver.")) ; and driver does not support foreign keys
datetime-unit :- (s/maybe (apply s/enum datetime-field-units))])
(s/defrecord AgFieldRef [index :- s/Int])
-
;; TODO - add a method to get matching expression from the query?
-(def FieldPlaceholderOrAgRef
- "Schema for either a `FieldPlaceholder` or `AgFieldRef`."
- (s/named (s/cond-pre FieldPlaceholder AgFieldRef) "Valid field (not a field ID or aggregate field reference)"))
+
+
(def FieldPlaceholderOrExpressionRef
"Schema for either a `FieldPlaceholder` or `ExpressionRef`."
(s/named (s/cond-pre FieldPlaceholder ExpressionRef)
"Valid field or expression reference."))
-
(s/defrecord RelativeDatetime [amount :- s/Int
unit :- DatetimeValueUnit])
-
-(declare RValue Aggregation)
+(declare Aggregation AnyField AnyValueLiteral)
(def ^:private ExpressionOperator (s/named (s/enum :+ :- :* :/) "Valid expression operator"))
(s/defrecord Expression [operator :- ExpressionOperator
- args :- [(s/cond-pre (s/recursive #'RValue)
+ args :- [(s/cond-pre (s/recursive #'AnyValueLiteral)
+ (s/recursive #'AnyField)
(s/recursive #'Aggregation))]
custom-name :- (s/maybe su/NonBlankString)])
-(def AnyFieldOrExpression
- "Schema for a `FieldPlaceholder`, `AgRef`, or `Expression`."
- (s/named (s/cond-pre ExpressionRef Expression FieldPlaceholderOrAgRef)
- "Valid field, ag field reference, expression, or expression reference."))
+(def AnyField
+ "Schema for a anything that is considered a valid 'field'."
+ (s/named (s/cond-pre Field
+ FieldPlaceholder
+ AgFieldRef
+ Expression
+ ExpressionRef)
+ "AnyField: field, ag field reference, expression, expression reference, or field literal."))
+
+
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
+;;; | VALUES |
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
(def LiteralDatetimeString
"Schema for an MBQL datetime string literal, in ISO-8601 format."
@@ -225,14 +211,48 @@
"Schema for something that is orderable value in MBQL (either a number or datetime)."
(s/named (s/cond-pre s/Num Datetime) "Valid orderable value (must be number or datetime)"))
-(def AnyValue
- "Schema for anything that is a considered a valid value in MBQL - `nil`, a `Boolean`, `Number`, `String`, or relative datetime form."
+(def AnyValueLiteral
+ "Schema for anything that is a considered a valid value literal in MBQL - `nil`, a `Boolean`, `Number`, `String`, or relative datetime form."
(s/named (s/maybe (s/cond-pre s/Bool su/NonBlankString OrderableValue)) "Valid value (must be nil, boolean, number, string, or a relative-datetime form)"))
+
+;; Value is the expansion of a value within a QL clause
+;; Information about the associated Field is included for convenience
+;; TODO - Value doesn't need the whole field, just the relevant type info / units
+(s/defrecord Value [value :- AnyValueLiteral
+ field :- (s/recursive #'AnyField)])
+
+;; e.g. an absolute point in time (literal)
+(s/defrecord DateTimeValue [value :- Timestamp
+ field :- DateTimeField])
+
+(s/defrecord RelativeDateTimeValue [amount :- s/Int
+ unit :- DatetimeValueUnit
+ field :- DateTimeField])
+
+(defprotocol ^:private IDateTimeValue
+ (unit [this]
+ "Get the `unit` associated with a `DateTimeValue` or `RelativeDateTimeValue`.")
+
+ (add-date-time-units [this n]
+ "Return a new `DateTimeValue` or `RelativeDateTimeValue` with N `units` added to it."))
+
+(extend-protocol IDateTimeValue
+ DateTimeValue
+ (unit [this] (:unit (:field this)))
+ (add-date-time-units [this n] (assoc this :value (u/relative-date (unit this) n (:value this))))
+
+ RelativeDateTimeValue
+ (unit [this] (:unit this))
+ (add-date-time-units [this n] (update this :amount (partial + n))))
+
+
+;;; Placeholder Types
+
;; Replace values with these during first pass over Query.
;; Include associated Field ID so appropriate the info can be found during Field resolution
(s/defrecord ValuePlaceholder [field-placeholder :- FieldPlaceholderOrExpressionRef
- value :- AnyValue])
+ value :- AnyValueLiteral])
(def OrderableValuePlaceholder
"`ValuePlaceholder` schema with the additional constraint that the value be orderable (a number or datetime)."
@@ -242,21 +262,16 @@
"`ValuePlaceholder` schema with the additional constraint that the value be a string/"
(s/constrained ValuePlaceholder (comp string? :value) ":value must be a string"))
-(def FieldOrAnyValue
- "Schema that accepts either a `FieldPlaceholder` or `ValuePlaceholder`."
- (s/named (s/cond-pre FieldPlaceholder ValuePlaceholder) "Field or value"))
-
-;; (def FieldOrOrderableValue (s/named (s/cond-pre FieldPlaceholder OrderableValuePlaceholder) "Field or orderable value (number or datetime)"))
-;; (def FieldOrStringValue (s/named (s/cond-pre FieldPlaceholder StringValuePlaceholder) "Field or string literal"))
+(def AnyFieldOrValue
+ "Schema that accepts anything normally considered a field (including expressions and literals) *or* a value or value placehoder."
+ (s/named (s/cond-pre AnyField Value ValuePlaceholder) "Field or value"))
-(def RValue
- "Schema for anything that can be an [RValue](https://github.com/metabase/metabase/wiki/Query-Language-'98#rvalues) -
- a `Field`, `Value`, or `Expression`."
- (s/named (s/cond-pre AnyValue FieldPlaceholderOrExpressionRef Expression)
- "RValue"))
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
+;;; | CLAUSES |
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
-;;; # ------------------------------------------------------------ CLAUSE SCHEMAS ------------------------------------------------------------
+;;; aggregation
(s/defrecord AggregationWithoutField [aggregation-type :- (s/named (s/enum :count :cumulative-count)
"Valid aggregation type")
@@ -281,9 +296,11 @@
"standard-deviation-aggregations is not supported by this driver."))
+;;; filter
+
(s/defrecord EqualityFilter [filter-type :- (s/enum := :!=)
field :- FieldPlaceholderOrExpressionRef
- value :- FieldOrAnyValue])
+ value :- AnyFieldOrValue])
(s/defrecord ComparisonFilter [filter-type :- (s/enum :< :<= :> :>=)
field :- FieldPlaceholderOrExpressionRef
@@ -316,28 +333,38 @@
(s/named (s/cond-pre SimpleFilterClause NotFilter CompoundFilter)
"Valid filter clause"))
+
+;;; order-by
+
(def OrderByDirection
"Schema for the direction in an `OrderBy` subclause."
(s/named (s/enum :ascending :descending) "Valid order-by direction"))
(def OrderBy
"Schema for top-level `order-by` clause in an MBQL query."
- (s/named {:field AnyFieldOrExpression
+ (s/named {:field AnyField
:direction OrderByDirection}
"Valid order-by subclause"))
+;;; page
+
(def Page
"Schema for the top-level `page` clause in a MBQL query."
(s/named {:page su/IntGreaterThanZero
:items su/IntGreaterThanZero}
"Valid page clause"))
+
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
+;;; | QUERY |
+;;; +----------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
(def Query
"Schema for an MBQL query."
{(s/optional-key :aggregation) [Aggregation]
(s/optional-key :breakout) [FieldPlaceholderOrExpressionRef]
- (s/optional-key :fields) [AnyFieldOrExpression]
+ (s/optional-key :fields) [AnyField]
(s/optional-key :filter) Filter
(s/optional-key :limit) su/IntGreaterThanZero
(s/optional-key :order-by) [OrderBy]
diff --git a/src/metabase/query_processor/middleware/permissions.clj b/src/metabase/query_processor/middleware/permissions.clj
index e4c32e1b8c43c9c93e4394fe08eb2f360bc8dbf2..61cccf4a5d02f95d50b7c372c3ff112890ecbf22 100644
--- a/src/metabase/query_processor/middleware/permissions.clj
+++ b/src/metabase/query_processor/middleware/permissions.clj
@@ -5,12 +5,14 @@
[metabase.util :as u]))
(defn- check-query-permissions* [query]
- ;; TODO - should we do anything if there is no *current-user-id* (for something like a pulse?)
(u/prog1 query
(when *current-user-id*
(perms/check-query-permissions *current-user-id* query))))
(defn check-query-permissions
- "Middleware that check that the current user has permissions to run the current query."
+ "Middleware that check that the current user has permissions to run the current query.
+ This only applies if `*current-user-id*` is bound. In other cases, like when running
+ public Cards or sending pulses, permissions need to be checked separately before allowing
+ the relevant objects to be create (e.g., when saving a new Pulse or 'publishing' a Card)."
[qp]
(comp qp check-query-permissions*))
diff --git a/src/metabase/query_processor/permissions.clj b/src/metabase/query_processor/permissions.clj
index 5dd16462d78d2b1b618fb25cbe38cd50545cd68c..bbf2a888d435edb628c84e99f82c124eb27717b0 100644
--- a/src/metabase/query_processor/permissions.clj
+++ b/src/metabase/query_processor/permissions.clj
@@ -62,6 +62,7 @@
(defn- ^:deprecated table-id [source-or-join-table]
+ {:post [(integer? %)]}
(or (:id source-or-join-table)
(:table-id source-or-join-table)))
@@ -75,6 +76,7 @@
(or (user-can-run-query-referencing-table? user-id (table-id table))
(throw-permissions-exception "You do not have permissions to run queries referencing table '%s'." (table-identifier table))))
+;; TODO - why is this the only function here that takes `user-id`?
(defn- throw-if-cannot-run-query
"Throw an exception if USER-ID doesn't have permissions to run QUERY."
[user-id {:keys [source-table join-tables]}]
@@ -118,8 +120,8 @@
(defn check-query-permissions
"Check that User with USER-ID has permissions to run QUERY, or throw an exception."
- [user-id {query-type :type, database :database, query :query, {card-id :card-id} :info}]
- {:pre [(integer? user-id)]}
+ [user-id {query-type :type, database :database, query :query, {card-id :card-id} :info, :as outer-query}]
+ {:pre [(integer? user-id) (map? outer-query)]}
(let [native? (= (keyword query-type) :native)
collection-id (db/select-one-field :collection_id 'Card :id card-id)]
(cond
diff --git a/src/metabase/query_processor/resolve.clj b/src/metabase/query_processor/resolve.clj
index 1d1747d15df622cbecd0e6ae2281097218a87285..33fcc695de7d22f22f57002f615b6123898b679d 100644
--- a/src/metabase/query_processor/resolve.clj
+++ b/src/metabase/query_processor/resolve.clj
@@ -194,7 +194,7 @@
;; Otherwise fetch + resolve the Fields in question
(let [fields (->> (u/key-by :id (db/select [field/Field :name :display_name :base_type :special_type :visibility_type :table_id :parent_id :description :id]
:visibility_type [:not= "sensitive"]
- :id [:in field-ids]))
+ :id [:in field-ids]))
(m/map-vals rename-mb-field-keys)
(m/map-vals #(assoc % :parent (when-let [parent-id (:parent-id %)]
(i/map->FieldPlaceholder {:field-id parent-id})))))]
@@ -207,7 +207,11 @@
;; Recurse in case any new (nested) unresolved fields were found.
(recur (dec max-iterations))))))))
-(defn- fk-field-ids->info [source-table-id fk-field-ids]
+(defn- fk-field-ids->info
+ "Given a SOURCE-TABLE-ID and collection of FK-FIELD-IDS, return a sequence of maps containing IDs and identifiers for those FK fields and their target tables and fields.
+ FK-FIELD-IDS are IDs of fields that belong to the source table. For example, SOURCE-TABLE-ID might be 'checkins' and FK-FIELD-IDS might have the IDs for 'checkins.user_id'
+ and the like."
+ [source-table-id fk-field-ids]
(when (seq fk-field-ids)
(db/query {:select [[:source-fk.name :source-field-name]
[:source-fk.id :source-field-id]
@@ -219,8 +223,8 @@
:from [[field/Field :source-fk]]
:left-join [[field/Field :target-pk] [:= :source-fk.fk_target_field_id :target-pk.id]
[Table :target-table] [:= :target-pk.table_id :target-table.id]]
- :where [:and [:in :source-fk.id (set fk-field-ids)]
- [:= :source-fk.table_id source-table-id]
+ :where [:and [:in :source-fk.id (set fk-field-ids)]
+ [:= :source-fk.table_id source-table-id]
(mdb/isa :source-fk.special_type :type/FK)]})))
(defn- fk-field-ids->joined-tables
diff --git a/src/metabase/query_processor/util.clj b/src/metabase/query_processor/util.clj
index 47f80946e2abff02fbc651b1287212716bfc57de..304527c8b2991153b26c81ec1ef879541da647d3 100644
--- a/src/metabase/query_processor/util.clj
+++ b/src/metabase/query_processor/util.clj
@@ -3,7 +3,11 @@
(:require [buddy.core
[codecs :as codecs]
[hash :as hash]]
- [cheshire.core :as json]))
+ [cheshire.core :as json]
+ [clojure.string :as str]
+ [metabase.util :as u]
+ [metabase.util.schema :as su]
+ [schema.core :as s]))
(defn mbql-query?
"Is the given query an MBQL query?"
@@ -33,6 +37,69 @@
(format ":: userID: %s queryType: %s queryHash: %s" executed-by query-type (codecs/bytes->hex query-hash)))))
+;;; ------------------------------------------------------------ Normalization ------------------------------------------------------------
+
+;; The following functions make it easier to deal with MBQL queries, which are case-insensitive, string/keyword insensitive, and underscore/hyphen insensitive.
+;; These should be preferred instead of assuming the frontend will always pass in clauses the same way, since different variation are all legal under MBQL '98.
+
+;; TODO - In the future it might make sense to simply walk the entire query and normalize the whole thing when it comes in. I've tried implementing middleware
+;; to do that but it ended up breaking a few things that wrongly assume different clauses will always use a certain case (e.g. SQL `:template_tags`). Fixing
+;; all of that is out-of-scope for the nested queries PR but should possibly be revisited in the future.
+
+(s/defn ^:always-validate normalize-token :- s/Keyword
+ "Convert a string or keyword in various cases (`lisp-case`, `snake_case`, or `SCREAMING_SNAKE_CASE`) to a lisp-cased keyword."
+ [token :- su/KeywordOrString]
+ (-> (name token)
+ str/lower-case
+ (str/replace #"_" "-")
+ keyword))
+
+(defn get-normalized
+ "Get the value for normalized key K in map M, regardless of how the key was specified in M,
+ whether string or keyword, lisp-case, snake_case, or SCREAMING_SNAKE_CASE.
+
+ (get-normalized {\"NUM_TOUCANS\" 2} :num-toucans) ; -> 2"
+ ([m k]
+ {:pre [(or (u/maybe? map? m)
+ (println "Not a map:" m))]}
+ (let [k (normalize-token k)]
+ (some (fn [[map-k v]]
+ (when (= k (normalize-token map-k))
+ v))
+ m)))
+ ([m k not-found]
+ (or (get-normalized m k)
+ not-found)))
+
+(defn get-in-normalized
+ "Like `get-normalized`, but accepts a sequence of keys KS, like `get-in`.
+
+ (get-in-normalized {\"NUM_BIRDS\" {\"TOUCANS\" 2}} [:num-birds :toucans]) ; -> 2"
+ ([m ks]
+ {:pre [(u/maybe? sequential? ks)]}
+ (loop [m m, [k & more] ks]
+ (if-not k
+ m
+ (recur (get-normalized m k) more))))
+ ([m ks not-found]
+ (or (get-in-normalized m ks)
+ not-found)))
+
+(defn dissoc-normalized
+ "Remove all matching keys from map M regardless of case, string/keyword, or hypens/underscores.
+
+ (dissoc-normalized {\"NUM_TOUCANS\" 3} :num-toucans) ; -> {}"
+ [m k]
+ {:pre [(or (u/maybe? map? m)
+ (println "Not a map:" m))]}
+ (let [k (normalize-token k)]
+ (loop [m m, [map-k & more, :as ks] (keys m)]
+ (cond
+ (not (seq ks)) m
+ (= k (normalize-token map-k)) (recur (dissoc m map-k) more)
+ :else (recur m more)))))
+
+
;;; ------------------------------------------------------------ Hashing ------------------------------------------------------------
(defn- select-keys-for-hashing
diff --git a/src/metabase/routes.clj b/src/metabase/routes.clj
index bfd8eb001f4efba61ccb817cc2f946de868f3f8a..469c73e3002cc7741c7cc8820ac843c87acb46fa 100644
--- a/src/metabase/routes.clj
+++ b/src/metabase/routes.clj
@@ -1,6 +1,7 @@
(ns metabase.routes
(:require [cheshire.core :as json]
[clojure.java.io :as io]
+ [clojure.string :as str]
[compojure
[core :refer [context defroutes GET]]
[route :as route]]
@@ -15,6 +16,14 @@
[ring.util.response :as resp]
[stencil.core :as stencil]))
+(defn- base-href []
+ (str (.getPath (io/as-url (public-settings/site-url))) "/"))
+
+(defn- escape-script [s]
+ ;; Escapes text to be included in an inline <script> tag, in particular the string '</script'
+ ;; https://stackoverflow.com/questions/14780858/escape-in-script-tag-contents/23983448#23983448
+ (str/replace s #"</script" "</scr\\\\ipt"))
+
(defn- load-file-at-path [path]
(slurp (or (io/resource path)
(throw (Exception. (str "Cannot find '" path "'. Did you remember to build the Metabase frontend?"))))))
@@ -25,7 +34,9 @@
(defn- entrypoint [entry embeddable? {:keys [uri]}]
(-> (if (init-status/complete?)
(load-template (str "frontend_client/" entry ".html")
- {:bootstrap_json (json/generate-string (public-settings/public-settings))
+ {:bootstrap_json (escape-script (json/generate-string (public-settings/public-settings)))
+ :uri (escape-script (json/generate-string uri))
+ :base_href (escape-script (json/generate-string (base-href)))
:embed_code (when embeddable? (embed/head uri))})
(load-file-at-path "frontend_client/init.html"))
resp/response
diff --git a/src/metabase/sync_database/analyze.clj b/src/metabase/sync_database/analyze.clj
index 87985f8b62283d70ebda6a42180d0b3e6a0fdefa..8881ba24d65522e8bac4223f19a0b242d2bd43fa 100644
--- a/src/metabase/sync_database/analyze.clj
+++ b/src/metabase/sync_database/analyze.clj
@@ -44,7 +44,7 @@
(try
(queries/table-row-count table)
(catch Throwable e
- (log/error (u/format-color 'red "Unable to determine row count for '%s': %s\n%s" (:name table) (.getMessage e) (u/pprint-to-str (u/filtered-stacktrace e)))))))
+ (log/warn (u/format-color 'red "Unable to determine row count for '%s': %s\n%s" (:name table) (.getMessage e) (u/pprint-to-str (u/filtered-stacktrace e)))))))
(defn test-for-cardinality?
"Should FIELD should be tested for cardinality?"
diff --git a/src/metabase/util/honeysql_extensions.clj b/src/metabase/util/honeysql_extensions.clj
index 70bfe6de28eaa0af1de1aae991c085fa5f54f685..2b08b2a006c3e7af4f63ae30e15d199a49183d5a 100644
--- a/src/metabase/util/honeysql_extensions.clj
+++ b/src/metabase/util/honeysql_extensions.clj
@@ -84,6 +84,7 @@
(rest sql-string-or-vector))))))
+;; Single-quoted string literal
(defrecord Literal [literal]
ToSql
(to-sql [_]
diff --git a/test/metabase/api/geojson_test.clj b/test/metabase/api/geojson_test.clj
index ad30b2e38fc4222169e7c4c874fc5fffd8c90018..72a6d767b7f61681b2b1886fb11f117be0972440 100644
--- a/test/metabase/api/geojson_test.clj
+++ b/test/metabase/api/geojson_test.clj
@@ -31,7 +31,7 @@
;;; test valid-json-resource?
(expect
- (valid-json-resource? "/app/charts/us-states.json"))
+ (valid-json-resource? "app/assets/geojson/us-states.json"))
;;; test the CustomGeoJSON schema
diff --git a/test/metabase/http_client.clj b/test/metabase/http_client.clj
index 8324c12a618f39b3f284c2908aab2b54df5e6561..b16790230d69800d76db42b769cca561eeb139bc 100644
--- a/test/metabase/http_client.clj
+++ b/test/metabase/http_client.clj
@@ -67,7 +67,6 @@
or throw an Exception if that fails."
[{:keys [email password], :as credentials}]
{:pre [(string? email) (string? password)]}
- (println "Authenticating" email) ; DEBUG
(try
(:id (client :post 200 "session" credentials))
(catch Throwable e
diff --git a/test/metabase/middleware_test.clj b/test/metabase/middleware_test.clj
index e67b97392181bfdeaf83a484eb69696b59158206..90175af670f6a37eb34c3cf14472ce4a174e0676 100644
--- a/test/metabase/middleware_test.clj
+++ b/test/metabase/middleware_test.clj
@@ -1,13 +1,20 @@
(ns metabase.middleware-test
(:require [cheshire.core :as json]
+ [clojure.core.async :as async]
+ [clojure.java.io :as io]
+ [clojure.tools.logging :as log]
+ [compojure.core :refer [GET]]
[expectations :refer :all]
[metabase
- [middleware :refer :all]
+ [config :as config]
+ [middleware :as middleware :refer :all]
+ [routes :as routes]
[util :as u]]
[metabase.api.common :refer [*current-user* *current-user-id*]]
[metabase.models.session :refer [Session]]
[metabase.test.data.users :refer :all]
[ring.mock.request :as mock]
+ [ring.util.response :as resp]
[toucan.db :as db]))
;; =========================== TEST wrap-session-id middleware ===========================
@@ -176,3 +183,95 @@
(expect "{\"my-bytes\":\"0xC42360D7\"}"
(json/generate-string {:my-bytes (byte-array [196 35 96 215 8 106 108 248 183 215 244 143 17 160 53 186
213 30 116 25 87 31 123 172 207 108 47 107 191 215 76 92])}))
+;;; stuff here
+
+(defn- streaming-fast-success [_]
+ (resp/response {:success true}))
+
+(defn- streaming-fast-failure [_]
+ (throw (Exception. "immediate failure")))
+
+(defn- streaming-slow-success [_]
+ (Thread/sleep 7000)
+ (resp/response {:success true}))
+
+(defn- streaming-slow-failure [_]
+ (Thread/sleep 7000)
+ (throw (Exception. "delayed failure")))
+
+(defn- test-streaming-endpoint [handler]
+ (let [path (str handler)]
+ (with-redefs [metabase.routes/routes (compojure.core/routes
+ (GET (str "/" path) [] (middleware/streaming-json-response
+ handler)))]
+ (let [connection (async/chan 1000)
+ reader (io/input-stream (str "http://localhost:" (config/config-int :mb-jetty-port) "/" path))]
+ (async/go-loop [next-char (.read reader)]
+ (if (pos? next-char)
+ (do
+ (async/>! connection (char next-char))
+ (recur (.read reader)))
+ (async/close! connection)))
+ (let [_ (Thread/sleep 1500)
+ first-second (async/poll! connection)
+ _ (Thread/sleep 1000)
+ second-second (async/poll! connection)
+ eventually (apply str (async/<!! (async/into [] connection)))]
+ [first-second second-second eventually])))))
+
+
+;;slow success
+(expect
+ [\newline \newline "\n\n\n{\"success\":true}"]
+ (test-streaming-endpoint streaming-slow-success))
+
+;; immediate success should have no padding
+(expect
+ [\{ \" "success\":true}"]
+ (test-streaming-endpoint streaming-fast-success))
+
+;; we know delayed failures (exception thrown) will just drop the connection
+(expect
+ [\newline \newline "\n\n\n"]
+ (test-streaming-endpoint streaming-slow-failure))
+
+;; immediate failures (where an exception is thown will return a 500
+(expect
+ #"Server returned HTTP response code: 500 for URL:.*"
+ (try
+ (test-streaming-endpoint streaming-fast-failure)
+ (catch java.io.IOException e
+ (.getMessage e))))
+
+;; test that handler is killed when connection closes
+(def test-slow-handler-state (atom :unset))
+
+(defn- test-slow-handler [_]
+ (log/debug (u/format-color 'yellow "starting test-slow-handler"))
+ (Thread/sleep 7000) ;; this is somewhat long to make sure the keepalive polling has time to kill it.
+ (reset! test-slow-handler-state :ran-to-compleation)
+ (log/debug (u/format-color 'yellow "finished test-slow-handler"))
+ (resp/response {:success true}))
+
+(defn- start-and-maybe-kill-test-request [kill?]
+ (reset! test-slow-handler-state :initial-state)
+ (let [path "test-slow-handler"]
+ (with-redefs [metabase.routes/routes (compojure.core/routes
+ (GET (str "/" path) [] (middleware/streaming-json-response
+ test-slow-handler)))]
+ (let [reader (io/input-stream (str "http://localhost:" (config/config-int :mb-jetty-port) "/" path))]
+ (Thread/sleep 1500)
+ (when kill?
+ (.close reader))
+ (Thread/sleep 10000)))) ;; this is long enough to ensure that the handler has run to completion if it was not killed.
+ @test-slow-handler-state)
+
+;; In this first test we will close the connection before the test handler gets to change the state
+(expect
+ :initial-state
+ (start-and-maybe-kill-test-request true))
+
+;; and to make sure this test actually works, run the same test again and let it change the state.
+(expect
+ :ran-to-compleation
+ (start-and-maybe-kill-test-request false))
diff --git a/test/metabase/models/card_test.clj b/test/metabase/models/card_test.clj
index 3f6cb57eddcb316acca67407fbcd5ade8f251864..0d7fc226e149a9d3122a0b6293c5e14053d1a114 100644
--- a/test/metabase/models/card_test.clj
+++ b/test/metabase/models/card_test.clj
@@ -9,8 +9,8 @@
[permissions :as perms]]
[metabase.query-processor.expand :as ql]
[metabase.test
- [data :refer [id]]
- [util :as tu :refer [random-name]]]
+ [data :as data]
+ [util :as tu]]
[metabase.test.data.users :refer :all]
[metabase.util :as u]
[toucan.db :as db]
@@ -26,9 +26,9 @@
(let [get-dashboard-count (fn [] (dashboard-count (Card card-id)))]
[(get-dashboard-count)
- (do (db/insert! DashboardCard :card_id card-id, :dashboard_id (:id (create-dash! (random-name))), :parameter_mappings [])
+ (do (db/insert! DashboardCard :card_id card-id, :dashboard_id (:id (create-dash! (tu/random-name))), :parameter_mappings [])
(get-dashboard-count))
- (do (db/insert! DashboardCard :card_id card-id, :dashboard_id (:id (create-dash! (random-name))), :parameter_mappings [])
+ (do (db/insert! DashboardCard :card_id card-id, :dashboard_id (:id (create-dash! (tu/random-name))), :parameter_mappings [])
(get-dashboard-count))])))
@@ -60,25 +60,25 @@
(expect
false
- (tt/with-temp Card [card {:dataset_query {:database (id), :type "native"}}]
+ (tt/with-temp Card [card {:dataset_query {:database (data/id), :type "native"}}]
(binding [*current-user-permissions-set* (delay #{})]
(mi/can-read? card))))
(expect
- (tt/with-temp Card [card {:dataset_query {:database (id), :type "native"}}]
- (binding [*current-user-permissions-set* (delay #{(perms/native-read-path (id))})]
+ (tt/with-temp Card [card {:dataset_query {:database (data/id), :type "native"}}]
+ (binding [*current-user-permissions-set* (delay #{(perms/native-read-path (data/id))})]
(mi/can-read? card))))
;; in order to *write* a native card user should need native readwrite access
(expect
false
- (tt/with-temp Card [card {:dataset_query {:database (id), :type "native"}}]
- (binding [*current-user-permissions-set* (delay #{(perms/native-read-path (id))})]
+ (tt/with-temp Card [card {:dataset_query {:database (data/id), :type "native"}}]
+ (binding [*current-user-permissions-set* (delay #{(perms/native-read-path (data/id))})]
(mi/can-write? card))))
(expect
- (tt/with-temp Card [card {:dataset_query {:database (id), :type "native"}}]
- (binding [*current-user-permissions-set* (delay #{(perms/native-readwrite-path (id))})]
+ (tt/with-temp Card [card {:dataset_query {:database (data/id), :type "native"}}]
+ (binding [*current-user-permissions-set* (delay #{(perms/native-readwrite-path (data/id))})]
(mi/can-write? card))))
@@ -100,24 +100,24 @@
(defn- mbql [query]
- {:database (id)
+ {:database (data/id)
:type :query
:query query})
;; MBQL w/o JOIN
(expect
- #{(perms/object-path (id) "PUBLIC" (id :venues))}
+ #{(perms/object-path (data/id) "PUBLIC" (data/id :venues))}
(query-perms-set (mbql (ql/query
- (ql/source-table (id :venues))))
+ (ql/source-table (data/id :venues))))
:read))
;; MBQL w/ JOIN
(expect
- #{(perms/object-path (id) "PUBLIC" (id :checkins))
- (perms/object-path (id) "PUBLIC" (id :venues))}
+ #{(perms/object-path (data/id) "PUBLIC" (data/id :checkins))
+ (perms/object-path (data/id) "PUBLIC" (data/id :venues))}
(query-perms-set (mbql (ql/query
- (ql/source-table (id :checkins))
- (ql/order-by (ql/asc (ql/fk-> (id :checkins :venue_id) (id :venues :name))))))
+ (ql/source-table (data/id :checkins))
+ (ql/order-by (ql/asc (ql/fk-> (data/id :checkins :venue_id) (data/id :venues :name))))))
:read))
;; invalid/legacy card should return perms for something that doesn't exist so no one gets to see it
diff --git a/test/metabase/permissions_collection_test.clj b/test/metabase/permissions_collection_test.clj
index fec9b5777ecfe7888f3d879046745e689f52f1dc..77c78293e23804bbfd6c6fa94c9239d5f68902e5 100644
--- a/test/metabase/permissions_collection_test.clj
+++ b/test/metabase/permissions_collection_test.clj
@@ -18,9 +18,6 @@
;; but not Rasta (all-users)
(defn- api-call-was-successful? {:style/indent 0} [response]
- (when (and (string? response)
- (not= response "You don't have permissions to do that."))
- (println "RESPONSE:" response)) ; DEBUG
(and (not= response "You don't have permissions to do that.")
(not= response "Unauthenticated")))
diff --git a/test/metabase/permissions_test.clj b/test/metabase/permissions_test.clj
index 43262069da6ce9d416f0daa4a6bfb8b31ab421aa..5171091191b20c4c4f8b67275217dc3a378c1c1d 100644
--- a/test/metabase/permissions_test.clj
+++ b/test/metabase/permissions_test.clj
@@ -129,7 +129,7 @@
:table_id (u/get-id table)
:dataset_query {:database (u/get-id db)
:type "native"
- :query (format "SELECT count(*) FROM \"%s\";" (:name table))}}))
+ :native {:query (format "SELECT count(*) FROM \"%s\";" (:name table))}}}))
(def ^:dynamic *card:db1-count-of-venues*)
diff --git a/test/metabase/query_processor/util_test.clj b/test/metabase/query_processor/util_test.clj
index 357583558a259029c48d0101d354c459d7c69542..eea0cdd83e2330b1a3097b7e79db11fd24f8ab31 100644
--- a/test/metabase/query_processor/util_test.clj
+++ b/test/metabase/query_processor/util_test.clj
@@ -105,3 +105,53 @@
(qputil/query-hash {:database 2
:type "native"
:native {:query "SELECT pg_sleep(15), 2 AS two"}})))
+
+
+;;; ------------------------------------------------------------ Tests for get-normalized and get-in-normalized ------------------------------------------------------------
+
+(expect 2 (qputil/get-normalized {"num_toucans" 2} :num-toucans))
+(expect 2 (qputil/get-normalized {"NUM_TOUCANS" 2} :num-toucans))
+(expect 2 (qputil/get-normalized {"num-toucans" 2} :num-toucans))
+(expect 2 (qputil/get-normalized {:num_toucans 2} :num-toucans))
+(expect 2 (qputil/get-normalized {:NUM_TOUCANS 2} :num-toucans))
+(expect 2 (qputil/get-normalized {:num-toucans 2} :num-toucans))
+
+(expect
+ nil
+ (qputil/get-normalized nil :num-toucans))
+
+(expect 2 (qputil/get-in-normalized {"BIRDS" {"NUM_TOUCANS" 2}} [:birds :num-toucans]))
+(expect 2 (qputil/get-in-normalized {"birds" {"num_toucans" 2}} [:birds :num-toucans]))
+(expect 2 (qputil/get-in-normalized {"birds" {"num-toucans" 2}} [:birds :num-toucans]))
+(expect 2 (qputil/get-in-normalized {:BIRDS {:NUM_TOUCANS 2}} [:birds :num-toucans]))
+(expect 2 (qputil/get-in-normalized {:birds {:num_toucans 2}} [:birds :num-toucans]))
+(expect 2 (qputil/get-in-normalized {:birds {:num-toucans 2}} [:birds :num-toucans]))
+
+(expect
+ 2
+ (qputil/get-in-normalized {:num-toucans 2} [:num-toucans]))
+
+(expect
+ nil
+ (qputil/get-in-normalized nil [:birds :num-toucans]))
+
+(expect
+ 10
+ (qputil/get-in-normalized
+ {"dataset_query" {"query" {"source_table" 10}}}
+ [:dataset-query :query :source-table]))
+
+(expect {} (qputil/dissoc-normalized {"NUM_TOUCANS" 3} :num-toucans))
+(expect {} (qputil/dissoc-normalized {"num_toucans" 3} :num-toucans))
+(expect {} (qputil/dissoc-normalized {"num-toucans" 3} :num-toucans))
+(expect {} (qputil/dissoc-normalized {:NUM_TOUCANS 3} :num-toucans))
+(expect {} (qputil/dissoc-normalized {:num_toucans 3} :num-toucans))
+(expect {} (qputil/dissoc-normalized {:num-toucans 3} :num-toucans))
+
+(expect
+ {}
+ (qputil/dissoc-normalized {:num-toucans 3, "NUM_TOUCANS" 3, "num_toucans" 3} :num-toucans))
+
+(expect
+ nil
+ (qputil/dissoc-normalized nil :num-toucans))
diff --git a/test/metabase/test/data.clj b/test/metabase/test/data.clj
index a02c1905a37d7fed7afc45e0eea83370be57b0c1..867e0ea04402d8e9ccab401ccd09c2d99275ea7a 100644
--- a/test/metabase/test/data.clj
+++ b/test/metabase/test/data.clj
@@ -32,11 +32,14 @@
;; These functions offer a generic way to get bits of info like Table + Field IDs from any of our many driver/dataset combos.
(defn get-or-create-test-data-db!
- "Get or create the Test Data database for DATA-LOADER, which defaults to `*driver*`."
- ([] (get-or-create-test-data-db! *driver*))
- ([data-loader] (get-or-create-database! data-loader defs/test-data)))
+ "Get or create the Test Data database for DRIVER, which defaults to `*driver*`."
+ ([] (get-or-create-test-data-db! *driver*))
+ ([driver] (get-or-create-database! driver defs/test-data)))
-(def ^:dynamic ^:private *get-db* get-or-create-test-data-db!)
+(def ^:dynamic ^:private *get-db*
+ "Implementation of `db` function that should return the current working test database when called, always with no arguments.
+ By default, this is `get-or-create-test-data-db!` for the current `*driver*`, which does exactly what it suggests."
+ get-or-create-test-data-db!)
(defn db
"Return the current database.
@@ -54,8 +57,6 @@
[db & body]
`(do-with-db ~db (fn [] ~@body)))
-(defn- parts->id [table-name ])
-
(defn- $->id
"Convert symbols like `$field` to `id` fn calls. Input is split into separate args by splitting the token on `.`.
With no `.` delimiters, it is assumed we're referring to a Field belonging to TABLE-NAME, which is passed implicitly as the first arg.
@@ -119,7 +120,12 @@
`(run-query* (query ~table ~@forms)))
-(defn format-name [nm]
+(defn format-name
+ "Format a SQL schema, table, or field identifier in the correct way for the current database by calling the
+ driver's implementation of `format-name`.
+ (Most databases use the default implementation of `identity`; H2 uses `clojure.string/upper-case`.)
+ This function DOES NOT quote the identifier."
+ [nm]
(i/format-name *driver* (name nm)))
(defn- get-table-id-or-explode [db-id table-name]
@@ -207,7 +213,7 @@
(defn get-or-create-database!
"Create DBMS database associated with DATABASE-DEFINITION, create corresponding Metabase `Databases`/`Tables`/`Fields`, and sync the `Database`.
- DRIVER should be an object that implements `IDatasetLoader`; it defaults to the value returned by the method `driver` for the
+ DRIVER should be an object that implements `IDriverTestExtensions`; it defaults to the value returned by the method `driver` for the
current dataset (`*driver*`), which is H2 by default."
([database-definition]
(get-or-create-database! *driver* database-definition))
diff --git a/test/metabase/test/data/bigquery.clj b/test/metabase/test/data/bigquery.clj
index 29085d4a232307c0d72bd386e2a46e4f9dc969de..cc4b74df7fba36992e6eae701a6b8d874def6ed0 100644
--- a/test/metabase/test/data/bigquery.clj
+++ b/test/metabase/test/data/bigquery.clj
@@ -198,11 +198,11 @@
(throw e))))))
-;;; # ------------------------------------------------------------ IDatasetLoader ------------------------------------------------------------
+;;; # ------------------------------------------------------------ IDriverTestExtensions ------------------------------------------------------------
(u/strict-extend BigQueryDriver
- i/IDatasetLoader
- (merge i/IDatasetLoaderDefaultsMixin
+ i/IDriverTestExtensions
+ (merge i/IDriverTestExtensionsDefaultsMixin
{:engine (constantly :bigquery)
:database->connection-details (u/drop-first-arg database->connection-details)
:create-db! (u/drop-first-arg create-db!)}))
diff --git a/test/metabase/test/data/crate.clj b/test/metabase/test/data/crate.clj
index 51c50552d6160c03b19d5198faed9baf4ba0dd90..65115ab6ba93aee9eb4e7acb8833a844c1b8d051 100644
--- a/test/metabase/test/data/crate.clj
+++ b/test/metabase/test/data/crate.clj
@@ -54,7 +54,7 @@
(constantly {:hosts "localhost:5200"}))
(extend CrateDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:execute-sql! generic/sequentially-execute-sql!
:field-base-type->sql-type (u/drop-first-arg field-base-type->sql-type)
@@ -64,8 +64,8 @@
:drop-db-if-exists-sql (constantly nil)
:load-data! (make-load-data-fn generic/load-data-add-ids)
:qualified-name-components (partial i/single-db-qualified-name-components "doc")})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details database->connection-details
:engine (constantly :crate)
:default-schema (constantly "doc")}))
diff --git a/test/metabase/test/data/datasets.clj b/test/metabase/test/data/datasets.clj
index e8c12e6647e90fe4afe58e0e6813324189ffb321..ddd7c8492f8f7593d6ccab426790ed13934e261f 100644
--- a/test/metabase/test/data/datasets.clj
+++ b/test/metabase/test/data/datasets.clj
@@ -56,38 +56,59 @@
"Keyword name of the engine that we're currently testing against. Defaults to `:h2`."
default-engine)
+(defn- engine->test-extensions-ns-symbol
+ "Return the namespace where we'd expect to find test extensions for the driver with ENGINE keyword.
+
+ (engine->test-extensions-ns-symbol :h2) ; -> 'metabase.test.data.h2"
+ [engine]
+ (symbol (str "metabase.test.data." (name engine))))
+
(defn- engine->driver
"Like `driver/engine->driver`, but reloads the relevant test data namespace as well if needed."
[engine]
(try (i/engine (driver/engine->driver engine))
(catch IllegalArgumentException _
- (require (symbol (str "metabase.test.data." (name engine))) :reload)))
+ (require (engine->test-extensions-ns-symbol engine) :reload)))
(driver/engine->driver engine))
(def ^:dynamic *driver*
"The driver we're currently testing against, bound by `with-engine`.
This is just a regular driver, e.g. `MySQLDriver`, with an extra promise keyed by `:dbpromise`
that is used to store the `test-data` dataset when you call `load-data!`."
- (driver/engine->driver default-engine))
+ (engine->driver default-engine))
-(defn do-with-engine [engine f]
+(defn do-with-engine
+ "Bind `*engine*` and `*driver*` as appropriate for ENGINE and execute F, a function that takes no args."
+ {:style/indent 1}
+ [engine f]
(binding [*engine* engine
*driver* (engine->driver engine)]
(f)))
(defmacro with-engine
"Bind `*driver*` to the dataset with ENGINE and execute BODY."
+ {:style/indent 1}
[engine & body]
`(do-with-engine ~engine (fn [] ~@body)))
+(defn do-when-testing-engine
+ "Call function F (always with no arguments) *only* if we are currently testing against ENGINE.
+ (This does NOT bind `*driver*`; use `do-with-engine` if you want to do that.)"
+ {:style/indent 1}
+ [engine f]
+ (when (contains? test-engines engine)
+ (f)))
+
(defmacro when-testing-engine
- "Execute BODY only if we're currently testing against ENGINE."
+ "Execute BODY only if we're currently testing against ENGINE.
+ (This does NOT bind `*driver*`; use `with-engine-when-testing` if you want to do that.)"
+ {:style/indent 1}
[engine & body]
- `(when (contains? test-engines ~engine)
- ~@body))
+ `(do-when-testing-engine ~engine (fn [] ~@body)))
(defmacro with-engine-when-testing
"When testing ENGINE, binding `*driver*` and executes BODY."
+ {:style/indent 1}
[engine & body]
`(when-testing-engine ~engine
(with-engine ~engine
@@ -95,6 +116,7 @@
(defmacro expect-with-engine
"Generate a unit test that only runs if we're currently testing against ENGINE, and that binds `*driver*` to the driver for ENGINE."
+ {:style/indent 1}
[engine expected actual]
`(when-testing-engine ~engine
(expect
@@ -104,6 +126,7 @@
(defmacro expect-with-engines
"Generate unit tests for all datasets in ENGINES; each test will only run if we're currently testing the corresponding dataset.
`*driver*` is bound to the current dataset inside each test."
+ {:style/indent 1}
[engines expected actual]
;; Make functions to get expected/actual so the code is only compiled one time instead of for every single driver
;; speeds up loading of metabase.driver.query-processor-test significantly
@@ -125,7 +148,7 @@
;;; Load metabase.test.data.* namespaces for all available drivers
-(doseq [[engine _] (driver/available-drivers)]
- (let [driver-test-namespace (symbol (str "metabase.test.data." (name engine)))]
+(doseq [engine all-valid-engines]
+ (let [driver-test-namespace (engine->test-extensions-ns-symbol engine)]
(when (find-ns driver-test-namespace)
(require driver-test-namespace))))
diff --git a/test/metabase/test/data/druid.clj b/test/metabase/test/data/druid.clj
index d25cb24d1b1cfa587010a5f6b206b612599daca1..b3dfd2c4ca8424b1becb49b56f8363bcec64e8ec 100644
--- a/test/metabase/test/data/druid.clj
+++ b/test/metabase/test/data/druid.clj
@@ -16,8 +16,8 @@
(throw (Exception. "In order to test Druid, you must specify `MB_DRUID_PORT`."))))})
(u/strict-extend DruidDriver
- i/IDatasetLoader
- (merge i/IDatasetLoaderDefaultsMixin
+ i/IDriverTestExtensions
+ (merge i/IDriverTestExtensionsDefaultsMixin
{:engine (constantly :druid)
:database->connection-details database->connection-details
:create-db! (constantly nil)}))
diff --git a/test/metabase/test/data/generic_sql.clj b/test/metabase/test/data/generic_sql.clj
index 8568cc34e36177d33640e969cbb94e0ba275682f..43f17f1210b07640d1f415a973e1e82e9afe48ae 100644
--- a/test/metabase/test/data/generic_sql.clj
+++ b/test/metabase/test/data/generic_sql.clj
@@ -8,9 +8,7 @@
[helpers :as h]]
[medley.core :as m]
[metabase.driver.generic-sql :as sql]
- [metabase.test.data
- [datasets :as datasets]
- [interface :as i]]
+ [metabase.test.data.interface :as i]
[metabase.util :as u]
[metabase.util.honeysql-extensions :as hx])
(:import clojure.lang.Keyword
@@ -19,10 +17,10 @@
;;; ## ------------------------------------------------------------ IGenericDatasetLoader + default impls ------------------------------------------------------------
-(defprotocol IGenericSQLDatasetLoader
+(defprotocol IGenericSQLTestExtensions
"Methods for loading `DatabaseDefinition` in a SQL database.
- A type that implements `IGenericSQLDatasetLoader` can be made to implement most of `IDatasetLoader`
- by using the `IDatasetLoaderMixin`.
+ A type that implements `IGenericSQLTestExtensions` can be made to implement most of `IDriverTestExtensions`
+ by using the `IDriverTestExtensionsMixin`.
Methods marked *Optional* below have a default implementation specified in `DefaultsMixin`."
(field-base-type->sql-type [this, ^Keyword base-type]
@@ -261,7 +259,7 @@
(def DefaultsMixin
- "Default implementations for methods marked *Optional* in `IGenericSQLDatasetLoader`."
+ "Default implementations for methods marked *Optional* in `IGenericSQLTestExtensions`."
{:add-fk-sql default-add-fk-sql
:create-db-sql default-create-db-sql
:create-table-sql default-create-table-sql
@@ -277,7 +275,7 @@
:quote-name default-quote-name})
-;; ## ------------------------------------------------------------ IDatasetLoader impl ------------------------------------------------------------
+;; ## ------------------------------------------------------------ IDriverTestExtensions impl ------------------------------------------------------------
(defn sequentially-execute-sql!
"Alternative implementation of `execute-sql!` that executes statements one at a time for drivers
@@ -317,9 +315,9 @@
(doseq [tabledef table-definitions]
(load-data! driver dbdef tabledef)))
-(def IDatasetLoaderMixin
- "Mixin for `IGenericSQLDatasetLoader` types to implement `create-db!` from `IDatasetLoader`."
- (merge i/IDatasetLoaderDefaultsMixin
+(def IDriverTestExtensionsMixin
+ "Mixin for `IGenericSQLTestExtensions` types to implement `create-db!` from `IDriverTestExtensions`."
+ (merge i/IDriverTestExtensionsDefaultsMixin
{:create-db! create-db!}))
@@ -330,17 +328,21 @@
Useful for doing engine-specific setup or teardown."
{:style/indent 2}
[engine get-connection-spec & sql-and-args]
- (datasets/when-testing-engine engine
- (println (u/format-color 'blue "[%s] %s" (name engine) (first sql-and-args)))
- (jdbc/execute! (get-connection-spec) sql-and-args)
- (println (u/format-color 'blue "[OK]"))))
+ ((resolve 'metabase.test.data.datasets/do-when-testing-engine)
+ engine
+ (fn []
+ (println (u/format-color 'blue "[%s] %s" (name engine) (first sql-and-args)))
+ (jdbc/execute! (get-connection-spec) sql-and-args)
+ (println (u/format-color 'blue "[OK]")))))
(defn query-when-testing!
"Execute a prepared SQL-AND-ARGS **query** against Database with spec returned by GET-CONNECTION-SPEC only when running tests against ENGINE.
Useful for doing engine-specific setup or teardown where `execute-when-testing!` won't work because the query returns results."
{:style/indent 2}
[engine get-connection-spec & sql-and-args]
- (datasets/when-testing-engine engine
- (println (u/format-color 'blue "[%s] %s" (name engine) (first sql-and-args)))
- (u/prog1 (jdbc/query (get-connection-spec) sql-and-args)
- (println (u/format-color 'blue "[OK] -> %s" (vec <>))))))
+ ((resolve 'metabase.test.data.datasets/do-when-testing-engine)
+ engine
+ (fn []
+ (println (u/format-color 'blue "[%s] %s" (name engine) (first sql-and-args)))
+ (u/prog1 (jdbc/query (get-connection-spec) sql-and-args)
+ (println (u/format-color 'blue "[OK] -> %s" (vec <>)))))))
diff --git a/test/metabase/test/data/h2.clj b/test/metabase/test/data/h2.clj
index 79de008ec4ec94aca8abb677654bec342576e4c6..7fb3104d843174c5ce422916f7af3ae2636dacdc 100644
--- a/test/metabase/test/data/h2.clj
+++ b/test/metabase/test/data/h2.clj
@@ -51,7 +51,7 @@
(u/strict-extend H2Driver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(let [{:keys [execute-sql!], :as mixin} generic/DefaultsMixin]
(merge mixin
{:create-db-sql (constantly create-db-sql)
@@ -69,8 +69,8 @@
:prepare-identifier (u/drop-first-arg s/upper-case)
:quote-name (u/drop-first-arg quote-name)}))
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (u/drop-first-arg database->connection-details)
:default-schema (constantly "PUBLIC")
:engine (constantly :h2)
diff --git a/test/metabase/test/data/interface.clj b/test/metabase/test/data/interface.clj
index 8a29f32c65568d54861745fdbc31d6409957ea2b..d1fbdb82e10b10c35ebf8ff3ca47d53033cfa461 100644
--- a/test/metabase/test/data/interface.clj
+++ b/test/metabase/test/data/interface.clj
@@ -1,7 +1,7 @@
(ns metabase.test.data.interface
"`Definition` types for databases, tables, fields; related protocols, helper functions.
- Objects that implement `IDatasetLoader` know how to load a `DatabaseDefinition` into an
+ Objects that implement `IDriverTestExtensions` know how to load a `DatabaseDefinition` into an
actual physical RDMS database. This functionality allows us to easily test with multiple datasets."
(:require [clojure.string :as str]
[metabase
@@ -85,11 +85,11 @@
(Database :name database-name, :engine (name engine-kw))))
-;; ## IDatasetLoader
+;; ## IDriverTestExtensions
-(defprotocol IDatasetLoader
+(defprotocol IDriverTestExtensions
"Methods for creating, deleting, and populating *pyhsical* DBMS databases, tables, and fields.
- Methods marked *OPTIONAL* have default implementations in `IDatasetLoaderDefaultsMixin`."
+ Methods marked *OPTIONAL* have default implementations in `IDriverTestExtensionsDefaultsMixin`."
(engine ^clojure.lang.Keyword [this]
"Return the engine keyword associated with this database, e.g. `:h2` or `:mongo`.")
@@ -126,7 +126,8 @@
(id-field-type ^clojure.lang.Keyword [this]
"*OPTIONAL* Return the `base_type` of the `id` `Field` (e.g. `:type/Integer` or `:type/BigInteger`). Defaults to `:type/Integer`."))
-(def IDatasetLoaderDefaultsMixin
+(def IDriverTestExtensionsDefaultsMixin
+ "Default implementations for the `IDriverTestExtensions` methods marked *OPTIONAL*."
{:expected-base-type->actual (u/drop-first-arg identity)
:default-schema (constantly nil)
:format-name (u/drop-first-arg identity)
diff --git a/test/metabase/test/data/mongo.clj b/test/metabase/test/data/mongo.clj
index 52e2c40fbb1bcf67fbdb37adc740bfb7b741d1b8..1317bd9b629718122dadb775818b76da5a02b482 100644
--- a/test/metabase/test/data/mongo.clj
+++ b/test/metabase/test/data/mongo.clj
@@ -41,8 +41,8 @@
(u/strict-extend MongoDriver
- i/IDatasetLoader
- (merge i/IDatasetLoaderDefaultsMixin
+ i/IDriverTestExtensions
+ (merge i/IDriverTestExtensionsDefaultsMixin
{:create-db! (u/drop-first-arg create-db!)
:database->connection-details database->connection-details
:engine (constantly :mongo)
diff --git a/test/metabase/test/data/mysql.clj b/test/metabase/test/data/mysql.clj
index 2e76092bd7ca0c2b70b6e2e351beee3bbcb95f55..6db38b8cbc5572dad17276d98d6ba232f573495a 100644
--- a/test/metabase/test/data/mysql.clj
+++ b/test/metabase/test/data/mysql.clj
@@ -35,7 +35,7 @@
(str \` nm \`))
(u/strict-extend MySQLDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:database->spec (comp add-connection-params (:database->spec generic/DefaultsMixin))
:execute-sql! generic/sequentially-execute-sql! ; TODO - we might be able to do SQL all at once by setting `allowMultiQueries=true` on the connection string
@@ -43,7 +43,7 @@
:load-data! generic/load-data-all-at-once!
:pk-sql-type (constantly "INTEGER NOT NULL AUTO_INCREMENT")
:quote-name (u/drop-first-arg quote-name)})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (u/drop-first-arg database->connection-details)
:engine (constantly :mysql)}))
diff --git a/test/metabase/test/data/oracle.clj b/test/metabase/test/data/oracle.clj
index c298352a3b0b71fcb44ba2cb8ba459594f21fbf1..33d7c0ccbf502c4bdf86c398fea57be7e80a6d86 100644
--- a/test/metabase/test/data/oracle.clj
+++ b/test/metabase/test/data/oracle.clj
@@ -72,7 +72,7 @@
(extend OracleDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:create-db-sql (constantly nil)
:drop-db-if-exists-sql (constantly nil)
@@ -83,8 +83,8 @@
:pk-sql-type (constantly "INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1 INCREMENT BY 1) NOT NULL") ; LOL
:qualified-name-components (partial i/single-db-qualified-name-components session-schema)})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (fn [& _] @db-connection-details)
:default-schema (constantly session-schema)
:engine (constantly :oracle)
diff --git a/test/metabase/test/data/postgres.clj b/test/metabase/test/data/postgres.clj
index f29d95c45b01c2d4199cba64d35783c98312b768..9c152d0a866e1ca095a20833c31de2d0fa2c3a2a 100644
--- a/test/metabase/test/data/postgres.clj
+++ b/test/metabase/test/data/postgres.clj
@@ -46,15 +46,15 @@
(u/strict-extend PostgresDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:drop-db-if-exists-sql drop-db-if-exists-sql
:drop-table-if-exists-sql generic/drop-table-if-exists-cascade-sql
:field-base-type->sql-type (u/drop-first-arg field-base-type->sql-type)
:load-data! generic/load-data-all-at-once!
:pk-sql-type (constantly "SERIAL")})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (u/drop-first-arg database->connection-details)
:default-schema (constantly "public")
:engine (constantly :postgres)
diff --git a/test/metabase/test/data/presto.clj b/test/metabase/test/data/presto.clj
index cb8863953aa0c1bd7c257b3291b8b5bc747530ce..65faebfc1d5b0c1196be0d6d7ad39c3c674c05c0 100644
--- a/test/metabase/test/data/presto.clj
+++ b/test/metabase/test/data/presto.clj
@@ -21,7 +21,7 @@
(s/upper-case (s/replace (name env-var) #"-" "_")))))))
-;;; IDatasetLoader implementation
+;;; IDriverTestExtensions implementation
(defn- database->connection-details [context {:keys [database-name]}]
(merge {:host (get-env-var :host)
@@ -92,11 +92,11 @@
(execute-presto-query! details (insert-sql dbdef tabledef batch))))))
-;;; IDatasetLoader implementation
+;;; IDriverTestExtensions implementation
(u/strict-extend PrestoDriver
- i/IDatasetLoader
- (merge i/IDatasetLoaderDefaultsMixin
+ i/IDriverTestExtensions
+ (merge i/IDriverTestExtensionsDefaultsMixin
{:engine (constantly :presto)
:database->connection-details (u/drop-first-arg database->connection-details)
:create-db! (u/drop-first-arg create-db!)
diff --git a/test/metabase/test/data/redshift.clj b/test/metabase/test/data/redshift.clj
index a8f57ab088394250385d7b6d1c2c1e3b4c90cd87..8368d3167be68a661914732a20e22f59a57c975a 100644
--- a/test/metabase/test/data/redshift.clj
+++ b/test/metabase/test/data/redshift.clj
@@ -48,7 +48,7 @@
(u/strict-extend RedshiftDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:create-db-sql (constantly nil)
:drop-db-if-exists-sql (constantly nil)
@@ -57,8 +57,8 @@
:pk-sql-type (constantly "INTEGER IDENTITY(1,1)")
:qualified-name-components (partial i/single-db-qualified-name-components session-schema-name)})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (fn [& _]
@db-connection-details)
:default-schema (constantly session-schema-name)
diff --git a/test/metabase/test/data/sqlite.clj b/test/metabase/test/data/sqlite.clj
index 639c483e1ddf38486970d56c811b46a69e23538d..5b2be792012a8348176dd22375f18712576438b2 100644
--- a/test/metabase/test/data/sqlite.clj
+++ b/test/metabase/test/data/sqlite.clj
@@ -32,7 +32,7 @@
(hsql/call :datetime (hx/literal (u/date->iso-8601 v))))]))))))
(u/strict-extend SQLiteDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:add-fk-sql (constantly nil) ; TODO - fix me
:create-db-sql (constantly nil)
@@ -41,7 +41,7 @@
:load-data! (generic/make-load-data-fn load-data-stringify-dates generic/load-data-chunked)
:pk-sql-type (constantly "INTEGER")
:field-base-type->sql-type (u/drop-first-arg field-base-type->sql-type)})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (u/drop-first-arg database->connection-details)
:engine (constantly :sqlite)}))
diff --git a/test/metabase/test/data/sqlserver.clj b/test/metabase/test/data/sqlserver.clj
index 26db970701937b9612d4245181288bdea442548c..6802c1761057556c639204ea01b230cd88eac76a 100644
--- a/test/metabase/test/data/sqlserver.clj
+++ b/test/metabase/test/data/sqlserver.clj
@@ -75,15 +75,15 @@
(u/strict-extend SQLServerDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:drop-db-if-exists-sql (u/drop-first-arg drop-db-if-exists-sql)
:drop-table-if-exists-sql (u/drop-first-arg drop-table-if-exists-sql)
:field-base-type->sql-type (u/drop-first-arg field-base-type->sql-type)
:pk-sql-type (constantly "INT IDENTITY(1,1)")
:qualified-name-components (u/drop-first-arg qualified-name-components)})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (u/drop-first-arg database->connection-details)
:default-schema (constantly "dbo")
:engine (constantly :sqlserver)}))
diff --git a/test/metabase/test/data/users.clj b/test/metabase/test/data/users.clj
index 773f80d5f9641d901d2acc7c3d60c54b7e246f9e..a1415e76d1298cdd4ff7b1e0eafd169f4de90d9d 100644
--- a/test/metabase/test/data/users.clj
+++ b/test/metabase/test/data/users.clj
@@ -70,7 +70,6 @@
{:pre [(string? email) (string? first) (string? last) (string? password) (m/boolean? superuser) (m/boolean? active)]}
(wait-for-initiailization)
(or (User :email email)
- (println "Creating test user:" email) ; DEBUG
(db/insert! User
:email email
:first_name first
@@ -139,7 +138,6 @@
(when-not (= status-code 401)
(throw e))
;; If we got a 401 unauthenticated clear the tokens cache + recur
- (printf "Got 401 (Unauthenticated) for %s. Clearing cached auth tokens and retrying request.\n" username) ; DEBUG
(reset! tokens {})
(apply client-fn username args)))))
diff --git a/test/metabase/test/data/vertica.clj b/test/metabase/test/data/vertica.clj
index e40032ff833e7129e049aac9d9ed22b9dc2503eb..9edd805a27d37a3ce9f3b64558c0d98060e415b3 100644
--- a/test/metabase/test/data/vertica.clj
+++ b/test/metabase/test/data/vertica.clj
@@ -40,7 +40,7 @@
(u/strict-extend VerticaDriver
- generic/IGenericSQLDatasetLoader
+ generic/IGenericSQLTestExtensions
(merge generic/DefaultsMixin
{:create-db-sql (constantly nil)
:drop-db-if-exists-sql (constantly nil)
@@ -50,8 +50,8 @@
:pk-sql-type (constantly "INTEGER")
:qualified-name-components (u/drop-first-arg qualified-name-components)
:execute-sql! generic/sequentially-execute-sql!})
- i/IDatasetLoader
- (merge generic/IDatasetLoaderMixin
+ i/IDriverTestExtensions
+ (merge generic/IDriverTestExtensionsMixin
{:database->connection-details (fn [& _] @db-connection-details)
:default-schema (constantly "public")
:engine (constantly :vertica)
diff --git a/test/metabase/test/util.clj b/test/metabase/test/util.clj
index f143dd2e7ab62ef017d199c1754b37d49585d42d..b738887fc920eae8a64b9a726db4be18abdd1372 100644
--- a/test/metabase/test/util.clj
+++ b/test/metabase/test/util.clj
@@ -26,19 +26,38 @@
[metabase.util :as u]
[toucan.util.test :as test]))
-(declare $->prop)
-
;; ## match-$
-(defmacro match-$
+(defn- $->prop
+ "If FORM is a symbol starting with a `$`, convert it to the form `(form-keyword SOURCE-OBJ)`.
+
+ ($->prop my-obj 'fish) -> 'fish
+ ($->prop my-obj '$fish) -> '(:fish my-obj)"
+ [source-obj form]
+ (or (when (and (symbol? form)
+ (= (first (name form)) \$)
+ (not= form '$))
+ (if (= form '$$)
+ source-obj
+ `(~(keyword (apply str (rest (name form)))) ~source-obj)))
+ form))
+
+(defmacro ^:deprecated match-$
"Walk over map DEST-OBJECT and replace values of the form `$`, `$key`, or `$$` as follows:
{k $} -> {k (k SOURCE-OBJECT)}
{k $symb} -> {k (:symb SOURCE-OBJECT)}
$$ -> {k SOURCE-OBJECT}
+
ex.
(match-$ m {:a $, :b 3, :c $b}) -> {:a (:a m), b 3, :c (:b m)}"
+ ;; DEPRECATED - This is an old pattern for writing tests and is probably best avoided going forward.
+ ;; Tests that use this macro end up being huge, often with giant maps with many values that are `$`.
+ ;; It's better just to write a helper function that only keeps values relevant to the tests you're writing
+ ;; and use that to pare down the results (e.g. only keeping a handful of keys relevant to the test).
+ ;; Alternatively, you can also consider converting fields that naturally change to boolean values indiciating their presence;
+ ;; see the `boolean-ids-and-timestamps` function below
[source-obj dest-object]
{:pre [(map? dest-object)]}
(let [source## (gensym)
@@ -46,32 +65,20 @@
{k (condp = v
'$ `(~k ~source##)
'$$ source##
- v)}))]
+ v)}))]
`(let [~source## ~source-obj]
- ~(clojure.walk/prewalk (partial $->prop source##)
- dest-object))))
-
-(defn- $->prop
- "If FORM is a symbol starting with a `$`, convert it to the form `(form-keyword SOURCE-OBJ)`.
-
- ($->prop my-obj 'fish) -> 'fish
- ($->prop my-obj '$fish) -> '(:fish my-obj)"
- [source-obj form]
- (or (when (and (symbol? form)
- (= (first (name form)) \$)
- (not= form '$))
- (if (= form '$$)
- source-obj
- `(~(keyword (apply str (rest (name form)))) ~source-obj)))
- form))
+ ~(walk/prewalk (partial $->prop source##)
+ dest-object))))
;;; random-name
-(let [random-uppercase-letter (partial rand-nth (mapv char (range (int \A) (inc (int \Z)))))]
- (defn random-name
- "Generate a random string of 20 uppercase letters."
- []
- (apply str (repeatedly 20 random-uppercase-letter))))
+(def ^:private ^{:arglists '([])} random-uppercase-letter
+ (partial rand-nth (mapv char (range (int \A) (inc (int \Z))))))
+
+(defn random-name
+ "Generate a random string of 20 uppercase letters."
+ []
+ (apply str (repeatedly 20 random-uppercase-letter)))
(defn random-email
"Generate a random email address."
@@ -100,7 +107,7 @@
(require 'metabase.test.data.users)
((resolve 'metabase.test.data.users/user->id) username))
-(defn- rasta-id [] (user-id :rasta))
+(defn- rasta-id [] (user-id :rasta))
(u/strict-extend (class Card)
diff --git a/test_resources/log4j.properties b/test_resources/log4j.properties
index 993488ed722d55bcad76dbc98f3f8c197a2989a4..161945c47bd0cc0b9aece51e130d6ff59e51c407 100644
--- a/test_resources/log4j.properties
+++ b/test_resources/log4j.properties
@@ -16,8 +16,8 @@ log4j.appender.file.layout.ConversionPattern=%d [%t] %-5p%c - %m%n
# customizations to logging by package
log4j.logger.com.mchange=ERROR
+log4j.logger.org.eclipse.jetty.server.HttpChannel=ERROR
log4j.logger.metabase=ERROR
-log4j.logger.metabase.middleware=INFO
log4j.logger.metabase.test-setup=INFO
log4j.logger.metabase.test.data.datasets=INFO
log4j.logger.metabase.util.encryption=INFO
diff --git a/webpack.config.js b/webpack.config.js
index 1783c3ad8019320d11bfa160bc120de31f9c115f..4c0d5703592b660695dab359421ab2fdf83e941a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -69,6 +69,7 @@ var CSS_CONFIG = {
"[hash:base64:5]",
restructuring: false,
compatibility: true,
+ url: false, // disabled because we need to use relative url()
importLoaders: 1
}
@@ -89,7 +90,7 @@ var config = module.exports = {
path: BUILD_PATH + '/app/dist',
// NOTE: the filename on disk won't include "?[chunkhash]" but the URL in index.html generated by HtmlWebpackPlugin will:
filename: '[name].bundle.js?[hash]',
- publicPath: '/app/dist/'
+ publicPath: 'app/dist/'
},
module: {
@@ -200,7 +201,7 @@ if (NODE_ENV === "hot") {
config.output.filename = "[name].hot.bundle.js?[hash]";
// point the publicPath (inlined in index.html by HtmlWebpackPlugin) to the hot-reloading server
- config.output.publicPath = "http://localhost:8080" + config.output.publicPath;
+ config.output.publicPath = "http://localhost:8080/" + config.output.publicPath;
config.module.loaders.unshift({
test: /\.jsx$/,
diff --git a/yarn.lock b/yarn.lock
index eac22ac2eea290c33f0e1bcad970bb3dc95bfe1d..88cc51c2ec981a57a1c9655a6028da041a03802d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2198,7 +2198,7 @@ di@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-diff@^3.0.0, diff@^3.2.0:
+diff@^3.0.0, diff@^3.1.0, diff@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
@@ -3043,6 +3043,12 @@ form-data@~2.1.1:
combined-stream "^1.0.5"
mime-types "^2.1.12"
+formatio@1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.2.0.tgz#f3b2167d9068c4698a8d51f4f760a39a54d818eb"
+ dependencies:
+ samsam "1.x"
+
forwarded@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
@@ -3254,10 +3260,6 @@ har-validator@~4.2.1:
ajv "^4.9.1"
har-schema "^1.0.5"
-harmony-reflect@^1.4.6:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.5.1.tgz#b54ca617b00cc8aef559bbb17b3d85431dc7e329"
-
has-ansi@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
@@ -3313,7 +3315,7 @@ he@1.1.x:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-history@^3.0.0:
+history@3, history@^3.0.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c"
dependencies:
@@ -3322,16 +3324,6 @@ history@^3.0.0:
query-string "^4.2.2"
warning "^3.0.0"
-history@^4.5.0:
- version "4.6.1"
- resolved "https://registry.yarnpkg.com/history/-/history-4.6.1.tgz#911cf8eb65728555a94f2b12780a0c531a14d2fd"
- dependencies:
- invariant "^2.2.1"
- loose-envify "^1.2.0"
- resolve-pathname "^2.0.0"
- value-equal "^0.2.0"
- warning "^3.0.0"
-
hmac-drbg@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3496,12 +3488,6 @@ icss-replace-symbols@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
-identity-obj-proxy@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
- dependencies:
- harmony-reflect "^1.4.6"
-
ieee754@^1.1.4:
version "1.1.8"
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -4733,6 +4719,10 @@ log4js@^0.6.31:
readable-stream "~1.0.2"
semver "~4.3.3"
+lolex@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
+
longest@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -4935,6 +4925,10 @@ nan@^2.3.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
+native-promise-only@^0.8.1:
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
+
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -5449,6 +5443,12 @@ path-to-regexp@0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+path-to-regexp@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+ dependencies:
+ isarray "0.0.1"
+
path-type@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -6686,10 +6686,6 @@ resolve-from@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-resolve-pathname@^2.0.0:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436"
-
resolve@1.1.7:
version "1.1.7"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -6763,6 +6759,10 @@ safe-buffer@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+samsam@1.x, samsam@^1.1.3:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
+
sane@~1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/sane/-/sane-1.5.0.tgz#a4adeae764d048621ecb27d5f9ecf513101939f3"
@@ -6924,6 +6924,19 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"
+sinon@^2.3.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.1.tgz#48c9c758b4d0bb86327486833f1c4298919ce9ee"
+ dependencies:
+ diff "^3.1.0"
+ formatio "1.2.0"
+ lolex "^1.6.0"
+ native-promise-only "^0.8.1"
+ path-to-regexp "^1.7.0"
+ samsam "^1.1.3"
+ text-encoding "0.6.4"
+ type-detect "^4.0.0"
+
slash@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -7292,6 +7305,10 @@ tether@^1.2.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
+text-encoding@0.6.4:
+ version "0.6.4"
+ resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
+
text-table@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7425,6 +7442,10 @@ type-check@~0.3.2:
dependencies:
prelude-ls "~1.1.2"
+type-detect@^4.0.0:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.3.tgz#0e3f2670b44099b0b46c284d136a7ef49c74c2ea"
+
type-is@~1.6.14:
version "1.6.15"
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
@@ -7598,10 +7619,6 @@ validate-npm-package-license@^3.0.1:
spdx-correct "~1.0.0"
spdx-expression-parse "~1.0.0"
-value-equal@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.0.tgz#4f41c60a3fc011139a2ec3d3340a8998ae8b69c0"
-
vary@~1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"