Merged in task/ux-plus-cris-2024_02_x/UXP-170 (pull request #92)

Task/ux plus cris 2024 02 x/UXP-170

Approved-by: Francesco Molinaro

Author: Andrea Barbasso

src/app/shared/explore/section-component/grid-section/grid-section.component.html

@@ -1,17 +1,19 @@
 <div class="grid-container py-5">
   <div class="cris-section-element-background path-title">
     <div class="inner-container d-flex flex-column justify-content-center gap-3 h-100">
-      <div class="main-content-badge mb-3">{{ maincontentBadge | translate }}</div>
+      <div class="main-content-badge mb-3">
+        <ds-markdown-viewer [value]="maincontentBadge | translate"></ds-markdown-viewer>
+      </div>
       <h2>
         <div class="main-content-title-1">
-          {{ maincontentTitle | translate }}
+          <ds-markdown-viewer [value]="maincontentTitle | translate"></ds-markdown-viewer>
         </div>
         <div class="main-content-title-2">
-          {{ maincontentSubtitle | translate }}
+          <ds-markdown-viewer [value]="maincontentSubtitle | translate"></ds-markdown-viewer>
         </div>
       </h2>
       <p class="main-content-text text-muted">
-        {{ maincontentAbstract | translate }}
+        <ds-markdown-viewer [value]="maincontentAbstract | translate"></ds-markdown-viewer>
       </p>
       <div class="align-self-end">
         <button type="button" class="btn btn-dark" (click)="goToMainContentLink()">

src/app/shared/explore/section-component/grid-section/grid-section.component.spec.ts

@@ -31,6 +31,7 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { LocaleService } from '../../../../core/locale/locale.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { MathService } from '../../../../core/shared/math.service';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { Site } from '../../../../core/shared/site.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
@@ -108,6 +109,7 @@ describe('GridSectionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
         { provide: NotificationsService, useValue: {} },
+        { provide: MathService, useValue: {} },
         {
           provide: ChangeDetectorRef, useValue: {
             detectChanges: () => fixture.detectChanges(),

src/app/shared/explore/section-component/grid-section/grid-section.component.ts

@@ -59,6 +59,7 @@ import {
 } from '../../../../shared/empty.util';
 import { SearchResult } from '../../../../shared/search/models/search-result.model';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { MarkdownViewerComponent } from '../../../markdown-viewer/markdown-viewer.component';
 import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from '../../../search/models/paginated-search-options.model';
 
@@ -77,6 +78,7 @@ import { PaginatedSearchOptions } from '../../../search/models/paginated-search-
     RouterLink,
     NgxSkeletonLoaderModule,
     NgTemplateOutlet,
+    MarkdownViewerComponent,
   ],
   standalone: true,
 })

src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts

@@ -90,11 +90,6 @@ describe('ItemDetailPreviewFieldComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should display dc.title value', () => {
-    const span = fixture.debugElement.query(By.css('span'));
-    expect(span.nativeElement.innerHTML).toContain('This is just another title');
-  });
-
   it('should display placeholder when metadata has no value', () => {
     component.metadata = 'dc.abstract';
     component.placeholder = 'No abstract';

src/app/shared/object-list/item-list-element/item-types/item/item-list-element.component.spec.ts

@@ -20,15 +20,18 @@ import { environment } from '../../../../../../environments/environment.test';
 import { AuthService } from '../../../../../core/auth/auth.service';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
+import { FileService } from '../../../../../core/shared/file.service';
 import { Item } from '../../../../../core/shared/item.model';
 import { ITEM } from '../../../../../core/shared/item.resource-type';
+import { MathService } from '../../../../../core/shared/math.service';
 import { METRIC } from '../../../../../core/shared/metric.resource-type';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
 import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 import { getMockThemeService } from '../../../../mocks/theme-service.mock';
 import { ActivatedRouteStub } from '../../../../testing/active-router.stub';
 import { AuthServiceStub } from '../../../../testing/auth-service.stub';
 import { AuthorizationDataServiceStub } from '../../../../testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../testing/file-service.stub';
 import { TruncatableServiceStub } from '../../../../testing/truncatable-service.stub';
 import { ThemeService } from '../../../../theme-support/theme.service';
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
@@ -84,13 +87,15 @@ describe('ItemListElementComponent', () => {
   let activatedRoute: ActivatedRouteStub;
   let authService: AuthServiceStub;
   let authorizationService: AuthorizationDataServiceStub;
+  let fileService: FileServiceStub;
   let themeService: ThemeService;
   let truncatableService: TruncatableServiceStub;
 
   beforeEach(waitForAsync(() => {
     activatedRoute = new ActivatedRouteStub();
     authService = new AuthServiceStub();
     authorizationService = new AuthorizationDataServiceStub();
+    fileService = new FileServiceStub();
     themeService = getMockThemeService();
     truncatableService = new TruncatableServiceStub();
 
@@ -105,6 +110,9 @@ describe('ItemListElementComponent', () => {
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: XSRFService, useValue: {} },
+        { provide: MathService, useValue: {} },
+        { provide: FileService, useValue: fileService },
         { provide: ThemeService, useValue: themeService },
         { provide: TruncatableService, useValue: truncatableService },
         { provide: XSRFService, useValue: {} },