mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Merge branch 'main' into w2p-91272_Add-themed-components-to-upstream-branch
This commit is contained in:
Alexandre Vryghem
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -22,7 +22,7 @@ jobs:
|
||||
strategy:
|
||||
# Create a matrix of Node versions to test against (in parallel)
|
||||
matrix:
|
||||
node-version: [12.x, 14.x]
|
||||
node-version: [14.x, 16.x]
|
||||
# Do NOT exit immediately if one matrix job fails
|
||||
fail-fast: false
|
||||
# These are the actual CI steps to perform per job
|
||||
@@ -82,11 +82,11 @@ jobs:
|
||||
run: yarn run test:headless
|
||||
|
||||
# NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
|
||||
# Upload coverage reports to Codecov (for Node v12 only)
|
||||
# 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
|
||||
if: matrix.node-version == '12.x'
|
||||
if: matrix.node-version == '16.x'
|
||||
|
||||
# Using docker-compose start backend using CI configuration
|
||||
# and load assetstore from a cached copy
|
||||
|
||||
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
|
||||
Quick start
|
||||
-----------
|
||||
|
||||
**Ensure you're running [Node](https://nodejs.org) `v12.x`, `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) `v14.x` or `v16.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
|
||||
|
||||
```bash
|
||||
# clone the repo
|
||||
@@ -90,7 +90,7 @@ Requirements
|
||||
------------
|
||||
|
||||
- [Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
|
||||
- Ensure you're running node `v12.x`, `v14.x` or `v16.x` and yarn == `v1.x`
|
||||
- Ensure you're running node `v14.x` or `v16.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.
|
||||
|
||||
|
||||
@@ -63,7 +63,8 @@
|
||||
"bundleName": "dspace-theme"
|
||||
}
|
||||
],
|
||||
"scripts": []
|
||||
"scripts": [],
|
||||
"baseHref": "/"
|
||||
},
|
||||
"configurations": {
|
||||
"development": {
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
debug: false
|
||||
|
||||
# Angular Universal server settings
|
||||
# NOTE: these must be 'synced' with the 'dspace.ui.url' setting in your backend's local.cfg.
|
||||
# NOTE: these settings define where Node.js will start your UI application. Therefore, these
|
||||
# "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
|
||||
ui:
|
||||
ssl: false
|
||||
host: localhost
|
||||
@@ -15,7 +16,8 @@ ui:
|
||||
max: 500 # limit each IP to 500 requests per windowMs
|
||||
|
||||
# The REST API server settings
|
||||
# NOTE: these must be 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
|
||||
# NOTE: these settings define which (publicly available) REST API to use. They are usually
|
||||
# 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
|
||||
rest:
|
||||
ssl: true
|
||||
host: api7.dspace.org
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
# Docker Compose files
|
||||
|
||||
***
|
||||
:warning: **NOT PRODUCTION READY** The below Docker Compose resources are not guaranteed "production ready" at this time. They have been built for development/testing only. Therefore, DSpace Docker images may not be fully secured or up-to-date. While you are welcome to base your own images on these DSpace images/resources, these should not be used "as is" in any production scenario.
|
||||
:warning: **THESE IMAGES ARE NOT PRODUCTION READY** The below Docker Compose images/resources were built for development/testing only. Therefore, they may not be fully secured or up-to-date, and should not be used in production.
|
||||
|
||||
If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
|
||||
***
|
||||
|
||||
## 'Dockerfile' in root directory
|
||||
|
||||
@@ -25,7 +25,7 @@ services:
|
||||
### OVERRIDE default 'entrypoint' in 'docker-compose-rest.yml' ####
|
||||
# Ensure that the database is ready BEFORE starting tomcat
|
||||
# 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
|
||||
# 2. Then, run database migration to init database tables
|
||||
# 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
|
||||
# 3. (Custom for Entities) enable Entity-specific collection submission mappings in item-submission.xml
|
||||
# This 'sed' command inserts the sample configurations specific to the Entities data set, see:
|
||||
# https://github.com/DSpace/DSpace/blob/main/dspace/config/item-submission.xml#L36-L49
|
||||
@@ -35,7 +35,7 @@ services:
|
||||
- '-c'
|
||||
- |
|
||||
while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
|
||||
/dspace/bin/dspace database migrate
|
||||
/dspace/bin/dspace database migrate ignored
|
||||
sed -i '/name-map collection-handle="default".*/a \\n <name-map collection-handle="123456789/3" submission-name="Publication"/> \
|
||||
<name-map collection-handle="123456789/4" submission-name="Publication"/> \
|
||||
<name-map collection-handle="123456789/281" submission-name="Publication"/> \
|
||||
|
||||
@@ -46,14 +46,14 @@ services:
|
||||
- solr_configs:/dspace/solr
|
||||
# Ensure that the database is ready BEFORE starting tomcat
|
||||
# 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
|
||||
# 2. Then, run database migration to init database tables
|
||||
# 2. Then, run database migration to init database tables (including any out-of-order ignored migrations, if any)
|
||||
# 3. Finally, start Tomcat
|
||||
entrypoint:
|
||||
- /bin/bash
|
||||
- '-c'
|
||||
- |
|
||||
while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
|
||||
/dspace/bin/dspace database migrate
|
||||
/dspace/bin/dspace database migrate ignored
|
||||
catalina.sh run
|
||||
# DSpace database container
|
||||
# NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
|
||||
|
||||
14
package.json
14
package.json
@@ -9,10 +9,11 @@
|
||||
"start:dev": "nodemon --exec \"cross-env NODE_ENV=development yarn run serve\"",
|
||||
"start:prod": "yarn run build:prod && cross-env NODE_ENV=production yarn run serve:ssr",
|
||||
"start:mirador:prod": "yarn run build:mirador && yarn run start:prod",
|
||||
"serve": "ng serve -c development",
|
||||
"preserve": "yarn base-href",
|
||||
"serve": "ng serve --configuration development",
|
||||
"serve:ssr": "node dist/server/main",
|
||||
"analyze": "webpack-bundle-analyzer dist/browser/stats.json",
|
||||
"build": "ng build -c development",
|
||||
"build": "ng build --configuration development",
|
||||
"build:stats": "ng build --stats-json",
|
||||
"build:prod": "yarn run build:ssr",
|
||||
"build:ssr": "ng build --configuration production && ng run dspace-angular:server:production",
|
||||
@@ -37,6 +38,7 @@
|
||||
"cypress:open": "cypress open",
|
||||
"cypress:run": "cypress run",
|
||||
"env:yaml": "ts-node --project ./tsconfig.ts-node.json scripts/env-to-yaml.ts",
|
||||
"base-href": "ts-node --project ./tsconfig.ts-node.json scripts/base-href.ts",
|
||||
"check-circ-deps": "npx madge --exclude '(bitstream|bundle|collection|config-submission-form|eperson|item|version)\\.model\\.ts$' --circular --extensions ts ./"
|
||||
},
|
||||
"browser": {
|
||||
@@ -78,6 +80,7 @@
|
||||
"@nicky-lenaers/ngx-scroll-to": "^9.0.0",
|
||||
"angular-idle-preload": "3.0.0",
|
||||
"angulartics2": "^12.0.0",
|
||||
"axios": "^0.27.2",
|
||||
"bootstrap": "4.3.1",
|
||||
"caniuse-lite": "^1.0.30001165",
|
||||
"cerialize": "0.1.18",
|
||||
@@ -104,7 +107,7 @@
|
||||
"mirador": "^3.3.0",
|
||||
"mirador-dl-plugin": "^0.13.0",
|
||||
"mirador-share-plugin": "^0.11.0",
|
||||
"moment": "^2.29.1",
|
||||
"moment": "^2.29.2",
|
||||
"morgan": "^1.10.0",
|
||||
"ng-mocks": "^13.1.1",
|
||||
"ng2-file-upload": "1.4.0",
|
||||
@@ -125,7 +128,8 @@
|
||||
"url-parse": "^1.5.6",
|
||||
"uuid": "^8.3.2",
|
||||
"webfontloader": "1.6.28",
|
||||
"zone.js": "~0.11.5"
|
||||
"zone.js": "~0.11.5",
|
||||
"ngx-ui-switch": "^11.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-builders/custom-webpack": "~13.1.0",
|
||||
@@ -210,4 +214,4 @@
|
||||
"webpack-cli": "^4.2.0",
|
||||
"webpack-dev-server": "^4.5.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
36
scripts/base-href.ts
Normal file
36
scripts/base-href.ts
Normal file
@@ -0,0 +1,36 @@
|
||||
import * as fs from 'fs';
|
||||
import { join } from 'path';
|
||||
|
||||
import { AppConfig } from '../src/config/app-config.interface';
|
||||
import { buildAppConfig } from '../src/config/config.server';
|
||||
|
||||
/**
|
||||
* Script to set baseHref as `ui.nameSpace` for development mode. Adds `baseHref` to angular.json build options.
|
||||
*
|
||||
* Usage (see package.json):
|
||||
*
|
||||
* yarn base-href
|
||||
*/
|
||||
|
||||
const appConfig: AppConfig = buildAppConfig();
|
||||
|
||||
const angularJsonPath = join(process.cwd(), 'angular.json');
|
||||
|
||||
if (!fs.existsSync(angularJsonPath)) {
|
||||
console.error(`Error:\n${angularJsonPath} does not exist\n`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
try {
|
||||
const angularJson = require(angularJsonPath);
|
||||
|
||||
const baseHref = `${appConfig.ui.nameSpace}${appConfig.ui.nameSpace.endsWith('/') ? '' : '/'}`;
|
||||
|
||||
console.log(`Setting baseHref to ${baseHref} in angular.json`);
|
||||
|
||||
angularJson.projects['dspace-angular'].architect.build.options.baseHref = baseHref;
|
||||
|
||||
fs.writeFileSync(angularJsonPath, JSON.stringify(angularJson, null, 2) + '\n');
|
||||
} catch (e) {
|
||||
console.error(e);
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { projectRoot} from '../webpack/helpers';
|
||||
import { projectRoot } from '../webpack/helpers';
|
||||
|
||||
const commander = require('commander');
|
||||
const fs = require('fs');
|
||||
const JSON5 = require('json5');
|
||||
@@ -119,7 +120,7 @@ function syncFileWithSource(pathToTargetFile, pathToOutputFile) {
|
||||
outputChunks.forEach(function (chunk) {
|
||||
progressBar.increment();
|
||||
chunk.split("\n").forEach(function (line) {
|
||||
file.write(" " + line + "\n");
|
||||
file.write((line === '' ? '' : ` ${line}`) + "\n");
|
||||
});
|
||||
});
|
||||
file.write("\n}");
|
||||
@@ -192,7 +193,10 @@ function createNewChunkComparingSourceAndTarget(correspondingTargetChunk, source
|
||||
|
||||
const targetList = correspondingTargetChunk.split("\n");
|
||||
const oldKeyValueInTargetComments = getSubStringWithRegex(correspondingTargetChunk, "\\s*\\/\\/\\s*\".*");
|
||||
const keyValueTarget = targetList[targetList.length - 1];
|
||||
let keyValueTarget = targetList[targetList.length - 1];
|
||||
if (!keyValueTarget.endsWith(",")) {
|
||||
keyValueTarget = keyValueTarget + ",";
|
||||
}
|
||||
|
||||
if (oldKeyValueInTargetComments != null) {
|
||||
const oldKeyValueUncommented = getSubStringWithRegex(oldKeyValueInTargetComments[0], "\".*")[0];
|
||||
|
||||
57
server.ts
57
server.ts
@@ -19,6 +19,7 @@ import 'zone.js/node';
|
||||
import 'reflect-metadata';
|
||||
import 'rxjs';
|
||||
|
||||
import axios from 'axios';
|
||||
import * as pem from 'pem';
|
||||
import * as https from 'https';
|
||||
import * as morgan from 'morgan';
|
||||
@@ -38,14 +39,14 @@ import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
|
||||
|
||||
import { environment } from './src/environments/environment';
|
||||
import { createProxyMiddleware } from 'http-proxy-middleware';
|
||||
import { hasValue, hasNoValue } from './src/app/shared/empty.util';
|
||||
import { hasNoValue, hasValue } from './src/app/shared/empty.util';
|
||||
|
||||
import { UIServerConfig } from './src/config/ui-server-config.interface';
|
||||
|
||||
import { ServerAppModule } from './src/main.server';
|
||||
|
||||
import { buildAppConfig } from './src/config/config.server';
|
||||
import { AppConfig, APP_CONFIG } from './src/config/app-config.interface';
|
||||
import { APP_CONFIG, AppConfig } from './src/config/app-config.interface';
|
||||
import { extendEnvironmentWithAppConfig } from './src/config/config.util';
|
||||
|
||||
/*
|
||||
@@ -67,6 +68,8 @@ extendEnvironmentWithAppConfig(environment, appConfig);
|
||||
// The Express app is exported so that it can be used by serverless Functions.
|
||||
export function app() {
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
/*
|
||||
* Create a new express application
|
||||
*/
|
||||
@@ -138,7 +141,11 @@ export function app() {
|
||||
/**
|
||||
* Proxy the sitemaps
|
||||
*/
|
||||
server.use('/sitemap**', createProxyMiddleware({ target: `${environment.rest.baseUrl}/sitemaps`, changeOrigin: true }));
|
||||
router.use('/sitemap**', createProxyMiddleware({
|
||||
target: `${environment.rest.baseUrl}/sitemaps`,
|
||||
pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
|
||||
changeOrigin: true
|
||||
}));
|
||||
|
||||
/**
|
||||
* Checks if the rateLimiter property is present
|
||||
@@ -157,7 +164,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)
|
||||
*/
|
||||
server.get('*.*', cacheControl, expressStaticGzip(DIST_FOLDER, {
|
||||
router.get('*.*', cacheControl, expressStaticGzip(DIST_FOLDER, {
|
||||
index: false,
|
||||
enableBrotli: true,
|
||||
orderPreference: ['br', 'gzip'],
|
||||
@@ -166,10 +173,17 @@ export function app() {
|
||||
/*
|
||||
* Fallthrough to the IIIF viewer (must be included in the build).
|
||||
*/
|
||||
server.use('/iiif', express.static(IIIF_VIEWER, {index:false}));
|
||||
router.use('/iiif', express.static(IIIF_VIEWER, { index: false }));
|
||||
|
||||
/**
|
||||
* Checking server status
|
||||
*/
|
||||
server.get('/app/health', healthCheck);
|
||||
|
||||
// Register the ngApp callback function to handle incoming requests
|
||||
server.get('*', ngApp);
|
||||
router.get('*', ngApp);
|
||||
|
||||
server.use(environment.ui.nameSpace, router);
|
||||
|
||||
return server;
|
||||
}
|
||||
@@ -203,13 +217,25 @@ function ngApp(req, res) {
|
||||
if (hasValue(err)) {
|
||||
console.warn('Error details : ', err);
|
||||
}
|
||||
res.sendFile(DIST_FOLDER + '/index.html');
|
||||
res.render(indexHtml, {
|
||||
req,
|
||||
providers: [{
|
||||
provide: APP_BASE_HREF,
|
||||
useValue: req.baseUrl
|
||||
}]
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// If preboot is disabled, just serve the client
|
||||
console.log('Universal off, serving for direct CSR');
|
||||
res.sendFile(DIST_FOLDER + '/index.html');
|
||||
res.render(indexHtml, {
|
||||
req,
|
||||
providers: [{
|
||||
provide: APP_BASE_HREF,
|
||||
useValue: req.baseUrl
|
||||
}]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -299,6 +325,21 @@ function start() {
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The callback function to serve health check requests
|
||||
*/
|
||||
function healthCheck(req, res) {
|
||||
const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
|
||||
axios.get(baseUrl)
|
||||
.then((response) => {
|
||||
res.status(response.status).send(response.data);
|
||||
})
|
||||
.catch((error) => {
|
||||
res.status(error.response.status).send({
|
||||
error: error.message
|
||||
});
|
||||
});
|
||||
}
|
||||
// Webpack will replace 'require' with '__webpack_require__'
|
||||
// '__non_webpack_require__' is a proxy to Node 'require'
|
||||
// The below code is to ensure that the server is run only when not requiring the bundle.
|
||||
|
||||
@@ -18,8 +18,8 @@ import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-r
|
||||
import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
|
||||
import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
|
||||
import { ThemeService } from '../../../../../shared/theme-support/theme.service';
|
||||
import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
|
||||
import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
|
||||
import { AccessStatusDataService } from '../../../../../core/data/access-status-data.service';
|
||||
import { AccessStatusObject } from '../../../../../shared/object-list/access-status-badge/access-status.model';
|
||||
|
||||
describe('ItemAdminSearchResultGridElementComponent', () => {
|
||||
let component: ItemAdminSearchResultGridElementComponent;
|
||||
|
||||
@@ -107,6 +107,8 @@ export function getPageInternalServerErrorRoute() {
|
||||
return `/${INTERNAL_SERVER_ERROR}`;
|
||||
}
|
||||
|
||||
export const ERROR_PAGE = 'error';
|
||||
|
||||
export const INFO_MODULE_PATH = 'info';
|
||||
export function getInfoModulePath() {
|
||||
return `/${INFO_MODULE_PATH}`;
|
||||
@@ -122,3 +124,5 @@ export const REQUEST_COPY_MODULE_PATH = 'request-a-copy';
|
||||
export function getRequestCopyModulePath() {
|
||||
return `/${REQUEST_COPY_MODULE_PATH}`;
|
||||
}
|
||||
|
||||
export const HEALTH_PAGE_PATH = 'health';
|
||||
|
||||
@@ -3,13 +3,17 @@ import { RouterModule, NoPreloading } from '@angular/router';
|
||||
import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
|
||||
|
||||
import { AuthenticatedGuard } from './core/auth/authenticated.guard';
|
||||
import { SiteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
|
||||
import {
|
||||
SiteAdministratorGuard
|
||||
} from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
|
||||
import {
|
||||
ACCESS_CONTROL_MODULE_PATH,
|
||||
ADMIN_MODULE_PATH,
|
||||
BITSTREAM_MODULE_PATH,
|
||||
ERROR_PAGE,
|
||||
FORBIDDEN_PATH,
|
||||
FORGOT_PASSWORD_PATH,
|
||||
HEALTH_PAGE_PATH,
|
||||
INFO_MODULE_PATH,
|
||||
INTERNAL_SERVER_ERROR,
|
||||
LEGACY_BITSTREAM_MODULE_PATH,
|
||||
@@ -27,15 +31,21 @@ import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-
|
||||
import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
|
||||
import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
|
||||
import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
|
||||
import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
|
||||
import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
|
||||
import {
|
||||
GroupAdministratorGuard
|
||||
} from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
|
||||
import {
|
||||
ThemedPageInternalServerErrorComponent
|
||||
} from './page-internal-server-error/themed-page-internal-server-error.component';
|
||||
import { ServerCheckGuard } from './core/server-check/server-check.guard';
|
||||
import { MenuResolver } from './menu.resolver';
|
||||
import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forRoot([
|
||||
{ path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
|
||||
{ path: ERROR_PAGE , component: ThemedPageErrorComponent },
|
||||
{
|
||||
path: '',
|
||||
canActivate: [AuthBlockingGuard],
|
||||
@@ -210,6 +220,11 @@ import { MenuResolver } from './menu.resolver';
|
||||
loadChildren: () => import('./statistics-page/statistics-page-routing.module')
|
||||
.then((m) => m.StatisticsPageRoutingModule)
|
||||
},
|
||||
{
|
||||
path: HEALTH_PAGE_PATH,
|
||||
loadChildren: () => import('./health-page/health-page.module')
|
||||
.then((m) => m.HealthPageModule)
|
||||
},
|
||||
{
|
||||
path: ACCESS_CONTROL_MODULE_PATH,
|
||||
loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
|
||||
|
||||
@@ -187,7 +187,7 @@ describe('App component', () => {
|
||||
link.setAttribute('rel', 'stylesheet');
|
||||
link.setAttribute('type', 'text/css');
|
||||
link.setAttribute('class', 'theme-css');
|
||||
link.setAttribute('href', '/custom-theme.css');
|
||||
link.setAttribute('href', 'custom-theme.css');
|
||||
|
||||
expect(headSpy.appendChild).toHaveBeenCalledWith(link);
|
||||
});
|
||||
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
} from '@angular/core';
|
||||
import {
|
||||
ActivatedRouteSnapshot,
|
||||
ActivationEnd,
|
||||
NavigationCancel,
|
||||
NavigationEnd,
|
||||
NavigationStart, ResolveEnd,
|
||||
@@ -21,7 +22,7 @@ import {
|
||||
import { isEqual } from 'lodash';
|
||||
import { BehaviorSubject, Observable, of } from 'rxjs';
|
||||
import { select, Store } from '@ngrx/store';
|
||||
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { NgbModal, NgbModalConfig } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { Angulartics2GoogleAnalytics } from 'angulartics2';
|
||||
|
||||
@@ -48,6 +49,7 @@ import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
|
||||
import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
|
||||
import { getDefaultThemeConfig } from '../config/config.util';
|
||||
import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
|
||||
import { ModalBeforeDismiss } from './shared/interfaces/modal-before-dismiss.interface';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-app',
|
||||
@@ -105,6 +107,7 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||
private localeService: LocaleService,
|
||||
private breadcrumbsService: BreadcrumbsService,
|
||||
private modalService: NgbModal,
|
||||
private modalConfig: NgbModalConfig,
|
||||
@Optional() private cookiesService: KlaroService,
|
||||
@Optional() private googleAnalyticsService: GoogleAnalyticsService,
|
||||
) {
|
||||
@@ -165,6 +168,16 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
/** Implement behavior for interface {@link ModalBeforeDismiss} */
|
||||
this.modalConfig.beforeDismiss = async function () {
|
||||
if (typeof this?.componentInstance?.beforeDismiss === 'function') {
|
||||
return this.componentInstance.beforeDismiss();
|
||||
}
|
||||
|
||||
// fall back to default behavior
|
||||
return true;
|
||||
};
|
||||
|
||||
this.isAuthBlocking$ = this.store.pipe(select(isAuthenticationBlocking)).pipe(
|
||||
distinctUntilChanged()
|
||||
);
|
||||
@@ -196,30 +209,30 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||
}
|
||||
|
||||
ngAfterViewInit() {
|
||||
let resolveEndFound = false;
|
||||
let updatingTheme = false;
|
||||
let snapshot: ActivatedRouteSnapshot;
|
||||
|
||||
this.router.events.subscribe((event) => {
|
||||
if (event instanceof NavigationStart) {
|
||||
resolveEndFound = false;
|
||||
updatingTheme = false;
|
||||
this.distinctNext(this.isRouteLoading$, true);
|
||||
} else if (event instanceof ResolveEnd) {
|
||||
resolveEndFound = true;
|
||||
const activatedRouteSnapShot: ActivatedRouteSnapshot = event.state.root;
|
||||
this.themeService.updateThemeOnRouteChange$(event.urlAfterRedirects, activatedRouteSnapShot).pipe(
|
||||
switchMap((changed) => {
|
||||
if (changed) {
|
||||
return this.isThemeCSSLoading$;
|
||||
} else {
|
||||
return [false];
|
||||
}
|
||||
})
|
||||
).subscribe((changed) => {
|
||||
this.distinctNext(this.isThemeLoading$, changed);
|
||||
});
|
||||
} else if (
|
||||
event instanceof NavigationEnd ||
|
||||
event instanceof NavigationCancel
|
||||
) {
|
||||
if (!resolveEndFound) {
|
||||
} else if (event instanceof ResolveEnd) {
|
||||
// this is the earliest point where we have all the information we need
|
||||
// to update the theme, but this event is not emitted on first load
|
||||
this.updateTheme(event.urlAfterRedirects, event.state.root);
|
||||
updatingTheme = true;
|
||||
} else if (!updatingTheme && event instanceof ActivationEnd) {
|
||||
// if there was no ResolveEnd, keep track of the snapshot...
|
||||
snapshot = event.snapshot;
|
||||
} else if (event instanceof NavigationEnd) {
|
||||
if (!updatingTheme) {
|
||||
// ...and use it to update the theme on NavigationEnd instead
|
||||
this.updateTheme(event.urlAfterRedirects, snapshot);
|
||||
updatingTheme = true;
|
||||
}
|
||||
this.distinctNext(this.isRouteLoading$, false);
|
||||
} else if (event instanceof NavigationCancel) {
|
||||
if (!updatingTheme) {
|
||||
this.distinctNext(this.isThemeLoading$, false);
|
||||
}
|
||||
this.distinctNext(this.isRouteLoading$, false);
|
||||
@@ -227,6 +240,26 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the theme according to the current route, if applicable.
|
||||
* @param urlAfterRedirects the current URL after redirects
|
||||
* @param snapshot the current route snapshot
|
||||
* @private
|
||||
*/
|
||||
private updateTheme(urlAfterRedirects: string, snapshot: ActivatedRouteSnapshot): void {
|
||||
this.themeService.updateThemeOnRouteChange$(urlAfterRedirects, snapshot).pipe(
|
||||
switchMap((changed) => {
|
||||
if (changed) {
|
||||
return this.isThemeCSSLoading$;
|
||||
} else {
|
||||
return [false];
|
||||
}
|
||||
})
|
||||
).subscribe((changed) => {
|
||||
this.distinctNext(this.isThemeLoading$, changed);
|
||||
});
|
||||
}
|
||||
|
||||
@HostListener('window:resize', ['$event'])
|
||||
public onResize(event): void {
|
||||
this.dispatchWindowSize(event.target.innerWidth, event.target.innerHeight);
|
||||
@@ -268,7 +301,7 @@ export class AppComponent implements OnInit, AfterViewInit {
|
||||
link.setAttribute('rel', 'stylesheet');
|
||||
link.setAttribute('type', 'text/css');
|
||||
link.setAttribute('class', 'theme-css');
|
||||
link.setAttribute('href', `/${encodeURIComponent(themeName)}-theme.css`);
|
||||
link.setAttribute('href', `${encodeURIComponent(themeName)}-theme.css`);
|
||||
// wait for the new css to download before removing the old one to prevent a
|
||||
// flash of unstyled content
|
||||
link.onload = () => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { APP_BASE_HREF, CommonModule } from '@angular/common';
|
||||
import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common';
|
||||
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
|
||||
import { APP_INITIALIZER, NgModule } from '@angular/core';
|
||||
import { AbstractControl } from '@angular/forms';
|
||||
@@ -42,9 +42,11 @@ export function getConfig() {
|
||||
return environment;
|
||||
}
|
||||
|
||||
export function getBase(appConfig: AppConfig) {
|
||||
return appConfig.ui.nameSpace;
|
||||
}
|
||||
const getBaseHref = (document: Document, appConfig: AppConfig): string => {
|
||||
const baseTag = document.querySelector('head > base');
|
||||
baseTag.setAttribute('href', `${appConfig.ui.nameSpace}${appConfig.ui.nameSpace.endsWith('/') ? '' : '/'}`);
|
||||
return baseTag.getAttribute('href');
|
||||
};
|
||||
|
||||
export function getMetaReducers(appConfig: AppConfig): MetaReducer<AppState>[] {
|
||||
return appConfig.debug ? [...appMetaReducers, ...debugMetaReducers] : appMetaReducers;
|
||||
@@ -84,8 +86,8 @@ const PROVIDERS = [
|
||||
},
|
||||
{
|
||||
provide: APP_BASE_HREF,
|
||||
useFactory: getBase,
|
||||
deps: [APP_CONFIG]
|
||||
useFactory: getBaseHref,
|
||||
deps: [DOCUMENT, APP_CONFIG]
|
||||
},
|
||||
{
|
||||
provide: USER_PROVIDED_META_REDUCERS,
|
||||
|
||||
@@ -377,25 +377,25 @@ describe('AuthService test', () => {
|
||||
it('should redirect to reload with redirect url', () => {
|
||||
authService.navigateToRedirectUrl('/collection/123');
|
||||
// Reload with redirect URL set to /collection/123
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*\\?redirect=' + encodeURIComponent('/collection/123'))));
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('reload/[0-9]*\\?redirect=' + encodeURIComponent('/collection/123'))));
|
||||
});
|
||||
|
||||
it('should redirect to reload with /home', () => {
|
||||
authService.navigateToRedirectUrl('/home');
|
||||
// Reload with redirect URL set to /home
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*\\?redirect=' + encodeURIComponent('/home'))));
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('reload/[0-9]*\\?redirect=' + encodeURIComponent('/home'))));
|
||||
});
|
||||
|
||||
it('should redirect to regular reload and not to /login', () => {
|
||||
authService.navigateToRedirectUrl('/login');
|
||||
// Reload without a redirect URL
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*(?!\\?)$')));
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('reload/[0-9]*(?!\\?)$')));
|
||||
});
|
||||
|
||||
it('should redirect to regular reload when no redirect url is found', () => {
|
||||
authService.navigateToRedirectUrl(undefined);
|
||||
// Reload without a redirect URL
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('/reload/[0-9]*(?!\\?)$')));
|
||||
expect(hardRedirectService.redirect).toHaveBeenCalledWith(jasmine.stringMatching(new RegExp('reload/[0-9]*(?!\\?)$')));
|
||||
});
|
||||
|
||||
describe('impersonate', () => {
|
||||
|
||||
@@ -468,8 +468,8 @@ export class AuthService {
|
||||
*/
|
||||
public navigateToRedirectUrl(redirectUrl: string) {
|
||||
// Don't do redirect if already on reload url
|
||||
if (!hasValue(redirectUrl) || !redirectUrl.includes('/reload/')) {
|
||||
let url = `/reload/${new Date().getTime()}`;
|
||||
if (!hasValue(redirectUrl) || !redirectUrl.includes('reload/')) {
|
||||
let url = `reload/${new Date().getTime()}`;
|
||||
if (isNotEmpty(redirectUrl) && !redirectUrl.startsWith(LOGIN_ROUTE)) {
|
||||
url += `?redirect=${encodeURIComponent(redirectUrl)}`;
|
||||
}
|
||||
|
||||
@@ -4,5 +4,6 @@ export enum AuthMethodType {
|
||||
Ldap = 'ldap',
|
||||
Ip = 'ip',
|
||||
X509 = 'x509',
|
||||
Oidc = 'oidc'
|
||||
Oidc = 'oidc',
|
||||
Orcid = 'orcid'
|
||||
}
|
||||
|
||||
@@ -34,6 +34,11 @@ export class AuthMethod {
|
||||
this.location = location;
|
||||
break;
|
||||
}
|
||||
case 'orcid': {
|
||||
this.authMethodType = AuthMethodType.Orcid;
|
||||
this.location = location;
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
break;
|
||||
|
||||
@@ -78,15 +78,32 @@ describe(`DSONameService`, () => {
|
||||
});
|
||||
|
||||
describe(`factories.Person`, () => {
|
||||
beforeEach(() => {
|
||||
spyOn(mockPerson, 'firstMetadataValue').and.returnValues(...mockPersonName.split(', '));
|
||||
describe(`with person.familyName and person.givenName`, () => {
|
||||
beforeEach(() => {
|
||||
spyOn(mockPerson, 'firstMetadataValue').and.returnValues(...mockPersonName.split(', '));
|
||||
});
|
||||
|
||||
it(`should return 'person.familyName, person.givenName'`, () => {
|
||||
const result = (service as any).factories.Person(mockPerson);
|
||||
expect(result).toBe(mockPersonName);
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.familyName');
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.givenName');
|
||||
expect(mockPerson.firstMetadataValue).not.toHaveBeenCalledWith('dc.title');
|
||||
});
|
||||
});
|
||||
|
||||
it(`should return 'person.familyName, person.givenName'`, () => {
|
||||
const result = (service as any).factories.Person(mockPerson);
|
||||
expect(result).toBe(mockPersonName);
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.familyName');
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.givenName');
|
||||
describe(`without person.familyName and person.givenName`, () => {
|
||||
beforeEach(() => {
|
||||
spyOn(mockPerson, 'firstMetadataValue').and.returnValues(undefined, undefined, mockPersonName);
|
||||
});
|
||||
|
||||
it(`should return dc.title`, () => {
|
||||
const result = (service as any).factories.Person(mockPerson);
|
||||
expect(result).toBe(mockPersonName);
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.familyName');
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('person.givenName');
|
||||
expect(mockPerson.firstMetadataValue).toHaveBeenCalledWith('dc.title');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { hasValue } from '../../shared/empty.util';
|
||||
import { hasValue, isEmpty } from '../../shared/empty.util';
|
||||
import { DSpaceObject } from '../shared/dspace-object.model';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
||||
@@ -27,7 +27,13 @@ export class DSONameService {
|
||||
*/
|
||||
private readonly factories = {
|
||||
Person: (dso: DSpaceObject): string => {
|
||||
return `${dso.firstMetadataValue('person.familyName')}, ${dso.firstMetadataValue('person.givenName')}`;
|
||||
const familyName = dso.firstMetadataValue('person.familyName');
|
||||
const givenName = dso.firstMetadataValue('person.givenName');
|
||||
if (isEmpty(familyName) && isEmpty(givenName)) {
|
||||
return dso.firstMetadataValue('dc.title') || dso.name;
|
||||
} else {
|
||||
return `${familyName}, ${givenName}`;
|
||||
}
|
||||
},
|
||||
OrgUnit: (dso: DSpaceObject): string => {
|
||||
return dso.firstMetadataValue('organization.legalName');
|
||||
|
||||
@@ -38,7 +38,7 @@ import { SubmissionSectionModel } from './config/models/config-submission-sectio
|
||||
import { SubmissionUploadsModel } from './config/models/config-submission-uploads.model';
|
||||
import { SubmissionFormsConfigService } from './config/submission-forms-config.service';
|
||||
import { coreEffects } from './core.effects';
|
||||
import { coreReducers} from './core.reducers';
|
||||
import { coreReducers } from './core.reducers';
|
||||
import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
|
||||
import { CollectionDataService } from './data/collection-data.service';
|
||||
import { CommunityDataService } from './data/community-data.service';
|
||||
@@ -132,11 +132,15 @@ import { Feature } from './shared/feature.model';
|
||||
import { Authorization } from './shared/authorization.model';
|
||||
import { FeatureDataService } from './data/feature-authorization/feature-data.service';
|
||||
import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
|
||||
import { SiteAdministratorGuard } from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
|
||||
import {
|
||||
SiteAdministratorGuard
|
||||
} from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
|
||||
import { Registration } from './shared/registration.model';
|
||||
import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
|
||||
import { MetadataFieldDataService } from './data/metadata-field-data.service';
|
||||
import { DsDynamicTypeBindRelationService } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
|
||||
import {
|
||||
DsDynamicTypeBindRelationService
|
||||
} from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
|
||||
import { TokenResponseParsingService } from './auth/token-response-parsing.service';
|
||||
import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
|
||||
import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
|
||||
@@ -166,6 +170,14 @@ import { SubmissionAccessesModel } from './config/models/config-submission-acces
|
||||
import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
|
||||
import { AccessStatusDataService } from './data/access-status-data.service';
|
||||
import { LinkHeadService } from './services/link-head.service';
|
||||
import { ResearcherProfileService } from './profile/researcher-profile.service';
|
||||
import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
|
||||
import { ResearcherProfile } from './profile/model/researcher-profile.model';
|
||||
import { OrcidQueueService } from './orcid/orcid-queue.service';
|
||||
import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
|
||||
import { OrcidQueue } from './orcid/model/orcid-queue.model';
|
||||
import { OrcidHistory } from './orcid/model/orcid-history.model';
|
||||
import { OrcidAuthService } from './orcid/orcid-auth.service';
|
||||
|
||||
/**
|
||||
* When not in production, endpoint responses can be mocked for testing purposes
|
||||
@@ -292,6 +304,11 @@ const PROVIDERS = [
|
||||
SequenceService,
|
||||
GroupDataService,
|
||||
FeedbackDataService,
|
||||
ResearcherProfileService,
|
||||
ProfileClaimService,
|
||||
OrcidAuthService,
|
||||
OrcidQueueService,
|
||||
OrcidHistoryDataService,
|
||||
];
|
||||
|
||||
/**
|
||||
@@ -352,6 +369,10 @@ export const models =
|
||||
Root,
|
||||
SearchConfig,
|
||||
SubmissionAccessesModel,
|
||||
AccessStatusObject,
|
||||
ResearcherProfile,
|
||||
OrcidQueue,
|
||||
OrcidHistory,
|
||||
AccessStatusObject
|
||||
];
|
||||
|
||||
|
||||
@@ -8,11 +8,12 @@ import {
|
||||
find,
|
||||
map,
|
||||
mergeMap,
|
||||
skipWhile,
|
||||
switchMap,
|
||||
take,
|
||||
takeWhile,
|
||||
switchMap,
|
||||
tap,
|
||||
skipWhile, toArray
|
||||
toArray
|
||||
} from 'rxjs/operators';
|
||||
import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
|
||||
import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
|
||||
@@ -26,18 +27,12 @@ import { ObjectCacheService } from '../cache/object-cache.service';
|
||||
import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
|
||||
import { DSpaceObject } from '../shared/dspace-object.model';
|
||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||
import { getRemoteDataPayload, getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../shared/operators';
|
||||
import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
|
||||
import { URLCombiner } from '../url-combiner/url-combiner';
|
||||
import { ChangeAnalyzer } from './change-analyzer';
|
||||
import { PaginatedList } from './paginated-list.model';
|
||||
import { RemoteData } from './remote-data';
|
||||
import {
|
||||
CreateRequest,
|
||||
GetRequest,
|
||||
PatchRequest,
|
||||
PutRequest,
|
||||
DeleteRequest
|
||||
} from './request.models';
|
||||
import { CreateRequest, DeleteRequest, GetRequest, PatchRequest, PutRequest } from './request.models';
|
||||
import { RequestService } from './request.service';
|
||||
import { RestRequestMethod } from './rest-request-method';
|
||||
import { UpdateDataService } from './update-data.service';
|
||||
@@ -169,7 +164,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
|
||||
* @return {Observable<string>}
|
||||
* Return an observable that emits created HREF
|
||||
*/
|
||||
protected buildHrefWithParams(href: string, params: RequestParam[], ...linksToFollow: FollowLinkConfig<T>[]): string {
|
||||
buildHrefWithParams(href: string, params: RequestParam[], ...linksToFollow: FollowLinkConfig<T>[]): string {
|
||||
|
||||
let args = [];
|
||||
if (hasValue(params)) {
|
||||
|
||||
@@ -60,14 +60,18 @@ export class AuthorizationDataService extends DataService<Authorization> {
|
||||
|
||||
/**
|
||||
* Checks if an {@link EPerson} (or anonymous) has access to a specific object within a {@link Feature}
|
||||
* @param objectUrl URL to the object to search {@link Authorization}s for.
|
||||
* If not provided, the repository's {@link Site} will be used.
|
||||
* @param ePersonUuid UUID of the {@link EPerson} to search {@link Authorization}s for.
|
||||
* If not provided, the UUID of the currently authenticated {@link EPerson} will be used.
|
||||
* @param featureId ID of the {@link Feature} to check {@link Authorization} for
|
||||
* @param objectUrl URL to the object to search {@link Authorization}s for.
|
||||
* If not provided, the repository's {@link Site} will be used.
|
||||
* @param ePersonUuid UUID of the {@link EPerson} to search {@link Authorization}s for.
|
||||
* If not provided, the UUID of the currently authenticated {@link EPerson} will be used.
|
||||
* @param featureId ID of the {@link Feature} to check {@link Authorization} for
|
||||
* @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
|
||||
* no valid cached version. Defaults to true
|
||||
* @param reRequestOnStale Whether or not the request should automatically be re-
|
||||
* requested after the response becomes stale
|
||||
*/
|
||||
isAuthorized(featureId?: FeatureID, objectUrl?: string, ePersonUuid?: string): Observable<boolean> {
|
||||
return this.searchByObject(featureId, objectUrl, ePersonUuid, {}, true, true, followLink('feature')).pipe(
|
||||
isAuthorized(featureId?: FeatureID, objectUrl?: string, ePersonUuid?: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<boolean> {
|
||||
return this.searchByObject(featureId, objectUrl, ePersonUuid, {}, useCachedVersionIfAvailable, reRequestOnStale, followLink('feature')).pipe(
|
||||
getFirstCompletedRemoteData(),
|
||||
map((authorizationRD) => {
|
||||
if (authorizationRD.statusCode !== 401 && hasValue(authorizationRD.payload) && isNotEmpty(authorizationRD.payload.page)) {
|
||||
|
||||
@@ -28,4 +28,6 @@ export enum FeatureID {
|
||||
CanCreateVersion = 'canCreateVersion',
|
||||
CanViewUsageStatistics = 'canViewUsageStatistics',
|
||||
CanSendFeedback = 'canSendFeedback',
|
||||
CanClaimItem = 'canClaimItem',
|
||||
CanSynchronizeWithORCID = 'canSynchronizeWithORCID'
|
||||
}
|
||||
|
||||
@@ -192,7 +192,7 @@ export class LocaleService {
|
||||
this.routeService.getCurrentUrl().pipe(take(1)).subscribe((currentURL) => {
|
||||
// Hard redirect to the reload page with a unique number behind it
|
||||
// so that all state is definitely lost
|
||||
this._window.nativeWindow.location.href = `/reload/${new Date().getTime()}?redirect=` + encodeURIComponent(currentURL);
|
||||
this._window.nativeWindow.location.href = `reload/${new Date().getTime()}?redirect=` + encodeURIComponent(currentURL);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
89
src/app/core/orcid/model/orcid-history.model.ts
Normal file
89
src/app/core/orcid/model/orcid-history.model.ts
Normal file
@@ -0,0 +1,89 @@
|
||||
import { autoserialize, deserialize } from 'cerialize';
|
||||
import { typedObject } from '../../cache/builders/build-decorators';
|
||||
import { HALLink } from '../../shared/hal-link.model';
|
||||
import { ResourceType } from '../../shared/resource-type';
|
||||
import { excludeFromEquals } from '../../utilities/equals.decorators';
|
||||
import { ORCID_HISTORY } from './orcid-history.resource-type';
|
||||
import { CacheableObject } from '../../cache/cacheable-object.model';
|
||||
|
||||
/**
|
||||
* Class the represents a Orcid History.
|
||||
*/
|
||||
@typedObject
|
||||
export class OrcidHistory extends CacheableObject {
|
||||
|
||||
static type = ORCID_HISTORY;
|
||||
|
||||
/**
|
||||
* The object type
|
||||
*/
|
||||
@excludeFromEquals
|
||||
@autoserialize
|
||||
type: ResourceType;
|
||||
|
||||
/**
|
||||
* The identifier of this Orcid History record
|
||||
*/
|
||||
@autoserialize
|
||||
id: number;
|
||||
|
||||
/**
|
||||
* The name of the related entity
|
||||
*/
|
||||
@autoserialize
|
||||
entityName: string;
|
||||
|
||||
/**
|
||||
* The identifier of the profileItem of this Orcid History record.
|
||||
*/
|
||||
@autoserialize
|
||||
profileItemId: string;
|
||||
|
||||
/**
|
||||
* The identifier of the entity related to this Orcid History record.
|
||||
*/
|
||||
@autoserialize
|
||||
entityId: string;
|
||||
|
||||
/**
|
||||
* The type of the entity related to this Orcid History record.
|
||||
*/
|
||||
@autoserialize
|
||||
entityType: string;
|
||||
|
||||
/**
|
||||
* The response status coming from ORCID api.
|
||||
*/
|
||||
@autoserialize
|
||||
status: number;
|
||||
|
||||
/**
|
||||
* The putCode assigned by ORCID to the entity.
|
||||
*/
|
||||
@autoserialize
|
||||
putCode: string;
|
||||
|
||||
/**
|
||||
* The last send attempt timestamp.
|
||||
*/
|
||||
lastAttempt: string;
|
||||
|
||||
/**
|
||||
* The success send attempt timestamp.
|
||||
*/
|
||||
successAttempt: string;
|
||||
|
||||
/**
|
||||
* The response coming from ORCID.
|
||||
*/
|
||||
responseMessage: string;
|
||||
|
||||
/**
|
||||
* The {@link HALLink}s for this Orcid History record
|
||||
*/
|
||||
@deserialize
|
||||
_links: {
|
||||
self: HALLink,
|
||||
};
|
||||
|
||||
}
|
||||
9
src/app/core/orcid/model/orcid-history.resource-type.ts
Normal file
9
src/app/core/orcid/model/orcid-history.resource-type.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import { ResourceType } from '../../shared/resource-type';
|
||||
|
||||
/**
|
||||
* The resource type for OrcidHistory
|
||||
*
|
||||
* Needs to be in a separate file to prevent circular
|
||||
* dependencies in webpack.
|
||||
*/
|
||||
export const ORCID_HISTORY = new ResourceType('orcidhistory');
|
||||
68
src/app/core/orcid/model/orcid-queue.model.ts
Normal file
68
src/app/core/orcid/model/orcid-queue.model.ts
Normal file
@@ -0,0 +1,68 @@
|
||||
import { autoserialize, deserialize } from 'cerialize';
|
||||
import { typedObject } from '../../cache/builders/build-decorators';
|
||||
import { HALLink } from '../../shared/hal-link.model';
|
||||
import { ResourceType } from '../../shared/resource-type';
|
||||
import { excludeFromEquals } from '../../utilities/equals.decorators';
|
||||
import { ORCID_QUEUE } from './orcid-queue.resource-type';
|
||||
import { CacheableObject } from '../../cache/cacheable-object.model';
|
||||
|
||||
/**
|
||||
* Class the represents a Orcid Queue.
|
||||
*/
|
||||
@typedObject
|
||||
export class OrcidQueue extends CacheableObject {
|
||||
|
||||
static type = ORCID_QUEUE;
|
||||
|
||||
/**
|
||||
* The object type
|
||||
*/
|
||||
@excludeFromEquals
|
||||
@autoserialize
|
||||
type: ResourceType;
|
||||
|
||||
/**
|
||||
* The identifier of this Orcid Queue record
|
||||
*/
|
||||
@autoserialize
|
||||
id: number;
|
||||
|
||||
/**
|
||||
* The record description.
|
||||
*/
|
||||
@autoserialize
|
||||
description: string;
|
||||
|
||||
/**
|
||||
* The identifier of the profileItem of this Orcid Queue record.
|
||||
*/
|
||||
@autoserialize
|
||||
profileItemId: string;
|
||||
|
||||
/**
|
||||
* The identifier of the entity related to this Orcid Queue record.
|
||||
*/
|
||||
@autoserialize
|
||||
entityId: string;
|
||||
|
||||
/**
|
||||
* The type of this Orcid Queue record.
|
||||
*/
|
||||
@autoserialize
|
||||
recordType: string;
|
||||
|
||||
/**
|
||||
* The operation related to this Orcid Queue record.
|
||||
*/
|
||||
@autoserialize
|
||||
operation: string;
|
||||
|
||||
/**
|
||||
* The {@link HALLink}s for this Orcid Queue record
|
||||
*/
|
||||
@deserialize
|
||||
_links: {
|
||||
self: HALLink,
|
||||
};
|
||||
|
||||
}
|
||||
9
src/app/core/orcid/model/orcid-queue.resource-type.ts
Normal file
9
src/app/core/orcid/model/orcid-queue.resource-type.ts
Normal file
@@ -0,0 +1,9 @@
|
||||
import { ResourceType } from '../../shared/resource-type';
|
||||
|
||||
/**
|
||||
* The resource type for OrcidQueue
|
||||
*
|
||||
* Needs to be in a separate file to prevent circular
|
||||
* dependencies in webpack.
|
||||
*/
|
||||
export const ORCID_QUEUE = new ResourceType('orcidqueue');
|
||||
329
src/app/core/orcid/orcid-auth.service.spec.ts
Normal file
329
src/app/core/orcid/orcid-auth.service.spec.ts
Normal file
@@ -0,0 +1,329 @@
|
||||
import { cold, getTestScheduler } from 'jasmine-marbles';
|
||||
import { TestScheduler } from 'rxjs/testing';
|
||||
import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
|
||||
import { RouterMock } from '../../shared/mocks/router.mock';
|
||||
import { ResearcherProfile } from '../profile/model/researcher-profile.model';
|
||||
import { Item } from '../shared/item.model';
|
||||
import { AddOperation, RemoveOperation } from 'fast-json-patch';
|
||||
import { ConfigurationProperty } from '../shared/configuration-property.model';
|
||||
import { ConfigurationDataService } from '../data/configuration-data.service';
|
||||
import { createPaginatedList } from '../../shared/testing/utils.test';
|
||||
import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
|
||||
import { URLCombiner } from '../url-combiner/url-combiner';
|
||||
import { OrcidAuthService } from './orcid-auth.service';
|
||||
import { ResearcherProfileService } from '../profile/researcher-profile.service';
|
||||
|
||||
describe('OrcidAuthService', () => {
|
||||
let scheduler: TestScheduler;
|
||||
let service: OrcidAuthService;
|
||||
let serviceAsAny: any;
|
||||
|
||||
let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
|
||||
let configurationDataService: ConfigurationDataService;
|
||||
let nativeWindowService: NativeWindowRefMock;
|
||||
let routerStub: any;
|
||||
|
||||
const researcherProfileId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
|
||||
const itemId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
|
||||
|
||||
const researcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
|
||||
id: researcherProfileId,
|
||||
visible: false,
|
||||
type: 'profile',
|
||||
_links: {
|
||||
item: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
|
||||
},
|
||||
self: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
|
||||
id: researcherProfileId,
|
||||
visible: true,
|
||||
type: 'profile',
|
||||
_links: {
|
||||
item: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
|
||||
},
|
||||
self: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
|
||||
id: 'mockItemUnlinkedToOrcid',
|
||||
bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
|
||||
metadata: {
|
||||
'dc.title': [{
|
||||
value: 'test person'
|
||||
}],
|
||||
'dspace.entity.type': [{
|
||||
'value': 'Person'
|
||||
}],
|
||||
'dspace.object.owner': [{
|
||||
'value': 'test person',
|
||||
'language': null,
|
||||
'authority': 'researcher-profile-id',
|
||||
'confidence': 600,
|
||||
'place': 0
|
||||
}],
|
||||
}
|
||||
});
|
||||
|
||||
const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
|
||||
bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
|
||||
metadata: {
|
||||
'dc.title': [{
|
||||
value: 'test person'
|
||||
}],
|
||||
'dspace.entity.type': [{
|
||||
'value': 'Person'
|
||||
}],
|
||||
'dspace.object.owner': [{
|
||||
'value': 'test person',
|
||||
'language': null,
|
||||
'authority': 'researcher-profile-id',
|
||||
'confidence': 600,
|
||||
'place': 0
|
||||
}],
|
||||
'dspace.orcid.authenticated': [{
|
||||
'value': '2022-06-10T15:15:12.952872',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 0
|
||||
}],
|
||||
'dspace.orcid.scope': [{
|
||||
'value': '/authenticate',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 0
|
||||
}, {
|
||||
'value': '/read-limited',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 1
|
||||
}, {
|
||||
'value': '/activities/update',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 2
|
||||
}, {
|
||||
'value': '/person/update',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 3
|
||||
}],
|
||||
'person.identifier.orcid': [{
|
||||
'value': 'orcid-id',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 0
|
||||
}]
|
||||
}
|
||||
});
|
||||
|
||||
const disconnectionAllowAdmin = {
|
||||
uuid: 'orcid.disconnection.allowed-users',
|
||||
name: 'orcid.disconnection.allowed-users',
|
||||
values: ['only_admin']
|
||||
} as ConfigurationProperty;
|
||||
|
||||
const disconnectionAllowAdminOwner = {
|
||||
uuid: 'orcid.disconnection.allowed-users',
|
||||
name: 'orcid.disconnection.allowed-users',
|
||||
values: ['admin_and_owner']
|
||||
} as ConfigurationProperty;
|
||||
|
||||
const authorizeUrl = {
|
||||
uuid: 'orcid.authorize-url',
|
||||
name: 'orcid.authorize-url',
|
||||
values: ['orcid.authorize-url']
|
||||
} as ConfigurationProperty;
|
||||
const appClientId = {
|
||||
uuid: 'orcid.application-client-id',
|
||||
name: 'orcid.application-client-id',
|
||||
values: ['orcid.application-client-id']
|
||||
} as ConfigurationProperty;
|
||||
const orcidScope = {
|
||||
uuid: 'orcid.scope',
|
||||
name: 'orcid.scope',
|
||||
values: ['/authenticate', '/read-limited']
|
||||
} as ConfigurationProperty;
|
||||
|
||||
beforeEach(() => {
|
||||
scheduler = getTestScheduler();
|
||||
routerStub = new RouterMock();
|
||||
researcherProfileService = jasmine.createSpyObj('ResearcherProfileService', {
|
||||
findById: jasmine.createSpy('findById'),
|
||||
updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations')
|
||||
});
|
||||
configurationDataService = jasmine.createSpyObj('configurationDataService', {
|
||||
findByPropertyName: jasmine.createSpy('findByPropertyName')
|
||||
});
|
||||
nativeWindowService = new NativeWindowRefMock();
|
||||
|
||||
service = new OrcidAuthService(
|
||||
nativeWindowService,
|
||||
configurationDataService,
|
||||
researcherProfileService,
|
||||
routerStub);
|
||||
|
||||
serviceAsAny = service;
|
||||
});
|
||||
|
||||
|
||||
describe('isLinkedToOrcid', () => {
|
||||
it('should return true when item has metadata', () => {
|
||||
const result = service.isLinkedToOrcid(mockItemLinkedToOrcid);
|
||||
expect(result).toBeTrue();
|
||||
});
|
||||
|
||||
it('should return true when item has no metadata', () => {
|
||||
const result = service.isLinkedToOrcid(mockItemUnlinkedToOrcid);
|
||||
expect(result).toBeFalse();
|
||||
});
|
||||
});
|
||||
|
||||
describe('onlyAdminCanDisconnectProfileFromOrcid', () => {
|
||||
it('should return true when property is only_admin', () => {
|
||||
spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdmin));
|
||||
const result = service.onlyAdminCanDisconnectProfileFromOrcid();
|
||||
const expected = cold('(a|)', {
|
||||
a: true
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
|
||||
it('should return false on faild', () => {
|
||||
spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
|
||||
const result = service.onlyAdminCanDisconnectProfileFromOrcid();
|
||||
const expected = cold('(a|)', {
|
||||
a: false
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('ownerCanDisconnectProfileFromOrcid', () => {
|
||||
it('should return true when property is admin_and_owner', () => {
|
||||
spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdminOwner));
|
||||
const result = service.ownerCanDisconnectProfileFromOrcid();
|
||||
const expected = cold('(a|)', {
|
||||
a: true
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
|
||||
it('should return false on faild', () => {
|
||||
spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
|
||||
const result = service.ownerCanDisconnectProfileFromOrcid();
|
||||
const expected = cold('(a|)', {
|
||||
a: false
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('linkOrcidByItem', () => {
|
||||
beforeEach(() => {
|
||||
scheduler = getTestScheduler();
|
||||
researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
researcherProfileService.findById.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
|
||||
});
|
||||
|
||||
it('should call updateByOrcidOperations method properly', () => {
|
||||
const operations: AddOperation<string>[] = [{
|
||||
path: '/orcid',
|
||||
op: 'add',
|
||||
value: 'test-code'
|
||||
}];
|
||||
|
||||
scheduler.schedule(() => service.linkOrcidByItem(mockItemUnlinkedToOrcid, 'test-code').subscribe());
|
||||
scheduler.flush();
|
||||
|
||||
expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(researcherProfile, operations);
|
||||
});
|
||||
});
|
||||
|
||||
describe('unlinkOrcidByItem', () => {
|
||||
beforeEach(() => {
|
||||
scheduler = getTestScheduler();
|
||||
researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
researcherProfileService.findById.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
|
||||
});
|
||||
|
||||
it('should call updateByOrcidOperations method properly', () => {
|
||||
const operations: RemoveOperation[] = [{
|
||||
path: '/orcid',
|
||||
op: 'remove'
|
||||
}];
|
||||
|
||||
scheduler.schedule(() => service.unlinkOrcidByItem(mockItemLinkedToOrcid).subscribe());
|
||||
scheduler.flush();
|
||||
|
||||
expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(researcherProfile, operations);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getOrcidAuthorizeUrl', () => {
|
||||
beforeEach(() => {
|
||||
routerStub.setRoute('/entities/person/uuid/orcid');
|
||||
(service as any).configurationService.findByPropertyName.and.returnValues(
|
||||
createSuccessfulRemoteDataObject$(authorizeUrl),
|
||||
createSuccessfulRemoteDataObject$(appClientId),
|
||||
createSuccessfulRemoteDataObject$(orcidScope)
|
||||
);
|
||||
});
|
||||
|
||||
it('should build the url properly', () => {
|
||||
const result = service.getOrcidAuthorizeUrl(mockItemUnlinkedToOrcid);
|
||||
const redirectUri: string = new URLCombiner(nativeWindowService.nativeWindow.origin, encodeURIComponent(routerStub.url.split('?')[0])).toString();
|
||||
const url = 'orcid.authorize-url?client_id=orcid.application-client-id&redirect_uri=' + redirectUri + '&response_type=code&scope=/authenticate /read-limited';
|
||||
|
||||
const expected = cold('(a|)', {
|
||||
a: url
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getOrcidAuthorizationScopesByItem', () => {
|
||||
it('should return list of scopes saved in the item', () => {
|
||||
const orcidScopes = [
|
||||
'/authenticate',
|
||||
'/read-limited',
|
||||
'/activities/update',
|
||||
'/person/update'
|
||||
];
|
||||
const result = service.getOrcidAuthorizationScopesByItem(mockItemLinkedToOrcid);
|
||||
expect(result).toEqual(orcidScopes);
|
||||
});
|
||||
});
|
||||
|
||||
describe('getOrcidAuthorizationScopes', () => {
|
||||
it('should return list of scopes by configuration', () => {
|
||||
(service as any).configurationService.findByPropertyName.and.returnValue(
|
||||
createSuccessfulRemoteDataObject$(orcidScope)
|
||||
);
|
||||
const orcidScopes = [
|
||||
'/authenticate',
|
||||
'/read-limited'
|
||||
];
|
||||
const expected = cold('(a|)', {
|
||||
a: orcidScopes
|
||||
});
|
||||
const result = service.getOrcidAuthorizationScopes();
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
});
|
||||
145
src/app/core/orcid/orcid-auth.service.ts
Normal file
145
src/app/core/orcid/orcid-auth.service.ts
Normal file
@@ -0,0 +1,145 @@
|
||||
import { Inject, Injectable } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
import { combineLatest, Observable } from 'rxjs';
|
||||
import { map, switchMap } from 'rxjs/operators';
|
||||
import { AddOperation, RemoveOperation } from 'fast-json-patch';
|
||||
|
||||
import { ResearcherProfileService } from '../profile/researcher-profile.service';
|
||||
import { Item } from '../shared/item.model';
|
||||
import { isNotEmpty } from '../../shared/empty.util';
|
||||
import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
|
||||
import { RemoteData } from '../data/remote-data';
|
||||
import { ConfigurationProperty } from '../shared/configuration-property.model';
|
||||
import { ConfigurationDataService } from '../data/configuration-data.service';
|
||||
import { ResearcherProfile } from '../profile/model/researcher-profile.model';
|
||||
import { URLCombiner } from '../url-combiner/url-combiner';
|
||||
import { NativeWindowRef, NativeWindowService } from '../services/window.service';
|
||||
|
||||
@Injectable()
|
||||
export class OrcidAuthService {
|
||||
|
||||
constructor(
|
||||
@Inject(NativeWindowService) protected _window: NativeWindowRef,
|
||||
private configurationService: ConfigurationDataService,
|
||||
private researcherProfileService: ResearcherProfileService,
|
||||
private router: Router) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the given item is linked to an ORCID profile.
|
||||
*
|
||||
* @param item the item to check
|
||||
* @returns the check result
|
||||
*/
|
||||
public isLinkedToOrcid(item: Item): boolean {
|
||||
return item.hasMetadata('dspace.orcid.authenticated');
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if only the admin users can disconnect a researcher profile from ORCID.
|
||||
*
|
||||
* @returns the check result
|
||||
*/
|
||||
public onlyAdminCanDisconnectProfileFromOrcid(): Observable<boolean> {
|
||||
return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
|
||||
map((propertyRD: RemoteData<ConfigurationProperty>) => {
|
||||
return propertyRD.hasSucceeded && propertyRD.payload.values.map((value) => value.toLowerCase()).includes('only_admin');
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the profile's owner can disconnect that profile from ORCID.
|
||||
*
|
||||
* @returns the check result
|
||||
*/
|
||||
public ownerCanDisconnectProfileFromOrcid(): Observable<boolean> {
|
||||
return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
|
||||
map((propertyRD: RemoteData<ConfigurationProperty>) => {
|
||||
return propertyRD.hasSucceeded && propertyRD.payload.values.map( (value) => value.toLowerCase()).includes('admin_and_owner');
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform a link operation to ORCID profile.
|
||||
*
|
||||
* @param person The person item related to the researcher profile
|
||||
* @param code The auth-code received from orcid
|
||||
*/
|
||||
public linkOrcidByItem(person: Item, code: string): Observable<RemoteData<ResearcherProfile>> {
|
||||
const operations: AddOperation<string>[] = [{
|
||||
path: '/orcid',
|
||||
op: 'add',
|
||||
value: code
|
||||
}];
|
||||
|
||||
return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
|
||||
getFirstCompletedRemoteData(),
|
||||
switchMap((profileRD) => this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform unlink operation from ORCID profile.
|
||||
*
|
||||
* @param person The person item related to the researcher profile
|
||||
*/
|
||||
public unlinkOrcidByItem(person: Item): Observable<RemoteData<ResearcherProfile>> {
|
||||
const operations: RemoveOperation[] = [{
|
||||
path:'/orcid',
|
||||
op:'remove'
|
||||
}];
|
||||
|
||||
return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
|
||||
getFirstCompletedRemoteData(),
|
||||
switchMap((profileRD) => this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Build and return the url to authenticate with orcid
|
||||
*
|
||||
* @param profile
|
||||
*/
|
||||
public getOrcidAuthorizeUrl(profile: Item): Observable<string> {
|
||||
return combineLatest([
|
||||
this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
|
||||
this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
|
||||
this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
|
||||
).pipe(
|
||||
map(([authorizeUrl, clientId, scopes]) => {
|
||||
const redirectUri = new URLCombiner(this._window.nativeWindow.origin, encodeURIComponent(this.router.url.split('?')[0]));
|
||||
console.log(redirectUri.toString());
|
||||
return authorizeUrl.values[0] + '?client_id=' + clientId.values[0] + '&redirect_uri=' + redirectUri + '&response_type=code&scope='
|
||||
+ scopes.values.join(' ');
|
||||
}));
|
||||
}
|
||||
|
||||
/**
|
||||
* Return all orcid authorization scopes saved in the given item
|
||||
*
|
||||
* @param item
|
||||
*/
|
||||
public getOrcidAuthorizationScopesByItem(item: Item): string[] {
|
||||
return isNotEmpty(item) ? item.allMetadataValues('dspace.orcid.scope') : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Return all orcid authorization scopes available by configuration
|
||||
*/
|
||||
public getOrcidAuthorizationScopes(): Observable<string[]> {
|
||||
return this.configurationService.findByPropertyName('orcid.scope').pipe(
|
||||
getFirstCompletedRemoteData(),
|
||||
map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
|
||||
);
|
||||
}
|
||||
|
||||
private getOrcidDisconnectionAllowedUsersConfiguration(): Observable<RemoteData<ConfigurationProperty>> {
|
||||
return this.configurationService.findByPropertyName('orcid.disconnection.allowed-users').pipe(
|
||||
getFirstCompletedRemoteData()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
126
src/app/core/orcid/orcid-history-data.service.ts
Normal file
126
src/app/core/orcid/orcid-history-data.service.ts
Normal file
@@ -0,0 +1,126 @@
|
||||
// eslint-disable-next-line max-classes-per-file
|
||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Store } from '@ngrx/store';
|
||||
import { Observable } from 'rxjs';
|
||||
import { map, switchMap } from 'rxjs/operators';
|
||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||
import { dataService } from '../cache/builders/build-decorators';
|
||||
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
||||
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||
import { DataService } from '../data/data.service';
|
||||
import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
|
||||
import { ItemDataService } from '../data/item-data.service';
|
||||
import { RemoteData } from '../data/remote-data';
|
||||
import { PostRequest } from '../data/request.models';
|
||||
import { RequestService } from '../data/request.service';
|
||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||
import { OrcidHistory } from './model/orcid-history.model';
|
||||
import { ORCID_HISTORY } from './model/orcid-history.resource-type';
|
||||
import { OrcidQueue } from './model/orcid-queue.model';
|
||||
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
|
||||
import { CoreState } from '../core-state.model';
|
||||
import { RestRequest } from '../data/rest-request.model';
|
||||
import { sendRequest } from '../shared/request.operators';
|
||||
import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
|
||||
import { FindListOptions } from '../data/find-list-options.model';
|
||||
import { PaginatedList } from '../data/paginated-list.model';
|
||||
|
||||
/**
|
||||
* A private DataService implementation to delegate specific methods to.
|
||||
*/
|
||||
class OrcidHistoryServiceImpl extends DataService<OrcidHistory> {
|
||||
public linkPath = 'orcidhistories';
|
||||
|
||||
constructor(
|
||||
protected requestService: RequestService,
|
||||
protected rdbService: RemoteDataBuildService,
|
||||
protected store: Store<CoreState>,
|
||||
protected objectCache: ObjectCacheService,
|
||||
protected halService: HALEndpointService,
|
||||
protected notificationsService: NotificationsService,
|
||||
protected http: HttpClient,
|
||||
protected comparator: DefaultChangeAnalyzer<OrcidHistory>) {
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* A service that provides methods to make REST requests with Orcid History endpoint.
|
||||
*/
|
||||
@Injectable()
|
||||
@dataService(ORCID_HISTORY)
|
||||
export class OrcidHistoryDataService {
|
||||
|
||||
dataService: OrcidHistoryServiceImpl;
|
||||
|
||||
responseMsToLive: number = 10 * 1000;
|
||||
|
||||
constructor(
|
||||
protected requestService: RequestService,
|
||||
protected rdbService: RemoteDataBuildService,
|
||||
protected store: Store<CoreState>,
|
||||
protected objectCache: ObjectCacheService,
|
||||
protected halService: HALEndpointService,
|
||||
protected notificationsService: NotificationsService,
|
||||
protected http: HttpClient,
|
||||
protected comparator: DefaultChangeAnalyzer<OrcidHistory>,
|
||||
protected itemService: ItemDataService ) {
|
||||
|
||||
this.dataService = new OrcidHistoryServiceImpl(requestService, rdbService, store, objectCache, halService,
|
||||
notificationsService, http, comparator);
|
||||
|
||||
}
|
||||
|
||||
sendToORCID(orcidQueue: OrcidQueue): Observable<RemoteData<OrcidHistory>> {
|
||||
const requestId = this.requestService.generateRequestId();
|
||||
return this.getEndpoint().pipe(
|
||||
map((endpointURL: string) => {
|
||||
const options: HttpOptions = Object.create({});
|
||||
let headers = new HttpHeaders();
|
||||
headers = headers.append('Content-Type', 'text/uri-list');
|
||||
options.headers = headers;
|
||||
return new PostRequest(requestId, endpointURL, orcidQueue._links.self.href, options);
|
||||
}),
|
||||
sendRequest(this.requestService),
|
||||
switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid) as Observable<RemoteData<OrcidHistory>>)
|
||||
);
|
||||
}
|
||||
|
||||
getEndpoint(): Observable<string> {
|
||||
return this.halService.getEndpoint(this.dataService.linkPath);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
|
||||
* {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
|
||||
* @param id ID of object we want to retrieve
|
||||
* @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
|
||||
* no valid cached version. Defaults to true
|
||||
* @param reRequestOnStale Whether or not the request should automatically be re-
|
||||
* requested after the response becomes stale
|
||||
* @param linksToFollow List of {@link FollowLinkConfig} that indicate which
|
||||
* {@link HALLink}s should be automatically resolved
|
||||
*/
|
||||
findById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<OrcidHistory>[]): Observable<RemoteData<OrcidHistory>> {
|
||||
return this.dataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a list of observables of {@link RemoteData} of {@link OrcidHistory}s, based on an href, with a list of {@link FollowLinkConfig},
|
||||
* to automatically resolve {@link HALLink}s of the {@link OrcidHistory}
|
||||
* @param href The url of object we want to retrieve
|
||||
* @param findListOptions Find list options object
|
||||
* @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
|
||||
* no valid cached version. Defaults to true
|
||||
* @param reRequestOnStale Whether or not the request should automatically be re-
|
||||
* requested after the response becomes stale
|
||||
* @param linksToFollow List of {@link FollowLinkConfig} that indicate which
|
||||
* {@link HALLink}s should be automatically resolved
|
||||
*/
|
||||
findAllByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<OrcidHistory>[]): Observable<RemoteData<PaginatedList<OrcidHistory>>> {
|
||||
return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
|
||||
}
|
||||
|
||||
}
|
||||
110
src/app/core/orcid/orcid-queue.service.ts
Normal file
110
src/app/core/orcid/orcid-queue.service.ts
Normal file
@@ -0,0 +1,110 @@
|
||||
// eslint-disable-next-line max-classes-per-file
|
||||
import { DataService } from '../data/data.service';
|
||||
import { OrcidQueue } from './model/orcid-queue.model';
|
||||
import { RequestService } from '../data/request.service';
|
||||
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
||||
import { Store } from '@ngrx/store';
|
||||
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { dataService } from '../cache/builders/build-decorators';
|
||||
import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
|
||||
import { ItemDataService } from '../data/item-data.service';
|
||||
import { Observable } from 'rxjs';
|
||||
import { RemoteData } from '../data/remote-data';
|
||||
import { PaginatedList } from '../data/paginated-list.model';
|
||||
import { RequestParam } from '../cache/models/request-param.model';
|
||||
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||
import { NoContent } from '../shared/NoContent.model';
|
||||
import { ConfigurationDataService } from '../data/configuration-data.service';
|
||||
import { Router } from '@angular/router';
|
||||
import { CoreState } from '../core-state.model';
|
||||
|
||||
/**
|
||||
* A private DataService implementation to delegate specific methods to.
|
||||
*/
|
||||
class OrcidQueueServiceImpl extends DataService<OrcidQueue> {
|
||||
public linkPath = 'orcidqueues';
|
||||
|
||||
constructor(
|
||||
protected requestService: RequestService,
|
||||
protected rdbService: RemoteDataBuildService,
|
||||
protected store: Store<CoreState>,
|
||||
protected objectCache: ObjectCacheService,
|
||||
protected halService: HALEndpointService,
|
||||
protected notificationsService: NotificationsService,
|
||||
protected http: HttpClient,
|
||||
protected comparator: DefaultChangeAnalyzer<OrcidQueue>) {
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* A service that provides methods to make REST requests with Orcid Queue endpoint.
|
||||
*/
|
||||
@Injectable()
|
||||
@dataService(ORCID_QUEUE)
|
||||
export class OrcidQueueService {
|
||||
|
||||
dataService: OrcidQueueServiceImpl;
|
||||
|
||||
responseMsToLive: number = 10 * 1000;
|
||||
|
||||
constructor(
|
||||
protected requestService: RequestService,
|
||||
protected rdbService: RemoteDataBuildService,
|
||||
protected store: Store<CoreState>,
|
||||
protected objectCache: ObjectCacheService,
|
||||
protected halService: HALEndpointService,
|
||||
protected notificationsService: NotificationsService,
|
||||
protected http: HttpClient,
|
||||
protected comparator: DefaultChangeAnalyzer<OrcidQueue>,
|
||||
protected configurationService: ConfigurationDataService,
|
||||
protected router: Router,
|
||||
protected itemService: ItemDataService ) {
|
||||
|
||||
this.dataService = new OrcidQueueServiceImpl(requestService, rdbService, store, objectCache, halService,
|
||||
notificationsService, http, comparator);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @param itemId It represent an Id of profileItem
|
||||
* @param paginationOptions The pagination options object
|
||||
* @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
|
||||
* no valid cached version. Defaults to true
|
||||
* @param reRequestOnStale Whether or not the request should automatically be re-
|
||||
* requested after the response becomes stale
|
||||
* @returns { OrcidQueue }
|
||||
*/
|
||||
searchByProfileItemId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
|
||||
return this.dataService.searchBy('findByProfileItem', {
|
||||
searchParams: [new RequestParam('profileItemId', itemId)],
|
||||
elementsPerPage: paginationOptions.pageSize,
|
||||
currentPage: paginationOptions.currentPage
|
||||
},
|
||||
useCachedVersionIfAvailable,
|
||||
reRequestOnStale
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param orcidQueueId represents a id of orcid queue
|
||||
* @returns { NoContent }
|
||||
*/
|
||||
deleteById(orcidQueueId: number): Observable<RemoteData<NoContent>> {
|
||||
return this.dataService.delete(orcidQueueId.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* This method will set linkPath to stale
|
||||
*/
|
||||
clearFindByProfileItemRequests() {
|
||||
this.requestService.setStaleByHrefSubstring(this.dataService.linkPath + '/search/findByProfileItem');
|
||||
}
|
||||
|
||||
}
|
||||
@@ -12,7 +12,7 @@ describe('PaginationService', () => {
|
||||
let routeService;
|
||||
|
||||
const defaultPagination = new PaginationComponentOptions();
|
||||
const defaultSort = new SortOptions('id', SortDirection.DESC);
|
||||
const defaultSort = new SortOptions('dc.title', SortDirection.ASC);
|
||||
const defaultFindListOptions = new FindListOptions();
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -39,7 +39,6 @@ describe('PaginationService', () => {
|
||||
service = new PaginationService(routeService, router);
|
||||
});
|
||||
|
||||
|
||||
describe('getCurrentPagination', () => {
|
||||
it('should retrieve the current pagination info from the routerService', () => {
|
||||
service.getCurrentPagination('test-id', defaultPagination).subscribe((currentPagination) => {
|
||||
@@ -56,6 +55,26 @@ describe('PaginationService', () => {
|
||||
expect(currentSort).toEqual(Object.assign(new SortOptions('score', SortDirection.ASC )));
|
||||
});
|
||||
});
|
||||
it('should return default sort when no sort specified', () => {
|
||||
// This is same as routeService (defined above), but returns no sort field or direction
|
||||
routeService = {
|
||||
getQueryParameterValue: (param) => {
|
||||
let value;
|
||||
if (param.endsWith('.page')) {
|
||||
value = 5;
|
||||
}
|
||||
if (param.endsWith('.rpp')) {
|
||||
value = 10;
|
||||
}
|
||||
return observableOf(value);
|
||||
}
|
||||
};
|
||||
service = new PaginationService(routeService, router);
|
||||
|
||||
service.getCurrentSort('test-id', defaultSort).subscribe((currentSort) => {
|
||||
expect(currentSort).toEqual(defaultSort);
|
||||
});
|
||||
});
|
||||
});
|
||||
describe('getFindListOptions', () => {
|
||||
it('should retrieve the current findListOptions info from the routerService', () => {
|
||||
|
||||
@@ -24,7 +24,11 @@ import { isNumeric } from '../../shared/numeric.util';
|
||||
*/
|
||||
export class PaginationService {
|
||||
|
||||
private defaultSortOptions = new SortOptions('id', SortDirection.ASC);
|
||||
/**
|
||||
* Sort on title ASC by default
|
||||
* @type {SortOptions}
|
||||
*/
|
||||
private defaultSortOptions = new SortOptions('dc.title', SortDirection.ASC);
|
||||
|
||||
private clearParams = {};
|
||||
|
||||
|
||||
61
src/app/core/profile/model/researcher-profile.model.ts
Normal file
61
src/app/core/profile/model/researcher-profile.model.ts
Normal file
@@ -0,0 +1,61 @@
|
||||
import { Observable } from 'rxjs';
|
||||
import { autoserialize, deserialize, deserializeAs } from 'cerialize';
|
||||
|
||||
import { link, typedObject } from '../../cache/builders/build-decorators';
|
||||
import { HALLink } from '../../shared/hal-link.model';
|
||||
import { ResourceType } from '../../shared/resource-type';
|
||||
import { excludeFromEquals } from '../../utilities/equals.decorators';
|
||||
import { RESEARCHER_PROFILE } from './researcher-profile.resource-type';
|
||||
import { CacheableObject } from '../../cache/cacheable-object.model';
|
||||
import { RemoteData } from '../../data/remote-data';
|
||||
import { ITEM } from '../../shared/item.resource-type';
|
||||
import { Item } from '../../shared/item.model';
|
||||
|
||||
/**
|
||||
* Class the represents a Researcher Profile.
|
||||
*/
|
||||
@typedObject
|
||||
export class ResearcherProfile extends CacheableObject {
|
||||
|
||||
static type = RESEARCHER_PROFILE;
|
||||
|
||||
/**
|
||||
* The object type
|
||||
*/
|
||||
@excludeFromEquals
|
||||
@autoserialize
|
||||
type: ResourceType;
|
||||
|
||||
/**
|
||||
* The identifier of this Researcher Profile
|
||||
*/
|
||||
@autoserialize
|
||||
id: string;
|
||||
|
||||
@deserializeAs('id')
|
||||
uuid: string;
|
||||
|
||||
/**
|
||||
* The visibility of this Researcher Profile
|
||||
*/
|
||||
@autoserialize
|
||||
visible: boolean;
|
||||
|
||||
/**
|
||||
* The {@link HALLink}s for this Researcher Profile
|
||||
*/
|
||||
@deserialize
|
||||
_links: {
|
||||
self: HALLink,
|
||||
item: HALLink,
|
||||
eperson: HALLink
|
||||
};
|
||||
|
||||
/**
|
||||
* The related person Item
|
||||
* Will be undefined unless the item {@link HALLink} has been resolved.
|
||||
*/
|
||||
@link(ITEM)
|
||||
item?: Observable<RemoteData<Item>>;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import { ResourceType } from '../../shared/resource-type';
|
||||
|
||||
/**
|
||||
* The resource type for ResearcherProfile
|
||||
*
|
||||
* Needs to be in a separate file to prevent circular
|
||||
* dependencies in webpack.
|
||||
*/
|
||||
export const RESEARCHER_PROFILE = new ResourceType('profile');
|
||||
419
src/app/core/profile/researcher-profile.service.spec.ts
Normal file
419
src/app/core/profile/researcher-profile.service.spec.ts
Normal file
@@ -0,0 +1,419 @@
|
||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||
|
||||
import { cold, getTestScheduler, hot } from 'jasmine-marbles';
|
||||
import { of as observableOf } from 'rxjs';
|
||||
import { TestScheduler } from 'rxjs/testing';
|
||||
|
||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
||||
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||
import { RequestService } from '../data/request.service';
|
||||
import { PageInfo } from '../shared/page-info.model';
|
||||
import { buildPaginatedList } from '../data/paginated-list.model';
|
||||
import {
|
||||
createNoContentRemoteDataObject$,
|
||||
createSuccessfulRemoteDataObject,
|
||||
createSuccessfulRemoteDataObject$
|
||||
} from '../../shared/remote-data.utils';
|
||||
import { RestResponse } from '../cache/response.models';
|
||||
import { RequestEntry } from '../data/request-entry.model';
|
||||
import { ResearcherProfileService } from './researcher-profile.service';
|
||||
import { RouterMock } from '../../shared/mocks/router.mock';
|
||||
import { ResearcherProfile } from './model/researcher-profile.model';
|
||||
import { Item } from '../shared/item.model';
|
||||
import { ReplaceOperation } from 'fast-json-patch';
|
||||
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
|
||||
import { PostRequest } from '../data/request.models';
|
||||
import { followLink } from '../../shared/utils/follow-link-config.model';
|
||||
import { ConfigurationProperty } from '../shared/configuration-property.model';
|
||||
import { createPaginatedList } from '../../shared/testing/utils.test';
|
||||
|
||||
describe('ResearcherProfileService', () => {
|
||||
let scheduler: TestScheduler;
|
||||
let service: ResearcherProfileService;
|
||||
let serviceAsAny: any;
|
||||
let requestService: RequestService;
|
||||
let rdbService: RemoteDataBuildService;
|
||||
let objectCache: ObjectCacheService;
|
||||
let halService: HALEndpointService;
|
||||
let responseCacheEntry: RequestEntry;
|
||||
let routerStub: any;
|
||||
|
||||
const researcherProfileId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
|
||||
const itemId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
|
||||
const researcherProfileItem: Item = Object.assign(new Item(), {
|
||||
id: itemId,
|
||||
_links: {
|
||||
self: {
|
||||
href: `https://rest.api/rest/api/items/${itemId}`
|
||||
},
|
||||
}
|
||||
});
|
||||
const researcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
|
||||
id: researcherProfileId,
|
||||
visible: false,
|
||||
type: 'profile',
|
||||
_links: {
|
||||
item: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
|
||||
},
|
||||
self: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
|
||||
id: researcherProfileId,
|
||||
visible: true,
|
||||
type: 'profile',
|
||||
_links: {
|
||||
item: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
|
||||
},
|
||||
self: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const researcherProfileId2 = 'agbf9946-f4ce-479e-8f11-b90cbe9f7241';
|
||||
const anotherResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
|
||||
id: researcherProfileId2,
|
||||
visible: false,
|
||||
type: 'profile',
|
||||
_links: {
|
||||
self: {
|
||||
href: `https://rest.api/rest/api/profiles/${researcherProfileId2}`
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
|
||||
id: 'mockItemUnlinkedToOrcid',
|
||||
bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
|
||||
metadata: {
|
||||
'dc.title': [{
|
||||
value: 'test person'
|
||||
}],
|
||||
'dspace.entity.type': [{
|
||||
'value': 'Person'
|
||||
}],
|
||||
'dspace.object.owner': [{
|
||||
'value': 'test person',
|
||||
'language': null,
|
||||
'authority': 'researcher-profile-id',
|
||||
'confidence': 600,
|
||||
'place': 0
|
||||
}],
|
||||
}
|
||||
});
|
||||
|
||||
const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
|
||||
bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
|
||||
metadata: {
|
||||
'dc.title': [{
|
||||
value: 'test person'
|
||||
}],
|
||||
'dspace.entity.type': [{
|
||||
'value': 'Person'
|
||||
}],
|
||||
'dspace.object.owner': [{
|
||||
'value': 'test person',
|
||||
'language': null,
|
||||
'authority': 'researcher-profile-id',
|
||||
'confidence': 600,
|
||||
'place': 0
|
||||
}],
|
||||
'dspace.orcid.authenticated': [{
|
||||
'value': '2022-06-10T15:15:12.952872',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 0
|
||||
}],
|
||||
'dspace.orcid.scope': [{
|
||||
'value': '/authenticate',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 0
|
||||
}, {
|
||||
'value': '/read-limited',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 1
|
||||
}, {
|
||||
'value': '/activities/update',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 2
|
||||
}, {
|
||||
'value': '/person/update',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 3
|
||||
}],
|
||||
'person.identifier.orcid': [{
|
||||
'value': 'orcid-id',
|
||||
'language': null,
|
||||
'authority': null,
|
||||
'confidence': -1,
|
||||
'place': 0
|
||||
}]
|
||||
}
|
||||
});
|
||||
|
||||
const disconnectionAllowAdmin = {
|
||||
uuid: 'orcid.disconnection.allowed-users',
|
||||
name: 'orcid.disconnection.allowed-users',
|
||||
values: ['only_admin']
|
||||
} as ConfigurationProperty;
|
||||
|
||||
const disconnectionAllowAdminOwner = {
|
||||
uuid: 'orcid.disconnection.allowed-users',
|
||||
name: 'orcid.disconnection.allowed-users',
|
||||
values: ['admin_and_owner']
|
||||
} as ConfigurationProperty;
|
||||
|
||||
const authorizeUrl = {
|
||||
uuid: 'orcid.authorize-url',
|
||||
name: 'orcid.authorize-url',
|
||||
values: ['orcid.authorize-url']
|
||||
} as ConfigurationProperty;
|
||||
const appClientId = {
|
||||
uuid: 'orcid.application-client-id',
|
||||
name: 'orcid.application-client-id',
|
||||
values: ['orcid.application-client-id']
|
||||
} as ConfigurationProperty;
|
||||
const orcidScope = {
|
||||
uuid: 'orcid.scope',
|
||||
name: 'orcid.scope',
|
||||
values: ['/authenticate', '/read-limited']
|
||||
} as ConfigurationProperty;
|
||||
|
||||
const endpointURL = `https://rest.api/rest/api/profiles`;
|
||||
const endpointURLWithEmbed = 'https://rest.api/rest/api/profiles?embed=item';
|
||||
const sourceUri = `https://rest.api/rest/api/external-source/profile`;
|
||||
const requestURL = `https://rest.api/rest/api/profiles/${researcherProfileId}`;
|
||||
const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
|
||||
|
||||
const pageInfo = new PageInfo();
|
||||
const array = [researcherProfile, anotherResearcherProfile];
|
||||
const paginatedList = buildPaginatedList(pageInfo, array);
|
||||
const researcherProfileRD = createSuccessfulRemoteDataObject(researcherProfile);
|
||||
const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
|
||||
|
||||
beforeEach(() => {
|
||||
scheduler = getTestScheduler();
|
||||
|
||||
halService = jasmine.createSpyObj('halService', {
|
||||
getEndpoint: cold('a', { a: endpointURL })
|
||||
});
|
||||
|
||||
responseCacheEntry = new RequestEntry();
|
||||
responseCacheEntry.request = { href: 'https://rest.api/' } as any;
|
||||
responseCacheEntry.response = new RestResponse(true, 200, 'Success');
|
||||
|
||||
requestService = jasmine.createSpyObj('requestService', {
|
||||
generateRequestId: requestUUID,
|
||||
send: true,
|
||||
removeByHrefSubstring: {},
|
||||
getByHref: observableOf(responseCacheEntry),
|
||||
getByUUID: observableOf(responseCacheEntry),
|
||||
setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring')
|
||||
});
|
||||
rdbService = jasmine.createSpyObj('rdbService', {
|
||||
buildSingle: hot('a|', {
|
||||
a: researcherProfileRD
|
||||
}),
|
||||
buildList: hot('a|', {
|
||||
a: paginatedListRD
|
||||
}),
|
||||
buildFromRequestUUID: hot('a|', {
|
||||
a: researcherProfileRD
|
||||
})
|
||||
});
|
||||
objectCache = {} as ObjectCacheService;
|
||||
const notificationsService = {} as NotificationsService;
|
||||
const http = {} as HttpClient;
|
||||
const comparator = {} as any;
|
||||
routerStub = new RouterMock();
|
||||
const itemService = jasmine.createSpyObj('ItemService', {
|
||||
findByHref: jasmine.createSpy('findByHref')
|
||||
});
|
||||
|
||||
service = new ResearcherProfileService(
|
||||
requestService,
|
||||
rdbService,
|
||||
objectCache,
|
||||
halService,
|
||||
notificationsService,
|
||||
http,
|
||||
routerStub,
|
||||
comparator,
|
||||
itemService
|
||||
);
|
||||
serviceAsAny = service;
|
||||
|
||||
spyOn((service as any).dataService, 'create').and.callThrough();
|
||||
spyOn((service as any).dataService, 'delete').and.callThrough();
|
||||
spyOn((service as any).dataService, 'update').and.callThrough();
|
||||
spyOn((service as any).dataService, 'findById').and.callThrough();
|
||||
spyOn((service as any).dataService, 'findByHref').and.callThrough();
|
||||
spyOn((service as any).dataService, 'searchBy').and.callThrough();
|
||||
spyOn((service as any).dataService, 'getLinkPath').and.returnValue(observableOf(endpointURL));
|
||||
|
||||
});
|
||||
|
||||
describe('findById', () => {
|
||||
it('should proxy the call to dataservice.findById with eperson UUID', () => {
|
||||
scheduler.schedule(() => service.findById(researcherProfileId));
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).dataService.findById).toHaveBeenCalledWith(researcherProfileId, true, true);
|
||||
});
|
||||
|
||||
it('should return a ResearcherProfile object with the given id', () => {
|
||||
const result = service.findById(researcherProfileId);
|
||||
const expected = cold('a|', {
|
||||
a: researcherProfileRD
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('create', () => {
|
||||
it('should proxy the call to dataservice.create with eperson UUID', () => {
|
||||
scheduler.schedule(() => service.create());
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).dataService.create).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should return the RemoteData<ResearcherProfile> created', () => {
|
||||
const result = service.create();
|
||||
const expected = cold('a|', {
|
||||
a: researcherProfileRD
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('delete', () => {
|
||||
it('should proxy the call to dataservice.delete', () => {
|
||||
scheduler.schedule(() => service.delete(researcherProfile));
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).dataService.delete).toHaveBeenCalledWith(researcherProfile.id);
|
||||
});
|
||||
});
|
||||
|
||||
describe('findRelatedItemId', () => {
|
||||
describe('with a related item', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
(service as any).itemService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfileItem));
|
||||
});
|
||||
|
||||
it('should proxy the call to dataservice.findById with eperson UUID', () => {
|
||||
scheduler.schedule(() => service.findRelatedItemId(researcherProfile));
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).itemService.findByHref).toHaveBeenCalledWith(researcherProfile._links.item.href, false);
|
||||
});
|
||||
|
||||
it('should return a ResearcherProfile object with the given id', () => {
|
||||
const result = service.findRelatedItemId(researcherProfile);
|
||||
const expected = cold('(a|)', {
|
||||
a: itemId
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
|
||||
describe('without a related item', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
(service as any).itemService.findByHref.and.returnValue(createNoContentRemoteDataObject$());
|
||||
});
|
||||
|
||||
it('should proxy the call to dataservice.findById with eperson UUID', () => {
|
||||
scheduler.schedule(() => service.findRelatedItemId(researcherProfile));
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).itemService.findByHref).toHaveBeenCalledWith(researcherProfile._links.item.href, false);
|
||||
});
|
||||
|
||||
it('should not return a ResearcherProfile object with the given id', () => {
|
||||
const result = service.findRelatedItemId(researcherProfile);
|
||||
const expected = cold('(a|)', {
|
||||
a: null
|
||||
});
|
||||
expect(result).toBeObservable(expected);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('setVisibility', () => {
|
||||
let patchSpy;
|
||||
beforeEach(() => {
|
||||
spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
spyOn((service as any), 'findById').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
});
|
||||
|
||||
it('should proxy the call to dataservice.patch', () => {
|
||||
const replaceOperation: ReplaceOperation<boolean> = {
|
||||
path: '/visible',
|
||||
op: 'replace',
|
||||
value: true
|
||||
};
|
||||
|
||||
scheduler.schedule(() => service.setVisibility(researcherProfile, true));
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, [replaceOperation]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('createFromExternalSource', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
spyOn((service as any), 'findById').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
});
|
||||
|
||||
it('should proxy the call to dataservice.patch', () => {
|
||||
const options: HttpOptions = Object.create({});
|
||||
let headers = new HttpHeaders();
|
||||
headers = headers.append('Content-Type', 'text/uri-list');
|
||||
options.headers = headers;
|
||||
const request = new PostRequest(requestUUID, endpointURLWithEmbed, sourceUri, options);
|
||||
|
||||
scheduler.schedule(() => service.createFromExternalSource(sourceUri));
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).requestService.send).toHaveBeenCalledWith(request);
|
||||
expect((service as any).rdbService.buildFromRequestUUID).toHaveBeenCalledWith(requestUUID, followLink('item'));
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
describe('updateByOrcidOperations', () => {
|
||||
beforeEach(() => {
|
||||
scheduler = getTestScheduler();
|
||||
spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
|
||||
});
|
||||
|
||||
it('should call patch method properly', () => {
|
||||
scheduler.schedule(() => service.updateByOrcidOperations(researcherProfile, []).subscribe());
|
||||
scheduler.flush();
|
||||
|
||||
expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, []);
|
||||
});
|
||||
});
|
||||
});
|
||||
194
src/app/core/profile/researcher-profile.service.ts
Normal file
194
src/app/core/profile/researcher-profile.service.ts
Normal file
@@ -0,0 +1,194 @@
|
||||
/* eslint-disable max-classes-per-file */
|
||||
import { HttpClient, HttpHeaders } from '@angular/common/http';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
|
||||
import { Store } from '@ngrx/store';
|
||||
import { Operation, ReplaceOperation } from 'fast-json-patch';
|
||||
import { Observable } from 'rxjs';
|
||||
import { find, map } from 'rxjs/operators';
|
||||
import { NotificationsService } from '../../shared/notifications/notifications.service';
|
||||
import { dataService } from '../cache/builders/build-decorators';
|
||||
import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
|
||||
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||
import { DataService } from '../data/data.service';
|
||||
import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
|
||||
import { ItemDataService } from '../data/item-data.service';
|
||||
import { RemoteData } from '../data/remote-data';
|
||||
import { RequestService } from '../data/request.service';
|
||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||
import { NoContent } from '../shared/NoContent.model';
|
||||
import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../shared/operators';
|
||||
import { ResearcherProfile } from './model/researcher-profile.model';
|
||||
import { RESEARCHER_PROFILE } from './model/researcher-profile.resource-type';
|
||||
import { HttpOptions } from '../dspace-rest/dspace-rest.service';
|
||||
import { PostRequest } from '../data/request.models';
|
||||
import { hasValue, isEmpty } from '../../shared/empty.util';
|
||||
import { CoreState } from '../core-state.model';
|
||||
import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
|
||||
import { Item } from '../shared/item.model';
|
||||
import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
|
||||
|
||||
/**
|
||||
* A private DataService implementation to delegate specific methods to.
|
||||
*/
|
||||
class ResearcherProfileServiceImpl extends DataService<ResearcherProfile> {
|
||||
protected linkPath = 'profiles';
|
||||
|
||||
constructor(
|
||||
protected requestService: RequestService,
|
||||
protected rdbService: RemoteDataBuildService,
|
||||
protected store: Store<CoreState>,
|
||||
protected objectCache: ObjectCacheService,
|
||||
protected halService: HALEndpointService,
|
||||
protected notificationsService: NotificationsService,
|
||||
protected http: HttpClient,
|
||||
protected comparator: DefaultChangeAnalyzer<ResearcherProfile>) {
|
||||
super();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* A service that provides methods to make REST requests with researcher profile endpoint.
|
||||
*/
|
||||
@Injectable()
|
||||
@dataService(RESEARCHER_PROFILE)
|
||||
export class ResearcherProfileService {
|
||||
|
||||
protected dataService: ResearcherProfileServiceImpl;
|
||||
|
||||
protected responseMsToLive: number = 10 * 1000;
|
||||
|
||||
constructor(
|
||||
protected requestService: RequestService,
|
||||
protected rdbService: RemoteDataBuildService,
|
||||
protected objectCache: ObjectCacheService,
|
||||
protected halService: HALEndpointService,
|
||||
protected notificationsService: NotificationsService,
|
||||
protected http: HttpClient,
|
||||
protected router: Router,
|
||||
protected comparator: DefaultChangeAnalyzer<ResearcherProfile>,
|
||||
protected itemService: ItemDataService) {
|
||||
|
||||
this.dataService = new ResearcherProfileServiceImpl(requestService, rdbService, null, objectCache, halService,
|
||||
notificationsService, http, comparator);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the researcher profile with the given uuid.
|
||||
*
|
||||
* @param uuid the profile uuid
|
||||
* @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
|
||||
* no valid cached version. Defaults to true
|
||||
* @param reRequestOnStale Whether or not the request should automatically be re-
|
||||
* requested after the response becomes stale
|
||||
* @param linksToFollow List of {@link FollowLinkConfig} that indicate which
|
||||
* {@link HALLink}s should be automatically resolved
|
||||
*/
|
||||
public findById(uuid: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ResearcherProfile>[]): Observable<RemoteData<ResearcherProfile>> {
|
||||
return this.dataService.findById(uuid, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
|
||||
getAllCompletedRemoteData(),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new researcher profile for the current user.
|
||||
*/
|
||||
public create(): Observable<RemoteData<ResearcherProfile>> {
|
||||
return this.dataService.create(new ResearcherProfile());
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a researcher profile.
|
||||
*
|
||||
* @param researcherProfile the profile to delete
|
||||
*/
|
||||
public delete(researcherProfile: ResearcherProfile): Observable<boolean> {
|
||||
return this.dataService.delete(researcherProfile.id).pipe(
|
||||
getFirstCompletedRemoteData(),
|
||||
map((response: RemoteData<NoContent>) => response.isSuccess)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find a researcher profile by its own related item
|
||||
*
|
||||
* @param item
|
||||
*/
|
||||
public findByRelatedItem(item: Item): Observable<RemoteData<ResearcherProfile>> {
|
||||
const profileId = item.firstMetadata('dspace.object.owner')?.authority;
|
||||
if (isEmpty(profileId)) {
|
||||
return createFailedRemoteDataObject$();
|
||||
} else {
|
||||
return this.findById(profileId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the item id related to the given researcher profile.
|
||||
*
|
||||
* @param researcherProfile the profile to find for
|
||||
*/
|
||||
public findRelatedItemId(researcherProfile: ResearcherProfile): Observable<string> {
|
||||
const relatedItem$ = researcherProfile.item ? researcherProfile.item : this.itemService.findByHref(researcherProfile._links.item.href, false);
|
||||
return relatedItem$.pipe(
|
||||
getFirstCompletedRemoteData(),
|
||||
map((itemRD: RemoteData<Item>) => (itemRD.hasSucceeded && itemRD.payload) ? itemRD.payload.id : null)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Change the visibility of the given researcher profile setting the given value.
|
||||
*
|
||||
* @param researcherProfile the profile to update
|
||||
* @param visible the visibility value to set
|
||||
*/
|
||||
public setVisibility(researcherProfile: ResearcherProfile, visible: boolean): Observable<RemoteData<ResearcherProfile>> {
|
||||
const replaceOperation: ReplaceOperation<boolean> = {
|
||||
path: '/visible',
|
||||
op: 'replace',
|
||||
value: visible
|
||||
};
|
||||
|
||||
return this.dataService.patch(researcherProfile, [replaceOperation]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a researcher profile starting from an external source URI
|
||||
* @param sourceUri URI of source item of researcher profile.
|
||||
*/
|
||||
public createFromExternalSource(sourceUri: string): Observable<RemoteData<ResearcherProfile>> {
|
||||
const options: HttpOptions = Object.create({});
|
||||
let headers = new HttpHeaders();
|
||||
headers = headers.append('Content-Type', 'text/uri-list');
|
||||
options.headers = headers;
|
||||
|
||||
const requestId = this.requestService.generateRequestId();
|
||||
const href$ = this.halService.getEndpoint(this.dataService.getLinkPath());
|
||||
|
||||
href$.pipe(
|
||||
find((href: string) => hasValue(href)),
|
||||
map((href: string) => this.dataService.buildHrefWithParams(href, [], followLink('item')))
|
||||
).subscribe((endpoint: string) => {
|
||||
const request = new PostRequest(requestId, endpoint, sourceUri, options);
|
||||
this.requestService.send(request);
|
||||
});
|
||||
|
||||
return this.rdbService.buildFromRequestUUID(requestId, followLink('item'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Update researcher profile by patch orcid operation
|
||||
*
|
||||
* @param researcherProfile
|
||||
* @param operations
|
||||
*/
|
||||
public updateByOrcidOperations(researcherProfile: ResearcherProfile, operations: Operation[]): Observable<RemoteData<ResearcherProfile>> {
|
||||
return this.dataService.patch(researcherProfile, operations);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,13 +1,17 @@
|
||||
import { ReloadGuard } from './reload.guard';
|
||||
import { Router } from '@angular/router';
|
||||
import { AppConfig } from '../../../config/app-config.interface';
|
||||
import { DefaultAppConfig } from '../../../config/default-app-config';
|
||||
import { ReloadGuard } from './reload.guard';
|
||||
|
||||
describe('ReloadGuard', () => {
|
||||
let guard: ReloadGuard;
|
||||
let router: Router;
|
||||
let appConfig: AppConfig;
|
||||
|
||||
beforeEach(() => {
|
||||
router = jasmine.createSpyObj('router', ['parseUrl', 'createUrlTree']);
|
||||
guard = new ReloadGuard(router);
|
||||
appConfig = new DefaultAppConfig();
|
||||
guard = new ReloadGuard(router, appConfig);
|
||||
});
|
||||
|
||||
describe('canActivate', () => {
|
||||
@@ -27,7 +31,7 @@ describe('ReloadGuard', () => {
|
||||
|
||||
it('should create a UrlTree with the redirect URL', () => {
|
||||
guard.canActivate(route, undefined);
|
||||
expect(router.parseUrl).toHaveBeenCalledWith(redirectUrl);
|
||||
expect(router.parseUrl).toHaveBeenCalledWith(redirectUrl.substring(1));
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { Inject, Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
|
||||
import { isNotEmpty } from '../../shared/empty.util';
|
||||
|
||||
/**
|
||||
@@ -8,7 +9,10 @@ import { isNotEmpty } from '../../shared/empty.util';
|
||||
*/
|
||||
@Injectable()
|
||||
export class ReloadGuard implements CanActivate {
|
||||
constructor(private router: Router) {
|
||||
constructor(
|
||||
private router: Router,
|
||||
@Inject(APP_CONFIG) private appConfig: AppConfig,
|
||||
) {
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -18,7 +22,10 @@ export class ReloadGuard implements CanActivate {
|
||||
*/
|
||||
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): UrlTree {
|
||||
if (isNotEmpty(route.queryParams.redirect)) {
|
||||
return this.router.parseUrl(route.queryParams.redirect);
|
||||
const url = route.queryParams.redirect.startsWith(this.appConfig.ui.nameSpace)
|
||||
? route.queryParams.redirect.substring(this.appConfig.ui.nameSpace.length)
|
||||
: route.queryParams.redirect;
|
||||
return this.router.parseUrl(url);
|
||||
} else {
|
||||
return this.router.createUrlTree(['home']);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
/**
|
||||
* An interface to represent an access condition.
|
||||
*/
|
||||
export class SherpaPoliciesDetailsObject {
|
||||
|
||||
/**
|
||||
* The sherpa policies error
|
||||
*/
|
||||
error: boolean;
|
||||
|
||||
/**
|
||||
* The sherpa policies journal details
|
||||
*/
|
||||
journals: Journal[];
|
||||
|
||||
/**
|
||||
* The sherpa policies message
|
||||
*/
|
||||
message: string;
|
||||
|
||||
/**
|
||||
* The sherpa policies metadata
|
||||
*/
|
||||
metadata: Metadata;
|
||||
|
||||
}
|
||||
|
||||
|
||||
export interface Metadata {
|
||||
id: number;
|
||||
uri: string;
|
||||
dateCreated: string;
|
||||
dateModified: string;
|
||||
inDOAJ: boolean;
|
||||
publiclyVisible: boolean;
|
||||
}
|
||||
|
||||
|
||||
export interface Journal {
|
||||
titles: string[];
|
||||
url: string;
|
||||
issns: string[];
|
||||
romeoPub: string;
|
||||
zetoPub: string;
|
||||
inDOAJ: boolean;
|
||||
publisher: Publisher;
|
||||
publishers: Publisher[];
|
||||
policies: Policy[];
|
||||
}
|
||||
|
||||
export interface Publisher {
|
||||
name: string;
|
||||
relationshipType: string;
|
||||
country: string;
|
||||
uri: string;
|
||||
identifier: string;
|
||||
paidAccessDescription: string;
|
||||
paidAccessUrl: string;
|
||||
publicationCount: number;
|
||||
}
|
||||
|
||||
export interface Policy {
|
||||
id: number;
|
||||
openAccessPermitted: boolean;
|
||||
uri: string;
|
||||
internalMoniker: string;
|
||||
permittedVersions: PermittedVersions[];
|
||||
urls: any;
|
||||
publicationCount: number;
|
||||
preArchiving: string;
|
||||
postArchiving: string;
|
||||
pubArchiving: string;
|
||||
openAccessProhibited: boolean;
|
||||
}
|
||||
|
||||
export interface PermittedVersions {
|
||||
articleVersion: string;
|
||||
option: number;
|
||||
conditions: string[];
|
||||
prerequisites: string[];
|
||||
locations: string[];
|
||||
licenses: string[];
|
||||
embargo: Embargo;
|
||||
}
|
||||
|
||||
export interface Embargo {
|
||||
units: any;
|
||||
amount: any;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import { SherpaPoliciesDetailsObject } from './sherpa-policies-details.model';
|
||||
|
||||
/**
|
||||
* An interface to represent the submission's item accesses condition.
|
||||
*/
|
||||
export interface WorkspaceitemSectionSherpaPoliciesObject {
|
||||
|
||||
/**
|
||||
* The access condition id
|
||||
*/
|
||||
id: string;
|
||||
|
||||
/**
|
||||
* The sherpa policies retrievalTime
|
||||
*/
|
||||
retrievalTime: string;
|
||||
|
||||
/**
|
||||
* The sherpa policies details
|
||||
*/
|
||||
sherpaResponse: SherpaPoliciesDetailsObject;
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.mod
|
||||
import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
|
||||
import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
|
||||
import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
|
||||
import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
|
||||
|
||||
/**
|
||||
* An interface to represent submission's section object.
|
||||
@@ -21,4 +22,5 @@ export type WorkspaceitemSectionDataType
|
||||
| WorkspaceitemSectionLicenseObject
|
||||
| WorkspaceitemSectionCcLicenseObject
|
||||
| WorkspaceitemSectionAccessesObject
|
||||
| WorkspaceitemSectionSherpaPoliciesObject
|
||||
| string;
|
||||
|
||||
@@ -15,6 +15,7 @@ import { By } from '@angular/platform-browser';
|
||||
import { ConfigurationDataService } from '../core/data/configuration-data.service';
|
||||
import { ConfigurationProperty } from '../core/shared/configuration-property.model';
|
||||
import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
|
||||
import { HandleService } from '../shared/handle.service';
|
||||
|
||||
describe('CurationFormComponent', () => {
|
||||
let comp: CurationFormComponent;
|
||||
@@ -23,6 +24,7 @@ describe('CurationFormComponent', () => {
|
||||
let scriptDataService: ScriptDataService;
|
||||
let processDataService: ProcessDataService;
|
||||
let configurationDataService: ConfigurationDataService;
|
||||
let handleService: HandleService;
|
||||
let notificationsService;
|
||||
let router;
|
||||
|
||||
@@ -51,6 +53,10 @@ describe('CurationFormComponent', () => {
|
||||
}))
|
||||
});
|
||||
|
||||
handleService = {
|
||||
normalizeHandle: (a) => a
|
||||
} as any;
|
||||
|
||||
notificationsService = new NotificationsServiceStub();
|
||||
router = new RouterStub();
|
||||
|
||||
@@ -58,11 +64,12 @@ describe('CurationFormComponent', () => {
|
||||
imports: [TranslateModule.forRoot(), FormsModule, ReactiveFormsModule],
|
||||
declarations: [CurationFormComponent],
|
||||
providers: [
|
||||
{provide: ScriptDataService, useValue: scriptDataService},
|
||||
{provide: ProcessDataService, useValue: processDataService},
|
||||
{provide: NotificationsService, useValue: notificationsService},
|
||||
{provide: Router, useValue: router},
|
||||
{provide: ConfigurationDataService, useValue: configurationDataService},
|
||||
{ provide: ScriptDataService, useValue: scriptDataService },
|
||||
{ provide: ProcessDataService, useValue: processDataService },
|
||||
{ provide: NotificationsService, useValue: notificationsService },
|
||||
{ provide: HandleService, useValue: handleService },
|
||||
{ provide: Router, useValue: router},
|
||||
{ provide: ConfigurationDataService, useValue: configurationDataService },
|
||||
],
|
||||
schemas: [CUSTOM_ELEMENTS_SCHEMA]
|
||||
}).compileComponents();
|
||||
@@ -143,4 +150,13 @@ describe('CurationFormComponent', () => {
|
||||
{name: '-i', value: 'all'},
|
||||
], []);
|
||||
});
|
||||
|
||||
it(`should show an error notification and return when an invalid dsoHandle is provided`, () => {
|
||||
comp.dsoHandle = 'test-handle';
|
||||
spyOn(handleService, 'normalizeHandle').and.returnValue(null);
|
||||
comp.submit();
|
||||
|
||||
expect(notificationsService.error).toHaveBeenCalled();
|
||||
expect(scriptDataService.invoke).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@ import { getFirstCompletedRemoteData } from '../core/shared/operators';
|
||||
import { find, map } from 'rxjs/operators';
|
||||
import { NotificationsService } from '../shared/notifications/notifications.service';
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
import { hasValue, isEmpty, isNotEmpty } from '../shared/empty.util';
|
||||
import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../shared/empty.util';
|
||||
import { RemoteData } from '../core/data/remote-data';
|
||||
import { Router } from '@angular/router';
|
||||
import { ProcessDataService } from '../core/data/processes/process-data.service';
|
||||
@@ -14,9 +14,9 @@ import { ConfigurationDataService } from '../core/data/configuration-data.servic
|
||||
import { ConfigurationProperty } from '../core/shared/configuration-property.model';
|
||||
import { Observable } from 'rxjs';
|
||||
import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
|
||||
import { HandleService } from '../shared/handle.service';
|
||||
|
||||
export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
|
||||
|
||||
/**
|
||||
* Component responsible for rendering the Curation Task form
|
||||
*/
|
||||
@@ -39,6 +39,7 @@ export class CurationFormComponent implements OnInit {
|
||||
private processDataService: ProcessDataService,
|
||||
private notificationsService: NotificationsService,
|
||||
private translateService: TranslateService,
|
||||
private handleService: HandleService,
|
||||
private router: Router
|
||||
) {
|
||||
}
|
||||
@@ -76,13 +77,19 @@ export class CurationFormComponent implements OnInit {
|
||||
const taskName = this.form.get('task').value;
|
||||
let handle;
|
||||
if (this.hasHandleValue()) {
|
||||
handle = this.dsoHandle;
|
||||
handle = this.handleService.normalizeHandle(this.dsoHandle);
|
||||
if (isEmpty(handle)) {
|
||||
this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
|
||||
this.translateService.get('curation.form.submit.error.invalid-handle'));
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
handle = this.form.get('handle').value;
|
||||
handle = this.handleService.normalizeHandle(this.form.get('handle').value);
|
||||
if (isEmpty(handle)) {
|
||||
handle = 'all';
|
||||
}
|
||||
}
|
||||
|
||||
this.scriptDataService.invoke('curate', [
|
||||
{ name: '-t', value: taskName },
|
||||
{ name: '-i', value: handle },
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
{{'journalissue.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
|
||||
</h2>
|
||||
<div class="pl-2 space-children-mr">
|
||||
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
|
||||
[tooltipMsgCreate]="'item.page.version.create'"
|
||||
[tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
|
||||
<ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalissue.page.edit'"></ds-dso-page-edit-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
|
||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
|
||||
|
||||
@listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
|
||||
@Component({
|
||||
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
|
||||
/**
|
||||
* The component for displaying metadata and relations of an item of the type Journal Issue
|
||||
*/
|
||||
export class JournalIssueComponent extends ItemComponent {
|
||||
export class JournalIssueComponent extends VersionedItemComponent {
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
{{'journalvolume.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
|
||||
</h2>
|
||||
<div class="pl-2 space-children-mr">
|
||||
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
|
||||
[tooltipMsgCreate]="'item.page.version.create'"
|
||||
[tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
|
||||
<ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalvolume.page.edit'"></ds-dso-page-edit-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
|
||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
|
||||
|
||||
@listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
|
||||
@Component({
|
||||
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
|
||||
/**
|
||||
* The component for displaying metadata and relations of an item of the type Journal Volume
|
||||
*/
|
||||
export class JournalVolumeComponent extends ItemComponent {
|
||||
export class JournalVolumeComponent extends VersionedItemComponent {
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
{{'journal.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
|
||||
</h2>
|
||||
<div class="pl-2 space-children-mr">
|
||||
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
|
||||
[tooltipMsgCreate]="'item.page.version.create'"
|
||||
[tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
|
||||
<ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journal.page.edit'"></ds-dso-page-edit-button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -44,7 +47,8 @@
|
||||
<ds-tabbed-related-entities-search [item]="object"
|
||||
[relationTypes]="[{
|
||||
label: 'isJournalOfPublication',
|
||||
filter: 'isJournalOfPublication'
|
||||
filter: 'isJournalOfPublication',
|
||||
configuration: 'default-relationships'
|
||||
}]">
|
||||
</ds-tabbed-related-entities-search>
|
||||
</div>
|
||||
|
||||
@@ -29,6 +29,11 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s
|
||||
import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
|
||||
import { JournalComponent } from './journal.component';
|
||||
import { RouteService } from '../../../../core/services/route.service';
|
||||
import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
|
||||
import { VersionDataService } from '../../../../core/data/version-data.service';
|
||||
import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
|
||||
import { SearchService } from '../../../../core/shared/search/search.service';
|
||||
|
||||
let comp: JournalComponent;
|
||||
let fixture: ComponentFixture<JournalComponent>;
|
||||
@@ -65,12 +70,15 @@ describe('JournalComponent', () => {
|
||||
};
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
})],
|
||||
imports: [
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
}),
|
||||
RouterTestingModule,
|
||||
],
|
||||
declarations: [JournalComponent, GenericItemPageFieldComponent, TruncatePipe],
|
||||
providers: [
|
||||
{ provide: ItemDataService, useValue: {} },
|
||||
@@ -86,7 +94,11 @@ describe('JournalComponent', () => {
|
||||
{ provide: DSOChangeAnalyzer, useValue: {} },
|
||||
{ provide: NotificationsService, useValue: {} },
|
||||
{ provide: DefaultChangeAnalyzer, useValue: {} },
|
||||
{ provide: VersionHistoryDataService, useValue: {} },
|
||||
{ provide: VersionDataService, useValue: {} },
|
||||
{ provide: BitstreamDataService, useValue: mockBitstreamDataService },
|
||||
{ provide: WorkspaceitemDataService, useValue: {} },
|
||||
{ provide: SearchService, useValue: {} },
|
||||
{ provide: RouteService, useValue: {} }
|
||||
],
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
|
||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
|
||||
|
||||
@listableObjectComponent('Journal', ViewMode.StandalonePage)
|
||||
@Component({
|
||||
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
|
||||
/**
|
||||
* The component for displaying metadata and relations of an item of the type Journal
|
||||
*/
|
||||
export class JournalComponent extends ItemComponent {
|
||||
export class JournalComponent extends VersionedItemComponent {
|
||||
}
|
||||
|
||||
@@ -7,13 +7,11 @@
|
||||
class="lead"
|
||||
[innerHTML]="firstMetadataValue('organization.legalName')"></span>
|
||||
<span class="text-muted">
|
||||
<ds-truncatable-part [id]="dso.id" [minLines]="3">
|
||||
<span *ngIf="dso.allMetadata(['dc.description']).length > 0"
|
||||
class="item-list-org-unit-description">
|
||||
<ds-truncatable-part [id]="dso.id" [minLines]="3"><span
|
||||
[innerHTML]="firstMetadataValue('dc.description')"></span>
|
||||
</ds-truncatable-part>
|
||||
</span>
|
||||
</ds-truncatable-part>
|
||||
<span *ngIf="dso.allMetadata(['dc.description']).length > 0"
|
||||
class="item-list-org-unit-description">
|
||||
<ds-truncatable-part [id]="dso.id" [minLines]="3"><span
|
||||
[innerHTML]="firstMetadataValue('dc.description')"></span>
|
||||
</ds-truncatable-part>
|
||||
</span>
|
||||
</span>
|
||||
</ds-truncatable>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
[innerHTML]="name"></a>
|
||||
<span *ngIf="linkType == linkTypes.None"
|
||||
class="lead"
|
||||
[innerHTML]="firstMetadataValue('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></span>
|
||||
[innerHTML]="name"></span>
|
||||
<span class="text-muted">
|
||||
<ds-truncatable-part [id]="dso.id" [minLines]="1">
|
||||
<span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import {
|
||||
listableObjectComponent
|
||||
} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { ViewMode } from '../../../../../core/shared/view-mode.model';
|
||||
import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
|
||||
import {
|
||||
ItemSearchResultListElementComponent
|
||||
} from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
|
||||
import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
|
||||
import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
|
||||
|
||||
@listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
|
||||
@Component({
|
||||
@@ -14,9 +20,14 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
|
||||
*/
|
||||
export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent {
|
||||
|
||||
public constructor(protected truncatableService: TruncatableService, protected dsoNameService: DSONameService) {
|
||||
super(truncatableService, dsoNameService);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the person name
|
||||
*/
|
||||
get name() {
|
||||
return this.value ?
|
||||
this.value :
|
||||
this.firstMetadataValue('person.familyName') + ', ' + this.firstMetadataValue('person.givenName');
|
||||
return this.dsoNameService.getName(this.dso);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
{{'orgunit.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['organization.legalName'])"></ds-metadata-values>
|
||||
</h2>
|
||||
<div class="pl-2 space-children-mr">
|
||||
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
|
||||
[tooltipMsgCreate]="'item.page.version.create'"
|
||||
[tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
|
||||
<ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'orgunit.page.edit'"></ds-dso-page-edit-button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -54,12 +57,12 @@
|
||||
[relationTypes]="[{
|
||||
label: 'isOrgUnitOfPerson',
|
||||
filter: 'isOrgUnitOfPerson',
|
||||
configuration: 'person'
|
||||
configuration: 'person-relationships'
|
||||
},
|
||||
{
|
||||
label: 'isOrgUnitOfProject',
|
||||
filter: 'isOrgUnitOfProject',
|
||||
configuration: 'project'
|
||||
configuration: 'project-relationships'
|
||||
}]">
|
||||
</ds-tabbed-related-entities-search>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
|
||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
|
||||
|
||||
@listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
|
||||
@Component({
|
||||
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
|
||||
/**
|
||||
* The component for displaying metadata and relations of an item of the type Organisation Unit
|
||||
*/
|
||||
export class OrgUnitComponent extends ItemComponent {
|
||||
export class OrgUnitComponent extends VersionedItemComponent {
|
||||
}
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
<div class="d-flex flex-row">
|
||||
<h2 class="item-page-title-field mr-auto">
|
||||
{{'person.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="[object?.firstMetadata('person.familyName'), object?.firstMetadata('person.givenName')]" [separator]="', '"></ds-metadata-values>
|
||||
{{'person.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="getTitleMetadataValues()" [separator]="', '"></ds-metadata-values>
|
||||
</h2>
|
||||
<div class="pl-2 space-children-mr">
|
||||
<ds-dso-page-orcid-button [pageRoute]="itemPageRoute" [dso]="object" class="mr-2"></ds-dso-page-orcid-button>
|
||||
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
|
||||
[tooltipMsgCreate]="'item.page.version.create'"
|
||||
[tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
|
||||
<ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'person.page.edit'"></ds-dso-page-edit-button>
|
||||
<ds-person-page-claim-button [object]="object"></ds-person-page-claim-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
@@ -19,18 +24,10 @@
|
||||
[fields]="['person.email']"
|
||||
[label]="'person.page.email'">
|
||||
</ds-generic-item-page-field>
|
||||
<!--<ds-generic-item-page-field [item]="object"-->
|
||||
<!--[fields]="['person.identifier.orcid']"-->
|
||||
<!--[label]="'person.page.orcid'">-->
|
||||
<!--</ds-generic-item-page-field>-->
|
||||
<ds-generic-item-page-field [item]="object"
|
||||
[fields]="['person.birthDate']"
|
||||
[label]="'person.page.birthdate'">
|
||||
</ds-generic-item-page-field>
|
||||
<!--<ds-generic-item-page-field [item]="object"-->
|
||||
<!--[fields]="['person.identifier.staffid']"-->
|
||||
<!--[label]="'person.page.staffid'">-->
|
||||
<!--</ds-generic-item-page-field>-->
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<ds-related-items
|
||||
@@ -55,6 +52,10 @@
|
||||
[fields]="['person.givenName']"
|
||||
[label]="'person.page.firstname'">
|
||||
</ds-generic-item-page-field>
|
||||
<ds-generic-item-page-field [item]="object"
|
||||
[fields]="['dc.title']"
|
||||
[label]="'person.page.name'">
|
||||
</ds-generic-item-page-field>
|
||||
<div>
|
||||
<a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
|
||||
{{"item.page.link.full" | translate}}
|
||||
@@ -65,7 +66,8 @@
|
||||
<ds-tabbed-related-entities-search [item]="object"
|
||||
[relationTypes]="[{
|
||||
label: 'isAuthorOfPublication',
|
||||
filter: 'isAuthorOfPublication'
|
||||
filter: 'isAuthorOfPublication',
|
||||
configuration: 'default-relationships'
|
||||
}]">
|
||||
</ds-tabbed-related-entities-search>
|
||||
</div>
|
||||
|
||||
@@ -17,24 +17,12 @@ const mockItem: Item = Object.assign(new Item(), {
|
||||
value: 'fake@email.com'
|
||||
}
|
||||
],
|
||||
// 'person.identifier.orcid': [
|
||||
// {
|
||||
// language: 'en_US',
|
||||
// value: 'ORCID-1'
|
||||
// }
|
||||
// ],
|
||||
'person.birthDate': [
|
||||
{
|
||||
language: 'en_US',
|
||||
value: '1993'
|
||||
}
|
||||
],
|
||||
// 'person.identifier.staffid': [
|
||||
// {
|
||||
// language: 'en_US',
|
||||
// value: '1'
|
||||
// }
|
||||
// ],
|
||||
'person.jobTitle': [
|
||||
{
|
||||
language: 'en_US',
|
||||
@@ -54,7 +42,50 @@ const mockItem: Item = Object.assign(new Item(), {
|
||||
}
|
||||
]
|
||||
},
|
||||
relationships: createRelationshipsObservable()
|
||||
relationships: createRelationshipsObservable(),
|
||||
_links: {
|
||||
self : {
|
||||
href: 'item-href'
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
describe('PersonComponent', getItemPageFieldsTest(mockItem, PersonComponent));
|
||||
const mockItemWithTitle: Item = Object.assign(new Item(), {
|
||||
bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
|
||||
metadata: {
|
||||
'person.email': [
|
||||
{
|
||||
language: 'en_US',
|
||||
value: 'fake@email.com'
|
||||
}
|
||||
],
|
||||
'person.birthDate': [
|
||||
{
|
||||
language: 'en_US',
|
||||
value: '1993'
|
||||
}
|
||||
],
|
||||
'person.jobTitle': [
|
||||
{
|
||||
language: 'en_US',
|
||||
value: 'Developer'
|
||||
}
|
||||
],
|
||||
'dc.title': [
|
||||
{
|
||||
language: 'en_US',
|
||||
value: 'Doe, John'
|
||||
}
|
||||
]
|
||||
},
|
||||
relationships: createRelationshipsObservable(),
|
||||
_links: {
|
||||
self : {
|
||||
href: 'item-href'
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
describe('PersonComponent with family and given names', getItemPageFieldsTest(mockItem, PersonComponent));
|
||||
|
||||
describe('PersonComponent with dc.title', getItemPageFieldsTest(mockItemWithTitle, PersonComponent));
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
|
||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
|
||||
import { MetadataValue } from '../../../../core/shared/metadata.models';
|
||||
|
||||
@listableObjectComponent('Person', ViewMode.StandalonePage)
|
||||
@Component({
|
||||
@@ -12,5 +13,26 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
|
||||
/**
|
||||
* The component for displaying metadata and relations of an item of the type Person
|
||||
*/
|
||||
export class PersonComponent extends ItemComponent {
|
||||
export class PersonComponent extends VersionedItemComponent {
|
||||
|
||||
/**
|
||||
* Returns the metadata values to be used for the page title.
|
||||
*/
|
||||
getTitleMetadataValues(): MetadataValue[] {
|
||||
const metadataValues = [];
|
||||
const familyName = this.object?.firstMetadata('person.familyName');
|
||||
const givenName = this.object?.firstMetadata('person.givenName');
|
||||
const title = this.object?.firstMetadata('dc.title');
|
||||
if (familyName) {
|
||||
metadataValues.push(familyName);
|
||||
}
|
||||
if (givenName) {
|
||||
metadataValues.push(givenName);
|
||||
}
|
||||
if (metadataValues.length === 0 && title) {
|
||||
metadataValues.push(title);
|
||||
}
|
||||
return metadataValues;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
{{'project.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
|
||||
</h2>
|
||||
<div class="pl-2 space-children-mr">
|
||||
<ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
|
||||
[tooltipMsgCreate]="'item.page.version.create'"
|
||||
[tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
|
||||
<ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'project.page.edit'"></ds-dso-page-edit-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Component } from '@angular/core';
|
||||
import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
|
||||
import { ViewMode } from '../../../../core/shared/view-mode.model';
|
||||
import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
|
||||
import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
|
||||
|
||||
@listableObjectComponent('Project', ViewMode.StandalonePage)
|
||||
@Component({
|
||||
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
|
||||
/**
|
||||
* The component for displaying metadata and relations of an item of the type Project
|
||||
*/
|
||||
export class ProjectComponent extends ItemComponent {
|
||||
export class ProjectComponent extends VersionedItemComponent {
|
||||
}
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<div *ngFor="let entry of healthInfoComponent | dsObjNgFor" data-test="collapse">
|
||||
<div *ngIf="entry && !isPlainProperty(entry.value)" class="mb-3 border-bottom">
|
||||
<div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
|
||||
<button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
|
||||
aria-controls="collapseExample">
|
||||
{{ entry.key | titlecase }}
|
||||
</button>
|
||||
<div class="d-inline-block">
|
||||
<span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
|
||||
<span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
|
||||
<div class="card border-0">
|
||||
<div class="card-body">
|
||||
<ds-health-info-component [healthInfoComponent]="entry.value"
|
||||
[healthInfoComponentName]="entry.key"
|
||||
[isNested]="true"
|
||||
data-test="info-component"></ds-health-info-component>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<ng-container *ngIf="entry && isPlainProperty(entry.value)">
|
||||
<p data-test="property"> <span class="font-weight-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
|
||||
</ng-container>
|
||||
</div>
|
||||
@@ -0,0 +1,3 @@
|
||||
.collapse-toggle {
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
|
||||
import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { HealthInfoComponentComponent } from './health-info-component.component';
|
||||
import { HealthInfoComponentOne, HealthInfoComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
|
||||
import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
|
||||
|
||||
describe('HealthInfoComponentComponent', () => {
|
||||
let component: HealthInfoComponentComponent;
|
||||
let fixture: ComponentFixture<HealthInfoComponentComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
NgbCollapseModule,
|
||||
NoopAnimationsModule,
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
})
|
||||
],
|
||||
declarations: [
|
||||
HealthInfoComponentComponent,
|
||||
ObjNgFor
|
||||
]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(HealthInfoComponentComponent);
|
||||
component = fixture.componentInstance;
|
||||
});
|
||||
|
||||
describe('when has nested components', () => {
|
||||
beforeEach(() => {
|
||||
component.healthInfoComponentName = 'App';
|
||||
component.healthInfoComponent = HealthInfoComponentOne;
|
||||
component.isCollapsed = false;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should display property', () => {
|
||||
const properties = fixture.debugElement.queryAll(By.css('[data-test="property"]'));
|
||||
expect(properties.length).toBe(14);
|
||||
const components = fixture.debugElement.queryAll(By.css('[data-test="info-component"]'));
|
||||
expect(components.length).toBe(4);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('when has plain properties', () => {
|
||||
beforeEach(() => {
|
||||
component.healthInfoComponentName = 'Java';
|
||||
component.healthInfoComponent = HealthInfoComponentTwo;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should display property', () => {
|
||||
const property = fixture.debugElement.queryAll(By.css('[data-test="property"]'));
|
||||
expect(property.length).toBe(1);
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,46 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
|
||||
import { HealthInfoComponent } from '../../models/health-component.model';
|
||||
import { HealthComponentComponent } from '../../health-panel/health-component/health-component.component';
|
||||
|
||||
/**
|
||||
* Shows a health info object
|
||||
*/
|
||||
@Component({
|
||||
selector: 'ds-health-info-component',
|
||||
templateUrl: './health-info-component.component.html',
|
||||
styleUrls: ['./health-info-component.component.scss']
|
||||
})
|
||||
export class HealthInfoComponentComponent extends HealthComponentComponent {
|
||||
|
||||
/**
|
||||
* The HealthInfoComponent object to display
|
||||
*/
|
||||
@Input() healthInfoComponent: HealthInfoComponent|string;
|
||||
|
||||
/**
|
||||
* The HealthInfoComponent object name
|
||||
*/
|
||||
@Input() healthInfoComponentName: string;
|
||||
|
||||
/**
|
||||
* A boolean representing if div should start collapsed
|
||||
*/
|
||||
@Input() isNested = false;
|
||||
|
||||
/**
|
||||
* A boolean representing if div should start collapsed
|
||||
*/
|
||||
public isCollapsed = false;
|
||||
|
||||
/**
|
||||
* Check if the HealthInfoComponent is has only string property or contains object
|
||||
*
|
||||
* @param entry The HealthInfoComponent to check
|
||||
* @return boolean
|
||||
*/
|
||||
isPlainProperty(entry: HealthInfoComponent | string): boolean {
|
||||
return typeof entry === 'string';
|
||||
}
|
||||
|
||||
}
|
||||
25
src/app/health-page/health-info/health-info.component.html
Normal file
25
src/app/health-page/health-info/health-info.component.html
Normal file
@@ -0,0 +1,25 @@
|
||||
<ng-container *ngIf="healthInfoResponse">
|
||||
<ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
|
||||
<ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
|
||||
<ng-template ngbPanelHeader>
|
||||
<div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
|
||||
<button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
|
||||
aria-controls="collapsePanels">
|
||||
{{ getPanelLabel(entry.key) | titlecase }}
|
||||
</button>
|
||||
<div class="text-right d-flex">
|
||||
<ds-health-status [status]="entry.value?.status"></ds-health-status>
|
||||
<div class="ml-3 d-inline-block">
|
||||
<span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
|
||||
<span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template ngbPanelContent>
|
||||
<ds-health-info-component [healthInfoComponentName]="entry.key"
|
||||
[healthInfoComponent]="entry.value"></ds-health-info-component>
|
||||
</ng-template>
|
||||
</ngb-panel>
|
||||
</ngb-accordion>
|
||||
</ng-container>
|
||||
@@ -0,0 +1,3 @@
|
||||
.collapse-toggle {
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { HealthInfoComponent } from './health-info.component';
|
||||
import { HealthInfoResponseObj } from '../../shared/mocks/health-endpoint.mocks';
|
||||
import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
|
||||
|
||||
describe('HealthInfoComponent', () => {
|
||||
let component: HealthInfoComponent;
|
||||
let fixture: ComponentFixture<HealthInfoComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
NgbAccordionModule,
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
})
|
||||
],
|
||||
declarations: [
|
||||
HealthInfoComponent,
|
||||
ObjNgFor
|
||||
],
|
||||
schemas: [NO_ERRORS_SCHEMA]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(HealthInfoComponent);
|
||||
component = fixture.componentInstance;
|
||||
component.healthInfoResponse = HealthInfoResponseObj;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create info component properly', () => {
|
||||
const components = fixture.debugElement.queryAll(By.css('[data-test="info-component"]'));
|
||||
expect(components.length).toBe(3);
|
||||
});
|
||||
});
|
||||
46
src/app/health-page/health-info/health-info.component.ts
Normal file
46
src/app/health-page/health-info/health-info.component.ts
Normal file
@@ -0,0 +1,46 @@
|
||||
import { Component, Input, OnInit } from '@angular/core';
|
||||
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
||||
import { HealthInfoResponse } from '../models/health-component.model';
|
||||
|
||||
/**
|
||||
* A component to render a "health-info component" object.
|
||||
*
|
||||
* Note that the word "component" in "health-info component" doesn't refer to Angular use of the term
|
||||
* but rather to the components used in the response of the health endpoint of Spring's Actuator
|
||||
* API.
|
||||
*/
|
||||
@Component({
|
||||
selector: 'ds-health-info',
|
||||
templateUrl: './health-info.component.html',
|
||||
styleUrls: ['./health-info.component.scss']
|
||||
})
|
||||
export class HealthInfoComponent implements OnInit {
|
||||
|
||||
@Input() healthInfoResponse: HealthInfoResponse;
|
||||
|
||||
/**
|
||||
* The first active panel id
|
||||
*/
|
||||
activeId: string;
|
||||
|
||||
constructor(private translate: TranslateService) {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.activeId = Object.keys(this.healthInfoResponse)[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Return translated label if exist for the given property
|
||||
*
|
||||
* @param panelKey
|
||||
*/
|
||||
public getPanelLabel(panelKey: string): string {
|
||||
const translationKey = `health-page.section-info.${panelKey}.title`;
|
||||
const translation = this.translate.instant(translationKey);
|
||||
|
||||
return (translation === translationKey) ? panelKey : translation;
|
||||
}
|
||||
}
|
||||
27
src/app/health-page/health-page.component.html
Normal file
27
src/app/health-page/health-page.component.html
Normal file
@@ -0,0 +1,27 @@
|
||||
<div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
|
||||
<h2>{{'health-page.heading' | translate}}</h2>
|
||||
<div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
|
||||
<ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
|
||||
<li [ngbNavItem]="'status'">
|
||||
<a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
|
||||
<ng-template ngbNavContent>
|
||||
<div id="status">
|
||||
<ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
|
||||
</div>
|
||||
</ng-template>
|
||||
</li>
|
||||
<li [ngbNavItem]="'info'">
|
||||
<a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
|
||||
<ng-template ngbNavContent>
|
||||
<div id="info">
|
||||
<ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
|
||||
</div>
|
||||
</ng-template>
|
||||
</li>
|
||||
</ul>
|
||||
<div [ngbNavOutlet]="nav" class="mt-2"></div>
|
||||
</div>
|
||||
<ds-alert *ngIf="!(healthResponse | async) || !(healthInfoResponse | async)" [type]="'alert-danger'" [content]="'health-page.error.msg'"></ds-alert>
|
||||
</div>
|
||||
|
||||
|
||||
0
src/app/health-page/health-page.component.scss
Normal file
0
src/app/health-page/health-page.component.scss
Normal file
72
src/app/health-page/health-page.component.spec.ts
Normal file
72
src/app/health-page/health-page.component.spec.ts
Normal file
@@ -0,0 +1,72 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { By } from '@angular/platform-browser';
|
||||
|
||||
import { of } from 'rxjs';
|
||||
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
import { HealthPageComponent } from './health-page.component';
|
||||
import { HealthService } from './health.service';
|
||||
import { HealthInfoResponseObj, HealthResponseObj } from '../shared/mocks/health-endpoint.mocks';
|
||||
import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
|
||||
import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
|
||||
|
||||
describe('HealthPageComponent', () => {
|
||||
let component: HealthPageComponent;
|
||||
let fixture: ComponentFixture<HealthPageComponent>;
|
||||
|
||||
const healthService = jasmine.createSpyObj('healthDataService', {
|
||||
getHealth: jasmine.createSpy('getHealth'),
|
||||
getInfo: jasmine.createSpy('getInfo'),
|
||||
});
|
||||
|
||||
const healthRestResponse$ = of({
|
||||
payload: HealthResponseObj,
|
||||
statusCode: 200,
|
||||
statusText: 'OK'
|
||||
} as RawRestResponse);
|
||||
|
||||
const healthInfoRestResponse$ = of({
|
||||
payload: HealthInfoResponseObj,
|
||||
statusCode: 200,
|
||||
statusText: 'OK'
|
||||
} as RawRestResponse);
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
NgbNavModule,
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
})
|
||||
],
|
||||
declarations: [ HealthPageComponent ],
|
||||
providers: [
|
||||
{ provide: HealthService, useValue: healthService }
|
||||
]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(HealthPageComponent);
|
||||
component = fixture.componentInstance;
|
||||
healthService.getHealth.and.returnValue(healthRestResponse$);
|
||||
healthService.getInfo.and.returnValue(healthInfoRestResponse$);
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create nav items properly', () => {
|
||||
const navItems = fixture.debugElement.queryAll(By.css('li.nav-item'));
|
||||
expect(navItems.length).toBe(2);
|
||||
});
|
||||
});
|
||||
66
src/app/health-page/health-page.component.ts
Normal file
66
src/app/health-page/health-page.component.ts
Normal file
@@ -0,0 +1,66 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
import { take } from 'rxjs/operators';
|
||||
|
||||
import { HealthService } from './health.service';
|
||||
import { HealthInfoResponse, HealthResponse } from './models/health-component.model';
|
||||
|
||||
@Component({
|
||||
selector: 'ds-health-page',
|
||||
templateUrl: './health-page.component.html',
|
||||
styleUrls: ['./health-page.component.scss']
|
||||
})
|
||||
export class HealthPageComponent implements OnInit {
|
||||
|
||||
/**
|
||||
* Health info endpoint response
|
||||
*/
|
||||
healthInfoResponse: BehaviorSubject<HealthInfoResponse> = new BehaviorSubject<HealthInfoResponse>(null);
|
||||
|
||||
/**
|
||||
* Health endpoint response
|
||||
*/
|
||||
healthResponse: BehaviorSubject<HealthResponse> = new BehaviorSubject<HealthResponse>(null);
|
||||
|
||||
/**
|
||||
* Represent if the response from health status endpoint is already retrieved or not
|
||||
*/
|
||||
healthResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
|
||||
|
||||
/**
|
||||
* Represent if the response from health info endpoint is already retrieved or not
|
||||
*/
|
||||
healthInfoResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
|
||||
|
||||
constructor(private healthDataService: HealthService) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve responses from rest
|
||||
*/
|
||||
ngOnInit(): void {
|
||||
this.healthDataService.getHealth().pipe(take(1)).subscribe({
|
||||
next: (data: any) => {
|
||||
this.healthResponse.next(data.payload);
|
||||
this.healthResponseInitialised.next(true);
|
||||
},
|
||||
error: () => {
|
||||
this.healthResponse.next(null);
|
||||
this.healthResponseInitialised.next(true);
|
||||
}
|
||||
});
|
||||
|
||||
this.healthDataService.getInfo().pipe(take(1)).subscribe({
|
||||
next: (data: any) => {
|
||||
this.healthInfoResponse.next(data.payload);
|
||||
this.healthInfoResponseInitialised.next(true);
|
||||
},
|
||||
error: () => {
|
||||
this.healthInfoResponse.next(null);
|
||||
this.healthInfoResponseInitialised.next(true);
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
35
src/app/health-page/health-page.module.ts
Normal file
35
src/app/health-page/health-page.module.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { NgModule } from '@angular/core';
|
||||
|
||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
import { HealthPageRoutingModule } from './health-page.routing.module';
|
||||
import { HealthPanelComponent } from './health-panel/health-panel.component';
|
||||
import { HealthStatusComponent } from './health-panel/health-status/health-status.component';
|
||||
import { SharedModule } from '../shared/shared.module';
|
||||
import { HealthPageComponent } from './health-page.component';
|
||||
import { HealthComponentComponent } from './health-panel/health-component/health-component.component';
|
||||
import { HealthInfoComponent } from './health-info/health-info.component';
|
||||
import { HealthInfoComponentComponent } from './health-info/health-info-component/health-info-component.component';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
HealthPageRoutingModule,
|
||||
NgbModule,
|
||||
SharedModule,
|
||||
TranslateModule
|
||||
],
|
||||
declarations: [
|
||||
HealthPageComponent,
|
||||
HealthPanelComponent,
|
||||
HealthStatusComponent,
|
||||
HealthComponentComponent,
|
||||
HealthInfoComponent,
|
||||
HealthInfoComponentComponent,
|
||||
]
|
||||
})
|
||||
export class HealthPageModule {
|
||||
}
|
||||
28
src/app/health-page/health-page.routing.module.ts
Normal file
28
src/app/health-page/health-page.routing.module.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { NgModule } from '@angular/core';
|
||||
|
||||
import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
|
||||
import { HealthPageComponent } from './health-page.component';
|
||||
import {
|
||||
SiteAdministratorGuard
|
||||
} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{
|
||||
path: '',
|
||||
resolve: { breadcrumb: I18nBreadcrumbResolver },
|
||||
data: {
|
||||
breadcrumbKey: 'health',
|
||||
title: 'health-page.title',
|
||||
},
|
||||
canActivate: [SiteAdministratorGuard],
|
||||
component: HealthPageComponent
|
||||
}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class HealthPageRoutingModule {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
<ng-container *ngIf="healthComponent?.components">
|
||||
<div *ngFor="let entry of healthComponent?.components | dsObjNgFor" class="mb-3 border-bottom" data-test="collapse">
|
||||
<div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
|
||||
<button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
|
||||
aria-controls="collapseExample">
|
||||
{{ entry.key | titlecase }}
|
||||
</button>
|
||||
<div class="d-inline-block">
|
||||
<span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
|
||||
<span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
|
||||
<div class="card border-0">
|
||||
<div class="card-body">
|
||||
<ds-health-component [healthComponent]="entry.value"
|
||||
[healthComponentName]="entry.key"></ds-health-component>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="healthComponent?.details">
|
||||
<div *ngFor="let item of healthComponent?.details | dsObjNgFor" data-test="details">
|
||||
<p data-test="property"><span class="font-weight-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!healthComponent?.details && !healthComponent?.components">
|
||||
<ds-alert [content]="'health-page.section.no-issues'" [type]="AlertTypeEnum.Info"></ds-alert>
|
||||
</ng-container>
|
||||
@@ -0,0 +1,3 @@
|
||||
.collapse-toggle {
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||
|
||||
import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { HealthComponentComponent } from './health-component.component';
|
||||
import { HealthComponentOne, HealthComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
|
||||
import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
|
||||
|
||||
describe('HealthComponentComponent', () => {
|
||||
let component: HealthComponentComponent;
|
||||
let fixture: ComponentFixture<HealthComponentComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
NgbCollapseModule,
|
||||
NoopAnimationsModule,
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
})
|
||||
],
|
||||
declarations: [
|
||||
HealthComponentComponent,
|
||||
ObjNgFor
|
||||
],
|
||||
schemas: [NO_ERRORS_SCHEMA]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(HealthComponentComponent);
|
||||
component = fixture.componentInstance;
|
||||
});
|
||||
|
||||
describe('when has nested components', () => {
|
||||
beforeEach(() => {
|
||||
component.healthComponentName = 'db';
|
||||
component.healthComponent = HealthComponentOne;
|
||||
component.isCollapsed = false;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create collapsible divs properly', () => {
|
||||
const collapseDivs = fixture.debugElement.queryAll(By.css('[data-test="collapse"]'));
|
||||
expect(collapseDivs.length).toBe(2);
|
||||
const detailsDivs = fixture.debugElement.queryAll(By.css('[data-test="details"]'));
|
||||
expect(detailsDivs.length).toBe(6);
|
||||
});
|
||||
});
|
||||
|
||||
describe('when has details', () => {
|
||||
beforeEach(() => {
|
||||
component.healthComponentName = 'geoIp';
|
||||
component.healthComponent = HealthComponentTwo;
|
||||
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create detail divs properly', () => {
|
||||
const detailsDivs = fixture.debugElement.queryAll(By.css('[data-test="details"]'));
|
||||
expect(detailsDivs.length).toBe(1);
|
||||
const collapseDivs = fixture.debugElement.queryAll(By.css('[data-test="collapse"]'));
|
||||
expect(collapseDivs.length).toBe(0);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,53 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
||||
import { HealthComponent } from '../../models/health-component.model';
|
||||
import { AlertType } from '../../../shared/alert/aletr-type';
|
||||
|
||||
/**
|
||||
* A component to render a "health component" object.
|
||||
*
|
||||
* Note that the word "component" in "health component" doesn't refer to Angular use of the term
|
||||
* but rather to the components used in the response of the health endpoint of Spring's Actuator
|
||||
* API.
|
||||
*/
|
||||
@Component({
|
||||
selector: 'ds-health-component',
|
||||
templateUrl: './health-component.component.html',
|
||||
styleUrls: ['./health-component.component.scss']
|
||||
})
|
||||
export class HealthComponentComponent {
|
||||
|
||||
/**
|
||||
* The HealthComponent object to display
|
||||
*/
|
||||
@Input() healthComponent: HealthComponent;
|
||||
|
||||
/**
|
||||
* The HealthComponent object name
|
||||
*/
|
||||
@Input() healthComponentName: string;
|
||||
|
||||
public AlertTypeEnum = AlertType;
|
||||
|
||||
/**
|
||||
* A boolean representing if div should start collapsed
|
||||
*/
|
||||
public isCollapsed = false;
|
||||
|
||||
constructor(private translate: TranslateService) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Return translated label if exist for the given property
|
||||
*
|
||||
* @param property
|
||||
*/
|
||||
public getPropertyLabel(property: string): string {
|
||||
const translationKey = `health-page.property.${property}`;
|
||||
const translation = this.translate.instant(translationKey);
|
||||
|
||||
return (translation === translationKey) ? property : translation;
|
||||
}
|
||||
}
|
||||
25
src/app/health-page/health-panel/health-panel.component.html
Normal file
25
src/app/health-page/health-panel/health-panel.component.html
Normal file
@@ -0,0 +1,25 @@
|
||||
<p class="h4">{{'health-page.status' | translate}} : <ds-health-status [status]="healthResponse.status"></ds-health-status></p>
|
||||
<ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
|
||||
<ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
|
||||
<ng-template ngbPanelHeader>
|
||||
<div class="w-100 d-flex justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
|
||||
<button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!acc.isExpanded(entry.key)"
|
||||
aria-controls="collapsePanels">
|
||||
{{ getPanelLabel(entry.key) | titlecase }}
|
||||
</button>
|
||||
<div class="text-right d-flex">
|
||||
<ds-health-status [status]="entry.value?.status"></ds-health-status>
|
||||
<div class="ml-3 d-inline-block">
|
||||
<span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
|
||||
<span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template ngbPanelContent>
|
||||
<ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"></ds-health-component>
|
||||
</ng-template>
|
||||
</ngb-panel>
|
||||
</ngb-accordion>
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
.collapse-toggle {
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
import { NgbAccordionModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
|
||||
import { HealthPanelComponent } from './health-panel.component';
|
||||
import { HealthResponseObj } from '../../shared/mocks/health-endpoint.mocks';
|
||||
import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
|
||||
|
||||
describe('HealthPanelComponent', () => {
|
||||
let component: HealthPanelComponent;
|
||||
let fixture: ComponentFixture<HealthPanelComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
NgbNavModule,
|
||||
NgbAccordionModule,
|
||||
CommonModule,
|
||||
BrowserAnimationsModule,
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
}),
|
||||
],
|
||||
declarations: [
|
||||
HealthPanelComponent,
|
||||
ObjNgFor
|
||||
],
|
||||
schemas: [NO_ERRORS_SCHEMA]
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(HealthPanelComponent);
|
||||
component = fixture.componentInstance;
|
||||
component.healthResponse = HealthResponseObj;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should render a panel for each component', () => {
|
||||
const components = fixture.debugElement.queryAll(By.css('[data-test="component"]'));
|
||||
expect(components.length).toBe(5);
|
||||
});
|
||||
|
||||
});
|
||||
45
src/app/health-page/health-panel/health-panel.component.ts
Normal file
45
src/app/health-page/health-panel/health-panel.component.ts
Normal file
@@ -0,0 +1,45 @@
|
||||
import { Component, Input, OnInit } from '@angular/core';
|
||||
|
||||
import { TranslateService } from '@ngx-translate/core';
|
||||
|
||||
import { HealthResponse } from '../models/health-component.model';
|
||||
|
||||
/**
|
||||
* Show the health panel
|
||||
*/
|
||||
@Component({
|
||||
selector: 'ds-health-panel',
|
||||
templateUrl: './health-panel.component.html',
|
||||
styleUrls: ['./health-panel.component.scss']
|
||||
})
|
||||
export class HealthPanelComponent implements OnInit {
|
||||
|
||||
/**
|
||||
* Health endpoint response
|
||||
*/
|
||||
@Input() healthResponse: HealthResponse;
|
||||
|
||||
/**
|
||||
* The first active panel id
|
||||
*/
|
||||
activeId: string;
|
||||
|
||||
constructor(private translate: TranslateService) {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.activeId = Object.keys(this.healthResponse.components)[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Return translated label if exist for the given property
|
||||
*
|
||||
* @param panelKey
|
||||
*/
|
||||
public getPanelLabel(panelKey: string): string {
|
||||
const translationKey = `health-page.section.${panelKey}.title`;
|
||||
const translation = this.translate.instant(translationKey);
|
||||
|
||||
return (translation === translationKey) ? panelKey : translation;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
<ng-container [ngSwitch]="status">
|
||||
<i *ngSwitchCase="HealthStatus.UP"
|
||||
class="fa fa-check-circle text-success ml-2 mt-1"
|
||||
ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
|
||||
<i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
|
||||
class="fa fa-exclamation-triangle text-warning ml-2 mt-1"
|
||||
ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
|
||||
<i *ngSwitchCase="HealthStatus.DOWN"
|
||||
class="fa fa-times-circle text-danger ml-2 mt-1"
|
||||
ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
|
||||
|
||||
</ng-container>
|
||||
@@ -0,0 +1,60 @@
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { By } from '@angular/platform-browser';
|
||||
|
||||
import { HealthStatusComponent } from './health-status.component';
|
||||
import { HealthStatus } from '../../models/health-component.model';
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
|
||||
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
describe('HealthStatusComponent', () => {
|
||||
let component: HealthStatusComponent;
|
||||
let fixture: ComponentFixture<HealthStatusComponent>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await TestBed.configureTestingModule({
|
||||
imports: [
|
||||
NgbTooltipModule,
|
||||
TranslateModule.forRoot({
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useClass: TranslateLoaderMock
|
||||
}
|
||||
})
|
||||
],
|
||||
declarations: [ HealthStatusComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(HealthStatusComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create success icon', () => {
|
||||
component.status = HealthStatus.UP;
|
||||
fixture.detectChanges();
|
||||
const icon = fixture.debugElement.query(By.css('i.text-success'));
|
||||
expect(icon).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create warning icon', () => {
|
||||
component.status = HealthStatus.UP_WITH_ISSUES;
|
||||
fixture.detectChanges();
|
||||
const icon = fixture.debugElement.query(By.css('i.text-warning'));
|
||||
expect(icon).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should create success icon', () => {
|
||||
component.status = HealthStatus.DOWN;
|
||||
fixture.detectChanges();
|
||||
const icon = fixture.debugElement.query(By.css('i.text-danger'));
|
||||
expect(icon).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,23 @@
|
||||
import { Component, Input } from '@angular/core';
|
||||
import { HealthStatus } from '../../models/health-component.model';
|
||||
|
||||
/**
|
||||
* Show a health status object
|
||||
*/
|
||||
@Component({
|
||||
selector: 'ds-health-status',
|
||||
templateUrl: './health-status.component.html',
|
||||
styleUrls: ['./health-status.component.scss']
|
||||
})
|
||||
export class HealthStatusComponent {
|
||||
/**
|
||||
* The current status to show
|
||||
*/
|
||||
@Input() status: HealthStatus;
|
||||
|
||||
/**
|
||||
* He
|
||||
*/
|
||||
HealthStatus = HealthStatus;
|
||||
|
||||
}
|
||||
32
src/app/health-page/health.service.ts
Normal file
32
src/app/health-page/health.service.ts
Normal file
@@ -0,0 +1,32 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { map, switchMap } from 'rxjs/operators';
|
||||
import { DspaceRestService } from '../core/dspace-rest/dspace-rest.service';
|
||||
import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
|
||||
import { HALEndpointService } from '../core/shared/hal-endpoint.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class HealthService {
|
||||
constructor(protected halService: HALEndpointService,
|
||||
protected restService: DspaceRestService) {
|
||||
}
|
||||
/**
|
||||
* @returns health data
|
||||
*/
|
||||
getHealth(): Observable<RawRestResponse> {
|
||||
return this.halService.getEndpoint('/actuator').pipe(
|
||||
map((restURL: string) => restURL + '/health'),
|
||||
switchMap((endpoint: string) => this.restService.get(endpoint)));
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns information of server
|
||||
*/
|
||||
getInfo(): Observable<RawRestResponse> {
|
||||
return this.halService.getEndpoint('/actuator').pipe(
|
||||
map((restURL: string) => restURL + '/info'),
|
||||
switchMap((endpoint: string) => this.restService.get(endpoint)));
|
||||
}
|
||||
}
|
||||
48
src/app/health-page/models/health-component.model.ts
Normal file
48
src/app/health-page/models/health-component.model.ts
Normal file
@@ -0,0 +1,48 @@
|
||||
/**
|
||||
* Interface for Health Status
|
||||
*/
|
||||
export enum HealthStatus {
|
||||
UP = 'UP',
|
||||
UP_WITH_ISSUES = 'UP_WITH_ISSUES',
|
||||
DOWN = 'DOWN'
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface describing the Health endpoint response
|
||||
*/
|
||||
export interface HealthResponse {
|
||||
status: HealthStatus;
|
||||
components: {
|
||||
[name: string]: HealthComponent;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface describing a single component retrieved from the Health endpoint response
|
||||
*/
|
||||
export interface HealthComponent {
|
||||
status: HealthStatus;
|
||||
details?: {
|
||||
[name: string]: number|string;
|
||||
};
|
||||
components?: {
|
||||
[name: string]: HealthComponent;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface describing the Health info endpoint response
|
||||
*/
|
||||
export interface HealthInfoResponse {
|
||||
[name: string]: HealthInfoComponent|string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface describing a single component retrieved from the Health info endpoint response
|
||||
*/
|
||||
export interface HealthInfoComponent {
|
||||
[property: string]: HealthInfoComponent|string;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
import { NgbTooltipModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||
|
||||
import { SharedModule } from '../../shared/shared.module';
|
||||
import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
|
||||
@@ -49,7 +49,8 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
|
||||
EditItemPageRoutingModule,
|
||||
SearchPageModule,
|
||||
DragDropModule,
|
||||
ResourcePoliciesModule
|
||||
ResourcePoliciesModule,
|
||||
NgbModule
|
||||
],
|
||||
declarations: [
|
||||
EditItemPageComponent,
|
||||
|
||||
@@ -1,13 +1,33 @@
|
||||
<div class="container">
|
||||
<ds-alert [type]="'alert-info'" [content]="'item.edit.authorizations.heading'"></ds-alert>
|
||||
<ds-resource-policies [resourceType]="'item'" [resourceUUID]="(getItemUUID() | async)"></ds-resource-policies>
|
||||
<ng-container *ngFor="let bundle of (getItemBundles() | async); trackById">
|
||||
<ds-resource-policies [resourceType]="'bundle'"
|
||||
[resourceUUID]="bundle.id"></ds-resource-policies>
|
||||
<ng-container *ngFor="let bitstream of (bundleBitstreamsMap.get(bundle.id) | async)?.page; trackById">
|
||||
<ds-resource-policies [resourceType]="'bitstream'"
|
||||
[resourceUUID]="bitstream.id"></ds-resource-policies>
|
||||
<ds-resource-policies [resourceType]="'item'" [resourceName]="(getItemName() | async)"
|
||||
[resourceUUID]="(getItemUUID() | async)">
|
||||
</ds-resource-policies>
|
||||
<ng-container *ngFor="let bundle of (bundles$ | async); trackById">
|
||||
<ds-resource-policies [resourceType]="'bundle'" [resourceUUID]="bundle.id" [resourceName]="bundle.name">
|
||||
</ds-resource-policies>
|
||||
<ng-container *ngIf="(bundleBitstreamsMap.get(bundle.id)?.bitstreams | async)?.length > 0">
|
||||
<div class="card auth-bitstream-container">
|
||||
<div class="card-header">
|
||||
<button type="button" class="btn btn-outline-primary" (click)="collapseArea(bundle.id)"
|
||||
[attr.aria-expanded]="false" [attr.aria-controls]="bundle.id">
|
||||
{{ 'collection.edit.item.authorizations.show-bitstreams-button' | translate }} {{bundle.name}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="card-body" [id]="bundle.id" [ngbCollapse]="bundleBitstreamsMap.get(bundle.id).isCollapsed">
|
||||
<ng-container
|
||||
*ngFor="let bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async); trackById">
|
||||
<ds-resource-policies [resourceType]="'bitstream'" [resourceUUID]="bitstream.id"
|
||||
[resourceName]="bitstream.name"></ds-resource-policies>
|
||||
</ng-container>
|
||||
<div class="row justify-content-center" *ngIf="!bundleBitstreamsMap.get(bundle.id).allBitstreamsLoaded">
|
||||
<button type="button" class="btn btn-link" (click)="onBitstreamsLoad(bundle)">{{ 'collection.edit.item.authorizations.load-more-button' | translate }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
<div class="row justify-content-center" *ngIf="!allBundlesLoaded">
|
||||
<button type="button" class="btn btn-link" (click)="onBundleLoad()">{{ 'collection.edit.item.authorizations.load-bundle-button' | translate }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
.auth-bitstream-container {
|
||||
margin-top: -1em;
|
||||
margin-bottom: 1.5em;
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
import { Observable } from 'rxjs/internal/Observable';
|
||||
import { waitForAsync, ComponentFixture, inject, TestBed } from '@angular/core/testing';
|
||||
import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { of as observableOf } from 'rxjs';
|
||||
import { of as observableOf, of } from 'rxjs';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { cold } from 'jasmine-marbles';
|
||||
import { ItemAuthorizationsComponent } from './item-authorizations.component';
|
||||
import { ItemAuthorizationsComponent, BitstreamMapValue } from './item-authorizations.component';
|
||||
import { Bitstream } from '../../../core/shared/bitstream.model';
|
||||
import { Bundle } from '../../../core/shared/bundle.model';
|
||||
import { Item } from '../../../core/shared/item.model';
|
||||
@@ -57,8 +58,6 @@ describe('ItemAuthorizationsComponent test suite', () => {
|
||||
bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
|
||||
});
|
||||
const bundles = [bundle1, bundle2];
|
||||
const bitstreamList1: PaginatedList<Bitstream> = buildPaginatedList(new PageInfo(), [bitstream1, bitstream2]);
|
||||
const bitstreamList2: PaginatedList<Bitstream> = buildPaginatedList(new PageInfo(), [bitstream3, bitstream4]);
|
||||
|
||||
const item = Object.assign(new Item(), {
|
||||
uuid: 'item',
|
||||
@@ -142,13 +141,12 @@ describe('ItemAuthorizationsComponent test suite', () => {
|
||||
expect(compAsAny.bundleBitstreamsMap.has('bundle1')).toBeTruthy();
|
||||
expect(compAsAny.bundleBitstreamsMap.has('bundle2')).toBeTruthy();
|
||||
let bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle1');
|
||||
expect(bitstreamList).toBeObservable(cold('(a|)', {
|
||||
a: bitstreamList1
|
||||
expect(bitstreamList.bitstreams).toBeObservable(cold('(a|)', {
|
||||
a : [bitstream1, bitstream2]
|
||||
}));
|
||||
|
||||
bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle2');
|
||||
expect(bitstreamList).toBeObservable(cold('(a|)', {
|
||||
a: bitstreamList2
|
||||
expect(bitstreamList.bitstreams).toBeObservable(cold('(a|)', {
|
||||
a: [bitstream3, bitstream4]
|
||||
}));
|
||||
});
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { isEqual } from 'lodash';
|
||||
import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
|
||||
import { Component, OnDestroy, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
|
||||
@@ -6,7 +8,8 @@ import { catchError, filter, first, map, mergeMap, take } from 'rxjs/operators';
|
||||
|
||||
import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
|
||||
import {
|
||||
getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataWithNotEmptyPayload,
|
||||
getFirstSucceededRemoteDataPayload,
|
||||
getFirstSucceededRemoteDataWithNotEmptyPayload,
|
||||
} from '../../../core/shared/operators';
|
||||
import { Item } from '../../../core/shared/item.model';
|
||||
import { followLink } from '../../../shared/utils/follow-link-config.model';
|
||||
@@ -25,7 +28,8 @@ interface BundleBitstreamsMapEntry {
|
||||
|
||||
@Component({
|
||||
selector: 'ds-item-authorizations',
|
||||
templateUrl: './item-authorizations.component.html'
|
||||
templateUrl: './item-authorizations.component.html',
|
||||
styleUrls:['./item-authorizations.component.scss']
|
||||
})
|
||||
/**
|
||||
* Component that handles the item Authorizations
|
||||
@@ -36,13 +40,13 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
|
||||
* A map that contains all bitstream of the item's bundles
|
||||
* @type {Observable<Map<string, Observable<PaginatedList<Bitstream>>>>}
|
||||
*/
|
||||
public bundleBitstreamsMap: Map<string, Observable<PaginatedList<Bitstream>>> = new Map<string, Observable<PaginatedList<Bitstream>>>();
|
||||
public bundleBitstreamsMap: Map<string, BitstreamMapValue> = new Map<string, BitstreamMapValue>();
|
||||
|
||||
/**
|
||||
* The list of bundle for the item
|
||||
* The list of all bundles for the item
|
||||
* @type {Observable<PaginatedList<Bundle>>}
|
||||
*/
|
||||
private bundles$: BehaviorSubject<Bundle[]> = new BehaviorSubject<Bundle[]>([]);
|
||||
bundles$: BehaviorSubject<Bundle[]> = new BehaviorSubject<Bundle[]>([]);
|
||||
|
||||
/**
|
||||
* The target editing item
|
||||
@@ -56,15 +60,48 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
|
||||
*/
|
||||
private subs: Subscription[] = [];
|
||||
|
||||
/**
|
||||
* The size of the bundles to be loaded on demand
|
||||
* @type {number}
|
||||
*/
|
||||
bundlesPerPage = 6;
|
||||
|
||||
/**
|
||||
* The number of current page
|
||||
* @type {number}
|
||||
*/
|
||||
bundlesPageSize = 1;
|
||||
|
||||
/**
|
||||
* The flag to show or not the 'Load more' button
|
||||
* based on the condition if all the bundles are loaded or not
|
||||
* @type {boolean}
|
||||
*/
|
||||
allBundlesLoaded = false;
|
||||
|
||||
/**
|
||||
* Initial size of loaded bitstreams
|
||||
* The size of incrementation used in bitstream pagination
|
||||
*/
|
||||
bitstreamSize = 4;
|
||||
|
||||
/**
|
||||
* The size of the loaded bitstremas at a certain moment
|
||||
* @private
|
||||
*/
|
||||
private bitstreamPageSize = 4;
|
||||
|
||||
/**
|
||||
* Initialize instance variables
|
||||
*
|
||||
* @param {LinkService} linkService
|
||||
* @param {ActivatedRoute} route
|
||||
* @param nameService
|
||||
*/
|
||||
constructor(
|
||||
private linkService: LinkService,
|
||||
private route: ActivatedRoute
|
||||
private route: ActivatedRoute,
|
||||
private nameService: DSONameService
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -72,16 +109,53 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
|
||||
* Initialize the component, setting up the bundle and bitstream within the item
|
||||
*/
|
||||
ngOnInit(): void {
|
||||
this.getBundlesPerItem();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the item's UUID
|
||||
*/
|
||||
getItemUUID(): Observable<string> {
|
||||
return this.item$.pipe(
|
||||
map((item: Item) => item.id),
|
||||
first((UUID: string) => isNotEmpty(UUID))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the item's name
|
||||
*/
|
||||
getItemName(): Observable<string> {
|
||||
return this.item$.pipe(
|
||||
map((item: Item) => this.nameService.getName(item))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return all item's bundles
|
||||
*
|
||||
* @return an observable that emits all item's bundles
|
||||
*/
|
||||
getItemBundles(): Observable<Bundle[]> {
|
||||
return this.bundles$.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Get all bundles per item
|
||||
* and all the bitstreams per bundle
|
||||
* @param page number of current page
|
||||
*/
|
||||
getBundlesPerItem(page: number = 1) {
|
||||
this.item$ = this.route.data.pipe(
|
||||
map((data) => data.dso),
|
||||
getFirstSucceededRemoteDataWithNotEmptyPayload(),
|
||||
map((item: Item) => this.linkService.resolveLink(
|
||||
item,
|
||||
followLink('bundles', {}, followLink('bitstreams'))
|
||||
followLink('bundles', {findListOptions: {currentPage : page, elementsPerPage: this.bundlesPerPage}}, followLink('bitstreams'))
|
||||
))
|
||||
) as Observable<Item>;
|
||||
|
||||
const bundles$: Observable<PaginatedList<Bundle>> = this.item$.pipe(
|
||||
const bundles$: Observable<PaginatedList<Bundle>> = this.item$.pipe(
|
||||
filter((item: Item) => isNotEmpty(item.bundles)),
|
||||
mergeMap((item: Item) => item.bundles),
|
||||
getFirstSucceededRemoteDataWithNotEmptyPayload(),
|
||||
@@ -96,37 +170,36 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
|
||||
take(1),
|
||||
map((list: PaginatedList<Bundle>) => list.page)
|
||||
).subscribe((bundles: Bundle[]) => {
|
||||
this.bundles$.next(bundles);
|
||||
if (isEqual(bundles.length,0) || bundles.length < this.bundlesPerPage) {
|
||||
this.allBundlesLoaded = true;
|
||||
}
|
||||
if (isEqual(page, 1)) {
|
||||
this.bundles$.next(bundles);
|
||||
} else {
|
||||
this.bundles$.next(this.bundles$.getValue().concat(bundles));
|
||||
}
|
||||
}),
|
||||
bundles$.pipe(
|
||||
take(1),
|
||||
mergeMap((list: PaginatedList<Bundle>) => list.page),
|
||||
map((bundle: Bundle) => ({ id: bundle.id, bitstreams: this.getBundleBitstreams(bundle) }))
|
||||
).subscribe((entry: BundleBitstreamsMapEntry) => {
|
||||
this.bundleBitstreamsMap.set(entry.id, entry.bitstreams);
|
||||
let bitstreamMapValues: BitstreamMapValue = {
|
||||
isCollapsed: true,
|
||||
allBitstreamsLoaded: false,
|
||||
bitstreams: null
|
||||
};
|
||||
bitstreamMapValues.bitstreams = entry.bitstreams.pipe(
|
||||
map((b: PaginatedList<Bitstream>) => {
|
||||
bitstreamMapValues.allBitstreamsLoaded = b?.page.length < this.bitstreamSize;
|
||||
return [...b.page.slice(0, this.bitstreamSize)];
|
||||
})
|
||||
);
|
||||
this.bundleBitstreamsMap.set(entry.id, bitstreamMapValues);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the item's UUID
|
||||
*/
|
||||
getItemUUID(): Observable<string> {
|
||||
return this.item$.pipe(
|
||||
map((item: Item) => item.id),
|
||||
first((UUID: string) => isNotEmpty(UUID))
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return all item's bundles
|
||||
*
|
||||
* @return an observable that emits all item's bundles
|
||||
*/
|
||||
getItemBundles(): Observable<Bundle[]> {
|
||||
return this.bundles$.asObservable();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return all bundle's bitstreams
|
||||
*
|
||||
@@ -142,6 +215,46 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes the collapsible state of the area that contains the bitstream list
|
||||
* @param bundleId Id of bundle responsible for the requested bitstreams
|
||||
*/
|
||||
collapseArea(bundleId: string) {
|
||||
this.bundleBitstreamsMap.get(bundleId).isCollapsed = !this.bundleBitstreamsMap.get(bundleId).isCollapsed;
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads as much bundles as initial value of bundleSize to be displayed
|
||||
*/
|
||||
onBundleLoad(){
|
||||
this.bundlesPageSize ++;
|
||||
this.getBundlesPerItem(this.bundlesPageSize);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates the bitstreams that are going to be loaded on demand,
|
||||
* based on the number configured on this.bitstreamSize.
|
||||
* @param bundle parent of bitstreams that are requested to be shown
|
||||
* @returns Subscription
|
||||
*/
|
||||
onBitstreamsLoad(bundle: Bundle) {
|
||||
return this.getBundleBitstreams(bundle).subscribe((res: PaginatedList<Bitstream>) => {
|
||||
let nextBitstreams = res?.page.slice(this.bitstreamPageSize, this.bitstreamPageSize + this.bitstreamSize);
|
||||
let bitstreamsToShow = this.bundleBitstreamsMap.get(bundle.id).bitstreams.pipe(
|
||||
map((existingBits: Bitstream[])=> {
|
||||
return [... existingBits, ...nextBitstreams];
|
||||
})
|
||||
);
|
||||
this.bitstreamPageSize = this.bitstreamPageSize + this.bitstreamSize;
|
||||
let bitstreamMapValues: BitstreamMapValue = {
|
||||
bitstreams: bitstreamsToShow ,
|
||||
isCollapsed: this.bundleBitstreamsMap.get(bundle.id).isCollapsed,
|
||||
allBitstreamsLoaded: res?.page.length <= this.bitstreamPageSize
|
||||
};
|
||||
this.bundleBitstreamsMap.set(bundle.id, bitstreamMapValues);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Unsubscribe from all subscriptions
|
||||
*/
|
||||
@@ -151,3 +264,9 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
|
||||
.forEach((subscription) => subscription.unsubscribe());
|
||||
}
|
||||
}
|
||||
|
||||
export interface BitstreamMapValue {
|
||||
bitstreams: Observable<Bitstream[]>;
|
||||
isCollapsed: boolean;
|
||||
allBitstreamsLoaded: boolean;
|
||||
}
|
||||
|
||||
@@ -50,3 +50,7 @@
|
||||
cursor: grabbing;
|
||||
}
|
||||
}
|
||||
|
||||
:host ::ng-deep .larger-tooltip .tooltip-inner {
|
||||
max-width: 500px;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user