Merge pull request #25 from byte-power/fix/fix_fork_dashboard

修复因slug不唯一导致的fork功能缺陷

Author: yangyinchun

client/app/pages/dashboards/hooks/useDuplicateDashboard.js

@@ -25,14 +25,14 @@ export default function useDuplicateDashboard(dashboard) {
     const tab = window.open("", tabName);
 
     setIsDuplicating(true);
-    Dashboard.fork({ slug: dashboard.slug })
+    Dashboard.fork({ id: dashboard.id })
       .then(newDashboard => {
         tab.location = keepCurrentUrlParams(newDashboard.url);
       })
       .finally(() => {
         setIsDuplicating(false);
       });
-  }, [dashboard.slug]);
+  }, [dashboard.id]);
 
   return [isDuplicating, isDuplicating ? noop : duplicateDashboard];
 }

client/app/services/dashboard.js

@@ -166,7 +166,7 @@ const DashboardService = {
   getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
   getEmbed: ({ dashboard_id, token }) =>
     axios.get(`/api/dashboards/embed/${dashboard_id}` + token).then(transformResponse),
-  fork: ({ slug }) => axios.post("api/dashboards/fork", { slug }).then(transformResponse),
+  fork: ({ id }) => axios.post("api/dashboards/fork", { id }).then(transformResponse),
   save: data => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
   delete: ({ id }) => axios.delete(`api/dashboards/${id}`).then(transformResponse),
   query: params => axios.get("api/dashboards", { params }).then(transformResponse),

redash/handlers/dashboards.py

@@ -391,8 +391,8 @@ class DashboardForkResource(BaseResource):
     @require_permission('edit_dashboard')
     def post(self):
         dashboard_properties = request.get_json(force=True)
-        dashboard_slug = dashboard_properties['slug']
-        dashboard = models.Dashboard.get_by_slug_and_org(dashboard_slug, self.current_org)
+        dashboard_id = dashboard_properties['id']
+        dashboard = models.Dashboard.get_by_id_and_org(dashboard_id, self.current_org)
 
         require_admin_or_owner(dashboard.user_id)
 
@@ -401,7 +401,7 @@ def post(self):
                    .outerjoin(models.Visualization)
                    .outerjoin(models.Query))
 
-        dashboard_duplicate = models.Dashboard(name=u'fork-of-{}'.format(dashboard.name, dashboard_slug),
+        dashboard_duplicate = models.Dashboard(name=u'fork-of-{}'.format(dashboard.name),
                                                org=self.current_org,
                                                user=self.current_user,
                                                is_draft=True,

tests/handlers/test_dashboards.py

@@ -261,7 +261,7 @@ def test_fork_success(self):
 
         res = self.make_request(
             "POST", "/api/dashboards/fork",
-            data={"slug": dashboard.slug}
+            data={"id": dashboard.id}
         )
         self.assertEqual(res.status_code, 200)
         n = json_loads(res.data)