Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial entities PR #315

Merged
merged 97 commits into from Dec 18, 2018

Conversation

artlowel
Copy link
Member

This is the initial PR for the entities UI functionality.

Art Lowel and others added 30 commits May 28, 2018 17:22
W2p 52212 item display relations

See merge request contributions/dspace-angular!1
…n' into 'entities-or2018'

52425: Publication - JournalIssue relation

See merge request contributions/dspace-angular!2
Atmire-Kristof and others added 8 commits November 28, 2018 13:16
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.spec.ts
	src/app/+search-page/search-results/search-results.component.ts
	src/app/+search-page/search-service/search-configuration.service.spec.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/core/cache/builders/remote-data-build.service.spec.ts
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/data/data.service.ts
	src/app/core/metadata/metadata.service.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/operators.ts
	src/app/shared/loading/loading.component.ts
	src/app/shared/object-collection/object-collection.component.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	yarn.lock
@paulo-graca
Copy link
Contributor

The last UI on DSpace had a dspace.cfg setting (only for JSPUI) that enabled us to have a custom JSP files folder that overrode the existing ones. I've been doing some tests and playing around with this work and I think this older feature/setting should be considered (perhaps on future versions) in order to be able to change a specific Entities page presentation without having to change dspace-angular base code.
Tim, aside my inexperience you DSpace angular interface, I've tried the understand how stuff is organized and I'm not sure if the current Fields Components dispersion is the best solution, but I'm Ok with it. I think this initial PR should be accepted in this branch.

@@ -0,0 +1,16 @@
import { Component } from '@angular/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if we would like to have each entity as a "module", as something pluggable, I think we should group every specific code file inside the same tree structure...
Example:

typedItems

Person

simple
full
object-list

OrgUnit

@@ -0,0 +1,16 @@
import { Component } from '@angular/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if we would like to have each entity as a "module", as something pluggable, I think we should group every specific code file inside the same tree structure...
Example:

typedItems

Project

simple
full
object-list

OrgUni

@@ -0,0 +1,16 @@
import { Component } from '@angular/core';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if we would like to have each entity as a "module", as something pluggable, I think we should group every specific code file inside the same tree structure...
Example:

typedItems

OrgUnit

simple
full
object-list

Person

Copy link
Contributor

@paulo-graca paulo-graca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job!

@tdonohue
Copy link
Member

Approved in today's DSpace Entities WG meeting: https://wiki.duraspace.org/display/DSPACE/2018-12-18+DSpace+7+Entities+WG+Meeting

Merging. Thanks all!

@tdonohue tdonohue merged commit cf9cf00 into DSpace:configurable_entities Dec 18, 2018
@ghost ghost removed the needs review label Dec 18, 2018
@benbosman benbosman deleted the configurable_entities branch September 11, 2020 07:51
@tdonohue tdonohue added this to the 7.0preview milestone Jan 26, 2021
kosarko pushed a commit to ufal/dspace-angular that referenced this pull request Nov 8, 2023
* tul/merge-into-clarin-dspace (DSpace#316)

* [CST-7757] Show object name

* 98855: Remove temp themed ng-content container

This is problematic when ng-content is provided but it's not used

* [CST-7221] Opaque search bar

* [CST-7757] Minor fixes

* [CST-7757] Labels renamed

* [CST-7755] updated PR to latest REST changes

* 97298: Added form validator tests for restricted domains

* 99053: Invalidate cache by default when performing the WorkflowItemActionPageComponent action

* 99053: Added DeclinedTask search result banner

* 99053: Fixed AdvancedWorkflowActionRatingComponent's rating from validation

* 99053: Added missing documentation

* [TLC-380] Support browse links and regex links in metadata display

(resolved conflicts jan 2023)

* [TLC-380] Lint fixes

* [TLC-380] Lint fixes

* [TLC-380] Unit test (provider injection) fixes

(resolved conflict jan 16)

* [TLC-380] lint fix

* [TLC-380] further browse link unit test fixes (waitForAsync)

* [TLC-380] Refactor browse links to use new /browses endpoint

* [TLC-249] Fix circular dependency in browse services

* [TLC-249] Larger refactor to field, item components for browse links

* [TLC-249] Lint fixes

* [TLC-249] Lint fixes

* [TLC-380] Fix mock service to return proper payload

* [TLC-380] Simplify / strip browse service from components

* [TLC-380] Lint fixes for mock browse def service

* [TLC-380] Template link, spec test, doc fixup as per review

* [TLC-380] Refactor metadata rep list comp after rebase

* [TLC-380] Lint fixes

* [TLC-380] Template link fixes, spec test fixes

Correct use of routerLink and queryParams
Removed unused method from browse service, specs
New spec tests for MetadataRepresentationListElementComponent

* [TLC-380] Lint fixes on spec test

* [TLC-380] Fix item page field test to supply router

* [TLC-249] Show Identifier Step angular 7.x

* [TLC-249] Remove CRIS7 visibility refs from component, i18n

* [TLC-249] Lint fixes

* [TLC-249] LGTM unused import fixes

* [TLC-249] Register DOI operation and button in item status page

* [TLC-249] Linting

* [TLC-337] Unit tests for register DOI component

* [TLC-249] Lint fixes

* [TLC-249] Update data service usage since rebasing

* [TLC-249] Update data service usage since rebasing

* [TLC-249] Ensure identifier data model mapped to type

* [TLC-249] Update spec test for new config form data service

* [TLC-249] Addressing review feedback

Adding comments and tidying some comments, imports
Expect text for status not integer
Send a 'type' parameter with a DOI registration
Rename item-status.register to registerDOI

As per todonohue's feedback on 2022-01-18

* [TLC-249] Addressing review feedback DSpace#2

Update WorkspaceitemSectionIdentifiersObject model to include a
display types string array, so identifier types can be included or excluded
from the step as needed.

Update section template to work with the above new data

As per todonohue's feedback on 2022-01-18

* [TLC-249] Lint fixes (imports, quotes)

* [TLC-249] Improve model of identifier data in workspace section

* [TLC-249] Update en.json5 with DOI status labels

* [TLC-249] Identifier mock data updated in unit test

* [TLC-249] Identifier mock data updated in unit test

* [TLC-380] Renaming, changes as per review feedback

* [TLC-380] WIP trying new routing / create flow

* [TLC-380] Refactor to use new endpoints, better naming

* [TLC-380] Refactor to use new endpoints, better naming

* [TLC-249] Attempting art's sub fix (doesn't work)

* [TLC-249] Update item status button logic to avoid nested subs

* [TLC-249] Lint

* [TLC-249] Fix import typo (from merge conflict)

* [TLC-249] Further test fixes

* Retrieve the XSRF token first, and set it as both the XSRF header and cookie

* Fix direct CSR

By moving from environment.ts to config.yml we made it so the environment is _not_ up to date with the server configuration when main.js is first loaded.
Because of this the app behaved as if CSR always happened _after_ SSR, effectively breaking direct CSR.

Here the "criterion" for SSR/non-SSR HTML is changed from the related configuration property to the presence of Angular Universal transfer state.

This means we can correctly determine when to bootstrap the app for direct CSR, and it's' now "safe" to just send index.html by itself.

* Fix lint and test issues

* Add "debug" config and "allowStale" configs

* Add done() to async tests

* 99053: Added test to check that the TYPE_REQUEST_FORGOT doesn't use the authentication-password.domain.valid

* 97732 Remove unnecessary subscriptions

* [CST-7757] subscriptions data service tests

* Fixed text (without HTML tags) not being passed to child components

* Fixed default @input() values not working for themed components

* [CST-7757] subscription modal tests

* [CST-7757] modal fixes

* [CST-7757] modal fixes

* [CST-7217] Add margins to better align badge

* [CST-7757] Hide delete info for new subscriptions and fix issue with unavailable items

* Keep SSL sessions alive between xhr2 requests

* [CST-7755] added cancel button to modal and updated message returned when a supervision order already exists

* [CST-7755] lint fix

* Fix bug where allowStale couldn't be disabled

* 99053: Removed ngx-bootstrap dependency

* 99053: Fixed encoded parameters being encoded twice in WorkflowItemActionPageComponent.previousPage()

* 99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent

* 99053: Passed previousSearchQuery to AdvancedWorkflowActionSelectReviewerComponent

* 99053: Pass all queryParameters to advanced workflow pages by default

* 99053: Save queryParams in init to prevent them being overwritten

* Bump http-cache-semantics from 4.1.0 to 4.1.1

Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](kornelski/http-cache-semantics@v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* [CST-7755] WIP refactoring

* [CST-7757] Missing label

* fixed issue in browser console

* [CST-7755] WIP revert changes on list components

* [CST-7757] Fix delete message

* [CST-7755] Complete refactoring

* Fix for "cannot read properties of undefined" error

* [CST-8914] Add flag to show/hide csv export button

* src/assets/i18n: Improve English strings for file upload

Simple improvement to the wording in the file upload section of the
item submission form. Also add a period at the end of the string.

Fixes: DSpace#2096

* [CST-8935] Fix issue with missing matcher providers

* translation fixes in security form

* remove minimum passwort length value from translated messages

* fixed missing comma

* added comma to default translation

* suggestionOption.name displayed

* [CST-8952] Fix issue with admin reset password functionality

* avoiding console.log errors

* Fix param to send user the forgot password email

* Update version tag for release

* Fixed a lot of compilation errors, but there is a need to refactor services.

* Added yarn.lock

* Fixed some service updates

* Fixed some service updates

* Solved some errors, but it is still not working.

* Something starting to work - the problem is in loading the modules

* Updated database testing dump for integration tests

* Fixed unit tests

* Fixed admin menu

* Fixed lint issues

* Fixed handle page circular dependency

* Fixed AuthorNameLink circular dependency

* Fixed compilation errors

* Fixed failing Unit tests

* Integration tests should take image `migrate-to-7.5`

* Integration tests should take image `migrate-to-7.5`

* revert docker-compose-ci.yml changes

* Updated BE envs

* Changed localhost to 127.0.0.1

* Added DSPACE_UI_HOST and DSPACE_UI_PORT to 127.0.0.1:4000

* Changed logging in the IT

* Fixed login

* Maybe fixed integration tests

* Copied a new code from the actual dtq-dev

* Fixed discojuice login pop up

* added S3 config to docker-compose-rest.yml

* Fixed IT

* Integration tests should not fail on console log error.

* Removed failing test what is not needed.

* SUbmitter user changed to admin

* Commenteed failing tests.

* added values for S3 to cli.yml

* Added flags into discojuice

* Added flags into discojuice

* Added another icons into discojuice

* discoPath is cleared in the discojuice.js

* Create migrate-docker.yml to create docker image

* create tag migrate-to-7.5

* Fixed some shibboleth problems

* Fixed problem during downloading restricted bitstreams.

* Disabled end user agreement page with footer options (DSpace#220)

* Full customization for TUL (DSpace#217)

* customize header, footer and homepage

* add hover on button and contact us in the footer

* add hover for logo and fix UI

* transform into valina page and apply the hover style for the link

* change search page into Vanila space default

* fix exapandable navbar item behaviour

* change the background of side admin bar and hide some options of it

* replace dspace logo with tul logo

* fix gray border of button

* add new component for CitacePRO and handle with dynamic data from item object

* fix merged issues

* make the url as the constant value

* hide the clarin license

* add description into en.json5

* change the position of the citation and edit test

* retrieve the constants from the BE

* change the fixed value

* calling new API from BE

* remove privacy policy in the footer

* add new page without content

* create content for the contact page and add text in i18n for translation

* receive email property from BE and add,fix unit tests

* edit the href for contact page

* change the fetch address

---------

Co-authored-by: HieuHorizonsfl <huynhnhatkhoa21@gmail.com>
Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com>
Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com>

* Tul/fixing (DSpace#225)

* customize header, footer and homepage

* add hover on button and contact us in the footer

* add hover for logo and fix UI

* transform into valina page and apply the hover style for the link

* change search page into Vanila space default

* fix exapandable navbar item behaviour

* change the background of side admin bar and hide some options of it

* replace dspace logo with tul logo

* fix gray border of button

* add new component for CitacePRO and handle with dynamic data from item object

* fix merged issues

* make the url as the constant value

* hide the clarin license

* add description into en.json5

* change the position of the citation and edit test

* retrieve the constants from the BE

* change the fixed value

* calling new API from BE

* remove privacy policy in the footer

* add new page without content

* create content for the contact page and add text in i18n for translation

* receive email property from BE and add,fix unit tests

* edit the href for contact page

* change the fetch address

---------

Co-authored-by: HieuHorizonsfl <huynhnhatkhoa21@gmail.com>
Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com>
Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com>

* Internal/multideploy support 2 (DSpace#240)

* fixed deployment values for TUL customer

* added DSPACE_VER

* actually append to the .env file

* remove automatic deploy

* unify erasing db

* fix correct branch in call after erase_db

* add redeploy to dev-5 -> curl call to deploy action

* forgotten " in github action

* correct redeploy branch in github action

* trigger docker images on correct branch

* added password env var (DSpace#258)

* added non-amazon params (DSpace#261)

* Tul/customize fe (DSpace#254)

* Disabled end user agreement page with footer options

* Added padding to icon

* If the citacePro properties is not defined in the BE, do not throw the errors

* Added dtq sign into footer

* Dataquest URL is loaded from the cfg

* Load the company name which has customized this DSpace from the cfg

* Updated Home News page header

* Prettify the code

* Update deploy.yml

* Update build.yml

* Update build.yml

* Update docker-compose-ci.yml

Updated dump for the integration tests

* Added purple into .btn-dark class (DSpace#263)

* Internal/update and secure docker compose (DSpace#269)

* added timezone

* added IP spec to all open ports on prod docker-composes

* removed now-false disclaimer about similarity to backend docker composes

* removed redundant host parameter in Dockerfile

* changed port on which to expect REST

* make envinronment production

* revert to serve for now

* revert to serve for now

* typo

* revert run command in dockerfile

* no need to run on host 0.0.0.0

* needed due to upgrade to docker compose v2

* tul/login-case-sensitive

* port change (so as not to expose 8086)

* tul/turn-off-language-translations

* Show error message from the error response (DSpace#275)

* Tul/fix integration tests (DSpace#276)

* Fixed admin spec IT - TUL doesn't have supported /licenses and /handle

* Commented out test class `submission-ui` because it is suitable only for the CLARIN-DSpace

* Commented out CLARIN license step for the submission IT

* Changed klaro cookies modal styles according to TUL requirements. (DSpace#288)

* tul/after_test-3-badge-color (DSpace#289)

* Updated badge color

* badge style rule moved for the _clarin-styles.scss

* Fixed conflicts

* Removed thumbnail message (DSpace#290)

* tul/after_test-6-underlined-links (DSpace#291)

* All links are underlined except buttons, facet filters and nav links.

* Fixed ugly coflicts

* tul/after_test-8-navbar-gasps

* Updated topLevelCommunityList pagination (DSpace#293)

* tul/13-add-czech-language (DSpace#272)

* Added CLARIN-DSpace-7.2. czech language

* Added script to find out which messages must be translated.

* Updated czech login message because text was too big

* Keep allowed only EN and CZ language

* Updated new czech translations

* Updated new czech translations

* "Sbírka" translated to "Kolekce"

* Updated final version of czech translation

* Revert "Updated final version of czech translation"

This reverts commit 0261c85.

* Revert "Revert "Updated final version of czech translation""

This reverts commit 644cfaa.

* Merged customer/TUL files

* pretyfied python script file

* Tul/13 add czech language (DSpace#297)

* Added CLARIN-DSpace-7.2. czech language

* Added script to find out which messages must be translated.

* Updated czech login message because text was too big

* Keep allowed only EN and CZ language

* Updated new czech translations

* Updated new czech translations

* "Sbírka" translated to "Kolekce"

* Updated final version of czech translation

* Revert "Updated final version of czech translation"

This reverts commit 0261c85.

* Revert "Revert "Updated final version of czech translation""

This reverts commit 644cfaa.

* Merged customer/TUL files

* pretyfied python script file

* Updated some messages

* modified to production config (DSpace#296)

* added dummy local.cfg and set up docker-compose (DSpace#278)

* tul/after_test-9-set-up-banner (DSpace#294)

* Updated topLevelCommunityList pagination

* Prepared home-page for a banner

* Banner in the top

* Refactoring

* Updated TUL favicon (DSpace#300)

* tul/fix-wrong-favicon (DSpace#302)

* Updated message and favicon icon

* trying to fix ssr github action error

* Added deleted favicon.ico

* revert language changes

* revert language changes

* revert language changes

* Changed Domov message

* Removed DSpace Angular :: message

* Removed DSpace Angular :: message

* Updated prefix DSpace

* Customer/tul wrong dockerfile missing pm2 (DSpace#304)

* added pm2

* forgot pm2, of course

* customer/TUL-mount-prod-cfg-2

* 7 pm2 nodes (DSpace#313)

* 7 pm2 nodes

* mistake fix

* tul/show-doi (DSpace#315)

* Show DOI full link in the identifier field in the item view.

* Just prettify

* Fixed failing test

* Just prettify

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Davide Negretti <davide.negretti@4science.it>
Co-authored-by: Alexandre Vryghem <alexandre@atmire.com>
Co-authored-by: Yana De Pauw <yana@atmire.com>
Co-authored-by: corrado lombardi <corrado.lombardi@4science.com>
Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>
Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com>
Co-authored-by: Kim Shepherd <kim@shepherd.nz>
Co-authored-by: Art Lowel <art.lowel@gmail.com>
Co-authored-by: Yury Bondarenko <ybnd@tuta.io>
Co-authored-by: Nathan Buckingham <nathan.buckingham@atmire.com>
Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it>
Co-authored-by: Agustina Martinez <am857@cam.ac.uk>
Co-authored-by: Pascal-Nicolas Becker <pnbecker@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cris <cristian.guzman.contacto@gmail.com>
Co-authored-by: Alan Orth <alan.orth@gmail.com>
Co-authored-by: Sascha Szott <szott@gmx.de>
Co-authored-by: MajoBerger <marian.berger@dataquest.sk>
Co-authored-by: HieuHorizonsfl <huynhnhatkhoa21@gmail.com>
Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com>
Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com>
Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com>

* pretiffy commit

* Git revert unwanted changes

* temp commit

* Updated dtq-dev

* Fixed removing of empty row

* Added forgotten functionalities into clarin merge

* Fixed review requirements

* removed unwanted tests

* Updated help script comment

* Updated test image for FE integration tests

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Davide Negretti <davide.negretti@4science.it>
Co-authored-by: Alexandre Vryghem <alexandre@atmire.com>
Co-authored-by: Yana De Pauw <yana@atmire.com>
Co-authored-by: corrado lombardi <corrado.lombardi@4science.com>
Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>
Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com>
Co-authored-by: Kim Shepherd <kim@shepherd.nz>
Co-authored-by: Art Lowel <art.lowel@gmail.com>
Co-authored-by: Yury Bondarenko <ybnd@tuta.io>
Co-authored-by: Nathan Buckingham <nathan.buckingham@atmire.com>
Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it>
Co-authored-by: Agustina Martinez <am857@cam.ac.uk>
Co-authored-by: Pascal-Nicolas Becker <pnbecker@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cris <cristian.guzman.contacto@gmail.com>
Co-authored-by: Alan Orth <alan.orth@gmail.com>
Co-authored-by: Sascha Szott <szott@gmx.de>
Co-authored-by: MajoBerger <marian.berger@dataquest.sk>
Co-authored-by: HieuHorizonsfl <huynhnhatkhoa21@gmail.com>
Co-authored-by: HieuHorizonsfl <105620951+HieuHorizonsfl@users.noreply.github.com>
Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com>
Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants