Merge branch 'next' of https://github.com/devforth/adminforth into feature/AdminForth/1323/show-beautiful-404-error-when-

Author: kulikp1

README.md

@@ -3,6 +3,7 @@
 
 <a href="https://adminforth.dev"><img src="https://img.shields.io/badge/website-adminforth.dev-blue" style="height:24px"/></a> <a href="https://adminforth.dev"><img src="https://img.shields.io/npm/dw/adminforth" style="height:24px"/></a> <a href="https://devforth.io"><img src="https://raw.githubusercontent.com/devforth/OnLogs/e97944fffc24fec0ce2347b205c9bda3be8de5c5/.assets/df_powered_by.svg" style="height:28px"/></a>
 
+[![Ask AI](http://tluma.ai/badge)](http://tluma.ai/ask-ai/devforth/adminforth)
 
 * [Try live demo](https://demo.adminforth.dev/)  (Read-only mode)
 
@@ -136,4 +137,4 @@ This will always run latest version of adminforth package.
 
 ## Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=adminforth/adminforth&type=date&legend=top-left)](https://www.star-history.com/#adminforth/adminforth&type=date&legend=top-left)
+[![Star History Chart](https://api.star-history.com/svg?repos=devforth/adminforth&type=date&legend=top-left)](https://www.star-history.com/#devforth/adminforth&type=date&legend=top-left)

adminforth/auth.ts

@@ -45,7 +45,7 @@ class AdminForthAuth implements IAdminForthAuth {
     this.adminforth = adminforth;
   }
 
-getClientIp(headers: object) {
+  getClientIp(headers: object) {
     const clientIpHeader = this.adminforth.config.auth.clientIpHeader;
 
     const headersLower = Object.keys(headers).reduce((acc, key) => {

adminforth/dataConnectors/clickhouse.ts

@@ -499,6 +499,21 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
       return res;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[] }): Promise<number> {
+      const pkColumn = resource.dataSourceColumns.find((col) => col.primaryKey);
+      if (!pkColumn || !recordIds || recordIds.length === 0) {
+         return 0;
+       }
+      const paramNames = recordIds.map((_, idx) => `id${idx}`);
+      const conditions = paramNames.map((name) => `${pkColumn.name} = {${name}:${pkColumn._underlineType}}`).join(' OR ');
+      const queryParams = paramNames.reduce((acc, name, idx) => {acc[name] = recordIds[idx]; return acc;}, {} as Record<string, any>);
+      await this.client.command({
+        query: `ALTER TABLE ${this.dbName}.${resource.table} DELETE WHERE ${conditions}`,
+        query_params: queryParams,
+      });
+      return recordIds.length;
+    }
+
     close() {
       this.client.disconnect();
     }

adminforth/dataConnectors/mongo.ts

@@ -397,6 +397,15 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
         return res.deletedCount > 0;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[] }): Promise<number> {
+        if (!recordIds || recordIds.length === 0) {
+            return 0;
+        }
+        const collection = this.client.db().collection(resource.table);
+        const res = await collection.deleteMany({[this.getPrimaryKey(resource)]: { $in: recordIds }});
+        return res.deletedCount ?? 0;
+    }
+
     async close() {
         await this.client.close()
     }

adminforth/dataConnectors/mysql.ts

@@ -420,6 +420,17 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
     return res.rowCount > 0;
   }
 
+  async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[] }): Promise<number> {
+    if (!recordIds || recordIds.length === 0) {
+      return 0;
+    }
+    const placeholders = recordIds.map(() => '?').join(',');
+    const query = `DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} IN (${placeholders})`;
+    dbLogger.trace(`🪲📜 MySQL Q: ${query} values: ${JSON.stringify([recordIds])}`);
+    const [result] = await this.client.execute(query, recordIds);
+    return result.affectedRows ?? 0;
+  }
+
   async close() {
     await this.client.end();
   }

adminforth/dataConnectors/postgres.ts

@@ -455,6 +455,17 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
         return res.rowCount > 0;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource; recordIds: string[]}): Promise<number> {
+        if (!recordIds || recordIds.length === 0) {
+            return 0;
+        }
+        const placeholders = recordIds.map((_, idx) => `$${idx + 1}`).join(', ');
+        const query = `DELETE FROM "${resource.table}" WHERE "${this.getPrimaryKey(resource)}" IN (${placeholders})`;
+        dbLogger.trace(`🪲📜 PG Q: ${query}, values: ${JSON.stringify([recordIds])}`);
+        const res = await this.client.query(query, recordIds);
+        return res.rowCount ?? 0;
+    }
+
     async close() {
         await this.client.end();
     }

adminforth/dataConnectors/sqlite.ts

@@ -382,6 +382,17 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
       return res.changes > 0;
     }
 
+    async deleteMany({ resource, recordIds }: { resource: AdminForthResource, recordIds: string[] }): Promise<number> {
+      if (!recordIds || recordIds.length === 0) {
+        return 0;
+      }
+      const placeholders = recordIds.map(() => '?').join(',');
+      const q = this.client.prepare(`DELETE FROM ${resource.table} WHERE ${this.getPrimaryKey(resource)} IN (${placeholders})`);
+      dbLogger.trace(`🪲📜 SQLITE Q: ${q}, params: ${JSON.stringify(recordIds)}`);
+      const res = await q.run(...recordIds);
+      return res.changes ?? 0;
+    }
+
     close() {
       this.client.close();
     }

adminforth/documentation/blog/2025-02-19-compose-aws-ec2-ecr-terraform-github-actions/index.md

@@ -294,14 +294,6 @@ resource "aws_security_group" "instance_sg" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  ingress {
-    description = "Allow Docker registry"
-    from_port   = 5000
-    to_port     = 5000
-    protocol    = "tcp"
-    cidr_blocks = ["0.0.0.0/0"]
-  }
-
   # SSH
   ingress {
     description = "Allow SSH"
@@ -351,26 +343,52 @@ resource "aws_instance" "app_instance" {
 
   user_data = <<-EOF
     #!/bin/bash
-    sudo apt-get update
-    sudo apt-get install ca-certificates curl python3 python3-pip -y
-    sudo install -m 0755 -d /etc/apt/keyrings
-    sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
-    sudo chmod a+r /etc/apt/keyrings/docker.asc
+    set -euo pipefail
+
+    LOG_FILE="/home/ubuntu/user_data.log"
+    exec > >(tee -a "$LOG_FILE") 2>&1
+    chown ubuntu:ubuntu "$LOG_FILE" || true
+
+    touch /home/ubuntu/user_data_started
+
+    on_error() {
+      echo "failed" > /home/ubuntu/user_data_failed
+    }
+    trap on_error ERR
+
+    export DEBIAN_FRONTEND=noninteractive
+
+    apt-get update
+    apt-get install -y --no-install-recommends \
+      ca-certificates \
+      curl
+
+    # Install the latest Docker Engine from Docker's official Ubuntu repo
+    install -m 0755 -d /etc/apt/keyrings
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+    chmod a+r /etc/apt/keyrings/docker.asc
 
-    # Add the repository to Apt sources:
     echo \
       "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
-      $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
-      sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-    sudo apt-get update
+      $(. /etc/os-release && echo "$VERSION_CODENAME") stable" \
+      > /etc/apt/sources.list.d/docker.list
 
-    sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin screen
+    apt-get update
+    apt-get install -y --no-install-recommends \
+      docker-ce \
+      docker-ce-cli \
+      containerd.io \
+      docker-buildx-plugin \
+      docker-compose-plugin
 
-    systemctl start docker
-    systemctl enable docker
-    usermod -a -G docker ubuntu
+    # Ensure Docker daemon is up
+    systemctl enable --now docker
 
-    sudo snap install aws-cli --classic
+    # Allow ubuntu user to run docker without sudo (new SSH session required)
+    usermod -aG docker ubuntu || true
+
+    docker --version
+    docker compose version
 
     echo "done" > /home/ubuntu/user_data_done
 
@@ -669,20 +687,10 @@ jobs:
         with:
           terraform_version: 1.10.1 
       
-      - name: Import Registry CA
-        run: |
-          mkdir -p deploy/.keys
-          echo "$VAULT_REGISTRY_CA_PEM" > deploy/.keys/ca.pem
-          echo "$VAULT_REGISTRY_CA_KEY" > deploy/.keys/ca.key
-        env:
-          VAULT_REGISTRY_CA_PEM: ${{ secrets.VAULT_REGISTRY_CA_PEM }}
-          VAULT_REGISTRY_CA_KEY: ${{ secrets.VAULT_REGISTRY_CA_KEY }}
-
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Import registry SSH keys
+      - name: Import SSH keys
         run: |
           mkdir -p deploy/.keys
           echo "$VAULT_SSH_PRIVATE_KEY" > deploy/.keys/id_rsa
@@ -732,8 +740,6 @@ Go to your GitHub repository, then `Settings` -> `Secrets` -> `New repository se
 - `VAULT_AWS_SECRET_ACCESS_KEY` - your AWS secret key
 - `VAULT_SSH_PRIVATE_KEY` - execute `cat deploy/.keys/id_rsa` and paste to GitHub secrets
 - `VAULT_SSH_PUBLIC_KEY` - execute `cat deploy/.keys/id_rsa.pub` and paste to GitHub secrets
-- `VAULT_REGISTRY_CA_PEM` - execute `cat deploy/.keys/ca.pem` and paste to GitHub secrets
-- `VAULT_REGISTRY_CA_KEY` - execute `cat deploy/.keys/ca.key` and paste to GitHub secrets
 - `VAULT_ADMINFORTH_SECRET` - generate some random string and paste to GitHub secrets, e.g. `openssl rand -base64 32 | tr -d '\n'`
 
 

adminforth/documentation/docs/tutorial/03-Customization/10-menuConfiguration.md

@@ -278,3 +278,23 @@ auth: {
 This syntax can be use to get unique avatar for each user of hardcode avatar, but it makes more sense to use it with [upload plugin](https://adminforth.dev/docs/tutorial/Plugins/upload/#using-plugin-for-uploading-avatar)
 
 
+## Custom URL
+You can use the url property to override default navigation. This is useful for linking to pre-filtered lists or external sites.
+
+
+```ts title='./index.ts'
+
+menu: [
+    {
+      label: 'Posts',
+      icon: 'flowbite:book-open-outline',
+      resourceId: 'posts',
+      //diff-add
+      url: '/resource/aparts?filter__country__in=["DE"]',  
+      //diff-add
+      isOpenInNewTab: true // You can also add isOpenInNewTab: true to open the link in a new browser tab
+    },
+  ],
+
+```
+> 👆 Please note start internal URLs with a leading / to ensure correct routing.

adminforth/documentation/docs/tutorial/03-Customization/15-afcl.md

@@ -285,6 +285,33 @@ You might need to put some extra item at bottom of list
   </div>
 </div>
 
+### Add classes to the input directly
+
+You might need to put some extra item at bottom of list
+
+<div class="split-screen" >
+  <div >
+```html
+<Select
+  class="w-full"
+  :options="[
+    {label: 'Last 7 days', value: '7'}, 
+    {label: 'Last 30 days', value: '30'}, 
+    {label: 'Last 90 days', value: '90'},
+  ]"
+  v-model="selected"
+  //diff-add
+  classesForInput="py-[4px] text-sm bg-white rounded"
+>
+
+</Select>
+```
+  </div>
+  <div>
+   ![AFCL Select](image-99.png)
+  </div>
+</div>
+
 ## Input