Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DLS data publications views #1532 #1533 #1538

Open
wants to merge 33 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ea73f10
#1532 - add basic DLS landing page
louise-davies Jun 12, 2023
bfc5578
#1532 - add content table to DLS DOI landing page
louise-davies Jun 12, 2023
69d603a
#1533 - Add My DOIs view
louise-davies Jun 13, 2023
cf95162
#1532 - fix issues with content table and fix routing issues
louise-davies Jun 20, 2023
1c1a757
#1532 - improve DLS landing page UI
louise-davies Jun 22, 2023
bedce9a
#1532 - add tests for data publication api endpoints
louise-davies Jul 18, 2023
f89729c
#1532 - Fix circular dependency
louise-davies Jul 19, 2023
a8cddae
#1532 - add translations + unit tests for DLS DOI landing page
louise-davies Jul 20, 2023
629f81c
#1533 - add unit tests for my DOIs view
louise-davies Jul 21, 2023
5d24236
#1532 #1533 add e2e tests
louise-davies Jul 25, 2023
4a5c021
#1532 #1533 - fix e2e tests broken by different timezones
louise-davies Jul 26, 2023
d715a0d
#1533 - fix e2e date
louise-davies Jul 26, 2023
334a4af
Merge branch 'develop' into feature/dls-data-publications-#1532-#1533
louise-davies Jan 18, 2024
bc8f4fc
#1532 - add basic version table & have WIP edit form
louise-davies Jan 22, 2024
84c9498
#1532 #1533 - only show concept dois and fix editing form
louise-davies Feb 2, 2024
d7bc602
Merge branch 'develop' into feature/dls-data-publications-#1532-#1533
louise-davies Mar 1, 2024
2a3d453
#1532 - improve version panel & landing page
louise-davies Mar 12, 2024
ae3349d
#1532 - fix unit tests & tidy up some code
louise-davies Mar 14, 2024
729e0e3
Fix wrong import & refactor e2e test for my dois table #1533
louise-davies Mar 15, 2024
5cbd215
Fix missing import
louise-davies Mar 18, 2024
1f0a8ed
#1532 - fix unit tests & refactor DOI api error handling
louise-davies Mar 20, 2024
de0b29f
Refactor translation key to match what's in the JSON file
louise-davies Mar 21, 2024
490d6aa
#1532 - adjust concept/version DOI stuff
louise-davies Mar 20, 2024
98eaeb6
#1533 - update unit tests with landing page changes
louise-davies Mar 22, 2024
45ed831
#1532 - add unit tests for doi version editing
louise-davies Apr 10, 2024
92ebbd1
#1532 - allow users to edit data when generating a new version
louise-davies May 1, 2024
d729975
#1532 - add unit tests for data publication content editing
louise-davies May 3, 2024
f956415
#1532 - fix tests broken by useIsCartMintable moving to dg-common
louise-davies May 3, 2024
f29bbfd
#1532 - Fix broken ids in citation formatter
louise-davies May 3, 2024
67a04c3
#1532 - fix more tests broken by useIsCartMintable moving to dg-common
louise-davies May 3, 2024
f2cbfb3
#1532 - add e2e tests for DOI versioning
louise-davies May 3, 2024
7e361ce
#1532 - fix test broken by edit button label key change
louise-davies May 7, 2024
7a65d00
#1532 #1533 - invalidate queries after updating data pubs
louise-davies May 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,36 @@ 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: Reinstall datagateway-download-api
run: |
cd /home/runner/install/datagateway-download-api/ && python2 ./setup -vv install

- name: Checkout datagateway-api
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
Expand Down Expand Up @@ -166,6 +187,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@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading