Skip to content
Snippets Groups Projects
Unverified Commit 39864ba4 authored by Tom Robinson's avatar Tom Robinson
Browse files

Fix public link URLs

parent 9e11bad0
No related branches found
No related tags found
No related merge requests found
......@@ -152,7 +152,7 @@ export const PublicLinksDashboardListing = () =>
revoke={DashboardApi.deletePublicLink}
type='Public Dashboard Listing'
getUrl={({ id }) => Urls.dashboard(id)}
getPublicUrl={({ public_uuid }) => window.location.origin + Urls.publicDashboard(public_uuid)}
getPublicUrl={({ public_uuid }) => Urls.publicDashboard(public_uuid)}
noLinksMessage="No dashboards have been publicly shared yet."
/>;
......@@ -162,7 +162,7 @@ export const PublicLinksQuestionListing = () =>
revoke={CardApi.deletePublicLink}
type='Public Card Listing'
getUrl={({ id }) => Urls.question(id)}
getPublicUrl={({ public_uuid }) => window.location.origin + Urls.publicCard(public_uuid)}
getPublicUrl={({ public_uuid }) => Urls.publicCard(public_uuid)}
noLinksMessage="No questions have been publicly shared yet."
/>;
......
......@@ -32,7 +32,7 @@ export default class DashboardEmbedWidget extends Component {
onDisablePublicLink={() => deletePublicLink(dashboard)}
onUpdateEnableEmbedding={(enableEmbedding) => updateEnableEmbedding(dashboard, enableEmbedding)}
onUpdateEmbeddingParams={(embeddingParams) => updateEmbeddingParams(dashboard, embeddingParams)}
getPublicUrl={({ public_uuid }) => window.location.origin + Urls.publicDashboard(public_uuid)}
getPublicUrl={({ public_uuid }) => Urls.publicDashboard(public_uuid)}
/>
);
}
......
import { serializeCardForUrl } from "metabase/lib/card";
import MetabaseSettings from "metabase/lib/settings"
// provides functions for building urls to things we care about
......@@ -59,11 +60,13 @@ export function label(label) {
}
export function publicCard(uuid, type = null) {
return `/public/question/${uuid}` + (type ? `.${type}` : ``);
const siteUrl = MetabaseSettings.get("site-url");
return `${siteUrl}/public/question/${uuid}` + (type ? `.${type}` : ``);
}
export function publicDashboard(uuid) {
return `/public/dashboard/${uuid}`;
const siteUrl = MetabaseSettings.get("site-url");
return `${siteUrl}/public/dashboard/${uuid}`;
}
export function embedCard(token, type = null) {
......
......@@ -32,7 +32,7 @@ export default class QuestionEmbedWidget extends Component {
onDisablePublicLink={() => deletePublicLink(card)}
onUpdateEnableEmbedding={(enableEmbedding) => updateEnableEmbedding(card, enableEmbedding)}
onUpdateEmbeddingParams={(embeddingParams) => updateEmbeddingParams(card, embeddingParams)}
getPublicUrl={({ public_uuid }, extension) => window.location.origin + Urls.publicCard(public_uuid, extension)}
getPublicUrl={({ public_uuid }, extension) => Urls.publicCard(public_uuid, extension)}
extensions={["csv", "json"]}
/>
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment