fixes search by strings containing "+"

Author: ivictbor

adminforth/dataConnectors/mongo.ts

@@ -5,6 +5,10 @@ import AdminForthBaseConnector from './baseConnector.js';
 
 import { AdminForthDataTypes, AdminForthFilterOperators, AdminForthSortDirections, } from '../types/Common.js';
 
+const escapeRegex = (value) => {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // Escapes special characters
+};
+
 class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataSourceConnector {
     db: MongoClient
 
@@ -31,8 +35,8 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         [AdminForthFilterOperators.LT]: (value) => ({ $lt: value }),
         [AdminForthFilterOperators.GTE]: (value) => ({ $gte: value }),
         [AdminForthFilterOperators.LTE]: (value) => ({ $lte: value }),
-        [AdminForthFilterOperators.LIKE]: (value) => ({ $regex: value }),
-        [AdminForthFilterOperators.ILIKE]: (value) => ({ $regex: value, $options: 'i' }),
+        [AdminForthFilterOperators.LIKE]: (value) => ({ $regex: escapeRegex(value) }),
+        [AdminForthFilterOperators.ILIKE]: (value) => ({ $regex: escapeRegex(value), $options: 'i' }),
         [AdminForthFilterOperators.IN]: (value) => ({ $in: value }),
         [AdminForthFilterOperators.NIN]: (value) => ({ $nin: value }),
     };

adminforth/package-lock.json

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

adminforth/package.json

@@ -25,14 +25,15 @@ export default class UploadPlugin extends AdminForthPlugin {
   async setupLifecycleRule() {
     // check that lifecyle rule "adminforth-unused-cleaner" exists
     const CLEANUP_RULE_ID = 'adminforth-unused-cleaner';
-    const s3 = new S3({
-      credentials: {
-        accessKeyId: this.options.s3AccessKeyId,
-        secretAccessKey: this.options.s3SecretAccessKey,
-      },
 
-      region: this.options.s3Region,
-    });
+    const s3 = new S3({
+        credentials: {
+          accessKeyId: this.options.s3AccessKeyId,
+          secretAccessKey: this.options.s3SecretAccessKey,
+        },
+        region: this.options.s3Region,
+      });
+   
     // check bucket exists
     const bucketExists = s3.headBucket({ Bucket: this.options.s3Bucket })
     if (!bucketExists) {
@@ -47,6 +48,8 @@ export default class UploadPlugin extends AdminForthPlugin {
         ruleExists = lifecycleConfig.Rules.some((rule: any) => rule.ID === CLEANUP_RULE_ID);
     } catch (e: any) {
       if (e.name !== 'NoSuchLifecycleConfiguration') {
+        console.error(`⛔ Error checking lifecycle configuration, please check keys have permissions to 
+getBucketLifecycleConfiguration on bucket ${this.options.s3Bucket} in region ${this.options.s3Region}. Exception:`, e);
         throw e;
       } else {
         ruleExists = false;

adminforth/plugins/upload/index.ts

@@ -1,12 +1,13 @@
 {
   "name": "@adminforth/upload",
-  "version": "1.0.30",
+  "version": "1.0.31-next.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "rollout": "tsc && rsync -av --exclude 'node_modules' custom dist/ && npm version patch && npm publish --access public",
     "prepare": "npm link adminforth",
+    "rollout-next": "npm run build && npm version prerelease --preid=next && npm publish --tag next",
     "build": "tsc"
   },
   "type": "module",

adminforth/plugins/upload/package-lock.json

@@ -13,6 +13,7 @@ import gamesUsersResource from './resources/games_users.js';
 import gamesResource from './resources/games.js';
 import translationsResource from './resources/translation.js';
 
+// const ADMIN_BASE_URL = '/portal';
 const ADMIN_BASE_URL = '';
 
 // create test1.db 
@@ -177,7 +178,7 @@ export const admin = new AdminForth({
     },
     {
       id: 'db3',
-      url: 'mongodb://127.0.0.1:27017/betbolt?retryWrites=true&w=majority&authSource=admin',
+      url: 'mongodb://127.0.0.1:27028/demo?retryWrites=true&w=majority&authSource=admin',
     },
     {
       id: 'ch',
@@ -228,11 +229,11 @@ export const admin = new AdminForth({
 
         },
 
-        // {
-        //   label: 'Games',
-        //   icon: 'flowbite:caret-right-solid',
-        //   resourceId: 'games',
-        // },
+        {
+          label: 'Games',
+          icon: 'flowbite:caret-right-solid',
+          resourceId: 'game',
+        },
         // {
         //   label: 'Games Users',
         //   icon: 'flowbite:user-solid',
@@ -288,7 +289,7 @@ export const admin = new AdminForth({
 
 const app = express()
 app.use(express.json());
-const port = 3000;
+const port = 30000;
 
 (async () => {
     console.log('🅿️🅿️🅿️ 🅿️Bundling AdminForth...');

adminforth/plugins/upload/package.json

@@ -33,14 +33,16 @@ services:
       - pg-data:/var/lib/postgresql/data
 
   mongo:
-    image: mongo:4.4
+    image:  mongo:6.0.5
     restart: always
+    environment:
+      MONGO_INITDB_DATABASE: demo
     ports:
-      - "27017:27017"
+      - "27028:27017"
     volumes:
-      - mongo-data:/data/db
+      - mongo-data1:/data/db
 
 volumes:
   clickhouse-data:
   pg-data:
-  mongo-data:
+  mongo-data1:

dev-demo/index.ts

@@ -15,7 +15,11 @@ export default {
       name: "bb_enabled",
       type: AdminForthDataTypes.BOOLEAN,
       required: false,
-      backendOnly: true,
+    },
+    {
+      name: "email",
+      type: AdminForthDataTypes.STRING,
+      required: false,
     },
     { name: "bb_rank", type: AdminForthDataTypes.INTEGER, required: false },
     {