From 467a1280f01c06324f0b74b539eec3ccc25b5643 Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Thu, 15 Aug 2019 11:14:47 +0300
Subject: [PATCH 01/29] on dashboard api calls - take the id from the beginning
 of the slug, unless there is no number in it - in that case, take the entire
 slug as id

---
 redash/handlers/dashboards.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index 954e9da4f7..6f11d01c8e 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -146,7 +146,14 @@ def get(self, dashboard_slug=None):
         :>json string widget.created_at: ISO format timestamp for widget creation
         :>json string widget.updated_at: ISO format timestamp for last widget modification
         """
-        dashboard = get_object_or_404(models.Dashboard.get_by_slug_and_org, dashboard_slug, self.current_org)
+        if dashboard_slug.split('-')[0].isdigit():
+            identifier = int(dashboard_slug.split('-')[0])
+            fn = models.Dashboard.get_by_id_and_org
+        else:
+            identifier = dashboard_slug
+            fn = models.Dashboard.get_by_slug_and_org
+
+        dashboard = get_object_or_404(fn, identifier, self.current_org)
         response = serialize_dashboard(dashboard, with_widgets=True, user=self.current_user)
 
         api_key = models.ApiKey.get_by_object(dashboard)

From 1e818f6202a00614fdf927e9c213b646b560afbd Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Thu, 15 Aug 2019 11:15:39 +0300
Subject: [PATCH 02/29] add dashboard id when showing links to dashboards

---
 client/app/pages/dashboards/DashboardList.jsx | 4 ++--
 client/app/services/dashboard.js              | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/app/pages/dashboards/DashboardList.jsx b/client/app/pages/dashboards/DashboardList.jsx
index bef99c2797..be4ef170e6 100644
--- a/client/app/pages/dashboards/DashboardList.jsx
+++ b/client/app/pages/dashboards/DashboardList.jsx
@@ -15,7 +15,7 @@ import ItemsTable, { Columns } from '@/components/items-list/components/ItemsTab
 
 import Layout from '@/components/layouts/ContentWithSidebar';
 
-import { Dashboard } from '@/services/dashboard';
+import { Dashboard, urlForDashboard } from '@/services/dashboard';
 import { routesToAngularRoutes } from '@/lib/utils';
 
 import DashboardListEmptyState from './DashboardListEmptyState';
@@ -45,7 +45,7 @@ class DashboardList extends React.Component {
     Columns.favorites({ className: 'p-r-0' }),
     Columns.custom.sortable((text, item) => (
       <React.Fragment>
-        <a className="table-main-title" href={'dashboard/' + item.slug} data-test={item.slug}>{ item.name }</a>
+        <a className="table-main-title" href={urlForDashboard(item)} data-test={item.slug}>{ item.name }</a>
         <DashboardTagsControl
           className="d-block"
           tags={item.tags}
diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 509ab387cf..62c1df8dbd 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -4,6 +4,15 @@ import { Widget } from './widget';
 
 export let Dashboard = null; // eslint-disable-line import/no-mutable-exports
 
+export const urlForDashboard = ({ id, name }) => `dashboard/${id}-${name.toString()
+  .trim()
+  .toLowerCase()
+  .replace(/\s+/g, '-')
+  .replace(/[^\w-]+/g, '')
+  .replace(/--+/g, '-')
+  .replace(/^-+/, '')
+  .replace(/-+$/, '')}`;
+
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};
   _.each(queryResults, (queryResult) => {

From 90ef7ccda0a904d75195554825f615ae6dc4a55b Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Thu, 15 Aug 2019 11:16:05 +0300
Subject: [PATCH 03/29] change path to include new name when renaming
 dashboards

---
 client/app/pages/dashboards/dashboard.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/app/pages/dashboards/dashboard.js b/client/app/pages/dashboards/dashboard.js
index f283c3594b..227e46a171 100644
--- a/client/app/pages/dashboards/dashboard.js
+++ b/client/app/pages/dashboards/dashboard.js
@@ -6,7 +6,7 @@ import {
   editableMappingsToParameterMappings,
   synchronizeWidgetTitles,
 } from '@/components/ParameterMappingInput';
-import { collectDashboardFilters } from '@/services/dashboard';
+import { collectDashboardFilters, urlForDashboard } from '@/services/dashboard';
 import { durationHumanize } from '@/filters';
 import template from './dashboard.html';
 import ShareDashboardDialog from './ShareDashboardDialog';
@@ -277,13 +277,13 @@ function DashboardCtrl(
 
   this.loadTags = () => getTags('api/dashboards/tags').then(tags => _.map(tags, t => t.name));
 
-  const updateDashboard = (data) => {
+  const updateDashboard = async (data) => {
     _.extend(this.dashboard, data);
     data = _.extend({}, data, {
       slug: this.dashboard.id,
       version: this.dashboard.version,
     });
-    Dashboard.save(
+    return Dashboard.save(
       data,
       (dashboard) => {
         _.extend(this.dashboard, _.pick(dashboard, _.keys(data)));
@@ -302,8 +302,9 @@ function DashboardCtrl(
     );
   };
 
-  this.saveName = (name) => {
-    updateDashboard({ name });
+  this.saveName = async (name) => {
+    await updateDashboard({ name });
+    $location.path(urlForDashboard(this.dashboard));
   };
 
   this.saveTags = (tags) => {

From aba6e3beb5b38c6753a099f8d68fa0ffb842abd2 Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Sun, 18 Aug 2019 23:19:22 +0300
Subject: [PATCH 04/29] move slug generation to backend

---
 client/app/services/dashboard.js |  9 +------
 redash/handlers/dashboards.py    |  9 +------
 redash/models/__init__.py        | 18 +++++++++++++-
 redash/serializers/__init__.py   |  2 +-
 tests/models/test_dashboards.py  | 40 ++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 62c1df8dbd..82e9445a7f 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -4,14 +4,7 @@ import { Widget } from './widget';
 
 export let Dashboard = null; // eslint-disable-line import/no-mutable-exports
 
-export const urlForDashboard = ({ id, name }) => `dashboard/${id}-${name.toString()
-  .trim()
-  .toLowerCase()
-  .replace(/\s+/g, '-')
-  .replace(/[^\w-]+/g, '')
-  .replace(/--+/g, '-')
-  .replace(/^-+/, '')
-  .replace(/-+$/, '')}`;
+export const urlForDashboard = ({ id, slug }) => `dashboard/${id}-${slug}`;
 
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};
diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index 6f11d01c8e..954e9da4f7 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -146,14 +146,7 @@ def get(self, dashboard_slug=None):
         :>json string widget.created_at: ISO format timestamp for widget creation
         :>json string widget.updated_at: ISO format timestamp for last widget modification
         """
-        if dashboard_slug.split('-')[0].isdigit():
-            identifier = int(dashboard_slug.split('-')[0])
-            fn = models.Dashboard.get_by_id_and_org
-        else:
-            identifier = dashboard_slug
-            fn = models.Dashboard.get_by_slug_and_org
-
-        dashboard = get_object_or_404(fn, identifier, self.current_org)
+        dashboard = get_object_or_404(models.Dashboard.get_by_slug_and_org, dashboard_slug, self.current_org)
         response = serialize_dashboard(dashboard, with_widgets=True, user=self.current_user)
 
         api_key = models.ApiKey.get_by_object(dashboard)
diff --git a/redash/models/__init__.py b/redash/models/__init__.py
index a4671e5824..3bc67aed82 100644
--- a/redash/models/__init__.py
+++ b/redash/models/__init__.py
@@ -3,6 +3,7 @@
 import logging
 import time
 import pytz
+from re import sub
 
 from six import python_2_unicode_compatible, text_type
 from sqlalchemy import distinct, or_, and_, UniqueConstraint
@@ -867,6 +868,14 @@ class Dashboard(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model
     def __str__(self):
         return u"%s=%s" % (self.id, self.name)
 
+    @property
+    def name_as_slug(self):
+        return sub(r'-+$', '',
+                   sub(r'^-+', '',
+                       sub(r'--+', '-',
+                           sub(r'[^\w-]+', '',
+                                           sub(r'\s+', '-', self.name.strip().lower())))))
+
     @classmethod
     def all(cls, org, group_ids, user_id):
         query = (
@@ -927,7 +936,14 @@ def favorites(cls, user, base_query=None):
 
     @classmethod
     def get_by_slug_and_org(cls, slug, org):
-        return cls.query.filter(cls.slug == slug, cls.org == org).one()
+        try:
+            return cls.query.filter(cls.slug == slug, cls.org == org).one()
+        except NoResultFound as e:
+            id = slug.split('-', 1)[0] if '-' in slug else slug
+            if id.isdigit():
+                return super(Dashboard, cls).get_by_id_and_org(int(id), org)
+            else:
+                raise e
 
     @hybrid_property
     def lowercase_name(self):
diff --git a/redash/serializers/__init__.py b/redash/serializers/__init__.py
index 0dc8b6a9f9..84a549a147 100644
--- a/redash/serializers/__init__.py
+++ b/redash/serializers/__init__.py
@@ -207,7 +207,7 @@ def serialize_dashboard(obj, with_widgets=False, user=None, with_favorite_state=
 
     d = {
         'id': obj.id,
-        'slug': obj.slug,
+        'slug': obj.name_as_slug,
         'name': obj.name,
         'user_id': obj.user_id,
         # TODO: we should properly load the users
diff --git a/tests/models/test_dashboards.py b/tests/models/test_dashboards.py
index cf9595a17d..82ecbdabbf 100644
--- a/tests/models/test_dashboards.py
+++ b/tests/models/test_dashboards.py
@@ -28,3 +28,43 @@ def test_all_tags(self):
             list(Dashboard.all_tags(self.factory.org, self.factory.user)),
             [(u'tag1', 3), (u'tag2', 2), (u'tag3', 1)]
         )
+
+    def test_gets_by_original_unhyphenated_slug(self):
+        expected = self.factory.create_dashboard(slug='hello')
+        actual = Dashboard.get_by_slug_and_org('hello', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_original_hyphenated_slug(self):
+        expected = self.factory.create_dashboard(slug='hello-world')
+        actual = Dashboard.get_by_slug_and_org('hello-world', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_number_name_as_slug(self):
+        expected = self.factory.create_dashboard(name='123')
+        actual = Dashboard.get_by_slug_and_org('123', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_id_and_single_word_name_as_slug(self):
+        expected = self.factory.create_dashboard(id=123, name='Hello')
+        actual = Dashboard.get_by_slug_and_org('123-hello', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_id_and_multi_word_name_as_slug(self):
+        expected = self.factory.create_dashboard(id=123, name='Hello World')
+        actual = Dashboard.get_by_slug_and_org('123-hello-world', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_original_slug_when_name_includes_a_number(self):
+        expected = self.factory.create_dashboard(id=123, name='28 Days Growth Metrics')
+        actual = Dashboard.get_by_slug_and_org('28-days-growth-metrics', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_id_when_name_includes_a_number(self):
+        expected = self.factory.create_dashboard(id=123, name='28 Days Growth Metrics')
+        actual = Dashboard.get_by_slug_and_org('123-28-days-growth-metrics', self.factory.org)
+        self.assertEqual(expected, actual)
+
+    def test_gets_by_id_even_when_slug_doesnt_match_name(self):
+        expected = self.factory.create_dashboard(id=123, name='28 Days Growth Metrics')
+        actual = Dashboard.get_by_slug_and_org('123-i-like-trains', self.factory.org)
+        self.assertEqual(expected, actual)
\ No newline at end of file

From 0ae13b0fe976af655eca9f80a06d17d25a443624 Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Sun, 18 Aug 2019 23:42:22 +0300
Subject: [PATCH 05/29] redirect to new name after changing (this time with a
 proper promise)

---
 client/app/pages/dashboards/dashboard.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/app/pages/dashboards/dashboard.js b/client/app/pages/dashboards/dashboard.js
index 227e46a171..16aa3a9cce 100644
--- a/client/app/pages/dashboards/dashboard.js
+++ b/client/app/pages/dashboards/dashboard.js
@@ -277,7 +277,7 @@ function DashboardCtrl(
 
   this.loadTags = () => getTags('api/dashboards/tags').then(tags => _.map(tags, t => t.name));
 
-  const updateDashboard = async (data) => {
+  const updateDashboard = (data) => {
     _.extend(this.dashboard, data);
     data = _.extend({}, data, {
       slug: this.dashboard.id,
@@ -302,9 +302,10 @@ function DashboardCtrl(
     );
   };
 
-  this.saveName = async (name) => {
-    await updateDashboard({ name });
-    $location.path(urlForDashboard(this.dashboard));
+  this.saveName = (name) => {
+    updateDashboard({ name }).$promise.then(() => {
+      $location.path(urlForDashboard(this.dashboard));
+    });
   };
 
   this.saveTags = (tags) => {

From 07833515e339220ea59c9dd0e95b400e6becf481 Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Mon, 19 Aug 2019 00:20:13 +0300
Subject: [PATCH 06/29] oh right, we already have a slug function

---
 redash/models/__init__.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/redash/models/__init__.py b/redash/models/__init__.py
index 3bc67aed82..93209d59e5 100644
--- a/redash/models/__init__.py
+++ b/redash/models/__init__.py
@@ -3,7 +3,6 @@
 import logging
 import time
 import pytz
-from re import sub
 
 from six import python_2_unicode_compatible, text_type
 from sqlalchemy import distinct, or_, and_, UniqueConstraint
@@ -870,11 +869,7 @@ def __str__(self):
 
     @property
     def name_as_slug(self):
-        return sub(r'-+$', '',
-                   sub(r'^-+', '',
-                       sub(r'--+', '-',
-                           sub(r'[^\w-]+', '',
-                                           sub(r'\s+', '-', self.name.strip().lower())))))
+        return utils.slugify(self.name)
 
     @classmethod
     def all(cls, org, group_ids, user_id):

From 1aedc44098674efd2f853599b4c1312f19407598 Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Mon, 19 Aug 2019 00:25:37 +0300
Subject: [PATCH 07/29] add spec that makes sure that renamed dashboards are
 redirected to the url which contains their new name

---
 client/app/pages/dashboards/dashboard.html    |  3 +-
 .../integration/dashboard/dashboard_spec.js   | 35 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/client/app/pages/dashboards/dashboard.html b/client/app/pages/dashboards/dashboard.html
index cc89ae3e61..7d88e9d08c 100644
--- a/client/app/pages/dashboards/dashboard.html
+++ b/client/app/pages/dashboards/dashboard.html
@@ -3,7 +3,7 @@
     <div class="page-title col-xs-8 col-sm-7 col-lg-7 p-l-0">
       <favorites-control item="$ctrl.dashboard"></favorites-control>
       <h3>
-        <edit-in-place class="edit-in-place" is-editable="$ctrl.layoutEditing" on-done="$ctrl.saveName" ignore-blanks="true" value="$ctrl.dashboard.name" editor="'input'"></edit-in-place>
+        <edit-in-place class="edit-in-place" is-editable="$ctrl.layoutEditing" on-done="$ctrl.saveName" ignore-blanks="true" value="$ctrl.dashboard.name" editor="'input'" data-test="DashboardName"></edit-in-place>
       </h3>
 
       <img ng-src="{{$ctrl.dashboard.user.profile_image_url}}" class="profile__image_thumb--dashboard" alt="{{$ctrl.dashboard.user.name}}">
@@ -33,6 +33,7 @@ <h3>
             <span ng-switch-default>
               <span class="save-status">Saved</span>
               <button class="btn btn-primary btn-sm"
+                data-test="DoneEditingDashboard"
                 ng-disabled="$ctrl.isGridDisabled"
                 ng-click="$ctrl.editLayout(false)">
                 <i class="fa fa-check"></i> Done Editing
diff --git a/client/cypress/integration/dashboard/dashboard_spec.js b/client/cypress/integration/dashboard/dashboard_spec.js
index 42876c1b13..824cb62815 100644
--- a/client/cypress/integration/dashboard/dashboard_spec.js
+++ b/client/cypress/integration/dashboard/dashboard_spec.js
@@ -36,8 +36,8 @@ describe('Dashboard', () => {
   });
 
   it('archives dashboard', () => {
-    createDashboard('Foo Bar').then(({ slug }) => {
-      cy.visit(`/dashboard/${slug}`);
+    createDashboard('Foo Bar').then(({ id, slug }) => {
+      cy.visit(`/dashboard/${id}-${slug}`);
 
       cy.getByTestId('DashboardMoreMenu')
         .click()
@@ -54,18 +54,39 @@ describe('Dashboard', () => {
 
       cy.visit('/dashboards');
       cy.getByTestId('DashboardLayoutContent').within(() => {
-        cy.getByTestId(slug).should('not.exist');
+        cy.getByTestId(`${id}-${slug}`).should('not.exist');
       });
     });
   });
 
+  it('renames dashboard', () => {
+    createDashboard('Foo Bar').then(({ id, slug }) => {
+      cy.visit(`/dashboard/${id}-${slug}`);
+
+      cy.getByTestId('DashboardMoreMenu')
+        .click()
+        .within(() => {
+          cy.get('li')
+            .contains('Edit')
+            .click();
+        });
+
+      cy.getByTestId('DashboardName').click().within(() => {
+        cy.get('input').clear().type('Baz Qux');
+      });
+
+      cy.getByTestId('DoneEditingDashboard').click();
+      cy.url().should('include', 'baz-qux');
+    });
+  });
+
   context('viewport width is at 800px', () => {
     before(function () {
       cy.login();
       createDashboard('Foo Bar')
         .then(({ slug, id }) => {
-          this.dashboardUrl = `/dashboard/${slug}`;
-          this.dashboardEditUrl = `/dashboard/${slug}?edit`;
+          this.dashboardUrl = `/dashboard/${id}-${slug}`;
+          this.dashboardEditUrl = `${this.dashboardUrl}?edit`;
           return addTextbox(id, 'Hello World!').then(getWidgetTestId);
         })
         .then((elTestId) => {
@@ -119,8 +140,8 @@ describe('Dashboard', () => {
   context('viewport width is at 767px', () => {
     before(function () {
       cy.login();
-      createDashboard('Foo Bar').then(({ slug }) => {
-        this.dashboardUrl = `/dashboard/${slug}`;
+      createDashboard('Foo Bar').then(({ id, slug }) => {
+        this.dashboardUrl = `/dashboard/${id}-${slug}`;
       });
     });
 

From b7a7a55665959351ef8f4ba2584b058a01bbfbb2 Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Mon, 19 Aug 2019 22:13:21 +0300
Subject: [PATCH 08/29] use id-slug in all Cypress specs

---
 .../integration/dashboard/grid_compliant_widgets_spec.js        | 2 +-
 client/cypress/integration/dashboard/sharing_spec.js            | 2 +-
 client/cypress/integration/dashboard/textbox_spec.js            | 2 +-
 client/cypress/integration/dashboard/widget_spec.js             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js b/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js
index b30041e155..cb858272ca 100644
--- a/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js
+++ b/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js
@@ -10,7 +10,7 @@ describe('Grid compliant widgets', () => {
     cy.viewport(1215, 800);
     createDashboard('Foo Bar')
       .then(({ slug, id }) => {
-        this.dashboardUrl = `/dashboard/${slug}`;
+        this.dashboardUrl = `/dashboard/${id}-${slug}`;
         return addTextbox(id, 'Hello World!').then(getWidgetTestId);
       })
       .then((elTestId) => {
diff --git a/client/cypress/integration/dashboard/sharing_spec.js b/client/cypress/integration/dashboard/sharing_spec.js
index e5f394e358..ac4cef3b22 100644
--- a/client/cypress/integration/dashboard/sharing_spec.js
+++ b/client/cypress/integration/dashboard/sharing_spec.js
@@ -8,7 +8,7 @@ describe('Dashboard Sharing', () => {
     cy.login();
     createDashboard('Foo Bar').then(({ slug, id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${slug}`;
+      this.dashboardUrl = `/dashboard/${id}-${slug}`;
     });
   });
 
diff --git a/client/cypress/integration/dashboard/textbox_spec.js b/client/cypress/integration/dashboard/textbox_spec.js
index 18460e2b6d..af786bd74c 100644
--- a/client/cypress/integration/dashboard/textbox_spec.js
+++ b/client/cypress/integration/dashboard/textbox_spec.js
@@ -8,7 +8,7 @@ describe('Textbox', () => {
     cy.login();
     createDashboard('Foo Bar').then(({ slug, id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${slug}`;
+      this.dashboardUrl = `/dashboard/${id}-${slug}`;
     });
   });
 
diff --git a/client/cypress/integration/dashboard/widget_spec.js b/client/cypress/integration/dashboard/widget_spec.js
index 743035e559..52eb037ba6 100644
--- a/client/cypress/integration/dashboard/widget_spec.js
+++ b/client/cypress/integration/dashboard/widget_spec.js
@@ -8,7 +8,7 @@ describe('Widget', () => {
     cy.login();
     createDashboard('Foo Bar').then(({ slug, id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${slug}`;
+      this.dashboardUrl = `/dashboard/${id}-${slug}`;
     });
   });
 

From a85140245ef18d92c6590c821a2cd9c4a08c295d Mon Sep 17 00:00:00 2001
From: Omer Lachish <omer@rauchy.net>
Date: Mon, 19 Aug 2019 23:23:57 +0300
Subject: [PATCH 09/29] move dashboards from /dashboard/:slug to
 /dashboards/:id-:name_as_slug

---
 client/app/pages/dashboards/dashboard.js |  6 +++-
 client/app/services/dashboard.js         |  2 +-
 redash/handlers/dashboards.py            |  3 +-
 redash/models/__init__.py                |  9 +-----
 tests/models/test_dashboards.py          | 40 ------------------------
 5 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/client/app/pages/dashboards/dashboard.js b/client/app/pages/dashboards/dashboard.js
index 16aa3a9cce..7b55af8660 100644
--- a/client/app/pages/dashboards/dashboard.js
+++ b/client/app/pages/dashboards/dashboard.js
@@ -160,7 +160,7 @@ function DashboardCtrl(
 
   this.loadDashboard = _.throttle((force) => {
     Dashboard.get(
-      { slug: $routeParams.dashboardSlug },
+      { slug: $routeParams.dashboardSlug || parseInt($routeParams.dashboardId, 10) },
       (dashboard) => {
         this.dashboard = dashboard;
         this.isDashboardOwner = currentUser.id === dashboard.user.id || currentUser.hasPermission('admin');
@@ -415,6 +415,10 @@ export default function init(ngModule) {
       template: '<dashboard-page></dashboard-page>',
       reloadOnSearch: false,
     },
+    '/dashboards/:dashboardId': {
+      template: '<dashboard-page></dashboard-page>',
+      reloadOnSearch: false,
+    },
   };
 }
 
diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 82e9445a7f..3005eb9683 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -4,7 +4,7 @@ import { Widget } from './widget';
 
 export let Dashboard = null; // eslint-disable-line import/no-mutable-exports
 
-export const urlForDashboard = ({ id, slug }) => `dashboard/${id}-${slug}`;
+export const urlForDashboard = ({ id, slug }) => `dashboards/${id}-${slug}`;
 
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};
diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index 954e9da4f7..01a94068ae 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -146,7 +146,8 @@ def get(self, dashboard_slug=None):
         :>json string widget.created_at: ISO format timestamp for widget creation
         :>json string widget.updated_at: ISO format timestamp for last widget modification
         """
-        dashboard = get_object_or_404(models.Dashboard.get_by_slug_and_org, dashboard_slug, self.current_org)
+        fn = models.Dashboard.get_by_id_and_org if dashboard_slug.isdigit() else models.Dashboard.get_by_slug_and_org
+        dashboard = get_object_or_404(fn, dashboard_slug, self.current_org)
         response = serialize_dashboard(dashboard, with_widgets=True, user=self.current_user)
 
         api_key = models.ApiKey.get_by_object(dashboard)
diff --git a/redash/models/__init__.py b/redash/models/__init__.py
index 93209d59e5..3d9a50d066 100644
--- a/redash/models/__init__.py
+++ b/redash/models/__init__.py
@@ -931,14 +931,7 @@ def favorites(cls, user, base_query=None):
 
     @classmethod
     def get_by_slug_and_org(cls, slug, org):
-        try:
-            return cls.query.filter(cls.slug == slug, cls.org == org).one()
-        except NoResultFound as e:
-            id = slug.split('-', 1)[0] if '-' in slug else slug
-            if id.isdigit():
-                return super(Dashboard, cls).get_by_id_and_org(int(id), org)
-            else:
-                raise e
+        return cls.query.filter(cls.slug == slug, cls.org == org).one()
 
     @hybrid_property
     def lowercase_name(self):
diff --git a/tests/models/test_dashboards.py b/tests/models/test_dashboards.py
index 82ecbdabbf..cf9595a17d 100644
--- a/tests/models/test_dashboards.py
+++ b/tests/models/test_dashboards.py
@@ -28,43 +28,3 @@ def test_all_tags(self):
             list(Dashboard.all_tags(self.factory.org, self.factory.user)),
             [(u'tag1', 3), (u'tag2', 2), (u'tag3', 1)]
         )
-
-    def test_gets_by_original_unhyphenated_slug(self):
-        expected = self.factory.create_dashboard(slug='hello')
-        actual = Dashboard.get_by_slug_and_org('hello', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_original_hyphenated_slug(self):
-        expected = self.factory.create_dashboard(slug='hello-world')
-        actual = Dashboard.get_by_slug_and_org('hello-world', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_number_name_as_slug(self):
-        expected = self.factory.create_dashboard(name='123')
-        actual = Dashboard.get_by_slug_and_org('123', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_id_and_single_word_name_as_slug(self):
-        expected = self.factory.create_dashboard(id=123, name='Hello')
-        actual = Dashboard.get_by_slug_and_org('123-hello', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_id_and_multi_word_name_as_slug(self):
-        expected = self.factory.create_dashboard(id=123, name='Hello World')
-        actual = Dashboard.get_by_slug_and_org('123-hello-world', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_original_slug_when_name_includes_a_number(self):
-        expected = self.factory.create_dashboard(id=123, name='28 Days Growth Metrics')
-        actual = Dashboard.get_by_slug_and_org('28-days-growth-metrics', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_id_when_name_includes_a_number(self):
-        expected = self.factory.create_dashboard(id=123, name='28 Days Growth Metrics')
-        actual = Dashboard.get_by_slug_and_org('123-28-days-growth-metrics', self.factory.org)
-        self.assertEqual(expected, actual)
-
-    def test_gets_by_id_even_when_slug_doesnt_match_name(self):
-        expected = self.factory.create_dashboard(id=123, name='28 Days Growth Metrics')
-        actual = Dashboard.get_by_slug_and_org('123-i-like-trains', self.factory.org)
-        self.assertEqual(expected, actual)
\ No newline at end of file

From 6ea5b97d6072fe99149d0732ec02281731cac383 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Fri, 26 Jun 2020 16:40:16 -0300
Subject: [PATCH 10/29] Update dashboard url as its name changes

---
 client/app/pages/dashboards/hooks/useDashboard.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/app/pages/dashboards/hooks/useDashboard.js b/client/app/pages/dashboards/hooks/useDashboard.js
index 3fd9d8da85..5334067d82 100644
--- a/client/app/pages/dashboards/hooks/useDashboard.js
+++ b/client/app/pages/dashboards/hooks/useDashboard.js
@@ -2,7 +2,7 @@ import { useState, useEffect, useMemo, useCallback, useRef } from "react";
 import { isEmpty, includes, compact, map, has, pick, keys, extend, every, get } from "lodash";
 import notification from "@/services/notification";
 import location from "@/services/location";
-import { Dashboard, collectDashboardFilters } from "@/services/dashboard";
+import { Dashboard, collectDashboardFilters, urlForDashboard } from "@/services/dashboard";
 import { currentUser } from "@/services/auth";
 import recordEvent from "@/services/recordEvent";
 import { QueryResultError } from "@/services/query";
@@ -14,6 +14,7 @@ import ShareDashboardDialog from "../components/ShareDashboardDialog";
 import useFullscreenHandler from "../../../lib/hooks/useFullscreenHandler";
 import useRefreshRateHandler from "./useRefreshRateHandler";
 import useEditModeHandler from "./useEditModeHandler";
+import navigateTo from "@/components/ApplicationArea/navigateTo";
 
 export { DashboardStatusEnum } from "./useEditModeHandler";
 
@@ -69,9 +70,12 @@ function useDashboard(dashboardData) {
         data = { ...data, version: dashboard.version };
       }
       return Dashboard.save(data)
-        .then(updatedDashboard =>
-          setDashboard(currentDashboard => extend({}, currentDashboard, pick(updatedDashboard, keys(data))))
-        )
+        .then(updatedDashboard => {
+          setDashboard(currentDashboard => extend({}, currentDashboard, pick(updatedDashboard, keys(data))));
+          if (has(data, "name")) {
+            navigateTo(urlForDashboard(updatedDashboard), true);
+          }
+        })
         .catch(error => {
           const status = get(error, "response.status");
           if (status === 403) {

From 8e5f4918ca557c97c7d591ebce50aa5bb2673a5c Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Fri, 26 Jun 2020 17:13:14 -0300
Subject: [PATCH 11/29] Update separator to be "/"

---
 client/app/pages/dashboards/DashboardPage.jsx | 3 ++-
 client/app/services/dashboard.js              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/app/pages/dashboards/DashboardPage.jsx b/client/app/pages/dashboards/DashboardPage.jsx
index 7dd41d9d7d..2a25db1034 100644
--- a/client/app/pages/dashboards/DashboardPage.jsx
+++ b/client/app/pages/dashboards/DashboardPage.jsx
@@ -173,6 +173,7 @@ DashboardPage.defaultProps = {
   onError: PropTypes.func,
 };
 
+// route kept for backward compatibility
 routes.register(
   "Dashboards.ViewOrEdit",
   routeWithUserSession({
@@ -184,7 +185,7 @@ routes.register(
 routes.register(
   "Dashboards.ViewOrEditWithId",
   routeWithUserSession({
-    path: "/dashboards/:dashboardId",
+    path: "/dashboards/:dashboardId/(.*)?",
     render: pageProps => <DashboardPage {...pageProps} />,
   })
 );
diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 0fa0dbd59e..8cf87f8b91 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -6,7 +6,7 @@ import { currentUser } from "@/services/auth";
 import location from "@/services/location";
 import { cloneParameter } from "@/services/parameters";
 
-export const urlForDashboard = ({ id, slug }) => `dashboards/${id}-${slug}`;
+export const urlForDashboard = ({ id, slug }) => `dashboards/${id}/${slug}`;
 
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};

From 3f47fb87c93e72a93ee3d56c60e98ac7cf0120a8 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Fri, 26 Jun 2020 17:21:22 -0300
Subject: [PATCH 12/29] Update missing dashboard urls

---
 client/app/components/dashboards/CreateDashboardDialog.jsx | 3 ++-
 client/app/components/queries/AddToDashboardDialog.jsx     | 4 ++--
 client/app/pages/home/Home.jsx                             | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/app/components/dashboards/CreateDashboardDialog.jsx b/client/app/components/dashboards/CreateDashboardDialog.jsx
index 0993e89721..9eefb7375f 100644
--- a/client/app/components/dashboards/CreateDashboardDialog.jsx
+++ b/client/app/components/dashboards/CreateDashboardDialog.jsx
@@ -8,6 +8,7 @@ import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import navigateTo from "@/components/ApplicationArea/navigateTo";
 import recordEvent from "@/services/recordEvent";
 import { policy } from "@/services/policy";
+import { urlForDashboard } from "@/services/dashboard";
 
 function CreateDashboardDialog({ dialog }) {
   const [name, setName] = useState("");
@@ -27,7 +28,7 @@ function CreateDashboardDialog({ dialog }) {
 
       axios.post("api/dashboards", { name }).then(data => {
         dialog.close();
-        navigateTo(`dashboard/${data.slug}?edit`);
+        navigateTo(`${urlForDashboard(data)}?edit`);
       });
       recordEvent("create", "dashboard");
     }
diff --git a/client/app/components/queries/AddToDashboardDialog.jsx b/client/app/components/queries/AddToDashboardDialog.jsx
index 48e9139811..9cefef64fc 100644
--- a/client/app/components/queries/AddToDashboardDialog.jsx
+++ b/client/app/components/queries/AddToDashboardDialog.jsx
@@ -7,7 +7,7 @@ import List from "antd/lib/list";
 import Icon from "antd/lib/icon";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import { QueryTagsControl } from "@/components/tags-control/TagsControl";
-import { Dashboard } from "@/services/dashboard";
+import { Dashboard, urlForDashboard } from "@/services/dashboard";
 import notification from "@/services/notification";
 import useSearchResults from "@/lib/hooks/useSearchResults";
 
@@ -51,7 +51,7 @@ function AddToDashboardDialog({ dialog, visualization }) {
         notification.success(
           "Widget added to dashboard",
           <React.Fragment>
-            <a href={`dashboard/${dashboard.slug}`} onClick={() => notification.close(key)}>
+            <a href={`${urlForDashboard(dashboard)}`} onClick={() => notification.close(key)}>
               {dashboard.name}
             </a>
             <QueryTagsControl isDraft={dashboard.is_draft} tags={dashboard.tags} />
diff --git a/client/app/pages/home/Home.jsx b/client/app/pages/home/Home.jsx
index 68c7e9e26b..9873e42732 100644
--- a/client/app/pages/home/Home.jsx
+++ b/client/app/pages/home/Home.jsx
@@ -13,7 +13,7 @@ import { axios } from "@/services/axios";
 import recordEvent from "@/services/recordEvent";
 import { messages } from "@/services/auth";
 import notification from "@/services/notification";
-import { Dashboard } from "@/services/dashboard";
+import { Dashboard, urlForDashboard } from "@/services/dashboard";
 import { Query } from "@/services/query";
 import routes from "@/services/routes";
 
@@ -119,7 +119,7 @@ function DashboardAndQueryFavoritesList() {
             <FavoriteList
               title="Favorite Dashboards"
               resource={Dashboard}
-              itemUrl={dashboard => `dashboard/${dashboard.slug}`}
+              itemUrl={dashboard => urlForDashboard(dashboard)}
               emptyState={
                 <p>
                   <span className="btn-favourite m-r-5">

From 2649292d6d83e961798eb14479e7ecfaccbeda08 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Fri, 26 Jun 2020 20:06:26 -0300
Subject: [PATCH 13/29] Update api not to depend on int id

---
 redash/handlers/dashboards.py |  3 +--
 redash/models/__init__.py     | 11 ++++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index d40e779923..7102db9e5d 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -149,9 +149,8 @@ def get(self, dashboard_slug=None):
         :>json string widget.created_at: ISO format timestamp for widget creation
         :>json string widget.updated_at: ISO format timestamp for last widget modification
         """
-        fn = models.Dashboard.get_by_id_and_org if dashboard_slug.isdigit() else models.Dashboard.get_by_slug_and_org
         dashboard = get_object_or_404(
-            fn, dashboard_slug, self.current_org
+            models.Dashboard.get_by_id_or_slug_and_org, dashboard_slug, self.current_org
         )
         response = DashboardSerializer(
             dashboard, with_widgets=True, user=self.current_user
diff --git a/redash/models/__init__.py b/redash/models/__init__.py
index a806b04b43..f71c8b3f71 100644
--- a/redash/models/__init__.py
+++ b/redash/models/__init__.py
@@ -5,7 +5,7 @@
 import numbers
 import pytz
 
-from sqlalchemy import distinct, or_, and_, UniqueConstraint
+from sqlalchemy import distinct, or_, and_, UniqueConstraint, cast
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.event import listens_for
 from sqlalchemy.ext.hybrid import hybrid_property
@@ -1172,6 +1172,15 @@ def favorites(cls, user, base_query=None):
     def get_by_slug_and_org(cls, slug, org):
         return cls.query.filter(cls.slug == slug, cls.org == org).one()
 
+    @classmethod
+    def get_by_id_or_slug_and_org(cls, id_or_slug, org):
+        return (
+            cls.query.filter(
+                cast(cls.id, db.String) == id_or_slug, cls.org == org
+            ).one_or_none()
+            or cls.query.filter(cls.slug == id_or_slug, cls.org == org).one()
+        )
+
     @hybrid_property
     def lowercase_name(self):
         "Optional property useful for sorting purposes."

From 59a9143ae0fc77b863e2c320757f140fd16620e9 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Tue, 30 Jun 2020 16:17:52 -0300
Subject: [PATCH 14/29] Use '-' instead of '/' as separator and update
 Dashboard.get calls

---
 client/app/components/queries/AddToDashboardDialog.jsx | 2 +-
 client/app/pages/dashboards/DashboardPage.jsx          | 4 ++--
 client/app/services/dashboard.js                       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/app/components/queries/AddToDashboardDialog.jsx b/client/app/components/queries/AddToDashboardDialog.jsx
index 9cefef64fc..5cbbc9217b 100644
--- a/client/app/components/queries/AddToDashboardDialog.jsx
+++ b/client/app/components/queries/AddToDashboardDialog.jsx
@@ -38,7 +38,7 @@ function AddToDashboardDialog({ dialog, visualization }) {
 
   function addWidgetToDashboard() {
     // Load dashboard with all widgets
-    Dashboard.get({ slug: selectedDashboard.slug })
+    Dashboard.get(selectedDashboard)
       .then(dashboard => {
         dashboard.addWidget(visualization);
         return dashboard;
diff --git a/client/app/pages/dashboards/DashboardPage.jsx b/client/app/pages/dashboards/DashboardPage.jsx
index 2a25db1034..7edca2465a 100644
--- a/client/app/pages/dashboards/DashboardPage.jsx
+++ b/client/app/pages/dashboards/DashboardPage.jsx
@@ -150,7 +150,7 @@ function DashboardPage({ dashboardSlug, dashboardId, onError }) {
   onErrorRef.current = onError;
 
   useEffect(() => {
-    Dashboard.get({ slug: dashboardSlug || parseInt(dashboardId, 10) })
+    Dashboard.get({ id: dashboardId, slug: dashboardSlug })
       .then(dashboardData => {
         recordEvent("view", "dashboard", dashboardData.id);
         setDashboard(dashboardData);
@@ -185,7 +185,7 @@ routes.register(
 routes.register(
   "Dashboards.ViewOrEditWithId",
   routeWithUserSession({
-    path: "/dashboards/:dashboardId/(.*)?",
+    path: "/dashboards/:dashboardId-(.*)?",
     render: pageProps => <DashboardPage {...pageProps} />,
   })
 );
diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 8cf87f8b91..bc853b005b 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -6,7 +6,7 @@ import { currentUser } from "@/services/auth";
 import location from "@/services/location";
 import { cloneParameter } from "@/services/parameters";
 
-export const urlForDashboard = ({ id, slug }) => `dashboards/${id}/${slug}`;
+export const urlForDashboard = ({ id, slug }) => `dashboards/${id}-${slug}`;
 
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};
@@ -151,7 +151,7 @@ function transformResponse(data) {
 
 const saveOrCreateUrl = data => (data.slug ? `api/dashboards/${data.slug}` : "api/dashboards");
 const DashboardService = {
-  get: ({ slug }) => axios.get(`api/dashboards/${slug}`).then(transformResponse),
+  get: ({ id, slug }) => axios.get(`api/dashboards/${id || slug}`).then(transformResponse),
   getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
   save: data => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
   delete: ({ slug }) => axios.delete(`api/dashboards/${slug}`).then(transformResponse),

From 169200ec7c6c25ac96ac867f9c1485d0c6398328 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Tue, 30 Jun 2020 16:43:52 -0300
Subject: [PATCH 15/29] slug -> name_as_slug

---
 client/app/services/dashboard.js | 2 +-
 redash/serializers/__init__.py   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index bc853b005b..d4e9015e0c 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -6,7 +6,7 @@ import { currentUser } from "@/services/auth";
 import location from "@/services/location";
 import { cloneParameter } from "@/services/parameters";
 
-export const urlForDashboard = ({ id, slug }) => `dashboards/${id}-${slug}`;
+export const urlForDashboard = ({ id, name_as_slug }) => `dashboards/${id}-${name_as_slug}`;
 
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};
diff --git a/redash/serializers/__init__.py b/redash/serializers/__init__.py
index 83b1fa266b..a9a027371b 100644
--- a/redash/serializers/__init__.py
+++ b/redash/serializers/__init__.py
@@ -245,7 +245,8 @@ def serialize_dashboard(obj, with_widgets=False, user=None, with_favorite_state=
 
     d = {
         "id": obj.id,
-        "slug": obj.name_as_slug,
+        "slug": obj.slug,
+        "name_as_slug": obj.name_as_slug,
         "name": obj.name,
         "user_id": obj.user_id,
         "user": {

From 1c9bbbe37706ddcec68da5b02b1e9f176035b918 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Tue, 30 Jun 2020 18:56:38 -0300
Subject: [PATCH 16/29] Keep slug urls on cypress

---
 client/cypress/integration/dashboard/sharing_spec.js | 2 +-
 client/cypress/integration/dashboard/textbox_spec.js | 2 +-
 client/cypress/integration/dashboard/widget_spec.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cypress/integration/dashboard/sharing_spec.js b/client/cypress/integration/dashboard/sharing_spec.js
index 16e8ccfd82..adba653603 100644
--- a/client/cypress/integration/dashboard/sharing_spec.js
+++ b/client/cypress/integration/dashboard/sharing_spec.js
@@ -8,7 +8,7 @@ describe("Dashboard Sharing", () => {
     cy.login();
     createDashboard("Foo Bar").then(({ slug, id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${id}-${slug}`;
+      this.dashboardUrl = `/dashboard/${slug}`;
     });
   });
 
diff --git a/client/cypress/integration/dashboard/textbox_spec.js b/client/cypress/integration/dashboard/textbox_spec.js
index ac31bc1025..7e5beffa54 100644
--- a/client/cypress/integration/dashboard/textbox_spec.js
+++ b/client/cypress/integration/dashboard/textbox_spec.js
@@ -8,7 +8,7 @@ describe("Textbox", () => {
     cy.login();
     createDashboard("Foo Bar").then(({ slug, id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${id}-${slug}`;
+      this.dashboardUrl = `/dashboard/${slug}`;
     });
   });
 
diff --git a/client/cypress/integration/dashboard/widget_spec.js b/client/cypress/integration/dashboard/widget_spec.js
index 20f9607f02..2eff9e4f21 100644
--- a/client/cypress/integration/dashboard/widget_spec.js
+++ b/client/cypress/integration/dashboard/widget_spec.js
@@ -8,7 +8,7 @@ describe("Widget", () => {
     cy.login();
     createDashboard("Foo Bar").then(({ slug, id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${id}-${slug}`;
+      this.dashboardUrl = `/dashboard/${slug}`;
     });
   });
 

From 2cf590b442cebf5aa45743ab8a0efef644ce8af4 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Wed, 1 Jul 2020 10:41:00 -0300
Subject: [PATCH 17/29] Update route path

---
 client/app/pages/dashboards/DashboardPage.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/pages/dashboards/DashboardPage.jsx b/client/app/pages/dashboards/DashboardPage.jsx
index 7edca2465a..2ac1de2a2a 100644
--- a/client/app/pages/dashboards/DashboardPage.jsx
+++ b/client/app/pages/dashboards/DashboardPage.jsx
@@ -185,7 +185,7 @@ routes.register(
 routes.register(
   "Dashboards.ViewOrEditWithId",
   routeWithUserSession({
-    path: "/dashboards/:dashboardId-(.*)?",
+    path: "/dashboards/:dashboardId([^-]+)(-.*)?",
     render: pageProps => <DashboardPage {...pageProps} />,
   })
 );

From 49482d9e3f5712add8acb3224e9b563371aeb6de Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Wed, 1 Jul 2020 23:02:49 -0300
Subject: [PATCH 18/29] Use legacy attr for GET

---
 client/app/services/dashboard.js | 2 +-
 redash/handlers/dashboards.py    | 7 +++++--
 redash/models/__init__.py        | 9 ---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index d4e9015e0c..400de2eaff 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -151,7 +151,7 @@ function transformResponse(data) {
 
 const saveOrCreateUrl = data => (data.slug ? `api/dashboards/${data.slug}` : "api/dashboards");
 const DashboardService = {
-  get: ({ id, slug }) => axios.get(`api/dashboards/${id || slug}`).then(transformResponse),
+  get: ({ id, slug }) => axios.get(`api/dashboards/${id || slug}` + (id ? "" : "?legacy")).then(transformResponse),
   getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
   save: data => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
   delete: ({ slug }) => axios.delete(`api/dashboards/${slug}`).then(transformResponse),
diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index 7102db9e5d..416d3841ee 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -149,9 +149,12 @@ def get(self, dashboard_slug=None):
         :>json string widget.created_at: ISO format timestamp for widget creation
         :>json string widget.updated_at: ISO format timestamp for last widget modification
         """
-        dashboard = get_object_or_404(
-            models.Dashboard.get_by_id_or_slug_and_org, dashboard_slug, self.current_org
+        fn = (
+            models.Dashboard.get_by_slug_and_org
+            if request.args.get("legacy") is not None
+            else models.Dashboard.get_by_id_and_org
         )
+        dashboard = get_object_or_404(fn, dashboard_slug, self.current_org)
         response = DashboardSerializer(
             dashboard, with_widgets=True, user=self.current_user
         ).serialize()
diff --git a/redash/models/__init__.py b/redash/models/__init__.py
index f71c8b3f71..b4d9991db6 100644
--- a/redash/models/__init__.py
+++ b/redash/models/__init__.py
@@ -1172,15 +1172,6 @@ def favorites(cls, user, base_query=None):
     def get_by_slug_and_org(cls, slug, org):
         return cls.query.filter(cls.slug == slug, cls.org == org).one()
 
-    @classmethod
-    def get_by_id_or_slug_and_org(cls, id_or_slug, org):
-        return (
-            cls.query.filter(
-                cast(cls.id, db.String) == id_or_slug, cls.org == org
-            ).one_or_none()
-            or cls.query.filter(cls.slug == id_or_slug, cls.org == org).one()
-        )
-
     @hybrid_property
     def lowercase_name(self):
         "Optional property useful for sorting purposes."

From 52041a35f4e071f4cf71964ebcea7d2a7c1364bf Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Wed, 1 Jul 2020 23:30:15 -0300
Subject: [PATCH 19/29] Use getter for urlForDashboard

---
 .../components/dashboards/CreateDashboardDialog.jsx   |  7 +++----
 .../app/components/queries/AddToDashboardDialog.jsx   |  4 ++--
 client/app/pages/dashboards/DashboardList.jsx         |  4 ++--
 client/app/pages/dashboards/hooks/useDashboard.js     | 11 ++++++++---
 client/app/pages/home/Home.jsx                        |  4 ++--
 client/app/services/dashboard.js                      |  5 +++++
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/client/app/components/dashboards/CreateDashboardDialog.jsx b/client/app/components/dashboards/CreateDashboardDialog.jsx
index 9eefb7375f..cb6bb8caa9 100644
--- a/client/app/components/dashboards/CreateDashboardDialog.jsx
+++ b/client/app/components/dashboards/CreateDashboardDialog.jsx
@@ -1,6 +1,5 @@
 import { trim } from "lodash";
 import React, { useState } from "react";
-import { axios } from "@/services/axios";
 import Modal from "antd/lib/modal";
 import Input from "antd/lib/input";
 import DynamicComponent from "@/components/DynamicComponent";
@@ -8,7 +7,7 @@ import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import navigateTo from "@/components/ApplicationArea/navigateTo";
 import recordEvent from "@/services/recordEvent";
 import { policy } from "@/services/policy";
-import { urlForDashboard } from "@/services/dashboard";
+import { Dashboard } from "@/services/dashboard";
 
 function CreateDashboardDialog({ dialog }) {
   const [name, setName] = useState("");
@@ -26,9 +25,9 @@ function CreateDashboardDialog({ dialog }) {
     if (name !== "") {
       setSaveInProgress(true);
 
-      axios.post("api/dashboards", { name }).then(data => {
+      Dashboard.save({ name }).then(data => {
         dialog.close();
-        navigateTo(`${urlForDashboard(data)}?edit`);
+        navigateTo(`${data.url}?edit`);
       });
       recordEvent("create", "dashboard");
     }
diff --git a/client/app/components/queries/AddToDashboardDialog.jsx b/client/app/components/queries/AddToDashboardDialog.jsx
index 5cbbc9217b..4510ee4170 100644
--- a/client/app/components/queries/AddToDashboardDialog.jsx
+++ b/client/app/components/queries/AddToDashboardDialog.jsx
@@ -7,7 +7,7 @@ import List from "antd/lib/list";
 import Icon from "antd/lib/icon";
 import { wrap as wrapDialog, DialogPropType } from "@/components/DialogWrapper";
 import { QueryTagsControl } from "@/components/tags-control/TagsControl";
-import { Dashboard, urlForDashboard } from "@/services/dashboard";
+import { Dashboard } from "@/services/dashboard";
 import notification from "@/services/notification";
 import useSearchResults from "@/lib/hooks/useSearchResults";
 
@@ -51,7 +51,7 @@ function AddToDashboardDialog({ dialog, visualization }) {
         notification.success(
           "Widget added to dashboard",
           <React.Fragment>
-            <a href={`${urlForDashboard(dashboard)}`} onClick={() => notification.close(key)}>
+            <a href={`${dashboard.url}`} onClick={() => notification.close(key)}>
               {dashboard.name}
             </a>
             <QueryTagsControl isDraft={dashboard.is_draft} tags={dashboard.tags} />
diff --git a/client/app/pages/dashboards/DashboardList.jsx b/client/app/pages/dashboards/DashboardList.jsx
index 69f93fb394..de481fb4d4 100644
--- a/client/app/pages/dashboards/DashboardList.jsx
+++ b/client/app/pages/dashboards/DashboardList.jsx
@@ -14,7 +14,7 @@ import ItemsTable, { Columns } from "@/components/items-list/components/ItemsTab
 import CreateDashboardDialog from "@/components/dashboards/CreateDashboardDialog";
 import Layout from "@/components/layouts/ContentWithSidebar";
 
-import { Dashboard, urlForDashboard } from "@/services/dashboard";
+import { Dashboard } from "@/services/dashboard";
 import { currentUser } from "@/services/auth";
 import routes from "@/services/routes";
 
@@ -46,7 +46,7 @@ class DashboardList extends React.Component {
     Columns.custom.sortable(
       (text, item) => (
         <React.Fragment>
-          <a className="table-main-title" href={urlForDashboard(item)} data-test={item.slug}>
+          <a className="table-main-title" href={item.url} data-test={item.slug}>
             {item.name}
           </a>
           <DashboardTagsControl
diff --git a/client/app/pages/dashboards/hooks/useDashboard.js b/client/app/pages/dashboards/hooks/useDashboard.js
index 5334067d82..1502350b8c 100644
--- a/client/app/pages/dashboards/hooks/useDashboard.js
+++ b/client/app/pages/dashboards/hooks/useDashboard.js
@@ -2,7 +2,8 @@ import { useState, useEffect, useMemo, useCallback, useRef } from "react";
 import { isEmpty, includes, compact, map, has, pick, keys, extend, every, get } from "lodash";
 import notification from "@/services/notification";
 import location from "@/services/location";
-import { Dashboard, collectDashboardFilters, urlForDashboard } from "@/services/dashboard";
+import url from "@/services/url";
+import { Dashboard, collectDashboardFilters } from "@/services/dashboard";
 import { currentUser } from "@/services/auth";
 import recordEvent from "@/services/recordEvent";
 import { QueryResultError } from "@/services/query";
@@ -14,7 +15,6 @@ import ShareDashboardDialog from "../components/ShareDashboardDialog";
 import useFullscreenHandler from "../../../lib/hooks/useFullscreenHandler";
 import useRefreshRateHandler from "./useRefreshRateHandler";
 import useEditModeHandler from "./useEditModeHandler";
-import navigateTo from "@/components/ApplicationArea/navigateTo";
 
 export { DashboardStatusEnum } from "./useEditModeHandler";
 
@@ -73,7 +73,12 @@ function useDashboard(dashboardData) {
         .then(updatedDashboard => {
           setDashboard(currentDashboard => extend({}, currentDashboard, pick(updatedDashboard, keys(data))));
           if (has(data, "name")) {
-            navigateTo(urlForDashboard(updatedDashboard), true);
+            location.update(
+              {
+                path: url.parse(updatedDashboard.url).pathname,
+              },
+              true
+            );
           }
         })
         .catch(error => {
diff --git a/client/app/pages/home/Home.jsx b/client/app/pages/home/Home.jsx
index 9873e42732..4fbd14b4dc 100644
--- a/client/app/pages/home/Home.jsx
+++ b/client/app/pages/home/Home.jsx
@@ -13,7 +13,7 @@ import { axios } from "@/services/axios";
 import recordEvent from "@/services/recordEvent";
 import { messages } from "@/services/auth";
 import notification from "@/services/notification";
-import { Dashboard, urlForDashboard } from "@/services/dashboard";
+import { Dashboard } from "@/services/dashboard";
 import { Query } from "@/services/query";
 import routes from "@/services/routes";
 
@@ -119,7 +119,7 @@ function DashboardAndQueryFavoritesList() {
             <FavoriteList
               title="Favorite Dashboards"
               resource={Dashboard}
-              itemUrl={dashboard => urlForDashboard(dashboard)}
+              itemUrl={dashboard => dashboard.url}
               emptyState={
                 <p>
                   <span className="btn-favourite m-r-5">
diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 400de2eaff..7882a2ed0b 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -125,6 +125,11 @@ function calculateNewWidgetPosition(existingWidgets, newWidget) {
 
 export function Dashboard(dashboard) {
   _.extend(this, dashboard);
+  Object.defineProperty(this, "url", {
+    get: function() {
+      return urlForDashboard(this);
+    },
+  });
 }
 
 function prepareDashboardWidgets(widgets) {

From 2ccc4c148d85f0fd82db6a7501432c6466a3ef4c Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Thu, 2 Jul 2020 13:53:33 -0300
Subject: [PATCH 20/29] Update dashboard url when loaded by slug

---
 client/app/pages/dashboards/DashboardPage.jsx     | 7 +++++++
 client/app/pages/dashboards/hooks/useDashboard.js | 7 +------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/app/pages/dashboards/DashboardPage.jsx b/client/app/pages/dashboards/DashboardPage.jsx
index 2ac1de2a2a..3212d13312 100644
--- a/client/app/pages/dashboards/DashboardPage.jsx
+++ b/client/app/pages/dashboards/DashboardPage.jsx
@@ -14,6 +14,8 @@ import { Dashboard } from "@/services/dashboard";
 import recordEvent from "@/services/recordEvent";
 import resizeObserver from "@/services/resizeObserver";
 import routes from "@/services/routes";
+import location from "@/services/location";
+import url from "@/services/url";
 
 import useDashboard from "./hooks/useDashboard";
 import DashboardHeader from "./components/DashboardHeader";
@@ -154,6 +156,11 @@ function DashboardPage({ dashboardSlug, dashboardId, onError }) {
       .then(dashboardData => {
         recordEvent("view", "dashboard", dashboardData.id);
         setDashboard(dashboardData);
+
+        // if loaded by slug, update location url to use the id
+        if (!dashboardId) {
+          location.setPath(url.parse(dashboardData.url).pathname, true);
+        }
       })
       .catch(error => onErrorRef.current(error));
   }, [dashboardSlug, dashboardId]);
diff --git a/client/app/pages/dashboards/hooks/useDashboard.js b/client/app/pages/dashboards/hooks/useDashboard.js
index 1502350b8c..8e092609b4 100644
--- a/client/app/pages/dashboards/hooks/useDashboard.js
+++ b/client/app/pages/dashboards/hooks/useDashboard.js
@@ -73,12 +73,7 @@ function useDashboard(dashboardData) {
         .then(updatedDashboard => {
           setDashboard(currentDashboard => extend({}, currentDashboard, pick(updatedDashboard, keys(data))));
           if (has(data, "name")) {
-            location.update(
-              {
-                path: url.parse(updatedDashboard.url).pathname,
-              },
-              true
-            );
+            location.setPath(url.parse(updatedDashboard.url).pathname, true);
           }
         })
         .catch(error => {

From 08c14de2bba52b588c0310eadf86f16a21ea4807 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Thu, 2 Jul 2020 20:48:44 -0300
Subject: [PATCH 21/29] Update Dashboard routes to use id instead of slug

---
 .../pages/dashboards/hooks/useDashboard.js    |  3 +--
 client/app/services/dashboard.js              |  8 ++++----
 redash/handlers/api.py                        |  2 +-
 redash/handlers/dashboards.py                 | 20 +++++++++----------
 redash/handlers/favorites.py                  |  4 ++--
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/client/app/pages/dashboards/hooks/useDashboard.js b/client/app/pages/dashboards/hooks/useDashboard.js
index 8e092609b4..07614ff68c 100644
--- a/client/app/pages/dashboards/hooks/useDashboard.js
+++ b/client/app/pages/dashboards/hooks/useDashboard.js
@@ -64,8 +64,7 @@ function useDashboard(dashboardData) {
   const updateDashboard = useCallback(
     (data, includeVersion = true) => {
       setDashboard(currentDashboard => extend({}, currentDashboard, data));
-      // for some reason the request uses the id as slug
-      data = { ...data, slug: dashboard.id };
+      data = { ...data, id: dashboard.id };
       if (includeVersion) {
         data = { ...data, version: dashboard.version };
       }
diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index 7882a2ed0b..d88655f002 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -154,17 +154,17 @@ function transformResponse(data) {
   return data;
 }
 
-const saveOrCreateUrl = data => (data.slug ? `api/dashboards/${data.slug}` : "api/dashboards");
+const saveOrCreateUrl = data => (data.id ? `api/dashboards/${data.id}` : "api/dashboards");
 const DashboardService = {
   get: ({ id, slug }) => axios.get(`api/dashboards/${id || slug}` + (id ? "" : "?legacy")).then(transformResponse),
   getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
   save: data => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
-  delete: ({ slug }) => axios.delete(`api/dashboards/${slug}`).then(transformResponse),
+  delete: ({ id }) => axios.delete(`api/dashboards/${id}`).then(transformResponse),
   query: params => axios.get("api/dashboards", { params }).then(transformResponse),
   recent: params => axios.get("api/dashboards/recent", { params }).then(transformResponse),
   favorites: params => axios.get("api/dashboards/favorites", { params }).then(transformResponse),
-  favorite: ({ slug }) => axios.post(`api/dashboards/${slug}/favorite`),
-  unfavorite: ({ slug }) => axios.delete(`api/dashboards/${slug}/favorite`),
+  favorite: ({ id }) => axios.post(`api/dashboards/${id}/favorite`),
+  unfavorite: ({ id }) => axios.delete(`api/dashboards/${id}/favorite`),
 };
 
 _.extend(Dashboard, DashboardService);
diff --git a/redash/handlers/api.py b/redash/handlers/api.py
index ef479ef3c3..c33d2f4b76 100644
--- a/redash/handlers/api.py
+++ b/redash/handlers/api.py
@@ -123,7 +123,7 @@ def json_representation(data, code, headers=None):
 
 api.add_org_resource(DashboardListResource, "/api/dashboards", endpoint="dashboards")
 api.add_org_resource(
-    DashboardResource, "/api/dashboards/<dashboard_slug>", endpoint="dashboard"
+    DashboardResource, "/api/dashboards/<dashboard_id>", endpoint="dashboard"
 )
 api.add_org_resource(
     PublicDashboardResource,
diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index 416d3841ee..fba1b5d28d 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -115,11 +115,11 @@ def post(self):
 
 class DashboardResource(BaseResource):
     @require_permission("list_dashboards")
-    def get(self, dashboard_slug=None):
+    def get(self, dashboard_id=None):
         """
         Retrieves a dashboard.
 
-        :qparam string slug: Slug of dashboard to retrieve.
+        :qparam number id: Id of dashboard to retrieve.
 
         .. _dashboard-response-label:
 
@@ -154,7 +154,7 @@ def get(self, dashboard_slug=None):
             if request.args.get("legacy") is not None
             else models.Dashboard.get_by_id_and_org
         )
-        dashboard = get_object_or_404(fn, dashboard_slug, self.current_org)
+        dashboard = get_object_or_404(fn, dashboard_id, self.current_org)
         response = DashboardSerializer(
             dashboard, with_widgets=True, user=self.current_user
         ).serialize()
@@ -178,11 +178,11 @@ def get(self, dashboard_slug=None):
         return response
 
     @require_permission("edit_dashboard")
-    def post(self, dashboard_slug):
+    def post(self, dashboard_id):
         """
         Modifies a dashboard.
 
-        :qparam string slug: Slug of dashboard to retrieve.
+        :qparam number id: Id of dashboard to retrieve.
 
         Responds with the updated :ref:`dashboard <dashboard-response-label>`.
 
@@ -191,7 +191,7 @@ def post(self, dashboard_slug):
         """
         dashboard_properties = request.get_json(force=True)
         # TODO: either convert all requests to use slugs or ids
-        dashboard = models.Dashboard.get_by_id_and_org(dashboard_slug, self.current_org)
+        dashboard = models.Dashboard.get_by_id_and_org(dashboard_id, self.current_org)
 
         require_object_modify_permission(dashboard, self.current_user)
 
@@ -234,17 +234,15 @@ def post(self, dashboard_slug):
         return result
 
     @require_permission("edit_dashboard")
-    def delete(self, dashboard_slug):
+    def delete(self, dashboard_id):
         """
         Archives a dashboard.
 
-        :qparam string slug: Slug of dashboard to retrieve.
+        :qparam number id: Id of dashboard to retrieve.
 
         Responds with the archived :ref:`dashboard <dashboard-response-label>`.
         """
-        dashboard = models.Dashboard.get_by_slug_and_org(
-            dashboard_slug, self.current_org
-        )
+        dashboard = models.Dashboard.get_by_id_and_org(dashboard_id, self.current_org)
         dashboard.is_archived = True
         dashboard.record_changes(changed_by=self.current_user)
         models.db.session.add(dashboard)
diff --git a/redash/handlers/favorites.py b/redash/handlers/favorites.py
index 71ac3a20b8..71a0ac3db1 100644
--- a/redash/handlers/favorites.py
+++ b/redash/handlers/favorites.py
@@ -51,7 +51,7 @@ def delete(self, query_id):
 class DashboardFavoriteResource(BaseResource):
     def post(self, object_id):
         dashboard = get_object_or_404(
-            models.Dashboard.get_by_slug_and_org, object_id, self.current_org
+            models.Dashboard.get_by_id_and_org, object_id, self.current_org
         )
         fav = models.Favorite(
             org_id=self.current_org.id, object=dashboard, user=self.current_user
@@ -76,7 +76,7 @@ def post(self, object_id):
 
     def delete(self, object_id):
         dashboard = get_object_or_404(
-            models.Dashboard.get_by_slug_and_org, object_id, self.current_org
+            models.Dashboard.get_by_id_and_org, object_id, self.current_org
         )
         models.Favorite.query.filter(
             models.Favorite.object == dashboard,

From d7728d1db06a567384d0bb1805de50f3b6afcac3 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Thu, 2 Jul 2020 20:55:25 -0300
Subject: [PATCH 22/29] Update Dashboard handler tests

---
 tests/handlers/test_dashboards.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/handlers/test_dashboards.py b/tests/handlers/test_dashboards.py
index b60fe627a9..f89e553b4b 100644
--- a/tests/handlers/test_dashboards.py
+++ b/tests/handlers/test_dashboards.py
@@ -53,7 +53,17 @@ def test_search_term(self):
 class TestDashboardResourceGet(BaseTestCase):
     def test_get_dashboard(self):
         d1 = self.factory.create_dashboard()
-        rv = self.make_request("get", "/api/dashboards/{0}".format(d1.slug))
+        rv = self.make_request("get", "/api/dashboards/{0}".format(d1.id))
+        self.assertEqual(rv.status_code, 200)
+
+        expected = serialize_dashboard(d1, with_widgets=True, with_favorite_state=False)
+        actual = json_loads(rv.data)
+
+        self.assertResponseEqual(expected, actual)
+
+    def test_get_dashboard_with_slug(self):
+        d1 = self.factory.create_dashboard()
+        rv = self.make_request("get", "/api/dashboards/{0}?legacy".format(d1.slug))
         self.assertEqual(rv.status_code, 200)
 
         expected = serialize_dashboard(d1, with_widgets=True, with_favorite_state=False)
@@ -76,13 +86,13 @@ def test_get_dashboard_filters_unauthorized_widgets(self):
         dashboard.layout = "[[{}, {}]]".format(widget.id, restricted_widget.id)
         db.session.commit()
 
-        rv = self.make_request("get", "/api/dashboards/{0}".format(dashboard.slug))
+        rv = self.make_request("get", "/api/dashboards/{0}".format(dashboard.id))
         self.assertEqual(rv.status_code, 200)
         self.assertTrue(rv.json["widgets"][0]["restricted"])
         self.assertNotIn("restricted", rv.json["widgets"][1])
 
     def test_get_non_existing_dashboard(self):
-        rv = self.make_request("get", "/api/dashboards/not_existing")
+        rv = self.make_request("get", "/api/dashboards/-1")
         self.assertEqual(rv.status_code, 404)
 
 
@@ -156,10 +166,10 @@ class TestDashboardResourceDelete(BaseTestCase):
     def test_delete_dashboard(self):
         d = self.factory.create_dashboard()
 
-        rv = self.make_request("delete", "/api/dashboards/{0}".format(d.slug))
+        rv = self.make_request("delete", "/api/dashboards/{0}".format(d.id))
         self.assertEqual(rv.status_code, 200)
 
-        d = Dashboard.get_by_slug_and_org(d.slug, d.org)
+        d = Dashboard.get_by_id_and_org(d.id, d.org)
         self.assertTrue(d.is_archived)
 
 

From d166069d3b690582b5904d2cb9eb9f7bac7709cd Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Fri, 3 Jul 2020 11:42:25 -0300
Subject: [PATCH 23/29] Update Cypress tests

---
 client/app/pages/dashboards/DashboardList.jsx |  2 +-
 client/app/pages/dashboards/DashboardPage.jsx |  2 +-
 .../integration/dashboard/dashboard_spec.js   | 31 ++++++++++++++-----
 .../dashboard/dashboard_tags_spec.js          |  2 +-
 .../integration/dashboard/filters_spec.js     |  2 +-
 .../dashboard/grid_compliant_widgets_spec.js  |  4 +--
 .../dashboard/parameter_mapping_spec.js       |  4 +--
 .../integration/dashboard/sharing_spec.js     |  4 +--
 .../integration/dashboard/textbox_spec.js     |  4 +--
 .../integration/dashboard/widget_spec.js      |  4 +--
 .../integration/visualizations/pivot_spec.js  |  2 +-
 .../visualizations/sankey_sunburst_spec.js    |  4 +--
 12 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/client/app/pages/dashboards/DashboardList.jsx b/client/app/pages/dashboards/DashboardList.jsx
index de481fb4d4..a3f0d0d5dd 100644
--- a/client/app/pages/dashboards/DashboardList.jsx
+++ b/client/app/pages/dashboards/DashboardList.jsx
@@ -46,7 +46,7 @@ class DashboardList extends React.Component {
     Columns.custom.sortable(
       (text, item) => (
         <React.Fragment>
-          <a className="table-main-title" href={item.url} data-test={item.slug}>
+          <a className="table-main-title" href={item.url} data-test={`DashboardId${item.id}`}>
             {item.name}
           </a>
           <DashboardTagsControl
diff --git a/client/app/pages/dashboards/DashboardPage.jsx b/client/app/pages/dashboards/DashboardPage.jsx
index 3212d13312..76930204ca 100644
--- a/client/app/pages/dashboards/DashboardPage.jsx
+++ b/client/app/pages/dashboards/DashboardPage.jsx
@@ -110,7 +110,7 @@ function DashboardComponent(props) {
   }, [pageContainer, editingLayout]);
 
   return (
-    <div className="container" ref={setPageContainer}>
+    <div className="container" ref={setPageContainer} data-test={`DashboardId${dashboard.id}Container`}>
       <DashboardHeader dashboardOptions={dashboardOptions} />
       {!isEmpty(globalParameters) && (
         <div className="dashboard-parameters m-b-10 p-15 bg-white tiled" data-test="DashboardParameters">
diff --git a/client/cypress/integration/dashboard/dashboard_spec.js b/client/cypress/integration/dashboard/dashboard_spec.js
index 489a07ea5f..97111fba14 100644
--- a/client/cypress/integration/dashboard/dashboard_spec.js
+++ b/client/cypress/integration/dashboard/dashboard_spec.js
@@ -36,8 +36,8 @@ describe("Dashboard", () => {
   });
 
   it("archives dashboard", () => {
-    createDashboard("Foo Bar").then(({ slug }) => {
-      cy.visit(`/dashboard/${slug}`);
+    createDashboard("Foo Bar").then(({ id }) => {
+      cy.visit(`/dashboards/${id}`);
 
       cy.getByTestId("DashboardMoreButton").click();
 
@@ -52,7 +52,22 @@ describe("Dashboard", () => {
 
       cy.visit("/dashboards");
       cy.getByTestId("DashboardLayoutContent").within(() => {
-        cy.getByTestId(slug).should("not.exist");
+        cy.getByTestId(`DashboardId${id}`).should("not.exist");
+      });
+    });
+  });
+
+  it("is accessible through multiple urls", () => {
+    cy.server();
+    cy.route("GET", "api/dashboards/*").as("LoadDashboard");
+    createDashboard("Foo Bar").then(({ id, slug }) => {
+      [`/dashboards/${id}`, `/dashboards/${id}-anything-here`, `/dashboard/${slug}`].forEach(url => {
+        cy.visit(url);
+        cy.wait("@LoadDashboard");
+        cy.getByTestId(`DashboardId${id}Container`).should("exist");
+
+        // assert it always use the "/dashboards/{id}" path
+        cy.location("pathname").should("contain", `/dashboards/${id}`);
       });
     });
   });
@@ -61,9 +76,9 @@ describe("Dashboard", () => {
     before(function() {
       cy.login();
       createDashboard("Foo Bar")
-        .then(({ slug, id }) => {
-          this.dashboardUrl = `/dashboard/${slug}`;
-          this.dashboardEditUrl = `/dashboard/${slug}?edit`;
+        .then(({ id }) => {
+          this.dashboardUrl = `/dashboards/${id}`;
+          this.dashboardEditUrl = `/dashboards/${id}?edit`;
           return addTextbox(id, "Hello World!").then(getWidgetTestId);
         })
         .then(elTestId => {
@@ -117,8 +132,8 @@ describe("Dashboard", () => {
   context("viewport width is at 767px", () => {
     before(function() {
       cy.login();
-      createDashboard("Foo Bar").then(({ slug }) => {
-        this.dashboardUrl = `/dashboard/${slug}`;
+      createDashboard("Foo Bar").then(({ id }) => {
+        this.dashboardUrl = `/dashboards/${id}`;
       });
     });
 
diff --git a/client/cypress/integration/dashboard/dashboard_tags_spec.js b/client/cypress/integration/dashboard/dashboard_tags_spec.js
index 9d8ef131ae..c7dd91e649 100644
--- a/client/cypress/integration/dashboard/dashboard_tags_spec.js
+++ b/client/cypress/integration/dashboard/dashboard_tags_spec.js
@@ -4,7 +4,7 @@ import { expectTagsToContain, typeInTagsSelectAndSave } from "../../support/tags
 describe("Dashboard Tags", () => {
   beforeEach(function() {
     cy.login();
-    createDashboard("Foo Bar").then(({ slug }) => cy.visit(`/dashboard/${slug}`));
+    createDashboard("Foo Bar").then(({ id }) => cy.visit(`/dashboards/${id}`));
   });
 
   it("is possible to add and edit tags", () => {
diff --git a/client/cypress/integration/dashboard/filters_spec.js b/client/cypress/integration/dashboard/filters_spec.js
index 47091c600a..b05b8c3e6c 100644
--- a/client/cypress/integration/dashboard/filters_spec.js
+++ b/client/cypress/integration/dashboard/filters_spec.js
@@ -29,7 +29,7 @@ describe("Dashboard Filters", () => {
         .as("widget1TestId")
         .then(() => createQueryAndAddWidget(dashboard.id, queryData, { position: { col: 4 } }))
         .as("widget2TestId")
-        .then(() => cy.visit(`/dashboard/${dashboard.slug}`));
+        .then(() => cy.visit(`/dashboards/${dashboard.id}`));
     });
   });
 
diff --git a/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js b/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js
index 31a7361979..27fcdbafb5 100644
--- a/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js
+++ b/client/cypress/integration/dashboard/grid_compliant_widgets_spec.js
@@ -10,8 +10,8 @@ describe("Grid compliant widgets", () => {
     cy.login();
     cy.viewport(1215 + menuWidth, 800);
     createDashboard("Foo Bar")
-      .then(({ slug, id }) => {
-        this.dashboardUrl = `/dashboard/${slug}`;
+      .then(({ id }) => {
+        this.dashboardUrl = `/dashboards/${id}`;
         return addTextbox(id, "Hello World!").then(getWidgetTestId);
       })
       .then(elTestId => {
diff --git a/client/cypress/integration/dashboard/parameter_mapping_spec.js b/client/cypress/integration/dashboard/parameter_mapping_spec.js
index 04dc58a439..4223f35dff 100644
--- a/client/cypress/integration/dashboard/parameter_mapping_spec.js
+++ b/client/cypress/integration/dashboard/parameter_mapping_spec.js
@@ -5,9 +5,9 @@ describe("Parameter Mapping", () => {
   beforeEach(function() {
     cy.login();
     createDashboard("Foo Bar")
-      .then(({ slug, id }) => {
+      .then(({ id }) => {
         this.dashboardId = id;
-        this.dashboardUrl = `/dashboard/${slug}`;
+        this.dashboardUrl = `/dashboards/${id}`;
       })
       .then(() => {
         const queryData = {
diff --git a/client/cypress/integration/dashboard/sharing_spec.js b/client/cypress/integration/dashboard/sharing_spec.js
index adba653603..4c7369dc4a 100644
--- a/client/cypress/integration/dashboard/sharing_spec.js
+++ b/client/cypress/integration/dashboard/sharing_spec.js
@@ -6,9 +6,9 @@ import { editDashboard, shareDashboard, createQueryAndAddWidget } from "../../su
 describe("Dashboard Sharing", () => {
   beforeEach(function() {
     cy.login();
-    createDashboard("Foo Bar").then(({ slug, id }) => {
+    createDashboard("Foo Bar").then(({ id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${slug}`;
+      this.dashboardUrl = `/dashboards/${id}`;
     });
   });
 
diff --git a/client/cypress/integration/dashboard/textbox_spec.js b/client/cypress/integration/dashboard/textbox_spec.js
index 7e5beffa54..3e4c7910a8 100644
--- a/client/cypress/integration/dashboard/textbox_spec.js
+++ b/client/cypress/integration/dashboard/textbox_spec.js
@@ -6,9 +6,9 @@ import { getWidgetTestId, editDashboard } from "../../support/dashboard";
 describe("Textbox", () => {
   beforeEach(function() {
     cy.login();
-    createDashboard("Foo Bar").then(({ slug, id }) => {
+    createDashboard("Foo Bar").then(({ id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${slug}`;
+      this.dashboardUrl = `/dashboards/${id}`;
     });
   });
 
diff --git a/client/cypress/integration/dashboard/widget_spec.js b/client/cypress/integration/dashboard/widget_spec.js
index 2eff9e4f21..60501f2ab7 100644
--- a/client/cypress/integration/dashboard/widget_spec.js
+++ b/client/cypress/integration/dashboard/widget_spec.js
@@ -6,9 +6,9 @@ import { createQueryAndAddWidget, editDashboard, resizeBy } from "../../support/
 describe("Widget", () => {
   beforeEach(function() {
     cy.login();
-    createDashboard("Foo Bar").then(({ slug, id }) => {
+    createDashboard("Foo Bar").then(({ id }) => {
       this.dashboardId = id;
-      this.dashboardUrl = `/dashboard/${slug}`;
+      this.dashboardUrl = `/dashboards/${id}`;
     });
   });
 
diff --git a/client/cypress/integration/visualizations/pivot_spec.js b/client/cypress/integration/visualizations/pivot_spec.js
index 54d4cf53ab..1e2f153ce3 100644
--- a/client/cypress/integration/visualizations/pivot_spec.js
+++ b/client/cypress/integration/visualizations/pivot_spec.js
@@ -143,7 +143,7 @@ describe("Pivot", () => {
 
     createDashboard("Pivot Visualization")
       .then(dashboard => {
-        this.dashboardUrl = `/dashboard/${dashboard.slug}`;
+        this.dashboardUrl = `/dashboards/${dashboard.id}`;
         return cy.all(
           pivotTables.map(pivot => () =>
             createVisualization(this.queryId, "PIVOT", pivot.name, pivot.options).then(visualization =>
diff --git a/client/cypress/integration/visualizations/sankey_sunburst_spec.js b/client/cypress/integration/visualizations/sankey_sunburst_spec.js
index 5bb8eda9e9..190b7c96c2 100644
--- a/client/cypress/integration/visualizations/sankey_sunburst_spec.js
+++ b/client/cypress/integration/visualizations/sankey_sunburst_spec.js
@@ -99,7 +99,7 @@ describe("Sankey and Sunburst", () => {
 
   it("takes a snapshot with Sunburst (1 - 5 stages)", function() {
     createDashboard("Sunburst Visualization").then(dashboard => {
-      this.dashboardUrl = `/dashboard/${dashboard.slug}`;
+      this.dashboardUrl = `/dashboards/${dashboard.id}`;
       return cy
         .all(
           STAGES_WIDGETS.map(sunburst => () =>
@@ -123,7 +123,7 @@ describe("Sankey and Sunburst", () => {
 
   it("takes a snapshot with Sankey (1 - 5 stages)", function() {
     createDashboard("Sankey Visualization").then(dashboard => {
-      this.dashboardUrl = `/dashboard/${dashboard.slug}`;
+      this.dashboardUrl = `/dashboards/${dashboard.id}`;
       return cy
         .all(
           STAGES_WIDGETS.map(sankey => () =>

From 7a8cb0eea96704b244a1c95d3de4cd37060da004 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Fri, 3 Jul 2020 12:17:24 -0300
Subject: [PATCH 24/29] Fix create new dashboard spec

---
 client/cypress/integration/dashboard/dashboard_spec.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/cypress/integration/dashboard/dashboard_spec.js b/client/cypress/integration/dashboard/dashboard_spec.js
index 97111fba14..95c4337217 100644
--- a/client/cypress/integration/dashboard/dashboard_spec.js
+++ b/client/cypress/integration/dashboard/dashboard_spec.js
@@ -25,12 +25,12 @@ describe("Dashboard", () => {
     });
 
     cy.wait("@NewDashboard").then(xhr => {
-      const slug = Cypress._.get(xhr, "response.body.slug");
-      assert.isDefined(slug, "Dashboard api call returns slug");
+      const id = Cypress._.get(xhr, "response.body.id");
+      assert.isDefined(id, "Dashboard api call returns id");
 
       cy.visit("/dashboards");
       cy.getByTestId("DashboardLayoutContent").within(() => {
-        cy.getByTestId(slug).should("exist");
+        cy.getByTestId(`DashboardId${id}`).should("exist");
       });
     });
   });

From eb825831c54ed98887897211f73c4d6bee43c056 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Mon, 6 Jul 2020 16:58:09 -0300
Subject: [PATCH 25/29] Use axios { params }

---
 client/app/services/dashboard.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index d88655f002..a0641868f8 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -156,7 +156,13 @@ function transformResponse(data) {
 
 const saveOrCreateUrl = data => (data.id ? `api/dashboards/${data.id}` : "api/dashboards");
 const DashboardService = {
-  get: ({ id, slug }) => axios.get(`api/dashboards/${id || slug}` + (id ? "" : "?legacy")).then(transformResponse),
+  get: ({ id, slug }) => {
+    const params = {};
+    if (!id) {
+      params.legacy = null;
+    }
+    return axios.get(`api/dashboards/${id || slug}`, { params }).then(transformResponse);
+  },
   getByToken: ({ token }) => axios.get(`api/dashboards/public/${token}`).then(transformResponse),
   save: data => axios.post(saveOrCreateUrl(data), data).then(transformResponse),
   delete: ({ id }) => axios.delete(`api/dashboards/${id}`).then(transformResponse),

From fd26a9f0348d55f6b02b2097fa23438e20625314 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Mon, 13 Jul 2020 12:35:10 -0300
Subject: [PATCH 26/29] Drop Ternary operator

---
 redash/handlers/dashboards.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/redash/handlers/dashboards.py b/redash/handlers/dashboards.py
index fba1b5d28d..cfc710930f 100644
--- a/redash/handlers/dashboards.py
+++ b/redash/handlers/dashboards.py
@@ -149,11 +149,11 @@ def get(self, dashboard_id=None):
         :>json string widget.created_at: ISO format timestamp for widget creation
         :>json string widget.updated_at: ISO format timestamp for last widget modification
         """
-        fn = (
-            models.Dashboard.get_by_slug_and_org
-            if request.args.get("legacy") is not None
-            else models.Dashboard.get_by_id_and_org
-        )
+        if request.args.get("legacy") is not None:
+            fn = models.Dashboard.get_by_slug_and_org
+        else:
+            fn = models.Dashboard.get_by_id_and_org
+
         dashboard = get_object_or_404(fn, dashboard_id, self.current_org)
         response = DashboardSerializer(
             dashboard, with_widgets=True, user=self.current_user

From 6e68b910fc01e59c65ba8231aec160c90f63a5e3 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Mon, 13 Jul 2020 12:35:44 -0300
Subject: [PATCH 27/29] Send updated slug directly in 'slug' attr

---
 client/app/services/dashboard.js | 2 +-
 redash/serializers/__init__.py   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/app/services/dashboard.js b/client/app/services/dashboard.js
index a0641868f8..d2f1806fa6 100644
--- a/client/app/services/dashboard.js
+++ b/client/app/services/dashboard.js
@@ -6,7 +6,7 @@ import { currentUser } from "@/services/auth";
 import location from "@/services/location";
 import { cloneParameter } from "@/services/parameters";
 
-export const urlForDashboard = ({ id, name_as_slug }) => `dashboards/${id}-${name_as_slug}`;
+export const urlForDashboard = ({ id, slug }) => `dashboards/${id}-${slug}`;
 
 export function collectDashboardFilters(dashboard, queryResults, urlParams) {
   const filters = {};
diff --git a/redash/serializers/__init__.py b/redash/serializers/__init__.py
index a9a027371b..83b1fa266b 100644
--- a/redash/serializers/__init__.py
+++ b/redash/serializers/__init__.py
@@ -245,8 +245,7 @@ def serialize_dashboard(obj, with_widgets=False, user=None, with_favorite_state=
 
     d = {
         "id": obj.id,
-        "slug": obj.slug,
-        "name_as_slug": obj.name_as_slug,
+        "slug": obj.name_as_slug,
         "name": obj.name,
         "user_id": obj.user_id,
         "user": {

From cd867a7ef9a350fbedf86fc9ca498327afbca6aa Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Mon, 13 Jul 2020 13:32:55 -0300
Subject: [PATCH 28/29] Update multiple urls Dashboard test name

---
 client/cypress/integration/dashboard/dashboard_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/cypress/integration/dashboard/dashboard_spec.js b/client/cypress/integration/dashboard/dashboard_spec.js
index 95c4337217..2410c51a1a 100644
--- a/client/cypress/integration/dashboard/dashboard_spec.js
+++ b/client/cypress/integration/dashboard/dashboard_spec.js
@@ -60,7 +60,7 @@ describe("Dashboard", () => {
   it("is accessible through multiple urls", () => {
     cy.server();
     cy.route("GET", "api/dashboards/*").as("LoadDashboard");
-    createDashboard("Foo Bar").then(({ id, slug }) => {
+    createDashboard("Dashboard multiple urls").then(({ id, slug }) => {
       [`/dashboards/${id}`, `/dashboards/${id}-anything-here`, `/dashboard/${slug}`].forEach(url => {
         cy.visit(url);
         cy.wait("@LoadDashboard");

From 212d4b452a1a0aafc83d70a5d76a958d688ce461 Mon Sep 17 00:00:00 2001
From: Gabriel Dutra <nesk.frz@gmail.com>
Date: Mon, 13 Jul 2020 14:27:02 -0300
Subject: [PATCH 29/29] Update route names

Co-authored-by: Levko Kravets <levko.ne@gmail.com>
---
 client/app/pages/dashboards/DashboardPage.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/app/pages/dashboards/DashboardPage.jsx b/client/app/pages/dashboards/DashboardPage.jsx
index 119e4c29b4..09dc062a04 100644
--- a/client/app/pages/dashboards/DashboardPage.jsx
+++ b/client/app/pages/dashboards/DashboardPage.jsx
@@ -182,7 +182,7 @@ DashboardPage.defaultProps = {
 
 // route kept for backward compatibility
 routes.register(
-  "Dashboards.ViewOrEdit",
+  "Dashboards.LegacyViewOrEdit",
   routeWithUserSession({
     path: "/dashboard/:dashboardSlug",
     render: pageProps => <DashboardPage {...pageProps} />,
@@ -190,7 +190,7 @@ routes.register(
 );
 
 routes.register(
-  "Dashboards.ViewOrEditWithId",
+  "Dashboards.ViewOrEdit",
   routeWithUserSession({
     path: "/dashboards/:dashboardId([^-]+)(-.*)?",
     render: pageProps => <DashboardPage {...pageProps} />,