Merged ux-plus-2023_02_x into UXP-126

Author: atarix83

src/app/core/shared/client-math.service.ts

@@ -1,11 +1,21 @@
-import { Injectable } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Observable, ReplaySubject, Subject } from 'rxjs';
 import { environment } from 'src/environments/environment';
-import { MathJaxConfig, MathService } from './math.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';import { MathJaxConfig, MathService } from './math.service';
 
 @Injectable({
   providedIn: 'root'
 })
+/**
+ * Provide the MathService for CSR
+ */
 export class ClientMathService extends MathService {
 
   protected isReady$: Subject<boolean>;
@@ -31,7 +41,10 @@ export class ClientMathService extends MathService {
     id: 'MathJaxBackupScript'
   };
 
-  constructor() {
+  constructor(
+    @Inject(DOCUMENT) private _document: Document,
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+  ) {
     super();
 
     this.isReady$ = new ReplaySubject<boolean>();
@@ -44,36 +57,49 @@ export class ClientMathService extends MathService {
       });
   }
 
+  /**
+   * Register the specified MathJax script in the document
+   *
+   * @param config The configuration object for the script
+   */
   protected async registerMathJaxAsync(config: MathJaxConfig): Promise<any> {
     if (environment.markdown.mathjax) {
       return new Promise<void>((resolve, reject) => {
 
-        const optionsScript: HTMLScriptElement = document.createElement('script');
+        const optionsScript: HTMLScriptElement = this._document.createElement('script');
         optionsScript.type = 'text/javascript';
         optionsScript.text = `MathJax = ${JSON.stringify(this.mathJaxOptions)};`;
-        document.head.appendChild(optionsScript);
+        this._document.head.appendChild(optionsScript);
 
-        const script: HTMLScriptElement = document.createElement('script');
+        const script: HTMLScriptElement = this._document.createElement('script');
         script.id = config.id;
         script.type = 'text/javascript';
         script.src = config.source;
         script.crossOrigin = 'anonymous';
         script.async = true;
         script.onload = () => resolve();
         script.onerror = error => reject(error);
-        document.head.appendChild(script);
+        this._document.head.appendChild(script);
       });
     }
     return Promise.resolve();
   }
 
+  /**
+   * Return the status of the script registration
+   */
   ready(): Observable<boolean> {
     return this.isReady$;
   }
 
+  /**
+   * Render the specified element using the MathJax JavaScript
+   *
+   * @param element The element to render with MathJax
+   */
   render(element: HTMLElement) {
     if (environment.markdown.mathjax) {
-      (window as any).MathJax.typesetPromise([element]);
+      this._window.nativeWindow.MathJax.typesetPromise([element]);
     }
   }
 }

src/app/core/shared/math.service.ts

@@ -5,6 +5,9 @@ export interface MathJaxConfig {
   id: string;
 }
 
+/**
+ * This service is used to provide the MathJax library with the ability to render markdown code
+ */
 export abstract class MathService {
   protected abstract mathJaxOptions: any;
   protected abstract mathJax: MathJaxConfig;

src/app/core/shared/server-math.service.ts

@@ -5,6 +5,9 @@ import { MathJaxConfig, MathService } from './math.service';
 @Injectable({
   providedIn: 'root'
 })
+/**
+ * Provide the MathService for SSR
+ */
 export class ServerMathService extends MathService {
 
   protected signal: Subject<boolean>;

src/app/cris-layout/enums/layout-box.enum.ts

@@ -16,4 +16,5 @@ export enum LayoutBox {
   IIIFTOOLBAR = 'IIIFTOOLBAR',
   VIDEOVIEWER = 'VIDEOVIEWER',
   COLLECTIONS = 'COLLECTIONS',
+  VERSIONING = 'VERSIONING',
 }

src/app/item-page/item-page.module.ts

@@ -61,8 +61,8 @@ import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component
 import {
   ThemedFullFileSectionComponent
 } from './full/field-components/file-section/themed-full-file-section.component';
-import { UnpaywallVersionsComponent } from './unpaywall-versions/unpaywall-versions.component';
 import { MarkdownViewerModule } from '../shared/markdown-viewer/markdown-viewer.module';
+import { UnpaywallVersionsComponent } from './unpaywall-versions/unpaywall-versions.component';
 
 
 const ENTRY_COMPONENTS = [

src/app/item-page/simple/item-page.component.html

@@ -2,6 +2,9 @@
   <div
     [ngClass]="{'container': (itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements < 1}"
     *ngVar="(itemRD$ | async) as itemRD">
+    <div class="py-1" [ngClass]="{'container': (itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements > 0}">
+      <ds-item-versions-notice [item]="itemRD?.payload" ></ds-item-versions-notice>
+    </div>
     <div class="item-page" *ngIf="(itemRD?.hasSucceeded && !itemRD?.hasNoContent) && tabsRD?.payload?.pageInfo?.totalElements < 1" @fadeInOut>
       <div *ngIf="itemRD?.payload as item">
         <ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>

src/app/item-page/versions/item-versions.component.spec.ts

@@ -10,7 +10,7 @@ import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
 import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
 import { BrowserModule, By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { EMPTY, of, of as observableOf } from 'rxjs';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -26,7 +26,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ItemSharedModule } from '../item-shared.module';
 import { UUIDService } from '../../core/shared/uuid.service';
@@ -135,6 +135,25 @@ describe('ItemVersionsComponent', () => {
     navigateByUrl: null,
   });
 
+  const mockItem = Object.assign(new Item(), {
+    id: 'fake-id',
+    uuid: 'fake-id',
+    handle: 'fake/handle',
+    lastModified: '2018',
+    _links: {
+      self: {
+        href: 'https://localhost:8000/items/fake-id'
+      }
+    }
+  });
+
+  const routeStub = {
+    data: observableOf({
+      dso: createSuccessfulRemoteDataObject(mockItem)
+    }),
+    children: []
+  };
+
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
@@ -153,7 +172,8 @@ describe('ItemVersionsComponent', () => {
         {provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy},
         {provide: ConfigurationDataService, useValue: configurationServiceSpy},
         { provide: Router, useValue: routerSpy },
-        { provide: UUIDService, useValue: getMockUUIDService() }
+        { provide: UUIDService, useValue: getMockUUIDService() },
+        { provide: ActivatedRoute, useValue: routeStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();

src/app/item-page/versions/item-versions.component.ts

@@ -40,7 +40,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component';
 import { VersionDataService } from '../../core/data/version-data.service';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { ItemVersionsSharedService } from './item-versions-shared.service';
@@ -49,7 +49,11 @@ import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-da
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { UUIDService } from '../../core/shared/uuid.service';
+import { RenderCrisLayoutBoxFor } from '../../cris-layout/decorators/cris-layout-box.decorator';
+import { LayoutBox } from '../../cris-layout/enums/layout-box.enum';
 
+
+@RenderCrisLayoutBoxFor(LayoutBox.VERSIONING)
 @Component({
   selector: 'ds-item-versions',
   templateUrl: './item-versions.component.html',
@@ -182,7 +186,8 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
               private workspaceItemDataService: WorkspaceitemDataService,
               private workflowItemDataService: WorkflowItemDataService,
               private configurationService: ConfigurationDataService,
-              private uuidService: UUIDService
+              private uuidService: UUIDService,
+              private route: ActivatedRoute,
   ) {
   }
 
@@ -488,6 +493,21 @@ export class ItemVersionsComponent implements OnDestroy, OnInit {
    * Initialize all observables
    */
   ngOnInit(): void {
+    if (!hasValue(this.item)) {
+      this.subs.push(this.route.data.pipe(
+        map((data) => {
+          return data.dso as RemoteData<Item>;
+        }),
+        getFirstCompletedRemoteData(),
+        map(data => data.payload)
+      ).subscribe((item) => {
+        this.item = item;
+        this.ngOnInit();
+      }));
+
+      return;
+    }
+
     if (hasValue(this.item.version)) {
       this.versionRD$ = this.item.version;
       this.versionHistoryRD$ = this.versionRD$.pipe(

src/app/shared/explore/explore.module.ts

@@ -20,10 +20,10 @@ import { ThemedSearchSectionComponent } from './section-component/search-section
 import { TextSectionComponent } from './section-component/text-section/text-section.component';
 import { ThemedTextSectionComponent } from './section-component/text-section/themed-text-section.component';
 import { SharedModule } from '../shared.module';
+import { MarkdownViewerModule } from '../markdown-viewer/markdown-viewer.module';
 import { CarouselSectionComponent } from './section-component/carousel-section/carousel-section.component';
 import { ThemedCarouselSectionComponent } from './section-component/carousel-section/themed-carousel-section.component';
 import { CarouselModule } from '../carousel/carousel.module';
-import { MarkdownViewerModule } from '../markdown-viewer/markdown-viewer.module';
 import { GridSectionComponent } from './section-component/grid-section/grid-section.component';
 import { ThemedGridSectionComponent } from './section-component/grid-section/themed-grid-section.component';
 import { TwitterSectionComponent } from './section-component/twitter-section/twitter-section.component';
@@ -56,12 +56,12 @@ const COMPONENTS = [
   declarations: [
     ...COMPONENTS
   ],
-  imports: [
-    CommonModule,
-    SharedModule,
-    CarouselModule,
-    MarkdownViewerModule
-  ],
+    imports: [
+        CommonModule,
+        SharedModule,
+        MarkdownViewerModule,
+        CarouselModule,
+    ],
   exports: [
     ...COMPONENTS
   ]

src/app/shared/form/builder/ds-dynamic-form-ui/models/markdown/ds-dynamic-markdown.model.ts

@@ -0,0 +1,14 @@
+import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
+import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_MARKDOWN } from './dynamic-markdown.model';
+
+
+export class DsDynamicMarkdownModel extends DsDynamicInputModel {
+  @serializable() type = DYNAMIC_FORM_CONTROL_TYPE_MARKDOWN;
+
+  constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) {
+    super(config, layout);
+
+  }
+
+}