Merge branch 'next', commit '0b3212db42b97a1f9c3575a4272f2533b2e4d77f' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/dataConnectors/mongo.ts

@@ -1,5 +1,6 @@
 import dayjs from 'dayjs';
 import { MongoClient } from 'mongodb';
+import { Decimal128 } from 'bson';
 import { IAdminForthDataSourceConnector, IAdminForthSingleFilter, IAdminForthAndOrFilter, AdminForthResource } from '../types/Back.js';
 import AdminForthBaseConnector from './baseConnector.js';
 
@@ -108,6 +109,8 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
           }
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
           return value ? true : false;
+        } else if (field.type == AdminForthDataTypes.DECIMAL) {
+            return Decimal128.fromString(value?.toString());
         }
         return value;
     }
@@ -138,6 +141,7 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         // const columns = resource.dataSourceColumns.filter(c=> !c.virtual).map((col) => col.name).join(', ');
         const tableName = resource.table;
 
+
         const collection = this.client.db().collection(tableName);
         const query = filters.subFilters.length ? this.getFilterQuery(resource, filters) : {};
 

adminforth/documentation/docs/tutorial/03-Customization/07-alert.md

@@ -34,7 +34,7 @@ import adminforth from '@/adminforth';
 const isConfirmed = await adminforth.confirm({message: 'Are you sure?', yes: 'Yes', no: 'No'})
 ```
 
-## Ussage example
+## Usage example
 
 Create a Vue component in the custom directory of your project, e.g. `Alerts.vue`:
 

adminforth/documentation/docs/tutorial/03-Customization/11-dataApi.md

@@ -108,13 +108,13 @@ const schools = await admin.resource('schools').list(
 );
 ```
 
-Get all users that have gmail address OR the ones created not in 2024
+Get all users that have gmail address AND the ones created not in 2024
 
 ```ts
 const users = await admin.resource('adminuser').list(
-  Filters.OR([
+  Filters.AND([
     Filters.LIKE('email', '@gmail.com'),
-    Filters.AND([
+    Filters.OR([
       Filters.LT('createdAt', '2024-01-01T00:00:00.000Z'),
       Filters.GTE('createdAt', '2025-01-01T00:00:00.000Z'),
     ]),