Merged dspace-cris-2025_02_x into task/dspace-cris-2025_02_x/DSC-2637

Author: AdamF42

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2024.02.03-SNAPSHOT",
+  "version": "2024.02.04-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -138,6 +138,7 @@
     "markdown-it": "^13.0.1",
     "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
+    "mirador-imagecropper": "^0.1.9",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
     "ng2-file-upload": "5.0.0",

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts

@@ -307,7 +307,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       name: 'email',
       validators: {
         required: null,
-        pattern: '^[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}$',
+        pattern: '^\\s*[a-z0-9._%+-]+@[a-z0-9.-]+\\.[a-z]{2,4}\\s*$',
       },
       required: true,
       errorMessages: {
@@ -426,7 +426,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
               },
             ],
           },
-          email: this.email.value,
+          email: (this.email.value as string)?.trim(),
           canLogIn: this.canLogIn.value,
           requireCertificate: this.requireCertificate.value,
         };

src/app/app-routes.ts

@@ -182,12 +182,12 @@ export const APP_ROUTES: Route[] = [
         canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
       },
       {
-        path: 'standard-login',
+        path: 'admin-only-login',
         loadChildren: () => import('./login-page/login-page-routes').then((m) => m.ROUTES),
         data: {
           isBackDoor: true,
         },
-        canMatch: [() => !environment.auth.disableStandardLogin],
+        canMatch: [() => environment.auth.isPasswordLoginEnabledForAdminsOnly],
       },
       {
         path: 'login',

src/app/app.config.ts

@@ -57,6 +57,7 @@ import { AuthInterceptor } from './core/auth/auth.interceptor';
 import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor';
 import { LocaleInterceptor } from './core/locale/locale.interceptor';
 import { LogInterceptor } from './core/log/log.interceptor';
+import { schemaModels } from './core/metadata/schema-json-ld/schema-types/provide-schema';
 import {
   models,
   provideCore,
@@ -169,3 +170,4 @@ const metadataRepresentations = METADATA_REPRESENTATION_COMPONENT_DECORATOR_MAP;
 const startsWithDecoratorMap = STARTS_WITH_DECORATOR_MAP;
 const browseByDecoratorMap = BROWSE_BY_DECORATOR_MAP;
 const authMethodForDecoratorMap = AUTH_METHOD_FOR_DECORATOR_MAP;
+const schemaModelList = schemaModels;

src/app/core/metadata/schema-json-ld/schema-json-ld.service.ts

@@ -3,6 +3,7 @@ import {
   Inject,
   Injectable,
 } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
 
 import {
   isEmpty,
@@ -20,7 +21,10 @@ import {
 export class SchemaJsonLDService {
   static scriptType = 'application/ld+json';
 
-  constructor(@Inject(DOCUMENT) private _document: Document) {}
+  constructor(
+    @Inject(DOCUMENT) private _document: Document,
+    protected sanitizer: DomSanitizer,
+  ) {}
 
   removeStructuredData(): void {
     const els = [];
@@ -66,7 +70,7 @@ export class SchemaJsonLDService {
     }
 
     if (isNotEmpty(constructor)) {
-      const provider: SchemaType = new constructor();
+      const provider: SchemaType = new constructor(this.sanitizer);
       return provider.getSchema(item);
     } else {
       return null;

src/app/core/metadata/schema-json-ld/schema-types/provide-schema.ts

@@ -0,0 +1,24 @@
+import { PersonSchemaType } from './Person/person-schema-type';
+import { ProductCreativeWorkSchemaType } from './product/product-creative-work-schema-type';
+import { ProductDatasetSchemaType } from './product/product-dataset-schema-type';
+import { PublicationBookSchemaType } from './publication/publication-book-schema-type';
+import { PublicationChapterSchemaType } from './publication/publication-chapter-schema-type';
+import { PublicationCreativeWorkSchemaType } from './publication/publication-creative-work-schema-type';
+import { PublicationReportSchemaType } from './publication/publication-report-schema-type';
+import { PublicationScholarlyArticleSchemaType } from './publication/publication-scholarly-article-schema-type';
+import { PublicationThesisSchemaType } from './publication/publication-thesis-schema-type';
+
+/**
+ * Declaration needed to make sure all decorator functions are called in time
+ */
+export const schemaModels = [
+  PersonSchemaType,
+  ProductCreativeWorkSchemaType,
+  ProductDatasetSchemaType,
+  PublicationBookSchemaType,
+  PublicationChapterSchemaType,
+  PublicationCreativeWorkSchemaType,
+  PublicationReportSchemaType,
+  PublicationScholarlyArticleSchemaType,
+  PublicationThesisSchemaType,
+];

src/app/core/metadata/schema-json-ld/schema-types/schema-type.ts

@@ -1,9 +1,13 @@
+import { SecurityContext } from '@angular/core';
+import { DomSanitizer } from '@angular/platform-browser';
 import isObject from 'lodash/isObject';
 
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { Item } from '../../../shared/item.model';
 
 export abstract class SchemaType {
+  constructor(protected sanitizer: DomSanitizer) {}
+
   protected abstract createSchema(item: Item): Record<string, any>;
   protected abstract createSchema(item: Item): Record<string, any>;
 
@@ -31,7 +35,35 @@ export abstract class SchemaType {
     }
   }
 
+  protected sanitizeSchema(obj: any):  Record<string, any> {
+    if (Array.isArray(obj)) {
+      return obj.map(v =>
+        typeof v === 'string'
+          ? this.sanitizer.sanitize(SecurityContext.HTML, v)
+          : this.sanitizeSchema(v),
+      );
+    }
+
+    if (typeof obj === 'object' && obj !== null) {
+      const sanitized: Record<string, any> = {};
+      for (const key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          const value = obj[key];
+          sanitized[key] =
+            typeof value === 'string'
+              ? this.sanitizer.sanitize(SecurityContext.HTML, value)
+              : this.sanitizeSchema(value);
+        }
+      }
+      return sanitized;
+    }
+
+    return obj;
+  }
+
+
   getSchema(item: Item): Record<string, any> {
-    return SchemaType.removeEmpty(this.createSchema(item));
+    const sanitizedRaw = this.sanitizeSchema(this.createSchema(item));
+    return SchemaType.removeEmpty(sanitizedRaw);
   }
 }

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

@@ -0,0 +1,8 @@
+<ds-item-page-cc-license-field
+  [item]="item"
+  [variant]="'full'"
+  [ccLicenseUriField]="dcRightsUri"
+  [ccLicenseNameField]="dcRights"
+  [showLabel]="false"
+  [showUrl]="true">
+</ds-item-page-cc-license-field>

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

@@ -0,0 +1,53 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CcLicenseLargeComponent } from './cc-license-large.component';
+
+describe('CcLicenseLargeComponent', () => {
+  let component: CcLicenseLargeComponent;
+  let fixture: ComponentFixture<CcLicenseLargeComponent>;
+
+  const mockItem = {
+    firstMetadataValue: jasmine.createSpy('firstMetadataValue').and.returnValue(''),
+    metadata: {},
+    findMetadataSortedByPlace: jasmine.createSpy('findMetadataSortedByPlace').and.returnValue([]),
+  };
+
+  const mockField = {
+    metadataGroup: { elements: [] },
+    styleValue: '',
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        CcLicenseLargeComponent,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        { provide: 'fieldProvider', useValue: mockField },
+        { provide: 'itemProvider', useValue: mockItem },
+        { provide: 'metadataValueProvider', useValue: {} },
+        { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(CcLicenseLargeComponent);
+    component = fixture.componentInstance;
+
+    component.componentsToBeRenderedMap.set(0, [
+      { field: { metadata: 'dc.rights' } as any, value: {} as any },
+      { field: { metadata: 'dc.rights.uri' } as any, value: {} as any },
+    ] as any);
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});