Commit Graph

4100 Commits

Author SHA1 Message Date
Michael W Spalti
7bda63bc5a Renamed cache property and replaced conditional with hasValue. 2019-10-15 14:26:50 -07:00
Michael W Spalti
8ae5e415db Explicitly checking for undefined in dataService (since I think 0 is not truthy for number). 2019-10-15 14:26:49 -07:00
Michael W Spalti
2a1c85937c Fixed unit test that was missing from project before rebase. 2019-10-15 14:26:49 -07:00
Michael W Spalti
a50e568899 Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses. 2019-10-15 14:26:49 -07:00
Michael W Spalti
d449bd70a0 Fixes unit test and problem in map fuction. 2019-10-15 14:26:49 -07:00
Michael W Spalti
6e3127c3a6 Setting cache period to zero for all instances where forceBypassCache was previously true. 2019-10-15 14:26:49 -07:00
Michael W Spalti
d2897cec3f Removed final reference to forceBypassCache param. 2019-10-15 14:26:49 -07:00
Michael W Spalti
96f8e905dd Refactored to remove forceBypassCache param from requestService and from data service classes. 2019-10-15 14:26:49 -07: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
lotte
7ca88021c9 added tests, aot fixes, lint fixes 2019-10-15 15:58:40 +02:00
Julius Gruber
6718bfdcfe Code clean up 2019-10-15 15:14:36 +02:00
Kristof De Langhe
f1b4b57cdb 65529: AoT build error fixes 2019-10-15 13:58:03 +02:00
Kristof De Langhe
b3b8ea1dee 65272: item template REST contract endpoint changes 2019-10-14 16:47:35 +02:00
Julius Gruber
909b47425f Added logs for testserver 2019-10-14 16:29:06 +02:00
lotte
bafb2f3490 fixed existing tests and added linkType 2019-10-14 16:27:08 +02:00
Julius Gruber
c9f92ee7a8 Moved isAuthenticated and isLoading to container 2019-10-14 16:21:35 +02:00
Kristof De Langhe
61d757493a 65572: Support for bundles on items 2019-10-14 13:39:29 +02:00
Michael W Spalti
a7f48865ea Added forceBypassCache property to request model. 2019-10-10 16:25:00 -07:00
Michael W Spalti
03a91adfab Setting responseMsToLive to zero for SubmissionRequest. 2019-10-10 15:53:52 -07:00
Tim Donohue
896462ff10 Merge pull request #348 from atmire/Item-Collection_Mapper
Item-Collection mapper
2019-10-10 11:38:24 -05:00
lotte
dfe1143184 metadata representation 2019-10-10 16:18:14 +02:00
Kristof De Langhe
f7bd30cf12 62589: Item-Mapper Requests responseMsToLive to 10s 2019-10-10 13:39:59 +02:00
Kristof De Langhe
98cd2aa84c 65529: Revert OrgUnit list changes on publication 2019-10-10 10:12:28 +02:00
Kristof De Langhe
7f50d7b23d 65529: ItemMetadataRepresentation using the virtual metadata value to display names 2019-10-09 17:08: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
Julius Gruber
a6ae487ebe Changed log-in-password.component to use injectedAuthModel 2019-10-08 17:17:57 +02:00
Julius Gruber
cc8a3c2dc1 Removed isStandalonePage property from AuthMethodModel class 2019-10-08 16:58:55 +02:00
L. Henze
61edfea1de Merge branch 'master' into 460-coll-pages 2019-10-08 10:47:30 -04:00
Julius Gruber
593018021d Code clean up 2019-10-08 16:39:19 +02:00
Julius Gruber
f9d9ca6191 Removed some failing tests 2019-10-08 16:12:17 +02:00
Julius Gruber
71fbf28984 Boolean isStandalonePage injected 2019-10-08 16:00:24 +02:00
lotte
0fb12c4274 refactored mydspace/listelements etc 2019-10-08 15:51:31 +02:00
Kristof De Langhe
e7b72d6df7 Merge branch 'master' into w2p-64574_Item-page-entities
Conflicts:
	src/app/core/data/relationship.service.spec.ts
2019-10-08 13:40:28 +02:00
Kristof De Langhe
5b776b605a 62589: Review 03-10-2019 Changes and fixes 2019-10-08 13:06:31 +02:00
Julius Gruber
43933771c0 Added english translation for Shibboleth login button 2019-10-08 10:42:37 +02:00
Julius Gruber
da7b7f92a0 Changed selector of ds-auth-methods 2019-10-08 10:33:21 +02:00
Julius Gruber
95239e0590 upToDate - ready to be worked on 2019-10-08 10:13:46 +02:00
Julius Gruber
46878a7875 Branch update merge 2019-10-08 09:44:37 +02:00
Art Lowel
254b7d1633 increased responseMsToLive from 0 to 10s, to prevent infinite loops 2019-10-07 15:35:19 +02:00
Art Lowel
4836fd9ec8 ensure object cache uses responseMsToLive from request 2019-10-07 15:27:45 +02:00
Kristof De Langhe
bfb2ef021a 65240: AoT build error fixes 2019-10-07 14:05:54 +02:00
Kristof De Langhe
d45b4eedfd Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65240_Community-and-collection-logos 2019-10-07 13:43:39 +02:00
Kristof De Langhe
c9ea990483 63669: Hide return button on community metadata edit 2019-10-07 13:43:26 +02:00
Kristof De Langhe
0cd8a4ebcd Merge branch 'w2p-63669_Edit-Col/Com-Tabs' into w2p-65240_Community-and-collection-logos
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.html
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
	src/app/+community-page/edit-community-page/edit-community-page.component.html
	src/app/+community-page/edit-community-page/edit-community-page.component.spec.ts
	src/app/+community-page/edit-community-page/edit-community-page.component.ts
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
2019-10-07 13:39:53 +02:00