Skip to content

Commit 864c3c3

Browse files
VolkerHartmannVolkerHartmann
committed
Merge branch 'development' into docker4metastore
2 parents 25fc20d + b18eb68 commit 864c3c3

19 files changed

+2258
-300
lines changed

‎definitions/base-repo/models/acl_entry.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
{
22
"type": "object",
33
"headerTemplate": "{{self.sid}}",
4+
"format": "grid-strict",
45
"properties": {
56
"id": {
67
"type": "integer",
7-
"readOnly":true
8+
"readOnly": true,
9+
"options": {
10+
"hidden": true
11+
}
812
},
913
"permission": {
1014
"type": "string",
1115
"propertyOrder":2,
12-
"enum": ["NONE", "READ", "WRITE", "ADMINISTRATE"]
16+
"enum": ["NONE", "READ", "WRITE", "ADMINISTRATE"],
17+
"options": {
18+
"grid_columns": 6,
19+
"infoText": "The access control permission."
20+
}
1321
},
1422
"sid": {
1523
"type": "string",
@@ -20,7 +28,9 @@
2028
"search": "search_keycloak",
2129
"getResultValue": "getResultValue_keycloak",
2230
"renderResult": "renderResult_keycloak"
23-
}
31+
},
32+
"grid_columns": 6,
33+
"infoText": "The subject identifier, e.g., a user id or email."
2434
}
2535
}
2636
},

‎definitions/base-repo/models/agent.json

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,39 @@
1010
"properties": {
1111
"id": {
1212
"type": "integer",
13-
"title": "Id",
14-
"propertyOrder": 1
13+
"options": {
14+
"hidden": true
15+
}
1516
},
1617
"givenName": {
1718
"type": "string",
18-
"propertyOrder": 2,
19+
"title": "First Name",
20+
"propertyOrder": 3,
1921
"options": {
20-
"grid_columns": 6
22+
"grid_columns": 6,
23+
"infoText": "The given name of the person."
2124
}
2225
},
2326
"familyName": {
2427
"type": "string",
25-
"propertyOrder": 3,
28+
"title": "Family Name",
29+
"propertyOrder": 2,
2630
"options": {
27-
"grid_columns": 6
31+
"grid_columns": 6,
32+
"infoText": "The family name of the person."
2833
}
2934
},
3035
"affiliations": {
3136
"type": "array",
3237
"title": "Affiliations",
3338
"propertyOrder": 4,
3439
"options": {
35-
"grid_columns": 12
40+
"collapsed": true,
41+
"grid_columns": 12,
42+
"infoText": "One or more affiliations of the person."
3643
},
3744
"items": {
38-
"headerTemplate": "Affiliation #{{ i1 }}",
45+
"headerTemplate": "Affiliation #{{ i1 }} {{#if self }} ({{ self }}) {{else}} (None) {{/if}}",
3946
"type": "string"
4047
}
4148
}

‎definitions/base-repo/models/alternate_identifier.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"type": "object",
3+
"headerTemplate": "{{self.identifierType}}",
4+
"format": "grid-strict",
5+
"properties": {
6+
"id": {
7+
"type": "integer",
8+
"readOnly": true,
9+
"options": {
10+
"hidden": true
11+
}
12+
},
13+
"identifierType": {
14+
"propertyOrder": 2,
15+
"type": "string",
16+
"title": "Identifier Type",
17+
"enum": [
18+
"ARK",
19+
"AR_XIV",
20+
"BIBCODE",
21+
"DOI",
22+
"EAN_13",
23+
"EISSN",
24+
"HANDLE",
25+
"IGSN",
26+
"ISBN",
27+
"ISSN",
28+
"ISTC",
29+
"LISSN",
30+
"LSID",
31+
"PMID",
32+
"PURL",
33+
"UPC",
34+
"URL",
35+
"URN",
36+
"W_3_ID",
37+
"INTERNAL",
38+
"OTHER"
39+
],
40+
"default": "DOI",
41+
"options": {
42+
"grid_columns": 4,
43+
"infoText": "The type of the alternate identifier."
44+
}
45+
},
46+
"value": {
47+
"type": "string",
48+
"propertyOrder": 3,
49+
"title": "Identifier",
50+
"options": {
51+
"grid_columns": 8,
52+
"infoText": "The alternate identifier value."
53+
}
54+
}
55+
},
56+
"required": [
57+
"identifierType",
58+
"value"
59+
]
60+
}

‎definitions/base-repo/models/contributor.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"type": "object",
3+
"format": "grid-strict",
4+
"properties": {
5+
"id": {
6+
"type": "integer",
7+
"propertyOrder": 1,
8+
"readOnly": true,
9+
"options": {
10+
"hidden": true
11+
}
12+
},
13+
"contributionType": {
14+
"type": "string",
15+
"title":"Contribution Type",
16+
"propertyOrder": 2,
17+
"enum": ["CONTACT_PERSON", "DATA_COLLECTOR", "DATA_CURATOR", "DATA_MANAGER", "DISTRIBUTOR", "EDITOR", "HOSTING_INSTITUTION", "OTHER", "PRODUCER", "PROJECT_LEADER", "PROJECT_MANAGER", "PROJECT_MEMBER", "REGISTRATION_AGENCY", "REGISTRATION_AUTHORITY", "RELATED_PERSON", "RESEARCH_GROUP", "RIGHTS_HOLDER", "RESEARCHER", "SPONSOR", "SUPERVISOR", "WORK_PACKAGE_LEADER"],
18+
"options": {
19+
"grid_columns": 12,
20+
"disable_collapse": false,
21+
"disable_edit_json": true,
22+
"disable_properties": true,
23+
"compact": false,
24+
"infoText": "The type of the contribution."
25+
}
26+
},
27+
"user": {
28+
"title": "Contributor",
29+
"propertyOrder": 3,
30+
"$ref": "agent.json",
31+
"required": ["givenName", "familyName"],
32+
"options": {
33+
"grid_columns": 12,
34+
"disable_collapse": true,
35+
"disable_edit_json": true,
36+
"disable_properties": true,
37+
"compact": true
38+
}
39+
}
40+
},
41+
"required": ["contributionType", "user"]
42+
}

‎definitions/base-repo/models/date.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"type": "object",
3+
"format": "grid-strict",
4+
"properties": {
5+
"id": {
6+
"type": "integer",
7+
"readOnly": true,
8+
"options": {
9+
"hidden": true
10+
}
11+
},
12+
"type": {
13+
"type": "string",
14+
"enum": ["ACCEPTED", "AVAILABLE", "COLLECTED", "COPYRIGHTED", "CREATED", "ISSUED", "SUBMITTED", "UPDATED", "VALID", "REVOKED"],
15+
"options": {
16+
"grid_columns": 6,
17+
"infoText": "The date type."
18+
19+
}
20+
},
21+
"value": {
22+
"type": "string",
23+
"pattern": "\\d{4}-[01]\\d-[0-3]\\dT[0-2]\\d:[0-5]\\d:[0-5]\\d([+-][0-2]\\d:[0-5]\\d|Z)",
24+
"options": {
25+
"grid_columns": 6,
26+
"infoText": "The date value."
27+
}
28+
}
29+
}
30+
}

‎definitions/base-repo/models/description.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,36 @@
66
"type": "integer",
77
"propertyOrder": 1,
88
"options":{
9-
"grid_columns":2,
109
"hidden": true
1110
}
1211
},
1312
"description": {
1413
"type": "string",
14+
"title": "Description",
1515
"propertyOrder": 4,
1616
"maxLength": 10240,
1717
"options":{
1818
"grid_columns":12,
19-
"infoText": "Your full name"
19+
"infoText": "The description text."
2020
}
2121
},
2222
"lang": {
2323
"$ref": "language.json",
24+
"title": "Language",
2425
"propertyOrder": 3,
2526
"options":{
26-
"grid_columns":5
27+
"grid_columns": 6,
28+
"infoText": "The description language."
2729
}
2830
},
2931
"type": {
3032
"type": "string",
33+
"title": "Description Type",
3134
"propertyOrder": 2,
3235
"enum": ["ABSTRACT", "METHODS", "SERIES_INFORMATION", "TABLE_OF_CONTENTS", "TECHNICAL_INFO", "OTHER"],
3336
"options":{
34-
"grid_columns":5
37+
"grid_columns": 6,
38+
"infoText": "The type of the description."
3539
}
3640
}
3741
},

‎definitions/base-repo/models/funding_reference.json

Lines changed: 66 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,89 @@
11
{
22
"type": "object",
3+
"format": "grid-strict",
34
"properties": {
4-
"awardNumber": {
5-
"$ref": "scheme.json"
6-
},
7-
"awardTitle": {
8-
"type": "string"
5+
"id": {
6+
"type": "integer",
7+
"options": {
8+
"hidden": true
9+
}
910
},
10-
"awardUri": {
11-
"type": "string"
11+
"funderName": {
12+
"title": "Funder Name",
13+
"propertyOrder": 1,
14+
"type": "string",
15+
"options": {
16+
"grid_columns": 12,
17+
"infoText": "The funder name."
18+
}
1219
},
1320
"funderIdentifier": {
1421
"type": "object",
22+
"format": "grid-strict",
23+
"propertyOrder": 2,
24+
"title": "Funder Identifier",
1525
"properties": {
1626
"id": {
17-
"type": "integer"
27+
"type": "integer",
28+
"options": {
29+
"hidden": true
30+
}
1831
},
1932
"identifierType": {
20-
"$ref": "#/$defs/IDENTIFIER_TYPE"
33+
"type": "string",
34+
"title": "Identifier Type",
35+
"enum": ["ARK", "AR_XIV", "BIBCODE", "DOI", "EAN_13", "EISSN", "HANDLE", "IGSN", "ISBN", "ISSN", "ISTC", "LISSN", "LSID", "PMID", "PURL", "UPC", "URL", "URN", "W_3_ID", "INTERNAL", "OTHER"],
36+
"default": "DOI",
37+
"options": {
38+
"grid_columns": 6,
39+
"infoText": "The funder identifier type."
40+
}
2141
},
2242
"type": {
2343
"type": "string",
24-
"enum": ["ISNI", "GRID", "CROSSREF_FUNDER_ID", "OTHER"]
44+
"title": "Identifier Issuer",
45+
"enum": ["ISNI", "GRID", "CROSSREF_FUNDER_ID", "OTHER"],
46+
"options": {
47+
"grid_columns": 6,
48+
"infoText": "The funder identifier issuer."
49+
}
2550
},
2651
"value": {
27-
"type": "string"
52+
"type": "string",
53+
"title": "Value",
54+
"options": {
55+
"grid_columns": 12,
56+
"infoText": "The funder identifier value."
57+
}
2858
}
59+
},
60+
"options": {
61+
"collapsed": true
2962
}
3063
},
31-
"funderName": {
32-
"type": "string"
64+
"awardTitle": {
65+
"type": "string",
66+
"propertyOrder": 3,
67+
"title": "Award Title",
68+
"options": {
69+
"grid_columns": 6
70+
}
3371
},
34-
"id": {
35-
"type": "integer"
72+
"awardUri": {
73+
"type": "string",
74+
"propertyOrder": 4,
75+
"title": "Award URI",
76+
"options": {
77+
"grid_columns": 6
78+
}
79+
},
80+
"awardNumber": {
81+
"propertyOrder": 5,
82+
"title": "Award Number",
83+
"$ref": "scheme.json",
84+
"options": {
85+
"collapsed": true
86+
}
3687
}
3788
}
3889
}

0 commit comments

Comments
 (0)