fix: resolve copilot comment

Author: kulikp1

adminforth/dataConnectors/mysql.ts

@@ -96,8 +96,9 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
         childTable: fk.child_table
       };
       if (fkMap[fk.column_name].cascade) {
-        afLogger.warn(`The database has ON DELETE CASCADE, which may conflict with adminForth cascade deletion and upload logic. Please remove it.`);      }
+        afLogger.warn(`The database has ON DELETE CASCADE, which may conflict with adminForth cascade deletion and upload logic. Please remove it.`);      
       }
+    }
     const fieldTypes = {};
     results.forEach((row) => {
       const field: any = {};

adminforth/dataConnectors/postgres.ts

@@ -110,8 +110,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         const tableName = resource.table;
         const fkMap = await this.getPgFkCascadeMap(tableName);
         const hasCascade = Object.values(fkMap).some(fk => fk.cascade);
-        const cascadeWarningShownMap: Record<string, boolean> = {};
-        if (hasCascade && !cascadeWarningShownMap[tableName]) {
+        if (hasCascade) {
             afLogger.warn(`The database has ON DELETE CASCADE, which may conflict with adminForth cascade deletion and upload logic. Please remove it.`);
         }
         const stmt = await this.client.query(`

adminforth/modules/configValidator.ts

@@ -621,7 +621,7 @@ export default class ConfigValidator implements IConfigValidator {
 
         if (col.foreignResource) {
           if (col.foreignResource.onDelete && (col.foreignResource.onDelete !== 'cascade' && col.foreignResource.onDelete !== 'setNull')){
-              errors.push (`Wrong delete strategy you can use 'setNull' or 'cascade'`);
+              errors.push (`Resource "${res.resourceId}" column "${col.name}" has wrong delete strategy, you can use 'setNull' or 'cascade'`);
           }
           if (!col.foreignResource.resourceId) {
             // resourceId is absent or empty

adminforth/modules/restApi.ts

@@ -1467,38 +1467,42 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
             if (!resource.options.allowedActions.delete) {
                 return { error: `Resource '${resource.resourceId}' does not allow delete action` };
             } 
+            
+            const { allowedActions } = await interpretResource(
+              adminUser, 
+              resource, 
+              { requestBody: body, record: record }, 
+              ActionCheckSource.DeleteRequest,
+              this.adminforth
+            );
+
+            const { allowed, error } = checkAccess(AllowedActionsEnum.delete, allowedActions);
+            if (!allowed) {
+              return { error };
+            }
+
             const childResources = this.adminforth.config.resources.filter(r => r.columns.some(c => c.foreignResource?.resourceId === resource.resourceId)); 
             if (childResources.length){
               for (const childRes of childResources) {
                 const foreignResourceColumn = childRes.columns.find(c => c.foreignResource?.resourceId === resource.resourceId);
                 if (!foreignResourceColumn.foreignResource.onDelete) continue;
                 const onDeleteStrategy = foreignResourceColumn.foreignResource.onDelete;    
                 const childRecords = await this.adminforth.resource(childRes.resourceId).list(Filters.EQ(foreignResourceColumn.name, body['primaryKey']))
+                const childPkColumn = childRes.columns.find(col => col.primaryKey);
+                if (!childPkColumn) continue;
+                const childPkFieldName = childPkColumn.name;
                 if (onDeleteStrategy === 'cascade') {
                   for (const childRecord of childRecords) {
-                    await this.adminforth.resource(childRes.resourceId).delete(childRecord.id);
+                    await this.adminforth.resource(childRes.resourceId).delete(childRecord[childPkFieldName]);
                   }
                 } else if (onDeleteStrategy === 'setNull') {
                   for (const childRecord of childRecords) {
-                    await this.adminforth.resource(childRes.resourceId).update(childRecord.id, {[foreignResourceColumn.name]: null});
+                    await this.adminforth.resource(childRes.resourceId).update(childRecord[childPkFieldName], {[foreignResourceColumn.name]: null});
                   }
                 }
               }
             }
 
-            const { allowedActions } = await interpretResource(
-              adminUser, 
-              resource, 
-              { requestBody: body, record: record }, 
-              ActionCheckSource.DeleteRequest,
-              this.adminforth
-            );
-
-            const { allowed, error } = checkAccess(AllowedActionsEnum.delete, allowedActions);
-            if (!allowed) {
-              return { error };
-            }
-
             const { error: deleteError } = await this.adminforth.deleteResourceRecord({ 
               resource, record, adminUser, recordId: body['primaryKey'], response, 
               extra: { body, query, headers, cookies, requestUrl, response } 

adminforth/types/Back.ts

@@ -2037,7 +2037,7 @@ export interface AdminForthForeignResource extends AdminForthForeignResourceComm
       afterDatasourceResponse?: AfterDataSourceResponseFunction | Array<AfterDataSourceResponseFunction>,
     },
   },
-  onDelete: 'cascade' | 'setNull'
+  onDelete?: 'cascade' | 'setNull'
 }
 
 export type ShowInModernInput = {