0.1.0 to go with v1.10.x

hackolade · Nov 22, 2017 · 03d2645 · 03d2645
1 parent 232c646
commit 03d2645
Show file tree

Hide file tree

Showing 35 changed files with 925 additions and 61 deletions.
diff --git a/jsonSchemaProperties.json b/jsonSchemaProperties.json
@@ -1,4 +1,4 @@
 {
-	"unneededFieldProps": ["collectionName", "name", "users", "indexes", "collectionUsers", "additionalPropertieserties"],
+	"unneededFieldProps": ["collectionName", "name", "users", "indexes", "collectionUsers", "additionalPropertieserties", "subTypes"],
 	"removeIfPropsNegative": ["partitionKey", "sortKey"]
 }
diff --git a/localization/en.json b/localization/en.json
@@ -7,7 +7,7 @@
 	"MAIN_MENU___ADD_ATTRIBUTE": "Add Attribute",
 	"MAIN_MENU___INSERT_FIELD": "Insert Field",
 	"MAIN_MENU___APPEND_FIELD": "Append Field",
-	"MAIN_MENU___REVERSE_MONGODB_COLLECTIONS": "Elasticsearch indices...",
+	"MAIN_MENU___REVERSE_DB_COLLECTIONS": "Elasticsearch indices...",
 	"TOOLBAR___ADD_BUCKET": "Add index",
 	"TOOLBAR___ADD_COLLECTION": "Add type",
 	"TOOLBAR___ADD_VIEW": "Add Filtered Alias",
@@ -83,7 +83,7 @@
 	"MODAL_WINDOW___CONTAIN_COLLECTIONS": "types",
 	"MODAL_WINDOW___CONTAIN_BUCKET": "indices",
 	"MODAL_WINDOW___CONTAIN_COLLECTION": "type",
-	"MODAL_WINDOW___MONGODB_CONNECTION_PROCESS": "Elasticsearch Reverse-Engineering Process",
+	"MODAL_WINDOW___DB_CONNECTION_PROCESS": "Elasticsearch Reverse-Engineering Process",
 	"PROGRESS_BAR___DATABASE": "Index",
 	"PROGRESS_BAR___COLLECTION": "Type",
 	"PROGRESS_BAR___PROCESS": "Process",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Elasticsearch",
-	"version": "0.0.1",
-	"versionDate": "2017-09-13",
+	"version": "0.1.0",
+	"versionDate": "2017-11-20",
 	"author": "hackolade",
 	"engines": {
 		"hackolade": "1.9.x",
@@ -25,7 +25,8 @@
 			]
 		},
 		"features": {
-			"nestedCollections": true
+			"nestedCollections": true,
+			"disableMultipleTypes": true
 		}
 	},
 	"description": "Hackolade plugin for Elasticsearch"

diff --git a/properties_pane/container_level/containerLevelConfig.json b/properties_pane/container_level/containerLevelConfig.json
@@ -14,7 +14,8 @@ making sure that you maintain a proper JSON format.
 				"propertyName": "Simple text",
 				"propertyKeyword": "simpletextProp",
 				"shouldValidate": false,
-				"propertyType": "text"
+				"propertyType": "text",
+				"sampleGen": "&containerName|&entityName|&random|<value>"
 			},
 			{
 				"propertyName": "Text area",
@@ -42,13 +43,39 @@ making sure that you maintain a proper JSON format.
 				"propertyKeyword": "numericProp",
 				"propertyValidate": true,
 				"propertyType": "numeric",
-				"valueType": "number"
+				"valueType": "number",
+				"allowNegative": false,
+				"sampleGen": "&containerName|&entityName|&random|<value>"
 			},
 			{
 				"propertyName": "Checkbox",
 				"propertyKeyword": "checkboxProp",
 				"shouldValidate": false,
 				"propertyType": "checkbox"
+			},
+			{
+				"propertyName": "Group",
+				"propertyType": "group",
+				"propertyKeyword": "grpProp",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "Simple Grp Text",
+						"propertyKeyword": "simpleGrpText",
+						"shouldValidate": false,
+						"propertyTooltip": "",
+						"propertyType": "text"
+					},
+					{
+						"propertyName": "Group Number",
+						"propertyKeyword": "grpNumber",
+						"propertyValidate": true,
+						"propertyType": "numeric",
+						"valueType": "number",
+						"allowNegative": false
+					}
+				]
 			}
 
 */
@@ -66,7 +93,8 @@ making sure that you maintain a proper JSON format.
 			"typeName": "Data type",
 			"typeOptions": ["string"],
 			"defaultType": "string",
-			"disabledFieldOption": true
+			"disabledFieldOption": true,
+			"sampleGen": "&containerName"
 		},{
 			"labelName": "Type",
 			"propertyName": "Document Type",
@@ -77,7 +105,8 @@ making sure that you maintain a proper JSON format.
 			"typeName": "Data type",
 			"typeOptions": ["string"],
 			"defaultType": "string",
-			"disabledFieldOption": true
+			"disabledFieldOption": true,
+			"sampleGen": "&entityName"
 		},{
 			"labelName": "ID",
 			"propertyName": "Document ID",
@@ -91,14 +120,16 @@ making sure that you maintain a proper JSON format.
 				"number"
 			],
 			"defaultType": "number",
-			"disabledFieldOption": true
+			"disabledFieldOption": true,
+			"sampleGen": "&random"
 		},{
 			"labelName": "Source",
 			"propertyName": "source",
 			"propertyKeyword": "source",
 			"defaultName": "_source",
 			"propertyPrimaryKey": false,
-			"propertyType": "object",
+			"propertyType": "text",
+			"valueType": "object",
 			"typeName": "Data type",
 			"typeOptions": [
 				"object"

diff --git a/properties_pane/defaultData.json b/properties_pane/defaultData.json
@@ -2,7 +2,8 @@
 	"model": {
 		"modelName": "New model",
 		"dbVersion": "",
-		"dbVendor": "Elasticsearch"
+		"dbVendor": "Elasticsearch",
+		"port": 9200
 	},
 	"container": {
 		"name": "New index",

diff --git a/properties_pane/entity_level/entityLevelConfig.json b/properties_pane/entity_level/entityLevelConfig.json
@@ -5,6 +5,79 @@
 * 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. 
+
+
+In order to define custom properties for any object's properties pane, you may copy/paste from the following,
+making sure that you maintain a proper JSON format.
+
+			{
+				"propertyName": "Simple text",
+				"propertyKeyword": "simpletextProp",
+				"shouldValidate": false,
+				"propertyType": "text",
+				"sampleGen": "&containerName|&entityName|&random|<value>"
+			},
+			{
+				"propertyName": "Text area",
+				"propertyKeyword": "textareaProp",
+				"propertyValidate": false,
+				"propertyTooltip": "Popup for multi-line text entry",
+				"propertyType": "details",
+				"template": "textarea"
+			},
+			{
+				"propertyName": "Dropdown selection",
+				"propertyKeyword": "dropdownProp",
+				"shouldValidate": false,
+				"propertyTooltip": "Select from list of options",
+				"propertyType": "select",
+				"options": [
+					"Option 1",
+					"Option 2",
+					"Option 3",
+					"Option 4"
+				]
+			},
+			{
+				"propertyName": "Numeric",
+				"propertyKeyword": "numericProp",
+				"propertyValidate": true,
+				"propertyType": "numeric",
+				"valueType": "number",
+				"allowNegative": false,
+				"sampleGen": "&containerName|&entityName|&random|<value>"
+			},
+			{
+				"propertyName": "Checkbox",
+				"propertyKeyword": "checkboxProp",
+				"shouldValidate": false,
+				"propertyType": "checkbox"
+			},
+			{
+				"propertyName": "Group",
+				"propertyType": "group",
+				"propertyKeyword": "grpProp",
+				"shouldValidate": true,
+				"propertyTooltip": "",
+				"structure": [
+					{
+						"propertyName": "Simple Grp Text",
+						"propertyKeyword": "simpleGrpText",
+						"shouldValidate": false,
+						"propertyTooltip": "",
+						"propertyType": "text"
+					},
+					{
+						"propertyName": "Group Number",
+						"propertyKeyword": "grpNumber",
+						"propertyValidate": true,
+						"propertyType": "numeric",
+						"valueType": "number",
+						"allowNegative": false
+					}
+				]
+			}
+
 */
 
 [