Added content language parameter to autocomplete result links, inc. tests

Author: joelit

resource/js/vocab-search.js

@@ -143,6 +143,9 @@ const vocabSearch = Vue.createApp({
         if ('uri' in result) { // create relative Skosmos page URL from the search result URI
           result.pageUrl = window.SKOSMOS.vocab + '/' + window.SKOSMOS.lang + '/page?'
           const urlParams = new URLSearchParams({ uri: result.uri })
+          if (this.selectedLanguage !== window.SKOSMOS.lang) { // add content language parameter
+            urlParams.append('clang', this.selectedLanguage)
+          }
           result.pageUrl += urlParams.toString()
         }
         // render search result renderedTypes

tests/cypress/template/vocab-search-bar.cy.js

@@ -156,6 +156,24 @@ describe('Vocab search bar', () => {
       cy.get('#main-container').click({ force: true }); // using force true to click on elements not considered actionable
       cy.get('#search-autocomplete-results').should('not.be.visible'); // the autocomplete should disappear
     })
+    it('Search language parameter is passed to the autocomplete result links', () => {
+      cy.visit('/yso/sv/')
+
+      // Choose 'fi' for search & content language
+      cy.get('#language-selector .dropdown-toggle').click();
+      cy.get('#language-list .dropdown-item').contains('finska').click();
+
+      // Searchg for 'kissa'
+      cy.get('#search-field').type('aarre');
+      cy.get('#search-autocomplete-results', { timeout: 20000 }).should('be.visible'); // the autocomplete should appear
+
+      // Click the first search result
+      cy.get('#search-autocomplete-results li:first-child a').click();
+
+      // The language parameters should persist on the concept page
+      cy.url().should('include', '/sv/');
+      cy.url().should('include', 'clang=fi');
+    })
   });
 
   describe('Search Result Rendering', () => {