Fix missing type in networkConnection.schema.json, group dcmFallbackM…

…oveSCPxxx properties

dcm4chee-arc-ui/src/main/webapp/schema/archiveDevice.schema.json

@@ -167,6 +167,16 @@
  "description": "AE Title of local C-STORE-SCP to be set as Move Destination in C-MOVE RQs forwarded to the external C-MOVE SCP specified by dcmFallbackCMoveSCP",
  "type": "string"
  },
+ "dcmFallbackCMoveSCPStudyOlderThan": {
+ "title": "Fallback C-Move SCP Study Older Than",
+ "description": "Specifies threshold for Study Date in format YYYYMMDD for marking received Studies as (potential) incomplete to enforce the retrieve from configured dcmFallbackCMoveSCP",
+ "type": "string"
+ },
+ "dcmFallbackCMoveSCPLeadingCFindSCP": {
+ "title": "Fallback C-Move SCP Leading C-Find SCP",
+ "description": "AE Title of external C-FIND SCP for Verification of Number of Instances retrieved from external C-MOVE SCP specified by dcmFallbackCMoveSCP.",
+ "type": "string"
+ },
  "dcmFallbackCMoveSCPRetries": {
  "title": "Fallback C-Move SCP Retries",
  "description": "Maximal number of retries to retrieve not available objects from C-MOVE SCP configured by dcmFallbackCMoveSCP. -1 = forever. 0 if absent",
@@ -343,11 +353,6 @@
  "description": "AE Title of Local Application Entity performing the automatic rejection of expired Studies and Series. If absent, neither expired Studies nor Series will be rejected automatically.",
  "type": "string"
  },
- "dcmFallbackCMoveSCPStudyOlderThan": {
- "title": "Fallback C-Move SCP Study Older Than",
- "description": "Specifies threshold for Study Date in format YYYYMMDD for marking received Studies as (potential) incomplete to enforce the retrieve from configured dcmFallbackCMoveSCP",
- "type": "string"
- },
  "dcmStorePermissionServiceURL": {
  "title": "Store Permission Service URL",
  "description": "URL of Store Permission Service which will be invoked on receive of the first object of a study. {<dicomTag>} will be replaced by the value of the attribute in the object. E.g. http://host.name/storage-permission/study/{0020000D}?patientId={00100020}&patientIdIssuer={00100021}&studyDescription={00081030}",
@@ -420,11 +425,6 @@
  "HASH_NAME_AND_ID"
  ]
  },
- "dcmFallbackCMoveSCPLeadingCFindSCP": {
- "title": "Fallback C-Move SCP Leading C-Find SCP",
- "description": "AE Title of external C-FIND SCP for Verification of Number of Instances retrieved from external C-MOVE SCP specified by dcmFallbackCMoveSCP.",
- "type": "string"
- },
  "dcmAttributeFilter": {
  "title": "Attribute Filter",
  "description": "Specifies Attributes stored in the database",

dcm4chee-arc-ui/src/main/webapp/schema/archiveNetworkAE.schema.json

@@ -137,11 +137,21 @@
  "description": "AE Title of external C-MOVE SCP to forward C-MOVE RQs if the requested Entities are not managed by this archive",
  "type": "string"
  },
+ "dcmFallbackCMoveSCPStudyOlderThan": {
+ "title": "Fallback C-Move SCP Study Older Than",
+ "description": "Specifies threshold for Study Date in format YYYYMMDD for marking received Studies as (potential) incomplete to enforce the retrieve from configured dcmFallbackCMoveSCP",
+ "type": "string"
+ },
  "dcmFallbackCMoveSCPDestination": {
  "title": "Fallback C-Move SCP Destination",
  "description": "AE Title of local C-STORE-SCP to be set as Move Destination in C-MOVE RQs forwarded to the external C-MOVE SCP specified by dcmFallbackCMoveSCP",
  "type": "string"
  },
+ "dcmFallbackCMoveSCPLeadingCFindSCP": {
+ "title": "Fallback C-Move SCP Leading C-Find SCP",
+ "description": "AE Title of external C-FIND SCP for Verification of Number of Instances retrieved from external C-MOVE SCP specified by dcmFallbackCMoveSCP.",
+ "type": "string"
+ },
  "dcmFallbackCMoveSCPRetries": {
  "title": "Fallback C-Move SCP Retries",
  "description": "Maximal number of retries to retrieve not available objects from C-MOVE SCP configured by dcmFallbackCMoveSCP. -1 = forever. Use value configured on Device level, if absent",
@@ -152,11 +162,6 @@
  "description": "AE Title of alternative C-MOVE SCP to forward C-MOVE RQs if the requested Entities are not located on a local attached Storage",
  "type": "string"
  },
- "dcmFallbackCMoveSCPStudyOlderThan": {
- "title": "Fallback C-Move SCP Study Older Than",
- "description": "Specifies threshold for Study Date in format YYYYMMDD for marking received Studies as (potential) incomplete to enforce the retrieve from configured dcmFallbackCMoveSCP",
- "type": "string"
- },
  "dcmStorePermissionServiceURL": {
  "title": "Store Permission Service URL",
  "description": "URL of Store Permission Service which will be invoked on receive of the first object of a study. {<dicomTag>} will be replaced by the value of the attribute in the object. E.g. http://host.name/storage-permission/study/{0020000D}?patientId={00100020}&patientIdIssuer={00100021}&studyDescription={00081030}",
@@ -199,11 +204,6 @@
  "description": "Regular Expression applied to responses from Store Permission Service to extract the initial Study Expiration Date. E.g. \"expirationdate\"\\s*:\\s*\"(\\d[8])\". If absent, locally configured Study Retention Policy Rules will be applied.",
  "type": "string"
  },
- "dcmFallbackCMoveSCPLeadingCFindSCP": {
- "title": "Fallback C-Move SCP Leading C-Find SCP",
- "description": "AE Title of external C-FIND SCP for Verification of Number of Instances retrieved from external C-MOVE SCP specified by dcmFallbackCMoveSCP.",
- "type": "string"
- },
  "dcmExportRule": {
  "title": "Export Rule",
  "description": "Export Rule",

dcm4chee-arc-ui/src/main/webapp/schema/networkConnection.schema.json

@@ -29,6 +29,7 @@
  "description": "The TLS CipherSuites that are supported on this particular connection. If not present TLS is disabled",
  "type": "array",
  "items": {
+ "type": "string",
  "enum": [
  "SSL_RSA_WITH_NULL_SHA",
  "TLS_RSA_WITH_AES_128_CBC_SHA",