Merged ux-plus-cris into task/ux-plus-cris/UXP-87

Author: vins01-4science

src/app/core/services/location.service.ts

@@ -184,8 +184,8 @@ export class LocationService {
   public isValidCoordinateString(coordinateString: string): boolean {
     if (this.isDecimalCoordinateString(coordinateString)) {
       const coordinateArray = coordinateString.split(',');
-      const latitude = parseFloat(coordinateArray[0]);
-      const longitude = parseFloat(coordinateArray[1]);
+      const latitude = parseFloat(coordinateArray[0].trim());
+      const longitude = parseFloat(coordinateArray[1].trim());
       return !isNaN(latitude) && !isNaN(longitude) && this.isValidDecimalCoordinatePair(latitude, longitude);
     } else {
       return false;

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

@@ -7,6 +7,7 @@ export enum FieldRenderingType {
   IDENTIFIER = 'IDENTIFIER',
   CRISREF = 'CRISREF',
   THUMBNAIL = 'THUMBNAIL',
+  IMAGE = 'IMAGE',
   ATTACHMENT = 'ATTACHMENT',
   TABLE = 'TABLE',
   INLINE = 'INLINE',
@@ -15,16 +16,17 @@ export enum FieldRenderingType {
   VALUEPAIR = 'VALUEPAIR',
   HTML = 'HTML',
   LONGHTML = 'LONGHTML',
-  ADVANCEDATTACHMENT = 'ADVANCEDATTACHMENT',
-  SIMPLEATTACHMENT = 'SIMPLEATTACHMENT',
-  AUTHORITYLINK = 'AUTHORITYLINK',
   GMAP = 'GOOGLEMAPS',
   OSMAP = 'OPENSTREETMAP',
   GMAPGROUP = 'GOOGLEMAPS-GROUP',
   OSMAPGROUP = 'OPENSTREETMAP-GROUP',
   BROWSE = 'BROWSE',
   TAGBROWSE = 'TAG-BROWSE',
   MARKDOWN = 'MARKDOWN',
+  LONGMARKDOWN = 'LONGMARKDOWN',
   SEARCH = 'SEARCH',
   TAGSEARCH = 'TAG-SEARCH',
+  ADVANCEDATTACHMENT = 'ADVANCEDATTACHMENT',
+  SIMPLEATTACHMENT = 'SIMPLEATTACHMENT',
+  AUTHORITYLINK = 'AUTHORITYLINK',
 }

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,114 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { BitstreamDataService } from '../../../../../../../core/data/bitstream-data.service';
+import { RemoteData } from '../../../../../../../core/data/remote-data';
+import { LayoutField } from '../../../../../../../core/layout/models/box.model';
+import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
+import { Item } from '../../../../../../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../../../../../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../../../../../shared/testing/utils.test';
+import { FieldRenderingType } from '../../../../boxes/metadata/rendering-types/field-rendering-type';
+import { ImageComponent } from './image.component';
+
+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({
+      imports: [
+        ImageComponent,
+        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,50 @@
+import { AsyncPipe } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
+import { getPaginatedListPayload } from '../../../../../../../core/shared/operators';
+import { BitstreamRenderingModelComponent } from '../bitstream-rendering-model';
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: 'div[ds-image]',
+  templateUrl: './image.component.html',
+  styleUrls: ['./image.component.scss'],
+  standalone: true,
+  imports: [
+    AsyncPipe,
+  ],
+})
+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/longmarkdown/longmarkdown.component.html

@@ -0,0 +1,9 @@
+<div class="mb-2">
+   <div class="{{field.styleValue}}">
+     <ds-truncatable [id]="truncatableId">
+       <ds-truncatable-part [id]="truncatableId" [minLines]="8">
+         <ds-markdown-viewer [value]="metadataValue.value"></ds-markdown-viewer>
+       </ds-truncatable-part>
+     </ds-truncatable>
+  </div>
+</div>

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

@@ -0,0 +1,106 @@
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { MockComponent } from 'ng-mocks';
+import { MarkdownViewerComponent } from 'src/app/shared/markdown-viewer/markdown-viewer.component';
+import { TruncatableComponent } from 'src/app/shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from 'src/app/shared/truncatable/truncatable-part/truncatable-part.component';
+
+import { LayoutField } from '../../../../../../../core/layout/models/box.model';
+import { Item } from '../../../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
+import { TranslateLoaderMock } from '../../../../../../../shared/mocks/translate-loader.mock';
+import { LongmarkdownComponent } from './longmarkdown.component';
+
+describe('LongmarkdownComponent', () => {
+  let component: LongmarkdownComponent;
+  let fixture: ComponentFixture<LongmarkdownComponent>;
+
+  const metadataValue = Object.assign(new MetadataValue(), {
+    'value': 'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.',
+    'language': null,
+    'authority': null,
+    'confidence': -1,
+    'place': 0,
+  });
+
+  const testItem = Object.assign(new Item(),
+    {
+      type: 'item',
+      metadata: {
+        'dc.abstract': [metadataValue],
+      },
+      uuid: 'test-item-uuid',
+    },
+  );
+
+
+  const mockField: LayoutField = {
+    'metadata': 'dc.abstract',
+    'label': 'Preferred name',
+    'rendering': 'markdown',
+    'fieldType': 'METADATA',
+    'style': null,
+    'styleLabel': 'test-style-label',
+    'styleValue': 'test-style-value',
+    'labelAsHeading': false,
+    'valuesInline': true,
+  };
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        BrowserAnimationsModule,
+        MockComponent(MarkdownViewerComponent),
+        MockComponent(TruncatableComponent),
+        MockComponent(TruncatablePartComponent),
+      ],
+      providers: [
+        { provide: 'fieldProvider', useValue: mockField },
+        { provide: 'itemProvider', useValue: testItem },
+        { provide: 'metadataValueProvider', useValue: metadataValue },
+        { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
+      ],
+      declarations: [LongmarkdownComponent],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LongmarkdownComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('check metadata rendering', (done) => {
+    const spanValueFound = fixture.debugElement.queryAll(By.css('ds-markdown-viewer'));
+    expect(spanValueFound.length).toBe(1);
+    done();
+  });
+
+  it('check value style', (done) => {
+    const spanValueFound = fixture.debugElement.queryAll(By.css('.test-style-value'));
+    expect(spanValueFound.length).toBe(1);
+    done();
+  });
+
+});

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

@@ -0,0 +1,36 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { MarkdownViewerComponent } from 'src/app/shared/markdown-viewer/markdown-viewer.component';
+import { TruncatableComponent } from 'src/app/shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from 'src/app/shared/truncatable/truncatable-part/truncatable-part.component';
+
+import { RenderingTypeValueModelComponent } from '../rendering-type-value.model';
+
+/**
+ * This component renders the markdown metadata fields with a show more button
+ */
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: 'div[ds-longmarkdown]',
+  templateUrl: './longmarkdown.component.html',
+  styleUrls: ['./longmarkdown.component.scss'],
+  standalone: true,
+  imports: [
+    MarkdownViewerComponent,
+    TruncatableComponent,
+    TruncatablePartComponent,
+  ],
+})
+export class LongmarkdownComponent extends RenderingTypeValueModelComponent implements OnInit {
+
+  /**
+   * Id for truncable component
+   */
+  truncatableId: string;
+
+  ngOnInit(): void {
+    this.truncatableId = `${this.item.id}_${this.field.metadata}_md`;
+  }
+}