Merge remote-tracking branch 'gitHub/main' into task/main/DURACOM-456

Author: FrancescoMolinaro

.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 }}
@@ -141,7 +141,7 @@ jobs:
       # https://github.com/cypress-io/github-action
       # (NOTE: to run these e2e tests locally, just use 'ng e2e')
       - name: Run e2e tests (integration tests)
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7.1.9
         with:
           # Run tests in Chrome, headless mode (default)
           browser: chrome

.github/workflows/docker.yml

@@ -106,8 +106,11 @@ jobs:
           sleep 10
           docker container ls
       # Create a test admin account. Load test data from a simple set of AIPs as defined in cli.ingest.yml
+      # NOTE: Before creating test data, we wait for the backend to become responsive by requesting it every 10 sec.
+      # Timeout after 5 minutes. This is done to ensure the backend is fully initialized before we create test data.
       - name: Load test data into Backend
         run: |
+          timeout 5m wget --retry-connrefused -t 0 --waitretry=10 http://127.0.0.1:8080/server/api
           docker compose -f docker/cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
           docker compose -f docker/cli.yml -f docker/cli.ingest.yml run --rm dspace-cli
       # Verify backend started successfully.

.github/workflows/port_merged_pull_request.yml

@@ -27,7 +27,7 @@ jobs:
       # Port PR to other branch (ONLY if labeled with "port to")
       # See https://github.com/korthout/backport-action
       - name: Create backport pull requests
-        uses: korthout/backport-action@v2
+        uses: korthout/backport-action@v4
         with:
           # Trigger based on a "port to [branch]" label on PR
           # (This label must specify the branch name to port to)

config/config.example.yml

@@ -93,6 +93,9 @@ cache:
   # NOTE: When updates are made to compiled *.js files, it will automatically bypass this browser cache, because
   # all compiled *.js files include a unique hash in their name which updates when content is modified.
   control: max-age=604800 # revalidate browser
+  # These static files should not be cached (paths relative to dist/browser, including the leading slash)
+  noCacheFiles:
+    - '/index.html'
   autoSync:
     defaultTime: 0
     maxBufferSize: 100
@@ -164,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:
@@ -202,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
@@ -380,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
@@ -396,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:
@@ -410,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
@@ -430,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>
@@ -492,6 +519,7 @@ themes:
   # - name: BASE_THEME_NAME
   #
   - name: dspace
+    prefetch: true
     headTags:
     - tagName: link
       attributes:
@@ -706,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:
@@ -736,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/item-edit.cy.ts

@@ -23,13 +23,27 @@ describe('Edit Item > Edit Metadata tab', () => {
     // <ds-edit-item-page> tag must be loaded
     cy.get('ds-edit-item-page').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // wait for all the ds-dso-edit-metadata-value components to be rendered
     cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
       cy.wrap($row).find('div[role="cell"]').should('be.visible');
     });
 
     // Analyze <ds-edit-item-page> for accessibility issues
-    testA11y('ds-edit-item-page');
+    testA11y('ds-edit-item-page',
+            {
+              rules: {
+                // Disable flakey "aria-required-children" test. While this test passes when run locally,
+                // in GitHub CI it will return random failures roughly 1/3 of the time saying that the
+                // "tablist" doesn't contain required "tab" elements, even though they do exist.
+                'aria-required-children': { enabled: false },
+              },
+            } as Options,
+    );
   });
 });
 
@@ -46,6 +60,11 @@ describe('Edit Item > Status tab', () => {
     // <ds-item-status> tag must be loaded
     cy.get('ds-item-status').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // Analyze for accessibility issues
     testA11y('ds-item-status');
   });
@@ -64,6 +83,10 @@ describe('Edit Item > Bitstreams tab', () => {
     // <ds-item-bitstreams> tag must be loaded
     cy.get('ds-item-bitstreams').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
     // Table of item bitstreams must also be loaded
     cy.get('div.item-bitstreams').should('be.visible');
 
@@ -93,6 +116,11 @@ describe('Edit Item > Curate tab', () => {
     // <ds-item-curate> tag must be loaded
     cy.get('ds-item-curate').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // Analyze for accessibility issues
     testA11y('ds-item-curate');
   });
@@ -111,6 +139,11 @@ describe('Edit Item > Relationships tab', () => {
     // <ds-item-relationships> tag must be loaded
     cy.get('ds-item-relationships').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // Analyze for accessibility issues
     testA11y('ds-item-relationships');
   });
@@ -129,6 +162,11 @@ describe('Edit Item > Version History tab', () => {
     // <ds-item-version-history> tag must be loaded
     cy.get('ds-item-version-history').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // Analyze for accessibility issues
     testA11y('ds-item-version-history');
   });
@@ -147,6 +185,11 @@ describe('Edit Item > Access Control tab', () => {
     // <ds-item-access-control> tag must be loaded
     cy.get('ds-item-access-control').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // Analyze for accessibility issues
     testA11y('ds-item-access-control');
   });
@@ -165,6 +208,11 @@ describe('Edit Item > Collection Mapper tab', () => {
     // <ds-item-collection-mapper> tag must be loaded
     cy.get('ds-item-collection-mapper').should('be.visible');
 
+    // wait for all the tabs to be rendered on this page
+    cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
+      cy.wrap($row).find('a[role="tab"]').should('be.visible');
+    });
+
     // Analyze entire page for accessibility issues
     testA11y('ds-item-collection-mapper');