Merge remote-tracking branch 'hackolade/master'

Author: taras-dubyk

adapter/0.1.37.json

@@ -0,0 +1,93 @@
+/**
+ * Copyright © 2016-2018 by IntegrIT S.A. dba Hackolade.  All rights reserved.
+ *
+ * The copyright to the computer software herein is the property of IntegrIT S.A.
+ * The software may be used and/or copied only with the written permission of 
+ * IntegrIT S.A. or in accordance with the terms and conditions stipulated in 
+ * the agreement/contract under which the software has been supplied. 
+ * 
+ * {
+ * 		"add": {
+ * 			"entity": [<names of new property>],
+ * 			"container": [<names of new property>],
+ * 			"model": [<names of new property>],
+ * 			"view": [<names of new property>],
+ *			"field": {
+ *				"<type>": [<names of new property>]
+ *			}
+ * 		},
+ * 		"remove": {
+ * 			"entity": [<names of new property>],
+ * 			"container": [<names of new property>],
+ * 			"model": [<names of new property>],
+ * 			"view": [<names of new property>],
+ *			"field": {
+ *				"<type>": [<names of new property>]
+ *			}
+ * 		},
+ * 		"modify": {
+ *	 		"entity": [
+ *	 			{
+ *					"from": { <properties that identify record> },
+ *					"to": { <properties that need to be changed> }
+ *				}
+ *			],
+ *			"container": [],
+ *			"model": [],
+ *			"view": [],
+ *			"field": []
+ * 		},
+ * }
+ */
+{
+    "modify": {
+        "field": [
+            {
+                "from": {
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "to": {
+                    "mode": "int64"
+                }
+            },
+            {
+                "from": {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                "to": {
+                    "mode": "int32"
+                }
+            },
+            {
+                "from": {
+                    "type": "number",
+                    "format": "float"
+                },
+                "to": {
+                    "mode": "float"
+                }
+            },
+            {
+                "from": {
+                    "type": "number",
+                    "format": "double"
+                },
+                "to": {
+                    "mode": "double"
+                }
+            }
+        ]
+    },
+    "delete": {
+        "field": {
+            "integer": [
+                "format"
+            ],
+            "number": [
+                "format"
+            ]
+        }
+    }
+}

forward_engineering/helpers/validationHelper.js

@@ -102,12 +102,14 @@ const createPathParameterError = (pathName, parameter) => {
 };
 
 const checkPathParameters = (schema) => {
+	const requestNames = ["get", "put", "post", "delete", "options", "head", "patch", "trace", "$ref"];
+
 	return Object.keys(schema.paths).reduce((errors, pathName) => {
 		const pathParameters = getPathParameters(pathName);
 		const requests = schema.paths[pathName] || {};
 
 		return pathParameters.reduce((errors, parameter) => {
-			return Object.keys(requests).reduce((errors, requestName) => {
+			return requestNames.filter(requestName => requests[requestName]).reduce((errors, requestName) => {
 				const request = requests[requestName];
 
 				if (!Array.isArray(request.parameters)) {

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "OpenAPI",
-	"version": "0.1.35",
-	"versionDate": "2021-11-01",
+	"version": "0.1.40",
+	"versionDate": "2022-01-28",
 	"author": "hackolade",
 	"engines": {
 		"hackolade": "4.3.15",
@@ -19,7 +19,7 @@
 			"nestedCollections": {
 				"level": 1
 			},
-			"disableMultipleTypes": false,
+			"disableMultipleTypes": true,
 			"enableReverseEngineering": {
 				"jsonDocument": {
 					"entities": false,
@@ -75,7 +75,10 @@
 			"enableStackedNestedCollections": true,
 			"externalDefinitionsFromTargetSchema": true,
 			"apiTarget": true,
-			"FEScriptCommentsSupported": true
+			"FEScriptCommentsSupported": true,
+			"displayOptions": {
+				"hideNonNullableAttributes": true
+			}
 		}
 	},
 	"description": "Hackolade plugin for OpenAPI",

properties_pane/field_level/fieldLevelConfig.json

@@ -639,7 +639,7 @@ making sure that you maintain a proper JSON format.
 			"schemaId",
 			"type",
 			{
-				"propertyName": "format",
+				"propertyName": "Format",
 				"propertyKeyword": "mode",
 				"propertyType": "select",
 				"options": [

reverse_engineering/helpers/dataHelper.js

@@ -564,14 +564,27 @@ const setMissedType = (schema) => {
 	return schema;
 }
 
+const convertFormatToMode = schema => {
+	switch (schema.type) {
+		case 'number':
+		case 'integer': {
+			const { format, ...schemaData } = schema;
+
+			return { ...schemaData, mode: format };
+		}
+		default:
+			return schema;
+	}
+};
+
 const handleSchemaProps = (schema, fieldOrder) => {
 	if (!schema) {
 		schema = {
 			type: 'object'
 		};
 	}
 
-	const fixedSchema = setMissedType(schema);
+	const fixedSchema = convertFormatToMode(setMissedType(schema));
 	const schemaWithAdditionalPropertiesData = handleAdditionalProperties(fixedSchema);
 	const schemaWithChoices = handleSchemaChoices(schemaWithAdditionalPropertiesData, fieldOrder);
 	const reorderedSchema = commonHelper.reorderFields(schemaWithChoices, fieldOrder);
@@ -608,7 +621,7 @@ const handleDefinitionSchemaProps = (schema, fieldOrder) => {
 		};
 	}
 
-	const fixedSchema = setMissedType(schema);
+	const fixedSchema = convertFormatToMode(setMissedType(schema));
 	const schemaWithAdditionalPropertiesData = handleAdditionalProperties(fixedSchema);
 	const reorderedSchema = commonHelper.reorderFields(schemaWithAdditionalPropertiesData, fieldOrder);
 	const schemaWithHandledProperties = Object.keys(reorderedSchema).reduce((accumulator, property) => {

snippets/response.json

@@ -11,7 +11,19 @@
 		"type": "object",
 		"properties": [{
 			"name": "application/json",
-			"type": "media"
+			"type": "media",
+			"properties": [{
+				"name": "schema",
+				"type": "object"
+			}, {
+				"name": "examples",
+				"type": "object",
+				"subtype": "example"
+			}, {
+				"name": "encoding",
+				"type": "object",
+				"subtype": "encoding"
+			}]
 		}]
 	},{
 		"name": "links",