From 2bd1a77c9c1b1e54c6b84f48efa3939a08783426 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Tue, 19 Dec 2017 17:07:42 +0900
Subject: [PATCH 01/13] Undo incomplete commit

---
 client/app/components/app-header/app-header.html       |  2 +-
 .../permissions-editor/permissions-editor.html         |  4 ++--
 client/app/pages/groups/show.html                      |  4 ++--
 client/app/pages/queries-list/queries-list.html        |  2 +-
 .../app/pages/queries/queries-search-results-page.html |  2 +-
 client/app/pages/queries/query.html                    |  2 +-
 client/app/pages/query-snippets/edit.html              |  2 +-
 client/app/pages/query-snippets/list.html              |  2 +-
 client/app/pages/users/list.html                       |  2 +-
 client/app/pages/users/show.html                       |  2 +-
 migrations/versions/7671dca4e604_.py                   |  4 ++--
 redash/authentication/google_oauth.py                  |  3 +--
 redash/handlers/authentication.py                      |  5 ++++-
 redash/models.py                                       | 10 +++++-----
 14 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/client/app/components/app-header/app-header.html b/client/app/components/app-header/app-header.html
index 4fb019ea7c..091f397143 100644
--- a/client/app/components/app-header/app-header.html
+++ b/client/app/components/app-header/app-header.html
@@ -57,7 +57,7 @@
         <!--</li>-->
         <li class="dropdown" uib-dropdown>
           <a href="#" class="dropdown-toggle dropdown--profile" uib-dropdown-toggle>
-            <img ng-src="{{$ctrl.currentUser.profile_image_url}}" class="profile__image--navbar" width="20"/>
+            <img ng-src="{{$ctrl.currentUser.gravatar_url}}" class="profile__image--navbar" width="20"/>
             <span class="dropdown--profile__username" ng-bind="$ctrl.currentUser.name"></span> <span
             class="caret caret--nav"></span></a>
           <ul class="dropdown-menu dropdown-menu--profile">
diff --git a/client/app/components/permissions-editor/permissions-editor.html b/client/app/components/permissions-editor/permissions-editor.html
index 61f45d893c..bf56e26fe1 100644
--- a/client/app/components/permissions-editor/permissions-editor.html
+++ b/client/app/components/permissions-editor/permissions-editor.html
@@ -11,7 +11,7 @@ <h4 class="modal-title">Manage Permissions</h4>
                          refresh-delay="0"
                          ui-disable-choice="user.alreadyGrantee">
         <div>
-          <img ng-src="{{user.profile_image_url}}" height="24px">&nbsp;{{user.name}}
+          <img ng-src="{{user.gravatar_url}}" height="24px">&nbsp;{{user.name}}
           <small ng-if="user.alreadyGrantee">(already has permission)</small>
         </div>
        </ui-select-choices>
@@ -28,7 +28,7 @@ <h4 class="modal-title">Manage Permissions</h4>
         </thead>
         <tbody>
         <tr ng-repeat="grantee in $ctrl.grantees">
-          <td width="50px"><img ng-src="{{grantee.profile_image_url}}" height="40px"/></td>
+          <td width="50px"><img ng-src="{{grantee.gravatar_url}}" height="40px"/></td>
           <td>{{grantee.name}} </td>
           <td>{{grantee.access_type}}</td>
           <td><button class="pull-right btn btn-sm btn-danger" ng-click="$ctrl.removeGrantee(grantee)">Remove</button></td>
diff --git a/client/app/pages/groups/show.html b/client/app/pages/groups/show.html
index c60f4ea3ba..94d521e857 100644
--- a/client/app/pages/groups/show.html
+++ b/client/app/pages/groups/show.html
@@ -17,7 +17,7 @@
                            refresh-delay="0"
                            ui-disable-choice="user.alreadyMember">
           <div>
-            <img ng-src="{{user.profile_image_url}}" height="24px">&nbsp;{{user.name}}
+            <img ng-src="{{user.gravatar_url}}" height="24px">&nbsp;{{user.name}}
             <small ng-if="user.alreadyMember">(already member in this group)</small>
           </div>
         </ui-select-choices>
@@ -29,7 +29,7 @@
       <table class="table table-condensed table-hover" ng-show="members">
         <tbody>
         <tr ng-repeat="member in members">
-          <td width="50px"><img ng-src="{{member.profile_image_url}}" height="40px"/></td>
+          <td width="50px"><img ng-src="{{member.gravatar_url}}" height="40px"/></td>
           <td>{{member.name}} <button class="pull-right btn btn-sm btn-danger" ng-click="removeMember(member)" ng-if="currentUser.isAdmin && (group.type != 'builtin' || currentUser.id != member.id)">Remove</button></td>
         </tr>
         </tbody>
diff --git a/client/app/pages/queries-list/queries-list.html b/client/app/pages/queries-list/queries-list.html
index 883e514296..62e99739dc 100644
--- a/client/app/pages/queries-list/queries-list.html
+++ b/client/app/pages/queries-list/queries-list.html
@@ -18,7 +18,7 @@
       <tr ng-repeat="query in $ctrl.paginator.getPageRows()">
         <td><a href="queries/{{query.id}}">{{query.name}}</a> <span class="label label-default" ng-if="query.is_draft">Unpublished</span></td>
         <td>
-          <img ng-src="{{query.user.profile_image_url}}" class="profile__image_thumb"/>
+          <img ng-src="{{query.user.gravatar_url}}" class="profile__image_thumb"/>
           {{query.user.name}}
         </td>
         <td>{{query.created_at | dateTime}}</td>
diff --git a/client/app/pages/queries/queries-search-results-page.html b/client/app/pages/queries/queries-search-results-page.html
index 16df5352b2..7b9cf26376 100644
--- a/client/app/pages/queries/queries-search-results-page.html
+++ b/client/app/pages/queries/queries-search-results-page.html
@@ -25,7 +25,7 @@
           <tr ng-repeat="query in $ctrl.paginator.getPageRows()">
             <td><a href="queries/{{query.id}}">{{query.name}}</a> <span class="label label-default" ng-if="query.is_draft">Unpublished</span></td>
             <td>
-              <img ng-src="{{query.user.profile_image_url}}" class="profile__image_thumb"/>
+              <img ng-src="{{query.user.gravatar_url}}" class="profile__image_thumb"/>
               {{query.user.name}}</td>
             <td>{{query.created_at | dateTime}}</td>
             <td>{{query.schedule | scheduleHumanize}}</td>
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 2e72f9dce2..a25ee66216 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -40,7 +40,7 @@ <h3>
         <li>
           <span class="zmdi zmdi-account"></span>
           <span class="text-muted">Created By </span>
-          <img ng-src="{{query.user.profile_image_url}}" class="profile__image_thumb"/>
+          <img ng-src="{{query.user.gravatar_url}}" class="profile__image_thumb"/>
           <strong>{{query.user.name}}</strong>
         </li>
         <li ng-if="query.last_modified_by && query.user.id != query.last_modified_by.id">
diff --git a/client/app/pages/query-snippets/edit.html b/client/app/pages/query-snippets/edit.html
index 3b509450eb..5ba4da3342 100644
--- a/client/app/pages/query-snippets/edit.html
+++ b/client/app/pages/query-snippets/edit.html
@@ -23,7 +23,7 @@
       </div>
       <small ng-if="$ctrl.snippet.user">
         Created by: 
-        <img ng-src="{{$ctrl.snippet.user.profile_image_url}}" class="profile__image_thumb"/>
+        <img ng-src="{{$ctrl.snippet.user.gravatar_url}}" class="profile__image_thumb"/>
         {{$ctrl.snippet.user.name}}
       </small>
     </form>
diff --git a/client/app/pages/query-snippets/list.html b/client/app/pages/query-snippets/list.html
index eccabd2519..08c43788c1 100644
--- a/client/app/pages/query-snippets/list.html
+++ b/client/app/pages/query-snippets/list.html
@@ -27,7 +27,7 @@
                   {{row.snippet}}
                 </td>
                 <td>
-                  <img ng-src="{{row.user.profile_image_url}}" class="profile__image_thumb"/>
+                  <img ng-src="{{row.user.gravatar_url}}" class="profile__image_thumb"/>
                   {{row.user.name}}
                 </td>
                 <td>
diff --git a/client/app/pages/users/list.html b/client/app/pages/users/list.html
index 301c920be4..d5d0c178cc 100644
--- a/client/app/pages/users/list.html
+++ b/client/app/pages/users/list.html
@@ -15,7 +15,7 @@
         <tbody>
           <tr ng-repeat="row in $ctrl.users.getPageRows()">
             <td>
-              <img ng-src="{{row.profile_image_url}}" height="32px" class="profile__image--settings"/> <a href="users/{{row.id}}">{{row.name}}</a>
+              <img ng-src="{{row.gravatar_url}}" height="32px" class="profile__image--settings"/> <a href="users/{{row.id}}">{{row.name}}</a>
             </td>
             <td>
               <span am-time-ago="row.created_at"></span>
diff --git a/client/app/pages/users/show.html b/client/app/pages/users/show.html
index 4f483b3293..f7dfe52312 100644
--- a/client/app/pages/users/show.html
+++ b/client/app/pages/users/show.html
@@ -5,7 +5,7 @@
     <div class="row">
       <div class="col-md-4 col-md-offset-4 profile__cointainer">
 
-        <img ng-src="{{user.profile_image_url}}" class="profile__image"/>
+        <img ng-src="{{user.gravatar_url}}" class="profile__image"/>
 
         <h3 class="profile__h3">{{user.name}}</h3>
 
diff --git a/migrations/versions/7671dca4e604_.py b/migrations/versions/7671dca4e604_.py
index ee981b1e39..a9f78d4589 100644
--- a/migrations/versions/7671dca4e604_.py
+++ b/migrations/versions/7671dca4e604_.py
@@ -17,9 +17,9 @@
 
 
 def upgrade():
-    op.add_column('users', sa.Column('profile_image_url', sa.String(),
+    op.add_column('users', sa.Column('image_url', sa.String(),
                                      nullable=True, server_default=None))
 
 
 def downgrade():
-    op.drop_column('users', 'profile_image_url')
+    op.drop_column('users', 'image_url')
diff --git a/redash/authentication/google_oauth.py b/redash/authentication/google_oauth.py
index 757ebb1ea3..7ceec344e1 100644
--- a/redash/authentication/google_oauth.py
+++ b/redash/authentication/google_oauth.py
@@ -67,8 +67,7 @@ def create_and_login_user(org, name, email, picture=None):
             models.db.session.commit()
     except NoResultFound:
         logger.debug("Creating user object (%r)", name)
-        user_object = models.User(org=org, name=name, email=email, _profile_image_url=picture,
-                                  group_ids=[org.default_group.id])
+        user_object = models.User(org=org, name=name, email=email, image_url=picture, group_ids=[org.default_group.id])
         models.db.session.add(user_object)
         models.db.session.commit()
 
diff --git a/redash/handlers/authentication.py b/redash/handlers/authentication.py
index 63f58c8b55..49e9b25915 100644
--- a/redash/handlers/authentication.py
+++ b/redash/handlers/authentication.py
@@ -191,8 +191,11 @@ def session(org_slug=None):
             'apiKey': current_user.id
         }
     else:
+        email_md5 = hashlib.md5(current_user.email.lower()).hexdigest()
+        gravatar_url = "https://www.gravatar.com/avatar/%s?s=40" % email_md5
+
         user = {
-            'profile_image_url': current_user.profile_image_url,
+            'gravatar_url': gravatar_url,
             'id': current_user.id,
             'name': current_user.name,
             'email': current_user.email,
diff --git a/redash/models.py b/redash/models.py
index a044e0b4a7..ee77f2ebea 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -395,7 +395,7 @@ class User(TimestampMixin, db.Model, BelongsToOrgMixin, UserMixin, PermissionsCh
     org = db.relationship(Organization, backref=db.backref("users", lazy="dynamic"))
     name = Column(db.String(320))
     email = Column(LowercasedString)
-    _profile_image_url = Column('profile_image_url', db.String(320), nullable=True)
+    image_url = Column(db.String(320), nullable=True)
     password_hash = Column(db.String(128), nullable=True)
     # XXX replace with association table
     group_ids = Column('groups', MutableList.as_mutable(postgresql.ARRAY(db.Integer)), nullable=True)
@@ -416,7 +416,7 @@ def to_dict(self, with_api_key=False):
             'id': self.id,
             'name': self.name,
             'email': self.email,
-            'profile_image_url': self.profile_image_url,
+            'gravatar_url': self.gravatar_url,
             'groups': self.group_ids,
             'updated_at': self.updated_at,
             'created_at': self.created_at
@@ -436,9 +436,9 @@ def is_api_user(self):
         return False
 
     @property
-    def profile_image_url(self):
-        if self._profile_image_url is not None:
-            return self._profile_image_url
+    def gravatar_url(self):
+        if self.image_url is not None:
+            return self.image_url
 
         email_md5 = hashlib.md5(self.email.lower()).hexdigest()
         return "https://www.gravatar.com/avatar/{}?s=40&d=identicon".format(email_md5)

From e16f51e2f6a871d00b6e5745091bea67898ef3ee Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Thu, 15 Feb 2018 11:01:20 +0900
Subject: [PATCH 02/13] Fix contamination

---
 client/app/components/app-header/app-header.html       |  2 +-
 .../permissions-editor/permissions-editor.html         |  4 ++--
 client/app/pages/groups/show.html                      |  4 ++--
 client/app/pages/queries-list/queries-list.html        |  2 +-
 .../app/pages/queries/queries-search-results-page.html |  2 +-
 client/app/pages/query-snippets/edit.html              |  2 +-
 client/app/pages/query-snippets/list.html              |  2 +-
 client/app/pages/users/list.html                       |  2 +-
 client/app/pages/users/show.html                       |  2 +-
 migrations/versions/7671dca4e604_.py                   |  4 ++--
 redash/authentication/google_oauth.py                  |  3 ++-
 redash/handlers/authentication.py                      |  5 +----
 redash/models.py                                       | 10 +++++-----
 13 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/client/app/components/app-header/app-header.html b/client/app/components/app-header/app-header.html
index 741a94037d..deb6ac0176 100644
--- a/client/app/components/app-header/app-header.html
+++ b/client/app/components/app-header/app-header.html
@@ -57,7 +57,7 @@
         <!--</li>-->
         <li class="dropdown" uib-dropdown>
           <a href="#" class="dropdown-toggle dropdown--profile" uib-dropdown-toggle>
-            <img ng-src="{{$ctrl.currentUser.gravatar_url}}" class="profile__image--navbar" width="20"/>
+            <img ng-src="{{$ctrl.currentUser.profile_image_url}}" class="profile__image--navbar" width="20"/>
             <span class="dropdown--profile__username" ng-bind="$ctrl.currentUser.name"></span> <span
             class="caret caret--nav"></span></a>
           <ul class="dropdown-menu dropdown-menu--profile">
diff --git a/client/app/components/permissions-editor/permissions-editor.html b/client/app/components/permissions-editor/permissions-editor.html
index bf56e26fe1..61f45d893c 100644
--- a/client/app/components/permissions-editor/permissions-editor.html
+++ b/client/app/components/permissions-editor/permissions-editor.html
@@ -11,7 +11,7 @@ <h4 class="modal-title">Manage Permissions</h4>
                          refresh-delay="0"
                          ui-disable-choice="user.alreadyGrantee">
         <div>
-          <img ng-src="{{user.gravatar_url}}" height="24px">&nbsp;{{user.name}}
+          <img ng-src="{{user.profile_image_url}}" height="24px">&nbsp;{{user.name}}
           <small ng-if="user.alreadyGrantee">(already has permission)</small>
         </div>
        </ui-select-choices>
@@ -28,7 +28,7 @@ <h4 class="modal-title">Manage Permissions</h4>
         </thead>
         <tbody>
         <tr ng-repeat="grantee in $ctrl.grantees">
-          <td width="50px"><img ng-src="{{grantee.gravatar_url}}" height="40px"/></td>
+          <td width="50px"><img ng-src="{{grantee.profile_image_url}}" height="40px"/></td>
           <td>{{grantee.name}} </td>
           <td>{{grantee.access_type}}</td>
           <td><button class="pull-right btn btn-sm btn-danger" ng-click="$ctrl.removeGrantee(grantee)">Remove</button></td>
diff --git a/client/app/pages/groups/show.html b/client/app/pages/groups/show.html
index 94d521e857..c60f4ea3ba 100644
--- a/client/app/pages/groups/show.html
+++ b/client/app/pages/groups/show.html
@@ -17,7 +17,7 @@
                            refresh-delay="0"
                            ui-disable-choice="user.alreadyMember">
           <div>
-            <img ng-src="{{user.gravatar_url}}" height="24px">&nbsp;{{user.name}}
+            <img ng-src="{{user.profile_image_url}}" height="24px">&nbsp;{{user.name}}
             <small ng-if="user.alreadyMember">(already member in this group)</small>
           </div>
         </ui-select-choices>
@@ -29,7 +29,7 @@
       <table class="table table-condensed table-hover" ng-show="members">
         <tbody>
         <tr ng-repeat="member in members">
-          <td width="50px"><img ng-src="{{member.gravatar_url}}" height="40px"/></td>
+          <td width="50px"><img ng-src="{{member.profile_image_url}}" height="40px"/></td>
           <td>{{member.name}} <button class="pull-right btn btn-sm btn-danger" ng-click="removeMember(member)" ng-if="currentUser.isAdmin && (group.type != 'builtin' || currentUser.id != member.id)">Remove</button></td>
         </tr>
         </tbody>
diff --git a/client/app/pages/queries-list/queries-list.html b/client/app/pages/queries-list/queries-list.html
index 62e99739dc..883e514296 100644
--- a/client/app/pages/queries-list/queries-list.html
+++ b/client/app/pages/queries-list/queries-list.html
@@ -18,7 +18,7 @@
       <tr ng-repeat="query in $ctrl.paginator.getPageRows()">
         <td><a href="queries/{{query.id}}">{{query.name}}</a> <span class="label label-default" ng-if="query.is_draft">Unpublished</span></td>
         <td>
-          <img ng-src="{{query.user.gravatar_url}}" class="profile__image_thumb"/>
+          <img ng-src="{{query.user.profile_image_url}}" class="profile__image_thumb"/>
           {{query.user.name}}
         </td>
         <td>{{query.created_at | dateTime}}</td>
diff --git a/client/app/pages/queries/queries-search-results-page.html b/client/app/pages/queries/queries-search-results-page.html
index 14605f2873..b1dc6de245 100644
--- a/client/app/pages/queries/queries-search-results-page.html
+++ b/client/app/pages/queries/queries-search-results-page.html
@@ -27,7 +27,7 @@
           <tr ng-repeat="query in $ctrl.paginator.getPageRows()">
             <td><a href="queries/{{query.id}}">{{query.name}}</a> <span class="label label-default" ng-if="query.is_draft">Unpublished</span></td>
             <td>
-              <img ng-src="{{query.user.gravatar_url}}" class="profile__image_thumb"/>
+              <img ng-src="{{query.user.profile_image_url}}" class="profile__image_thumb"/>
               {{query.user.name}}</td>
             <td>{{query.created_at | dateTime}}</td>
             <td>{{query.schedule | scheduleHumanize}}</td>
diff --git a/client/app/pages/query-snippets/edit.html b/client/app/pages/query-snippets/edit.html
index 5ba4da3342..3b509450eb 100644
--- a/client/app/pages/query-snippets/edit.html
+++ b/client/app/pages/query-snippets/edit.html
@@ -23,7 +23,7 @@
       </div>
       <small ng-if="$ctrl.snippet.user">
         Created by: 
-        <img ng-src="{{$ctrl.snippet.user.gravatar_url}}" class="profile__image_thumb"/>
+        <img ng-src="{{$ctrl.snippet.user.profile_image_url}}" class="profile__image_thumb"/>
         {{$ctrl.snippet.user.name}}
       </small>
     </form>
diff --git a/client/app/pages/query-snippets/list.html b/client/app/pages/query-snippets/list.html
index 24de76dcb7..e89e50c1fd 100644
--- a/client/app/pages/query-snippets/list.html
+++ b/client/app/pages/query-snippets/list.html
@@ -27,7 +27,7 @@
                   {{row.snippet}}
                 </td>
                 <td>
-                  <img ng-src="{{row.user.gravatar_url}}" class="profile__image_thumb"/>
+                  <img ng-src="{{row.user.profile_image_url}}" class="profile__image_thumb"/>
                   {{row.user.name}}
                 </td>
                 <td>
diff --git a/client/app/pages/users/list.html b/client/app/pages/users/list.html
index bb8d928d16..d8fe2cb1d0 100644
--- a/client/app/pages/users/list.html
+++ b/client/app/pages/users/list.html
@@ -15,7 +15,7 @@
         <tbody>
           <tr ng-repeat="row in $ctrl.users.getPageRows()">
             <td>
-              <img ng-src="{{row.gravatar_url}}" height="32px" class="profile__image--settings"/> <a href="users/{{row.id}}">{{row.name}}</a>
+              <img ng-src="{{row.profile_image_url}}" height="32px" class="profile__image--settings"/> <a href="users/{{row.id}}">{{row.name}}</a>
             </td>
             <td>
               <span am-time-ago="row.created_at"></span>
diff --git a/client/app/pages/users/show.html b/client/app/pages/users/show.html
index 032f6a2d05..2f44713b4f 100644
--- a/client/app/pages/users/show.html
+++ b/client/app/pages/users/show.html
@@ -5,7 +5,7 @@
     <div class="row">
       <div class="col-md-4 col-md-offset-4 profile__container">
 
-        <img ng-src="{{user.gravatar_url}}" class="profile__image"/>
+        <img ng-src="{{user.profile_image_url}}" class="profile__image"/>
 
         <h3 class="profile__h3">{{user.name}}</h3>
 
diff --git a/migrations/versions/7671dca4e604_.py b/migrations/versions/7671dca4e604_.py
index a9f78d4589..ee981b1e39 100644
--- a/migrations/versions/7671dca4e604_.py
+++ b/migrations/versions/7671dca4e604_.py
@@ -17,9 +17,9 @@
 
 
 def upgrade():
-    op.add_column('users', sa.Column('image_url', sa.String(),
+    op.add_column('users', sa.Column('profile_image_url', sa.String(),
                                      nullable=True, server_default=None))
 
 
 def downgrade():
-    op.drop_column('users', 'image_url')
+    op.drop_column('users', 'profile_image_url')
diff --git a/redash/authentication/google_oauth.py b/redash/authentication/google_oauth.py
index 7ceec344e1..757ebb1ea3 100644
--- a/redash/authentication/google_oauth.py
+++ b/redash/authentication/google_oauth.py
@@ -67,7 +67,8 @@ def create_and_login_user(org, name, email, picture=None):
             models.db.session.commit()
     except NoResultFound:
         logger.debug("Creating user object (%r)", name)
-        user_object = models.User(org=org, name=name, email=email, image_url=picture, group_ids=[org.default_group.id])
+        user_object = models.User(org=org, name=name, email=email, _profile_image_url=picture,
+                                  group_ids=[org.default_group.id])
         models.db.session.add(user_object)
         models.db.session.commit()
 
diff --git a/redash/handlers/authentication.py b/redash/handlers/authentication.py
index e97acbe0d1..83b49c53a2 100644
--- a/redash/handlers/authentication.py
+++ b/redash/handlers/authentication.py
@@ -204,11 +204,8 @@ def session(org_slug=None):
             'apiKey': current_user.id
         }
     else:
-        email_md5 = hashlib.md5(current_user.email.lower()).hexdigest()
-        gravatar_url = "https://www.gravatar.com/avatar/%s?s=40" % email_md5
-
         user = {
-            'gravatar_url': gravatar_url,
+            'profile_image_url': current_user.profile_image_url,
             'id': current_user.id,
             'name': current_user.name,
             'email': current_user.email,
diff --git a/redash/models.py b/redash/models.py
index e93a46b459..2566cd42d4 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -431,7 +431,7 @@ class User(TimestampMixin, db.Model, BelongsToOrgMixin, UserMixin, PermissionsCh
     org = db.relationship(Organization, backref=db.backref("users", lazy="dynamic"))
     name = Column(db.String(320))
     email = Column(LowercasedString)
-    image_url = Column(db.String(320), nullable=True)
+    _profile_image_url = Column('profile_image_url', db.String(320), nullable=True)
     password_hash = Column(db.String(128), nullable=True)
     # XXX replace with association table
     group_ids = Column('groups', MutableList.as_mutable(postgresql.ARRAY(db.Integer)), nullable=True)
@@ -452,7 +452,7 @@ def to_dict(self, with_api_key=False):
             'id': self.id,
             'name': self.name,
             'email': self.email,
-            'gravatar_url': self.gravatar_url,
+            'profile_image_url': self.profile_image_url,
             'groups': self.group_ids,
             'updated_at': self.updated_at,
             'created_at': self.created_at
@@ -472,9 +472,9 @@ def is_api_user(self):
         return False
 
     @property
-    def gravatar_url(self):
-        if self.image_url is not None:
-            return self.image_url
+    def profile_image_url(self):
+        if self._profile_image_url is not None:
+            return self._profile_image_url
 
         email_md5 = hashlib.md5(self.email.lower()).hexdigest()
         return "https://www.gravatar.com/avatar/{}?s=40&d=identicon".format(email_md5)

From 1df255a34ddd1cb04fb298c344654d9640afc20e Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Tue, 11 Jul 2017 10:06:31 +0900
Subject: [PATCH 03/13] Fix Data Labels

---
 client/app/services/query-result.js           | 10 ++
 .../visualizations/chart/chart-editor.html    | 54 ++++++++++-
 client/app/visualizations/chart/index.js      | 16 ++++
 .../app/visualizations/chart/plotly/index.js  |  3 +-
 .../app/visualizations/chart/plotly/utils.js  | 94 ++++++++++++++++++-
 dynamics                                      |  1 +
 6 files changed, 171 insertions(+), 7 deletions(-)
 create mode 160000 dynamics

diff --git a/client/app/services/query-result.js b/client/app/services/query-result.js
index 1ebe00b3f2..7c90cb487c 100644
--- a/client/app/services/query-result.js
+++ b/client/app/services/query-result.js
@@ -260,6 +260,7 @@ function QueryResultService($resource, $timeout, $q) {
         const yValues = {};
         let eValue = null;
         let sizeValue = null;
+        let zValue = null;
 
         each(row, (v, definition) => {
           const name = definition.split('::')[0] || definition.split('__')[0];
@@ -298,6 +299,11 @@ function QueryResultService($resource, $timeout, $q) {
             sizeValue = value;
           }
 
+          if (type === 'zVal') {
+            point[type] = value;
+            zValue = value;
+          }
+
           if (type === 'multiFilter' || type === 'multi-filter') {
             seriesName = String(value);
           }
@@ -313,6 +319,10 @@ function QueryResultService($resource, $timeout, $q) {
             if (sizeValue !== null) {
               point.size = sizeValue;
             }
+
+            if (zValue !== null) {
+              point.zVal = zValue;
+            }
             addPointToSeries(point, series, ySeriesName);
           });
         } else {
diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 8f9c94e253..a37e0f6f0a 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -32,7 +32,7 @@
       </div>
     </div>
 
-    <div ng-if="['line', 'area', 'column', 'scatter'].indexOf(options.globalSeriesType) >= 0" class="checkbox">
+    <div ng-if="['line', 'area', 'column', 'scatter', 'heatmap'].indexOf(options.globalSeriesType) >= 0" class="checkbox">
       <label><input type="checkbox" ng-model="options.showDataLabels"> Show data labels</label>
     </div>
 
@@ -62,7 +62,7 @@
 
     </div>
 
-    <div class="form-group" ng-if="options.globalSeriesType != 'custom'">
+    <div class="form-group" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
       <label class="control-label">Group by</label>
       <ui-select name="groupby" ng-model="form.groupby" class="clearable">
         <ui-select-match allow-clear="true" placeholder="Choose column...">
@@ -87,7 +87,19 @@
       </ui-select>
     </div>
 
-    <div class="form-group" ng-if="options.globalSeriesType != 'custom'">
+    <div class="form-group" ng-if="showZColumnPicker()">
+      <label class="control-label">Color Column</label>
+
+      <ui-select name="zValColumn" ng-model="form.zValColumn">
+        <ui-select-match allow-clear="true" placeholder="Choose column...">{{$select.selected}}</ui-select-match>
+        <ui-select-choices repeat="column in columnNames | remove:form.yAxisColumns | remove:form.groupby">
+          <span ng-bind-html="column | highlight: $select.search"></span><span> </span>
+          <small class="text-muted" ng-bind="columns[column].type"></small>
+        </ui-select-choices>
+      </ui-select>
+    </div>
+
+    <div class="form-group" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
       <label class="control-label">Errors column</label>
 
       <ui-select name="errorColumn" ng-model="form.errorColumn">
@@ -99,7 +111,7 @@
       </ui-select>
     </div>
 
-    <div class="checkbox" ng-if="options.globalSeriesType != 'custom'">
+    <div class="checkbox" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
       <label>
         <input type="checkbox" ng-model="options.legend.enabled">
         <i class="input-helper"></i> Show Legend
@@ -113,7 +125,7 @@
       </label>
     </div>
 
-    <div class="form-group" ng-if="options.globalSeriesType != 'custom'">
+    <div class="form-group" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
       <label class="control-label">Stacking</label>
 
       <div ng-if="stackingOptions"><!--the if is a weird workaround-->
@@ -133,6 +145,16 @@
         </label>
       </div>
     </div>
+    <div class="form-group" ng-if="options.globalSeriesType == 'heatmap'">
+      <label class="control-label">Color Scheme</label>
+
+      <ui-select ng-model="options.colorScheme"">
+        <ui-select-match allow-clear="true" placeholder="Choose Colorscheme...">{{$select.selected | capitalize}}</ui-select-match>
+        <ui-select-choices repeat="value in colorScheme">
+          <div ng-bind-html="value | highlight: $select.search"></div>
+        </ui-select-choices>
+      </ui-select>
+    </div>
   </div>
 
   <div class="form-group" ng-if="options.globalSeriesType == 'custom'">
@@ -178,6 +200,13 @@
       </label>
     </div>
 
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" ng-model="options.reverseX">
+        <i class="input-helper"></i> Reverse Order
+      </label>
+    </div>
+
     <div class="checkbox">
       <label>
         <input type="checkbox" ng-model="options.xAxis.labels.enabled">
@@ -211,6 +240,21 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
         <label class="control-label">Max Value</label>
         <input ng-model="yAxis.rangeMax" type="number" step="any" placeholder="Auto" class="form-control"></input>
       </div>
+
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" ng-model="options.sortY">
+          <i class="input-helper"></i> Sort Values
+        </label>
+      </div>
+
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" ng-model="options.reverseY">
+          <i class="input-helper"></i> Reverse Order
+        </label>
+      </div>
+
     </div>
   </div>
 
diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js
index e2360cff3f..56ca5963e7 100644
--- a/client/app/visualizations/chart/index.js
+++ b/client/app/visualizations/chart/index.js
@@ -70,6 +70,7 @@ function ChartEditor(ColorPalette, clientConfig) {
         pie: { name: 'Pie', icon: 'pie-chart' },
         scatter: { name: 'Scatter', icon: 'circle-o' },
         bubble: { name: 'Bubble', icon: 'circle-o' },
+        heatmap: { name: 'Heatmap', icon: 'th' },
         box: { name: 'Box', icon: 'square-o' },
       };
 
@@ -87,7 +88,12 @@ function ChartEditor(ColorPalette, clientConfig) {
       };
       scope.chartTypeChanged();
 
+      scope.colorScheme = ['Blackbody', 'Bluered', 'Blues', 'Earth', 'Electric',
+        'Greens', 'Greys', 'Hot', 'Jet', 'Picnic', 'Portland',
+        'Rainbow', 'RdBu', 'Reds', 'Viridis', 'YlGnBu', 'YlOrRd'];
+
       scope.showSizeColumnPicker = () => some(scope.options.seriesOptions, options => options.type === 'bubble');
+      scope.showZColumnPicker = () => some(scope.options.seriesOptions, options => options.type === 'heatmap');
 
       if (scope.options.customCode === undefined) {
         scope.options.customCode = `// Available variables are x, ys, element, and Plotly
@@ -207,6 +213,14 @@ function ChartEditor(ColorPalette, clientConfig) {
         }
       });
 
+      scope.$watch('form.zValColumn', (value, old) => {
+        if (old !== undefined) {
+          unsetColumn(old);
+        }
+        if (value !== undefined) {
+          setColumnRole('zVal', value);
+        }
+      });
 
       scope.$watch('form.groupby', (value, old) => {
         if (old !== undefined) {
@@ -236,6 +250,8 @@ function ChartEditor(ColorPalette, clientConfig) {
             scope.form.errorColumn = key;
           } else if (value === 'size') {
             scope.form.sizeColumn = key;
+          } else if (value === 'zVal') {
+            scope.form.zValColumn = key;
           }
         });
       }
diff --git a/client/app/visualizations/chart/plotly/index.js b/client/app/visualizations/chart/plotly/index.js
index f9ac2bc984..443027339d 100644
--- a/client/app/visualizations/chart/plotly/index.js
+++ b/client/app/visualizations/chart/plotly/index.js
@@ -5,6 +5,7 @@ import bar from 'plotly.js/lib/bar';
 import pie from 'plotly.js/lib/pie';
 import histogram from 'plotly.js/lib/histogram';
 import box from 'plotly.js/lib/box';
+import heatmap from 'plotly.js/lib/heatmap';
 
 import {
   ColorPalette,
@@ -16,7 +17,7 @@ import {
   normalizeValue,
 } from './utils';
 
-Plotly.register([bar, pie, histogram, box]);
+Plotly.register([bar, pie, histogram, box, heatmap]);
 Plotly.setPlotConfig({
   modeBarButtonsToRemove: ['sendDataToCloud'],
 });
diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index b0ab0700cf..1a3038622c 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -1,6 +1,6 @@
 import {
   isArray, isNumber, isString, isUndefined, contains, min, max, has, find,
-  each, values, sortBy, pluck, identity, filter, map,
+  each, values, sortBy, pluck, identity, filter, map, uniq, findWhere, flatten,
 } from 'underscore';
 import moment from 'moment';
 import createFormatter from '@/lib/value-format';
@@ -76,6 +76,15 @@ export function normalizeValue(value) {
   return value;
 }
 
+function naturalSort($a, $b) {
+  if ($a === $b) {
+    return 0;
+  } else if ($a < $b) {
+    return -1;
+  }
+  return 1;
+}
+
 function calculateAxisRange(seriesList, minValue, maxValue) {
   if (!isNumber(minValue)) {
     minValue = Math.min(0, min(map(seriesList, series => min(series.y))));
@@ -201,6 +210,79 @@ function preparePieData(seriesList, options) {
   });
 }
 
+function prepareHeatmapData(seriesList, options) {
+  return map(seriesList, (series) => {
+    const plotlySeries = {
+      x: [],
+      y: [],
+      z: [],
+      type: 'heatmap',
+      name: '',
+      colorscale: options.colorScheme || 'RdBu',
+    };
+
+    plotlySeries.x = uniq(pluck(series.data, 'x'));
+    plotlySeries.y = uniq(pluck(series.data, 'y'));
+
+    if (options.sortX) {
+      plotlySeries.x.sort(naturalSort);
+    }
+
+    if (options.sortY) {
+      plotlySeries.y.sort(naturalSort);
+    }
+
+    if (options.reverseX) {
+      plotlySeries.x.reverse();
+    }
+
+    if (options.reverseY) {
+      plotlySeries.y.reverse();
+    }
+
+    const zMax = max(pluck(series.data, 'zVal'));
+
+    // Use text trace instead of default annotation for better performance
+    const dataLabels = {
+      x: [],
+      y: [],
+      mode: 'text',
+      hoverinfo: 'skip',
+      showlegend: false,
+      text: [],
+      textfont: {
+        color: [],
+      },
+    };
+
+    for (let i = 0; i < plotlySeries.y.length; i += 1) {
+      const item = [];
+      for (let j = 0; j < plotlySeries.x.length; j += 1) {
+        const datum = findWhere(
+          series.data,
+          { x: plotlySeries.x[j], y: plotlySeries.y[i] },
+        );
+
+        const zValue = datum ? datum.zVal : 0;
+        item.push(zValue);
+
+        if (isFinite(zMax) && options.showDataLabels) {
+          dataLabels.x.push(plotlySeries.x[j]);
+          dataLabels.y.push(plotlySeries.y[i]);
+          dataLabels.text.push(String(zValue));
+          dataLabels.textfont.color.push((zValue / zMax) < 0.25 ? 'white' : 'black');
+        }
+      }
+      plotlySeries.z.push(item);
+    }
+
+    if (isFinite(zMax) && options.showDataLabels) {
+      return [plotlySeries, dataLabels];
+    }
+    return plotlySeries;
+  });
+}
+
 function prepareChartData(seriesList, options) {
   const sortX = (options.sortX === true) || (options.sortX === undefined);
 
@@ -280,6 +362,12 @@ export function prepareData(seriesList, options) {
   if (options.globalSeriesType === 'pie') {
     return preparePieData(seriesList, options);
   }
+  if (options.globalSeriesType === 'heatmap') {
+    if (options.showDataLabels) {
+      return flatten(prepareHeatmapData(seriesList, options));
+    }
+    return prepareHeatmapData(seriesList, options);
+  }
   return prepareChartData(seriesList, options);
 }
 
@@ -445,6 +533,9 @@ export function updateData(seriesList, options) {
   if (options.globalSeriesType === 'pie') {
     return seriesList;
   }
+  if (options.globalSeriesType === 'heatmap') {
+    return seriesList;
+  }
 
   // Use only visible series
   seriesList = filter(seriesList, s => s.visible === true);
@@ -519,3 +610,4 @@ export function updateDimensions(layout, element, margins) {
 
   return changed;
 }
+
diff --git a/dynamics b/dynamics
new file mode 160000
index 0000000000..0c96ec0716
--- /dev/null
+++ b/dynamics
@@ -0,0 +1 @@
+Subproject commit 0c96ec0716dee4ae4eb3a8eca1a795b2955d518d

From aa7ff0158d5ed5901b8f9d8487c1289219b56f23 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Thu, 15 Feb 2018 02:11:29 +0900
Subject: [PATCH 04/13] Fix Data Labels

---
 client/app/visualizations/chart/plotly/utils.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index 1a3038622c..71e1198b9f 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -279,7 +279,7 @@ function prepareHeatmapData(seriesList, options) {
     if (isFinite(zMax) && options.showDataLabels) {
       return [plotlySeries, dataLabels];
     }
-    return plotlySeries;
+    return [plotlySeries];
   });
 }
 
@@ -363,10 +363,7 @@ export function prepareData(seriesList, options) {
     return preparePieData(seriesList, options);
   }
   if (options.globalSeriesType === 'heatmap') {
-    if (options.showDataLabels) {
-      return flatten(prepareHeatmapData(seriesList, options));
-    }
-    return prepareHeatmapData(seriesList, options);
+    return flatten(prepareHeatmapData(seriesList, options));
   }
   return prepareChartData(seriesList, options);
 }

From 10ace9be46e4f53d87eb607371381832ac55c68c Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Sat, 24 Feb 2018 07:09:57 +0900
Subject: [PATCH 05/13] Remove unwanted directory

---
 dynamics | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 dynamics

diff --git a/dynamics b/dynamics
deleted file mode 160000
index 0c96ec0716..0000000000
--- a/dynamics
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0c96ec0716dee4ae4eb3a8eca1a795b2955d518d

From daa1ae7d9e6a9fac0bc9837a2f29bc66e11b0d25 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Sun, 4 Mar 2018 23:59:33 +0900
Subject: [PATCH 06/13] Make default color scheme match to new color scheme

---
 client/app/visualizations/chart/plotly/utils.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index 71e1198b9f..ed006058dd 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -211,6 +211,17 @@ function preparePieData(seriesList, options) {
 }
 
 function prepareHeatmapData(seriesList, options) {
+  const defaultColorScheme = [
+    [0, '#356aff'],
+    [0.14, '#4a7aff'],
+    [0.28, '#5d87ff'],
+    [0.42, '#7398ff'],
+    [0.56, '#fb8c8c'],
+    [0.71, '#ec6463'],
+    [0.86, '#ec4949'],
+    [1, '#e92827'],
+  ];
+
   return map(seriesList, (series) => {
     const plotlySeries = {
       x: [],
@@ -218,7 +229,7 @@ function prepareHeatmapData(seriesList, options) {
       z: [],
       type: 'heatmap',
       name: '',
-      colorscale: options.colorScheme || 'RdBu',
+      colorscale: options.colorScheme || defaultColorScheme,
     };
 
     plotlySeries.x = uniq(pluck(series.data, 'x'));

From 115f0d833915194c5c299e668358154ce6abd5af Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Mon, 5 Mar 2018 01:25:09 +0900
Subject: [PATCH 07/13] Allow custom color scheme

---
 client/app/visualizations/chart/chart-editor.html | 10 ++++++++++
 client/app/visualizations/chart/index.js          |  2 +-
 client/app/visualizations/chart/plotly/utils.js   | 12 +++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index a37e0f6f0a..10f915cd65 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -157,6 +157,16 @@
     </div>
   </div>
 
+  <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
+      <label class="control-label">Min Color</label>
+      <input ng-model="options.heatMinColor" type="text" class="form-control"></input>
+  </div>
+
+  <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
+      <label class="control-label">Max Color</label>
+      <input ng-model="options.heatMaxColor" type="text" class="form-control"></input>
+  </div>
+
   <div class="form-group" ng-if="options.globalSeriesType == 'custom'">
     <label class="control-label">Custom code</label>
     <textarea ng-model="options.customCode" class="form-control v-resizable" rows="10">
diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js
index 56ca5963e7..d385d14a8b 100644
--- a/client/app/visualizations/chart/index.js
+++ b/client/app/visualizations/chart/index.js
@@ -90,7 +90,7 @@ function ChartEditor(ColorPalette, clientConfig) {
 
       scope.colorScheme = ['Blackbody', 'Bluered', 'Blues', 'Earth', 'Electric',
         'Greens', 'Greys', 'Hot', 'Jet', 'Picnic', 'Portland',
-        'Rainbow', 'RdBu', 'Reds', 'Viridis', 'YlGnBu', 'YlOrRd'];
+        'Rainbow', 'RdBu', 'Reds', 'Viridis', 'YlGnBu', 'YlOrRd', 'Custom..'];
 
       scope.showSizeColumnPicker = () => some(scope.options.seriesOptions, options => options.type === 'bubble');
       scope.showZColumnPicker = () => some(scope.options.seriesOptions, options => options.type === 'heatmap');
diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index ed006058dd..4563f47bff 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -222,6 +222,16 @@ function prepareHeatmapData(seriesList, options) {
     [1, '#e92827'],
   ];
 
+  let colorScheme = [];
+
+  if (!options.colorScheme) {
+    colorScheme = defaultColorScheme;
+  } else if (options.colorScheme === 'Custom..') {
+    colorScheme = [[0, options.heatMinColor], [1, options.heatMaxColor]];
+  } else {
+    colorScheme = options.colorScheme;
+  }
+
   return map(seriesList, (series) => {
     const plotlySeries = {
       x: [],
@@ -229,7 +239,7 @@ function prepareHeatmapData(seriesList, options) {
       z: [],
       type: 'heatmap',
       name: '',
-      colorscale: options.colorScheme || defaultColorScheme,
+      colorscale: colorScheme,
     };
 
     plotlySeries.x = uniq(pluck(series.data, 'x'));

From 4cf30b4d8a4c53df09a82fefb2e620d334f4baca Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Mon, 5 Mar 2018 12:01:00 +0900
Subject: [PATCH 08/13] Use color selector for custom heatmap colors

---
 .../visualizations/chart/chart-editor.html    | 24 +++++++++++++++----
 .../app/visualizations/chart/plotly/utils.js  |  6 ++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 10f915cd65..055156c5c7 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -158,13 +158,29 @@
   </div>
 
   <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
-      <label class="control-label">Min Color</label>
-      <input ng-model="options.heatMinColor" type="text" class="form-control"></input>
+    <label class="control-label">Min Color</label>
+    <ui-select ng-model="options.heatMinColor">
+      <ui-select-match>
+        <color-box color="$select.selected.value"></color-box>
+      </ui-select-match>
+      <ui-select-choices repeat="color.value as (key, color) in colors">
+        <color-box color="color.value"></color-box>
+        <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
+      </ui-select-choices>
+    </ui-select>
   </div>
 
   <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
-      <label class="control-label">Max Color</label>
-      <input ng-model="options.heatMaxColor" type="text" class="form-control"></input>
+    <label class="control-label">Max Color</label>
+    <ui-select ng-model="options.heatMaxColor">
+      <ui-select-match>
+        <color-box color="$select.selected.value"></color-box>
+      </ui-select-match>
+      <ui-select-choices repeat="color.value as (key, color) in colors">
+        <color-box color="color.value"></color-box>
+        <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
+      </ui-select-choices>
+    </ui-select>
   </div>
 
   <div class="form-group" ng-if="options.globalSeriesType == 'custom'">
diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index 4563f47bff..dd152731f9 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -291,7 +291,11 @@ function prepareHeatmapData(seriesList, options) {
           dataLabels.x.push(plotlySeries.x[j]);
           dataLabels.y.push(plotlySeries.y[i]);
           dataLabels.text.push(String(zValue));
-          dataLabels.textfont.color.push((zValue / zMax) < 0.25 ? 'white' : 'black');
+          if (options.colorScheme && options.colorScheme === 'Custom..') {
+            dataLabels.textfont.color.push('white');
+          } else {
+            dataLabels.textfont.color.push((zValue / zMax) < 0.25 ? 'white' : 'black');
+          }
         }
       }
       plotlySeries.z.push(item);

From 99aadf7f5d2efc3841502fb40994a41c3ae55029 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Tue, 6 Mar 2018 08:38:43 +0900
Subject: [PATCH 09/13] Color selector layout change

---
 .../visualizations/chart/chart-editor.html    | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 055156c5c7..e3d5a26d86 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -157,30 +157,35 @@
     </div>
   </div>
 
-  <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
-    <label class="control-label">Min Color</label>
-    <ui-select ng-model="options.heatMinColor">
-      <ui-select-match>
-        <color-box color="$select.selected.value"></color-box>
-      </ui-select-match>
-      <ui-select-choices repeat="color.value as (key, color) in colors">
-        <color-box color="color.value"></color-box>
-        <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
-      </ui-select-choices>
-    </ui-select>
-  </div>
-
-  <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
-    <label class="control-label">Max Color</label>
-    <ui-select ng-model="options.heatMaxColor">
-      <ui-select-match>
-        <color-box color="$select.selected.value"></color-box>
-      </ui-select-match>
-      <ui-select-choices repeat="color.value as (key, color) in colors">
-        <color-box color="color.value"></color-box>
-        <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
-      </ui-select-choices>
-    </ui-select>
+  <div class="row">
+    <div class="col-xs-6">
+      <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
+        <label class="control-label">Min Color</label>
+        <ui-select ng-model="options.heatMinColor">
+          <ui-select-match>
+            <color-box color="$select.selected.value"></color-box>
+          </ui-select-match>
+          <ui-select-choices repeat="color.value as (key, color) in colors">
+            <color-box color="color.value"></color-box>
+            <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
+          </ui-select-choices>
+        </ui-select>
+      </div>
+    </div>
+    <div class="col-xs-6">
+      <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
+        <label class="control-label">Max Color</label>
+        <ui-select ng-model="options.heatMaxColor">
+          <ui-select-match>
+            <color-box color="$select.selected.value"></color-box>
+          </ui-select-match>
+          <ui-select-choices repeat="color.value as (key, color) in colors">
+            <color-box color="color.value"></color-box>
+            <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
+          </ui-select-choices>
+        </ui-select>
+      </div>
+    </div>
   </div>
 
   <div class="form-group" ng-if="options.globalSeriesType == 'custom'">

From d303b5f3ec2ca0a6640d0cd12bb760ad278699b6 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Wed, 7 Mar 2018 20:22:05 +0900
Subject: [PATCH 10/13] Minor fixes

---
 client/app/visualizations/chart/chart-editor.html | 12 ++++++------
 client/app/visualizations/chart/index.js          |  2 +-
 client/app/visualizations/chart/plotly/utils.js   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index e3d5a26d86..5c9e78866a 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -62,7 +62,7 @@
 
     </div>
 
-    <div class="form-group" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
+    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) >= 0">
       <label class="control-label">Group by</label>
       <ui-select name="groupby" ng-model="form.groupby" class="clearable">
         <ui-select-match allow-clear="true" placeholder="Choose column...">
@@ -99,7 +99,7 @@
       </ui-select>
     </div>
 
-    <div class="form-group" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
+    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) >= 0">
       <label class="control-label">Errors column</label>
 
       <ui-select name="errorColumn" ng-model="form.errorColumn">
@@ -111,7 +111,7 @@
       </ui-select>
     </div>
 
-    <div class="checkbox" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
+    <div class="checkbox" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) >= 0">
       <label>
         <input type="checkbox" ng-model="options.legend.enabled">
         <i class="input-helper"></i> Show Legend
@@ -149,7 +149,7 @@
       <label class="control-label">Color Scheme</label>
 
       <ui-select ng-model="options.colorScheme"">
-        <ui-select-match allow-clear="true" placeholder="Choose Colorscheme...">{{$select.selected | capitalize}}</ui-select-match>
+        <ui-select-match allow-clear="true" placeholder="Choose Color Scheme...">{{$select.selected | capitalize}}</ui-select-match>
         <ui-select-choices repeat="value in colorScheme">
           <div ng-bind-html="value | highlight: $select.search"></div>
         </ui-select-choices>
@@ -159,7 +159,7 @@
 
   <div class="row">
     <div class="col-xs-6">
-      <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
+      <div class="form-group" ng-if="options.colorScheme == 'Custom...'">
         <label class="control-label">Min Color</label>
         <ui-select ng-model="options.heatMinColor">
           <ui-select-match>
@@ -173,7 +173,7 @@
       </div>
     </div>
     <div class="col-xs-6">
-      <div class="form-group" ng-if="options.colorScheme == 'Custom..'">
+      <div class="form-group" ng-if="options.colorScheme == 'Custom...'">
         <label class="control-label">Max Color</label>
         <ui-select ng-model="options.heatMaxColor">
           <ui-select-match>
diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js
index d385d14a8b..0c390e6dc7 100644
--- a/client/app/visualizations/chart/index.js
+++ b/client/app/visualizations/chart/index.js
@@ -90,7 +90,7 @@ function ChartEditor(ColorPalette, clientConfig) {
 
       scope.colorScheme = ['Blackbody', 'Bluered', 'Blues', 'Earth', 'Electric',
         'Greens', 'Greys', 'Hot', 'Jet', 'Picnic', 'Portland',
-        'Rainbow', 'RdBu', 'Reds', 'Viridis', 'YlGnBu', 'YlOrRd', 'Custom..'];
+        'Rainbow', 'RdBu', 'Reds', 'Viridis', 'YlGnBu', 'YlOrRd', 'Custom...'];
 
       scope.showSizeColumnPicker = () => some(scope.options.seriesOptions, options => options.type === 'bubble');
       scope.showZColumnPicker = () => some(scope.options.seriesOptions, options => options.type === 'heatmap');
diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index dd152731f9..01fedfef78 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -226,7 +226,7 @@ function prepareHeatmapData(seriesList, options) {
 
   if (!options.colorScheme) {
     colorScheme = defaultColorScheme;
-  } else if (options.colorScheme === 'Custom..') {
+  } else if (options.colorScheme === 'Custom...') {
     colorScheme = [[0, options.heatMinColor], [1, options.heatMaxColor]];
   } else {
     colorScheme = options.colorScheme;
@@ -291,7 +291,7 @@ function prepareHeatmapData(seriesList, options) {
           dataLabels.x.push(plotlySeries.x[j]);
           dataLabels.y.push(plotlySeries.y[i]);
           dataLabels.text.push(String(zValue));
-          if (options.colorScheme && options.colorScheme === 'Custom..') {
+          if (options.colorScheme && options.colorScheme === 'Custom...') {
             dataLabels.textfont.color.push('white');
           } else {
             dataLabels.textfont.color.push((zValue / zMax) < 0.25 ? 'white' : 'black');

From 9a319842eba3d4098a3d82ce14e85002f4aaf199 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Wed, 7 Mar 2018 20:49:47 +0900
Subject: [PATCH 11/13] Minor fixes

---
 client/app/visualizations/chart/chart-editor.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 5c9e78866a..4eb5019f92 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -62,7 +62,7 @@
 
     </div>
 
-    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) >= 0">
+    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) == -1">
       <label class="control-label">Group by</label>
       <ui-select name="groupby" ng-model="form.groupby" class="clearable">
         <ui-select-match allow-clear="true" placeholder="Choose column...">
@@ -99,7 +99,7 @@
       </ui-select>
     </div>
 
-    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) >= 0">
+    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) == -1">
       <label class="control-label">Errors column</label>
 
       <ui-select name="errorColumn" ng-model="form.errorColumn">
@@ -111,7 +111,7 @@
       </ui-select>
     </div>
 
-    <div class="checkbox" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) >= 0">
+    <div class="checkbox" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) == -1">
       <label>
         <input type="checkbox" ng-model="options.legend.enabled">
         <i class="input-helper"></i> Show Legend

From 8b97f0a354992f293f032c79931d7d64b0bfb340 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Fri, 10 Aug 2018 02:11:47 -0400
Subject: [PATCH 12/13] Fix after merge master

---
 .../visualizations/chart/chart-editor.html    | 91 ++++++++++---------
 .../app/visualizations/chart/plotly/utils.js  | 23 +++--
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index bcfa6442d7..69d4a0d2cf 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -136,7 +136,7 @@
       </label>
     </div>
 
-    <div class="form-group" ng-if="options.globalSeriesType != 'custom' && options.globalSeriesType != 'heatmap'">
+    <div class="form-group" ng-if="['custom', 'heatmap'].indexOf(options.globalSeriesType) == -1">
       <label class="control-label">Stacking</label>
 
       <div ng-if="stackingOptions">
@@ -155,47 +155,6 @@
         </label>
       </div>
     </div>
-    <div class="form-group" ng-if="options.globalSeriesType == 'heatmap'">
-      <label class="control-label">Color Scheme</label>
-
-      <ui-select ng-model="options.colorScheme"">
-        <ui-select-match allow-clear="true" placeholder="Choose Color Scheme...">{{$select.selected | capitalize}}</ui-select-match>
-        <ui-select-choices repeat="value in colorScheme">
-          <div ng-bind-html="value | highlight: $select.search"></div>
-        </ui-select-choices>
-      </ui-select>
-    </div>
-  </div>
-
-  <div class="row">
-    <div class="col-xs-6">
-      <div class="form-group" ng-if="options.colorScheme == 'Custom...'">
-        <label class="control-label">Min Color</label>
-        <ui-select ng-model="options.heatMinColor">
-          <ui-select-match>
-            <color-box color="$select.selected.value"></color-box>
-          </ui-select-match>
-          <ui-select-choices repeat="color.value as (key, color) in colors">
-            <color-box color="color.value"></color-box>
-            <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
-          </ui-select-choices>
-        </ui-select>
-      </div>
-    </div>
-    <div class="col-xs-6">
-      <div class="form-group" ng-if="options.colorScheme == 'Custom...'">
-        <label class="control-label">Max Color</label>
-        <ui-select ng-model="options.heatMaxColor">
-          <ui-select-match>
-            <color-box color="$select.selected.value"></color-box>
-          </ui-select-match>
-          <ui-select-choices repeat="color.value as (key, color) in colors">
-            <color-box color="color.value"></color-box>
-            <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
-          </ui-select-choices>
-        </ui-select>
-      </div>
-    </div>
   </div>
 
   <div ng-if="options.globalSeriesType == 'custom'">
@@ -347,7 +306,7 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
     </table>
   </div>
 
-  <div ng-if="(currentTab == 'colors') && (options.globalSeriesType != 'pie')" class="m-t-10 m-b-10">
+  <div ng-if="(currentTab == 'colors') && (['pie', 'heatmap'].indexOf(options.globalSeriesType) == -1)" class="m-t-10 m-b-10">
     <table class="table table-condensed col-table">
       <tbody>
       <tr ng-repeat="name in form.seriesList">
@@ -370,6 +329,50 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
     </table>
   </div>
 
+  <div ng-if="(currentTab == 'colors') && (options.globalSeriesType == 'heatmap')" class="m-t-10 m-b-10">
+    <div class="form-group" ng-if="options.globalSeriesType == 'heatmap'">
+      <label class="control-label">Color Scheme</label>
+
+      <ui-select ng-model="options.colorScheme"">
+        <ui-select-match allow-clear="true" placeholder="Choose Color Scheme...">{{$select.selected | capitalize}}</ui-select-match>
+        <ui-select-choices repeat="value in colorScheme">
+          <div ng-bind-html="value | highlight: $select.search"></div>
+        </ui-select-choices>
+      </ui-select>
+    </div>
+
+    <div class="row">
+      <div class="col-xs-6">
+        <div class="form-group" ng-if="options.colorScheme == 'Custom...'">
+          <label class="control-label">Min Color</label>
+          <ui-select ng-model="options.heatMinColor">
+            <ui-select-match>
+              <color-box color="$select.selected.value"></color-box>
+            </ui-select-match>
+            <ui-select-choices repeat="color.value as (key, color) in colors">
+              <color-box color="color.value"></color-box>
+              <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
+            </ui-select-choices>
+          </ui-select>
+        </div>
+      </div>
+      <div class="col-xs-6">
+        <div class="form-group" ng-if="options.colorScheme == 'Custom...'">
+          <label class="control-label">Max Color</label>
+          <ui-select ng-model="options.heatMaxColor">
+            <ui-select-match>
+              <color-box color="$select.selected.value"></color-box>
+            </ui-select-match>
+            <ui-select-choices repeat="color.value as (key, color) in colors">
+              <color-box color="color.value"></color-box>
+              <span ng-bind-html="color.key | capitalize | highlight: $select.search"></span>
+            </ui-select-choices>
+          </ui-select>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <div ng-if="(currentTab == 'colors') && (options.globalSeriesType == 'pie')" class="m-t-10 m-b-10">
     <table class="table table-condensed col-table">
       <tbody>
@@ -394,7 +397,7 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
   </div>
 
   <div ng-if="currentTab == 'dataLabels'" class="m-t-10 m-b-10">
-    <div ng-if="['line', 'area', 'column', 'scatter', 'pie'].indexOf(options.globalSeriesType) >= 0" class="checkbox">
+    <div ng-if="['line', 'area', 'column', 'scatter', 'pie', 'heatmap'].indexOf(options.globalSeriesType) >= 0" class="checkbox">
       <label>
         <input type="checkbox" ng-model="options.showDataLabels"> Show Data Labels</label>
     </div>
diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index 70ece9a80c..cec3bc9e1f 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -1,6 +1,6 @@
 import {
   isArray, isNumber, isString, isUndefined, includes, min, max, has, find,
-  each, values, sortBy, identity, filter, map, extend, reduce,
+  each, values, sortBy, identity, filter, map, extend, reduce, flatten, uniq,
 } from 'lodash';
 import moment from 'moment';
 import d3 from 'd3';
@@ -307,6 +307,11 @@ function prepareHeatmapData(seriesList, options) {
     [1, '#e92827'],
   ];
 
+  const formatNumber = createFormatter({
+    displayAs: 'number',
+    numberFormat: options.numberFormat,
+  });
+
   let colorScheme = [];
 
   if (!options.colorScheme) {
@@ -327,8 +332,8 @@ function prepareHeatmapData(seriesList, options) {
       colorscale: colorScheme,
     };
 
-    plotlySeries.x = uniq(pluck(series.data, 'x'));
-    plotlySeries.y = uniq(pluck(series.data, 'y'));
+    plotlySeries.x = uniq(map(series.data, 'x'));
+    plotlySeries.y = uniq(map(series.data, 'y'));
 
     if (options.sortX) {
       plotlySeries.x.sort(naturalSort);
@@ -346,7 +351,7 @@ function prepareHeatmapData(seriesList, options) {
       plotlySeries.y.reverse();
     }
 
-    const zMax = max(pluck(series.data, 'zVal'));
+    const zMax = max(map(series.data, 'zVal'));
 
     // Use text trace instead of default annotation for better performance
     const dataLabels = {
@@ -364,7 +369,7 @@ function prepareHeatmapData(seriesList, options) {
     for (let i = 0; i < plotlySeries.y.length; i += 1) {
       const item = [];
       for (let j = 0; j < plotlySeries.x.length; j += 1) {
-        const datum = findWhere(
+        const datum = find(
           series.data,
           { x: plotlySeries.x[j], y: plotlySeries.y[i] },
         );
@@ -375,7 +380,7 @@ function prepareHeatmapData(seriesList, options) {
         if (isFinite(zMax) && options.showDataLabels) {
           dataLabels.x.push(plotlySeries.x[j]);
           dataLabels.y.push(plotlySeries.y[i]);
-          dataLabels.text.push(String(zValue));
+          dataLabels.text.push(formatNumber(zValue));
           if (options.colorScheme && options.colorScheme === 'Custom...') {
             dataLabels.textfont.color.push('white');
           } else {
@@ -554,7 +559,11 @@ export function prepareLayout(element, seriesList, options, data) {
     };
 
     if (options.sortX && result.xaxis.type === 'category') {
-      result.xaxis.categoryorder = 'category ascending';
+      if (options.reverseX) {
+        result.xaxis.categoryorder = 'category descending';
+      } else {
+        result.xaxis.categoryorder = 'category ascending';
+      }
     }
 
     if (!isUndefined(options.xAxis.labels)) {

From dceac5751c874ba15d23f4cb9ee6445a4a247f14 Mon Sep 17 00:00:00 2001
From: deecay <daiju.kito@gmail.com>
Date: Fri, 10 Aug 2018 04:16:58 -0400
Subject: [PATCH 13/13] Cosmetic fixes

---
 client/app/visualizations/chart/chart-editor.html | 2 +-
 client/app/visualizations/chart/plotly/utils.js   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 69d4a0d2cf..32fa0f29fc 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -333,7 +333,7 @@ <h4>{{$index == 0 ? 'Left' : 'Right'}} Y Axis</h4>
     <div class="form-group" ng-if="options.globalSeriesType == 'heatmap'">
       <label class="control-label">Color Scheme</label>
 
-      <ui-select ng-model="options.colorScheme"">
+      <ui-select ng-model="options.colorScheme">
         <ui-select-match allow-clear="true" placeholder="Choose Color Scheme...">{{$select.selected | capitalize}}</ui-select-match>
         <ui-select-choices repeat="value in colorScheme">
           <div ng-bind-html="value | highlight: $select.search"></div>
diff --git a/client/app/visualizations/chart/plotly/utils.js b/client/app/visualizations/chart/plotly/utils.js
index cec3bc9e1f..1f10b04dcf 100644
--- a/client/app/visualizations/chart/plotly/utils.js
+++ b/client/app/visualizations/chart/plotly/utils.js
@@ -777,4 +777,3 @@ export function updateDimensions(layout, element, margins) {
 
   return changed;
 }
-