From 50ec7e378ed45d9653dd99663997e6ef0b6c5a75 Mon Sep 17 00:00:00 2001
From: qtp <phatpt8@gmail.com>
Date: Tue, 21 May 2024 11:55:31 +0200
Subject: [PATCH] f-header@v10.20.0 Stop Portugal, Romania, and New Zealand
 support & adding Slovakia country (#2529)

* Remove PT, RO, and NZ support in f-header component

* bumb

* Support Slovakia

* update icon imports
---
 .../organisms/f-header/CHANGELOG.md           |  9 +++
 .../organisms/f-header/package.json           |  2 +-
 .../f-header/src/components/FlagIcon.vue      | 48 ++++++------
 .../src/components/_tests/Header.test.js      | 14 ----
 .../f-header/src/tenants/countryList.js       | 36 +++------
 .../organisms/f-header/src/tenants/en-NZ.js   | 74 -------------------
 .../organisms/f-header/src/tenants/index.js   |  2 -
 .../f-header/stories/header.stories.js        |  2 +-
 .../accessibility/axe-accessibility.spec.js   |  1 -
 .../test/component/f-header.component.spec.js |  6 +-
 .../visual/f-header.visual.desktop.spec.js    |  2 -
 .../visual/f-header.visual.mobile.spec.js     |  2 -
 12 files changed, 44 insertions(+), 154 deletions(-)
 delete mode 100644 packages/components/organisms/f-header/src/tenants/en-NZ.js

diff --git a/packages/components/organisms/f-header/CHANGELOG.md b/packages/components/organisms/f-header/CHANGELOG.md
index f00fc54c85..6c53417785 100644
--- a/packages/components/organisms/f-header/CHANGELOG.md
+++ b/packages/components/organisms/f-header/CHANGELOG.md
@@ -3,6 +3,15 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v10.20.0
+
+_May 16, 2024_
+
+### Changed
+
+- Stop Portugal, Romania, and New Zealand support.
+- Support new country Slovakia.
+
 ## v10.19.0
 
 _March 13, 2024_
diff --git a/packages/components/organisms/f-header/package.json b/packages/components/organisms/f-header/package.json
index 955166d4df..e3b6a87364 100644
--- a/packages/components/organisms/f-header/package.json
+++ b/packages/components/organisms/f-header/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@justeat/f-header",
   "description": "Fozzie Header - Globalised Header Component",
-  "version": "10.19.0",
+  "version": "10.20.0",
   "main": "dist/f-header.umd.min.js",
   "maxBundleSize": "55kB",
   "files": [
diff --git a/packages/components/organisms/f-header/src/components/FlagIcon.vue b/packages/components/organisms/f-header/src/components/FlagIcon.vue
index f52ecdfc26..3fcd42cc27 100644
--- a/packages/components/organisms/f-header/src/components/FlagIcon.vue
+++ b/packages/components/organisms/f-header/src/components/FlagIcon.vue
@@ -4,28 +4,26 @@
 
 <script>
 import {
-    FlagAtRoundIcon as FlagIconAt,
-    FlagBeRoundIcon as FlagIconBe,
-    FlagBgRoundIcon as FlagIconBg,
-    FlagCaRoundIcon as FlagIconCa,
-    FlagChRoundIcon as FlagIconCh,
-    FlagDkRoundIcon as FlagIconDk,
-    FlagAuRoundIcon as FlagIconAu,
-    FlagFrRoundIcon as FlagIconFr,
-    FlagDeRoundIcon as FlagIconDe,
-    FlagIeRoundIcon as FlagIconIe,
-    FlagIlRoundIcon as FlagIconIl,
-    FlagItRoundIcon as FlagIconIt,
-    FlagLuRoundIcon as FlagIconLu,
-    FlagNlRoundIcon as FlagIconNl,
-    FlagNzRoundIcon as FlagIconNz,
-    FlagNoRoundIcon as FlagIconNo,
-    FlagPlRoundIcon as FlagIconPl,
-    FlagPtRoundIcon as FlagIconPt,
-    FlagRoRoundIcon as FlagIconRo,
-    FlagEsRoundIcon as FlagIconEs,
-    FlagGbRoundIcon as FlagIconGb
-} from '@justeat/f-vue-icons';
+    FlagAustriaIcon as FlagIconAt,
+    FlagAustraliaIcon as FlagIconAu,
+    FlagBelgiumIcon as FlagIconBe,
+    FlagBulgariaIcon as FlagIconBg,
+    FlagCanadaIcon as FlagIconCa,
+    FlagSwitzerlandIcon as FlagIconCh,
+    FlagDenmarkIcon as FlagIconDk,
+    FlagGermanyIcon as FlagIconDe,
+    FlagFranceIcon as FlagIconFr,
+    FlagUnitedKingdomIcon as FlagIconGb,
+    FlagIrelandIcon as FlagIconIe,
+    FlagIsraelIcon as FlagIconIl,
+    FlagItalyIcon as FlagIconIt,
+    FlagLuxemburgIcon as FlagIconLu,
+    FlagNetherlandsIcon as FlagIconNl,
+    FlagNorwayIcon as FlagIconNo,
+    FlagPolandIcon as FlagIconPl,
+    FlagSpainIcon as FlagIconEs,
+    FlagSlovakiaIcon as FlagIconSk
+} from '@justeattakeaway/pie-icons-vue';
 
 export default {
     components: {
@@ -43,13 +41,11 @@ export default {
         FlagIconIt,
         FlagIconLu,
         FlagIconNl,
-        FlagIconNz,
         FlagIconNo,
         FlagIconPl,
-        FlagIconPt,
-        FlagIconRo,
         FlagIconEs,
-        FlagIconGb
+        FlagIconGb,
+        FlagIconSk
     },
 
     props: {
diff --git a/packages/components/organisms/f-header/src/components/_tests/Header.test.js b/packages/components/organisms/f-header/src/components/_tests/Header.test.js
index d1c8c52137..0bcfe500e9 100644
--- a/packages/components/organisms/f-header/src/components/_tests/Header.test.js
+++ b/packages/components/organisms/f-header/src/components/_tests/Header.test.js
@@ -51,20 +51,6 @@ describe('Header', () => {
         expect(wrapper.attributes('data-theme')).toBe('ml');
     });
 
-    it('should render ml themed component if NZ local passed', () => {
-        // Arrange
-        const propsData = {
-            locale: 'en-NZ',
-            headerBackgroundTheme: 'transparent'
-        };
-
-        // Act
-        const wrapper = shallowMount(Header, { propsData });
-
-        // Assert
-        expect(wrapper.attributes('data-theme')).toBe('ml');
-    });
-
 
     it('should render jet themed component if shouldUseJetLogo prop is true even when there is no locale', () => {
         // Arrange
diff --git a/packages/components/organisms/f-header/src/tenants/countryList.js b/packages/components/organisms/f-header/src/tenants/countryList.js
index 1d5bad7621..af5f93d140 100644
--- a/packages/components/organisms/f-header/src/tenants/countryList.js
+++ b/packages/components/organisms/f-header/src/tenants/countryList.js
@@ -134,15 +134,6 @@ export default [
         siteUrl: 'https://www.thuisbezorgd.nl',
         gtm: 'click_country_nl'
     },
-    {
-        key: 'nz',
-        flagKey: 'nz',
-        dataTestKey: 'nz',
-        lang: 'en',
-        localisedName: 'New Zealand',
-        siteUrl: 'https://www.menulog.co.nz',
-        gtm: 'click_country_nz'
-    },
     {
         key: 'no',
         flagKey: 'no',
@@ -161,24 +152,6 @@ export default [
         siteUrl: 'https://www.pyszne.pl',
         gtm: 'click_country_pl'
     },
-    {
-        key: 'pt',
-        flagKey: 'pt',
-        dataTestKey: 'pt',
-        lang: 'pt',
-        localisedName: 'Portugal',
-        siteUrl: 'https://www.takeaway.com/pt',
-        gtm: 'click_country_pt'
-    },
-    {
-        key: 'ro',
-        flagKey: 'ro',
-        dataTestKey: 'ro',
-        lang: 'ro',
-        localisedName: 'România',
-        siteUrl: 'https://www.takeaway.com/ro',
-        gtm: 'click_country_ro'
-    },
     {
         key: 'es',
         flagKey: 'es',
@@ -214,5 +187,14 @@ export default [
         localisedName: 'Suisse',
         siteUrl: 'https://www.eat.ch/fr',
         gtm: 'click_country_ch_fr'
+    },
+    {
+        key: 'sk',
+        flagKey: 'sk',
+        dataTestKey: 'sk',
+        lang: 'sk',
+        localisedName: 'Slovakia',
+        siteUrl: 'https://www.bistro.sk/',
+        gtm: 'click_country_sk'
     }
 ];
diff --git a/packages/components/organisms/f-header/src/tenants/en-NZ.js b/packages/components/organisms/f-header/src/tenants/en-NZ.js
deleted file mode 100644
index 0a4e6a3283..0000000000
--- a/packages/components/organisms/f-header/src/tenants/en-NZ.js
+++ /dev/null
@@ -1,74 +0,0 @@
-export default {
-    locale: 'en-NZ',
-    companyName: 'Menulog',
-    openMenuText: 'Open Menu',
-    loginNoScriptLinkText: 'Account',
-    skipToMainContentText: 'Skip to main content',
-    navTitle: 'Main menu',
-
-    navLinks: {
-        accountInfo: {
-            text: 'Account info',
-            url: '/account/info',
-            gtm: 'click_account_your_account'
-        },
-        orderHistory: {
-            text: 'Orders',
-            url: '/order-history',
-            gtm: 'click_account_your_orders'
-        },
-        accountCredit: {
-            text: 'Account credit',
-            url: '/account/credit',
-            gtm: 'click_account_credit'
-        },
-        addressBook: {
-            text: 'Delivery addresses',
-            url: '/account/addressbook',
-            gtm: 'click_account_address_books'
-        }
-    },
-
-    userMenu: {
-        buttonLabel: name => `${name}'s account`
-    },
-
-    logo: {
-        gtm: 'click_logo'
-    },
-    help: {
-        text: 'Help',
-        url: '/help',
-        gtm: 'click_help'
-    },
-    accountLogin: {
-        text: 'Log in',
-        url: '/account/login',
-        gtm: 'click_login'
-    },
-    accountLogout: {
-        text: 'Log out',
-        url: '/account/logout',
-        gtm: 'click_logout'
-    },
-    deliveryEnquiry: {
-        text: 'Become a courier',
-        url: 'https://couriers.menulog.co.nz/application?utm_source=mainsite&utm_medium=Referral&utm_campaign=RC_M_WS_NZL_EN_[DELCO]_[AWRN]_[OWMD]_[English]',
-        gtm: 'click_courier_signup'
-    },
-    offers: {
-        text: 'For you',
-        url: '/offers'
-    },
-    countrySelector: {
-        selectYourCountryText: 'Select your country',
-        currentCountryKey: 'nz',
-        changeCurrentCountry: 'You are on the NZ website, click here to change',
-        goBackToMainMenu: 'Go back to main menu'
-    },
-    corporate: {
-        text: 'Corporate Ordering',
-        url: 'https://www.menulog.co.nz/business/',
-        gtm: 'click_corporate_ordering'
-    }
-};
diff --git a/packages/components/organisms/f-header/src/tenants/index.js b/packages/components/organisms/f-header/src/tenants/index.js
index 74fc2e33f1..638a0e45f3 100644
--- a/packages/components/organisms/f-header/src/tenants/index.js
+++ b/packages/components/organisms/f-header/src/tenants/index.js
@@ -1,6 +1,5 @@
 import uk from './en-GB';
 import au from './en-AU';
-import nz from './en-NZ';
 import es from './es-ES';
 import ie from './en-IE';
 import it from './it-IT';
@@ -9,7 +8,6 @@ import countries from './countryList';
 const tenantConfigs = {
     'en-GB': uk,
     'en-AU': au,
-    'en-NZ': nz,
     'es-ES': es,
     'en-IE': ie,
     'it-IT': it
diff --git a/packages/components/organisms/f-header/stories/header.stories.js b/packages/components/organisms/f-header/stories/header.stories.js
index efed18338f..3228241e26 100644
--- a/packages/components/organisms/f-header/stories/header.stories.js
+++ b/packages/components/organisms/f-header/stories/header.stories.js
@@ -64,7 +64,7 @@ HeaderComponent.argTypes = {
     locale: {
         control: { type: 'select' },
         description: 'Select a tenant',
-        options: ['en-GB', 'en-AU', 'en-IE', 'en-NZ', 'es-ES', 'it-IT']
+        options: ['en-GB', 'en-AU', 'en-IE', 'es-ES', 'it-IT']
     },
 
     headerBackgroundTheme: {
diff --git a/packages/components/organisms/f-header/test/accessibility/axe-accessibility.spec.js b/packages/components/organisms/f-header/test/accessibility/axe-accessibility.spec.js
index 5bd25ece01..6a5592b3ab 100644
--- a/packages/components/organisms/f-header/test/accessibility/axe-accessibility.spec.js
+++ b/packages/components/organisms/f-header/test/accessibility/axe-accessibility.spec.js
@@ -4,7 +4,6 @@ describe('Accessibility tests', () => {
     const locales = [
         'en-GB',
         'en-AU',
-        'en-NZ',
         'en-IE',
         'it-IT',
         'es-ES'
diff --git a/packages/components/organisms/f-header/test/component/f-header.component.spec.js b/packages/components/organisms/f-header/test/component/f-header.component.spec.js
index 49c19ceeba..1994c29527 100644
--- a/packages/components/organisms/f-header/test/component/f-header.component.spec.js
+++ b/packages/components/organisms/f-header/test/component/f-header.component.spec.js
@@ -40,15 +40,13 @@ describe('Desktop - f-header component tests', () => {
         { expectedLocale: 'it', expectedUrl: 'justeat.it' },
         { expectedLocale: 'lu', expectedUrl: 'takeaway.com/lu' },
         { expectedLocale: 'nl', expectedUrl: 'thuisbezorgd.nl' },
-        { expectedLocale: 'nz', expectedUrl: 'menulog.co.nz' },
         { expectedLocale: 'no', expectedUrl: 'just-eat.no' },
         { expectedLocale: 'pl', expectedUrl: 'pyszne.pl' },
-        { expectedLocale: 'pt', expectedUrl: 'takeaway.com/pt' },
-        { expectedLocale: 'ro', expectedUrl: 'takeaway.com/ro' },
         { expectedLocale: 'es', expectedUrl: 'just-eat.es' },
         { expectedLocale: 'ch_ch', expectedUrl: 'eat.ch' },
         { expectedLocale: 'ch_en', expectedUrl: 'eat.ch/en' },
-        { expectedLocale: 'ch_fr', expectedUrl: 'eat.ch/fr' }
+        { expectedLocale: 'ch_fr', expectedUrl: 'eat.ch/fr' },
+        { expectedLocale: 'sk', expectedUrl: 'bistro.sk' }
     ];
 
     tests.forEach(({ expectedLocale, expectedUrl }) => {
diff --git a/packages/components/organisms/f-header/test/visual/f-header.visual.desktop.spec.js b/packages/components/organisms/f-header/test/visual/f-header.visual.desktop.spec.js
index 81a969df6d..edda237adf 100644
--- a/packages/components/organisms/f-header/test/visual/f-header.visual.desktop.spec.js
+++ b/packages/components/organisms/f-header/test/visual/f-header.visual.desktop.spec.js
@@ -8,8 +8,6 @@ describe('Shared - f-header component tests', () => {
         { tenant: 'en-GB', isLoggedIn: false },
         { tenant: 'en-AU', isLoggedIn: true },
         { tenant: 'en-AU', isLoggedIn: false },
-        { tenant: 'en-NZ', isLoggedIn: true },
-        { tenant: 'en-NZ', isLoggedIn: false },
         { tenant: 'en-IE', isLoggedIn: true },
         { tenant: 'en-IE', isLoggedIn: false },
         { tenant: 'it-IT', isLoggedIn: true },
diff --git a/packages/components/organisms/f-header/test/visual/f-header.visual.mobile.spec.js b/packages/components/organisms/f-header/test/visual/f-header.visual.mobile.spec.js
index 91b87336c9..f4e0942579 100644
--- a/packages/components/organisms/f-header/test/visual/f-header.visual.mobile.spec.js
+++ b/packages/components/organisms/f-header/test/visual/f-header.visual.mobile.spec.js
@@ -8,8 +8,6 @@ describe('Shared - f-header component tests', () => {
         { tenant: 'en-GB', isLoggedIn: false },
         { tenant: 'en-AU', isLoggedIn: true },
         { tenant: 'en-AU', isLoggedIn: false },
-        { tenant: 'en-NZ', isLoggedIn: true },
-        { tenant: 'en-NZ', isLoggedIn: false },
         { tenant: 'en-IE', isLoggedIn: true },
         { tenant: 'en-IE', isLoggedIn: false },
         { tenant: 'it-IT', isLoggedIn: true },