dataquest -> lindat sync

.eslintrc.json

@@ -231,10 +231,13 @@
         "*.json5"
       ],
       "extends": [
-        "plugin:jsonc/recommended-with-jsonc"
+        "plugin:jsonc/recommended-with-json5"
       ],
       "rules": {
-        "no-irregular-whitespace": "error",
+        // The ESLint core no-irregular-whitespace rule doesn't work well in JSON
+        // See: https://ota-meshi.github.io/eslint-plugin-jsonc/rules/no-irregular-whitespace.html
+        "no-irregular-whitespace": "off",
+        "jsonc/no-irregular-whitespace": "error",
         "no-trailing-spaces": "error",
         "jsonc/comma-dangle": [
           "error",

.github/actions/import-db/action.yml

@@ -14,6 +14,10 @@ inputs:
     description: 'location of assetstore folder'
     required: false
     type: string
+  ADMIN_PASSWORD:
+    description: 'Admin password for DSpace'
+    required: true
+    type: string
 
 runs:
   using: "composite"
@@ -42,6 +46,8 @@ runs:
         DB5NAME: dspace-import-db5
         DB7PORT: 543${{ inputs.INSTANCE }}
         BEURL: http://dev-5.pc:8${{ inputs.INSTANCE }}/repository/server/api
+        BEUSERNAME: dspace.admin.dev@dataquest.sk
+        BEUSERPASSWORD: ${{ inputs.ADMIN_PASSWORD }}
       run: |
           docker stop $DB5NAME || true
           echo "====="
@@ -78,6 +84,8 @@ runs:
           args=(
             --resume=false
             --config=backend.endpoint=$BEURL
+            --config=backend.user=$BEUSERNAME
+            --config=backend.password=$BEUSERPASSWORD
             --config=db_dspace_7.port=$DB7PORT
             --config=db_dspace_5.port=$DB5PORT
             --config=db_utilities_5.port=$DB5PORT

.github/disabled-workflows/deploy.yml

@@ -44,6 +44,8 @@ jobs:
     env:
       INSTANCE: '5'
       ENVFILE: /opt/dspace-envs/.env.dspace.dev-5
+      ADMIN_PASSWORD: ${{ secrets.DSPACE_ADMIN_PASSWORD }}
+      USER_PASSWORD: ${{ secrets.DSPACE_USER_PASSWORD }}
     steps:
       - uses: actions/checkout@v4
 
@@ -73,6 +75,8 @@ jobs:
       # disable TSL checks = allowing to cooperate with https backend with invalid
       # certificate
       ENVFILE: /opt/dspace-envs/.env.dspace.imported.dev-5
+      ADMIN_PASSWORD: ${{ secrets.DSPACE_ADMIN_PASSWORD }}
+      USER_PASSWORD: ${{ secrets.DSPACE_USER_PASSWORD }}
     steps:
       - uses: actions/checkout@v4
 
@@ -95,9 +99,6 @@ jobs:
           ## !!!!! please remove this section if you do not want handle server !!!!!!!
           echo "====="
           echo "installing handle server"
-          docker exec dspace${INSTANCE} apt update
-          docker exec dspace${INSTANCE} apt install host -y
-          echo "installed host from apt"
           docker exec dspace${INSTANCE} /dspace/bin/make-handle-config
           echo "made handle config:"
           docker exec dspace${INSTANCE} cat /dspace/handle-server/config.dct
@@ -122,6 +123,7 @@ jobs:
           DATADIR: /opt/dspace-data/clarin-dspace/
           ASSETSTORE: /opt/dspace-data/clarin-dspace/assetstore/
           LOGDIR: /log/
+          ADMIN_PASSWORD: ${{ secrets.DSPACE_ADMIN_PASSWORD }}
 
       - name: dspace basic command
         run: |
@@ -150,44 +152,15 @@ jobs:
           docker exec $DNAME /bin/bash -c "cd /dspace/bin && ./dspace healthcheck -v"
 
   playwright-after-deploy8:
-    runs-on: dspace-test-1
     needs: deploy-8
-    timeout-minutes: 45
     if: '!inputs.IMPORT'
-    steps:
-      - name: Checkout Playwright tests
-        uses: actions/checkout@v4
-        with:
-          repository: dataquest-dev/dspace-ui-tests
-          path: dspace-ui-tests
-          token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
-
-      - name: Checkout main repository
-        uses: actions/checkout@v4
-        with:
-          path: this-repository
-
-      - name: Copy customer config to UI tests repository for merging
-        run: |
-          cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/
-
-      - name: test
-        working-directory: dspace-ui-tests/scripts
-        env:
-          HOME_URL: https://dev-5.pc:8443/repository/
-          NAME: LINDAT
-        run: |
-          ./test.sh
-
-      - uses: mazoea/ga-maz/end@master
-        with:
-          CHOWN_DIR: ./
-        if: ${{ always() }}
+    uses: ./.github/workflows/playwright-tests.yml
+    secrets: inherit
 
   rest-tests-after-deploy8:
     runs-on: ubuntu-latest
     needs: playwright-after-deploy8
-    timeout-minutes: 45
+    timeout-minutes: 120
     steps:
       - name: run rest-tests
         run: |
@@ -219,44 +192,15 @@ jobs:
 
 
   playwright-after-import8:
-    runs-on: dspace-test-1
     needs: import-8
     if: inputs.IMPORT
-    timeout-minutes: 45
-    steps:
-      - name: Checkout Playwright tests
-        uses: actions/checkout@v4
-        with:
-          repository: dataquest-dev/dspace-ui-tests
-          path: dspace-ui-tests
-          token: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
-
-      - name: Checkout main repository
-        uses: actions/checkout@v4
-        with:
-          path: this-repository
-
-      - name: Copy customer config to UI tests repository for merging
-        run: |
-          cp this-repository/config/config.lindat.ui.tests.json dspace-ui-tests/customer-constants/
-
-      - name: test
-        working-directory: dspace-ui-tests/scripts
-        env:
-          HOME_URL: https://dev-5.pc:8443/repository/
-          NAME: LINDAT
-        run: |
-          ./test.sh
-
-      - uses: mazoea/ga-maz/end@master
-        with:
-          CHOWN_DIR: ./
-        if: ${{ always() }}
+    uses: ./.github/workflows/playwright-tests.yml
+    secrets: inherit
 
   rest-tests-after-import8:
     runs-on: ubuntu-latest
     needs: playwright-after-import8
-    timeout-minutes: 45
+    timeout-minutes: 120
     steps:
       - name: run rest-tests
         run: |

.github/pull_request_template.md

@@ -1,15 +1,16 @@
-| Phases            | MP | MM  |  MB  | MR |   JM | Total  |
-|-----------------|----:|----:|----:|-----:|-----:|-------:|
-| ETA                  |  0  |  0  |    0 |     0 |      0 |        0 |
-| Developing      |  0  |  0  |    0 |    0 |      0 |         0 |
-| Review             |  0  |  0  |    0 |    0 |      0 |         0 |
-| Total                |   -  |   -  |   -   |  -    |   -    |         0 |
-| ETA est.             |      |      |       |       |         |         0 |
-| ETA cust.           |   -  |   -  |   -  |   -   |   -     |        0 |
 ## Problem description
-### Reported issues
-### Not-reported issues
+
 ## Analysis
 (Write here, if there is needed describe some specific problem. Erase it, when it is not needed.)
 ## Problems
 (Write here, if some unexpected problems occur during solving issues. Erase it, when it is not needed.) 
+
+### Sync verification
+If en.json5 or cs.json5 translation files were updated:
+- [ ] Run `yarn run sync-i18n -t src/assets/i18n/cs.json5 -i` to synchronize messages, and changes are included in this PR.
+
+### Manual Testing (if applicable)
+- [ ] Added to [testing scenarios](https://github.com/dataquest-dev/dspace-customers/issues/55)
+
+### Copilot review
+- [ ] Requested review from Copilot

.github/workflows/build.yml

@@ -15,7 +15,8 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -39,17 +40,22 @@ jobs:
       DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0
       # Tell Cypress to run e2e tests using the same UI URL
       CYPRESS_BASE_URL: http://127.0.0.1:4000
+      # Disable the cookie consent banner in e2e tests to avoid errors because of elements hidden by it
+      DSPACE_INFO_ENABLECOOKIECONSENTPOPUP: false
       # When Chrome version is specified, we pin to a specific version of Chrome
       # Comment this out to use the latest release
       #CHROME_VERSION: "90.0.4430.212-1"
       # Bump Node heap size (OOM in CI after upgrading to Angular 15)
       NODE_OPTIONS: '--max-old-space-size=4096'
-      # Project name to use when running docker compose prior to e2e tests
+      # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
+      # Docker Registry to use for Docker compose scripts below.
+      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
+      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
       # Do NOT exit immediately if one matrix job fails
       fail-fast: false
     # These are the actual CI steps to perform per job
@@ -119,7 +125,15 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
-      # Using docker compose start backend using CI configuration
+      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
         run: |
@@ -183,21 +197,124 @@ jobs:
       # Get homepage and verify that the <meta name="title"> tag includes "DSpace".
       # If it does, then SSR is working, as this tag is created by our MetadataService.
       # This step also prints entire HTML of homepage for easier debugging if grep fails.
-      - name: Verify SSR (server-side rendering)
+      - name: Verify SSR (server-side rendering) on Homepage
         run: |
           result=$(wget -O- -q http://127.0.0.1:4000/home)
           echo "$result"
           echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep Home
 
+      # Get a specific community in our test data and verify that the "<h1>" tag includes "Publications" (the community name).
+      # 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)
+          echo "$result"
+          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Publications
+
+      # Get a specific collection in our test data and verify that the "<h1>" tag includes "Articles" (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)
+          echo "$result"
+          echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Articles
+
+      # 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)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "An Economic Model of Mortality Salience"
+
+      # 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)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Simmons, Cameron"
+
+      # 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)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "University Research Fellowship"
+
+      # 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)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Law and Development"
+
+      # 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)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology"
+
+      # 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
+        run: |
+          result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538)
+          echo "$result"
+          echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Volume 28 (2017)"
+
+      # 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}')
+          echo "$result"
+          [[ "$result" -eq "301" ]]
+
+      # Verify 403 error code behavior
+      - name: Verify 403 error code from '/403'
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/403 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          [[ "$result" -eq "403" ]]
+
+      # Verify 404 error code behavior
+      - name: Verify 404 error code from '/404' and on invalid pages
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/404 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          result2=$(wget --server-response --quiet http://127.0.0.1:4000/invalidurl 2>&1 | head -1 | awk '{print $2}')
+          echo "$result2"
+          [[ "$result" -eq "404" && "$result2" -eq "404" ]]
+
+      # Verify 500 error code behavior
+      - name: Verify 500 error code from '/500'
+        run: |
+          result=$(wget --server-response --quiet http://127.0.0.1:4000/500 2>&1 | head -1 | awk '{print $2}')
+          echo "$result"
+          [[ "$result" -eq "500" ]]
+
       - name: Stop running app
         run: kill -9 $(lsof -t -i:4000)
 
       - name: Shutdown Docker containers
         run: docker compose -f ./docker/docker-compose-ci.yml down
 
-  # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
-  # job above. This is necessary because Codecov uploads seem to randomly fail at times.
-  # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
+#  # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
+#  # job above. This is necessary because Codecov uploads seem to randomly fail at times.
+#  # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
 #  codecov:
 #    # Must run after 'tests' job above
 #    needs: tests

.github/workflows/codescan.yml

@@ -35,7 +35,7 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       # https://github.com/github/codeql-action