adminforth 1.13.0-next.26 → 1.13.0-next.28

package/commands/createApp/templates/adminuser.ts.hbs

@@ -1,4 +1,5 @@
-import AdminForth, { AdminForthDataTypes, AdminForthResourceInput } from 'adminforth';
+import AdminForth, { AdminForthDataTypes, AdminForthResourceInput, AdminForthResource, AdminUser } from 'adminforth';
+
 import type { AdminUser } from  'adminforth';
 
 async function canModifyUsers({ adminUser }: { adminUser: AdminUser }): Promise<boolean> {
@@ -86,18 +87,19 @@ export default {
   ],
   hooks: {
     create: {
-      beforeSave: async ({ record, adminUser, resource }) => {
-        record.password_hash = await AdminForth.Utils.generatePasswordHash(record.password);
+      beforeSave: async ({ record, adminUser, resource }: { record: any, adminUser: AdminUser, resource: AdminForthResource }) => {
+        record.passwordHash = await AdminForth.Utils.generatePasswordHash(record.password);
         return { ok: true };
       }
     },
     edit: {
-      beforeSave: async ({ record, adminUser, resource }) => {
-        if (record.password) {
-          record.password_hash = await AdminForth.Utils.generatePasswordHash(record.password);
+      beforeSave: async ({ updates, adminUser, resource }: { updates: any, adminUser: AdminUser, resource: AdminForthResource }) => {
+        console.log('Updating user', updates);
+        if (updates.password) {
+          updates.passwordHash = await AdminForth.Utils.generatePasswordHash(updates.password);
         }
         return { ok: true }
       },
     },
-  }
+  },
 } as AdminForthResourceInput;

package/dist/spa/src/components/ResourceListTable.vue

@@ -21,7 +21,7 @@
             <div class="flex items-center">
               <input id="checkbox-all-search" type="checkbox" :checked="allFromThisPageChecked" @change="selectAll()" 
                     :disabled="!rows || !rows.length"
-                    class="w-4 h-4 cursor-pointer text-blue-600 bg-gray-100 border-gray-300 rounded
+                    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">
               <label for="checkbox-all-search" class="sr-only">{{ $t('checkbox') }}</label>
             </div>
@@ -416,7 +416,7 @@ async function selectAll(value) {
 const totalPages = computed(() => Math.ceil(props.totalRows / props.pageSize));
 
 const allFromThisPageChecked = computed(() => {
-  if (!props.rows) return false;
+  if (!props.rows || !props.rows.length) return false;
   return props.rows.every((r) => checkboxesInternal.value.includes(r._primaryKeyValue));
 });
 const ascArr = computed(() => sort.value.filter((s) => s.direction === 'asc').map((s) => s.field));
@@ -572,4 +572,13 @@ async function startCustomAction(actionId, row) {
 }
 
 
-</script>
+</script>
+
+<style lang="scss" scoped>
+input[type="checkbox"][disabled] {
+  @apply opacity-50;
+}
+input[type="checkbox"]:not([disabled]) {
+  @apply cursor-pointer;
+}
+</style>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.13.0-next.26",
+  "version": "1.13.0-next.28",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",