Merged in task/ux-plus-2023_02_x/UXP-138 (pull request #16)

Task/ux plus 2023 02 x/UXP-138

Approved-by: Francesco Molinaro

Author: alisaismailati

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/image/image.component.html

@@ -0,0 +1,4 @@
+<div [class]="field.styleValue">
+  <img *ngIf="(imageUrl$ | async) as url" [src]="url">
+</div>
+

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/image/image.component.scss

@@ -0,0 +1,5 @@
+img {
+  width: 100%;
+  max-width: 900px;
+  max-height: 600px;
+}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/image/image.component.spec.ts

@@ -0,0 +1,104 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+
+import {ImageComponent} from './image.component';
+import {LayoutField} from '../../../../../../../core/layout/models/box.model';
+import {FieldRenderingType} from '../metadata-box.decorator';
+import {Item} from '../../../../../../../core/shared/item.model';
+import {Observable, of} from 'rxjs';
+import {BitstreamDataService} from '../../../../../../../core/data/bitstream-data.service';
+import {TranslateLoader, TranslateModule, TranslateService} from '@ngx-translate/core';
+import {RemoteData} from '../../../../../../../core/data/remote-data';
+import {Bitstream} from '../../../../../../../core/shared/bitstream.model';
+import {createSuccessfulRemoteDataObject$} from '../../../../../../../shared/remote-data.utils';
+import {TranslateLoaderMock} from '../../../../../../../shared/mocks/translate-loader.mock';
+import {createPaginatedList} from '../../../../../../../shared/testing/utils.test';
+
+describe('ImageComponent', () => {
+    let component: ImageComponent;
+    let fixture: ComponentFixture<ImageComponent>;
+
+    const mockField: LayoutField = {
+        metadata: '',
+        label: 'Files',
+        rendering: FieldRenderingType.IMAGE,
+        fieldType: 'BITSTREAM',
+        style: null,
+        styleLabel: 'test-style-label',
+        styleValue: 'test-style-value',
+        labelAsHeading: false,
+        valuesInline: true,
+        bitstream: {
+            bundle: 'ORIGINAL',
+            metadataField: null,
+            metadataValue: null
+        }
+    };
+
+    const testItem = Object.assign(new Item(), {
+        bundles: of({}),
+        metadata: {
+            'dc.identifier.doi': [
+                {
+                    value: 'doi:10.1392/dironix'
+                }
+            ]
+        },
+        _links: {
+            self: {href: 'obj-selflink'}
+        },
+        uuid: 'item-uuid',
+    });
+
+    const mockBitstreamDataService: any = jasmine.createSpyObj('BitstreamDataService', {
+        getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
+            return createSuccessfulRemoteDataObject$(new Bitstream());
+        },
+        findAllByItemAndBundleName: jasmine.createSpy('findAllByItemAndBundleName'),
+        findByItem: of(createPaginatedList([new Bitstream()])),
+    });
+    const langList = ['en', 'xx', 'de'];
+    const translateServiceStub: any = {
+        getLangs: () => {
+            return langList;
+        },
+        getBrowserLang: () => {
+            return langList;
+        },
+        // eslint-disable-next-line @typescript-eslint/no-empty-function
+        use: (param: string) => {
+        }
+    };
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            declarations: [ImageComponent],
+            imports: [
+                TranslateModule.forRoot({
+                    loader: {
+                        provide: TranslateLoader,
+                        useClass: TranslateLoaderMock
+                    }
+                }),
+            ],
+            providers: [
+                {provide: 'fieldProvider', useValue: mockField},
+                {provide: 'itemProvider', useValue: testItem},
+                {provide: 'renderingSubTypeProvider', useValue: ''},
+                {provide: 'tabNameProvider', useValue: ''},
+                {provide: BitstreamDataService, useValue: mockBitstreamDataService},
+                {provide: TranslateService, useValue: translateServiceStub},
+            ]
+        })
+            .compileComponents();
+    });
+
+    beforeEach(() => {
+        fixture = TestBed.createComponent(ImageComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
+
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
+});

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/image/image.component.ts

@@ -0,0 +1,41 @@
+import { Component, OnInit } from '@angular/core';
+import { FieldRenderingType, MetadataBoxFieldRendering } from '../metadata-box.decorator';
+
+import { BitstreamRenderingModelComponent } from '../bitstream-rendering-model';
+import { map } from 'rxjs/operators';
+import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { getPaginatedListPayload } from '../../../../../../../core/shared/operators';
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: 'div[ds-image]',
+  templateUrl: './image.component.html',
+  styleUrls: ['./image.component.scss'],
+})
+@MetadataBoxFieldRendering(FieldRenderingType.IMAGE, true)
+export class ImageComponent extends BitstreamRenderingModelComponent implements OnInit {
+
+  bitstream = new BehaviorSubject<Bitstream>(null);
+
+  imageUrl$: Observable<string>;
+
+  ngOnInit(): void {
+    this.getBitstreamsByItem().pipe(
+      getPaginatedListPayload(),
+      map((filteredBitstreams: Bitstream[]) => filteredBitstreams.length > 0 ? filteredBitstreams[0] : null)
+    ).subscribe((image) => {
+      this.bitstream.next(image);
+    });
+
+    this.imageUrl$ = this.bitstream.asObservable().pipe(
+      map((bitstream) => bitstream?._links?.content?.href),
+    );
+
+  }
+
+  backgroundImageUrl(url: string) {
+    return `url('${url}')`;
+  }
+
+}

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/metadata-box.decorator.ts

@@ -10,6 +10,7 @@ export enum FieldRenderingType {
   IDENTIFIER = 'IDENTIFIER',
   CRISREF = 'CRISREF',
   THUMBNAIL = 'THUMBNAIL',
+  IMAGE = 'IMAGE',
   ATTACHMENT = 'ATTACHMENT',
   TABLE = 'TABLE',
   INLINE = 'INLINE',

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts

@@ -164,6 +164,7 @@ export class MetadataContainerComponent implements OnInit {
     const rendering = this.computeRendering(this.field);
     if (this.field.fieldType === LayoutFieldType.BITSTREAM
       && (rendering.toLocaleLowerCase() === FieldRenderingType.ATTACHMENT.toLocaleLowerCase()
+        || rendering.toLocaleLowerCase() === FieldRenderingType.IMAGE.toLocaleLowerCase()
         || rendering.toLocaleLowerCase() === FieldRenderingType.ADVANCEDATTACHMENT.toLocaleLowerCase())) {
       this.hasBitstream().pipe(take(1)).subscribe((hasBitstream: boolean) => {
         if (hasBitstream) {

src/app/cris-layout/cris-layout.module.ts

@@ -158,6 +158,9 @@ import {
 import {
   LonghtmlComponent
 } from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/longhtml/longhtml.component';
+import {
+  ImageComponent
+} from './cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/image/image.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -199,6 +202,7 @@ const ENTRY_COMPONENTS = [
   CrisLayoutMediaBoxComponent,
   GooglemapsGroupComponent,
   OpenstreetmapGroupComponent,
+  ImageComponent
 ];
 
 @NgModule({
@@ -225,6 +229,8 @@ const ENTRY_COMPONENTS = [
     MetadataRenderComponent,
     BitstreamAttachmentComponent,
     AttachmentRenderComponent,
+    MarkdownComponent,
+    ImageComponent
   ],
   providers:[ LoadMoreService, NgbActiveModal ],
   imports: [