Merge branch 'main' into fix/eperson-create-form-hangs-app

Author: PawelZlakowski

.github/workflows/codescan.yml

@@ -25,7 +25,7 @@ on:
 jobs:
   analyze:
     name: Analyze Code
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     # Limit permissions of this GitHub action. Can only write to security-events
     permissions:
       actions: read

.github/workflows/docker.yml

@@ -74,10 +74,6 @@ jobs:
       DSPACE_REST_HOST: 127.0.0.1
       # Override default dspace.ui.url to also use 127.0.0.1.
       dspace__P__ui__P__url: http://127.0.0.1:4000
-      # Docker Registry to use for Docker compose scripts below.
-      # If this is a PR, then we need to use docker.io (as the registry must be public),
-      # Otherwise we default to ghcr.io to avoid aggressive rate limits at DockerHub.
-      DOCKER_REGISTRY: ${{ github.event_name == 'pull_request' && 'docker.io' || 'ghcr.io' }}
     steps:
       # Checkout our codebase (to get access to Docker Compose scripts)
       - name: Checkout codebase
@@ -98,6 +94,11 @@ jobs:
           docker image ls -a
       # Start backend using our compose script in the codebase.
       - name: Start backend in Docker
+        # MUST use docker.io as we don't have a copy of this backend image in our GitHub Action,
+        # and docker.io is the only public image. If we ever hit aggressive rate limits at DockerHub,
+        # we may need to consider making the 'ghcr.io' images public & switch this to 'ghcr.io'
+        env:
+          DOCKER_REGISTRY: docker.io
         run: |
           docker compose -f docker/docker-compose-rest.yml up -d
           sleep 10

.github/workflows/issue_opened.yml

@@ -8,7 +8,7 @@ on:
 permissions: {}
 jobs:
   automation:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
     # Add the new issue to a project board, if it needs triage
     # See https://github.com/actions/add-to-project

.github/workflows/label_merge_conflicts.yml

@@ -18,7 +18,7 @@ jobs:
   triage:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
     if: github.repository == 'dspace/dspace-angular'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     permissions:
       pull-requests: write
     steps:
@@ -36,4 +36,4 @@ jobs:
           conflict_comment: |
             Hi @${author},
             Conflicts have been detected against the base branch.
-            Please [resolve these conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) as soon as you can. Thanks!
+            Please [resolve these conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) as soon as you can. Thanks!

.github/workflows/port_merged_pull_request.yml

@@ -18,7 +18,7 @@ permissions:
 
 jobs:
   port_pr:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     # Don't run on closed *unmerged* pull requests
     if: github.event.pull_request.merged
     steps:
@@ -43,4 +43,4 @@ jobs:
           merge_commits: 'skip'
           # Use a personal access token (PAT) to create PR as 'dspace-bot' user.
           # A PAT is required in order for the new PR to trigger its own actions (for CI checks)
-          github_token: ${{ secrets.PR_PORT_TOKEN }}
+          github_token: ${{ secrets.PR_PORT_TOKEN }}

.github/workflows/pull_request_opened.yml

@@ -16,7 +16,7 @@ permissions:
 
 jobs:
   automation:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
     # Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
     # See https://github.com/toshimaru/auto-author-assign

.github/workflows/stale.yml

@@ -0,0 +1,72 @@
+# DSpace rules for flagging untouched issues and PRs as stale using 'stale':
+# https://github.com/actions/stale
+name: 'Mark issues and PRs as stale'
+on:
+  # Schedule to run weekly on Sunday at 3:03am UTC
+  # NOTE: This time is purposefully different from the "stale" bot settings in "DSpace/DSpace" to help
+  # ensure we don't hit GitHub's rate limits.
+  schedule:
+    - cron: '3 3 * * 0'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-slim
+    steps:
+      - uses: actions/stale@v10
+        with:
+          # Number of GitHub API calls to allow in a single run (to avoid hitting GitHub's rate limit)
+          # Default is 30. But, we've found that only results in processing ~7 issues or PRs. So, we've increased it.
+          operations-per-run: 60
+          # Issues will be marked stale after 3 years of no activity
+          days-before-issue-stale: 1095
+          # Issues marked stale will be closed after one additional week of no activity
+          days-before-issue-close: 7
+          # High priority issues are never marked stale
+          exempt-issue-labels: 'high priority'
+          # When an issue is marked stale, this label and comment will be added to the issue.
+          stale-issue-label: stale
+          stale-issue-message: |
+            This issue has been automatically marked as stale because it has not had
+            activity in 3 years. It will be closed in 7 days if no further activity occurs.
+
+            Allowing issues to close as stale helps us filter out issues which can wait
+            for future development time. All issues closed by this bot will continue to act 
+            like normal issues; they can be searched for, commented on or reopened at any point.
+
+            To extend the lifetime of an issue please comment below. This will help us to see
+            that this issue is still affecting you with current versions of DSpace, and encourage
+            us to re-prioritize this issue.
+          # When an issue is closed, this comment will be added to the issue.
+          close-issue-message: |
+            This issue has been closed automatically as "stale". If this still affects you please 
+            request to re-open this issue via a comment, providing us with details on how this still
+            impacts your usage of DSpace.
+          # PRs will be marked stale after 1 year of no activity
+          days-before-pr-stale: 365
+          # PRs marked stale will be closed after two additional weeks of no activity
+          days-before-pr-close: 14
+          # High priority PRs are never marked stale
+          exempt-pr-labels: 'high priority'
+          # When a PR is marked stale, this label and comment will be added to the issue.
+          stale-pr-label: stale
+          stale-pr-message: |
+            This pull request has been automatically marked as stale because it has not had
+            activity in one year. It will be closed in 14 days if no further activity occurs.
+
+            Allowing pull requests to close as stale helps us filter out old work that is no longer
+            relevant and helps developers focus on reviewing current work.
+
+            All pull requests closed by this bot act like normal pull requests;
+            they can be searched for, commented on or reopened at any point.
+
+            If these changes are still relevant then please comment and/or rebase your PR based on the
+            latest DSpace code. This will remove the stale status and notify us to assign a reviewer
+            for your PR.
+          close-pr-message: |
+            This pull request has been closed automatically. If these changes are still relevant
+            then please re-open this pull request with a comment and rebase your PR based on the latest
+            DSpace code. This will notify us to assign a reviewer to your PR.

Dockerfile

@@ -5,7 +5,7 @@ FROM docker.io/node:22-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
-RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+RUN apk --no-cache add python3 make g++
 
 WORKDIR /app
 
@@ -31,4 +31,4 @@ EXPOSE 4000
 ENTRYPOINT [ "npm", "run", "serve" ]
 # By default set host to 0.0.0.0 to listen/accept connections from all IP addresses.
 # Poll for changes every 5 seconds (if any detected, app will rebuild/restart)
-CMD ["--", "--host 0.0.0.0", "--poll 5000"]
+CMD ["--", "--host 0.0.0.0", "--poll 5000"]

Dockerfile.dist

@@ -9,7 +9,7 @@ FROM docker.io/node:22-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
-RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+RUN apk --no-cache add python3 make g++
 
 WORKDIR /app
 # Copy over package files first, so this layer will only be rebuilt if those files change.
@@ -46,4 +46,4 @@ EXPOSE 4000
 # On startup, run start the DSpace UI in PM2
 ENTRYPOINT [ "pm2-runtime", "start", "dspace-ui.json" ]
 # By default, pass param that specifies to use JSON format logs.
-CMD ["--json"]
+CMD ["--json"]

config/config.example.yml

@@ -10,10 +10,13 @@ ui:
   port: 4000
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /
-  # The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
+  # The rateLimiter settings limit each IP to a 'limit' of 500 requests per 'windowMs' (1 minute).
   rateLimiter:
     windowMs: 60000 # 1 minute
-    max: 500 # limit each IP to 500 requests per windowMs
+    limit: 500 # limit each IP to 500 requests per windowMs
+    # IPv6 subnet mask applied to IPv6 addresses.
+    # See: https://express-rate-limit.mintlify.app/reference/configuration#ipv6subnet
+    ipv6Subnet: 56
   # Trust X-FORWARDED-* headers from proxies (default = true)
   useProxies: true
 
@@ -295,12 +298,18 @@ languages:
   - code: lv
     label: Latviešu
     active: true
+  - code: ml
+    label: മലയാളം
+    active: true
   - code: mr
     label: मराठी
     active: true
   - code: nl
     label: Nederlands
     active: true
+  - code: od
+    label: ଓଡିଆ
+    active: true
   - code: pl
     label: Polski
     active: true
@@ -322,6 +331,9 @@ languages:
   - code: sv
     label: Svenska
     active: true
+  - code: te
+    label: తెలుగు
+    active: true
   - code: ta
     label: தமிழ்
     active: true