From a14fb34cf87c6586ca9bc6b508e03281e0e89816 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 17 Apr 2017 21:15:28 -0700
Subject: [PATCH 1/5] Adding a stats footer to the dashboard view

---
 .../javascripts/components/TooltipWrapper.jsx |  21 +--
 .../javascripts/components/UserImage.jsx      |  61 +++++++++
 .../javascripts/dashboard/Dashboard.jsx       |   5 +
 .../dashboard/components/Footer.css           |  21 +++
 .../dashboard/components/Footer.jsx           | 124 ++++++++++++++++++
 .../profile/components/CreatedContent.jsx     |   4 +-
 .../profile/components/Favorites.jsx          |   4 +-
 .../profile/components/RecentActivity.jsx     |   2 +-
 .../profile/components/UserInfo.jsx           |  25 ++--
 .../versions/cd8aba67c8b6_image_url.py        |  24 ++++
 ...8976cf2d39e_adding_dashboard_stat_index.py |  33 +++++
 superset/models/core.py                       |  63 ++++++++-
 superset/models/helpers.py                    |   9 +-
 superset/templates/superset/dashboard.html    |   1 +
 superset/views/core.py                        |  73 +++++++++--
 15 files changed, 426 insertions(+), 44 deletions(-)
 create mode 100644 superset/assets/javascripts/components/UserImage.jsx
 create mode 100644 superset/assets/javascripts/dashboard/components/Footer.css
 create mode 100644 superset/assets/javascripts/dashboard/components/Footer.jsx
 create mode 100644 superset/migrations/versions/cd8aba67c8b6_image_url.py
 create mode 100644 superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py

diff --git a/superset/assets/javascripts/components/TooltipWrapper.jsx b/superset/assets/javascripts/components/TooltipWrapper.jsx
index b189041603de8..81737c688b841 100644
--- a/superset/assets/javascripts/components/TooltipWrapper.jsx
+++ b/superset/assets/javascripts/components/TooltipWrapper.jsx
@@ -5,7 +5,7 @@ import { slugify } from '../modules/utils';
 
 const propTypes = {
   label: PropTypes.string.isRequired,
-  tooltip: PropTypes.node.isRequired,
+  tooltip: PropTypes.node,
   children: PropTypes.node.isRequired,
   placement: PropTypes.string,
 };
@@ -15,14 +15,17 @@ const defaultProps = {
 };
 
 export default function TooltipWrapper({ label, tooltip, children, placement }) {
-  return (
-    <OverlayTrigger
-      placement={placement}
-      overlay={<Tooltip id={`${slugify(label)}-tooltip`}>{tooltip}</Tooltip>}
-    >
-      {children}
-    </OverlayTrigger>
-  );
+  if (tooltip) {
+    return (
+      <OverlayTrigger
+        placement={placement}
+        overlay={<Tooltip id={`${slugify(label)}-tooltip`}>{tooltip}</Tooltip>}
+      >
+        {children}
+      </OverlayTrigger>
+    );
+  }
+  return children;
 }
 
 TooltipWrapper.propTypes = propTypes;
diff --git a/superset/assets/javascripts/components/UserImage.jsx b/superset/assets/javascripts/components/UserImage.jsx
new file mode 100644
index 0000000000000..258fe7cb7568c
--- /dev/null
+++ b/superset/assets/javascripts/components/UserImage.jsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Gravatar from 'react-gravatar';
+
+import TooltipWrapper from './TooltipWrapper';
+
+const propTypes = {
+  href: PropTypes.string,
+  user: PropTypes.object,
+  tooltip: PropTypes.node,
+  width: PropTypes.string,
+  height: PropTypes.string,
+  imgStyle: PropTypes.object,
+  showTooltip: PropTypes.bool,
+  linkToProfile: PropTypes.bool,
+};
+const defaultProps = {
+  imgStyle: { borderRadius: 3 },
+  linkToProfile: true,
+  showTooltip: true,
+};
+
+export default function UserImage(props) {
+  let tooltip;
+  if (props.showTooltip) {
+    tooltip = props.tooltip || props.user.username;
+  }
+  let href = props.href || '#';
+  if (props.linkToProfile) {
+    href = `/superset/profile/${props.user.username}/`;
+  }
+  return (
+    <TooltipWrapper label={`user-${props.user.username}`} tooltip={tooltip}>
+      <span className="user-icon m-l-3">
+        <a href={href}>
+          {props.user.image_url ?
+            <img
+              alt={tooltip || 'User image'}
+              src={props.user.image_url}
+              width={props.width}
+              height={props.height}
+              style={props.imgStyle}
+            />
+          :
+            <Gravatar
+              email={props.user.email}
+              width={props.width}
+              height={props.height}
+              alt="Profile picture provided by Gravatar"
+              className="img-rounded"
+              style={props.imgStyle}
+            />
+          }
+        </a>
+      </span>
+    </TooltipWrapper>
+  );
+}
+
+UserImage.propTypes = propTypes;
+UserImage.defaultProps = defaultProps;
diff --git a/superset/assets/javascripts/dashboard/Dashboard.jsx b/superset/assets/javascripts/dashboard/Dashboard.jsx
index 8b0a0e1c69114..3f87647a369ae 100644
--- a/superset/assets/javascripts/dashboard/Dashboard.jsx
+++ b/superset/assets/javascripts/dashboard/Dashboard.jsx
@@ -6,6 +6,7 @@ import moment from 'moment';
 
 import GridLayout from './components/GridLayout';
 import Header from './components/Header';
+import Footer from './components/Footer';
 import { appSetup } from '../common';
 import AlertsWrapper from '../components/AlertsWrapper';
 
@@ -72,6 +73,10 @@ function initDashboardView(dashboard) {
     <GridLayout dashboard={dashboard} />,
     document.getElementById('grid-container'),
   );
+  render(
+    <Footer dashboard={dashboard} />,
+    document.getElementById('dash-footer'),
+  );
 
   // Displaying widget controls on hover
   $('.react-grid-item').hover(
diff --git a/superset/assets/javascripts/dashboard/components/Footer.css b/superset/assets/javascripts/dashboard/components/Footer.css
new file mode 100644
index 0000000000000..39809c5d6b695
--- /dev/null
+++ b/superset/assets/javascripts/dashboard/components/Footer.css
@@ -0,0 +1,21 @@
+.dash-footer {
+    background-color: white;
+    margin-top: 10px;
+}
+.m-l-3 {
+    margin-left: 3;
+}
+.user-icon {
+    opacity: 0.8;
+}
+.user-icon:hover {
+    opacity: 1;
+}
+.navbar.bottom {
+    margin-bottom: 10px;
+    border-color: #DDD;
+    border-width: 1px;
+}
+.navbar .profile-images img {
+    margin-top: 8px;
+}
diff --git a/superset/assets/javascripts/dashboard/components/Footer.jsx b/superset/assets/javascripts/dashboard/components/Footer.jsx
new file mode 100644
index 0000000000000..ac89c28971a71
--- /dev/null
+++ b/superset/assets/javascripts/dashboard/components/Footer.jsx
@@ -0,0 +1,124 @@
+import React from 'react';
+import { Badge, Label, Navbar } from 'react-bootstrap';
+import $ from 'jquery';
+
+import './Footer.css';
+import UserImage from '../../components/UserImage';
+import TooltipWrapper from '../../components/TooltipWrapper';
+
+
+const propTypes = {
+  dashboard: React.PropTypes.object,
+};
+const defaultProps = {
+};
+
+const PROFILE_IMG_SIZE = '32';
+const MAX_VIEWERS = 30;
+
+class Footer extends React.PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      totalViews: '?',
+      userCount: '?',
+      viewers: [],
+    };
+  }
+  componentWillMount() {
+    $.ajax({
+      url: `/superset/dashboard/${this.props.dashboard.id}/stats/`,
+      success: (resp) => {
+        const viewers = resp;
+        let totalViews = 0;
+        resp.forEach((d) => {
+          totalViews += d.views;
+        });
+        const userCount = resp.length;
+        this.setState({ totalViews, userCount, viewers });
+      },
+      error() {
+      },
+    });
+  }
+  renderViewers() {
+    const viewers = this.state.viewers.slice(0, MAX_VIEWERS);
+    let extra;
+    if (this.state.viewers.length > MAX_VIEWERS) {
+      extra = (
+        <Label className="m-l-3">
+          <i className="fa fa-plus-circle" /> {''}
+          {this.state.viewers.length - MAX_VIEWERS} more
+        </Label>);
+    }
+    return (
+      <span>
+        {viewers.map(user => this.renderUserIcon(user))}
+        {extra}
+      </span>);
+  }
+  renderUserIcon(user) {
+    return (
+      <UserImage
+        user={user}
+        tooltip={
+          <div>
+            <div>{user.first_name} {user.last_name}</div>
+            {user.views &&
+              <div><b>{user.views}</b> views</div>
+            }
+          </div>
+        }
+        width={PROFILE_IMG_SIZE}
+        height={PROFILE_IMG_SIZE}
+      />
+    );
+  }
+  render() {
+    const dashboard = this.props.dashboard;
+    return (
+      <Navbar fluid inverse className="bottom">
+        <Navbar.Collapse>
+          <span>
+            <Navbar.Text>
+              <TooltipWrapper label="owners" tooltip="Owner(s)">
+                <i className="fa fa-wrench" />
+              </TooltipWrapper>
+            </Navbar.Text>
+            <span className="profile-images pull-left">
+              {dashboard.owners.map(user => this.renderUserIcon(user))}
+            </span>
+          </span>
+          <span>
+            <Navbar.Text>
+              <TooltipWrapper label="viewers" tooltip="Viewers">
+                <i className="fa fa-users" />
+              </TooltipWrapper>
+            </Navbar.Text>
+            <span className="profile-images pull-left">
+              {this.renderViewers()}
+            </span>
+          </span>
+          <Navbar.Text pullRight>
+            <TooltipWrapper label="user-views" tooltip="Number of views">
+              <span>
+                <i className="fa fa-eye" /> <Badge>{this.state.totalViews}</Badge>
+              </span>
+            </TooltipWrapper>
+          </Navbar.Text>
+          <Navbar.Text pullRight>
+            <TooltipWrapper label="user-count" tooltip="Number of viewers">
+              <span>
+                <i className="fa fa-user" /> <Badge>{this.state.userCount}</Badge>
+              </span>
+            </TooltipWrapper>
+          </Navbar.Text>
+        </Navbar.Collapse>
+      </Navbar>
+    );
+  }
+}
+Footer.propTypes = propTypes;
+Footer.defaultProps = defaultProps;
+
+export default Footer;
diff --git a/superset/assets/javascripts/profile/components/CreatedContent.jsx b/superset/assets/javascripts/profile/components/CreatedContent.jsx
index 87921c6872e6c..5397257d2e381 100644
--- a/superset/assets/javascripts/profile/components/CreatedContent.jsx
+++ b/superset/assets/javascripts/profile/components/CreatedContent.jsx
@@ -25,7 +25,7 @@ class CreatedContent extends React.PureComponent {
     }));
     return (
       <TableLoader
-        dataEndpoint={`/superset/created_slices/${this.props.user.userId}/`}
+        dataEndpoint={`/superset/created_slices/${this.props.user.id}/`}
         className="table table-condensed"
         columns={['slice', 'favorited']}
         mutator={mutator}
@@ -44,7 +44,7 @@ class CreatedContent extends React.PureComponent {
       <TableLoader
         className="table table-condensed"
         mutator={mutator}
-        dataEndpoint={`/superset/created_dashboards/${this.props.user.userId}/`}
+        dataEndpoint={`/superset/created_dashboards/${this.props.user.id}/`}
         noDataText="No dashboards"
         columns={['dashboard', 'favorited']}
         sortable
diff --git a/superset/assets/javascripts/profile/components/Favorites.jsx b/superset/assets/javascripts/profile/components/Favorites.jsx
index 9039d916518b4..5f3d1ca048c49 100644
--- a/superset/assets/javascripts/profile/components/Favorites.jsx
+++ b/superset/assets/javascripts/profile/components/Favorites.jsx
@@ -26,7 +26,7 @@ export default class Favorites extends React.PureComponent {
     }));
     return (
       <TableLoader
-        dataEndpoint={`/superset/fave_slices/${this.props.user.userId}/`}
+        dataEndpoint={`/superset/fave_slices/${this.props.user.id}/`}
         className="table table-condensed"
         columns={['slice', 'creator', 'favorited']}
         mutator={mutator}
@@ -45,7 +45,7 @@ export default class Favorites extends React.PureComponent {
       <TableLoader
         className="table table-condensed"
         mutator={mutator}
-        dataEndpoint={`/superset/fave_dashboards/${this.props.user.userId}/`}
+        dataEndpoint={`/superset/fave_dashboards/${this.props.user.id}/`}
         noDataText="No favorite dashboards yet, go click on stars!"
         columns={['dashboard', 'creator', 'favorited']}
         sortable
diff --git a/superset/assets/javascripts/profile/components/RecentActivity.jsx b/superset/assets/javascripts/profile/components/RecentActivity.jsx
index 476f6d6180a41..ea1dbb3cd350f 100644
--- a/superset/assets/javascripts/profile/components/RecentActivity.jsx
+++ b/superset/assets/javascripts/profile/components/RecentActivity.jsx
@@ -24,7 +24,7 @@ export default class RecentActivity extends React.PureComponent {
           className="table table-condensed"
           mutator={mutator}
           sortable
-          dataEndpoint={`/superset/recent_activity/${this.props.user.userId}/`}
+          dataEndpoint={`/superset/recent_activity/${this.props.user.id}/`}
         />
       </div>
     );
diff --git a/superset/assets/javascripts/profile/components/UserInfo.jsx b/superset/assets/javascripts/profile/components/UserInfo.jsx
index 4f751ed0d2391..0cbec2c1a94eb 100644
--- a/superset/assets/javascripts/profile/components/UserInfo.jsx
+++ b/superset/assets/javascripts/profile/components/UserInfo.jsx
@@ -1,46 +1,39 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Gravatar from 'react-gravatar';
 import moment from 'moment';
-import { Panel } from 'react-bootstrap';
+import { Label, Panel } from 'react-bootstrap';
+import UserImage from '../../components/UserImage';
 
 const propTypes = {
   user: PropTypes.object.isRequired,
 };
 const UserInfo = ({ user }) => (
   <div>
-    <a href="https://en.gravatar.com/">
-      <Gravatar
-        email={user.email}
-        width="100%"
-        height=""
-        alt="Profile picture provided by Gravatar"
-        className="img-rounded"
-        style={{ borderRadius: 15 }}
-      />
-    </a>
+    <UserImage width="100%" user={user} showTooltip={false} linkToProfile={false} />
     <hr />
     <Panel>
       <h3>
-        <strong>{user.firstName} {user.lastName}</strong>
+        <strong>{user.first_name} {user.last_name}</strong>
       </h3>
       <h4 className="username">
         <i className="fa fa-user-o" /> {user.username}
       </h4>
       <hr />
       <p>
-        <i className="fa fa-clock-o" /> joined {moment(user.createdOn, 'YYYYMMDD').fromNow()}
+        <i className="fa fa-clock-o" /> joined {moment(user.created_on, 'YYYYMMDD').fromNow()}
       </p>
       <p className="email">
         <i className="fa fa-envelope-o" /> {user.email}
       </p>
       <p className="roles">
-        <i className="fa fa-lock" /> {Object.keys(user.roles).join(', ')}
+        <i className="fa fa-lock" /> {Object.keys(user.roles).map(k => (
+          <Label key={`${k}-label`}>{k}</Label>
+        ))}
       </p>
       <p>
         <i className="fa fa-key" />&nbsp;
         <span className="text-muted">id:</span>&nbsp;
-        <span className="user-id">{user.userId}</span>
+        <span className="user-id">{user.id}</span>
       </p>
     </Panel>
   </div>
diff --git a/superset/migrations/versions/cd8aba67c8b6_image_url.py b/superset/migrations/versions/cd8aba67c8b6_image_url.py
new file mode 100644
index 0000000000000..39038aca1f881
--- /dev/null
+++ b/superset/migrations/versions/cd8aba67c8b6_image_url.py
@@ -0,0 +1,24 @@
+"""image_url
+
+Revision ID: cd8aba67c8b6
+Revises: e8976cf2d39e
+Create Date: 2017-04-18 16:21:26.561856
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'cd8aba67c8b6'
+down_revision = 'e8976cf2d39e'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('ab_user', sa.Column('image_url', sa.String(length=1000), nullable=True))
+    op.add_column('ab_user', sa.Column('slack_username', sa.String(length=500), nullable=True))
+
+
+def downgrade():
+    op.drop_column('ab_user', 'slack_username')
+    op.drop_column('ab_user', 'image_url')
diff --git a/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py b/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py
new file mode 100644
index 0000000000000..d6f477f0a5dbe
--- /dev/null
+++ b/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py
@@ -0,0 +1,33 @@
+"""Adding dashboard stat index
+
+Revision ID: e8976cf2d39e
+Revises: 2fcdcb35e487
+Create Date: 2017-04-17 21:09:46.655435
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e8976cf2d39e'
+down_revision = '2fcdcb35e487'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+
+def upgrade():
+    op.alter_column(
+        'logs',
+        'action',
+        existing_type=mysql.VARCHAR(length=512),
+        type_=sa.String(length=64),
+        existing_nullable=True)
+    op.create_index(
+        'log_dash_status',
+        'logs',
+        ['dashboard_id', 'action', 'dttm', 'user_id'],
+        unique=False)
+
+
+def downgrade():
+    op.drop_index('log_dash_status', table_name='logs')
diff --git a/superset/models/core.py b/superset/models/core.py
index 5527f11d45291..99a5ab3739c8c 100644
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -4,6 +4,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from collections import defaultdict
 import functools
 import json
 import logging
@@ -22,6 +23,7 @@
 from flask import escape, g, Markup, request
 from flask_appbuilder import Model
 from flask_appbuilder.models.decorators import renders
+from flask_appbuilder.security.sqla import models as ab_models
 
 from sqlalchemy import (
     Column, Integer, String, ForeignKey, Text, Boolean,
@@ -38,7 +40,8 @@
 from superset import app, db, db_engine_specs, utils, sm
 from superset.connectors.connector_registry import ConnectorRegistry
 from superset.viz import viz_types
-from superset.models.helpers import AuditMixinNullable, ImportMixin, set_perm
+from superset.models.helpers import (
+        AuditMixinNullable, ImportMixin, set_perm)
 install_aliases()
 from urllib import parse  # noqa
 
@@ -349,6 +352,7 @@ def data(self):
             'metadata': self.params_dict,
             'css': self.css,
             'dashboard_title': self.dashboard_title,
+            'owners': [u.data for u in self.owners],
             'slug': self.slug,
             'slices': [slc.data for slc in self.slices],
             'position_json': positions,
@@ -721,7 +725,7 @@ class Log(Model):
     __tablename__ = 'logs'
 
     id = Column(Integer, primary_key=True)
-    action = Column(String(512))
+    action = Column(String(64))
     user_id = Column(Integer, ForeignKey('ab_user.id'))
     dashboard_id = Column(Integer)
     slice_id = Column(Integer)
@@ -732,6 +736,10 @@ class Log(Model):
     duration_ms = Column(Integer)
     referrer = Column(String(1024))
 
+    __table_args__ = (
+        sqla.Index('log_dash_status', dashboard_id, action, dttm, user_id),
+    )
+
     @classmethod
     def log_this(cls, f):
         """Decorator to log user actions"""
@@ -851,3 +859,54 @@ def user_roles(self):
                 href = "{} Role".format(r.name)
             action_list = action_list + '<li>' + href + '</li>'
         return '<ul>' + action_list + '</ul>'
+
+
+class SupersetUser(ab_models.User):
+    """Deriving FAB's USER to enrich it"""
+    image_url = Column(String(1000))
+    slack_username = Column(String(500))
+
+    @property
+    def full_name(self):
+        return self.first_name + ' ' + self.last_name
+
+    @property
+    def data(self):
+        """Returns a json-serializable representation of the self"""
+        return {
+            'id': self.id,
+            'first_name': self.first_name,
+            'last_name': self.last_name,
+            'slack_username': self.slack_username,
+            'email': self.email,
+            'image_url': self.image_url,
+            'username': self.username,
+            'is_active': self.is_active(),
+            'created_on': self.created_on.isoformat(),
+        }
+    @property
+    def data_extended(self):
+        """Superset of data property with roles and perms"""
+        d = self.data
+        roles = {}
+        permissions = defaultdict(set)
+        for role in self.roles:
+            perms = set()
+            for perm in role.permissions:
+                perms.add(
+                    (perm.permission.name, perm.view_menu.name)
+                )
+                if perm.permission.name in ('datasource_access', 'database_access'):
+                    permissions[perm.permission.name].add(perm.view_menu.name)
+            roles[role.name] = [
+                [perm.permission.name, perm.view_menu.name]
+                for perm in role.permissions
+            ]
+        d.update({
+            'roles': roles,
+            'permissions': permissions,
+        })
+        return d
+
+# hoo hoo hoo hee hee hee
+ab_models.User = SupersetUser
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index 9af7c68ef9e53..581cf7c79ecf9 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -163,6 +163,13 @@ def set_perm(mapper, connection, target):  # noqa
             .where(link_table.c.id == target.id)
             .values(perm=target.get_perm())
         )
-
     # add to view menu if not already exists
     merge_perm(sm, 'datasource_access', target.get_perm(), connection)
+
+def user_data(user):
+    """Returns a json-serializable representation of the user"""
+    return {
+        'id': user.id,
+        'username': user.username,
+        'email': user.email,
+    }
diff --git a/superset/templates/superset/dashboard.html b/superset/templates/superset/dashboard.html
index 8fe4a6ed5bfc1..df4de80f98904 100644
--- a/superset/templates/superset/dashboard.html
+++ b/superset/templates/superset/dashboard.html
@@ -19,6 +19,7 @@
 
   <!-- gridster class used for backwards compatibility -->
   <div id="grid-container" class="slice-grid gridster"></div>
+  <div id="dash-footer"></div>
 
 </div>
 {% endblock %}
diff --git a/superset/views/core.py b/superset/views/core.py
index d5a31260c0607..e7fa83f39ed6b 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -22,6 +22,7 @@
 from flask_appbuilder.actions import action
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_appbuilder.security.decorators import has_access_api
+from flask_appbuilder.security import views as fab_views
 from flask_appbuilder.security.sqla import models as ab_models
 
 from flask_babel import gettext as __
@@ -1668,6 +1669,47 @@ def favstar(self, class_name, obj_id, action):
         session.commit()
         return json_success(json.dumps({'count': count}))
 
+    @has_access_api
+    @expose("/dashboard/<dashboard_id>/stats/")
+    def dashboard_stats(self, dashboard_id):
+        session = db.session()
+        Log = models.Log
+        stats = (
+            session.query(
+                ab_models.User.username,
+                ab_models.User.email,
+                ab_models.User.first_name,
+                ab_models.User.last_name,
+                ab_models.User.slack_username,
+                ab_models.User.image_url,
+                sqla.func.count())
+            .filter(
+                Log.dashboard_id == str(dashboard_id),
+                Log.action == 'dashboard',
+                Log.user_id == ab_models.User.id)
+            .group_by(
+                ab_models.User.username,
+                ab_models.User.email,
+                ab_models.User.first_name,
+                ab_models.User.last_name,
+                ab_models.User.slack_username,
+                ab_models.User.image_url)
+            .order_by(
+                sqla.desc(sqla.func.count())
+            )
+        )
+        print(stats)
+        payload = [{
+            'username': row[0],
+            'email': row[1],
+            'first_name': row[2],
+            'last_name': row[3],
+            'slack_username': row[4],
+            'image_url': row[5],
+            'views': row[6],
+        } for row in stats.all()]
+        return json_success(json.dumps(payload))
+
     @has_access
     @expose("/dashboard/<dashboard_id>/")
     def dashboard(self, dashboard_id):
@@ -2257,17 +2299,7 @@ def profile(self, username):
                 for perm in role.permissions
             ]
         payload = {
-            'user': {
-                'username': user.username,
-                'firstName': user.first_name,
-                'lastName': user.last_name,
-                'userId': user.id,
-                'isActive': user.is_active(),
-                'createdOn': user.created_on.isoformat(),
-                'email': user.email,
-                'roles': roles,
-                'permissions': permissions,
-            }
+            'user': user.data_extended,
         }
         return self.render_template(
             'superset/profile.html',
@@ -2332,6 +2364,25 @@ class CssTemplateAsyncModelView(CssTemplateModelView):
 )
 
 
+class SupersetUserModelView(fab_views.UserDBModelView):
+    route_base = '/userext'
+    datamodel = SQLAInterface(models.SupersetUser)
+    edit_columns = fab_views.UserDBModelView.edit_columns + [
+        'image_url', 'slack_username']
+    add_columns = fab_views.UserDBModelView.add_columns + [
+        'image_url', 'slack_username']
+fab_views.UserDBModelView = SupersetUserModelView
+
+appbuilder.add_view(
+    SupersetUserModelView,
+    "UsersExtended",
+    label=__("Users - Extended"),
+    icon="fa-user",
+    category="Security",
+    category_label=__("Security"),
+    category_icon='fa-cogs',)
+
+
 @app.after_request
 def apply_caching(response):
     """Applies the configuration's http headers to all responses"""

From 569fd99b5369a4300d2f7c376f7dfd361c95be70 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 1 May 2017 22:11:51 -0700
Subject: [PATCH 2/5] Fix lint & tests

---
 .../javascripts/profile/UserInfo_spec.jsx     |  5 ++-
 .../spec/javascripts/profile/fixtures.jsx     | 10 +++---
 ...8976cf2d39e_adding_dashboard_stat_index.py | 31 ++++++++++---------
 superset/models/core.py                       |  4 ++-
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/superset/assets/spec/javascripts/profile/UserInfo_spec.jsx b/superset/assets/spec/javascripts/profile/UserInfo_spec.jsx
index 360443635b043..f161db2c62e13 100644
--- a/superset/assets/spec/javascripts/profile/UserInfo_spec.jsx
+++ b/superset/assets/spec/javascripts/profile/UserInfo_spec.jsx
@@ -32,7 +32,10 @@ describe('UserInfo', () => {
   });
   it('renders roles information', () => {
     const wrapper = mount(<UserInfo {...mockedProps} />);
-    expect(wrapper.find('.roles').text()).to.equal(' Alpha, sql_lab');
+    const roleLabels = wrapper.find('.roles .label');
+    expect(roleLabels.length).to.equal(2);
+    expect(roleLabels.first().text()).to.equal('Alpha');
+    expect(roleLabels.last().text()).to.equal('sql_lab');
   });
   it('shows the right user-id', () => {
     const wrapper = mount(<UserInfo {...mockedProps} />);
diff --git a/superset/assets/spec/javascripts/profile/fixtures.jsx b/superset/assets/spec/javascripts/profile/fixtures.jsx
index 13237d1d091a2..c46e9f2f2cdac 100644
--- a/superset/assets/spec/javascripts/profile/fixtures.jsx
+++ b/superset/assets/spec/javascripts/profile/fixtures.jsx
@@ -38,12 +38,12 @@ export const user = {
       ],
     ],
   },
-  firstName: 'alpha',
-  lastName: 'alpha',
-  createdOn: '2016-11-11T12:34:17',
-  userId: 5,
+  first_name: 'alpha',
+  last_name: 'alpha',
+  created_on: '2016-11-11T12:34:17',
+  id: 5,
   email: 'alpha@alpha.com',
-  isActive: true,
+  is_active: true,
   permissions: {
     datasource_access: ['table1', 'table2'],
     database_access: ['db1', 'db2', 'db3'],
diff --git a/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py b/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py
index d6f477f0a5dbe..06d741184f69d 100644
--- a/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py
+++ b/superset/migrations/versions/e8976cf2d39e_adding_dashboard_stat_index.py
@@ -6,27 +6,28 @@
 
 """
 
+from alembic import op
+import sqlalchemy as sa
+
 # revision identifiers, used by Alembic.
 revision = 'e8976cf2d39e'
 down_revision = '2fcdcb35e487'
 
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
-
 
 def upgrade():
-    op.alter_column(
-        'logs',
-        'action',
-        existing_type=mysql.VARCHAR(length=512),
-        type_=sa.String(length=64),
-        existing_nullable=True)
-    op.create_index(
-        'log_dash_status',
-        'logs',
-        ['dashboard_id', 'action', 'dttm', 'user_id'],
-        unique=False)
+    try:
+        op.alter_column(
+            'logs',
+            'action',
+            type_=sa.String(length=64),
+            existing_nullable=True)
+        op.create_index(
+            'log_dash_status',
+            'logs',
+            ['dashboard_id', 'action', 'dttm', 'user_id'],
+            unique=False)
+    except Exception:
+        pass
 
 
 def downgrade():
diff --git a/superset/models/core.py b/superset/models/core.py
index 99a5ab3739c8c..1fc7b7b5763df 100644
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -884,6 +884,7 @@ def data(self):
             'is_active': self.is_active(),
             'created_on': self.created_on.isoformat(),
         }
+
     @property
     def data_extended(self):
         """Superset of data property with roles and perms"""
@@ -896,7 +897,8 @@ def data_extended(self):
                 perms.add(
                     (perm.permission.name, perm.view_menu.name)
                 )
-                if perm.permission.name in ('datasource_access', 'database_access'):
+                if perm.permission.name in (
+                        'datasource_access', 'database_access'):
                     permissions[perm.permission.name].add(perm.view_menu.name)
             roles[role.name] = [
                 [perm.permission.name, perm.view_menu.name]

From bc066d6512b4942fdbe1fa4061829e3624c585f1 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Tue, 2 May 2017 08:20:31 -0700
Subject: [PATCH 3/5] Fixing tests

---
 superset/models/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/models/core.py b/superset/models/core.py
index 1fc7b7b5763df..e4def7ae6a10a 100644
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -911,4 +911,4 @@ def data_extended(self):
         return d
 
 # hoo hoo hoo hee hee hee
-ab_models.User = SupersetUser
+#ab_models.User = SupersetUser

From 2b71f13dd7bf3e0b85e8387c0c03d252fab97c02 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Sat, 17 Jun 2017 15:28:33 -0700
Subject: [PATCH 4/5] Fixing how user model is extended

---
 UPDATE.md                                     | 16 ++++
 docs/security.rst                             |  9 +++
 superset/__init__.py                          | 48 +++++++-----
 .../javascripts/dashboard/Dashboard.jsx       | 10 ++-
 .../dashboard/components/Footer.jsx           |  5 +-
 superset/config.py                            |  4 +
 .../versions/cd8aba67c8b6_image_url.py        | 22 ++++--
 superset/migrations/versions/e58b53fc8605_.py | 22 ++++++
 superset/models/core.py                       | 53 --------------
 superset/models/helpers.py                    |  1 +
 superset/security.py                          |  1 +
 superset/security_manager.py                  | 73 +++++++++++++++++++
 superset/views/core.py                        | 55 ++++++--------
 13 files changed, 200 insertions(+), 119 deletions(-)
 create mode 100644 UPDATE.md
 create mode 100644 superset/migrations/versions/e58b53fc8605_.py
 create mode 100644 superset/security_manager.py

diff --git a/UPDATE.md b/UPDATE.md
new file mode 100644
index 0000000000000..64abbafc086f0
--- /dev/null
+++ b/UPDATE.md
@@ -0,0 +1,16 @@
+This document details changes that aren't fully backwards compatible.
+This doc is here to inform of change of behavior as well as
+to explain actions that may be required to take while upgrading.
+
+# 0.19.0
+* We introduced `superset.security_manager.SupersetSecurityManager`,
+that derives `flask_appbuilder.security.sqla.manager.SecurityManager`.
+This derivation of FAB's SecurityManager was necessary in order to
+introduce new attributes to `SupersetUser` like the `image_url` surfaced
+in the profile page as well as in the new dashboard stats footer.
+
+Knowing that the authentication in FAB is implemented by deriving their
+`SecurityManager`, if you have your own auth setup in that way, you'll now
+have to derive `SupersetSecurityManager` instead.
+
+
diff --git a/docs/security.rst b/docs/security.rst
index b5d5b63456dec..81a40f4270d12 100644
--- a/docs/security.rst
+++ b/docs/security.rst
@@ -4,6 +4,15 @@ Security in Superset is handled by Flask AppBuilder (FAB). FAB is a
 "Simple and rapid application development framework, built on top of Flask.".
 FAB provides authentication, user management, permissions and roles.
 
+FAB supports multiple types of authentications:
+in-database, LDAP, OpenID, OAuth, REMOTE_USER, or custom.
+
+To setup/customize authentication for Superset, follow
+`FAB's documentation<https://flask-appbuilder.readthedocs.io/en/latest/security.html#security>`_, but instead of deriving ``flask_appbuilder.security.sqla.manager.SecurityManager``,
+derive Superset's ``superset.security_manager.SupersetSecurityManager``.
+
+Note that Superset extends FAB's ``SecurityManger`` to extend
+the user model as specified in the FAB documentation.
 
 Provided Roles
 --------------
diff --git a/superset/__init__.py b/superset/__init__.py
index fceff86159ff8..7d7b8c8f5b54a 100644
--- a/superset/__init__.py
+++ b/superset/__init__.py
@@ -19,6 +19,7 @@
 
 from superset.connectors.connector_registry import ConnectorRegistry
 from superset import utils, config  # noqa
+from superset.security_manager import SupersetSecurityManager
 
 
 APP_DIR = os.path.dirname(__file__)
@@ -77,25 +78,25 @@ def get_js_manifest():
 migrate = Migrate(app, db, directory=APP_DIR + "/migrations")
 
 # Logging configuration
-logging.basicConfig(format=app.config.get('LOG_FORMAT'))
-logging.getLogger().setLevel(app.config.get('LOG_LEVEL'))
-
-if app.config.get('ENABLE_TIME_ROTATE'):
-    logging.getLogger().setLevel(app.config.get('TIME_ROTATE_LOG_LEVEL'))
-    handler = TimedRotatingFileHandler(app.config.get('FILENAME'),
-                                       when=app.config.get('ROLLOVER'),
-                                       interval=app.config.get('INTERVAL'),
-                                       backupCount=app.config.get('BACKUP_COUNT'))
+logging.basicConfig(format=conf.get('LOG_FORMAT'))
+logging.getLogger().setLevel(conf.get('LOG_LEVEL'))
+
+if conf.get('ENABLE_TIME_ROTATE'):
+    logging.getLogger().setLevel(conf.get('TIME_ROTATE_LOG_LEVEL'))
+    handler = TimedRotatingFileHandler(conf.get('FILENAME'),
+                                       when=conf.get('ROLLOVER'),
+                                       interval=conf.get('INTERVAL'),
+                                       backupCount=conf.get('BACKUP_COUNT'))
     logging.getLogger().addHandler(handler)
 
-if app.config.get('ENABLE_CORS'):
+if conf.get('ENABLE_CORS'):
     from flask_cors import CORS
-    CORS(app, **app.config.get('CORS_OPTIONS'))
+    CORS(app, **conf.get('CORS_OPTIONS'))
 
-if app.config.get('ENABLE_PROXY_FIX'):
+if conf.get('ENABLE_PROXY_FIX'):
     app.wsgi_app = ProxyFix(app.wsgi_app)
 
-if app.config.get('ENABLE_CHUNK_ENCODING'):
+if conf.get('ENABLE_CHUNK_ENCODING'):
     class ChunkedEncodingFix(object):
 
         def __init__(self, app):
@@ -109,13 +110,13 @@ def __call__(self, environ, start_response):
             return self.app(environ, start_response)
     app.wsgi_app = ChunkedEncodingFix(app.wsgi_app)
 
-if app.config.get('UPLOAD_FOLDER'):
+if conf.get('UPLOAD_FOLDER'):
     try:
-        os.makedirs(app.config.get('UPLOAD_FOLDER'))
+        os.makedirs(conf.get('UPLOAD_FOLDER'))
     except OSError:
         pass
 
-for middleware in app.config.get('ADDITIONAL_MIDDLEWARE'):
+for middleware in conf.get('ADDITIONAL_MIDDLEWARE'):
     app.wsgi_app = middleware(app.wsgi_app)
 
 
@@ -124,20 +125,27 @@ class MyIndexView(IndexView):
     def index(self):
         return redirect('/superset/welcome')
 
+SecurityManager = (
+    conf.get("CUSTOM_SECURITY_MANAGER") or SupersetSecurityManager)
+if not issubclass(SecurityManager, SupersetSecurityManager):
+    raise Exception(
+        "Security manager needs to be a subclass of "
+        "superset.security.SupersetSecurityManager")
+
 appbuilder = AppBuilder(
     app, db.session,
     base_template='superset/base.html',
     indexview=MyIndexView,
-    security_manager_class=app.config.get("CUSTOM_SECURITY_MANAGER"))
+    security_manager_class=SecurityManager)
 
 sm = appbuilder.sm
 
 get_session = appbuilder.get_session
-results_backend = app.config.get("RESULTS_BACKEND")
+results_backend = conf.get("RESULTS_BACKEND")
 
 # Registering sources
-module_datasource_map = app.config.get("DEFAULT_MODULE_DS_MAP")
-module_datasource_map.update(app.config.get("ADDITIONAL_MODULE_DS_MAP"))
+module_datasource_map = conf.get("DEFAULT_MODULE_DS_MAP")
+module_datasource_map.update(conf.get("ADDITIONAL_MODULE_DS_MAP"))
 ConnectorRegistry.register_sources(module_datasource_map)
 
 from superset import views  # noqa
diff --git a/superset/assets/javascripts/dashboard/Dashboard.jsx b/superset/assets/javascripts/dashboard/Dashboard.jsx
index 3f87647a369ae..29d7f88be4639 100644
--- a/superset/assets/javascripts/dashboard/Dashboard.jsx
+++ b/superset/assets/javascripts/dashboard/Dashboard.jsx
@@ -73,10 +73,12 @@ function initDashboardView(dashboard) {
     <GridLayout dashboard={dashboard} />,
     document.getElementById('grid-container'),
   );
-  render(
-    <Footer dashboard={dashboard} />,
-    document.getElementById('dash-footer'),
-  );
+  if (dashboard.ENABLE_DASHBOARD_STATS) {
+    render(
+      <Footer dashboard={dashboard} />,
+      document.getElementById('dash-footer'),
+    );
+  }
 
   // Displaying widget controls on hover
   $('.react-grid-item').hover(
diff --git a/superset/assets/javascripts/dashboard/components/Footer.jsx b/superset/assets/javascripts/dashboard/components/Footer.jsx
index ac89c28971a71..936c0490e4f72 100644
--- a/superset/assets/javascripts/dashboard/components/Footer.jsx
+++ b/superset/assets/javascripts/dashboard/components/Footer.jsx
@@ -85,7 +85,10 @@ class Footer extends React.PureComponent {
                 <i className="fa fa-wrench" />
               </TooltipWrapper>
             </Navbar.Text>
-            <span className="profile-images pull-left">
+            <span
+              className="profile-images pull-left"
+              style={{ marginRight: 50 }}
+            >
               {dashboard.owners.map(user => this.renderUserIcon(user))}
             </span>
           </span>
diff --git a/superset/config.py b/superset/config.py
index 47126f8bd4f40..d08ea5fdfdf7b 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -313,6 +313,10 @@ class CeleryConfig(object):
 # into a proxied one
 TRACKING_URL_TRANSFORMER = lambda x: x
 
+# Makes it possible to disable the dashboard footer where usage stats are
+# exposed
+ENABLE_DASHBOARD_STATS = True
+
 try:
     if CONFIG_PATH_ENV_VAR in os.environ:
         # Explicitly import config module that is not in pythonpath; useful
diff --git a/superset/migrations/versions/cd8aba67c8b6_image_url.py b/superset/migrations/versions/cd8aba67c8b6_image_url.py
index 39038aca1f881..843dc174bbc7d 100644
--- a/superset/migrations/versions/cd8aba67c8b6_image_url.py
+++ b/superset/migrations/versions/cd8aba67c8b6_image_url.py
@@ -5,20 +5,28 @@
 Create Date: 2017-04-18 16:21:26.561856
 
 """
+from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = 'cd8aba67c8b6'
 down_revision = 'e8976cf2d39e'
 
-from alembic import op
-import sqlalchemy as sa
-
 
 def upgrade():
-    op.add_column('ab_user', sa.Column('image_url', sa.String(length=1000), nullable=True))
-    op.add_column('ab_user', sa.Column('slack_username', sa.String(length=500), nullable=True))
+    try:
+        with op.batch_alter_table('ab_user', schema=None) as batch_op:
+            batch_op.add_column(
+                'ab_user',
+                sa.Column('image_url', sa.String(length=1000), nullable=True))
+            batch_op.add_column(
+                'ab_user',
+                sa.Column('slack_username', sa.String(length=500), nullable=True))
+    except Exception:
+        pass
 
 
 def downgrade():
-    op.drop_column('ab_user', 'slack_username')
-    op.drop_column('ab_user', 'image_url')
+    with op.batch_alter_table('ab_user', schema=None) as batch_op:
+        batch_op.drop_column('ab_user', 'slack_username')
+        batch_op.drop_column('ab_user', 'image_url')
diff --git a/superset/migrations/versions/e58b53fc8605_.py b/superset/migrations/versions/e58b53fc8605_.py
new file mode 100644
index 0000000000000..6d23618be7b9d
--- /dev/null
+++ b/superset/migrations/versions/e58b53fc8605_.py
@@ -0,0 +1,22 @@
+"""empty message
+
+Revision ID: e58b53fc8605
+Revises: ('cd8aba67c8b6', 'a65458420354')
+Create Date: 2017-06-17 10:17:40.227962
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e58b53fc8605'
+down_revision = ('cd8aba67c8b6', 'a65458420354')
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass
diff --git a/superset/models/core.py b/superset/models/core.py
index e4def7ae6a10a..886617aa7eef7 100644
--- a/superset/models/core.py
+++ b/superset/models/core.py
@@ -859,56 +859,3 @@ def user_roles(self):
                 href = "{} Role".format(r.name)
             action_list = action_list + '<li>' + href + '</li>'
         return '<ul>' + action_list + '</ul>'
-
-
-class SupersetUser(ab_models.User):
-    """Deriving FAB's USER to enrich it"""
-    image_url = Column(String(1000))
-    slack_username = Column(String(500))
-
-    @property
-    def full_name(self):
-        return self.first_name + ' ' + self.last_name
-
-    @property
-    def data(self):
-        """Returns a json-serializable representation of the self"""
-        return {
-            'id': self.id,
-            'first_name': self.first_name,
-            'last_name': self.last_name,
-            'slack_username': self.slack_username,
-            'email': self.email,
-            'image_url': self.image_url,
-            'username': self.username,
-            'is_active': self.is_active(),
-            'created_on': self.created_on.isoformat(),
-        }
-
-    @property
-    def data_extended(self):
-        """Superset of data property with roles and perms"""
-        d = self.data
-        roles = {}
-        permissions = defaultdict(set)
-        for role in self.roles:
-            perms = set()
-            for perm in role.permissions:
-                perms.add(
-                    (perm.permission.name, perm.view_menu.name)
-                )
-                if perm.permission.name in (
-                        'datasource_access', 'database_access'):
-                    permissions[perm.permission.name].add(perm.view_menu.name)
-            roles[role.name] = [
-                [perm.permission.name, perm.view_menu.name]
-                for perm in role.permissions
-            ]
-        d.update({
-            'roles': roles,
-            'permissions': permissions,
-        })
-        return d
-
-# hoo hoo hoo hee hee hee
-#ab_models.User = SupersetUser
diff --git a/superset/models/helpers.py b/superset/models/helpers.py
index 581cf7c79ecf9..165fd1ebc35f2 100644
--- a/superset/models/helpers.py
+++ b/superset/models/helpers.py
@@ -166,6 +166,7 @@ def set_perm(mapper, connection, target):  # noqa
     # add to view menu if not already exists
     merge_perm(sm, 'datasource_access', target.get_perm(), connection)
 
+
 def user_data(user):
     """Returns a json-serializable representation of the user"""
     return {
diff --git a/superset/security.py b/superset/security.py
index 012891143e45c..29deeca211aec 100644
--- a/superset/security.py
+++ b/superset/security.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 
 import logging
+
 from flask_appbuilder.security.sqla import models as ab_models
 
 from superset import conf, db, sm
diff --git a/superset/security_manager.py b/superset/security_manager.py
new file mode 100644
index 0000000000000..6f229400694c0
--- /dev/null
+++ b/superset/security_manager.py
@@ -0,0 +1,73 @@
+from collections import defaultdict
+
+from flask_appbuilder.models.sqla.interface import SQLAInterface
+from flask_appbuilder.security import views as fab_views
+from flask_appbuilder.security.sqla import models as ab_models
+from flask_appbuilder.security.sqla.manager import SecurityManager
+
+from sqlalchemy import Column, String
+
+
+class SupersetUser(ab_models.User):
+    """Deriving FAB's USER to enrich it"""
+    image_url = Column(String(1000))
+    slack_username = Column(String(500))
+
+    @property
+    def full_name(self):
+        return self.first_name + ' ' + self.last_name
+
+    @property
+    def data(self):
+        """Returns a json-serializable representation of the self"""
+        return {
+            'id': self.id,
+            'first_name': self.first_name,
+            'last_name': self.last_name,
+            'slack_username': self.slack_username,
+            'email': self.email,
+            'image_url': self.image_url,
+            'username': self.username,
+            'is_active': self.is_active(),
+            'created_on': self.created_on.isoformat(),
+        }
+
+    @property
+    def data_extended(self):
+        """Superset of data property with roles and perms"""
+        d = self.data
+        roles = {}
+        permissions = defaultdict(set)
+        for role in self.roles:
+            perms = set()
+            for perm in role.permissions:
+                perms.add(
+                    (perm.permission.name, perm.view_menu.name)
+                )
+                if perm.permission.name in (
+                        'datasource_access', 'database_access'):
+                    permissions[perm.permission.name].add(perm.view_menu.name)
+            roles[role.name] = [
+                [perm.permission.name, perm.view_menu.name]
+                for perm in role.permissions
+            ]
+        d.update({
+            'roles': roles,
+            'permissions': permissions,
+        })
+        return d
+
+
+class SupersetUserModelView(fab_views.UserDBModelView):
+    route_base = '/userext'
+    datamodel = SQLAInterface(SupersetUser)
+    edit_columns = fab_views.UserDBModelView.edit_columns + [
+        'image_url', 'slack_username']
+    add_columns = fab_views.UserDBModelView.add_columns + [
+        'image_url', 'slack_username']
+fab_views.UserDBModelView = SupersetUserModelView
+
+
+class SupersetSecurityManager(SecurityManager):
+    user_model = SupersetUser
+    userdbmodelview = SupersetUserModelView
diff --git a/superset/views/core.py b/superset/views/core.py
index e7fa83f39ed6b..4d4545bafcbf6 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -22,7 +22,6 @@
 from flask_appbuilder.actions import action
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_appbuilder.security.decorators import has_access_api
-from flask_appbuilder.security import views as fab_views
 from flask_appbuilder.security.sqla import models as ab_models
 
 from flask_babel import gettext as __
@@ -1672,28 +1671,29 @@ def favstar(self, class_name, obj_id, action):
     @has_access_api
     @expose("/dashboard/<dashboard_id>/stats/")
     def dashboard_stats(self, dashboard_id):
+        User = sm.user_model
         session = db.session()
         Log = models.Log
         stats = (
             session.query(
-                ab_models.User.username,
-                ab_models.User.email,
-                ab_models.User.first_name,
-                ab_models.User.last_name,
-                ab_models.User.slack_username,
-                ab_models.User.image_url,
+                User.username,
+                User.email,
+                User.first_name,
+                User.last_name,
+                User.slack_username,
+                User.image_url,
                 sqla.func.count())
             .filter(
                 Log.dashboard_id == str(dashboard_id),
                 Log.action == 'dashboard',
-                Log.user_id == ab_models.User.id)
+                Log.user_id == User.id)
             .group_by(
-                ab_models.User.username,
-                ab_models.User.email,
-                ab_models.User.first_name,
-                ab_models.User.last_name,
-                ab_models.User.slack_username,
-                ab_models.User.image_url)
+                User.username,
+                User.email,
+                User.first_name,
+                User.last_name,
+                User.slack_username,
+                User.image_url)
             .order_by(
                 sqla.desc(sqla.func.count())
             )
@@ -1752,6 +1752,7 @@ def dashboard(**kwargs):  # noqa
             'standalone_mode': request.args.get("standalone") == "true",
             'dash_save_perm': dash_save_perm,
             'dash_edit_perm': dash_edit_perm,
+            'ENABLE_DASHBOARD_STATS': config.get('ENABLE_DASHBOARD_STATS'),
         })
 
         bootstrap_data = {
@@ -2277,10 +2278,15 @@ def welcome(self):
     @expose("/profile/<username>/")
     def profile(self, username):
         """User profile page"""
+        print(sm.user_model)
+        print(sm.user_model)
+        print(sm.user_model)
+        print(sm.user_model)
+        print(sm.user_model)
         if not username and g.user:
             username = g.user.username
         user = (
-            db.session.query(ab_models.User)
+            db.session.query(sm.user_model)
             .filter_by(username=username)
             .one()
         )
@@ -2364,25 +2370,6 @@ class CssTemplateAsyncModelView(CssTemplateModelView):
 )
 
 
-class SupersetUserModelView(fab_views.UserDBModelView):
-    route_base = '/userext'
-    datamodel = SQLAInterface(models.SupersetUser)
-    edit_columns = fab_views.UserDBModelView.edit_columns + [
-        'image_url', 'slack_username']
-    add_columns = fab_views.UserDBModelView.add_columns + [
-        'image_url', 'slack_username']
-fab_views.UserDBModelView = SupersetUserModelView
-
-appbuilder.add_view(
-    SupersetUserModelView,
-    "UsersExtended",
-    label=__("Users - Extended"),
-    icon="fa-user",
-    category="Security",
-    category_label=__("Security"),
-    category_icon='fa-cogs',)
-
-
 @app.after_request
 def apply_caching(response):
     """Applies the configuration's http headers to all responses"""

From ff7397bd502743385cfe24f69ba21c7df7fbf7ac Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 31 Jul 2017 20:42:48 -0700
Subject: [PATCH 5/5] Merging db migrations

---
 superset/migrations/versions/14bb909b78aa_.py | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 superset/migrations/versions/14bb909b78aa_.py

diff --git a/superset/migrations/versions/14bb909b78aa_.py b/superset/migrations/versions/14bb909b78aa_.py
new file mode 100644
index 0000000000000..578d9acd4f125
--- /dev/null
+++ b/superset/migrations/versions/14bb909b78aa_.py
@@ -0,0 +1,22 @@
+"""empty message
+
+Revision ID: 14bb909b78aa
+Revises: ('ca69c70ec99b', 'e58b53fc8605')
+Create Date: 2017-07-31 20:42:34.935832
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '14bb909b78aa'
+down_revision = ('ca69c70ec99b', 'e58b53fc8605')
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass