Merge pull request #1538 from ral-facilities/feature/dls-data-publications-#1532-#1533

DLS data publications views #1532 #1533

Author: louise-davies

.github/workflows/ci-build.yml

@@ -125,15 +125,42 @@ jobs:
           ansible-playbook icat-ansible/icat_test_hosts.yml -i icat-ansible/hosts --vault-password-file icat-ansible/vault_pass.txt -vv
 
       # Fixes on ICAT components needed for e2e tests
-      - name: Add anon user to rootUserNames
+      - name: Removing authenticator prefix for simple auth
         run: |
-          awk -F" =" '/rootUserNames/{$2="= simple/root anon/anon";print;next}1' /home/runner/install/icat.server/run.properties > /home/runner/install/icat.server/run.properties.tmp
+          sed -i 's/mechanism = simple/!mechanism = simple/' /home/runner/install/authn.simple/run.properties
+      - name: Adding Chris481 user
+        run: |
+          sed -i '/user\.list/ s/$/ Chris481/' /home/runner/install/authn.simple/run.properties
+      - name: Adding Chris481 user password
+        run: |
+          echo "user.Chris481.password = pw" >> /home/runner/install/authn.simple/run.properties
+      - name: Reinstall authn.simple
+        run: |
+          cd /home/runner/install/authn.simple/ && ./setup -vv install
+      - name: Add anon, root (simple without prefix) and Chris481 users to rootUserNames
+        run: |
+          awk -F" =" '/rootUserNames/{$2="= root Chris481 anon/anon";print;next}1' /home/runner/install/icat.server/run.properties > /home/runner/install/icat.server/run.properties.tmp
       - name: Apply rootUserNames change
         run: |
           mv -f /home/runner/install/icat.server/run.properties.tmp /home/runner/install/icat.server/run.properties
       - name: Reinstall ICAT Server
         run: |
           cd /home/runner/install/icat.server/ && ./setup -vv install
+      - name: Add root (simple without prefix) to datagateway-download-api adminUserNames
+        run: |
+          awk -F" =" '/adminUserNames/{$2="= root";print;next}1' /home/runner/install/datagateway-download-api/run.properties > /home/runner/install/datagateway-download-api/run.properties.tmp
+      - name: Apply adminUserNames change
+        run: |
+          mv -f /home/runner/install/datagateway-download-api/run.properties.tmp /home/runner/install/datagateway-download-api/run.properties
+      - name: Add root (simple without prefix) to datagateway-download-api queue.priority.user
+        run: |
+          awk -F" =" '/queue.priority.user/{sub(/}/,", \"root\": 1}");print;next}1' /home/runner/install/datagateway-download-api/run.properties > /home/runner/install/datagateway-download-api/run.properties.tmp
+      - name: Apply queue.priority.user change
+        run: |
+          mv -f /home/runner/install/datagateway-download-api/run.properties.tmp /home/runner/install/datagateway-download-api/run.properties
+      - name: Reinstall datagateway-download-api
+        run: |
+          cd /home/runner/install/datagateway-download-api/ && python ./setup -vv install
 
       - name: Checkout datagateway-api
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
@@ -163,6 +190,16 @@ jobs:
       - name: Start API
         run: cd datagateway-api/; nohup poetry run python -m datagateway_api.src.main > api-output.txt &
 
+      # DOI minter setup
+      - name: Adding 'User-defined' DataPublicationType (needed for DOI minting api)
+        run: cd datagateway-api/; poetry run python ../.github/add_doi_datapublicationtype.py
+
+      - name: 'Add password to env file'
+        run: echo DATACITE_PASSWORD=${{ secrets.DATACITE_PASSWORD }} >> ./.github/config.env
+
+      - name: Run minting api
+        run: docker run --env-file ./.github/config.env -p 8000:8000 --add-host host.docker.internal:host-gateway -d harbor.stfc.ac.uk/icat/doi-mint-api
+
       # E2E tests
       - name: Setup Node.js
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0

Dockerfile

@@ -68,6 +68,8 @@ ENV API_URL="/datagateway-api"
 ENV DOWNLOAD_API_URL="http://localhost/topcat"
 ENV ICAT_URL="http://localhost/icat"
 ENV IDS_URL="http://localhost/ids"
+ENV DOI_MINTER_URL="http://localhost/doi-minter"
+ENV DATACITE_URL="https://api.test.datacite.org"
 
 COPY docker/docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]

docker/docker-entrypoint.sh

@@ -8,6 +8,8 @@ sed -e "s|\"facilityName\": \".*\"|\"facilityName\": \"$FACILITY_NAME\"|" \
     -e "s|\"idsUrl\": \".*\"|\"idsUrl\": \"$IDS_URL\"|" \
     -e "s|\"apiUrl\": \".*\"|\"apiUrl\": \"$API_URL\"|" \
     -e "s|\"downloadApiUrl\": \".*\"|\"downloadApiUrl\": \"$DOWNLOAD_API_URL\"|" \
+    -e "s|\"doiMinterUrl\": \".*\"|\"apiUrl\": \"$DOI_MINTER_URL\"|" \
+    -e "s|\"dataCiteUrl\": \".*\"|\"apiUrl\": \"$DATACITE_URL\"|" \
     -e "s|\"pluginHost\": \".*\"|\"pluginHost\": \"/datagateway-dataview\"|" \
     /usr/local/apache2/htdocs/datagateway-dataview/datagateway-dataview-settings.json > "$TEMPFILE"
 
@@ -18,6 +20,8 @@ sed -e "s|\"facilityName\": \".*\"|\"facilityName\": \"$FACILITY_NAME\"|" \
     -e "s|\"idsUrl\": \".*\"|\"idsUrl\": \"$IDS_URL\"|" \
     -e "s|\"apiUrl\": \".*\"|\"apiUrl\": \"$API_URL\"|" \
     -e "s|\"downloadApiUrl\": \".*\"|\"downloadApiUrl\": \"$DOWNLOAD_API_URL\"|" \
+    -e "s|\"doiMinterUrl\": \".*\"|\"apiUrl\": \"$DOI_MINTER_URL\"|" \
+    -e "s|\"dataCiteUrl\": \".*\"|\"apiUrl\": \"$DATACITE_URL\"|" \
     -e "s|\"pluginHost\": \".*\"|\"pluginHost\": \"/datagateway-download\"|" \
     /usr/local/apache2/htdocs/datagateway-download/datagateway-download-settings.json > "$TEMPFILE"
 

packages/datagateway-common/__mocks__/axios.ts

@@ -2,6 +2,7 @@ import axios from 'axios';
 
 const requests = {
   get: vi.fn(() => Promise.resolve({ data: {} })),
+  put: vi.fn(() => Promise.resolve({ data: {} })),
   post: vi.fn(() => Promise.resolve({ data: {} })),
   delete: vi.fn(() => Promise.resolve({ data: {} })),
   CancelToken: axios.CancelToken,

…ts__/dialogTitle.component.test.tsx.snap …ts__/dialogTitle.component.test.tsx.snappackages/datagateway-common/src/downloadConfirmation/__snapshots__/dialogTitle.component.test.tsx.snap renamed to packages/datagateway-common/src/__snapshots__/dialogTitle.component.test.tsx.snap packages/datagateway-common/src/downloadConfirmation/__snapshots__/dialogTitle.component.test.tsx.snap renamed to packages/datagateway-common/src/__snapshots__/dialogTitle.component.test.tsx.snap

@@ -12,7 +12,7 @@ exports[`DialogTitle > should render correctly 1`] = `
       Title
     </p>
     <button
-      aria-label="downloadConfirmDialog.close_arialabel"
+      aria-label="close_aria_label"
       class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeLarge css-1f5482o-MuiButtonBase-root-MuiIconButton-root"
       tabindex="0"
       type="button"