CirlceCI: Docker build for release branches.

🎉  Add: data source to run queries on top of query results

.gitignore

@@ -9,14 +9,8 @@ celerybeat-schedule*
 \#*#
 *~
 _build
-
-# Vagrant related
-.vagrant
-Berksfile.lock
-redash/dump.rdb
+.vscode
 .env
-.ruby-version
-venv
 
 dump.rdb
 

CHANGELOG.md

@@ -1,5 +1,201 @@
 # Change Log
 
+## v3.0.0 - UNRELEASED
+
+### Added
+
+- Query Result data source (run queries on query results).
+- Athena: option to load schema from Glue catalog. @myouju
+- Allow running any command inside the container via the Docker entrypoint script. @jezdez
+- Make invitation token max age configurable. @hhamalai
+- Redshift: add support for the new ACM root CA.
+- Redshift: support for Spectrum (external) tables. @atharvai
+- MongoDB: option to set allowDiskUse in queries.
+- Option to disable SQLAlchemy connection pool.
+- Option to set a time limit on adhoc queries.
+- Option to disable sending an invite to a new user.
+- Azure SQL Data Warehouse query runner. @kitsuyui
+- Prometheus query runner. @yershalom
+- Option to set the Flask-Limiter storage engine.
+- Option to set UnicodeWriter's error handling method. @fan-t-endo
+- PostgreSQL: SSL configuration option. @TylerBrock
+- Counter visualization: additional formatting options. @deecay
+- Query based drop down parameter. @rohithmenon
+- MySQL: multiple queries support & connection timeout.
+- Ability to select all in multi-filter. @Posnet
+- LDAP (Active Directory) support. @amarjayr
+
+### Changed
+
+- Copy parameters when forking a query. @kyoshidajp
+- Prevent using Query API Key with refresh API (previously it was just failing).
+- Reduce boilerplate in frontend code.
+- Set auto focus in first input items. @kyoshidajp
+- Update gunicorn to latest version.
+- Make log format configurable. 
+- Sort series by name. 
+- Allow setting test file with Docker test run. @meinac
+- Use outdated queries count stored already in Redis.
+- Show links based on permissions the user have. 
+- Cassandra: update driver version. @yershalom
+- Docker-Compose: update configuration to always restart services. @muddydixon
+- Modernize Python 2 code to get ready for Python 3. @cclauss
+- Cohort visualization: make it friendlier to use by better handle gaps in data, so it's easier to generate the data needed.
+- Use a different markdown library. @alexmuller
+- Salesforce: improve error messages we receive from the API. @akiray03
+- Custom JS code visualization improvements. @deecay
+- DQL: Update version to 0.5.24. @aterreno
+- Cassandra: get_schema support for both C* 2.x and 3.x, support for SortedSet type serialization. (@mfouilleul)
+- Replace deprecated ng-annotate with babel plugin. @44px
+- Update Python dependencies to recent versions. @alison985
+- Bootstrap script: create /opt/redash directory only if it doesn't exist. @isomura
+- Bootstrap script: make use of REDASH_BASE_PATH variable in setup script. @sylvain
+
+### Fixed
+
+- Require full data source access to fork a query.
+- API key of one query could be used to get results of another one.
+- Delete group id from user object when deleting the group. @kyoshidajp
+- Sorting of X axis wasn't working for Box plot type visualizations. @deecay
+- Exporting query results as excel was failing when one of the columns had array data. @kyoshidajp
+- Show query editor's Archive/Publish Query drop-down only on saved queries. @cyriac
+- Move misplaced configuration in docker-compose.production.yml. @yutannihilation
+- MySQL: support UTF8 schema.
+- TreasureData queries were failing when returning 0 rows.
+- Use series color for Boxplot. @deecay
+- Revoke permission should respect to given grantee and access type. @meinac
+- Fixed eslint "Cannot read property 'length' of undefined" error. @kravets-levko
+- Don't crash query editor when there are unclosed curly brackets. 
+- Error value in charts wasn't displayed if it was 0.
+- Prevent line breaks in EditInPlace description when using Firefox. @alexmuller
+- Queries#all_queries was sometimes returning wrong number of queries.
+- record_event fails for API events.
+- Cancel button on tasks admin page was broken.
+- Remove deprecated cx_Oracle types. @queeno
+- Textbox widgets were updating their value even when editor was cancelled. @alison985
+- Collaborators couldn't edit visualizations or schedule.
+- Use series color for error bar. @deecay
+- Upgrade script was using the wrong restart command on new AMIs.
+
+## v2.0.1 - 2017-10-22
+
+This is a patch release, that adds support for Redshift ACM certificates (see #2044 for details).
+
+
+## v2.0.0 - 2017-08-08
+
+### Added
+
+- [Cassandra] Support for UUID serializing and setting protocol version. @mfouilleul
+- [BigQuery] Add maximumBillingTier to BigQuery configuration. @dotneet
+- Add the propertyOrder field to specify order of data source settings. @rmakulov
+- Add Plotly based Boxplot visualization. @deecay
+- [Presto] Add: query cancellation support. @fbertsch
+- [MongoDB] add $oids JSON extension.
+- [PostgreSQL] support for loading materialized views in schema.
+- [MySQL] Add option to hide SSL settings.
+- [MySQL] support for RDS MySQL and SSL.
+- [Google Analytics] support for mcf queries & better errors.
+- Add: static enum parameter type. @rockwotj
+- Add: option to hide pivot table controls. @deecay
+- Retry reload of query results if it had an error.
+- [Data Sources] Add: MemSQL query runner. @alexanderlz
+- "Dumb" recents option (see #1779 for details)
+- Athena: direct query runner using the instead of JDBC proxy. @laughingman7743
+- Optionally support parameters in embeds. @ziahamza
+- Sorting ability in alerts view.
+- Option to change default encoding of CSV writer. @yamamanx
+- Ability to set dashboard level filters from UI.
+- CLI command to open IPython shell.
+- Add link to query page from admin view. @miketheman
+- Add the option to write logs to STDOUT instead of STDERR. @eyalzek
+- Add limit parameter to tasks API. @alexpekurovsky
+- Add SQLAlchemy pool settings.
+- Support for category type y axis.
+- Add 12 & 24 hours refresh rate option to dashboards.
+
+### Changed
+
+- Upgrade Google API client library for all Google data sources. @ahamino
+- [JIRA JQL] change default max results limit from 50 to 1000. @jvanegmond
+- Upgrade to newer Plotly version. @deecay
+- [Athena] Configuration flag to disable query annotations for Athena. @suemoc
+- Ignore extra columns in CSV output. @alexanderlz
+- [TreasureData] improve error handling and upgrade client.
+- [InfluxDB] simpler test connection query (show databases requires admin).
+- [MSSQL] Mark integers as decimals as well, as sometimes decimal columns being returned
+  with integer column type.
+- [Google Spreadsheets] add timeout to requests.
+- Sort dashboards list by name. @deecay
+- Include Celery task name in statsd metrics.
+- Don't include paused datasource's queries in outdated queries count.
+- Cohort: handle the case where the value/total might be strings.
+- Query results: better type guessing on the client side.
+- Counter: support negative indexes to iterate from the end of the results.
+- Data sources and destinations configuration: change order of name and type (type first now).
+- Show API Key in a modal dialog instead of alert.
+- Sentry: upgrade client version.
+- Sentry: don't install logging hook.
+- Split refresh schemas into separate tasks and add a timeout.
+- Execute scheduled queries with parameters using their default value.
+- Keep track of last query execution (including failed ones) for scheduling purposes.
+- Same view for input on search result page as in header. @44px
+- Metrics: report endpoints without dots for metrics.
+- Redirect to / when org not found.
+- Improve parameters label placement. @44px
+- Auto-publish queries when they are named (with option to disable; #1830).
+- Show friendly error message in case of duplicate data source name.
+- Don't allow saving dashboard with empty name.
+- Enable strict checking for Angular DI.
+- Disable Angular debug info (should improve performance).
+- Update to Webpack 2. @44px
+- Remove /forgot endpoint if REDASH_PASSWORD_LOGIN_ENABLED is false. @amarjayr
+- Docker: make Gunicorn worker count configurable. @unixwitch
+- Snowflake support is no longer enabled by default.
+- Enable memory optimization for Excel exporter.
+
+### Fixed
+
+- Fix: set default values in options to enable 'default: True' for checkbox. @rmakulov
+- Support MULTI_ORG again.
+- [Google Spreadsheets] handle distant future dates.
+- [SQLite] better handle utf-8 error messages.
+- Fix: don't remove locks for queries with task status of PENDING.
+- Only split columns with __/:: that end with filter/MultiFilter.
+- Alert notifications fail (sometime) with a SQLAlchemy error.
+- Safeguard against empty query results when checking alert status. @danielerapati
+- Delete data source doesn't work when query results referenced by queries.
+- Fix redirect to /setup on the last setup step. @44px
+- Cassandra: use port setting in connection options. @yershalom
+- Metrics: table name wasn't found for count queries.
+- BigQuery wasn't loading due to bad import.
+- DynamicForm component was inserting empty values.
+- Clear null values from data source options dictionary.
+- /api/session API call wasn't working when multi tenancy enabled
+- If column had no type it would use previous column's type.
+- Alert destination details were not updating.
+- When setting rearm on a new alert, it wasn't persisted.
+- Salesforce: sandbox parameter should be optional. @msnider
+- Alert page wasn't properly linked from alerts list. @alison985
+- PostgreSQL passwords with spaces were not supported. (#1056)
+- PivotTable wasn't updating after first save.
+
+
+## v1.0.3 - 2017-04-18
+
+### Fixed
+
+- Fix: sort by column no longer working.
+
+## v1.0.2 - 2017-04-18
+
+### Fixed
+
+- Fix: favicon wasn't showing up.
+- Fix: support for unicode in dashboard tags. @deecay
+- Fix: page freezes when rendering large result set.
+- Fix: chart embeds were not rendering in PhantomJS.
+
 ## v1.0.1 - 2017-04-02
 
 ### Added
@@ -39,8 +235,11 @@
 - Fix: page header wasn't updating on dashboards page @MichaelJAndy
 - Fix: keyboard shortcuts didn't work in parameter inputs
 
-## v1.0.0-rc.2 - 2017-02-22
+### Other
 
+- Change default job expiry times to: job lock expire after 12 hours (previously: 6 hours) and Celery task result object expire after 4 hours (previously: 1 hour). @shimpeko
+
+## v1.0.0-rc.2 - 2017-02-22
 
 ### Changed
 
@@ -171,109 +370,110 @@ We're releasing a new upgrade script -- see [here](https://redash.io/help-onprem
 
 ### Added
 
-61fe16e #1374: Add: allow '*' in REDASH_CORS_ACCESS_CONTROL_ALLOW_ORIGIN (Allen Short)  
-2f09043 #1113: Add: share modify/access permissions for queries and dashboard (whummer)  
-3db0eea #1341: Add: support for specifying SAML nameid-format (zoetrope)  
-b0ecd0e #1343: Add: support for local SAML metadata file (zoetrope)  
-0235d37 #1335: Add: allow changing alert email subject. (Arik Fraimovich)  
-2135dfd #1333: Add: control over y axis min/max values (Arik Fraimovich)  
-49e788a #1328: Add: support for snapshot generation service (Arik Fraimovich)  
-229ca6c #1323: Add: collect runtime metrics for Celery tasks (Arik Fraimovich)  
-931a1f3 #1315: Add: support for loading BigQuery schema (Arik Fraimovich)  
-39b4f9a #1314: Add: support MongoDB SSL connections (Arik Fraimovich)  
-ca1ca9b #1312: Add: additional configuration for Celery jobs (Arik Fraimovich)  
-fc00e61 #1310: Add: support for date/time with seconds parameters (Arik Fraimovich)  
-d72a198 #1307: Add: API to force refresh data source schema (Arik Fraimovich)  
-beb89ec #1305: Add: UI to edit dashboard text box widget (Kazuhito Hokamura)  
-808fdd4 #1298: Add: JIRA (JQL) query runner (Arik Fraimovich)  
-ff9e844 #1280: Add: configuration flag to disable scheduled queries (Hirotaka Suzuki)  
-ef4699a #1269: Add: Google Drive federated tables support in BigQuery query runner (Kurt Gooden)  
-2eeb947 #1236: Add: query runner for Cassandra and ScyllaDB (syerushalmy)  
-10b398e #1249: Add: override slack webhook parameters (mystelynx)  
-2b5e340 #1252: Add: Schema loading support for Presto query runner (using information_schema) (Rohan Dhupelia)  
-2aaf5dd #1250: Add: query snippets feature (Arik Fraimovich)  
-8d8af73 #1226: Add: Sankey visualization (Arik Fraimovich)  
-a02edda #1222: Add: additional results format for sunburst visualization (Arik Fraimovich)  
-0e70188 #1213: Add: new sunburst sequence visualization (Arik Fraimovich)  
-9a6d2d7 #1204: Add: show views in schema browser for Vertica data sources (Matthew Carter)  
-600afa5 #1138: Add: ability to register user defined function (UDF) resources for BigQuery DataSource/Query (fabito)  
-b410410 #1166: Add: "every 14 days" refresh option (Arik Fraimovich)  
-906365f #967: Add: extend ElasticSearch query_runner to support aggregations (lloydw)
+- 61fe16e #1374: Add: allow '*' in REDASH_CORS_ACCESS_CONTROL_ALLOW_ORIGIN (Allen Short)
+- 2f09043 #1113: Add: share modify/access permissions for queries and dashboard (whummer)
+- 3db0eea #1341: Add: support for specifying SAML nameid-format (zoetrope)
+- b0ecd0e #1343: Add: support for local SAML metadata file (zoetrope)
+- 0235d37 #1335: Add: allow changing alert email subject. (Arik Fraimovich)
+- 2135dfd #1333: Add: control over y axis min/max values (Arik Fraimovich)
+- 49e788a #1328: Add: support for snapshot generation service (Arik Fraimovich)
+- 229ca6c #1323: Add: collect runtime metrics for Celery tasks (Arik Fraimovich)
+- 931a1f3 #1315: Add: support for loading BigQuery schema (Arik Fraimovich)
+- 39b4f9a #1314: Add: support MongoDB SSL connections (Arik Fraimovich)
+- ca1ca9b #1312: Add: additional configuration for Celery jobs (Arik Fraimovich)
+- fc00e61 #1310: Add: support for date/time with seconds parameters (Arik Fraimovich)
+- d72a198 #1307: Add: API to force refresh data source schema (Arik Fraimovich)
+- beb89ec #1305: Add: UI to edit dashboard text box widget (Kazuhito Hokamura)
+- 808fdd4 #1298: Add: JIRA (JQL) query runner (Arik Fraimovich)
+- ff9e844 #1280: Add: configuration flag to disable scheduled queries (Hirotaka Suzuki)
+- ef4699a #1269: Add: Google Drive federated tables support in BigQuery query runner (Kurt Gooden)
+- 2eeb947 #1236: Add: query runner for Cassandra and ScyllaDB (syerushalmy)
+- 10b398e #1249: Add: override slack webhook parameters (mystelynx)
+- 2b5e340 #1252: Add: Schema loading support for Presto query runner (using information_schema) (Rohan Dhupelia)
+- 2aaf5dd #1250: Add: query snippets feature (Arik Fraimovich)
+- 8d8af73 #1226: Add: Sankey visualization (Arik Fraimovich)
+- a02edda #1222: Add: additional results format for sunburst visualization (Arik Fraimovich)
+- 0e70188 #1213: Add: new sunburst sequence visualization (Arik Fraimovich)
+- 9a6d2d7 #1204: Add: show views in schema browser for Vertica data sources (Matthew Carter)
+- 600afa5 #1138: Add: ability to register user defined function (UDF) resources for BigQuery DataSource/Query (fabito)
+- b410410 #1166: Add: "every 14 days" refresh option (Arik Fraimovich)
+- 906365f #967: Add: extend ElasticSearch query_runner to support aggregations (lloydw)
 
 ### Changed
 
-2de4aa2 #1395: Change: switch to requests in URL query runner (Arik Fraimovich)
-db1a941 #1392: Change: Update documentation links to point at the new location. (Arik Fraimovich)
-002f794 #1368: Change: added ability to disable auto update in admin views (Arik Fraimovich)  
-aa5d14e #1366: Change: improve error message for exception in the Python query runner (deecay)  
-880627c #1355: Change: pass the user object to the run_query method (Arik Fraimovich)  
-23c605b #1342: SAML: specify entity id (zoetrope)  
-015b1dc #1334: Change: allow specifying recipient address when sending email test message (Arik Fraimovich)  
-39aaa2f #1292: Change: improvements to map visualization (Arik Fraimovich)  
-b22191b #1332: Change: upgrade Python packages (Arik Fraimovich)  
-23ba98b #1331: Celery: Upgrade Celery to more recent version. (Arik Fraimovich)  
-3283116 #1330: Change: upgrade Requests to latest version. (Arik Fraimovich)  
-39091e0 #1324: Change: add more logging and information for refresh schemas task (Arik Fraimovich)  
-462faea #1316: Change: remove deprecated settings (Arik Fraimovich)  
-73e1837 #1313: Change: more flexible column width calculation (Arik Fraimovich)  
-e8eb840 #1279: Change: update bootstrap.sh to support Ubuntu 16.04 (IllusiveMilkman)  
-8cf0252 #1262: Change: upgrade Plot.ly version and switch to smaller build (Arik Fraimovich)  
-0b79fb8 #1306: Change: paginate queries page & add explicit urls. (Arik Fraimovich)  
-41f99f5 #1299: Change: send Content-Type header (application/json) in query results responses (Tsuyoshi Tatsukawa)  
-dfb1a20 #1297: Change: update Slack configuration titles. (Arik Fraimovich)  
-8c1056c #1294: Change: don't annotate BigQuery queries (Arik Fraimovich)  
-a3cf92e #1289: Change: use key_as_string when available (ElasticSearch query runner) (Arik Fraimovich)  
-e155191 #1285: Change: do not display Oracle tablespace name in schema browser (Matthew Carter)  
-6cbc39c #1282: Change: deduplicate Google Spreadsheet columns (Arik Fraimovich)  
-4caf2e3 #1277: Set specific version of cryptography lib (Arik Fraimovich)  
-d22f0d4 #1216: Change: bootstrap.sh - use non interactive dist-upgrade (Atsushi Sasaki)  
-19530f4 #1245: Change: switch from CodeMirror to Ace editor (Arik Fraimovich)  
-dfb92db #1234: Change: MongoDB query runner set DB name as mandatory (Arik Fraimovich)  
-b750843 #1230: Change: annotate Presto queries with metadata (Noriaki Katayama)  
-5b20fe2 #1217: Change: install libffi-dev for Cryptography (Ubuntu setup script) (Atsushi Sasaki)  
-a9fac34 #1206: Change: update pymssql version to 2.1.3 (kitsuyui)  
-5d43cbe #1198: Change: add support for Standard SQL in BigQuery query runner (mystelynx)  
-84d0c22 #1193: Change: modify the argument order of moment.add function call (Kenya Yamaguchi)  
+- 2de4aa2 #1395: Change: switch to requests in URL query runner (Arik Fraimovich)
+- db1a941 #1392: Change: Update documentation links to point at the new location. (Arik Fraimovich)
+- 002f794 #1368: Change: added ability to disable auto update in admin views (Arik Fraimovich)
+- aa5d14e #1366: Change: improve error message for exception in the Python query runner (deecay)
+- 880627c #1355: Change: pass the user object to the run_query method (Arik Fraimovich)
+- 23c605b #1342: SAML: specify entity id (zoetrope)
+- 015b1dc #1334: Change: allow specifying recipient address when sending email test message (Arik Fraimovich)
+- 39aaa2f #1292: Change: improvements to map visualization (Arik Fraimovich)
+- b22191b #1332: Change: upgrade Python packages (Arik Fraimovich)
+- 23ba98b #1331: Celery: Upgrade Celery to more recent version. (Arik Fraimovich)
+- 3283116 #1330: Change: upgrade Requests to latest version. (Arik Fraimovich)
+- 39091e0 #1324: Change: add more logging and information for refresh schemas task (Arik Fraimovich)
+- 462faea #1316: Change: remove deprecated settings (Arik Fraimovich)
+- 73e1837 #1313: Change: more flexible column width calculation (Arik Fraimovich)
+- e8eb840 #1279: Change: update bootstrap.sh to support Ubuntu 16.04 (IllusiveMilkman)
+- 8cf0252 #1262: Change: upgrade Plot.ly version and switch to smaller build (Arik Fraimovich)
+- 0b79fb8 #1306: Change: paginate queries page & add explicit urls. (Arik Fraimovich)
+- 41f99f5 #1299: Change: send Content-Type header (application/json) in query results responses (Tsuyoshi Tatsukawa)
+- dfb1a20 #1297: Change: update Slack configuration titles. (Arik Fraimovich)
+- 8c1056c #1294: Change: don't annotate BigQuery queries (Arik Fraimovich)
+- a3cf92e #1289: Change: use key_as_string when available (ElasticSearch query runner) (Arik Fraimovich)
+- e155191 #1285: Change: do not display Oracle tablespace name in schema browser (Matthew Carter)
+- 6cbc39c #1282: Change: deduplicate Google Spreadsheet columns (Arik Fraimovich)
+- 4caf2e3 #1277: Set specific version of cryptography lib (Arik Fraimovich)
+- d22f0d4 #1216: Change: bootstrap.sh - use non interactive dist-upgrade (Atsushi Sasaki)
+- 19530f4 #1245: Change: switch from CodeMirror to Ace editor (Arik Fraimovich)
+- dfb92db #1234: Change: MongoDB query runner set DB name as mandatory (Arik Fraimovich)
+- b750843 #1230: Change: annotate Presto queries with metadata (Noriaki Katayama)
+- 5b20fe2 #1217: Change: install libffi-dev for Cryptography (Ubuntu setup script) (Atsushi Sasaki)
+- a9fac34 #1206: Change: update pymssql version to 2.1.3 (kitsuyui)
+- 5d43cbe #1198: Change: add support for Standard SQL in BigQuery query runner (mystelynx)
+- 84d0c22 #1193: Change: modify the argument order of moment.add function call (Kenya Yamaguchi)
 
 
 ### Fixed
 
-d6febb0 #1375: Fix: Download Dataset does not work when not logged in (Joshua Dechant)  
-96553ad #1369: Fix: missing format call in Elasticsearch test method (Adam Griffiths)  
-c57c765 #1365: Fix: compare retrieval times in UTC timezone (Allen Short)  
-37dff5f #1360: Fix: connection test was broken for MySQL (ichihara)  
-360028c #1359: Fix: schema loading query for Hive was wrong for non default schema (laughingman7743)  
-7ee41d4 #1358: Fix: make sure all calls to run_query updated with new parameter (Arik Fraimovich)  
-0d94479 #1329: Fix: Redis memory leak. (Arik Fraimovich)  
-7145aa2 #1325: Fix: queries API was doing N+1 queries in most cases (Arik Fraimovich)  
-cd2e927 #1311: Fix: BoxPlot visualization wasn't rendering on a dashboard (Arik Fraimovich)  
-a562ce7 #1309: Fix: properly render checkboxes in dynamic forms (Arik Fraimovich)  
-d48192c #1308: Fix: support for Unicode columns name in Google Spreadsheets (Arik Fraimovich)  
-e42f93f #1283: Fix: schema browser was unstable after opening a table (Arik Fraimovich)  
-170bd65 #1272: Fix: TreasureData get_schema method was returning array instead of string as column name (ariarijp)  
-4710c41 #1265: Fix: refresh modal not working for unsaved query (Arik Fraimovich)  
-bc3a5ab #1264: Fix: dashboard refresh not working (Arik Fraimovich)  
-6202d09 #1240: Fix: when shared dashboard token not found, return 404 (Wesley Batista)  
-93aac14 #1251: Fix: autocomplete went crazy when database has no autocomplete. (Arik Fraimovich)  
-b8eca28 #1246: Fix: support large schemas in schema browser (Arik Fraimovich)  
-b781003 #1223: Fix: Alert: when hipchat Alert.name is multibyte character, occur error. (toyama0919)  
-0b928e6 #1227: Fix: Bower install fails in vagrant (Kazuhito Hokamura)  
-a411af2 #1232: Fix: don't show warning when query string (parameters value) changes (Kazuhito Hokamura)  
-3dbb5a6 #1221: Fix: sunburst didn't handle all cases of path lengths (Arik Fraimovich)  
-a7cc1ee #1218: Fix: updated result not being saved when changing query text. (Arik Fraimovich)  
-0617833 #1215: Fix: email alerts not working (Arik Fraimovich)  
-78f65b1 #1187: Fix: read only users receive the permission error modal in query view (Arik Fraimovich)  
-bba801f #1167: Fix the version of setuptools on bootstrap script for Ubuntu (Takuya Arita)  
-ce81d69 #1160: Fix indentation in docker-compose-example.yml (Hirofumi Wakasugi)  
-dd759fe #1155: Fix: make all configuration values of Oracle required (Arik Fraimovich)  
+- d6febb0 #1375: Fix: Download Dataset does not work when not logged in (Joshua Dechant)
+- 96553ad #1369: Fix: missing format call in Elasticsearch test method (Adam Griffiths)
+- c57c765 #1365: Fix: compare retrieval times in UTC timezone (Allen Short)
+- 37dff5f #1360: Fix: connection test was broken for MySQL (ichihara)
+- 360028c #1359: Fix: schema loading query for Hive was wrong for non default schema (laughingman7743)
+- 7ee41d4 #1358: Fix: make sure all calls to run_query updated with new parameter (Arik Fraimovich)
+- 0d94479 #1329: Fix: Redis memory leak. (Arik Fraimovich)
+- 7145aa2 #1325: Fix: queries API was doing N+1 queries in most cases (Arik Fraimovich)
+- cd2e927 #1311: Fix: BoxPlot visualization wasn't rendering on a dashboard (Arik Fraimovich)
+- a562ce7 #1309: Fix: properly render checkboxes in dynamic forms (Arik Fraimovich)
+- d48192c #1308: Fix: support for Unicode columns name in Google Spreadsheets (Arik Fraimovich)
+- e42f93f #1283: Fix: schema browser was unstable after opening a table (Arik Fraimovich)
+- 170bd65 #1272: Fix: TreasureData get_schema method was returning array instead of string as column name (ariarijp)
+- 4710c41 #1265: Fix: refresh modal not working for unsaved query (Arik Fraimovich)
+- bc3a5ab #1264: Fix: dashboard refresh not working (Arik Fraimovich)
+- 6202d09 #1240: Fix: when shared dashboard token not found, return 404 (Wesley Batista)
+- 93aac14 #1251: Fix: autocomplete went crazy when database has no autocomplete. (Arik Fraimovich)
+- b8eca28 #1246: Fix: support large schemas in schema browser (Arik Fraimovich)
+- b781003 #1223: Fix: Alert: when hipchat Alert.name is multibyte character, occur error. (toyama0919)
+- 0b928e6 #1227: Fix: Bower install fails in vagrant (Kazuhito Hokamura)
+- a411af2 #1232: Fix: don't show warning when query string (parameters value) changes (Kazuhito Hokamura)
+- 3dbb5a6 #1221: Fix: sunburst didn't handle all cases of path lengths (Arik Fraimovich)
+- a7cc1ee #1218: Fix: updated result not being saved when changing query text. (Arik Fraimovich)
+- 0617833 #1215: Fix: email alerts not working (Arik Fraimovich)
+- 78f65b1 #1187: Fix: read only users receive the permission error modal in query view (Arik Fraimovich)
+- bba801f #1167: Fix the version of setuptools on bootstrap script for Ubuntu (Takuya Arita)
+- ce81d69 #1160: Fix indentation in docker-compose-example.yml (Hirofumi Wakasugi)
+- dd759fe #1155: Fix: make all configuration values of Oracle required (Arik Fraimovich)
 
 ### Docs
-a69ee0c #1225: Fix: RST formatting of the Vagrant documentation (Kazuhito Hokamura)  
-03837c0 #1242: Docs: add warning re. quotes on column names and BigQuery (Ereli)  
-9a98075 #1255: Docs: add documentation for InfluxDB (vishesh92)  
-e0485de #1195: Docs: fix typo in maintenance page title (Antoine Augusti)  
-7681d3e #1164: Docs: update permission documentation (Daniel Darabos)  
-bcd3670 #1156: Docs: add SSL parameters to nginx configuration (Josh Cox)  
+
+- a69ee0c #1225: Fix: RST formatting of the Vagrant documentation (Kazuhito Hokamura)
+- 03837c0 #1242: Docs: add warning re. quotes on column names and BigQuery (Ereli)
+- 9a98075 #1255: Docs: add documentation for InfluxDB (vishesh92)
+- e0485de #1195: Docs: fix typo in maintenance page title (Antoine Augusti)
+- 7681d3e #1164: Docs: update permission documentation (Daniel Darabos)
+- bcd3670 #1156: Docs: add SSL parameters to nginx configuration (Josh Cox)
 
 ## v0.11.1.b2095 - 2016-08-02
 
@@ -291,73 +491,77 @@ Also, this release includes numerous smaller features, improvements, and bug fix
 A big thank you goes to all who contributed code and documentation in this release: @AntoineAugusti, @James226, @adamlwgriffiths, @alexdebrie, @anthony-coble, @ariarijp, @dheerajrav, @edwardsharp, @machira, @nabilblk, @ninneko, @ordd, @tomerben,  @toru-takahashi, @vishesh92, @vorakumar and @whummer.
 
 ### Added
-d5e5b24 #1136: Feature: add --org option to all relevant CLI commands. (@adamlwgriffiths)  
-87e25f2 #1129: Feature: support for JSON query formatting (Mongo, ElasticSearch) (@arikfr)  
-6bb2716 #1121: Show error when failing to communicate with server (@arikfr)  
-f21276e #1119: Feature: add UI to delete alerts (@arikfr)  
-8656540 #1069: Feature: UI for query parameters (@arikfr)  
-790128c #1067: Feature: word cloud visualization (@anthony-coble)  
-8b73a2b #1098: Feature: UI for alert destinations & new destination types (@alexdebrie)  
-1fbeb5d #1092: Add Heroku support (@adamlwgriffiths)  
-f64622d #1089: Add support for serialising UUID type within MSSQL #961 (@James226)  
-857caab #1085: Feature: API to pause a data source (@arikfr)  
-214aa3b #1060: Feature: support configuring user's groups with SAML (@vorakumar)  
-e20a005 #1007: Issue#1006:  Make bottom margin editable for Chart visualization (@vorakumar)  
-6e0dd2b #1063: Add support for date/time Y axis (@tomerben)  
-b5a4a6b #979: Feature: Add CLI to edit group permissions (@ninneko)  
-6d495d2 #1014: Add server-side parameter handling for embeds (@whummer)  
-5255804 #1091: Add caching for queries used in embeds (@whummer)  
+
+- d5e5b24 #1136: Feature: add --org option to all relevant CLI commands. (@adamlwgriffiths)
+- 87e25f2 #1129: Feature: support for JSON query formatting (Mongo, ElasticSearch) (@arikfr)
+- 6bb2716 #1121: Show error when failing to communicate with server (@arikfr)
+- f21276e #1119: Feature: add UI to delete alerts (@arikfr)
+- 8656540 #1069: Feature: UI for query parameters (@arikfr)
+- 790128c #1067: Feature: word cloud visualization (@anthony-coble)
+- 8b73a2b #1098: Feature: UI for alert destinations & new destination types (@alexdebrie)
+- 1fbeb5d #1092: Add Heroku support (@adamlwgriffiths)
+- f64622d #1089: Add support for serialising UUID type within MSSQL #961 (@James226)
+- 857caab #1085: Feature: API to pause a data source (@arikfr)
+- 214aa3b #1060: Feature: support configuring user's groups with SAML (@vorakumar)
+- e20a005 #1007: Issue#1006:  Make bottom margin editable for Chart visualization (@vorakumar)
+- 6e0dd2b #1063: Add support for date/time Y axis (@tomerben)
+- b5a4a6b #979: Feature: Add CLI to edit group permissions (@ninneko)
+- 6d495d2 #1014: Add server-side parameter handling for embeds (@whummer)
+- 5255804 #1091: Add caching for queries used in embeds (@whummer)
 
 ### Changed
-0314313 #1149: Presto QueryRunner supports tinyint and smallint (@toru-takahashi)  
-8fa6fdb #1030: Make sure data sources list ordered by id (@arikfr)  
-8df822e #1141: Make create data source button more prominent (@arikfr)  
-96dd811 #1127: Mark basic_auth_password as secret (@adamlwgriffiths)  
-ad65391 #1130: Improve Slack notification style (@AntoineAugusti)  
-df637e3 #1116: Return meaningful error when there is no cached result. (@arikfr)  
-65635ec #1102: Switch to HipChat V2 API (@arikfr)  
-14fcf01 #1072: Remove counter from the tasks Done tab (as it always shows 50). #1047 (@arikfr)  
-1a1160e #1062: DynamoDB: Better exception handling (@arikfr)  
-ed45dcb #1044: Improve vagrant flow (@staritza)  
-8b5dc8e #1036: Add optional block for more scripts in template (@arikfr)  
+
+- 0314313 #1149: Presto QueryRunner supports tinyint and smallint (@toru-takahashi)
+- 8fa6fdb #1030: Make sure data sources list ordered by id (@arikfr)
+- 8df822e #1141: Make create data source button more prominent (@arikfr)
+- 96dd811 #1127: Mark basic_auth_password as secret (@adamlwgriffiths)
+- ad65391 #1130: Improve Slack notification style (@AntoineAugusti)
+- df637e3 #1116: Return meaningful error when there is no cached result. (@arikfr)
+- 65635ec #1102: Switch to HipChat V2 API (@arikfr)
+- 14fcf01 #1072: Remove counter from the tasks Done tab (as it always shows 50). #1047 (@arikfr)
+- 1a1160e #1062: DynamoDB: Better exception handling (@arikfr)
+- ed45dcb #1044: Improve vagrant flow (@staritza)
+- 8b5dc8e #1036: Add optional block for more scripts in template (@arikfr)
 
 ### Fixed
-dbd48e1 #1143: Fix: use the email input type where needed (@ariarijp)  
-7445972 #1142: Fix: dates in filters might be duplicated (@arikfr)  
-5d0ed02 #1140: Fix: Hive should use the enabled variable (@arikfr)  
-392627d #1139: Fix: Impala data source referencing wrong variable (@arikfr)  
-c5bfbba #1133: Fix: query scrolling issues (@vishesh92)  
-c01d266 #1128: Fix: visualization options not updating after changing type (@arikfr)  
-6bc0e7a #1126: Fix #669: save fails when doing partial save of new query (@arikfr)  
-3ce27b9 #1118: Fix: remove alerts for archived queries (@arikfr)  
-4fabaae #1117: Fix #1052: filter not working for date/time values (@arikfr)  
-c107c94 #1077: Fix: install needed dependencies to use Hive in Docker image (@nabilblk)  
-abc790c #1115: Fix: allow non integers in alert reference value (@arikfr)  
-4ec473c #1110: Fix #1109: mixed group permissions resulting in wrong permission (@arikfr)  
-1ca5262 #1099: Fix RST syntax for links (@adamlwgriffiths)  
-daa6c1c #1096: Fix typo in env variable VERSION_CHECK (@AntoineAugusti)  
-cd06d27 #1095: Fix: use create_query permission for new query button. (@ordd)  
-2bc0b27 #1061: Fix: area chart stacking doesn't work (@machira)  
-8c21e91 #1108: Remove potnetially concurrency not safe code form enqueue_query (@arikfr)  
-e831218 #1084: Fix #1049: duplicate alerts when data source belongs to multiple groups (@arikfr)  
-6edb0ca #1080: Fix typo (@jeffwidman)  
-64d7538 #1074: Fix: ElasticSearch wasn't using correct type names (@toyama0919)  
-3f90dd9 #1064: Fix: old task trackers were not really removed (@arikfr)  
-e10ecd2 #1058: Bring back filters if dashboard filters are enabled (@AntoineAugusti)  
-701035f #1059: Fix: DynamoDB having issues when setting host (@arikfr)  
-2924d4f #1040: Small fixes to visualizations view (@arikfr)  
-fec0d5f #1037: Fix: multi filter wasn't working with __ syntax (@dheerajrav)  
-b066ce4 #1033: Fix: only ask for notification permissions if wasn't denied (@arikfr)  
-960c416 #1032: Fix: make sure we return dashboards only for current org only (@arikfr)  
-b3844d3 #1029: Hive: close connection only if it exists (@arikfr)  
+
+- dbd48e1 #1143: Fix: use the email input type where needed (@ariarijp)
+- 7445972 #1142: Fix: dates in filters might be duplicated (@arikfr)
+- 5d0ed02 #1140: Fix: Hive should use the enabled variable (@arikfr)
+- 392627d #1139: Fix: Impala data source referencing wrong variable (@arikfr)
+- c5bfbba #1133: Fix: query scrolling issues (@vishesh92)
+- c01d266 #1128: Fix: visualization options not updating after changing type (@arikfr)
+- 6bc0e7a #1126: Fix #669: save fails when doing partial save of new query (@arikfr)
+- 3ce27b9 #1118: Fix: remove alerts for archived queries (@arikfr)
+- 4fabaae #1117: Fix #1052: filter not working for date/time values (@arikfr)
+- c107c94 #1077: Fix: install needed dependencies to use Hive in Docker image (@nabilblk)
+- abc790c #1115: Fix: allow non integers in alert reference value (@arikfr)
+- 4ec473c #1110: Fix #1109: mixed group permissions resulting in wrong permission (@arikfr)
+- 1ca5262 #1099: Fix RST syntax for links (@adamlwgriffiths)
+- daa6c1c #1096: Fix typo in env variable VERSION_CHECK (@AntoineAugusti)
+- cd06d27 #1095: Fix: use create_query permission for new query button. (@ordd)
+- 2bc0b27 #1061: Fix: area chart stacking doesn't work (@machira)
+- 8c21e91 #1108: Remove potnetially concurrency not safe code form enqueue_query (@arikfr)
+- e831218 #1084: Fix #1049: duplicate alerts when data source belongs to multiple groups (@arikfr)
+- 6edb0ca #1080: Fix typo (@jeffwidman)
+- 64d7538 #1074: Fix: ElasticSearch wasn't using correct type names (@toyama0919)
+- 3f90dd9 #1064: Fix: old task trackers were not really removed (@arikfr)
+- e10ecd2 #1058: Bring back filters if dashboard filters are enabled (@AntoineAugusti)
+- 701035f #1059: Fix: DynamoDB having issues when setting host (@arikfr)
+- 2924d4f #1040: Small fixes to visualizations view (@arikfr)
+- fec0d5f #1037: Fix: multi filter wasn't working with __ syntax (@dheerajrav)
+- b066ce4 #1033: Fix: only ask for notification permissions if wasn't denied (@arikfr)
+- 960c416 #1032: Fix: make sure we return dashboards only for current org only (@arikfr)
+- b3844d3 #1029: Hive: close connection only if it exists (@arikfr)
 
 ### Docs
-6bb09d8 #1146: Docs: add a link to settings documentation. (@adamlwgriffiths)  
-095e759 #1103: Docs: add section about monitoring (@AntoineAugusti)  
-e942486 #1090: Contributing Guide (@arikfr)  
-3037c4f #1066: Docs: command type-o fix. (@edwardsharp)  
-2ee0065 #1038: Add an ISSUE_TEMPLATE.md to direct people at the forum (@arikfr)  
-f7322a4 #1021: Vagrant docs: add purging the cache step (@ariarijp)  
+
+- 6bb09d8 #1146: Docs: add a link to settings documentation. (@adamlwgriffiths)
+- 095e759 #1103: Docs: add section about monitoring (@AntoineAugusti)
+- e942486 #1090: Contributing Guide (@arikfr)
+- 3037c4f #1066: Docs: command type-o fix. (@edwardsharp)
+- 2ee0065 #1038: Add an ISSUE_TEMPLATE.md to direct people at the forum (@arikfr)
+- f7322a4 #1021: Vagrant docs: add purging the cache step (@ariarijp)
 
 ---
 

CONTRIBUTING.md

@@ -6,7 +6,7 @@ The following is a set of guidelines for contributing to Redash. These are guide
 
 ## Quick Links:
 
-- [Feature Roadmap](https://trello.com/b/b2LUHU7A/re-dash-roadmap)
+- [Feature Roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap)
 - [Feature Requests](https://discuss.redash.io/c/feature-requests)
 - [Gitter Chat](https://gitter.im/getredash/redash) or [Slack](https://slack.redash.io)
 - [Documentation](https://redash.io/help/)
@@ -29,7 +29,7 @@ The following is a set of guidelines for contributing to Redash. These are guide
 - [Documentation](#documentation)
 - Design?
 
-[Addtional Notes](#additional-notes)
+[Additional Notes](#additional-notes)
 
 - [Release Method](#release-method)
 - [Code of Conduct](#code-of-conduct)
@@ -46,9 +46,9 @@ When creating a new bug report, please make sure to:
 
 ### Suggesting Enhancements / Feature Requests
 
-If you would like to suggest an enchancement or ask for a new feature:
+If you would like to suggest an enhancement or ask for a new feature:
 
-- Please check [the roadmap](https://trello.com/b/b2LUHU7A/re-dash-roadmap) for existing Trello card for what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
+- Please check [the roadmap](https://trello.com/b/b2LUHU7A/redash-roadmap) for existing Trello card for what you want to suggest/ask. If there is, feel free to upvote it to signal interest or add your comments.
 - If there is no existing card, open a thread in [the forum](https://discuss.redash.io/c/feature-requests) to start a discussion about what you want to suggest. Try to provide as much details and context as possible and include information about *the problem you want to solve* rather only *your proposed solution*.
 
 ### Pull Requests
@@ -56,7 +56,7 @@ If you would like to suggest an enchancement or ask for a new feature:
 - **Code contributions are welcomed**. For big changes or significant features, it's usually better to reach out first and discuss what you want to implement and how (we recommend reading: [Pull Request First](https://medium.com/practical-blend/pull-request-first-f6bb667a9b6#.ozlqxvj36)). This to make sure that what you want to implement is aligned with our goals for the project and that no one else is already working on it.
 - Include screenshots and animated GIFs in your pull request whenever possible.
 - Please add [documentation](#documentation) for new features or changes in functionality along with the code.
-- Please follow existing code style. We use PEP8 for Python and sensible style for Javascript.
+- Please follow existing code style. We use PEP8 for Python and sensible style for JavaScript.
 
 ### Documentation
 

Makefile

@@ -4,6 +4,7 @@ FULL_VERSION=$(VERSION)+b$(CIRCLE_BUILD_NUM)
 BASE_VERSION=$(shell python ./manage.py version | cut -d + -f 1)
 # VERSION gets evaluated every time it's referenced, therefore we need to use VERSION here instead of FULL_VERSION.
 FILENAME=$(CIRCLE_ARTIFACTS)/$(NAME).$(VERSION).tar.gz
+TEST_ARGS?=--with-coverage --cover-package=redash tests/
 
 deps:
 	if [ -d "./client/app" ]; then npm install; fi
@@ -17,4 +18,4 @@ upload:
 	python bin/release_manager.py $(CIRCLE_SHA1) $(BASE_VERSION) $(FILENAME)
 
 test:
-	nosetests --with-coverage --cover-package=redash tests/
+	nosetests $(TEST_ARGS)

README.md

@@ -43,7 +43,7 @@ You can try out the demo instance: http://demo.redash.io/ (login with any Google
 ## Reporting Bugs and Contributing Code
 
 * Want to report a bug or request a feature? Please open [an issue](https://github.com/getredash/redash/issues/new).
-* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://redash.io/help-onpremise/setup/setting-up-development-environment-using-vagrant.html), and make a pull request. We need all the help we can get!
+* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://redash.io/help-onpremise/dev/guide.html), and make a pull request. We need all the help we can get!
 
 ## License
 

bin/docker-entrypoint

@@ -19,7 +19,7 @@ scheduler() {
 }
 
 server() {
-  exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w4 redash.wsgi:app
+  exec /usr/local/bin/gunicorn -b 0.0.0.0:5000 --name redash -w${REDASH_WEB_WORKERS:-4} redash.wsgi:app
 }
 
 help() {
@@ -72,7 +72,10 @@ case "$1" in
   tests)
     tests
     ;;
-  *)
+  help)
     help
     ;;
+  *)
+    exec "$@"
+    ;;
 esac

bin/release_manager.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import os
 import sys
 import json
@@ -95,7 +96,7 @@ def get_changelog(commit_sha):
         try:
             pull_request = re.match("Merge pull request #(\d+)", subject).groups()[0]
             pull_request = " #{}".format(pull_request)
-        except Exception, ex:
+        except Exception as ex:
             pull_request = ""
 
         author = subprocess.check_output(['git', 'log', '-1', '--pretty=format:"%an"', parents.split(' ')[-1]])[1:-1]
@@ -124,7 +125,7 @@ def update_release(version, build_filepath, commit_sha):
         else:
             release = create_release(version, commit_sha)
 
-        print "Using release id: {}".format(release['id'])
+        print("Using release id: {}".format(release['id']))
 
         remove_previous_builds(release)
         response = upload_asset(release, build_filepath)
@@ -135,8 +136,8 @@ def update_release(version, build_filepath, commit_sha):
         if response.status_code != 200:
             raise exception_from_error("Failed updating release description", response)
 
-    except Exception, ex:
-        print ex
+    except Exception as ex:
+        print(ex)
 
 if __name__ == '__main__':
     commit_sha = sys.argv[1]

bin/upgrade

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import os
 import argparse
+import os
 import subprocess
 import sys
 from collections import namedtuple
@@ -111,7 +111,10 @@ def restart_services():
     # otherwise it won't notice that /opt/redash/current pointing at a different
     # directory.
     green("Restarting...")
+    try:
         run('sudo /etc/init.d/redash_supervisord restart')
+    except subprocess.CalledProcessError as e:
+        run('sudo service supervisor restart')
 
 
 def update_requirements(version_name):

circle.yml

@@ -18,7 +18,7 @@ test:
     - nosetests --with-xunit --xunit-file=$CIRCLE_TEST_REPORTS/junit.xml --with-coverage --cover-package=redash tests/
 deployment:
   github_and_docker:
-    branch: master
+    branch: [master, /release.*/]
     commands:
       - make pack
       # Skipping uploads for now, until master is stable.

client/.babelrc

@@ -1,4 +1,4 @@
 {
   "presets": ["es2015", "stage-2"],
-  "plugins": ["transform-object-assign"]
+  "plugins": ["angularjs-annotate", "transform-object-assign"]
 }

client/.eslintignore

@@ -1,2 +1,3 @@
 build/*.js
 config/*.js
+node_modules

client/.eslintrc.js

@@ -1,15 +1,30 @@
 module.exports = {
   root: true,
-  extends: 'airbnb-base',
+  extends: "airbnb-base",
+  settings: {
+    "import/resolver": "webpack"
+  },
   env: {
     "browser": true,
     "node": true
   },
   rules: {
     // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     'no-param-reassign': 0,
     'no-mixed-operators': 0,
     'no-underscore-dangle': 0,
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
+    "prefer-destructuring": "off",
+    "prefer-template": "off",
+    "no-restricted-properties": "off",
+    "no-restricted-globals": "off",
+    "no-multi-assign": "off",
+    "max-len": ['error', 120, 2, {
+      ignoreUrls: true,
+      ignoreComments: false,
+      ignoreRegExpLiterals: true,
+      ignoreStrings: true,
+      ignoreTemplateLiterals: true,
+    }]
   }
+};

client/app/assets/css/redash.css

@@ -4,12 +4,17 @@ body {
 
 body.headless {
   padding-top: 0px;
+  padding-bottom: 0px;
 }
 
 body.headless nav.app-header {
   display: none;
 }
 
+body.headless div#footer {
+  display: none;
+}
+
 a[ng-click] {
   cursor: pointer;
 }
@@ -432,6 +437,10 @@ counter-renderer counter-name {
   border: 1px solid rgba(0,0,0,.15);
 }
 
+.parameter-label {
+  display: block;
+}
+
 div.table-name {
   overflow: hidden;
   text-overflow: ellipsis;

client/app/assets/css/superflat_redash.css

@@ -1781,6 +1781,9 @@ fieldset[disabled] .form-control {
 textarea.form-control {
   height: auto;
 }
+textarea.v-resizable {
+  resize: vertical;
+}
 input[type="search"] {
   -webkit-appearance: none;
 }
@@ -8592,6 +8595,7 @@ a.thumbnail.active {
   padding: 0;
   white-space: nowrap;
   margin: 0;
+  margin-bottom: 10px;
   overflow: auto;
   box-shadow: inset 0 -2px 0 0 #eee;
 }

client/app/components/alerts/alert-subscriptions/index.js

@@ -0,0 +1,113 @@
+import { contains, without, compact } from 'underscore';
+import template from './alert-subscriptions.html';
+
+function controller($scope, $q, $sce, currentUser, AlertSubscription, Destination, toastr) {
+  'ngInject';
+
+  $scope.newSubscription = {};
+  $scope.subscribers = [];
+  $scope.destinations = [];
+  $scope.currentUser = currentUser;
+
+  $q
+    .all([
+      Destination.query().$promise,
+      AlertSubscription.query({ alertId: $scope.alertId }).$promise,
+    ])
+    .then((responses) => {
+      const destinations = responses[0];
+      const subscribers = responses[1];
+
+      const mapF = s => s.destination && s.destination.id;
+      const subscribedDestinations = compact(subscribers.map(mapF));
+
+      const subscribedUsers = compact(subscribers.map(s => !s.destination && s.user.id));
+
+      $scope.destinations = destinations.filter(d => !contains(subscribedDestinations, d.id));
+
+      if (!contains(subscribedUsers, currentUser.id)) {
+        $scope.destinations.unshift({ user: { name: currentUser.name } });
+      }
+
+      $scope.newSubscription.destination = $scope.destinations[0];
+      $scope.subscribers = subscribers;
+    });
+
+  $scope.destinationsDisplay = (d) => {
+    if (!d) {
+      return '';
+    }
+
+    let destination = d;
+    if (d.destination) {
+      destination = destination.destination;
+    } else if (destination.user) {
+      destination = {
+        name: `${d.user.name} (Email)`,
+        icon: 'fa-envelope',
+        type: 'user',
+      };
+    }
+
+    return $sce.trustAsHtml(`<i class="fa ${destination.icon}"></i>&nbsp;${destination.name}`);
+  };
+
+  $scope.saveSubscriber = () => {
+    const sub = new AlertSubscription({ alert_id: $scope.alertId });
+    if ($scope.newSubscription.destination.id) {
+      sub.destination_id = $scope.newSubscription.destination.id;
+    }
+
+    sub.$save(
+      () => {
+        toastr.success('Subscribed.');
+        $scope.subscribers.push(sub);
+        $scope.destinations = without($scope.destinations, $scope.newSubscription.destination);
+        if ($scope.destinations.length > 0) {
+          $scope.newSubscription.destination = $scope.destinations[0];
+        } else {
+          $scope.newSubscription.destination = undefined;
+        }
+      },
+      () => {
+        toastr.error('Failed saving subscription.');
+      },
+    );
+  };
+
+  $scope.unsubscribe = (subscriber) => {
+    const destination = subscriber.destination;
+    const user = subscriber.user;
+
+    subscriber.$delete(
+      () => {
+        toastr.success('Unsubscribed');
+        $scope.subscribers = without($scope.subscribers, subscriber);
+        if (destination) {
+          $scope.destinations.push(destination);
+        } else if (user.id === currentUser.id) {
+          $scope.destinations.push({ user: { name: currentUser.name } });
+        }
+
+        if ($scope.destinations.length === 1) {
+          $scope.newSubscription.destination = $scope.destinations[0];
+        }
+      },
+      () => {
+        toastr.error('Failed unsubscribing.');
+      },
+    );
+  };
+}
+
+export default function init(ngModule) {
+  ngModule.directive('alertSubscriptions', () => ({
+    restrict: 'E',
+    replace: true,
+    scope: {
+      alertId: '=',
+    },
+    template,
+    controller,
+  }));
+}

client/app/components/app-header/app-header.html

@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/"><img ng-src="{{$ctrl.logoUrl}}"/></a>
+      <a class="navbar-brand" ng-href="{{$ctrl.basePath}}"><img ng-src="{{$ctrl.logoUrl}}"/></a>
     </div>
     <div class="collapse navbar-collapse" uib-collapse="!isNavOpen">
       <ul class="nav navbar-nav">
@@ -32,7 +32,7 @@
             <li><a href="queries">Queries</a></li>
           </ul>
         </li>
-        <li>
+        <li ng-if="$ctrl.showAlertsLink">
           <a href="alerts">Alerts</a>
         </li>
       </ul>

client/app/components/app-header/index.js

@@ -1,16 +1,17 @@
 import debug from 'debug';
 
+import logoUrl from '@/assets/images/redash_icon_small.png';
 import template from './app-header.html';
-import logoUrl from '../../assets/images/redash_icon_small.png';
 import './app-header.css';
 
 const logger = debug('redash:appHeader');
 
-function controller($rootScope, $location, $uibModal, Auth, currentUser, Dashboard) {
-  // TODO: logoUrl should come from clientconfig
+function controller($rootScope, $location, $uibModal, Auth, currentUser, clientConfig, Dashboard) {
   this.logoUrl = logoUrl;
+  this.basePath = clientConfig.basePath;
   this.currentUser = currentUser;
   this.showQueriesMenu = currentUser.hasPermission('view_query');
+  this.showAlertsLink = currentUser.hasPermission('list_alerts');
   this.showNewQueryMenu = currentUser.hasPermission('create_query');
   this.showSettingsMenu = currentUser.hasPermission('list_users');
   this.showDashboardsMenu = currentUser.hasPermission('list_dashboards');
@@ -42,7 +43,7 @@ function controller($rootScope, $location, $uibModal, Auth, currentUser, Dashboa
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('appHeader', {
     template,
     controller,

client/app/components/cancel-query-button/index.js

@@ -27,6 +27,6 @@ function cancelQueryButton() {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('cancelQueryButton', cancelQueryButton);
 }

client/app/components/dashboards/add-widget-dialog.js

@@ -17,6 +17,8 @@ const AddWidgetDialog = {
     this.query = {};
     this.selected_query = undefined;
     this.text = '';
+    this.existing_text = '';
+    this.new_text = '';
     this.widgetSizes = [{
       name: 'Regular',
       value: 1,
@@ -95,6 +97,6 @@ const AddWidgetDialog = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('addWidgetDialog', AddWidgetDialog);
 }

client/app/components/dashboards/edit-dashboard-dialog.html

@@ -4,7 +4,14 @@
 </div>
 <div class="modal-body">
   <p>
-    <input type="text" class="form-control" placeholder="Dashboard Name" ng-model="$ctrl.dashboard.name">
+    <input type="text" class="form-control" placeholder="Dashboard Name" ng-model="$ctrl.dashboard.name" autofocus>
+  </p>
+
+  <p ng-if="$ctrl.dashboard.id">
+    <label>
+        <input name="input" type="checkbox" ng-model="$ctrl.dashboard.dashboard_filters_enabled">
+        Use Dashboard Level Filters
+    </label>
   </p>
 
   <div gridster="$ctrl.gridsterOptions" ng-if="$ctrl.items | notEmpty">
@@ -17,5 +24,5 @@
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-default" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.dismiss()">Close</button>
-  <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.saveDashboard()">Save</button>
+  <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress || !$ctrl.isFormValid()" ng-click="$ctrl.saveDashboard()">Save</button>
 </div>

client/app/components/dashboards/edit-dashboard-dialog.js

@@ -1,4 +1,4 @@
-import { sortBy } from 'underscore';
+import { isEmpty, sortBy } from 'underscore';
 import template from './edit-dashboard-dialog.html';
 
 const EditDashboardDialog = {
@@ -45,6 +45,8 @@ const EditDashboardDialog = {
       });
     }
 
+    this.isFormValid = () => !isEmpty(this.dashboard.name);
+
     this.saveDashboard = () => {
       this.saveInProgress = true;
 
@@ -65,6 +67,7 @@ const EditDashboardDialog = {
           slug: this.dashboard.id,
           name: this.dashboard.name,
           version: this.dashboard.version,
+          dashboard_filters_enabled: this.dashboard.dashboard_filters_enabled,
           layout: JSON.stringify(layout),
         };
 
@@ -96,6 +99,6 @@ const EditDashboardDialog = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('editDashboardDialog', EditDashboardDialog);
 }

client/app/components/dashboards/edit-text-box.html

@@ -4,11 +4,11 @@
 </div>
 <div class="modal-body">
   <div class="form-group">
-    <textarea class="form-control" ng-model="$ctrl.widget.text" rows="3"></textarea>
+    <textarea class="form-control" ng-model="$ctrl.widget.new_text" rows="3"></textarea>
   </div>
-  <div ng-show="$ctrl.widget.text">
+  <div ng-show="$ctrl.widget.new_text">
     <strong>Preview:</strong>
-    <p ng-bind-html="$ctrl.widget.text | markdown"></p>
+    <p ng-bind-html="$ctrl.widget.new_text | markdown"></p>
   </div>
 </div>
 

client/app/components/dashboards/widget.js

@@ -15,6 +15,8 @@ const EditTextBoxComponent = {
     this.widget = this.resolve.widget;
     this.saveWidget = () => {
       this.saveInProgress = true;
+      if (this.widget.new_text !== this.widget.existing_text) {
+        this.widget.text = this.widget.new_text;
         this.widget.$save().then(() => {
           this.close();
         }).catch(() => {
@@ -22,6 +24,9 @@ const EditTextBoxComponent = {
         }).finally(() => {
           this.saveInProgress = false;
         });
+      } else {
+        this.close();
+      }
     };
   },
 };
@@ -30,6 +35,8 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
   this.canViewQuery = currentUser.hasPermission('view_query');
 
   this.editTextBox = () => {
+    this.widget.existing_text = this.widget.text;
+    this.widget.new_text = this.widget.text;
     $uibModal.open({
       component: 'editTextBox',
       resolve: {
@@ -78,8 +85,8 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
   };
 
   if (this.widget.visualization) {
-    Events.record('view', 'query', this.widget.visualization.query.id);
-    Events.record('view', 'visualization', this.widget.visualization.id);
+    Events.record('view', 'query', this.widget.visualization.query.id, { dashboard: true });
+    Events.record('view', 'visualization', this.widget.visualization.id, { dashboard: true });
 
     this.query = this.widget.getQuery();
     this.reload(false);
@@ -92,7 +99,7 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
   }
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('editTextBox', EditTextBoxComponent);
   ngModule.component('dashboardWidget', {
     template,

client/app/components/dynamic-form.html

@@ -1,27 +1,28 @@
 <form name="dataSourceForm">
+    <div class="form-group">
+        <label for="type">Type</label>
+        <select name="type" class="form-control" ng-options="type.type as type.name for type in types" ng-model="target.type" autofocus></select>
+    </div>
     <div class="form-group">
         <label for="dataSourceName">Name</label>
         <input type="string" class="form-control" name="dataSourceName" ng-model="target.name" required>
     </div>
-    <div class="form-group">
-        <label for="type">Type</label>
-        <select name="type" class="form-control" ng-options="type.type as type.name for type in types" ng-model="target.type"></select>
-    </div>
-    <div class="form-group" ng-class='{"has-error": !inner.input.$valid}' ng-form="inner" ng-repeat="(name, input) in type.configuration_schema.properties">
-        <label ng-if="input.type !== 'checkbox'">{{input.title || name | capitalize}}</label>
-        <input name="input" type="{{input.type}}" class="form-control" ng-model="target.options[name]" ng-required="input.required"
-                ng-if="input.type !== 'file' && input.type !== 'checkbox'" accesskey="tab" placeholder="{{input.default}}">
+    <div class="form-group" ng-class='{"has-error": !inner.input.$valid}' ng-form="inner" ng-repeat="field in fields">
+        <label ng-if="field.property.type !== 'checkbox'">{{field.property.title || field.name | capitalize}}</label>
+        <input name="input" type="{{field.property.type}}" class="form-control" ng-model="target.options[field.name]" ng-required="field.property.required"
+               ng-if="field.property.type !== 'file' && field.property.type !== 'checkbox'" accesskey="tab" placeholder="{{field.property.default}}">
 
-        <label ng-if="input.type=='checkbox'">
-          <input name="input" type="{{input.type}}" ng-model="target.options[name]" ng-required="input.required"
-                  ng-if="input.type !== 'file'" accesskey="tab" placeholder="{{input.default}}">
-          {{input.title || name | capitalize}}
+        <label ng-if="field.property.type=='checkbox'">
+            <input name="input" type="{{field.property.type}}" ng-model="target.options[field.name]" ng-required="field.property.required"
+                   ng-if="field.property.type !== 'file'" accesskey="tab" placeholder="{{field.property.default}}">
+            {{field.property.title || field.name | capitalize}}
         </label>
 
-        <input name="input" type="file" class="form-control" ng-model="files[name]" ng-required="input.required && !target.options[name]"
+        <input name="input" type="file" class="form-control" ng-model="files[field.name]" ng-required="field.property.required && !target.options[field.name]"
                base-sixty-four-input
-               ng-if="input.type === 'file'">
+               ng-if="field.property.type === 'file'">
     </div>
+
     <button class="btn btn-primary" ng-disabled="!dataSourceForm.$valid" ng-click="saveChanges()">Save</button>
     <span ng-repeat="action in actions">
         <button class="btn"

client/app/components/dynamic-form.js

@@ -1,8 +1,22 @@
-import { each, contains, find } from 'underscore';
+import { isUndefined, each, contains, find } from 'underscore';
 import endsWith from 'underscore.string/endsWith';
 import template from './dynamic-form.html';
 
 function DynamicForm($http, toastr, $q) {
+  function orderedInputs(properties, order) {
+    const inputs = new Array(order.length);
+    Object.keys(properties).forEach((key) => {
+      const position = order.indexOf(key);
+      const input = { name: key, property: properties[key] };
+      if (position > -1) {
+        inputs[position] = input;
+      } else {
+        inputs.push(input);
+      }
+    });
+    return inputs;
+  }
+
   return {
     restrict: 'E',
     replace: 'true',
@@ -19,7 +33,15 @@ function DynamicForm($http, toastr, $q) {
           $scope.target.type = types[0].type;
         }
 
-        $scope.type = find(types, t => t.type === $scope.target.type);
+        const type = find(types, t => t.type === $scope.target.type);
+        const configurationSchema = type.configuration_schema;
+
+        $scope.fields = orderedInputs(
+          configurationSchema.properties,
+          configurationSchema.order || [],
+        );
+
+        return type;
       }
 
       $scope.inProgressActions = {};
@@ -35,6 +57,7 @@ function DynamicForm($http, toastr, $q) {
               $scope.inProgressActions[action.name] = false;
               action.name = name;
             }
+
             originalCallback(release);
           };
         });
@@ -80,29 +103,47 @@ function DynamicForm($http, toastr, $q) {
             prop.required = contains(type.configuration_schema.required, name);
           });
         });
-      });
 
         $scope.$watch('target.type', (current, prev) => {
           if (prev !== current) {
             if (prev !== undefined) {
               $scope.target.options = {};
             }
-          setType($scope.types);
+
+            const type = setType($scope.types);
+
+            if (Object.keys($scope.target.options).length === 0) {
+              const properties = type.configuration_schema.properties;
+              Object.keys(properties).forEach((property) => {
+                if (!isUndefined(properties[property].default)) {
+                  $scope.target.options[property] = properties[property].default;
                 }
               });
+            }
+          }
+        });
+      });
+
 
       $scope.saveChanges = () => {
-        $scope.target.$save(() => {
+        $scope.target.$save(
+          () => {
             toastr.success('Saved.');
             $scope.dataSourceForm.$setPristine();
-        }, () => {
+          },
+          (error) => {
+            if (error.status === 400 && 'message' in error.data) {
+              toastr.error(error.data.message);
+            } else {
               toastr.error('Failed saving.');
-        });
+            }
+          },
+        );
       };
     },
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('dynamicForm', DynamicForm);
 }

client/app/components/dynamic-table/dynamic-table.html

@@ -9,7 +9,7 @@
 
     </thead>
     <tbody>
-    <tr ng-repeat="row in $ctrl.rows">
+    <tr ng-repeat="row in $ctrl.rowsToDisplay">
       <td ng-repeat="column in $ctrl.columns" ng-bind-html="$ctrl.sanitize(column.formatFunction(row[column.name]))">
       </td>
     </tr>

client/app/components/dynamic-table/index.js

@@ -15,7 +15,7 @@ function DynamicTable($sanitize) {
     const first = this.count * (this.page - 1);
     const last = this.count * (this.page);
 
-    this.rows = this.allRows.slice(first, last);
+    this.rowsToDisplay = this.rows.slice(first, last);
   };
 
   this.$onChanges = (changes) => {
@@ -24,10 +24,10 @@ function DynamicTable($sanitize) {
     }
 
     if (changes.rows) {
-      this.allRows = changes.rows.currentValue;
+      this.rows = changes.rows.currentValue;
     }
 
-    this.rowsCount = this.allRows.length;
+    this.rowsCount = this.rows.length;
 
     this.pageChanged();
   };
@@ -41,9 +41,9 @@ function DynamicTable($sanitize) {
     }
 
     if (this.orderByField) {
-      this.allRows = sortBy(this.allRows, this.orderByField.name);
+      this.rows = sortBy(this.rows, this.orderByField.name);
       if (this.orderByReverse) {
-        this.allRows = this.allRows.reverse();
+        this.rows = this.rows.reverse();
       }
       this.pageChanged();
     }
@@ -64,7 +64,7 @@ function DynamicTable($sanitize) {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('dynamicTable', {
     template,
     controller: DynamicTable,

client/app/components/edit-in-place.js

@@ -33,6 +33,8 @@ function EditInPlace() {
     link($scope, element) {
       // Let's get a reference to the input element, as we'll want to reference it.
       const inputElement = $(element.children()[2]);
+      const keycodeEnter = 13;
+      const keycodeEscape = 27;
 
       // This directive should have a set class so we can style it.
       element.addClass('edit-in-place');
@@ -74,9 +76,10 @@ function EditInPlace() {
       $(inputElement).keydown((e) => {
         // 'return' or 'enter' key pressed
         // allow 'shift' to break lines
-        if (e.which === 13 && !e.shiftKey) {
+        if (e.which === keycodeEnter && !e.shiftKey) {
+          e.preventDefault();
           save();
-        } else if (e.which === 27) {
+        } else if (e.which === keycodeEscape) {
           $scope.value = $scope.oldValue;
           $scope.$apply(() => {
             $(inputElement[0]).blur();
@@ -89,6 +92,6 @@ function EditInPlace() {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('editInPlace', EditInPlace);
 }

client/app/components/email-settings-warning/index.js

@@ -2,7 +2,7 @@ function controller(clientConfig, currentUser) {
   this.showMailWarning = clientConfig.mailSettingsMissing && currentUser.isAdmin;
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('emailSettingsWarning', {
     bindings: {
       function: '<',

client/app/components/error-messages.js

@@ -15,6 +15,6 @@ const ErrorMessagesComponent = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('errorMessages', ErrorMessagesComponent);
 }

client/app/components/filters.html

@@ -1,20 +1,34 @@
 <div class="container bg-white p-5" ng-show="$ctrl.filters | notEmpty">
   <div class="row">
     <div class="col-sm-6 m-t-5" ng-repeat="filter in $ctrl.filters">
-      <ui-select ng-model="filter.current" ng-if="!filter.multiple" on-select="$ctrl.filterChangeListener(filter, $model)" on-remove="$ctrl.filterChangeListener(filter, $model)">
-        <ui-select-match placeholder="Select value for {{filter.friendlyName}}...">{{filter.friendlyName}}: {{$select.selected | filterValue:filter}}</ui-select-match>
+      <label>{{filter.friendlyName}}</label>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-6 m-t-5" ng-repeat="filter in $ctrl.filters">
+      <ui-select ng-model="filter.current" ng-if="!filter.multiple" on-select="$ctrl.filterChangeListener(filter, $model)" on-remove="$ctrl.filterChangeListener(filter, $model)"
+        remove-selected="false">
+        <ui-select-match placeholder="Select value for {{filter.friendlyName}}...">{{$select.selected | filterValue:filter}}</ui-select-match>
         <ui-select-choices repeat="value in filter.values | filter: $select.search">
           {{value | filterValue:filter }}
         </ui-select-choices>
       </ui-select>
 
-      <ui-select ng-model="filter.current" multiple ng-if="filter.multiple" on-select="$ctrl.filterChangeListener(filter, $model)" on-remove="$ctrl.filterChangeListener(filter, $model)">
-        <ui-select-match placeholder="Select value for {{filter.friendlyName}}...">{{filter.friendlyName}}: {{$item | filterValue:filter}}</ui-select-match>
-        <ui-select-choices repeat="value in filter.values | filter: $select.search">
+      <ui-select ng-model="filter.current" multiple ng-if="filter.multiple" on-select="$ctrl.filterChangeListener(filter, $model)"
+        on-remove="$ctrl.filterChangeListener(filter, $model)" remove-selected="false">
+        <ui-select-match placeholder="Select value for {{filter.friendlyName}}...">{{$item | filterValue:filter}}</ui-select-match>
+        <ui-select-choices repeat="value in filter.values | filter: $select.search" group-by="$ctrl.itemGroup">
+          <span ng-if="value == '*'">
+            Select All
+          </span>
+          <span ng-if="value == '-'">
+            Clear
+          </span>
+          <span ng-if="value != '*' && value != '-'">
             {{value | filterValue:filter }}
+          </span>
         </ui-select-choices>
       </ui-select>
     </div>
   </div>
 </div>
-

client/app/components/filters.js

@@ -12,10 +12,18 @@ const FiltersComponent = {
     this.filterChangeListener = (filter, modal) => {
       this.onChange({ filter, $modal: modal });
     };
+
+    this.itemGroup = (item) => {
+      if (item === '*' || item === '-') {
+        return '';
+      }
+
+      return 'Values';
+    };
   },
 };
 
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('filters', FiltersComponent);
 }

client/app/components/footer/index.js

@@ -5,7 +5,7 @@ function controller(clientConfig, currentUser) {
   this.newVersionAvailable = clientConfig.newVersionAvailable && currentUser.isAdmin;
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('footer', {
     template,
     controller,

client/app/components/groups/edit-group-dialog.html

@@ -3,7 +3,7 @@
 </div>
 <div class="modal-body">
     <form class="form">
-        <input type="text" ng-model="$ctrl.group.name" placeholder="Group Name" class="form-control"/>
+        <input type="text" ng-model="$ctrl.group.name" placeholder="Group Name" class="form-control" autofocus/>
     </form>
 </div>
 <div class="modal-footer">

client/app/components/groups/edit-group-dialog.js

@@ -34,6 +34,6 @@ const EditGroupDialogComponent = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('editGroupDialog', EditGroupDialogComponent);
 }

client/app/components/groups/group-name.js

@@ -15,7 +15,7 @@ function controller($window, $location, toastr, currentUser) {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('groupName', {
     bindings: {
       group: '<',

client/app/components/index.js

@@ -1,20 +0,0 @@
-export { default as appHeader } from './app-header';
-export { default as footer } from './footer';
-export { default as pageHeader } from './page-header';
-export { default as tabNav } from './tab-nav';
-export { default as emailSettingsWarning } from './email-settings-warning';
-export { default as rdTab } from './rd-tab';
-export { default as queryLink } from './query-link';
-export { default as parameters } from './parameters';
-export { default as permissionsEditor } from './permissions-editor';
-export { default as dynamicTable } from './dynamic-table';
-export { default as paginator } from './paginator';
-export { default as settingsScreen } from './settings-screen';
-export { default as errorMessages } from './error-messages';
-export { default as editInPlace } from './edit-in-place';
-export { default as dynamicForm } from './dynamic-form';
-export { default as rdTimer } from './rd-timer';
-export { default as rdTimeAgo } from './rd-time-ago';
-export { default as overlay } from './overlay';
-export { default as routeStatus } from './route-status';
-export { default as filters } from './filters';

client/app/components/overlay.js

@@ -11,6 +11,6 @@ const Overlay = {
   transclude: true,
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('overlay', Overlay);
 }

client/app/components/page-header/index.js

@@ -4,7 +4,7 @@ function controller() {
 
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('pageHeader', {
     template,
     controller,

client/app/components/paginator.js

@@ -7,7 +7,7 @@ class PaginatorCtrl {
   }
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('paginator', {
     template: `
 <div class="text-center">

client/app/components/parameter-settings.html

@@ -13,14 +13,33 @@
         <select ng-model="$ctrl.parameter.type" class="form-control">
           <option value="text">Text</option>
           <option value="number">Number</option>
+          <option value="enum">Dropdown List</option>
+          <option value="query">Query Based Dropdown List</option>
           <option value="date">Date</option>
           <option value="datetime-local">Date and Time</option>
           <option value="datetime-with-seconds">Date and Time (with seconds)</option>
         </select>
       </div>
       <div class="form-group">
-        <label>Global</label>
+        <label>
           <input type="checkbox" class="form-inline" ng-model="$ctrl.parameter.global">
+          Global
+        </label>
+      </div>
+      <div class="form-group" ng-if="$ctrl.parameter.type === 'enum'">
+        <label>Dropdown List Values (newline delimited)</label>
+        <textarea class="form-control" rows="3" ng-model="$ctrl.parameter.enumOptions"></textarea>
+      </div>
+      <div class="form-group" ng-if="$ctrl.parameter.type === 'query'">
+        <label>Query to load dropdown values from:</label>
+        <ui-select ng-model="$ctrl.parameter.queryId" reset-search-input="false">
+            <ui-select-match placeholder="Search a query by name">{{$select.selected.name}}</ui-select-match>
+            <ui-select-choices repeat="q.id as q in $ctrl.queries"
+                               refresh="$ctrl.searchQueries($select.search)"
+                               refresh-delay="0">
+            <div class="form-group" ng-bind-html="$ctrl.trustAsHtml(q.name | highlight: $select.search)"></div>
+            </ui-select-choices>
+        </ui-select>
       </div>
     </div>
 </div>

client/app/components/parameters.html

@@ -1,11 +1,27 @@
-<div class="form-inline bg-white p-5" ng-if="parameters | notEmpty" ui-sortable="{ 'ui-floating': true, 'disabled': !editable }" ng-model="parameters">
-  <div class="form-group" ng-repeat="param in parameters">
-    <label>{{param.title}}</label>
-    <button class="btn btn-default btn-xs" ng-click="showParameterSettings(param)" ng-if="editable"><i class="zmdi zmdi-settings"></i></button>
+<div class="form-inline bg-white p-5"
+     ng-if="parameters | notEmpty"
+     ui-sortable="{ 'ui-floating': true, 'disabled': !editable }"
+     ng-model="parameters">
+  <div class="form-group m-l-10 m-r-10"
+       ng-repeat="param in parameters">
+    <label class="parameter-label">{{param.title}}</label>
+    <button class="btn btn-default btn-xs"
+            ng-click="showParameterSettings(param)"
+            ng-if="editable">
+        <i class="zmdi zmdi-settings"></i>
+    </button>
     <span ng-switch="param.type">
       <input ng-switch-when="datetime-with-seconds" type="datetime-local" step="1" class="form-control" ng-model="param.ngModel">
       <input ng-switch-when="datetime-local" type="datetime-local" class="form-control" ng-model="param.ngModel">
       <input ng-switch-when="date" type="date" class="form-control" ng-model="param.ngModel">
+      <span ng-switch-when="enum">
+        <select ng-model="param.value" class="form-control">
+          <option ng-repeat="option in extractEnumOptions(param.enumOptions)" value="{{option}}">{{option}}</option>
+        </select>
+      </span>
+      <span ng-switch-when="query">
+        <query-based-parameter param="param" query-id="param.queryId"></query-based-parameter>
+      </span>
       <input ng-switch-default type="{{param.type}}" class="form-control" ng-model="param.ngModel">
     </span>
   </div>

client/app/components/parameters.js

@@ -1,4 +1,6 @@
+import { find } from 'underscore';
 import template from './parameters.html';
+import queryBasedParameterTemplate from './query-based-parameter.html';
 import parameterSettingsTemplate from './parameter-settings.html';
 
 const ParameterSettingsComponent = {
@@ -8,10 +10,96 @@ const ParameterSettingsComponent = {
     close: '&',
     dismiss: '&',
   },
-  controller() {
+  controller($sce, Query) {
     'ngInject';
 
+    this.trustAsHtml = html => $sce.trustAsHtml(html);
     this.parameter = this.resolve.parameter;
+
+    if (this.parameter.queryId) {
+      Query.get({ id: this.parameter.queryId }, (query) => {
+        this.queries = [query];
+      });
+    }
+
+    this.searchQueries = (term) => {
+      if (!term || term.length < 3) {
+        return;
+      }
+
+      Query.search({ q: term }, (results) => {
+        this.queries = results;
+      });
+    };
+  },
+};
+
+function optionsFromQueryResult(queryResult) {
+  const columns = queryResult.data.columns;
+  const numColumns = columns.length;
+  let options = [];
+  // If there are multiple columns, check if there is a column
+  // named 'name' and column named 'value'. If name column is present
+  // in results, use name from name column. Similar for value column.
+  // Default: Use first string column for name and value.
+  if (numColumns > 0) {
+    let nameColumn = null;
+    let valueColumn = null;
+    columns.forEach((column) => {
+      const columnName = column.name.toLowerCase();
+      if (columnName === 'name') {
+        nameColumn = column.name;
+      }
+      if (columnName === 'value') {
+        valueColumn = column.name;
+      }
+      // Assign first string column as name and value column.
+      if (nameColumn === null) {
+        nameColumn = column.name;
+      }
+      if (valueColumn === null) {
+        valueColumn = column.name;
+      }
+    });
+    if (nameColumn !== null && valueColumn !== null) {
+      options = queryResult.data.rows.map((row) => {
+        const queryResultOption = {
+          name: row[nameColumn],
+          value: row[valueColumn],
+        };
+        return queryResultOption;
+      });
+    }
+  }
+  return options;
+}
+
+function updateCurrentValue(param, options) {
+  const found = find(options, option => option.value === param.value) !== undefined;
+
+  if (!found) {
+    param.value = options[0].value;
+  }
+}
+
+const QueryBasedParameterComponent = {
+  template: queryBasedParameterTemplate,
+  bindings: {
+    param: '<',
+    queryId: '<',
+  },
+  controller(Query) {
+    'ngInject';
+
+    this.$onChanges = (changes) => {
+      if (changes.queryId) {
+        Query.resultById({ id: this.queryId }, (result) => {
+          const queryResult = result.query_result;
+          this.queryResultOptions = optionsFromQueryResult(queryResult);
+          updateCurrentValue(this.param, this.queryResultOptions);
+        });
+      }
+    };
   },
 };
 
@@ -41,6 +129,14 @@ function ParametersDirective($location, $uibModal) {
         }, true);
       }
 
+      // These are input as newline delimited values,
+      // so we split them here.
+      scope.extractEnumOptions = (enumOptions) => {
+        if (enumOptions) {
+          return enumOptions.split('\n');
+        }
+        return [];
+      };
       scope.showParameterSettings = (param) => {
         $uibModal.open({
           component: 'parameterSettings',
@@ -53,7 +149,8 @@ function ParametersDirective($location, $uibModal) {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('parameters', ParametersDirective);
+  ngModule.component('queryBasedParameter', QueryBasedParameterComponent);
   ngModule.component('parameterSettings', ParameterSettingsComponent);
 }

client/app/components/permissions-editor/index.js

@@ -59,7 +59,8 @@ const PermissionsEditorComponent = {
     // Remove user from grantees list
     this.removeGrantee = (user) => {
       const body = { access_type: 'modify', user_id: user.id };
-      $http({ url: this.aclUrl,
+      $http({
+        url: this.aclUrl,
         method: 'DELETE',
         data: body,
         headers: { 'Content-Type': 'application/json' },
@@ -74,6 +75,6 @@ const PermissionsEditorComponent = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('permissionsEditor', PermissionsEditorComponent);
 }

client/app/components/queries/alert-unsaved-changes.js

@@ -32,6 +32,6 @@ function alertUnsavedChanges($window) {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('alertUnsavedChanges', alertUnsavedChanges);
 }

client/app/components/queries/api-key-dialog.js

@@ -0,0 +1,37 @@
+const ApiKeyDialog = {
+  template: `<div class="modal-header">
+    <button type="button" class="close" aria-label="Close" ng-click="$ctrl.close()"><span aria-hidden="true">&times;</span></button>
+</div>
+<div class="modal-body">
+    <h5>API Key</h5>
+    <pre>{{$ctrl.apiKey}}</pre>
+
+    <h5>Example API Calls:</h5>
+
+    <div>
+        Results in CSV format:
+
+        <pre>{{$ctrl.csvUrl}}</pre>
+
+        Results in JSON format:
+
+        <pre>{{$ctrl.jsonUrl}}</pre>
+    </div>
+</div>`,
+  controller(clientConfig) {
+    'ngInject';
+
+    this.apiKey = this.resolve.query.api_key;
+    this.csvUrl = `${clientConfig.basePath}api/queries/${this.resolve.query.id}/results.csv?api_key=${this.apiKey}`;
+    this.jsonUrl = `${clientConfig.basePath}api/queries/${this.resolve.query.id}/results.json?api_key=${this.apiKey}`;
+  },
+  bindings: {
+    resolve: '<',
+    close: '&',
+    dismiss: '&',
+  },
+};
+
+export default function init(ngModule) {
+  ngModule.component('apiKeyDialog', ApiKeyDialog);
+}

client/app/components/queries/embed-code-dialog.html

@@ -0,0 +1,17 @@
+<div class="modal-header">
+  <button type="button" class="close" aria-label="Close" ng-click="$ctrl.close()"><span aria-hidden="true">&times;</span></button>
+  <h4 class="modal-title">Embed Code</h4>
+</div>
+<div class="modal-body">
+  <h5>IFrame Embed</h5>
+  <div>
+    <code>&lt;iframe src="{{ $ctrl.embedUrl }}" width="720" height="391"&gt;&lt;/iframe&gt;</code>
+  </div>
+  <span class="text-muted">(height should be adjusted)</span>
+  <div ng-if="$ctrl.snapshotUrl">
+    <h5>Image Embed</h5>
+    <div>
+      <code style="overflow-wrap:break-word;">{{$ctrl.snapshotUrl}}</code>
+    </div>
+  </div>
+</div>

client/app/components/queries/embed-code-dialog.js

@@ -20,6 +20,6 @@ const EmbedCodeDialog = {
   template,
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('embedCodeDialog', EmbedCodeDialog);
 }

client/app/components/queries/query-editor.js

@@ -118,8 +118,7 @@ function queryEditor(QuerySnippet) {
                   value: k,
                   score: 0,
                   meta: v,
-                 })
-              );
+                }));
             }
             callback(null, $scope.schema.keywords);
           },
@@ -134,6 +133,6 @@ function queryEditor(QuerySnippet) {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('queryEditor', queryEditor);
 }

client/app/components/queries/query-results-link.js

@@ -21,6 +21,6 @@ function queryResultLink() {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('queryResultLink', queryResultLink);
 }

client/app/components/queries/schedule-dialog.js

@@ -143,7 +143,7 @@ const ScheduleForm = {
   template,
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('queryTimePicker', queryTimePicker);
   ngModule.directive('queryRefreshSelect', queryRefreshSelect);
   ngModule.component('scheduleDialog', ScheduleForm);

client/app/components/queries/schema-browser.js

@@ -28,6 +28,6 @@ const SchemaBrowser = {
   template,
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('schemaBrowser', SchemaBrowser);
 }

client/app/components/queries/visualization-embed.html

@@ -2,7 +2,7 @@
   <div class="t-heading p-10">
     <h3 class="th-title">
       <p>
-        <img src="{{$ctrl.logoUrl}}" style="height: 24px;"/>
+        <img ng-src="{{$ctrl.logoUrl}}" style="height: 24px;"/>
         {{$ctrl.query.name}}
         <small><visualization-name visualization="$ctrl.visualization"/></small>
       </p>

client/app/components/queries/visualization-embed.js

@@ -1,6 +1,6 @@
 import { find } from 'underscore';
+import logoUrl from '@/assets/images/redash_icon_small.png';
 import template from './visualization-embed.html';
-import logoUrl from '../../assets/images/redash_icon_small.png';
 
 const VisualizationEmbed = {
   template,
@@ -22,7 +22,7 @@ const VisualizationEmbed = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('visualizationEmbed', VisualizationEmbed);
 
   function session($http, $route, Auth) {
@@ -36,8 +36,8 @@ export default function (ngModule) {
   function loadData($http, $route, $q, Auth) {
     return session($http, $route, Auth).then(() => {
       const queryId = $route.current.params.queryId;
-      const query = $http.get(`/api/queries/${queryId}`).then(response => response.data);
-      const queryResult = $http.get(`/api/queries/${queryId}/results.json`).then(response => response.data);
+      const query = $http.get(`api/queries/${queryId}`).then(response => response.data);
+      const queryResult = $http.get(`api/queries/${queryId}/results.json${location.search}`).then(response => response.data);
       return $q.all([query, queryResult]);
     });
   }

client/app/components/query-based-parameter.html

@@ -0,0 +1,2 @@
+<select ng-model="$ctrl.param.value" class="form-control" ng-options="option.value as option.name for option in $ctrl.queryResultOptions">
+</select>

client/app/components/query-link.js

@@ -13,7 +13,7 @@ function QueryLinkController() {
   this.link = this.query.getUrl(false, hash);
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('queryLink', {
     bindings: {
       query: '<',

client/app/components/rd-tab/index.js

@@ -11,15 +11,14 @@ function rdTab($location) {
     replace: true,
     link(scope) {
       scope.basePath = scope.basePath || $location.path().substring(1);
-      scope.$watch(() =>
-         scope.$parent.selectedTab
-      , (tab) => {
-        scope.selectedTab = tab;
-      });
+      scope.$watch(
+        () => scope.$parent.selectedTab,
+        (tab) => { scope.selectedTab = tab; },
+      );
     },
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('rdTab', rdTab);
 }

client/app/components/rd-time-ago.js

@@ -10,6 +10,6 @@ const RdTimeAgo = {
       '</span>',
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('rdTimeAgo', RdTimeAgo);
 }

client/app/components/rd-timer.js

@@ -25,6 +25,6 @@ function rdTimer() {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.directive('rdTimer', rdTimer);
 }

client/app/components/route-status.js

@@ -1,4 +1,4 @@
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('routeStatus', {
     template: '<overlay ng-if="$ctrl.permissionDenied">You do not have permission to load this page.',
 

client/app/components/settings-screen.html

@@ -8,7 +8,7 @@
       <li ng-class="{'active': usersPage }" ng-if="showUsersLink"><a href="users">Users</a></li>
       <li ng-class="{'active': groupsPage }" ng-if="showGroupsLink"><a href="groups">Groups</a></li>
       <li ng-class="{'active': destinationsPage }" ng-if="showDestinationsLink"><a href="destinations">Alert Destinations</a></li>
-      <li ng-class="{'active': snippetsPage }"><a href="query_snippets">Query Snippets</a></li>
+      <li ng-class="{'active': snippetsPage }" ng-if="showQuerySnippetsLink"><a href="query_snippets">Query Snippets</a></li>
     </ul>
 
     <div ng-transclude>

client/app/components/settings-screen.js

@@ -1,9 +1,8 @@
 import startsWith from 'underscore.string/startsWith';
 import template from './settings-screen.html';
 
-export default function (ngModule) {
-  ngModule.directive('settingsScreen', $location =>
-     ({
+export default function init(ngModule) {
+  ngModule.directive('settingsScreen', $location => ({
     restrict: 'E',
     transclude: true,
     template,
@@ -18,7 +17,7 @@ export default function (ngModule) {
       $scope.showUsersLink = currentUser.hasPermission('list_users');
       $scope.showDsLink = currentUser.hasPermission('admin');
       $scope.showDestinationsLink = currentUser.hasPermission('admin');
+      $scope.showQuerySnippetsLink = currentUser.hasPermission('create_query');
     },
-     })
-  );
+  }));
 }

client/app/components/sort-icon.js

@@ -0,0 +1,26 @@
+export default function init(ngModule) {
+  ngModule.component('sortIcon', {
+    template: '<span ng-if="$ctrl.showIcon"><i class="fa fa-sort-{{$ctrl.icon}}"></i></span>',
+    bindings: {
+      column: '<',
+      sortColumn: '<',
+      reverse: '<',
+    },
+    controller() {
+      this.$onChanges = (changes) => {
+        ['column', 'sortColumn', 'reverse'].forEach((v) => {
+          if (v in changes) {
+            this[v] = changes[v].currentValue;
+          }
+        });
+
+        this.showIcon = false;
+
+        if (this.column === this.sortColumn) {
+          this.showIcon = true;
+          this.icon = this.reverse ? 'desc' : 'asc';
+        }
+      };
+    },
+  });
+}

client/app/components/tab-nav/index.js

@@ -10,7 +10,7 @@ function controller($location) {
   });
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('tabNav', {
     template: '<ul class="tab-nav bg-white">' +
                 '<li ng-repeat="tab in $ctrl.tabs" ng-class="{\'active\': tab.active }"><a ng-href="{{tab.path}}">{{tab.name}}</a></li>' +

client/app/components/visualization-name.js

@@ -1,4 +1,4 @@
-function VisualizationName(Visualization) {
+export default function VisualizationName(Visualization) {
   return {
     restrict: 'E',
     scope: {
@@ -7,7 +7,10 @@ function VisualizationName(Visualization) {
     template: '{{name}}',
     replace: false,
     link(scope) {
-      if (Visualization.visualizations[scope.visualization.type].name !== scope.visualization.name) {
+      const currentType = scope.visualization.type;
+      const nameByType = Visualization.visualizations[currentType].name;
+      const currentName = scope.visualization.name;
+      if (nameByType !== currentName) {
         scope.name = scope.visualization.name;
       }
     },

client/app/config/index.js

@@ -0,0 +1,111 @@
+// This polyfill is needed to support PhantomJS which we use to generate PNGs from embeds.
+import 'core-js/fn/typed/array-buffer';
+
+import 'pace-progress';
+import debug from 'debug';
+import angular from 'angular';
+import ngSanitize from 'angular-sanitize';
+import ngRoute from 'angular-route';
+import ngResource from 'angular-resource';
+import uiBootstrap from 'angular-ui-bootstrap';
+import uiSelect from 'ui-select';
+import ngMessages from 'angular-messages';
+import toastr from 'angular-toastr';
+import ngUpload from 'angular-base64-upload';
+import vsRepeat from 'angular-vs-repeat';
+import 'angular-moment';
+import 'brace';
+import 'angular-ui-ace';
+import 'angular-resizable';
+import ngGridster from 'angular-gridster';
+import { each } from 'underscore';
+
+import '@/lib/sortable';
+
+import * as filters from '@/filters';
+import registerDirectives from '@/directives';
+import markdownFilter from '@/filters/markdown';
+import dateTimeFilter from '@/filters/datetime';
+
+const logger = debug('redash:config');
+
+const requirements = [
+  ngRoute,
+  ngResource,
+  ngSanitize,
+  uiBootstrap,
+  ngMessages,
+  uiSelect,
+  'angularMoment',
+  toastr,
+  'ui.ace',
+  ngUpload,
+  'angularResizable',
+  vsRepeat,
+  'ui.sortable',
+  ngGridster.name,
+];
+
+const ngModule = angular.module('app', requirements);
+
+function registerAll(context) {
+  const modules = context
+    .keys()
+    .map(context)
+    .map(module => module.default);
+
+  return modules.map(f => f(ngModule));
+}
+
+function registerComponents() {
+  // We repeat this code in other register functions, because if we don't use a literal for the path
+  // Webpack won't be able to statcily analyze our imports.
+  const context = require.context('@/components', true, /^((?![\\/]test[\\/]).)*\.js$/);
+  registerAll(context);
+}
+
+function registerServices() {
+  const context = require.context('@/services', true, /^((?![\\/]test[\\/]).)*\.js$/);
+  registerAll(context);
+}
+
+function registerVisualizations() {
+  const context = require.context('@/visualizations', true, /^((?![\\/]test[\\/]).)*\.js$/);
+  registerAll(context);
+}
+
+function registerPages() {
+  const context = require.context('@/pages', true, /^((?![\\/]test[\\/]).)*\.js$/);
+  const routesCollection = registerAll(context);
+  routesCollection.forEach((routes) => {
+    ngModule.config(($routeProvider) => {
+      each(routes, (route, path) => {
+        logger('Registering route: %s', path);
+        // This is a workaround, to make sure app-header and footer are loaded only
+        // for the authenticated routes.
+        // We should look into switching to ui-router, that has built in support for
+        // such things.
+        route.template = `<app-header></app-header><route-status></route-status>${route.template}<footer></footer>`;
+        route.authenticated = true;
+        $routeProvider.when(path, route);
+      });
+    });
+  });
+}
+
+function registerFilters() {
+  each(filters, (filter, name) => {
+    ngModule.filter(name, () => filter);
+  });
+}
+
+registerDirectives(ngModule);
+registerServices();
+registerFilters();
+markdownFilter(ngModule);
+dateTimeFilter(ngModule);
+registerComponents();
+registerPages();
+registerVisualizations(ngModule);
+
+export default ngModule;

client/app/config/styles.js

@@ -0,0 +1,11 @@
+import 'material-design-iconic-font/dist/css/material-design-iconic-font.css';
+import 'font-awesome/css/font-awesome.css';
+import 'ui-select/dist/select.css';
+import 'angular-toastr/dist/angular-toastr.css';
+import 'angular-resizable/src/angular-resizable.css';
+import 'angular-gridster/dist/angular-gridster.css';
+import 'pace-progress/themes/blue/pace-theme-minimal.css';
+
+import '@/assets/css/superflat_redash.css';
+import '@/assets/css/redash.css';
+import '@/assets/css/main.scss';

client/app/directives/index.js

@@ -70,7 +70,7 @@ function title($rootScope, Title) {
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.factory('Title', TitleService);
   ngModule.directive('title', title);
   ngModule.directive('compareTo', compareTo);

client/app/filters/datetime.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.filter('toMilliseconds', () => value => value * 1000.0);
 
   ngModule.filter('dateTime', clientConfig =>
@@ -10,6 +10,5 @@ export default function (ngModule) {
       }
 
       return moment(value).format(clientConfig.dateTimeFormat);
-     }
-  );
+    });
 }

client/app/filters/index.js

@@ -45,8 +45,7 @@ export function scheduleHumanize(schedule) {
 
 export function toHuman(text) {
   return text.replace(/_/g, ' ').replace(/(?:^|\s)\S/g, a =>
-     a.toUpperCase()
-  );
+    a.toUpperCase());
 }
 
 export function colWidth(widgetWidth) {

client/app/filters/markdown.js

@@ -1,18 +1,17 @@
-import marked from 'marked';
+import { markdown } from 'markdown';
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.filter('markdown', ($sce, clientConfig) =>
-     function markdown(text) {
+    function parseMarkdown(text) {
       if (!text) {
         return '';
       }
 
-       let html = marked(String(text));
+      let html = markdown.toHTML(String(text));
       if (clientConfig.allowScriptsInUserInput) {
         html = $sce.trustAsHtml(html);
       }
 
       return html;
-     }
-  );
+    });
 }

client/app/index.html

@@ -1,14 +1,14 @@
 <!DOCTYPE html>
-<html ng-app="app">
+<html ng-app="app" ng-strict-di>
   <head lang="en">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="UTF-8">
     <base href="/">
     <title>Redash</title>
 
-    <link rel="icon" type="image/png" sizes="32x32" href="./assets/images/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="./assets/images/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="./assets/images/favicon-16x16.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/images/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
   </head>
 
   <body>

client/app/index.js

@@ -1,102 +1,8 @@
-import 'material-design-iconic-font/dist/css/material-design-iconic-font.css';
-import 'font-awesome/css/font-awesome.css';
-import 'ui-select/dist/select.css';
-import 'angular-toastr/dist/angular-toastr.css';
-import 'angular-resizable/src/angular-resizable.css';
-import 'angular-gridster/dist/angular-gridster.css';
-import 'pace-progress/themes/blue/pace-theme-minimal.css';
+import '@/config/styles';
+import ngModule from '@/config';
 
-import 'pace-progress';
-import debug from 'debug';
-import angular from 'angular';
-import ngSanitize from 'angular-sanitize';
-import ngRoute from 'angular-route';
-import ngResource from 'angular-resource';
-import uiBootstrap from 'angular-ui-bootstrap';
-import uiSelect from 'ui-select';
-import ngMessages from 'angular-messages';
-import toastr from 'angular-toastr';
-import ngUpload from 'angular-base64-upload';
-import vsRepeat from 'angular-vs-repeat';
-import 'angular-moment';
-import 'brace';
-import 'angular-ui-ace';
-import 'angular-resizable';
-import ngGridster from 'angular-gridster';
-import { each } from 'underscore';
-
-import './sortable';
-
-import './assets/css/superflat_redash.css';
-import './assets/css/redash.css';
-import './assets/css/main.scss';
-
-import * as pages from './pages';
-import * as components from './components';
-import * as filters from './filters';
-import * as services from './services';
-import registerDirectives from './directives';
-import registerVisualizations from './visualizations';
-import markdownFilter from './filters/markdown';
-import dateTimeFilter from './filters/datetime';
-
-const logger = debug('redash');
-
-const requirements = [
-  ngRoute, ngResource, ngSanitize, uiBootstrap, ngMessages, uiSelect, 'angularMoment', toastr, 'ui.ace',
-  ngUpload, 'angularResizable', vsRepeat, 'ui.sortable', ngGridster.name,
-];
-
-const ngModule = angular.module('app', requirements);
-
-function registerComponents() {
-  each(components, (register) => {
-    register(ngModule);
-  });
-}
-
-function registerServices() {
-  each(services, (register) => {
-    register(ngModule);
-  });
-}
-
-function registerPages() {
-  each(pages, (registerPage) => {
-    const routes = registerPage(ngModule);
-
-    ngModule.config(($routeProvider) => {
-      each(routes, (route, path) => {
-        logger('Route: ', path);
-        // This is a workaround, to make sure app-header and footer are loaded only
-        // for the authenticated routes.
-        // We should look into switching to ui-router, that has built in support for
-        // such things.
-        route.template = `<app-header></app-header><route-status></route-status>${route.template}<footer></footer>`;
-        route.authenticated = true;
-        $routeProvider.when(path, route);
-      });
-    });
-  });
-}
-
-function registerFilters() {
-  each(filters, (filter, name) => {
-    ngModule.filter(name, () => filter);
-  });
-}
-
-registerDirectives(ngModule);
-registerServices();
-registerFilters();
-markdownFilter(ngModule);
-dateTimeFilter(ngModule);
-registerComponents();
-registerPages();
-registerVisualizations(ngModule);
-
-ngModule.config(($routeProvider, $locationProvider, $compileProvider,
-  uiSelectConfig, toastrConfig) => {
+ngModule.config(($locationProvider, $compileProvider, uiSelectConfig, toastrConfig) => {
+  $compileProvider.debugInfoEnabled(false);
   $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|http|data):/);
   $locationProvider.html5Mode(true);
   uiSelectConfig.theme = 'bootstrap';
@@ -108,7 +14,8 @@ ngModule.config(($routeProvider, $locationProvider, $compileProvider,
 });
 
 // Update ui-select's template to use Font-Awesome instead of glyphicon.
-ngModule.run(($templateCache, OfflineListener) => { // eslint-disable-line no-unused-vars
+// eslint-disable-next-line no-unused-vars
+ngModule.run(($templateCache, OfflineListener) => {
   const templateName = 'bootstrap/match.tpl.html';
   let template = $templateCache.get(templateName);
   template = template.replace('glyphicon glyphicon-remove', 'fa fa-remove');

client/app/lib/pagination/paginator.js

@@ -1,8 +1,12 @@
+import { sortBy } from 'underscore';
+
 export default class Paginator {
   constructor(rows, { page = 1, itemsPerPage = 20, totalCount = undefined } = {}) {
     this.page = page;
     this.itemsPerPage = itemsPerPage;
     this.updateRows(rows, totalCount);
+    this.orderByField = undefined;
+    this.orderByReverse = false;
   }
 
   setPage(page) {
@@ -24,4 +28,20 @@ export default class Paginator {
       this.totalCount = 0;
     }
   }
+
+  orderBy(column) {
+    if (column === this.orderByField) {
+      this.orderByReverse = !this.orderByReverse;
+    } else {
+      this.orderByField = column;
+      this.orderByReverse = false;
+    }
+
+    if (this.orderByField) {
+      this.rows = sortBy(this.rows, this.orderByField);
+      if (this.orderByReverse) {
+        this.rows = this.rows.reverse();
+      }
+    }
+  }
 }

client/app/lib/visualizations/d3box.js

@@ -0,0 +1,328 @@
+/* eslint-disable */
+// Inspired by http://informationandvisualization.de/blog/box-plot
+function box() {
+  let width = 1,
+    height = 1,
+    duration = 0,
+    domain = null,
+    value = Number,
+    whiskers = boxWhiskers,
+    quartiles = boxQuartiles,
+    tickFormat = null;
+
+  // For each small multiple…
+  function box(g) {
+    g.each(function(d, i) {
+      d = d.map(value).sort(d3.ascending);
+      let g = d3.select(this),
+        n = d.length,
+        min = d[0],
+        max = d[n - 1];
+
+      // Compute quartiles. Must return exactly 3 elements.
+      const quartileData = (d.quartiles = quartiles(d));
+
+      // Compute whiskers. Must return exactly 2 elements, or null.
+      let whiskerIndices = whiskers && whiskers.call(this, d, i),
+        whiskerData = whiskerIndices && whiskerIndices.map(i => d[i]);
+
+      // Compute outliers. If no whiskers are specified, all data are "outliers".
+      // We compute the outliers as indices, so that we can join across transitions!
+      const outlierIndices = whiskerIndices
+        ? d3.range(0, whiskerIndices[0]).concat(d3.range(whiskerIndices[1] + 1, n))
+        : d3.range(n);
+
+      // Compute the new x-scale.
+      const x1 = d3.scale
+        .linear()
+        .domain((domain && domain.call(this, d, i)) || [min, max])
+        .range([height, 0]);
+
+      // Retrieve the old x-scale, if this is an update.
+      const x0 =
+        this.__chart__ ||
+        d3.scale
+          .linear()
+          .domain([0, Infinity])
+          .range(x1.range());
+
+      // Stash the new scale.
+      this.__chart__ = x1;
+
+      // Note: the box, median, and box tick elements are fixed in number,
+      // so we only have to handle enter and update. In contrast, the outliers
+      // and other elements are variable, so we need to exit them! Variable
+      // elements also fade in and out.
+
+      // Update center line: the vertical line spanning the whiskers.
+      const center = g.selectAll('line.center').data(whiskerData ? [whiskerData] : []);
+
+      center
+        .enter()
+        .insert('line', 'rect')
+        .attr('class', 'center')
+        .attr('x1', width / 2)
+        .attr('y1', d => x0(d[0]))
+        .attr('x2', width / 2)
+        .attr('y2', d => x0(d[1]))
+        .style('opacity', 1e-6)
+        .transition()
+        .duration(duration)
+        .style('opacity', 1)
+        .attr('y1', d => x1(d[0]))
+        .attr('y2', d => x1(d[1]));
+
+      center
+        .transition()
+        .duration(duration)
+        .style('opacity', 1)
+        .attr('y1', d => x1(d[0]))
+        .attr('y2', d => x1(d[1]));
+
+      center
+        .exit()
+        .transition()
+        .duration(duration)
+        .style('opacity', 1e-6)
+        .attr('y1', d => x1(d[0]))
+        .attr('y2', d => x1(d[1]))
+        .remove();
+
+      // Update innerquartile box.
+      const box = g.selectAll('rect.box').data([quartileData]);
+
+      box
+        .enter()
+        .append('rect')
+        .attr('class', 'box')
+        .attr('x', 0)
+        .attr('y', d => x0(d[2]))
+        .attr('width', width)
+        .attr('height', d => x0(d[0]) - x0(d[2]))
+        .transition()
+        .duration(duration)
+        .attr('y', d => x1(d[2]))
+        .attr('height', d => x1(d[0]) - x1(d[2]));
+
+      box
+        .transition()
+        .duration(duration)
+        .attr('y', d => x1(d[2]))
+        .attr('height', d => x1(d[0]) - x1(d[2]));
+
+      box.exit().remove();
+
+      // Update median line.
+      const medianLine = g.selectAll('line.median').data([quartileData[1]]);
+
+      medianLine
+        .enter()
+        .append('line')
+        .attr('class', 'median')
+        .attr('x1', 0)
+        .attr('y1', x0)
+        .attr('x2', width)
+        .attr('y2', x0)
+        .transition()
+        .duration(duration)
+        .attr('y1', x1)
+        .attr('y2', x1);
+
+      medianLine
+        .transition()
+        .duration(duration)
+        .attr('y1', x1)
+        .attr('y2', x1);
+
+      medianLine.exit().remove();
+
+      // Update whiskers.
+      const whisker = g.selectAll('line.whisker').data(whiskerData || []);
+
+      whisker
+        .enter()
+        .insert('line', 'circle, text')
+        .attr('class', 'whisker')
+        .attr('x1', 0)
+        .attr('y1', x0)
+        .attr('x2', width)
+        .attr('y2', x0)
+        .style('opacity', 1e-6)
+        .transition()
+        .duration(duration)
+        .attr('y1', x1)
+        .attr('y2', x1)
+        .style('opacity', 1);
+
+      whisker
+        .transition()
+        .duration(duration)
+        .attr('y1', x1)
+        .attr('y2', x1)
+        .style('opacity', 1);
+
+      whisker
+        .exit()
+        .transition()
+        .duration(duration)
+        .attr('y1', x1)
+        .attr('y2', x1)
+        .style('opacity', 1e-6)
+        .remove();
+
+      // Update outliers.
+      const outlier = g.selectAll('circle.outlier').data(outlierIndices, Number);
+
+      outlier
+        .enter()
+        .insert('circle', 'text')
+        .attr('class', 'outlier')
+        .attr('r', 5)
+        .attr('cx', width / 2)
+        .attr('cy', i => x0(d[i]))
+        .style('opacity', 1e-6)
+        .transition()
+        .duration(duration)
+        .attr('cy', i => x1(d[i]))
+        .style('opacity', 1);
+
+      outlier
+        .transition()
+        .duration(duration)
+        .attr('cy', i => x1(d[i]))
+        .style('opacity', 1);
+
+      outlier
+        .exit()
+        .transition()
+        .duration(duration)
+        .attr('cy', i => x1(d[i]))
+        .style('opacity', 1e-6)
+        .remove();
+
+      // Compute the tick format.
+      const format = tickFormat || x1.tickFormat(8);
+
+      // Update box ticks.
+      const boxTick = g.selectAll('text.box').data(quartileData);
+
+      boxTick
+        .enter()
+        .append('text')
+        .attr('class', 'box')
+        .attr('dy', '.3em')
+        .attr('dx', (d, i) => (i & 1 ? 6 : -6))
+        .attr('x', (d, i) => (i & 1 ? width : 0))
+        .attr('y', x0)
+        .attr('text-anchor', (d, i) => (i & 1 ? 'start' : 'end'))
+        .text(format)
+        .transition()
+        .duration(duration)
+        .attr('y', x1);
+
+      boxTick
+        .transition()
+        .duration(duration)
+        .text(format)
+        .attr('y', x1);
+
+      boxTick.exit().remove();
+
+      // Update whisker ticks. These are handled separately from the box
+      // ticks because they may or may not exist, and we want don't want
+      // to join box ticks pre-transition with whisker ticks post-.
+      const whiskerTick = g.selectAll('text.whisker').data(whiskerData || []);
+
+      whiskerTick
+        .enter()
+        .append('text')
+        .attr('class', 'whisker')
+        .attr('dy', '.3em')
+        .attr('dx', 6)
+        .attr('x', width)
+        .attr('y', x0)
+        .text(format)
+        .style('opacity', 1e-6)
+        .transition()
+        .duration(duration)
+        .attr('y', x1)
+        .style('opacity', 1);
+
+      whiskerTick
+        .transition()
+        .duration(duration)
+        .text(format)
+        .attr('y', x1)
+        .style('opacity', 1);
+
+      whiskerTick
+        .exit()
+        .transition()
+        .duration(duration)
+        .attr('y', x1)
+        .style('opacity', 1e-6)
+        .remove();
+    });
+    d3.timer.flush();
+  }
+
+  box.width = function(x) {
+    if (!arguments.length) return width;
+    width = x;
+    return box;
+  };
+
+  box.height = function(x) {
+    if (!arguments.length) return height;
+    height = x;
+    return box;
+  };
+
+  box.tickFormat = function(x) {
+    if (!arguments.length) return tickFormat;
+    tickFormat = x;
+    return box;
+  };
+
+  box.duration = function(x) {
+    if (!arguments.length) return duration;
+    duration = x;
+    return box;
+  };
+
+  box.domain = function(x) {
+    if (!arguments.length) return domain;
+    domain = x == null ? x : d3.functor(x);
+    return box;
+  };
+
+  box.value = function(x) {
+    if (!arguments.length) return value;
+    value = x;
+    return box;
+  };
+
+  box.whiskers = function(x) {
+    if (!arguments.length) return whiskers;
+    whiskers = x;
+    return box;
+  };
+
+  box.quartiles = function(x) {
+    if (!arguments.length) return quartiles;
+    quartiles = x;
+    return box;
+  };
+
+  return box;
+}
+
+function boxWhiskers(d) {
+  return [0, d.length - 1];
+}
+
+function boxQuartiles(d) {
+  return [d3.quantile(d, 0.25), d3.quantile(d, 0.5), d3.quantile(d, 0.75)];
+}
+
+export default box;

client/app/lib/visualizations/d3sankey.js

@@ -10,7 +10,7 @@ function value(link) {
   return link.value;
 }
 
-export default function() {
+function Sankey() {
   const sankey = {};
   let nodeWidth = 24;
   let nodePadding = 8;
@@ -21,11 +21,11 @@ export default function() {
   // Populate the sourceLinks and targetLinks for each node.
   // Also, if the source and target are not objects, assume they are indices.
   function computeNodeLinks() {
-    nodes.forEach((node) => {
+    nodes.forEach(node => {
       node.sourceLinks = [];
       node.targetLinks = [];
     });
-    links.forEach((link) => {
+    links.forEach(link => {
       let source = link.source;
       let target = link.target;
       if (typeof source === 'number') source = link.source = nodes[link.source];
@@ -37,16 +37,13 @@ export default function() {
 
   // Compute the value (size) of each node by summing the associated links.
   function computeNodeValues() {
-    nodes.forEach((node) => {
-      node.value = Math.max(
-        d3.sum(node.sourceLinks, value),
-        d3.sum(node.targetLinks, value)
-      );
+    nodes.forEach(node => {
+      node.value = Math.max(d3.sum(node.sourceLinks, value), d3.sum(node.targetLinks, value));
     });
   }
 
   function moveSinksRight(x) {
-    nodes.forEach((node) => {
+    nodes.forEach(node => {
       if (!node.sourceLinks.length) {
         node.x = x - 1;
       }
@@ -54,7 +51,7 @@ export default function() {
   }
 
   function scaleNodeBreadths(kx) {
-    nodes.forEach((node) => {
+    nodes.forEach(node => {
       node.x *= kx;
     });
   }
@@ -71,7 +68,7 @@ export default function() {
     function assignBreadth(node) {
       node.x = x;
       node.dx = nodeWidth;
-      node.sourceLinks.forEach((link) => {
+      node.sourceLinks.forEach(link => {
         if (nextNodes.indexOf(link.target) < 0) {
           nextNodes.push(link.target);
         }
@@ -91,7 +88,7 @@ export default function() {
   }
 
   function moveSourcesRight() {
-    nodes.forEach((node) => {
+    nodes.forEach(node => {
       if (!node.targetLinks.length) {
         node.x = d3.min(node.sourceLinks, d => d.target.x) - 1;
       }
@@ -99,25 +96,27 @@ export default function() {
   }
 
   function computeNodeDepths(iterations) {
-    const nodesByBreadth = d3.nest()
+    const nodesByBreadth = d3
+      .nest()
       .key(d => d.x)
       .sortKeys(d3.ascending)
       .entries(nodes)
       .map(d => d.values);
 
     function initializeNodeDepth() {
-      const ky = d3.min(nodesByBreadth, n =>
-         (size[1] - (n.length - 1) * nodePadding) / d3.sum(n, value)
+      const ky = d3.min(
+        nodesByBreadth,
+        n => (size[1] - (n.length - 1) * nodePadding) / d3.sum(n, value),
       );
 
-      nodesByBreadth.forEach((n) => {
+      nodesByBreadth.forEach(n => {
         n.forEach((node, i) => {
           node.y = i;
           node.dy = node.value * ky;
         });
       });
 
-      links.forEach((link) => {
+      links.forEach(link => {
         link.dy = link.value * ky;
       });
     }
@@ -127,8 +126,8 @@ export default function() {
         return center(link.source) * link.value;
       }
 
-      nodesByBreadth.forEach((n) => {
-        n.forEach((node) => {
+      nodesByBreadth.forEach(n => {
+        n.forEach(node => {
           if (node.targetLinks.length) {
             const y = d3.sum(node.targetLinks, weightedSource) / d3.sum(node.targetLinks, value);
             node.y += (y - center(node)) * alpha;
@@ -138,7 +137,7 @@ export default function() {
     }
 
     function resolveCollisions() {
-      nodesByBreadth.forEach((nodes) => {
+      nodesByBreadth.forEach(nodes => {
         const n = nodes.length;
         let node;
         let dy;
@@ -171,7 +170,7 @@ export default function() {
     }
 
     function resolveCollisions() {
-      nodesByBreadth.forEach((nodes) => {
+      nodesByBreadth.forEach(nodes => {
         let node,
           dy,
           y0 = 0,
@@ -203,20 +202,22 @@ export default function() {
       });
     }
 
-
     initializeNodeDepth();
     resolveCollisions();
 
     for (let alpha = 1; iterations > 0; iterations -= 1) {
-      relaxRightToLeft(alpha *= 0.99);
+      relaxRightToLeft((alpha *= 0.99));
       resolveCollisions();
       relaxLeftToRight(alpha);
       resolveCollisions();
     }
 
     function relaxRightToLeft(alpha) {
-      nodesByBreadth.slice().reverse().forEach((nodes) => {
-        nodes.forEach((node) => {
+      nodesByBreadth
+        .slice()
+        .reverse()
+        .forEach(nodes => {
+          nodes.forEach(node => {
             if (node.sourceLinks.length) {
               const y = d3.sum(node.sourceLinks, weightedTarget) / d3.sum(node.sourceLinks, value);
               node.y += (y - center(node)) * alpha;
@@ -235,18 +236,18 @@ export default function() {
   }
 
   function computeLinkDepths() {
-    nodes.forEach((node) => {
+    nodes.forEach(node => {
       node.sourceLinks.sort(ascendingTargetDepth);
       node.targetLinks.sort(ascendingSourceDepth);
     });
-    nodes.forEach((node) => {
+    nodes.forEach(node => {
       let sy = 0,
         ty = 0;
-      node.sourceLinks.forEach((link) => {
+      node.sourceLinks.forEach(link => {
         link.sy = sy;
         sy += link.dy;
       });
-      node.targetLinks.forEach((link) => {
+      node.targetLinks.forEach(link => {
         link.ty = ty;
         ty += link.dy;
       });
@@ -317,13 +318,10 @@ export default function() {
       const y0 = d.source.y + d.sy + d.dy / 2;
       const y1 = d.target.y + d.ty + d.dy / 2;
 
-      return `M${x0},${y0
-            }C${x2},${y0
-            } ${x3},${y1
-            } ${x1},${y1}`;
+      return `M${x0},${y0}C${x2},${y0} ${x3},${y1} ${x1},${y1}`;
     }
 
-    link.curvature = (_) => {
+    link.curvature = _ => {
       if (!arguments.length) return curvature;
       curvature = +_;
       return link;
@@ -332,6 +330,7 @@ export default function() {
     return link;
   };
 
-
   return sankey;
-};
+}
+
+export default Sankey;

client/app/lib/visualizations/sunburst.js

@@ -1,4 +1,4 @@
-import d3 from 'd3';
+import * as d3 from 'd3';
 import _ from 'underscore';
 import angular from 'angular';
 
@@ -10,7 +10,6 @@ function colorMap(d) {
   return colors(d.name);
 }
 
-
 // Return array of ancestors of nodes, highest first, but excluding the root.
 function getAncestors(node) {
   const path = [];
@@ -24,7 +23,7 @@ function getAncestors(node) {
 }
 
 // The following is based on @chrisrzhou's example from: http://bl.ocks.org/chrisrzhou/d5bdd8546f64ca0e4366.
-export default function Sunburst(scope, element) {
+function Sunburst(scope, element) {
   this.element = element;
   this.watches = [];
 
@@ -60,27 +59,18 @@ export default function Sunburst(scope, element) {
   let totalSize = 0;
 
   // create d3.layout.partition
-  const partition = d3.layout.partition()
+  const partition = d3.layout
+    .partition()
     .size([2 * Math.PI, radius * radius])
-    .value(d =>
-       d.size
-    );
+    .value(d => d.size);
 
   // create arcs for drawing D3 paths
-  const arc = d3.svg.arc()
-    .startAngle(d =>
-       d.x
-    )
-    .endAngle(d =>
-       d.x + d.dx
-    )
-    .innerRadius(d =>
-       Math.sqrt(d.y)
-    )
-    .outerRadius(d =>
-       Math.sqrt(d.y + d.dy)
-    );
-
+  const arc = d3.svg
+    .arc()
+    .startAngle(d => d.x)
+    .endAngle(d => d.x + d.dx)
+    .innerRadius(d => Math.sqrt(d.y))
+    .outerRadius(d => Math.sqrt(d.y + d.dy));
 
   /**
    * Define and initialize D3 select references and div-containers
@@ -88,15 +78,18 @@ export default function Sunburst(scope, element) {
    * e.g. vis, breadcrumbs, lastCrumb, summary, sunburst, legend
    */
   // create main vis selection
-  const vis = d3.select(element[0])
-    .append('div').classed('vis-container', true)
+  const vis = d3
+    .select(element[0])
+    .append('div')
+    .classed('vis-container', true)
     .style('position', 'relative')
     .style('margin-top', '5px')
     .style('height', `${height + 2 * b.h}px`);
 
   // create and position breadcrumbs container and svg
   const breadcrumbs = vis
-    .append('div').classed('breadcrumbs-container', true)
+    .append('div')
+    .classed('breadcrumbs-container', true)
     .append('svg')
     .attr('width', width)
     .attr('height', b.h)
@@ -107,7 +100,8 @@ export default function Sunburst(scope, element) {
 
   // create and position SVG
   const sunburst = vis
-    .append('div').classed('sunburst-container', true)
+    .append('div')
+    .classed('sunburst-container', true)
     .style('z-index', '2')
     // .style("margin-left", marginLeft + "px")
     .style('left', `${marginLeft}px`)
@@ -123,9 +117,10 @@ export default function Sunburst(scope, element) {
 
   // create and position summary container
   const summary = vis
-    .append('div').classed('summary-container', true)
+    .append('div')
+    .classed('summary-container', true)
     .style('position', 'absolute')
-    .style('top', `${b.h + radius * 0.80}px`)
+    .style('top', `${b.h + radius * 0.8}px`)
     .style('left', `${marginLeft + radius / 2}px`)
     .style('width', `${radius}px`)
     .style('height', `${radius}px`)
@@ -143,7 +138,8 @@ export default function Sunburst(scope, element) {
     points.push(`${b.w},${b.h}`);
     points.push(`0,${b.h}`);
 
-    if (i > 0) { // Leftmost breadcrumb; don't include 6th vertex.
+    if (i > 0) {
+      // Leftmost breadcrumb; don't include 6th vertex.
       points.push(`${b.t},${b.h / 2}`);
     }
     return points.join(' ');
@@ -152,34 +148,29 @@ export default function Sunburst(scope, element) {
   // Update the breadcrumb breadcrumbs to show the current sequence and percentage.
   function updateBreadcrumbs(ancestors, percentageString) {
     // Data join, where primary key = name + depth.
-    const g = breadcrumbs.selectAll('g')
-      .data(ancestors, d =>
-         d.name + d.depth
-      );
+    const g = breadcrumbs.selectAll('g').data(ancestors, d => d.name + d.depth);
 
     // Add breadcrumb and label for entering nodes.
     const breadcrumb = g.enter().append('g');
 
     breadcrumb
-      .append('polygon').classed('breadcrumbs-shape', true)
+      .append('polygon')
+      .classed('breadcrumbs-shape', true)
       .attr('points', breadcrumbPoints)
       .attr('fill', colorMap);
 
     breadcrumb
-      .append('text').classed('breadcrumbs-text', true)
+      .append('text')
+      .classed('breadcrumbs-text', true)
       .attr('x', (b.w + b.t) / 2)
       .attr('y', b.h / 2)
       .attr('dy', '0.35em')
       .attr('font-size', '10px')
       .attr('text-anchor', 'middle')
-      .text(d =>
-         d.name
-      );
+      .text(d => d.name);
 
     // Set position for entering and updating nodes.
-    g.attr('transform', (d, i) =>
-       `translate(${i * (b.w + b.s)}, 0)`
-    );
+    g.attr('transform', (d, i) => `translate(${i * (b.w + b.s)}, 0)`);
 
     // Remove exiting nodes.
     g.exit().remove();
@@ -210,32 +201,27 @@ export default function Sunburst(scope, element) {
     updateBreadcrumbs(ancestors, percentageString);
 
     // update sunburst (Fade all the segments and highlight only ancestors of current segment)
-    sunburst.selectAll('path')
-      .attr('opacity', 0.3);
-    sunburst.selectAll('path')
-      .filter(node =>
-         (ancestors.indexOf(node) >= 0)
-      )
+    sunburst.selectAll('path').attr('opacity', 0.3);
+    sunburst
+      .selectAll('path')
+      .filter(node => ancestors.indexOf(node) >= 0)
       .attr('opacity', 1);
 
     // update summary
-    summary.html(
-      `Stage: ${d.depth}<br />` +
-      `<span class='percentage' style='font-size: 2em;'>${percentageString}</span><br />${
-      d.value} of ${totalSize}<br />`
-    );
+    summary.html(`Stage: ${d.depth}<br />` +
+        `<span class='percentage' style='font-size: 2em;'>${percentageString}</span><br />${d.value} of ${totalSize}<br />`);
 
     // display summary and breadcrumbs if hidden
     summary.style('visibility', '');
     breadcrumbs.style('visibility', '');
   }
 
-
   // helper function click to handle mouseleave events/animations
   function click() {
     // Deactivate all segments then retransition each segment to full opacity.
     sunburst.selectAll('path').on('mouseover', null);
-    sunburst.selectAll('path')
+    sunburst
+      .selectAll('path')
       .transition()
       .duration(1000)
       .attr('opacity', 1)
@@ -251,10 +237,8 @@ export default function Sunburst(scope, element) {
   // helper function to draw the sunburst and breadcrumbs
   function drawSunburst(json) {
     // Build only nodes of a threshold "visible" sizes to improve efficiency
-    const nodes = partition.nodes(json)
-      .filter(d =>
-         (d.dx > 0.005) && d.name !== exitNode // 0.005 radians = 0.29 degrees
-      );
+    // 0.005 radians = 0.29 degrees
+    const nodes = partition.nodes(json).filter(d => d.dx > 0.005 && d.name !== exitNode);
 
     // this section is required to update the colors.domain() every time the data updates
     const uniqueNames = (function uniqueNames(a) {
@@ -267,8 +251,11 @@ export default function Sunburst(scope, element) {
     colors.domain(uniqueNames); // update domain colors
 
     // create path based on nodes
-    const path = sunburst.data([json]).selectAll('path')
-      .data(nodes).enter()
+    const path = sunburst
+      .data([json])
+      .selectAll('path')
+      .data(nodes)
+      .enter()
       .append('path')
       .classed('nodePath', true)
       .attr('display', d => (d.depth ? null : 'none'))
@@ -278,7 +265,6 @@ export default function Sunburst(scope, element) {
       .attr('stroke', 'white')
       .on('mouseover', mouseover);
 
-
     // // trigger mouse click over sunburst to reset visualization summary
     vis.on('click', click);
 
@@ -299,7 +285,12 @@ export default function Sunburst(scope, element) {
   function buildNodes(raw) {
     let values;
 
-    if (_.has(raw[0], 'sequence') && _.has(raw[0], 'stage') && _.has(raw[0], 'node') && _.has(raw[0], 'value')) {
+    if (
+      _.has(raw[0], 'sequence') &&
+      _.has(raw[0], 'stage') &&
+      _.has(raw[0], 'node') &&
+      _.has(raw[0], 'value')
+    ) {
       const grouped = _.groupBy(raw, 'sequence');
 
       values = _.map(grouped, (value) => {
@@ -314,13 +305,11 @@ export default function Sunburst(scope, element) {
       const validKey = key => key !== 'value' && key.indexOf('$$') !== 0;
       const keys = _.sortBy(_.filter(_.keys(raw[0]), validKey), _.identity);
 
-      values = _.map(raw, (row, sequence) =>
-         ({
+      values = _.map(raw, (row, sequence) => ({
         size: row.value,
         sequence,
         nodes: _.compact(_.map(keys, key => row[key])),
-         })
-      );
+      }));
     }
 
     return values;
@@ -346,7 +335,6 @@ export default function Sunburst(scope, element) {
         const nodeName = nodes[j];
         const isLeaf = j + 1 === nodes.length;
 
-
         if (!children) {
           currentNode.children = children = [];
           children.push({
@@ -403,6 +391,10 @@ export default function Sunburst(scope, element) {
 }
 
 Sunburst.prototype.remove = function remove() {
-  this.watches.forEach((unregister) => { unregister(); });
+  this.watches.forEach((unregister) => {
+    unregister();
+  });
   angular.element(this.element[0]).empty('.vis-container');
 };
+
+export default Sunburst;

client/app/multi_org.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html ng-app="app" ng-strict-di>
+  <head lang="en">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="UTF-8">
+    <base href="{{base_href}}">
+    <title>Redash</title>
+
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/images/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
+  </head>
+
+  <body>
+    <section>
+      <div ng-view></div>
+    </section>
+  </body>
+</html>

client/app/pages/admin/index.js

@@ -1,10 +0,0 @@
-import registerStatusPage from './status';
-import registerOutdatedQueriesPage from './outdated-queries';
-import registerTasksPage from './tasks';
-
-export default function (ngModule) {
-  const routes = Object.assign({}, registerStatusPage(ngModule),
-                                   registerOutdatedQueriesPage(ngModule),
-                                   registerTasksPage(ngModule));
-  return routes;
-}

client/app/pages/admin/outdated-queries/index.js

@@ -1,6 +1,6 @@
 import moment from 'moment';
 
-import { Paginator } from '../../../utils';
+import { Paginator } from '@/lib/pagination';
 import template from './outdated-queries.html';
 
 function OutdatedQueriesCtrl($scope, Events, $http, $timeout) {
@@ -30,7 +30,7 @@ function OutdatedQueriesCtrl($scope, Events, $http, $timeout) {
   refresh();
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('outdatedQueriesPage', {
     template,
     controller: OutdatedQueriesCtrl,

client/app/pages/admin/status/index.js

@@ -25,7 +25,7 @@ function AdminStatusCtrl($scope, $http, $timeout, currentUser, Events) {
   refresh();
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('statusPage', {
     template,
     controller: AdminStatusCtrl,

client/app/pages/admin/tasks/index.js

@@ -1,8 +1,7 @@
 import moment from 'moment';
 
-import { Paginator } from '../../../utils';
+import { Paginator } from '@/lib/pagination';
 import template from './tasks.html';
-import registerCancelQueryButton from './cancel-query-button';
 
 function TasksCtrl($scope, $location, $http, $timeout, Events) {
   Events.record('view', 'page', 'admin/tasks');
@@ -46,14 +45,12 @@ function TasksCtrl($scope, $location, $http, $timeout, Events) {
   refresh();
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('tasksPage', {
     template,
     controller: TasksCtrl,
   });
 
-  registerCancelQueryButton(ngModule);
-
   return {
     '/admin/queries/tasks': {
       template: '<tasks-page></tasks-page>',

client/app/pages/admin/tasks/tasks.html

@@ -35,14 +35,14 @@
         <td>{{row.data_source_id}}</td>
         <td>{{row.username}}</td>
         <td>{{row.state}} <span ng-if="row.state === 'failed'" uib-popover="{{row.error}}" popover-trigger="mouseenter" class="zmdi zmdi-help"></span></td>
-        <td>{{row.query_id}}</td>
+        <td><a href="queries/{{row.query_id}}">{{row.query_id}}</a></td>
         <td>{{row.query_hash}}</td>
         <td>{{row.run_time | durationHumanize}}</td>
         <td>{{row.created_at | toMilliseconds | dateTime }}</td>
         <td>{{row.started_at | toMilliseconds | dateTime }}</td>
         <td>{{row.updated_at | toMilliseconds | dateTime }}</td>
         <td ng-if="selectedTab === 'in_progress'">
-          <cancel-query-button query-id="dataRow.query_id" task-id="dataRow.task_id"></cancel-query-button>
+          <cancel-query-button query-id="row.query_id" task-id="row.task_id"></cancel-query-button>
         </td>
       </tr>
       </tbody>

client/app/pages/alert/alert-subscriptions/index.js

@@ -1,102 +0,0 @@
-import { contains, without, compact } from 'underscore';
-import template from './alert-subscriptions.html';
-
-function controller($scope, $q, $sce, currentUser, AlertSubscription, Destination, toastr) {
-  'ngInject';
-
-  $scope.newSubscription = {};
-  $scope.subscribers = [];
-  $scope.destinations = [];
-  $scope.currentUser = currentUser;
-
-  $q.all([Destination.query().$promise,
-    AlertSubscription.query({ alertId: $scope.alertId }).$promise]).then((responses) => {
-      const destinations = responses[0];
-      const subscribers = responses[1];
-
-      const subscribedDestinations =
-        compact(subscribers.map(s => s.destination && s.destination.id));
-
-      const subscribedUsers =
-        compact(subscribers.map(s => !s.destination && s.user.id));
-
-      $scope.destinations = destinations.filter(d => !contains(subscribedDestinations, d.id));
-
-      if (!contains(subscribedUsers, currentUser.id)) {
-        $scope.destinations.unshift({ user: { name: currentUser.name } });
-      }
-
-      $scope.newSubscription.destination = $scope.destinations[0];
-      $scope.subscribers = subscribers;
-    });
-
-  $scope.destinationsDisplay = (d) => {
-    if (!d) {
-      return '';
-    }
-
-    let destination = d;
-    if (d.destination) {
-      destination = destination.destination;
-    } else if (destination.user) {
-      destination = {
-        name: `${d.user.name} (Email)`,
-        icon: 'fa-envelope',
-        type: 'user',
-      };
-    }
-
-    return $sce.trustAsHtml(`<i class="fa ${destination.icon}"></i>&nbsp;${destination.name}`);
-  };
-
-  $scope.saveSubscriber = () => {
-    const sub = new AlertSubscription({ alert_id: $scope.alertId });
-    if ($scope.newSubscription.destination.id) {
-      sub.destination_id = $scope.newSubscription.destination.id;
-    }
-
-    sub.$save(() => {
-      toastr.success('Subscribed.');
-      $scope.subscribers.push(sub);
-      $scope.destinations = without($scope.destinations, $scope.newSubscription.destination);
-      if ($scope.destinations.length > 0) {
-        $scope.newSubscription.destination = $scope.destinations[0];
-      } else {
-        $scope.newSubscription.destination = undefined;
-      }
-    }, () => {
-      toastr.error('Failed saving subscription.');
-    });
-  };
-
-  $scope.unsubscribe = (subscriber) => {
-    const destination = subscriber.destination;
-    const user = subscriber.user;
-
-    subscriber.$delete(() => {
-      toastr.success('Unsubscribed');
-      $scope.subscribers = without($scope.subscribers, subscriber);
-      if (destination) {
-        $scope.destinations.push(destination);
-      } else if (user.id === currentUser.id) {
-        $scope.destinations.push({ user: { name: currentUser.name } });
-      }
-
-      if ($scope.destinations.length === 1) {
-        $scope.newSubscription.destination = $scope.destinations[0];
-      }
-    }, () => {
-      toastr.error('Failed unsubscribing.');
-    });
-  };
-}
-
-export default () => ({
-  restrict: 'E',
-  replace: true,
-  scope: {
-    alertId: '=',
-  },
-  template,
-  controller,
-});

client/app/pages/alert/index.js

@@ -1,6 +1,5 @@
 import { template as templateBuilder } from 'underscore';
 import template from './alert.html';
-import alertSubscriptions from './alert-subscriptions';
 
 function AlertCtrl($routeParams, $location, $sce, toastr, currentUser, Query, Events, Alert) {
   this.alertId = $routeParams.alertId;
@@ -60,34 +59,38 @@ function AlertCtrl($routeParams, $location, $sce, toastr, currentUser, Query, Ev
     if (this.alert.rearm === '' || this.alert.rearm === 0) {
       this.alert.rearm = null;
     }
-    this.alert.$save((alert) => {
+    this.alert.$save(
+      (alert) => {
         toastr.success('Saved.');
         if (this.alertId === 'new') {
           $location.path(`/alerts/${alert.id}`).replace();
         }
-    }, () => {
+      },
+      () => {
         toastr.error('Failed saving alert.');
-    });
+      },
+    );
   };
 
   this.delete = () => {
-    this.alert.$delete(() => {
+    this.alert.$delete(
+      () => {
         $location.path('/alerts');
         toastr.success('Alert deleted.');
-    }, () => {
+      },
+      () => {
         toastr.error('Failed deleting alert.');
-    });
+      },
+    );
   };
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('alertPage', {
     template,
     controller: AlertCtrl,
   });
 
-  ngModule.directive('alertSubscriptions', alertSubscriptions);
-
   return {
     '/alerts/:alertId': {
       template: '<alert-page></alert-page>',

client/app/pages/alerts-list/alerts-list.html

@@ -4,20 +4,20 @@
   </page-header>
 
   <div class="container">
-    <div class="container bg-white">
+    <div class="bg-white">
       <table class="table table-condensed table-hover">
         <thead>
         <tr>
-          <th>Name</th>
-          <th>Created By</th>
-          <th>State</th>
-          <th>Created At</th>
+          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('name')">Name <sort-icon column="'name'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
+          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('created_by')">Created By <sort-icon column="'created_by'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
+          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('state')">State <sort-icon column="'state'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
+          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('created_at')">Created By <sort-icon column="'created_at'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
         </tr>
         </thead>
         <tbody>
         <tr ng-repeat="row in $ctrl.alerts.getPageRows()">
           <td><a href="alerts/{{row.id}}">{{row.name}}</a></td>
-          <td>{{row.user.name}}</td>
+          <td>{{row.created_by}}</td>
           <td><span ng-class="row.class">{{row.state | uppercase}}</span> since <span am-time-ago="row.updated_at"></span></td>
           <td><span am-time-ago="row.created_at"></span></td>
         </tr>

client/app/pages/alerts-list/index.js

@@ -1,29 +1,32 @@
-import { Paginator } from '../../utils';
+import { Paginator } from '@/lib/pagination';
 import template from './alerts-list.html';
 
-class AlertsListCtrl {
-  constructor(Events, Alert) {
-    Events.record('view', 'page', 'alerts');
-
-    this.alerts = new Paginator([], { itemsPerPage: 20 });
-
-    Alert.query((alerts) => {
 const stateClass = {
   ok: 'label label-success',
   triggered: 'label label-danger',
   unknown: 'label label-warning',
 };
 
-      alerts.forEach((alert) => {
-        alert.class = stateClass[alert.state];
-      });
+class AlertsListCtrl {
+  constructor(Events, Alert) {
+    Events.record('view', 'page', 'alerts');
 
-      this.alerts.updateRows(alerts);
+    this.alerts = new Paginator([], { itemsPerPage: 20 });
+    Alert.query((alerts) => {
+      this.alerts.updateRows(alerts.map(alert => ({
+        id: alert.id,
+        name: alert.name,
+        state: alert.state,
+        class: stateClass[alert.state],
+        created_by: alert.user.name,
+        created_at: alert.created_at,
+        updated_at: alert.updated_at,
+      })));
     });
   }
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('alertsListPage', {
     template,
     controller: AlertsListCtrl,

client/app/pages/dashboards/dashboard-list.html

@@ -2,7 +2,7 @@
   <page-header title="Dashboards"></page-header>
   <div class="col-lg-3">
     <input type='text' class='form-control' placeholder="Search Dashboards..." 
-      ng-change="$ctrl.update()" ng-model="$ctrl.searchText"/>
+      ng-change="$ctrl.update()" ng-model="$ctrl.searchText" autofocus/>
     <div class='list-group m-t-20 tags-list'>
       <a ng-repeat='tag in $ctrl.allTags' ng-class='{"active": $ctrl.tagIsSelected(tag)}'
       class='list-group-item' ng-click='$ctrl.toggleTag($event, tag)'>

client/app/pages/dashboards/dashboard-list.js

@@ -1,12 +1,12 @@
 import _ from 'underscore';
 
-import { Paginator } from '../../utils';
+import { Paginator } from '@/lib/pagination';
 import template from './dashboard-list.html';
 import './dashboard-list.css';
 
 
 function DashboardListCtrl(Dashboard, $location, clientConfig) {
-  const TAGS_REGEX = /(^[\w\s]+):|(#[\w-]+)/ig;
+  const TAGS_REGEX = /(^([\w\s]|[^\u0000-\u007F])+):|(#([\w-]|[^\u0000-\u007F])+)/ig;
 
   this.logoUrl = clientConfig.logoUrl;
   const page = parseInt($location.search().page || 1, 10);
@@ -46,6 +46,7 @@ function DashboardListCtrl(Dashboard, $location, clientConfig) {
 
   this.update = () => {
     this.dashboards.$promise.then((data) => {
+      data = _.sortBy(data, 'name');
       const filteredDashboards = data.map((dashboard) => {
         dashboard.tags = (dashboard.name.match(TAGS_REGEX) || []).map(tag => tag.replace(/:$/, ''));
         dashboard.untagged_name = dashboard.name.replace(TAGS_REGEX, '').trim();
@@ -74,7 +75,7 @@ function DashboardListCtrl(Dashboard, $location, clientConfig) {
   this.update();
 }
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('pageDashboardList', {
     template,
     controller: DashboardListCtrl,

client/app/pages/dashboards/dashboard.js

@@ -2,8 +2,10 @@ import * as _ from 'underscore';
 import template from './dashboard.html';
 import shareDashboardTemplate from './share-dashboard.html';
 
-function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibModal,
-  Title, AlertDialog, Dashboard, currentUser, clientConfig, Events) {
+function DashboardCtrl(
+  $rootScope, $routeParams, $location, $timeout, $q, $uibModal,
+  Title, AlertDialog, Dashboard, currentUser, clientConfig, Events,
+) {
   this.isFullscreen = false;
   this.refreshRate = null;
   this.showPermissionsControl = clientConfig.showPermissionsControl;
@@ -17,6 +19,8 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
     { name: '10 minutes', rate: 60 * 10 },
     { name: '30 minutes', rate: 60 * 30 },
     { name: '1 hour', rate: 60 * 60 },
+    { name: '12 hour', rate: 12 * 60 * 60 },
+    { name: '24 hour', rate: 24 * 60 * 60 },
   ];
 
   this.setRefreshRate = (rate) => {
@@ -40,8 +44,7 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
             globalParams[param.name].locals.push(param);
           });
         }
-      })
-    );
+      }));
     this.globalParameters = _.values(globalParams);
   };
 
@@ -66,8 +69,7 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
             promises.push(queryResult.toPromise());
           }
         }
-       })
-    );
+      }));
 
     this.extractGlobalParameters();
 
@@ -126,8 +128,7 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
   this.autoRefresh = () => {
     $timeout(() => {
       this.loadDashboard(true);
-    }, this.refreshRate.rate * 1000
-    ).then(() => this.autoRefresh());
+    }, this.refreshRate.rate * 1000).then(() => this.autoRefresh());
   };
 
   this.archiveDashboard = () => {
@@ -155,12 +156,20 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
   };
 
   this.editDashboard = () => {
+    const previousFiltersState = this.dashboard.dashboard_filters_enabled;
     $uibModal.open({
       component: 'editDashboardDialog',
       resolve: {
         dashboard: () => this.dashboard,
       },
-    }).result.then((dashboard) => { this.dashboard = dashboard; });
+    }).result.then((dashboard) => {
+      const shouldRenderDashboard = !previousFiltersState && dashboard.dashboard_filters_enabled;
+      this.dashboard = dashboard;
+
+      if (shouldRenderDashboard) {
+        renderDashboard(this.dashboard);
+      }
+    });
   };
 
   this.addWidget = () => {
@@ -250,7 +259,7 @@ const ShareDashboardComponent = {
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('shareDashboard', ShareDashboardComponent);
   ngModule.component('dashboardPage', {
     template,

client/app/pages/dashboards/index.js

@@ -1,14 +0,0 @@
-import dashboardPage from './dashboard';
-import dashboardList from './dashboard-list';
-import widgetComponent from './widget';
-import addWidgetDialog from './add-widget-dialog';
-import registerEditDashboardDialog from './edit-dashboard-dialog';
-import publicDashboardPage from './public-dashboard-page';
-
-export default function (ngModule) {
-  addWidgetDialog(ngModule);
-  widgetComponent(ngModule);
-  publicDashboardPage(ngModule);
-  registerEditDashboardDialog(ngModule);
-  return Object.assign({}, dashboardPage(ngModule), dashboardList(ngModule));
-}

client/app/pages/dashboards/public-dashboard-page.js

@@ -1,5 +1,5 @@
+import logoUrl from '@/assets/images/redash_icon_small.png';
 import template from './public-dashboard-page.html';
-import logoUrl from '../../assets/images/redash_icon_small.png';
 
 const PublicDashboardPage = {
   template,
@@ -17,23 +17,18 @@ const PublicDashboardPage = {
     }
     this.public = true;
     this.dashboard.widgets = this.dashboard.widgets.map(row =>
-       row.map(widget =>
-         new Widget(widget)
-      )
-    );
+      row.map(widget => new Widget(widget)));
   },
 };
 
-export default function (ngModule) {
+export default function init(ngModule) {
   ngModule.component('publicDashboardPage', PublicDashboardPage);
 
   function loadPublicDashboard($http, $route) {
     'ngInject';
 
     const token = $route.current.params.token;
-    return $http.get(`/api/dashboards/public/${token}`).then(response =>
-       response.data
-    );
+    return $http.get(`api/dashboards/public/${token}`).then(response => response.data);
   }
 
   function session($http, $route, Auth) {
@@ -52,4 +47,6 @@ export default function (ngModule) {
       },
     });
   });
+
+  return [];
 }