syncing dataquest-dev/dtq-dev

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

@@ -18,6 +18,11 @@ inputs:
     description: 'Admin password for DSpace'
     required: true
     type: string
+  LOGDIR:
+    description: 'Directory for log files'
+    required: false
+    type: string
+    default: ''
 
 runs:
   using: "composite"

.github/disabled-workflows/deploy.yml

@@ -202,35 +202,25 @@ jobs:
   rest-tests-after-deploy8:
     runs-on: ubuntu-latest
     needs: playwright-after-deploy8
+    if: '!inputs.IMPORT'
     timeout-minutes: 120
+    env:
+      GH_TOKEN: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
+      REPO: dataquest-dev/dspace-rest-test
+      WORKFLOW: run_unittests.yml
     steps:
       - name: run rest-tests
         run: |
-          curl -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \
-          --request POST \
-          https://api.github.com/repos/dataquest-dev/\
-          dspace-rest-test/actions/workflows/run_unittests.yml/dispatches \
-          --data "{\"ref\":\"refs/heads/master\"}" 2> /dev/null
-
-          # wait for it to start
-          sleep 30s
-
-          # get result of last job
-          RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
+          OUTPUT=$(gh workflow run "$WORKFLOW" \
+            --repo "$REPO" \
+            --ref master \
+            -f CUSTOMER="${{ github.ref_name }}" \
+            -f URL="http://dev-5.pc:88/repository/server/api" 2>&1)
 
-          # while job did not finish, sleep
-          while [[ $RES == 'null' ]]; do
-            sleep 10s
-            RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-          done;
+          RUN_ID=$(echo "$OUTPUT" | grep -oE '/runs/[0-9]+' | grep -oE '[0-9]+')
 
-          echo $RES
-          # if last result is not success, return -1 and fail
-          if [[ $RES != \"success\" ]]; then
-            echo "rest-tests have failed! check appropriate action run in the dspace-rest-test repository"
-            exit 1
-          fi;
+          echo "Watching run: https://github.com/$REPO/actions/runs/$RUN_ID"
+          gh run watch "$RUN_ID" --repo "$REPO" --interval 30 --exit-status
 
 
   playwright-after-import8:
@@ -243,31 +233,20 @@ jobs:
     runs-on: ubuntu-latest
     needs: playwright-after-import8
     timeout-minutes: 120
+    env:
+      GH_TOKEN: ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}
+      REPO: dataquest-dev/dspace-rest-test
+      WORKFLOW: run_unittests.yml
     steps:
       - name: run rest-tests
         run: |
-          curl -H "Accept: application/vnd.github.everest-preview+json" \
-          -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" \
-          --request POST \
-          https://api.github.com/repos/dataquest-dev/\
-          dspace-rest-test/actions/workflows/run_unittests.yml/dispatches \
-          --data "{\"ref\":\"refs/heads/master\"}" 2> /dev/null
-
-          # wait for it to start
-          sleep 30s
-
-          # get result of last job
-          RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-
-          # while job did not finish, sleep
-          while [[ $RES == 'null' ]]; do
-            sleep 10s
-            RES=$(curl -H "Accept: application/vnd.github.everest-preview+json" -H "Authorization: token ${{ secrets.DEPLOY_DEV5_GH_ACTION_DISPATCH }}" https://api.github.com/repos/dataquest-dev/dspace-rest-test/actions/workflows/run_unittests.yml/runs?per_page=1 2> /dev/null | jq .workflow_runs[0].conclusion)
-          done;
-
-          echo $RES
-          # if last result is not success, return -1 and fail
-          if [[ $RES != \"success\" ]]; then
-            echo "rest-tests have failed! check appropriate action run in the dspace-rest-test repository"
-            exit 1
-          fi;
+          OUTPUT=$(gh workflow run "$WORKFLOW" \
+            --repo "$REPO" \
+            --ref master \
+            -f CUSTOMER="${{ github.ref_name }}" \
+            -f URL="http://dev-5.pc:88/repository/server/api" 2>&1)
+
+          RUN_ID=$(echo "$OUTPUT" | grep -oE '/runs/[0-9]+' | grep -oE '[0-9]+')
+
+          echo "Watching run: https://github.com/$REPO/actions/runs/$RUN_ID"
+          gh run watch "$RUN_ID" --repo "$REPO" --interval 30 --exit-status

.github/workflows/build.yml

@@ -322,11 +322,11 @@ jobs:
 #    runs-on: ubuntu-latest
 #    steps:
 #      - name: Checkout
-#        uses: actions/checkout@v4
+#        uses: actions/checkout@v3
 #
 #      # Download artifacts from previous 'tests' job
 #      - name: Download coverage artifacts
-#        uses: actions/download-artifact@v4
+#        uses: actions/download-artifact@v3
 #
 #      # Now attempt upload to Codecov using its action.
 #      # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.

.github/workflows/new_issue_label.yml

@@ -0,0 +1,17 @@
+name: Auto Label New Issues
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  label-issue:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - name: Auto Label
+        uses: dataquest-dev/gh-actions/start@main
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/playwright-tests.yml

@@ -16,20 +16,12 @@ jobs:
           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
+          NAME: DEFAULT
+          PASSWORD_ADMIN: ${{ secrets.DSPACE_ADMIN_PASSWORD }}
         run: |
           ./test.sh
 

.github/workflows/trigger-ui-tests.yml

@@ -24,7 +24,7 @@ jobs:
 
           git fetch --prune origin
           BRANCHES=$(git ls-remote --heads origin | awk -F'/' '{print $3"/"$4}' | grep '^customer/')
-          SKIP_BRANCHES=("customer/uk" "customer/mendelu-v7" "customer/palo-docker" "customer/palo-docker-rebase" "customer/palo-docker-typo-fix")
+          SKIP_BRANCHES=("customer/jcu" "customer/uk" "customer/mendelu-v7" "customer/palo-docker" "customer/palo-docker-rebase" "customer/palo-docker-typo-fix")
 
           for branch in $(echo "$BRANCHES" | sed -e 's/[\[\]"]//g' -e 's/,/\n/g'); do
             if [[ " ${SKIP_BRANCHES[@]} " =~ " ${branch} " ]]; then

.gitignore

@@ -47,3 +47,16 @@ python_data_import/debug.log.txt
 python_data_import/logs.txt
 python_data_import/date.txt
 */__pycache__/
+
+# Local-only artifacts generated by scripts/dspace-deploy.bat (one-per-instance, never committed)
+/docker/.env.dspace-*
+/docker/.override.dspace-*.yml
+
+# Playwright MCP captures + investigation artifacts
+/.playwright-mcp/
+/PROGRESS.md
+/flicker-snapshots-*.json
+/perf-*.json
+/home-initial.png
+/overlay-state.png
+/verify-*.png

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "python_data_import/lib"]
 	path = python_data_import/lib
 	url = https://github.com/dataquest-dev/dspace-blackbox-testing.git
+[submodule ".dspace-skills"]
+	path = .dspace-skills
+	url = git@github.com:dataquest-dev/dspace-skills.git
+	branch = main

AGENTS.md

@@ -0,0 +1,16 @@
+
+<!-- dspace-skills:begin -->
+## Private team playbooks (dataquest)
+
+This repo vendors dataquest's private AI knowledge base as the `.dspace-skills/` git submodule. **If
+`.dspace-skills/` is present**, treat **`.dspace-skills/AGENTS.md`** as the authoritative agent guide for this repo:
+read it first, then load the matching profile (`.dspace-skills/profiles/frontend.md` for dspace-angular,
+`.dspace-skills/profiles/backend.md` for DSpace) and pull skills from `.dspace-skills/skills/` on demand. Start any
+PR/backport/test task from `.dspace-skills/SKILLS.md`.
+
+If `.dspace-skills/` is empty (you don't have access, e.g. an outside contributor), ignore this section
+and proceed with the public project conventions.
+
+To enable: `git submodule update --init .dspace-skills` (requires access to
+`dataquest-dev/dspace-skills`).
+<!-- dspace-skills:end -->

CLAUDE.md

@@ -0,0 +1,16 @@
+
+<!-- dspace-skills:begin -->
+## Private team playbooks (dataquest)
+
+This repo vendors dataquest's private AI knowledge base as the `.dspace-skills/` git submodule. **If
+`.dspace-skills/` is present**, treat **`.dspace-skills/AGENTS.md`** as the authoritative agent guide for this repo:
+read it first, then load the matching profile (`.dspace-skills/profiles/frontend.md` for dspace-angular,
+`.dspace-skills/profiles/backend.md` for DSpace) and pull skills from `.dspace-skills/skills/` on demand. Start any
+PR/backport/test task from `.dspace-skills/SKILLS.md`.
+
+If `.dspace-skills/` is empty (you don't have access, e.g. an outside contributor), ignore this section
+and proceed with the public project conventions.
+
+To enable: `git submodule update --init .dspace-skills` (requires access to
+`dataquest-dev/dspace-skills`).
+<!-- dspace-skills:end -->

angular.json

@@ -100,8 +100,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "3mb",
-                  "maximumError": "5mb"
+                  "maximumWarning": "5.5mb",
+                  "maximumError": "6mb"
                 },
                 {
                   "type": "anyComponentStyle",

cypress/e2e/submission-ui.cy.ts

@@ -283,6 +283,12 @@ describe('Create a new submission', () => {
     // DON'T upload any file - just check the license section is accessible
     createItemProcess.checkLicenseSelectionValue('Select a License ...');
 
+    // Allow frontend to propagate the initial section status (no file => valid)
+    // before asserting the header icon. Mirrors the pattern used in the
+    // sibling "license validation when file is uploaded" test above.
+    cy.wait(1000);
+    cy.get('div[id="section_clarin-license"]').find('.card-header').should('be.visible');
+
     // Verify warning and error icons do NOT exist
     cy.get('div[id="section_clarin-license"]')
       .find('.card-header')
@@ -294,9 +300,11 @@ describe('Create a new submission', () => {
       .find('.fa-exclamation-circle.text-danger')
       .should('not.exist');
 
+    // Green check must eventually appear (retry-ability with a longer timeout
+    // handles any remaining async settle of the section status observable).
     cy.get('div[id="section_clarin-license"]')
       .find('.card-header')
-      .find('.fa-check-circle.text-success')
+      .find('.fa-check-circle.text-success', { timeout: 15000 })
       .should('be.visible');
   });
 

docker/docker-compose-rest.yml

@@ -85,6 +85,7 @@ services:
     volumes:
     - dspace_logs:/dspace/log
     - assetstore:/dspace/assetstore
+    #- /opt/DATA/assetstore:/dspace/assetstore
     - handle_server:/dspace/handle-server
     - ./local.cfg:/dspace/config/local.cfg
     # Mount a tmpfs over the requests folder to protect it - associated with https://github.com/dataquest-dev/DSpace/pull/1095
@@ -174,7 +175,7 @@ services:
       cp -r /opt/solr/server/solr/configsets/search/* search
       precreate-core statistics /opt/solr/server/solr/configsets/statistics
       cp -r /opt/solr/server/solr/configsets/statistics/* statistics
-      exec solr -p 8983 -f -m 4g
+      exec solr -p 8983 -f -m "${SOLR_HEAP:-4g}"
 volumes:
   # Commented out because there are a lot of files in the assetstore
   assetstore: