Skip to content

Commit ee63d3c

Browse files
[DSC-1708] Merge branch 'dspace-cris-2023_02_x' into task/dspace-cris-2023_02_x/DSC-1708
2 parents 9b0069a + 1b19d0f commit ee63d3c

45 files changed

Lines changed: 896 additions & 122 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dspace-angular",
3-
"version": "2023.02.04-SNAPSHOT",
3+
"version": "2023.02.05-SNAPSHOT",
44
"scripts": {
55
"ng": "ng",
66
"config:watch": "nodemon",
@@ -84,6 +84,7 @@
8484
"@angular/platform-server": "^15.2.8",
8585
"@angular/router": "^15.2.8",
8686
"@babel/runtime": "7.21.0",
87+
"@datadog/browser-rum": "^5.7.0",
8788
"@kolkov/ngx-gallery": "^2.0.1",
8889
"@material-ui/core": "^4.11.0",
8990
"@material-ui/icons": "^4.11.3",

src/app/app.component.spec.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
3737
import { of } from 'rxjs';
3838
import { APP_CONFIG } from '../config/app-config.interface';
3939
import { environment } from '../environments/environment';
40+
import { KlaroService } from './shared/cookies/klaro.service';
41+
import { DatadogRumService } from './shared/datadog-rum/datadog-rum.service';
4042

4143
let comp: AppComponent;
4244
let fixture: ComponentFixture<AppComponent>;
@@ -55,13 +57,27 @@ describe('App component', () => {
5557

5658
let breadcrumbsServiceSpy;
5759
let routeServiceMock;
60+
let klaroServiceSpy: jasmine.SpyObj<KlaroService>;
61+
let datadogRumServiceSpy: jasmine.SpyObj<DatadogRumService>;
5862

5963
const getDefaultTestBedConf = () => {
6064
breadcrumbsServiceSpy = jasmine.createSpyObj(['listenForRouteChanges']);
6165
routeServiceMock = jasmine.createSpyObj('RouterService', {
6266
getCurrentUrl: of('/home')
6367
});
6468

69+
klaroServiceSpy = jasmine.createSpyObj('KlaroService', {
70+
getSavedPreferences: jasmine.createSpy('getSavedPreferences'),
71+
watchConsentUpdates: jasmine.createSpy('watchConsentUpdates')
72+
},{
73+
consentsUpdates$: of({})
74+
});
75+
76+
datadogRumServiceSpy = jasmine.createSpyObj('DatadogRumService', {
77+
initDatadogRum: jasmine.createSpy('initDatadogRum'),
78+
getDatadogRumState: jasmine.createSpy('getDatadogRumState')
79+
});
80+
6581
return {
6682
imports: [
6783
CommonModule,
@@ -89,6 +105,8 @@ describe('App component', () => {
89105
{ provide: BreadcrumbsService, useValue: breadcrumbsServiceSpy },
90106
{ provide: RouteService, useValue: routeServiceMock },
91107
{ provide: APP_CONFIG, useValue: environment },
108+
{ provide: KlaroService, useValue: klaroServiceSpy },
109+
{ provide: DatadogRumService, useValue: datadogRumServiceSpy },
92110
provideMockStore({ initialState }),
93111
AppComponent,
94112
// RouteService

src/app/app.component.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { distinctNext } from './core/shared/distinct-next';
2929
import { RouteService } from './core/services/route.service';
3030
import { getEditItemPageRoute, getWorkflowItemModuleRoute, getWorkspaceItemModuleRoute } from './app-routing-paths';
3131
import { SocialService } from './social/social.service';
32+
import { DatadogRumService } from './shared/datadog-rum/datadog-rum.service';
3233

3334
@Component({
3435
selector: 'ds-app',
@@ -74,6 +75,7 @@ export class AppComponent implements OnInit, AfterViewInit {
7475
private modalService: NgbModal,
7576
private modalConfig: NgbModalConfig,
7677
private socialService: SocialService,
78+
private datadogRumService: DatadogRumService
7779
) {
7880
this.notificationOptions = environment.notifications;
7981

@@ -108,6 +110,8 @@ export class AppComponent implements OnInit, AfterViewInit {
108110
);
109111

110112
this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight);
113+
114+
this.datadogRumService.initDatadogRum();
111115
}
112116

113117
private storeCSSVariables() {

0 commit comments

Comments
 (0)