cassproject 5.0.2 → 5.0.3

package/README.md

@@ -50,6 +50,10 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 5.0.3
+* Updates to CEASN import/export.
+* Security updates.
+
 ## 5.0.2
 * Cosmetic and security updates (to dev dependencies)
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "5.0.2",
+	"version": "5.0.3",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -10,12 +10,12 @@
 		"multitest": "concurrently --kill-others-on-fail \"npm run test15\" \"npm run test14\" \"npm run test13\" \"npm run test12\"",
 		"testCassTest": "npm run testkill && docker run -d --platform linux/amd64 --network cass-net --name cass-test -p80:80 -e CASS_LOOPBACK cass-test && wait-on http://localhost/api/ping && npm run testNode18 && npm run testNode18Fips && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testCypressEdge && npm run testCypress && npm run testkill",
 		"testDevHttps": "npm run testkill && docker run -d --platform linux/amd64 --network cass-net --name cass-test -p443:80 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:dev && wait-on https://localhost/api/ping && npm run testNode18HttpsFips && npm run testNode18Https && npm run testNode16Https && npm run testNode15Https && npm run testNode14Https && npm run testNode13Https && npm run testNode12Https && npm run testCypressEdgeHttps && npm run testCypressHttps",
-		"test16HttpsFips": "export CASS_LOOPBACK=https://cass-testsf16/api/|| set CASS_LOOPBACK=https://cass-testsf16/api/&& npm run testkillsf16 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf16 -p450:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6.4 && wait-on https://localhost:450/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf16",
-		"test16Https11Fips": "export CASS_LOOPBACK=https://cass-testsf1116/api/|| set CASS_LOOPBACK=https://cass-testsf1116/api/&& npm run testkillsf1116 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf1116 -p449:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.6.4 && wait-on https://localhost:449/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf1116",
-		"test16Https": "export CASS_LOOPBACK=https://cass-tests16/api/|| set CASS_LOOPBACK=https://cass-tests16/api/&& npm run testkills16 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests16 -p448:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6.4 && wait-on https://localhost:448/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" && npm run testkills16",
-		"test16Https11": "export CASS_LOOPBACK=https://cass-tests1116/api/|| set CASS_LOOPBACK=https://cass-tests1116/api/&& npm run testkills1116 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests1116 -p451:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.6.4 && wait-on https://localhost:451/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" && npm run testkills1116",
-		"test16Fips": "export CASS_LOOPBACK=http://cass-testf16/api/|| set CASS_LOOPBACK=http://cass-testf16/api/&& npm run testkillf16 && docker run -d --platform linux/amd64 --network cass-net -e CASS_LOOPBACK --name cass-testf16 -p83:80 cassproject/cass:1.6.4 && wait-on http://localhost:83/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode24\" \"npm run testNode24Fips\" \"npm run testNode24ForceFips\" \"npm run testNode22\" \"npm run testNode22Fips\" \"npm run testNode22ForceFips\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode20ForceFips\" \"npm run testNode18\" && npm run testkillf16",
-		"test16": "export CASS_LOOPBACK=http://cass-test16/api/|| set CASS_LOOPBACK=http://cass-test16/api/&& npm run testkill16 && docker run -d --platform linux/amd64 --network cass-net -e CASS_LOOPBACK --name cass-test16 -p82:80 cassproject/cass:1.6.4 && wait-on http://localhost:82/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode24\" \"npm run testNode24Fips\" \"npm run testNode22\" \"npm run testNode22Fips\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode18\" && npm run testkill16",
+		"test16HttpsFips": "export CASS_LOOPBACK=https://cass-testsf16/api/|| set CASS_LOOPBACK=https://cass-testsf16/api/&& npm run testkillsf16 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf16 -p450:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6.6 && wait-on https://localhost:450/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf16",
+		"test16Https11Fips": "export CASS_LOOPBACK=https://cass-testsf1116/api/|| set CASS_LOOPBACK=https://cass-testsf1116/api/&& npm run testkillsf1116 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf1116 -p449:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.6.6 && wait-on https://localhost:449/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf1116",
+		"test16Https": "export CASS_LOOPBACK=https://cass-tests16/api/|| set CASS_LOOPBACK=https://cass-tests16/api/&& npm run testkills16 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests16 -p448:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.6.6 && wait-on https://localhost:448/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" && npm run testkills16",
+		"test16Https11": "export CASS_LOOPBACK=https://cass-tests1116/api/|| set CASS_LOOPBACK=https://cass-tests1116/api/&& npm run testkills1116 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests1116 -p451:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.6.6 && wait-on https://localhost:451/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" && npm run testkills1116",
+		"test16Fips": "export CASS_LOOPBACK=http://cass-testf16/api/|| set CASS_LOOPBACK=http://cass-testf16/api/&& npm run testkillf16 && docker run -d --platform linux/amd64 --network cass-net -e CASS_LOOPBACK --name cass-testf16 -p83:80 cassproject/cass:1.6.6 && wait-on http://localhost:83/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode24\" \"npm run testNode24Fips\" \"npm run testNode24ForceFips\" \"npm run testNode22\" \"npm run testNode22Fips\" \"npm run testNode22ForceFips\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode20ForceFips\" \"npm run testNode18\" && npm run testkillf16",
+		"test16": "export CASS_LOOPBACK=http://cass-test16/api/|| set CASS_LOOPBACK=http://cass-test16/api/&& npm run testkill16 && docker run -d --platform linux/amd64 --network cass-net -e CASS_LOOPBACK --name cass-test16 -p82:80 cassproject/cass:1.6.6 && wait-on http://localhost:82/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode24\" \"npm run testNode24Fips\" \"npm run testNode22\" \"npm run testNode22Fips\" \"npm run testNode20\" \"npm run testNode20Fips\" \"npm run testNode18\" && npm run testkill16",
 		"test15HttpsFips": "export TESTLEVEL=15|| set TESTLEVEL=15&& export CASS_LOOPBACK=https://cass-testsf15/api/|| set CASS_LOOPBACK=https://cass-testsf15/api/&& npm run testkillsf15 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf15 -p446:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.75 && wait-on https://localhost:446/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf15",
 		"test15Https11Fips": "export TESTLEVEL=15|| set TESTLEVEL=15&& export CASS_LOOPBACK=https://cass-testsf1115/api/|| set CASS_LOOPBACK=https://cass-testsf1115/api/&& npm run testkillsf1115 && docker run -d --platform linux/amd64 --network cass-net --name cass-testsf1115 -p447:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.75 && wait-on https://localhost:447/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode24HttpsForceFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode22HttpsForceFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode20HttpsForceFips\" \"npm run testNode18Https\" && npm run testkillsf1115",
 		"test15Https": "export TESTLEVEL=15|| set TESTLEVEL=15&& export CASS_LOOPBACK=https://cass-tests15/api/|| set CASS_LOOPBACK=https://cass-tests15/api/&& npm run testkills15 && docker run -d --platform linux/amd64 --network cass-net --name cass-tests15 -p444:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.75 && wait-on https://localhost:444/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode24Https\" \"npm run testNode24HttpsFips\" \"npm run testNode22Https\" \"npm run testNode22HttpsFips\" \"npm run testNode20Https\" \"npm run testNode20HttpsFips\" \"npm run testNode18Https\" && npm run testkills15",
@@ -188,10 +188,10 @@
 		"chai": "4.5.0",
 		"concurrently": "^9.2.1",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^15.2.0",
+		"cypress": "^15.4.0",
 		"cypress-fail-fast": "^7.1.1",
-		"eslint": "^9.35.0",
-		"fake-indexeddb": "^6.2.2",
+		"eslint": "^9.37.0",
+		"fake-indexeddb": "^6.2.3",
 		"mocha": "^10.8.2",
 		"node-polyfill-webpack-plugin": "^4.1.0",
 		"nodemon": "^3.1.10",
@@ -199,7 +199,7 @@
 		"sinon": "^19.0.5",
 		"url-polyfill": "^1.1.14",
 		"wait-on": "^8.0.5",
-		"webpack": "^5.101.3",
+		"webpack": "^5.102.1",
 		"webpack-cli": "^5.1.4"
 	},
 	"packageManager": "npm@11.3.0+sha512.96eb611483f49c55f7fa74df61b588de9e213f80a256728e6798ddc67176c7b07e4a1cfc7de8922422cbce02543714367037536955221fa451b0c4fefaf20c66"

package/src/org/cass/exporter/CSVExport.js

@@ -23,6 +23,7 @@ module.exports = class CSVExport extends Exporter {
 		compExport.downloadCSV(fileName);
 	}
 	static exportCTDLASN(json, name) {
+		console.log('export CTDL');
 		let objects = [];
 		CSVExport.findGraphs(json, objects);
 		CSVExport.exportObjects(objects, name + ".csv", true);
@@ -202,7 +203,16 @@ module.exports = class CSVExport extends Exporter {
 								display += props2[prop2][prop3] + "|";
 							}
 						} else {
-							display += props2[prop2] + "|";
+							if (prop === 'ceterms:versionIdentifier') {
+								if (props2[prop2]['ceterms:identifierValueCode'])
+									display += props2[prop2]['ceterms:identifierValueCode'] + "~";
+								if (props2[prop2]['ceterms:identifierTypeName'])
+									display += Object.values(props2[prop2]['ceterms:identifierTypeName'])[0] + "~";
+								if (props2[prop2]['ceterms:identifierType'])
+									display += props2[prop2]['ceterms:identifierType'] + "|";
+							} else {
+								display += props2[prop2] + "|";
+							}
 						}
 					}
 					display = display.substring(0, display.length - 1);

package/src/org/cass/importer/CTDLASNCSVConceptImport.js

@@ -109,7 +109,8 @@ module.exports = class CTDLASNCSVConceptImport {
 		ceo,
 		endpoint,
 		eim,
-		progressionsFlag
+		progressionsFlag,
+		validationRules
 	) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
@@ -123,7 +124,7 @@ module.exports = class CTDLASNCSVConceptImport {
 			failure("Invalid file type");
 		}
 		if (progressionsFlag) {
-			return this.importProgressions(repo, file, success, failure, ceo, endpoint, eim);
+			return this.importProgressions(repo, file, success, failure, ceo, endpoint, eim, validationRules);
 		}
 		Papa.parse(file, {
 			header: true,
@@ -139,21 +140,50 @@ module.exports = class CTDLASNCSVConceptImport {
 				} catch (e) {
 					console.error('Error trimming data', e);
 				}
+
+				// Validate hierarchy before processing (only if validation rules provided)
+				if (validationRules && validationRules.validateHierarchy !== false) {
+					const hierarchyError = CTDLASNCSVConceptImport.validateConceptHierarchy(
+						tabularData,
+						validationRules.hierarchyRules
+					);
+					if (hierarchyError) {
+						failure(hierarchyError);
+						return;
+					}
+				}
 				const terms = JSON.parse(JSON.stringify((await EcRemote.getExpectingObject("https://schema.cassproject.org/0.4/jsonld1.1/ceasn2cassConceptsTerms"))));
 				let schemeArray = [];
 				let concepts = [];
 				for (let each = 0; each < tabularData.length; each++) {
 					let pretranslatedE = tabularData[each];
-					// Probably an empty newline, skip
-					if (!pretranslatedE["@id"]) {
+					// Skip extra lines if found in file
+					if (!pretranslatedE || !pretranslatedE["@type"]) {
 						continue;
 					}
+					if (!pretranslatedE["@id"]) {
+						failure(`Row ${each + 2}: is missing an @id`);
+						return;
+					}
 					if (
 						pretranslatedE["@type"].toLowerCase().startsWith('sample') || pretranslatedE["@type"].toLowerCase().startsWith('instruction')
 					) {
 						continue;
 					}
 					if (pretranslatedE["@type"] == "skos:ConceptScheme") {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVConceptImport.validateRequiredProperties(
+								pretranslatedE,
+								"skos:ConceptScheme",
+								each + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -223,6 +253,19 @@ module.exports = class CTDLASNCSVConceptImport {
 						setVersionIdentifier(f);
 						schemeArray.push(f);
 					} else if (pretranslatedE["@type"] == "skos:Concept") {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVConceptImport.validateRequiredProperties(
+								pretranslatedE,
+								"skos:Concept",
+								each + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -251,6 +294,7 @@ module.exports = class CTDLASNCSVConceptImport {
 						let f = new EcConcept();
 						f.copyFrom(e);
 						if (e["id"] == null) {
+							failure(`Row ${each + 2}: Concept is missing an id`);
 							return;
 						}
 						if (
@@ -364,10 +408,11 @@ module.exports = class CTDLASNCSVConceptImport {
 						pretranslatedE["@type"] == null ||
 						pretranslatedE["@type"] == ""
 					) {
+						failure(`Row ${each + 2}: Missing or empty @type`);
 						return;
 					} else {
-						this.error(
-							"Found unknown type:" + pretranslatedE["@type"]
+						failure(
+							`Row ${each + 2}: Found unknown type: ` + pretranslatedE["@type"]
 						);
 						return;
 					}
@@ -384,7 +429,8 @@ module.exports = class CTDLASNCSVConceptImport {
 		failure,
 		ceo,
 		endpoint,
-		eim
+		eim,
+		validationRules
 	) {
 		Papa.parse(file, {
 			header: true,
@@ -400,17 +446,50 @@ module.exports = class CTDLASNCSVConceptImport {
 				} catch (e) {
 					console.error('Error trimming data', e);
 				}
+
+				// Validate hierarchy before processing (only if validation rules provided)
+				if (validationRules && validationRules.validateHierarchy !== false) {
+					const hierarchyError = CTDLASNCSVConceptImport.validateConceptHierarchy(
+						tabularData,
+						validationRules.hierarchyRules
+					);
+					if (hierarchyError) {
+						failure(hierarchyError);
+						return;
+					}
+				}
 				const terms = JSON.parse(JSON.stringify((await EcRemote.getExpectingObject("https://schema.cassproject.org/0.4/jsonld1.1/ceasn2cassConceptsTerms"))));
 				let schemeArray = [];
 				let concepts = [];
 				for (let each = 0; each < tabularData.length; each++) {
 					let pretranslatedE = tabularData[each];
+					// Skip extra lines if found in file
+					if (!pretranslatedE || !pretranslatedE["@type"]) {
+						continue;
+					}
+					if (!pretranslatedE["@id"]) {
+						failure(`Row ${each + 2}: is missing an @id`);
+						return;
+					}
 					if (
 						pretranslatedE["@type"].toLowerCase().startsWith('sample') || pretranslatedE["@type"].toLowerCase().startsWith('instruction')
 					) {
 						continue;
 					}
 					if (pretranslatedE["@type"] == "asn:ProgressionModel") {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVConceptImport.validateRequiredProperties(
+								pretranslatedE,
+								"asn:ProgressionModel",
+								each + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -476,6 +555,19 @@ module.exports = class CTDLASNCSVConceptImport {
 						f.subType = "Progression";
 						schemeArray.push(f);
 					} else if (pretranslatedE["@type"] == "asn:ProgressionLevel") {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVConceptImport.validateRequiredProperties(
+								pretranslatedE,
+								"asn:ProgressionLevel",
+								each + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -504,6 +596,7 @@ module.exports = class CTDLASNCSVConceptImport {
 						let f = new EcConcept();
 						f.copyFrom(e);
 						if (e["id"] == null) {
+							failure(`Row ${each + 2}: Concept is missing an id`);
 							return;
 						}
 						if (
@@ -583,10 +676,11 @@ module.exports = class CTDLASNCSVConceptImport {
 						pretranslatedE["@type"] == null ||
 						pretranslatedE["@type"] == ""
 					) {
+						failure(`Row ${each + 2}: Missing or empty @type`);
 						return;
 					} else {
-						this.error(
-							"Found unknown type:" + pretranslatedE["@type"]
+						failure(
+							`Row ${each + 2}: Found unknown type: ` + pretranslatedE["@type"]
 						);
 						return;
 					}
@@ -596,4 +690,75 @@ module.exports = class CTDLASNCSVConceptImport {
 			error: failure
 		});
 	}
+
+	static validateRequiredProperties(obj, type, rowIndex, requiredProps) {
+		// Use provided validation rules or fall back to defaults
+		if (!requiredProps) {
+			return 'Required properties not defined.'
+		}
+
+		const props = requiredProps[type];
+		if (!props) return null;
+
+		const missing = [];
+		for (const prop of props) {
+			if (!obj[prop] || (typeof obj[prop] === 'string' && obj[prop].trim() === '')) {
+				missing.push(prop);
+			}
+		}
+
+		if (missing.length > 0) {
+			return `Row ${rowIndex}: Missing required properties for ${type}: ${missing.join(', ')}`;
+		}
+		return null;
+	}
+
+	static validateConceptHierarchy(tabularData, hierarchyRules) {
+		// Use provided hierarchy rules or fall back to defaults
+		if (!hierarchyRules) {
+			return 'Hierarchy rules not defined.'
+		}
+
+		// Check each type defined in hierarchy rules
+		for (const [type, rules] of Object.entries(hierarchyRules)) {
+			const hasType = tabularData.some(r => r && r["@type"] === type);
+			if (!hasType) continue;
+
+			let hasRequiredProp = false;
+			let hasChildProp = false;
+
+			for (const row of tabularData) {
+				if (!row || !row["@type"]) continue;
+
+				// Check if this row has any of the required properties
+				if (row["@type"] === type && rules.requiredProperties) {
+					for (const prop of rules.requiredProperties) {
+						if (row[prop]) {
+							hasRequiredProp = true;
+							break;
+						}
+					}
+				}
+
+				// Check if any row has child properties
+				if (rules.childProperties) {
+					for (const prop of rules.childProperties) {
+						if (row[prop]) {
+							hasChildProp = true;
+							break;
+						}
+					}
+				}
+
+				if (hasRequiredProp && hasChildProp) break;
+			}
+
+			// Validate that at least one of the hierarchy properties exists
+			if (!hasRequiredProp && !hasChildProp) {
+				return rules.errorMessage || `CSV must contain hierarchy properties for ${type}`;
+			}
+		}
+
+		return null;
+	}
 };

package/src/org/cass/importer/CTDLASNCSVImport.js

@@ -133,7 +133,8 @@ module.exports = class CTDLASNCSVImport {
 		endpoint,
 		eim,
 		collectionsFlag,
-		skip
+		skip,
+		validationRules
 	) {
 		if (eim === undefined || eim == null)
 			eim = EcIdentityManager.default;
@@ -147,7 +148,7 @@ module.exports = class CTDLASNCSVImport {
 			failure("Invalid file type");
 		}
 		if (collectionsFlag) {
-			return this.importCollectionsAndCompetencies(repo, file, success, failure, ceo, endpoint, eim, skip);
+			return this.importCollectionsAndCompetencies(repo, file, success, failure, ceo, endpoint, eim, skip, validationRules);
 		}
 		Papa.parse(file, {
 			header: true,
@@ -163,7 +164,19 @@ module.exports = class CTDLASNCSVImport {
 				} catch (e) {
 					console.error('Error trimming data', e);
 				}
-				
+
+				// Validate hierarchy before processing (only if validation rules provided)
+				if (validationRules && validationRules.validateHierarchy !== false) {
+					const hierarchyError = CTDLASNCSVImport.validateFrameworkHierarchy(
+						tabularData,
+						validationRules.hierarchyRules
+					);
+					if (hierarchyError) {
+						failure(hierarchyError);
+						return;
+					}
+				}
+
 				const terms = JSON.parse(JSON.stringify((await EcRemote.getExpectingObject("https://schema.cassproject.org/0.4/jsonld1.1/ceasn2cassTerms"))));
 				let frameworks = {};
 				let frameworkArray = [];
@@ -206,6 +219,20 @@ module.exports = class CTDLASNCSVImport {
 						pretranslatedE["@type"] ==
 						"ceasn:CompetencyFramework"
 					) {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVImport.validateRequiredProperties(
+								pretranslatedE,
+								"ceasn:CompetencyFramework",
+								i + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
+
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -318,9 +345,9 @@ module.exports = class CTDLASNCSVImport {
 						// Remove skipped competencies
 						if (skip && Array.isArray(skip) && skip.length > 0 && f.competency) {
 							skip.forEach((element) => {
-								const id = (element.ctid ? element.ctid : element).replace('ce-', '');								
+								const id = (element.ctid ? element.ctid : element).replace('ce-', '');
 								const index = f.competency.findIndex((comp) => comp.includes(id));
-								if (index) {
+								if (index >= 0) {
 									f.competency.splice(index, 1);
 								}
 							});
@@ -334,6 +361,20 @@ module.exports = class CTDLASNCSVImport {
 					} else if (
 						pretranslatedE["@type"] == "ceasn:Competency"
 					) {
+					// Validate required properties (only if validation rules provided)
+					if (validationRules && validationRules.requiredProps) {
+						const validationError = CTDLASNCSVImport.validateRequiredProperties(
+							pretranslatedE,
+							"ceasn:Competency",
+							i + 2,
+							validationRules.requiredProps
+						);
+						if (validationError) {
+							failure(validationError);
+							return;
+						}
+					}
+
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -369,6 +410,7 @@ module.exports = class CTDLASNCSVImport {
 						let f = new EcCompetency();
 						f.copyFrom(e);
 						if (e["id"] == null) {
+							failure(`Row ${i+2}: Competency is missing an id`);
 							return;
 						}
 						if (e["ceasn:isPartOf"] != null) {
@@ -632,6 +674,7 @@ module.exports = class CTDLASNCSVImport {
 						pretranslatedE["@type"] == null ||
 						pretranslatedE["@type"] == ""
 					) {
+						failure(`Row ${i+2}: Missing or empty @type`);
 						return;
 					} else {
 						failure(
@@ -653,7 +696,8 @@ module.exports = class CTDLASNCSVImport {
 		ceo,
 		endpoint,
 		eim,
-		skip
+		skip,
+		validationRules
 	) {
 		Papa.parse(file, {
 			header: true,
@@ -670,6 +714,18 @@ module.exports = class CTDLASNCSVImport {
 					console.error('Error trimming data', e);
 				}
 
+				// Validate hierarchy before processing (only if validation rules provided)
+				if (validationRules && validationRules.validateHierarchy !== false) {
+					const hierarchyError = CTDLASNCSVImport.validateFrameworkHierarchy(
+						tabularData,
+						validationRules.hierarchyRules
+					);
+					if (hierarchyError) {
+						failure(hierarchyError);
+						return;
+					}
+				}
+
 				const terms = JSON.parse(JSON.stringify((await EcRemote.getExpectingObject("https://schema.cassproject.org/0.4/jsonld1.1/ceasn2cassTerms"))));
 				let frameworks = {};
 				let frameworkArray = [];
@@ -705,6 +761,19 @@ module.exports = class CTDLASNCSVImport {
 						pretranslatedE["@type"] ==
 						"ceterms:Collection"
 					) {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVImport.validateRequiredProperties(
+								pretranslatedE,
+								"ceterms:Collection",
+								i + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -762,9 +831,9 @@ module.exports = class CTDLASNCSVImport {
 						// Remove skipped competencies
 						if (skip && Array.isArray(skip) && skip.length > 0 && f.competency) {
 							skip.forEach((element) => {
-								const id = (element.ctid ? element.ctid : element).replace('ce-', '');								
+								const id = (element.ctid ? element.ctid : element).replace('ce-', '');
 								const index = f.competency.findIndex((comp) => comp.includes(id));
-								if (index) {
+								if (index >= 0) {
 									f.competency.splice(index, 1);
 								}
 							});
@@ -776,6 +845,19 @@ module.exports = class CTDLASNCSVImport {
 					} else if (
 						pretranslatedE["@type"] == "ceasn:Competency"
 					) {
+						// Validate required properties (only if validation rules provided)
+						if (validationRules && validationRules.requiredProps) {
+							const validationError = CTDLASNCSVImport.validateRequiredProperties(
+								pretranslatedE,
+								"ceterms:Collection:Competency",
+								i + 2,
+								validationRules.requiredProps
+							);
+							if (validationError) {
+								failure(validationError);
+								return;
+							}
+						}
 						let translator = new EcLinkedData(null, null);
 						translator.copyFrom(pretranslatedE);
 						CTDLASNCSVImport.cleanUpTranslator(
@@ -799,6 +881,7 @@ module.exports = class CTDLASNCSVImport {
 						let f = new EcCompetency();
 						f.copyFrom(e);
 						if (e["id"] == null) {
+							failure(`Row ${i+2}: Competency is missing an id`);
 							return;
 						}
 						if (e["ceterms:isMemberOf"] != null) {
@@ -992,6 +1075,7 @@ module.exports = class CTDLASNCSVImport {
 						pretranslatedE["@type"] == null ||
 						pretranslatedE["@type"] == ""
 					) {
+						failure(`Row ${i+2}: Missing or empty @type`);
 						return;
 					} else {
 						failure(
@@ -1244,6 +1328,77 @@ module.exports = class CTDLASNCSVImport {
 			frameworks[EcRemoteLinkedData.trimVersionFromUrl(e["ceasn:isPartOf"])].relation.push(r.shortId());
 		}
 	}
+	static validateRequiredProperties(obj, type, rowIndex, requiredProps) {
+		// Use provided validation rules or fall back to defaults
+		if (!requiredProps) {
+			return 'Required properties not defined.'
+		}
+
+		const props = requiredProps[type];
+		if (!props) return null;
+
+		const missing = [];
+		for (const prop of props) {
+			if (!obj[prop] || (typeof obj[prop] === 'string' && obj[prop].trim() === '')) {
+				missing.push(prop);
+			}
+		}
+
+		if (missing.length > 0) {
+			return `Row ${rowIndex}: Missing required properties for ${type}: ${missing.join(', ')}`;
+		}
+		return null;
+	}
+
+	static validateFrameworkHierarchy(tabularData, hierarchyRules) {
+		// Use provided hierarchy rules or fall back to defaults
+		if (!hierarchyRules) {
+			return 'Hierarchy rules not defined.'
+		}
+
+		// Check each type defined in hierarchy rules
+		for (const [type, rules] of Object.entries(hierarchyRules)) {
+			const hasType = tabularData.some(r => r && r["@type"] === type);
+			if (!hasType) continue;
+
+			let hasRequiredProp = false;
+			let hasChildProp = false;
+
+			for (const row of tabularData) {
+				if (!row || !row["@type"]) continue;
+
+				// Check if this row has any of the required properties
+				if (row["@type"] === type && rules.requiredProperties) {
+					for (const prop of rules.requiredProperties) {
+						if (row[prop]) {
+							hasRequiredProp = true;
+							break;
+						}
+					}
+				}
+
+				// Check if any row has child properties
+				if (rules.childProperties) {
+					for (const prop of rules.childProperties) {
+						if (row[prop]) {
+							hasChildProp = true;
+							break;
+						}
+					}
+				}
+
+				if (hasRequiredProp && hasChildProp) break;
+			}
+
+			// Validate that at least one of the hierarchy properties exists
+			if (!hasRequiredProp && !hasChildProp) {
+				return rules.errorMessage || `CSV must contain hierarchy properties for ${type}`;
+			}
+		}
+
+		return null;
+	}
+
 	static setDateCreated(importObject, object) {
 		if (
 			importObject["ceasn:dateCreated"] == null &&