Merged in task/prod/uon--repo/CST-24396 (pull request DSpace#4101)

Task/prod/uon  repo/CST-24396

Approved-by: Daniele Ninfo

Author: atarix83

bitbucket-pipelines.yml

@@ -87,7 +87,7 @@ definitions:
           - yarn build:lint
           - npm run ng-high-memory -- lint --quiet
           - yarn run check-circ-deps
-          - yarn run test:headless
+          - yarn run test:headless:ci
         artifacts:
           - .next/**
           - .cache/**
@@ -105,6 +105,7 @@ definitions:
           - node-2024-02-x
           - cypress-2024-02-x
         script:
+          - apt-get update && apt-get install -y curl
           - export HASH_COMMIT=${BITBUCKET_COMMIT:0:8}
           - echo "Running tests for commit $HASH_COMMIT"
           - export DSPACE_REST_HOST=${E2E_RUNNER_HOST}
@@ -120,6 +121,27 @@ definitions:
           - export CYPRESS_CACHE_FOLDER=~/.cache/Cypress
           - export CHROME_FLAGS="--no-sandbox --disable-dev-shm-usage --disable-gpu"
           - export NODE_OPTIONS="--max-old-space-size=4096"
+          - |
+            MAX_RETRIES=10
+            RETRY_COUNT=0
+            SUCCESS=false
+            while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do
+              echo "Pinging REST endpoint... (Attempt $((RETRY_COUNT+1)))"
+              STATUS_CODE=$(curl -s -o /dev/null -w "%{http_code}" "https://$DSPACE_REST_HOST$DSPACE_REST_NAMESPACE")
+              if [ "$STATUS_CODE" -lt 400 ]; then
+                echo "REST endpoint is up! Status code: $STATUS_CODE"
+                SUCCESS=true
+                break
+              else
+                echo "REST endpoint not ready (Status code: $STATUS_CODE). Retrying in 60 seconds..."
+                RETRY_COUNT=$((RETRY_COUNT+1))
+                sleep 60
+              fi
+            done
+            if [ "$SUCCESS" = "false" ]; then
+              echo "REST endpoint did not become available after $MAX_RETRIES attempts. Failing the build."
+              exit 1
+            fi
           - npx cypress install
           - yarn serve:ssr &
           - echo "Waiting for server to start..."
@@ -277,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" = "ux-plus-cris" ]] || [[ "$BITBUCKET_BRANCH" == ux-plus-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 ux-plus-cris, ux-plus-cris-20*_02_x, prod/**, or test/**"
+              exit 1
+            fi
+
 pipelines:
   custom:
     e2e-on-custom-backend:
@@ -290,23 +324,25 @@ 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:
       - step: *turn-on-staging
     turn-on-test:
       - step: *turn-on-test
   branches:
-    'ux-plus-data-quality-cris-2024_02_x':
+    "ux-plus-data-quality-cris-2024_02_x":
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
-      - step: *build-and-push
-      - step: *deploy-on-dev
-      - step: *find-and-invalidate-cloudfront-dev
-      - step: *deploy-on-staging
-      - step: *find-and-invalidate-cloudfront-staging
-    'prod/**':
+    "prod/**":
+      - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
@@ -315,7 +351,8 @@ pipelines:
       - step: *find-and-invalidate-cloudfront-dev
       - step: *deploy-on-staging
       - step: *find-and-invalidate-cloudfront-staging
-    'test/**':
+    "test/**":
+      - step: *check-branch-name-allowed
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests
@@ -324,7 +361,7 @@ pipelines:
       - step: *find-and-invalidate-cloudfront-test
 
   pull-requests:
-    '**':
+    "**":
       - step: *preliminary-operation
       - step: *angular-build
       - parallel: *parallel-run-tests

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2024.02.03",
+  "version": "2024.02.04",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -25,6 +25,7 @@
     "test": "ng test --source-map=true --watch=false --configuration test",
     "test:watch": "nodemon --exec \"ng test --source-map=true --watch=true --configuration test\"",
     "test:headless": "ng test --source-map=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
+    "test:headless:ci": "ng test --source-map=false --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
     "test:lint": "yarn build:lint && yarn test:lint:nobuild",
     "test:lint:nobuild": "jasmine --config=lint/jasmine.json",
     "lint": "yarn build:lint && yarn lint:nobuild",
@@ -91,8 +92,8 @@
     "@angular/platform-server": "^17.3.11",
     "@angular/router": "^17.3.11",
     "@angular/ssr": "^17.3.17",
-    "@babel/runtime": "7.27.6",
     "@asymmetrik/ngx-leaflet": "^17.0.0",
+    "@babel/runtime": "7.27.6",
     "@datadog/browser-rum": "^5.7.0",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0",
@@ -150,14 +151,16 @@
     "ng2-pdfjs-viewer": "^15.0.0",
     "ngx-infinite-scroll": "^17.0.0",
     "ngx-pagination": "6.0.3",
-    "ngx-skeleton-loader": "^9.0.0",
     "ngx-quill": "25.3.3",
+    "ngx-skeleton-loader": "^9.0.0",
     "nouislider": "^15.8.1",
     "pem": "1.14.8",
     "prop-types": "^15.8.1",
     "quill": "2.0.3",
     "quill-emoji": "^0.2.0",
+    "react": "^17.0.0",
     "react-copy-to-clipboard": "^5.1.0",
+    "react-dom": "^17.0.0",
     "redux-saga": "^1.3.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.2",
@@ -194,9 +197,9 @@
     "@types/file-saver": "^2.0.1",
     "@types/googlemaps": "^3.43.3",
     "@types/grecaptcha": "^3.0.9",
-    "@types/leaflet": "^1.9.12",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
+    "@types/leaflet": "^1.9.12",
     "@types/lodash": "^4.17.17",
     "@types/node": "^14.14.9",
     "@types/sanitize-html": "^2.13.0",
@@ -249,9 +252,9 @@
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "prop-types": "^15.8.1",
-    "react": "^16.14.0",
+    "react": "^17.0.0",
     "react-copy-to-clipboard": "^5.1.0",
-    "react-dom": "^16.14.0",
+    "react-dom": "^17.0.0",
     "rimraf": "^3.0.2",
     "sass": "~1.89.2",
     "sass-loader": "^12.6.0",

server.ts

@@ -255,6 +255,11 @@ export function app() {
    */
   server.get('/app/client/health', clientHealthCheck);
 
+  /**
+   * Redirecting old manifest
+   */
+  server.get('/json/iiif/**/manifest', redirectManifest);
+
   /**
    * Default sending all incoming requests to ngApp() function, after first checking for a cached
    * copy of the page (see cacheCheck())
@@ -721,6 +726,39 @@ function healthCheck(req, res) {
     });
 }
 
+/*
+ * The callback function to redirect old manifest
+ */
+function redirectManifest(req, res) {
+  console.info('Redirecting old manifest');
+  const url = req.url;
+  const regex = /json\/iiif\/([^\/]+\/[^\/]+)(?:\/([^\/]+))?\/manifest/;
+  const match = url.match(regex);
+  let handle;
+  let id;
+
+  if (match) {
+    handle = match[1];
+    const baseUrl = `${environment.rest.baseUrl}/api/pid/find?id=${handle}`;
+    axios.get(baseUrl)
+      .then((response) => {
+        if (response.status === 200) {
+          const newUrl = `${environment.rest.baseUrl}/iiif/${response.data.id}/manifest`;
+          console.info('Manifest found, redirect to ', newUrl);
+          res.redirect(newUrl);
+        }
+      })
+      .catch((error) => {
+        res.status(error.response.status).send({
+          error: error.message
+        });
+      });
+  } else {
+    res.status(422).send({
+      error: 'Wrong handle'
+    });
+  }
+}
 
 // Webpack will replace 'require' with '__webpack_require__'
 // '__non_webpack_require__' is a proxy to Node 'require'

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

@@ -194,12 +194,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',
@@ -342,7 +342,7 @@ export const APP_ROUTES: Route[] = [
           .then((m) => m.ROUTES),
       },
       {
-        path: 'luck-search',
+        path: 'lucky-search',
         loadChildren: () => import('./lucky-search/lucky-search-routes')
           .then((m) => m.ROUTES),
       },

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/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/collection-page/collection-page.component.html

@@ -4,7 +4,7 @@
     <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
       <div *ngIf="collectionRD?.payload as collection">
         <div class="d-flex flex-row border-bottom mb-4 pb-4">
-          <header class="comcol-header mr-auto">
+          <header class="comcol-header w-100">
             <!-- Collection Name -->
             <ds-comcol-page-header
                 [name]="dsoNameService.getName(collection)">

src/app/community-page/community-page.component.html

@@ -2,7 +2,7 @@
   <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="communityRD?.payload; let communityPayload">
       <div class="d-flex flex-row border-bottom mb-4 pb-4">
-        <header class="comcol-header mr-auto">
+        <header class="comcol-header w-100">
           <!-- Community name -->
           <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
           <!-- Community logo -->