Merge remote-tracking branch 'origin/main' into cache-bust-dynamic-configuration_contribute-main

Author: ybnd

.eslintrc.json

@@ -70,7 +70,6 @@
           "error",
           {
             "allow": [
-              "log",
               "warn",
               "dir",
               "timeLog",

.github/workflows/build.yml

@@ -123,7 +123,7 @@ jobs:
 
       # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
       - name: Login to ${{ env.DOCKER_REGISTRY }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ env.DOCKER_REGISTRY }}
           username: ${{ github.repository_owner }}

config/config.example.yml

@@ -167,6 +167,9 @@ form:
   validatorMap:
     required: required
     regex: pattern
+  # If true it enables the button "Duplicate" inside inline form groups.
+  # The button will give the possibility to duplicate the whole form section copying the metadata values as well.
+  showInlineGroupDuplicateButton: false
 
 # Notification settings
 notifications:
@@ -205,6 +208,10 @@ submission:
       # default configuration
       - name: default
         style: ''
+    # Icons that should remain visible even when no authority value is present for the metadata field.
+    # This is useful for fields where you want to display an icon regardless of whether the value has an authority link.
+    # Example: ['fas fa-user'] will show the user icon for author fields even without authority data.
+    iconsVisibleWithNoAuthority: ['fas fa-user']
     authority:
       confidence:
         # NOTE: example of configuration
@@ -383,6 +390,8 @@ communityList:
   pageSize: 20
 
 homePage:
+  # Whether to show the top footer section or not
+  showTopFooter: false
   recentSubmissions:
     # The number of item showing in recent submission components
     pageSize: 5
@@ -399,6 +408,20 @@ homePage:
 item:
   edit:
     undoTimeout: 10000 # 10 seconds
+    # Defines the security levels available for metadata fields.
+    # Each level maps to a numeric value stored on the metadata field in the backend and controls visibility of that field based on the user's role.
+    # Levels are displayed as toggle buttons in the metadata edit UI.
+    security:
+      levels:
+          - value: 0       # Public — visible to everyone
+            icon: fa fa-globe
+            color: green
+          - value: 1       # Registered users — visible to authenticated users only
+            icon: fa fa-key
+            color: orange
+          - value: 2       # Administrators only — restricted to admin users
+            icon: fa fa-lock
+            color: red
   # Show the item access status label in items lists
   showAccessStatuses: false
   bitstream:
@@ -413,7 +436,6 @@ item:
     # Metdadata list to be displayed for entities without a specific configuration
     fallbackMetdataList:
       - dc.description.abstract
-      - dc.description.note
     # Configuration for each entity type
     entityDataConfig:
       - entityType: Person
@@ -433,6 +455,8 @@ item:
         iconPosition: IdentifierSubtypesIconPositionEnum.LEFT
         link: https://ror.org
 
+  # Enable authority based relations in item page
+  showAuthorityRelations: false
 # Community Page Config
 community:
   # Default tab to be shown when browsing a Community. Valid values are: comcols, search, or browse_<field>
@@ -710,6 +734,28 @@ layout:
         default:
           icon: fas fa-project-diagram
           style: text-success
+  # If true the download link in item page will be rendered as an advanced attachment, the view can be then configured with the layout.advancedAttachmentRendering config
+  showDownloadLinkAsAttachment: false
+  # Configuration for advanced attachment rendering in item pages. This controls how files are displayed when showDownloadLinkAsAttachment is enabled.
+  # Defines which metadata/attributes to display for bitstream attachments.
+  advancedAttachmentRendering:
+    # Metadata and attributes to display for each attachment
+    metadata:
+      - name: dc.title
+        type: metadata
+        truncatable: false
+      - name: dc.type
+        type: metadata
+        truncatable: false
+      - name: dc.description
+        type: metadata
+        truncatable: true
+      - name: size
+        type: attribute
+      - name: format
+        type: attribute
+      - name: checksum
+        type: attribute
 
 # Configuration for customization of search results
 searchResults:
@@ -740,3 +786,22 @@ searchResults:
   followAuthorityMetadataValuesLimit: 5
 
 
+# Configuration of social links using AddToAny plugin
+addToAnyPlugin:
+  # This is enabled flag
+  socialNetworksEnabled: false
+  # If you want to self-host check https://www.addtoany.com/buttons/customize/host_cache
+  scriptUrl: "https://static.addtoany.com/menu/page.js"
+  # Check available integrations, visit https://www.addtoany.com/buttons/for/website
+  # 1. Click "Choose Services", select integrations, then click Done
+  # 2. Get Button Code
+  # 3. You will get a HTML e.g. <a class="a2a_button_facebook"></a> where "facebook" is part you want to include in list
+  buttons:
+    - facebook
+    - twitter
+    - linkedin
+    - email
+    - copy_link
+  showPlusButton: true
+  showCounters: true
+  title: DSpace demo

cypress.config.ts

@@ -37,7 +37,9 @@ export default defineConfig({
     DSPACE_TEST_SUBMIT_USER_UUID: '914955b1-cf2e-4884-8af7-a166aa24cf73',
     DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
     // Administrator users group
-    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
+    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4',
+    //Collection to send and test workflow item
+    DSPACE_TEST_SUBMIT_WORKFLOW_COLLECTION_NAME: '1-step Workflow collection',
   },
   e2e: {
     // Setup our plugins for e2e tests

cypress/e2e/my-dspace.cy.ts

@@ -131,4 +131,151 @@ describe('My DSpace page', () => {
     testA11y('ds-submission-import-external');
   });
 
+  it('should let you filter to only archived items', () => {
+    cy.visit('/mydspace');
+
+    //To wait filter be ready
+    cy.intercept({
+      method: 'GET',
+      url: '/server/api/discover/facets/namedresourcetype**',
+    }).as('facetNamedResourceType');
+
+    //This page is restricted, so we will be shown the login form. Fill it in and submit it
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+    //Wait for the page to display
+    cy.wait('@facetNamedResourceType');
+
+    //Open all filters
+    cy.get('.filter-toggle').click({ multiple: true });
+
+    //The authority filter should be visible.
+    cy.get('ds-search-authority-filter').scrollIntoView().should('be.visible');
+
+    //Intercept the request to filter and the request of filter.
+    cy.intercept({
+      method: 'GET',
+      url: '/server/api/discover/search/objects**',
+    }).as('filterByItem');
+
+    //Apply the filter to the “archived” items.
+    cy.get('ds-search-authority-filter a[href*="f.namedresourcetype=item,authority"]').find('input[type="checkbox"]').click();
+
+    //Wait for the response.
+    cy.wait('@filterByItem');
+
+    //Check that we have at least one item and that they all have the archived badge.
+    cy.get('ds-item-search-result-list-element-submission').should('exist');
+    cy.get('ds-item-search-result-list-element-submission')
+      .each(($item) => {
+        cy.wrap($item)
+          .find('.badge-archived')
+          .should('exist');
+      });
+  });
+
+  //This test also generate an item to validate workflow task section
+  it('should upload a file via drag & drop, display it in the UI and submit the item', () => {
+    const fileName = 'example.pdf';
+    const currentYear = new Date().getFullYear();
+
+    cy.visit('/mydspace');
+
+    //This page is restricted, so we will be shown the login form. Fill it in and submit it
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
+
+    //Wait for the page to display
+    cy.get('ds-my-dspace-page').should('be.visible');
+
+    //Select the uploader and perform the drag-and-drop action.
+    cy.get('ds-uploader .well').selectFile(`cypress/fixtures/${fileName}`, { action: 'drag-drop' });
+
+    //Validate that the file appears in the UI
+    cy.get('ds-uploader .filename').should('exist').and('contain.text', fileName);
+
+    //Validate that there is now exactly 1 file in the queue
+    cy.get('ds-uploader .upload-item-top').should('have.length', 1);
+
+    // This should display the <ds-collection-dropdown> (popup window)
+    cy.get('ds-collection-dropdown').should('be.visible');
+
+    // Type in a known Collection name in the search box
+    cy.get('ds-collection-dropdown input[type="search"]').type(Cypress.env('DSPACE_TEST_SUBMIT_WORKFLOW_COLLECTION_NAME'));
+
+    // Click on the button matching that known Collection name
+    cy.get('ds-collection-dropdown li[title="'.concat(Cypress.env('DSPACE_TEST_SUBMIT_WORKFLOW_COLLECTION_NAME')).concat('"]')).click();
+
+    // New URL should include /workspaceitems, as we've started a new submission
+    cy.url().should('include', '/workspaceitems');
+
+    //Fill required fields
+    cy.get('#dc_title').type('Workflow test item');
+    cy.get('#dc_date_issued_year').type(currentYear.toString());
+    cy.get('input[name="dc.type"]').click();
+    cy.get('.dropdown-menu').should('be.visible').contains('button', 'Other').click();
+    cy.get('#granted').check();
+
+    //Press deposit button
+    cy.get('button[data-test="deposit"]').click();
+
+    //validate that URL is /mydspace
+    cy.url().should('include', '/mydspace');
+
+  });
+
+  it('should let you take task from workflow', () => {
+    cy.visit('/mydspace');
+
+    //This page is restricted, so we will be shown the login form. Fill it in and submit it
+    cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+
+    //Wait for the page to display
+    cy.get('ds-my-dspace-page').should('be.visible');
+
+    //And wait to list is ready
+    cy.get('[data-test="objects"]').should('be.visible');
+
+    //Intercept to await backend response
+    cy.intercept({
+      method: 'GET',
+      url: '/server/api/discover/search/objects**',
+    }).as('workflowSearch');
+
+    //Change view to see workflow tasks
+    cy.get('ds-search-switch-configuration select option[data-test="workflow"]')
+      .should('exist')
+      .invoke('attr', 'value')
+      .then(value => {
+        cy.get('ds-search-switch-configuration select').select(value);
+      });
+
+    //Await backend search response
+    cy.wait('@workflowSearch');
+
+    //Validate URL
+    cy.url().should('include', 'configuration=workflow');
+
+    //Wait to render the list and at leat one item
+    cy.get('[data-test="list-object"]').should('have.length.greaterThan', 0);
+    cy.get('[data-test="claim-button"]').should('exist');
+
+    //Check that we have at least one item in worflow search, the item have claim-button and can click in it.
+    cy.get('[data-test="list-object"]')
+      .then(($items) => {
+        const itemWithClaim = [...$items].find(item =>
+          item.querySelector('[data-test="claim-button"]'),
+        );
+        cy.wrap(itemWithClaim).should('exist');
+        cy.wrap(itemWithClaim).as('selectedItem');
+        cy.wrap(itemWithClaim).within(() => {
+          cy.get('ds-pool-task-actions').should('exist');
+          cy.get('[data-test="claim-button"]').click();
+        });
+      });
+
+    //Finally, when you click the ‘Claim’ button, the actions for the selected item change
+    cy.get('@selectedItem').within(() => {
+      cy.get('ds-claimed-task-actions').should('exist');
+    });
+  });
 });

cypress/fixtures/example.pdf

@@ -13,7 +13,7 @@ module.exports = (on, config) => {
     // Define "log" and "table" tasks, used for logging accessibility errors during CI
     // Borrowed from https://github.com/component-driven/cypress-axe#in-cypress-plugins-file
     log(message: string) {
-      console.log(message);
+      console.info(message);
       return null;
     },
     table(message: string) {