@acorex/modules 21.0.0-next.88 → 21.0.0-next.90

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

@@ -1,6 +1,6 @@
 import { AXPStateMessageComponent, AXPLayoutSideDetailPanelComponent, AXPLayoutSideDetailPanelSectionDirective, AXP_PAGE_COMPONENT_PROVIDER, AXPThemeLayoutBlockComponent, AXPQueryFiltersComponent } from '@acorex/platform/layout/components';
 import { AXPEntityService, 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, AXPDeviceService, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER } from '@acorex/platform/core';
+import { AXPHookService, AXPDeviceService, AXPExpressionEvaluatorService, getSmart, AXP_MODULE_MANIFEST_PROVIDER, AXP_FEATURE_DEFINITION_PROVIDER, AXP_DISTRIBUTED_EVENT_LISTENER_PROVIDER } from '@acorex/platform/core';
 import { AXPSearchCommandProvider, createEntitySearchCommand, AXPFileTypeProviderService, AXP_FILE_TYPE_INFO_PROVIDER, AXPFileStorageService, AXPFilterOperatorMiddlewareService, AXPSettingsService, AXPLockService, UploadFromComputerActionProvider, AXP_FILE_ACTION_PROVIDER, AXP_PROTECTED_ROUTE_GUARDS, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER } from '@acorex/platform/common';
 import { AXPSessionService, AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex/platform/auth';
 import * as i0 from '@angular/core';
@@ -9,11 +9,11 @@ import * as i5 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import { AXPCommonMenuKeys } from '@acorex/modules/common';
 import { firstValueFrom } from 'rxjs';
-import * as i6 from '@acorex/platform/layout/widget-core';
+import * as i7 from '@acorex/platform/layout/widget-core';
 import { AXPValueWidgetComponent, AXPWidgetCoreModule, AXP_WIDGETS_ADVANCE_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
 import { AXPWidgetsCatalog, AXPPlatformScope, AXPDataGenerator, AXPWidgetsList, resolvePlatformScopeKey, resolvePlatformScopeName } from '@acorex/platform/contracts';
 import { AXDataSource } from '@acorex/cdk/common';
-import * as i7 from '@acorex/components/collapse';
+import * as i8 from '@acorex/components/collapse';
 import { AXCollapseModule } from '@acorex/components/collapse';
 import * as i3$1 from '@acorex/components/decorators';
 import { AXDecoratorModule } from '@acorex/components/decorators';
@@ -21,11 +21,15 @@ import * as i3 from '@acorex/components/form';
 import { AXFormModule } from '@acorex/components/form';
 import * as i4 from '@acorex/components/label';
 import { AXLabelModule } from '@acorex/components/label';
+import * as i6 from '@acorex/components/search-box';
+import { AXSearchBoxModule } from '@acorex/components/search-box';
 import * as i1 from '@acorex/components/select-box';
 import { AXSelectBoxModule } from '@acorex/components/select-box';
 import * as i2 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import get from 'lodash-es/get';
+import isEmpty from 'lodash-es/isEmpty';
+import isString from 'lodash-es/isString';
 import set from 'lodash-es/set';
 import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY } from '@acorex/platform/layout/widgets';
 import * as i1$1 from '@angular/common';
@@ -38,7 +42,7 @@ import { AXPCommandService } from '@acorex/platform/runtime';
 import * as i2$3 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 { isArray, castArray, get as get$1, isString as isString$1, set as set$1 } from 'lodash-es';
 import * as i1$3 from '@acorex/components/media-viewer';
 import { AXMediaViewerModule } from '@acorex/components/media-viewer';
 import * as i1$2 from '@acorex/components/button';
@@ -56,7 +60,6 @@ import { AXButtonGroupModule } from '@acorex/components/button-group';
 import * as i2$2 from '@acorex/components/dropdown';
 import { AXDropdownModule } from '@acorex/components/dropdown';
 import { AXDropdownButtonModule } from '@acorex/components/dropdown-button';
-import { AXSearchBoxModule } from '@acorex/components/search-box';
 import { AXPPageLayoutBaseComponent, AXPPageLayoutBase, AXPPageLayoutComponent } from '@acorex/platform/layout/views';
 import { createAllQueryView, entityMasterCrudActions, entityMasterRecordActions } from '@acorex/platform/layout/entity-contracts';
 import { AXBreadcrumbsModule } from '@acorex/components/breadcrumbs';
@@ -241,7 +244,7 @@ class AXMMenuProvider {
         const module = RootConfig.module;
         const appName = this.sessionService.application?.name;
         const scope = RootConfig.config.i18n;
-        // My Drive: root level, after Task Board (priority 1)
+        // My Drive: root level, after Task Board (priority 0)
         context.addItems([
             {
                 name: AXPDocumentManagementMenuKeys.UserDrive,
@@ -255,11 +258,11 @@ class AXMMenuProvider {
                 },
             },
         ]);
-        // Tenant Documents: root under MODULES section (priority 9001)
+        // Tenant Documents: root under MODULES section (priority 8120)
         context.addItems([
             {
                 name: AXPDocumentManagementMenuKeys.TenantDrive,
-                priority: 9001,
+                priority: 8120,
                 text: `@${scope}:menus.tenant-documents.title`,
                 icon: RootConfig.entities.document.icon,
                 path: `${appName}/drive/tenant`,
@@ -745,6 +748,7 @@ class AXMFileTypeExtensionWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
         this.fileTypeService = inject(AXPFileTypeProviderService);
+        this.searchValue = signal(undefined, ...(ngDevMode ? [{ debugName: "searchValue" }] : /* istanbul ignore next */ []));
         this.dataSource = new AXDataSource({
             load: async (_) => {
                 try {
@@ -763,9 +767,14 @@ class AXMFileTypeExtensionWidgetEditComponent extends AXPValueWidgetComponent {
                         });
                     })
                         .flat();
+                    const query = this.normalizeSearchQuery(this.searchValue());
+                    const items = query
+                        ? types.filter((item) => item.title.toLowerCase().includes(query) ||
+                            item.name.toLowerCase().includes(query))
+                        : types;
                     return {
-                        items: types,
-                        total: types.length,
+                        items,
+                        total: items.length,
                     };
                 }
                 catch (e) {
@@ -795,6 +804,26 @@ class AXMFileTypeExtensionWidgetEditComponent extends AXPValueWidgetComponent {
         this.context.set(e.data);
         this.setValue({ ...this.getValue(), context: e.data });
     }
+    handleSearchQueryChange(value) {
+        this.applySearchQuery(value);
+    }
+    handleSearchValueChange(e) {
+        this.applySearchQuery(e.value);
+    }
+    applySearchQuery(value) {
+        const next = isString(value) && !isEmpty(value.trim()) ? value : undefined;
+        if (this.searchValue() === next) {
+            return;
+        }
+        this.searchValue.set(next);
+        void this.dataSource.refresh();
+    }
+    normalizeSearchQuery(value) {
+        if (!isString(value) || isEmpty(value.trim())) {
+            return undefined;
+        }
+        return value.trim().toLowerCase();
+    }
     async handleValueChange(e) {
         const selectItems = e.component.selectedItems;
         this.setValue({ ...this.getValue(), selectedItems: selectItems });
@@ -872,6 +901,14 @@ class AXMFileTypeExtensionWidgetEditComponent extends AXPValueWidgetComponent {
       [ngModel]="getValue()?.selectedItems"
       (onValueChanged)="handleValueChange($event)"
     >
+      <ax-search-box
+        [autoSearch]="false"
+        [ngModel]="searchValue()"
+        (ngModelChange)="handleSearchQueryChange($event)"
+        (onValueChanged)="handleSearchValueChange($event)"
+      >
+        <ax-clear-button></ax-clear-button>
+      </ax-search-box>
     </ax-select-box>
     <div class="ax-py-3"></div>
     <axp-widgets-container (onContextChanged)="handleOnContextChange($event)" [context]="context()">
@@ -925,7 +962,7 @@ class AXMFileTypeExtensionWidgetEditComponent extends AXPValueWidgetComponent {
         </ax-collapse-group>
       }
     </axp-widgets-container>
-  </div>`, isInline: true, dependencies: [{ kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "itemHeight", "maxVisibleItems", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i3.AXFormFieldComponent, selector: "ax-form-field", inputs: ["labelMode"] }, { kind: "ngmodule", type: AXLabelModule }, { kind: "component", type: i4.AXLabelComponent, selector: "ax-label", inputs: ["required", "for"], outputs: ["requiredChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i6.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i6.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXCollapseModule }, { kind: "component", type: i7.AXCollapseComponent, selector: "ax-collapse", inputs: ["disabled", "look", "isCollapsed", "showHeader", "caption", "icon", "isLoading", "headerTemplate"], outputs: ["onClick", "isCollapsedChange"] }, { kind: "component", type: i7.AXCollapseGroupComponent, selector: "ax-collapse-group", inputs: ["look", "accordion", "activeIndex"], outputs: ["accordionChange", "activeIndexChange"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  </div>`, isInline: true, dependencies: [{ kind: "ngmodule", type: AXSelectBoxModule }, { kind: "component", type: i1.AXSelectBoxComponent, selector: "ax-select-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "minValue", "maxValue", "value", "state", "name", "id", "type", "look", "multiple", "valueField", "textField", "disabledField", "textTemplate", "selectedItems", "isItemTruncated", "showItemTooltip", "itemHeight", "maxVisibleItems", "dataSource", "minRecordsForSearch", "caption", "itemTemplate", "selectedTemplate", "emptyTemplate", "loadingTemplate", "dropdownWidth", "searchBoxAutoFocus"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onOpened", "onClosed", "onItemSelected", "onItemClick"] }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "ngmodule", type: AXFormModule }, { kind: "component", type: i3.AXFormFieldComponent, selector: "ax-form-field", inputs: ["labelMode"] }, { kind: "ngmodule", type: AXLabelModule }, { kind: "component", type: i4.AXLabelComponent, selector: "ax-label", inputs: ["required", "for"], outputs: ["requiredChange"] }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "component", type: i3$1.AXDecoratorClearButtonComponent, selector: "ax-clear-button", inputs: ["icon"] }, { kind: "component", type: i3$1.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXSearchBoxModule }, { kind: "component", type: i6.AXSearchBoxComponent, selector: "ax-search-box", inputs: ["disabled", "readonly", "tabIndex", "placeholder", "value", "state", "name", "id", "look", "class", "delayTime", "type", "autoSearch"], outputs: ["valueChange", "stateChange", "onValueChanged", "onBlur", "onFocus", "readonlyChange", "disabledChange", "onKeyDown", "onKeyUp", "onKeyPress"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i7.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i7.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXCollapseModule }, { kind: "component", type: i8.AXCollapseComponent, selector: "ax-collapse", inputs: ["disabled", "look", "isCollapsed", "showHeader", "caption", "icon", "isLoading", "headerTemplate"], outputs: ["onClick", "isCollapsedChange"] }, { kind: "component", type: i8.AXCollapseGroupComponent, selector: "ax-collapse-group", inputs: ["look", "accordion", "activeIndex"], outputs: ["accordionChange", "activeIndexChange"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMFileTypeExtensionWidgetEditComponent, decorators: [{
             type: Component,
@@ -940,6 +977,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
       [ngModel]="getValue()?.selectedItems"
       (onValueChanged)="handleValueChange($event)"
     >
+      <ax-search-box
+        [autoSearch]="false"
+        [ngModel]="searchValue()"
+        (ngModelChange)="handleSearchQueryChange($event)"
+        (onValueChanged)="handleSearchValueChange($event)"
+      >
+        <ax-clear-button></ax-clear-button>
+      </ax-search-box>
     </ax-select-box>
     <div class="ax-py-3"></div>
     <axp-widgets-container (onContextChanged)="handleOnContextChange($event)" [context]="context()">
@@ -1001,6 +1046,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                         AXFormModule,
                         AXLabelModule,
                         AXDecoratorModule,
+                        AXSearchBoxModule,
                         AXPWidgetCoreModule,
                         AXCollapseModule,
                     ],
@@ -1294,6 +1340,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
 class AXMDocumentDialogService {
     constructor() {
         this.layoutBuilder = inject(AXPLayoutBuilderService);
+        this.translateService = inject(AXTranslationService);
         this.entityService = inject(AXPEntityService);
         this.documentData = this.entityService
             .withEntity(RootConfig.module.name, RootConfig.entities.document.name)
@@ -1556,7 +1603,10 @@ class AXMDocumentDialogService {
     }
     async chooseDocumentType() {
         const res = await this.documentTypeService.query({ skip: 0, take: 100 });
-        const items = (res?.items ?? []).map((x) => ({ value: x.id, text: x.title }));
+        const items = (res?.items ?? []).map((x) => ({
+            value: x.id,
+            text: this.translateService.resolve(x.title ?? x.name ?? x.id),
+        }));
         const result = await this.layoutBuilder
             .create()
             .dialog((dialog) => {
@@ -1620,7 +1670,7 @@ class DocumentAttachmentsService {
             version: 0,
         };
         const title = await this.translateService.translateAsync('@document-management:dialogs.attach-file.title', {
-            params: { title: fileTypeEntity.title },
+            params: { title: this.translateService.resolve(fileTypeEntity.title) },
         });
         const result = await this.documentDialog.openAttachmentDialog(title, popupData);
         return this.handlePopupResult(result);
@@ -2495,7 +2545,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      * Opens the drive folder picker and creates a shortcut to the given node in the selected folder.
      */
     async createShortcutWithPicker(node, scope) {
-        const comp = (await import('./acorex-modules-document-management-drive-choose.component-DyJoXajP.mjs')).AXMDocumentDriveChooseComponent;
+        const comp = (await import('./acorex-modules-document-management-drive-choose.component-Dx1slMSA.mjs')).AXMDocumentDriveChooseComponent;
         const popup = await this.popupService.open(comp, {
             title: await this.translate.translateAsync('@document-management:actions.choose-folder-for-shortcut'),
             data: {
@@ -2573,7 +2623,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      * Moves a node to another location
      */
     async moveTo(options) {
-        const comp = (await import('./acorex-modules-document-management-drive-choose.component-DyJoXajP.mjs')).AXMDocumentDriveChooseComponent;
+        const comp = (await import('./acorex-modules-document-management-drive-choose.component-Dx1slMSA.mjs')).AXMDocumentDriveChooseComponent;
         const popup = await this.popupService.open(comp, {
             title: `Choose ${options.browseMode == 'file' ? 'File' : 'Folder'}`,
             data: {
@@ -2606,7 +2656,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      * Copies a node to another location
      */
     async copyTo(options) {
-        const comp = (await import('./acorex-modules-document-management-drive-choose.component-DyJoXajP.mjs')).AXMDocumentDriveChooseComponent;
+        const comp = (await import('./acorex-modules-document-management-drive-choose.component-Dx1slMSA.mjs')).AXMDocumentDriveChooseComponent;
         const popup = await this.popupService.open(comp, {
             title: `Choose ${options.browseMode == 'file' ? 'File' : 'Folder'}`,
             data: {
@@ -2854,18 +2904,36 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      */
     initialFolderDialogDocumentTypes(items, existing) {
         if (Array.isArray(existing) && existing.length > 0) {
-            return existing;
+            return existing.map((entry) => {
+                const name = typeof entry === 'object' && entry != null && 'name' in entry
+                    ? entry.name
+                    : String(entry);
+                return items.find((it) => it?.name === name) ?? entry;
+            });
         }
         const anyType = items.find((it) => it?.name === 'any');
         return anyType ? [anyType] : [];
     }
+    mapDocumentTypesForPicker(items) {
+        return items.map((it) => ({
+            ...it,
+            displayTitle: this.resolveDocumentTypeLabel(it),
+        }));
+    }
+    resolveDocumentTypeLabel(item) {
+        const value = item.title ?? item.name ?? item.id;
+        if (value == null || value === '') {
+            return '';
+        }
+        return this.translate.resolve(value);
+    }
     /**
      * Shows folder edit dialog
      */
     async showFolderEditDialog(node) {
         // Load document types for selection
         const res = await this.documentTypeService.query({ skip: 0, take: 1000 });
-        const items = res?.items ?? [];
+        const items = this.mapDocumentTypesForPicker(res?.items ?? []);
         const result = await this.layoutBuilder
             .create()
             .dialog((dialog) => {
@@ -2905,7 +2973,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                     field.path('documentTypes');
                     field.selectBox({
                         valueField: 'name',
-                        textField: 'title',
+                        textField: 'displayTitle',
                         dataSource: items,
                         multiple: true,
                         allowSearch: true,
@@ -2952,11 +3020,16 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      */
     async showCreateFolderDialog(parentId, options) {
         const res = await this.documentTypeService.query({ skip: 0, take: 1000 });
-        let items = res?.items ?? [];
+        let items = this.mapDocumentTypesForPicker(res?.items ?? []);
         const allowedNames = options?.allowedDocumentTypeNames;
-        if (Array.isArray(allowedNames) && allowedNames.length > 0) {
-            const set = new Set(allowedNames);
-            items = items.filter((it) => it?.name && set.has(it.name));
+        if (isArray(allowedNames)) {
+            if (allowedNames.length === 0) {
+                items = [];
+            }
+            else {
+                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
@@ -2998,7 +3071,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
                     field.path('documentTypes');
                     field.selectBox({
                         valueField: 'name',
-                        textField: 'title',
+                        textField: 'displayTitle',
                         dataSource: items,
                         multiple: true,
                         allowSearch: true,
@@ -3158,7 +3231,7 @@ class AXMDocumentManagerServiceImpl extends AXMDocumentManagerService {
      * Shows choose file dialog
      */
     async showChooseFileDialog(scope) {
-        const comp = (await import('./acorex-modules-document-management-drive-choose.component-DyJoXajP.mjs')).AXMDocumentDriveChooseComponent;
+        const comp = (await import('./acorex-modules-document-management-drive-choose.component-Dx1slMSA.mjs')).AXMDocumentDriveChooseComponent;
         const result = await this.popupService.open(comp, {
             title: await this.translate.translateAsync('@document-management:actions.choose-from-drive'),
             data: {
@@ -3856,8 +3929,10 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
             : [];
         const folderTypes = store.currentFolder()?.documentTypes ?? [];
         const allowedNames = store.allowedDocumentTypeNames();
-        let typesToShow = allowedNames != null && allowedNames.length > 0
-            ? folderTypes.filter((t) => t?.name && allowedNames.includes(t.name))
+        let typesToShow = allowedNames != null
+            ? allowedNames.length > 0
+                ? folderTypes.filter((t) => t?.name && allowedNames.includes(t.name))
+                : []
             : folderTypes;
         if (allowedNames != null &&
             allowedNames.length > 0 &&
@@ -3877,7 +3952,7 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
                     },
                 }] : []),
             ...typesToShow.map((type) => ({
-                title: type.title,
+                title: translateService.resolve(type.title),
                 icon: 'fa-light fa-file-arrow-up',
                 break: true,
                 command: {
@@ -4086,7 +4161,7 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
                 break: true,
                 items: node.documentTypes.map((type, index, array) => ({
                     name: `upload.${type.name}`,
-                    text: type.title,
+                    text: translateService.resolve(type.title),
                     icon: 'fa-light fa-file-arrow-up',
                     break: index !== array.length - 1,
                     data: {
@@ -4319,9 +4394,8 @@ const AXPDocumentExplorerViewModel = signalStore({ providedIn: 'root' }, withSta
         const parentId = node?.id ?? store.currentNode()?.id;
         if (parentId) {
             const allowedNames = store.allowedDocumentTypeNames();
-            console.log('allowedNames', allowedNames);
             const result = await driveService.showCreateFolderDialog(parentId, {
-                allowedDocumentTypeNames: allowedNames != null && allowedNames.length > 0 ? allowedNames : undefined,
+                allowedDocumentTypeNames: allowedNames ?? undefined,
             });
             if (result) {
                 await this.refresh();
@@ -4530,7 +4604,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", "closeOnRouteChange", "items", "target"], outputs: ["onItemClick", "onOpening", "onClose"] }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "look"] }], 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", "closeOnRouteChange", "items", "target"], outputs: ["onItemClick", "onOpening", "onClose"] }, { kind: "component", type: AXPStateMessageComponent, selector: "axp-state-message", inputs: ["mode", "icon", "title", "description", "titleParams", "descriptionParams", "look"] }], encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentExplorerComponent, decorators: [{
             type: Component,
@@ -4998,7 +5072,7 @@ class AXMDocumentExplorerDetailPanelComponent {
         this.multiSelectLabel.set(`${this.vm.selectedCount()} ${itemsSelected}`);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentExplorerDetailPanelComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXMDocumentExplorerDetailPanelComponent, isStandalone: true, selector: "axm-document-explorer-detail-panel", ngImport: i0, template: "@if (vm.hasMultipleSelectedItems() && multiSelectLabel(); as multiLabel) {\n  <axp-layout-side-detail-panel [multiSelectLabel]=\"multiLabel\" (panelClose)=\"onPanelClose()\" />\n} @else {\n  <axp-layout-side-detail-panel\n    [header]=\"panelHeader()\"\n    [sections]=\"panelSections()\"\n    (panelClose)=\"onPanelClose()\"\n  >\n    @if (metadataWidgetNode(); as widgetNode) {\n      <ng-template axpLayoutSideDetailPanelSection=\"metadata\">\n        <axp-widgets-container [context]=\"metadataContext()\">\n          <ng-container axp-widget-renderer [node]=\"widgetNode\" [mode]=\"'view'\"></ng-container>\n        </axp-widgets-container>\n      </ng-template>\n    }\n  </axp-layout-side-detail-panel>\n}\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i6.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i6.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "component", type: AXPLayoutSideDetailPanelComponent, selector: "axp-layout-side-detail-panel", inputs: ["multiSelectLabel", "header", "sections", "rows", "rowsSectionTitle", "noRowsMessage", "emptyState"], outputs: ["panelClose"] }, { kind: "directive", type: AXPLayoutSideDetailPanelSectionDirective, selector: "[axpLayoutSideDetailPanelSection]", inputs: ["axpLayoutSideDetailPanelSection"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXMDocumentExplorerDetailPanelComponent, isStandalone: true, selector: "axm-document-explorer-detail-panel", ngImport: i0, template: "@if (vm.hasMultipleSelectedItems() && multiSelectLabel(); as multiLabel) {\n  <axp-layout-side-detail-panel [multiSelectLabel]=\"multiLabel\" (panelClose)=\"onPanelClose()\" />\n} @else {\n  <axp-layout-side-detail-panel\n    [header]=\"panelHeader()\"\n    [sections]=\"panelSections()\"\n    (panelClose)=\"onPanelClose()\"\n  >\n    @if (metadataWidgetNode(); as widgetNode) {\n      <ng-template axpLayoutSideDetailPanelSection=\"metadata\">\n        <axp-widgets-container [context]=\"metadataContext()\">\n          <ng-container axp-widget-renderer [node]=\"widgetNode\" [mode]=\"'view'\"></ng-container>\n        </axp-widgets-container>\n      </ng-template>\n    }\n  </axp-layout-side-detail-panel>\n}\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i7.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i7.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "component", type: AXPLayoutSideDetailPanelComponent, selector: "axp-layout-side-detail-panel", inputs: ["multiSelectLabel", "header", "sections", "rows", "rowsSectionTitle", "noRowsMessage", "emptyState"], outputs: ["panelClose"] }, { kind: "directive", type: AXPLayoutSideDetailPanelSectionDirective, selector: "[axpLayoutSideDetailPanelSection]", inputs: ["axpLayoutSideDetailPanelSection"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXMDocumentExplorerDetailPanelComponent, decorators: [{
             type: Component,
@@ -5033,6 +5107,9 @@ class AXMDocumentDrivePageComponent extends AXPPageLayoutBaseComponent {
         this.driveService = inject(AXMDocumentManagerService);
         this.vm = inject(AXPDocumentExplorerViewModel);
         this.route = inject(ActivatedRoute);
+        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
+        /** Resolved restriction list; null = not configured (allow all). */
+        this.resolvedAllowedDocumentTypeNames = signal(null, ...(ngDevMode ? [{ debugName: "resolvedAllowedDocumentTypeNames" }] : /* istanbul ignore next */ []));
         //#endregion
         //#region ----   View State   ----
         this.filterItems = signal([], ...(ngDevMode ? [{ debugName: "filterItems" }] : /* istanbul ignore next */ []));
@@ -5084,12 +5161,23 @@ class AXMDocumentDrivePageComponent extends AXPPageLayoutBaseComponent {
                 this.layoutService.setNavigationLoading(isLoading);
             });
         }, ...(ngDevMode ? [{ debugName: "#loadingEffect" }] : /* istanbul ignore next */ []));
+        /** Re-apply document type restrictions when record context or plugin options change. */
+        this.#allowedDocumentTypesEffect = effect(() => {
+            this.rootContext();
+            this.options();
+            this.pageConfig();
+            untracked(() => {
+                void this.applyAllowedDocumentTypeNames();
+            });
+        }, ...(ngDevMode ? [{ debugName: "#allowedDocumentTypesEffect" }] : /* istanbul ignore next */ []));
     }
     //#endregion
     //#region ----   Effects   ----
     /** In embedded mode: when VM requests folder navigation, load that folder (no router). */
     #navigateEffect;
     #loadingEffect;
+    /** Re-apply document type restrictions when record context or plugin options change. */
+    #allowedDocumentTypesEffect;
     //#endregion
     //#region ----   Lifecycle   ----
     async ngOnInit() {
@@ -5099,25 +5187,56 @@ class AXMDocumentDrivePageComponent extends AXPPageLayoutBaseComponent {
         if (!refType || !refId) {
             return;
         }
-        console.log('options: ', this.options());
         await this.vm.initialize({ browseMode: 'file', scope: AXPPlatformScope.Tenant });
-        const pageConfigSnapshot = this.pageConfig();
-        console.log('[document-drive-page] ngOnInit pageConfig():', pageConfigSnapshot);
-        const allowedNames = this.getAllowedDocumentTypeNames();
-        console.log('[document-drive-page] getAllowedDocumentTypeNames():', allowedNames);
-        if (allowedNames) {
-            this.vm.setAllowedDocumentTypeNames(allowedNames);
-        }
+        await this.applyAllowedDocumentTypeNames();
         const { result } = await this.driveService.getRootByEntityRef(refType, refId);
         this.pageRootFolderId.set(result.id);
         await this.vm.loadFolderContents(result.id);
+        await this.applyAllowedDocumentTypeNames();
         this.recompute();
     }
-    /** Allowed document type names from pageConfig (when plugin is configured with documentTypeNames). */
-    getAllowedDocumentTypeNames() {
+    /**
+     * Resolves allowed document type names from static plugin config or an expression evaluated against rootContext.
+     * Returns null when not configured (no restriction).
+     */
+    async resolveAllowedDocumentTypeNames() {
         const config = this.pageConfig();
-        const arr = config && config.allowedDocumentTypeNames;
-        return Array.isArray(arr) && arr.length > 0 ? arr : undefined;
+        const configNames = config && config.allowedDocumentTypeNames;
+        if (isArray(configNames)) {
+            return configNames.filter((name) => isString$1(name) && name.trim().length > 0);
+        }
+        const raw = this.options()?.['documentTypeNames'];
+        if (raw == null) {
+            return null;
+        }
+        if (isArray(raw)) {
+            return raw.filter((name) => isString$1(name) && name.trim().length > 0);
+        }
+        if (isString$1(raw) && raw.trim()) {
+            const scope = {
+                context: {
+                    eval: (path) => getSmart(this.rootContext(), path),
+                },
+            };
+            const evaluated = await this.expressionEvaluator.evaluate(raw.trim(), scope);
+            if (isArray(evaluated)) {
+                return evaluated.filter((name) => isString$1(name) && name.trim().length > 0);
+            }
+            return [];
+        }
+        return null;
+    }
+    async applyAllowedDocumentTypeNames() {
+        const names = await this.resolveAllowedDocumentTypeNames();
+        if (names === null) {
+            return;
+        }
+        this.resolvedAllowedDocumentTypeNames.set(names);
+        this.vm.setAllowedDocumentTypeNames(names);
+    }
+    getAllowedDocumentTypeNames() {
+        const names = this.resolvedAllowedDocumentTypeNames();
+        return names === null ? undefined : names;
     }
     /**
      * Resolves refType and refId for getRootByEntityRef from pageConfig, rootContext, or route.
@@ -5220,8 +5339,7 @@ class AXMDocumentDrivePageComponent extends AXPPageLayoutBaseComponent {
                 },
             ];
         }
-        const addItemItems = await this.vm.getFolderAddMenuItems({ canAddFolder: false });
-        console.log('[document-drive-page] addItemItems:', addItemItems);
+        const addItemItems = await this.vm.getFolderAddMenuItems();
         if (addItemItems.length > 0) {
             addItemItems[addItemItems.length - 1].break = false;
             return [
@@ -6079,11 +6197,18 @@ async function documentTypeFactory() {
             plural: RootConfig.entities.documentType.titlePlural,
             searchResult: {
                 title: '{{ title }}',
-                description: RootConfig.module.title,
+                description: '{{ description }}',
             },
         },
         plugins: [
             { name: 'history' },
+            {
+                name: 'unique-fields',
+                options: {
+                    fields: 'name',
+                    scope: 'global',
+                },
+            },
             {
                 name: 'meta-data-builder',
                 options: {
@@ -6095,7 +6220,11 @@ async function documentTypeFactory() {
         groups: [
             {
                 id: 'basic-info',
-                title: RootConfig.entities.documentType.title,
+                title: '@general:terms.interface.basic-info',
+            },
+            {
+                id: 'configuration',
+                title: '@general:terms.interface.configuration',
             },
             {
                 id: 'management',
@@ -6111,23 +6240,41 @@ async function documentTypeFactory() {
                     sort: {
                         enabled: true,
                     },
+                    filter: {
+                        advance: { enabled: true },
+                        inline: { enabled: true },
+                    },
                 },
                 schema: {
                     dataType: 'string',
+                    readonly: '{{ !!context.eval("id") }}',
                     interface: {
                         type: AXPWidgetsList.Editors.TextBox,
+                        options: {
+                            disabled: '{{ !!context.eval("id") }}',
+                        },
                     },
                 },
                 validations: [
                     {
                         rule: 'required',
                     },
+                    {
+                        rule: 'variable-name',
+                    },
                 ],
             },
             {
                 name: 'title',
                 title: '@general:terms.common.title',
                 groupId: 'basic-info',
+                options: {
+                    sort: { enabled: true },
+                    filter: {
+                        advance: { enabled: true },
+                        inline: { enabled: true },
+                    },
+                },
                 schema: {
                     dataType: 'string',
                     interface: {
@@ -6140,12 +6287,31 @@ async function documentTypeFactory() {
                     },
                 ],
             },
+            {
+                name: 'description',
+                title: '@general:terms.common.description',
+                groupId: 'basic-info',
+                options: {
+                    sort: { enabled: false },
+                    filter: { advance: { enabled: true }, inline: { enabled: true } },
+                },
+                schema: {
+                    dataType: 'string',
+                    interface: {
+                        type: AXPWidgetsList.Editors.LargeTextBox,
+                        options: {
+                            rows: 3,
+                        },
+                    },
+                },
+            },
             {
                 name: 'maxSize',
                 title: `@${i18n}:terms.document.max-size`,
-                groupId: 'basic-info',
+                groupId: 'configuration',
                 schema: {
                     dataType: 'number',
+                    defaultValue: 50000,
                     interface: {
                         type: AXPWidgetsList.Editors.UnitValueBox,
                         options: {
@@ -6181,7 +6347,7 @@ async function documentTypeFactory() {
             {
                 name: 'isEncrypted',
                 title: `@${i18n}:terms.document.is-encrypted`,
-                groupId: 'basic-info',
+                groupId: 'configuration',
                 schema: {
                     dataType: 'boolean',
                     interface: {
@@ -6189,6 +6355,21 @@ async function documentTypeFactory() {
                     },
                 },
             },
+            {
+                name: 'type',
+                title: `@${i18n}:terms.common.type`,
+                groupId: 'configuration',
+                options: {
+                    sort: { enabled: false },
+                },
+                schema: {
+                    dataType: 'object',
+                    interface: {
+                        type: AXPWidgetsList.Editors.FileTypeExtension,
+                        options: {},
+                    },
+                },
+            },
             {
                 name: 'enableExpiration',
                 title: `@${i18n}:terms.document.enable-expiration`,
@@ -6242,214 +6423,36 @@ async function documentTypeFactory() {
             //     },
             //   },
             // },
-            {
-                name: 'type',
-                title: `@${i18n}:terms.common.type`,
-                groupId: 'basic-info',
-                schema: {
-                    dataType: 'object',
-                    interface: {
-                        type: AXPWidgetsList.Editors.FileTypeExtension,
-                        options: {},
-                    },
-                },
-            },
         ],
-        columns: [{ name: 'name' }, { name: 'title' }],
+        columns: [{ name: 'name' }, { name: 'title' }, { name: 'description' }],
         interfaces: {
             master: {
                 create: {
-                    sections: [
-                        {
-                            id: 'basic-info',
-                        },
-                        {
-                            id: 'management',
-                        },
-                    ],
+                    sections: [{ id: 'basic-info' }, { id: 'configuration' }, { id: 'management' }],
                     properties: [
-                        {
-                            name: 'name',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'title',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'maxSize',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'isEncrypted',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'enableExpiration',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'requiresReview',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'enableVersioning',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        // {
-                        //   name: 'meta',
-                        //   layout: {
-                        //     positions: {
-                        //       lg: {
-                        //         colSpan: 12,
-                        //       },
-                        //     },
-                        //   },
-                        // },
-                        {
-                            name: 'type',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
-                        },
+                        { name: 'name', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'maxSize', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'isEncrypted', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'type', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'enableExpiration', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'requiresReview', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
+                        { name: 'enableVersioning', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
                     ],
                 },
                 update: {
-                    sections: [
-                        {
-                            id: 'basic-info',
-                        },
-                        {
-                            id: 'management',
-                        },
-                    ],
+                    sections: [{ id: 'basic-info' }, { id: 'configuration' }, { id: 'management' }],
                     properties: [
-                        {
-                            name: 'name',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'title',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'maxSize',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'isEncrypted',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'enableExpiration',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'requiresReview',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'enableVersioning',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'type',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
-                        },
+                        { name: 'name', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'maxSize', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'isEncrypted', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'type', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'enableExpiration', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'requiresReview', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
+                        { name: 'enableVersioning', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
                     ],
                 },
                 single: {
@@ -6457,116 +6460,30 @@ async function documentTypeFactory() {
                     sections: [
                         {
                             id: 'basic-info',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
+                            order: 1,
+                            layout: { positions: { lg: { colSpan: 12 } } },
+                        },
+                        {
+                            id: 'configuration',
+                            order: 2,
+                            layout: { positions: { lg: { colSpan: 12 } } },
                         },
                         {
                             id: 'management',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
+                            order: 3,
+                            layout: { positions: { lg: { colSpan: 12 } } },
                         },
                     ],
                     properties: [
-                        {
-                            name: 'name',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'title',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'maxSize',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'isEncrypted',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'enableExpiration',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'requiresReview',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        {
-                            name: 'enableVersioning',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 6,
-                                    },
-                                },
-                            },
-                        },
-                        // {
-                        //   name: 'meta',
-                        //   layout: {
-                        //     positions: {
-                        //       lg: {
-                        //         colSpan: 12,
-                        //       },
-                        //     },
-                        //   },
-                        // },
-                        {
-                            name: 'type',
-                            layout: {
-                                positions: {
-                                    lg: {
-                                        colSpan: 12,
-                                    },
-                                },
-                            },
-                        },
+                        { name: 'name', layout: { positions: { lg: { colSpan: 6, order: 1 } } } },
+                        { name: 'title', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'description', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'maxSize', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'isEncrypted', layout: { positions: { lg: { colSpan: 6, order: 2 } } } },
+                        { name: 'type', layout: { positions: { lg: { colSpan: 12, order: 3 } } } },
+                        { name: 'enableExpiration', layout: { positions: { lg: { colSpan: 4, order: 1 } } } },
+                        { name: 'requiresReview', layout: { positions: { lg: { colSpan: 4, order: 2 } } } },
+                        { name: 'enableVersioning', layout: { positions: { lg: { colSpan: 4, order: 3 } } } },
                     ],
                     actions: [...entityMasterRecordActions()],
                 },
@@ -6741,7 +6658,7 @@ class AXMDocumentDriveComponent extends AXPPageLayoutBaseComponent {
         const docTypes = await this.documentTypeService.query({ skip: 0, take: 1000 });
         this.documentTypeFilterOptions.set((docTypes.items ?? []).map((it) => ({
             id: it.id,
-            title: (it.title ?? it.name ?? it.id),
+            title: this.translateService.resolve(it.title ?? it.name ?? it.id),
         })));
         await this.loadAdvancedFilterDefinitions([]);
         const searchQuery = snapshot.queryParams['search'];