HCK-6860: fix dependency for primary key structure

hackolade · Jun 20, 2024 · a176ce4 · a176ce4
1 parent ac87bac
commit a176ce4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/forward_engineering/services/statements/getPrimaryKeySampleByStructure.js b/forward_engineering/services/statements/getPrimaryKeySampleByStructure.js
@@ -3,14 +3,17 @@
  * @typedef {import('../../../shared/types').UUID} UUID
  */
 const RandExp = require('randexp');
+const { isEmpty } = require('lodash');
 const { PK_SEGMENT_TYPE } = require('../../../shared/constants');
 
 /**
  * @param {{ collection: object, jsonData: object }}
  * @returns {string}
  */
 const getPrimaryKeySampleByStructure = ({ collection, jsonData }) => {
-	const keyField = Object.values(collection.properties || {}).find(field => field.primaryKeyStructure);
+	const keyField = Object.values(collection.properties || {}).find(
+		field => field.primaryKey && !isEmpty(field.primaryKeyStructure),
+	);
 	const primaryKeyStructure = keyField?.primaryKeyStructure;
 
 	if (!Array.isArray(primaryKeyStructure)) {

diff --git a/forward_engineering/services/statements/insertStatements.js b/forward_engineering/services/statements/insertStatements.js
@@ -32,7 +32,7 @@ const getInsertScriptForCollection = ({ jsonData, collection }) => {
 	}
 
 	const keyPropertyName = Object.keys(collection?.properties ?? {}).find(propertyName =>
-		Boolean(collection?.properties?.[propertyName]['<key>']),
+		Boolean(collection?.properties?.[propertyName]?.primaryKey),
 	);
 
 	const insertionPath = getKeySpaceReference(collection);

diff --git a/properties_pane/field_level/fieldLevelConfig.json b/properties_pane/field_level/fieldLevelConfig.json
@@ -224,7 +224,7 @@ making sure that you maintain a proper JSON format.
 					}
 				],
 				"dependency": {
-					"key": "containerLevelKey",
+					"key": "primaryKey",
 					"value": true
 				}
 			},