Merge branch 'main' into w2p-119612_export-item-limit

atmire · Jan 24, 2025 · 2a39bd8 · 2a39bd8
2 parents b69b21a + d653c01
commit 2a39bd8
Show file tree

Hide file tree

Showing 76 changed files with 1,640 additions and 489 deletions.
diff --git a/config/config.example.yml b/config/config.example.yml
@@ -23,6 +23,16 @@ ssr:
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
+  # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/' ]
+  # Whether to enable rendering of Search component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableSearchComponent: false,
+  # Whether to enable rendering of Browse component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableBrowseComponent: false,
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
@@ -448,6 +458,12 @@ search:
     enabled: false
     # List of filters to enable in "Advanced Search" dropdown
     filter: [ 'title', 'author', 'subject', 'entityType' ]
+  #
+  # Number used to render n UI elements called loading skeletons that act as placeholders.
+  # These elements indicate that some content will be loaded in their stead.
+  # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+  # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+  defaultFiltersCount: 5
 
 
 # Notify metrics

diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu

diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -37,6 +39,7 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu

diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
@@ -9,6 +9,7 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
@@ -23,6 +24,7 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu