@acorex-platform/module-asset-management-client 0.0.38 → 0.0.48

package/fesm2022/acorex-platform-module-asset-management-client.mjs

@@ -1,6 +1,6 @@
 import { AXP_PERMISSION_DEFINITION_PROVIDER } from '@acorex-platform/framework-client/auth';
 import { AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER, AXP_STATUS_PROVIDERS, AXPSearchCommandProvider, createEntityCommandOptions } from '@acorex-platform/framework-client/common';
-import { AXP_MODULE_MANIFEST_PROVIDER, AXP_CATALOG_SCOPE_DEFINITION_PROVIDER, provideLazyProvider, AXP_FEATURE_DEFINITION_PROVIDER, AXPDataGenerator } from '@acorex-platform/framework-client/core';
+import { AXP_CATALOG_SCOPE_DEFINITION_PROVIDER, provideLazyProvider, AXP_FEATURE_DEFINITION_PROVIDER, AXPDataGenerator } from '@acorex-platform/framework-client/core';
 import { AXP_PAGE_COMPONENT_PROVIDER, AXPStandardSectionItemsBuilderComponent } from '@acorex-platform/framework-client/layout/components';
 import { AXPMiddlewareAbortError, AXP_ENTITY_STORAGE_MIDDLEWARE, AXPEntityService } from '@acorex-platform/framework-client/layout/entity';
 import { provideCommand, provideCommandSetups, AXPCommandService } from '@acorex-platform/framework-client/runtime';
@@ -67,26 +67,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
             type: Injectable
         }] });
 
-//#region ----   Imports   ----
-//#endregion
-//#region ----   Manifest Definition   ----
-/**
- * Asset Management Module Manifest.
- * Defines module metadata, features, and provider references.
- */
-const AssetManagementManifest = {
-    name: RootConfig.module.name,
-    version: '1.0.0',
-    title: RootConfig.module.title,
-    icon: RootConfig.module.icon,
-    i18n: RootConfig.config.i18n,
-    type: 'domain',
-    domain: 'asset-maintenance',
-    required: false,
-    // Module dependencies (optional)
-};
-//#endregion
-
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Asset System Type Has Child Middleware   ----
@@ -197,12 +177,6 @@ class AXMAssetManagementModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMAssetManagementModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "22.0.8", ngImport: i0, type: AXMAssetManagementModule }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXMAssetManagementModule, providers: [
-            // Module Manifest Provider
-            {
-                provide: AXP_MODULE_MANIFEST_PROVIDER,
-                useValue: AssetManagementManifest,
-                multi: true,
-            },
             {
                 provide: AXP_CATALOG_SCOPE_DEFINITION_PROVIDER,
                 useClass: AXMAssetManagementCatalogScopeDefinitionProvider,
@@ -251,12 +225,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
             args: [{
                     imports: [],
                     providers: [
-                        // Module Manifest Provider
-                        {
-                            provide: AXP_MODULE_MANIFEST_PROVIDER,
-                            useValue: AssetManagementManifest,
-                            multi: true,
-                        },
                         {
                             provide: AXP_CATALOG_SCOPE_DEFINITION_PROVIDER,
                             useClass: AXMAssetManagementCatalogScopeDefinitionProvider,
@@ -1024,7 +992,13 @@ class AXMAssetTypeSectionBuilderComponent {
         this.linkAssetMode = computed(() => this.options()['linkAssetMode'] === true, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "linkAssetMode" }] : /* istanbul ignore next */ []));
         this.#syncValueToBuilder = effect(() => {
-            const normalized = normalizeAssetTypeSectionBuilderValue(this.value(), this.assetTypeId());
+            const raw = this.value();
+            // In link mode an empty value means "template not loaded yet" — do not invent a default section.
+            if (this.linkAssetMode() && (!raw || !Array.isArray(raw.sections) || raw.sections.length === 0)) {
+                this.builderValue.set({ sections: [] });
+                return;
+            }
+            const normalized = normalizeAssetTypeSectionBuilderValue(raw, this.assetTypeId());
             this.builderValue.set(this.toBuilderValue(normalized));
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "#syncValueToBuilder" }] : /* istanbul ignore next */ []));
@@ -1251,9 +1225,10 @@ class AXMAssetTypeSectionBuilderComponent {
         };
     }
     async promptEditLinkedAssetItem(item, _sectionId, _value) {
+        const assetTypeId = this.resolveLinkedItemAssetTypeId(item);
         const seed = {
             assetId: String(item['assetId'] ?? ''),
-            assetTypeId: String(item['assetTypeId'] ?? '').trim(),
+            assetTypeId,
             asset: item['asset'] ?? {
                 id: '',
                 code: '',
@@ -1270,6 +1245,17 @@ class AXMAssetTypeSectionBuilderComponent {
             asset: result.assetId ? result.asset : undefined,
         };
     }
+    resolveLinkedItemAssetTypeId(item) {
+        const fromField = typeof item['assetTypeId'] === 'string' ? item['assetTypeId'].trim() : '';
+        if (fromField) {
+            return fromField;
+        }
+        const nested = item['assetType'];
+        if (nested && typeof nested.id === 'string' && nested.id.trim()) {
+            return nested.id.trim();
+        }
+        return '';
+    }
     async promptLinkAssetForm(seed) {
         const title = (await this.translationService.translateAsync('@asset-management:assets.entities.asset.components.asset-component.actions.edit.title')) || 'Edit Component Asset';
         const result = await this.layoutBuilder
@@ -1282,7 +1268,7 @@ class AXMAssetTypeSectionBuilderComponent {
                 .setContext({ ...seed })
                 .content((layout) => {
                 layout.mode('edit');
-                layout.dynamicForm(this.buildLinkAssetFormDefinition());
+                layout.dynamicForm(this.buildLinkAssetFormDefinition(seed.assetTypeId));
             })
                 .setActions((actions) => {
                 actions.cancel('@general:actions.cancel.title').submit('@general:actions.save.title');
@@ -1296,7 +1282,7 @@ class AXMAssetTypeSectionBuilderComponent {
                 const asset = context.asset ?? { id: assetId, code: '', title: '' };
                 return { success: true, kind: 'object', value: {
                         assetId,
-                        assetTypeId: String(context.assetTypeId ?? ''),
+                        assetTypeId: String(context.assetTypeId ?? seed.assetTypeId ?? ''),
                         asset: {
                             id: String(asset.id ?? assetId),
                             code: String(asset.code ?? ''),
@@ -1512,8 +1498,11 @@ class AXMAssetTypeSectionBuilderComponent {
         };
         return { groups: [group] };
     }
-    buildLinkAssetFormDefinition() {
+    buildLinkAssetFormDefinition(requiredAssetTypeId) {
         const currentAssetId = this.options()['mainAssetId'];
+        const assetTypeFilterValue = typeof requiredAssetTypeId === 'string' && requiredAssetTypeId.trim()
+            ? requiredAssetTypeId.trim()
+            : "{{ context.eval('assetTypeId') }}";
         const filters = [
             ...(typeof currentAssetId === 'string' && currentAssetId
                 ? [{ field: 'id', operator: { type: 'notEqual' }, value: currentAssetId }]
@@ -1521,7 +1510,7 @@ class AXMAssetTypeSectionBuilderComponent {
             {
                 field: 'assetTypeId',
                 operator: { type: 'equal' },
-                value: "{{ context.eval('assetTypeId') }}",
+                value: assetTypeFilterValue,
             },
         ];
         const group = {
@@ -1817,8 +1806,19 @@ class AXMAssetTypeSectionBuilderPageComponent extends AXPPageLayoutBaseComponent
         this.context = computed(() => this.rootContext(), /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "context" }] : /* istanbul ignore next */ []));
         this.sourceRecordId = computed(() => {
-            const id = get(this.context(), this.sourceIdPath());
-            return typeof id === 'string' ? id : undefined;
+            const ctx = this.context();
+            const id = get(ctx, this.sourceIdPath());
+            if (typeof id === 'string' && id.length > 0) {
+                return id;
+            }
+            // Lookup expose often hydrates nested `assetType.id` before/without top-level assetTypeId.
+            if (this.sourceIdPath() === 'assetTypeId') {
+                const nested = get(ctx, 'assetType.id');
+                if (typeof nested === 'string' && nested.length > 0) {
+                    return nested;
+                }
+            }
+            return undefined;
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "sourceRecordId" }] : /* istanbul ignore next */ []));
         this.targetRecordId = computed(() => {
@@ -1858,27 +1858,60 @@ class AXMAssetTypeSectionBuilderPageComponent extends AXPPageLayoutBaseComponent
         this.#syncFromContext = effect((onCleanup) => {
             const ctx = this.context();
             const id = this.sourceRecordId();
-            const value = get(ctx, this.fieldName());
-            const linkedFromContext = get(ctx, this.fieldName());
-            const sourceValue = get(ctx, this.sourceFieldName());
+            const linkMode = this.linkAssetMode();
+            const fieldName = this.fieldName();
             const sourceField = this.sourceFieldName();
-            const immediateValue = this.linkAssetMode()
-                ? this.buildLinkedAssetValue(sourceValue ?? null, this.pickPersistedComponentLinks(linkedFromContext, undefined))
-                : (value ?? null);
-            this.baselineValue.set(immediateValue);
-            this.committedValue.set(immediateValue);
-            untracked(() => this.recompute());
+            const value = get(ctx, fieldName);
+            const linkedFromContext = get(ctx, fieldName);
+            if (!linkMode) {
+                const immediateValue = (value ?? null);
+                this.baselineValue.set(immediateValue);
+                this.committedValue.set(immediateValue);
+                untracked(() => this.recompute());
+                if (!id) {
+                    return;
+                }
+                let cancelled = false;
+                const sourceEntityRef = this.sourceEntityRef();
+                const load = async () => {
+                    try {
+                        const sourceRecord = await this.entityService.withEntity(sourceEntityRef).data().byKey(id);
+                        if (cancelled)
+                            return;
+                        const fallbackValue = get(sourceRecord, sourceField);
+                        const resolved = this.hasSections(value) ? value : (fallbackValue ?? null);
+                        this.baselineValue.set(resolved);
+                        this.committedValue.set(resolved);
+                        untracked(() => this.recompute());
+                    }
+                    catch {
+                        if (cancelled)
+                            return;
+                        this.baselineValue.set(immediateValue);
+                        this.committedValue.set(immediateValue);
+                        untracked(() => this.recompute());
+                    }
+                };
+                void load();
+                onCleanup(() => {
+                    cancelled = true;
+                });
+                return;
+            }
+            // ----- linkAssetMode: template from source entity (AssetType), links on target (Asset) -----
+            // Never use target context's `components` (or empty defaults) as the structure template.
             if (!id) {
+                const empty = this.buildLinkedAssetValue(null, this.pickPersistedComponentLinks(linkedFromContext, undefined));
+                this.baselineValue.set(empty);
+                this.committedValue.set(empty);
+                untracked(() => this.recompute());
                 return;
             }
             let cancelled = false;
             const sourceEntityRef = this.sourceEntityRef();
             const targetEntityRef = this.targetEntityRef();
             const targetRecordId = this.targetRecordId();
-            const linkMode = this.linkAssetMode();
-            const fieldName = this.fieldName();
-            const shouldFetchPersistedLinksFromTarget = linkMode &&
-                typeof targetRecordId === 'string' &&
+            const shouldFetchPersistedLinksFromTarget = typeof targetRecordId === 'string' &&
                 targetRecordId.length > 0 &&
                 targetEntityRef !== sourceEntityRef;
             const load = async () => {
@@ -1891,17 +1924,11 @@ class AXMAssetTypeSectionBuilderPageComponent extends AXPPageLayoutBaseComponent
                     ]);
                     if (cancelled)
                         return;
-                    const fallbackValue = get(sourceRecord, sourceField);
-                    const recordLinksUnknown = linkMode && shouldFetchPersistedLinksFromTarget
+                    const template = get(sourceRecord, sourceField);
+                    const recordLinksUnknown = shouldFetchPersistedLinksFromTarget
                         ? get(targetRecord, fieldName)
-                        : linkMode
-                            ? get(sourceRecord, fieldName)
-                            : undefined;
-                    const resolved = linkMode
-                        ? this.buildLinkedAssetValue(sourceValue ?? fallbackValue ?? null, this.pickPersistedComponentLinks(linkedFromContext, recordLinksUnknown))
-                        : this.hasSections(value)
-                            ? value
-                            : (fallbackValue ?? null);
+                        : get(sourceRecord, fieldName);
+                    const resolved = this.buildLinkedAssetValue(this.hasSections(template) ? (template ?? null) : null, this.pickPersistedComponentLinks(linkedFromContext, recordLinksUnknown));
                     this.baselineValue.set(resolved);
                     this.committedValue.set(resolved);
                     untracked(() => this.recompute());
@@ -1909,8 +1936,7 @@ class AXMAssetTypeSectionBuilderPageComponent extends AXPPageLayoutBaseComponent
                 catch {
                     if (cancelled)
                         return;
-                    this.baselineValue.set(immediateValue);
-                    this.committedValue.set(immediateValue);
+                    // Keep whatever is already shown; do not wipe with an empty target-context template.
                     untracked(() => this.recompute());
                 }
             };