Merge branch 'master' of github.com:metabase/metabase into e2e-fixes-cleanup

.dir-locals.el

 ((clojure-mode . ((eval . (progn
                             ;; Specify which arg is the docstring for certain macros
                             ;; (Add more as needed)
-                            (put 'defannotation 'clojure-doc-string-elt 2)
                             (put 'defendpoint 'clojure-doc-string-elt 3)
+                            (put 'api/defendpoint 'clojure-doc-string-elt 3)
                             (put 'defsetting 'clojure-doc-string-elt 2)
                             (put 'setting/defsetting 'clojure-doc-string-elt 2)
+                            (put 's/defn 'clojure-doc-string-elt 2)
 
                             ;; Define custom indentation for functions inside metabase.
                             ;; This list isn't complete; add more forms as we come across them.

docs/administration-guide/05-setting-permissions.md

@@ -77,4 +77,4 @@ Pulses act a bit differently with regard to permissions. When a user creates a n
 ---
 
 ## Next: custom segments and metrics
-Learn how to define custom segments and commonly referenced metrics in the [next section](06-segments-and-metrics.md).
+Learn how to create collections of questions to organize things and decide who gets to see what in the [next section](06-collections.md).

docs/administration-guide/06-collections.md

+## Creating Collections for Your Saved Questions
+---
+
+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).
+
+### 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.
+
+![Permissions empty state](images/collections/collections-empty-state.png)
+
+### Setting permissions for collections
+Collection permissions are similar to data permissions. Rather than going to the Admin Panel, you set permissions on collections by clicking on the lock icon in the top-right of the Questions screen or the top-right of a collection screen.
+
+![Permissions grid](images/collections/permissions-grid.png)
+
+You'll see a table with your user groups along the top and all your collections down along the left. A user group can have View access, Curate access, or no access to a given collection.
+
+- View access: can see all the questions in the collection, **even if the user doesn't have access to the underlying data used to create the question.**
+- Curate access: can additionally move questions in or out of the collection, and edit the questions in the collection.
+- No access: won't see the collection listed on the Questions page, and can't see questions from this collection in dashboards or when creating a Pulse.
+
+Just like with data access permissions, collection permissions are *additive*, meaning that if a user belongs to more than one group, if one of their groups has a more restrictive setting for a collection than another one of their groups, they'll be given the *more permissive* setting. This is especially important to remember when dealing with the All Users group: since all users are members of this group, if you give the All Users group Curate access to a collection, then *all* users will be given that access for that collection, even if they also belong to a group with *less* access than that.
+
+### The "Everything Else" section
+If a question isn't saved within a collection, it will be placed in the Everything Else section of the main Questions page. **All your Metabase users can see questions in this section**, provided they have data access permission.
+
+### Archiving collections
+You can archive collections similarly to how you can archive questions. Click the archive icon in the top-right of the collection screen to archive it. This will also archive all questions in the collection, and importantly it will also remove all of those questions from all dashboards and Pulses that use those questions. So be careful!
+
+To restore a collection and its contents, click the `View Archive` icon in the top-right of the main Questions screen to see the archive, then hover over an item to reveal the `Unarchive` icon on the far right of the item. Questions within archived collections are not individually listed in the archive, so if you want to unarchive a specific question from an archived collection, you have to unarchive that whole collection.
+
+### What about labels?
+Older versions of Metabase provided labels as a way to organize and filter saved questions. If you were already using labels, you'll still be able to edit and use them for now from the Labels dropdown on lists of saved questions. However, **labels will be removed from Metabase in an upcoming version.** If your instance of Metabase was not using labels previously, you won't see the label tools at all anymore.
+
+What should you do if you want to prepare for the impending removal of labels? We recommend creating collections that match your most important labels, and moving the matching labeled questions into those collections.
+
+If you don't want to remove all the labels from your questions yet, we recommend at least ensuring that none of your questions have more than a single label. That way, if in the future we provide a migration tool that converts labels to collections automatically, there won't be any ambiguity with your labels.
+
+---
+
+## Next: custom segments and metrics
+Learn how to define custom segments and commonly referenced metrics in the [next section](07-segments-and-metrics.md).

docs/administration-guide/06-segments-and-metrics.md → docs/administration-guide/07-segments-and-metrics.md

@@ -47,4 +47,4 @@ Lastly, you can also view the revision history for each segment and metric from
 ---
 
 ## Next: configuring Metabase
-There are a few other settings you configure in Metabase. [Learn how](06-configuration-settings.md).
+There are a few other settings you configure in Metabase. [Learn how](08-configuration-settings.md).

docs/administration-guide/07-configuration-settings.md → docs/administration-guide/08-configuration-settings.md

@@ -19,4 +19,4 @@ This option turns determines whether or not you allow anonymous data about your
 ---
 
 ## Next: Setting up Slack
-If you want to use Slack to enhance the Metabase experience then lets do that now. Let’s learn [how to setup Slack](07-setting-up-slack.md).
+If you want to use Slack to enhance the Metabase experience then lets do that now. Let’s learn [how to setup Slack](09-setting-up-slack.md).

docs/administration-guide/08-setting-up-slack.md → docs/administration-guide/09-setting-up-slack.md

@@ -30,4 +30,4 @@ That's it!  Metabase will automatically run a quick test to check that the API t
 ---
 
 ## Next: Single Sign-On
-Learn how to [configure Single Sign-On](08-single-sign-on.md) to let users sign in or sign up with just a click.
+Learn how to [configure Single Sign-On](10-single-sign-on.md) to let users sign in or sign up with just a click.

docs/administration-guide/start.md

@@ -9,11 +9,12 @@ Are you in charge of managing Metabase for your organization? Then you're in the
 * [Editing your database metadata](03-metadata-editing.md)
 * [Managing user accounts](04-managing-users.md)
 * [Setting data permissions](05-setting-permissions.md)
-* [Creating segments and metrics](06-segments-and-metrics.md)
-* [Configuring settings](07-configuration-settings.md)
-* [Setting up Slack integration](08-setting-up-slack.md)
-* [Enabling single sign-on with Google](09-single-sign-on.md)
-* [Creating a Getting Started Guide for your team](10-getting-started-guide.md)
+* [Creating and managing collections](06-collections.md)
+* [Creating segments and metrics](07-segments-and-metrics.md)
+* [Configuring settings](08-configuration-settings.md)
+* [Setting up Slack integration](09-setting-up-slack.md)
+* [Enabling single sign-on with Google](10-single-sign-on.md)
+* [Creating a Getting Started Guide for your team](11-getting-started-guide.md)
 
 First things first, you'll need to install Metabase. If you haven’t done that yet, our [Installation Guide](../operations-guide/start.md#installing-and-running-metabase) will help you through the process.
 

docs/api-documentation.md

@@ -34,7 +34,13 @@ Get all the `Cards`. Option filter param `f` can be used to change the set of Ca
    but other options include `mine`, `fav`, `database`, `table`, `recent`, `popular`, and `archived`. See corresponding implementation
    functions above for the specific behavior of each filter option. :card_index:
 
-   Optionally filter cards by LABEL slug.
+   Optionally filter cards by LABEL or COLLECTION slug. (COLLECTION can be a blank string, to signify cards with *no collection* should be returned.)
+
+   NOTES:
+
+   *  Filtering by LABEL is considered *deprecated*, as `Labels` will be removed from an upcoming version of Metabase in favor of `Collections`.
+   *  LABEL and COLLECTION params are mutually exclusive; if both are specified, LABEL will be ignored and Cards will only be filtered by their `Collection`.
+   *  If no `Collection` exists with the slug COLLECTION, this endpoint will return a 404.
 
 ##### PARAMS:
 
@@ -44,6 +50,8 @@ Get all the `Cards`. Option filter param `f` can be used to change the set of Ca
 
 *  **`label`** value may be nil, or if non-nil, value must be a non-blank string.
 
+*  **`collection`** value may be nil, or if non-nil, value must be a string.
+
 
 ## `GET /api/card/:id`
 
@@ -62,7 +70,7 @@ Create a new `Card`.
 
 *  **`dataset_query`** 
 
-*  **`description`** 
+*  **`description`** value may be nil, or if non-nil, value must be a non-blank string.
 
 *  **`display`** value must be a non-blank string.
 
@@ -70,6 +78,8 @@ Create a new `Card`.
 
 *  **`visualization_settings`** value must be a map.
 
+*  **`collection_id`** value may be nil, or if non-nil, value must be an integer greater than zero.
+
 
 ## `POST /api/card/:card-id/favorite`
 
@@ -83,6 +93,7 @@ Favorite a Card.
 ## `POST /api/card/:card-id/labels`
 
 Update the set of `Labels` that apply to a `Card`.
+   (This endpoint is considered DEPRECATED as Labels will be removed in a future version of Metabase.)
 
 ##### PARAMS:
 
@@ -124,6 +135,18 @@ Run the query associated with a Card, and return its results as JSON. Note that
 *  **`parameters`** value may be nil, or if non-nil, value must be a valid JSON string.
 
 
+## `POST /api/card/collections`
+
+Bulk update endpoint for Card Collections. Move a set of `Cards` with CARD_IDS into a `Collection` with COLLECTION_ID,
+   or remove them from any Collections by passing a `null` COLLECTION_ID.
+
+##### PARAMS:
+
+*  **`card_ids`** value must be an array. Each value must be an integer greater than zero.
+
+*  **`collection_id`** value may be nil, or if non-nil, value must be an integer greater than zero.
+
+
 ## `PUT /api/card/:id`
 
 Update a `Card`.
@@ -134,7 +157,7 @@ Update a `Card`.
 
 *  **`dataset_query`** 
 
-*  **`description`** 
+*  **`description`** value may be nil, or if non-nil, value must be a non-blank string.
 
 *  **`display`** value may be nil, or if non-nil, value must be a non-blank string.
 
@@ -144,6 +167,74 @@ Update a `Card`.
 
 *  **`archived`** value may be nil, or if non-nil, value must be a boolean.
 
+*  **`collection_id`** value may be nil, or if non-nil, value must be an integer greater than zero.
+
+
+## `GET /api/collection/`
+
+Fetch a list of all Collections that the current user has read permissions for.
+   This includes `:can_write`, which means whether the current user is allowed to add or remove Cards to this Collection; keep in mind
+   that regardless of this status you must be a superuser to modify properties of Collections themselves.
+
+   By default, this returns non-archived Collections, but instead you can show archived ones by passing `?archived=true`.
+
+##### PARAMS:
+
+*  **`archived`** value may be nil, or if non-nil, value must be a valid boolean (true or false).
+
+
+## `GET /api/collection/:id`
+
+Fetch a specific (non-archived) Collection, including cards that belong to it.
+
+##### PARAMS:
+
+*  **`id`** 
+
+
+## `GET /api/collection/graph`
+
+Fetch a graph of all Collection Permissions.
+
+
+## `POST /api/collection/`
+
+Create a new Collection.
+
+##### PARAMS:
+
+*  **`name`** value must be a non-blank string.
+
+*  **`color`** value must be a string that matches the regex `^#[0-9A-Fa-f]{6}$`.
+
+*  **`description`** value may be nil, or if non-nil, value must be a non-blank string.
+
+
+## `PUT /api/collection/:id`
+
+Modify an existing Collection, including archiving or unarchiving it.
+
+##### PARAMS:
+
+*  **`id`** 
+
+*  **`name`** value must be a non-blank string.
+
+*  **`color`** value must be a string that matches the regex `^#[0-9A-Fa-f]{6}$`.
+
+*  **`description`** value may be nil, or if non-nil, value must be a non-blank string.
+
+*  **`archived`** value may be nil, or if non-nil, value must be a boolean.
+
+
+## `PUT /api/collection/graph`
+
+Do a batch update of Collections Permissions by passing in a modified graph.
+
+##### PARAMS:
+
+*  **`body`** value must be a map.
+
 
 ## `DELETE /api/dashboard/:id`
 
@@ -542,7 +633,7 @@ Fetch basic info for the Getting Started guide.
 
 ## `DELETE /api/label/:id`
 
-Delete a `Label`. :label:
+[DEPRECATED] Delete a `Label`. :label:
 
 ##### PARAMS:
 
@@ -551,12 +642,12 @@ Delete a `Label`. :label:
 
 ## `GET /api/label/`
 
-List all `Labels`. :label:
+[DEPRECATED] List all `Labels`. :label:
 
 
 ## `POST /api/label/`
 
-Create a new `Label`. :label: 
+[DEPRECATED] Create a new `Label`. :label:
 
 ##### PARAMS:
 
@@ -567,7 +658,7 @@ Create a new `Label`. :label:
 
 ## `PUT /api/label/:id`
 
-Update a `Label`. :label:
+[DEPRECATED] Update a `Label`. :label:
 
 ##### PARAMS:
 

docs/users-guide/03-asking-questions.md

@@ -49,7 +49,7 @@ If your Metabase admins have created special named filters, called segments, for
 
 ### Answer Output
 ---
-The last section of the question builder is where you select what you want the output of your answer to be, under the View dropdown. You’re basically telling Metabase, “I want to view the…” Metabase can output the answer to your question in three different ways:
+The last section of the question builder is where you select what you want the output of your answer to be, under the View dropdown. You’re basically telling Metabase, “I want to view the…” Metabase can output the answer to your question in four different ways:
 
 #### 1. Raw Data
 Raw Data is just a table with the answer listed in rows.  It's useful when you want to see the actual data you're working with, rather than a sum or average, etc., or when you're exploring a small table with a limited number of records.  
@@ -58,19 +58,29 @@ When you filter your data to see groups of interesting users, orders, etc., Raw
 
 #### 2. Basic Metrics
 
-What's a *metric*? It's a number that is derived from your source table and takes into consideration any filters you asked Metabase to apply to your question. So when you select one of these metrics, your answer will come back in the form of a number. The different basic metrics are:
+What's a *metric*? It's a number that is derived from your source table and takes into consideration any filters you asked Metabase to apply to your question. So when you select one of these metrics, your answer will come back in the form of a number. You can add additional metrics to your question using the `+` icon next to your selected metric.
 
-* **Count:** The total of number of rows in the answer. Each row corresponds to a separate record. If you want to know how many orders in the Orders table were placed with a price greater than $40, you’d filter by “Price greater than 40,” and then select Count, because you want Metabase to count how many orders matched your filter.
-* **Sum:** Sum of all the values in a column. This is really easy to get mixed up with Count — just remember that Count counts each *row*, but Sum adds up all the values in a single field. You’d use Sum to get your total revenue dollar amount, for example.
-* **Average:** Average of all the values in a column.
-* **Number of Distinct Values:** Number of unique values in all the cells of a single column. This would be useful to find out things like how many different *types* of products were sold last month (not how many were sold in total).
-* **Cumulative Sum:** This gives you a running total of a specific column. This will look exactly the same as Sum unless you break out your answer by day, week, month, etc. (See the next section about breaking out metrics.) An example would be total revenue over time.
-* **Standard Deviation:** A number which expresses how much the values of a column vary, plus or minus, from the average of that column.
+The different basic metrics are:
+
+* **Count of rows:** The total of number of rows in the answer. Each row corresponds to a separate record. If you want to know how many orders in the Orders table were placed with a price greater than $40, you’d filter by “Price greater than 40,” and then select Count, because you want Metabase to count how many orders matched your filter.
+* **Sum of …:** Sum of all the values in a column. This is really easy to get mixed up with Count — just remember that Count counts each *row*, but Sum adds up all the values in a single field. You’d use Sum to get your total revenue dollar amount, for example.
+* **Average of …:** Average of all the values in a column.
+* **Number of distinct values of…:** Number of unique values in all the cells of a single column. This would be useful to find out things like how many different *types* of products were sold last month (not how many were sold in total).
+* **Cumulative sum of…:** This gives you a running total of a specific column. This will look exactly the same as Sum unless you break out your answer by day, week, month, etc. (See the next section about breaking out metrics.) An example would be total revenue over time.
+* **Cumulative count of rows:** This gives you a running total of the number of rows in the table over time. Just like `Cumulative sum of…`, this will look exactly the same as `Count of rows` unless you break out your answer a time field.
+* **Standard deviation of …:** A number which expresses how much the values of a column vary, plus or minus, from the average of that column.
+* **Minimum of …:** The minimum value present in the selected field.
+* **Maximum of …:** The maximum value present in the selected field.
 
 #### 3. Common Metrics
 
 If your admins have created any named metrics that are specific to your company or organization, they will be in this dropdown under the **Common Metrics** section. These might be things like your company’s official way of calculating revenue.
 
+#### 4. Custom Expressions
+Custom expressions allow you to do simple arithmetic within or between aggregation functions. For example, you could do `Average(FieldX) + Sum(FieldY)` or `Max(FieldX - FieldY)`, where `FieldX` and `FieldY` are fields in the currently selected table. You can either use your cursor to select suggested functions and fields, or simply start typing and use the autocomplete. If you are a Metabase administrator, you can now also use custom aggregation expressions when creating defined common metrics in the Admin Panel.
+
+Currently, you can use any of the basic aggregation functions listed in #2 above in your custom expression, and these basic mathematical operators: `+`, `-`, `*` (multiply), `/` (divide). You can also use parentheses to clarify the order of operations.
+
 ### Breaking Out Metrics: Add a group
 ---
 Metrics are great by themselves if the answer you’re looking for is just a simple, single number. But often you'll want to know more detailed information than that.
@@ -100,7 +110,7 @@ A custom field is helpful if you need to create a new field based on a calculati
 
 ![Custom fields](images/custom-fields/blank-formula.png)
 
-Say we had a table of individual baseball games, and we wanted to figure out how many more runs the home team scored than the away team (the “run differential”). If we have one field with the home team’s score, and another field with the away team’s score, we could type a formula like this:
+Say we had a table of baseball games, each row representing a single game, and we wanted to figure out how many more runs the home team scored than the away team (the “run differential”). If we have one field with the home team’s score, and another field with the away team’s score, we could type a formula like this:
 
 ![Formula](images/custom-fields/filled-formula.png)
 

docs/users-guide/05-sharing-answers.md

@@ -9,38 +9,39 @@ Whenever you’ve arrived at an answer that you want to save for later, click th
 
 A pop-up box will appear, you to give your question a name and a description. We suggest phrasing the names for your questions in the form of a question, such as, “How many customers did we have last month?” After saving your question, you'll be asked if you want to add it to a dashboard.
 
-Now, whenever you want to refer to your question again, you can find it in the saved questions list by clicking on the **Questions** link from the main navigation. To edit your question, go to it and click the pencil icon in the top-right.
+Now, whenever you want to refer to your question again you can find it in the saved questions list by clicking on the **Questions** link from the main navigation. To edit your question, go to it and click the pencil icon in the top-right.
 
 ### Organizing and Finding your Saved Questions
-
-
 After your team has been using Metabase for a while, you’ll probably end up with lots of saved questions. The Questions page has several tools that’ll help you organize things and find what you’re looking for.
 
 ![Questions](images/saved-questions.png)
 
-#### Shortcuts
-In the top left, you’ll find shortcuts to your favorite questions (mark a question as a favorite by clicking on the star icon that appears on the far right when you hover over it), questions you’ve recently viewed, questions that you’ve saved personally, and popular questions that are used the most by your team.
-
-#### Search
-You can search for a question by typing keywords into the **Search for a question** area.
+#### Collections
+Administrators of Metabase can create collections to put saved questions in. Depending on the permissions you've been given to collections, you'll be able to view the questions inside, edit them, and move questions from one collection to another. Questions that aren't saved in any collection will appear in the "Everything else" section of the main Questions page, and are visible to all Metabase users in your organization. If you're an administrator of your Metabase instance, here are [instructions for creating collections and managing permissions](../administration-guide/06-collections.md).
 
 #### Labels
-One great way to organize your questions is to label them. Create and organize your team’s labels by clicking on the **Labels** heading in the left menu on the Questions page. To create a label, just choose a color (or emoji!) for it, give it a name, and click **Create Label**. You can edit or delete a label by hovering of a label and clicking the **Edit** or **X** icon. You can create labels that pertain to different teams, projects, products, reports, dashboards, or whatever you want!
+Older versions of Metabase included a way to add labels to your questions, but this feature will be going away in a future version of Metabase. Currently, if your team was already using labels, you'll still be able to edit and apply them to questions. Here are some [suggestions for switching from labels to collections](../administration-guide/06-collections.md#what-about-labels).
 
-You can assign as many labels as you want to your questions. Just hover over a question in your list and click the label icon, then pick the label(s) you want to apply to the question.
+#### Shortcuts
+At the top of lists of saved questions you’ll find a dropdown with shortcuts to your favorite questions (mark a question as a favorite by clicking on the star icon that appears when you hover over it), questions you’ve recently viewed, questions that you’ve saved personally, and popular questions that are used the most by your team.
+
+#### Search and filtering
+On the main Questions page, you can search through all of your collections for a particular question using the search box in the top-right. You can also filter lists of saved questions by typing in the `Filter the list…` area.
 
-![Actions](images/question-actions.png)
+#### Moving
+To move a question into a collection, or from one collection to another, hover over it and click on the right-arrow icon that appears on the far right of the question. Note that you have to have permission to edit the collection that you're moving a question into, and the collection you're moving the question out of.
 
-If you have several questions that you want to give the same label to, just click the checkbox on the left side of each question’s title when you hover over it to select your questions, then click the Labels dropdown at the top of the page.
+#### Archiving
+Sometimes questions outlive their usefulness and need to be sent to Question Heaven. To archive a question, just click on the box icon that appears on the far right when you hover over a question. Collections can also be archived and unarchived, but only by Metabase administrators.
 
-![Checkbox](images/question-checkbox.png)
+Note that archiving a question removes it from all dashboards or Pulses where it appears, so be careful!
 
-Once you’ve created a label, it’ll appear in the list on the left side of the screen. Clicking on a label, either in the list of labels or on an individual question, will show you all the questions that have that label.
+If you have second thoughts and want to bring an archived question back, you can see all your archived questions from the **Archive** icon at the top-right of the Questions page. To unarchive a question, hover over it and click the box icon that appears on the far right.
 
-#### Archiving
-Sometimes questions outlive their usefulness and need to be sent to Question Heaven. To archive a question, just click on the box icon that appears on the far right when you hover over a question. You can also archive multiple questions the same way you apply labels to multiple questions.
+#### Selecting multiple questions
+Clicking on the icon to the left of questions let's you select several at once so that you can move or archive many questions at once.
 
-If you have second thoughts and want to bring an archived question back, you can see all your archived questions from the **Archive** link at the bottom of the left menu. To unarchive a question, hover over it and click the box icon that appears on the far right.
+![Selecting questions](images/question-checkbox.png)
 
 ---
 

docs/users-guide/start.md

@@ -4,7 +4,7 @@
 
 *   [What Metabase does](01-what-is-metabase.md)
 *   [The basics of database terminology](02-database-basics.md)
-*   [What Metabase questions are made up of](03-asking-questions.md)
+*   [Asking questions in Metabase](03-asking-questions.md)
 *   [How to visualize the answers to questions](04-visualizing-results.md)
 *   [Sharing and organizing your saved questions](05-sharing-answers.md)
 *   [Creating dashboards](06-dashboards.md)

frontend/src/metabase/App.jsx

@@ -2,6 +2,8 @@ import React, { Component, PropTypes } from "react";
 
 import Navbar from "metabase/nav/containers/Navbar.jsx";
 
+import UndoListing from "metabase/containers/UndoListing";
+
 export default class App extends Component {
     render() {
         const { children, location } = this.props;
@@ -9,8 +11,8 @@ export default class App extends Component {
             <div className="spread flex flex-column">
                 <Navbar location={location} className="flex-no-shrink" />
                 {children}
+                <UndoListing />
             </div>
         )
     }
 }
-

frontend/src/metabase/admin/databases/components/CreatedDatabaseModal.jsx

@@ -15,7 +15,7 @@ export default class CreatedDatabaseModal extends Component {
         return (
             <ModalContent
                 title="Your database has been added!"
-                closeFn={onClose}
+                onClose={onClose}
             >
                 <div className="Form-inputs mb4">
                     <p>