adminforth 1.3.21 → 1.3.22

package/dist/modules/configValidator.js

@@ -251,6 +251,7 @@ export default class ConfigValidator {
                         label: `Delete checked`,
                         state: 'danger',
                         icon: 'flowbite:trash-bin-outline',
+                        confirm: 'Are you sure you want to delete selected items?',
                         allowed: (_b) => __awaiter(this, [_b], void 0, function* ({ resource, adminUser, allowedActions }) { return allowedActions.delete; }),
                         action: (_c) => __awaiter(this, [_c], void 0, function* ({ selectedIds, adminUser }) {
                             const connector = this.adminforth.connectors[res.dataSource];
@@ -286,7 +287,7 @@ export default class ConfigValidator {
                             if (error) {
                                 return { error, ok: false };
                             }
-                            return { ok: true };
+                            return { ok: true, successMessage: `${selectedIds.length} item${selectedIds.length > 1 ? 's' : ''} deleted` };
                         })
                     });
                 }

package/dist/modules/restApi.js

@@ -43,7 +43,7 @@ export default class AdminForthRestAPI {
             path: '/login',
             handler: (_a) => __awaiter(this, [_a], void 0, function* ({ body, response }) {
                 var _b, _c, _d, _e;
-                const INVALID_MESSAGE = 'Invalid username or password';
+                const INVALID_MESSAGE = 'Invalid Username or Password';
                 const { username, password } = body;
                 let adminUser;
                 let toReturn = { ok: true, allowedLogin: true };
@@ -71,9 +71,8 @@ export default class AdminForthRestAPI {
                     offset: 0,
                     sort: [],
                 })).data) === null || _b === void 0 ? void 0 : _b[0];
-                console.log('userRecord', userRecord, this.adminforth.config.auth.usernameField, username);
                 if (!userRecord) {
-                    return { error: 'User not found' };
+                    return { error: INVALID_MESSAGE };
                 }
                 const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];
                 const valid = yield AdminForthAuth.verifyPassword(password, passwordHash);

package/modules/configValidator.ts

@@ -6,6 +6,7 @@ import {
   AdminForthResourcePages, AllowedActionsEnum,
   type AdminForthComponentDeclarationFull,
   type AfterSaveFunction,
+  AdminForthBulkAction,
 } from "../types/AdminForthConfig.js";
 
 import fs from 'fs';
@@ -260,7 +261,7 @@ export default class ConfigValidator implements IConfigValidator {
 
 
         //check if resource has bulkActions
-        let bulkActions = res?.options?.bulkActions || [];
+        let bulkActions: AdminForthBulkAction[] = res?.options?.bulkActions || [];
 
         if (!Array.isArray(bulkActions)) {
           errors.push(`Resource "${res.resourceId}" bulkActions must be an array`);
@@ -272,6 +273,7 @@ export default class ConfigValidator implements IConfigValidator {
             label: `Delete checked`,
             state: 'danger',
             icon: 'flowbite:trash-bin-outline',
+            confirm: 'Are you sure you want to delete selected items?',
             allowed: async ({ resource, adminUser, allowedActions }) => { return allowedActions.delete },
             action: async ({ selectedIds, adminUser }) => {
               const connector = this.adminforth.connectors[res.dataSource];
@@ -324,7 +326,7 @@ export default class ConfigValidator implements IConfigValidator {
               if (error) {
                 return { error, ok: false };
               }
-              return { ok: true };
+              return { ok: true, successMessage: `${selectedIds.length} item${selectedIds.length > 1 ? 's' : ''} deleted` };
             }
           });
         }

package/modules/restApi.ts

@@ -62,7 +62,7 @@ export default class AdminForthRestAPI {
       path: '/login',
       handler: async ({ body, response }) => {
        
-        const INVALID_MESSAGE = 'Invalid username or password';
+        const INVALID_MESSAGE = 'Invalid Username or Password';
         const { username, password } = body;
         let adminUser: AdminUser;
         let toReturn: { ok: boolean, redirectTo?: string, allowedLogin:boolean } = { ok: true, allowedLogin:true};
@@ -95,10 +95,9 @@ export default class AdminForthRestAPI {
           })
         ).data?.[0];
 
-        console.log('userRecord', userRecord, this.adminforth.config.auth.usernameField, username);
 
         if (!userRecord) {
-          return { error: 'User not found' };
+          return { error: INVALID_MESSAGE };
         }
 
         const passwordHash = userRecord[this.adminforth.config.auth.passwordHashField];

package/package.json

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

package/spa/src/composables/useFrontendApi.ts

@@ -9,7 +9,7 @@ export function showWarningTost(message: string) {
 }
 
 export function showErrorTost(message: string, timeout?: number) {
-  window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 'unlimited'});  
+  window.adminforth.alert({ message, variant: 'danger', timeout: timeout || 30});  
   return message;
 }
 

package/spa/src/composables/useStores.ts

@@ -57,7 +57,11 @@ export class FrontendAPI implements FrontendAPIInterface {
 
   confirm(params: ConfirmParams): Promise<void> {
     return new Promise((resolve, reject) => {
-      this.modalStore.setModalContent({ content: params.message, acceptText: params.yes, cancelText: params.no })
+      this.modalStore.setModalContent({ 
+        content: params.message, 
+        acceptText: params.yes || 'Yes',
+        cancelText: params.no || 'Cancel' 
+      })
       this.modalStore.onAcceptFunction = resolve
       this.modalStore.onCancelFunction = reject
       this.modalStore.togleModal()

package/spa/src/stores/core.ts

@@ -71,7 +71,7 @@ export const useCoreStore = defineStore('core', () => {
       window.adminforth.alert({
         message: respData.error,
         variant: 'danger',
-        timeout: 'unlimited'
+        timeout: 30,
       });
       record.value = {};
     } else {

package/spa/src/stores/toast.ts

@@ -1,14 +1,30 @@
-import { ref, computed } from 'vue'
+import { ref, watch, type Ref } from 'vue'
 import { defineStore } from 'pinia'
-import { callAdminForthApi } from '@/utils';
 import { v1 as uuid } from 'uuid';
+import { useRoute } from 'vue-router';
+
+
 
 export const useToastStore = defineStore('toast', () => {
-    const toasts = ref([]);
-    const addToast = (toast) => {
-        toasts.value.push({...toast, id: uuid()});
+    const toasts: Ref<any[]> = ref([]);
+    const route = useRoute();
+
+    watch(route, () => {
+        console.log('route changed 121');
+        // on route change clear all toasts older then 5 seconds
+        const now = +new Date();
+        toasts.value = toasts.value.filter((t) => now - t.createdAt < 5000);
+    });
+
+    const addToast = (toast: { message: string; variant: string }) => {
+        const toastId = uuid();
+        toasts.value.push({
+            ...toast,
+            id: toastId,
+            createdAt: +new Date(),
+        });
     };
-    const removeToast = (toast) => {
+    const removeToast = (toast: { id: string }) => {
         toasts.value = toasts.value.filter((t) => t.id !== toast.id);
     };
     return { toasts, addToast, removeToast };

package/spa/src/views/CreateView.vue

@@ -149,6 +149,10 @@ async function saveRecord() {
         primaryKey: response.newRecordId
       } 
     });
+    window.adminforth.alert({
+      message: 'Record created successfully',
+      variant: 'success'
+    });
   }
 }
 

package/spa/src/views/ListView.vue

@@ -179,6 +179,16 @@ async function getList() {
 }
 
 async function startBulkAction(actionId) {
+  const action = coreStore.resource.options.bulkActions.find(a => a.id === actionId);
+  if (action.confirm) {
+    const confirmed = await window.adminforth.confirm({
+      message: action.confirm,
+    });
+    if (!confirmed) {
+      return;
+    }
+  }
+
   const data = await callAdminForthApi({
     path: '/start_bulk_action',
     method: 'POST',
@@ -192,6 +202,14 @@ async function startBulkAction(actionId) {
   if (data?.ok) {
     checkboxes.value = [];
     await getList();
+
+    if (data.successMessage) {
+      window.adminforth.alert({
+        message: data.successMessage,
+        variant: 'success'
+      });
+    }
+
   }
   if (data?.error) {
     showErrorTost(data.error);

package/types/AdminForthConfig.ts

@@ -744,13 +744,17 @@ export type AdminForthBulkAction = {
    * Callback which will be called on backend when user clicks on action button.
    * It should return Promise which will be resolved when action is done.
    */
-  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string }>,
+  action: ({ resource, selectedIds, adminUser }: { resource: AdminForthResource, selectedIds: Array<any>, adminUser: AdminUser }) => Promise<{ ok: boolean, error?: string, successMessage?: string }>,
 
   /**
    * Confirmation message which will be displayed to user before action is executed.
    */
   confirm?: string,
 
+  /**
+   * Success message which will be displayed to user after action is executed.
+   */
+  successMessage?: string,
   /**
    * Allowed callback called to check whether action is allowed for user.
    * 1. It called first time when user goes to list view. If callback returns false, action button will be hidden on list view.