Skip to content

Commit

Permalink
🔨 Fix explorer edit link issue
Browse files Browse the repository at this point in the history
  • Loading branch information
danyx23 committed Nov 4, 2024
1 parent cd7bcf8 commit 9e1b440
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
3 changes: 3 additions & 0 deletions explorer/Explorer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ export class Explorer
...this.explorerProgram.grapherConfigOnlyGrapherProps,
bakedGrapherURL: BAKED_GRAPHER_URL,
dataApiUrl: DATA_API_URL,
adminBaseUrl: ADMIN_BASE_URL,
hideEntityControls: this.showExplorerControls,
manuallyProvideData: false,
}
Expand Down Expand Up @@ -606,6 +607,7 @@ export class Explorer
...this.explorerProgram.grapherConfigOnlyGrapherProps,
bakedGrapherURL: BAKED_GRAPHER_URL,
dataApiUrl: DATA_API_URL,
adminBaseUrl: ADMIN_BASE_URL,
hideEntityControls: this.showExplorerControls,
manuallyProvideData: false,
}
Expand Down Expand Up @@ -757,6 +759,7 @@ export class Explorer
...this.explorerProgram.grapherConfigOnlyGrapherProps,
bakedGrapherURL: BAKED_GRAPHER_URL,
dataApiUrl: DATA_API_URL,
adminBaseUrl: ADMIN_BASE_URL,
hideEntityControls: this.showExplorerControls,
manuallyProvideData: true,
}
Expand Down
14 changes: 3 additions & 11 deletions packages/@ourworldindata/grapher/src/core/Grapher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -882,18 +882,10 @@ export class Grapher
}

@computed get editUrl(): string | undefined {
const yColumnSlugs = this.yColumnSlugs
if (this.showAdminControls) {
// This is a workaround to make the edit button work for MDims. We
// probably want to do this in a more general way.
if (window._OWID_MULTI_DIM_PROPS) {
const varId = yColumnSlugs[0]

return `${this.adminBaseUrl ?? ""}/admin/variables/${varId}/config`
} else
return `${this.adminBaseUrl}/admin/${
this.manager?.editUrl ?? `charts/${this.id}/edit`
}`
return `${this.adminBaseUrl}/admin/${
this.manager?.editUrl ?? `charts/${this.id}/edit`
}`
}
return undefined
}
Expand Down

0 comments on commit 9e1b440

Please sign in to comment.