From 18e5f378c6188755834a8c3a36a52d5f4acbeaf8 Mon Sep 17 00:00:00 2001
From: Takala Joeli A <joelitak@lx3-981-28087.ad.helsinki.fi>
Date: Thu, 3 Oct 2024 11:18:11 +0300
Subject: [PATCH 1/5] Search bar language selector according to the vocabulary
 config languages

---
 resource/js/vocab-search.js |  2 +-
 src/view/scripts.inc.twig   | 40 +++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/resource/js/vocab-search.js b/resource/js/vocab-search.js
index de57f8580..e7e6b6528 100644
--- a/resource/js/vocab-search.js
+++ b/resource/js/vocab-search.js
@@ -18,7 +18,7 @@ const vocabSearch = Vue.createApp({
     this.languages = window.SKOSMOS.languageOrder
     this.selectedLanguage = this.parseSearchLang()
     this.searchCounter = 0 // used for matching the query and the response in case there are many responses
-    this.languageStrings = window.SKOSMOS.language_strings[window.SKOSMOS.lang] ?? window.SKOSMOS.language_strings.en
+    this.languageStrings = window.SKOSMOS.language_strings
     this.msgs = window.SKOSMOS.msgs[window.SKOSMOS.lang] ?? window.SKOSMOS.msgs.en
     this.renderedResultsList = []
     this.showNotation = window.SKOSMOS.showNotation
diff --git a/src/view/scripts.inc.twig b/src/view/scripts.inc.twig
index 0b448c4b1..5a4e82424 100644
--- a/src/view/scripts.inc.twig
+++ b/src/view/scripts.inc.twig
@@ -1,6 +1,29 @@
 <!-- Skosmos variables passed from the backend to the frontend code-->
 <!-- NB: Do not add comments inside the JS object as it would break JSON parsing -->
 <script id="skosmos-global-vars">
+{% set mockup_translations = {
+    "fi": {
+        "fi": "suomi",
+        "en": "englanti",
+        "se": "pohjoissaame",
+        "sv": "ruotsi",
+        "all": "kaikilla kielillä"
+    },
+    "sv": {
+        "fi": "finska",
+        "en": "engelska",
+        "se": "nordsamiska",
+        "sv": "svenska",
+        "all": "på alla språk"
+    },
+    "en": {
+        "fi": "Finnish",
+        "en": "English",
+        "se": "Northern Sami",
+        "sv": "Swedish",
+        "all": "In all languages"
+    }
+} %}
 window.SKOSMOS = {
   "content_lang": "{{ request.contentLang }}",
   "explicitLangCodes": {{ explicit_langcodes ? "true" : "false" }},
@@ -33,21 +56,8 @@ window.SKOSMOS = {
   },
   {%- endif -%}
   "baseHref": "{{ BaseHref }}",
-  "language_strings": { "fi": { "fi": "suomi",
-                                "en": "englanti",
-                                "se": "pohjoissaame",
-                                "sv": "ruotsi",
-                                "all": "kaikilla kielillä"},
-                        "sv": { "fi": "finska",
-                                "en": "engelska",
-                                "se": "nordsamiska",
-                                "sv": "svenska",
-                                "all": "på alla språk"},
-                        "en": { "fi": "Finnish",
-                                "en": "English",
-                                "se": "Northern Sami",
-                                "sv": "Swedish",
-                                "all": "In all languages"}},
+  "language_strings": { {% for lang in request.vocab.config.languages %}"{{ lang }}": "{{ mockup_translations[request.lang][lang] }}", {% endfor -%}
+                      "all": "{{ mockup_translations[request.lang].all }}" },
   "msgs" : { "fi": { "No results": "Ei hakutuloksia",
                      "http://www.yso.fi/onto/yso-meta/Concept": "Yleiskäsite",
                      "http://www.yso.fi/onto/yso-meta/Hierarchy": "Hierarkisoiva käsite",

From 78924aee65be8bdeb376825799bca479d822a47a Mon Sep 17 00:00:00 2001
From: Joeli Takala <joeli.takala@helsinki.fi>
Date: Thu, 3 Oct 2024 13:19:48 +0300
Subject: [PATCH 2/5] Expose vocabulary config languages to SKOSMOS object for
 front end testing

---
 src/view/scripts.inc.twig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/view/scripts.inc.twig b/src/view/scripts.inc.twig
index 5a4e82424..670c6a716 100644
--- a/src/view/scripts.inc.twig
+++ b/src/view/scripts.inc.twig
@@ -35,6 +35,7 @@ window.SKOSMOS = {
   "uri": "{{ concept.uri }}",
   {% endif %}
   {%- if request.vocab ~%}
+  "languages": [{% for lang in request.vocab.config.languages %}"{{ lang }}"{% if not loop.last %}, {% endif %}{% endfor %}],
   "languageOrder": [{% for lang in request.vocab.config.languageOrder(request.contentLang) %}"{{ lang }}"{% if not loop.last %}, {% endif %}{% endfor %}],
   "showNotation": {{ request.vocab.config.showNotation ? "true" : "false" }},
   "sortByNotation": {% if request.vocab.config.sortByNotation %}"{{ request.vocab.config.sortByNotation }}"{% else %}null{% endif ~%},

From 1b519bccde07f4fa7d4e87ab212c11e1b08c3ac9 Mon Sep 17 00:00:00 2001
From: Joeli Takala <joeli.takala@helsinki.fi>
Date: Thu, 3 Oct 2024 13:21:28 +0300
Subject: [PATCH 3/5] Added tests for the contents of the search bar language
 menu

Translations can be maintained with the Symfony-Lokalise combination (pull, push, extract)  but not yet by extracting from Vue code (#1648)

At first, there was some uncertainty about whether the system was actually updating the data correctly (deletion in Lokalise -> deletion locally as well), but it seems that it worked correctly after all. Although the feature branch can be merged, further testing should still be done just to be sure.

Add cypress tests for alphabetical index + add new test vocab

Add cypress test for alt labels

Add cypress files for alphabetical index and hierarchy

Move alphabetical index cypress tests from vocab-home.cy.js + add checks for spinners

Change test vocab name

Fix uriSpace

Fix uri space in test vocab
---
 tests/cypress/template/vocab-search-bar.cy.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/cypress/template/vocab-search-bar.cy.js b/tests/cypress/template/vocab-search-bar.cy.js
index dd759d530..736022d1b 100644
--- a/tests/cypress/template/vocab-search-bar.cy.js
+++ b/tests/cypress/template/vocab-search-bar.cy.js
@@ -53,6 +53,23 @@ describe('Vocab search bar', () => {
       cy.url().should('include', 'clang=sv');
     })
 
+    it('available search languages are the ones described in the vocabulary config', () => {
+      cy.visit('/yso/en/') // go to the YSO home page in English language
+
+      // check that the vocabulary languages can be found in the search bar language dropdown menu
+      cy.window().then((win) => {
+        cy.get('#language-list .dropdown-item').then($elements => {
+          const actualLanguages = $elements.map((index, el) => Cypress.$(el).attr('value')).get();
+
+          // The expected languages should be those found in vocabulary configuration with an additional 'all' language
+          const expectedLanguages = [...win.SKOSMOS.languages, 'all'];
+
+          // The two language lists should be of equal length and all of the expected languages can be found
+          expect(expectedLanguages).to.have.lengthOf(actualLanguages.length);
+          expectedLanguages.forEach(lang => { expect(actualLanguages).to.include(lang); });
+        })
+      })
+    })
   });
 
   describe('Autocomplete', () => {

From a5b94f28c9001566cdbc4b4e74c9b95fe9bc66a8 Mon Sep 17 00:00:00 2001
From: Joeli Takala <joeli.takala@helsinki.fi>
Date: Tue, 8 Oct 2024 11:17:58 +0300
Subject: [PATCH 4/5] Removed the language list from SKOSMOS object and
 hardcoded the relevant cypress test to avoid a false positive test result

---
 src/view/scripts.inc.twig                     | 1 -
 tests/cypress/template/vocab-search-bar.cy.js | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/view/scripts.inc.twig b/src/view/scripts.inc.twig
index 670c6a716..5a4e82424 100644
--- a/src/view/scripts.inc.twig
+++ b/src/view/scripts.inc.twig
@@ -35,7 +35,6 @@ window.SKOSMOS = {
   "uri": "{{ concept.uri }}",
   {% endif %}
   {%- if request.vocab ~%}
-  "languages": [{% for lang in request.vocab.config.languages %}"{{ lang }}"{% if not loop.last %}, {% endif %}{% endfor %}],
   "languageOrder": [{% for lang in request.vocab.config.languageOrder(request.contentLang) %}"{{ lang }}"{% if not loop.last %}, {% endif %}{% endfor %}],
   "showNotation": {{ request.vocab.config.showNotation ? "true" : "false" }},
   "sortByNotation": {% if request.vocab.config.sortByNotation %}"{{ request.vocab.config.sortByNotation }}"{% else %}null{% endif ~%},
diff --git a/tests/cypress/template/vocab-search-bar.cy.js b/tests/cypress/template/vocab-search-bar.cy.js
index 736022d1b..f7a5c8d8d 100644
--- a/tests/cypress/template/vocab-search-bar.cy.js
+++ b/tests/cypress/template/vocab-search-bar.cy.js
@@ -61,8 +61,7 @@ describe('Vocab search bar', () => {
         cy.get('#language-list .dropdown-item').then($elements => {
           const actualLanguages = $elements.map((index, el) => Cypress.$(el).attr('value')).get();
 
-          // The expected languages should be those found in vocabulary configuration with an additional 'all' language
-          const expectedLanguages = [...win.SKOSMOS.languages, 'all'];
+          const expectedLanguages = ['fi', 'sv', 'se', 'en', 'all'];
 
           // The two language lists should be of equal length and all of the expected languages can be found
           expect(expectedLanguages).to.have.lengthOf(actualLanguages.length);

From 2a1fa7b86a1fcafda07b660531b9dca17eac467e Mon Sep 17 00:00:00 2001
From: Joeli Takala <joeli.takala@helsinki.fi>
Date: Wed, 9 Oct 2024 09:43:37 +0300
Subject: [PATCH 5/5] Fixed the cookie name

---
 src/controller/WebController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controller/WebController.php b/src/controller/WebController.php
index bfb5d57ce..39d53b403 100644
--- a/src/controller/WebController.php
+++ b/src/controller/WebController.php
@@ -79,8 +79,8 @@ public function __construct($model)
     public function guessLanguage($request, $vocid = null)
     {
         // 1. select language based on SKOSMOS_LANGUAGE cookie
-        $languageCookie = $request->getCookie('SKOSMOS_LANGUAGE');
-        if ($languageCookie) {
+        $languageCookie = $request->getCookie('SKOSMOS_SEARCH_LANG');
+        if ($languageCookie && $languageCookie != 'all') {
             return $languageCookie;
         }