Merged dspace-cris-2024_02_x into task/dspace-cris-2024_02_x/DSC-2529

Author: vins01-4science

.github/workflows/build.yml

@@ -203,79 +203,72 @@ jobs:
       # If it does, then SSR is working.
       - name: Verify SSR on a Community page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/communities/0958c910-2037-42a9-81c7-dca80e3892b4)
+          result=$(wget -O- -q http://127.0.0.1:4000/communities/a30b75e4-1682-4b4d-85fd-a47fc78dbcf6)
           echo "$result"
-          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Publications
+          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep "CRIS Community"
 
-      # Get a specific collection in our test data and verify that the "<h1>" tag includes "Articles" (the collection name).
+      # Get a specific collection in our test data and verify that the "<h1>" tag includes "Publications" (the collection name).
       # If it does, then SSR is working.
       - name: Verify SSR on a Collection page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/collections/282164f5-d325-4740-8dd1-fa4d6d3e7200)
+          result=$(wget -O- -q http://127.0.0.1:4000/collections/caf04bfa-b2f6-40d3-90d2-aa0b86d92f8d)
           echo "$result"
-          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Articles
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Publications"
 
       # Get a specific publication in our test data and verify that the <meta name="title"> tag includes
       # the title of this publication. If it does, then SSR is working.
       - name: Verify SSR on a Publication page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/6160810f-1e53-40db-81ef-f6621a727398)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/1df533fd-5385-4820-babd-b5fabdb82101)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "An Economic Model of Mortality Salience"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "test publication with pdf version 1"
 
       # Get a specific person in our test data and verify that the <meta name="title"> tag includes
       # the name of the person. If it does, then SSR is working.
       - name: Verify SSR on a Person page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/person/b1b2c768-bda1-448a-a073-fc541e8b24d9)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/person/98cea993-d448-4200-99d5-f6fab8967bf8)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Simmons, Cameron"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Submitter Dspace"
 
       # Get a specific project in our test data and verify that the <meta name="title"> tag includes
       # the name of the project. If it does, then SSR is working.
       - name: Verify SSR on a Project page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/46ccb608-a74c-4bf6-bc7a-e29cc7defea9)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/project/1e3451e4-60d7-46a8-962e-5b94b62c63ff)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "University Research Fellowship"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Test DSC-1819"
 
       # Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
       # the name of the orgunit. If it does, then SSR is working.
       - name: Verify SSR on an OrgUnit page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/9851674d-bd9a-467b-8d84-068deb568ccf)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/6d4abaee-eedb-458d-a29b-35db82037dfa)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Law and Development"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "4Science"
 
       # Get a specific journal in our test data and verify that the <meta name="title"> tag includes
       # the name of the journal. If it does, then SSR is working.
       - name: Verify SSR on a Journal page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/d4af6c3e-53d0-4757-81eb-566f3b45d63a)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/f05c4530-b1b8-4459-a048-ea1c60089a1e)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Journal 4S"
 
-      # Get a specific journal volume in our test data and verify that the <meta name="title"> tag includes
-      # the name of the volume. If it does, then SSR is working.
-      - name: Verify SSR on a Journal Volume page
+      # Get a specific funding in our test data and verify that the <meta name="title"> tag includes
+      # the name of the funding. If it does, then SSR is working.
+      - name: Verify SSR on a Funding page
         run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538)
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/funding/640d35ba-6172-44c0-9e11-bf5da417cdc8)
           echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Volume 28 (2017)"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "test funding"
 
-      # Get a specific journal issue in our test data and verify that the <meta name="title"> tag includes
-      # the name of the issue. If it does, then SSR is working.
-      - name: Verify SSR on a Journal Issue page
-        run: |
-          result=$(wget -O- -q http://127.0.0.1:4000/entities/journalissue/44c29473-5de2-48fa-b005-e5029aa1a50b)
-          echo "$result"
-          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Vol. 28, No. 1"
 
       # Verify 301 Handle redirect behavior
       # Note: /handle/123456789/260 is the same test Publication used by our e2e tests
       - name: Verify 301 redirect from '/handle' URLs
         run: |
-          result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/260 2>&1 | head -1 | awk '{print $2}')
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/71 2>&1 | head -1 | awk '{print $2}')
           echo "$result"
           [[ "$result" -eq "301" ]]
 

.github/workflows/docker.yml

@@ -9,44 +9,66 @@ name: Docker images
 on:
   push:
     branches:
-      - main
-      - 'dspace-**'
+      - main-cris
+      - 'dspace-cris-*_02_x'
     tags:
-      - 'dspace-**'
+      - 'dspace-cris-**'
   pull_request:
 
 permissions:
   contents: read  # to fetch code (actions/checkout)
   packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:
+
+  ####################################################
+  # Build/Push the '4science/dspace-cris-dependencies' image.
+  # This image is used by all other DSpace build jobs.
+  ####################################################
+  dspace-cris-angular-dependencies:
+    # Ensure this job never runs on forked repos. It's only executed for '4science/dspace'
+    if: github.repository == '4science/dspace-angular'
+    # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
+    uses: 4science/DSpace/.github/workflows/reusable-docker-build.yml@dspace-cris-2024_02_x
+    with:
+      build_id: dspace-cris-angular-dependencies
+      image_name: 4science/dspace-cris-angular-dependencies
+      dockerfile_path: ./Dockerfile.dependencies
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+
   #############################################################
-  # Build/Push the 'dspace/dspace-angular' image
+  # Build/Push the '4science/dspace-cris-angular' image
   #############################################################
   dspace-angular:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
-    if: github.repository == 'dspace/dspace-angular'
+    if: github.repository == '4science/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
-    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    uses: 4science/DSpace/.github/workflows/reusable-docker-build.yml@dspace-cris-2024_02_x
+    needs: dspace-cris-angular-dependencies
     with:
-      build_id: dspace-angular-dev
-      image_name: dspace/dspace-angular
+      build_id: dspace-cris-angular-dev
+      image_name: 4science/dspace-cris-angular
       dockerfile_path: ./Dockerfile
     secrets:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
   #############################################################
-  # Build/Push the 'dspace/dspace-angular' image ('-dist' tag)
+  # Build/Push the '4science/dspace-cris-angular' image ('-dist' tag)
   #############################################################
   dspace-angular-dist:
     # Ensure this job never runs on forked repos. It's only executed for 'dspace/dspace-angular'
-    if: github.repository == 'dspace/dspace-angular'
+    if: github.repository == '4science/dspace-angular'
     # Use the reusable-docker-build.yml script from DSpace/DSpace repo to build our Docker image
-    uses: DSpace/DSpace/.github/workflows/reusable-docker-build.yml@main
+    uses: 4science/DSpace/.github/workflows/reusable-docker-build.yml@dspace-cris-2024_02_x
+    # Must run after 'dspace-dependencies' job above
+    needs: dspace-cris-angular-dependencies
     with:
-      build_id: dspace-angular-dist
-      image_name: dspace/dspace-angular
+      build_id: dspace-cris-angular-dist
+      image_name: 4science/dspace-cris-angular
       dockerfile_path: ./Dockerfile.dist
       # As this is a "dist" image, its tags are all suffixed with "-dist". Otherwise, it uses the same
       # tagging logic as the primary 'dspace/dspace-angular' image above.

Dockerfile

@@ -2,10 +2,10 @@
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
 ARG NODE_VERSION=22
-ARG DSPACE_VERSION=2024_02_x
+ARG DSPACE_VERSION=dspace-cris-2024_02_x
 ARG DOCKER_REGISTRY=docker.io
 
-FROM ${DOCKER_REGISTRY:-docker.io}/4science/dspace-cris-angular-dependencies:${DSPACE_VERSION:-2024_02_x} AS dev
+FROM ${DOCKER_REGISTRY:-docker.io}/4science/dspace-cris-angular-dependencies:${DSPACE_VERSION:-dspace-cris-2024_02_x} AS dev
 
 WORKDIR /app
 ADD . /app/

Dockerfile.dependencies

@@ -1,12 +1,12 @@
 # Test build:
-# docker build -f Dockerfile.dependencies -t 4science/dspace-angular-dependencies:2024_02_x .
+# docker build -f Dockerfile.dependencies -t 4science/dspace-cris-angular-dependencies:dspace-cris-2024_02_x .
 
 # Angular 17 + Node 22 optimized Dockerfile
 ARG NODE_VERSION=22
-ARG DSPACE_VERSION=2024_02_X
+ARG DSPACE_VERSION=dspace-cris-2024_02_x
 ARG DOCKER_REGISTRY=docker.io
 
-FROM ${DOCKER_REGISTRY:-docker.io}/node:${NODE_VERSION-22}-alpine AS dependencies
+FROM docker.io/node:${NODE_VERSION-22}-alpine AS dependencies
 
 # Install build dependencies
 RUN apk add --no-cache python3 make g++
@@ -15,4 +15,4 @@ WORKDIR /app
 
 # Install dependencies (use npm ci if you have package-lock.json)
 COPY package.json yarn.lock ./
-RUN yarn install --network-timeout 300000
+RUN yarn install --frozen-lockfile --network-timeout 300000

Dockerfile.dist

@@ -1,27 +1,28 @@
 # syntax=docker/dockerfile:1.7-labs
 
 # This image will be published as dspace/dspace-angular:$DSPACE_VERSION-dist
-# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
+# See https://github.com/4science/dspace-angular/tree/main/docker for usage details
 
 # Test build:
-# docker build -f Dockerfile.dist -t dspace/dspace-angular:dspace-8_x-dist .
+# docker build -f Dockerfile.dist -t 4science/dspace-angular:dspace-cris-2024_02_x-dist .
 
 # Angular 17 + Node 22 optimized Dockerfile
 ARG NODE_VERSION=22
-ARG DSPACE_VERSION=2024_02_x
+ARG DSPACE_VERSION=dspace-cris-2024_02_x
 ARG DOCKER_REGISTRY=docker.io
 
-FROM ${DOCKER_REGISTRY:-docker.io}/4science/dspace-cris-angular-dependencies:${DSPACE_VERSION:-2024_02_x} AS build
+FROM ${DOCKER_REGISTRY:-docker.io}/4science/dspace-cris-angular-dependencies:${DSPACE_VERSION:-dspace-cris-2024_02_x} AS build
 
-COPY --parents src/** config/** webpack/** docker/dspace-ui.json angular.json server.ts startup-message.ts tsconfig.json tsconfig.app.json tsconfig.server.json tsconfig.spec.json tsconfig.ts-node.json typedoc.json /app/
+COPY . /app/
 
 WORKDIR /app
 
 # Build Angular app
 RUN yarn build:prod
+RUN yarn build:mirador
 
 # ---- Production image ----
-FROM ${DOCKER_REGISTRY:-docker.io}/node:${NODE_VERSION-22}-alpine AS prod
+FROM docker.io/node:${NODE_VERSION-22}-alpine AS prod
 
 # Install pm2 globally and clean npm cache
 RUN npm install --global pm2 && npm cache clean --force