Merge pull request #24 from mtseluiko/fix/fe-missing-extensions

FE: fix missing scopes extensions

Author: mtseluiko

forward_engineering/helpers/pathHelper.js

@@ -62,7 +62,7 @@ function getRequestData(collections, containers, containerId, containersPath = [
 				methodName: data.collectionName,
 				isActivated: data.isActivated
 			};
-			const extensions = getExtensions(data.operationExtensions);
+			const extensions = getExtensions(data.scopesExtensions);
 
 			return Object.assign({}, request, extensions);
 		})
@@ -103,9 +103,10 @@ function mapResponses(collections, collectionId, isParentActivated) {
 		.map(collection => {
 			const responseCode = collection.collectionName;
 			const shouldResponseBeCommented = !collection.isActivated && isParentActivated;
+			const extensions = getExtensions(collection.scopesExtensions);
 			const response = mapResponse(get(collection, 'properties.response'), collection.description, shouldResponseBeCommented);
 
-			return { responseCode, response };
+			return { responseCode, response: { ...response, ...extensions } };
 		})
 		.reduce((acc, { responseCode, response }) => {
 			acc[responseCode] = response;
@@ -137,8 +138,9 @@ function getCallbacks(data, containers, containerId, containersPath = []) {
 				containers,
 				[...containersPath, containerId]
 			);
+			const extensions = getExtensions(value.scopesExtensions);
 
-			return { [key]: { [value.callbackExpression]: callbackData }};
+			return { [key]: { [value.callbackExpression]: callbackData, ...extensions }};
 
 		})
 		.reduce((acc, item) => {

forward_engineering/helpers/typeHelper.js

@@ -55,8 +55,9 @@ function getTypeProps(data, key) {
 				xml: getXml(data.xml)
 			};
 			const objectChoices = getChoices(data, key);
+    		const extensions = getExtensions(data.scopesExtensions);
 
-			return Object.assign({}, objectProps, objectChoices);
+			return Object.assign({}, objectProps, objectChoices, extensions);
 		}
 		case 'parameter':
 			if (!properties || properties.length === 0) {

properties_pane/field_level/fieldLevelConfig.json

@@ -1432,7 +1432,11 @@ making sure that you maintain a proper JSON format.
 						"template": "textarea",
 						"markdown": false
 					}
-				]
+				],
+				"dependency": {
+					"key": "subtype",
+					"value": "schema"
+				}
 			},
 			"comments"
 		],
@@ -2566,6 +2570,31 @@ making sure that you maintain a proper JSON format.
 						]
 					}
 				]
+			},
+			{
+				"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
+					}
+				]
 			}
 		],
 		"expression": [

snippets/encoding.json

@@ -1,6 +1,5 @@
 {
 	"name": "encoding",
-	"subtype": "snippetChildrenOnly",
 	"parentType": "document",
 	"properties": [{
 		"name": "headers",

types/encoding.json

@@ -14,8 +14,10 @@
 		"minProperties": "",
 		"maxProperties": "",
 		"snippet": "encoding",
+		"properties": [],
 		"additionalProperties": false,
 		"enum": [],
+		"subtype": "snippetChildrenOnly",
 		"hackoladeMeta": {
 			"disableAdd": true
 		}