Revert "fix: don't validate optional empty fields as invalid"

This reverts commit d6dcd70.

Author: yaroslav8765

adminforth/index.ts

@@ -315,10 +315,10 @@ class AdminForth implements IAdminForth {
           return error;
         }
       } else {
-        if (column.minValue !== undefined && record[column.name] && record[column.name] < column.minValue) {
+        if (column.minValue !== undefined && record[column.name] < column.minValue) {
           return `Value in "${column.name}" must be greater than ${column.minValue}`;
         }
-        if (column.maxValue !== undefined && record[column.name] && record[column.name] > column.maxValue) {
+        if (column.maxValue !== undefined && record[column.name] > column.maxValue) {
           return `Value in "${column.name}" must be less than ${column.maxValue}`;
         }
       }

dev-demo/.env.sample

@@ -1,5 +1,11 @@
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
+ADMINFORTH_SECRET=123
+NODE_ENV=development
 OPENAI_API_KEY=1
 HEAVY_DEBUG=
-HEAVY_DEBUG_QUERY=
+HEAVY_DEBUG_QUERY=
+PORT=3000
+
+DATABASE_FILE=./db.sqlite
+DATABASE_FILE_URL=file:${DATABASE_FILE}

dev-demo/.gitignore

@@ -1,5 +1,4 @@
 node_modules
 *.sqlite
-*.sqlite-journal
 .env
 db

dev-demo/custom/GroupTable.vue

@@ -78,14 +78,7 @@ export const admin = new AdminForth({
     loginBackgroundImage: 'https://images.unsplash.com/photo-1534239697798-120952b76f2b?q=80&w=3389&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
     loginBackgroundPosition: '1/2', // over, 3/4, 2/5, 3/5 (tailwind grid)
     demoCredentials: "adminforth:adminforth",  // never use it for production
-    // loginPromptHTML: async () => { 
-    //   const adminforthUserExists = await admin.resource("users").count(Filters.EQ('email', 'adminforth')) > 0;
-    //   if (adminforthUserExists) {
-    //     return "Please use <b>adminforth</b> as username and <b>adminforth</b> as password"
-    //   }
-    //   return "";
-    // },
-    loginPromptHTML:"Nya without function",
+    loginPromptHTML: "Use email <b>adminforth</b> and password <b>adminforth</b> to login",
     // loginBackgroundImage: '@@/pho.jpg',
     rememberMeDays: 30,
     beforeLoginConfirmation: [async ({adminUser, adminforth, extra}) => {
@@ -123,29 +116,6 @@ export const admin = new AdminForth({
       userMenu: '@@/login2.vue',
       // header: '@@/PropertyCost.vue',
     },
-    customHeadItems: [
-        {
-          tagName: 'link',
-          attributes: {
-            rel: 'stylesheet',
-            href: 'https://example.com/custom.css'
-          }
-        },
-        {
-          tagName: 'script',
-          attributes: {
-            src: 'https://example.com/custom.js',
-            defer: true
-          }
-        },
-        {
-          tagName: 'meta',
-          attributes: {
-            name: 'theme-color',
-            content: ' #000000'
-          }
-        }
-      ],
     customPages:[{
       path : '/login2',
       component: {
@@ -220,7 +190,7 @@ export const admin = new AdminForth({
   dataSources: [
     {
       id: 'maindb',
-      url: process.env.DATABASE_URL as string,
+      url: process.env.DATABASE_URL,
     },
     {
       id: 'pg',
@@ -232,7 +202,7 @@ export const admin = new AdminForth({
     },
     {
       id: 'ch',
-      url: 'clickhouse://demo:demo@localhost:8124/demo',
+      url: 'clickhouse://demo:demo@localhost:8125/demo',
     },
     {
       id: 'mysql',
@@ -255,13 +225,6 @@ export const admin = new AdminForth({
     translationsResource,
   ],
   menu: [
-     {
-      label: 'TablesGroup',
-      path: '/overview',
-      homepage: true,
-      icon: 'flowbite:chart-pie-solid',
-      component: '@@/GroupTable.vue',
-    },
     {
       label: 'Dashboard',
       icon: 'flowbite:chart-pie-solid',

dev-demo/index.ts

@@ -15,7 +15,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@adminforth/foreign-inline-show": "^1.0.1",
     "@prisma/client": "^5.22.0",
     "better-sqlite3": "^10.1.0",
     "express": "^4.21.0",

dev-demo/package-lock.json

@@ -20,7 +20,7 @@ import AdminForthAdapterLocal from "../../adapters/adminforth-storage-adapter-lo
 import AdminForthStorageAdapterLocalFilesystem from "../../adapters/adminforth-storage-adapter-local/index.js";
 import AdminForth from "../../adminforth";
 import { StorageAdapter } from "../../adminforth";
-import ForeignInlineShowPlugin from '@adminforth/foreign-inline-show';
+
 
 const demoChecker = async ({ record, adminUser, resource }) => {
   if (adminUser.dbUser.role !== "superadmin") {
@@ -143,7 +143,7 @@ export default {
         list: {
           file: "@/renderers/CountryFlag.vue",
           meta: {
-            showCountryName: true,
+            showCountryName: false,
           },
         },
         edit: {
@@ -245,7 +245,8 @@ export default {
       name: "square_meter",
       label: "Square",
       // allowMinMaxQuery: true,
-      minValue: 2, // you can set min /max value for number fields
+      minValue: 1, // you can set min /max value for number fields
+      maxValue: 100000000,
       components: {
         list: {
           file: "@/renderers/HumanNumber.vue",
@@ -295,6 +296,18 @@ export default {
       showIn: {filter: true, show: true, edit: true, list: true, create: true},
       foreignResource: {
         resourceId: 'users',
+        hooks: {
+          dropdownList: {
+            beforeDatasourceRequest: async ({ adminUser, query }: { adminUser: AdminUser, query: any }) => {
+              if (adminUser.dbUser.role !== "superadmin") {
+                query.filtersTools.replaceOrAddTopFilter(Filters.EQ("id", adminUser.dbUser.id));
+              };
+              return {
+                "ok": true,
+              };
+            }
+          },
+        }
       }
     },
     {
@@ -318,11 +331,8 @@ export default {
   plugins: [
     ...(process.env.AWS_ACCESS_KEY_ID
       ? [
-        new ForeignInlineShowPlugin({
-          foreignResourceId: 'adminuser',
-        }),
-        new UploadPlugin({
-          pathColumnName: "apartment_image",
+          new UploadPlugin({
+            pathColumnName: "apartment_image",
 
             storageAdapter: new AdminForthAdapterS3Storage({
               region: "eu-central-1",