Skip to content

Commit 8c70ee8

Browse files
author
Andrea Barbasso
committed
Merge branch 'main' into task/main/CST-15593
# Conflicts: # package-lock.json # package.json # src/assets/i18n/ar.json5
2 parents ad7bbb8 + bd43d95 commit 8c70ee8

64 files changed

Lines changed: 25764 additions & 16506 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/dependabot.yml‎

Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,294 @@
1+
#-------------------
2+
# DSpace's dependabot rules. Enables npm updates for all dependencies on a weekly basis
3+
# for main and any maintenance branches. Security updates only apply to main.
4+
#-------------------
5+
version: 2
6+
updates:
7+
###############
8+
## Main branch
9+
###############
10+
# NOTE: At this time, "security-updates" rules only apply if "target-branch" is unspecified
11+
# So, only this first section can include "applies-to: security-updates"
12+
- package-ecosystem: "npm"
13+
directory: "/"
14+
schedule:
15+
interval: "weekly"
16+
# Allow up to 10 open PRs for dependencies
17+
open-pull-requests-limit: 10
18+
# Group together Angular package upgrades
19+
groups:
20+
# Group together all minor/patch version updates for Angular in a single PR
21+
angular:
22+
applies-to: version-updates
23+
patterns:
24+
- "@angular*"
25+
update-types:
26+
- "minor"
27+
- "patch"
28+
# Group together all security updates for Angular. Only accept minor/patch types.
29+
angular-security:
30+
applies-to: security-updates
31+
patterns:
32+
- "@angular*"
33+
update-types:
34+
- "minor"
35+
- "patch"
36+
# Group together all minor/patch version updates for NgRx in a single PR
37+
ngrx:
38+
applies-to: version-updates
39+
patterns:
40+
- "@ngrx*"
41+
update-types:
42+
- "minor"
43+
- "patch"
44+
# Group together all security updates for NgRx. Only accept minor/patch types.
45+
ngrx-security:
46+
applies-to: security-updates
47+
patterns:
48+
- "@ngrx*"
49+
update-types:
50+
- "minor"
51+
- "patch"
52+
# Group together all patch version updates for eslint in a single PR
53+
eslint:
54+
applies-to: version-updates
55+
patterns:
56+
- "@typescript-eslint*"
57+
- "eslint*"
58+
update-types:
59+
- "minor"
60+
- "patch"
61+
# Group together all security updates for eslint.
62+
eslint-security:
63+
applies-to: security-updates
64+
patterns:
65+
- "@typescript-eslint*"
66+
- "eslint*"
67+
update-types:
68+
- "minor"
69+
- "patch"
70+
# Group together any testing related version updates
71+
testing:
72+
applies-to: version-updates
73+
patterns:
74+
- "@cypress*"
75+
- "cypress*"
76+
- "jasmine*"
77+
- "karma*"
78+
- "ng-mocks"
79+
update-types:
80+
- "minor"
81+
- "patch"
82+
# Group together any testing related security updates
83+
testing-security:
84+
applies-to: security-updates
85+
patterns:
86+
- "@cypress*"
87+
- "cypress*"
88+
- "jasmine*"
89+
- "karma*"
90+
- "ng-mocks"
91+
update-types:
92+
- "minor"
93+
- "patch"
94+
# Group together any postcss related version updates
95+
postcss:
96+
applies-to: version-updates
97+
patterns:
98+
- "postcss*"
99+
update-types:
100+
- "minor"
101+
- "patch"
102+
# Group together any postcss related security updates
103+
postcss-security:
104+
applies-to: security-updates
105+
patterns:
106+
- "postcss*"
107+
update-types:
108+
- "minor"
109+
- "patch"
110+
# Group together any sass related version updates
111+
sass:
112+
applies-to: version-updates
113+
patterns:
114+
- "sass*"
115+
update-types:
116+
- "minor"
117+
- "patch"
118+
# Group together any sass related security updates
119+
sass-security:
120+
applies-to: security-updates
121+
patterns:
122+
- "sass*"
123+
update-types:
124+
- "minor"
125+
- "patch"
126+
# Group together any webpack related version updates
127+
webpack:
128+
applies-to: version-updates
129+
patterns:
130+
- "webpack*"
131+
update-types:
132+
- "minor"
133+
- "patch"
134+
# Group together any webpack related seurity updates
135+
webpack-security:
136+
applies-to: security-updates
137+
patterns:
138+
- "webpack*"
139+
update-types:
140+
- "minor"
141+
- "patch"
142+
ignore:
143+
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
144+
- dependency-name: "*"
145+
update-types: ["version-update:semver-major"]
146+
#####################
147+
## dspace-8_x branch
148+
#####################
149+
- package-ecosystem: "npm"
150+
directory: "/"
151+
target-branch: dspace-8_x
152+
schedule:
153+
interval: "weekly"
154+
# Allow up to 10 open PRs for dependencies
155+
open-pull-requests-limit: 10
156+
# Group together Angular package upgrades
157+
groups:
158+
# Group together all patch version updates for Angular in a single PR
159+
angular:
160+
applies-to: version-updates
161+
patterns:
162+
- "@angular*"
163+
update-types:
164+
- "minor"
165+
- "patch"
166+
# Group together all minor/patch version updates for NgRx in a single PR
167+
ngrx:
168+
applies-to: version-updates
169+
patterns:
170+
- "@ngrx*"
171+
update-types:
172+
- "minor"
173+
- "patch"
174+
# Group together all patch version updates for eslint in a single PR
175+
eslint:
176+
applies-to: version-updates
177+
patterns:
178+
- "@typescript-eslint*"
179+
- "eslint*"
180+
update-types:
181+
- "minor"
182+
- "patch"
183+
# Group together any testing related version updates
184+
testing:
185+
applies-to: version-updates
186+
patterns:
187+
- "@cypress*"
188+
- "cypress*"
189+
- "jasmine*"
190+
- "karma*"
191+
- "ng-mocks"
192+
update-types:
193+
- "minor"
194+
- "patch"
195+
# Group together any postcss related version updates
196+
postcss:
197+
applies-to: version-updates
198+
patterns:
199+
- "postcss*"
200+
update-types:
201+
- "minor"
202+
- "patch"
203+
# Group together any sass related version updates
204+
sass:
205+
applies-to: version-updates
206+
patterns:
207+
- "sass*"
208+
update-types:
209+
- "minor"
210+
- "patch"
211+
# Group together any webpack related version updates
212+
webpack:
213+
applies-to: version-updates
214+
patterns:
215+
- "webpack*"
216+
update-types:
217+
- "minor"
218+
- "patch"
219+
ignore:
220+
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
221+
- dependency-name: "*"
222+
update-types: ["version-update:semver-major"]
223+
#####################
224+
## dspace-7_x branch
225+
#####################
226+
- package-ecosystem: "npm"
227+
directory: "/"
228+
target-branch: dspace-7_x
229+
schedule:
230+
interval: "weekly"
231+
# Allow up to 10 open PRs for dependencies
232+
open-pull-requests-limit: 10
233+
# Group together Angular package upgrades
234+
groups:
235+
# Group together all minor/patch version updates for Angular in a single PR
236+
angular:
237+
applies-to: version-updates
238+
patterns:
239+
- "@angular*"
240+
update-types:
241+
- "minor"
242+
- "patch"
243+
# Group together all minor/patch version updates for NgRx in a single PR
244+
ngrx:
245+
applies-to: version-updates
246+
patterns:
247+
- "@ngrx*"
248+
update-types:
249+
- "minor"
250+
- "patch"
251+
# Group together all patch version updates for eslint in a single PR
252+
eslint:
253+
applies-to: version-updates
254+
patterns:
255+
- "@typescript-eslint*"
256+
- "eslint*"
257+
update-types:
258+
- "minor"
259+
- "patch"
260+
# Group together any testing related version updates
261+
testing:
262+
applies-to: version-updates
263+
patterns:
264+
- "@cypress*"
265+
- "cypress*"
266+
- "jasmine*"
267+
- "karma*"
268+
- "ng-mocks"
269+
update-types:
270+
- "minor"
271+
- "patch"
272+
# Group together any postcss related version updates
273+
postcss:
274+
applies-to: version-updates
275+
patterns:
276+
- "postcss*"
277+
update-types:
278+
- "minor"
279+
- "patch"
280+
# Group together any sass related version updates
281+
sass:
282+
applies-to: version-updates
283+
patterns:
284+
- "sass*"
285+
update-types:
286+
- "minor"
287+
- "patch"
288+
ignore:
289+
# 7.x Cannot update Webpack past v5.76.1 as later versions not supported by Angular 15
290+
# See also https://github.com/DSpace/dspace-angular/pull/3283#issuecomment-2372488489
291+
- dependency-name: "webpack"
292+
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
293+
- dependency-name: "*"
294+
update-types: ["version-update:semver-major"]

‎angular.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"lodash",
3131
"jwt-decode",
3232
"uuid",
33-
"webfontloader",
3433
"zone.js"
3534
],
3635
"outputPath": "dist/browser",

‎cypress.config.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { defineConfig } from 'cypress';
22

33
export default defineConfig({
4+
video: true,
45
videosFolder: 'cypress/videos',
56
screenshotsFolder: 'cypress/screenshots',
67
fixturesFolder: 'cypress/fixtures',
@@ -18,6 +19,7 @@ export default defineConfig({
1819

1920
// Admin account used for administrative tests
2021
DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
22+
DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
2123
DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
2224
// Community/collection/publication used for view/edit tests
2325
DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
@@ -33,6 +35,8 @@ export default defineConfig({
3335
// Account used to test basic submission process
3436
DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
3537
DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
38+
// Administrator users group
39+
DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
3640
},
3741
e2e: {
3842
// Setup our plugins for e2e tests

‎cypress/e2e/admin-add-new-modals.cy.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import { testA11y } from 'cypress/support/utils';
2+
3+
describe('Admin Add New Modals', () => {
4+
beforeEach(() => {
5+
// Must login as an Admin for sidebar to appear
6+
cy.visit('/login');
7+
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
8+
});
9+
10+
it('Add new Community modal should pass accessibility tests', () => {
11+
// Pin the sidebar open
12+
cy.get('#sidebar-collapse-toggle').click();
13+
14+
// Click on entry of menu
15+
cy.get('#admin-menu-section-new-title').click();
16+
17+
cy.get('a[data-test="menu.section.new_community"]').click();
18+
19+
// Analyze <ds-create-community-parent-selector> for accessibility
20+
testA11y('ds-create-community-parent-selector');
21+
});
22+
23+
it('Add new Collection modal should pass accessibility tests', () => {
24+
// Pin the sidebar open
25+
cy.get('#sidebar-collapse-toggle').click();
26+
27+
// Click on entry of menu
28+
cy.get('#admin-menu-section-new-title').click();
29+
30+
cy.get('a[data-test="menu.section.new_collection"]').click();
31+
32+
// Analyze <ds-create-collection-parent-selector> for accessibility
33+
testA11y('ds-create-collection-parent-selector');
34+
});
35+
36+
it('Add new Item modal should pass accessibility tests', () => {
37+
// Pin the sidebar open
38+
cy.get('#sidebar-collapse-toggle').click();
39+
40+
// Click on entry of menu
41+
cy.get('#admin-menu-section-new-title').click();
42+
43+
cy.get('a[data-test="menu.section.new_item"]').click();
44+
45+
// Analyze <ds-create-item-parent-selector> for accessibility
46+
testA11y('ds-create-item-parent-selector');
47+
});
48+
});

‎cypress/e2e/admin-curation-tasks.cy.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { testA11y } from 'cypress/support/utils';
2+
3+
describe('Admin Curation Tasks', () => {
4+
beforeEach(() => {
5+
// Must login as an Admin to see the page
6+
cy.visit('/admin/curation-tasks');
7+
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
8+
});
9+
10+
it('should pass accessibility tests', () => {
11+
// Page must first be visible
12+
cy.get('ds-admin-curation-task').should('be.visible');
13+
// Analyze <ds-admin-curation-task> for accessibility issues
14+
testA11y('ds-admin-curation-task');
15+
});
16+
});

0 commit comments

Comments
 (0)