Commits

Lotte Hofstede authored b6fd84eb38c Merge
Merge remote-tracking branch 'artlowel/rest-relationships' into w2p-40416_simple-item-page

Conflicts: src/app/core/shared/dspace-object.model.ts
No tags

config/environment.default.js

Modified
1 1 module.exports = {
2 - "production": false,
3 - // The REST API Location.
2 + // The REST API server settings.
4 3 "rest": {
4 + "ssl": false,
5 + "address": "localhost",
6 + "port": 3000,
5 7 // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
6 - "nameSpace": "/api",
7 - "baseURL": "http://localhost:3000"
8 + "nameSpace": "/api"
8 9 },
9 - // Path and Port in use for this Angular2 UI
10 + // Angular2 UI server settings.
10 11 "ui": {
11 - "nameSpace": "/",
12 - "baseURL": "http://localhost:3000"
12 + "ssl": false,
13 + "address": "localhost",
14 + "port": 3000,
15 + // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
16 + "nameSpace": "/"
13 17 },
14 18 "cache": {
15 19 // how long should objects be cached for by default
16 - "msToLive": 15 * 60 * 1000, //15 minutes
20 + "msToLive": 15 * 60 * 1000, // 15 minute
21 + "control": "max-age=60" // revalidate browser
17 22 },
18 23 "universal": {
19 - //on the client: start with the state on the server
20 - "shouldRehydrate": true
24 + // Angular Universal settings
25 + "preboot": true,
26 + "async": true
21 27 }
22 28 };

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut