From d27982cea01a8a63f439b4f24b112177f37c502a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atte=20Kein=C3=A4nen?= <atte.keinanen@gmail.com>
Date: Tue, 9 May 2017 12:01:34 -0700
Subject: [PATCH] Extract card adding url to urls.js [ci e2e]
---
frontend/src/metabase/containers/AddToDashSelectDashModal.jsx | 2 +-
frontend/src/metabase/lib/urls.js | 4 ++++
frontend/test/e2e/dashboards/dashboards.utils.js | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/frontend/src/metabase/containers/AddToDashSelectDashModal.jsx b/frontend/src/metabase/containers/AddToDashSelectDashModal.jsx
index 31df0ab2ccf..a900ea345e6 100644
--- a/frontend/src/metabase/containers/AddToDashSelectDashModal.jsx
+++ b/frontend/src/metabase/containers/AddToDashSelectDashModal.jsx
@@ -45,7 +45,7 @@ export default class AddToDashSelectDashModal extends Component {
addToDashboard = (dashboard: Dashboard) => {
// we send the user over to the chosen dashboard in edit mode with the current card added
- this.props.onChangeLocation(Urls.dashboard(dashboard.id)+"#add="+this.props.card.id);
+ this.props.onChangeLocation(Urls.dashboardWithAddCard(dashboard.id, this.props.card.id));
}
createDashboard = async(newDashboard: Dashboard) => {
diff --git a/frontend/src/metabase/lib/urls.js b/frontend/src/metabase/lib/urls.js
index 9b3912b11d7..afb4f42f9b2 100644
--- a/frontend/src/metabase/lib/urls.js
+++ b/frontend/src/metabase/lib/urls.js
@@ -27,6 +27,10 @@ export function dashboard(dashboardId) {
return `/dashboard/${dashboardId}`;
}
+export function dashboardWithAddCard(dashboardId, cardId) {
+ return `/dashboard/${dashboardId}#add=${cardId}`;
+}
+
export function modelToUrl(model, modelId) {
switch (model) {
case "card":
diff --git a/frontend/test/e2e/dashboards/dashboards.utils.js b/frontend/test/e2e/dashboards/dashboards.utils.js
index ab790367caa..f5e6a102025 100644
--- a/frontend/test/e2e/dashboards/dashboards.utils.js
+++ b/frontend/test/e2e/dashboards/dashboards.utils.js
@@ -3,7 +3,6 @@ export const incrementDashboardCount = () => {
dashboardCount += 1;
}
export const getLatestDashboardUrl = () => {
- console.log(`/dashboard/${dashboardCount}`)
return `/dashboard/${dashboardCount}`
}
export const getPreviousDashboardUrl = (nFromLatest) => {
--
GitLab