Merge pull request #15 from lenchvolodymyr/fix/partition-key

Fix/partition key
hackolade · Jan 19, 2021 · 8723d2a · 8723d2a
2 parents 8fd3b09 + 260cd69
commit 8723d2a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/forward_engineering/api.js b/forward_engineering/api.js
@@ -6,6 +6,7 @@ module.exports = {
 		try {
 			const _ = app.require('lodash');
 			const script = {
+				partitionKey: getPartitionKey(_)(data.containerData),
 				indexingPolicy: getIndexPolicyScript(_)(data.containerData),
 				sample: data.entities.map(entityId => updateSample(
 					JSON.parse(data.jsonData[entityId]),
@@ -25,6 +26,7 @@ module.exports = {
 		try {
 			const _ = app.require('lodash');
 			const script = {
+				partitionKey: getPartitionKey(_)(data.containerData),
 				indexingPolicy: getIndexPolicyScript(_)(data.containerData),
 				sample: updateSample(
 					JSON.parse(data.jsonData),
@@ -58,6 +60,10 @@ const updateSample = (sample, containerData, entityData) => {
 	};
 };
 
+const getPartitionKey = (_) => (containerData) => {
+	return _.get(containerData, '[0].partitionKey[0].name');
+};
+
 const add = (key, items, mapper) => (script) => {
 	if (!items.length) {
 		return script;

diff --git a/forward_engineering/applyToInstance/index.js b/forward_engineering/applyToInstance/index.js
@@ -63,16 +63,6 @@ const updateIndexingPolicy = (indexes) => {
 	return result;
 };
 
-const getPartitionKey = (_) => (containerData) => {
-	const partitionKey = _.get(containerData, '[0].partitionKey[0].name');
-
-	if (!partitionKey) {
-		return;
-	}
-
-	return '/' + partitionKey.split('.').slice(1).join('/');
-};
-
 const getUniqueKeys = (uniqueKeys) => {
 	if (!uniqueKeys) {
 		return [];
@@ -116,7 +106,7 @@ module.exports = {
 
 			const { container, resource: containerDef } = await database.containers.createIfNotExists({
 				id: containerId,
-				partitionKey: getPartitionKey(_)(containerData),
+				partitionKey: script.partitionKey,
 				defaultTtl: helper.getTTL(containerData),
 			});
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "CosmosDB-with-SQL-API",
-	"version": "0.1.21",
-	"versionDate": "2021-01-08",
+	"version": "0.1.22",
+	"versionDate": "2021-01-15",
 	"author": "hackolade",
 	"engines": {
 		"hackolade": "4.3.1",

diff --git a/properties_pane/container_level/containerLevelConfig.json b/properties_pane/container_level/containerLevelConfig.json
@@ -163,6 +163,9 @@ making sure that you maintain a proper JSON format.
 				"propertyType": "fieldList",
 				"template": "orderedList",
 				"templateOptions": {
+					"divider": "/",
+					"front": true,
+					"entityName": false,
 					"maxField": 1
 				}
 			},