mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge branch 'master' into submission-miscellaneous-fixes
This commit is contained in:
Giuseppe Digilio
@@ -11,7 +11,7 @@ language: node_js
|
|||||||
|
|
||||||
node_js:
|
node_js:
|
||||||
- "8"
|
- "8"
|
||||||
- "9"
|
- "10"
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
yarn: true
|
yarn: true
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ If you're looking for the 2016 Angular 2 DSpace UI prototype, you can find it [h
|
|||||||
Quick start
|
Quick start
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
**Ensure you're running [Node](https://nodejs.org) >= `v8.0.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) >= `v1.x`**
|
**Ensure you're running [Node](https://nodejs.org) `v8.0.x` or `v10.0.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) >= `v1.x`**
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# clone the repo
|
# clone the repo
|
||||||
@@ -65,7 +65,7 @@ Requirements
|
|||||||
------------
|
------------
|
||||||
|
|
||||||
- [Node.js](https://nodejs.org), [npm](https://www.npmjs.com/), and [yarn](https://yarnpkg.com)
|
- [Node.js](https://nodejs.org), [npm](https://www.npmjs.com/), and [yarn](https://yarnpkg.com)
|
||||||
- Ensure you're running node >= `v8.x`, npm >= `v5.x` and yarn >= `v1.x`
|
- Ensure you're running node `v8.x` or `v10.x`, npm >= `v5.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.
|
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.
|
||||||
|
|
||||||
|
|||||||
20
package.json
20
package.json
@@ -8,7 +8,7 @@
|
|||||||
},
|
},
|
||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8.0.0"
|
"node": "8.* || >= 10.*"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"global": "npm install -g @angular/cli marked node-gyp nodemon node-nightly npm-check-updates npm-run-all rimraf typescript ts-node typedoc webpack webpack-bundle-analyzer pm2 rollup",
|
"global": "npm install -g @angular/cli marked node-gyp nodemon node-nightly npm-check-updates npm-run-all rimraf typescript ts-node typedoc webpack webpack-bundle-analyzer pm2 rollup",
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
"debug:server": "node-nightly --inspect --debug-brk dist/server.js",
|
"debug:server": "node-nightly --inspect --debug-brk dist/server.js",
|
||||||
"debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --mode development",
|
"debug:build": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --mode development",
|
||||||
"debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --env.aot --env.client --env.server --mode production",
|
"debug:build:prod": "node-nightly --inspect --debug-brk node_modules/webpack/bin/webpack.js --env.aot --env.client --env.server --mode production",
|
||||||
"ci": "yarn run lint && yarn run build:aot && yarn run test:headless && npm-run-all -p -r server e2e",
|
"ci": "yarn run lint && yarn run build:aot && yarn run test:headless",
|
||||||
"protractor": "node node_modules/protractor/bin/protractor",
|
"protractor": "node node_modules/protractor/bin/protractor",
|
||||||
"pree2e": "yarn run webdriver:update",
|
"pree2e": "yarn run webdriver:update",
|
||||||
"e2e": "yarn run protractor",
|
"e2e": "yarn run protractor",
|
||||||
@@ -62,7 +62,9 @@
|
|||||||
"webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone --gecko false",
|
"webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone --gecko false",
|
||||||
"lint": "tslint \"src/**/*.ts\" && tslint \"e2e/**/*.ts\"",
|
"lint": "tslint \"src/**/*.ts\" && tslint \"e2e/**/*.ts\"",
|
||||||
"docs": "typedoc --options typedoc.json ./src/",
|
"docs": "typedoc --options typedoc.json ./src/",
|
||||||
"coverage": "http-server -c-1 -o -p 9875 ./coverage"
|
"coverage": "http-server -c-1 -o -p 9875 ./coverage",
|
||||||
|
"postinstall": "yarn run patch-protractor",
|
||||||
|
"patch-protractor": "ncp node_modules/webdriver-manager node_modules/protractor/node_modules/webdriver-manager"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^6.1.4",
|
"@angular/animations": "^6.1.4",
|
||||||
@@ -120,7 +122,7 @@
|
|||||||
"ngx-moment": "^3.1.0",
|
"ngx-moment": "^3.1.0",
|
||||||
"ngx-pagination": "3.0.3",
|
"ngx-pagination": "3.0.3",
|
||||||
"nouislider": "^11.0.0",
|
"nouislider": "^11.0.0",
|
||||||
"pem": "1.12.3",
|
"pem": "1.13.2",
|
||||||
"reflect-metadata": "0.1.12",
|
"reflect-metadata": "0.1.12",
|
||||||
"rxjs": "6.2.2",
|
"rxjs": "6.2.2",
|
||||||
"rxjs-spy": "^7.5.1",
|
"rxjs-spy": "^7.5.1",
|
||||||
@@ -167,7 +169,7 @@
|
|||||||
"codelyzer": "^4.4.4",
|
"codelyzer": "^4.4.4",
|
||||||
"compression-webpack-plugin": "^1.1.6",
|
"compression-webpack-plugin": "^1.1.6",
|
||||||
"copy-webpack-plugin": "^4.4.1",
|
"copy-webpack-plugin": "^4.4.1",
|
||||||
"copyfiles": "^2.1.0",
|
"copyfiles": "^2.1.1",
|
||||||
"coveralls": "3.0.0",
|
"coveralls": "3.0.0",
|
||||||
"css-loader": "1.0.0",
|
"css-loader": "1.0.0",
|
||||||
"cssnano": "^4.1.10",
|
"cssnano": "^4.1.10",
|
||||||
@@ -190,8 +192,9 @@
|
|||||||
"karma-remap-coverage": "^0.1.5",
|
"karma-remap-coverage": "^0.1.5",
|
||||||
"karma-remap-istanbul": "0.6.0",
|
"karma-remap-istanbul": "0.6.0",
|
||||||
"karma-sourcemap-loader": "0.3.7",
|
"karma-sourcemap-loader": "0.3.7",
|
||||||
"karma-webdriver-launcher": "1.0.5",
|
"karma-webdriver-launcher": "^1.0.7",
|
||||||
"karma-webpack": "3.0.0",
|
"karma-webpack": "3.0.0",
|
||||||
|
"ncp": "^2.0.0",
|
||||||
"ngrx-store-freeze": "^0.2.4",
|
"ngrx-store-freeze": "^0.2.4",
|
||||||
"node-sass": "^4.11.0",
|
"node-sass": "^4.11.0",
|
||||||
"nodemon": "^1.15.0",
|
"nodemon": "^1.15.0",
|
||||||
@@ -204,7 +207,7 @@
|
|||||||
"postcss-loader": "^3.0.0",
|
"postcss-loader": "^3.0.0",
|
||||||
"postcss-responsive-type": "1.0.0",
|
"postcss-responsive-type": "1.0.0",
|
||||||
"postcss-smart-import": "0.7.6",
|
"postcss-smart-import": "0.7.6",
|
||||||
"protractor": "^5.3.0",
|
"protractor": "^5.4.2",
|
||||||
"protractor-istanbul-plugin": "2.0.0",
|
"protractor-istanbul-plugin": "2.0.0",
|
||||||
"raw-loader": "0.5.1",
|
"raw-loader": "0.5.1",
|
||||||
"resolve-url-loader": "^2.3.0",
|
"resolve-url-loader": "^2.3.0",
|
||||||
@@ -225,10 +228,11 @@
|
|||||||
"tslint": "5.11.0",
|
"tslint": "5.11.0",
|
||||||
"typedoc": "^0.9.0",
|
"typedoc": "^0.9.0",
|
||||||
"typescript": "^2.9.1",
|
"typescript": "^2.9.1",
|
||||||
|
"webdriver-manager": "^12.1.6",
|
||||||
"webpack": "^4.17.1",
|
"webpack": "^4.17.1",
|
||||||
"webpack-bundle-analyzer": "^3.3.2",
|
"webpack-bundle-analyzer": "^3.3.2",
|
||||||
"webpack-dev-middleware": "3.2.0",
|
"webpack-dev-middleware": "3.2.0",
|
||||||
"webpack-dev-server": "^3.1.5",
|
"webpack-dev-server": "^3.1.11",
|
||||||
"webpack-import-glob-loader": "^1.6.3",
|
"webpack-import-glob-loader": "^1.6.3",
|
||||||
"webpack-merge": "4.1.4",
|
"webpack-merge": "4.1.4",
|
||||||
"webpack-node-externals": "1.7.2"
|
"webpack-node-externals": "1.7.2"
|
||||||
|
|||||||
@@ -1,277 +1,149 @@
|
|||||||
{
|
{
|
||||||
"footer": {
|
"404.help": "Nepodařilo se najít stránku, kterou hledáte. Je možné, že stránka byla přesunuta nebo smazána. Pomocí tlačítka níže můžete přejít na domovskou stránku. ",
|
||||||
"copyright": "copyright © 2002-{{ year }}",
|
"404.link.home-page": "Přejít na domovskou stránku",
|
||||||
"link.dspace": "software DSpace",
|
"404.page-not-found": "stránka nenalezena",
|
||||||
"link.duraspace": "DuraSpace"
|
"admin.registries.bitstream-formats.description": "Tento seznam formátů souborů poskytuje informace o známých formátech a o úrovni jejich podpory.",
|
||||||
},
|
"admin.registries.bitstream-formats.formats.no-items": "Žádné formáty souborů.",
|
||||||
"collection": {
|
"admin.registries.bitstream-formats.formats.table.internal": "interní",
|
||||||
"page": {
|
"admin.registries.bitstream-formats.formats.table.mimetype": "Typ MIME",
|
||||||
"news": "Novinky",
|
"admin.registries.bitstream-formats.formats.table.name": "Název",
|
||||||
"license": "Licence",
|
"admin.registries.bitstream-formats.formats.table.supportLevel.0": "Neznámá",
|
||||||
"browse": {
|
"admin.registries.bitstream-formats.formats.table.supportLevel.1": "Známá",
|
||||||
"recent": {
|
"admin.registries.bitstream-formats.formats.table.supportLevel.2": "Podpora",
|
||||||
"head": "Poslední příspěvky"
|
"admin.registries.bitstream-formats.formats.table.supportLevel.head": "Úroveň podpory",
|
||||||
}
|
"admin.registries.bitstream-formats.head": "Registr formátů souborů",
|
||||||
}
|
"admin.registries.bitstream-formats.title": "DSpace Angular :: Registr formátů souborů",
|
||||||
}
|
"admin.registries.metadata.description": "Registr metadat je seznam všech metadatových polí dostupných v repozitáři. Tyto pole mohou být rozdělena do více schémat. DSpace však vyžaduje použití schématu kvalifikový Dublin Core.",
|
||||||
},
|
"admin.registries.metadata.head": "Registr metadat",
|
||||||
"community": {
|
"admin.registries.metadata.schemas.no-items": "Žádná schémata metadat.",
|
||||||
"page": {
|
"admin.registries.metadata.schemas.table.id": "ID",
|
||||||
"news": "Novinky",
|
"admin.registries.metadata.schemas.table.name": "Název",
|
||||||
"license": "Licence"
|
"admin.registries.metadata.schemas.table.namespace": "Jmenný prostor",
|
||||||
},
|
"admin.registries.metadata.title": "DSpace Angular :: Registr metadat",
|
||||||
"sub-collection-list": {
|
"admin.registries.schema.description": "Toto je schéma metadat pro „{{namespace}}“.",
|
||||||
"head": "Kolekce v této komunitě"
|
"admin.registries.schema.fields.head": "Pole schématu metadat",
|
||||||
}
|
"admin.registries.schema.fields.no-items": "Žádná metadatová pole.",
|
||||||
},
|
"admin.registries.schema.fields.table.field": "Pole",
|
||||||
"item": {
|
"admin.registries.schema.fields.table.scopenote": "Poznámka o rozsahu",
|
||||||
"page": {
|
"admin.registries.schema.head": "Metadata Schema",
|
||||||
"author": "Autor",
|
"admin.registries.schema.title": "DSpace Angular :: Registr schémat metadat",
|
||||||
"abstract": "Abstract",
|
"auth.errors.invalid-user": "Neplatná e-mailová adresa nebo heslo.",
|
||||||
"date": "Datum",
|
"auth.messages.expired": "Vaše relace vypršela. Prosím, znova se přihlaste.",
|
||||||
"uri": "URI",
|
"browse.title": "Prohlížíte {{ collection }} dle {{ field }} {{ value }}",
|
||||||
"files": "Soubory",
|
"collection.page.browse.recent.head": "Poslední příspěvky",
|
||||||
"collections": "Kolekce",
|
"collection.page.license": "Licence",
|
||||||
"filesection": {
|
"collection.page.news": "Novinky",
|
||||||
"download": "Stáhnout",
|
"community.page.license": "Licence",
|
||||||
"name": "Název:",
|
"community.page.news": "Novinky",
|
||||||
"format": "Formát:",
|
"community.sub-collection-list.head": "Kolekce v této komunitě",
|
||||||
"size": "Velikost:",
|
"error.browse-by": "Chyba během stahování záznamů",
|
||||||
"description": "Popis:"
|
"error.collection": "Chyba během stahování kolekce",
|
||||||
},
|
"error.community": "Chyba během stahování komunity",
|
||||||
"link": {
|
"error.default": "Chyba",
|
||||||
"simple": "Minimální záznam",
|
"error.item": "Chyba během stahování záznamu",
|
||||||
"full": "Úplný záznam"
|
"error.objects": "Chyba během stahování objektů",
|
||||||
}
|
"error.recent-submissions": "Chyba během stahování posledních příspěvků",
|
||||||
}
|
"error.search-results": "Chyba během stahování výsledků hledání",
|
||||||
},
|
"error.sub-collections": "Chyba během stahování subkolekcí",
|
||||||
"nav": {
|
"error.top-level-communities": "Chyba během stahování komunit nejvyšší úrovně",
|
||||||
"home": "Domů",
|
"error.validation.license.notgranted": "Pro dokončení zaslání Musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat.",
|
||||||
"login": "Přihlásit se",
|
"error.validation.pattern": "Tento vstup je omezen dle vzoru: {{ pattern }}.",
|
||||||
"logout": "Odhlásit se"
|
"footer.copyright": "copyright © 2002-{{ year }}",
|
||||||
},
|
"footer.link.dspace": "software DSpace",
|
||||||
"pagination": {
|
"footer.link.duraspace": "DuraSpace",
|
||||||
"results-per-page": "Výsledků na stránku",
|
"form.cancel": "Zrušit",
|
||||||
"sort-direction": "Seřazení",
|
"form.first-name": "Křestní jméno",
|
||||||
"showing": {
|
"form.group-collapse": "Sbalit",
|
||||||
"label": "Zobrazují se záznamy ",
|
"form.group-collapse-help": "Kliknutím sem sbalíte",
|
||||||
"detail": "{{ range }} z {{ total }}"
|
"form.group-expand": "Rozbalit",
|
||||||
}
|
"form.group-expand-help": "Kliknutím sem rozbalíte a přidáte další prvky",
|
||||||
},
|
"form.last-name": "Příjmení",
|
||||||
"sorting": {
|
"form.loading": "Načítá se...",
|
||||||
"score": {
|
"form.no-results": "Nebyli nalezeny žádné výsledky",
|
||||||
"DESC": "Relevance"
|
"form.no-value": "Nebyla zadána hodnota",
|
||||||
},
|
"form.remove": "Smazat",
|
||||||
"dc.title": {
|
"form.search": "Hledat",
|
||||||
"ASC": "Název vzestupně",
|
"form.submit": "Odeslat",
|
||||||
"DESC": "Název sestupně"
|
"home.description": "",
|
||||||
}
|
"home.title": "DSpace Angular :: Domů",
|
||||||
},
|
"home.top-level-communities.head": "Komunity v DSpace",
|
||||||
"title": "DSpace",
|
"home.top-level-communities.help": "Vybráním komunity můžete prohlížet její kolekce.",
|
||||||
"404": {
|
"item.page.abstract": "Abstract",
|
||||||
"help": "Nepodařilo se najít stránku, kterou hledáte. Je možné, že stránka byla přesunuta nebo smazána. Pomocí tlačítka níže můžete přejít na domovskou stránku. ",
|
"item.page.author": "Autor",
|
||||||
"page-not-found": "stránka nenalezena",
|
"item.page.collections": "Kolekce",
|
||||||
"link": {
|
"item.page.date": "Datum",
|
||||||
"home-page": "Přejít na domovskou stránku"
|
"item.page.files": "Soubory",
|
||||||
}
|
"item.page.filesection.description": "Popis:",
|
||||||
},
|
"item.page.filesection.download": "Stáhnout",
|
||||||
"home": {
|
"item.page.filesection.format": "Formát:",
|
||||||
"title": "DSpace Angular :: Domů",
|
"item.page.filesection.name": "Název:",
|
||||||
"description": "",
|
"item.page.filesection.size": "Velikost:",
|
||||||
"top-level-communities": {
|
"item.page.link.full": "Úplný záznam",
|
||||||
"head": "Komunity v DSpace",
|
"item.page.link.simple": "Minimální záznam",
|
||||||
"help": "Vybráním komunity můžete prohlížet její kolekce."
|
"item.page.uri": "URI",
|
||||||
}
|
"loading.browse-by": "Načítají se záznamy...",
|
||||||
},
|
"loading.collection": "Načítá se kolekce...",
|
||||||
"search": {
|
"loading.community": "Načítá se komunita...",
|
||||||
"title": "DSpace Angular :: Hledat",
|
"loading.default": "Načítá se...",
|
||||||
"description": "",
|
"loading.item": "Načítá se záznam...",
|
||||||
"form": {
|
"loading.objects": "Načítá se...",
|
||||||
"search": "Hledat",
|
"loading.recent-submissions": "Načítají se poslední příspěvky...",
|
||||||
"search_dspace": "Hledat v DSpace"
|
"loading.search-results": "Načítají se výsledky hledání...",
|
||||||
},
|
"loading.sub-collections": "Načítají se subkolekce...",
|
||||||
"results": {
|
"loading.top-level-communities": "Načítají se komunity nejvyšší úrovně...",
|
||||||
"head": "Výsledky hledání",
|
"login.form.email": "E-mailová adresa",
|
||||||
"no-results": "Nebyli nalezeny žádné výsledky"
|
"login.form.forgot-password": "Zapomněli jste své heslo?",
|
||||||
},
|
"login.form.header": "Prosím, přihlaste se do DSpace",
|
||||||
"sidebar": {
|
"login.form.new-user": "Nový uživatel? Zaregistrujte se kliknutím sem.",
|
||||||
"close": "Zpět na výsledky",
|
"login.form.password": "Heslo",
|
||||||
"open": "Vyhledávací nástroje",
|
"login.form.submit": "Přihlásit se",
|
||||||
"results": "výsledky",
|
"login.title": "Přihlásit se",
|
||||||
"filters": {
|
"logout.form.header": "Odhlásit se z DSpace",
|
||||||
"title": "Filtry"
|
"logout.form.submit": "Odhlásit se",
|
||||||
},
|
"logout.title": "Odhlásit se",
|
||||||
"settings": {
|
"nav.home": "Domů",
|
||||||
"title": "Nastavení",
|
"nav.login": "Přihlásit se",
|
||||||
"sort-by": "Řadit dle",
|
"nav.logout": "Odhlásit se",
|
||||||
"rpp": "Výsledků na stránku"
|
"pagination.results-per-page": "Výsledků na stránku",
|
||||||
}
|
"pagination.showing.detail": "{{ range }} z {{ total }}",
|
||||||
},
|
"pagination.showing.label": "Zobrazují se záznamy ",
|
||||||
"view-switch": {
|
"pagination.sort-direction": "Seřazení",
|
||||||
"show-list": "Zobrazit seznam",
|
"search.description": "",
|
||||||
"show-grid": "Zobrazit mřížku"
|
"search.filters.applied.f.author": "Autor",
|
||||||
},
|
"search.filters.applied.f.dateIssued.max": "Do data",
|
||||||
"filters": {
|
"search.filters.applied.f.dateIssued.min": "Od data",
|
||||||
"head": "Filtry",
|
"search.filters.applied.f.has_content_in_original_bundle": "Má soubory",
|
||||||
"reset": "Obnovit filtry",
|
"search.filters.applied.f.subject": "Předmět",
|
||||||
"applied": {
|
"search.filters.filter.author.head": "Autor",
|
||||||
"f.author": "Autor",
|
"search.filters.filter.author.placeholder": "Jméno autora",
|
||||||
"f.dateIssued.min": "Od data",
|
"search.filters.filter.dateIssued.head": "Datum",
|
||||||
"f.dateIssued.max": "Do data",
|
"search.filters.filter.dateIssued.max.placeholder": "Datum od",
|
||||||
"f.subject": "Předmět",
|
"search.filters.filter.dateIssued.min.placeholder": "Datum do",
|
||||||
"f.has_content_in_original_bundle": "Má soubory"
|
"search.filters.filter.has_content_in_original_bundle.head": "Má soubory",
|
||||||
},
|
"search.filters.filter.scope.head": "Rozsah",
|
||||||
"filter": {
|
"search.filters.filter.scope.placeholder": "Filtr rozsahu",
|
||||||
"show-more": "Zobrazit více",
|
"search.filters.filter.show-less": "Sbalit",
|
||||||
"show-less": "Sbalit",
|
"search.filters.filter.show-more": "Zobrazit více",
|
||||||
"author": {
|
"search.filters.filter.subject.head": "Předmět",
|
||||||
"placeholder": "Jméno autora",
|
"search.filters.filter.subject.placeholder": "Předmět",
|
||||||
"head": "Autor"
|
"search.filters.head": "Filtry",
|
||||||
},
|
"search.filters.reset": "Obnovit filtry",
|
||||||
"scope": {
|
"search.form.search": "Hledat",
|
||||||
"placeholder": "Filtr rozsahu",
|
"search.form.search_dspace": "Hledat v DSpace",
|
||||||
"head": "Rozsah"
|
"search.results.head": "Výsledky hledání",
|
||||||
},
|
"search.results.no-results": "Nebyli nalezeny žádné výsledky",
|
||||||
"subject": {
|
"search.sidebar.close": "Zpět na výsledky",
|
||||||
"placeholder": "Předmět",
|
"search.sidebar.filters.title": "Filtry",
|
||||||
"head": "Předmět"
|
"search.sidebar.open": "Vyhledávací nástroje",
|
||||||
},
|
"search.sidebar.results": "výsledky",
|
||||||
"dateIssued": {
|
"search.sidebar.settings.rpp": "Výsledků na stránku",
|
||||||
"max": {
|
"search.sidebar.settings.sort-by": "Řadit dle",
|
||||||
"placeholder": "Datum od"
|
"search.sidebar.settings.title": "Nastavení",
|
||||||
},
|
"search.title": "DSpace Angular :: Hledat",
|
||||||
"min": {
|
"search.view-switch.show-grid": "Zobrazit mřížku",
|
||||||
"placeholder": "Datum do"
|
"search.view-switch.show-list": "Zobrazit seznam",
|
||||||
},
|
"sorting.dc.title.ASC": "Název vzestupně",
|
||||||
"head": "Datum"
|
"sorting.dc.title.DESC": "Název sestupně",
|
||||||
},
|
"sorting.score.DESC": "Relevance",
|
||||||
"has_content_in_original_bundle": {
|
"title": "DSpace"
|
||||||
"head": "Má soubory"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"browse": {
|
|
||||||
"title": "Prohlížíte {{ collection }} dle {{ field }} {{ value }}"
|
|
||||||
},
|
|
||||||
"admin": {
|
|
||||||
"registries": {
|
|
||||||
"metadata": {
|
|
||||||
"title": "DSpace Angular :: Registr metadat",
|
|
||||||
"head": "Registr metadat",
|
|
||||||
"description": "Registr metadat je seznam všech metadatových polí dostupných v repozitáři. Tyto pole mohou být rozdělena do více schémat. DSpace však vyžaduje použití schématu kvalifikový Dublin Core.",
|
|
||||||
"schemas": {
|
|
||||||
"table": {
|
|
||||||
"id": "ID",
|
|
||||||
"namespace": "Jmenný prostor",
|
|
||||||
"name": "Název"
|
|
||||||
},
|
|
||||||
"no-items": "Žádná schémata metadat."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"schema": {
|
|
||||||
"title": "DSpace Angular :: Registr schémat metadat",
|
|
||||||
"head": "Metadata Schema",
|
|
||||||
"description": "Toto je schéma metadat pro „{{namespace}}“.",
|
|
||||||
"fields": {
|
|
||||||
"head": "Pole schématu metadat",
|
|
||||||
"table": {
|
|
||||||
"field": "Pole",
|
|
||||||
"scopenote": "Poznámka o rozsahu"
|
|
||||||
},
|
|
||||||
"no-items": "Žádná metadatová pole."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bitstream-formats": {
|
|
||||||
"title": "DSpace Angular :: Registr formátů souborů",
|
|
||||||
"head": "Registr formátů souborů",
|
|
||||||
"description": "Tento seznam formátů souborů poskytuje informace o známých formátech a o úrovni jejich podpory.",
|
|
||||||
"formats": {
|
|
||||||
"table": {
|
|
||||||
"name": "Název",
|
|
||||||
"mimetype": "Typ MIME",
|
|
||||||
"supportLevel": {
|
|
||||||
"head": "Úroveň podpory",
|
|
||||||
"0": "Neznámá",
|
|
||||||
"1": "Známá",
|
|
||||||
"2": "Podpora"
|
|
||||||
},
|
|
||||||
"internal": "interní"
|
|
||||||
},
|
|
||||||
"no-items": "Žádné formáty souborů."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"loading": {
|
|
||||||
"default": "Načítá se...",
|
|
||||||
"top-level-communities": "Načítají se komunity nejvyšší úrovně...",
|
|
||||||
"community": "Načítá se komunita...",
|
|
||||||
"collection": "Načítá se kolekce...",
|
|
||||||
"sub-collections": "Načítají se subkolekce...",
|
|
||||||
"recent-submissions": "Načítají se poslední příspěvky...",
|
|
||||||
"item": "Načítá se záznam...",
|
|
||||||
"objects": "Načítá se...",
|
|
||||||
"search-results": "Načítají se výsledky hledání...",
|
|
||||||
"browse-by": "Načítají se záznamy..."
|
|
||||||
},
|
|
||||||
"error": {
|
|
||||||
"default": "Chyba",
|
|
||||||
"top-level-communities": "Chyba během stahování komunit nejvyšší úrovně",
|
|
||||||
"community": "Chyba během stahování komunity",
|
|
||||||
"collection": "Chyba během stahování kolekce",
|
|
||||||
"sub-collections": "Chyba během stahování subkolekcí",
|
|
||||||
"recent-submissions": "Chyba během stahování posledních příspěvků",
|
|
||||||
"item": "Chyba během stahování záznamu",
|
|
||||||
"objects": "Chyba během stahování objektů",
|
|
||||||
"search-results": "Chyba během stahování výsledků hledání",
|
|
||||||
"browse-by": "Chyba během stahování záznamů",
|
|
||||||
"validation": {
|
|
||||||
"pattern": "Tento vstup je omezen dle vzoru: {{ pattern }}.",
|
|
||||||
"license": {
|
|
||||||
"notgranted": "Pro dokončení zaslání Musíte udělit licenci. Pokud v tuto chvíli tuto licenci nemůžete udělit, můžete svou práci uložit a později se k svému příspěveku vrátit nebo jej smazat."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"form": {
|
|
||||||
"submit": "Odeslat",
|
|
||||||
"cancel": "Zrušit",
|
|
||||||
"search": "Hledat",
|
|
||||||
"remove": "Smazat",
|
|
||||||
"first-name": "Křestní jméno",
|
|
||||||
"last-name": "Příjmení",
|
|
||||||
"loading": "Načítá se...",
|
|
||||||
"no-results": "Nebyli nalezeny žádné výsledky",
|
|
||||||
"no-value": "Nebyla zadána hodnota",
|
|
||||||
"group-collapse": "Sbalit",
|
|
||||||
"group-expand": "Rozbalit",
|
|
||||||
"group-collapse-help": "Kliknutím sem sbalíte",
|
|
||||||
"group-expand-help": "Kliknutím sem rozbalíte a přidáte další prvky"
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"title": "Přihlásit se",
|
|
||||||
"form": {
|
|
||||||
"header": "Prosím, přihlaste se do DSpace",
|
|
||||||
"email": "E-mailová adresa",
|
|
||||||
"forgot-password": "Zapomněli jste své heslo?",
|
|
||||||
"new-user": "Nový uživatel? Zaregistrujte se kliknutím sem.",
|
|
||||||
"password": "Heslo",
|
|
||||||
"submit": "Přihlásit se"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"logout": {
|
|
||||||
"title": "Odhlásit se",
|
|
||||||
"form": {
|
|
||||||
"header": "Odhlásit se z DSpace",
|
|
||||||
"submit": "Odhlásit se"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"auth": {
|
|
||||||
"messages": {
|
|
||||||
"expired": "Vaše relace vypršela. Prosím, znova se přihlaste."
|
|
||||||
},
|
|
||||||
"errors": {
|
|
||||||
"invalid-user": "Neplatná e-mailová adresa nebo heslo."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,277 +1,149 @@
|
|||||||
{
|
{
|
||||||
"footer": {
|
"404.help": "Die Seite, die Sie aufrufen wollten, konnte nicht gefunden werden. Sie könnte verschoben oder gelöscht worden sein. Mit dem Link unten kommen Sie zurück zur Startseite. ",
|
||||||
"copyright": "Copyright © 2002-{{ year }}",
|
"404.link.home-page": "Zurück zur Startseite",
|
||||||
"link.dspace": "DSpace Software",
|
"404.page-not-found": "Seite nicht gefunden",
|
||||||
"link.duraspace": "DuraSpace"
|
"admin.registries.bitstream-formats.description": "Diese Liste enhtält die in diesem Repositorium zulässigen Dateiformate und den jeweiligen Unterstützungsgrad.",
|
||||||
},
|
"admin.registries.bitstream-formats.formats.no-items": "Es gibt keine Formate in dieser Referenzliste.",
|
||||||
"collection": {
|
"admin.registries.bitstream-formats.formats.table.internal": "intern",
|
||||||
"page": {
|
"admin.registries.bitstream-formats.formats.table.mimetype": "MIME Type",
|
||||||
"news": "Neuigkeiten",
|
"admin.registries.bitstream-formats.formats.table.name": "Name",
|
||||||
"license": "Lizenz",
|
"admin.registries.bitstream-formats.formats.table.supportLevel.0": "Unbekannt",
|
||||||
"browse": {
|
"admin.registries.bitstream-formats.formats.table.supportLevel.1": "Bekannt",
|
||||||
"recent": {
|
"admin.registries.bitstream-formats.formats.table.supportLevel.2": "Unterstützt",
|
||||||
"head": "Aktuellste Veröffentlichungen"
|
"admin.registries.bitstream-formats.formats.table.supportLevel.head": "Unterstützungsgrad",
|
||||||
}
|
"admin.registries.bitstream-formats.head": "Referenzliste der Dateiformate",
|
||||||
}
|
"admin.registries.bitstream-formats.title": "DSpace Angular :: Referenzliste der Dateiformate",
|
||||||
}
|
"admin.registries.metadata.description": "Die Metadatenreferenzliste beinhaltet alle Metadatenfelder, die zur Verfügung stehen. Die Felder können in unterschiedlichen Schemata enthalten sein. Nichtsdestotrotz benötigt DSpace mindestens qualifiziertes Dublin Core.",
|
||||||
},
|
"admin.registries.metadata.head": "Metadatenreferenzliste",
|
||||||
"community": {
|
"admin.registries.metadata.schemas.no-items": "Es gbit keine Metadatenschemata.",
|
||||||
"page": {
|
"admin.registries.metadata.schemas.table.id": "ID",
|
||||||
"news": "Neuigkeiten",
|
"admin.registries.metadata.schemas.table.name": "Name",
|
||||||
"license": "Lizenz"
|
"admin.registries.metadata.schemas.table.namespace": "Namensraum",
|
||||||
},
|
"admin.registries.metadata.title": "DSpace Angular :: Metadatenreferenzliste",
|
||||||
"sub-collection-list": {
|
"admin.registries.schema.description": "Dies ist das Metadatenschema für \"{{namespace}}\".",
|
||||||
"head": "Sammlungen in diesem Bereich"
|
"admin.registries.schema.fields.head": "Felder in diesem Schema",
|
||||||
}
|
"admin.registries.schema.fields.no-items": "Es gibt keine Felder in diesem Schema.",
|
||||||
},
|
"admin.registries.schema.fields.table.field": "Feld",
|
||||||
"item": {
|
"admin.registries.schema.fields.table.scopenote": "Gültigkeitsbereich",
|
||||||
"page": {
|
"admin.registries.schema.head": "Metadatenschemata",
|
||||||
"author": "Autor",
|
"admin.registries.schema.title": "DSpace Angular :: Referenzliste der Metadatenschemata",
|
||||||
"abstract": "Kurzfassung",
|
"auth.errors.invalid-user": "Ungültige E-Mail-Adresse oder Passwort.",
|
||||||
"date": "Datum",
|
"auth.messages.expired": "Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an.",
|
||||||
"uri": "URI",
|
"browse.title": "Anzeige {{ collection }} nach {{ field }} {{ value }}",
|
||||||
"files": "Dateien",
|
"collection.page.browse.recent.head": "Aktuellste Veröffentlichungen",
|
||||||
"collections": "Sammlungen",
|
"collection.page.license": "Lizenz",
|
||||||
"filesection": {
|
"collection.page.news": "Neuigkeiten",
|
||||||
"download": "Herunterladen",
|
"community.page.license": "Lizenz",
|
||||||
"name": "Name:",
|
"community.page.news": "Neuigkeiten",
|
||||||
"format": "Format:",
|
"community.sub-collection-list.head": "Sammlungen in diesem Bereich",
|
||||||
"size": "Größe:",
|
"error.browse-by": "Fehler beim Laden der Ressourcen",
|
||||||
"description": "Beschreibung:"
|
"error.collection": "Fehler beim Laden der Sammlung.",
|
||||||
},
|
"error.community": "Fehler beim Laden des Bereiches.",
|
||||||
"link": {
|
"error.default": "Fehler",
|
||||||
"simple": "Kurzanzeige",
|
"error.item": "Fehler beim Laden der Ressource.",
|
||||||
"full": "Vollanzeige"
|
"error.objects": "Fehler beim Laden der Objekte.",
|
||||||
}
|
"error.recent-submissions": "Fehler beim Laden der aktuellsten Veröffentlichungen.",
|
||||||
}
|
"error.search-results": "Fehler beim Laden der Suchergebnisse.",
|
||||||
},
|
"error.sub-collections": "Fehler beim Laden der untergeordneten Sammlungen.",
|
||||||
"nav": {
|
"error.top-level-communities": "Fehler beim Laden der Hauptbereiche.",
|
||||||
"home": "Zur Startseite",
|
"error.validation.license.notgranted": "Sie müssen der Lizenz zustimmen, um die Ressource einzureichen. Wenn dies zur Zeit nicht geht, können Sie die Einreichung speichern und später wiederaufnehmen oder löschen.",
|
||||||
"login": "Anmelden",
|
"error.validation.pattern": "Die Eingabe kann nur folgendes Muster haben: {{ pattern }}.",
|
||||||
"logout": "Abmelden"
|
"footer.copyright": "Copyright © 2002-{{ year }}",
|
||||||
},
|
"footer.link.dspace": "DSpace Software",
|
||||||
"pagination": {
|
"footer.link.duraspace": "DuraSpace",
|
||||||
"results-per-page": "Ergebnisse pro Seite",
|
"form.cancel": "Abbrechen",
|
||||||
"sort-direction": "Sortiermöglichkeiten",
|
"form.first-name": "Vorname",
|
||||||
"showing": {
|
"form.group-collapse": "Weniger",
|
||||||
"label": "Anzeige der Treffer ",
|
"form.group-collapse-help": "Hier klicken, um die Anzeige zu reduzieren",
|
||||||
"detail": "{{ range }} bis {{ total }}"
|
"form.group-expand": "Mehr",
|
||||||
}
|
"form.group-expand-help": "Hier klicken, um mehr Elemente anzuzeigen",
|
||||||
},
|
"form.last-name": "Nachname",
|
||||||
"sorting": {
|
"form.loading": "Am Laden ...",
|
||||||
"score": {
|
"form.no-results": "Keine Ergebnisse gefunden",
|
||||||
"DESC": "Relevanz"
|
"form.no-value": "Kein Wert eingegeben",
|
||||||
},
|
"form.remove": "Löschen",
|
||||||
"dc.title": {
|
"form.search": "Suchen",
|
||||||
"ASC": "Titel aufsteigend",
|
"form.submit": "Los",
|
||||||
"DESC": "Titel absteigend"
|
"home.description": "",
|
||||||
}
|
"home.title": "DSpace Angular :: Startseite",
|
||||||
},
|
"home.top-level-communities.head": "Bereiche in DSpace",
|
||||||
"title": "DSpace",
|
"home.top-level-communities.help": "Wählen Sie einen Bereich, um seine Sammlungen einzusehen.",
|
||||||
"404": {
|
"item.page.abstract": "Kurzfassung",
|
||||||
"help": "Die Seite, die Sie aufrufen wollten, konnte nicht gefunden werden. Sie könnte verschoben oder gelöscht worden sein. Mit dem Link unten kommen Sie zurück zur Startseite. ",
|
"item.page.author": "Autor",
|
||||||
"page-not-found": "Seite nicht gefunden",
|
"item.page.collections": "Sammlungen",
|
||||||
"link": {
|
"item.page.date": "Datum",
|
||||||
"home-page": "Zurück zur Startseite"
|
"item.page.files": "Dateien",
|
||||||
}
|
"item.page.filesection.description": "Beschreibung:",
|
||||||
},
|
"item.page.filesection.download": "Herunterladen",
|
||||||
"home": {
|
"item.page.filesection.format": "Format:",
|
||||||
"title": "DSpace Angular :: Startseite",
|
"item.page.filesection.name": "Name:",
|
||||||
"description": "",
|
"item.page.filesection.size": "Größe:",
|
||||||
"top-level-communities": {
|
"item.page.link.full": "Vollanzeige",
|
||||||
"head": "Bereiche in DSpace",
|
"item.page.link.simple": "Kurzanzeige",
|
||||||
"help": "Wählen Sie einen Bereich, um seine Sammlungen einzusehen."
|
"item.page.uri": "URI",
|
||||||
}
|
"loading.browse-by": "Die Ressourcen werden geladen ...",
|
||||||
},
|
"loading.collection": "Die Sammlung wird geladen ...",
|
||||||
"search": {
|
"loading.community": "Der Bereich wird geladen ...",
|
||||||
"title": "DSpace Angular :: Suche",
|
"loading.default": "Am Laden ...",
|
||||||
"description": "",
|
"loading.item": "Die Ressource wird geladen ...",
|
||||||
"form": {
|
"loading.objects": "Am Laden ...",
|
||||||
"search": "Suche",
|
"loading.recent-submissions": "Die aktuellsten Veröffentlichungen werden geladen ...",
|
||||||
"search_dspace": "DSpace durchsuchen"
|
"loading.search-results": "Die Suchergebnisse werden geladen ...",
|
||||||
},
|
"loading.sub-collections": "Die untergeordneten Sammlungen werden geladen ...",
|
||||||
"results": {
|
"loading.top-level-communities": "Die Hauptbereiche werden geladen ...",
|
||||||
"head": "Suchergebnisse",
|
"login.form.email": "E-Mail-Adresse",
|
||||||
"no-results": "Zu dieser Suche gibt es keine Treffer."
|
"login.form.forgot-password": "Haben Sie Ihr Passwort vergessen?",
|
||||||
},
|
"login.form.header": "Bitte Loggen Sie sich ein.",
|
||||||
"sidebar": {
|
"login.form.new-user": "Sind Sie neu hier? Klicken Sie hier, um sich zu registrieren.",
|
||||||
"close": "Zurück zu den Ergebnissen",
|
"login.form.password": "Passwort",
|
||||||
"open": "Suchwerkzeuge",
|
"login.form.submit": "Einloggen",
|
||||||
"results": "Ergebnisse",
|
"login.title": "Einloggen",
|
||||||
"filters": {
|
"logout.form.header": "Ausloggen aus DSpace",
|
||||||
"title": "Filter"
|
"logout.form.submit": "Ausloggen",
|
||||||
},
|
"logout.title": "Ausloggen",
|
||||||
"settings": {
|
"nav.home": "Zur Startseite",
|
||||||
"title": "Einstellungen",
|
"nav.login": "Anmelden",
|
||||||
"sort-by": "Sortiere nach",
|
"nav.logout": "Abmelden",
|
||||||
"rpp": "Treffer pro Seite"
|
"pagination.results-per-page": "Ergebnisse pro Seite",
|
||||||
}
|
"pagination.showing.detail": "{{ range }} bis {{ total }}",
|
||||||
},
|
"pagination.showing.label": "Anzeige der Treffer ",
|
||||||
"view-switch": {
|
"pagination.sort-direction": "Sortiermöglichkeiten",
|
||||||
"show-list": "Zeige als Liste",
|
"search.description": "",
|
||||||
"show-grid": "Zeige als Raster"
|
"search.filters.applied.f.author": "Autor",
|
||||||
},
|
"search.filters.applied.f.dateIssued.max": "Enddatum",
|
||||||
"filters": {
|
"search.filters.applied.f.dateIssued.min": "Anfangsdatum",
|
||||||
"head": "Filter",
|
"search.filters.applied.f.has_content_in_original_bundle": "Besitzt Dateien",
|
||||||
"reset": "Filter zurücksetzen",
|
"search.filters.applied.f.subject": "Thema",
|
||||||
"applied": {
|
"search.filters.filter.author.head": "Autor",
|
||||||
"f.author": "Autor",
|
"search.filters.filter.author.placeholder": "Autor",
|
||||||
"f.dateIssued.min": "Anfangsdatum",
|
"search.filters.filter.dateIssued.head": "Datum",
|
||||||
"f.dateIssued.max": "Enddatum",
|
"search.filters.filter.dateIssued.max.placeholder": "Frühestes Datum",
|
||||||
"f.subject": "Thema",
|
"search.filters.filter.dateIssued.min.placeholder": "Ältestes Datum",
|
||||||
"f.has_content_in_original_bundle": "Besitzt Dateien"
|
"search.filters.filter.has_content_in_original_bundle.head": "Besitzt Dateien",
|
||||||
},
|
"search.filters.filter.scope.head": "Bereich",
|
||||||
"filter": {
|
"search.filters.filter.scope.placeholder": "Bereichsfilter",
|
||||||
"show-more": "Zeige mehr",
|
"search.filters.filter.show-less": "Zeige weniger",
|
||||||
"show-less": "Zeige weniger",
|
"search.filters.filter.show-more": "Zeige mehr",
|
||||||
"author": {
|
"search.filters.filter.subject.head": "Schlagwort",
|
||||||
"placeholder": "Autor",
|
"search.filters.filter.subject.placeholder": "Schlagwort",
|
||||||
"head": "Autor"
|
"search.filters.head": "Filter",
|
||||||
},
|
"search.filters.reset": "Filter zurücksetzen",
|
||||||
"scope": {
|
"search.form.search": "Suche",
|
||||||
"placeholder": "Bereichsfilter",
|
"search.form.search_dspace": "DSpace durchsuchen",
|
||||||
"head": "Bereich"
|
"search.results.head": "Suchergebnisse",
|
||||||
},
|
"search.results.no-results": "Zu dieser Suche gibt es keine Treffer.",
|
||||||
"subject": {
|
"search.sidebar.close": "Zurück zu den Ergebnissen",
|
||||||
"placeholder": "Schlagwort",
|
"search.sidebar.filters.title": "Filter",
|
||||||
"head": "Schlagwort"
|
"search.sidebar.open": "Suchwerkzeuge",
|
||||||
},
|
"search.sidebar.results": "Ergebnisse",
|
||||||
"dateIssued": {
|
"search.sidebar.settings.rpp": "Treffer pro Seite",
|
||||||
"max": {
|
"search.sidebar.settings.sort-by": "Sortiere nach",
|
||||||
"placeholder": "Frühestes Datum"
|
"search.sidebar.settings.title": "Einstellungen",
|
||||||
},
|
"search.title": "DSpace Angular :: Suche",
|
||||||
"min": {
|
"search.view-switch.show-grid": "Zeige als Raster",
|
||||||
"placeholder": "Ältestes Datum"
|
"search.view-switch.show-list": "Zeige als Liste",
|
||||||
},
|
"sorting.dc.title.ASC": "Titel aufsteigend",
|
||||||
"head": "Datum"
|
"sorting.dc.title.DESC": "Titel absteigend",
|
||||||
},
|
"sorting.score.DESC": "Relevanz",
|
||||||
"has_content_in_original_bundle": {
|
"title": "DSpace"
|
||||||
"head": "Besitzt Dateien"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"browse": {
|
|
||||||
"title": "Anzeige {{ collection }} nach {{ field }} {{ value }}"
|
|
||||||
},
|
|
||||||
"admin": {
|
|
||||||
"registries": {
|
|
||||||
"metadata": {
|
|
||||||
"title": "DSpace Angular :: Metadatenreferenzliste",
|
|
||||||
"head": "Metadatenreferenzliste",
|
|
||||||
"description": "Die Metadatenreferenzliste beinhaltet alle Metadatenfelder, die zur Verfügung stehen. Die Felder können in unterschiedlichen Schemata enthalten sein. Nichtsdestotrotz benötigt DSpace mindestens qualifiziertes Dublin Core.",
|
|
||||||
"schemas": {
|
|
||||||
"table": {
|
|
||||||
"id": "ID",
|
|
||||||
"namespace": "Namensraum",
|
|
||||||
"name": "Name"
|
|
||||||
},
|
|
||||||
"no-items": "Es gbit keine Metadatenschemata."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"schema": {
|
|
||||||
"title": "DSpace Angular :: Referenzliste der Metadatenschemata",
|
|
||||||
"head": "Metadatenschemata",
|
|
||||||
"description": "Dies ist das Metadatenschema für \"{{namespace}}\".",
|
|
||||||
"fields": {
|
|
||||||
"head": "Felder in diesem Schema",
|
|
||||||
"table": {
|
|
||||||
"field": "Feld",
|
|
||||||
"scopenote": "Gültigkeitsbereich"
|
|
||||||
},
|
|
||||||
"no-items": "Es gibt keine Felder in diesem Schema."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bitstream-formats": {
|
|
||||||
"title": "DSpace Angular :: Referenzliste der Dateiformate",
|
|
||||||
"head": "Referenzliste der Dateiformate",
|
|
||||||
"description": "Diese Liste enhtält die in diesem Repositorium zulässigen Dateiformate und den jeweiligen Unterstützungsgrad.",
|
|
||||||
"formats": {
|
|
||||||
"table": {
|
|
||||||
"name": "Name",
|
|
||||||
"mimetype": "MIME Type",
|
|
||||||
"supportLevel": {
|
|
||||||
"head": "Unterstützungsgrad",
|
|
||||||
"0": "Unbekannt",
|
|
||||||
"1": "Bekannt",
|
|
||||||
"2": "Unterstützt"
|
|
||||||
},
|
|
||||||
"internal": "intern"
|
|
||||||
},
|
|
||||||
"no-items": "Es gibt keine Formate in dieser Referenzliste."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"loading": {
|
|
||||||
"default": "Am Laden ...",
|
|
||||||
"top-level-communities": "Die Hauptbereiche werden geladen ...",
|
|
||||||
"community": "Der Bereich wird geladen ...",
|
|
||||||
"collection": "Die Sammlung wird geladen ...",
|
|
||||||
"sub-collections": "Die untergeordneten Sammlungen werden geladen ...",
|
|
||||||
"recent-submissions": "Die aktuellsten Veröffentlichungen werden geladen ...",
|
|
||||||
"item": "Die Ressource wird geladen ...",
|
|
||||||
"objects": "Am Laden ...",
|
|
||||||
"search-results": "Die Suchergebnisse werden geladen ...",
|
|
||||||
"browse-by": "Die Ressourcen werden geladen ..."
|
|
||||||
},
|
|
||||||
"error": {
|
|
||||||
"default": "Fehler",
|
|
||||||
"top-level-communities": "Fehler beim Laden der Hauptbereiche.",
|
|
||||||
"community": "Fehler beim Laden des Bereiches.",
|
|
||||||
"collection": "Fehler beim Laden der Sammlung.",
|
|
||||||
"sub-collections": "Fehler beim Laden der untergeordneten Sammlungen.",
|
|
||||||
"recent-submissions": "Fehler beim Laden der aktuellsten Veröffentlichungen.",
|
|
||||||
"item": "Fehler beim Laden der Ressource.",
|
|
||||||
"objects": "Fehler beim Laden der Objekte.",
|
|
||||||
"search-results": "Fehler beim Laden der Suchergebnisse.",
|
|
||||||
"browse-by": "Fehler beim Laden der Ressourcen",
|
|
||||||
"validation": {
|
|
||||||
"pattern": "Die Eingabe kann nur folgendes Muster haben: {{ pattern }}.",
|
|
||||||
"license": {
|
|
||||||
"notgranted": "Sie müssen der Lizenz zustimmen, um die Ressource einzureichen. Wenn dies zur Zeit nicht geht, können Sie die Einreichung speichern und später wiederaufnehmen oder löschen."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"form": {
|
|
||||||
"submit": "Los",
|
|
||||||
"cancel": "Abbrechen",
|
|
||||||
"search": "Suchen",
|
|
||||||
"remove": "Löschen",
|
|
||||||
"first-name": "Vorname",
|
|
||||||
"last-name": "Nachname",
|
|
||||||
"loading": "Am Laden ...",
|
|
||||||
"no-results": "Keine Ergebnisse gefunden",
|
|
||||||
"no-value": "Kein Wert eingegeben",
|
|
||||||
"group-collapse": "Weniger",
|
|
||||||
"group-expand": "Mehr",
|
|
||||||
"group-collapse-help": "Hier klicken, um die Anzeige zu reduzieren",
|
|
||||||
"group-expand-help": "Hier klicken, um mehr Elemente anzuzeigen"
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"title": "Einloggen",
|
|
||||||
"form": {
|
|
||||||
"header": "Bitte Loggen Sie sich ein.",
|
|
||||||
"email": "E-Mail-Adresse",
|
|
||||||
"forgot-password": "Haben Sie Ihr Passwort vergessen?",
|
|
||||||
"new-user": "Sind Sie neu hier? Klicken Sie hier, um sich zu registrieren.",
|
|
||||||
"password": "Passwort",
|
|
||||||
"submit": "Einloggen"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"logout": {
|
|
||||||
"title": "Ausloggen",
|
|
||||||
"form": {
|
|
||||||
"header": "Ausloggen aus DSpace",
|
|
||||||
"submit": "Ausloggen"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"auth": {
|
|
||||||
"messages": {
|
|
||||||
"expired": "Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an."
|
|
||||||
},
|
|
||||||
"errors": {
|
|
||||||
"invalid-user": "Ungültige E-Mail-Adresse oder Passwort."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,277 +1,149 @@
|
|||||||
{
|
{
|
||||||
"footer": {
|
"404.help": "De pagina die u zoekt kan niet gevonden worden. De pagina werd mogelijk verplaatst of verwijderd. U kan onderstaande knop gebruiken om terug naar de homepagina te gaan. ",
|
||||||
"copyright": "copyright © 2002-{{ year }}",
|
"404.link.home-page": "Terug naar de homepagina",
|
||||||
"link.dspace": "DSpace software",
|
"404.page-not-found": "Pagina niet gevonden",
|
||||||
"link.duraspace": "DuraSpace"
|
"admin.registries.bitstream-formats.description": "Deze lijst van Bitstream formaten biedt informatie over de formaten die in deze repository zijn toegelaten en op welke manier ze ondersteund worden. De term Bitstream wordt in DSpace gebruikt om een bestand aan te duiden dat samen met metadata onderdeel uitmaakt van een item. De naam bitstream duidt op het feit dat het bestand achterliggend wordt opgeslaan zonder bestandsextensie.",
|
||||||
},
|
"admin.registries.bitstream-formats.formats.no-items": "Er kunnen geen bitstreamformaten getoond worden.",
|
||||||
"collection": {
|
"admin.registries.bitstream-formats.formats.table.internal": "intern",
|
||||||
"page": {
|
"admin.registries.bitstream-formats.formats.table.mimetype": "MIME Type",
|
||||||
"news": "Nieuws",
|
"admin.registries.bitstream-formats.formats.table.name": "Naam",
|
||||||
"license": "Licentie",
|
"admin.registries.bitstream-formats.formats.table.supportLevel.0": "Onbekend",
|
||||||
"browse": {
|
"admin.registries.bitstream-formats.formats.table.supportLevel.1": "Gekend",
|
||||||
"recent": {
|
"admin.registries.bitstream-formats.formats.table.supportLevel.2": "Ondersteund",
|
||||||
"head": "Recent toegevoegd"
|
"admin.registries.bitstream-formats.formats.table.supportLevel.head": "Ondersteuning",
|
||||||
}
|
"admin.registries.bitstream-formats.head": "Bitstream Formaat Register",
|
||||||
}
|
"admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Formaat Register",
|
||||||
}
|
"admin.registries.metadata.description": "Het metadataregister omvat de lijst van alle metadatavelden die beschikbaar zijn in het systeem. Deze velden kunnen verspreid zijn over verschillende metadataschema's. Het qualified Dublin Core schema (dc) is een verplicht schema en kan niet worden verwijderd.",
|
||||||
},
|
"admin.registries.metadata.head": "Metadata Register",
|
||||||
"community": {
|
"admin.registries.metadata.schemas.no-items": "Er kunnen geen metadataschema's getoond worden.",
|
||||||
"page": {
|
"admin.registries.metadata.schemas.table.id": "ID",
|
||||||
"news": "Nieuws",
|
"admin.registries.metadata.schemas.table.name": "Naam",
|
||||||
"license": "Licentie"
|
"admin.registries.metadata.schemas.table.namespace": "Naamruimte",
|
||||||
},
|
"admin.registries.metadata.title": "DSpace Angular :: Metadata Register",
|
||||||
"sub-collection-list": {
|
"admin.registries.schema.description": "Dit is het metadataschema voor \"{{namespace}}\".",
|
||||||
"head": "Collecties in deze Community"
|
"admin.registries.schema.fields.head": "Schema metadatavelden",
|
||||||
}
|
"admin.registries.schema.fields.no-items": "Er kunnen geen metadatavelden getoond worden.",
|
||||||
},
|
"admin.registries.schema.fields.table.field": "Veld",
|
||||||
"item": {
|
"admin.registries.schema.fields.table.scopenote": "Opmerking over bereik",
|
||||||
"page": {
|
"admin.registries.schema.head": "Metadata Schema",
|
||||||
"author": "Auteur",
|
"admin.registries.schema.title": "DSpace Angular :: Metadata Schema Register",
|
||||||
"abstract": "Abstract",
|
"auth.errors.invalid-user": "Ongeldig e-mailadres of wachtwoord.",
|
||||||
"date": "Datum",
|
"auth.messages.expired": "Uw sessie is vervallen. Gelieve opnieuw aan te melden.",
|
||||||
"uri": "URI",
|
"browse.title": "Verken {{ collection }} volgens {{ field }} {{ value }}",
|
||||||
"files": "Bestanden",
|
"collection.page.browse.recent.head": "Recent toegevoegd",
|
||||||
"collections": "Collecties",
|
"collection.page.license": "Licentie",
|
||||||
"filesection": {
|
"collection.page.news": "Nieuws",
|
||||||
"download": "Download",
|
"community.page.license": "Licentie",
|
||||||
"name": "Naam:",
|
"community.page.news": "Nieuws",
|
||||||
"format": "Formaat:",
|
"community.sub-collection-list.head": "Collecties in deze Community",
|
||||||
"size": "Grootte:",
|
"error.browse-by": "Fout bij het ophalen van items",
|
||||||
"description": "Beschrijving:"
|
"error.collection": "Fout bij het ophalen van een collectie",
|
||||||
},
|
"error.community": "Fout bij het ophalen van een community",
|
||||||
"link": {
|
"error.default": "Fout",
|
||||||
"simple": "Eenvoudige itemweergave",
|
"error.item": "Fout bij het ophalen van items",
|
||||||
"full": "Volledige itemweergave"
|
"error.objects": "Fout bij het ophalen van objecten",
|
||||||
}
|
"error.recent-submissions": "Fout bij het ophalen van recent toegevoegde items",
|
||||||
}
|
"error.search-results": "Fout bij het ophalen van zoekresultaten",
|
||||||
},
|
"error.sub-collections": "Fout bij het ophalen van sub-collecties",
|
||||||
"nav": {
|
"error.top-level-communities": "Fout bij het inladen van communities op het hoogste niveau",
|
||||||
"home": "Home",
|
"error.validation.license.notgranted": "U moet de invoerlicentie goedkeuren om de invoer af te werken. Indien u deze licentie momenteel niet kan of mag goedkeuren, kan u uw werk opslaan en de invoer later afwerken. U kunt dit nieuwe item ook verwijderen indien u niet voldoet aan de vereisten van de invoerlicentie.",
|
||||||
"login": "Log In",
|
"error.validation.pattern": "Deze invoer is niet toegelaten volgens dit patroon: {{ pattern }}.",
|
||||||
"logout": "Log Uit"
|
"footer.copyright": "copyright © 2002-{{ year }}",
|
||||||
},
|
"footer.link.dspace": "DSpace software",
|
||||||
"pagination": {
|
"footer.link.duraspace": "DuraSpace",
|
||||||
"results-per-page": "Resultaten per pagina",
|
"form.cancel": "Annuleer",
|
||||||
"sort-direction": "Sorteermogelijkheden",
|
"form.first-name": "Voornaam",
|
||||||
"showing": {
|
"form.group-collapse": "Inklappen",
|
||||||
"label": "Resultaten ",
|
"form.group-collapse-help": "Klik hier op in te klappen",
|
||||||
"detail": "{{ range }} van {{ total }}"
|
"form.group-expand": "Uitklappen",
|
||||||
}
|
"form.group-expand-help": "Klik hier om uit te klappen en om meer onderdelen toe te voegen",
|
||||||
},
|
"form.last-name": "Achternaam",
|
||||||
"sorting": {
|
"form.loading": "Inladen...",
|
||||||
"score": {
|
"form.no-results": "Geen resultaten gevonden",
|
||||||
"DESC": "Relevantie"
|
"form.no-value": "Geen waarde ingevoerd",
|
||||||
},
|
"form.remove": "Verwijder",
|
||||||
"dc.title": {
|
"form.search": "Zoek",
|
||||||
"ASC": "Oplopend op titel",
|
"form.submit": "Verstuur",
|
||||||
"DESC": "Aflopend op titel"
|
"home.description": "",
|
||||||
}
|
"home.title": "DSpace Angular :: Home",
|
||||||
},
|
"home.top-level-communities.head": "Communities in DSpace",
|
||||||
"title": "DSpace",
|
"home.top-level-communities.help": "Selecteer een community om diens collecties te verkennen.",
|
||||||
"404": {
|
"item.page.abstract": "Abstract",
|
||||||
"help": "De pagina die u zoekt kan niet gevonden worden. De pagina werd mogelijk verplaatst of verwijderd. U kan onderstaande knop gebruiken om terug naar de homepagina te gaan. ",
|
"item.page.author": "Auteur",
|
||||||
"page-not-found": "Pagina niet gevonden",
|
"item.page.collections": "Collecties",
|
||||||
"link": {
|
"item.page.date": "Datum",
|
||||||
"home-page": "Terug naar de homepagina"
|
"item.page.files": "Bestanden",
|
||||||
}
|
"item.page.filesection.description": "Beschrijving:",
|
||||||
},
|
"item.page.filesection.download": "Download",
|
||||||
"home": {
|
"item.page.filesection.format": "Formaat:",
|
||||||
"title": "DSpace Angular :: Home",
|
"item.page.filesection.name": "Naam:",
|
||||||
"description": "",
|
"item.page.filesection.size": "Grootte:",
|
||||||
"top-level-communities": {
|
"item.page.link.full": "Volledige itemweergave",
|
||||||
"head": "Communities in DSpace",
|
"item.page.link.simple": "Eenvoudige itemweergave",
|
||||||
"help": "Selecteer een community om diens collecties te verkennen."
|
"item.page.uri": "URI",
|
||||||
}
|
"loading.browse-by": "Items worden ingeladen...",
|
||||||
},
|
"loading.collection": "Collectie wordt ingeladen...",
|
||||||
"search": {
|
"loading.community": "Community wordt ingeladen...",
|
||||||
"title": "DSpace Angular :: Zoek",
|
"loading.default": "Laden...",
|
||||||
"description": "",
|
"loading.item": "Item wordt ingeladen...",
|
||||||
"form": {
|
"loading.objects": "Laden...",
|
||||||
"search": "Zoek",
|
"loading.recent-submissions": "Recent toegevoegde items worden ingeladen...",
|
||||||
"search_dspace": "Zoek in DSpace"
|
"loading.search-results": "Zoekresultaten worden ingeladen...",
|
||||||
},
|
"loading.sub-collections": "De sub-collecties worden ingeladen...",
|
||||||
"results": {
|
"loading.top-level-communities": "Inladen van de Communities op het hoogste niveau...",
|
||||||
"head": "Zoekresultaten",
|
"login.form.email": "Email adres",
|
||||||
"no-results": "Er waren geen resultaten voor deze zoekopdracht"
|
"login.form.forgot-password": "Bent u uw wachtwoord vergeten?",
|
||||||
},
|
"login.form.header": "Gelieve in te loggen in DSpace",
|
||||||
"sidebar": {
|
"login.form.new-user": "Nieuwe gebruiker? Gelieve u hier te registreren",
|
||||||
"close": "Terug naar de resultaten",
|
"login.form.password": "Wachtwoord",
|
||||||
"open": "Zoek Tools",
|
"login.form.submit": "Aanmelden",
|
||||||
"results": "resultaten",
|
"login.title": "Aanmelden",
|
||||||
"filters": {
|
"logout.form.header": "Afmelden in DSpace",
|
||||||
"title": "Filters"
|
"logout.form.submit": "Afmelden",
|
||||||
},
|
"logout.title": "Afmelden",
|
||||||
"settings": {
|
"nav.home": "Home",
|
||||||
"title": "Instellingen",
|
"nav.login": "Log In",
|
||||||
"sort-by": "Sorteer volgens",
|
"nav.logout": "Log Uit",
|
||||||
"rpp": "Resultaten per pagina"
|
"pagination.results-per-page": "Resultaten per pagina",
|
||||||
}
|
"pagination.showing.detail": "{{ range }} van {{ total }}",
|
||||||
},
|
"pagination.showing.label": "Resultaten ",
|
||||||
"view-switch": {
|
"pagination.sort-direction": "Sorteermogelijkheden",
|
||||||
"show-list": "Toon als lijst",
|
"search.description": "",
|
||||||
"show-grid": "Toon in raster"
|
"search.filters.applied.f.author": "Auteur",
|
||||||
},
|
"search.filters.applied.f.dateIssued.max": "Einddatum",
|
||||||
"filters": {
|
"search.filters.applied.f.dateIssued.min": "Startdatum",
|
||||||
"head": "Filters",
|
"search.filters.applied.f.has_content_in_original_bundle": "Heeft bestanden",
|
||||||
"reset": "Filters verwijderen",
|
"search.filters.applied.f.subject": "Sleutelwoord",
|
||||||
"applied": {
|
"search.filters.filter.author.head": "Auteur",
|
||||||
"f.author": "Auteur",
|
"search.filters.filter.author.placeholder": "Auteursnaam",
|
||||||
"f.dateIssued.min": "Startdatum",
|
"search.filters.filter.dateIssued.head": "Datum",
|
||||||
"f.dateIssued.max": "Einddatum",
|
"search.filters.filter.dateIssued.max.placeholder": "Vroegste Datum",
|
||||||
"f.subject": "Sleutelwoord",
|
"search.filters.filter.dateIssued.min.placeholder": "Laatste Datum",
|
||||||
"f.has_content_in_original_bundle": "Heeft bestanden"
|
"search.filters.filter.has_content_in_original_bundle.head": "Heeft bestanden",
|
||||||
},
|
"search.filters.filter.scope.head": "Bereik",
|
||||||
"filter": {
|
"search.filters.filter.scope.placeholder": "Bereikfilter",
|
||||||
"show-more": "Toon meer",
|
"search.filters.filter.show-less": "Inklappen",
|
||||||
"show-less": "Inklappen",
|
"search.filters.filter.show-more": "Toon meer",
|
||||||
"author": {
|
"search.filters.filter.subject.head": "Onderwerp",
|
||||||
"placeholder": "Auteursnaam",
|
"search.filters.filter.subject.placeholder": "Onderwerp",
|
||||||
"head": "Auteur"
|
"search.filters.head": "Filters",
|
||||||
},
|
"search.filters.reset": "Filters verwijderen",
|
||||||
"scope": {
|
"search.form.search": "Zoek",
|
||||||
"placeholder": "Bereikfilter",
|
"search.form.search_dspace": "Zoek in DSpace",
|
||||||
"head": "Bereik"
|
"search.results.head": "Zoekresultaten",
|
||||||
},
|
"search.results.no-results": "Er waren geen resultaten voor deze zoekopdracht",
|
||||||
"subject": {
|
"search.sidebar.close": "Terug naar de resultaten",
|
||||||
"placeholder": "Onderwerp",
|
"search.sidebar.filters.title": "Filters",
|
||||||
"head": "Onderwerp"
|
"search.sidebar.open": "Zoek Tools",
|
||||||
},
|
"search.sidebar.results": "resultaten",
|
||||||
"dateIssued": {
|
"search.sidebar.settings.rpp": "Resultaten per pagina",
|
||||||
"max": {
|
"search.sidebar.settings.sort-by": "Sorteer volgens",
|
||||||
"placeholder": "Vroegste Datum"
|
"search.sidebar.settings.title": "Instellingen",
|
||||||
},
|
"search.title": "DSpace Angular :: Zoek",
|
||||||
"min": {
|
"search.view-switch.show-grid": "Toon in raster",
|
||||||
"placeholder": "Laatste Datum"
|
"search.view-switch.show-list": "Toon als lijst",
|
||||||
},
|
"sorting.dc.title.ASC": "Oplopend op titel",
|
||||||
"head": "Datum"
|
"sorting.dc.title.DESC": "Aflopend op titel",
|
||||||
},
|
"sorting.score.DESC": "Relevantie",
|
||||||
"has_content_in_original_bundle": {
|
"title": "DSpace"
|
||||||
"head": "Heeft bestanden"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"browse": {
|
|
||||||
"title": "Verken {{ collection }} volgens {{ field }} {{ value }}"
|
|
||||||
},
|
|
||||||
"admin": {
|
|
||||||
"registries": {
|
|
||||||
"metadata": {
|
|
||||||
"title": "DSpace Angular :: Metadata Register",
|
|
||||||
"head": "Metadata Register",
|
|
||||||
"description": "Het metadataregister omvat de lijst van alle metadatavelden die beschikbaar zijn in het systeem. Deze velden kunnen verspreid zijn over verschillende metadataschema's. Het qualified Dublin Core schema (dc) is een verplicht schema en kan niet worden verwijderd.",
|
|
||||||
"schemas": {
|
|
||||||
"table": {
|
|
||||||
"id": "ID",
|
|
||||||
"namespace": "Naamruimte",
|
|
||||||
"name": "Naam"
|
|
||||||
},
|
|
||||||
"no-items": "Er kunnen geen metadataschema's getoond worden."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"schema": {
|
|
||||||
"title": "DSpace Angular :: Metadata Schema Register",
|
|
||||||
"head": "Metadata Schema",
|
|
||||||
"description": "Dit is het metadataschema voor \"{{namespace}}\".",
|
|
||||||
"fields": {
|
|
||||||
"head": "Schema metadatavelden",
|
|
||||||
"table": {
|
|
||||||
"field": "Veld",
|
|
||||||
"scopenote": "Opmerking over bereik"
|
|
||||||
},
|
|
||||||
"no-items": "Er kunnen geen metadatavelden getoond worden."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bitstream-formats": {
|
|
||||||
"title": "DSpace Angular :: Bitstream Formaat Register",
|
|
||||||
"head": "Bitstream Formaat Register",
|
|
||||||
"description": "Deze lijst van Bitstream formaten biedt informatie over de formaten die in deze repository zijn toegelaten en op welke manier ze ondersteund worden. De term Bitstream wordt in DSpace gebruikt om een bestand aan te duiden dat samen met metadata onderdeel uitmaakt van een item. De naam bitstream duidt op het feit dat het bestand achterliggend wordt opgeslaan zonder bestandsextensie.",
|
|
||||||
"formats": {
|
|
||||||
"table": {
|
|
||||||
"name": "Naam",
|
|
||||||
"mimetype": "MIME Type",
|
|
||||||
"supportLevel": {
|
|
||||||
"head": "Ondersteuning",
|
|
||||||
"0": "Onbekend",
|
|
||||||
"1": "Gekend",
|
|
||||||
"2": "Ondersteund"
|
|
||||||
},
|
|
||||||
"internal": "intern"
|
|
||||||
},
|
|
||||||
"no-items": "Er kunnen geen bitstreamformaten getoond worden."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"loading": {
|
|
||||||
"default": "Laden...",
|
|
||||||
"top-level-communities": "Inladen van de Communities op het hoogste niveau...",
|
|
||||||
"community": "Community wordt ingeladen...",
|
|
||||||
"collection": "Collectie wordt ingeladen...",
|
|
||||||
"sub-collections": "De sub-collecties worden ingeladen...",
|
|
||||||
"recent-submissions": "Recent toegevoegde items worden ingeladen...",
|
|
||||||
"item": "Item wordt ingeladen...",
|
|
||||||
"objects": "Laden...",
|
|
||||||
"search-results": "Zoekresultaten worden ingeladen...",
|
|
||||||
"browse-by": "Items worden ingeladen..."
|
|
||||||
},
|
|
||||||
"error": {
|
|
||||||
"default": "Fout",
|
|
||||||
"top-level-communities": "Fout bij het inladen van communities op het hoogste niveau",
|
|
||||||
"community": "Fout bij het ophalen van een community",
|
|
||||||
"collection": "Fout bij het ophalen van een collectie",
|
|
||||||
"sub-collections": "Fout bij het ophalen van sub-collecties",
|
|
||||||
"recent-submissions": "Fout bij het ophalen van recent toegevoegde items",
|
|
||||||
"item": "Fout bij het ophalen van items",
|
|
||||||
"objects": "Fout bij het ophalen van objecten",
|
|
||||||
"search-results": "Fout bij het ophalen van zoekresultaten",
|
|
||||||
"browse-by": "Fout bij het ophalen van items",
|
|
||||||
"validation": {
|
|
||||||
"pattern": "Deze invoer is niet toegelaten volgens dit patroon: {{ pattern }}.",
|
|
||||||
"license": {
|
|
||||||
"notgranted": "U moet de invoerlicentie goedkeuren om de invoer af te werken. Indien u deze licentie momenteel niet kan of mag goedkeuren, kan u uw werk opslaan en de invoer later afwerken. U kunt dit nieuwe item ook verwijderen indien u niet voldoet aan de vereisten van de invoerlicentie."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"form": {
|
|
||||||
"submit": "Verstuur",
|
|
||||||
"cancel": "Annuleer",
|
|
||||||
"search": "Zoek",
|
|
||||||
"remove": "Verwijder",
|
|
||||||
"first-name": "Voornaam",
|
|
||||||
"last-name": "Achternaam",
|
|
||||||
"loading": "Inladen...",
|
|
||||||
"no-results": "Geen resultaten gevonden",
|
|
||||||
"no-value": "Geen waarde ingevoerd",
|
|
||||||
"group-collapse": "Inklappen",
|
|
||||||
"group-expand": "Uitklappen",
|
|
||||||
"group-collapse-help": "Klik hier op in te klappen",
|
|
||||||
"group-expand-help": "Klik hier om uit te klappen en om meer onderdelen toe te voegen"
|
|
||||||
},
|
|
||||||
"login": {
|
|
||||||
"title": "Aanmelden",
|
|
||||||
"form": {
|
|
||||||
"header": "Gelieve in te loggen in DSpace",
|
|
||||||
"email": "Email adres",
|
|
||||||
"forgot-password": "Bent u uw wachtwoord vergeten?",
|
|
||||||
"new-user": "Nieuwe gebruiker? Gelieve u hier te registreren",
|
|
||||||
"password": "Wachtwoord",
|
|
||||||
"submit": "Aanmelden"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"logout": {
|
|
||||||
"title": "Afmelden",
|
|
||||||
"form": {
|
|
||||||
"header": "Afmelden in DSpace",
|
|
||||||
"submit": "Afmelden"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"auth": {
|
|
||||||
"messages": {
|
|
||||||
"expired": "Uw sessie is vervallen. Gelieve opnieuw aan te melden."
|
|
||||||
},
|
|
||||||
"errors": {
|
|
||||||
"invalid-user": "Ongeldig e-mailadres of wachtwoord."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
|||||||
import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
|
import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
|
||||||
import { HostWindowService } from '../../../shared/host-window.service';
|
import { HostWindowService } from '../../../shared/host-window.service';
|
||||||
import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
|
import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
describe('BitstreamFormatsComponent', () => {
|
describe('BitstreamFormatsComponent', () => {
|
||||||
let comp: BitstreamFormatsComponent;
|
let comp: BitstreamFormatsComponent;
|
||||||
@@ -52,7 +53,7 @@ describe('BitstreamFormatsComponent', () => {
|
|||||||
extensions: null
|
extensions: null
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
const mockFormats = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFormatsList)));
|
const mockFormats = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockFormatsList));
|
||||||
const registryServiceStub = {
|
const registryServiceStub = {
|
||||||
getBitstreamFormats: () => mockFormats
|
getBitstreamFormats: () => mockFormats
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Action } from '@ngrx/store';
|
import { Action } from '@ngrx/store';
|
||||||
import { type } from '../../../shared/ngrx/type';
|
import { type } from '../../../shared/ngrx/type';
|
||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
import { MetadataField } from '../../../core/metadata/metadatafield.model';
|
import { MetadataField } from '../../../core/metadata/metadata-field.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For each action type in an action group, make a simple
|
* For each action type in an action group, make a simple
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
|
|||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
|
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
describe('MetadataRegistryComponent', () => {
|
describe('MetadataRegistryComponent', () => {
|
||||||
let comp: MetadataRegistryComponent;
|
let comp: MetadataRegistryComponent;
|
||||||
@@ -36,7 +37,7 @@ describe('MetadataRegistryComponent', () => {
|
|||||||
namespace: 'http://dspace.org/mockschema'
|
namespace: 'http://dspace.org/mockschema'
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
const mockSchemas = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
|
const mockSchemas = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockSchemasList));
|
||||||
/* tslint:disable:no-empty */
|
/* tslint:disable:no-empty */
|
||||||
const registryServiceStub = {
|
const registryServiceStub = {
|
||||||
getMetadataSchemas: () => mockSchemas,
|
getMetadataSchemas: () => mockSchemas,
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { RegistryService } from '../../../core/registry/registry.service';
|
|||||||
import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
|
import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list';
|
import { PaginatedList } from '../../../core/data/paginated-list';
|
||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { map, take } from 'rxjs/operators';
|
import { map, take } from 'rxjs/operators';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
@@ -12,6 +11,7 @@ import { zip } from 'rxjs/internal/observable/zip';
|
|||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { Route, Router } from '@angular/router';
|
import { Route, Router } from '@angular/router';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-metadata-registry',
|
selector: 'ds-metadata-registry',
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import {
|
|||||||
MetadataRegistrySelectSchemaAction
|
MetadataRegistrySelectSchemaAction
|
||||||
} from './metadata-registry.actions';
|
} from './metadata-registry.actions';
|
||||||
import { metadataRegistryReducer, MetadataRegistryState } from './metadata-registry.reducers';
|
import { metadataRegistryReducer, MetadataRegistryState } from './metadata-registry.reducers';
|
||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
import { MetadataField } from '../../../core/metadata/metadatafield.model';
|
import { MetadataField } from '../../../core/metadata/metadata-field.model';
|
||||||
|
|
||||||
class NullAction extends MetadataRegistryEditSchemaAction {
|
class NullAction extends MetadataRegistryEditSchemaAction {
|
||||||
type = null;
|
type = null;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
|
||||||
import {
|
import {
|
||||||
MetadataRegistryAction,
|
MetadataRegistryAction,
|
||||||
MetadataRegistryActionTypes,
|
MetadataRegistryActionTypes,
|
||||||
@@ -9,7 +8,8 @@ import {
|
|||||||
MetadataRegistrySelectFieldAction,
|
MetadataRegistrySelectFieldAction,
|
||||||
MetadataRegistrySelectSchemaAction
|
MetadataRegistrySelectSchemaAction
|
||||||
} from './metadata-registry.actions';
|
} from './metadata-registry.actions';
|
||||||
import { MetadataField } from '../../../core/metadata/metadatafield.model';
|
import { MetadataField } from '../../../core/metadata/metadata-field.model';
|
||||||
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The metadata registry state.
|
* The metadata registry state.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
|
|||||||
import { RegistryService } from '../../../../core/registry/registry.service';
|
import { RegistryService } from '../../../../core/registry/registry.service';
|
||||||
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
||||||
import { of as observableOf } from 'rxjs/internal/observable/of';
|
import { of as observableOf } from 'rxjs/internal/observable/of';
|
||||||
import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
|
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
|
||||||
|
|
||||||
describe('MetadataSchemaFormComponent', () => {
|
describe('MetadataSchemaFormComponent', () => {
|
||||||
let component: MetadataSchemaFormComponent;
|
let component: MetadataSchemaFormComponent;
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ import { FormGroup } from '@angular/forms';
|
|||||||
import { RegistryService } from '../../../../core/registry/registry.service';
|
import { RegistryService } from '../../../../core/registry/registry.service';
|
||||||
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
||||||
import { take } from 'rxjs/operators';
|
import { take } from 'rxjs/operators';
|
||||||
import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
|
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { combineLatest } from 'rxjs/internal/observable/combineLatest';
|
import { combineLatest } from 'rxjs/internal/observable/combineLatest';
|
||||||
|
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-metadata-schema-form',
|
selector: 'ds-metadata-schema-form',
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'
|
|||||||
import { MetadataFieldFormComponent } from './metadata-field-form.component';
|
import { MetadataFieldFormComponent } from './metadata-field-form.component';
|
||||||
import { RegistryService } from '../../../../core/registry/registry.service';
|
import { RegistryService } from '../../../../core/registry/registry.service';
|
||||||
import { of as observableOf } from 'rxjs/internal/observable/of';
|
import { of as observableOf } from 'rxjs/internal/observable/of';
|
||||||
import { MetadataField } from '../../../../core/metadata/metadatafield.model';
|
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { RouterTestingModule } from '@angular/router/testing';
|
import { RouterTestingModule } from '@angular/router/testing';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
@@ -11,7 +10,8 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
|||||||
import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
|
import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
|
||||||
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
||||||
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
import { NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
|
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
|
||||||
|
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
|
||||||
|
|
||||||
describe('MetadataFieldFormComponent', () => {
|
describe('MetadataFieldFormComponent', () => {
|
||||||
let component: MetadataFieldFormComponent;
|
let component: MetadataFieldFormComponent;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
|
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
|
||||||
import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
|
|
||||||
import {
|
import {
|
||||||
DynamicFormControlModel,
|
DynamicFormControlModel,
|
||||||
DynamicFormLayout,
|
DynamicFormLayout,
|
||||||
@@ -8,10 +7,11 @@ import {
|
|||||||
import { FormGroup } from '@angular/forms';
|
import { FormGroup } from '@angular/forms';
|
||||||
import { RegistryService } from '../../../../core/registry/registry.service';
|
import { RegistryService } from '../../../../core/registry/registry.service';
|
||||||
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
|
||||||
import { MetadataField } from '../../../../core/metadata/metadatafield.model';
|
|
||||||
import { take } from 'rxjs/operators';
|
import { take } from 'rxjs/operators';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { combineLatest } from 'rxjs/internal/observable/combineLatest';
|
import { combineLatest } from 'rxjs/internal/observable/combineLatest';
|
||||||
|
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
|
||||||
|
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-metadata-field-form',
|
selector: 'ds-metadata-field-form',
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing'
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list';
|
import { PaginatedList } from '../../../core/data/paginated-list';
|
||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
@@ -21,6 +20,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
|
|||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
|
import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
describe('MetadataSchemaComponent', () => {
|
describe('MetadataSchemaComponent', () => {
|
||||||
let comp: MetadataSchemaComponent;
|
let comp: MetadataSchemaComponent;
|
||||||
@@ -74,12 +75,12 @@ describe('MetadataSchemaComponent', () => {
|
|||||||
schema: mockSchemasList[1]
|
schema: mockSchemasList[1]
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
const mockSchemas = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
|
const mockSchemas = createSuccessfulRemoteDataObject$(new PaginatedList(null, mockSchemasList));
|
||||||
/* tslint:disable:no-empty */
|
/* tslint:disable:no-empty */
|
||||||
const registryServiceStub = {
|
const registryServiceStub = {
|
||||||
getMetadataSchemas: () => mockSchemas,
|
getMetadataSchemas: () => mockSchemas,
|
||||||
getMetadataFieldsBySchema: (schema: MetadataSchema) => observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))),
|
getMetadataFieldsBySchema: (schema: MetadataSchema) => createSuccessfulRemoteDataObject$(new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema))),
|
||||||
getMetadataSchemaByName: (schemaName: string) => observableOf(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0])),
|
getMetadataSchemaByName: (schemaName: string) => createSuccessfulRemoteDataObject$(mockSchemasList.filter((value) => value.prefix === schemaName)[0]),
|
||||||
getActiveMetadataField: () => observableOf(undefined),
|
getActiveMetadataField: () => observableOf(undefined),
|
||||||
getSelectedMetadataFields: () => observableOf([]),
|
getSelectedMetadataFields: () => observableOf([]),
|
||||||
editMetadataField: (schema) => {},
|
editMetadataField: (schema) => {},
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ import { ActivatedRoute, Router } from '@angular/router';
|
|||||||
import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
|
import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list';
|
import { PaginatedList } from '../../../core/data/paginated-list';
|
||||||
import { MetadataField } from '../../../core/metadata/metadatafield.model';
|
|
||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
|
||||||
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
|
||||||
import { map, take } from 'rxjs/operators';
|
import { map, take } from 'rxjs/operators';
|
||||||
import { hasValue } from '../../../shared/empty.util';
|
import { hasValue } from '../../../shared/empty.util';
|
||||||
@@ -13,6 +11,8 @@ import { RestResponse } from '../../../core/cache/response.models';
|
|||||||
import { zip } from 'rxjs/internal/observable/zip';
|
import { zip } from 'rxjs/internal/observable/zip';
|
||||||
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
import { NotificationsService } from '../../../shared/notifications/notifications.service';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
|
import { MetadataField } from '../../../core/metadata/metadata-field.model';
|
||||||
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-metadata-schema',
|
selector: 'ds-metadata-schema',
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { Item } from '../../core/shared/item.model';
|
|||||||
import { ENV_CONFIG, GLOBAL_CONFIG } from '../../../config';
|
import { ENV_CONFIG, GLOBAL_CONFIG } from '../../../config';
|
||||||
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
|
import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
|
||||||
import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec';
|
import { toRemoteData } from '../+browse-by-metadata-page/browse-by-metadata-page.component.spec';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
|
||||||
|
|
||||||
describe('BrowseByDatePageComponent', () => {
|
describe('BrowseByDatePageComponent', () => {
|
||||||
let comp: BrowseByDatePageComponent;
|
let comp: BrowseByDatePageComponent;
|
||||||
@@ -48,11 +49,11 @@ describe('BrowseByDatePageComponent', () => {
|
|||||||
const mockBrowseService = {
|
const mockBrowseService = {
|
||||||
getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData([]),
|
getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData([]),
|
||||||
getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData([firstItem]),
|
getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData([firstItem]),
|
||||||
getFirstItemFor: () => observableOf(new RemoteData(false, false, true, undefined, firstItem))
|
getFirstItemFor: () => createSuccessfulRemoteDataObject$(firstItem)
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockDsoService = {
|
const mockDsoService = {
|
||||||
findById: () => observableOf(new RemoteData(false, false, true, null, mockCommunity))
|
findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
|
||||||
};
|
};
|
||||||
|
|
||||||
const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
|
const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ import { Item } from '../../core/shared/item.model';
|
|||||||
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { MockRouter } from '../../shared/mocks/mock-router';
|
import { MockRouter } from '../../shared/mocks/mock-router';
|
||||||
|
import { ResourceType } from '../../core/shared/resource-type';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
|
||||||
|
import { BrowseEntry } from '../../core/shared/browse-entry.model';
|
||||||
|
|
||||||
describe('BrowseByMetadataPageComponent', () => {
|
describe('BrowseByMetadataPageComponent', () => {
|
||||||
let comp: BrowseByMetadataPageComponent;
|
let comp: BrowseByMetadataPageComponent;
|
||||||
@@ -39,21 +42,21 @@ describe('BrowseByMetadataPageComponent', () => {
|
|||||||
|
|
||||||
const mockEntries = [
|
const mockEntries = [
|
||||||
{
|
{
|
||||||
type: 'author',
|
type: BrowseEntry.type,
|
||||||
authority: null,
|
authority: null,
|
||||||
value: 'John Doe',
|
value: 'John Doe',
|
||||||
language: 'en',
|
language: 'en',
|
||||||
count: 1
|
count: 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'author',
|
type: BrowseEntry.type,
|
||||||
authority: null,
|
authority: null,
|
||||||
value: 'James Doe',
|
value: 'James Doe',
|
||||||
language: 'en',
|
language: 'en',
|
||||||
count: 3
|
count: 3
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'subject',
|
type: BrowseEntry.type,
|
||||||
authority: null,
|
authority: null,
|
||||||
value: 'Fake subject',
|
value: 'Fake subject',
|
||||||
language: 'en',
|
language: 'en',
|
||||||
@@ -68,12 +71,12 @@ describe('BrowseByMetadataPageComponent', () => {
|
|||||||
];
|
];
|
||||||
|
|
||||||
const mockBrowseService = {
|
const mockBrowseService = {
|
||||||
getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData(mockEntries.filter((entry) => entry.type === options.metadataDefinition)),
|
getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData(mockEntries),
|
||||||
getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems)
|
getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems)
|
||||||
};
|
};
|
||||||
|
|
||||||
const mockDsoService = {
|
const mockDsoService = {
|
||||||
findById: () => observableOf(new RemoteData(false, false, true, null, mockCommunity))
|
findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
|
||||||
};
|
};
|
||||||
|
|
||||||
const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
|
const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
|
||||||
@@ -105,12 +108,6 @@ describe('BrowseByMetadataPageComponent', () => {
|
|||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should fetch the correct entries depending on the metadata definition', () => {
|
|
||||||
comp.browseEntries$.subscribe((result) => {
|
|
||||||
expect(result.payload.page).toEqual(mockEntries.filter((entry) => entry.type === 'author'));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should not fetch any items when no value is provided', () => {
|
it('should not fetch any items when no value is provided', () => {
|
||||||
expect(comp.items$).toBeUndefined();
|
expect(comp.items$).toBeUndefined();
|
||||||
});
|
});
|
||||||
@@ -160,5 +157,5 @@ describe('BrowseByMetadataPageComponent', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
|
export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
|
||||||
return observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), objects)));
|
return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), objects));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { RemoteData } from '../../core/data/remote-data';
|
|||||||
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
||||||
import { BrowseService } from '../../core/browse/browse.service';
|
import { BrowseService } from '../../core/browse/browse.service';
|
||||||
import { MockRouter } from '../../shared/mocks/mock-router';
|
import { MockRouter } from '../../shared/mocks/mock-router';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
|
||||||
|
|
||||||
describe('BrowseByTitlePageComponent', () => {
|
describe('BrowseByTitlePageComponent', () => {
|
||||||
let comp: BrowseByTitlePageComponent;
|
let comp: BrowseByTitlePageComponent;
|
||||||
@@ -52,7 +53,7 @@ describe('BrowseByTitlePageComponent', () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const mockDsoService = {
|
const mockDsoService = {
|
||||||
findById: () => observableOf(new RemoteData(false, false, true, null, mockCommunity))
|
findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
|
||||||
};
|
};
|
||||||
|
|
||||||
const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
|
const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
import { Component, Input } from '@angular/core';
|
import { Component, Input } from '@angular/core';
|
||||||
import {
|
import { DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core';
|
||||||
DynamicInputModel,
|
|
||||||
DynamicTextAreaModel
|
|
||||||
} from '@ng-dynamic-forms/core';
|
|
||||||
import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
|
import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
|
||||||
import { ResourceType } from '../../core/shared/resource-type';
|
|
||||||
import { Collection } from '../../core/shared/collection.model';
|
import { Collection } from '../../core/shared/collection.model';
|
||||||
import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
|
import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
|
||||||
|
import { NormalizedCollection } from '../../core/cache/models/normalized-collection.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Form used for creating and editing collections
|
* Form used for creating and editing collections
|
||||||
@@ -23,9 +20,9 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> {
|
|||||||
@Input() dso: Collection = new Collection();
|
@Input() dso: Collection = new Collection();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {ResourceType.Collection} This is a collection-type form
|
* @type {Collection.type} This is a collection-type form
|
||||||
*/
|
*/
|
||||||
protected type = ResourceType.Collection;
|
protected type = Collection.type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The dynamic form fields used for creating/editing a collection
|
* The dynamic form fields used for creating/editing a collection
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { CreateCollectionPageGuard } from './create-collection-page.guard';
|
import { CreateCollectionPageGuard } from './create-collection-page.guard';
|
||||||
import { MockRouter } from '../../shared/mocks/mock-router';
|
import { MockRouter } from '../../shared/mocks/mock-router';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
|
||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { of as observableOf } from 'rxjs';
|
|
||||||
import { first } from 'rxjs/operators';
|
import { first } from 'rxjs/operators';
|
||||||
|
import {
|
||||||
|
createFailedRemoteDataObject$,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../shared/testing/utils';
|
||||||
|
|
||||||
describe('CreateCollectionPageGuard', () => {
|
describe('CreateCollectionPageGuard', () => {
|
||||||
describe('canActivate', () => {
|
describe('canActivate', () => {
|
||||||
@@ -15,11 +17,11 @@ describe('CreateCollectionPageGuard', () => {
|
|||||||
communityDataServiceStub = {
|
communityDataServiceStub = {
|
||||||
findById: (id: string) => {
|
findById: (id: string) => {
|
||||||
if (id === 'valid-id') {
|
if (id === 'valid-id') {
|
||||||
return observableOf(new RemoteData(false, false, true, null, new Community()));
|
return createSuccessfulRemoteDataObject$(new Community());
|
||||||
} else if (id === 'invalid-id') {
|
} else if (id === 'invalid-id') {
|
||||||
return observableOf(new RemoteData(false, false, true, null, undefined));
|
return createSuccessfulRemoteDataObject$(undefined);
|
||||||
} else if (id === 'error-id') {
|
} else if (id === 'error-id') {
|
||||||
return observableOf(new RemoteData(false, false, false, null, new Community()));
|
return createFailedRemoteDataObject$(new Community());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -20,9 +20,9 @@ export class CommunityFormComponent extends ComColFormComponent<Community> {
|
|||||||
@Input() dso: Community = new Community();
|
@Input() dso: Community = new Community();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {ResourceType.Community} This is a community-type form
|
* @type {Community.type} This is a community-type form
|
||||||
*/
|
*/
|
||||||
protected type = ResourceType.Community;
|
protected type = Community.type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The dynamic form fields used for creating/editing a community
|
* The dynamic form fields used for creating/editing a community
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { CreateCommunityPageGuard } from './create-community-page.guard';
|
import { CreateCommunityPageGuard } from './create-community-page.guard';
|
||||||
import { MockRouter } from '../../shared/mocks/mock-router';
|
import { MockRouter } from '../../shared/mocks/mock-router';
|
||||||
import { RemoteData } from '../../core/data/remote-data';
|
|
||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { of as observableOf } from 'rxjs';
|
|
||||||
import { first } from 'rxjs/operators';
|
import { first } from 'rxjs/operators';
|
||||||
|
import {
|
||||||
|
createFailedRemoteDataObject$,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../shared/testing/utils';
|
||||||
|
|
||||||
describe('CreateCommunityPageGuard', () => {
|
describe('CreateCommunityPageGuard', () => {
|
||||||
describe('canActivate', () => {
|
describe('canActivate', () => {
|
||||||
@@ -15,11 +17,11 @@ describe('CreateCommunityPageGuard', () => {
|
|||||||
communityDataServiceStub = {
|
communityDataServiceStub = {
|
||||||
findById: (id: string) => {
|
findById: (id: string) => {
|
||||||
if (id === 'valid-id') {
|
if (id === 'valid-id') {
|
||||||
return observableOf(new RemoteData(false, false, true, null, new Community()));
|
return createSuccessfulRemoteDataObject$(new Community());
|
||||||
} else if (id === 'invalid-id') {
|
} else if (id === 'invalid-id') {
|
||||||
return observableOf(new RemoteData(false, false, true, null, undefined));
|
return createSuccessfulRemoteDataObject$(undefined);
|
||||||
} else if (id === 'error-id') {
|
} else if (id === 'error-id') {
|
||||||
return observableOf(new RemoteData(false, false, false, null, new Community()));
|
return createFailedRemoteDataObject$(new Community());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {RouterTestingModule} from '@angular/router/testing';
|
|||||||
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
|
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
|
||||||
import {By} from '@angular/platform-browser';
|
import {By} from '@angular/platform-browser';
|
||||||
import {of as observableOf, Observable } from 'rxjs';
|
import {of as observableOf, Observable } from 'rxjs';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
|
||||||
|
|
||||||
describe('SubCommunityList Component', () => {
|
describe('SubCommunityList Component', () => {
|
||||||
let comp: CommunityPageSubCommunityListComponent;
|
let comp: CommunityPageSubCommunityListComponent;
|
||||||
@@ -40,8 +41,7 @@ describe('SubCommunityList Component', () => {
|
|||||||
{ language: 'en_US', value: 'Test title' }
|
{ language: 'en_US', value: 'Test title' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
subcommunities: observableOf(new RemoteData(true, true, true,
|
subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
|
||||||
undefined, new PaginatedList(new PageInfo(), [])))
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const mockCommunity = Object.assign(new Community(), {
|
const mockCommunity = Object.assign(new Community(), {
|
||||||
@@ -50,8 +50,7 @@ describe('SubCommunityList Component', () => {
|
|||||||
{ language: 'en_US', value: 'Test title' }
|
{ language: 'en_US', value: 'Test title' }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
subcommunities: observableOf(new RemoteData(true, true, true,
|
subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), subcommunities))
|
||||||
undefined, new PaginatedList(new PageInfo(), subcommunities)))
|
|
||||||
})
|
})
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,10 @@ import {RemoteData} from '../../core/data/remote-data';
|
|||||||
import {hot} from 'jasmine-marbles';
|
import {hot} from 'jasmine-marbles';
|
||||||
import {Item} from '../../core/shared/item.model';
|
import {Item} from '../../core/shared/item.model';
|
||||||
import {findSuccessfulAccordingTo} from './edit-item-operators';
|
import {findSuccessfulAccordingTo} from './edit-item-operators';
|
||||||
|
import {
|
||||||
|
createFailedRemoteDataObject,
|
||||||
|
createSuccessfulRemoteDataObject
|
||||||
|
} from '../../shared/testing/utils';
|
||||||
|
|
||||||
describe('findSuccessfulAccordingTo', () => {
|
describe('findSuccessfulAccordingTo', () => {
|
||||||
let mockItem1;
|
let mockItem1;
|
||||||
@@ -19,11 +23,11 @@ describe('findSuccessfulAccordingTo', () => {
|
|||||||
});
|
});
|
||||||
it('should return first successful RemoteData Observable that complies to predicate', () => {
|
it('should return first successful RemoteData Observable that complies to predicate', () => {
|
||||||
const testRD = {
|
const testRD = {
|
||||||
a: new RemoteData(false, false, true, null, undefined),
|
a: createSuccessfulRemoteDataObject(undefined),
|
||||||
b: new RemoteData(false, false, false, null, mockItem1),
|
b: createFailedRemoteDataObject(mockItem1),
|
||||||
c: new RemoteData(false, false, true, null, mockItem2),
|
c: createSuccessfulRemoteDataObject(mockItem2),
|
||||||
d: new RemoteData(false, false, true, null, mockItem1),
|
d: createSuccessfulRemoteDataObject(mockItem1),
|
||||||
e: new RemoteData(false, false, true, null, mockItem2),
|
e: createSuccessfulRemoteDataObject(mockItem2),
|
||||||
};
|
};
|
||||||
|
|
||||||
const source = hot('abcde', testRD);
|
const source = hot('abcde', testRD);
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { By } from '@angular/platform-browser';
|
|||||||
import { ItemDeleteComponent } from './item-delete.component';
|
import { ItemDeleteComponent } from './item-delete.component';
|
||||||
import { getItemEditPath } from '../../item-page-routing.module';
|
import { getItemEditPath } from '../../item-page-routing.module';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemDeleteComponent;
|
let comp: ItemDeleteComponent;
|
||||||
let fixture: ComponentFixture<ItemDeleteComponent>;
|
let fixture: ComponentFixture<ItemDeleteComponent>;
|
||||||
@@ -49,7 +50,7 @@ describe('ItemDeleteComponent', () => {
|
|||||||
|
|
||||||
routeStub = {
|
routeStub = {
|
||||||
data: observableOf({
|
data: observableOf({
|
||||||
item: new RemoteData(false, false, true, null, mockItem)
|
item: createSuccessfulRemoteDataObject(mockItem)
|
||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,17 +6,18 @@ import { ObjectUpdatesService } from '../../../../core/data/object-updates/objec
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { RemoteData } from '../../../../core/data/remote-data';
|
import { RemoteData } from '../../../../core/data/remote-data';
|
||||||
import { PaginatedList } from '../../../../core/data/paginated-list';
|
import { PaginatedList } from '../../../../core/data/paginated-list';
|
||||||
import { MetadataField } from '../../../../core/metadata/metadatafield.model';
|
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
import { SharedModule } from '../../../../shared/shared.module';
|
import { SharedModule } from '../../../../shared/shared.module';
|
||||||
import { getTestScheduler } from 'jasmine-marbles';
|
import { getTestScheduler } from 'jasmine-marbles';
|
||||||
import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
|
import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
|
||||||
import { TestScheduler } from 'rxjs/testing';
|
import { TestScheduler } from 'rxjs/testing';
|
||||||
import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
|
|
||||||
import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
|
import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
|
import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
|
||||||
|
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
|
||||||
|
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: EditInPlaceFieldComponent;
|
let comp: EditInPlaceFieldComponent;
|
||||||
let fixture: ComponentFixture<EditInPlaceFieldComponent>;
|
let fixture: ComponentFixture<EditInPlaceFieldComponent>;
|
||||||
@@ -59,7 +60,7 @@ describe('EditInPlaceFieldComponent', () => {
|
|||||||
paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);
|
paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);
|
||||||
|
|
||||||
metadataFieldService = jasmine.createSpyObj({
|
metadataFieldService = jasmine.createSpyObj({
|
||||||
queryMetadataFields: observableOf(new RemoteData(false, false, true, undefined, paginatedMetadataFields)),
|
queryMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields),
|
||||||
});
|
});
|
||||||
objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
|
objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ import { RegistryService } from '../../../../core/registry/registry.service';
|
|||||||
import { cloneDeep } from 'lodash';
|
import { cloneDeep } from 'lodash';
|
||||||
import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
|
import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
|
||||||
import { map, take } from 'rxjs/operators';
|
import { map, take } from 'rxjs/operators';
|
||||||
import { MetadataField } from '../../../../core/metadata/metadatafield.model';
|
|
||||||
import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
|
import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
|
||||||
import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
|
import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
|
||||||
import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer';
|
import { FieldUpdate } from '../../../../core/data/object-updates/object-updates.reducer';
|
||||||
import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
|
import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
|
||||||
import { NgModel } from '@angular/forms';
|
import { NgModel } from '@angular/forms';
|
||||||
import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
|
import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
|
||||||
|
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
// tslint:disable-next-line:component-selector
|
// tslint:disable-next-line:component-selector
|
||||||
|
|||||||
@@ -20,13 +20,16 @@ import { RouterStub } from '../../../shared/testing/router-stub';
|
|||||||
import { GLOBAL_CONFIG } from '../../../../config';
|
import { GLOBAL_CONFIG } from '../../../../config';
|
||||||
import { Item } from '../../../core/shared/item.model';
|
import { Item } from '../../../core/shared/item.model';
|
||||||
import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
|
import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
|
||||||
import { MetadatumViewModel } from '../../../core/shared/metadata.models';
|
import { MetadatumViewModel } from '../../../core/shared/metadata.models';
|
||||||
import { RegistryService } from '../../../core/registry/registry.service';
|
import { RegistryService } from '../../../core/registry/registry.service';
|
||||||
import { PaginatedList } from '../../../core/data/paginated-list';
|
import { PaginatedList } from '../../../core/data/paginated-list';
|
||||||
import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
|
|
||||||
import { MetadataField } from '../../../core/metadata/metadatafield.model';
|
|
||||||
import { Metadata } from '../../../core/shared/metadata.utils';
|
import { Metadata } from '../../../core/shared/metadata.utils';
|
||||||
|
import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
|
||||||
|
import { MetadataField } from '../../../core/metadata/metadata-field.model';
|
||||||
|
import {
|
||||||
|
createSuccessfulRemoteDataObject,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemMetadataComponent;
|
let comp: ItemMetadataComponent;
|
||||||
let fixture: ComponentFixture<ItemMetadataComponent>;
|
let fixture: ComponentFixture<ItemMetadataComponent>;
|
||||||
@@ -116,18 +119,18 @@ describe('ItemMetadataComponent', () => {
|
|||||||
)
|
)
|
||||||
;
|
;
|
||||||
itemService = jasmine.createSpyObj('itemService', {
|
itemService = jasmine.createSpyObj('itemService', {
|
||||||
update: observableOf(new RemoteData(false, false, true, undefined, item)),
|
update: createSuccessfulRemoteDataObject$(item),
|
||||||
commitUpdates: {}
|
commitUpdates: {}
|
||||||
});
|
});
|
||||||
routeStub = {
|
routeStub = {
|
||||||
parent: {
|
parent: {
|
||||||
data: observableOf({ item: new RemoteData(false, false, true, null, item) })
|
data: observableOf({ item: createSuccessfulRemoteDataObject(item) })
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);
|
paginatedMetadataFields = new PaginatedList(undefined, [mdField1, mdField2, mdField3]);
|
||||||
|
|
||||||
metadataFieldService = jasmine.createSpyObj({
|
metadataFieldService = jasmine.createSpyObj({
|
||||||
getAllMetadataFields: observableOf(new RemoteData(false, false, true, undefined, paginatedMetadataFields))
|
getAllMetadataFields:createSuccessfulRemoteDataObject$(paginatedMetadataFields)
|
||||||
});
|
});
|
||||||
scheduler = getTestScheduler();
|
scheduler = getTestScheduler();
|
||||||
objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
|
objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
|
||||||
|
|||||||
@@ -17,9 +17,9 @@ import { NotificationsService } from '../../../shared/notifications/notification
|
|||||||
import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config';
|
import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config';
|
||||||
import { TranslateService } from '@ngx-translate/core';
|
import { TranslateService } from '@ngx-translate/core';
|
||||||
import { RegistryService } from '../../../core/registry/registry.service';
|
import { RegistryService } from '../../../core/registry/registry.service';
|
||||||
import { MetadataField } from '../../../core/metadata/metadatafield.model';
|
|
||||||
import { MetadatumViewModel } from '../../../core/shared/metadata.models';
|
import { MetadatumViewModel } from '../../../core/shared/metadata.models';
|
||||||
import { Metadata } from '../../../core/shared/metadata.utils';
|
import { Metadata } from '../../../core/shared/metadata.utils';
|
||||||
|
import { MetadataField } from '../../../core/metadata/metadata-field.model';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'ds-item-metadata',
|
selector: 'ds-item-metadata',
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { ItemPrivateComponent } from './item-private.component';
|
import { ItemPrivateComponent } from './item-private.component';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemPrivateComponent;
|
let comp: ItemPrivateComponent;
|
||||||
let fixture: ComponentFixture<ItemPrivateComponent>;
|
let fixture: ComponentFixture<ItemPrivateComponent>;
|
||||||
@@ -50,7 +51,7 @@ describe('ItemPrivateComponent', () => {
|
|||||||
|
|
||||||
routeStub = {
|
routeStub = {
|
||||||
data: observableOf({
|
data: observableOf({
|
||||||
item: new RemoteData(false, false, true, null, {
|
item: createSuccessfulRemoteDataObject({
|
||||||
id: 'fake-id'
|
id: 'fake-id'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { ItemPublicComponent } from './item-public.component';
|
import { ItemPublicComponent } from './item-public.component';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemPublicComponent;
|
let comp: ItemPublicComponent;
|
||||||
let fixture: ComponentFixture<ItemPublicComponent>;
|
let fixture: ComponentFixture<ItemPublicComponent>;
|
||||||
@@ -50,7 +51,7 @@ describe('ItemPublicComponent', () => {
|
|||||||
|
|
||||||
routeStub = {
|
routeStub = {
|
||||||
data: observableOf({
|
data: observableOf({
|
||||||
item: new RemoteData(false, false, true, null, {
|
item: createSuccessfulRemoteDataObject({
|
||||||
id: 'fake-id'
|
id: 'fake-id'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { ItemReinstateComponent } from './item-reinstate.component';
|
import { ItemReinstateComponent } from './item-reinstate.component';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemReinstateComponent;
|
let comp: ItemReinstateComponent;
|
||||||
let fixture: ComponentFixture<ItemReinstateComponent>;
|
let fixture: ComponentFixture<ItemReinstateComponent>;
|
||||||
@@ -50,7 +51,7 @@ describe('ItemReinstateComponent', () => {
|
|||||||
|
|
||||||
routeStub = {
|
routeStub = {
|
||||||
data: observableOf({
|
data: observableOf({
|
||||||
item: new RemoteData(false, false, true, null, {
|
item: createSuccessfulRemoteDataObject({
|
||||||
id: 'fake-id'
|
id: 'fake-id'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
{{'item.edit.tabs.status.labels.itemPage' | translate}}:
|
{{'item.edit.tabs.status.labels.itemPage' | translate}}:
|
||||||
</div>
|
</div>
|
||||||
<div class="col-9 float-left status-data" id="status-itemPage">
|
<div class="col-9 float-left status-data" id="status-itemPage">
|
||||||
<a href="{{getItemPage((itemRD$ | async)?.payload)}}">{{getItemPage((itemRD$ | async)?.payload)}}</a>
|
<a [routerLink]="getItemPage((itemRD$ | async)?.payload)">{{getItemPage((itemRD$ | async)?.payload)}}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngFor="let operation of operations" class="w-100 pt-3">
|
<div *ngFor="let operation of operations" class="w-100 pt-3">
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { Item } from '../../../core/shared/item.model';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
describe('ItemStatusComponent', () => {
|
describe('ItemStatusComponent', () => {
|
||||||
let comp: ItemStatusComponent;
|
let comp: ItemStatusComponent;
|
||||||
@@ -27,7 +27,7 @@ describe('ItemStatusComponent', () => {
|
|||||||
|
|
||||||
const routeStub = {
|
const routeStub = {
|
||||||
parent: {
|
parent: {
|
||||||
data: observableOf({ item: new RemoteData(false, false, true, null, mockItem) })
|
data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
|
|||||||
import { ItemWithdrawComponent } from './item-withdraw.component';
|
import { ItemWithdrawComponent } from './item-withdraw.component';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemWithdrawComponent;
|
let comp: ItemWithdrawComponent;
|
||||||
let fixture: ComponentFixture<ItemWithdrawComponent>;
|
let fixture: ComponentFixture<ItemWithdrawComponent>;
|
||||||
@@ -50,7 +51,7 @@ describe('ItemWithdrawComponent', () => {
|
|||||||
|
|
||||||
routeStub = {
|
routeStub = {
|
||||||
data: observableOf({
|
data: observableOf({
|
||||||
item: new RemoteData(false, false, true, null, {
|
item: createSuccessfulRemoteDataObject({
|
||||||
id: 'fake-id'
|
id: 'fake-id'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ import { By } from '@angular/platform-browser';
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { getItemEditPath } from '../../item-page-routing.module';
|
import { getItemEditPath } from '../../item-page-routing.module';
|
||||||
import { RestResponse } from '../../../core/cache/response.models';
|
import { RestResponse } from '../../../core/cache/response.models';
|
||||||
|
import {
|
||||||
|
createSuccessfulRemoteDataObject,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../../shared/testing/utils';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test component that implements the AbstractSimpleItemActionComponent used to test the
|
* Test component that implements the AbstractSimpleItemActionComponent used to test the
|
||||||
@@ -65,12 +69,12 @@ describe('AbstractSimpleItemActionComponent', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
mockItemDataService = jasmine.createSpyObj({
|
mockItemDataService = jasmine.createSpyObj({
|
||||||
findById: observableOf(new RemoteData(false, false, true, undefined, mockItem))
|
findById: createSuccessfulRemoteDataObject$(mockItem)
|
||||||
});
|
});
|
||||||
|
|
||||||
routeStub = {
|
routeStub = {
|
||||||
data: observableOf({
|
data: observableOf({
|
||||||
item: new RemoteData(false, false, true, null, {
|
item: createSuccessfulRemoteDataObject({
|
||||||
id: 'fake-id'
|
id: 'fake-id'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -9,6 +9,10 @@ import { Item } from '../../../core/shared/item.model';
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { RemoteData } from '../../../core/data/remote-data';
|
import { RemoteData } from '../../../core/data/remote-data';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
import {
|
||||||
|
createFailedRemoteDataObject$,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../../shared/testing/utils';
|
||||||
|
|
||||||
let collectionsComponent: CollectionsComponent;
|
let collectionsComponent: CollectionsComponent;
|
||||||
let fixture: ComponentFixture<CollectionsComponent>;
|
let fixture: ComponentFixture<CollectionsComponent>;
|
||||||
@@ -24,8 +28,8 @@ const mockCollection1: Collection = Object.assign(new Collection(), {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: observableOf(new RemoteData(false, false, true, null, mockCollection1))});
|
const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: createSuccessfulRemoteDataObject$(mockCollection1)});
|
||||||
const failedMockItem: Item = Object.assign(new Item(), {owningCollection: observableOf(new RemoteData(false, false, false, null, mockCollection1))});
|
const failedMockItem: Item = Object.assign(new Item(), {owningCollection: createFailedRemoteDataObject$(mockCollection1)});
|
||||||
|
|
||||||
describe('CollectionsComponent', () => {
|
describe('CollectionsComponent', () => {
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
|
|||||||
@@ -17,9 +17,13 @@ import { RemoteData } from '../../core/data/remote-data';
|
|||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
|
import {
|
||||||
|
createSuccessfulRemoteDataObject,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../shared/testing/utils';
|
||||||
|
|
||||||
const mockItem: Item = Object.assign(new Item(), {
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
|
bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
|
||||||
metadata: {
|
metadata: {
|
||||||
'dc.title': [
|
'dc.title': [
|
||||||
{
|
{
|
||||||
@@ -30,7 +34,7 @@ const mockItem: Item = Object.assign(new Item(), {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
const routeStub = Object.assign(new ActivatedRouteStub(), {
|
const routeStub = Object.assign(new ActivatedRouteStub(), {
|
||||||
data: observableOf({ item: new RemoteData(false, false, true, null, mockItem) })
|
data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
|
||||||
});
|
});
|
||||||
const metadataServiceStub = {
|
const metadataServiceStub = {
|
||||||
/* tslint:disable:no-empty */
|
/* tslint:disable:no-empty */
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { ItemPageFieldComponent } from './item-page-field.component';
|
|||||||
import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
|
import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
|
import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
|
||||||
|
|
||||||
let comp: ItemPageFieldComponent;
|
let comp: ItemPageFieldComponent;
|
||||||
let fixture: ComponentFixture<ItemPageFieldComponent>;
|
let fixture: ComponentFixture<ItemPageFieldComponent>;
|
||||||
@@ -52,7 +53,7 @@ describe('ItemPageFieldComponent', () => {
|
|||||||
|
|
||||||
export function mockItemWithMetadataFieldAndValue(field: string, value: string): Item {
|
export function mockItemWithMetadataFieldAndValue(field: string, value: string): Item {
|
||||||
const item = Object.assign(new Item(), {
|
const item = Object.assign(new Item(), {
|
||||||
bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
|
bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
|
||||||
metadata: new MetadataMap()
|
metadata: new MetadataMap()
|
||||||
});
|
});
|
||||||
item.metadata[field] = [{
|
item.metadata[field] = [{
|
||||||
|
|||||||
@@ -16,9 +16,13 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
|
import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
import {
|
||||||
|
createFailedRemoteDataObject$, createPendingRemoteDataObject$, createSuccessfulRemoteDataObject,
|
||||||
|
createSuccessfulRemoteDataObject$
|
||||||
|
} from '../../shared/testing/utils';
|
||||||
|
|
||||||
const mockItem: Item = Object.assign(new Item(), {
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
|
bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
|
||||||
metadata: [],
|
metadata: [],
|
||||||
relationships: createRelationshipsObservable()
|
relationships: createRelationshipsObservable()
|
||||||
});
|
});
|
||||||
@@ -33,7 +37,7 @@ describe('ItemPageComponent', () => {
|
|||||||
/* tslint:enable:no-empty */
|
/* tslint:enable:no-empty */
|
||||||
};
|
};
|
||||||
const mockRoute = Object.assign(new ActivatedRouteStub(), {
|
const mockRoute = Object.assign(new ActivatedRouteStub(), {
|
||||||
data: observableOf({ item: new RemoteData(false, false, true, null, mockItem) })
|
data: observableOf({ item: createSuccessfulRemoteDataObject(mockItem) })
|
||||||
});
|
});
|
||||||
|
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
@@ -66,7 +70,8 @@ describe('ItemPageComponent', () => {
|
|||||||
|
|
||||||
describe('when the item is loading', () => {
|
describe('when the item is loading', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
comp.itemRD$ = observableOf(new RemoteData(true, true, true, null, undefined));
|
comp.itemRD$ = createPendingRemoteDataObject$(undefined);
|
||||||
|
// comp.itemRD$ = observableOf(new RemoteData(true, true, true, null, undefined));
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -78,7 +83,7 @@ describe('ItemPageComponent', () => {
|
|||||||
|
|
||||||
describe('when the item failed loading', () => {
|
describe('when the item failed loading', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
comp.itemRD$ = observableOf(new RemoteData(false, false, false, null, undefined));
|
comp.itemRD$ = createFailedRemoteDataObject$(undefined);
|
||||||
fixture.detectChanges();
|
fixture.detectChanges();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -17,9 +17,10 @@ import { createRelationshipsObservable } from '../shared/item.component.spec';
|
|||||||
import { PublicationComponent } from './publication.component';
|
import { PublicationComponent } from './publication.component';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
import { MetadataMap } from '../../../../core/shared/metadata.models';
|
import { MetadataMap } from '../../../../core/shared/metadata.models';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
|
||||||
|
|
||||||
const mockItem: Item = Object.assign(new Item(), {
|
const mockItem: Item = Object.assign(new Item(), {
|
||||||
bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
|
bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
|
||||||
metadata: new MetadataMap(),
|
metadata: new MetadataMap(),
|
||||||
relationships: createRelationshipsObservable()
|
relationships: createRelationshipsObservable()
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import { MetadatumRepresentation } from '../../../../core/shared/metadata-repres
|
|||||||
import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
|
||||||
import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
|
import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
|
||||||
import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils';
|
import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a generic test for an item-page-fields component using a mockItem and the type of component
|
* Create a generic test for an item-page-fields component using a mockItem and the type of component
|
||||||
@@ -102,13 +103,13 @@ export function containsFieldInput(fields: DebugElement[], metadataKey: string):
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function createRelationshipsObservable() {
|
export function createRelationshipsObservable() {
|
||||||
return observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [
|
return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [
|
||||||
Object.assign(new Relationship(), {
|
Object.assign(new Relationship(), {
|
||||||
relationshipType: observableOf(new RemoteData(false, false, true, null, new RelationshipType())),
|
relationshipType: createSuccessfulRemoteDataObject$(new RelationshipType()),
|
||||||
leftItem: observableOf(new RemoteData(false, false, true, null, new Item())),
|
leftItem: createSuccessfulRemoteDataObject$(new Item()),
|
||||||
rightItem: observableOf(new RemoteData(false, false, true, null, new Item()))
|
rightItem: createSuccessfulRemoteDataObject$(new Item())
|
||||||
})
|
})
|
||||||
])));
|
]));
|
||||||
}
|
}
|
||||||
describe('ItemComponent', () => {
|
describe('ItemComponent', () => {
|
||||||
const arr1 = [
|
const arr1 = [
|
||||||
@@ -337,15 +338,15 @@ describe('ItemComponent', () => {
|
|||||||
uuid: '1',
|
uuid: '1',
|
||||||
metadata: new MetadataMap()
|
metadata: new MetadataMap()
|
||||||
});
|
});
|
||||||
mockItem.relationships = observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [
|
mockItem.relationships = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [
|
||||||
Object.assign(new Relationship(), {
|
Object.assign(new Relationship(), {
|
||||||
uuid: '123',
|
uuid: '123',
|
||||||
id: '123',
|
id: '123',
|
||||||
leftItem: observableOf(new RemoteData(false, false, true, null, mockItem)),
|
leftItem: createSuccessfulRemoteDataObject$(mockItem),
|
||||||
rightItem: observableOf(new RemoteData(false, false, true, null, relatedItem)),
|
rightItem: createSuccessfulRemoteDataObject$(relatedItem),
|
||||||
relationshipType: observableOf(new RemoteData(false, false, true, null, new RelationshipType()))
|
relationshipType: createSuccessfulRemoteDataObject$(new RelationshipType())
|
||||||
})
|
})
|
||||||
])));
|
]));
|
||||||
mockItem.metadata[metadataField] = [
|
mockItem.metadata[metadataField] = [
|
||||||
{
|
{
|
||||||
value: 'Second value',
|
value: 'Second value',
|
||||||
@@ -369,7 +370,7 @@ describe('ItemComponent', () => {
|
|||||||
const mockItemDataService = Object.assign({
|
const mockItemDataService = Object.assign({
|
||||||
findById: (id) => {
|
findById: (id) => {
|
||||||
if (id === relatedItem.id) {
|
if (id === relatedItem.id) {
|
||||||
return observableOf(new RemoteData(false, false, true, null, relatedItem))
|
return createSuccessfulRemoteDataObject$(relatedItem)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}) as ItemDataService;
|
}) as ItemDataService;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<ds-filtered-search-page
|
<ds-filtered-search-page
|
||||||
[fixedFilterQuery]="fixedFilter"
|
[fixedFilterQuery]="fixedFilter"
|
||||||
[fixedFilter$]="fixedFilter$"
|
[configuration$]="configuration$"
|
||||||
[searchEnabled]="searchEnabled"
|
[searchEnabled]="searchEnabled"
|
||||||
[sideBarWidth]="sideBarWidth">
|
[sideBarWidth]="sideBarWidth">
|
||||||
</ds-filtered-search-page>
|
</ds-filtered-search-page>
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ describe('RelatedEntitiesSearchComponent', () => {
|
|||||||
expect(comp.fixedFilter).toEqual(mockFilter);
|
expect(comp.fixedFilter).toEqual(mockFilter);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should create a fixedFilter$', () => {
|
it('should create a configuration$', () => {
|
||||||
comp.fixedFilter$.subscribe((fixedFilter) => {
|
comp.configuration$.subscribe((configuration) => {
|
||||||
expect(fixedFilter).toEqual(mockRelationEntityType);
|
expect(configuration).toEqual(mockRelationEntityType);
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ export class RelatedEntitiesSearchComponent implements OnInit {
|
|||||||
@Input() sideBarWidth = 4;
|
@Input() sideBarWidth = 4;
|
||||||
|
|
||||||
fixedFilter: string;
|
fixedFilter: string;
|
||||||
fixedFilter$: Observable<string>;
|
configuration$: Observable<string>;
|
||||||
|
|
||||||
constructor(private fixedFilterService: SearchFixedFilterService) {
|
constructor(private fixedFilterService: SearchFixedFilterService) {
|
||||||
}
|
}
|
||||||
@@ -57,7 +57,7 @@ export class RelatedEntitiesSearchComponent implements OnInit {
|
|||||||
this.fixedFilter = this.fixedFilterService.getFilterByRelation(this.relationType, this.item.id);
|
this.fixedFilter = this.fixedFilterService.getFilterByRelation(this.relationType, this.item.id);
|
||||||
}
|
}
|
||||||
if (isNotEmpty(this.relationEntityType)) {
|
if (isNotEmpty(this.relationEntityType)) {
|
||||||
this.fixedFilter$ = of(this.relationEntityType);
|
this.configuration$ = of(this.relationEntityType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,14 +8,15 @@ import { PageInfo } from '../../../core/shared/page-info.model';
|
|||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
|
import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
const mockItem1: Item = Object.assign(new Item(), {
|
const mockItem1: Item = Object.assign(new Item(), {
|
||||||
bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
|
bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
|
||||||
metadata: [],
|
metadata: [],
|
||||||
relationships: createRelationshipsObservable()
|
relationships: createRelationshipsObservable()
|
||||||
});
|
});
|
||||||
const mockItem2: Item = Object.assign(new Item(), {
|
const mockItem2: Item = Object.assign(new Item(), {
|
||||||
bitstreams: observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), []))),
|
bitstreams: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
|
||||||
metadata: [],
|
metadata: [],
|
||||||
relationships: createRelationshipsObservable()
|
relationships: createRelationshipsObservable()
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import { RoleDirective } from '../shared/roles/role.directive';
|
|||||||
import { RoleService } from '../core/roles/role.service';
|
import { RoleService } from '../core/roles/role.service';
|
||||||
import { MockRoleService } from '../shared/mocks/mock-role-service';
|
import { MockRoleService } from '../shared/mocks/mock-role-service';
|
||||||
import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
|
import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../shared/testing/utils';
|
||||||
|
|
||||||
describe('MyDSpacePageComponent', () => {
|
describe('MyDSpacePageComponent', () => {
|
||||||
let comp: MyDSpacePageComponent;
|
let comp: MyDSpacePageComponent;
|
||||||
@@ -46,7 +47,7 @@ describe('MyDSpacePageComponent', () => {
|
|||||||
pagination.currentPage = 1;
|
pagination.currentPage = 1;
|
||||||
pagination.pageSize = 10;
|
pagination.pageSize = 10;
|
||||||
const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
|
const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
|
||||||
const mockResults = observableOf(new RemoteData(false, false, true, null, ['test', 'data']));
|
const mockResults = createSuccessfulRemoteDataObject$(['test', 'data']);
|
||||||
const searchServiceStub = jasmine.createSpyObj('SearchService', {
|
const searchServiceStub = jasmine.createSpyObj('SearchService', {
|
||||||
search: mockResults,
|
search: mockResults,
|
||||||
getSearchLink: '/mydspace',
|
getSearchLink: '/mydspace',
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { configureSearchComponentTestingModule } from './search-page.component.spec';
|
||||||
|
import { SearchConfigurationService } from './search-service/search-configuration.service';
|
||||||
|
import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
|
||||||
|
|
||||||
|
describe('ConfigurationSearchPageComponent', () => {
|
||||||
|
let comp: ConfigurationSearchPageComponent;
|
||||||
|
let fixture: ComponentFixture<ConfigurationSearchPageComponent>;
|
||||||
|
let searchConfigService: SearchConfigurationService;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
configureSearchComponentTestingModule(ConfigurationSearchPageComponent);
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ConfigurationSearchPageComponent);
|
||||||
|
comp = fixture.componentInstance;
|
||||||
|
searchConfigService = (comp as any).searchConfigService;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
});
|
||||||
71
src/app/+search-page/configuration-search-page.component.ts
Normal file
71
src/app/+search-page/configuration-search-page.component.ts
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
import { HostWindowService } from '../shared/host-window.service';
|
||||||
|
import { SearchService } from './search-service/search.service';
|
||||||
|
import { SearchSidebarService } from './search-sidebar/search-sidebar.service';
|
||||||
|
import { SearchPageComponent } from './search-page.component';
|
||||||
|
import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
|
||||||
|
import { pushInOut } from '../shared/animations/push';
|
||||||
|
import { RouteService } from '../shared/services/route.service';
|
||||||
|
import { SearchConfigurationService } from './search-service/search-configuration.service';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { PaginatedSearchOptions } from './paginated-search-options.model';
|
||||||
|
import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
|
||||||
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This component renders a search page using a configuration as input.
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'ds-configuration-search-page',
|
||||||
|
styleUrls: ['./search-page.component.scss'],
|
||||||
|
templateUrl: './search-page.component.html',
|
||||||
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
animations: [pushInOut],
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
provide: SEARCH_CONFIG_SERVICE,
|
||||||
|
useClass: SearchConfigurationService
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
export class ConfigurationSearchPageComponent extends SearchPageComponent implements OnInit {
|
||||||
|
/**
|
||||||
|
* The configuration to use for the search options
|
||||||
|
* If empty, the configuration will be determined by the route parameter called 'configuration'
|
||||||
|
*/
|
||||||
|
@Input() configuration: string;
|
||||||
|
|
||||||
|
constructor(protected service: SearchService,
|
||||||
|
protected sidebarService: SearchSidebarService,
|
||||||
|
protected windowService: HostWindowService,
|
||||||
|
@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
|
||||||
|
protected routeService: RouteService) {
|
||||||
|
super(service, sidebarService, windowService, searchConfigService, routeService);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Listening to changes in the paginated search options
|
||||||
|
* If something changes, update the search results
|
||||||
|
*
|
||||||
|
* Listen to changes in the scope
|
||||||
|
* If something changes, update the list of scopes for the dropdown
|
||||||
|
*/
|
||||||
|
ngOnInit(): void {
|
||||||
|
super.ngOnInit();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current paginated search options after updating the configuration using the configuration input
|
||||||
|
* This is to make sure the configuration is included in the paginated search options, as it is not part of any
|
||||||
|
* query or route parameters
|
||||||
|
* @returns {Observable<PaginatedSearchOptions>}
|
||||||
|
*/
|
||||||
|
protected getSearchOptions(): Observable<PaginatedSearchOptions> {
|
||||||
|
return this.searchConfigService.paginatedSearchOptions.pipe(
|
||||||
|
map((options: PaginatedSearchOptions) => {
|
||||||
|
const config = this.configuration || options.configuration;
|
||||||
|
return Object.assign(options, { configuration: config });
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
src/app/+search-page/configuration-search-page.guard.ts
Normal file
22
src/app/+search-page/configuration-search-page.guard.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
/**
|
||||||
|
* Assemble the correct i18n key for the configuration search page's title depending on the current route's configuration parameter.
|
||||||
|
* The format of the key will be "{configuration}.search.title" with:
|
||||||
|
* - configuration: The current configuration stored in route.params
|
||||||
|
*/
|
||||||
|
export class ConfigurationSearchPageGuard implements CanActivate {
|
||||||
|
canActivate(
|
||||||
|
route: ActivatedRouteSnapshot,
|
||||||
|
state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
|
||||||
|
const configuration = route.params.configuration;
|
||||||
|
|
||||||
|
const newTitle = configuration + '.search.title';
|
||||||
|
|
||||||
|
route.data = { title: newTitle };
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { Injectable } from '@angular/core';
|
|
||||||
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
|
|
||||||
import { Observable } from 'rxjs';
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
/**
|
|
||||||
* Assemble the correct i18n key for the filtered search page's title depending on the current route's filter parameter.
|
|
||||||
* The format of the key will be "{filter}.search.title" with:
|
|
||||||
* - filter: The current filter stored in route.params
|
|
||||||
*/
|
|
||||||
export class FilteredSearchPageGuard implements CanActivate {
|
|
||||||
canActivate(
|
|
||||||
route: ActivatedRouteSnapshot,
|
|
||||||
state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
|
|
||||||
const filter = route.params.filter;
|
|
||||||
|
|
||||||
const newTitle = filter + '.search.title';
|
|
||||||
|
|
||||||
route.data = { title: newTitle };
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,12 @@
|
|||||||
import { autoserialize, autoserializeAs } from 'cerialize';
|
import { autoserialize, inheritSerialization } from 'cerialize';
|
||||||
import { MetadataMap } from '../core/shared/metadata.models';
|
import { MetadataMap } from '../core/shared/metadata.models';
|
||||||
import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
|
import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
|
||||||
|
import { NormalizedObject } from '../core/cache/models/normalized-object.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a normalized version of a search result object of a certain DSpaceObject
|
* Represents a normalized version of a search result object of a certain DSpaceObject
|
||||||
*/
|
*/
|
||||||
|
@inheritSerialization(NormalizedObject)
|
||||||
export class NormalizedSearchResult implements ListableObject {
|
export class NormalizedSearchResult implements ListableObject {
|
||||||
/**
|
/**
|
||||||
* The UUID of the DSpaceObject that was found
|
* The UUID of the DSpaceObject that was found
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-d
|
|||||||
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service-stub';
|
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service-stub';
|
||||||
import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
|
import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
|
||||||
import { tap } from 'rxjs/operators';
|
import { tap } from 'rxjs/operators';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
|
||||||
|
|
||||||
describe('SearchFacetFilterComponent', () => {
|
describe('SearchFacetFilterComponent', () => {
|
||||||
let comp: SearchFacetFilterComponent;
|
let comp: SearchFacetFilterComponent;
|
||||||
@@ -61,7 +62,7 @@ describe('SearchFacetFilterComponent', () => {
|
|||||||
let router;
|
let router;
|
||||||
const page = observableOf(0);
|
const page = observableOf(0);
|
||||||
|
|
||||||
const mockValues = observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), values)));
|
const mockValues = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), values));
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import { RouteService } from '../../../../shared/services/route.service';
|
|||||||
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
|
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
|
||||||
import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
|
import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
|
||||||
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service-stub';
|
import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service-stub';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
|
||||||
|
|
||||||
describe('SearchRangeFilterComponent', () => {
|
describe('SearchRangeFilterComponent', () => {
|
||||||
let comp: SearchRangeFilterComponent;
|
let comp: SearchRangeFilterComponent;
|
||||||
@@ -66,7 +67,7 @@ describe('SearchRangeFilterComponent', () => {
|
|||||||
let router;
|
let router;
|
||||||
const page = observableOf(0);
|
const page = observableOf(0);
|
||||||
|
|
||||||
const mockValues = observableOf(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), values)));
|
const mockValues = createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), values));
|
||||||
beforeEach(async(() => {
|
beforeEach(async(() => {
|
||||||
TestBed.configureTestingModule({
|
TestBed.configureTestingModule({
|
||||||
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
|
||||||
|
|||||||
@@ -2,14 +2,14 @@ import { NgModule } from '@angular/core';
|
|||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
|
|
||||||
import { SearchPageComponent } from './search-page.component';
|
import { SearchPageComponent } from './search-page.component';
|
||||||
import { FilteredSearchPageComponent } from './filtered-search-page.component';
|
import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
|
||||||
import { FilteredSearchPageGuard } from './filtered-search-page.guard';
|
import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
RouterModule.forChild([
|
RouterModule.forChild([
|
||||||
{ path: '', component: SearchPageComponent, data: { title: 'search.title' } },
|
{ path: '', component: SearchPageComponent, data: { title: 'search.title' } },
|
||||||
{ path: ':filter', component: FilteredSearchPageComponent, canActivate: [FilteredSearchPageGuard]}
|
{ path: ':configuration', component: ConfigurationSearchPageComponent, canActivate: [ConfigurationSearchPageGuard]}
|
||||||
])
|
])
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<ds-search-results [searchResults]="resultsRD$ | async"
|
<ds-search-results [searchResults]="resultsRD$ | async"
|
||||||
[searchConfig]="searchOptions$ | async"
|
[searchConfig]="searchOptions$ | async"
|
||||||
[fixedFilter]="fixedFilter$ | async"
|
[configuration]="configuration$ | async"
|
||||||
[disableHeader]="!searchEnabled"></ds-search-results>
|
[disableHeader]="!searchEnabled"></ds-search-results>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import { RouteService } from '../shared/services/route.service';
|
|||||||
import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
|
import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
|
||||||
import { PaginatedSearchOptions } from './paginated-search-options.model';
|
import { PaginatedSearchOptions } from './paginated-search-options.model';
|
||||||
import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
|
import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../shared/testing/utils';
|
||||||
|
|
||||||
let comp: SearchPageComponent;
|
let comp: SearchPageComponent;
|
||||||
let fixture: ComponentFixture<SearchPageComponent>;
|
let fixture: ComponentFixture<SearchPageComponent>;
|
||||||
@@ -41,7 +42,7 @@ pagination.id = 'search-results-pagination';
|
|||||||
pagination.currentPage = 1;
|
pagination.currentPage = 1;
|
||||||
pagination.pageSize = 10;
|
pagination.pageSize = 10;
|
||||||
const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
|
const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
|
||||||
const mockResults = observableOf(new RemoteData(false, false, true, null, ['test', 'data']));
|
const mockResults = createSuccessfulRemoteDataObject$(['test', 'data']);
|
||||||
const searchServiceStub = jasmine.createSpyObj('SearchService', {
|
const searchServiceStub = jasmine.createSpyObj('SearchService', {
|
||||||
search: mockResults,
|
search: mockResults,
|
||||||
getSearchLink: '/search',
|
getSearchLink: '/search',
|
||||||
|
|||||||
@@ -86,10 +86,10 @@ export class SearchPageComponent implements OnInit {
|
|||||||
sideBarWidth = 3;
|
sideBarWidth = 3;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The currently applied filter (determines title of search)
|
* The currently applied configuration (determines title of search)
|
||||||
*/
|
*/
|
||||||
@Input()
|
@Input()
|
||||||
fixedFilter$: Observable<string>;
|
configuration$: Observable<string>;
|
||||||
|
|
||||||
constructor(protected service: SearchService,
|
constructor(protected service: SearchService,
|
||||||
protected sidebarService: SearchSidebarService,
|
protected sidebarService: SearchSidebarService,
|
||||||
@@ -116,8 +116,8 @@ export class SearchPageComponent implements OnInit {
|
|||||||
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
|
this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
|
||||||
switchMap((scopeId) => this.service.getScopes(scopeId))
|
switchMap((scopeId) => this.service.getScopes(scopeId))
|
||||||
);
|
);
|
||||||
if (!isNotEmpty(this.fixedFilter$)) {
|
if (!isNotEmpty(this.configuration$)) {
|
||||||
this.fixedFilter$ = this.routeService.getRouteParameterValue('filter');
|
this.configuration$ = this.routeService.getRouteParameterValue('configuration');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,9 +17,7 @@ import { SearchFiltersComponent } from './search-filters/search-filters.componen
|
|||||||
import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
|
import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
|
||||||
import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
|
import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
|
||||||
import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
|
import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
|
||||||
import { FilteredSearchPageComponent } from './filtered-search-page.component';
|
|
||||||
import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
|
import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
|
||||||
import { FilteredSearchPageGuard } from './filtered-search-page.guard';
|
|
||||||
import { SearchLabelsComponent } from './search-labels/search-labels.component';
|
import { SearchLabelsComponent } from './search-labels/search-labels.component';
|
||||||
import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
|
import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
|
||||||
import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
|
import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
|
||||||
@@ -32,6 +30,9 @@ import { SearchFacetSelectedOptionComponent } from './search-filters/search-filt
|
|||||||
import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
|
import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
|
||||||
import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
|
import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
|
||||||
import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
|
import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
|
||||||
|
import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
|
||||||
|
import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
|
||||||
|
import { FilteredSearchPageComponent } from './filtered-search-page.component';
|
||||||
|
|
||||||
const effects = [
|
const effects = [
|
||||||
SearchSidebarEffects
|
SearchSidebarEffects
|
||||||
@@ -60,7 +61,8 @@ const components = [
|
|||||||
SearchFacetRangeOptionComponent,
|
SearchFacetRangeOptionComponent,
|
||||||
SearchSwitchConfigurationComponent,
|
SearchSwitchConfigurationComponent,
|
||||||
SearchAuthorityFilterComponent,
|
SearchAuthorityFilterComponent,
|
||||||
FilteredSearchPageComponent
|
FilteredSearchPageComponent,
|
||||||
|
ConfigurationSearchPageComponent
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
@@ -76,7 +78,7 @@ const components = [
|
|||||||
SearchSidebarService,
|
SearchSidebarService,
|
||||||
SearchFilterService,
|
SearchFilterService,
|
||||||
SearchFixedFilterService,
|
SearchFixedFilterService,
|
||||||
FilteredSearchPageGuard,
|
ConfigurationSearchPageGuard,
|
||||||
SearchFilterService,
|
SearchFilterService,
|
||||||
SearchConfigurationService
|
SearchConfigurationService
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<h2 *ngIf="!disableHeader">{{ getTitleKey() | translate }}</h2>
|
<h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
|
||||||
<div *ngIf="searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
|
<div *ngIf="searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
|
||||||
<ds-viewable-collection
|
<ds-viewable-collection
|
||||||
[config]="searchConfig.pagination"
|
[config]="searchConfig.pagination"
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ export const objects = [
|
|||||||
self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
|
self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
|
||||||
id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
|
id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
|
||||||
uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
|
uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
|
||||||
type: ResourceType.Community,
|
type: Community.type,
|
||||||
metadata: {
|
metadata: {
|
||||||
'dc.description': [
|
'dc.description': [
|
||||||
{
|
{
|
||||||
@@ -168,7 +168,7 @@ export const objects = [
|
|||||||
self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/9076bd16-e69a-48d6-9e41-0238cb40d863',
|
self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/communities/9076bd16-e69a-48d6-9e41-0238cb40d863',
|
||||||
id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
|
id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
|
||||||
uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
|
uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
|
||||||
type: ResourceType.Community,
|
type: Community.type,
|
||||||
metadata: {
|
metadata: {
|
||||||
'dc.description': [
|
'dc.description': [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -45,9 +45,9 @@ export class SearchResultsComponent {
|
|||||||
@Input() viewMode: SetViewMode;
|
@Input() viewMode: SetViewMode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An optional fixed filter to filter the result on one type
|
* An optional configuration to filter the result on one type
|
||||||
*/
|
*/
|
||||||
@Input() fixedFilter: string;
|
@Input() configuration: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether or not to hide the header of the results
|
* Whether or not to hide the header of the results
|
||||||
@@ -55,19 +55,6 @@ export class SearchResultsComponent {
|
|||||||
*/
|
*/
|
||||||
@Input() disableHeader = false;
|
@Input() disableHeader = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the i18n key for the title depending on the fixed filter
|
|
||||||
* Defaults to 'search.results.head' if there's no fixed filter found
|
|
||||||
* @returns {string}
|
|
||||||
*/
|
|
||||||
getTitleKey() {
|
|
||||||
if (isNotEmpty(this.fixedFilter)) {
|
|
||||||
return this.fixedFilter + '.search.results.head'
|
|
||||||
} else {
|
|
||||||
return 'search.results.head';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Method to change the given string by surrounding it by quotes if not already present.
|
* Method to change the given string by surrounding it by quotes if not already present.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import {
|
|||||||
of as observableOf,
|
of as observableOf,
|
||||||
Subscription
|
Subscription
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
import { filter, flatMap, map, switchMap, tap } from 'rxjs/operators';
|
import { filter, flatMap, map, startWith, switchMap, tap } from 'rxjs/operators';
|
||||||
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
|
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
|
||||||
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
|
||||||
import { SearchOptions } from '../search-options.model';
|
import { SearchOptions } from '../search-options.model';
|
||||||
@@ -21,6 +21,7 @@ import { getSucceededRemoteData } from '../../core/shared/operators';
|
|||||||
import { SearchFilter } from '../search-filter.model';
|
import { SearchFilter } from '../search-filter.model';
|
||||||
import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
|
import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
|
||||||
import { SearchFixedFilterService } from '../search-filters/search-filter/search-fixed-filter.service';
|
import { SearchFixedFilterService } from '../search-filters/search-filter/search-fixed-filter.service';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service that performs all actions that have to do with the current search configuration
|
* Service that performs all actions that have to do with the current search configuration
|
||||||
@@ -109,9 +110,14 @@ export class SearchConfigurationService implements OnDestroy {
|
|||||||
* @returns {Observable<string>} Emits the current configuration string
|
* @returns {Observable<string>} Emits the current configuration string
|
||||||
*/
|
*/
|
||||||
getCurrentConfiguration(defaultConfiguration: string) {
|
getCurrentConfiguration(defaultConfiguration: string) {
|
||||||
return this.routeService.getQueryParameterValue('configuration').pipe(map((configuration) => {
|
return observableCombineLatest(
|
||||||
return configuration || defaultConfiguration;
|
this.routeService.getQueryParameterValue('configuration').pipe(startWith(undefined)),
|
||||||
}));
|
this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined))
|
||||||
|
).pipe(
|
||||||
|
map(([queryConfig, routeConfig]) => {
|
||||||
|
return queryConfig || routeConfig || defaultConfiguration;
|
||||||
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -269,7 +275,7 @@ export class SearchConfigurationService implements OnDestroy {
|
|||||||
scope: this.defaultScope,
|
scope: this.defaultScope,
|
||||||
query: this.defaultQuery
|
query: this.defaultQuery
|
||||||
});
|
});
|
||||||
this._defaults = observableOf(new RemoteData(false, false, true, null, options));
|
this._defaults = createSuccessfulRemoteDataObject$(options);
|
||||||
}
|
}
|
||||||
return this._defaults;
|
return this._defaults;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { GenericConstructor } from '../../core/shared/generic-constructor';
|
import { GenericConstructor } from '../../core/shared/generic-constructor';
|
||||||
import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
|
import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
|
||||||
import { isNull } from '../../shared/empty.util';
|
import { hasNoValue, isNull } from '../../shared/empty.util';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Contains the mapping between a search result component and a DSpaceObject
|
* Contains the mapping between a search result component and a DSpaceObject
|
||||||
@@ -34,7 +34,7 @@ export function searchResultFor(domainConstructor: GenericConstructor<ListableOb
|
|||||||
* @returns The component's constructor that matches the given DSpaceObject
|
* @returns The component's constructor that matches the given DSpaceObject
|
||||||
*/
|
*/
|
||||||
export function getSearchResultFor(domainConstructor: GenericConstructor<ListableObject>, configuration: string = null) {
|
export function getSearchResultFor(domainConstructor: GenericConstructor<ListableObject>, configuration: string = null) {
|
||||||
if (isNull(configuration) || configuration === 'default') {
|
if (isNull(configuration) || configuration === 'default' || hasNoValue(searchResultMap.get(configuration))) {
|
||||||
return searchResultMap.get(domainConstructor);
|
return searchResultMap.get(domainConstructor);
|
||||||
} else {
|
} else {
|
||||||
return searchResultMap.get(configuration).get(domainConstructor);
|
return searchResultMap.get(configuration).get(domainConstructor);
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
|
|||||||
import { map } from 'rxjs/operators';
|
import { map } from 'rxjs/operators';
|
||||||
import { RouteService } from '../../shared/services/route.service';
|
import { RouteService } from '../../shared/services/route.service';
|
||||||
import { routeServiceStub } from '../../shared/testing/route-service-stub';
|
import { routeServiceStub } from '../../shared/testing/route-service-stub';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
|
||||||
|
|
||||||
@Component({ template: '' })
|
@Component({ template: '' })
|
||||||
class DummyComponent {
|
class DummyComponent {
|
||||||
@@ -91,7 +92,7 @@ describe('SearchService', () => {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
aggregate: (input: Array<Observable<RemoteData<any>>>): Observable<RemoteData<any[]>> => {
|
aggregate: (input: Array<Observable<RemoteData<any>>>): Observable<RemoteData<any[]>> => {
|
||||||
return observableOf(new RemoteData(false, false, true, null, []));
|
return createSuccessfulRemoteDataObject$([]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
|
import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
|
||||||
import { Injectable, OnDestroy } from '@angular/core';
|
import { Injectable, OnDestroy } from '@angular/core';
|
||||||
import { NavigationExtras, PRIMARY_OUTLET, Router, UrlSegmentGroup } from '@angular/router';
|
import { NavigationExtras, Router } from '@angular/router';
|
||||||
import { first, map, switchMap } from 'rxjs/operators';
|
import { first, map, switchMap } from 'rxjs/operators';
|
||||||
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
|
import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
|
||||||
import {
|
import {
|
||||||
@@ -40,7 +40,6 @@ import { PaginatedSearchOptions } from '../paginated-search-options.model';
|
|||||||
import { Community } from '../../core/shared/community.model';
|
import { Community } from '../../core/shared/community.model';
|
||||||
import { CommunityDataService } from '../../core/data/community-data.service';
|
import { CommunityDataService } from '../../core/data/community-data.service';
|
||||||
import { ViewMode } from '../../core/shared/view-mode.model';
|
import { ViewMode } from '../../core/shared/view-mode.model';
|
||||||
import { ResourceType } from '../../core/shared/resource-type';
|
|
||||||
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
|
||||||
import { RouteService } from '../../shared/services/route.service';
|
import { RouteService } from '../../shared/services/route.service';
|
||||||
|
|
||||||
@@ -296,7 +295,7 @@ export class SearchService implements OnDestroy {
|
|||||||
const scopeObject: Observable<RemoteData<DSpaceObject>> = this.dspaceObjectService.findById(scopeId).pipe(getSucceededRemoteData());
|
const scopeObject: Observable<RemoteData<DSpaceObject>> = this.dspaceObjectService.findById(scopeId).pipe(getSucceededRemoteData());
|
||||||
const scopeList: Observable<DSpaceObject[]> = scopeObject.pipe(
|
const scopeList: Observable<DSpaceObject[]> = scopeObject.pipe(
|
||||||
switchMap((dsoRD: RemoteData<DSpaceObject>) => {
|
switchMap((dsoRD: RemoteData<DSpaceObject>) => {
|
||||||
if (dsoRD.payload.type === ResourceType.Community) {
|
if ((dsoRD.payload as any).type === Community.type.value) {
|
||||||
const community: Community = dsoRD.payload as Community;
|
const community: Community = dsoRD.payload as Community;
|
||||||
return observableCombineLatest(community.subcommunities, community.collections).pipe(
|
return observableCombineLatest(community.subcommunities, community.collections).pipe(
|
||||||
map(([subCommunities, collections]) => {
|
map(([subCommunities, collections]) => {
|
||||||
|
|||||||
@@ -20,4 +20,4 @@ import { SubmissionEditComponent } from '../submission/edit/submission-edit.comp
|
|||||||
/**
|
/**
|
||||||
* This module defines the default component to load when navigating to the workflowitems edit page path.
|
* This module defines the default component to load when navigating to the workflowitems edit page path.
|
||||||
*/
|
*/
|
||||||
export class WorkflowitemsEditPageRoutingModule { }
|
export class WorkflowItemsEditPageRoutingModule { }
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { WorkflowitemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
|
import { WorkflowItemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
|
||||||
import { SubmissionModule } from '../submission/submission.module';
|
import { SubmissionModule } from '../submission/submission.module';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
WorkflowitemsEditPageRoutingModule,
|
WorkflowItemsEditPageRoutingModule,
|
||||||
CommonModule,
|
CommonModule,
|
||||||
SharedModule,
|
SharedModule,
|
||||||
SubmissionModule,
|
SubmissionModule,
|
||||||
@@ -16,6 +16,6 @@ import { SubmissionModule } from '../submission/submission.module';
|
|||||||
/**
|
/**
|
||||||
* This module handles all modules that need to access the workflowitems edit page.
|
* This module handles all modules that need to access the workflowitems edit page.
|
||||||
*/
|
*/
|
||||||
export class WorkflowitemsEditPageModule {
|
export class WorkflowItemsEditPageModule {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export function getCommunityModulePath() {
|
|||||||
{ path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
|
{ path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
|
||||||
{ path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
|
{ path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule' },
|
||||||
{ path: 'workspaceitems', loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule' },
|
{ path: 'workspaceitems', loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule' },
|
||||||
{ path: 'workflowitems', loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowitemsEditPageModule' },
|
{ path: 'workflowitems', loadChildren: './+workflowitems-edit-page/workflowitems-edit-page.module#WorkflowItemsEditPageModule' },
|
||||||
{ path: '**', pathMatch: 'full', component: PageNotFoundComponent },
|
{ path: '**', pathMatch: 'full', component: PageNotFoundComponent },
|
||||||
])
|
])
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
import { AuthType } from './auth-type';
|
|
||||||
import { GenericConstructor } from '../shared/generic-constructor';
|
|
||||||
import { NormalizedAuthStatus } from './models/normalized-auth-status.model';
|
|
||||||
import { NormalizedEPerson } from '../eperson/models/normalized-eperson.model';
|
|
||||||
import { NormalizedObject } from '../cache/models/normalized-object.model';
|
|
||||||
import { CacheableObject } from '../cache/object-cache.reducer';
|
|
||||||
import { NormalizedGroup } from '../eperson/models/normalized-group.model';
|
|
||||||
|
|
||||||
export class AuthObjectFactory {
|
|
||||||
public static getConstructor(type): GenericConstructor<NormalizedObject<CacheableObject>> {
|
|
||||||
switch (type) {
|
|
||||||
case AuthType.EPerson: {
|
|
||||||
return NormalizedEPerson
|
|
||||||
}
|
|
||||||
|
|
||||||
case AuthType.Group: {
|
|
||||||
return NormalizedGroup
|
|
||||||
}
|
|
||||||
|
|
||||||
case AuthType.Status: {
|
|
||||||
return NormalizedAuthStatus
|
|
||||||
}
|
|
||||||
|
|
||||||
default: {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -35,16 +35,23 @@ describe('AuthResponseParsingService', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe('parse', () => {
|
describe('parse', () => {
|
||||||
const validRequest = new AuthPostRequest(
|
let validRequest;
|
||||||
|
let validRequest2;
|
||||||
|
let validResponse;
|
||||||
|
let validResponse1;
|
||||||
|
let validResponse2;
|
||||||
|
beforeEach(() => {
|
||||||
|
|
||||||
|
validRequest = new AuthPostRequest(
|
||||||
'69f375b5-19f4-4453-8c7a-7dc5c55aafbb',
|
'69f375b5-19f4-4453-8c7a-7dc5c55aafbb',
|
||||||
'https://rest.api/dspace-spring-rest/api/authn/login',
|
'https://rest.api/dspace-spring-rest/api/authn/login',
|
||||||
'password=test&user=myself@testshib.org');
|
'password=test&user=myself@testshib.org');
|
||||||
|
|
||||||
const validRequest2 = new AuthGetRequest(
|
validRequest2 = new AuthGetRequest(
|
||||||
'69f375b5-19f4-4453-8c7a-7dc5c55aafbb',
|
'69f375b5-19f4-4453-8c7a-7dc5c55aafbb',
|
||||||
'https://rest.api/dspace-spring-rest/api/authn/status');
|
'https://rest.api/dspace-spring-rest/api/authn/status');
|
||||||
|
|
||||||
const validResponse = {
|
validResponse = {
|
||||||
payload: {
|
payload: {
|
||||||
authenticated: true,
|
authenticated: true,
|
||||||
id: null,
|
id: null,
|
||||||
@@ -58,13 +65,13 @@ describe('AuthResponseParsingService', () => {
|
|||||||
statusText: '200'
|
statusText: '200'
|
||||||
};
|
};
|
||||||
|
|
||||||
const validResponse1 = {
|
validResponse1 = {
|
||||||
payload: {},
|
payload: {},
|
||||||
statusCode: 404,
|
statusCode: 404,
|
||||||
statusText: '404'
|
statusText: '404'
|
||||||
};
|
};
|
||||||
|
|
||||||
const validResponse2 = {
|
validResponse2 = {
|
||||||
payload: {
|
payload: {
|
||||||
authenticated: true,
|
authenticated: true,
|
||||||
id: null,
|
id: null,
|
||||||
@@ -124,6 +131,7 @@ describe('AuthResponseParsingService', () => {
|
|||||||
statusText: '200'
|
statusText: '200'
|
||||||
|
|
||||||
};
|
};
|
||||||
|
});
|
||||||
|
|
||||||
it('should return a AuthStatusResponse if data contains a valid AuthStatus object as payload', () => {
|
it('should return a AuthStatusResponse if data contains a valid AuthStatus object as payload', () => {
|
||||||
const response = service.parse(validRequest, validResponse);
|
const response = service.parse(validRequest, validResponse);
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { Inject, Injectable } from '@angular/core';
|
import { Inject, Injectable } from '@angular/core';
|
||||||
|
|
||||||
import { AuthObjectFactory } from './auth-object-factory';
|
|
||||||
import { BaseResponseParsingService } from '../data/base-response-parsing.service';
|
import { BaseResponseParsingService } from '../data/base-response-parsing.service';
|
||||||
import { AuthStatusResponse, RestResponse } from '../cache/response.models';
|
import { AuthStatusResponse, RestResponse } from '../cache/response.models';
|
||||||
import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
|
import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
|
||||||
@@ -10,7 +9,6 @@ import { isNotEmpty } from '../../shared/empty.util';
|
|||||||
import { ObjectCacheService } from '../cache/object-cache.service';
|
import { ObjectCacheService } from '../cache/object-cache.service';
|
||||||
import { ResponseParsingService } from '../data/parsing.service';
|
import { ResponseParsingService } from '../data/parsing.service';
|
||||||
import { RestRequest } from '../data/request.models';
|
import { RestRequest } from '../data/request.models';
|
||||||
import { AuthType } from './auth-type';
|
|
||||||
import { AuthStatus } from './models/auth-status.model';
|
import { AuthStatus } from './models/auth-status.model';
|
||||||
import { NormalizedAuthStatus } from './models/normalized-auth-status.model';
|
import { NormalizedAuthStatus } from './models/normalized-auth-status.model';
|
||||||
import { NormalizedObject } from '../cache/models/normalized-object.model';
|
import { NormalizedObject } from '../cache/models/normalized-object.model';
|
||||||
@@ -18,7 +16,6 @@ import { NormalizedObject } from '../cache/models/normalized-object.model';
|
|||||||
@Injectable()
|
@Injectable()
|
||||||
export class AuthResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
|
export class AuthResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
|
||||||
|
|
||||||
protected objectFactory = AuthObjectFactory;
|
|
||||||
protected toCache = true;
|
protected toCache = true;
|
||||||
|
|
||||||
constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
|
constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
|
||||||
@@ -28,7 +25,7 @@ export class AuthResponseParsingService extends BaseResponseParsingService imple
|
|||||||
|
|
||||||
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
|
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
|
||||||
if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === 200)) {
|
if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === 200)) {
|
||||||
const response = this.process<NormalizedObject<AuthStatus>, AuthType>(data.payload, request.uuid);
|
const response = this.process<NormalizedObject<AuthStatus>>(data.payload, request.uuid);
|
||||||
return new AuthStatusResponse(response, data.statusCode, data.statusText);
|
return new AuthStatusResponse(response, data.statusCode, data.statusText);
|
||||||
} else {
|
} else {
|
||||||
return new AuthStatusResponse(data.payload as NormalizedAuthStatus, data.statusCode, data.statusText);
|
return new AuthStatusResponse(data.payload as NormalizedAuthStatus, data.statusCode, data.statusText);
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
export enum AuthType {
|
|
||||||
EPerson = 'eperson',
|
|
||||||
Status = 'status',
|
|
||||||
Group = 'group'
|
|
||||||
}
|
|
||||||
@@ -4,20 +4,51 @@ import { EPerson } from '../../eperson/models/eperson.model';
|
|||||||
import { RemoteData } from '../../data/remote-data';
|
import { RemoteData } from '../../data/remote-data';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { CacheableObject } from '../../cache/object-cache.reducer';
|
import { CacheableObject } from '../../cache/object-cache.reducer';
|
||||||
|
import { ResourceType } from '../../shared/resource-type';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Object that represents the authenticated status of a user
|
||||||
|
*/
|
||||||
export class AuthStatus implements CacheableObject {
|
export class AuthStatus implements CacheableObject {
|
||||||
|
static type = new ResourceType('status');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unique identifier of this auth status
|
||||||
|
*/
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unique uuid of this auth status
|
||||||
|
*/
|
||||||
|
uuid: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True if REST API is up and running, should never return false
|
||||||
|
*/
|
||||||
okay: boolean;
|
okay: boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the auth status represents an authenticated state
|
||||||
|
*/
|
||||||
authenticated: boolean;
|
authenticated: boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Authentication error if there was one for this status
|
||||||
|
*/
|
||||||
error?: AuthError;
|
error?: AuthError;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The eperson of this auth status
|
||||||
|
*/
|
||||||
eperson: Observable<RemoteData<EPerson>>;
|
eperson: Observable<RemoteData<EPerson>>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True if the token is valid, false if there was no token or the token wasn't valid
|
||||||
|
*/
|
||||||
token?: AuthTokenInfo;
|
token?: AuthTokenInfo;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The self link of this auth status' REST object
|
||||||
|
*/
|
||||||
self: string;
|
self: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,22 @@
|
|||||||
import { AuthStatus } from './auth-status.model';
|
import { AuthStatus } from './auth-status.model';
|
||||||
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
|
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
|
||||||
import { mapsTo, relationship } from '../../cache/builders/build-decorators';
|
import { mapsTo, relationship } from '../../cache/builders/build-decorators';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
|
||||||
import { NormalizedObject } from '../../cache/models/normalized-object.model';
|
import { NormalizedObject } from '../../cache/models/normalized-object.model';
|
||||||
import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
|
import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
|
||||||
|
import { EPerson } from '../../eperson/models/eperson.model';
|
||||||
|
|
||||||
@mapsTo(AuthStatus)
|
@mapsTo(AuthStatus)
|
||||||
@inheritSerialization(NormalizedObject)
|
@inheritSerialization(NormalizedObject)
|
||||||
export class NormalizedAuthStatus extends NormalizedObject<AuthStatus> {
|
export class NormalizedAuthStatus extends NormalizedObject<AuthStatus> {
|
||||||
|
/**
|
||||||
|
* The unique identifier of this auth status
|
||||||
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
id: string;
|
id: string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unique generated uuid of this auth status
|
||||||
|
*/
|
||||||
@autoserializeAs(new IDToUUIDSerializer('auth-status'), 'id')
|
@autoserializeAs(new IDToUUIDSerializer('auth-status'), 'id')
|
||||||
uuid: string;
|
uuid: string;
|
||||||
|
|
||||||
@@ -26,7 +32,10 @@ export class NormalizedAuthStatus extends NormalizedObject<AuthStatus> {
|
|||||||
@autoserialize
|
@autoserialize
|
||||||
authenticated: boolean;
|
authenticated: boolean;
|
||||||
|
|
||||||
@relationship(ResourceType.EPerson, false)
|
/**
|
||||||
|
* The self link to the eperson of this auth status
|
||||||
|
*/
|
||||||
|
@relationship(EPerson, false)
|
||||||
@autoserialize
|
@autoserialize
|
||||||
eperson: string;
|
eperson: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { Observable, of as observableOf } from 'rxjs';
|
import { Observable, of as observableOf } from 'rxjs';
|
||||||
import { distinctUntilChanged, map, startWith, take } from 'rxjs/operators';
|
import { distinctUntilChanged, map, startWith } from 'rxjs/operators';
|
||||||
import {
|
import {
|
||||||
ensureArrayHasValue, hasValue,
|
ensureArrayHasValue,
|
||||||
|
hasValue,
|
||||||
hasValueOperator,
|
hasValueOperator,
|
||||||
isEmpty,
|
isEmpty,
|
||||||
isNotEmpty,
|
isNotEmpty,
|
||||||
@@ -23,7 +24,9 @@ import { BrowseEntry } from '../shared/browse-entry.model';
|
|||||||
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
import { HALEndpointService } from '../shared/hal-endpoint.service';
|
||||||
import {
|
import {
|
||||||
configureRequest,
|
configureRequest,
|
||||||
filterSuccessfulResponses, getBrowseDefinitionLinks, getFirstOccurrence,
|
filterSuccessfulResponses,
|
||||||
|
getBrowseDefinitionLinks,
|
||||||
|
getFirstOccurrence,
|
||||||
getRemoteDataPayload,
|
getRemoteDataPayload,
|
||||||
getRequestFromRequestHref
|
getRequestFromRequestHref
|
||||||
} from '../shared/operators';
|
} from '../shared/operators';
|
||||||
@@ -32,7 +35,6 @@ import { Item } from '../shared/item.model';
|
|||||||
import { DSpaceObject } from '../shared/dspace-object.model';
|
import { DSpaceObject } from '../shared/dspace-object.model';
|
||||||
import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
|
import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
|
||||||
import { GenericSuccessResponse } from '../cache/response.models';
|
import { GenericSuccessResponse } from '../cache/response.models';
|
||||||
import { RequestEntry } from '../data/request.reducer';
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The service handling all browse requests
|
* The service handling all browse requests
|
||||||
|
|||||||
50
src/app/core/cache/builders/build-decorators.ts
vendored
50
src/app/core/cache/builders/build-decorators.ts
vendored
@@ -1,23 +1,59 @@
|
|||||||
import 'reflect-metadata';
|
import 'reflect-metadata';
|
||||||
|
|
||||||
import { GenericConstructor } from '../../shared/generic-constructor';
|
import { GenericConstructor } from '../../shared/generic-constructor';
|
||||||
import { CacheableObject } from '../object-cache.reducer';
|
import { CacheableObject, TypedObject } from '../object-cache.reducer';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { ResourceType } from '../../shared/resource-type';
|
||||||
|
|
||||||
const mapsToMetadataKey = Symbol('mapsTo');
|
const mapsToMetadataKey = Symbol('mapsTo');
|
||||||
const relationshipKey = Symbol('relationship');
|
const relationshipKey = Symbol('relationship');
|
||||||
|
|
||||||
const relationshipMap = new Map();
|
const relationshipMap = new Map();
|
||||||
|
const typeMap = new Map();
|
||||||
|
|
||||||
export function mapsTo(value: GenericConstructor<CacheableObject>) {
|
/**
|
||||||
return Reflect.metadata(mapsToMetadataKey, value);
|
* Decorator function to map a normalized class to it's not-normalized counter part class
|
||||||
|
* It will also maps a type to the matching class
|
||||||
|
* @param value The not-normalized class to map to
|
||||||
|
*/
|
||||||
|
export function mapsTo(value: GenericConstructor<TypedObject>) {
|
||||||
|
return function decorator(objectConstructor: GenericConstructor<TypedObject>) {
|
||||||
|
Reflect.defineMetadata(mapsToMetadataKey, value, objectConstructor);
|
||||||
|
mapsToType((value as any).type, objectConstructor);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maps a type to the matching class
|
||||||
|
* @param value The resourse type
|
||||||
|
* @param objectConstructor The class to map to
|
||||||
|
*/
|
||||||
|
function mapsToType(value: ResourceType, objectConstructor: GenericConstructor<TypedObject>) {
|
||||||
|
if (!objectConstructor || !value) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
typeMap.set(value.value, objectConstructor);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the mapped class for the given normalized class
|
||||||
|
* @param target The normalized class
|
||||||
|
*/
|
||||||
export function getMapsTo(target: any) {
|
export function getMapsTo(target: any) {
|
||||||
return Reflect.getOwnMetadata(mapsToMetadataKey, target);
|
return Reflect.getOwnMetadata(mapsToMetadataKey, target);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function relationship(value: ResourceType, isList: boolean = false): any {
|
/**
|
||||||
|
* Returns the mapped class for the given type
|
||||||
|
* @param type The resource type
|
||||||
|
*/
|
||||||
|
export function getMapsToType(type: string | ResourceType) {
|
||||||
|
if (typeof(type) === 'object') {
|
||||||
|
type = (type as ResourceType).value;
|
||||||
|
}
|
||||||
|
return typeMap.get(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function relationship<T extends CacheableObject>(value: GenericConstructor<T>, isList: boolean = false): any {
|
||||||
return function r(target: any, propertyKey: string, descriptor: PropertyDescriptor) {
|
return function r(target: any, propertyKey: string, descriptor: PropertyDescriptor) {
|
||||||
if (!target || !propertyKey) {
|
if (!target || !propertyKey) {
|
||||||
return;
|
return;
|
||||||
@@ -28,8 +64,10 @@ export function relationship(value: ResourceType, isList: boolean = false): any
|
|||||||
metaDataList.push(propertyKey);
|
metaDataList.push(propertyKey);
|
||||||
}
|
}
|
||||||
relationshipMap.set(target.constructor, metaDataList);
|
relationshipMap.set(target.constructor, metaDataList);
|
||||||
|
return Reflect.metadata(relationshipKey, {
|
||||||
return Reflect.metadata(relationshipKey, { resourceType: value, isList }).apply(this, arguments);
|
resourceType: (value as any).type.value,
|
||||||
|
isList
|
||||||
|
}).apply(this, arguments);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import { NormalizedObject } from '../models/normalized-object.model';
|
import { NormalizedObject } from '../models/normalized-object.model';
|
||||||
import { CacheableObject } from '../object-cache.reducer';
|
import { getMapsToType, getRelationships } from './build-decorators';
|
||||||
import { getRelationships } from './build-decorators';
|
|
||||||
import { NormalizedObjectFactory } from '../models/normalized-object-factory';
|
|
||||||
import { hasValue, isNotEmpty } from '../../../shared/empty.util';
|
import { hasValue, isNotEmpty } from '../../../shared/empty.util';
|
||||||
|
import { TypedObject } from '../object-cache.reducer';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return true if halObj has a value for `_links.self`
|
* Return true if halObj has a value for `_links.self`
|
||||||
@@ -35,8 +34,8 @@ export class NormalizedObjectBuildService {
|
|||||||
*
|
*
|
||||||
* @param {TDomain} domainModel a domain model
|
* @param {TDomain} domainModel a domain model
|
||||||
*/
|
*/
|
||||||
normalize<T extends CacheableObject>(domainModel: T): NormalizedObject<T> {
|
normalize<T extends TypedObject>(domainModel: T): NormalizedObject<T> {
|
||||||
const normalizedConstructor = NormalizedObjectFactory.getConstructor(domainModel.type);
|
const normalizedConstructor = getMapsToType((domainModel as any).type);
|
||||||
const relationships = getRelationships(normalizedConstructor) || [];
|
const relationships = getRelationships(normalizedConstructor) || [];
|
||||||
|
|
||||||
const normalizedModel = Object.assign({}, domainModel) as any;
|
const normalizedModel = Object.assign({}, domainModel) as any;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { PaginatedList } from '../../data/paginated-list';
|
|||||||
import { PageInfo } from '../../shared/page-info.model';
|
import { PageInfo } from '../../shared/page-info.model';
|
||||||
import { RemoteData } from '../../data/remote-data';
|
import { RemoteData } from '../../data/remote-data';
|
||||||
import { of as observableOf } from 'rxjs';
|
import { of as observableOf } from 'rxjs';
|
||||||
|
import { createSuccessfulRemoteDataObject } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
const pageInfo = new PageInfo();
|
const pageInfo = new PageInfo();
|
||||||
const array = [
|
const array = [
|
||||||
@@ -29,8 +30,8 @@ const array = [
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
const paginatedList = new PaginatedList(pageInfo, array);
|
const paginatedList = new PaginatedList(pageInfo, array);
|
||||||
const arrayRD = new RemoteData(false, false, true, undefined, array);
|
const arrayRD = createSuccessfulRemoteDataObject(array);
|
||||||
const paginatedListRD = new RemoteData(false, false, true, undefined, paginatedList);
|
const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
|
||||||
|
|
||||||
describe('RemoteDataBuildService', () => {
|
describe('RemoteDataBuildService', () => {
|
||||||
let service: RemoteDataBuildService;
|
let service: RemoteDataBuildService;
|
||||||
|
|||||||
@@ -21,7 +21,8 @@ import {
|
|||||||
getRequestFromRequestUUID,
|
getRequestFromRequestUUID,
|
||||||
getResourceLinksFromResponse
|
getResourceLinksFromResponse
|
||||||
} from '../../shared/operators';
|
} from '../../shared/operators';
|
||||||
import { CacheableObject } from '../object-cache.reducer';
|
import { CacheableObject, TypedObject } from '../object-cache.reducer';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class RemoteDataBuildService {
|
export class RemoteDataBuildService {
|
||||||
@@ -200,7 +201,7 @@ export class RemoteDataBuildService {
|
|||||||
aggregate<T>(input: Array<Observable<RemoteData<T>>>): Observable<RemoteData<T[]>> {
|
aggregate<T>(input: Array<Observable<RemoteData<T>>>): Observable<RemoteData<T[]>> {
|
||||||
|
|
||||||
if (isEmpty(input)) {
|
if (isEmpty(input)) {
|
||||||
return observableOf(new RemoteData(false, false, true, null, []));
|
return createSuccessfulRemoteDataObject$([]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return observableCombineLatest(...input).pipe(
|
return observableCombineLatest(...input).pipe(
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
|
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
|
||||||
import { ItemType } from '../../../shared/item-relationships/item-type.model';
|
import { ItemType } from '../../../shared/item-relationships/item-type.model';
|
||||||
import { ResourceType } from '../../../shared/resource-type';
|
|
||||||
import { mapsTo } from '../../builders/build-decorators';
|
import { mapsTo } from '../../builders/build-decorators';
|
||||||
import { NormalizedObject } from '../normalized-object.model';
|
import { NormalizedObject } from '../normalized-object.model';
|
||||||
import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
||||||
@@ -11,7 +10,6 @@ import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
|||||||
@mapsTo(ItemType)
|
@mapsTo(ItemType)
|
||||||
@inheritSerialization(NormalizedObject)
|
@inheritSerialization(NormalizedObject)
|
||||||
export class NormalizedItemType extends NormalizedObject<ItemType> {
|
export class NormalizedItemType extends NormalizedObject<ItemType> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The label that describes the ResourceType of the Item
|
* The label that describes the ResourceType of the Item
|
||||||
*/
|
*/
|
||||||
@@ -27,6 +25,6 @@ export class NormalizedItemType extends NormalizedObject<ItemType> {
|
|||||||
/**
|
/**
|
||||||
* The universally unique identifier of this ItemType
|
* The universally unique identifier of this ItemType
|
||||||
*/
|
*/
|
||||||
@autoserializeAs(new IDToUUIDSerializer(ResourceType.ItemType), 'id')
|
@autoserializeAs(new IDToUUIDSerializer(ItemType.type.value), 'id')
|
||||||
uuid: string;
|
uuid: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { mapsTo, relationship } from '../../builders/build-decorators';
|
|||||||
import { NormalizedDSpaceObject } from '../normalized-dspace-object.model';
|
import { NormalizedDSpaceObject } from '../normalized-dspace-object.model';
|
||||||
import { NormalizedObject } from '../normalized-object.model';
|
import { NormalizedObject } from '../normalized-object.model';
|
||||||
import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
||||||
|
import { ItemType } from '../../../shared/item-relationships/item-type.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace RelationshipType
|
* Normalized model class for a DSpace RelationshipType
|
||||||
@@ -12,7 +13,6 @@ import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
|||||||
@mapsTo(RelationshipType)
|
@mapsTo(RelationshipType)
|
||||||
@inheritSerialization(NormalizedDSpaceObject)
|
@inheritSerialization(NormalizedDSpaceObject)
|
||||||
export class NormalizedRelationshipType extends NormalizedObject<RelationshipType> {
|
export class NormalizedRelationshipType extends NormalizedObject<RelationshipType> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The identifier of this RelationshipType
|
* The identifier of this RelationshipType
|
||||||
*/
|
*/
|
||||||
@@ -59,19 +59,19 @@ export class NormalizedRelationshipType extends NormalizedObject<RelationshipTyp
|
|||||||
* The type of Item found to the left of this RelationshipType
|
* The type of Item found to the left of this RelationshipType
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.ItemType, false)
|
@relationship(ItemType, false)
|
||||||
leftType: string;
|
leftType: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The type of Item found to the right of this RelationshipType
|
* The type of Item found to the right of this RelationshipType
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.ItemType, false)
|
@relationship(ItemType, false)
|
||||||
rightType: string;
|
rightType: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The universally unique identifier of this RelationshipType
|
* The universally unique identifier of this RelationshipType
|
||||||
*/
|
*/
|
||||||
@autoserializeAs(new IDToUUIDSerializer(ResourceType.RelationshipType), 'id')
|
@autoserializeAs(new IDToUUIDSerializer(RelationshipType.type.value), 'id')
|
||||||
uuid: string;
|
uuid: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
|
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
|
||||||
import { Relationship } from '../../../shared/item-relationships/relationship.model';
|
import { Relationship } from '../../../shared/item-relationships/relationship.model';
|
||||||
import { ResourceType } from '../../../shared/resource-type';
|
|
||||||
import { mapsTo, relationship } from '../../builders/build-decorators';
|
import { mapsTo, relationship } from '../../builders/build-decorators';
|
||||||
import { NormalizedObject } from '../normalized-object.model';
|
import { NormalizedObject } from '../normalized-object.model';
|
||||||
import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
import { IDToUUIDSerializer } from '../../id-to-uuid-serializer';
|
||||||
|
import { RelationshipType } from '../../../shared/item-relationships/relationship-type.model';
|
||||||
|
import { Item } from '../../../shared/item.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace Relationship
|
* Normalized model class for a DSpace Relationship
|
||||||
@@ -22,14 +23,14 @@ export class NormalizedRelationship extends NormalizedObject<Relationship> {
|
|||||||
* The item to the left of this relationship
|
* The item to the left of this relationship
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Item, false)
|
@relationship(Item, false)
|
||||||
leftItem: string;
|
leftItem: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The item to the right of this relationship
|
* The item to the right of this relationship
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Item, false)
|
@relationship(Item, false)
|
||||||
rightItem: string;
|
rightItem: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -48,12 +49,12 @@ export class NormalizedRelationship extends NormalizedObject<Relationship> {
|
|||||||
* The type of Relationship
|
* The type of Relationship
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.RelationshipType, false)
|
@relationship(RelationshipType, false)
|
||||||
relationshipType: string;
|
relationshipType: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The universally unique identifier of this Relationship
|
* The universally unique identifier of this Relationship
|
||||||
*/
|
*/
|
||||||
@autoserializeAs(new IDToUUIDSerializer(ResourceType.Relationship), 'id')
|
@autoserializeAs(new IDToUUIDSerializer(Relationship.type.value), 'id')
|
||||||
uuid: string;
|
uuid: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { SupportLevel } from './support-level.model';
|
|||||||
@mapsTo(BitstreamFormat)
|
@mapsTo(BitstreamFormat)
|
||||||
@inheritSerialization(NormalizedObject)
|
@inheritSerialization(NormalizedObject)
|
||||||
export class NormalizedBitstreamFormat extends NormalizedObject<BitstreamFormat> {
|
export class NormalizedBitstreamFormat extends NormalizedObject<BitstreamFormat> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Short description of this Bitstream Format
|
* Short description of this Bitstream Format
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import { inheritSerialization, autoserialize } from 'cerialize';
|
import { autoserialize, inheritSerialization } from 'cerialize';
|
||||||
|
|
||||||
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
||||||
import { Bitstream } from '../../shared/bitstream.model';
|
import { Bitstream } from '../../shared/bitstream.model';
|
||||||
import { mapsTo, relationship } from '../builders/build-decorators';
|
import { mapsTo, relationship } from '../builders/build-decorators';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { Item } from '../../shared/item.model';
|
||||||
|
import { BitstreamFormat } from '../../shared/bitstream-format.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace Bitstream
|
* Normalized model class for a DSpace Bitstream
|
||||||
@@ -11,7 +12,6 @@ import { ResourceType } from '../../shared/resource-type';
|
|||||||
@mapsTo(Bitstream)
|
@mapsTo(Bitstream)
|
||||||
@inheritSerialization(NormalizedDSpaceObject)
|
@inheritSerialization(NormalizedDSpaceObject)
|
||||||
export class NormalizedBitstream extends NormalizedDSpaceObject<Bitstream> {
|
export class NormalizedBitstream extends NormalizedDSpaceObject<Bitstream> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The size of this bitstream in bytes
|
* The size of this bitstream in bytes
|
||||||
*/
|
*/
|
||||||
@@ -28,7 +28,7 @@ export class NormalizedBitstream extends NormalizedDSpaceObject<Bitstream> {
|
|||||||
* The format of this Bitstream
|
* The format of this Bitstream
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.BitstreamFormat, false)
|
@relationship(BitstreamFormat, false)
|
||||||
format: string;
|
format: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -41,14 +41,14 @@ export class NormalizedBitstream extends NormalizedDSpaceObject<Bitstream> {
|
|||||||
* An array of Bundles that are direct parents of this Bitstream
|
* An array of Bundles that are direct parents of this Bitstream
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Item, true)
|
@relationship(Item, true)
|
||||||
parents: string[];
|
parents: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Bundle that owns this Bitstream
|
* The Bundle that owns this Bitstream
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Item, false)
|
@relationship(Item, false)
|
||||||
owner: string;
|
owner: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { autoserialize, inheritSerialization } from 'cerialize';
|
|||||||
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
||||||
import { Bundle } from '../../shared/bundle.model';
|
import { Bundle } from '../../shared/bundle.model';
|
||||||
import { mapsTo, relationship } from '../builders/build-decorators';
|
import { mapsTo, relationship } from '../builders/build-decorators';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { Bitstream } from '../../shared/bitstream.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace Bundle
|
* Normalized model class for a DSpace Bundle
|
||||||
@@ -15,7 +15,7 @@ export class NormalizedBundle extends NormalizedDSpaceObject<Bundle> {
|
|||||||
* The primary bitstream of this Bundle
|
* The primary bitstream of this Bundle
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Bitstream, false)
|
@relationship(Bitstream, false)
|
||||||
primaryBitstream: string;
|
primaryBitstream: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -32,7 +32,7 @@ export class NormalizedBundle extends NormalizedDSpaceObject<Bundle> {
|
|||||||
* List of Bitstreams that are part of this Bundle
|
* List of Bitstreams that are part of this Bundle
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Bitstream, true)
|
@relationship(Bitstream, true)
|
||||||
bitstreams: string[];
|
bitstreams: string[];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,15 @@ import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
|
|||||||
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
||||||
import { Collection } from '../../shared/collection.model';
|
import { Collection } from '../../shared/collection.model';
|
||||||
import { mapsTo, relationship } from '../builders/build-decorators';
|
import { mapsTo, relationship } from '../builders/build-decorators';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { NormalizedResourcePolicy } from './normalized-resource-policy.model';
|
||||||
|
import { NormalizedBitstream } from './normalized-bitstream.model';
|
||||||
|
import { NormalizedCommunity } from './normalized-community.model';
|
||||||
|
import { NormalizedItem } from './normalized-item.model';
|
||||||
|
import { License } from '../../shared/license.model';
|
||||||
|
import { ResourcePolicy } from '../../shared/resource-policy.model';
|
||||||
|
import { Bitstream } from '../../shared/bitstream.model';
|
||||||
|
import { Community } from '../../shared/community.model';
|
||||||
|
import { Item } from '../../shared/item.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace Collection
|
* Normalized model class for a DSpace Collection
|
||||||
@@ -22,42 +30,42 @@ export class NormalizedCollection extends NormalizedDSpaceObject<Collection> {
|
|||||||
* The Bitstream that represents the license of this Collection
|
* The Bitstream that represents the license of this Collection
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.License, false)
|
@relationship(License, false)
|
||||||
license: string;
|
license: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Bitstream that represents the default Access Conditions of this Collection
|
* The Bitstream that represents the default Access Conditions of this Collection
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.ResourcePolicy, false)
|
@relationship(ResourcePolicy, false)
|
||||||
defaultAccessConditions: string;
|
defaultAccessConditions: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Bitstream that represents the logo of this Collection
|
* The Bitstream that represents the logo of this Collection
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Bitstream, false)
|
@relationship(Bitstream, false)
|
||||||
logo: string;
|
logo: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An array of Communities that are direct parents of this Collection
|
* An array of Communities that are direct parents of this Collection
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Community, true)
|
@relationship(Community, true)
|
||||||
parents: string[];
|
parents: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Community that owns this Collection
|
* The Community that owns this Collection
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Community, false)
|
@relationship(Community, false)
|
||||||
owner: string;
|
owner: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of Items that are part of (not necessarily owned by) this Collection
|
* List of Items that are part of (not necessarily owned by) this Collection
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Item, true)
|
@relationship(Item, true)
|
||||||
items: string[];
|
items: string[];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
import { autoserialize, deserialize, inheritSerialization, serialize } from 'cerialize';
|
import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
|
||||||
|
|
||||||
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
||||||
import { Community } from '../../shared/community.model';
|
import { Community } from '../../shared/community.model';
|
||||||
import { mapsTo, relationship } from '../builders/build-decorators';
|
import { mapsTo, relationship } from '../builders/build-decorators';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { ResourceType } from '../../shared/resource-type';
|
||||||
|
import { NormalizedBitstream } from './normalized-bitstream.model';
|
||||||
|
import { NormalizedCollection } from './normalized-collection.model';
|
||||||
|
import { Bitstream } from '../../shared/bitstream.model';
|
||||||
|
import { Collection } from '../../shared/collection.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace Community
|
* Normalized model class for a DSpace Community
|
||||||
@@ -11,7 +15,6 @@ import { ResourceType } from '../../shared/resource-type';
|
|||||||
@mapsTo(Community)
|
@mapsTo(Community)
|
||||||
@inheritSerialization(NormalizedDSpaceObject)
|
@inheritSerialization(NormalizedDSpaceObject)
|
||||||
export class NormalizedCommunity extends NormalizedDSpaceObject<Community> {
|
export class NormalizedCommunity extends NormalizedDSpaceObject<Community> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A string representing the unique handle of this Community
|
* A string representing the unique handle of this Community
|
||||||
*/
|
*/
|
||||||
@@ -22,32 +25,32 @@ export class NormalizedCommunity extends NormalizedDSpaceObject<Community> {
|
|||||||
* The Bitstream that represents the logo of this Community
|
* The Bitstream that represents the logo of this Community
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Bitstream, false)
|
@relationship(Bitstream, false)
|
||||||
logo: string;
|
logo: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An array of Communities that are direct parents of this Community
|
* An array of Communities that are direct parents of this Community
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Community, true)
|
@relationship(Community, true)
|
||||||
parents: string[];
|
parents: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Community that owns this Community
|
* The Community that owns this Community
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Community, false)
|
@relationship(Community, false)
|
||||||
owner: string;
|
owner: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of Collections that are owned by this Community
|
* List of Collections that are owned by this Community
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Collection, true)
|
@relationship(Collection, true)
|
||||||
collections: string[];
|
collections: string[];
|
||||||
|
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Community, true)
|
@relationship(Community, true)
|
||||||
subcommunities: string[];
|
subcommunities: string[];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
import { autoserializeAs, deserializeAs } from 'cerialize';
|
import { autoserializeAs, deserializeAs, autoserialize } from 'cerialize';
|
||||||
import { DSpaceObject } from '../../shared/dspace-object.model';
|
import { DSpaceObject } from '../../shared/dspace-object.model';
|
||||||
import { MetadataMap, MetadataMapSerializer } from '../../shared/metadata.models';
|
import { MetadataMap, MetadataMapSerializer } from '../../shared/metadata.models';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
|
||||||
import { mapsTo } from '../builders/build-decorators';
|
import { mapsTo } from '../builders/build-decorators';
|
||||||
import { NormalizedObject } from './normalized-object.model';
|
import { NormalizedObject } from './normalized-object.model';
|
||||||
|
import { TypedObject } from '../object-cache.reducer';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An model class for a DSpaceObject.
|
* An model class for a DSpaceObject.
|
||||||
*/
|
*/
|
||||||
@mapsTo(DSpaceObject)
|
@mapsTo(DSpaceObject)
|
||||||
export class NormalizedDSpaceObject<T extends DSpaceObject> extends NormalizedObject<T> {
|
export class NormalizedDSpaceObject<T extends DSpaceObject> extends NormalizedObject<T> implements TypedObject {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The link to the rest endpoint where this object can be found
|
* The link to the rest endpoint where this object can be found
|
||||||
@@ -38,8 +38,8 @@ export class NormalizedDSpaceObject<T extends DSpaceObject> extends NormalizedOb
|
|||||||
/**
|
/**
|
||||||
* A string representing the kind of DSpaceObject, e.g. community, item, …
|
* A string representing the kind of DSpaceObject, e.g. community, item, …
|
||||||
*/
|
*/
|
||||||
@autoserializeAs(String)
|
@autoserialize
|
||||||
type: ResourceType;
|
type: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All metadata of this DSpaceObject
|
* All metadata of this DSpaceObject
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
|
|||||||
import { Item } from '../../shared/item.model';
|
import { Item } from '../../shared/item.model';
|
||||||
import { mapsTo, relationship } from '../builders/build-decorators';
|
import { mapsTo, relationship } from '../builders/build-decorators';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { ResourceType } from '../../shared/resource-type';
|
||||||
|
import { NormalizedCollection } from './normalized-collection.model';
|
||||||
|
import { NormalizedBitstream } from './normalized-bitstream.model';
|
||||||
|
import { NormalizedRelationship } from './items/normalized-relationship.model';
|
||||||
|
import { Collection } from '../../shared/collection.model';
|
||||||
|
import { Bitstream } from '../../shared/bitstream.model';
|
||||||
|
import { Relationship } from '../../shared/item-relationships/relationship.model';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Normalized model class for a DSpace Item
|
* Normalized model class for a DSpace Item
|
||||||
@@ -46,25 +52,25 @@ export class NormalizedItem extends NormalizedDSpaceObject<Item> {
|
|||||||
* An array of Collections that are direct parents of this Item
|
* An array of Collections that are direct parents of this Item
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Collection, true)
|
@relationship(Collection, true)
|
||||||
parents: string[];
|
parents: string[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Collection that owns this Item
|
* The Collection that owns this Item
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Collection, false)
|
@relationship(Collection, false)
|
||||||
owningCollection: string;
|
owningCollection: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List of Bitstreams that are owned by this Item
|
* List of Bitstreams that are owned by this Item
|
||||||
*/
|
*/
|
||||||
@deserialize
|
@deserialize
|
||||||
@relationship(ResourceType.Bitstream, true)
|
@relationship(Bitstream, true)
|
||||||
bitstreams: string[];
|
bitstreams: string[];
|
||||||
|
|
||||||
@autoserialize
|
@autoserialize
|
||||||
@relationship(ResourceType.Relationship, true)
|
@relationship(Relationship, true)
|
||||||
relationships: string[];
|
relationships: string[];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,104 +0,0 @@
|
|||||||
import { NormalizedItemType } from './items/normalized-item-type.model';
|
|
||||||
import { NormalizedRelationshipType } from './items/normalized-relationship-type.model';
|
|
||||||
import { NormalizedRelationship } from './items/normalized-relationship.model';
|
|
||||||
import { NormalizedBitstream } from './normalized-bitstream.model';
|
|
||||||
import { NormalizedBundle } from './normalized-bundle.model';
|
|
||||||
import { NormalizedItem } from './normalized-item.model';
|
|
||||||
import { NormalizedCollection } from './normalized-collection.model';
|
|
||||||
import { GenericConstructor } from '../../shared/generic-constructor';
|
|
||||||
import { NormalizedCommunity } from './normalized-community.model';
|
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
|
||||||
import { NormalizedObject } from './normalized-object.model';
|
|
||||||
import { NormalizedLicense } from './normalized-license.model';
|
|
||||||
import { NormalizedResourcePolicy } from './normalized-resource-policy.model';
|
|
||||||
import { NormalizedWorkspaceItem } from '../../submission/models/normalized-workspaceitem.model';
|
|
||||||
import { NormalizedEPerson } from '../../eperson/models/normalized-eperson.model';
|
|
||||||
import { NormalizedGroup } from '../../eperson/models/normalized-group.model';
|
|
||||||
import { NormalizedWorkflowItem } from '../../submission/models/normalized-workflowitem.model';
|
|
||||||
import { NormalizedClaimedTask } from '../../tasks/models/normalized-claimed-task-object.model';
|
|
||||||
import { NormalizedPoolTask } from '../../tasks/models/normalized-pool-task-object.model';
|
|
||||||
import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model';
|
|
||||||
import { NormalizedMetadataSchema } from '../../metadata/normalized-metadata-schema.model';
|
|
||||||
import { CacheableObject } from '../object-cache.reducer';
|
|
||||||
import { NormalizedSubmissionDefinitionsModel } from '../../config/models/normalized-config-submission-definitions.model';
|
|
||||||
import { NormalizedSubmissionFormsModel } from '../../config/models/normalized-config-submission-forms.model';
|
|
||||||
import { NormalizedSubmissionSectionModel } from '../../config/models/normalized-config-submission-section.model';
|
|
||||||
|
|
||||||
export class NormalizedObjectFactory {
|
|
||||||
public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject<CacheableObject>> {
|
|
||||||
switch (type) {
|
|
||||||
case ResourceType.Bitstream: {
|
|
||||||
return NormalizedBitstream
|
|
||||||
}
|
|
||||||
case ResourceType.Bundle: {
|
|
||||||
return NormalizedBundle
|
|
||||||
}
|
|
||||||
case ResourceType.Item: {
|
|
||||||
return NormalizedItem
|
|
||||||
}
|
|
||||||
case ResourceType.Collection: {
|
|
||||||
return NormalizedCollection
|
|
||||||
}
|
|
||||||
case ResourceType.Community: {
|
|
||||||
return NormalizedCommunity
|
|
||||||
}
|
|
||||||
case ResourceType.BitstreamFormat: {
|
|
||||||
return NormalizedBitstreamFormat
|
|
||||||
}
|
|
||||||
case ResourceType.License: {
|
|
||||||
return NormalizedLicense
|
|
||||||
}
|
|
||||||
case ResourceType.ResourcePolicy: {
|
|
||||||
return NormalizedResourcePolicy
|
|
||||||
}
|
|
||||||
case ResourceType.Relationship: {
|
|
||||||
return NormalizedRelationship
|
|
||||||
}
|
|
||||||
case ResourceType.RelationshipType: {
|
|
||||||
return NormalizedRelationshipType
|
|
||||||
}
|
|
||||||
case ResourceType.ItemType: {
|
|
||||||
return NormalizedItemType
|
|
||||||
}
|
|
||||||
case ResourceType.EPerson: {
|
|
||||||
return NormalizedEPerson
|
|
||||||
}
|
|
||||||
case ResourceType.Group: {
|
|
||||||
return NormalizedGroup
|
|
||||||
}
|
|
||||||
case ResourceType.MetadataSchema: {
|
|
||||||
return NormalizedMetadataSchema
|
|
||||||
}
|
|
||||||
case ResourceType.MetadataField: {
|
|
||||||
return NormalizedGroup
|
|
||||||
}
|
|
||||||
case ResourceType.Workspaceitem: {
|
|
||||||
return NormalizedWorkspaceItem
|
|
||||||
}
|
|
||||||
case ResourceType.Workflowitem: {
|
|
||||||
return NormalizedWorkflowItem
|
|
||||||
}
|
|
||||||
case ResourceType.ClaimedTask: {
|
|
||||||
return NormalizedClaimedTask
|
|
||||||
}
|
|
||||||
case ResourceType.PoolTask: {
|
|
||||||
return NormalizedPoolTask
|
|
||||||
}
|
|
||||||
case ResourceType.SubmissionDefinition:
|
|
||||||
case ResourceType.SubmissionDefinitions: {
|
|
||||||
return NormalizedSubmissionDefinitionsModel
|
|
||||||
}
|
|
||||||
case ResourceType.SubmissionForm:
|
|
||||||
case ResourceType.SubmissionForms: {
|
|
||||||
return NormalizedSubmissionFormsModel
|
|
||||||
}
|
|
||||||
case ResourceType.SubmissionSection:
|
|
||||||
case ResourceType.SubmissionSections: {
|
|
||||||
return NormalizedSubmissionSectionModel
|
|
||||||
}
|
|
||||||
default: {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +1,24 @@
|
|||||||
import { CacheableObject } from '../object-cache.reducer';
|
import { CacheableObject, TypedObject } from '../object-cache.reducer';
|
||||||
import { autoserialize } from 'cerialize';
|
import { autoserialize } from 'cerialize';
|
||||||
import { ResourceType } from '../../shared/resource-type';
|
import { ResourceType } from '../../shared/resource-type';
|
||||||
/**
|
/**
|
||||||
* An abstract model class for a NormalizedObject.
|
* An abstract model class for a NormalizedObject.
|
||||||
*/
|
*/
|
||||||
export abstract class NormalizedObject<T extends CacheableObject> implements CacheableObject {
|
export abstract class NormalizedObject<T extends TypedObject> implements CacheableObject {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The link to the rest endpoint where this object can be found
|
* The link to the rest endpoint where this object can be found
|
||||||
*/
|
*/
|
||||||
@autoserialize
|
@autoserialize
|
||||||
self: string;
|
self: string;
|
||||||
|
|
||||||
/**
|
|
||||||
* A string representing the kind of DSpaceObject, e.g. community, item, …
|
|
||||||
*/
|
|
||||||
@autoserialize
|
|
||||||
type: ResourceType;
|
|
||||||
|
|
||||||
@autoserialize
|
@autoserialize
|
||||||
_links: {
|
_links: {
|
||||||
[name: string]: string
|
[name: string]: string
|
||||||
}
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A string representing the kind of object
|
||||||
|
*/
|
||||||
|
@autoserialize
|
||||||
|
type: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import { ActionType } from './action-type.model';
|
|||||||
@mapsTo(ResourcePolicy)
|
@mapsTo(ResourcePolicy)
|
||||||
@inheritSerialization(NormalizedObject)
|
@inheritSerialization(NormalizedObject)
|
||||||
export class NormalizedResourcePolicy extends NormalizedObject<ResourcePolicy> {
|
export class NormalizedResourcePolicy extends NormalizedObject<ResourcePolicy> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The action that is allowed by this Resource Policy
|
* The action that is allowed by this Resource Policy
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export enum SupportLevel {
|
|||||||
Unknown = 0,
|
Unknown = 0,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unknown for Bitstream Formats that are known to the system, but not fully supported
|
* Known for Bitstream Formats that are known to the system, but not fully supported
|
||||||
*/
|
*/
|
||||||
Known = 1,
|
Known = 1,
|
||||||
|
|
||||||
|
|||||||
14
src/app/core/cache/object-cache.reducer.spec.ts
vendored
14
src/app/core/cache/object-cache.reducer.spec.ts
vendored
@@ -9,6 +9,7 @@ import {
|
|||||||
ResetObjectCacheTimestampsAction
|
ResetObjectCacheTimestampsAction
|
||||||
} from './object-cache.actions';
|
} from './object-cache.actions';
|
||||||
import { Operation } from 'fast-json-patch';
|
import { Operation } from 'fast-json-patch';
|
||||||
|
import { Item } from '../shared/item.model';
|
||||||
|
|
||||||
class NullAction extends RemoveFromObjectCacheAction {
|
class NullAction extends RemoveFromObjectCacheAction {
|
||||||
type = null;
|
type = null;
|
||||||
@@ -28,6 +29,7 @@ describe('objectCacheReducer', () => {
|
|||||||
const testState = {
|
const testState = {
|
||||||
[selfLink1]: {
|
[selfLink1]: {
|
||||||
data: {
|
data: {
|
||||||
|
type: Item.type,
|
||||||
self: selfLink1,
|
self: selfLink1,
|
||||||
foo: 'bar'
|
foo: 'bar'
|
||||||
},
|
},
|
||||||
@@ -39,6 +41,7 @@ describe('objectCacheReducer', () => {
|
|||||||
},
|
},
|
||||||
[selfLink2]: {
|
[selfLink2]: {
|
||||||
data: {
|
data: {
|
||||||
|
type: Item.type,
|
||||||
self: requestUUID2,
|
self: requestUUID2,
|
||||||
foo: 'baz'
|
foo: 'baz'
|
||||||
},
|
},
|
||||||
@@ -67,7 +70,7 @@ describe('objectCacheReducer', () => {
|
|||||||
|
|
||||||
it('should add the payload to the cache in response to an ADD action', () => {
|
it('should add the payload to the cache in response to an ADD action', () => {
|
||||||
const state = Object.create(null);
|
const state = Object.create(null);
|
||||||
const objectToCache = { self: selfLink1 };
|
const objectToCache = { self: selfLink1, type: Item.type };
|
||||||
const timeAdded = new Date().getTime();
|
const timeAdded = new Date().getTime();
|
||||||
const msToLive = 900000;
|
const msToLive = 900000;
|
||||||
const requestUUID = requestUUID1;
|
const requestUUID = requestUUID1;
|
||||||
@@ -80,7 +83,12 @@ describe('objectCacheReducer', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
it('should overwrite an object in the cache in response to an ADD action if it already exists', () => {
|
it('should overwrite an object in the cache in response to an ADD action if it already exists', () => {
|
||||||
const objectToCache = { self: selfLink1, foo: 'baz', somethingElse: true };
|
const objectToCache = {
|
||||||
|
self: selfLink1,
|
||||||
|
foo: 'baz',
|
||||||
|
somethingElse: true,
|
||||||
|
type: Item.type
|
||||||
|
};
|
||||||
const timeAdded = new Date().getTime();
|
const timeAdded = new Date().getTime();
|
||||||
const msToLive = 900000;
|
const msToLive = 900000;
|
||||||
const requestUUID = requestUUID1;
|
const requestUUID = requestUUID1;
|
||||||
@@ -95,7 +103,7 @@ describe('objectCacheReducer', () => {
|
|||||||
|
|
||||||
it('should perform the ADD action without affecting the previous state', () => {
|
it('should perform the ADD action without affecting the previous state', () => {
|
||||||
const state = Object.create(null);
|
const state = Object.create(null);
|
||||||
const objectToCache = { self: selfLink1 };
|
const objectToCache = { self: selfLink1, type: Item.type };
|
||||||
const timeAdded = new Date().getTime();
|
const timeAdded = new Date().getTime();
|
||||||
const msToLive = 900000;
|
const msToLive = 900000;
|
||||||
const requestUUID = requestUUID1;
|
const requestUUID = requestUUID1;
|
||||||
|
|||||||
9
src/app/core/cache/object-cache.reducer.ts
vendored
9
src/app/core/cache/object-cache.reducer.ts
vendored
@@ -32,15 +32,19 @@ export interface Patch {
|
|||||||
operations: Operation[];
|
operations: Operation[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export abstract class TypedObject {
|
||||||
|
static type: ResourceType;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tslint:disable:max-classes-per-file */
|
||||||
/**
|
/**
|
||||||
* An interface to represent objects that can be cached
|
* An interface to represent objects that can be cached
|
||||||
*
|
*
|
||||||
* A cacheable object should have a self link
|
* A cacheable object should have a self link
|
||||||
*/
|
*/
|
||||||
export interface CacheableObject {
|
export class CacheableObject extends TypedObject {
|
||||||
uuid?: string;
|
uuid?: string;
|
||||||
self: string;
|
self: string;
|
||||||
type?: ResourceType;
|
|
||||||
// isNew: boolean;
|
// isNew: boolean;
|
||||||
// dirtyType: DirtyType;
|
// dirtyType: DirtyType;
|
||||||
// hasDirtyAttributes: boolean;
|
// hasDirtyAttributes: boolean;
|
||||||
@@ -59,6 +63,7 @@ export class ObjectCacheEntry implements CacheEntry {
|
|||||||
patches: Patch[] = [];
|
patches: Patch[] = [];
|
||||||
isDirty: boolean;
|
isDirty: boolean;
|
||||||
}
|
}
|
||||||
|
/* tslint:enable:max-classes-per-file */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The ObjectCache State
|
* The ObjectCache State
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user