diff --git a/pass-core-metadataschema-service/src/main/resources/schemas/jhu/global.json b/pass-core-metadataschema-service/src/main/resources/schemas/jhu/global.json
index ee52fbd0..3d2c8018 100644
--- a/pass-core-metadataschema-service/src/main/resources/schemas/jhu/global.json
+++ b/pass-core-metadataschema-service/src/main/resources/schemas/jhu/global.json
@@ -264,8 +264,16 @@
},
"publicationDate": {
"type": "date",
- "label": "Publication Date (optional)",
+ "label": "Publication Date ",
"hidden": false,
+ "helpersPosition": "above",
+ "validate": true,
+ "inputType": "date",
+ "fieldClass": "date-time-picker",
+ "picker": {
+ "format": "L",
+ "allowInputToggle": true
+ },
"order": 8
},
"abstract": {
@@ -308,12 +316,11 @@
"label": "Embargo End Date",
"helper": "After the embargo end date, your submission manuscripts or article can be made public. If this publication is not under embargo, please leave this field blank.",
"helpersPosition": "above",
- "placeholder": "dd/mm/yyyy",
"validate": true,
"inputType": "date",
"fieldClass": "date-time-picker",
"picker": {
- "format": "MM/DD/YY",
+ "format": "L",
"allowInputToggle": true
},
"order": 12,
diff --git a/pass-core-metadataschema-service/src/main/resources/schemas/jhu/jscholarship.json b/pass-core-metadataschema-service/src/main/resources/schemas/jhu/jscholarship.json
index 64cd158b..887106ad 100644
--- a/pass-core-metadataschema-service/src/main/resources/schemas/jhu/jscholarship.json
+++ b/pass-core-metadataschema-service/src/main/resources/schemas/jhu/jscholarship.json
@@ -13,7 +13,7 @@
"$ref": "global.json#/properties/authors"
}
},
- "required": ["authors"]
+ "required": ["authors", "publicationDate"]
},
"options": {
"$ref": "global.json#/options"
diff --git a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/common.json b/pass-core-metadataschema-service/src/test/resources/schemas/jhu/common.json
deleted file mode 100644
index 2c09ee78..00000000
--- a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/common.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "title": "JHU common schema",
- "description": "Enumerates the common properties required by most repositories",
- "$id": "https://eclipse-pass.github.io/pass-metadata-schemas/schemas/jhu/common.json",
- "$schema": "http://json-schema.org/draft-07/schema#",
- "type": "object",
- "definitions": {
- "form": {
- "type": "object",
- "title": "Publication Details
Please provide additional information about your article/manuscript below. If DOI was provided in the initial step of the submission, the metadata associated with that DOI was found and used to prepopulatethis form.
Fields that are not editable were populated using metadata associated with the provided DOI.
", - "$comment": "These properties are intended to be displayed in an Alpaca form", - "properties": { - "title": { - "$ref": "global.json#/properties/title" - }, - "journal-title": { - "$ref": "global.json#/properties/journal-title" - }, - "volume": { - "$ref": "global.json#/properties/volume" - }, - "issue": { - "$ref": "global.json#/properties/issue" - }, - "issns": { - "$ref": "global.json#/properties/issns" - }, - "publisher": { - "$ref": "global.json#/properties/publisher" - }, - "publicationDate": { - "$ref": "global.json#/properties/publicationDate" - }, - "abstract": { - "$ref": "global.json#/properties/abstract" - }, - "authors": { - "$ref": "global.json#/properties/authors" - }, - "under-embargo": { - "$ref": "global.json#/properties/under-embargo" - }, - "Embargo-end-date": { - "$ref": "global.json#/properties/Embargo-end-date" - } - }, - "dependencies": { - "Embargo-end-date": ["under-embargo"] - }, - "options": { - "$ref": "global.json#/options" - } - } - } -} diff --git a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/global.json b/pass-core-metadataschema-service/src/test/resources/schemas/jhu/global.json deleted file mode 100644 index ae1ba87f..00000000 --- a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/global.json +++ /dev/null @@ -1,298 +0,0 @@ -{ - "title": "JHU global schema", - "description": "Defines all possible metadata fields for PASS deposit", - "$id": "https://eclipse-pass.github.io/pass-metadata-schemas/schemas/jhu/global.json", - "$schema": "http://json-schema.org/draft-07/schema#", - "type": "object", - "required": [ - "$schema", - "title", - "journal-title" - ], - "additionalProperties": false, - "properties": { - "$schema": { - "type": "string", - "title": "JSON schema", - "description": "The JSON schema that applies to the resulting metadata blob" - }, - "agreements": { - "type": "object", - "title": "Agreements to deposit conditions", - "description": "Maps repository keys to the text or links containing the agreements accepted by the submitter", - "$comment": "This was formerly known as 'embargo', available only for JScholarship metadata", - "patternProperties": { - "^.+$": { - "type": "string", - "title": "Agreement", - "description": "Text or link agreed to for the given repository key", - "$comment": "Example: {'jScholarship': 'http://example.org/agreementText'}" - } - } - }, - "abstract": { - "type": "string", - "title": "Abstract", - "description": "The abstract of the article or manuscript being submitted" - }, - "agent_information": { - "type": "object", - "title": "User agent (browser) information", - "description": "Contains the identity and version of the user's browser", - "properties": { - "name": { - "type": "string", - "title": "User agent (browser) name" - }, - "version": { - "type": "string", - "title": "User agent (browser) version" - } - } - }, - "authors": { - "type": "array", - "title": "Authors of this article or manuscript", - "description": "List of authors and their associated ORCIDS, if available", - "uniqueItems": true, - "items": { - "type": "object", - "title": "Author", - "properties": { - "author": { - "type": "string" - }, - "orcid": { - "type": "string" - } - }, - "required": ["author"] - } - }, - "doi": { - "type": "string", - "pattern": "^10\\..+?/.+?$", - "title": "DOI of article", - "description": "The DOI of the individual article or manuscript submitted" - }, - "Embargo-end-date": { - "type": "string", - "format": "date", - "title": "Embargo end date", - "description": "Date at which the article or manuscript may be made public" - }, - "hints": { - "type": "object", - "title": "Hints provided by the UI to backend services", - "description": "Hints have semantics shared by the UI and the backend that are intended to influence the backend processing of the submission.", - "additionalProperties": false, - "properties": { - "collection-tags": { - "type": "array", - "uniqueItems": true, - "title": "Tags impacting the collection used by Deposit Services for deposit", - "items": { - "type": "string" - } - } - } - }, - "journal-NLMTA-ID": { - "type": "string", - "title": "NTMLA", - "description": "NLM identifier for a journal" - }, - "journal-title": { - "type": "string", - "title": "Journal title", - "description": "Title of the journal the individual article or manuscript was submitted to" - }, - "journal-title-short": { - "type": "string", - "title": "Short journal title", - "description": "Short journal title from CrossRef" - }, - "issue": { - "type": "string", - "title": "Journal issue", - "description": "Issue number of the journal this article or manuscript was submitted to" - }, - "issns": { - "type": "array", - "title": "ISSN information for the manuscript's journal", - "description": "List of ISSN numbers with optional publication type", - "uniqueItems": true, - "items": { - "type": "object", - "title": "ISSN info", - "properties": { - "issn": { - "type": "string", - "title": "ISSN " - }, - "pubType": { - "type": "string", - "title": "publication type", - "enum": ["Print", "Online"] - } - } - } - }, - "publisher": { - "type": "string", - "title": "Publisher", - "description": "Publisher of the journal this article or manuscript was submitted to" - }, - "publicationDate": { - "type": "string", - "title": "Publication Date", - "description": "Publication date of the journal or article this manuscript was submitted to", - "$comment": "This was formerly date-time format, but that appears too precise for values like 'Summer 2018'" - }, - "title": { - "type": "string", - "title": "Article / Manuscript Title", - "description": "The title of the individual article or manuscript that was submitted" - }, - "under-embargo": { - "type": "string", - "title": "Under Embargo", - "description": "Indicates wither the article or manuscript is under embargo", - "$comment": "This should probably be a boolean" - }, - "volume": { - "type": "string", - "title": "Journal Volume", - "description": "journal volume this article or manuscript was published in" - } - }, - "dependencies": { - "Embargo-end-date": ["under-embargo"] - }, - "options": { - "fields": { - "title": { - "type": "textarea", - "label": "Article / Manuscript Title (required)", - "placeholder": "Enter the manuscript title", - "rows": 2, - "cols": 100, - "hidden": false, - "order": 1 - }, - "journal-title": { - "type": "text", - "label": "Journal Title (required)", - "placeholder": "Enter the journal title", - "hidden": false, - "order": 2 - }, - "journal-NLMTA-ID": { - "type": "text", - "label": "Journal NLMTA ID (optional)", - "placeholder": "nlmta", - "order": 3 - }, - "volume": { - "type": "text", - "label": "Volume (optional)", - "placeholder": "Enter the volume", - "hidden": false, - "order": 4 - }, - "issue": { - "type": "text", - "label": "Issue (optional)", - "placeholder": "Enter issue", - "hidden": false, - "order": 5 - }, - "issns": { - "label": "Deposit requirements for JH's institutional repository JScholarship
", - "type": "object", - "properties": { - "authors": { - "$ref": "global.json#/properties/authors" - } - }, - "required": ["authors"] - }, - "options": { - "$ref": "global.json#/options" - } - }, - "allOf": [ - { - "$ref": "global.json#" - }, - { - "$ref": "#/definitions/form" - } - ] -} diff --git a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/jscholarship_deref.json b/pass-core-metadataschema-service/src/test/resources/schemas/jhu/jscholarship_deref.json index 7d69b6da..144f3ac6 100644 --- a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/jscholarship_deref.json +++ b/pass-core-metadataschema-service/src/test/resources/schemas/jhu/jscholarship_deref.json @@ -25,34 +25,42 @@ "type": "string" } }, - "required": ["author"] + "required": [ + "author" + ] } } }, - "required": ["authors"] + "required": [ + "authors", + "publicationDate" + ] }, "options": { "fields": { "title": { "type": "textarea", - "label": "Article / Manuscript Title (required)", + "label": "Article / Manuscript Title", "placeholder": "Enter the manuscript title", "rows": 2, "cols": 100, "hidden": false, + "readonly": true, "order": 1 }, "journal-title": { "type": "text", - "label": "Journal Title (required)", + "label": "Journal Title", "placeholder": "Enter the journal title", "hidden": false, + "readonly": true, "order": 2 }, "journal-NLMTA-ID": { "type": "text", - "label": "Journal NLMTA ID (optional)", + "label": "Journal NLMTA ID", "placeholder": "nlmta", + "readonly": true, "order": 3 }, "volume": { @@ -72,7 +80,38 @@ "issns": { "label": "Deposit requirements for JH's institutional repository JScholarship
", @@ -478,11 +574,16 @@ "type": "string" } }, - "required": ["author"] + "required": [ + "author" + ] } } }, - "required": ["authors"] + "required": [ + "authors", + "publicationDate" + ] } ] } diff --git a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/nihms.json b/pass-core-metadataschema-service/src/test/resources/schemas/jhu/nihms.json deleted file mode 100644 index 64ef1a6c..00000000 --- a/pass-core-metadataschema-service/src/test/resources/schemas/jhu/nihms.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "title": "NIHMS schema", - "description": "NIHMS-specific metadata requirements", - "$id": "https://eclipse-pass.github.io/pass-metadata-schemas/schemas/jhu/nihms.json", - "$schema": "http://json-schema.org/draft-07/schema#", - "type": "object", - "definitions": { - "form": { - "title": "NIH Manuscript Submission System (NIHMS)The following metadata fields will be part of the NIHMS submission.
", - "type": "object", - "properties": { - "journal-NLMTA-ID": { - "$ref": "global.json#/properties/journal-NLMTA-ID" - }, - "issns": { - "$ref": "global.json#/properties/issns" - } - } - }, - "prerequisites": { - "anyOf": [ - {"$ref": "#/definitions/nlmta_present"}, - {"$ref": "#/definitions/issn_present"} - ] - }, - "issn_present": { - "type": "object", - "properties": { - "issns": { - "type": "array", - "contains": { - "type": "object", - "required": [ - "issn", - "pubType" - ], - "properties": { - "issn": { - "type": "string" - }, - "pubType": { - "type": "string" - } - } - } - } - } - }, - "nlmta_present": { - "type": "object", - "required": [ - "journal-NLMTA-ID" - ], - "properties": { - "journal-NLMTA-ID": { - "$ref": "global.json#/properties/journal-NLMTA-ID" - } - } - }, - "options": { - "$ref": "global.json#/options" - } - }, - "allOf": [ - { - "$ref": "global.json#" - }, - { - "$ref": "#/definitions/prerequisites" - }, - { - "$ref": "#/definitions/form" - } - ] -} \ No newline at end of file