feat: add new campaign redirect routes to events & sports apps

Clarify the redirect route usage in events app by moving non-campaign
redirect routes to redirectNonCampaignRoutes.config.js and creating
redirectCampaignRoutes.config.js for the campaign redirect routes.

Also fix linting in events & sports apps by removing unused loading
variables.

refs TH-1369

Author: karisal-anders

apps/events-helsinki/next.config.js

@@ -1,21 +1,38 @@
 const packageJson = require('./package.json');
 const i18nRoutes = require('./i18nRoutes.config');
-const redirectRoutes = require('./redirectRoutes.config');
+const redirectCampaignRoutes = require('./redirectCampaignRoutes.config');
+const redirectNonCampaignRoutes = require('./redirectNonCampaignRoutes.config');
 const { i18n } = require('./next-i18next.config');
 const nextBaseConfig = require('../../next.base.config');
 
+const campaignRedirects = Object.entries(redirectCampaignRoutes).flatMap(
+  ([source, destination]) => [
+    {
+      // Not setting `locale: false` here because that didn't work for some reason.
+      // When locale is left undefined middleware.ts's prefixDefaultLocale function
+      // lets these redirect routes through without prefixing them with locale.
+      source,
+      destination,
+      permanent: false,
+    },
+  ]
+);
+
+const nonCampaignRedirects = Object.entries(redirectNonCampaignRoutes).flatMap(
+  ([destination, sources]) =>
+    sources.map(({ source, locale }) => ({
+      destination,
+      source: `/${locale}${source}`,
+      locale: false,
+      permanent: false,
+    }))
+);
+
 module.exports = nextBaseConfig({
   packageJson,
   i18nRoutes,
   i18n,
   async redirects() {
-    return Object.entries(redirectRoutes).flatMap(([destination, sources]) =>
-      sources.map(({ source, locale }) => ({
-        destination,
-        source: `/${locale}${source}`,
-        locale: false,
-        permanent: false,
-      }))
-    );
+    return [...campaignRedirects, ...nonCampaignRedirects];
   },
 });

apps/events-helsinki/redirectCampaignRoutes.config.js

@@ -0,0 +1,14 @@
+// Ignore prettier in order to preserve readability of the routes:
+// prettier-ignore
+const redirectCampaignRoutes = {
+  // Finnish locale versions
+  '/maaginen': '/fi/articles/yleinen/maaginen-viikko-helsingin-kirjastoissa',
+
+  // Swedish locale versions
+  // None yet
+
+  // English locale versions
+  // None yet
+};
+
+module.exports = redirectCampaignRoutes;

…events-helsinki/redirectRoutes.config.js …inki/redirectNonCampaignRoutes.config.jsapps/events-helsinki/redirectRoutes.config.js renamed to apps/events-helsinki/redirectNonCampaignRoutes.config.js apps/events-helsinki/redirectRoutes.config.js renamed to apps/events-helsinki/redirectNonCampaignRoutes.config.js

@@ -1,4 +1,4 @@
-const redirectRoutes = {
+const redirectNonCampaignRoutes = {
   '/fi': [{ source: '/home', locale: 'fi' }],
   '/sv': [{ source: '/home', locale: 'sv' }],
   '/en': [{ source: '/home', locale: 'en' }],
@@ -7,4 +7,4 @@ const redirectRoutes = {
   '/en/search': [{ source: '/events', locale: 'en' }],
 };
 
-module.exports = redirectRoutes;
+module.exports = redirectNonCampaignRoutes;

apps/events-helsinki/src/pages/articles/[...slug].tsx

@@ -75,13 +75,12 @@ const NextCmsArticle: NextPage<{
 
   const { footerMenu } = useContext(NavigationContext);
 
-  const { data: categoriesData, loading: loadingCategories } =
-    useCategoriesQuery({
-      variables: {
-        first: CATEGORIES_AMOUNT,
-        language: getLanguageCodeFilter(currentLanguageCode),
-      },
-    });
+  const { data: categoriesData } = useCategoriesQuery({
+    variables: {
+      first: CATEGORIES_AMOUNT,
+      language: getLanguageCodeFilter(currentLanguageCode),
+    },
+  });
 
   const categories = categoriesData?.categories?.nodes ?? [];
 

apps/sports-helsinki/redirectCampaignRoutes.config.js

@@ -32,6 +32,7 @@ const redirectRoutes = {
   '/liikuntatilavaraukset': '/fi/pages/liikuntatilojen-varaaminen',
   '/maksut': '/fi/pages/maksut-ja-hinnasto',
   '/vertaisohjatut': '/fi/pages/ohjattu-liikunta/vertaisohjatut-liikuntaryhmat',
+  '/arkipäivätuote': '/fi/articles/yleinen/uusi-arkipaivatuote-helsingin-liikuntapalveluiden-valikoimaan',
   // Swedish locale versions
   '/biblioteks-motion': '/sv/articles/aldre/gor-motion-till-en-rutin-i-ditt-liv-delta-i-biblioteksmotionen-for-aldre-manniskor',
   '/barn-och-familjer': '/sv/sidor/malgrupper/barn-och-familjer',
@@ -59,6 +60,7 @@ const redirectRoutes = {
   '/idrottslek-for-familjer': '/sv/pages/malgrupper/barn-och-familjer/perhehulinat-idrottslek-for-familjer-pa-egen-hand',
   '/bokning-av-idrottsutrymmen': '/sv/pages/bokning-av-idrottsutrymmen',
   '/priser': '/sv/pages/priser',
+  '/vardagsprodukt': '/sv/articles/vuxna/ny-vardagsprodukt-i-helsingfors-idrottstjansters-utbud',
   // English locale versions
   '/library-exercise': '/en/articles/seniors/make-exercise-a-routine-for-yourself-join-the-library-exercise-for-seniors',
   '/children-and-families': '/en/pages/target-groups/children-and-families',
@@ -86,6 +88,7 @@ const redirectRoutes = {
   '/family-sports-sessions': '/en/pages/target-groups/children-and-families/perhehulinat-family-sports-sessions-self-guided',
   '/reservation-of-sports-facilities': '/en/pages/reservation-of-sports-facilities',
   '/pricing': '/en/pages/pricing',
+  '/weekdayproduct': '/en/articles/adults/helsinki-sports-services-launching-new-weekday-product',
 };
 
 module.exports = redirectRoutes;

apps/sports-helsinki/src/pages/articles/[...slug].tsx

@@ -74,13 +74,12 @@ const NextCmsArticle: NextPage<{
   const { resilientT } = useResilientTranslation();
   const { footerMenu } = useContext(NavigationContext);
 
-  const { data: categoriesData, loading: loadingCategories } =
-    useCategoriesQuery({
-      variables: {
-        first: CATEGORIES_AMOUNT,
-        language: getLanguageCodeFilter(currentLanguageCode),
-      },
-    });
+  const { data: categoriesData } = useCategoriesQuery({
+    variables: {
+      first: CATEGORIES_AMOUNT,
+      language: getLanguageCodeFilter(currentLanguageCode),
+    },
+  });
 
   const categories = categoriesData?.categories?.nodes ?? [];