Skip to content

Commit 9e39b01

Browse files
AAwoutersAAwouters
committed
Merge branch 'dspace-8_x' into accessibility-settings-8_x
2 parents 991dc0a + 1ec2df1 commit 9e39b01

211 files changed

Lines changed: 8182 additions & 2909 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.

‎.eslintrc.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"eslint-plugin-rxjs",
1313
"eslint-plugin-simple-import-sort",
1414
"eslint-plugin-import-newlines",
15-
"eslint-plugin-jsonc",
1615
"dspace-angular-ts",
1716
"dspace-angular-html"
1817
],
@@ -302,10 +301,13 @@
302301
"*.json5"
303302
],
304303
"extends": [
305-
"plugin:jsonc/recommended-with-jsonc"
304+
"plugin:jsonc/recommended-with-json5"
306305
],
307306
"rules": {
308-
"no-irregular-whitespace": "error",
307+
// The ESLint core no-irregular-whitespace rule doesn't work well in JSON
308+
// See: https://ota-meshi.github.io/eslint-plugin-jsonc/rules/no-irregular-whitespace.html
309+
"no-irregular-whitespace": "off",
310+
"jsonc/no-irregular-whitespace": "error",
309311
"no-trailing-spaces": "error",
310312
"jsonc/comma-dangle": [
311313
"error",

‎.github/workflows/build.yml‎

Lines changed: 104 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,115 @@ jobs:
190190
# Get homepage and verify that the <meta name="title"> tag includes "DSpace".
191191
# If it does, then SSR is working, as this tag is created by our MetadataService.
192192
# This step also prints entire HTML of homepage for easier debugging if grep fails.
193-
- name: Verify SSR (server-side rendering)
193+
- name: Verify SSR (server-side rendering) on Homepage
194194
run: |
195195
result=$(wget -O- -q http://127.0.0.1:4000/home)
196196
echo "$result"
197197
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
198198
199+
# Get a specific community in our test data and verify that the "<h1>" tag includes "Publications" (the community name).
200+
# If it does, then SSR is working.
201+
- name: Verify SSR on a Community page
202+
run: |
203+
result=$(wget -O- -q http://127.0.0.1:4000/communities/0958c910-2037-42a9-81c7-dca80e3892b4)
204+
echo "$result"
205+
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Publications
206+
207+
# Get a specific collection in our test data and verify that the "<h1>" tag includes "Articles" (the collection name).
208+
# If it does, then SSR is working.
209+
- name: Verify SSR on a Collection page
210+
run: |
211+
result=$(wget -O- -q http://127.0.0.1:4000/collections/282164f5-d325-4740-8dd1-fa4d6d3e7200)
212+
echo "$result"
213+
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Articles
214+
215+
# Get a specific publication in our test data and verify that the <meta name="title"> tag includes
216+
# the title of this publication. If it does, then SSR is working.
217+
- name: Verify SSR on a Publication page
218+
run: |
219+
result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/6160810f-1e53-40db-81ef-f6621a727398)
220+
echo "$result"
221+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "An Economic Model of Mortality Salience"
222+
223+
# Get a specific person in our test data and verify that the <meta name="title"> tag includes
224+
# the name of the person. If it does, then SSR is working.
225+
- name: Verify SSR on a Person page
226+
run: |
227+
result=$(wget -O- -q http://127.0.0.1:4000/entities/person/b1b2c768-bda1-448a-a073-fc541e8b24d9)
228+
echo "$result"
229+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Simmons, Cameron"
230+
231+
# Get a specific project in our test data and verify that the <meta name="title"> tag includes
232+
# the name of the project. If it does, then SSR is working.
233+
- name: Verify SSR on a Project page
234+
run: |
235+
result=$(wget -O- -q http://127.0.0.1:4000/entities/project/46ccb608-a74c-4bf6-bc7a-e29cc7defea9)
236+
echo "$result"
237+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "University Research Fellowship"
238+
239+
# Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
240+
# the name of the orgunit. If it does, then SSR is working.
241+
- name: Verify SSR on an OrgUnit page
242+
run: |
243+
result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/9851674d-bd9a-467b-8d84-068deb568ccf)
244+
echo "$result"
245+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Law and Development"
246+
247+
# Get a specific journal in our test data and verify that the <meta name="title"> tag includes
248+
# the name of the journal. If it does, then SSR is working.
249+
- name: Verify SSR on a Journal page
250+
run: |
251+
result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/d4af6c3e-53d0-4757-81eb-566f3b45d63a)
252+
echo "$result"
253+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology"
254+
255+
# Get a specific journal volume in our test data and verify that the <meta name="title"> tag includes
256+
# the name of the volume. If it does, then SSR is working.
257+
- name: Verify SSR on a Journal Volume page
258+
run: |
259+
result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538)
260+
echo "$result"
261+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Volume 28 (2017)"
262+
263+
# Get a specific journal issue in our test data and verify that the <meta name="title"> tag includes
264+
# the name of the issue. If it does, then SSR is working.
265+
- name: Verify SSR on a Journal Issue page
266+
run: |
267+
result=$(wget -O- -q http://127.0.0.1:4000/entities/journalissue/44c29473-5de2-48fa-b005-e5029aa1a50b)
268+
echo "$result"
269+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Vol. 28, No. 1"
270+
271+
# Verify 301 Handle redirect behavior
272+
# Note: /handle/123456789/260 is the same test Publication used by our e2e tests
273+
- name: Verify 301 redirect from '/handle' URLs
274+
run: |
275+
result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/260 2>&1 | head -1 | awk '{print $2}')
276+
echo "$result"
277+
[[ "$result" -eq "301" ]]
278+
279+
# Verify 403 error code behavior
280+
- name: Verify 403 error code from '/403'
281+
run: |
282+
result=$(wget --server-response --quiet http://127.0.0.1:4000/403 2>&1 | head -1 | awk '{print $2}')
283+
echo "$result"
284+
[[ "$result" -eq "403" ]]
285+
286+
# Verify 404 error code behavior
287+
- name: Verify 404 error code from '/404' and on invalid pages
288+
run: |
289+
result=$(wget --server-response --quiet http://127.0.0.1:4000/404 2>&1 | head -1 | awk '{print $2}')
290+
echo "$result"
291+
result2=$(wget --server-response --quiet http://127.0.0.1:4000/invalidurl 2>&1 | head -1 | awk '{print $2}')
292+
echo "$result2"
293+
[[ "$result" -eq "404" && "$result2" -eq "404" ]]
294+
295+
# Verify 500 error code behavior
296+
- name: Verify 500 error code from '/500'
297+
run: |
298+
result=$(wget --server-response --quiet http://127.0.0.1:4000/500 2>&1 | head -1 | awk '{print $2}')
299+
echo "$result"
300+
[[ "$result" -eq "500" ]]
301+
199302
- name: Stop running app
200303
run: kill -9 $(lsof -t -i:4000)
201304

‎config/config.example.yml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,24 @@ ssr:
2323
# Determining which styles are critical is a relatively expensive operation; this option is
2424
# disabled (false) by default to boost server performance at the expense of loading smoothness.
2525
inlineCriticalCss: false
26-
# Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
27-
# NOTE: The "/handle/" path ensures Handle redirects work via SSR. The "/reload/" path ensures
28-
# hard refreshes (e.g. after login) trigger SSR while fully reloading the page.
29-
paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ]
26+
# Patterns to be run as regexes against the path of the page to check if SSR is allowed.
27+
# If the path match any of the regexes it will be served directly in CSR.
28+
# By default, excludes community and collection browse, global browse, global search, community list, statistics and various administrative tools.
29+
excludePathPatterns:
30+
- pattern: "^/communities/[a-f0-9-]{36}/browse(/.*)?$"
31+
flag: "i"
32+
- pattern: "^/collections/[a-f0-9-]{36}/browse(/.*)?$"
33+
flag: "i"
34+
- pattern: "^/browse/"
35+
- pattern: "^/search$"
36+
- pattern: "^/community-list$"
37+
- pattern: "^/admin/"
38+
- pattern: "^/processes/?"
39+
- pattern: "^/notifications/"
40+
- pattern: "^/statistics/?"
41+
- pattern: "^/access-control/"
42+
- pattern: "^/health$"
43+
3044
# Whether to enable rendering of Search component on SSR.
3145
# If set to true the component will be included in the HTML returned from the server side rendering.
3246
# If set to false the component will not be included in the HTML returned from the server side rendering.

‎package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
"@angular/platform-browser-dynamic": "^17.3.11",
6767
"@angular/platform-server": "^17.3.11",
6868
"@angular/router": "^17.3.11",
69-
"@angular/ssr": "^17.3.11",
70-
"@babel/runtime": "7.26.7",
69+
"@angular/ssr": "^17.3.17",
70+
"@babel/runtime": "7.27.6",
7171
"@kolkov/ngx-gallery": "^2.0.1",
7272
"@ng-bootstrap/ng-bootstrap": "^11.0.0",
7373
"@ng-dynamic-forms/core": "^16.0.0",
@@ -78,14 +78,14 @@
7878
"@ngx-translate/core": "^14.0.0",
7979
"@nicky-lenaers/ngx-scroll-to": "^14.0.0",
8080
"angulartics2": "^12.2.0",
81-
"axios": "^1.7.9",
81+
"axios": "^1.10.0",
8282
"bootstrap": "^4.6.1",
8383
"cerialize": "0.1.18",
8484
"cli-progress": "^3.12.0",
8585
"colors": "^1.4.0",
86-
"compression": "^1.7.5",
86+
"compression": "^1.8.0",
8787
"cookie-parser": "1.4.7",
88-
"core-js": "^3.40.0",
88+
"core-js": "^3.42.0",
8989
"date-fns": "^2.29.3",
9090
"date-fns-tz": "^1.3.7",
9191
"deepmerge": "^4.3.1",
@@ -94,9 +94,9 @@
9494
"express-rate-limit": "^5.1.3",
9595
"fast-json-patch": "^3.1.1",
9696
"filesize": "^6.1.0",
97-
"http-proxy-middleware": "^2.0.7",
97+
"http-proxy-middleware": "^2.0.9",
9898
"http-terminator": "^3.2.0",
99-
"isbot": "^5.1.22",
99+
"isbot": "^5.1.28",
100100
"js-cookie": "2.2.1",
101101
"js-yaml": "^4.1.0",
102102
"json5": "^2.2.3",
@@ -119,20 +119,20 @@
119119
"nouislider": "^15.7.1",
120120
"pem": "1.14.8",
121121
"reflect-metadata": "^0.2.2",
122-
"rxjs": "^7.8.0",
122+
"rxjs": "^7.8.2",
123123
"uuid": "^8.3.2",
124-
"zone.js": "~0.15.0"
124+
"zone.js": "~0.14.0"
125125
},
126126
"devDependencies": {
127127
"@angular-builders/custom-webpack": "~17.0.2",
128-
"@angular-devkit/build-angular": "^17.3.11",
128+
"@angular-devkit/build-angular": "^17.3.17",
129129
"@angular-eslint/builder": "17.5.3",
130130
"@angular-eslint/bundled-angular-compiler": "17.5.3",
131131
"@angular-eslint/eslint-plugin": "17.5.3",
132132
"@angular-eslint/eslint-plugin-template": "17.5.3",
133133
"@angular-eslint/schematics": "17.5.3",
134134
"@angular-eslint/template-parser": "17.5.3",
135-
"@angular/cli": "^17.3.11",
135+
"@angular/cli": "^17.3.17",
136136
"@angular/compiler-cli": "^17.3.11",
137137
"@angular/language-service": "^17.3.11",
138138
"@cypress/schematic": "^1.5.0",
@@ -147,13 +147,13 @@
147147
"@types/grecaptcha": "^3.0.9",
148148
"@types/jasmine": "~3.6.0",
149149
"@types/js-cookie": "2.2.6",
150-
"@types/lodash": "^4.17.15",
150+
"@types/lodash": "^4.17.17",
151151
"@types/node": "^14.14.9",
152152
"@typescript-eslint/eslint-plugin": "^7.2.0",
153153
"@typescript-eslint/parser": "^7.2.0",
154154
"@typescript-eslint/rule-tester": "^7.2.0",
155155
"@typescript-eslint/utils": "^7.2.0",
156-
"axe-core": "^4.10.2",
156+
"axe-core": "^4.10.3",
157157
"compression-webpack-plugin": "^9.2.0",
158158
"copy-webpack-plugin": "^6.4.1",
159159
"cross-env": "^7.0.3",
@@ -168,7 +168,7 @@
168168
"eslint-plugin-import": "^2.31.0",
169169
"eslint-plugin-import-newlines": "^1.3.1",
170170
"eslint-plugin-jsdoc": "^45.0.0",
171-
"eslint-plugin-jsonc": "^2.19.1",
171+
"eslint-plugin-jsonc": "^2.20.1",
172172
"eslint-plugin-lodash": "^7.4.0",
173173
"eslint-plugin-rxjs": "^5.0.3",
174174
"eslint-plugin-simple-import-sort": "^10.0.0",
@@ -183,7 +183,7 @@
183183
"karma-jasmine": "~4.0.0",
184184
"karma-jasmine-html-reporter": "^1.5.0",
185185
"karma-mocha-reporter": "2.2.5",
186-
"ng-mocks": "^14.13.2",
186+
"ng-mocks": "^14.13.5",
187187
"ngx-mask": "14.2.4",
188188
"nodemon": "^2.0.22",
189189
"postcss": "^8.5",
@@ -195,12 +195,12 @@
195195
"react-copy-to-clipboard": "^5.1.0",
196196
"react-dom": "^16.14.0",
197197
"rimraf": "^3.0.2",
198-
"sass": "~1.84.0",
198+
"sass": "~1.89.2",
199199
"sass-loader": "^12.6.0",
200200
"sass-resources-loader": "^2.2.5",
201201
"ts-node": "^8.10.2",
202202
"typescript": "~5.4.5",
203-
"webpack": "5.97.1",
203+
"webpack": "5.99.9",
204204
"webpack-cli": "^5.1.4",
205205
"webpack-dev-server": "^4.15.1"
206206
}

‎server.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import {
5858
REQUEST,
5959
RESPONSE,
6060
} from './src/express.tokens';
61+
import { SsrExcludePatterns } from "./src/config/ssr-config.interface";
6162

6263
/*
6364
* Set path for the browser application's dist folder
@@ -221,7 +222,7 @@ export function app() {
221222
* The callback function to serve server side angular
222223
*/
223224
function ngApp(req, res, next) {
224-
if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || environment.ssr.paths.some(pathPrefix => req.path.startsWith(pathPrefix)))) {
225+
if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || !isExcludedFromSsr(req.path, environment.ssr.excludePathPatterns))) {
225226
// Render the page to user via SSR (server side rendering)
226227
serverSideRender(req, res, next);
227228
} else {
@@ -627,6 +628,21 @@ function start() {
627628
}
628629
}
629630

631+
/**
632+
* Check if SSR should be skipped for path
633+
*
634+
* @param path
635+
* @param excludePathPattern
636+
*/
637+
function isExcludedFromSsr(path: string, excludePathPattern: SsrExcludePatterns[]): boolean {
638+
const patterns = excludePathPattern.map(p =>
639+
new RegExp(p.pattern, p.flag || '')
640+
);
641+
return patterns.some((regex) => {
642+
return regex.test(path)
643+
});
644+
}
645+
630646
/*
631647
* The callback function to serve health check requests
632648
*/

0 commit comments

Comments
 (0)