@acorex/modules 21.0.0-next.41 → 21.0.0-next.43

package/fesm2022/acorex-modules-document-management.mjs

@@ -2,7 +2,7 @@ import { AXPSessionService, AXPAuthGuard, AXP_PERMISSION_DEFINITION_PROVIDER } f
 import { AXPStateMessageComponent, AXP_PAGE_COMPONENT_PROVIDER, AXPThemeLayoutBlockComponent, AXPQueryFiltersComponent } from '@acorex/platform/layout/components';
 import { AXPEntityService, entityMasterCrudActions, entityMasterRecordActions, AXMEntityCrudServiceImpl, resolveEntityPluginDetailPageOrder, ensureListActions, AXPEntityDefinitionRegistryService, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
 import { AXPHookService, AXPPlatformScope, AXPDataGenerator, AXPDeviceService, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER, resolvePlatformScopeKey, resolvePlatformScopeName } from '@acorex/platform/core';
-import { AXPSearchCommandProvider, createEntitySearchCommand, AXPFileTypeProviderService, AXP_FILE_TYPE_INFO_PROVIDER, createAllQueryView, AXPFileStorageService, AXPSettingsService, AXPFileStorageStatus, AXPFilterOperatorMiddlewareService, AXPLockService, UploadFromComputerActionProvider, AXP_FILE_ACTION_PROVIDER, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER } from '@acorex/platform/common';
+import { AXPSearchCommandProvider, createEntitySearchCommand, AXPFileTypeProviderService, AXP_FILE_TYPE_INFO_PROVIDER, createAllQueryView, AXPFileStorageService, AXPFilterOperatorMiddlewareService, AXPSettingsService, AXPLockService, UploadFromComputerActionProvider, AXP_FILE_ACTION_PROVIDER, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import * as i0 from '@angular/core';
 import { Injectable, inject, Injector, ChangeDetectionStrategy, Component, signal, NgModule, viewChild, computed, input, effect, ViewEncapsulation, untracked, DestroyRef, HostListener } from '@angular/core';
 import * as i3$2 from '@acorex/core/translation';
@@ -38,7 +38,6 @@ import * as i2$4 from '@acorex/platform/workflow';
 import { AXPWorkflowService, AXPWorkflowAction, AXPWorkflowModule } from '@acorex/platform/workflow';
 import { AXFileService, AXFileModule } from '@acorex/core/file';
 import { castArray, get as get$1, set as set$1 } from 'lodash-es';
-import { AXPAiAssistChatModelCatalogService, AXPAiManagementSettings, AIMANAGEMENT_EXTRACT_DOCUMENT_TEXT_COMMAND_KEY, AIMANAGEMENT_STRUCTURED_TEXT_COMPLETION_COMMAND_KEY, axpAiChatTextMessage } from '@acorex/modules/ai-management';
 import * as i1$3 from '@acorex/components/media-viewer';
 import { AXMediaViewerModule } from '@acorex/components/media-viewer';
 import * as i1$2 from '@acorex/components/button';
@@ -331,6 +330,104 @@ class AXMSearchCommandProvider extends AXPSearchCommandProvider {
     }
 }
 
+//#region ----   Setting Keys   ----
+/**
+ * Persisted setting keys for the Document Management module (`AXPSettingsService`).
+ */
+var AXPDocumentManagementSettings;
+(function (AXPDocumentManagementSettings) {
+    AXPDocumentManagementSettings["ViewMode"] = "DocumentManagement:Setting:DocumentExplorer.Layout.ViewMode";
+    AXPDocumentManagementSettings["SortField"] = "DocumentManagement:Setting:DocumentExplorer.Layout.SortField";
+    AXPDocumentManagementSettings["SortDirection"] = "DocumentManagement:Setting:DocumentExplorer.Layout.SortDirection";
+})(AXPDocumentManagementSettings || (AXPDocumentManagementSettings = {}));
+//#endregion
+
+//#endregion
+//#region ----   Module Constants ----
+const I18N = '@document-management:settings';
+//#endregion
+/**
+ * Registers Document Management settings (document explorer defaults and related options).
+ */
+class AXPDocumentManagementSettingProvider {
+    //#region ----   AXPSettingDefinitionProvider ----
+    async provide(context) {
+        context
+            .addGroup('document-management', `${I18N}.group.title`, `${I18N}.group.description`, RootConfig.module.icon)
+            .addSection('document-explorer-layout', `${I18N}.sections.explorer-layout.title`, `${I18N}.sections.explorer-layout.description`)
+            .addSetting({
+            key: AXPDocumentManagementSettings.ViewMode,
+            title: `${I18N}.items.view-mode.title`,
+            description: `${I18N}.items.view-mode.description`,
+            scope: 'U',
+            isInherited: true,
+            defaultValue: 'large-tiles',
+            widget: {
+                type: AXPWidgetsCatalog.select,
+                options: {
+                    valueField: 'id',
+                    textField: 'title',
+                    dataSource: [
+                        { id: 'large-tiles', title: `${I18N}.items.view-mode.options.large-tiles` },
+                        { id: 'small-tiles', title: `${I18N}.items.view-mode.options.small-tiles` },
+                        { id: 'list', title: `${I18N}.items.view-mode.options.list` },
+                        { id: 'details', title: `${I18N}.items.view-mode.options.details` },
+                        { id: 'large-icons', title: `${I18N}.items.view-mode.options.large-icons` },
+                        { id: 'small-icons', title: `${I18N}.items.view-mode.options.small-icons` },
+                        { id: 'attachment', title: `${I18N}.items.view-mode.options.attachment` },
+                    ],
+                },
+            },
+        })
+            .addSetting({
+            key: AXPDocumentManagementSettings.SortField,
+            title: `${I18N}.items.sort-field.title`,
+            description: `${I18N}.items.sort-field.description`,
+            scope: 'U',
+            isInherited: true,
+            defaultValue: 'name',
+            widget: {
+                type: AXPWidgetsCatalog.select,
+                options: {
+                    valueField: 'id',
+                    textField: 'title',
+                    dataSource: [
+                        { id: 'name', title: `${I18N}.items.sort-field.options.name` },
+                        { id: 'modified', title: `${I18N}.items.sort-field.options.modified` },
+                        { id: 'size', title: `${I18N}.items.sort-field.options.size` },
+                    ],
+                },
+            },
+        })
+            .addSetting({
+            key: AXPDocumentManagementSettings.SortDirection,
+            title: `${I18N}.items.sort-direction.title`,
+            description: `${I18N}.items.sort-direction.description`,
+            scope: 'U',
+            isInherited: true,
+            defaultValue: 'asc',
+            widget: {
+                type: AXPWidgetsCatalog.select,
+                options: {
+                    valueField: 'id',
+                    textField: 'title',
+                    dataSource: [
+                        { id: 'asc', title: `${I18N}.items.sort-direction.options.asc` },
+                        { id: 'desc', title: `${I18N}.items.sort-direction.options.desc` },
+                    ],
+                },
+            },
+        })
+            .endSection()
+            .endGroup();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDocumentManagementSettingProvider, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDocumentManagementSettingProvider }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDocumentManagementSettingProvider, decorators: [{
+            type: Injectable
+        }] });
+
 class AXMImageFileTypeProvider {
     async items() {
         return [
@@ -1891,286 +1988,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             type: Injectable
         }] });
 
-//#region ---- Imports ----
-//#endregion
-//#region ---- Field collection ----
-/**
- * Flattens metadata selector value into field descriptors for LLM mapping prompts.
- */
-function collectMetadataFieldDescriptors(meta) {
-    if (!meta?.groups?.length) {
-        return [];
-    }
-    const out = [];
-    for (const g of meta.groups) {
-        for (const f of g.fields ?? []) {
-            out.push({
-                name: f.name,
-                title: f.title ?? f.name,
-                interfaceType: f.interface,
-            });
-        }
-    }
-    return out;
-}
-//#endregion
-//#region ---- Prompt + JSON parsing ----
-const DOCUMENT_METADATA_MAPPING_SYSTEM_PROMPT = 'You are a precise assistant. Output only a single JSON object with string keys matching the requested field names. No markdown fences, no commentary.';
-/**
- * Builds the user message body for OCR → metadata JSON mapping.
- */
-function buildMetadataMappingUserPayload(ocrText, fields) {
-    const lines = fields.map((x) => `- "${x.name}" (${x.title}) [widget: ${x.interfaceType}]`);
-    return [
-        'You map document OCR text to metadata fields.',
-        'Reply with a single JSON object only. Keys must be exactly the "name" values listed below.',
-        'Use null for unknown or not found values. Do not invent unrelated keys.',
-        '',
-        'Fields:',
-        ...lines,
-        '',
-        'OCR text:',
-        ocrText,
-    ].join('\n');
-}
-/**
- * Parses a JSON object from an assistant reply (strips optional ```json fences).
- */
-function parseMetadataMappingJson(text) {
-    const trimmed = text.trim();
-    const fence = /^```(?:json)?\s*([\s\S]*?)```$/m.exec(trimmed);
-    const raw = fence ? fence[1].trim() : trimmed;
-    try {
-        const parsed = JSON.parse(raw);
-        if (parsed != null && typeof parsed === 'object' && !Array.isArray(parsed)) {
-            return parsed;
-        }
-    }
-    catch {
-        // ignore
-    }
-    return {};
-}
-/**
- * Shallow merge: only fills keys that are empty in `existing`.
- */
-function mergeMetadataPrefill(existing, partial) {
-    const base = { ...(existing ?? {}) };
-    for (const [k, v] of Object.entries(partial)) {
-        const cur = base[k];
-        const empty = cur === undefined || cur === null || cur === '';
-        if (empty && v !== undefined && v !== null && v !== '') {
-            base[k] = v;
-        }
-    }
-    return base;
-}
-//#endregion
-//#region ---- File kind ----
-/**
- * Returns true when the file list item is an image suitable for vision OCR.
- */
-function isImageFileListItem(item) {
-    if (!item) {
-        return false;
-    }
-    const t = typeof item.type === 'string' ? item.type : '';
-    if (t.startsWith('image/')) {
-        return true;
-    }
-    const name = String(item.name ?? '');
-    return /\.(png|jpe?g|gif|webp|bmp|tif|tiff)$/i.test(name);
-}
-//#endregion
-
-/**
- * Tenant settings for optional OCR-based metadata prefill on image uploads.
- */
-var AXMDocumentMetadataOcrSettings;
-(function (AXMDocumentMetadataOcrSettings) {
-    /** When true, image uploads may run OCR + mapping into metadata fields (when document type defines metadata). */
-    AXMDocumentMetadataOcrSettings["Enabled"] = "DocumentManagement:Setting:MetadataOcr.Enabled";
-    /**
-     * Optional assist primary key for OCR/mapping. When empty, {@link AXPAiManagementSettings.DefaultAssistId} is used.
-     */
-    AXMDocumentMetadataOcrSettings["AssistId"] = "DocumentManagement:Setting:MetadataOcr.AssistId";
-})(AXMDocumentMetadataOcrSettings || (AXMDocumentMetadataOcrSettings = {}));
-
-//#region ---- Imports ----
-//#endregion
-function toChatTransport(raw) {
-    return String(raw ?? '').toLowerCase() === 'gemini' ? 'gemini' : 'openai';
-}
-function readSettingString(raw) {
-    if (typeof raw === 'string') {
-        return raw.trim();
-    }
-    if (raw && typeof raw === 'object' && 'value' in raw && raw.value != null) {
-        return String(raw.value).trim();
-    }
-    return '';
-}
-function readSettingBool(raw) {
-    if (typeof raw === 'boolean') {
-        return raw;
-    }
-    if (raw && typeof raw === 'object' && 'value' in raw) {
-        const v = raw.value;
-        return v === true || v === 'true';
-    }
-    return false;
-}
-//#region ---- Service ----
-/**
- * Runs vision OCR + text-only JSON mapping for document metadata prefill (image files).
- */
-class AXMDocumentMetadataAiPrefillService {
-    constructor() {
-        this.fileStorage = inject(AXPFileStorageService);
-        this.modelCatalog = inject(AXPAiAssistChatModelCatalogService);
-        this.commandService = inject(AXPCommandService);
-        this.settings = inject(AXPSettingsService);
-    }
-    /**
-     * Whether OCR metadata prefill is enabled in tenant settings.
-     * Defaults to true when the setting has never been stored (opt-out via settings UI).
-     */
-    async isMetadataOcrEnabled() {
-        const raw = await this.settings.get(AXMDocumentMetadataOcrSettings.Enabled);
-        if (raw === undefined || raw === null) {
-            return true;
-        }
-        return readSettingBool(raw);
-    }
-    /**
-     * Resolves assist id: document override, else AI default assist setting.
-     */
-    async resolveAssistIdForMetadataOcr() {
-        const doc = readSettingString(await this.settings.get(AXMDocumentMetadataOcrSettings.AssistId));
-        if (doc) {
-            return doc;
-        }
-        return readSettingString(await this.settings.get(AXPAiManagementSettings.DefaultAssistId));
-    }
-    /**
-     * Uploads a blob-backed file item to storage for vision APIs that require {@link fileId}.
-     */
-    async ensureStoredFileId(fileItem, folderId) {
-        const existing = fileItem.source?.kind === 'fileId' && typeof fileItem.source.value === 'string'
-            ? fileItem.source.value.trim()
-            : typeof fileItem.id === 'string'
-                ? fileItem.id.trim()
-                : '';
-        if (existing) {
-            return existing;
-        }
-        const file = this.resolveFileForUpload(fileItem);
-        if (!file) {
-            return null;
-        }
-        const refId = folderId?.trim() || 'document-metadata-ocr-prefill';
-        const saved = await this.fileStorage.save({
-            file,
-            name: fileItem.name,
-            refId,
-            refType: `${RootConfig.module.name}.${RootConfig.entities.document.name}`,
-            category: 'document',
-            status: AXPFileStorageStatus.Temporary,
-        });
-        return saved.fileId?.trim() || null;
-    }
-    /**
-     * OCR + structured mapping; returns merged metadata (only fills empty keys in {@link existingMeta}).
-     */
-    async prefillFromImageOcr(options) {
-        const fields = collectMetadataFieldDescriptors(options.metaDataList ?? undefined);
-        if (fields.length === 0) {
-            return { ocrText: '', merged: { ...(options.existingMeta ?? {}) } };
-        }
-        const assistId = await this.resolveAssistIdForMetadataOcr();
-        if (!assistId) {
-            throw new Error('No AI assist is configured for metadata OCR. Set Document Management or AI default assist.');
-        }
-        const models = await this.modelCatalog.listModels({ assistId });
-        const model = this.pickChatModelForMetadataOcr(models);
-        if (!model?.id) {
-            throw new Error('No chat model is available for this assist. Configure models in AI Management.');
-        }
-        const chatTransport = toChatTransport(model.chatTransport);
-        const fileId = await this.ensureStoredFileId(options.fileItem, options.folderId);
-        if (!fileId) {
-            throw new Error('Could not upload the file for OCR.');
-        }
-        const extractResult = await this.commandService.execute(AIMANAGEMENT_EXTRACT_DOCUMENT_TEXT_COMMAND_KEY, {
-            fileId,
-            assistId,
-            chatTransport,
-            modelEntityId: model.id,
-        });
-        if (extractResult == null || !extractResult.success || !extractResult.data) {
-            const detail = extractResult != null && typeof extractResult.message?.text === 'string' && extractResult.message.text.trim()
-                ? extractResult.message.text
-                : 'Document text extraction failed.';
-            throw new Error(detail);
-        }
-        const ocrText = extractResult.data.text;
-        const userBody = buildMetadataMappingUserPayload(ocrText, fields);
-        const structuredResult = await this.commandService.execute(AIMANAGEMENT_STRUCTURED_TEXT_COMPLETION_COMMAND_KEY, {
-            assistId,
-            modelEntityId: model.id,
-            messages: [
-                axpAiChatTextMessage('system', DOCUMENT_METADATA_MAPPING_SYSTEM_PROMPT),
-                axpAiChatTextMessage('user', userBody),
-            ],
-            maxTokens: 2048,
-            temperature: 0.1,
-        });
-        if (structuredResult == null || !structuredResult.success || !structuredResult.data) {
-            const detail = structuredResult != null &&
-                typeof structuredResult.message?.text === 'string' &&
-                structuredResult.message.text.trim()
-                ? structuredResult.message.text
-                : 'Structured metadata mapping failed.';
-            throw new Error(detail);
-        }
-        const assistantText = structuredResult.data.text;
-        const parsed = parseMetadataMappingJson(assistantText);
-        const merged = mergeMetadataPrefill(options.existingMeta, parsed);
-        return { ocrText, merged };
-    }
-    //#region ---- Utility Methods ----
-    /**
-     * Prefers catalog model `gpt-5.4` (GPT-5.4) when present; otherwise first allowed model.
-     */
-    pickChatModelForMetadataOcr(models) {
-        if (!models.length) {
-            return undefined;
-        }
-        const preferredName = 'gpt-5.4';
-        return (models.find((m) => String(m.name ?? '')
-            .trim()
-            .toLowerCase() === preferredName) ??
-            models.find((m) => /gpt-5\.4/i.test(String(m.title ?? ''))) ??
-            models[0]);
-    }
-    resolveFileForUpload(item) {
-        const v = item.source?.value;
-        if (v instanceof File) {
-            return v;
-        }
-        if (item.source?.kind === 'blob' && v instanceof Blob) {
-            return new File([v], item.name, { type: item.type ?? v.type ?? 'application/octet-stream' });
-        }
-        return null;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentMetadataAiPrefillService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentMetadataAiPrefillService, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentMetadataAiPrefillService, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }] });
-
 class AXMDocumentDialogService {
     constructor() {
         this.layoutBuilder = inject(AXPLayoutBuilderService);
@@ -2179,7 +1996,6 @@ class AXMDocumentDialogService {
             .withEntity(RootConfig.module.name, RootConfig.entities.document.name)
             .data();
         this.documentTypeService = inject(AXMDocumentTypeService);
-        this.metadataPrefill = inject(AXMDocumentMetadataAiPrefillService);
     }
     async openAttachmentDialog(title, data) {
         const { documentType, files, parentId, metaData, documentId, version, showMeta = true } = data ?? {};
@@ -2201,9 +2017,6 @@ class AXMDocumentDialogService {
             }
             : { groups: [] };
         const hasMetaFields = (editableMetaDataList.groups ?? []).some((g) => (g.fields?.length ?? 0) > 0);
-        const ocrFeatureEnabled = await this.metadataPrefill.isMetadataOcrEnabled();
-        const hasImage = fileList.some((f) => isImageFileListItem(f));
-        const showAiMetadataButton = !!showMeta && hasMetaFields && ocrFeatureEnabled && hasImage;
         // Build initial context for all files
         const initialContext = {};
         if (showMeta) {
@@ -2222,27 +2035,26 @@ class AXMDocumentDialogService {
             dialog
                 .setTitle(title)
                 .setSize('md')
+                .setOptions({
+                metadata: {
+                    showMeta: !!showMeta,
+                    hasMetaFields,
+                    parentId: parentId ?? '',
+                    documentType,
+                },
+            })
                 .setContext(initialContext)
                 .content((flex) => {
                 flex.setDirection('column');
-                if (showAiMetadataButton) {
-                    flex.formField('', (field) => {
-                        field.customWidget('document-metadata-ai-fill-button', {
-                            parentId: parentId ?? '',
-                            documentType,
-                        });
-                    });
-                }
                 // Add fields for each file dynamically
                 for (let index = 0; index < fileList.length; index++) {
                     const item = fileList[index];
                     if (showMeta) {
                         if (hasMetaFields) {
-                            // Bind meta-data-form-editor to file-${index}.metaDataForm so that
-                            // metaDataFormWithExpiration can read/write correctly.
-                            flex.formField('@document-management:terms.common.meta-data', (field) => {
-                                field.path(`file-${index}.metaDataForm`);
-                                field.customWidget('meta-data-form-editor', editableMetaDataList);
+                            // Bind meta-data-form-editor to file-${index}.metaDataForm (no form-field wrapper).
+                            flex.customWidget('meta-data-form-editor', (widget) => {
+                                widget.path(`file-${index}.metaDataForm`);
+                                widget.options(editableMetaDataList);
                             });
                         }
                         if (enableExpiration) {
@@ -2339,7 +2151,7 @@ class AXMDocumentDialogService {
         return result;
     }
     async openAttachmentDialogWithoutSave(title, data) {
-        const { documentType, files, parentId, metaData, documentId, showMeta = true } = data ?? {};
+        const { documentType, files, parentId, metaData, showMeta = true } = data ?? {};
         const accept = (documentType?.type?.selectedItems ?? [])
             .map((f) => `.${f.name.split('.')[1]}`)
             .join(',');
@@ -2348,9 +2160,6 @@ class AXMDocumentDialogService {
         /** Get metaDataForm from a file item (widget may store under meta or metaDataForm). */
         const getFileMeta = (item) => item?.metaDataForm ?? (item?.meta && typeof item.meta === 'object' && !Array.isArray(item.meta) ? item.meta : undefined);
         const hasMetaFields = (documentType?.metaDataList?.groups ?? []).some((g) => (g.fields?.length ?? 0) > 0);
-        const ocrFeatureEnabled = await this.metadataPrefill.isMetadataOcrEnabled();
-        const hasImage = fileList.some((f) => isImageFileListItem(f));
-        const showAiMetadataButton = !!showMeta && hasMetaFields && ocrFeatureEnabled && hasImage;
         // Build initial context for all files: each file-${index} gets that file's metaDataForm so form shows existing meta
         const initialContext = {};
         if (showMeta) {
@@ -2374,25 +2183,26 @@ class AXMDocumentDialogService {
             dialog
                 .setTitle(title)
                 .setSize('md')
+                .setOptions({
+                metadata: {
+                    showMeta: !!showMeta,
+                    hasMetaFields,
+                    parentId: parentId ?? '',
+                    documentType,
+                },
+            })
                 .setContext(initialContext)
                 .content((flex) => {
                 flex.setDirection('column');
-                if (showAiMetadataButton) {
-                    flex.formField('', (field) => {
-                        field.customWidget('document-metadata-ai-fill-button', {
-                            parentId: parentId ?? '',
-                            documentType,
-                        });
-                    });
-                }
                 // Add fields for each file dynamically
                 for (let index = 0; index < fileList.length; index++) {
                     const item = fileList[index];
                     if (showMeta) {
                         if (hasMetaFields) {
-                            flex.formField('@document-management:terms.common.meta-data', (field) => {
-                                field.path(`file-${index}.metaDataForm`);
-                                field.customWidget('meta-data-form-editor', documentType?.metaDataList ?? { groups: [] });
+                            const metaListForWidget = documentType?.metaDataList ?? { groups: [] };
+                            flex.customWidget('meta-data-form-editor', (widget) => {
+                                widget.path(`file-${index}.metaDataForm`);
+                                widget.options(metaListForWidget);
                             });
                         }
                         if (enableExpiration) {
@@ -2684,6 +2494,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                 description: folder.description != null ? this.translate.resolve(folder.description) : undefined,
                 childrenCount: folder.childrenCount,
                 size: folder.size,
+                color: folder.color,
                 documentTypes: folder.documentTypes || [],
                 storageType: 'physical',
                 inherit: folder.inherit,
@@ -3575,7 +3386,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      */
     async searchNodes(searchTerm, scope, options) {
         const hasSearchTerm = searchTerm?.trim().length > 0;
-        const hasMetadataFilters = options?.metadataFilters && Object.keys(options.metadataFilters).length > 0;
+        const hasMetadataFilters = Boolean(options?.metadataFilters?.length);
         const hasDocTypeFilter = Boolean(options?.documentTypeIds && options.documentTypeIds.length > 0);
         let folders = [];
         let files = [];
@@ -3734,6 +3545,17 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
         const unlocked = result.getOutput('unlocked');
         return unlocked;
     }
+    /**
+     * Document types picker: keeps current selection when non-empty; otherwise defaults to the
+     * catalog entry whose programmatic name is `any` (mock title "Document").
+     */
+    initialFolderDialogDocumentTypes(items, existing) {
+        if (Array.isArray(existing) && existing.length > 0) {
+            return existing;
+        }
+        const anyType = items.find((it) => it?.name === 'any');
+        return anyType ? [anyType] : [];
+    }
     /**
      * Shows folder edit dialog
      */
@@ -3750,8 +3572,8 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                 name: node.name,
                 description: node.description ?? '',
                 inherit: node.inherit ?? 'None',
-                documentTypes: node.documentTypes ?? [],
-                color: '#FFFFFF',
+                documentTypes: this.initialFolderDialogDocumentTypes(items, node.documentTypes),
+                color: node.color ?? '#FFFFFF',
             })
                 .content((flex) => {
                 flex
@@ -3784,6 +3606,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                         dataSource: items,
                         multiple: true,
                         allowSearch: true,
+                        validations: [{ rule: 'required' }],
                     });
                 })
                     .formField('@general:terms.common.color', (field) => {
@@ -3802,6 +3625,9 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                 }
                 const form = context;
                 const selected = Array.isArray(form.documentTypes) ? form.documentTypes : [];
+                if (selected.length === 0) {
+                    return false;
+                }
                 const selectedTypes = selected.map((v) => typeof v === 'object' ? v : items.find((it) => it.name === v) || { name: v, title: v, id: v });
                 await this.updateFolder(node.id, {
                     title: form.title ?? form.name,
@@ -3829,12 +3655,19 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
             const set = new Set(allowedNames);
             items = items.filter((it) => it?.name && set.has(it.name));
         }
+        const defaultDocumentTypes = this.initialFolderDialogDocumentTypes(items, []);
         const result = await this.layoutBuilder
             .create()
             .dialog((dialog) => {
             dialog
                 .setTitle('@document-management:actions.create-folder')
-                .setContext({ title: '', description: '', inherit: 'None', documentTypes: [], color: '#FFFFFF' })
+                .setContext({
+                title: '',
+                description: '',
+                inherit: 'None',
+                documentTypes: defaultDocumentTypes,
+                color: '#FFFFFF',
+            })
                 .content((flex) => {
                 flex
                     .setDirection('column')
@@ -3866,6 +3699,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                         dataSource: items,
                         multiple: true,
                         allowSearch: true,
+                        validations: [{ rule: 'required' }],
                     });
                 })
                     .formField('@general:terms.common.color', (field) => {
@@ -3883,13 +3717,18 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                     return null;
                 }
                 const form = context;
+                const selectedTypesRaw = Array.isArray(form.documentTypes) ? form.documentTypes : [];
+                if (selectedTypesRaw.length === 0) {
+                    return null;
+                }
+                const selectedTypes = selectedTypesRaw.map((v) => typeof v === 'object' ? v : items.find((it) => it.name === v) || { name: v, title: v, id: v });
                 try {
                     const folder = await this.createFolder({
                         title: form.title,
                         color: form.color,
                         parentId,
                         description: form.description,
-                        documentTypes: form.documentTypes,
+                        documentTypes: selectedTypes,
                         size: 0,
                         inherit: form.inherit,
                     });
@@ -4198,13 +4037,6 @@ class ScopedDriveService {
     }
 }
 
-var AXPDocumentExplorerSettings;
-(function (AXPDocumentExplorerSettings) {
-    AXPDocumentExplorerSettings["ViewMode"] = "DocumentManagement:Setting:DocumentExplorer.Layout.ViewMode";
-    AXPDocumentExplorerSettings["SortField"] = "DocumentManagement:Setting:DocumentExplorer.Layout.SortField";
-    AXPDocumentExplorerSettings["SortDirection"] = "DocumentManagement:Setting:DocumentExplorer.Layout.SortDirection";
-})(AXPDocumentExplorerSettings || (AXPDocumentExplorerSettings = {}));
-
 const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withState(() => ({
     // View State
     viewMode: 'large-tiles',
@@ -4301,9 +4133,9 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
         patchState(store, { fileTypes });
         // Load initial settings (use same scope for get/set so persistence works after refresh)
         const scopedSettings = settingsService.scope(scope);
-        const viewMode = await scopedSettings.get(AXPDocumentExplorerSettings.ViewMode);
-        const sortField = await scopedSettings.get(AXPDocumentExplorerSettings.SortField);
-        const sortDirection = await scopedSettings.get(AXPDocumentExplorerSettings.SortDirection);
+        const viewMode = await scopedSettings.get(AXPDocumentManagementSettings.ViewMode);
+        const sortField = await scopedSettings.get(AXPDocumentManagementSettings.SortField);
+        const sortDirection = await scopedSettings.get(AXPDocumentManagementSettings.SortDirection);
         patchState(store, {
             viewMode: viewMode ?? 'large-tiles',
             sortField: sortField ?? 'name',
@@ -4398,19 +4230,19 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
     },
     setViewMode(mode) {
         patchState(store, { viewMode: mode });
-        settingsService.scope(store.scope()).set(AXPDocumentExplorerSettings.ViewMode, mode);
+        settingsService.scope(store.scope()).set(AXPDocumentManagementSettings.ViewMode, mode);
     },
     isViewMode(mode) {
         return store.viewMode() === mode;
     },
     setSortField(field) {
         patchState(store, { sortField: field });
-        settingsService.scope(store.scope()).set(AXPDocumentExplorerSettings.SortField, field);
+        settingsService.scope(store.scope()).set(AXPDocumentManagementSettings.SortField, field);
         this.refresh();
     },
     setSortDirection(direction) {
         patchState(store, { sortDirection: direction });
-        settingsService.scope(store.scope()).set(AXPDocumentExplorerSettings.SortDirection, direction);
+        settingsService.scope(store.scope()).set(AXPDocumentManagementSettings.SortDirection, direction);
         this.refresh();
     },
     setSelectionMode(mode) {
@@ -4548,7 +4380,7 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
                 },
                 {
                     title: 'Items',
-                    content: node.childrenCount,
+                    content: node.children?.length ?? 0,
                     icon: 'fa-solid fa-file-lines',
                 },
                 {
@@ -5322,8 +5154,8 @@ class AXMDocumentExplorerComponent {
         this.view = signal(null, ...(ngDevMode ? [{ debugName: "view" }] : /* istanbul ignore next */ []));
         this.viewMap = {
             list: async () => (await import('./acorex-modules-document-management-list-view.component-_4qlp2zS.mjs')).AXMDocumentExplorerListViewComponent,
-            'small-tiles': async () => (await import('./acorex-modules-document-management-small-tiles-view.component-BQSgUw6o.mjs')).AXMDocumentExplorerSmallTilesViewComponent,
-            'large-tiles': async () => (await import('./acorex-modules-document-management-large-tiles-view.component-CSHUgcLx.mjs')).AXMDocumentExplorerLargeTilesViewComponent,
+            'small-tiles': async () => (await import('./acorex-modules-document-management-small-tiles-view.component-DI6QQ2St.mjs')).AXMDocumentExplorerSmallTilesViewComponent,
+            'large-tiles': async () => (await import('./acorex-modules-document-management-large-tiles-view.component-BZWN7WCX.mjs')).AXMDocumentExplorerLargeTilesViewComponent,
             details: async () => (await import('./acorex-modules-document-management-details-view.component-lFZrUj3W.mjs')).AXMDocumentExplorerDetailsViewComponent,
             'large-icons': async () => (await import('./acorex-modules-document-management-large-icons-view.component-Ba2iLe4s.mjs')).AXMDocumentExplorerLargeIconsViewComponent,
             'small-icons': async () => (await import('./acorex-modules-document-management-small-icons-view.component-BS9YW1SX.mjs')).AXMDocumentExplorerSmallIconsViewComponent,
@@ -5394,7 +5226,7 @@ class AXMDocumentExplorerComponent {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentExplorerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXMDocumentExplorerComponent, isStandalone: true, selector: "axm-document-explorer", inputs: { browseMode: { classPropertyName: "browseMode", publicName: "browseMode", isSignal: true, isRequired: false, transformFunction: null }, viewMode: { classPropertyName: "viewMode", publicName: "viewMode", isSignal: true, isRequired: false, transformFunction: null }, selectionMode: { classPropertyName: "selectionMode", publicName: "selectionMode", isSignal: true, isRequired: false, transformFunction: null }, showContextMenu: { classPropertyName: "showContextMenu", publicName: "showContextMenu", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "contextMenu", first: true, predicate: ["itemsContextMenu"], descendants: true, isSignal: true }, { propertyName: "rootContextMenu", first: true, predicate: ["rootContextMenu"], descendants: true, isSignal: true }], ngImport: i0, template: "<!-- Empty State -->\n<div class=\"view-container\">\n  @if (vm.filteredFolders().length === 0 && vm.filteredFiles().length === 0) {\n    <axp-state-message\n      icon=\"fa-light fa-folder-open\"\n      [title]=\"'@document-management:empty-states.no-items.title'\"\n      [description]=\"'@document-management:empty-states.no-items.description'\"\n    >\n    </axp-state-message>\n  } @else {\n    <ng-container [ngComponentOutlet]=\"view()\"></ng-container>\n  }\n</div>\n\n<!-- Context Menu -->\n@if (showContextMenu()) {\n  <!-- Item Context Menu-->\n  <ax-context-menu\n    #itemsContextMenu\n    [target]=\"'.__explorer-item'\"\n    [orientation]=\"'vertical'\"\n    [closeOn]=\"'leave'\"\n    (onItemClick)=\"handleContextMenuItemClick($event)\"\n    (onOpening)=\"handleContextMenuOnOpening($event)\"\n  >\n  </ax-context-menu>\n  <!-- Root Context Menu-->\n  <ax-context-menu\n    #rootContextMenu\n    [target]=\"'.view-container'\"\n    [orientation]=\"'vertical'\"\n    [closeOn]=\"'leave'\"\n    (onItemClick)=\"handleContextMenuItemClick($event)\"\n    (onOpening)=\"handleContextMenuRootOnOpening($event)\"\n  >\n  </ax-context-menu>\n}\n", styles: ["axm-document-explorer{display:flex;height:max-content;min-height:100%;width:100%;flex-direction:row;gap:1rem}axm-document-explorer>.view-container{display:flex;flex:1 1 0%;-webkit-user-select:none;user-select:none;flex-direction:column;gap:1rem}axm-document-explorer .animation-duration-2s{--fa-animation-duration: 2s}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletEnvironmentInjector", "ngComponentOutletContent", "ngComponentOutletNgModule"], exportAs: ["ngComponentOutlet"] }, { kind: "ngmodule", type: RouterModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXFormatModule }, { kind: "ngmodule", type: AXDateTimeModule }, { kind: "ngmodule", type: AXMenuModule }, { kind: "component", type: i2$1.AXContextMenuComponent, selector: "ax-context-menu", inputs: ["orientation", "openOn", "closeOn", "items", "target"], outputs: ["onItemClick", "onOpening", "onClose"] }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "variant"] }], encapsulation: i0.ViewEncapsulation.None }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXMDocumentExplorerComponent, isStandalone: true, selector: "axm-document-explorer", inputs: { browseMode: { classPropertyName: "browseMode", publicName: "browseMode", isSignal: true, isRequired: false, transformFunction: null }, viewMode: { classPropertyName: "viewMode", publicName: "viewMode", isSignal: true, isRequired: false, transformFunction: null }, selectionMode: { classPropertyName: "selectionMode", publicName: "selectionMode", isSignal: true, isRequired: false, transformFunction: null }, showContextMenu: { classPropertyName: "showContextMenu", publicName: "showContextMenu", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "contextMenu", first: true, predicate: ["itemsContextMenu"], descendants: true, isSignal: true }, { propertyName: "rootContextMenu", first: true, predicate: ["rootContextMenu"], descendants: true, isSignal: true }], ngImport: i0, template: "<!-- Empty State -->\n<div class=\"view-container\">\n  @if (vm.filteredFolders().length === 0 && vm.filteredFiles().length === 0) {\n    <axp-state-message\n      icon=\"fa-light fa-folder-open\"\n      [title]=\"'@document-management:empty-states.no-items.title'\"\n      [description]=\"'@document-management:empty-states.no-items.description'\"\n    >\n    </axp-state-message>\n  } @else {\n    <ng-container [ngComponentOutlet]=\"view()\"></ng-container>\n  }\n</div>\n\n<!-- Context Menu -->\n@if (showContextMenu()) {\n  <!-- Item Context Menu-->\n  <ax-context-menu\n    #itemsContextMenu\n    [target]=\"'.__explorer-item'\"\n    [orientation]=\"'vertical'\"\n    [closeOn]=\"'leave'\"\n    (onItemClick)=\"handleContextMenuItemClick($event)\"\n    (onOpening)=\"handleContextMenuOnOpening($event)\"\n  >\n  </ax-context-menu>\n  <!-- Root Context Menu-->\n  <ax-context-menu\n    #rootContextMenu\n    [target]=\"'.view-container'\"\n    [orientation]=\"'vertical'\"\n    [closeOn]=\"'leave'\"\n    (onItemClick)=\"handleContextMenuItemClick($event)\"\n    (onOpening)=\"handleContextMenuRootOnOpening($event)\"\n  >\n  </ax-context-menu>\n}\n", styles: ["axm-document-explorer{display:flex;height:max-content;min-height:100%;width:100%;flex-direction:row;gap:1rem}axm-document-explorer>.view-container{display:flex;flex:1 1 0%;-webkit-user-select:none;user-select:none;flex-direction:column;gap:1rem}axm-document-explorer .animation-duration-2s{--fa-animation-duration: 2s}\n"], dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i1$1.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletEnvironmentInjector", "ngComponentOutletContent", "ngComponentOutletNgModule"], exportAs: ["ngComponentOutlet"] }, { kind: "ngmodule", type: RouterModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXFormatModule }, { kind: "ngmodule", type: AXDateTimeModule }, { kind: "ngmodule", type: AXMenuModule }, { kind: "component", type: i2$1.AXContextMenuComponent, selector: "ax-context-menu", inputs: ["orientation", "openOn", "closeOn", "items", "target"], outputs: ["onItemClick", "onOpening", "onClose"] }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "look"] }], encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentExplorerComponent, decorators: [{
             type: Component,
@@ -5426,6 +5258,22 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     ], template: "<!-- Breadcrumbs Section -->\n<div class=\"__breadcrumb ax-xs\">\n  <!-- Desktop Breadcrumb -->\n  @for (item of vm.currentPath(); track item.id; let i = $index;let last = $last) {\n  <!-- Navigation Button -->\n  <ax-button look=\"blank\" (onClick)=\"vm.navigateToFolder(item.id)\" [text]=\"item.name\" [disabled]=\"last\">\n    @if(i === 0) {\n    <ax-icon icon=\"fa-light fa-cloud\"></ax-icon>\n    }@else {\n    <ax-icon icon=\"fa-light fa-folder-closed\"></ax-icon>\n    }\n  </ax-button>\n  <!-- Separator -->\n  @if(!last) {\n  <i class=\"far fa-chevron-right rtl:ax-rotate-180 fa-fw fa-xs ax-me-2\"></i>\n  }\n  <!-- End Navigation Button -->\n  }\n</div>\n", styles: [":host{display:flex;width:100%;align-items:center}:host .__nav{display:flex;flex-direction:row;align-items:center;gap:.25rem;border-inline-end-width:1px;padding-inline-start:.25rem;padding-inline-end:.5rem}:host .__breadcrumb{display:flex;flex-direction:row;flex-wrap:wrap;align-items:center;padding-inline-start:.5rem;padding-inline-end:.25rem}:host .__breadcrumb .ax-state-disabled button,:host .__breadcrumb .ax-state-loading button{cursor:default!important}\n"] }]
         }] });
 
+//#region ---- Imports ----
+//#endregion
+//#region ---- Dialog surfaces ----
+/** `dialogSurface` for attachment dialog with save (layout builder options). */
+const AXM_DOCUMENT_DIALOG_SURFACE_ATTACHMENT = 'document-management.attachment-dialog';
+/** `dialogSurface` for attachment dialog without save. */
+const AXM_DOCUMENT_DIALOG_SURFACE_ATTACHMENT_NO_SAVE = 'document-management.attachment-dialog-no-save';
+//#endregion
+//#region ---- On-action hook (extensions handle custom commands, e.g. AI metadata fill) ----
+/**
+ * Runs when the user triggers a footer/dialog action, before the default attachment-dialog handler.
+ * Extensions may set {@link AXMDocumentAttachmentDialogOnActionPayload.result} to short-circuit (e.g. keep dialog open after patching context).
+ */
+const AXM_DOCUMENT_ATTACHMENT_DIALOG_ON_ACTION_HOOK_KEY = 'document-management.attachment-dialog.on-action';
+//#endregion
+
 /**
  * Build a Blob for "clone" attachment from drive file metadata (storage fileId, url, or existing blob).
  */
@@ -6317,51 +6165,6 @@ const attachmentsUploadMiddleware = {
     },
 };
 
-class AXMSettingProvider {
-    constructor(injector) {
-        this.injector = injector;
-        this.translateService = this.injector.get(AXTranslationService);
-    }
-    async provide(context) {
-        const t = async (key) => await this.translateService.translateAsync(`@document-management:settings.metadata-ocr.${key}`);
-        context
-            .addGroup('document-management-metadata-ocr', await t('group-title'), await t('group-description'), RootConfig.module.icon)
-            .addSection('metadata-ocr', await t('section-title'), await t('section-description'))
-            .addSetting({
-            key: AXMDocumentMetadataOcrSettings.Enabled,
-            title: await t('enabled-title'),
-            scope: 'T',
-            isInherited: true,
-            defaultValue: true,
-            widget: {
-                type: AXPWidgetsCatalog.toggle,
-            },
-            description: await t('enabled-description'),
-        })
-            .addSetting({
-            key: AXMDocumentMetadataOcrSettings.AssistId,
-            title: await t('assist-id-title'),
-            scope: 'T',
-            isInherited: true,
-            defaultValue: '',
-            widget: {
-                type: AXPWidgetsCatalog.text,
-                options: {
-                    placeholder: await t('assist-id-placeholder'),
-                },
-            },
-            description: await t('assist-id-description'),
-        })
-            .endSection()
-            .endGroup();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMSettingProvider, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMSettingProvider }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMSettingProvider, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [{ type: i0.Injector }] });
-
 function getFileIdFromFileInfo(fileInfo) {
     if (fileInfo == null)
         return undefined;
@@ -6703,7 +6506,7 @@ class AXMDocumentManagementModule {
             },
             {
                 provide: AXP_SETTING_DEFINITION_PROVIDER,
-                useClass: AXMSettingProvider,
+                useClass: AXPDocumentManagementSettingProvider,
                 multi: true,
             },
             {
@@ -6801,7 +6604,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         },
                         {
                             provide: AXP_SETTING_DEFINITION_PROVIDER,
-                            useClass: AXMSettingProvider,
+                            useClass: AXPDocumentManagementSettingProvider,
                             multi: true,
                         },
                         {
@@ -6848,8 +6651,8 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         this.driveRootIds = null;
         /** Filter definitions: document type (cascade parent) + metadata + search + file type. */
         this.advancedFilterDefinitions = signal([], ...(ngDevMode ? [{ debugName: "advancedFilterDefinitions" }] : /* istanbul ignore next */ []));
-        /** Active metadata filter values from the query filter panel. */
-        this.activeMetadataFilters = signal({}, ...(ngDevMode ? [{ debugName: "activeMetadataFilters" }] : /* istanbul ignore next */ []));
+        /** Active metadata filters from the query filter panel (same shape as {@link AXPFilterQuery}). */
+        this.activeMetadataFilters = signal([], ...(ngDevMode ? [{ debugName: "activeMetadataFilters" }] : /* istanbul ignore next */ []));
         /** Options for the document type filter (drive search). */
         this.documentTypeFilterOptions = signal([], ...(ngDevMode ? [{ debugName: "documentTypeFilterOptions" }] : /* istanbul ignore next */ []));
         /**
@@ -6969,7 +6772,7 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
             this.previousFolderId = currentNode?.id ?? null;
         }
         const metadataFilters = this.activeMetadataFilters();
-        const hasMetadataFilters = Object.keys(metadataFilters).length > 0;
+        const hasMetadataFilters = metadataFilters.length > 0;
         const documentTypeIds = this.activeDocumentTypeFilterIds();
         const hasDocTypeFilter = documentTypeIds.length > 0;
         const result = await this.driveService.searchNodes(searchValue, this.vm.scope(), {
@@ -7010,17 +6813,26 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         const fileTypeFilter = filters.find((f) => f.field === 'fileType');
         const fileTypeValue = fileTypeFilter?.value != null ? String(fileTypeFilter.value) : 'all';
         this.vm.setFileTypeFilter(fileTypeValue);
-        const metaFilters = {};
+        const metaFilters = [];
         for (const filter of filters) {
-            if (filter.field &&
-                filter.field !== 'all' &&
-                filter.field !== 'title' &&
-                filter.field !== 'fileType' &&
-                filter.field !== 'documentTypeId' &&
-                filter.value != null &&
-                filter.value !== '') {
-                metaFilters[filter.field] = filter.value;
+            if (!filter.field ||
+                filter.field === 'all' ||
+                filter.field === 'title' ||
+                filter.field === 'fileType' ||
+                filter.field === 'documentTypeId') {
+                continue;
             }
+            const opType = filter.operator?.type;
+            const isValuelessOperator = opType === 'isEmpty' || opType === 'isNotEmpty' || opType === 'isNull';
+            if (!isValuelessOperator && (filter.value == null || filter.value === '')) {
+                continue;
+            }
+            metaFilters.push({
+                field: filter.field,
+                value: filter.value,
+                operator: filter.operator,
+                logic: filter.logic,
+            });
         }
         this.activeMetadataFilters.set(metaFilters);
         const app = this.sessionService.application?.name;
@@ -7043,7 +6855,7 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
             });
         }
         const hasDocTypeFilter = documentTypeIds.length > 0;
-        if (searchValue.length > 0 || Object.keys(metaFilters).length > 0 || hasDocTypeFilter) {
+        if (searchValue.length > 0 || metaFilters.length > 0 || hasDocTypeFilter) {
             await this.performSearch(searchValue);
         }
         else if (this.vm.isVirtual()) {
@@ -7504,5 +7316,5 @@ var drive_component = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { AXMArchiveFileTypeProvider, AXMAudioFileTypeProvider, AXMCodeFileTypeProvider, AXMDocumentDriveComponent, AXMDocumentDrivePageComponent, AXMDocumentDrivePageComponentProvider, AXMDocumentExplorerComponent, AXMDocumentFileTypeProvider, AXMDocumentManagementDocumentStatusValues, AXMDocumentManagementDocumentTypeEntityModule, AXMDocumentManagementModule, AXMDocumentManagerService, AXMDocumentManagerServiceImpl, AXMDocumentTypeService, AXMDocumentTypeServiceImpl, AXMEntityProvider, AXMFileTypeExtensionWidgetColumnComponent, AXMFileTypeExtensionWidgetDesignerComponent, AXMFileTypeExtensionWidgetEditComponent, AXMFileTypeExtensionWidgetViewComponent, AXMFileTypeModule, AXMFolderPathBreadcrumbsComponent, AXMImageFileTypeProvider, AXMMenuProvider, AXMPermissionsKeys, AXMSearchCommandProvider, AXMSettingProvider, AXMVideoFileTypeProvider, AXPDocumentExplorerSettings, AXPDocumentExplorerViewModel, AXPDocumentManagementFeatureKeys, AXPDocumentManagementMenuKeys, AXPDocumentManagementService, AXmFileTypeExtensionWidget, DOCUMENT_DRIVE_PAGE_COMPONENT_KEY, RootConfig, ScopedDriveService, documentEntityFactory, documentPlugin, documentTypeFactory, folderEntityFactory };
+export { AXMArchiveFileTypeProvider, AXMAudioFileTypeProvider, AXMCodeFileTypeProvider, AXMDocumentDriveComponent, AXMDocumentDrivePageComponent, AXMDocumentDrivePageComponentProvider, AXMDocumentExplorerComponent, AXMDocumentFileTypeProvider, AXMDocumentManagementDocumentStatusValues, AXMDocumentManagementDocumentTypeEntityModule, AXMDocumentManagementModule, AXMDocumentManagerService, AXMDocumentManagerServiceImpl, AXMDocumentTypeService, AXMDocumentTypeServiceImpl, AXMEntityProvider, AXMFileTypeExtensionWidgetColumnComponent, AXMFileTypeExtensionWidgetDesignerComponent, AXMFileTypeExtensionWidgetEditComponent, AXMFileTypeExtensionWidgetViewComponent, AXMFileTypeModule, AXMFolderPathBreadcrumbsComponent, AXMImageFileTypeProvider, AXMMenuProvider, AXMPermissionsKeys, AXMSearchCommandProvider, AXMVideoFileTypeProvider, AXM_DOCUMENT_ATTACHMENT_DIALOG_ON_ACTION_HOOK_KEY, AXM_DOCUMENT_DIALOG_SURFACE_ATTACHMENT, AXM_DOCUMENT_DIALOG_SURFACE_ATTACHMENT_NO_SAVE, AXPDocumentExplorerViewModel, AXPDocumentManagementFeatureKeys, AXPDocumentManagementMenuKeys, AXPDocumentManagementService, AXPDocumentManagementSettingProvider, AXPDocumentManagementSettings, AXmFileTypeExtensionWidget, DOCUMENT_DRIVE_PAGE_COMPONENT_KEY, RootConfig, ScopedDriveService, documentEntityFactory, documentPlugin, documentTypeFactory, folderEntityFactory };
 //# sourceMappingURL=acorex-modules-document-management.mjs.map