Merge branch 'alpha2' into alpha

Author: Ivan S

src/helpers/configHelper.ts

@@ -146,6 +146,16 @@ export class ConfigHelper {
 	 */
 	public static normalizeConfig(config: AdminpanelConfig): AdminpanelConfig {
 		const defaultConfig = getDefaultConfig();
+		const defaultPrefix = defaultConfig.routePrefix;
+		const routePrefix = config.routePrefix ?? defaultPrefix;
+
+		// Built-in navbar links are written against the default prefix, so retarget
+		// them whenever the app overrides routePrefix (otherwise they 404).
+		const builtinLinks = (defaultConfig.navbar?.additionalLinks || []).map((item) =>
+			typeof item.link === 'string' && item.link.startsWith(`${defaultPrefix}/`)
+				? { ...item, link: routePrefix + item.link.slice(defaultPrefix.length) }
+				: item
+		);
 
 		const mergedConfig = {
 			...defaultConfig,
@@ -158,7 +168,7 @@ export class ConfigHelper {
 				...defaultConfig.navbar,
 				...config.navbar,
 				additionalLinks: [
-					...(defaultConfig.navbar?.additionalLinks || []),
+					...builtinLinks,
 					...(config.navbar?.additionalLinks || [])
 				]
 			}

src/lib/DataAccessor.ts

@@ -200,7 +200,11 @@ export class DataAccessor {
             // Set required and type attributes
             fldConfig.required = Boolean(fldConfig.required ?? modelField.required);
             // Default type for field. Could be fetched from config file or model if not defined in config file.
-            fldConfig.type = ((fldConfig.type || modelField.type).toLowerCase() as FieldsTypes);
+            // The model layer has a single temporal type (`date`), the UI distinguishes
+            // date/datetime/time. Default to `datetime` so the time part survives editing;
+            // a date-only column can be narrowed with `type: "date"` in the model config.
+            const modelFieldType = modelField.type === "date" ? "datetime" : modelField.type;
+            fldConfig.type = ((fldConfig.type || modelFieldType).toLowerCase() as FieldsTypes);
 
             // Normalize final configuration (fldConfig is always an object here, normalize never returns undefined)
             fldConfig = this.adminizer.configHelper.normalizeFieldConfig(this.adminizer, fldConfig, key, modelField)!;

src/lib/model/AbstractModel.ts

@@ -7,7 +7,12 @@ import { InternalModelCreateData, InternalModelRepository, InternalModelUpdateDa
 import { INTERNAL_MODEL_ACCESS_TOKEN } from "./internalModelAccessToken";
 
 export interface Attribute {
-    type: 'association' | 'association-many' | 'number' | 'json' | 'string' | 'boolean' | 'ref';
+    /**
+     * `date` covers every temporal column (date, time, timestamp). It is deliberately
+     * separate from `string`: dates must not take part in LIKE search, and the UI
+     * renders them with date controls.
+     */
+    type: 'association' | 'association-many' | 'number' | 'json' | 'string' | 'boolean' | 'date' | 'ref';
     required?: boolean;
     unique?: boolean;
     defaultsTo?: any;

src/lib/model/adapter/sequelize.ts

@@ -28,7 +28,9 @@ function resolveType(type: any): Attribute["type"] {
     if (sqlType.includes("bool") || sqlType === "tinyint(1)") return "boolean";
     if (sqlType.includes("int") || sqlType.includes("float") || sqlType.includes("decimal")) return "number";
     if (sqlType.includes("json")) return "json";
-    if (sqlType.includes("date")) return "string";
+    // Sequelize renders temporal types per dialect: sqlite gives DATETIME/DATE,
+    // postgres TIMESTAMP WITH TIME ZONE, mysql DATETIME/TIMESTAMP. Match all of them.
+    if (sqlType.includes("date") || sqlType.includes("time")) return "date";
     return "ref";
 }
 
@@ -115,6 +117,7 @@ type AbstractFieldType =
     | "number"
     | "boolean"
     | "json"
+    | "date"
     | "ref"
     | "association"
     | "association-many";

src/lib/model/adapter/typeorm.ts

@@ -48,7 +48,7 @@ function resolveAdminizerTypeFromColumn(column: any): Attribute["type"] {
         return "number";
     }
     if (type.includes("json")) return "json";
-    if (type.includes("date") || type.includes("time")) return "string";
+    if (type.includes("date") || type.includes("time")) return "date";
     if (type.includes("char") || type.includes("text") || type.includes("uuid") || type.includes("string")) {
         return "string";
     }

src/system/Router.ts

@@ -30,6 +30,7 @@ import { Adminizer } from "../lib/Adminizer";
 import timezones from "../controllers/timezones";
 import { NotificationController } from "../controllers/notifications/NotificationController";
 import { HistoryController } from "../controllers/history-actions/HistoryController";
+import { AiAssistantController } from "../controllers/ai/AiAssistantController";
 import listUserFilters from "../controllers/listUserFilters";
 import {
     requireAnyPermission,
@@ -39,6 +40,7 @@ import {
     requirePermission
 } from "../policies/authPolicies";
 import {
+    aiModelToken,
     catalogToken,
     groupFilterVisibilityToken,
     historyToken,
@@ -419,6 +421,26 @@ export default class Router {
             withPolicies(regenerateUserApiKey, requireAuthEnabled(), requireAuthAPI())
         );
 
+        /**
+         * AI assistant — consumed by src/assets/js/contexts/AiAssistantContext.tsx
+         */
+        adminizer.app.get(
+            `${adminizer.config.routePrefix}/api/ai-assistant/models`,
+            withPolicies(AiAssistantController.getModels, requireAuthAPI())
+        );
+        adminizer.app.get(
+            `${adminizer.config.routePrefix}/api/ai-assistant/history/:modelId`,
+            withPolicies(AiAssistantController.getHistory, requireAuthAPI(), requirePermission(aiModelToken))
+        );
+        adminizer.app.post(
+            `${adminizer.config.routePrefix}/api/ai-assistant/query`,
+            withPolicies(AiAssistantController.sendMessage, requireAuthAPI(), requirePermission(aiModelToken))
+        );
+        adminizer.app.delete(
+            `${adminizer.config.routePrefix}/api/ai-assistant/history/:modelId`,
+            withPolicies(AiAssistantController.resetHistory, requireAuthAPI(), requirePermission(aiModelToken))
+        );
+
 
         adminizer.app.get(
             `${adminizer.config.routePrefix}/get-timezones`,

src/system/systemModelContracts.ts

@@ -86,8 +86,8 @@ export const SYSTEM_MODEL_CONTRACTS: readonly SystemModelContract[] = [
             color: {type: "string"},
             version: {type: "number"},
             columns: {relation: {kind: "many", target: "FilterColumn"}},
-            createdAt: {type: "string"},
-            updatedAt: {type: "string"},
+            createdAt: {type: "date"},
+            updatedAt: {type: "date"},
         },
     },
     {
@@ -112,8 +112,8 @@ export const SYSTEM_MODEL_CONTRACTS: readonly SystemModelContract[] = [
             diff: {type: "json"},
             user: {relation: {kind: "one", target: "User"}},
             isCurrent: {type: "boolean"},
-            createdAt: {type: "string"},
-            updatedAt: {type: "string"},
+            createdAt: {type: "date"},
+            updatedAt: {type: "date"},
             preview: {type: "boolean"},
         },
     },
@@ -127,8 +127,8 @@ export const SYSTEM_MODEL_CONTRACTS: readonly SystemModelContract[] = [
             notificationClass: {type: "string"},
             channel: {type: "string"},
             metadata: {type: "json"},
-            createdAt: {type: "string"},
-            updatedAt: {type: "string"},
+            createdAt: {type: "date"},
+            updatedAt: {type: "date"},
         },
     },
     {
@@ -161,7 +161,12 @@ export function validateSystemModelContract(
             continue;
         }
 
-        if (expected.type && actual.type !== expected.type) {
+        // Before `date` existed, temporal columns were reported as `string`.
+        // Keep accepting that from third-party adapters that have not been updated.
+        const typeMatches = expected.type === actual.type
+            || (expected.type === "date" && actual.type === "string");
+
+        if (expected.type && !typeMatches) {
             errors.push(`attribute "${attributeName}" must have type "${expected.type}", received "${actual.type}"`);
         }
         if (expected.required === true && actual.required !== true) {