adminforth 1.3.11 → 1.3.13

package/dataConnectors/baseConnector.ts

@@ -57,25 +57,28 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
     throw new Error('Method not implemented.');
   }
 
-  createRecord({ resource, record, adminUser }: { 
+  async createRecord({ resource, record, adminUser }: { 
     resource: AdminForthResource; record: any; adminUser: any;
-  }): Promise<void> {
+  }): Promise<any> {
     // transform value using setFieldValue and call createRecordOriginalValues
-    const newRecord = {...record};
-    
+    const filledRecord = {...record};
+    const recordWithOriginalValues = {...record};
+
     for (const col of resource.dataSourceColumns) {
       if (col.fillOnCreate) {
-        if (record[col.name] === undefined) {
-            record[col.name] = col.fillOnCreate({
-                initialRecord: record, adminUser
-             });
+        if (filledRecord[col.name] === undefined) {
+          filledRecord[col.name] = col.fillOnCreate({
+            initialRecord: record, 
+            adminUser
+          });
         }
       }
-
-        newRecord[col.name] = this.setFieldValue(col, record[col.name]);
+      recordWithOriginalValues[col.name] = this.setFieldValue(col, filledRecord[col.name]);
     }
-    process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', newRecord);
-    return this.createRecordOriginalValues({ resource, record: newRecord });
+    process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', recordWithOriginalValues);
+    await this.createRecordOriginalValues({ resource, record: recordWithOriginalValues });
+
+    return recordWithOriginalValues;
   }
 
   updateRecord({ resource, recordId, newValues }: { resource: AdminForthResource; recordId: string; newValues: any; }): Promise<void> {

package/dist/dataConnectors/baseConnector.js

@@ -50,21 +50,26 @@ export default class AdminForthBaseConnector {
     createRecordOriginalValues({ resource, record }) {
         throw new Error('Method not implemented.');
     }
-    createRecord({ resource, record, adminUser }) {
-        // transform value using setFieldValue and call createRecordOriginalValues
-        const newRecord = Object.assign({}, record);
-        for (const col of resource.dataSourceColumns) {
-            if (col.fillOnCreate) {
-                if (record[col.name] === undefined) {
-                    record[col.name] = col.fillOnCreate({
-                        initialRecord: record, adminUser
-                    });
+    createRecord(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ resource, record, adminUser }) {
+            // transform value using setFieldValue and call createRecordOriginalValues
+            const filledRecord = Object.assign({}, record);
+            const recordWithOriginalValues = Object.assign({}, record);
+            for (const col of resource.dataSourceColumns) {
+                if (col.fillOnCreate) {
+                    if (filledRecord[col.name] === undefined) {
+                        filledRecord[col.name] = col.fillOnCreate({
+                            initialRecord: record,
+                            adminUser
+                        });
+                    }
                 }
+                recordWithOriginalValues[col.name] = this.setFieldValue(col, filledRecord[col.name]);
             }
-            newRecord[col.name] = this.setFieldValue(col, record[col.name]);
-        }
-        process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', newRecord);
-        return this.createRecordOriginalValues({ resource, record: newRecord });
+            process.env.HEAVY_DEBUG && console.log('🪲🪲🪲🪲 creating record', recordWithOriginalValues);
+            yield this.createRecordOriginalValues({ resource, record: recordWithOriginalValues });
+            return recordWithOriginalValues;
+        });
     }
     updateRecord({ resource, recordId, newValues }) {
         throw new Error('Method not implemented.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.3.11",
+  "version": "1.3.13",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/components/ResourceListTable.vue

@@ -70,7 +70,7 @@
         </td>
       </tr>
 
-      <tr @click="onClick($event,row)"   v-else v-for="(row, rowI) in rows" :key="row.id"
+      <tr @click="onClick($event,row)"   v-else v-for="(row, rowI) in rows" :key="`row_${row._primaryKeyValue}`"
           class="bg-lightListTable dark:bg-darkListTable border-lightListBorder dark:border-gray-700 hover:bg-lightListTableRowHover dark:hover:bg-darkListTableRowHover cursor-pointer"
         :class="{'border-b': rowI !== rows.length - 1}"
       >
@@ -80,8 +80,8 @@
               @click="(e)=>{e.stopPropagation()}"
               id="checkbox-table-search-1"
               type="checkbox"
-              :checked="checkboxesInternal.includes(row.id)"
-              @change="(e)=>{addToCheckedValues(row.id)}"
+              :checked="checkboxesInternal.includes(row._primaryKeyValue)"
+              @change="(e)=>{addToCheckedValues(row._primaryKeyValue)}"
               class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 dark:focus:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600 cursor-pointer">
             <label for="checkbox-table-search-1" class="sr-only">checkbox</label>
           </div>
@@ -299,6 +299,7 @@ watch(() => props.sort, (newSort) => {
 });
 
 function addToCheckedValues(id) {
+  console.log('checking', checkboxesInternal.value, 'id', id)
   if (checkboxesInternal.value.includes(id)) {
     checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== id);
   } else {
@@ -312,13 +313,13 @@ const columnsListed = computed(() => props.resource?.columns?.filter(c => c.show
 async function selectAll(value) {
   if (!allFromThisPageChecked.value) {
     props.rows.forEach((r) => {
-      if (!checkboxesInternal.value.includes(r.id)) {
-        checkboxesInternal.value.push(r.id)
+      if (!checkboxesInternal.value.includes(r._primaryKeyValue)) {
+        checkboxesInternal.value.push(r._primaryKeyValue)
       } 
     });
   } else {
     props.rows.forEach((r) => {
-      checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== r.id);
+      checkboxesInternal.value = checkboxesInternal.value.filter((item) => item !== r._primaryKeyValue);
     });
   }
   checkboxesInternal.value = [ ...checkboxesInternal.value ];
@@ -328,7 +329,7 @@ const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
 const allFromThisPageChecked = computed(() => {
   if (!props.rows) return false;
-  return props.rows.every((r) => checkboxesInternal.value.includes(r.id));
+  return props.rows.every((r) => checkboxesInternal.value.includes(r._primaryKeyValue));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
 const descArr = computed(() => sort.value.filter((s) => s.direction === 'desc').map((s) => s.field));

package/types/AdminForthConfig.ts

@@ -226,7 +226,7 @@ export interface IAdminForthDataSourceConnectorBase extends IAdminForthDataSourc
     resource: AdminForthResource, 
     record: any 
     adminUser: AdminUser
-  }): Promise<void>;
+  }): Promise<any>;
 
   getMinMaxForColumns({ resource, columns }: { resource: AdminForthResource, columns: AdminForthResourceColumn[] }): Promise<{ [key: string]: { min: any, max: any } }>;
 }