diff --git a/.eslintrc.json b/.eslintrc.json
index 6d5aa89db72..b95b54b979a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -6,7 +6,8 @@
"eslint-plugin-import",
"eslint-plugin-jsdoc",
"eslint-plugin-deprecation",
- "eslint-plugin-unused-imports"
+ "unused-imports",
+ "eslint-plugin-lodash"
],
"overrides": [
{
@@ -202,7 +203,13 @@
"deprecation/deprecation": "warn",
"import/order": "off",
- "import/no-deprecated": "warn"
+ "import/no-deprecated": "warn",
+ "import/no-namespace": "error",
+ "unused-imports/no-unused-imports": "error",
+ "lodash/import-scope": [
+ "error",
+ "method"
+ ]
}
},
{
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index be15b0a507c..e50105b8797 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
## References
_Add references/links to any related issues or PRs. These may include:_
-* Fixes #[issue-number]
-* Requires DSpace/DSpace#[pr-number] (if a REST API PR is required to test this)
+* Fixes #`issue-number` (if this fixes an issue ticket)
+* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
## Description
Short summary of changes (1-2 sentences).
@@ -19,8 +19,10 @@ List of changes in this PR:
_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
-- [ ] My PR passes [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
-- [ ] My PR doesn't introduce circular dependencies
+- [ ] My PR passes [ESLint](https://eslint.org/) validation using `yarn lint`
+- [ ] My PR doesn't introduce circular dependencies (verified via `yarn check-circ-deps`)
- [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
- [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
-- [ ] If my PR includes new, third-party dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
+- [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04d426d0919..dabc0b428e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,34 +6,39 @@ name: Build
# Run this Build for all pushes / PRs to current branch
on: [push, pull_request]
+permissions:
+ contents: read # to fetch code (actions/checkout)
+
jobs:
tests:
runs-on: ubuntu-latest
env:
# The ci step will test the dspace-angular code against DSpace REST.
# Direct that step to utilize a DSpace REST service that has been started in docker.
- DSPACE_REST_HOST: localhost
+ DSPACE_REST_HOST: 127.0.0.1
DSPACE_REST_PORT: 8080
DSPACE_REST_NAMESPACE: '/server'
DSPACE_REST_SSL: false
+ # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
+ DSPACE_UI_HOST: 127.0.0.1
# When Chrome version is specified, we pin to a specific version of Chrome
# Comment this out to use the latest release
- #CHROME_VERSION: "90.0.4430.212-1"
+ CHROME_VERSION: "116.0.5845.187-1"
strategy:
# Create a matrix of Node versions to test against (in parallel)
matrix:
- node-version: [14.x, 16.x]
+ node-version: [16.x, 18.x]
# Do NOT exit immediately if one matrix job fails
fail-fast: false
# These are the actual CI steps to perform per job
steps:
# https://github.com/actions/checkout
- name: Checkout codebase
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
# https://github.com/actions/setup-node
- name: Install Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v2
+ uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
@@ -58,7 +63,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache Yarn dependencies
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
# Cache entire Yarn cache directory (see previous step)
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -85,7 +90,7 @@ jobs:
# Upload coverage reports to Codecov (for one version of Node only)
# https://github.com/codecov/codecov-action
- name: Upload coverage to Codecov.io
- uses: codecov/codecov-action@v2
+ uses: codecov/codecov-action@v3
if: matrix.node-version == '16.x'
# Using docker-compose start backend using CI configuration
@@ -100,7 +105,7 @@ jobs:
# https://github.com/cypress-io/github-action
# (NOTE: to run these e2e tests locally, just use 'ng e2e')
- name: Run e2e tests (integration tests)
- uses: cypress-io/github-action@v2
+ uses: cypress-io/github-action@v4
with:
# Run tests in Chrome, headless mode
browser: chrome
@@ -109,14 +114,14 @@ jobs:
start: yarn run serve:ssr
# Wait for backend & frontend to be available
# NOTE: We use the 'sites' REST endpoint to also ensure the database is ready
- wait-on: http://localhost:8080/server/api/core/sites, http://localhost:4000
+ wait-on: http://127.0.0.1:8080/server/api/core/sites, http://127.0.0.1:4000
# Wait for 2 mins max for everything to respond
wait-on-timeout: 120
# Cypress always creates a video of all e2e tests (whether they succeeded or failed)
# Save those in an Artifact
- name: Upload e2e test videos to Artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
if: always()
with:
name: e2e-test-videos
@@ -125,7 +130,7 @@ jobs:
# If e2e tests fail, Cypress creates a screenshot of what happened
# Save those in an Artifact
- name: Upload e2e test failure screenshots to Artifacts
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
if: failure()
with:
name: e2e-test-screenshots
@@ -144,7 +149,7 @@ jobs:
run: |
nohup yarn run serve:ssr &
printf 'Waiting for app to start'
- until curl --output /dev/null --silent --head --fail http://localhost:4000/home; do
+ until curl --output /dev/null --silent --head --fail http://127.0.0.1:4000/home; do
printf '.'
sleep 2
done
@@ -155,7 +160,7 @@ jobs:
# This step also prints entire HTML of homepage for easier debugging if grep fails.
- name: Verify SSR (server-side rendering)
run: |
- result=$(wget -O- -q http://localhost:4000/home)
+ result=$(wget -O- -q http://127.0.0.1:4000/home)
echo "$result"
echo "$result" | grep -oE "]*>" | grep DSpace
diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
new file mode 100644
index 00000000000..35a2e2d24aa
--- /dev/null
+++ b/.github/workflows/codescan.yml
@@ -0,0 +1,49 @@
+# DSpace CodeQL code scanning configuration for GitHub
+# https://docs.github.com/en/code-security/code-scanning
+#
+# NOTE: Code scanning must be run separate from our default build.yml
+# because CodeQL requires a fresh build with all tests *disabled*.
+name: "Code Scanning"
+
+# Run this code scan for all pushes / PRs to main branch. Also run once a week.
+on:
+ push:
+ branches: [ main ]
+ pull_request:
+ branches: [ main ]
+ # Don't run if PR is only updating static documentation
+ paths-ignore:
+ - '**/*.md'
+ - '**/*.txt'
+ schedule:
+ - cron: "37 0 * * 1"
+
+jobs:
+ analyze:
+ name: Analyze Code
+ runs-on: ubuntu-latest
+ # Limit permissions of this GitHub action. Can only write to security-events
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ steps:
+ # https://github.com/actions/checkout
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ # https://github.com/github/codeql-action
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: javascript
+
+ # Autobuild attempts to build any compiled languages
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+ # Perform GitHub Code Scanning.
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 64303ca8bbd..908c5c34fdc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -12,6 +12,9 @@ on:
- 'dspace-**'
pull_request:
+permissions:
+ contents: read # to fetch code (actions/checkout)
+
jobs:
docker:
# Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
@@ -39,11 +42,11 @@ jobs:
steps:
# https://github.com/actions/checkout
- name: Checkout codebase
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
# https://github.com/docker/setup-buildx-action
- name: Setup Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU emulation to build for multiple architectures
@@ -53,7 +56,7 @@ jobs:
- name: Login to DockerHub
# Only login if not a PR, as PRs only trigger a Docker build and not a push
if: github.event_name != 'pull_request'
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -65,7 +68,7 @@ jobs:
# Get Metadata for docker_build step below
- name: Sync metadata (tags, labels) from GitHub to Docker for 'dspace-angular' image
id: meta_build
- uses: docker/metadata-action@v3
+ uses: docker/metadata-action@v4
with:
images: dspace/dspace-angular
tags: ${{ env.IMAGE_TAGS }}
@@ -74,7 +77,7 @@ jobs:
# https://github.com/docker/build-push-action
- name: Build and push 'dspace-angular' image
id: docker_build
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile
diff --git a/.github/workflows/issue_opened.yml b/.github/workflows/issue_opened.yml
index 6b9a273ab6d..5d7c1c30f7d 100644
--- a/.github/workflows/issue_opened.yml
+++ b/.github/workflows/issue_opened.yml
@@ -5,25 +5,22 @@ on:
issues:
types: [opened]
+permissions: {}
jobs:
automation:
runs-on: ubuntu-latest
steps:
# Add the new issue to a project board, if it needs triage
- # See https://github.com/marketplace/actions/create-project-card-action
- - name: Add issue to project board
+ # See https://github.com/actions/add-to-project
+ - name: Add issue to triage board
# 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: technote-space/create-project-card-action@v1
+ uses: actions/add-to-project@v0.3.0
# Note, the authentication token below is an ORG level Secret.
- # It must be created/recreated manually via a personal access token with "public_repo" and "admin:org" permissions
+ # 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
# This is necessary because the "DSpace Backlog" project is an org level project (i.e. not repo specific)
with:
- GITHUB_TOKEN: ${{ secrets.ORG_PROJECT_TOKEN }}
- PROJECT: DSpace Backlog
- COLUMN: Triage
- CHECK_ORG_PROJECT: true
- # Ignore errors
- continue-on-error: true
+ github-token: ${{ secrets.TRIAGE_PROJECT_TOKEN }}
+ project-url: https://github.com/orgs/DSpace/projects/24
diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
index dcbab18f1b5..a840a4fd171 100644
--- a/.github/workflows/label_merge_conflicts.yml
+++ b/.github/workflows/label_merge_conflicts.yml
@@ -5,21 +5,32 @@ name: Check for merge conflicts
# NOTE: This means merge conflicts are only checked for when a PR is merged to main.
on:
push:
- branches:
- - main
+ branches: [ main ]
+ # 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/dspace-angular'
+ if: github.repository == 'dspace/dspace-angular'
runs-on: ubuntu-latest
+ permissions:
+ pull-requests: write
steps:
- # See: https://github.com/mschilde/auto-label-merge-conflicts/
+ # See: https://github.com/prince-chrismc/label-merge-conflicts-action
- name: Auto-label PRs with merge conflicts
- uses: mschilde/auto-label-merge-conflicts@v2.0
+ uses: prince-chrismc/label-merge-conflicts-action@v2
# 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 }}
- # Ignore errors
- continue-on-error: true
+ 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!
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..4e732302f4a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,46 @@
+# How to Contribute
+
+DSpace is a community built and supported project. We do not have a centralized development or support team, but have a dedicated group of volunteers who help us improve the software, documentation, resources, etc.
+
+* [Contribute new code via a Pull Request](#contribute-new-code-via-a-pull-request)
+* [Contribute documentation](#contribute-documentation)
+* [Help others on mailing lists or Slack](#help-others-on-mailing-lists-or-slack)
+* [Join a working or interest group](#join-a-working-or-interest-group)
+
+## Contribute new code via a Pull Request
+
+We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
+
+Code Contribution Checklist
+- [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
+- [ ] PRs **must** pass [ESLint](https://eslint.org/) validation using `yarn lint`
+- [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
+- [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
+- [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] Basic technical documentation _should_ be provided for any new features or configuration, either in the PR itself or in the DSpace Wiki documentation.
+- [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+Additional details on the code contribution process can be found in our [Code Contribution Guidelines](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines)
+
+## Contribute documentation
+
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x
+
+If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
+Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
+
+## Help others on mailing lists or Slack
+
+DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
+Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
+
+## Join a working or interest group
+
+Most of the work in building/improving DSpace comes via [Working Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Working+Groups) or [Interest Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Interest+Groups).
+
+All working/interest groups are open to anyone to join and participate. A few key groups to be aware of include:
+
+* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
+* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a7c1640d0ba..61d960e7d3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,15 @@
# This image will be published as dspace/dspace-angular
# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
-FROM node:14-alpine
+FROM node:18-alpine
WORKDIR /app
ADD . /app/
EXPOSE 4000
+# Ensure Python and other build tools are available
+# These are needed to install some node modules, especially on linux/arm64
+RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+
# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
# See, for example https://github.com/yarnpkg/yarn/issues/5540
RUN yarn install --network-timeout 300000
diff --git a/README.md b/README.md
index 6caa3663ead..3aad58c9b9b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ You can find additional information on the DSpace 7 Angular UI on the [wiki](htt
Quick start
-----------
-**Ensure you're running [Node](https://nodejs.org) `v14.x` or `v16.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
```bash
# clone the repo
@@ -68,7 +68,7 @@ Requirements
------------
- [Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
-- Ensure you're running node `v14.x` or `v16.x` and yarn == `v1.x`
+- Ensure you're running node `v16.x` or `v18.x` and yarn == `v1.x`
If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
@@ -329,7 +329,7 @@ Documentation
Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
-Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of htis codebase.
+Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of this codebase.
### Building code documentation
@@ -357,10 +357,10 @@ To get the most out of TypeScript, you'll need a TypeScript-aware editor. We've
- [Sublime Text](http://www.sublimetext.com/3)
- [Typescript-Sublime-Plugin](https://github.com/Microsoft/Typescript-Sublime-plugin#installation)
-Collaborating
+Contributing
-------------
-See [the guide on the wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+-+Angular+UI+Development#DSpace7-AngularUIDevelopment-Howtocontribute)
+See [Contributing documentation](CONTRIBUTING.md)
File Structure
--------------
diff --git a/angular.json b/angular.json
index 2f50ff3e8d4..3d991a57744 100644
--- a/angular.json
+++ b/angular.json
@@ -25,7 +25,6 @@
}
},
"allowedCommonJsDependencies": [
- "angular2-text-mask",
"cerialize",
"core-js",
"file-saver",
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
new file mode 100644
index 00000000000..5cdc81bfd51
--- /dev/null
+++ b/bitbucket-pipelines.yml
@@ -0,0 +1,27 @@
+options:
+ runs-on: ubuntu-latest
+
+definitions:
+ steps:
+ - step: &unittest-code-checks
+ name: test-code-checks
+ image:
+ name: cypress/browsers:node18.12.0-chrome107
+ run-as-user: 1000
+ size: 2x
+ caches:
+ - node
+ script:
+ - yarn install --frozen-lockfile
+ - yarn run lint --quiet
+ - yarn run check-circ-deps
+ - yarn run build:prod
+ - yarn run test:headless
+
+pipelines:
+ branches:
+ 'dspace-cris-7':
+ - step: *unittest-code-checks
+ pull-requests:
+ '**':
+ - step: *unittest-code-checks
diff --git a/config/config.example.yml b/config/config.example.yml
index 02626b7dd30..10344a47a2b 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -32,12 +32,60 @@ cache:
# NOTE: how long should objects be cached for by default
msToLive:
default: 900000 # 15 minutes
- control: max-age=60 # revalidate browser
+ # Default 'Cache-Control' HTTP Header to set for all static content (including compiled *.js files)
+ # Defaults to max-age=604,800 seconds (one week). This lets a user's browser know that it can cache these
+ # files for one week, after which they will be "stale" and need to be redownloaded.
+ # NOTE: When updates are made to compiled *.js files, it will automatically bypass this browser cache, because
+ # all compiled *.js files include a unique hash in their name which updates when content is modified.
+ control: max-age=604800 # revalidate browser
autoSync:
defaultTime: 0
maxBufferSize: 100
timePerMethod:
PATCH: 3 # time in seconds
+ # In-memory cache(s) of server-side rendered pages. These caches will store the most recently accessed public pages.
+ # Pages are automatically added/dropped from these caches based on how recently they have been used.
+ # Restarting the app clears all page caches.
+ # NOTE: To control the cache size, use the "max" setting. Keep in mind, individual cached pages are usually small (<100KB).
+ # Enabling *both* caches will mean that a page may be cached twice, once in each cache (but may expire at different times via timeToLive).
+ serverSide:
+ # Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues.
+ debug: false
+ # When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots.
+ # (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.)
+ botCache:
+ # Maximum number of pages to cache for known bots. Set to zero (0) to disable server side caching for bots.
+ # Default is 1000, which means the 1000 most recently accessed public pages will be cached.
+ # As all pages are cached in server memory, increasing this value will increase memory needs.
+ # Individual cached pages are usually small (<100KB), so max=1000 should only require ~100MB of memory.
+ max: 1000
+ # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
+ # copy is automatically refreshed on the next request.
+ # NOTE: For the bot cache, this setting may impact how quickly search engine bots will index new content on your site.
+ # For example, setting this to one week may mean that search engine bots may not find all new content for one week.
+ timeToLive: 86400000 # 1 day
+ # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+ # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+ # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+ # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+ allowStale: true
+ # When enabled (i.e. max > 0), all anonymous users will be sent pages from a server side cache.
+ # This allows anonymous users to interact more quickly with the site, but also means they may see slightly
+ # outdated content (based on timeToLive)
+ anonymousCache:
+ # Maximum number of pages to cache. Default is zero (0) which means anonymous user cache is disabled.
+ # As all pages are cached in server memory, increasing this value will increase memory needs.
+ # Individual cached pages are usually small (<100KB), so a value of max=1000 would only require ~100MB of memory.
+ max: 0
+ # Amount of time after which cached pages are considered stale (in ms). After becoming stale, the cached
+ # copy is automatically refreshed on the next request.
+ # NOTE: For the anonymous cache, it is recommended to keep this value low to avoid anonymous users seeing outdated content.
+ timeToLive: 10000 # 10 seconds
+ # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+ # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+ # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+ # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+ allowStale: true
# Authentication settings
auth:
@@ -55,6 +103,8 @@ auth:
# Form settings
form:
+ # Sets the spellcheck textarea attribute value
+ spellCheck: true
# NOTE: Map server-side validators to comparative Angular form validators
validatorMap:
required: required
@@ -140,6 +190,9 @@ languages:
- code: en
label: English
active: true
+ - code: ca
+ label: Català
+ active: true
- code: cs
label: Čeština
active: true
@@ -167,6 +220,9 @@ languages:
- code: nl
label: Nederlands
active: true
+ - code: pl
+ label: Polski
+ active: true
- code: pt-PT
label: Português
active: true
@@ -194,6 +250,10 @@ languages:
- code: el
label: Ελληνικά
active: true
+ - code: uk
+ label: Yкраї́нська
+ active: true
+
# Browse-By Pages
browseBy:
@@ -231,6 +291,11 @@ item:
undoTimeout: 10000 # 10 seconds
# Show the item access status label in items lists
showAccessStatuses: false
+ bitstream:
+ # Number of entries in the bitstream list in the item view page.
+ # Rounded to the nearest size in the list of selectable sizes on the
+ # settings menu. See pageSizeOptions in 'pagination-component-options.model.ts'.
+ pageSize: 5
# When the search results are retrieved, for each item type the metadata with a valid authority value are inspected.
# Referenced items will be fetched with a find all by id strategy to avoid individual rest requests
@@ -334,6 +399,14 @@ markdown:
enabled: false
mathjax: false
+# Which vocabularies should be used for which search filters
+# and whether to show the filter in the search sidebar
+# Take a look at the filter-vocabulary-config.ts file for documentation on how the options are obtained
+vocabularies:
+ - filter: 'subject'
+ vocabulary: 'srsc'
+ enabled: true
+
crisLayout:
urn:
- name: doi
@@ -378,7 +451,8 @@ crisLayout:
default:
icon: fas fa-project-diagram
style: text-success
- crisRefStyleMetadata: "cris.entity.style"
+ crisRefStyleMetadata:
+ default: cris.entity.style
itemPage:
OrgUnit:
orientation: vertical
@@ -398,7 +472,17 @@ layout:
cms:
metadataList: ['cris.cms.home-header', 'cris.cms.home-news', 'cris.cms.footer']
-addThisPlugin:
- siteId: ''
- scriptUrl: "http://s7.addthis.com/js/300/addthis_widget.js#pubid="
- socialNetworksEnabled: false
+addToAnyPlugin:
+ scriptUrl: "https://static.addtoany.com/menu/page.js"
+ socialNetworksEnabled: true
+ buttons:
+ - facebook
+ - twitter
+ - linkedin
+ - email
+ - copy_link
+ showPlusButton: true
+ showCounters: true
+ title: DSpace CRIS 7 demo
+ # The link to be shown in the shared post, if different from document.location.origin (optional)
+ # link: https://dspacecris7.4science.cloud/
diff --git a/cypress.json b/cypress.json
index 80358eb6dde..3adf7839c24 100644
--- a/cypress.json
+++ b/cypress.json
@@ -5,7 +5,7 @@
"screenshotsFolder": "cypress/screenshots",
"pluginsFile": "cypress/plugins/index.ts",
"fixturesFolder": "cypress/fixtures",
- "baseUrl": "http://localhost:4000",
+ "baseUrl": "http://127.0.0.1:4000",
"retries": {
"runMode": 2,
"openMode": 0
@@ -22,4 +22,4 @@
"DSPACE_TEST_SUBMIT_USER": "dspacedemo+submit@gmail.com",
"DSPACE_TEST_SUBMIT_USER_PASSWORD": "dspace"
}
-}
\ No newline at end of file
+}
diff --git a/cypress/integration/footer.spec.ts b/cypress/integration/footer.spec.ts
index b0c9d15756f..d43fe570a7d 100644
--- a/cypress/integration/footer.spec.ts
+++ b/cypress/integration/footer.spec.ts
@@ -1,7 +1,7 @@
import { testA11y } from 'cypress/support/utils';
import { Options } from 'cypress-axe';
-describe('Footer', () => {
+xdescribe('Footer', () => {
it('should pass accessibility tests', () => {
cy.visit('/');
diff --git a/cypress/integration/homepage.spec.ts b/cypress/integration/homepage.spec.ts
index 7a147ff7e03..39097dc5186 100644
--- a/cypress/integration/homepage.spec.ts
+++ b/cypress/integration/homepage.spec.ts
@@ -7,8 +7,8 @@ describe('Homepage', () => {
cy.visit('/');
});
- it('should display translated title "DSpace Cris Angular :: Home"', () => {
- cy.title().should('eq', 'DSpace Cris Angular :: Home');
+ it('should display translated title "DSpace at My University :: Home"', () => {
+ cy.title().should('eq', 'DSpace at My University :: Home');
});
it('should contain a news section', () => {
diff --git a/cypress/integration/my-dspace.spec.ts b/cypress/integration/my-dspace.spec.ts
index db3c8b75bf6..a214a865c93 100644
--- a/cypress/integration/my-dspace.spec.ts
+++ b/cypress/integration/my-dspace.spec.ts
@@ -4,10 +4,11 @@ import { testA11y } from 'cypress/support/utils';
xdescribe('My DSpace page', () => {
it('should display recent submissions and pass accessibility tests', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
cy.visit('/mydspace');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
cy.get('ds-my-dspace-page').should('exist');
// At least one recent submission should be displayed
@@ -36,10 +37,11 @@ xdescribe('My DSpace page', () => {
});
it('should have a working detailed view that passes accessibility tests', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
cy.visit('/mydspace');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
cy.get('ds-my-dspace-page').should('exist');
// Click button in sidebar to display detailed view
@@ -61,9 +63,11 @@ xdescribe('My DSpace page', () => {
// NOTE: Deleting existing submissions is exercised by submission.spec.ts
it('should let you start a new submission & edit in-progress submissions', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
cy.visit('/mydspace');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
// Open the New Submission dropdown
cy.get('button[data-test="submission-dropdown"]').click();
// Click on the "Item" type in that dropdown
@@ -131,9 +135,11 @@ xdescribe('My DSpace page', () => {
});
it('should let you import from external sources', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
cy.visit('/mydspace');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
// Open the New Import dropdown
cy.get('button[data-test="import-dropdown"]').click();
// Click on the "Item" type in that dropdown
diff --git a/cypress/integration/submission.spec.ts b/cypress/integration/submission.spec.ts
index 28126239611..7c9af9c3074 100644
--- a/cypress/integration/submission.spec.ts
+++ b/cypress/integration/submission.spec.ts
@@ -6,11 +6,12 @@ xdescribe('New Submission page', () => {
// NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
it('should create a new submission when using /submit path & pass accessibility', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
// Test that calling /submit with collection & entityType will create a new submission
cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
// Should redirect to /workspaceitems, as we've started a new submission
cy.url().should('include', '/workspaceitems');
@@ -33,11 +34,12 @@ xdescribe('New Submission page', () => {
});
it('should block submission & show errors if required fields are missing', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
// Create a new submission
cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
// Attempt an immediate deposit without filling out any fields
cy.get('button#deposit').click();
@@ -92,11 +94,12 @@ xdescribe('New Submission page', () => {
});
it('should allow for deposit if all required fields completed & file uploaded', () => {
- cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
// Create a new submission
cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
+ // This page is restricted, so we will be shown the login form. Fill it out & submit.
+ cy.loginViaForm(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
+
// Fill out all required fields (Title, Date)
cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
cy.get('input#dc_date_issued_year').type('2022');
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 30951d46f1e..04c217aa0f6 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -19,6 +19,14 @@ declare global {
* @param password password to login as
*/
login(email: string, password: string): typeof login;
+
+ /**
+ * Login via form before accessing the next page. Useful to fill out login
+ * form when a cy.visit() call is to an a page which requires authentication.
+ * @param email email to login as
+ * @param password password to login as
+ */
+ loginViaForm(email: string, password: string): typeof loginViaForm;
}
}
}
@@ -26,6 +34,8 @@ declare global {
/**
* Login user via REST API directly, and pass authentication token to UI via
* the UI's dsAuthInfo cookie.
+ * WARNING: WHILE THIS METHOD WORKS, OCCASIONALLY RANDOM AUTHENTICATION ERRORS OCCUR.
+ * At this time "loginViaForm()" seems more consistent/stable.
* @param email email to login as
* @param password password to login as
*/
@@ -81,3 +91,20 @@ function login(email: string, password: string): void {
}
// Add as a Cypress command (i.e. assign to 'cy.login')
Cypress.Commands.add('login', login);
+
+
+/**
+ * Login user via displayed login form
+ * @param email email to login as
+ * @param password password to login as
+ */
+ function loginViaForm(email: string, password: string): void {
+ // Enter email
+ cy.get('ds-log-in [data-test="email"]').type(email);
+ // Enter password
+ cy.get('ds-log-in [data-test="password"]').type(password);
+ // Click login button
+ cy.get('ds-log-in [data-test="login-button"]').click();
+}
+// Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
+Cypress.Commands.add('loginViaForm', loginViaForm);
\ No newline at end of file
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index dbe9500499b..ef84c14f43f 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -24,8 +24,8 @@ services:
# __D__ => "-" (e.g. google__D__metadata => google-metadata)
# dspace.dir, dspace.server.url and dspace.ui.url
dspace__P__dir: /dspace
- dspace__P__server__P__url: http://localhost:8080/server
- dspace__P__ui__P__url: http://localhost:4000
+ dspace__P__server__P__url: http://127.0.0.1:8080/server
+ dspace__P__ui__P__url: http://127.0.0.1:4000
# db.url: Ensure we are using the 'dspacedb' image for our database
db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
# solr.server: Ensure we are using the 'dspacesolr' image for Solr
diff --git a/package.json b/package.json
index 2051eb79b0e..a80ad477a35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "dspace-angular",
- "version": "2022.03.01-SNAPSHOT",
+ "version": "2023.02.00-SNAPSHOT",
"scripts": {
"ng": "ng",
"config:watch": "nodemon",
@@ -32,8 +32,9 @@
"clean:log": "rimraf *.log*",
"clean:json": "rimraf *.records.json",
"clean:node": "rimraf node_modules",
+ "clean:cli": "rimraf .angular/cache",
"clean:prod": "yarn run clean:dist && yarn run clean:log && yarn run clean:doc && yarn run clean:coverage && yarn run clean:json",
- "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:node",
+ "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:cli && yarn run clean:node",
"sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
"build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
"merge-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
@@ -67,18 +68,18 @@
"ts-node": "10.2.1"
},
"dependencies": {
- "@angular/animations": "~13.2.6",
+ "@angular/animations": "~13.3.12",
"@angular/cdk": "^13.2.6",
- "@angular/common": "~13.2.6",
- "@angular/compiler": "~13.2.6",
- "@angular/core": "~13.2.6",
- "@angular/forms": "~13.2.6",
- "@angular/localize": "13.2.6",
- "@angular/platform-browser": "~13.2.6",
- "@angular/platform-browser-dynamic": "~13.2.6",
- "@angular/platform-server": "~13.2.6",
- "@angular/router": "~13.2.6",
- "@babel/runtime": "^7.17.2",
+ "@angular/common": "~13.3.12",
+ "@angular/compiler": "~13.3.12",
+ "@angular/core": "~13.3.12",
+ "@angular/forms": "~13.3.12",
+ "@angular/localize": "13.3.12",
+ "@angular/platform-browser": "~13.3.12",
+ "@angular/platform-browser-dynamic": "~13.3.12",
+ "@angular/platform-server": "~13.3.12",
+ "@angular/router": "~13.3.12",
+ "@babel/runtime": "7.17.2",
"@kolkov/ngx-gallery": "^2.0.1",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
@@ -91,20 +92,23 @@
"@ngrx/store": "^13.0.2",
"@nguniversal/express-engine": "^13.0.2",
"@ngx-translate/core": "^13.0.0",
- "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
+ "@nicky-lenaers/ngx-scroll-to": "^13.0.0",
"@swimlane/ngx-charts": "^16.0.0",
"@types/grecaptcha": "^3.0.4",
"angular-idle-preload": "3.0.0",
"angulartics2": "^12.0.0",
"axios": "^0.27.2",
- "bootstrap": "4.3.1",
- "caniuse-lite": "^1.0.30001165",
+ "bootstrap": "^4.6.1",
"cerialize": "0.1.18",
"cli-progress": "^3.8.0",
+ "colors": "^1.4.0",
"compression": "^1.7.4",
"cookie-parser": "1.4.5",
"core-js": "^3.7.0",
+ "date-fns": "^2.29.3",
+ "date-fns-tz": "^1.3.7",
"deepmerge": "^4.2.2",
+ "ejs": "^3.1.8",
"express": "^4.17.1",
"express-rate-limit": "^5.1.3",
"fast-json-patch": "^3.0.0-1",
@@ -113,95 +117,84 @@
"font-awesome": "4.7.0",
"html-to-image": "^1.10.8",
"http-proxy-middleware": "^1.0.5",
- "https": "1.0.0",
+ "isbot": "^3.6.5",
"js-cookie": "2.2.1",
"js-yaml": "^4.1.0",
"json5": "^2.2.2",
"jsonschema": "1.4.0",
"jwt-decode": "^3.1.2",
- "klaro": "^0.7.10",
+ "klaro": "^0.7.18",
"lodash": "^4.17.21",
+ "lru-cache": "^7.14.1",
"markdown-it": "^13.0.1",
"markdown-it-mathjax3": "^4.3.1",
"mirador": "^3.3.0",
"mirador-dl-plugin": "^0.13.0",
"mirador-share-plugin": "^0.11.0",
- "moment": "^2.29.4",
"morgan": "^1.10.0",
"ng-mocks": "^13.1.1",
"ng2-file-upload": "1.4.0",
"ng2-google-charts": "^6.1.0",
"ng2-nouislider": "^1.8.3",
"ngx-infinite-scroll": "^10.0.1",
- "ngx-moment": "^5.0.0",
"ngx-pagination": "5.0.0",
"ngx-sortablejs": "^11.1.0",
- "ngx-ui-switch": "^11.0.1",
+ "ngx-ui-switch": "^13.0.2",
"nouislider": "^14.6.3",
"pem": "1.14.4",
- "postcss-cli": "^9.1.0",
"prop-types": "^15.7.2",
"react-copy-to-clipboard": "^5.0.1",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.5.5",
"sanitize-html": "^2.7.2",
"sortablejs": "1.13.0",
- "tslib": "^2.0.0",
- "url-parse": "^1.5.6",
"uuid": "^8.3.2",
"webfontloader": "1.6.28",
"zone.js": "~0.11.5"
},
"devDependencies": {
"@angular-builders/custom-webpack": "~13.1.0",
- "@angular-devkit/build-angular": "~13.2.6",
+ "@angular-devkit/build-angular": "~13.3.10",
"@angular-eslint/builder": "13.1.0",
"@angular-eslint/eslint-plugin": "13.1.0",
"@angular-eslint/eslint-plugin-template": "13.1.0",
"@angular-eslint/schematics": "13.1.0",
"@angular-eslint/template-parser": "13.1.0",
- "@angular/cli": "~13.2.6",
- "@angular/compiler-cli": "~13.2.6",
- "@angular/language-service": "~13.2.6",
+ "@angular/cli": "~13.3.10",
+ "@angular/compiler-cli": "~13.3.12",
+ "@angular/language-service": "~13.3.12",
"@cypress/schematic": "^1.5.0",
- "@fortawesome/fontawesome-free": "^5.5.0",
+ "@fortawesome/fontawesome-free": "^6.2.1",
"@ngrx/store-devtools": "^13.0.2",
"@ngtools/webpack": "^13.2.6",
- "@nguniversal/builders": "^13.0.2",
+ "@nguniversal/builders": "^13.1.1",
"@types/deep-freeze": "0.1.2",
+ "@types/ejs": "^3.1.1",
"@types/express": "^4.17.9",
"@types/file-saver": "^2.0.1",
"@types/jasmine": "~3.6.0",
- "@types/jasminewd2": "~2.0.8",
"@types/js-cookie": "2.2.6",
"@types/lodash": "^4.14.165",
"@types/node": "^14.14.9",
"@types/sanitize-html": "^2.6.2",
"@typescript-eslint/eslint-plugin": "5.11.0",
"@typescript-eslint/parser": "5.11.0",
- "axe-core": "^4.3.3",
+ "axe-core": "^4.4.3",
"compression-webpack-plugin": "^9.2.0",
"copy-webpack-plugin": "^6.4.1",
"cross-env": "^7.0.3",
- "css-loader": "^6.2.0",
- "css-minimizer-webpack-plugin": "^3.4.1",
- "cssnano": "^5.0.6",
- "cypress": "9.5.1",
+ "cypress": "9.7.0",
"cypress-axe": "^0.14.0",
- "debug-loader": "^0.0.1",
"deep-freeze": "0.0.1",
- "dotenv": "^8.2.0",
"eslint": "^8.2.0",
"eslint-plugin-deprecation": "^1.3.2",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsdoc": "^39.6.4",
+ "eslint-plugin-lodash": "^7.4.0",
"eslint-plugin-unused-imports": "^2.0.0",
"express-static-gzip": "^2.1.5",
- "fork-ts-checker-webpack-plugin": "^6.0.3",
- "html-loader": "^1.3.2",
"jasmine-core": "^3.8.0",
"jasmine-marbles": "0.9.2",
- "jasmine-spec-reporter": "~5.0.0",
"karma": "^6.3.14",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
@@ -210,26 +203,20 @@
"karma-mocha-reporter": "2.2.5",
"ngx-export-as": "~1.13.0",
"ngx-mask": "^13.1.7",
- "nodemon": "^2.0.15",
+ "nodemon": "^2.0.20",
"postcss": "^8.1",
"postcss-apply": "0.12.0",
"postcss-import": "^14.0.0",
"postcss-loader": "^4.0.3",
"postcss-preset-env": "^7.4.2",
"postcss-responsive-type": "1.0.0",
- "protractor": "^7.0.0",
- "protractor-istanbul-plugin": "2.0.0",
- "raw-loader": "0.5.1",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"rimraf": "^3.0.2",
"rxjs-spy": "^8.0.2",
- "sass": "~1.32.6",
+ "sass": "~1.33.0",
"sass-loader": "^12.6.0",
"sass-resources-loader": "^2.1.1",
- "string-replace-loader": "^3.1.0",
- "terser-webpack-plugin": "^2.3.1",
- "ts-loader": "^5.2.0",
"ts-node": "^8.10.2",
"typescript": "~4.5.5",
"webpack": "^5.69.1",
diff --git a/scripts/base-href.ts b/scripts/base-href.ts
index aee547b46d2..7212e1c5168 100644
--- a/scripts/base-href.ts
+++ b/scripts/base-href.ts
@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import { existsSync, writeFileSync } from 'fs';
import { join } from 'path';
import { AppConfig } from '../src/config/app-config.interface';
@@ -16,7 +16,7 @@ const appConfig: AppConfig = buildAppConfig();
const angularJsonPath = join(process.cwd(), 'angular.json');
-if (!fs.existsSync(angularJsonPath)) {
+if (!existsSync(angularJsonPath)) {
console.error(`Error:\n${angularJsonPath} does not exist\n`);
process.exit(1);
}
@@ -30,7 +30,7 @@ try {
angularJson.projects['dspace-angular'].architect.build.options.baseHref = baseHref;
- fs.writeFileSync(angularJsonPath, JSON.stringify(angularJson, null, 2) + '\n');
+ writeFileSync(angularJsonPath, JSON.stringify(angularJson, null, 2) + '\n');
} catch (e) {
console.error(e);
}
diff --git a/scripts/env-to-yaml.ts b/scripts/env-to-yaml.ts
index c2dd1cf0cae..6e8153f4c11 100644
--- a/scripts/env-to-yaml.ts
+++ b/scripts/env-to-yaml.ts
@@ -1,5 +1,5 @@
-import * as fs from 'fs';
-import * as yaml from 'js-yaml';
+import { existsSync, writeFileSync } from 'fs';
+import { dump } from 'js-yaml';
import { join } from 'path';
/**
@@ -18,7 +18,7 @@ if (args[0] === undefined) {
const envFullPath = join(process.cwd(), args[0]);
-if (!fs.existsSync(envFullPath)) {
+if (!existsSync(envFullPath)) {
console.error(`Error:\n${envFullPath} does not exist\n`);
process.exit(1);
}
@@ -26,10 +26,10 @@ if (!fs.existsSync(envFullPath)) {
try {
const env = require(envFullPath).environment;
- const config = yaml.dump(env);
+ const config = dump(env);
if (args[1]) {
const ymlFullPath = join(process.cwd(), args[1]);
- fs.writeFileSync(ymlFullPath, config);
+ writeFileSync(ymlFullPath, config);
} else {
console.log(config);
}
diff --git a/scripts/serve.ts b/scripts/serve.ts
index 0c534af7654..082c1651a49 100644
--- a/scripts/serve.ts
+++ b/scripts/serve.ts
@@ -1,4 +1,4 @@
-import * as child from 'child_process';
+import { spawn } from 'child_process';
import { AppConfig } from '../src/config/app-config.interface';
import { buildAppConfig } from '../src/config/config.server';
@@ -9,7 +9,7 @@ const appConfig: AppConfig = buildAppConfig();
* Calls `ng serve` with the following arguments configured for the UI in the app config: host, port, nameSpace, ssl
* Any CLI arguments given to this script are patched through to `ng serve` as well.
*/
-child.spawn(
+spawn(
`npm run ng-high-memory -- serve --host ${appConfig.ui.host} --port ${appConfig.ui.port} --serve-path ${appConfig.ui.nameSpace} --ssl ${appConfig.ui.ssl} ${process.argv.slice(2).join(' ')} --configuration development`,
{ stdio: 'inherit', shell: true }
);
diff --git a/scripts/test-rest.ts b/scripts/test-rest.ts
index 51822cf9396..9066777c42a 100644
--- a/scripts/test-rest.ts
+++ b/scripts/test-rest.ts
@@ -1,5 +1,5 @@
-import * as http from 'http';
-import * as https from 'https';
+import { request } from 'http';
+import { request as https_request } from 'https';
import { AppConfig } from '../src/config/app-config.interface';
import { buildAppConfig } from '../src/config/config.server';
@@ -20,7 +20,7 @@ console.log(`...Testing connection to REST API at ${restUrl}...\n`);
// If SSL enabled, test via HTTPS, else via HTTP
if (appConfig.rest.ssl) {
- const req = https.request(restUrl, (res) => {
+ const req = https_request(restUrl, (res) => {
console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
// We will keep reading data until the 'end' event fires.
// This ensures we don't just read the first chunk.
@@ -39,7 +39,7 @@ if (appConfig.rest.ssl) {
req.end();
} else {
- const req = http.request(restUrl, (res) => {
+ const req = request(restUrl, (res) => {
console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
// We will keep reading data until the 'end' event fires.
// This ensures we don't just read the first chunk.
diff --git a/server.ts b/server.ts
index 81137ad56a8..3e10677a8b1 100644
--- a/server.ts
+++ b/server.ts
@@ -19,19 +19,24 @@ import 'zone.js/node';
import 'reflect-metadata';
import 'rxjs';
-import axios from 'axios';
-import * as pem from 'pem';
-import * as https from 'https';
+/* eslint-disable import/no-namespace */
import * as morgan from 'morgan';
import * as express from 'express';
-import * as bodyParser from 'body-parser';
+import * as ejs from 'ejs';
import * as compression from 'compression';
import * as expressStaticGzip from 'express-static-gzip';
+/* eslint-enable import/no-namespace */
+
+import axios from 'axios';
+import LRU from 'lru-cache';
+import isbot from 'isbot';
+import { createCertificate } from 'pem';
+import { createServer } from 'https';
+import { json } from 'body-parser';
import { existsSync, readFileSync } from 'fs';
import { join } from 'path';
-import { APP_BASE_HREF } from '@angular/common';
import { enableProdMode } from '@angular/core';
import { ngExpressEngine } from '@nguniversal/express-engine';
@@ -49,6 +54,8 @@ import { buildAppConfig } from './src/config/config.server';
import { APP_CONFIG, AppConfig } from './src/config/app-config.interface';
import { extendEnvironmentWithAppConfig } from './src/config/config.util';
import { logStartupMessage } from './startup-message';
+import { TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
+
/*
* Set path for the browser application's dist folder
@@ -57,12 +64,18 @@ const DIST_FOLDER = join(process.cwd(), 'dist/browser');
// Set path fir IIIF viewer.
const IIIF_VIEWER = join(process.cwd(), 'dist/iiif');
-const indexHtml = existsSync(join(DIST_FOLDER, 'index.html')) ? 'index.html' : 'index';
+const indexHtml = join(DIST_FOLDER, 'index.html');
const cookieParser = require('cookie-parser');
const appConfig: AppConfig = buildAppConfig(join(DIST_FOLDER, 'assets/config.json'));
+// cache of SSR pages for known bots, only enabled in production mode
+let botCache: LRU;
+
+// cache of SSR pages for anonymous users. Disabled by default, and only available in production mode
+let anonymousCache: LRU;
+
// extend environment with app config for server
extendEnvironmentWithAppConfig(environment, appConfig);
@@ -83,10 +96,12 @@ export function app() {
/*
* If production mode is enabled in the environment file:
* - Enable Angular's production mode
+ * - Initialize caching of SSR rendered pages (if enabled in config.yml)
* - Enable compression for SSR reponses. See [compression](https://github.com/expressjs/compression)
*/
if (environment.production) {
enableProdMode();
+ initCache();
server.use(compression({
// only compress responses we've marked as SSR
// otherwise, this middleware may compress files we've chosen not to compress via compression-webpack-plugin
@@ -102,15 +117,15 @@ export function app() {
/*
* Add cookie parser middleware
- * See [morgan](https://github.com/expressjs/cookie-parser)
+ * See [cookie-parser](https://github.com/expressjs/cookie-parser)
*/
server.use(cookieParser());
/*
- * Add parser for request bodies
- * See [morgan](https://github.com/expressjs/body-parser)
+ * Add JSON parser for request bodies
+ * See [body-parser](https://github.com/expressjs/body-parser)
*/
- server.use(bodyParser.json());
+ server.use(json());
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
server.engine('html', (_, options, callback) =>
@@ -133,10 +148,23 @@ export function app() {
})(_, (options as any), callback)
);
+ server.engine('ejs', ejs.renderFile);
+
/*
* Register the view engines for html and ejs
*/
server.set('view engine', 'html');
+ server.set('view engine', 'ejs');
+
+ /**
+ * Serve the robots.txt ejs template, filling in the origin variable
+ */
+ server.get('/robots.txt', (req, res) => {
+ res.setHeader('content-type', 'text/plain');
+ res.render('assets/robots.txt.ejs', {
+ 'origin': req.protocol + '://' + req.headers.host
+ });
+ });
/*
* Set views folder path to directory where template files are stored
@@ -169,7 +197,7 @@ export function app() {
* Serve static resources (images, i18n messages, …)
* Handle pre-compressed files with [express-static-gzip](https://github.com/tkoenig89/express-static-gzip)
*/
- router.get('*.*', cacheControl, expressStaticGzip(DIST_FOLDER, {
+ router.get('*.*', addCacheControl, expressStaticGzip(DIST_FOLDER, {
index: false,
enableBrotli: true,
orderPreference: ['br', 'gzip'],
@@ -185,8 +213,11 @@ export function app() {
*/
server.get('/app/health', healthCheck);
- // Register the ngApp callback function to handle incoming requests
- router.get('*', ngApp);
+ /**
+ * Default sending all incoming requests to ngApp() function, after first checking for a cached
+ * copy of the page (see cacheCheck())
+ */
+ router.get('*', cacheCheck, ngApp);
server.use(environment.ui.nameSpace, router);
@@ -198,62 +229,244 @@ export function app() {
*/
function ngApp(req, res) {
if (environment.universal.preboot) {
- res.render(indexHtml, {
- req,
- res,
- preboot: environment.universal.preboot,
- async: environment.universal.async,
- time: environment.universal.time,
- baseUrl: environment.ui.nameSpace,
- originUrl: environment.ui.baseUrl,
- requestUrl: req.originalUrl,
- providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }]
- }, (err, data) => {
- if (hasNoValue(err) && hasValue(data)) {
- res.locals.ssr = true; // mark response as SSR
- res.send(data);
- } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
- // When this error occurs we can't fall back to CSR because the response has already been
- // sent. These errors occur for various reasons in universal, not all of which are in our
- // control to solve.
- console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
- } else {
- console.warn('Error in SSR, serving for direct CSR.');
- if (hasValue(err)) {
- console.warn('Error details : ', err);
- }
- res.render(indexHtml, {
- req,
- providers: [{
- provide: APP_BASE_HREF,
- useValue: req.baseUrl
- }]
- });
- }
- });
+ // Render the page to user via SSR (server side rendering)
+ serverSideRender(req, res);
} else {
// If preboot is disabled, just serve the client
- console.log('Universal off, serving for direct CSR');
- res.render(indexHtml, {
- req,
- providers: [{
- provide: APP_BASE_HREF,
- useValue: req.baseUrl
- }]
- });
+ console.log('Universal off, serving for direct client-side rendering (CSR)');
+ clientSideRender(req, res);
}
}
+/**
+ * Render page content on server side using Angular SSR. By default this page content is
+ * returned to the user.
+ * @param req current request
+ * @param res current response
+ * @param sendToUser if true (default), send the rendered content to the user.
+ * If false, then only save this rendered content to the in-memory cache (to refresh cache).
+ */
+function serverSideRender(req, res, sendToUser: boolean = true) {
+ // Render the page via SSR (server side rendering)
+ res.render(indexHtml, {
+ req,
+ res,
+ preboot: environment.universal.preboot,
+ async: environment.universal.async,
+ time: environment.universal.time,
+ baseUrl: environment.ui.nameSpace,
+ originUrl: environment.ui.baseUrl,
+ requestUrl: req.originalUrl,
+ }, (err, data) => {
+ if (hasNoValue(err) && hasValue(data)) {
+ // save server side rendered page to cache (if any are enabled)
+ saveToCache(req, data);
+ if (sendToUser) {
+ res.locals.ssr = true; // mark response as SSR (enables text compression)
+ // send rendered page to user
+ res.send(data);
+ }
+ } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
+ // When this error occurs we can't fall back to CSR because the response has already been
+ // sent. These errors occur for various reasons in universal, not all of which are in our
+ // control to solve.
+ console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
+ } else {
+ console.warn('Error in server-side rendering (SSR)');
+ if (hasValue(err)) {
+ console.warn('Error details : ', err);
+ }
+ if (sendToUser) {
+ console.warn('Falling back to serving direct client-side rendering (CSR).');
+ clientSideRender(req, res);
+ }
+ }
+ });
+}
+
+/**
+ * Send back response to user to trigger direct client-side rendering (CSR)
+ * @param req current request
+ * @param res current response
+ */
+function clientSideRender(req, res) {
+ res.sendFile(indexHtml);
+}
+
+
/*
- * Adds a cache control header to the response
- * The cache control value can be configured in the environments file and defaults to max-age=60
+ * Adds a Cache-Control HTTP header to the response.
+ * The cache control value can be configured in the config.*.yml file
+ * Defaults to max-age=604,800 seconds (1 week)
*/
-function cacheControl(req, res, next) {
+function addCacheControl(req, res, next) {
// instruct browser to revalidate
- res.header('Cache-Control', environment.cache.control || 'max-age=60');
+ res.header('Cache-Control', environment.cache.control || 'max-age=604800');
next();
}
+/*
+ * Initialize server-side caching of pages rendered via SSR.
+ */
+function initCache() {
+ if (botCacheEnabled()) {
+ // Initialize a new "least-recently-used" item cache (where least recently used pages are removed first)
+ // See https://www.npmjs.com/package/lru-cache
+ // When enabled, each page defaults to expiring after 1 day
+ botCache = new LRU( {
+ max: environment.cache.serverSide.botCache.max,
+ ttl: environment.cache.serverSide.botCache.timeToLive || 24 * 60 * 60 * 1000, // 1 day
+ allowStale: environment.cache.serverSide.botCache.allowStale ?? true // if object is stale, return stale value before deleting
+ });
+ }
+
+ if (anonymousCacheEnabled()) {
+ // NOTE: While caches may share SSR pages, this cache must be kept separately because the timeToLive
+ // may expire pages more frequently.
+ // When enabled, each page defaults to expiring after 10 seconds (to minimize anonymous users seeing out-of-date content)
+ anonymousCache = new LRU( {
+ max: environment.cache.serverSide.anonymousCache.max,
+ ttl: environment.cache.serverSide.anonymousCache.timeToLive || 10 * 1000, // 10 seconds
+ allowStale: environment.cache.serverSide.anonymousCache.allowStale ?? true // if object is stale, return stale value before deleting
+ });
+ }
+}
+
+/**
+ * Return whether bot-specific server side caching is enabled in configuration.
+ */
+function botCacheEnabled(): boolean {
+ // Caching is only enabled if SSR is enabled AND
+ // "max" pages to cache is greater than zero
+ return environment.universal.preboot && environment.cache.serverSide.botCache.max && (environment.cache.serverSide.botCache.max > 0);
+}
+
+/**
+ * Return whether anonymous user server side caching is enabled in configuration.
+ */
+function anonymousCacheEnabled(): boolean {
+ // Caching is only enabled if SSR is enabled AND
+ // "max" pages to cache is greater than zero
+ return environment.universal.preboot && environment.cache.serverSide.anonymousCache.max && (environment.cache.serverSide.anonymousCache.max > 0);
+}
+
+/**
+ * Check if the currently requested page is in our server-side, in-memory cache.
+ * Caching is ONLY done for SSR requests. Pages are cached base on their path (e.g. /home or /search?query=test)
+ */
+function cacheCheck(req, res, next) {
+ // Cached copy of page (if found)
+ let cachedCopy;
+
+ // If the bot cache is enabled and this request looks like a bot, check the bot cache for a cached page.
+ if (botCacheEnabled() && isbot(req.get('user-agent'))) {
+ cachedCopy = checkCacheForRequest('bot', botCache, req, res);
+ } else if (anonymousCacheEnabled() && !isUserAuthenticated(req)) {
+ cachedCopy = checkCacheForRequest('anonymous', anonymousCache, req, res);
+ }
+
+ // If cached copy exists, return it to the user.
+ if (cachedCopy) {
+ res.locals.ssr = true; // mark response as SSR-generated (enables text compression)
+ res.send(cachedCopy);
+
+ // Tell Express to skip all other handlers for this path
+ // This ensures we don't try to re-render the page since we've already returned the cached copy
+ next('router');
+ } else {
+ // If nothing found in cache, just continue with next handler
+ // (This should send the request on to the handler that rerenders the page via SSR
+ next();
+ }
+}
+
+/**
+ * Checks if the current request (i.e. page) is found in the given cache. If it is found,
+ * the cached copy is returned. When found, this method also triggers a re-render via
+ * SSR if the cached copy is now expired (i.e. timeToLive has passed for this cached copy).
+ * @param cacheName name of cache (just useful for debug logging)
+ * @param cache LRU cache to check
+ * @param req current request to look for in the cache
+ * @param res current response
+ * @returns cached copy (if found) or undefined (if not found)
+ */
+function checkCacheForRequest(cacheName: string, cache: LRU, req, res): any {
+ // Get the cache key for this request
+ const key = getCacheKey(req);
+
+ // Check if this page is in our cache
+ let cachedCopy = cache.get(key);
+ if (cachedCopy) {
+ if (environment.cache.serverSide.debug) { console.log(`CACHE HIT FOR ${key} in ${cacheName} cache`); }
+
+ // Check if cached copy is expired (If expired, the key will now be gone from cache)
+ // NOTE: This will only occur when "allowStale=true", as it means the "get(key)" above returned a stale value.
+ if (!cache.has(key)) {
+ if (environment.cache.serverSide.debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); }
+ // Update cached copy by rerendering server-side
+ // NOTE: In this scenario the currently cached copy will be returned to the current user.
+ // This re-render is peformed behind the scenes to update cached copy for next user.
+ serverSideRender(req, res, false);
+ }
+ } else {
+ if (environment.cache.serverSide.debug) { console.log(`CACHE MISS FOR ${key} in ${cacheName} cache.`); }
+ }
+
+ // return page from cache
+ return cachedCopy;
+}
+
+/**
+ * Create a cache key from the current request.
+ * The cache key is the URL path (NOTE: this key will also include any querystring params).
+ * E.g. "/home" or "/search?query=test"
+ * @param req current request
+ * @returns cache key to use for this page
+ */
+function getCacheKey(req): string {
+ // NOTE: this will return the URL path *without* any baseUrl
+ return req.url;
+}
+
+/**
+ * Save page to server side cache(s), if enabled. If caching is not enabled or a user is authenticated, this is a noop
+ * If multiple caches are enabled, the page will be saved to any caches where it does not yet exist (or is expired).
+ * (This minimizes the number of times we need to run SSR on the same page.)
+ * @param req current page request
+ * @param page page data to save to cache
+ */
+function saveToCache(req, page: any) {
+ // Only cache if no one is currently authenticated. This means ONLY public pages can be cached.
+ // NOTE: It's not safe to save page data to the cache when a user is authenticated. In that situation,
+ // the page may include sensitive or user-specific materials. As the cache is shared across all users, it can only contain public info.
+ if (!isUserAuthenticated(req)) {
+ const key = getCacheKey(req);
+ // Avoid caching "/reload/[random]" paths (these are hard refreshes after logout)
+ if (key.startsWith('/reload')) { return; }
+
+ // If bot cache is enabled, save it to that cache if it doesn't exist or is expired
+ // (NOTE: has() will return false if page is expired in cache)
+ if (botCacheEnabled() && !botCache.has(key)) {
+ botCache.set(key, page);
+ if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in bot cache.`); }
+ }
+
+ // If anonymous cache is enabled, save it to that cache if it doesn't exist or is expired
+ if (anonymousCacheEnabled() && !anonymousCache.has(key)) {
+ anonymousCache.set(key, page);
+ if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in anonymous cache.`); }
+ }
+ }
+}
+
+/**
+ * Whether a user is authenticated or not
+ */
+function isUserAuthenticated(req): boolean {
+ // Check whether our DSpace authentication Cookie exists or not
+ return req.cookies[TOKENITEM];
+}
+
/*
* Callback function for when the server has started
*/
@@ -266,7 +479,7 @@ function serverStarted() {
* @param keys SSL credentials
*/
function createHttpsServer(keys) {
- https.createServer({
+ createServer({
key: keys.serviceKey,
cert: keys.certificate
}, app).listen(environment.ui.port, environment.ui.host, () => {
@@ -320,7 +533,7 @@ function start() {
process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]
- pem.createCertificate({
+ createCertificate({
days: 1,
selfSigned: true
}, (error, keys) => {
diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts
index 891238bbed1..47a971a882a 100644
--- a/src/app/access-control/access-control.module.ts
+++ b/src/app/access-control/access-control.module.ts
@@ -10,6 +10,16 @@ import { MembersListComponent } from './group-registry/group-form/members-list/m
import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
import { FormModule } from '../shared/form/form.module';
+import { DYNAMIC_ERROR_MESSAGES_MATCHER, DynamicErrorMessagesMatcher } from '@ng-dynamic-forms/core';
+import { AbstractControl } from '@angular/forms';
+
+/**
+ * Condition for displaying error messages on email form field
+ */
+export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
+ (control: AbstractControl, model: any, hasFocus: boolean) => {
+ return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
+ };
@NgModule({
imports: [
@@ -17,7 +27,10 @@ import { FormModule } from '../shared/form/form.module';
SharedModule,
RouterModule,
AccessControlRoutingModule,
- FormModule
+ FormModule,
+ ],
+ exports: [
+ MembersListComponent,
],
declarations: [
EPeopleRegistryComponent,
@@ -25,7 +38,13 @@ import { FormModule } from '../shared/form/form.module';
GroupsRegistryComponent,
GroupFormComponent,
SubgroupsListComponent,
- MembersListComponent
+ MembersListComponent,
+ ],
+ providers: [
+ {
+ provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
+ useValue: ValidateEmailErrorStateMatcher
+ },
]
})
/**
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index c0d70fd0b25..c3a6fc8bbce 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -27,6 +27,8 @@ import { RequestService } from '../../core/data/request.service';
import { PaginationService } from '../../core/pagination/pagination.service';
import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
import { FindListOptions } from '../../core/data/find-list-options.model';
+import { UUIDService } from '../../core/shared/uuid.service';
+import { getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
describe('EPeopleRegistryComponent', () => {
let component: EPeopleRegistryComponent;
@@ -138,7 +140,8 @@ describe('EPeopleRegistryComponent', () => {
{ provide: FormBuilderService, useValue: builderService },
{ provide: Router, useValue: new RouterStub() },
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
- { provide: PaginationService, useValue: paginationService }
+ { provide: PaginationService, useValue: paginationService },
+ { provide: UUIDService, useValue: getMockUUIDService() }
],
schemas: [NO_ERRORS_SCHEMA]
}).compileComponents();
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index 55233d8173d..f600fef0b23 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -21,6 +21,7 @@ import { RequestService } from '../../core/data/request.service';
import { PageInfo } from '../../core/shared/page-info.model';
import { NoContent } from '../../core/shared/NoContent.model';
import { PaginationService } from '../../core/pagination/pagination.service';
+import { UUIDService } from '../../core/shared/uuid.service';
@Component({
selector: 'ds-epeople-registry',
@@ -58,7 +59,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
* Pagination config used to display the list of epeople
*/
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
- id: 'elp',
+ id: this.uuidService.generate(),
pageSize: 5,
currentPage: 1
});
@@ -93,6 +94,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
private router: Router,
private modalService: NgbModal,
private paginationService: PaginationService,
+ private uuidService: UUIDService,
public requestService: RequestService) {
this.currentSearchQuery = '';
this.currentSearchScope = 'metadata';
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index cf82e3f61d3..64217b1410f 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -31,6 +31,8 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
import { FindListOptions } from '../../../core/data/find-list-options.model';
import { ValidateEmailNotTaken } from './validators/email-taken.validator';
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { UUIDService } from '../../../core/shared/uuid.service';
+import { getMockUUIDService } from '../../../shared/mocks/uuid.service.mock';
describe('EPersonFormComponent', () => {
let component: EPersonFormComponent;
@@ -207,6 +209,7 @@ describe('EPersonFormComponent', () => {
{ provide: PaginationService, useValue: paginationService },
{ provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])},
{ provide: EpersonRegistrationService, useValue: epersonRegistrationService },
+ { provide: UUIDService, useValue: getMockUUIDService() },
EPeopleRegistryComponent
],
schemas: [NO_ERRORS_SCHEMA]
@@ -542,7 +545,7 @@ describe('EPersonFormComponent', () => {
});
it('should call epersonRegistrationService.registerEmail', () => {
- expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail);
+ expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail, null, 'forgot');
});
});
});
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 588f8fa308d..7e24d76d82b 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -36,6 +36,8 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
import { ValidateEmailNotTaken } from './validators/email-taken.validator';
import { Registration } from '../../../core/shared/registration.model';
import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
+import { UUIDService } from '../../../core/shared/uuid.service';
@Component({
selector: 'ds-eperson-form',
@@ -149,7 +151,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
* Pagination config used to display the list of groups
*/
config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
- id: 'gem',
+ id: this.uuidService.generate(),
pageSize: 5,
currentPage: 1
});
@@ -182,6 +184,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
private paginationService: PaginationService,
public requestService: RequestService,
private epersonRegistrationService: EpersonRegistrationService,
+ private uuidService: UUIDService
) {
this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
this.epersonInitial = eperson;
@@ -491,7 +494,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
*/
resetPassword() {
if (hasValue(this.epersonInitial.email)) {
- this.epersonRegistrationService.registerEmail(this.epersonInitial.email).pipe(getFirstCompletedRemoteData())
+ this.epersonRegistrationService.registerEmail(this.epersonInitial.email, null, TYPE_REQUEST_FORGOT).pipe(getFirstCompletedRemoteData())
.subscribe((response: RemoteData) => {
if (response.hasSucceeded) {
this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'),
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index 0fc5a574b7d..d86adc674b6 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -9,7 +9,18 @@ {{messagePrefix + '.head.create' | translate}}
- {{messagePrefix + '.head.edit' | translate}}
+
+
+ {{messagePrefix + '.head.edit' | translate}}
+
+
{
fixture.detectChanges();
});
+ it('should edit with name and description operations', () => {
+ const operations = [{
+ op: 'add',
+ path: '/metadata/dc.description',
+ value: 'testDescription'
+ }, {
+ op: 'replace',
+ path: '/name',
+ value: 'newGroupName'
+ }];
+ expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+ });
+
+ it('should edit with description operations', () => {
+ component.groupName.value = null;
+ component.onSubmit();
+ fixture.detectChanges();
+ const operations = [{
+ op: 'add',
+ path: '/metadata/dc.description',
+ value: 'testDescription'
+ }];
+ expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+ });
+
+ it('should edit with name operations', () => {
+ component.groupDescription.value = null;
+ component.onSubmit();
+ fixture.detectChanges();
+ const operations = [{
+ op: 'replace',
+ path: '/name',
+ value: 'newGroupName'
+ }];
+ expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+ });
+
it('should emit the existing group using the correct new values', waitForAsync(() => {
fixture.whenStable().then(() => {
expect(component.submitForm.emit).toHaveBeenCalledWith(expected2);
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index e46648bb3ef..44e128acb60 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -46,6 +46,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
import { NoContent } from '../../../core/shared/NoContent.model';
import { Operation } from 'fast-json-patch';
import { ValidateGroupExists } from './validators/group-exists.validator';
+import { environment } from '../../../../environments/environment';
@Component({
selector: 'ds-group-form',
@@ -194,6 +195,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
label: groupDescription,
name: 'groupDescription',
required: false,
+ spellCheck: environment.form.spellCheck,
});
this.formModel = [
this.groupName,
@@ -344,8 +346,8 @@ export class GroupFormComponent implements OnInit, OnDestroy {
if (hasValue(this.groupDescription.value)) {
operations = [...operations, {
- op: 'replace',
- path: '/metadata/dc.description/0/value',
+ op: 'add',
+ path: '/metadata/dc.description',
value: this.groupDescription.value
}];
}
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index e5932edf059..282ee896741 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -1,9 +1,19 @@
{{messagePrefix + '.head' | translate}}
- {{messagePrefix + '.search.head' | translate}}
-
+
+
+ {{messagePrefix + '.search.head' | translate}}
+
+