Merge branch 'next' of github.com:devforth/adminforth into next

Author: SerVitasik

.gitignore

@@ -3,4 +3,5 @@ plugins/*
 !plugins/README.md
 adapters/*
 !adapters/README.md
-background-jobs-dbs
+background-jobs-dbs
+tests/jest_tests/db/

adminforth/dataConnectors/baseConnector.ts

@@ -498,14 +498,17 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       filters: IAdminForthAndOrFilter;
     }): Promise<number> {
       const tableName = resource.table;
+      let normalizedFilters = filters;
+
       // validate and normalize in case this method is called from dataAPI
       if (filters) {
         const filterValidation = this.validateAndNormalizeFilters(filters, resource);
         if (!filterValidation.ok) {
           throw new Error(filterValidation.error);
         }
+        normalizedFilters = filterValidation.normalizedFilters as IAdminForthAndOrFilter;
       }
-      const { where, params } = this.whereClause(resource, filters);
+      const { where, params } = this.whereClause(resource, normalizedFilters);
 
       const countQ = await this.client.query({
         query: `SELECT COUNT(*) as count FROM ${tableName} ${where}`,

adminforth/dataConnectors/clickhouse.ts

@@ -340,15 +340,18 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         resource: AdminForthResource,
         filters: IAdminForthAndOrFilter,
     }): Promise<number> {
+        let normalizedFilters = filters;
+
         if (filters) {
             // validate and normalize in case this method is called from dataAPI
             const filterValidation = this.validateAndNormalizeFilters(filters, resource);
             if (!filterValidation.ok) {
                 throw new Error(filterValidation.error);
             }
+            normalizedFilters = filterValidation.normalizedFilters as IAdminForthAndOrFilter;
         }
         const collection = this.client.db().collection(resource.table);
-        const query = filters.subFilters.length ? this.getFilterQuery(resource, filters) : {};
+        const query = normalizedFilters.subFilters.length ? this.getFilterQuery(resource, normalizedFilters) : {};
         return await collection.countDocuments(query);
     }
 

adminforth/dataConnectors/mongo.ts

@@ -365,14 +365,17 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
 
   async getCount({ resource, filters }: { resource: AdminForthResource; filters: IAdminForthAndOrFilter; }): Promise<number> {
     const tableName = resource.table;
+    let normalizedFilters = filters;
+
     // validate and normalize in case this method is called from dataAPI
     if (filters) {
       const filterValidation = this.validateAndNormalizeFilters(filters, resource);
       if (!filterValidation.ok) {
         throw new Error(filterValidation.error);
       }
+      normalizedFilters = filterValidation.normalizedFilters as IAdminForthAndOrFilter;
     }
-    const { sql: where, values: filterValues } = this.whereClauseAndValues(filters);
+    const { sql: where, values: filterValues } = this.whereClauseAndValues(normalizedFilters);
     const q = `SELECT COUNT(*) FROM ${tableName} ${where}`;
     dbLogger.trace(`🪲📜 MySQL Q: ${q} values: ${JSON.stringify(filterValues)}`);
     const [results] = await this.client.execute(q, filterValues);

adminforth/dataConnectors/mysql.ts

@@ -396,14 +396,17 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
 
     async getCount({ resource, filters }: { resource: AdminForthResource; filters: IAdminForthAndOrFilter; }): Promise<number> {
         const tableName = resource.table;
+        let normalizedFilters = filters;
+
         // validate and normalize in case this method is called from dataAPI
         if (filters) {
             const filterValidation = this.validateAndNormalizeFilters(filters, resource);
             if (!filterValidation.ok) {
                 throw new Error(filterValidation.error);
             }
+            normalizedFilters = filterValidation.normalizedFilters as IAdminForthAndOrFilter;
         }
-        const { sql: where, values: filterValues } = this.whereClauseAndValues(resource, filters);
+        const { sql: where, values: filterValues } = this.whereClauseAndValues(resource, normalizedFilters);
         const q = `SELECT COUNT(*) FROM "${tableName}" ${where}`;
         dbLogger.trace(`🪲📜 PG Q: ${q}, values: ${JSON.stringify(filterValues)}`);
         const stmt = await this.client.query(q, filterValues);

adminforth/dataConnectors/postgres.ts

@@ -326,16 +326,19 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
     }
 
     async getCount({ resource, filters }) {
+      let normalizedFilters = filters;
+
       if (filters) {
       // validate and normalize in case this method is called from dataAPI
         const filterValidation = this.validateAndNormalizeFilters(filters, resource);
         if (!filterValidation.ok) {
           throw new Error(filterValidation.error);
         }
+        normalizedFilters = filterValidation.normalizedFilters as IAdminForthAndOrFilter;
       }
       const tableName = resource.table;
-      const where = this.whereClause(filters);
-      const filterValues = this.getFilterParams(filters);
+      const where = this.whereClause(normalizedFilters);
+      const filterValues = this.getFilterParams(normalizedFilters);
       const q = `SELECT COUNT(*) FROM ${tableName} ${where}`;
       dbLogger.trace(`🪲📜 SQLITE Q: ${q}, params: ${JSON.stringify(filterValues)}`);
       const totalStmt = this.client.prepare(q);

adminforth/dataConnectors/sqlite.ts

@@ -109,7 +109,7 @@ Now create file `ApartsPie.vue` in the `custom` folder of your project:
 
 Also we have to add an Api to get percentages:
 
-```ts title="./index.ts"
+```ts title="/api.ts"
 import type { IAdminUserExpressRequest } from 'adminforth';
 import express from 'express';
 import * as z from 'zod';
@@ -152,10 +152,6 @@ import * as z from 'zod';
       )
     )
   );
-
-  // serve after you added all api
-  admin.discoverDatabases();
-  admin.express.serve(app)
 ```
 
 Install and import Zod before using this pattern: `pnpm add zod` or `npm install zod`, then `import * as z from 'zod';`. `admin.express.withSchema(...)` will convert the Zod schema to OpenAPI for you.