Merge pull request #398 from devforth/AdminForth/929

fix: fix isUnique resource constraint for the records edit

Author: ivictbor

adminforth/dataConnectors/baseConnector.ts

@@ -227,11 +227,19 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     throw new Error('Method not implemented.');
   }
 
-  async checkUnique(resource: AdminForthResource, column: AdminForthResourceColumn, value: any) {
+  async checkUnique(resource: AdminForthResource, column: AdminForthResourceColumn, value: any, record?: any): Promise<boolean> {
     process.env.HEAVY_DEBUG && console.log('☝️🪲🪲🪲🪲 checkUnique|||', column, value);
+
+    const primaryKeyField = this.getPrimaryKey(resource);
     const existingRecord = await this.getData({
       resource,
-      filters: { operator: AdminForthFilterOperators.AND, subFilters: [{ field: column.name, operator: AdminForthFilterOperators.EQ, value }]},
+      filters: { 
+        operator: AdminForthFilterOperators.AND, 
+        subFilters: [
+          { field: column.name, operator: AdminForthFilterOperators.EQ, value },
+          ...(record ? [{ field: primaryKeyField, operator: AdminForthFilterOperators.NE as AdminForthFilterOperators.NE, value: record[primaryKeyField] }] : [])
+        ]
+      },
       limit: 1,
       sort: [],
       offset: 0,
@@ -306,7 +314,7 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
   async updateRecord({ resource, recordId, newValues }: { resource: AdminForthResource; recordId: string; newValues: any; }): Promise<{ error?: string; ok: boolean; }> {
     // transform value using setFieldValue and call updateRecordOriginalValues
     const recordWithOriginalValues = {...newValues};
-
+    
     for (const field of Object.keys(newValues)) {
       const col = resource.dataSourceColumns.find((col) => col.name == field);
       // todo instead of throwing error, we can just not use setFieldValue here, and pass original value to updateRecordOriginalValues
@@ -319,6 +327,23 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
       }
       recordWithOriginalValues[col.name] = this.setFieldValue(col, newValues[col.name]);
     }
+    const record = await this.getRecordByPrimaryKey(resource, recordId);
+    let error: string | null = null;
+     await Promise.all(
+      resource.dataSourceColumns.map(async (col) => {
+        if (col.isUnique && !col.virtual && !error) {
+          const exists = await this.checkUnique(resource, col, recordWithOriginalValues[col.name], record);
+          if (exists) {
+            error = `Record with ${col.name} ${recordWithOriginalValues[col.name]} already exists`;
+          }
+        }
+      })
+    );
+    if (error) {
+      process.env.HEAVY_DEBUG && console.log('🪲🆕 check unique error', error);
+      return { error, ok: false };
+    }
+
 
     process.env.HEAVY_DEBUG && console.log(`🪲✏️ updating record id:${recordId}, values: ${JSON.stringify(recordWithOriginalValues)}`);
 

adminforth/index.ts

@@ -651,7 +651,10 @@ class AdminForth implements IAdminForth {
     } 
 
     if (Object.keys(newValues).length > 0) {
-      await connector.updateRecord({ resource, recordId, newValues });
+      const { error } = await connector.updateRecord({ resource, recordId, newValues });
+      if ( error ) {
+        return { error };
+      }
     }
 
     // execute hook if needed

adminforth/spa/src/views/EditView.vue

@@ -218,9 +218,9 @@ async function saveRecord(opts?: { confirmationResult?: any }) {
       variant: 'success',
       timeout: 400000
     });
+    router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: resp.recordId } });
   }
   saving.value = false;
-  router.push({ name: 'resource-show', params: { resourceId: route.params.resourceId, primaryKey: resp.recordId } });
 }
 
 </script>