Add user dashboards to list Insights

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 name: Tests
 on: [push, pull_request]
 env:
-  CODE_COVERAGE_THRESHOLD_REQUIRED: 80
+  CODE_COVERAGE_THRESHOLD_REQUIRED: 65
 jobs:
   lint:
     runs-on: ubuntu-latest

ckanext/in_app_reporting/action.py

@@ -105,6 +105,68 @@ def metabase_sql_questions_list(context, data_dict):
     return questions
 
 
+@tk.side_effect_free
+def metabase_user_created_cards_list(context, data_dict):
+    """
+    List Metabase cards created by a user.
+
+    Args:
+        email (optional): Email address of the user. If not provided, uses the current user's email.
+
+    Returns:
+        List of dictionaries containing card information (id, name, type, model, updated_at, created_at, creator)
+    """
+    tk.check_access('metabase_user_created_cards_list', context, data_dict)
+
+    # Check if email parameter is provided
+    user_email = data_dict.get('email')
+
+    # If no email provided, use the current user's email
+    if not user_email:
+        userobj = context.get('auth_user_obj') or tk.g.userobj
+        if not userobj:
+            raise tk.NotAuthorized('User not authenticated')
+
+        # Try to get email from userobj - in CKAN, name is often the email for SSO users
+        user_email = getattr(userobj, 'email', None) or userobj.name
+        if not user_email:
+            raise tk.ValidationError({'error': 'User email not found'})
+
+    cards = utils.get_metabase_user_created_cards(user_email)
+    return cards
+
+
+@tk.side_effect_free
+def metabase_user_created_dashboards_list(context, data_dict):
+    """
+    List Metabase dashboards created by a user.
+
+    Args:
+        email (optional): Email address of the user. If not provided, uses the current user's email.
+
+    Returns:
+        List of dictionaries containing dashboard information (id, name, type, updated_at, created_at, creator)
+    """
+    tk.check_access('metabase_user_created_dashboards_list', context, data_dict)
+
+    # Check if email parameter is provided
+    user_email = data_dict.get('email')
+
+    # If no email provided, use the current user's email
+    if not user_email:
+        userobj = context.get('auth_user_obj') or tk.g.userobj
+        if not userobj:
+            raise tk.NotAuthorized('User not authenticated')
+
+        # Try to get email from userobj - in CKAN, name is often the email for SSO users
+        user_email = getattr(userobj, 'email', None) or userobj.name
+        if not user_email:
+            raise tk.ValidationError({'error': 'User email not found'})
+
+    dashboards = utils.get_metabase_user_created_dashboards(user_email)
+    return dashboards
+
+
 def metabase_card_publish(context, data_dict):
     tk.check_access('metabase_card_publish', context, data_dict)
 

ckanext/in_app_reporting/auth.py

@@ -105,3 +105,19 @@ def metabase_model_create(context, data_dict):
         return {'success': True}
 
     return {'success': False}
+
+
+def metabase_user_created_cards_list(context, data_dict):
+    user = context.get('user')
+    userobj = model.User.get(user)
+    if utils.is_metabase_sso_user(userobj):
+        return {'success': True}
+    return {'success': False}
+
+
+def metabase_user_created_dashboards_list(context, data_dict):
+    user = context.get('user')
+    userobj = model.User.get(user)
+    if utils.is_metabase_sso_user(userobj):
+        return {'success': True}
+    return {'success': False}

ckanext/in_app_reporting/blueprint.py

@@ -195,6 +195,90 @@ def chart_list(resource_id):
         except (tk.ObjectNotFound, tk.NotAuthorized):
             tk.abort(404, tk._('Resource not found'))
 
+    def user_created_cards_list():
+        if not utils.is_metabase_sso_user(tk.g.userobj):
+            tk.abort(404, tk._(u'Resource not found'))
+        try:
+            context = {
+                u'model': model,
+                u'user': tk.g.user,
+                u'auth_user_obj': tk.g.userobj
+            }
+            tk.check_access('metabase_user_created_cards_list', context, {})
+            cards = tk.get_action('metabase_user_created_cards_list')(context, {})
+            data = {
+                'results': cards if cards else []
+            }
+            return data
+        except (tk.NotAuthorized, tk.ValidationError):
+            tk.abort(404, tk._('Resource not found'))
+
+    def user_created_dashboards_list():
+        if not utils.is_metabase_sso_user(tk.g.userobj):
+            tk.abort(404, tk._(u'Resource not found'))
+        try:
+            context = {
+                u'model': model,
+                u'user': tk.g.user,
+                u'auth_user_obj': tk.g.userobj
+            }
+            tk.check_access('metabase_user_created_dashboards_list', context, {})
+            dashboards = tk.get_action('metabase_user_created_dashboards_list')(context, {})
+            data = {
+                'results': dashboards if dashboards else []
+            }
+            return data
+        except (tk.NotAuthorized, tk.ValidationError):
+            tk.abort(404, tk._('Resource not found'))
+
+    def user_created_cards_page():
+        """Render HTML page listing user-created cards."""
+        if not utils.is_metabase_sso_user(tk.g.userobj):
+            tk.abort(404, tk._(u'Resource not found'))
+        try:
+            context = {
+                u'model': model,
+                u'user': tk.g.user,
+                u'auth_user_obj': tk.g.userobj
+            }
+            tk.check_access('metabase_user_created_cards_list', context, {})
+            cards = tk.get_action('metabase_user_created_cards_list')(context, {})
+            user_dict = tk.get_action('user_show')(context, {'id': tk.g.userobj.id})
+            return tk.render(
+                u'user/dashboard_charts.html',
+                extra_vars={
+                    'cards': cards if cards else [],
+                    'user': tk.g.user,
+                    'user_dict': user_dict
+                }
+            )
+        except (tk.NotAuthorized, tk.ValidationError):
+            tk.abort(404, tk._('Resource not found'))
+
+    def user_created_dashboards_page():
+        """Render HTML page listing user-created dashboards."""
+        if not utils.is_metabase_sso_user(tk.g.userobj):
+            tk.abort(404, tk._(u'Resource not found'))
+        try:
+            context = {
+                u'model': model,
+                u'user': tk.g.user,
+                u'auth_user_obj': tk.g.userobj
+            }
+            tk.check_access('metabase_user_created_dashboards_list', context, {})
+            dashboards = tk.get_action('metabase_user_created_dashboards_list')(context, {})
+            user_dict = tk.get_action('user_show')(context, {'id': tk.g.userobj.id})
+            return tk.render(
+                u'user/dashboard_dashboards.html',
+                extra_vars={
+                    'dashboards': dashboards if dashboards else [],
+                    'user': tk.g.user,
+                    'user_dict': user_dict
+                }
+            )
+        except (tk.NotAuthorized, tk.ValidationError):
+            tk.abort(404, tk._('Resource not found'))
+
 
 metabase.add_url_rule(
     u'/insights',
@@ -231,3 +315,29 @@ def chart_list(resource_id):
     view_func=MetabaseView.chart_list,
     methods=[u'GET']
 )
+
+metabase.add_url_rule(
+    u'/api/metabase/user_created_cards',
+    view_func=MetabaseView.user_created_cards_list,
+    methods=[u'GET']
+)
+
+metabase.add_url_rule(
+    u'/api/metabase/user_created_dashboards',
+    view_func=MetabaseView.user_created_dashboards_list,
+    methods=[u'GET']
+)
+
+metabase.add_url_rule(
+    u'/dashboard/insights_charts',
+    view_func=MetabaseView.user_created_cards_page,
+    methods=[u'GET'],
+    endpoint='user_created_cards_page'
+)
+
+metabase.add_url_rule(
+    u'/dashboard/insights_dashboards',
+    view_func=MetabaseView.user_created_dashboards_page,
+    methods=[u'GET'],
+    endpoint='user_created_dashboards_page'
+)

ckanext/in_app_reporting/plugin.py

@@ -44,7 +44,9 @@ def get_actions(self):
             'metabase_card_publish': action.metabase_card_publish,
             'metabase_dashboard_publish': action.metabase_dashboard_publish,
             'metabase_model_create': action.metabase_model_create,
-            'metabase_sql_questions_list': action.metabase_sql_questions_list
+            'metabase_sql_questions_list': action.metabase_sql_questions_list,
+            'metabase_user_created_cards_list': action.metabase_user_created_cards_list,
+            'metabase_user_created_dashboards_list': action.metabase_user_created_dashboards_list
         }
 
     # IAuthFunctions
@@ -60,7 +62,9 @@ def get_auth_functions(self):
             'metabase_data': auth.metabase_data,
             'metabase_card_publish': auth.metabase_card_publish,
             'metabase_dashboard_publish': auth.metabase_dashboard_publish,
-            'metabase_model_create': auth.metabase_model_create
+            'metabase_model_create': auth.metabase_model_create,
+            'metabase_user_created_cards_list': auth.metabase_user_created_cards_list,
+            'metabase_user_created_dashboards_list': auth.metabase_user_created_dashboards_list
         }
 
     # IBlueprint

ckanext/in_app_reporting/templates/user/dashboard.html

@@ -0,0 +1,9 @@
+{% ckan_extends %}
+
+{% block dashboard_nav_links %}
+  {{ super() }}
+  {% if h.is_metabase_sso_user(g.userobj) %}
+    {{ h.build_nav_icon('metabase.user_created_cards_page', _('My Insights Charts'), icon='bar-chart') }}
+    {{ h.build_nav_icon('metabase.user_created_dashboards_page', _('My Insights Dashboards'), icon='dashboard') }}
+  {% endif %}
+{% endblock %}

ckanext/in_app_reporting/templates/user/dashboard_charts.html

@@ -0,0 +1,39 @@
+{% extends "user/dashboard.html" %}
+
+{% block primary_content_inner %}
+  <h2 class="page-heading">
+    {{ _('Recent Insights Charts') }}
+  </h2>
+
+  {% if cards %}
+    <ul class="dataset-list list-unstyled">
+      {% for card in cards %}
+        <li class="dataset-item">
+          <div class="dataset-content">
+            <h3 class="dataset-heading">
+              <a href="{{ h.url_for('metabase.metabase_embed', return_to='/question/' + card.id|string) }}" target="_blank">
+                {{ card.name or _('Untitled Chart') }}
+              </a>
+            </h3>
+            {% if card.description %}
+              <p class="dataset-description">{{ card.description }}</p>
+            {% endif %}
+            <div class="dataset-meta">
+              {% if card.updated_at %}
+                <div>
+                  {{ _('Updated') }}: {{ h.render_datetime(card.updated_at) }}
+                </div>
+              {% endif %}
+              {% if card.type %}
+                <div class="label label-default">{{ card.display }}</div>
+              {% endif %}
+            </div>
+          </div>
+        </li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    <p class="empty">{{ _('You have not created any charts yet.') }}</p>
+  {% endif %}
+{% endblock %}
+

ckanext/in_app_reporting/templates/user/dashboard_dashboards.html

@@ -0,0 +1,36 @@
+{% extends "user/dashboard.html" %}
+
+{% block primary_content_inner %}
+  <h2 class="page-heading">
+    {{ _('Recent Insights Dashboards') }}
+  </h2>
+
+  {% if dashboards %}
+    <ul class="dataset-list list-unstyled">
+      {% for dashboard in dashboards %}
+        <li class="dataset-item">
+          <div class="dataset-content">
+            <h3 class="dataset-heading">
+              <a href="{{ h.url_for('metabase.metabase_embed', return_to='/dashboard/' + dashboard.id|string) }}" target="_blank">
+                {{ dashboard.name or _('Untitled Dashboard') }}
+              </a>
+            </h3>
+            {% if dashboard.description %}
+              <p class="dataset-description">{{ dashboard.description }}</p>
+            {% endif %}
+            <div class="dataset-meta">
+              {% if dashboard.updated_at %}
+                <div>
+                  {{ _('Updated') }}: {{ h.render_datetime(dashboard.updated_at) }}
+                </div>
+              {% endif %}
+            </div>
+          </div>
+        </li>
+      {% endfor %}
+    </ul>
+  {% else %}
+    <p class="empty">{{ _('You have not created any dashboards yet.') }}</p>
+  {% endif %}
+{% endblock %}
+