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

Author: SerVitasik

adminforth/dataConnectors/clickhouse.ts

@@ -107,7 +107,7 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
         }
         return dayjs(value).toISOString().split('T')[0];
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-        return !!value;
+        return value === null ? null : !!value;
       } else if (field.type == AdminForthDataTypes.JSON) {
         if (field._underlineType.startsWith('String') || field._underlineType.startsWith('FixedString')) {
           try {
@@ -138,7 +138,7 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
           return iso;
         }
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-        return value ? 1 : 0;
+        return  value === null ? null : (value ? 1 : 0);
       } else if (field.type == AdminForthDataTypes.JSON) {
         // check underline type is text or string
         if (field._underlineType.startsWith('String') || field._underlineType.startsWith('FixedString')) {

adminforth/dataConnectors/mongo.ts

@@ -86,7 +86,7 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
             return dayjs(Date.parse(value)).toISOString().split('T')[0];
 
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-          return !!value;
+          return value === null ? null : !!value;
         } else if (field.type == AdminForthDataTypes.DECIMAL) {
             return value?.toString();
         }
@@ -108,7 +108,7 @@ class MongoConnector extends AdminForthBaseConnector implements IAdminForthDataS
             return dayjs(value).toISOString();
           }
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-          return value ? true : false;
+            return value === null ? null : (value ? true : false);
         } else if (field.type == AdminForthDataTypes.DECIMAL) {
             return Decimal128.fromString(value?.toString());
         }

adminforth/dataConnectors/mysql.ts

@@ -130,7 +130,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
     } else if (field.type == AdminForthDataTypes.TIME) {
       return value || null;
     } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-      return !!value;
+      return value === null ? null : !!value;
     } else if (field.type == AdminForthDataTypes.JSON) {
       if (typeof value === 'string') {
         try {
@@ -158,7 +158,7 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
       }
       return dayjs(value).format('YYYY-MM-DD HH:mm:ss');
     } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-      return value ? 1 : 0;
+      return value === null ? null : (value ? 1 : 0);
     } else if (field.type == AdminForthDataTypes.JSON) {
       if (field._underlineType === 'json') {
         return value;

adminforth/dataConnectors/postgres.ts

@@ -157,6 +157,10 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
             return dayjs(value).toISOString().split('T')[0];
         }
 
+        if (field.type == AdminForthDataTypes.BOOLEAN) {
+            return value === null ? null : !!value;
+        } 
+
         if (field.type == AdminForthDataTypes.JSON) {
             if (typeof value == 'string') {
                 try {
@@ -188,7 +192,7 @@ class PostgresConnector extends AdminForthBaseConnector implements IAdminForthDa
                 return dayjs(value).toISOString();
             }
         } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-            return value ? 1 : 0;
+            return value === null ? null : (value ? 1 : 0);
         } else if (field.type == AdminForthDataTypes.JSON) {
             if (field._underlineType == 'json') {
                 return value;

adminforth/dataConnectors/sqlite.ts

@@ -81,7 +81,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
         return dayjs(value).toISOString().split('T')[0];
 
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-        return !!value;
+        return value === null ? null : !!value;
       } else if (field.type == AdminForthDataTypes.JSON) {
         if (field._underlineType == 'text' || field._underlineType == 'varchar') {
           try {
@@ -112,7 +112,7 @@ class SQLiteConnector extends AdminForthBaseConnector implements IAdminForthData
           return value;
         }
       } else if (field.type == AdminForthDataTypes.BOOLEAN) {
-        return value ? 1 : 0;
+        return value === null ? null : (value ? 1 : 0);
       } else if (field.type == AdminForthDataTypes.JSON) {
         // check underline type is text or string
         if (field._underlineType == 'text' || field._underlineType == 'varchar') {

adminforth/spa/src/components/ValueRenderer.vue

@@ -27,8 +27,9 @@
     </span>
 
     <span v-else-if="column.type === 'boolean'">
-      <span v-if="record[column.name]" class="bg-green-100 text-green-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-green-400 border border-green-400">{{ $t('Yes') }}</span>
-      <span v-else class="bg-red-100 text-red-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">{{ $t('No') }}</span>
+      <span v-if="record[column.name] === true" class="bg-green-100 text-green-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-green-400 border border-green-400">{{ $t('Yes') }}</span>
+      <span v-else-if="record[column.name] === false" class="bg-red-100 text-red-800gg text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-red-400 border border-red-400">{{ $t('No') }}</span>
+      <span v-else class="bg-gray-100 text-gray-800 text-xs font-medium me-2 px-2.5 py-0.5 rounded dark:bg-gray-700 dark:text-gray-400 border border-gray-400">{{ $t('Unset') }}</span>
     </span>
     <span
       v-else-if="column.type === 'json' && column.isArray?.enabled"