Issue 53225: Unable to delete row from ehr_lookups.procedures (#1018)

labkey-bpatel · web-flow · commit 0e15803fd240 · 2025-09-02T09:58:21.000-07:00
* Use registerHandlerForQuery for a BEFORE_DELETE event.
* Include the trigger script name as a parameter for a better error message.
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeecategory.js
@@ -24,15 +24,15 @@ function beforeDelete(row, errors){
     var fields = ['categoryname'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'category', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'category', row[fieldName], 'employeecategory')){
             addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table');
         }
 
-        if (helper.verifyNotUsed('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName], 'employeecategory')){
             addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the requirementspercategory table');
         }
 
-        if (helper.verifyNotUsed('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName], 'employeecategory')){
             addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the sopbycategory table');
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeelocations.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeelocations.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['location'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'location', row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'location', row[fieldName], 'employeelocations')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employees.js
@@ -63,14 +63,14 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'employeeid', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'employeeid', row[fieldName], 'employees')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
     }
 
     //also check trainer
-    if (helper.verifyNotUsed('ehr_compliancedb', 'completiondates', 'trainer', row[fieldName])){
+    if (helper.verifyNotUsed('ehr_compliancedb', 'completiondates', 'trainer', row[fieldName], 'employees')){
         addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table completiondates');
     }
 }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetitles.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetitles.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['title'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName], 'employeetitles')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetypes.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/employeetypes.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['type'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'employees', fieldName, row[fieldName], 'employeetypes')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirements.js
@@ -63,7 +63,7 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName], 'requirements')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementtype.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/requirementtype.js
@@ -22,7 +22,7 @@ function beforeDelete(row, errors){
     var fields = ['type'], fieldName;
     for (var i=0;i<fields.length;i++){
         fieldName = fields[i];
-        if (helper.verifyNotUsed('ehr_compliancedb', 'requirements', fieldName, row[fieldName])){
+        if (helper.verifyNotUsed('ehr_compliancedb', 'requirements', fieldName, row[fieldName], 'requirementtype')){
             errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the requirements table'];
         }
     }
diff --git a/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js b/EHR_ComplianceDB/resources/queries/ehr_compliancedb/unit_names.js
@@ -26,7 +26,7 @@ function beforeDelete(row, errors){
         query = queries[j];
         for (var i=0;i<fields.length;i++){
             fieldName = fields[i];
-            if (helper.verifyNotUsed('ehr_compliancedb', query, 'unit', row[fieldName])){
+            if (helper.verifyNotUsed('ehr_compliancedb', query, 'unit', row[fieldName], 'unit_names')){
                 addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
             }
         }
diff --git a/ehr/resources/queries/ehr_lookups/procedures.js b/ehr/resources/queries/ehr_lookups/procedures.js
@@ -6,15 +6,17 @@
 
 var console = require("console");
 var LABKEY = require("labkey");
+var triggers = require("ehr/triggers");
+triggers.initScript(this);
+var EHR = triggers.EHR;
 
-var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_lookups', 'procedures');
+var lookupValidationHelper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.currentContainer.id, LABKEY.Security.currentUser.id, 'ehr_lookups', 'procedures');
 
-
-function beforeDelete(row, errors){
-    if (helper.verifyNotUsed('study', 'encounters', 'procedureid', row['rowid'])){
+EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.BEFORE_DELETE, 'ehr_lookups', 'procedures', function(helper, scriptErrors, row, oldRow){
+    if (lookupValidationHelper.verifyNotUsed('study', 'encounters', 'procedureid', row['rowid'], 'procedures')) {
         addError(errors, 'name', 'Cannot delete row with ID: ' + row['rowid'] + ' because it is referenced by the table encounters.  You should inactivate this item instead.');
     }
-}
+});
 
 function addError(errors, fieldName, msg){
     if (!errors[fieldName])

Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,15 @@ function beforeDelete(row, errors){`
`24`	`24`	`var fields = ['categoryname'], fieldName;`
`25`	`25`	`for (var i=0;i<fields.length;i++){`
`26`	`26`	`fieldName = fields[i];`
`27`		`- if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'category', row[fieldName])){`
	`27`	`+ if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'category', row[fieldName], 'employeecategory')){`
`28`	`28`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table');`
`29`	`29`	`}`
`30`	`30`
`31`		`- if (helper.verifyNotUsed('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName])){`
	`31`	`+ if (helper.verifyNotUsed('ehr_compliancedb', 'requirementspercategory', 'category', row[fieldName], 'employeecategory')){`
`32`	`32`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the requirementspercategory table');`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (helper.verifyNotUsed('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName])){`
	`35`	`+ if (helper.verifyNotUsed('ehr_compliancedb', 'sopbycategory', 'category', row[fieldName], 'employeecategory')){`
`36`	`36`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the sopbycategory table');`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function beforeDelete(row, errors){`
`22`	`22`	`var fields = ['location'], fieldName;`
`23`	`23`	`for (var i=0;i<fields.length;i++){`
`24`	`24`	`fieldName = fields[i];`
`25`		`- if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'location', row[fieldName])){`
	`25`	`+ if (helper.verifyNotUsed('ehr_compliancedb', 'employees', 'location', row[fieldName], 'employeelocations')){`
`26`	`26`	`errors[fieldName] = ['Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the employees table'];`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,14 @@ function beforeDelete(row, errors){`
`63`	`63`	`query = queries[j];`
`64`	`64`	`for (var i=0;i<fields.length;i++){`
`65`	`65`	`fieldName = fields[i];`
`66`		`- if (helper.verifyNotUsed('ehr_compliancedb', query, 'employeeid', row[fieldName])){`
	`66`	`+ if (helper.verifyNotUsed('ehr_compliancedb', query, 'employeeid', row[fieldName], 'employees')){`
`67`	`67`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`//also check trainer`
`73`		`- if (helper.verifyNotUsed('ehr_compliancedb', 'completiondates', 'trainer', row[fieldName])){`
	`73`	`+ if (helper.verifyNotUsed('ehr_compliancedb', 'completiondates', 'trainer', row[fieldName], 'employees')){`
`74`	`74`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table completiondates');`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ function beforeDelete(row, errors){`
`63`	`63`	`query = queries[j];`
`64`	`64`	`for (var i=0;i<fields.length;i++){`
`65`	`65`	`fieldName = fields[i];`
`66`		`- if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName])){`
	`66`	`+ if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName], 'requirements')){`
`67`	`67`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function beforeDelete(row, errors){`
`26`	`26`	`query = queries[j];`
`27`	`27`	`for (var i=0;i<fields.length;i++){`
`28`	`28`	`fieldName = fields[i];`
`29`		`- if (helper.verifyNotUsed('ehr_compliancedb', query, 'unit', row[fieldName])){`
	`29`	`+ if (helper.verifyNotUsed('ehr_compliancedb', query, 'unit', row[fieldName], 'unit_names')){`
`30`	`30`	`addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);`
`31`	`31`	`}`
`32`	`32`	`}`