Skip to content

Commit cf41d60

Browse files
Merge pull request #1879 from ral-facilities/release/v3.0.0
Release v3.0.0
2 parents 5309f80 + de01574 commit cf41d60

File tree

499 files changed

+35151
-23511
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

499 files changed

+35151
-23511
lines changed

.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
/.github
2+
/.git
23
/.husky
34
/packages/datagateway-*/cypress
45
/packages/datagateway-*/cypress.json
56
/packages/datagateway-*/server
67
/packages/datagateway-*/README.md
78
**/build
9+
**/dist
810
**/coverage
911
**/lib
1012
**/node_modules
@@ -14,7 +16,11 @@ codecov.yml
1416
CODEOWNERS
1517
LICENSE.md
1618
README.md
19+
CHANGELOG*
20+
CONTRIBUTING.md
1721
Dockerfile
1822
**/*.test.*
1923
**/setupTests*
2024
**/testData*
25+
**/public/*settings*.json
26+
!**/public/*settings.example.json

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module.exports = {
22
parser: '@typescript-eslint/parser',
33
env: {
44
browser: true,
5-
jest: true,
65
es6: true,
76
node: true,
87
},
@@ -34,6 +33,7 @@ module.exports = {
3433
},
3534
],
3635
'import/no-extraneous-dependencies': 'error',
36+
'react/react-in-jsx-scope': 'off',
3737
},
3838
overrides: [
3939
{

.github/add_doi_datapublicationtype.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,19 @@
66
)
77
client.login("simple", {"username": "root", "password": "pw"})
88

9-
data_publication_type = client.new("dataPublicationType")
10-
data_publication_type.name = "User-defined"
11-
data_publication_type.description = "User-defined"
12-
data_publication_type.facility = client.get("Facility", 1)
13-
data_publication_type.create()
9+
data_publication_type_1 = client.new("dataPublicationType")
10+
data_publication_type_1.name = "User-defined"
11+
data_publication_type_1.description = "User-defined"
12+
data_publication_type_1.facility = client.get("Facility", 1)
13+
data_publication_type_1.create()
14+
15+
data_publication_type_2 = client.new("dataPublicationType")
16+
data_publication_type_2.name = "Investigation"
17+
data_publication_type_2.description = "Investigation"
18+
data_publication_type_2.facility = client.get("Facility", 1)
19+
data_publication_type_2.create()
20+
21+
# TODO: remove when this is fixed by API
22+
for funding_reference in client.search("SELECT fr FROM FundingReference fr JOIN fr.investigations AS fi JOIN fi.investigation AS i WHERE i.id = 15"):
23+
funding_reference.funderIdentifier = None
24+
funding_reference.update()

.github/config.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ ICAT_URL=https://host.docker.internal:8181
22
FACILITY=LILS
33
ICAT_USERNAME=root
44
ICAT_PASSWORD=pw
5-
PUBLISHER=test
5+
PUBLISHER_NAME=test
66
MINTER_ROLE=PI
77
VERSION=0.01
8+
INVESTIGATION_MINTER=root
89

910
ICAT_DOI_BASE_URL=https://example.stfc.ac.uk/
1011
ICAT_SESSION_PATH=/icat/session/
1112
ICAT_AUTHENTICATOR_NAME=simple
1213
ICAT_CHECK_CERT=False
13-
SSL_CERT_VERIFICATION=False
1414

1515
DATACITE_PREFIX=10.5286
1616
DATACITE_URL=https://api.test.datacite.org/dois

0 commit comments

Comments
 (0)