Commit Graph

48 Commits

Author SHA1 Message Date
Art Lowel
f19daf54cb Merge branch 'add-referrer-to-pageview-event-7.2' into add-referrer-to-pageview-event-7.4 2023-05-02 18:31:06 +02:00
Art Lowel
bd4dbcf9ad Merge branch 'add-referrer-to-pageview-event-7.0' into add-referrer-to-pageview-event-7.2 2023-05-02 18:16:32 +02:00
Art Lowel
27d3c58d00 add referrer to pageview events 2023-05-02 17:09:55 +02:00
Giuseppe Digilio
171ac62beb [CST-6753] Maintain compatibility with version 3 2022-09-28 13:30:22 +02:00
Giuseppe Digilio
70c6eac88d [CST-6753] Change google-analytics.service in order to use GoogleTagManager instead of GoogleAnalytics 2022-09-15 14:30:59 +02:00
Yura Bondarenko
4403555c29 Merge remote-tracking branch 'origin/main' into w2p-93219_Consolidate-all-initialization-in-a-single-Service 2022-07-29 16:42:21 +02:00
Yura Bondarenko
5ff80a8a02 93219: Fold DSpaceTransferState into InitService 2022-07-22 14:25:22 +02:00
Yura Bondarenko
372cddfd5e 93219: Support Router in InitService
For Router to work properly, APP_BASE_HREF must be resolved _before_ the APP_INITIALIZER factory is called (otherwise Angular will attempt to initialize APP_BASE_HREF too soon)
To fix this we add a pre-initialization hook to APP_CONFIG so BrowserInitService can resolve it before APP_INITIALIZER
2022-07-22 14:25:22 +02:00
Yura Bondarenko
39c2aa85ec 93219: Move APP_INITIALIZER logic into InitService 2022-07-18 15:58:07 +02:00
Yura Bondarenko
21579d1525 Merge remote-tracking branch 'origin/main' into w2p-90978_Improve-initial-page-load_PR 2022-05-13 09:32:34 +02:00
Yura Bondarenko
34be1179ab Fix unused import 2022-04-28 14:49:34 +02:00
Yura Bondarenko
1522c36ed0 Merge remote-tracking branch 'origin/main' into w2p-90978_Improve-initial-page-load_PR 2022-04-28 13:49:39 +02:00
Art Lowel
3bc5ee0253 pages loading twice poc
Cherry-picked from original branch started from Angular 13 PR
2022-04-27 11:58:43 +02:00
Yura Bondarenko
8d6f156db1 90918: Upgrade ng-dynamic-forms and RxJs
Copied over isNumeric from RxJs 6.x as it was removed from 7.x
Build & tests are broken, fixed in subsequent commit
2022-04-25 15:32:34 +02:00
Yura Bondarenko
22c5976095 87968: Upgrade to Angular 12 2022-04-08 17:57:15 +02:00
Art Lowel
2fe5587e02 move the correlation id to the ngrx store 2021-12-23 16:55:46 +01:00
William Welling
33488ccf40 extend environment and use injected app config 2021-12-07 10:12:27 -06:00
Art Lowel
ff4bd59de0 use GET for shortlivedtoken requests on the server, POST on the client 2021-04-06 16:46:21 +02:00
Art Lowel
afa7b67532 roll back test changes 2021-03-08 12:10:56 +01:00
Art Lowel
5a6e4b1278 Add support for dynamic themes 2021-03-01 10:38:05 +01:00
Art Lowel
4e826f7ee8 fix SSR injection context issue with Angulartics 2021-01-18 16:57:25 +01:00
Giuseppe Digilio
79285b203b Changed to use TestBed.inject method instead of deprecated TestBed.get 2020-11-20 15:21:34 +01:00
Kristof De Langhe
7367f91176 72699: Hard redirect after log in 2020-08-26 14:20:47 +02:00
Kristof De Langhe
35ca785695 Merge branch 'master' into w2p-71809_Add-server-side-X-Forwarded-For-interceptor
Conflicts:
	src/modules/app/server-app.module.ts
2020-07-14 13:35:11 +02:00
Kristof De Langhe
0fa1e17078 71809: ForwardClientIpInterceptor 2020-07-13 15:47:59 +02:00
Danilo Di Nuzzo
722fdc0124 [CST-2877] rm browser lang for SSR reqs 2020-06-30 16:42:58 +02:00
lotte
8bf241c182 angular cli 2020-03-18 16:03:40 +01:00
Antoine Snyers
d571c174f0 Use Angulartics' Routerless module
https://github.com/DSpace/dspace-angular/issues/560
2020-02-14 13:03:06 +01:00
Giuseppe Digilio
daeb475eb6 upgrade angulartics lib version 2020-01-02 10:47:27 +01:00
Antoine Snyers
dfa846a98e Track page views and searches in DSpace with a custom Angulartics2 provider 2019-11-28 09:54:39 +01:00
Tim Donohue
d85cc0a0f2 Merge pull request #467 from mspalti/login_redirect_url
Redirecting user to same page after login.
2019-09-19 17:30:00 +02:00
Art Lowel
b186ec635e Merge branch 'master' into improve-i18n-files 2019-09-12 17:13:43 +02:00
Michael W Spalti
d9fb68dce9 Modified redirectToPreviousUrl to use the standalone page parameter if no redirect url is found in the store.
Removed unused import that was causing merge conflict.

Once again try to fix merge conflict.

Added routeService to server module providers.

Changed order of providers.

Minor change to ServerAuthService to make method signature consistent with AuthService.

Try adding RouteService to browser-app module to see if that fixes travis build.

One more try at getting the CI build to work.

Removed change to browser module.
2019-09-09 12:58:55 -07:00
Art Lowel
359cb10fa3 add json5 support 2019-07-26 17:21:57 +02:00
lotte
bb76015aa1 Solved issue with non-existing search pages 2019-06-18 08:58:35 +02:00
Giuseppe Digilio
ff97a4cc8b Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	package.json
#	src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/app.module.ts
#	src/app/core/auth/auth.interceptor.ts
#	src/app/core/cache/response-cache.service.spec.ts
#	src/app/core/data/browse-response-parsing.service.spec.ts
#	src/app/core/data/data.service.spec.ts
#	src/app/core/data/request.service.spec.ts
#	src/app/core/data/request.service.ts
#	src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
#	src/app/core/integration/integration.service.ts
#	src/app/core/metadata/metadata.service.spec.ts
#	src/app/core/registry/registry.service.spec.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/item.model.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.ts
#	src/app/shared/form/builder/form-builder.service.spec.ts
#	src/app/shared/form/form.service.spec.ts
#	src/app/shared/notifications/notification/notification.component.spec.ts
#	src/app/shared/services/route.service.spec.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/shared.module.ts
#	yarn.lock
2018-12-13 20:28:11 +01:00
lotte
3a8f7754fa 55143: fixed all tests 2018-10-11 12:02:40 +02:00
lotte
14fd58dd21 issues with form component tests 2018-09-07 13:48:00 +02:00
lotte
2cbe6a6d91 upgrade to angular6 2018-08-24 13:26:43 +02:00
Giuseppe
6f60cd68e2 Merged submission module code 2018-07-26 18:36:36 +02:00
Giuseppe Digilio
f8b3cc516c Merge remote-tracking branch 'remotes/origin/master' into authentication
# Conflicts:
#	src/app/+search-page/search-filters/search-filter/search-filter.component.ts
#	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
#	src/app/+search-page/search-service/search.service.spec.ts
#	src/app/+search-page/search-service/search.service.ts
#	src/app/app.component.spec.ts
#	src/app/app.component.ts
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/core.effects.ts
#	src/app/core/core.module.ts
#	src/app/core/shared/hal-endpoint.service.ts
#	src/app/shared/services/route.service.ts
#	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
#	src/modules/app/browser-app.module.ts
#	src/modules/app/server-app.module.ts
2018-05-08 10:57:15 +02:00
Giuseppe Digilio
c8a1fe0860 Removed use of platform service and created different service for SSR and CSR 2018-05-03 19:08:07 +02:00
Kristof De Langhe
062f0f1a0e 50479: compile errors fixed 2018-03-23 10:12:20 +01:00
Kristof De Langhe
9454b9393b 50479: angularticsMock + tslint fixes 2018-03-20 15:54:11 +01:00
Kristof De Langhe
35cbedf6fe 50479: Added google analytics support 2018-03-20 15:29:05 +01:00
Art Lowel
4fbceab1b9 Switched to angular 5's built-in transfer state api 2018-02-01 13:17:59 +01:00
Art Lowel
ee84399d23 fixed an issue where a rehydrate would sometimes leave the app in a broken state 2017-10-26 12:58:42 +02:00
William Welling
8c4c533203 include all modules in coverage 2017-10-09 08:18:28 -05:00