From ecf4dbc9b6c3c7e072271c8594af4f17cc0aebbd Mon Sep 17 00:00:00 2001 From: Ruben Arakelyan Date: Mon, 8 Jan 2018 09:59:18 +0000 Subject: [PATCH] Link directly to content item in whitehall MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit changes the “Go to whitehall” link to point directly to the relevant content item in whitehall rather than the homepage. This is enabled by the `/by-content-id` route in whitehall. --- spec/javascripts/external_links_spec.js | 3 ++- src/popup/external_links.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/javascripts/external_links_spec.js b/spec/javascripts/external_links_spec.js index 6142a4e..e3427de 100644 --- a/spec/javascripts/external_links_spec.js +++ b/spec/javascripts/external_links_spec.js @@ -137,6 +137,7 @@ describe("Popup.generateExternalLinks", function () { it("generates edit links for Whitehall items", function () { var contentItem = { + content_id: '4d8568c4-67f2-48da-a578-5ac6f35b69b4', publishing_app: 'whitehall' } @@ -144,7 +145,7 @@ describe("Popup.generateExternalLinks", function () { expect(links).toContain({ name: 'Go to Whitehall Publisher', - url: 'https://whitehall-admin.publishing.service.gov.uk/' + url: 'https://whitehall-admin.publishing.service.gov.uk/government/admin/by-content-id/4d8568c4-67f2-48da-a578-5ac6f35b69b4' }) }) diff --git a/src/popup/external_links.js b/src/popup/external_links.js index f7d0e1d..3c85c5c 100644 --- a/src/popup/external_links.js +++ b/src/popup/external_links.js @@ -96,7 +96,7 @@ function generateEditLink(contentItem, env) { } else if (contentItem.publishing_app == 'whitehall') { return { name: 'Go to Whitehall Publisher', - url: env.protocol + '://whitehall-admin.' + env.serviceDomain + '/', + url: env.protocol + '://whitehall-admin.' + env.serviceDomain + '/government/admin/by-content-id/' + contentItem.content_id, } } else if (contentItem.document_type == 'manual') { return {