change dashbord_bp a embeded_dashboard

ckanext/dashboard/actions/dashboard_dataset.py

@@ -117,9 +117,7 @@ def dataset_dashboard_update(context, data_dict):
     """
     log.info("Executing dataset_dashboard_update")
 
-    dashboard_id = toolkit.get_or_bust('id')
-    if not dashboard_id:
-        raise ValueError("The 'id' parameter is required to update the dashboard.")
+    dashboard_id = toolkit.get_or_bust(data_dict, 'dashboard_id')
 
     session = model.Session
     dashboard = session.query(DatasetDashboard).filter_by(id=dashboard_id).first()
@@ -131,6 +129,10 @@ def dataset_dashboard_update(context, data_dict):
         dashboard.title = data_dict['title']
     if 'description' in data_dict:
         dashboard.description = data_dict['description']
+    if 'embeded_url' in data_dict:
+        dashboard.embeded_url = data_dict['embeded_url']
+    if 'report_url' in data_dict:
+        dashboard.report_url = data_dict['report_url']
 
     session.add(dashboard)
     session.commit()
@@ -141,7 +143,7 @@ def dataset_dashboard_update(context, data_dict):
         'title': dashboard.title,
         'description': dashboard.description,
         'embeded_url': dashboard.embeded_url,
-        'report_url': dashboard.report
+        'report_url': dashboard.report_url
     }
 
 
@@ -155,9 +157,7 @@ def dataset_dashboard_delete(context, data_dict):
     """
     log.info("Executing dataset_dashboard_delete")
 
-    dashboard_id = data_dict.get('id')
-    if not dashboard_id:
-        raise ValueError("The 'id' parameter is required to delete the dashboard.")
+    dashboard_id = toolkit.get_or_bust(data_dict, 'id')
 
     session = model.Session
     dashboard = session.query(DatasetDashboard).filter_by(id=dashboard_id).first()

ckanext/dashboard/blueprints/dashboard.py

@@ -12,7 +12,7 @@
 
 log = logging.getLogger(__name__)
 
-dashboard_bp = Blueprint('dashboard_bp', __name__, url_prefix='/dashboard-external')
+dashboard_bp = Blueprint('embeded_dashboard', __name__, url_prefix='/embeded-dashboard')
 
 
 @dashboard_bp.route('/', methods=['GET'], endpoint='dashboard_list')
@@ -52,7 +52,7 @@ def dashboard_new():
         except Exception as e:
             h.flash_error(f'Error: {e}', 'error')
             log.error("Error creating dashboard: %s", e)
-        return redirect(url_for('dashboard_bp.dashboard_list'))
+        return redirect(url_for('embeded_dashboard.dashboard_list'))
     return render('dashboard/new.html')
 
 
@@ -76,7 +76,7 @@ def dashboard_edit(dashboard_id):
         except Exception as e:
             h.flash_error(f'Error: {e}', 'error')
             log.error("Error updating dashboard for dashboard_id %s: %s", dashboard_id, e)
-        return redirect(url_for('dashboard_bp.dashboard_list'))
+        return redirect(url_for('embeded_dashboard.dashboard_list'))
     else:
         try:
             dashboard = p.toolkit.get_action('dataset_dashboard_show')(context, {'id': dashboard_id})
@@ -98,7 +98,7 @@ def dashboard_delete(dashboard_id):
     except Exception as e:
         h.flash_error(f'Error: {e}', 'error')
         log.error("Error deleting dashboard for dashboard_id %s: %s", dashboard_id, e)
-    return redirect(url_for('dashboard_bp.dashboard_list'))
+    return redirect(url_for('embeded_dashboard.dashboard_list'))
 
 
 @dashboard_bp.route('/show/<dashboard_id>', methods=['GET'], endpoint='dashboard_show')

ckanext/dashboard/templates/admin/base.html

@@ -7,7 +7,7 @@
 
 {% block content_primary_nav %}
   {{ super() }}
-  {{ h.build_nav_icon('dashboard_bp.dashboard_list', _('External dashboards'), icon='icon-list') }}
+  {{ h.build_nav_icon('embeded_dashboard.dashboard_list', _('Embebed dashboards'), icon='icon-list') }}
   {# Los endpoints que requieren package_id se muestran en contextos específicos y no en la navegación global #}
 {% endblock %}
 

ckanext/dashboard/templates/dashboard/index.html

@@ -5,14 +5,14 @@
 {% block content %}
   <div class="dashboard-list-container">
     <h1>📊 Dashboard - List</h1>
-    <a href="{{ url_for('dashboard_bp.dashboard_new') }}">New</a> 
+    <a href="{{ url_for('embeded_dashboard.dashboard_new') }}">New</a> 
 
     {% if dashboards %}
       <ul class="dashboard-list">
         {% for dashboard in dashboards %}
           <li class="dashboard-item">
             <strong>{{ dashboard.title }}</strong><br>
-            <a href="{{ h.url_for('dashboard_bp.dashboard_show', dashboard_id=dashboard.dashboard_id) }}">View</a>
+            <a href="{{ h.url_for('embeded_dashboard.dashboard_show', dashboard_id=dashboard.dashboard_id) }}">View</a>
           </li>
         {% endfor %}
       </ul>

ckanext/dashboard/templates/dashboard/show.html

@@ -26,8 +26,8 @@ <h1>{{ dashboard.title }}</h1>
         </p>
 
         <div class="dashboard-actions">
-            <a class="btn btn-primary" href="{{ h.url_for('dashboard_bp.dashboard_edit', dashboard_id=dashboard_id) }}">Edit</a>
-            <form action="{{ h.url_for('dashboard_bp.dashboard_delete', dashboard_id=dashboard_id) }}" method="POST" style="display:inline;">
+            <a class="btn btn-primary" href="{{ h.url_for('embeded_dashboard.dashboard_edit', dashboard_id=dashboard_id) }}">Edit</a>
+            <form action="{{ h.url_for('embeded_dashboard.dashboard_delete', dashboard_id=dashboard_id) }}" method="POST" style="display:inline;">
                 <button class="btn btn-danger" type="submit" onclick="return confirm('Are you sure you want to delete this dashboard?');">Delete</button>
             </form>
         </div>

ckanext/dashboard/templates/index.html

@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 {% block content %}
 <h1>Dashboard Configurations</h1>
-<a href="{{ h.url_for('dashboard_bp.dashboard_new') }}">Add new dashboard</a>
+<a href="{{ h.url_for('embeded_dashboard.dashboard_new') }}">Add new dashboard</a>
 <ul>
   {% for d in dashboards %}
     <li>
       Dataset: {{ d.package_id }} -
-      <a href="{{ h.url_for('dashboard_bp.dashboard_edit', dashboard_id=dashboard.id) }}">Edit</a>
-      <form action="{{ h.url_for('dashboard_bp.dashboard_delete', dashboard_id=dashboard.id) }}" method="POST">
+      <a href="{{ h.url_for('embeded_dashboard.dashboard_edit', dashboard_id=dashboard.id) }}">Edit</a>
+      <form action="{{ h.url_for('embeded_dashboard.dashboard_delete', dashboard_id=dashboard.id) }}" method="POST">
         <button type="submit">Delete</button>
       </form>
     </li>