Merge branch 'dspace-cris-2024_02_x' into dspace-cris-2025_02_x

# Conflicts:
#	bitbucket-pipelines.yml

Author: atarix83

bitbucket-pipelines.yml

@@ -299,6 +299,18 @@ definitions:
           - export CLOUDFRONT_DISTRIBUTION_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Comment=='test--${CLOUDFRONT_NAME}'].Id" --output text)
           - aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths "/*" || echo "CloudFront distribution $CLOUDFRONT_DISTRIBUTION_ID not found — skipping invalidation."
 
+    - step: &check-branch-name-allowed
+        name: Check allowed branch name
+        image: alpine:latest
+        script:
+          - |
+            if [[ "$BITBUCKET_BRANCH" = "main-cris" ]] || [[ "$BITBUCKET_BRANCH" == dspace-cris-20*_02_x ]] || [[ "$BITBUCKET_BRANCH" == prod/* ]] || [[ "$BITBUCKET_BRANCH" == test/* ]]; then
+              echo "Branch $BITBUCKET_BRANCH is allowed."
+            else
+              echo "This pipeline can only run on main-cris, dspace-cris-20*_02_x, prod/**, or test/**"
+              exit 1
+            fi
+
 pipelines:
   custom:
     e2e-on-custom-backend:
@@ -312,6 +324,12 @@ pipelines:
       - step: *build-and-push
       - step: *deploy-on-dev
       - step: *find-and-invalidate-cloudfront-dev
+    deploy-on-staging:
+      - step: *check-branch-name-allowed
+      - step: *angular-build
+      - step: *build-and-push
+      - step: *deploy-on-staging
+      - step: *find-and-invalidate-cloudfront-staging
     turn-on-dev:
       - step: *turn-on-dev
     turn-on-staging:
@@ -320,11 +338,12 @@ pipelines:
       - step: *turn-on-test
   branches:
     'main-cris':
+      - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
-      - step: *build-and-push
-    'dspace-cris-2025_02_x':
+    'dspace-cris-20*_02_x':
+      - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
@@ -334,6 +353,7 @@ pipelines:
       - step: *deploy-on-staging
       - step: *find-and-invalidate-cloudfront-staging
     'prod/**':
+      - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
@@ -343,6 +363,7 @@ pipelines:
       - step: *deploy-on-staging
       - step: *find-and-invalidate-cloudfront-staging
     'test/**':
+      - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests

src/app/breadcrumbs/breadcrumbs.component.html

@@ -14,7 +14,6 @@
     </ng-template>
 
     <ng-template #activeBreadcrumb let-text="text">
-        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><span class="text-truncate" [innerHTML]="text | translate"></span></div></li>
+        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><span class="text-truncate" [innerHTML]="text | translate | dsEscapeHtml"></span></div></li>
     </ng-template>
 </ng-container>
-

src/app/breadcrumbs/breadcrumbs.component.ts

@@ -10,6 +10,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 
+import { EscapeHtmlPipe } from '../shared/utils/escape-html.pipe';
 import { VarDirective } from '../shared/utils/var.directive';
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 import { BreadcrumbsService } from './breadcrumbs.service';
@@ -22,7 +23,7 @@ import { BreadcrumbsService } from './breadcrumbs.service';
   templateUrl: './breadcrumbs.component.html',
   styleUrls: ['./breadcrumbs.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgTemplateOutlet, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgIf, NgTemplateOutlet, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EscapeHtmlPipe],
 })
 export class BreadcrumbsComponent {
 

src/app/core/locale/locale.service.spec.ts

@@ -1,3 +1,4 @@
+import { PLATFORM_ID } from '@angular/core';
 import {
   TestBed,
   waitForAsync,
@@ -34,6 +35,7 @@ describe('LocaleService test suite', () => {
   let routeService;
   let document;
   let spyOnGetLanguage;
+  const platformId = 'browser';
 
 
   const translateServiceStub: any = {
@@ -72,6 +74,7 @@ describe('LocaleService test suite', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: TranslateService, useValue: translateServiceStub },
           { provide: Document, useValue: document },
+          { provide: PLATFORM_ID, useValue: platformId },
         ],
       });
     }));
@@ -82,7 +85,7 @@ describe('LocaleService test suite', () => {
       routeService = TestBed.inject(RouteService);
       window = new NativeWindowRef();
       document = { documentElement: { lang: 'en' } };
-      service = new LocaleService(window, cookieService, translateService, authService, routeService, document);
+      service = new LocaleService(window, cookieService, translateService, authService, routeService, document, platformId);
       serviceAsAny = service;
       spyOnGet = spyOn(cookieService, 'get');
       spyOnSet = spyOn(cookieService, 'set');

src/app/core/locale/locale.service.ts

@@ -1,7 +1,11 @@
-import { DOCUMENT } from '@angular/common';
+import {
+  DOCUMENT,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Inject,
   Injectable,
+  PLATFORM_ID,
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import {
@@ -58,6 +62,7 @@ export class LocaleService {
     protected authService: AuthService,
     protected routeService: RouteService,
     @Inject(DOCUMENT) protected document: any,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
     this.initDefaults();
   }
@@ -69,7 +74,9 @@ export class LocaleService {
     this.routeService.getQueryParameterValue('lang').subscribe(lang => {
       if (lang && this.translate.getLangs().includes(lang)) {
         this.setCurrentLanguageCode(lang);
-        this.routeService.removeQueryParam('lang');
+        if (isPlatformBrowser(this.platformId)) {
+          this.routeService.removeQueryParam('lang');
+        }
       }
     });
   }

src/app/core/locale/server-locale.service.ts

@@ -2,6 +2,7 @@ import { DOCUMENT } from '@angular/common';
 import {
   Inject,
   Injectable,
+  PLATFORM_ID,
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import {
@@ -44,8 +45,9 @@ export class ServerLocaleService extends LocaleService {
     protected authService: AuthService,
     protected routeService: RouteService,
     @Inject(DOCUMENT) protected document: any,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
-    super(_window, cookie, translate, authService, routeService, document);
+    super(_window, cookie, translate, authService, routeService, document, platformId);
   }
 
   /**

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

@@ -2,7 +2,7 @@
    <div class="{{field.styleValue}}">
     <ds-truncatable [id]="truncableId">
       <ds-truncatable-part [id]="truncableId" [minLines]="3">
-        <span [innerHTML]="formatText(metadataValue.value)" data-test="formatted-text"></span>
+        <span [innerHTML]="metadataValue.value | dsEscapeHtml" data-test="formatted-text"></span>
       </ds-truncatable-part>
     </ds-truncatable>
   </div>

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

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 
 import { TruncatableComponent } from '../../../../../../../shared/truncatable/truncatable.component';
 import { TruncatablePartComponent } from '../../../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
+import { EscapeHtmlPipe } from '../../../../../../../shared/utils/escape-html.pipe';
 import { RenderingTypeValueModelComponent } from '../rendering-type-value.model';
 
 /**
@@ -13,7 +14,7 @@ import { RenderingTypeValueModelComponent } from '../rendering-type-value.model'
   templateUrl: './longtext.component.html',
   styleUrls: ['./longtext.component.scss'],
   standalone: true,
-  imports: [TruncatableComponent, TruncatablePartComponent],
+  imports: [TruncatableComponent, TruncatablePartComponent, EscapeHtmlPipe],
 })
 export class LongtextComponent extends RenderingTypeValueModelComponent {
 

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

@@ -1,3 +1,3 @@
 <div [class]="field.styleValue">
-    <span class="text-value" [attr.lang]="metadataValue.language" [innerHTML]="formatText(metadataValue.value)"></span>
+    <span class="text-value" [attr.lang]="metadataValue.language" [innerHTML]="metadataValue.value | dsEscapeHtml"></span>
 </div>

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

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 
+import { EscapeHtmlPipe } from '../../../../../../../shared/utils/escape-html.pipe';
 import { RenderingTypeValueModelComponent } from '../rendering-type-value.model';
 
 /**
@@ -11,6 +12,9 @@ import { RenderingTypeValueModelComponent } from '../rendering-type-value.model'
   templateUrl: './text.component.html',
   styleUrls: ['./text.component.scss'],
   standalone: true,
+  imports: [
+    EscapeHtmlPipe,
+  ],
 })
 export class TextComponent extends RenderingTypeValueModelComponent {