Skip to content

Commit 833033d

Browse files
Merge branch 'main' into DURACOM-204
# Conflicts: # src/app/core/data/feature-authorization/feature-id.ts
2 parents 2429c36 + 85369aa commit 833033d

381 files changed

Lines changed: 12254 additions & 2300 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
steps:
4444
# https://github.com/actions/checkout
4545
- name: Checkout codebase
46-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4
4747

4848
# https://github.com/actions/setup-node
4949
- name: Install Node.js ${{ matrix.node-version }}
50-
uses: actions/setup-node@v3
50+
uses: actions/setup-node@v4
5151
with:
5252
node-version: ${{ matrix.node-version }}
5353

@@ -118,7 +118,7 @@ jobs:
118118
# https://github.com/cypress-io/github-action
119119
# (NOTE: to run these e2e tests locally, just use 'ng e2e')
120120
- name: Run e2e tests (integration tests)
121-
uses: cypress-io/github-action@v5
121+
uses: cypress-io/github-action@v6
122122
with:
123123
# Run tests in Chrome, headless mode (default)
124124
browser: chrome
@@ -191,7 +191,7 @@ jobs:
191191
runs-on: ubuntu-latest
192192
steps:
193193
- name: Checkout
194-
uses: actions/checkout@v3
194+
uses: actions/checkout@v4
195195

196196
# Download artifacts from previous 'tests' job
197197
- name: Download coverage artifacts
@@ -203,10 +203,14 @@ jobs:
203203
# Retry action: https://github.com/marketplace/actions/retry-action
204204
# Codecov action: https://github.com/codecov/codecov-action
205205
- name: Upload coverage to Codecov.io
206-
uses: Wandalen/wretry.action@v1.0.36
206+
uses: Wandalen/wretry.action@v1.3.0
207207
with:
208208
action: codecov/codecov-action@v3
209-
# Try upload 5 times max
209+
# Ensure codecov-action throws an error when it fails to upload
210+
# This allows us to auto-restart the action if an error is thrown
211+
with: |
212+
fail_ci_if_error: true
213+
# Try re-running action 5 times max
210214
attempt_limit: 5
211215
# Run again in 30 seconds
212216
attempt_delay: 30000

.github/workflows/codescan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
# https://github.com/actions/checkout
3737
- name: Checkout repository
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
# Initializes the CodeQL tools for scanning.
4141
# https://github.com/github/codeql-action

.github/workflows/docker.yml

Lines changed: 30 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Docker images
33

44
# Run this Build for all pushes to 'main' or maintenance branches, or tagged releases.
55
# Also run for PRs to ensure PR doesn't break Docker build process
6+
# NOTE: uses "reusable-docker-build.yml" in DSpace/DSpace to actually build each of the Docker images
7+
# https://github.com/DSpace/DSpace/blob/main/.github/workflows/reusable-docker-build.yml
8+
#
69
on:
710
push:
811
branches:
@@ -15,136 +18,42 @@ on:
1518
permissions:
1619
contents: read # to fetch code (actions/checkout)
1720

18-
19-
env:
20-
# Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
21-
# For a new commit on default branch (main), use the literal tag 'latest' on Docker image.
22-
# For a new commit on other branches, use the branch name as the tag for Docker image.
23-
# For a new tag, copy that tag name as the tag for Docker image.
24-
IMAGE_TAGS: |
25-
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
26-
type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
27-
type=ref,event=tag
28-
# Define default tag "flavor" for docker/metadata-action per
29-
# https://github.com/docker/metadata-action#flavor-input
30-
# We manage the 'latest' tag ourselves to the 'main' branch (see settings above)
31-
TAGS_FLAVOR: |
32-
latest=false
33-
# Architectures / Platforms for which we will build Docker images
34-
# If this is a PR, we ONLY build for AMD64. For PRs we only do a sanity check test to ensure Docker builds work.
35-
# If this is NOT a PR (e.g. a tag or merge commit), also build for ARM64.
36-
PLATFORMS: linux/amd64${{ github.event_name != 'pull_request' && ', linux/arm64' || '' }}
37-
38-
3921
jobs:
40-
###############################################
22+
#############################################################
4123
# Build/Push the 'dspace/dspace-angular' image
42-
###############################################
24+
#############################################################
4325
dspace-angular:
4426
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
4527
if: github.repository == 'dspace/dspace-angular'
46-
runs-on: ubuntu-latest
47-
48-
steps:
49-
# https://github.com/actions/checkout
50-
- name: Checkout codebase
51-
uses: actions/checkout@v3
52-
53-
# https://github.com/docker/setup-buildx-action
54-
- name: Setup Docker Buildx
55-
uses: docker/setup-buildx-action@v2
56-
57-
# https://github.com/docker/setup-qemu-action
58-
- name: Set up QEMU emulation to build for multiple architectures
59-
uses: docker/setup-qemu-action@v2
60-
61-
# https://github.com/docker/login-action
62-
- name: Login to DockerHub
63-
# Only login if not a PR, as PRs only trigger a Docker build and not a push
64-
if: github.event_name != 'pull_request'
65-
uses: docker/login-action@v2
66-
with:
67-
username: ${{ secrets.DOCKER_USERNAME }}
68-
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
69-
70-
# https://github.com/docker/metadata-action
71-
# Get Metadata for docker_build step below
72-
- name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
73-
id: meta_build
74-
uses: docker/metadata-action@v4
75-
with:
76-
images: dspace/dspace-angular
77-
tags: ${{ env.IMAGE_TAGS }}
78-
flavor: ${{ env.TAGS_FLAVOR }}
79-
80-
# https://github.com/docker/build-push-action
81-
- name: Build and push 'dspace-angular' image
82-
id: docker_build
83-
uses: docker/build-push-action@v4
84-
with:
85-
context: .
86-
file: ./Dockerfile
87-
platforms: ${{ env.PLATFORMS }}
88-
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
89-
# but we ONLY do an image push to DockerHub if it's NOT a PR
90-
push: ${{ github.event_name != 'pull_request' }}
91-
# Use tags / labels provided by 'docker/metadata-action' above
92-
tags: ${{ steps.meta_build.outputs.tags }}
93-
labels: ${{ steps.meta_build.outputs.labels }}
28+
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
29+
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
30+
with:
31+
build_id: dspace-angular
32+
image_name: dspace/dspace-angular
33+
dockerfile_path: ./Dockerfile
34+
secrets:
35+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
36+
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
9437

9538
#############################################################
9639
# Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
9740
#############################################################
9841
dspace-angular-dist:
9942
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
10043
if: github.repository == 'dspace/dspace-angular'
101-
runs-on: ubuntu-latest
102-
103-
steps:
104-
# https://github.com/actions/checkout
105-
- name: Checkout codebase
106-
uses: actions/checkout@v3
107-
108-
# https://github.com/docker/setup-buildx-action
109-
- name: Setup Docker Buildx
110-
uses: docker/setup-buildx-action@v2
111-
112-
# https://github.com/docker/setup-qemu-action
113-
- name: Set up QEMU emulation to build for multiple architectures
114-
uses: docker/setup-qemu-action@v2
115-
116-
# https://github.com/docker/login-action
117-
- name: Login to DockerHub
118-
# Only login if not a PR, as PRs only trigger a Docker build and not a push
119-
if: github.event_name != 'pull_request'
120-
uses: docker/login-action@v2
121-
with:
122-
username: ${{ secrets.DOCKER_USERNAME }}
123-
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
124-
125-
# https://github.com/docker/metadata-action
126-
# Get Metadata for docker_build_dist step below
127-
- name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular-dist' image
128-
id: meta_build_dist
129-
uses: docker/metadata-action@v4
130-
with:
131-
images: dspace/dspace-angular
132-
tags: ${{ env.IMAGE_TAGS }}
133-
# As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
134-
# tagging logic as the primary 'dspace/dspace-angular' image above.
135-
flavor: ${{ env.TAGS_FLAVOR }}
136-
suffix=-dist
137-
138-
- name: Build and push 'dspace-angular-dist' image
139-
id: docker_build_dist
140-
uses: docker/build-push-action@v4
141-
with:
142-
context: .
143-
file: ./Dockerfile.dist
144-
platforms: ${{ env.PLATFORMS }}
145-
# For pull requests, we run the Docker build (to ensure no PR changes break the build),
146-
# but we ONLY do an image push to DockerHub if it's NOT a PR
147-
push: ${{ github.event_name != 'pull_request' }}
148-
# Use tags / labels provided by 'docker/metadata-action' above
149-
tags: ${{ steps.meta_build_dist.outputs.tags }}
150-
labels: ${{ steps.meta_build_dist.outputs.labels }}
44+
# Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
45+
uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
46+
with:
47+
build_id: dspace-angular-dist
48+
image_name: dspace/dspace-angular
49+
dockerfile_path: ./Dockerfile.dist
50+
# As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
51+
# tagging logic as the primary 'dspace/dspace-angular' image above.
52+
tags_flavor: suffix=-dist
53+
secrets:
54+
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
55+
DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
56+
# Enable redeploy of sandbox & demo if the branch for this image matches the deployment branch of
57+
# these sites as specified in reusable-docker-build.xml
58+
REDEPLOY_SANDBOX_URL: ${{ secrets.REDEPLOY_SANDBOX_URL }}
59+
REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }}

.github/workflows/port_merged_pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
if: github.event.pull_request.merged
2424
steps:
2525
# Checkout code
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
# Port PR to other branch (ONLY if labeled with "port to")
2828
# See https://github.com/korthout/backport-action
2929
- name: Create backport pull requests
30-
uses: korthout/backport-action@v1
30+
uses: korthout/backport-action@v2
3131
with:
3232
# Trigger based on a "port to [branch]" label on PR
3333
# (This label must specify the branch name to port to)

.github/workflows/pull_request_opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
# Assign the PR to whomever created it. This is useful for visualizing assignments on project boards
2222
# See https://github.com/toshimaru/auto-author-assign
2323
- name: Assign PR to creator
24-
uses: toshimaru/auto-author-assign@v1.6.2
24+
uses: toshimaru/auto-author-assign@v2.0.1

cypress.config.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ export default defineConfig({
99
openMode: 0,
1010
},
1111
env: {
12-
// Global constants used in DSpace e2e tests (see also ./cypress/support/e2e.ts)
13-
// May be overridden in our cypress.json config file using specified environment variables.
12+
// Global DSpace environment variables used in all our Cypress e2e tests
13+
// May be modified in this config, or overridden in a variety of ways.
14+
// See Cypress environment variable docs: https://docs.cypress.io/guides/guides/environment-variables
1415
// Default values listed here are all valid for the Demo Entities Data set available at
1516
// https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
1617
// (This is the data set used in our CI environment)
@@ -21,12 +22,14 @@ export default defineConfig({
2122
// Community/collection/publication used for view/edit tests
2223
DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
2324
DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
24-
DSPACE_TEST_ENTITY_PUBLICATION: 'e98b0f27-5c19-49a0-960d-eb6ad5287067',
25+
DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
2526
// Search term (should return results) used in search tests
2627
DSPACE_TEST_SEARCH_TERM: 'test',
27-
// Collection used for submission tests
28+
// Main Collection used for submission tests. Should be able to accept normal Item objects
2829
DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
2930
DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
31+
// Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
32+
DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
3033
// Account used to test basic submission process
3134
DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
3235
DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',

cypress/e2e/admin-sidebar.cy.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { Options } from 'cypress-axe';
2+
import { testA11y } from 'cypress/support/utils';
3+
4+
describe('Admin Sidebar', () => {
5+
beforeEach(() => {
6+
// Must login as an Admin for sidebar to appear
7+
cy.visit('/login');
8+
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
9+
});
10+
11+
it('should be pinnable and pass accessibility tests', () => {
12+
// Pin the sidebar open
13+
cy.get('#sidebar-collapse-toggle').click();
14+
15+
// Click on every expandable section to open all menus
16+
cy.get('ds-expandable-admin-sidebar-section').click({multiple: true});
17+
18+
// Analyze <ds-admin-sidebar> for accessibility
19+
testA11y('ds-admin-sidebar',
20+
{
21+
rules: {
22+
// Currently all expandable sections have nested interactive elements
23+
// See https://github.com/DSpace/dspace-angular/issues/2178
24+
'nested-interactive': { enabled: false },
25+
}
26+
} as Options);
27+
});
28+
});

cypress/e2e/breadcrumbs.cy.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { TEST_ENTITY_PUBLICATION } from 'cypress/support/e2e';
21
import { testA11y } from 'cypress/support/utils';
32

43
describe('Breadcrumbs', () => {
54
it('should pass accessibility tests', () => {
65
// Visit an Item, as those have more breadcrumbs
7-
cy.visit('/entities/publication/'.concat(TEST_ENTITY_PUBLICATION));
6+
cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
87

98
// Wait for breadcrumbs to be visible
109
cy.get('ds-breadcrumbs').should('be.visible');

0 commit comments

Comments
 (0)