Commit Graph

2633 Commits

Author SHA1 Message Date
Kristof De Langhe
ef3d4fb154 Merge branch 'w2p-65572_Add-support-for-bundles' into w2p-65717_Bundles-in-edit-item 2019-10-18 12:42:34 +02:00
Kristof De Langhe
5fa2827d1b Merge branch 'master' into w2p-65717_Bundles-in-edit-item
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
2019-10-18 12:42:11 +02:00
Art Lowel
bf5fb417e1 Merge pull request #472 from lhenze/460-coll-pages
Collections pages: add collection header and footer to all "browse by..." views
2019-10-17 12:38:01 +02:00
L. Henze
150aace38e Page title - only show if there is no parent 2019-10-15 13:47:51 -04:00
L. Henze
b7b8eed6db *ngIf broken into two parts 2019-10-15 12:38:22 -04:00
L. Henze
8f2a942536 Merge branch 'master' into 460-coll-pages 2019-10-15 10:57:35 -04:00
Kristof De Langhe
61d757493a 65572: Support for bundles on items 2019-10-14 13:39:29 +02:00
Tim Donohue
896462ff10 Merge pull request #348 from atmire/Item-Collection_Mapper
Item-Collection mapper
2019-10-10 11:38:24 -05:00
Kristof De Langhe
f7bd30cf12 62589: Item-Mapper Requests responseMsToLive to 10s 2019-10-10 13:39:59 +02:00
L. Henze
46b86ec6c7 Desktop view: also using allOptions array, and tidying 2019-10-08 12:52:10 -04:00
L. Henze
c46480c97f from @art-lowel: update onSelectChange to work with ngModel
Because we're working with ngModel, we're no longer getting a generic JS event in the onSelectChange, but simply the id of the selected option. I use that Id to find the option in the allOptions array that matches, and then use the data inside that matching option to navigate to the correct page.
2019-10-08 12:40:57 -04:00
L. Henze
be19a2a961 from @art-lowel: set ngModel for select, and also selected attribute for options
That currentOptionId$ observable is then used in the template to set the ngModel for the select, which, as mentioned above, should have been enough to select the correct option, but as it wasn't I also use it to set the selected attribute on the options
2019-10-08 12:38:01 -04:00
L. Henze
c957031317 from @art-lowel: Observable for currentOptionId
Next in order to know what page we're on, I use the route.url observable angular provides us that contains the current url, pipe that through a filter to ensure it has a value for the map below, which will just get the last part of the current url, so the community or collection id, or the type of the browse page.
2019-10-08 12:32:40 -04:00
L. Henze
3d8ffd6fe3 from @art-lowel: create array and map all options to it
I created a list in the component that contains all the possible values a button or an option in the select can have, that way we can get rid of those *ngIfs in the template, and render everything with an *ngFor
Instead of putting all the data needed to select an option and to redirect to the correct option in the template, I created an interface to represent all the info we need: ComColPageNavOption
During ngOnInit, I first take the browseBy types in the config, and perform a map operation on them, that basically means, turn every element of this array in to something else using the function inside the map operator.
So inside the map function I each BrowseByTypeConfig object in to a ComColPageNavOption object
Afterwards I check whether we're dealing with a collection or a community, and in each case I create a ComColPageNavOption object, and add it to the front of the allOptions array
...this.allOptions means enumerate everything that's currently in the allOptions array, so I put my new object first, then enumerate everything that was already there, and assign the result again to this.allOptions
2019-10-08 12:15:25 -04:00
L. Henze
61edfea1de Merge branch 'master' into 460-coll-pages 2019-10-08 10:47:30 -04:00
Kristof De Langhe
5b776b605a 62589: Review 03-10-2019 Changes and fixes 2019-10-08 13:06:31 +02:00
Tim Donohue
1508d6133d Merge pull request #493 from terrywbrady/ds4346V2
[DS-4346] V2: create docker compose files in code base
2019-10-04 19:37:43 +02:00
Tim Donohue
f114897661 Minor updates/corrections to README 2019-10-04 12:08:30 -05:00
Tim Donohue
262b33261e Merge pull request #494 from atmire/Changes-to-relationship-type-fix
Small bug-fix due to changes to relationship-type
2019-10-03 19:18:29 +02:00
Kristof De Langhe
556475318d Fixed remaining left/right-labels 2019-10-03 15:22:45 +02:00
Kristof De Langhe
a1fea1d6a2 leftLabel/rightLabel renaming to leftwardType/rightwardType in test case 2019-10-03 14:53:00 +02:00
Kristof De Langhe
36d3ddd691 leftLabel/rightLabel renaming to leftwardType/rightwardType 2019-10-03 13:55:57 +02:00
benbosman
b85c76f40e Merge pull request #461 from atmire/changes-to-relationship-type
Rename relationship type properties
2019-10-02 18:23:04 +02:00
Terry Brady
e4bab45f3c correct path in README 2019-10-01 23:47:01 -07:00
Terry Brady
f8961d7647 readme update 2019-10-01 23:32:45 -07:00
Terry Brady
dc47d191ec move all compose files to one dir 2019-10-01 23:30:26 -07:00
Terry Brady
a74f256cea refine startup instructions 2019-10-01 22:52:44 -07:00
Terry Brady
292f7ddd25 Add pull vs build instructions to README 2019-10-01 15:38:19 -07:00
Terry Brady
f85d4fa033 Add README for Docker 2019-10-01 10:31:07 -07:00
lhenze
d4d4a6121e Mobile view: adding select element for navigation 2019-10-01 12:12:50 -04:00
lhenze
39aa284310 Merge branch 'master' into 460-coll-pages 2019-10-01 12:09:15 -04:00
Terry Brady
c6d2cb66c7 refactor docker compse names 2019-09-30 10:45:45 -07:00
Kristof De Langhe
8652c4bce8 62589: Fixed test imports 2019-09-30 16:37:44 +02:00
Kristof De Langhe
b8a466d12b 62589: Loading components for item and collection select lists 2019-09-30 16:17:18 +02:00
Kristof De Langhe
3c8e35e4d2 Merge branch 'master' into w2p-62589_Item-mapper-update 2019-09-30 10:37:02 +02:00
Kristof De Langhe
a2fb8a316b 62589: Added tests for more coverage 2019-09-30 10:35:52 +02:00
Terry Brady
eca35851d3 match network name 2019-09-29 11:58:50 -07:00
Terry Brady
824289cde1 fix compose file 2019-09-29 11:19:56 -07:00
Terry Brady
c060099ff8 run angular on its own 2019-09-29 10:44:42 -07:00
Tim Donohue
2789996000 Merge pull request #486 from atmire/add-header-icon-color-variable
Add header icon color variable
2019-09-27 20:20:24 +02:00
Kristof De Langhe
145ed346c8 62589: Feedback improvements and fixes 2019-09-27 16:40:47 +02:00
Kristof De Langhe
f83e31a1a2 Merge remote-tracking branch 'dspace/master' into w2p-62589_Item-mapper-update
Conflicts:
	src/app/core/data/collection-data.service.ts
2019-09-27 15:33:02 +02:00
Art Lowel
e68cbcd28c add header icon color variable and add !default to all themeable
variables
2019-09-27 14:57:07 +02:00
Tim Donohue
eea250664d Merge pull request #432 from 4Science/submission-miscellaneous-fixes
Submission miscellaneous fixes
2019-09-26 23:22:42 +02:00
Art Lowel
69a0ae8722 Merge pull request #491 from paulo-graca/patch-1
Remove duplicated "SearchFilterService"
2019-09-26 11:36:40 +02:00
Paulo Graça
ef832d34dc Remove duplicated "SearchFilterService" 2019-09-26 10:04:21 +01:00
Terry Brady
5dfc2fffca fix compose file 2019-09-25 15:09:36 -07:00
Terry Brady
71287b6b41 travis troubleshooting 2019-09-25 15:03:46 -07:00
Terry Brady
dfcb5abd49 change path to component compose files 2019-09-25 14:56:57 -07:00
Kristof De Langhe
1bb3bb6626 64961: Test and naming fixes 2019-09-25 17:44:15 +02:00