Merge branch 'next' of https://github.com/devforth/adminforth into fix-mongo-id-filter

Author: NoOne7135

adminforth/auth.ts

@@ -97,7 +97,7 @@ class AdminForthAuth implements IAdminForthAuth {
   }
 
   setCustomCookie({ response, payload }: {
-    response: any, payload: { name: string, value: string, expiry: number | undefined, expirySeconds: number | undefined, httpOnly: boolean }
+    response: any, payload: { name: string, value: string, expiry?: number | undefined, expirySeconds: number | undefined, httpOnly: boolean }
   }) {
     const {name, value, expiry, httpOnly, expirySeconds } = payload;
 

adminforth/types/Back.ts

@@ -307,7 +307,7 @@ export interface IAdminForthAuth {
 
   removeCustomCookie({response, name}: {response: any, name: string}): void;
 
-  setCustomCookie({response, payload}: {response: any, payload: {name: string, value: string, expiry: number, expirySeconds: number, httpOnly: boolean}}): void;
+  setCustomCookie({response, payload}: {response: any, payload: {name: string, value: string, expiry?: number, expirySeconds: number, httpOnly: boolean}}): void;
 
   getCustomCookie({cookies, name}: {cookies: {key: string, value: string}[], name: string}): string | null;
 

dev-demo/resources/carsResourseTemplate.ts

@@ -18,7 +18,7 @@ import AdminForthStorageAdapterLocalFilesystem from "../../adapters/adminforth-s
 import AdminForthAdapterS3Storage from '../../adapters/adminforth-storage-adapter-amazon-s3/index.js';
 import AdminForthImageVisionAdapterOpenAi from '../../adapters/adminforth-image-vision-adapter-openai/index.js';
 
-export default function carsResourseTemplate(resourceId: string, dataSource: string) {
+export default function carsResourseTemplate(resourceId: string, dataSource: string, pkFileldName: string) {
   return {
     dataSource: dataSource,
     table: 'cars',
@@ -35,7 +35,7 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
     *********************************************************************************/
     columns: [
       {
-        name: 'id',
+        name: pkFileldName,
         type: AdminForthDataTypes.STRING,
         label: 'Identifier',
         showIn: {

dev-demo/resources/cars_Ch.ts

@@ -1,4 +1,4 @@
 import carsResourseTemplate from "./carsResourseTemplate.js";
 
 
-export default carsResourseTemplate("cars_ch", "clickhouse");
+export default carsResourseTemplate("cars_ch", "clickhouse", "id");

dev-demo/resources/cars_MyS.ts

@@ -1,4 +1,4 @@
 import carsResourseTemplate from "./carsResourseTemplate.js";
 
 
-export default carsResourseTemplate("cars_mysql", "mysql");
+export default carsResourseTemplate("cars_mysql", "mysql", "id");

dev-demo/resources/cars_PG.ts

@@ -1,4 +1,4 @@
 import carsResourseTemplate from "./carsResourseTemplate.js";
 
 
-export default carsResourseTemplate("cars_pg", "postgres");
+export default carsResourseTemplate("cars_pg", "postgres", "id");

dev-demo/resources/cars_SL.ts

@@ -1,4 +1,4 @@
 import carsResourseTemplate from "./carsResourseTemplate.js";
 
 
-export default carsResourseTemplate("cars_sl", "sqlite");
+export default carsResourseTemplate("cars_sl", "sqlite", "id");

dev-demo/resources/cars_mongo.ts

@@ -1,4 +1,4 @@
 import carsResourseTemplate from "./carsResourseTemplate.js";
 
 
-export default carsResourseTemplate("cars_mongo", "mongo");
+export default carsResourseTemplate("cars_mongo", "mongo", "_id");