[WORLDSERVICE-464] Remove sw.js for Public Services by elvinasv · Pull Request #12566 · bbc/simorgh

elvinasv · 2025-03-25T14:41:19Z

Resolves JIRA: https://jira.dev.bbc.co.uk/browse/WORLDSERVICE-464

Summary

Removes sw.js for remaining Public Services

Code changes

Removed swPath from archive and scotland configs
Updated getWorldServices util to include scotland in the publicServices list
Updated getArticleSwRegex and getSwRegex to only use WS
Updated tests

Developer Checklist

Testing

Additional Testing Steps

SW should not be accessible via the Public Service path (e.g., /news/sw.js).

Useful Links

Coding Standards
Repository use guidelines
Add Links to useful resources related to this PR if applicable.

src/app/routes/utils/regex/utils/index.js

…-for-public-service-simorgh

karinathomasbbc · 2025-03-26T09:46:03Z

src/app/routes/utils/regex/index.test.js


  const invalidRoutes = [
    '/news/sw.js',
+    '/news/articles/sw.js',


I am wondering whether to add examples of all sw paths which are now invalid, for all Public Services? Especially if we have excluded them explictly from the regex.

So this would be:

/sport/articles/sw.js

/newsround/articles/sw.js

/archive/articles/sw.js

/scotland/articles/sw.js

/naidheachdan/sgeulachdan/sw.js

Good point, updated

karinathomasbbc · 2025-03-26T09:48:32Z

src/app/routes/utils/regex/utils/index.js


+export const getArticleSwRegex = services => {
+  const serviceRegex = getServiceRegex(getWorldServices(services));
+  return `/:service(${serviceRegex})/:local(${articleLocalRegex})/sw.js`;


Given that the articleLocalRegex was for the public services, does it now make sense to remove this, and hardcode articles instead...?

Suggested change

return `/:service(${serviceRegex})/:local(${articleLocalRegex})/sw.js`;

return `/:service(${serviceRegex})/articles/sw.js`;

Good idea. Updated

karinathomasbbc · 2025-03-26T09:49:44Z

src/app/routes/utils/regex/utils/index.js

 export const getArticleManifestRegex = services => {
  const serviceRegex = getServiceRegex(getWorldServices(services));
  return `/:service(${serviceRegex})/:local(${articleLocalRegex})/manifest.json`;


~~This is potentially out of scope (or is it? - Let's get a second opinion!)~~ Let's do this while we're here: per my comment above anything that uses getWorldServices no longer needs articleLocalRegex. If we did change it, we would also need to update some tests.

(Note that this we recently removed manifest paths from Public Services, and we just missed this.

Suggested change

export const getArticleManifestRegex = services => {

const serviceRegex = getServiceRegex(getWorldServices(services));

return `/:service(${serviceRegex})/:local(${articleLocalRegex})/manifest.json`;

export const getArticleManifestRegex = services => {

const serviceRegex = getServiceRegex(getWorldServices(services));

return `/:service(${serviceRegex})/articles/manifest.json`;

That makes sense. Updated

Isabella-Mitchell

Looks good - one thing I noticed is we have some e2e tests which mention service worker in cypress/e2e/application/index.js. Will these be impacted? I'm taking a look to understand when we run these...

karinathomasbbc · 2025-03-26T10:09:02Z

Looks good - one thing I noticed is we have some e2e tests which mention service worker in cypress/e2e/application/index.js. Will these be impacted? I'm taking a look to understand when we run these...

Ohhh that's a good shout, I had forgotten about that. I think we might not need to do anything, as these tests had already been removed for Public Services. I would have expected the Cypress tests to fail if we deleted something & didn't clean up the tests accordingly.

…update tests

…-for-public-service-simorgh

…ed code

…-for-public-service-simorgh

…unning-sw-available [WORLDSERVICE-594] Ensure application cypress tests are running to check if service worker is available

src/server/index.jsx

karinathomasbbc · 2025-03-31T13:32:00Z

src/server/index.test.jsx

  });

  describe('Service workers', () => {
-    it('should serve a file for existing service workers', async () => {


Can we make sure there's still a test for existence of /world-service/sw.js? (choose one of the world services as an example)

Oops, we should def keep it. Updated

karinathomasbbc · 2025-03-31T13:32:36Z

src/server/index.test.jsx

-      );
-    });
-
    it('should not serve a file for non-existing service workers', async () => {


Could we update this test to use one of the public services as the test (instead of some-service)

…-for-public-service-simorgh

karinathomasbbc

Great stuff, thanks for this, and for some excellent cleaning up 🧹

…-for-public-service-simorgh

refactor: remove sw.js for Public Service

023e582

elvinasv changed the title ~~[WORLDSERVICE-464] Remove sw.js for Public Service~~ [WORLDSERVICE-464] Remove sw.js for Public Services Mar 25, 2025

test: update service worker tests to reflect non-WS

c823c44

elvinasv commented Mar 25, 2025

View reviewed changes

src/app/routes/utils/regex/utils/index.js Show resolved Hide resolved

Merge branch 'latest' of github.com:bbc/simorgh into 464-remove-sw-js…

9b2989b

…-for-public-service-simorgh

elvinasv marked this pull request as ready for review March 25, 2025 16:40

elvinasv requested a review from karinathomasbbc March 25, 2025 16:40

amoore108 approved these changes Mar 26, 2025

View reviewed changes

karinathomasbbc reviewed Mar 26, 2025

View reviewed changes

Isabella-Mitchell reviewed Mar 26, 2025

View reviewed changes

elvinasv added 3 commits March 26, 2025 14:56

refactor: remove Public Service related regex for getArticleSwRegex; …

cc31758

…update tests

Merge branch 'latest' of github.com:bbc/simorgh into 464-remove-sw-js…

c210d37

…-for-public-service-simorgh

Merge branch 'latest' of github.com:bbc/simorgh into 464-remove-sw-js…

5bf38c4

…-for-public-service-simorgh

elvinasv marked this pull request as draft March 31, 2025 09:38

elvinasv added 3 commits March 31, 2025 15:30

refactor: remove getArticleSwRegex, getArticleManifestRegex and relat…

16f79f4

…ed code

Merge branch 'latest' of github.com:bbc/simorgh into 464-remove-sw-js…

643a20d

…-for-public-service-simorgh

test: re-enable e2e test; remove outdated tests

c3479eb

Isabella-Mitchell approved these changes Mar 31, 2025

View reviewed changes

elvinasv marked this pull request as ready for review March 31, 2025 13:22

Merge pull request #12583 from bbc/594-ensure-app-cypress-tests-are-r…

4f4d5bb

…unning-sw-available [WORLDSERVICE-594] Ensure application cypress tests are running to check if service worker is available

karinathomasbbc reviewed Mar 31, 2025

View reviewed changes

elvinasv added 2 commits March 31, 2025 17:56

Merge branch 'latest' of github.com:bbc/simorgh into 464-remove-sw-js…

7f46c5e

…-for-public-service-simorgh

refactor: keep sw test; remove array wrapper

2b57114

karinathomasbbc approved these changes Mar 31, 2025

View reviewed changes

Merge branch 'latest' of github.com:bbc/simorgh into 464-remove-sw-js…

0434dbc

…-for-public-service-simorgh

elvinasv merged commit 9632203 into latest Apr 1, 2025
11 checks passed

elvinasv deleted the 464-remove-sw-js-for-public-service-simorgh branch April 1, 2025 08:50

	return `/:service(${serviceRegex})/:local(${articleLocalRegex})/sw.js`;
	return `/:service(${serviceRegex})/articles/sw.js`;

Conversation

elvinasv commented Mar 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Code changes

Developer Checklist

Testing

Additional Testing Steps

Useful Links

Uh oh!

Uh oh!

karinathomasbbc Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

elvinasv Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

karinathomasbbc Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

elvinasv Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

karinathomasbbc Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elvinasv Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

Isabella-Mitchell left a comment

Choose a reason for hiding this comment

Uh oh!

karinathomasbbc commented Mar 26, 2025

Uh oh!

Uh oh!

Uh oh!

karinathomasbbc Mar 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elvinasv Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

karinathomasbbc Mar 31, 2025

Choose a reason for hiding this comment

Uh oh!

karinathomasbbc left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

elvinasv commented Mar 25, 2025 •

edited

Loading

elvinasv Mar 26, 2025 •

edited

Loading

karinathomasbbc Mar 26, 2025 •

edited

Loading

karinathomasbbc Mar 31, 2025 •

edited

Loading