@acorex-platform/module-platform-management-client 0.0.38 → 0.0.46

package/fesm2022/{acorex-platform-module-platform-management-client-create-user-query.command-9Ku7C1BC.mjs → acorex-platform-module-platform-management-client-create-user-query.command-Bh49QHkl.mjs}

@@ -1,287 +1,109 @@
+import { extractRequestErrorInfo, platformErrorI18nKey } from '@acorex-platform/framework-client/common';
 import { resolveLayoutBuilderDialogResult, AXPLayoutBuilderService } from '@acorex-platform/framework-client/layout/builder';
-import { AXPEntityResolver } from '@acorex-platform/framework-client/layout/entity';
-import { resolveEntityActionCommandInput, entityActionDataRecord } from '@acorex-platform/framework-shared/runtime';
+import { AXPEntityResolver, AXPEntityService } from '@acorex-platform/framework-client/layout/entity';
+import { ENTITY_INSERT_DEFAULT, resolveEntityActionCommandInput, entityActionDataRecord } from '@acorex-platform/framework-shared/runtime';
+import { AXPCommandService } from '@acorex-platform/framework-client/runtime';
+import { RootConfig } from '@acorex-platform/module-platform-management-client/contracts';
 import { AXToastService } from '@acorex/components/toast';
 import { AXTranslationService } from '@acorex/core/translation';
 import * as i0 from '@angular/core';
 import { inject, Injectable } from '@angular/core';
+import { n as normalizeUserQueryMeasure, r as resolvePickedEntityFullName, w as withRequiredIdField, c as collectSelectedFieldGroupPaths, a as resolveAvailableContractFields, f as flattenEntityFieldItems, b as assembleEntityQueryContract, v as validateEntityQueryContract, p as parseEntityFullName, d as collectUserQueryEntityFieldGroups, e as defaultSelectedFieldGroups, U as USER_QUERY_RELATED_DEPTH, g as numericUserQueryFields, h as createDefaultEntityContract } from './acorex-platform-module-platform-management-client-create-user-query-contract.util-D_af2BUi.mjs';
+import { C as CREATE_USER_QUERY_I18N, a as CREATE_USER_QUERY_WIZARD_NAME, n as normalizeRestApiOutput, c as createEmptyRestApiOutput, b as CREATE_USER_QUERY_ENTITY_CATALOG, U as USER_QUERY_KIND_OPTIONS, d as USER_QUERY_VALUE_TYPE_OPTIONS, e as USER_QUERY_MEASURE_REDUCER_OPTIONS, Q as QUERY_CONTRACT_WIDGET_NAME, R as REST_API_GENERATOR_WIDGET_NAME } from './acorex-platform-module-platform-management-client-acorex-platform-module-platform-management-client-YuJijjKh.mjs';
 import { AXPWidgetsList } from '@acorex-platform/framework-shared/core';
-import { parsePropertyExposeEntries } from '@acorex-platform/framework-shared/entity';
-import { C as CREATE_USER_QUERY_I18N, a as CREATE_USER_QUERY_WIZARD_NAME, b as CREATE_USER_QUERY_ENTITY_CATALOG } from './acorex-platform-module-platform-management-client-create-user-query.types-DdygAori.mjs';
-import { n as normalizeRestApiOutput, c as createEmptyRestApiOutput, R as REST_API_GENERATOR_WIDGET_NAME } from './acorex-platform-module-platform-management-client-acorex-platform-module-platform-management-client-BGVhn6wv.mjs';
 
-//#region ----- Imports -----
-//#endregion
 //#region ----- Constants -----
-const LOOKUP_WIDGET_TYPES = new Set(['lookup-editor', 'select-editor']);
-const USER_QUERY_RELATED_DEPTH = 3;
+const VALUE_REDUCERS = ['count', 'sum', 'min', 'max', 'avg'];
+const EMPTY_USER_QUERY_WHERE = {
+    id: 'root',
+    logic: 'and',
+    filters: [],
+    order: 0,
+    title: 'Root',
+    widget: { type: 'string-filter', options: {} },
+    filterType: { advance: true, inline: true },
+};
 //#endregion
 //#region ----- Public API -----
-function parseEntityFullName(fullName) {
-    const trimmed = fullName.trim();
-    const separator = trimmed.indexOf('.');
-    if (separator <= 0 || separator === trimmed.length - 1) {
-        return null;
-    }
+function emptyUserQueryBuilderValue() {
     return {
-        module: trimmed.slice(0, separator),
-        name: trimmed.slice(separator + 1),
-    };
-}
-function resolvePickedEntityFullName(value) {
-    if (typeof value === 'string') {
-        return value.trim();
-    }
-    if (value == null || typeof value !== 'object') {
-        return '';
-    }
-    const record = value;
-    const id = typeof record['id'] === 'string' ? record['id'].trim() : '';
-    if (id.includes('.')) {
-        return id;
-    }
-    const moduleName = typeof record['module_id'] === 'string' ? record['module_id'].trim() : '';
-    const name = typeof record['name'] === 'string' ? record['name'].trim() : '';
-    if (moduleName && name) {
-        return `${moduleName}.${name}`;
-    }
-    return id;
-}
-function collectUserQueryEntityFieldGroups(entity, relatedByName) {
-    return collectGroups(entity, relatedByName, '', new Set());
-}
-function flattenEntityFieldGroups(groups) {
-    const result = [];
-    const walk = (group) => {
-        result.push(group);
-        for (const child of group.children ?? []) {
-            walk(child);
-        }
-    };
-    for (const group of groups) {
-        walk(group);
-    }
-    return result;
-}
-function defaultSelectedFieldGroups(groups) {
-    const selected = {};
-    for (const group of flattenEntityFieldGroups(groups)) {
-        selected[group.id] = [];
-    }
-    for (const group of groups) {
-        if (group.kind !== 'relation') {
-            selected[group.id] = group.items.map((item) => item.path);
-        }
-    }
-    return selected;
-}
-function collectSelectedFieldGroupPaths(fieldGroups, groups) {
-    const paths = [];
-    const walk = (group) => {
-        paths.push(...normalizeSelectedFieldPaths(fieldGroups?.[group.id]));
-        for (const child of group.children ?? []) {
-            walk(child);
-        }
+        columns: [],
+        where: { ...EMPTY_USER_QUERY_WHERE, filters: [] },
+        sort: [],
+        groupBy: [],
+        aggregates: [],
     };
-    for (const group of groups) {
-        walk(group);
-    }
-    return paths;
-}
-function withRequiredIdField(paths) {
-    const unique = [];
-    const seen = new Set();
-    for (const path of paths) {
-        const trimmed = path.trim();
-        if (!trimmed || seen.has(trimmed)) {
-            continue;
-        }
-        seen.add(trimmed);
-        unique.push(trimmed);
-    }
-    if (!seen.has('id')) {
-        unique.unshift('id');
-    }
-    return unique;
 }
-function normalizeSelectedFieldPaths(value) {
-    if (!Array.isArray(value)) {
-        return [];
-    }
-    const paths = [];
-    for (const item of value) {
-        if (typeof item === 'string') {
-            paths.push(item);
-            continue;
-        }
-        if (item != null && typeof item === 'object') {
-            const path = item.path;
-            if (typeof path === 'string') {
-                paths.push(path);
-            }
-        }
-    }
-    return paths;
-}
-//#endregion
-//#region ----- Group collection -----
-function collectGroups(entity, relatedByName, pathPrefix, ancestry) {
-    const groups = [];
-    const { host, lookups } = collectHostAndLookups(entity, pathPrefix);
-    if (host.items.length) {
-        groups.push(host);
-    }
-    groups.push(...lookups);
-    const hostFullName = `${entity.module}.${entity.name}`;
-    const nextAncestry = new Set(ancestry);
-    nextAncestry.add(hostFullName);
-    for (const related of entity.relatedEntities ?? []) {
-        const group = collectRelatedGroup(related, relatedByName, pathPrefix, nextAncestry);
-        if (group) {
-            groups.push(group);
-        }
-    }
-    return groups;
-}
-function collectHostAndLookups(entity, pathPrefix, allowedNames) {
-    const hostItems = [];
-    const lookups = [];
-    for (const property of entity?.properties ?? []) {
-        const name = property.name?.trim();
-        if (!name || name.toLowerCase() === 'id') {
-            continue;
-        }
-        if (allowedNames && !allowedNames.has(name)) {
-            continue;
-        }
-        if (isLookupProperty(property)) {
-            const lookupGroup = collectLookupGroup(property, pathPrefix);
-            if (lookupGroup) {
-                lookups.push(lookupGroup);
-            }
-            continue;
-        }
-        hostItems.push({
-            path: joinPath(pathPrefix, name),
-            title: property.title,
-            fallback: name,
-        });
-    }
+function toQueryBuilderDataSource(entityName, fields) {
+    const columns = fields.map((field) => ({
+        name: field.path,
+        title: field.text || field.path,
+        datatype: field.dataType || 'string',
+        type: field.filterWidget || 'text-editor',
+    }));
+    const filters = fields.map((field) => ({
+        id: field.path,
+        field: field.path,
+        title: field.text || field.path,
+        operator: { type: 'equal' },
+        widget: { type: field.filterWidget || 'string-filter', options: {} },
+        filterType: { advance: true, inline: true },
+    }));
     return {
-        host: {
-            id: pathPrefix ? `rel_${sanitizeGroupId(pathPrefix)}_fields` : 'host',
-            kind: pathPrefix ? 'relation' : 'host',
-            title: '',
-            fallback: 'fields',
-            items: hostItems,
-        },
-        lookups,
+        name: entityName,
+        title: entityName,
+        columns,
+        filters,
     };
 }
-function collectLookupGroup(property, pathPrefix) {
-    const name = property.name?.trim();
-    if (!name) {
-        return null;
-    }
-    const items = [
-        {
-            path: joinPath(pathPrefix, name),
-            title: property.title,
-            fallback: name,
-        },
-    ];
-    const opts = property.schema?.interface?.options;
-    for (const entry of parsePropertyExposeEntries(opts)) {
-        const target = entry.target.trim();
-        if (!target || target === name) {
-            continue;
-        }
-        items.push({
-            path: joinPath(pathPrefix, target),
-            title: entry.source,
-            fallback: entry.source.trim() || target,
-        });
-    }
-    return {
-        id: `lookup_${sanitizeGroupId(joinPath(pathPrefix, name))}`,
-        kind: 'lookup',
-        title: property.title,
-        fallback: name,
-        items,
+function measureFromBuilderValue(query, fallback, available) {
+    const first = query?.aggregates?.find((item) => typeof item?.function === 'string' && item.function.trim());
+    if (!first) {
+        return normalizeUserQueryMeasure(fallback, available);
+    }
+    const key = first.function.trim().toLowerCase();
+    const reducer = key === 'average' ? 'avg' : VALUE_REDUCERS.includes(key) ? key : 'count';
+    if (reducer === 'count') {
+        return { reducer: 'count', alias: first.alias?.trim() || 'value' };
+    }
+    return normalizeUserQueryMeasure({ reducer, field: first.field, alias: first.alias?.trim() || 'value' }, available);
+}
+function toUserQueryDefinitionRow(context, available) {
+    const contract = context.contract;
+    if (!contract) {
+        throw new Error('contract');
+    }
+    const entityName = typeof context.source?.entity?.entityName === 'string' ? context.source.entity.entityName.trim() : '';
+    const fields = context.source?.entity?.fields ?? [];
+    const query = (context.source?.entity?.query ?? emptyUserQueryBuilderValue());
+    const measure = contract.kind === 'value' ? measureFromBuilderValue(query, contract.measure, available) : undefined;
+    const source = {
+        kind: 'entity',
+        entityName,
+        fields,
+        fieldGroups: context.source?.entity?.fieldGroups,
+        query,
+        ...(measure ? { measure } : {}),
     };
-}
-function collectRelatedGroup(related, relatedByName, pathPrefix, ancestry) {
-    if (related.hidden === true) {
-        return null;
-    }
-    const entityName = related.entity?.trim();
-    if (!entityName || ancestry.has(entityName)) {
-        return null;
-    }
-    const relatedEntity = relatedByName.get(entityName);
-    const dataPath = related.persistence?.dataPath?.trim() || entityName.split('.').pop() || entityName;
-    const pathRoot = joinPath(pathPrefix, dataPath);
-    const allowed = resolveAllowedPropertyNames(related, relatedEntity);
-    const { host, lookups } = collectHostAndLookups(relatedEntity, pathRoot, allowed);
-    const childAncestry = new Set(ancestry);
-    childAncestry.add(entityName);
-    const children = [...lookups];
-    for (const nested of relatedEntity?.relatedEntities ?? []) {
-        const child = collectRelatedGroup(nested, relatedByName, pathRoot, childAncestry);
-        if (child) {
-            children.push(child);
-        }
-    }
-    if (!host.items.length && !children.length) {
-        return null;
-    }
     return {
-        id: `rel_${sanitizeGroupId(pathRoot)}`,
-        kind: 'relation',
-        title: related.title,
-        fallback: entityName,
-        items: host.items,
-        children: children.length ? children : undefined,
+        name: contract.name.trim(),
+        catalogTitle: contract.catalogTitle.trim(),
+        description: contract.description,
+        active: true,
+        executionMode: 'backend',
+        kind: contract.kind,
+        valueType: contract.kind === 'value' ? contract.valueType : undefined,
+        binding: contract.kind === 'collection' ? contract.capabilities?.binding : undefined,
+        args: { enabled: false },
+        filter: contract.capabilities?.filter ?? { enabled: false },
+        sort: contract.kind === 'collection' ? contract.capabilities?.sort : { enabled: false },
+        paging: contract.kind === 'collection' ? contract.capabilities?.paging : { enabled: false },
+        columns: contract.kind === 'value' ? undefined : contract.columns,
+        capabilities: ['ai'],
+        source,
+        stateInfo: { isSystem: false },
     };
 }
-function resolveAllowedPropertyNames(related, relatedEntity) {
-    const excluded = new Set((related.excludeProperties ?? [])
-        .filter((name) => typeof name === 'string')
-        .map((name) => name.trim())
-        .filter(Boolean));
-    const fromConfig = Array.isArray(related.properties)
-        ? related.properties.filter((name) => typeof name === 'string' && name.trim().length > 0)
-        : [];
-    if (fromConfig.length) {
-        return new Set(fromConfig.map((name) => name.trim()).filter((name) => name.toLowerCase() !== 'id' && !excluded.has(name)));
-    }
-    if (!excluded.size) {
-        return undefined;
-    }
-    const names = (relatedEntity?.properties ?? [])
-        .map((property) => property.name?.trim() ?? '')
-        .filter((name) => name && name.toLowerCase() !== 'id' && !excluded.has(name));
-    return new Set(names);
-}
-function isLookupProperty(property) {
-    const iface = property.schema?.interface;
-    const opts = iface?.options;
-    const lookupEntity = typeof opts?.['entity'] === 'string' ? String(opts['entity']).trim() : '';
-    if (!lookupEntity) {
-        return false;
-    }
-    const widgetType = typeof iface?.type === 'string' ? iface.type : '';
-    if (LOOKUP_WIDGET_TYPES.has(widgetType)) {
-        return true;
-    }
-    return /(Ids|IDs|Id|ID)$/i.test(property.name);
-}
-function joinPath(prefix, segment) {
-    return prefix ? `${prefix}.${segment}` : segment;
-}
-function sanitizeGroupId(value) {
-    return value.replace(/[^a-zA-Z0-9]+/g, '_').replace(/^_|_$/g, '');
-}
 //#endregion
 
 //#region ----- Imports -----
@@ -342,7 +164,10 @@ async function openEntityPickDialog(args, entityName) {
             .setCloseButton(true)
             .setContext(createInitialContext('entity', entityName))
             .content((flex) => {
-            flex.setDirection('column').setGap('16px').stepWizard((wizard) => {
+            flex
+                .setDirection('column')
+                .setGap('16px')
+                .stepWizard((wizard) => {
                 wizard
                     .name(CREATE_USER_QUERY_WIZARD_NAME)
                     .setLook('circular-icon')
@@ -361,7 +186,7 @@ async function openEntityPickDialog(args, entityName) {
                 })
                     .step('contract', CREATE_USER_QUERY_I18N.steps.contract, (step) => {
                     step.setIcon('fa-light fa-file-contract').content((layout) => {
-                        fillContractPlaceholderStep(layout);
+                        fillHintStep(layout, CREATE_USER_QUERY_I18N.steps.contract, CREATE_USER_QUERY_I18N.placeholders.contractNext);
                     });
                 });
             });
@@ -387,7 +212,7 @@ async function openEntityPickDialog(args, entityName) {
             })
                 .custom({
                 title: '@general:actions.submit.title',
-                command: `widget:${CREATE_USER_QUERY_WIZARD_NAME}.submit`,
+                command: 'submit',
                 icon: 'fa-regular fa-check',
                 color: 'success',
                 hidden: '{{!api.getStatus().isLast}}',
@@ -417,9 +242,12 @@ async function openEntityFieldsDialog(args, entityName, groups, selectedGroups)
             .setTitle(CREATE_USER_QUERY_I18N.titles.entity)
             .setSize('xl')
             .setCloseButton(true)
-            .setContext(createInitialContext('entity', entityName, [], selectedGroups))
+            .setContext(createInitialContext('entity', entityName, [], selectedGroups, createEntityContractSeed(entityName, groups, selectedGroups)))
             .content((flex) => {
-            flex.setDirection('column').setGap('16px').stepWizard((wizard) => {
+            flex
+                .setDirection('column')
+                .setGap('16px')
+                .stepWizard((wizard) => {
                 wizard
                     .name(CREATE_USER_QUERY_WIZARD_NAME)
                     .setLook('circular-icon')
@@ -436,7 +264,7 @@ async function openEntityFieldsDialog(args, entityName, groups, selectedGroups)
                 })
                     .step('contract', CREATE_USER_QUERY_I18N.steps.contract, (step) => {
                     step.setIcon('fa-light fa-file-contract').content((layout) => {
-                        fillContractPlaceholderStep(layout);
+                        fillEntityContractStep(layout, entityName, groups);
                     });
                 });
             });
@@ -472,7 +300,7 @@ async function openEntityFieldsDialog(args, entityName, groups, selectedGroups)
             })
                 .custom({
                 title: '@general:actions.submit.title',
-                command: `widget:${CREATE_USER_QUERY_WIZARD_NAME}.submit`,
+                command: 'submit',
                 icon: 'fa-regular fa-check',
                 color: 'success',
                 hidden: '{{!api.getStatus().isLast}}',
@@ -494,12 +322,27 @@ async function openEntityFieldsDialog(args, entityName, groups, selectedGroups)
             if (countFieldGroupItems(groups) > 0 && fields.filter((path) => path !== 'id').length === 0) {
                 throw new Error(CREATE_USER_QUERY_I18N.errors.fieldsRequired);
             }
+            const available = resolveAvailableContractFields(flattenEntityFieldItems(groups), fields);
+            const contract = assembleEntityQueryContract({
+                name: context.contract?.name ?? '',
+                catalogTitle: context.contract?.catalogTitle ?? '',
+                description: context.contract?.description,
+                kind: context.contract?.kind,
+                valueType: context.contract?.valueType,
+                measure: context.contract?.measure,
+            }, context.contract?.capabilities, available);
+            const contractError = validateEntityQueryContract(contract, available);
+            if (contractError) {
+                throw new Error(contractValidationErrorKey(contractError));
+            }
             return {
                 ...context,
+                contract,
                 source: {
                     ...context.source,
                     kind: 'entity',
                     entity: {
+                        ...context.source?.entity,
                         entityName,
                         fields,
                         fieldGroups: context.source?.entity?.fieldGroups,
@@ -566,9 +409,7 @@ async function openApiSourceWizard(args) {
         }
         const groups = inferJsonFieldGroups(tested.source?.api?.lastTest?.body);
         const views = await toFieldGroupViews(groups, args.translationService);
-        const selected = isSameApiRequest(previous, tested) && previous.source?.api?.fieldGroups
-            ? previous.source.api.fieldGroups
-            : defaultHostFieldGroups(groups);
+        const selected = isSameApiRequest(previous, tested) && previous.source?.api?.fieldGroups ? previous.source.api.fieldGroups : defaultHostFieldGroups(groups);
         const outcome = await openApiFieldsDialog(args, tested, views, selected);
         if (outcome === API_WIZARD_BACK) {
             previous = tested;
@@ -587,7 +428,10 @@ async function openApiSourceDialog(args, previous) {
             .setCloseButton(true)
             .setContext(previous)
             .content((flex) => {
-            flex.setDirection('column').setGap('16px').stepWizard((wizard) => {
+            flex
+                .setDirection('column')
+                .setGap('16px')
+                .stepWizard((wizard) => {
                 wizard
                     .name(CREATE_USER_QUERY_WIZARD_NAME)
                     .setLook('circular-icon')
@@ -632,7 +476,7 @@ async function openApiSourceDialog(args, previous) {
             })
                 .custom({
                 title: '@general:actions.submit.title',
-                command: `widget:${CREATE_USER_QUERY_WIZARD_NAME}.submit`,
+                command: 'submit',
                 icon: 'fa-regular fa-check',
                 color: 'success',
                 hidden: '{{!api.getStatus().isLast}}',
@@ -675,7 +519,10 @@ async function openApiFieldsDialog(args, tested, groups, selectedGroups) {
             .setCloseButton(true)
             .setContext(createApiWizardContext(tested.source?.api, selectedGroups))
             .content((flex) => {
-            flex.setDirection('column').setGap('16px').stepWizard((wizard) => {
+            flex
+                .setDirection('column')
+                .setGap('16px')
+                .stepWizard((wizard) => {
                 wizard
                     .name(CREATE_USER_QUERY_WIZARD_NAME)
                     .setLook('circular-icon')
@@ -728,7 +575,7 @@ async function openApiFieldsDialog(args, tested, groups, selectedGroups) {
             })
                 .custom({
                 title: '@general:actions.submit.title',
-                command: `widget:${CREATE_USER_QUERY_WIZARD_NAME}.submit`,
+                command: 'submit',
                 icon: 'fa-regular fa-check',
                 color: 'success',
                 hidden: '{{!api.getStatus().isLast}}',
@@ -805,9 +652,7 @@ function createApiWizardContext(api, fieldGroups = {}) {
             api: {
                 request: api?.request ?? createEmptyRestApiOutput(),
                 connectionId: api?.connectionId,
-                lastTest: api?.lastTest
-                    ? { ...api.lastTest, status: String(api.lastTest.status) }
-                    : undefined,
+                lastTest: api?.lastTest ? { ...api.lastTest, status: String(api.lastTest.status) } : undefined,
                 fields: api?.fields ?? [],
                 fieldGroups: Object.keys(fieldGroups).length ? fieldGroups : (api?.fieldGroups ?? {}),
             },
@@ -935,9 +780,7 @@ function splitJsonEnvelope(root) {
             return Array.isArray(value) && value.some((item) => isPlainObject(item));
         });
         const otherKeys = keys.filter((key) => !arrayKeys.includes(key));
-        if (arrayKeys.length === 1 &&
-            otherKeys.length > 0 &&
-            otherKeys.every((key) => isJsonScalar(root[key]))) {
+        if (arrayKeys.length === 1 && otherKeys.length > 0 && otherKeys.every((key) => isJsonScalar(root[key]))) {
             payloadKey = arrayKeys[0];
         }
     }
@@ -1059,11 +902,7 @@ async function openAdvancedPlaceholder(args) {
     await args.layoutBuilder
         .create()
         .dialog((dialog) => {
-        dialog
-            .setTitle(CREATE_USER_QUERY_I18N.titles.advanced)
-            .setMessage(CREATE_USER_QUERY_I18N.placeholders.advanced)
-            .setSize('md')
-            .setCloseButton(true);
+        dialog.setTitle(CREATE_USER_QUERY_I18N.titles.advanced).setMessage(CREATE_USER_QUERY_I18N.placeholders.advanced).setSize('md').setCloseButton(true);
     })
         .show();
     return null;
@@ -1077,7 +916,10 @@ function configureSimpleSourceWizard(dialog, args) {
         .setCloseButton(true)
         .setContext(createInitialContext(args.sourceKind))
         .content((flex) => {
-        flex.setDirection('column').setGap('16px').stepWizard((wizard) => {
+        flex
+            .setDirection('column')
+            .setGap('16px')
+            .stepWizard((wizard) => {
             wizard
                 .name(CREATE_USER_QUERY_WIZARD_NAME)
                 .setLook('circular-icon')
@@ -1121,7 +963,7 @@ function configureSimpleSourceWizard(dialog, args) {
         })
             .custom({
             title: '@general:actions.submit.title',
-            command: `widget:${CREATE_USER_QUERY_WIZARD_NAME}.submit`,
+            command: 'submit',
             icon: 'fa-regular fa-check',
             color: 'success',
             hidden: '{{!api.getStatus().isLast}}',
@@ -1158,9 +1000,8 @@ function fillEntityPickStep(layout, readonly = false) {
         fieldset.formField(CREATE_USER_QUERY_I18N.fields.entity, (field) => {
             field.path('source.entity.entityName').lookupBox({
                 entity: CREATE_USER_QUERY_ENTITY_CATALOG,
-                valueField: 'id',
-                textField: 'id',
-                columns: ['name', 'module_id'],
+                valueField: 'name',
+                textField: 'name',
                 look: 'select',
                 searchable: true,
                 allowClear: !readonly,
@@ -1172,15 +1013,115 @@ function fillEntityPickStep(layout, readonly = false) {
         });
     });
 }
-function fillEntityFieldsStep(layout, entityName, groups) {
+function fillEntityContractStep(layout, entityName, groups) {
+    const builderFields = flattenEntityFieldItems(groups);
     layout.flex((flex) => {
         flex.setDirection('column').setGap('16px').setAlignItems('stretch');
         flex.fieldset((fieldset) => {
             fieldset
-                .setTitle(entityName)
-                .setDescription(CREATE_USER_QUERY_I18N.placeholders.selectedEntityHint)
-                .setIcon('fa-light fa-database')
-                .setLook('group');
+                .setTitle(CREATE_USER_QUERY_I18N.fields.identity)
+                .setDescription(CREATE_USER_QUERY_I18N.placeholders.identity)
+                .setIcon('fa-light fa-id-card')
+                .setCols(2)
+                .formField(CREATE_USER_QUERY_I18N.fields.queryName, (field) => {
+                field.path('contract.name').textBox({ validations: [{ rule: 'required' }] });
+            })
+                .formField(CREATE_USER_QUERY_I18N.fields.catalogTitle, (field) => {
+                field.path('contract.catalogTitle').textBox({ validations: [{ rule: 'required' }] });
+            })
+                .formField(CREATE_USER_QUERY_I18N.fields.description, (field) => {
+                field.path('contract.description').largeTextBox({ rows: 3 }).layout(2);
+            });
+        });
+        flex.fieldset((fieldset) => {
+            fieldset
+                .setTitle(CREATE_USER_QUERY_I18N.fields.kind)
+                .setDescription(CREATE_USER_QUERY_I18N.placeholders.kind)
+                .setIcon('fa-light fa-shapes')
+                .setCols(2)
+                .formField(CREATE_USER_QUERY_I18N.fields.kind, (field) => {
+                field
+                    .path('contract.kind')
+                    .setShowLabel(false)
+                    .selectBox({
+                    valueField: 'value',
+                    textField: 'text',
+                    dataSource: USER_QUERY_KIND_OPTIONS,
+                    validations: [{ rule: 'required' }],
+                });
+            })
+                .formField(CREATE_USER_QUERY_I18N.fields.valueType, (field) => {
+                field
+                    .path('contract.valueType')
+                    .selectBox({
+                    valueField: 'value',
+                    textField: 'text',
+                    dataSource: USER_QUERY_VALUE_TYPE_OPTIONS,
+                })
+                    .visible('{{ context.eval("contract.kind") === "value" }}');
+            })
+                .formField(CREATE_USER_QUERY_I18N.fields.measure, (field) => {
+                field
+                    .path('contract.measure.reducer')
+                    .selectBox({
+                    valueField: 'value',
+                    textField: 'text',
+                    dataSource: USER_QUERY_MEASURE_REDUCER_OPTIONS,
+                    validations: [{ rule: 'required' }],
+                })
+                    .visible('{{ context.eval("contract.kind") === "value" }}');
+            })
+                .formField(CREATE_USER_QUERY_I18N.fields.measureField, (field) => {
+                field
+                    .path('contract.measure.field')
+                    .selectBox({
+                    valueField: 'path',
+                    textField: 'text',
+                    dataSource: numericUserQueryFields(flattenEntityFieldItems(groups)),
+                })
+                    .visible('{{ context.eval("contract.kind") === "value" && context.eval("contract.measure.reducer") !== "count" }}');
+            });
+        });
+        flex.fieldset((fieldset) => {
+            fieldset
+                .setTitle(CREATE_USER_QUERY_I18N.fields.predicates)
+                .setDescription(CREATE_USER_QUERY_I18N.placeholders.predicates)
+                .setIcon('fa-light fa-filter')
+                .setCols(1)
+                .formField(' ', (field) => {
+                field
+                    .path('source.entity.query')
+                    .setShowLabel(false)
+                    .customWidget(AXPWidgetsList.Editors.QueryBuilder, {
+                    visibleTabs: ['where', 'aggregate'],
+                    dataSource: toQueryBuilderDataSource(entityName, builderFields),
+                })
+                    .layout(1);
+            });
+        });
+        flex.fieldset((fieldset) => {
+            fieldset
+                .setTitle(CREATE_USER_QUERY_I18N.fields.capabilities)
+                .setDescription(CREATE_USER_QUERY_I18N.placeholders.capabilities)
+                .setIcon('fa-light fa-sliders')
+                .setCols(1)
+                .formField(' ', (field) => {
+                field
+                    .path('contract.capabilities')
+                    .setShowLabel(false)
+                    .customWidget(QUERY_CONTRACT_WIDGET_NAME, {
+                    fields: flattenEntityFieldItems(groups),
+                })
+                    .layout(1);
+            });
+        });
+    });
+}
+function fillEntityFieldsStep(layout, entityName, groups) {
+    layout.flex((flex) => {
+        flex.setDirection('column').setGap('16px').setAlignItems('stretch');
+        flex.fieldset((fieldset) => {
+            fieldset.setTitle(entityName).setDescription(CREATE_USER_QUERY_I18N.placeholders.selectedEntityHint).setIcon('fa-light fa-database').setLook('group');
         });
         for (const group of groups) {
             renderFieldGroup(flex, group);
@@ -1288,10 +1229,7 @@ function staticItemRepeaterChildren() {
                 gap: '12px',
                 alignItems: 'stretch',
             },
-            children: [
-                staticItemRepeaterField(CREATE_USER_QUERY_I18N.fields.value, 'value'),
-                staticItemRepeaterField(CREATE_USER_QUERY_I18N.fields.title, 'title'),
-            ],
+            children: [staticItemRepeaterField(CREATE_USER_QUERY_I18N.fields.value, 'value'), staticItemRepeaterField(CREATE_USER_QUERY_I18N.fields.title, 'title')],
         },
     ];
 }
@@ -1339,11 +1277,7 @@ function fillApiSourceStep(layout) {
 }
 function fillContractPlaceholderStep(layout) {
     layout.fieldset((fieldset) => {
-        fieldset
-            .setTitle(CREATE_USER_QUERY_I18N.steps.contract)
-            .setDescription(CREATE_USER_QUERY_I18N.placeholders.contract)
-            .setIcon('fa-light fa-file-contract')
-            .setLook('group');
+        fieldset.setTitle(CREATE_USER_QUERY_I18N.steps.contract).setDescription(CREATE_USER_QUERY_I18N.placeholders.contract).setIcon('fa-light fa-file-contract').setLook('group');
     });
 }
 //#endregion
@@ -1386,18 +1320,35 @@ function sourceStepErrorKey(sourceKind, context) {
     }
     return null;
 }
-function createInitialContext(sourceKind, entityName = '', fields = [], fieldGroups = {}) {
+function createInitialContext(sourceKind, entityName = '', fields = [], fieldGroups = {}, contract) {
     const items = [{ value: '', title: '' }];
     return {
         sourceKind,
         source: {
             kind: sourceKind,
-            entity: { entityName, fields, fieldGroups },
+            entity: { entityName, fields, fieldGroups, query: emptyUserQueryBuilderValue() },
             static: { items },
             api: { request: createEmptyRestApiOutput() },
         },
+        contract,
     };
 }
+function createEntityContractSeed(entityName, groups, selectedGroups) {
+    const available = resolveAvailableContractFields(flattenEntityFieldItems(groups), collectSelectedFieldGroupPaths(selectedGroups, groups));
+    return createDefaultEntityContract(entityName, available);
+}
+function contractValidationErrorKey(error) {
+    if (error === 'title') {
+        return CREATE_USER_QUERY_I18N.errors.contractTitleRequired;
+    }
+    if (error === 'binding') {
+        return CREATE_USER_QUERY_I18N.errors.contractBindingInvalid;
+    }
+    if (error === 'measure') {
+        return CREATE_USER_QUERY_I18N.errors.contractMeasureInvalid;
+    }
+    return CREATE_USER_QUERY_I18N.errors.contractNameRequired;
+}
 function countFieldGroupItems(groups) {
     let count = 0;
     const walk = (group) => {
@@ -1412,9 +1363,9 @@ function countFieldGroupItems(groups) {
     return count;
 }
 async function toFieldGroupViews(groups, translationService) {
-    const hostTitle = resolveLabel(translationService, CREATE_USER_QUERY_I18N.fields.hostFields, 'Fields');
+    const hostTitle = await resolveLabel(translationService, CREATE_USER_QUERY_I18N.fields.hostFields, 'Fields');
     const mapGroup = async (group) => {
-        const resolvedName = resolveLabel(translationService, group.title, group.fallback);
+        const resolvedName = await resolveLabel(translationService, group.title, group.fallback);
         let title = resolvedName;
         if (group.kind === 'host') {
             title = hostTitle;
@@ -1422,17 +1373,17 @@ async function toFieldGroupViews(groups, translationService) {
         else if (group.kind === 'relation') {
             title = await formatRelatedGroupTitle(translationService, resolvedName);
         }
-        const children = group.children?.length
-            ? await Promise.all(group.children.map((child) => mapGroup(child)))
-            : undefined;
+        const children = group.children?.length ? await Promise.all(group.children.map((child) => mapGroup(child))) : undefined;
         return {
             id: group.id,
             kind: group.kind,
             title,
-            items: group.items.map((item) => ({
+            items: await Promise.all(group.items.map(async (item) => ({
                 path: item.path,
-                text: resolveLabel(translationService, item.title, item.fallback),
-            })),
+                text: await resolveLabel(translationService, item.title, item.fallback),
+                filterWidget: item.filterWidget,
+                dataType: item.dataType,
+            }))),
             children,
         };
     };
@@ -1442,10 +1393,22 @@ async function formatRelatedGroupTitle(translationService, name) {
     const translated = await translationService.translateAsync(CREATE_USER_QUERY_I18N.placeholders.relatedTo, { params: { name } });
     return typeof translated === 'string' && translated.trim() ? translated.trim() : name;
 }
-function resolveLabel(translationService, value, fallback) {
+async function resolveLabel(translationService, value, fallback) {
     if (value == null || value === '') {
         return fallback;
     }
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        if (!trimmed) {
+            return fallback;
+        }
+        if (trimmed.startsWith('@')) {
+            const translated = await translationService.translateAsync(trimmed);
+            const text = typeof translated === 'string' ? translated.trim() : '';
+            return text && text !== trimmed ? text : fallback;
+        }
+        return trimmed;
+    }
     const resolved = translationService.resolve(value);
     const text = typeof resolved === 'string' ? resolved.trim() : '';
     return text || fallback;
@@ -1484,13 +1447,15 @@ function sourceStepIcon(sourceKind) {
 //#endregion
 //#region ----- Command -----
 /**
- * Opens the user-query create wizard. Step 1 configures the source; nothing is persisted.
+ * Opens the user-query create wizard and persists an entity-source QueryDefinition.
  */
 class AXMCreateUserQueryCommand {
     constructor() {
         //#region ----- Services & Dependencies -----
         this.layoutBuilder = inject(AXPLayoutBuilderService);
         this.entityResolver = inject(AXPEntityResolver);
+        this.entityService = inject(AXPEntityService);
+        this.commandService = inject(AXPCommandService);
         this.toastService = inject(AXToastService);
         this.translationService = inject(AXTranslationService);
     }
@@ -1498,20 +1463,99 @@ class AXMCreateUserQueryCommand {
     //#region ----- Execution -----
     async execute(input = {}) {
         const sourceKind = resolveSourceKind(input);
-        await openCreateUserQueryWizard({
+        const context = await openCreateUserQueryWizard({
             layoutBuilder: this.layoutBuilder,
             toastService: this.toastService,
             translationService: this.translationService,
             entityResolver: this.entityResolver,
             sourceKind,
         });
+        if (!context) {
+            return {
+                success: true,
+                kind: 'object',
+                data: { sourceKind },
+                metadata: { refresh: false },
+            };
+        }
+        if (context.sourceKind !== 'entity' || !context.contract) {
+            return {
+                success: true,
+                kind: 'object',
+                data: context,
+                metadata: { refresh: false },
+            };
+        }
+        try {
+            await this.persistEntityQuery(context);
+        }
+        catch (error) {
+            const message = await this.translatePersistError(error);
+            this.toastService.show({
+                color: 'danger',
+                content: message,
+                closeButton: true,
+                timeOut: 5000,
+                timeOutProgress: true,
+            });
+            return {
+                success: false,
+                message: { text: message },
+            };
+        }
+        const ok = await this.translationService.translateAsync(CREATE_USER_QUERY_I18N.placeholders.persistOk, {
+            params: { name: context.contract.name },
+        });
+        this.toastService.show({
+            color: 'success',
+            content: ok,
+            closeButton: true,
+            timeOut: 4000,
+            timeOutProgress: true,
+        });
         return {
             success: true,
             kind: 'object',
-            data: { sourceKind },
-            metadata: { refresh: false },
+            data: context,
+            metadata: { refresh: true },
         };
     }
+    //#endregion
+    //#region ----- Persist -----
+    async persistEntityQuery(context) {
+        const name = context.contract?.name?.trim() ?? '';
+        const catalog = this.entityService
+            .withEntity(RootConfig.module.name, RootConfig.entities.queryDefinition.name)
+            .data();
+        const existing = await catalog.query({
+            skip: 0,
+            take: 1,
+            filter: { field: 'name', operator: { type: 'equal' }, value: name },
+        });
+        if ((existing.items?.length ?? 0) > 0) {
+            throw new DuplicateUserQueryNameError();
+        }
+        const available = (context.source?.entity?.fields ?? []).map((path) => ({ path, text: path }));
+        const row = toUserQueryDefinitionRow(context, available);
+        const result = await this.commandService.execute(ENTITY_INSERT_DEFAULT, {
+            entity: `${RootConfig.module.name}.${RootConfig.entities.queryDefinition.name}`,
+            data: row,
+        });
+        if (!result?.success) {
+            throw result ?? new Error('insert');
+        }
+    }
+    async translatePersistError(error) {
+        if (error instanceof DuplicateUserQueryNameError) {
+            return this.translationService.translateAsync(CREATE_USER_QUERY_I18N.errors.persistDuplicate);
+        }
+        const info = extractRequestErrorInfo(error);
+        const mapped = platformErrorI18nKey(info?.code);
+        if (mapped) {
+            return this.translationService.translateAsync(mapped);
+        }
+        return this.translationService.translateAsync(CREATE_USER_QUERY_I18N.errors.persistFailed);
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMCreateUserQueryCommand, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMCreateUserQueryCommand, providedIn: 'root' }); }
 }
@@ -1521,6 +1565,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
         }] });
 //#endregion
 //#region ----- Helpers -----
+class DuplicateUserQueryNameError extends Error {
+    constructor() {
+        super('duplicate-query-name');
+        this.name = 'DuplicateUserQueryNameError';
+    }
+}
 function resolveSourceKind(input) {
     const resolved = resolveEntityActionCommandInput(input);
     const data = entityActionDataRecord(resolved.data) ?? {};
@@ -1535,4 +1585,4 @@ function resolveSourceKind(input) {
 }
 
 export { AXMCreateUserQueryCommand };
-//# sourceMappingURL=acorex-platform-module-platform-management-client-create-user-query.command-9Ku7C1BC.mjs.map
+//# sourceMappingURL=acorex-platform-module-platform-management-client-create-user-query.command-Bh49QHkl.mjs.map