Commit Graph

2707 Commits

Author SHA1 Message Date
Julius Gruber
eb099e588c Removed dev stub from config environment.default.js 2019-10-18 12:33:29 +02:00
Julius Gruber
0aac997238 Removed dev console logs 2019-10-18 11:40:08 +02:00
Julius Gruber
94539cd61d Code clean up 2019-10-18 11:37:38 +02:00
Julius Gruber
ac32d2de11 Added storage of redirectUrl in a cookie 2019-10-18 10:20:18 +02:00
Julius Gruber
8ea2b79edf Testing local storage of redirectURL 2019-10-18 09:50:37 +02:00
Julius Gruber
8d939cd35c Shared module import fixed 2019-10-18 09:12:15 +02:00
Julius Gruber
8fbe6ade81 Merge conflicts resolved 2019-10-18 09:11:22 +02:00
Julius Gruber
792f7bf74d Removed isStandAlone from store 2019-10-18 08:58:36 +02:00
Julius Gruber
392b539036 Removed model InjectedAuthMethods 2019-10-17 15:46:55 +02:00
Julius Gruber
6a2b9dad26 Added Action to set isStandAlonePage in store 2019-10-17 15:39:33 +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
Julius Gruber
8fde909915 Changed log-in.comonent to use observables again 2019-10-16 15:33:18 +02:00
Julius Gruber
94377487b7 Another testserver log 2019-10-16 13:41:51 +02:00
Julius Gruber
a59aafb1f4 Commit for server test 2019-10-16 13:14:24 +02:00
Julius Gruber
331596968b Added log for injectedAuthMethods on testserver 2019-10-16 10:41:19 +02:00
Julius Gruber
26fd261d17 Added more debug logs for testserver 2019-10-16 10:08:49 +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
Julius Gruber
6718bfdcfe Code clean up 2019-10-15 15:14:36 +02:00
Julius Gruber
909b47425f Added logs for testserver 2019-10-14 16:29:06 +02:00
Julius Gruber
c9f92ee7a8 Moved isAuthenticated and isLoading to container 2019-10-14 16:21:35 +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
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
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
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