Merge pull request #61 from taras-dubyk/master

HCK-3770: add schema extensions for simple types

Author: VitaliiBedletskyi

properties_pane/field_level/fieldLevelConfig.json

@@ -588,7 +588,32 @@ making sure that you maintain a proper JSON format.
 				],
 				"enableForReference": true
 			},
-			"comments"
+			"comments",
+			{
+				"propertyName": "extensions",
+				"propertyType": "group",
+				"propertyKeyword": "scopesExtensions",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "pattern",
+						"propertyKeyword": "extensionPattern",
+						"shouldValidate": true,
+						"propertyType": "text",
+						"regex":"^x-"
+					},
+					{
+						"propertyName": "value",
+						"propertyKeyword": "extensionValue",
+						"propertyValidate": false,
+						"propertyTooltip": "Popup for multi-line text entry",
+						"propertyType": "details",
+						"template": "textarea",
+						"markdown": false
+					}
+				]
+			}
 		],
 		"number": [
 			{
@@ -873,7 +898,32 @@ making sure that you maintain a proper JSON format.
 				],
 				"enableForReference": true
 			},
-			"comments"
+			"comments",
+			{
+				"propertyName": "extensions",
+				"propertyType": "group",
+				"propertyKeyword": "scopesExtensions",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "pattern",
+						"propertyKeyword": "extensionPattern",
+						"shouldValidate": true,
+						"propertyType": "text",
+						"regex":"^x-"
+					},
+					{
+						"propertyName": "value",
+						"propertyKeyword": "extensionValue",
+						"propertyValidate": false,
+						"propertyTooltip": "Popup for multi-line text entry",
+						"propertyType": "details",
+						"template": "textarea",
+						"markdown": false
+					}
+				]
+			}
 		],
 		"integer": [
 			{
@@ -1159,7 +1209,32 @@ making sure that you maintain a proper JSON format.
 				],
 				"enableForReference": true
 			},
-			"comments"
+			"comments",
+			{
+				"propertyName": "extensions",
+				"propertyType": "group",
+				"propertyKeyword": "scopesExtensions",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "pattern",
+						"propertyKeyword": "extensionPattern",
+						"shouldValidate": true,
+						"propertyType": "text",
+						"regex":"^x-"
+					},
+					{
+						"propertyName": "value",
+						"propertyKeyword": "extensionValue",
+						"propertyValidate": false,
+						"propertyTooltip": "Popup for multi-line text entry",
+						"propertyType": "details",
+						"template": "textarea",
+						"markdown": false
+					}
+				]
+			}
 		],
 		"boolean": [
 			{
@@ -1320,7 +1395,32 @@ making sure that you maintain a proper JSON format.
 				"propertyType": "checkbox",
 				"enableForReference": true
 			},
-			"comments"
+			"comments",
+			{
+				"propertyName": "extensions",
+				"propertyType": "group",
+				"propertyKeyword": "scopesExtensions",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "pattern",
+						"propertyKeyword": "extensionPattern",
+						"shouldValidate": true,
+						"propertyType": "text",
+						"regex":"^x-"
+					},
+					{
+						"propertyName": "value",
+						"propertyKeyword": "extensionValue",
+						"propertyValidate": false,
+						"propertyTooltip": "Popup for multi-line text entry",
+						"propertyType": "details",
+						"template": "textarea",
+						"markdown": false
+					}
+				]
+			}
 		],
 		"null": [
 			{
@@ -1435,7 +1535,32 @@ making sure that you maintain a proper JSON format.
 				"propertyType": "text",
 				"shouldValidate": true
 			},
-			"comments"
+			"comments",
+			{
+				"propertyName": "extensions",
+				"propertyType": "group",
+				"propertyKeyword": "scopesExtensions",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "pattern",
+						"propertyKeyword": "extensionPattern",
+						"shouldValidate": true,
+						"propertyType": "text",
+						"regex":"^x-"
+					},
+					{
+						"propertyName": "value",
+						"propertyKeyword": "extensionValue",
+						"propertyValidate": false,
+						"propertyTooltip": "Popup for multi-line text entry",
+						"propertyType": "details",
+						"template": "textarea",
+						"markdown": false
+					}
+				]
+			}
 		],
 		"array": [
 			{

reverse_engineering/helpers/dataHelper.js

@@ -582,6 +582,18 @@ const convertFormatToMode = schema => {
 	}
 };
 
+const handleSchemaExtensions = (schema) => {
+	const mappedExtensionsObject = getExtensionsObject(schema);
+	const schemaWithoutExtensions = Object.keys(schema).reduce((accumulator, property) => {
+		if (property.startsWith(EXTENSION_SYMBOL)) {
+			return accumulator;
+		}
+		return Object.assign({}, accumulator, {[property]: schema[property]});
+	}, {});
+
+	return Object.assign({}, schemaWithoutExtensions, mappedExtensionsObject);
+};
+
 const handleSchemaProps = (schema, fieldOrder) => {
 	if (!schema) {
 		schema = {
@@ -590,7 +602,8 @@ const handleSchemaProps = (schema, fieldOrder) => {
 	}
 
 	const fixedSchema = convertFormatToMode(setMissedType(schema));
-	const schemaWithAdditionalPropertiesData = handleAdditionalProperties(fixedSchema);
+	const schemaWithExtensions = handleSchemaExtensions(fixedSchema);
+	const schemaWithAdditionalPropertiesData = handleAdditionalProperties(schemaWithExtensions);
 	const schemaWithChoices = handleSchemaChoices(schemaWithAdditionalPropertiesData, fieldOrder);
 	const reorderedSchema = commonHelper.reorderFields(schemaWithChoices, fieldOrder);
 	const schemaWithHandledProperties = Object.keys(reorderedSchema).reduce((accumulator, property) => {