Merge pull request #561 from geonetwork/misc-fixes-for-1.1

Misc. fixes for 1.1 release

.gitignore

@@ -46,3 +46,5 @@ Thumbs.db
 
 docs/.vitepress/dist
 docs/.vitepress/cache
+
+apps/*-e2e/cypress/**

apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts

@@ -72,7 +72,7 @@ describe('dataset pages', () => {
           .children('header')
           .find('gn-ui-navigation-button')
           .click()
-        cy.url().should('include', '/home/search')
+        cy.url().should('include', '/search')
       })
     })
     describe('navigation bar', () => {
@@ -110,18 +110,19 @@ describe('dataset pages', () => {
         cy.get('gn-ui-record-metadata')
           .find('[id="about"]')
           .find('gn-ui-metadata-contact')
-          .children('div')
-          .children('div')
-          .children('div')
-          .should('have.length', 2)
+          .should('have.length', 1)
         cy.get('gn-ui-record-metadata')
           .find('[id="about"]')
           .find('gn-ui-metadata-contact')
           .children('div')
-          .children('p')
+          .children('a')
           .eq(1)
           .invoke('text')
           .should('include', '@')
+        cy.get('gn-ui-record-metadata')
+          .find('[id="about"]')
+          .find('gn-ui-metadata-catalog')
+          .should('have.length', 1)
       })
       it('should display the catalog details', () => {
         cy.get('gn-ui-record-metadata')
@@ -180,7 +181,7 @@ describe('dataset pages', () => {
           .children('div')
           .first()
           .click()
-        cy.url().should('include', '/home/search?publisher=')
+        cy.url().should('include', '/search?publisher=')
       })
       it('should go to dataset search page when clicking on keyword and filter by keyword', () => {
         cy.get('gn-ui-record-metadata')
@@ -197,7 +198,7 @@ describe('dataset pages', () => {
           .then((key) => {
             keyword = key.text().toUpperCase()
             cy.get('@keyword').click()
-            cy.url().should('include', '/home/search?q=')
+            cy.url().should('include', '/search?q=')
             cy.get('gn-ui-fuzzy-search')
               .find('input')
               .should('have.value', keyword)
@@ -417,8 +418,10 @@ describe('dataset pages', () => {
           .find('button')
           .first()
           .click({ force: true })
-        cy.get('body')
-          .click()
+        cy.wait(500)
+          .get('body')
+          .focus()
+          .realClick()
           .window()
           .then((win) => {
             win.navigator.clipboard.readText().then((text) => {

apps/datahub-e2e/src/e2e/datasets.cy.ts

@@ -4,7 +4,7 @@ import { find } from 'cypress/types/lodash'
 
 describe('datasets', () => {
   beforeEach(() => {
-    cy.visit('/home/search')
+    cy.visit('/search')
     cy.viewport(1700, 1200)
   })
 
@@ -39,7 +39,7 @@ describe('datasets', () => {
 
   describe('display of dataset previews', () => {
     beforeEach(() => {
-      cy.get('gn-ui-record-preview-row').children('div').first().as('dataset')
+      cy.get('gn-ui-record-preview-row').children('a').first().as('dataset')
     })
     it('should display the image', () => {
       cy.get('@dataset').find('gn-ui-thumbnail').should('be.visible')
@@ -72,7 +72,7 @@ describe('datasets', () => {
 
   describe('list actions', () => {
     beforeEach(() => {
-      cy.get('gn-ui-record-preview-row').children('div').first().as('dataset')
+      cy.get('gn-ui-record-preview-row').children('a').first().as('dataset')
     })
     it('should open the dataset page on click', () => {
       cy.get('@dataset').click()
@@ -95,7 +95,7 @@ describe('datasets', () => {
           cy.get('@login').eq(1).type('admin', { force: true })
           cy.get('@login').eq(2).type('admin', { force: true })
           cy.get('[name="gnSigninForm"]').find('button').realClick()
-          cy.url().should('include', '/home/search')
+          cy.url().should('include', '/search')
           cy.get('@favoriteStar').find('span').invoke('text').as('initialCount')
           cy.get('@favoriteStar')
             .find('gn-ui-star-toggle')
@@ -122,7 +122,7 @@ describe('datasets', () => {
         .eq(1)
         .find('gn-ui-button')
         .click()
-      cy.get('@filters').filter(':visible').should('have.length', 8)
+      cy.get('@filters').filter(':visible').should('have.length', 6)
     })
     describe('have the right options in filters', () => {
       beforeEach(() => {
@@ -176,55 +176,37 @@ describe('datasets', () => {
       })
       it('should have an accurate count of data per org', () => {
         const dropdownOptions = []
-        const listOptions = []
 
-        cy.get('[id^=dropdown-multiselect-]').then((dropdown) => {
-          const options = dropdown.find('label')
-          const regex = /\(\d+\)/g
-          options.map((index, element) => {
-            dropdownOptions.push([
-              Cypress.$(element).text().replace(regex, '').trim(),
-              Number(
-                Cypress.$(element)
-                  .text()
-                  .match(regex)[0]
-                  .replace('(', '')
-                  .replace(')', '')
-              ),
-            ])
+        cy.get('[id^=dropdown-multiselect-]')
+          .find('label')
+          .each((element) => {
+            dropdownOptions.push(Cypress.$(element).text().trim())
           })
-        })
-
-        cy.get('[data-cy="recordOrg"]')
-          .invoke('text')
-          .then((value) => {
-            const listProv = value.split('  ').map((item) => item.trim())
-            const occurrences = {}
-
-            for (let i = 0; i < listProv.length; i++) {
-              const str = listProv[i]
-              occurrences[str] = occurrences[str] ? occurrences[str] + 1 : 1
-            }
-
-            for (const str in occurrences) {
-              listOptions.push([str, Number(occurrences[str])])
-            }
-
-            listOptions.forEach((item) => {
-              expect(
-                dropdownOptions.find(
-                  (opt) => opt[0] === item[0] && opt[1] === item[1]
-                )
-              ).to.not.be.undefined
-            })
+          .then(() => {
+            expect(dropdownOptions).to.eql([
+              'Agence wallonne du Patrimoine (SPW - Territoire, Logement, Patrimoine, Énergie - Agence wallonne du Patrimoine) (1)',
+              'atmo Hauts-de-France (1)',
+              'Bundesamt für Raumentwicklung (2)',
+              "Canton du Valais - Service de l'environnement (SEN) - Protection des sols (1)",
+              'Cellule informatique et géomatique (SPW - Intérieur et Action sociale - Direction fonctionnelle et d’appui) (1)',
+              "Direction de l'Action sociale (SPW - Intérieur et Action sociale - Département de l'Action sociale - Direction de l'Action sociale) (1)",
+              'DREAL (1)',
+              "DREAL HdF (Direction Régionale de l'Environnement de l'Aménagement et du Logement des Hauts de France) (54)",
+              'Géo2France (1)',
+              "Helpdesk carto du SPW (SPW - Secrétariat général - SPW Digital - Département de la Géomatique - Direction de l'Intégration des géodonnées) (2)",
+              'Métropole Européenne de Lille (1)',
+              'Région Hauts-de-France (2)',
+              'Service public de Wallonie (SPW) (2)',
+              "Société Publique de Gestion de l'Eau (SPGE) (2)",
+            ])
           })
       })
     })
 
     describe('filter the list on click on options', () => {
       let filterLength
       beforeEach(() => {
-        cy.visit('/home/search')
+        cy.visit('/search')
         cy.get('[data-cy="addMoreBtn"]').trigger('click')
         cy.get('@filters')
           .its('length')
@@ -234,7 +216,7 @@ describe('datasets', () => {
       })
       it('first option then second option', () => {
         for (let i = 0; i < filterLength; i++) {
-          cy.visit('/home/search')
+          cy.visit('/search')
           cy.get('[data-cy="addMoreBtn"]').trigger('click')
           cy.get('datahub-search-filters')
             .children('div')
@@ -306,7 +288,7 @@ describe('datasets', () => {
       })
       it('from option list', () => {
         for (let i = 0; i < filterLength; i++) {
-          cy.visit('/home/search')
+          cy.visit('/search')
           cy.get('[data-cy="addMoreBtn"]').trigger('click')
           cy.get('datahub-search-filters')
             .children('div')
@@ -352,7 +334,7 @@ describe('datasets', () => {
       })
       it('from selected options block', () => {
         for (let i = 0; i < filterLength; i++) {
-          cy.visit('/home/search')
+          cy.visit('/search')
           cy.get('[data-cy="addMoreBtn"]').trigger('click')
           cy.get('datahub-search-filters')
             .children('div')
@@ -402,7 +384,7 @@ describe('datasets', () => {
 
       it('from filter clear button', () => {
         for (let i = 0; i < filterLength; i++) {
-          cy.visit('/home/search')
+          cy.visit('/search')
           cy.get('[data-cy="addMoreBtn"]').trigger('click')
           cy.get('datahub-search-filters')
             .children('div')
@@ -451,7 +433,7 @@ describe('datasets', () => {
       })
 
       it('from cross button', () => {
-        cy.visit('/home/search')
+        cy.visit('/search')
         cy.get('[data-cy="addMoreBtn"]').realClick()
         cy.get('datahub-search-filters')
           .children('div')

apps/datahub-e2e/src/e2e/header.cy.ts

@@ -20,19 +20,19 @@ describe('header', () => {
         .find('button')
         .eq(0)
         .click({ force: true })
-      cy.url().should('include', '/home/news')
+      cy.url().should('include', '/news')
       cy.visit('/')
       cy.get('datahub-navigation-menu')
         .find('button')
         .eq(1)
         .click({ force: true })
-      cy.url().should('include', '/home/search')
+      cy.url().should('include', '/search')
       cy.visit('/')
       cy.get('datahub-navigation-menu')
         .find('button')
         .eq(2)
         .click({ force: true })
-      cy.url().should('include', '/home/organisations')
+      cy.url().should('include', '/organisations')
     })
   })
 
@@ -48,18 +48,20 @@ describe('header', () => {
     })
     it('should display the search results on click on icon', () => {
       cy.get('gn-ui-fuzzy-search').type('velo')
-      cy.get('mat-icon').contains('search').trigger('click')
+      cy.get('mat-icon')
+        .contains('search')
+        .trigger('click', { waitForAnimations: false })
       cy.get('gn-ui-record-preview-row').should('have.length', 1)
       cy.get('gn-ui-record-preview-row')
-        .find('div')
+        .find('a')
         .first()
         .should('have.attr', 'title', 'Accroches vélos MEL')
     })
     it('should display the search results on enter touch', () => {
       cy.get('gn-ui-fuzzy-search').type('velo{enter}')
       cy.get('gn-ui-record-preview-row').should('have.length', 1)
       cy.get('gn-ui-record-preview-row')
-        .find('div')
+        .find('a')
         .first()
         .should('have.attr', 'title', 'Accroches vélos MEL')
     })
@@ -78,15 +80,19 @@ describe('header', () => {
     })
     it('should delete text input on click on cancel button', () => {
       cy.get('gn-ui-fuzzy-search').type('velo')
-      cy.get('mat-icon').contains('close').trigger('click')
+      cy.get('mat-icon')
+        .contains('close')
+        .trigger('click', { waitForAnimations: false })
       cy.get('gn-ui-autocomplete')
         .find('div')
         .find('input')
         .should('have.value', '')
     })
     it('should reset search results on click on cancel button', () => {
       cy.get('gn-ui-fuzzy-search').type('velo')
-      cy.get('mat-icon').contains('close').trigger('click')
+      cy.get('mat-icon')
+        .contains('close')
+        .trigger('click', { waitForAnimations: false })
       cy.get('gn-ui-record-preview-row').should('have.length.gt', 1)
     })
   })
@@ -100,9 +106,9 @@ describe('header', () => {
     })
 
     beforeEach(() => {
-      cy.visit('/home/search')
+      cy.visit('/search')
       cy.get('gn-ui-record-preview-row').as('initialList')
-      cy.visit('/home/news')
+      cy.visit('/news')
     })
 
     it('should filter results by latest date', () => {

apps/datahub-e2e/src/e2e/home.cy.ts

@@ -62,12 +62,12 @@ describe('header', () => {
 
   describe('button link actions', () => {
     it('goes to the dataset page upon clicking', () => {
-      cy.get('[href="/home/search"]').click()
-      cy.url().should('include', '/home/search')
+      cy.get('[href="/search"]').click()
+      cy.url().should('include', '/search')
     })
     it('goes to the organisations page upon clicking', () => {
-      cy.get('[href="/home/organisations"]').click()
-      cy.url().should('include', '/home/organisations')
+      cy.get('[href="/organisations"]').click()
+      cy.url().should('include', '/organisations')
     })
   })
 })

apps/datahub-e2e/src/e2e/organisations.cy.ts

@@ -80,7 +80,7 @@ describe('organisations', () => {
         .children('span')
         .invoke('text')
         .then((txt) => {
-          providerOrg = txt.toUpperCase().trim()
+          providerOrg = txt.trim()
         })
     })
     it('should access the related datasets on click', () => {
@@ -90,7 +90,9 @@ describe('organisations', () => {
         .children('gn-ui-content-ghost')
         .eq(11)
         .click()
-      cy.url().should('include', 'publisher=').and('include', providerOrg)
+      cy.url()
+        .should('include', 'publisher=')
+        .and('include', encodeURIComponent(providerOrg))
     })
   })
 

apps/datahub/src/app/home/header-badge-button/header-badge-button.component.html

@@ -1,5 +1,5 @@
 <button
-  class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
+  class="badge-btn bg-primary-opacity-50 hover-bg-primary-opacity-100"
   [class.active]="toggled"
   (click)="toggle()"
 >

apps/datahub/src/app/home/home-header/home-header.component.html

@@ -3,7 +3,7 @@
     class="container-lg h-full mx-auto flex flex-col-reverse justify-between sm:flex-col sm:justify-end"
   >
     <div
-      class="py-8 relative z-50 mb-[184px] sm:mb-0"
+      class="py-8 relative z-40 mb-[184px] sm:mb-0"
       [style.transform]="'translate(0, ' + (1 - expandRatio) * 242 + 'px)'"
     >
       <div
@@ -70,7 +70,7 @@
     </div>
 -->
     <datahub-navigation-menu
-      class="tabs flex justify-between font-medium -mx-5 sm:mx-0 sm:mt-32 inset-x-0 bottom-0"
+      class="tabs flex justify-between font-medium -mx-5 sm:mx-0 sm:mt-32 inset-x-0 bottom-0 z-50"
       [style.opacity]="-0.6 + expandRatio * 5"
     ></datahub-navigation-menu>
   </div>