Merge remote-tracking branch 'upstreamdspace/dspace-8_x' into main-cris

# Conflicts:
#	profiles.md
#	statistics-reports.md
#	suggestions.md
#	suggestionsources.md
#	suggestiontargets.md
#	workspaceitems.md

Author: atarix83

.github/workflows/issue_opened.yml

@@ -5,6 +5,7 @@ on:
   issues:
     types: [opened]
 
+permissions: {}
 jobs:
   automation:
     runs-on: ubuntu-latest
@@ -15,7 +16,7 @@ jobs:
       # Only add to project board if issue is flagged as "needs triage" or has no labels
       # NOTE: By default we flag new issues as "needs triage" in our issue template
       if: (contains(github.event.issue.labels.*.name, 'needs triage') || join(github.event.issue.labels.*.name) == '')
-      uses: actions/add-to-project@v0.3.0
+      uses: actions/add-to-project@v0.5.0
       # Note, the authentication token below is an ORG level Secret. 
       # It must be created/recreated manually via a personal access token with admin:org, project, public_repo permissions
       # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token#permissions-for-the-github_token

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,39 @@
+# This workflow checks open PRs for merge conflicts and labels them when conflicts are found
+name: Check for merge conflicts
+
+# Run this for all pushes (i.e. merges) to 'main' or maintenance branches
+on:
+  push:
+    branches:
+      - main
+      - 'dspace-**'
+  # So that the `conflict_label_name` is removed if conflicts are resolved,
+  # we allow this to run for `pull_request_target` so that github secrets are available.
+  pull_request_target:
+    types: [ synchronize ]
+
+permissions: {}
+
+jobs:
+  triage:
+    # Ensure this job never runs on forked repos. It's only executed for 'DSpace/RestContract'
+    if: github.repository == 'dspace/restcontract'
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      # See: https://github.com/prince-chrismc/label-merge-conflicts-action
+      - name: Auto-label PRs with merge conflicts
+        uses: prince-chrismc/label-merge-conflicts-action@v3
+        # Ignore any failures -- may occur (randomly?) for older, outdated PRs.
+        continue-on-error: true
+        # Add "merge conflict" label if a merge conflict is detected. Remove it when resolved.
+        # Note, the authentication token is created automatically
+        # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/authenticating-with-the-github_token
+        with:
+          conflict_label_name: 'merge conflict'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          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!

.github/workflows/port_merged_pull_request.yml

@@ -0,0 +1,46 @@
+# This workflow will attempt to port a merged pull request to
+# the branch specified in a "port to" label (if exists)
+name: Port merged Pull Request
+
+# Only run for merged PRs against the "main" or maintenance branches
+# We allow this to run for `pull_request_target` so that github secrets are available
+# (This is required when the PR comes from a forked repo)
+on:
+  pull_request_target:
+    types: [ closed ]
+    branches:
+      - main
+      - 'dspace-**'
+
+permissions:
+  contents: write      # so action can add comments
+  pull-requests: write # so action can create pull requests
+
+jobs:
+  port_pr:
+    runs-on: ubuntu-latest
+    # Don't run on closed *unmerged* pull requests
+    if: github.event.pull_request.merged
+    steps:
+      # Checkout code
+      - uses: actions/checkout@v4
+      # 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
+        with:
+          # Trigger based on a "port to [branch]" label on PR
+          # (This label must specify the branch name to port to)
+          label_pattern: '^port to ([^ ]+)$'
+          # Title to add to the (newly created) port PR
+          pull_title: '[Port ${target_branch}] ${pull_title}'
+          # Description to add to the (newly created) port PR
+          pull_description: 'Port of #${pull_number} by @${pull_author} to `${target_branch}`.'
+          # Copy all labels from original PR to (newly created) port PR
+          # NOTE: The labels matching 'label_pattern' are automatically excluded
+          copy_labels_pattern: '.*'
+          # Skip any merge commits in the ported PR. This means only non-merge commits are cherry-picked to the new PR
+          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/workflows/pull_request_opened.yml

@@ -0,0 +1,24 @@
+# This workflow runs whenever a new pull request is created
+name: Pull Request opened
+
+# Only run for newly opened PRs against the "main" or maintenance branches
+# We allow this to run for `pull_request_target` so that github secrets are available
+# (This is required to assign a PR back to the creator when the PR comes from a forked repo)
+on:
+  pull_request_target:
+    types: [ opened ]
+    branches:
+      - main
+      - 'dspace-**'
+
+permissions:
+  pull-requests: write
+
+jobs:
+  automation:
+    runs-on: ubuntu-latest
+    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
+    - name: Assign PR to creator
+      uses: toshimaru/[email protected]

authorizations.md

@@ -42,7 +42,7 @@ Return codes:
 
 The supported parameters are:
 * page, size [see pagination](README.md#Pagination)
-* uri: mandatory, the object to use for the authorization check. The full URI of the rest resource must be specified, i.e. https://{dspace.url}/api/core/community/{uuid}
+* uri: mandatory, the object to use for the authorization check. The full URI of the rest resource must be specified, i.e. https://{dspace.url}/api/core/communities/{uuid}
 * eperson: optional, the uuid of the eperson to evaluate for authorization. If not specified authorization of anonymous users will be returned
 * feature: optional, limit the returned authorization to the specified feature (this provide an alternative to codify the authorization id rule on the client side)
 
@@ -60,7 +60,7 @@ Return codes:
 The supported parameters are:
 * page, size [see pagination](README.md#Pagination)
 * uuid: mandatory, repeatable. Represents the list of objects to be used for the authorization check. For each of them, the UUID must be specified.2
-* type: mandatory. Represents the type of resource(s) (i.e. "core.item", "workflow.workflowitem",...)  on which authorizations are checked.
+* type: mandatory. Represents the type of resource(s) (i.e. "core.items", "workflow.workflowitems",...)  on which authorizations are checked.
 * eperson: optional, the uuid of the eperson to evaluate for authorization. If not specified authorization of anonymous users will be returned
 * feature: optional, repeatable. Represents the list of features. Limits the returned authorizations to the specified features (this provide an alternative to codify the authorization id rule on the client side)
 

collections.md

@@ -663,31 +663,31 @@ Status codes:
 * 422: if the collection didn't contain an administrator group
 
 #### Collection Submitters
-**/api/core/communities/<:uuid>/submittersGroup**
+**/api/core/collections/<:uuid>/submittersGroup**
 
 Endpoints for managing the Collection Submitters group
 
 This works identical to the [Collection administrators](#collection-administrators),
 except the collection administrators can also create the submitters group.
 
 #### Collection Default item READ rights group
-**/api/core/communities/<:uuid>/itemReadGroup**
+**/api/core/collections/<:uuid>/itemReadGroup**
 
 Endpoints for managing the Collection Default item READ rights group
 
 This works identical to the [Collection administrators](#collection-administrators),
 except the collection administrators can also create the Collection Default item READ rights group.
 
 #### Collection Default bitstream READ rights group
-**/api/core/communities/<:uuid>/bitstreamReadGroup**
+**/api/core/collections/<:uuid>/bitstreamReadGroup**
 
 Endpoints for managing the Collection Default bitstream READ rights group
 
 This works identical to the [Collection administrators](#collection-administrators),
 except the collection administrators can also create the Collection Default bitstream READ rights group
 
 #### Collection Workflow groups
-**/api/core/communities/<:uuid>/workflowGroups/<:workflow-role>**
+**/api/core/collections/<:uuid>/workflowGroups/<:workflow-role>**
 
 Endpoints for managing the Collection Workflow groups
 
@@ -703,7 +703,7 @@ The workflow role can be e.g.:
 * reviewmanagers
 
 ##### Delete a collection workflow group
-**DELETE /api/core/communities/<:uuid>/workflowGroups/<:workflow-role>**
+**DELETE /api/core/collections/<:uuid>/workflowGroups/<:workflow-role>**
 
 Delete the Group associated with a Workflow role.
 
@@ -749,7 +749,7 @@ Provide updated metadata information about a specific collection, when the updat
 ```json
 {
   "uuid": "20263916-6a3d-4fdc-a44a-4616312f030c",
-  "name": "test collection",
+  "handle": "10673/2",
   "metadata": {
     "dc.title": [
       {
@@ -767,7 +767,8 @@ Provide updated metadata information about a specific collection, when the updat
         "confidence": -1
       }
     ]
-  }
+  },
+  "type": "collection"
 }
 ```  
 

communities.md

@@ -359,9 +359,7 @@ Provide updated metadata information about a specific community, when the update
 
 ```json
 {
-  "id": "b8872eba-1a79-4b8b-a8f6-55fa8f73197b",
   "uuid": "b8872eba-1a79-4b8b-a8f6-55fa8f73197b",
-  "name": "test new title",
   "handle": "123456789/60631",
   "metadata": {
     "dc.title": [

contentreport-filteredcollections.md

@@ -0,0 +1,149 @@
+# Filtered Collections report
+[Back to the list of all defined endpoints](endpoints.md)
+
+This endpoint provides aggregated statistics about the number of items per collection according to selected filters.
+
+NOTE: This is currently a beta feature.
+
+
+**GET /api/contentreport/filteredcollections**
+
+The endpoint takes a `filters` query parameter whose value is a comma-separated list of filters
+like the following:
+```
+?filters=is_discoverable,has_multiple_originals,has_pdf_original
+```
+
+Alternatively, the comma-separated list can be replaced by a repetition of the `filters` parameter
+for each requested filter:
+```
+?filters=is_discoverable&filter=has_multiple_originals&filter=has_pdf_original
+```
+
+
+Please see [below](#available-filters) for the list of available filters.
+
+## Report contents
+
+For each collection, the basic report consists of:
+* name (label) and handle of the collection
+* name (label) and handle of the parent community
+* total number of items
+* number of items matching all selected filters
+
+In addition, a `summary` element provides the total number of items and the total number of items matching all filters
+for the whole repository.
+
+An example JSON response document to `/api/contentreport/filteredcollections`:
+```json
+{
+    "id": "filteredcollections",
+    "collections": [
+        {
+            "label": "Collection 1",
+            "handle": "100/1",
+            "values": {
+                "is_discoverable": 23,
+                "has_multiple_originals": 3,
+                "has_pdf_original": 14
+            },
+            "community_label": "Community 1",
+            "community_handle": "20.500.11794/1",
+            "nb_total_items": 23,
+            "all_filters_value": 3
+        },
+        {
+            "label": "Collection 2",
+            "handle": "100/2",
+            "values": {
+                "is_discoverable": 1,
+                "has_multiple_originals": 0,
+                "has_pdf_original": 0
+            },
+            "community_label": "Community 1",
+            "community_handle": "20.500.11794/1",
+            "nb_total_items": 1,
+            "all_filters_value": 0
+        },
+        {
+            "label": "Collection 3",
+            "handle": "100/3",
+            "values": {
+                "is_discoverable": 1,
+                "has_multiple_originals": 0,
+                "has_pdf_original": 1
+            },
+            "community_label": "Community 1",
+            "community_handle": "20.500.11794/1",
+            "nb_total_items": 1,
+            "all_filters_value": 0
+        }
+    ],
+    "summary": {
+        "label": null,
+        "handle": null,
+        "values": {
+            "is_discoverable": 25,
+            "has_multiple_originals": 3,
+            "has_pdf_original": 15
+        },
+        "community_label": null,
+        "community_handle": null,
+        "nb_total_items": 25,
+        "all_filters_value": 3
+    },
+    "type": "filtered-collections",
+    "_links": {
+        "self": {
+            "href": "http://localhost:8080/dspace-server/api/contentreport/filtered-collections"
+        }
+    }
+}
+```
+
+## Available filters
+
+The available filters are as follows:
+
+* Item Property Filters
+    * `is_item`: Is Item - always true
+    * `is_withdrawn`: Withdrawn Items
+    * `is_not_withdrawn`: Available Items - Not Withdrawn
+    * `is_discoverable`: Discoverable Items - Not Private
+    * `is_not_discoverable`: Not Discoverable - Private Item
+* Basic Bitstream Filters
+    * `has_multiple_originals`: Item has Multiple Original Bitstreams
+    * `has_no_originals`: Item has No Original Bitstreams
+    * `has_one_original`: Item has One Original Bitstream
+* Bitstream Filters by MIME Type
+    * `has_doc_original`: Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)
+    * `has_image_original`: Item has an Image Original Bitstream
+    * `has_unsupp_type`: Has Other Bitstream Types (not Doc or Image)
+    * `has_mixed_original`: Item has multiple types of Original Bitstreams (Doc, Image, Other)
+    * `has_pdf_original`: Item has a PDF Original Bitstream
+    * `has_jpg_original`: Item has JPG Original Bitstream
+    * `has_small_pdf`: Has unusually small PDF
+    * `has_large_pdf`: Has unusually large PDF
+    * `has_doc_without_text`: Has document bitstream without TEXT item
+* Supported MIME Type Filters
+    * `has_only_supp_image_type`: Item Image Bitstreams are Supported
+    * `has_unsupp_image_type`: Item has Image Bitstream that is Unsupported
+    * `has_only_supp_doc_type`: Item Document Bitstreams are Supported
+    * `has_unsupp_doc_type`: Item has Document Bitstream that is Unsupported
+* Bitstream Bundle Filters
+    * `has_unsupported_bundle`: Has bitstream in an unsupported bundle
+    * `has_small_thumbnail`: Has unusually small thumbnail
+    * `has_original_without_thumbnail`: Has original bitstream without thumbnail
+    * `has_invalid_thumbnail_name`: Has invalid thumbnail name (assumes one thumbnail for each original)
+    * `has_non_generated_thumb`: Has non-generated thumbnail
+    * `no_license`: Doesn't have a license
+    * `has_license_documentation`: Has documentation in the license bundle
+* Permission Filters
+    * `has_restricted_original`: Item has Restricted Original Bitstream
+    * `has_restricted_thumbnail`: Item has Restricted Thumbnail
+    * `has_restricted_metadata`: Item has Restricted Metadata
+
+Possible response status:
+
+* 200 OK - The specific report data was found, and the data has been properly returned.
+* 403 Forbidden - In case of unauthorized user session.