@acorex/platform 21.0.0-next.3 → 21.0.0-next.5

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -3,7 +3,7 @@ import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import * as i4$1 from '@acorex/platform/common';
 import { AXPSettingsService, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
-import { AXPModuleProviderRegistry, AXP_MODULE_PROVIDER_LOADER, AXPModuleManifestRegistry, AXPDeviceService, AXPBroadcastEventService, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPSystemActionType } from '@acorex/platform/core';
+import { AXPDeviceService, AXPBroadcastEventService, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXHighlightService, extractValue, setSmart, getChangedPaths, AXPSystemActionType } from '@acorex/platform/core';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, effect, Input, afterNextRender, ViewEncapsulation, ChangeDetectorRef, viewChildren, linkedSignal, untracked, HostBinding, NgModule } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
@@ -407,28 +407,37 @@ const AXP_ENTITY_DEFINITION_LOADER = new InjectionToken('AXP_ENTITY_DEFINITION_P
 class AXPEntityResolver {
     constructor() {
         this.providers = inject(AXP_ENTITY_DEFINITION_LOADER);
-        this.providerRegistry = inject(AXPModuleProviderRegistry);
     }
     async get(moduleName, entityName) {
-        // Load from DI tokens (backward compatibility)
+        // Load from DI tokens
         if (Array.isArray(this.providers)) {
             for (const loader of this.providers) {
-                const entity = await loader.get(moduleName, entityName);
+                let resolvedLoader;
+                if (loader instanceof Promise) {
+                    // If loader is a promise, resolve it
+                    resolvedLoader = await loader;
+                }
+                else {
+                    // If loader is a direct instance, use it directly
+                    resolvedLoader = loader;
+                }
+                const entity = await resolvedLoader.get(moduleName, entityName);
                 if (entity) {
                     return entity;
                 }
             }
         }
         else {
-            const entity = await this.providers.get(moduleName, entityName);
-            if (entity) {
-                return entity;
+            let resolvedLoader;
+            if (this.providers instanceof Promise) {
+                // If loader is a promise, resolve it
+                resolvedLoader = await this.providers;
             }
-        }
-        // Load from registry (manifest-based, conditionally loaded)
-        const registryProviders = this.providerRegistry.getEntityProviders();
-        for (const loader of registryProviders) {
-            const entity = await loader.get(moduleName, entityName);
+            else {
+                // If loader is a direct instance, use it directly
+                resolvedLoader = this.providers;
+            }
+            const entity = await resolvedLoader.get(moduleName, entityName);
             if (entity) {
                 return entity;
             }
@@ -446,8 +455,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
 class AXPEntityDefinitionRegistryService {
     constructor() {
         this.middleware = inject(AXPEntityMiddleware);
-        this.moduleProviderLoader = inject(AXP_MODULE_PROVIDER_LOADER, { optional: true });
-        this.manifestRegistry = inject(AXPModuleManifestRegistry, { optional: true });
         this.onChanged = new Subject();
         // Stores AXPEntityConfig objects, keyed by a combination of module and entity name.
         this.entities = new Map();
@@ -547,8 +554,6 @@ class AXPEntityDefinitionRegistryService {
         const key = this.createEntityKey(moduleName, entityName);
         let config = this.entities.get(key) ?? null;
         if (!config) {
-            // Wait for module provider to be loaded if module exists in manifest but provider isn't registered yet
-            await this.waitForModuleProviderIfNeeded(moduleName);
             try {
                 config = await this.entityResolver.get(moduleName, entityName);
                 if (config) {
@@ -570,46 +575,6 @@ class AXPEntityDefinitionRegistryService {
         const key = this.createEntityKey(moduleName, entityName);
         return this.entities.has(key);
     }
-    /**
-     * Waits for module provider to be loaded if the module exists in manifest but provider isn't registered yet.
-     * This handles race conditions where entity resolution happens before module providers finish loading.
-     * Only waits for required modules or waits briefly for non-required modules (which may not be accessible to current user).
-     */
-    async waitForModuleProviderIfNeeded(moduleName) {
-        if (!this.moduleProviderLoader || !this.manifestRegistry) {
-            return;
-        }
-        try {
-            await this.manifestRegistry.initialize();
-            const manifest = this.manifestRegistry.get(moduleName);
-            if (!manifest || this.moduleProviderLoader.isModuleRegistered(moduleName)) {
-                return;
-            }
-            const isRequired = manifest.required === true;
-            // Increase wait time for non-required modules to handle cases where providers are still loading
-            // This prevents "Invalid entity name" errors during page refresh when entities are accessed
-            // before module providers finish loading
-            const maxRetries = isRequired ? 10 : 20; // Increased from 2 to 20 for non-required modules
-            const retryDelay = isRequired ? 100 : 100; // Increased from 50ms to 100ms for consistency
-            for (let attempt = 0; attempt < maxRetries; attempt++) {
-                await new Promise((resolve) => setTimeout(resolve, retryDelay));
-                if (this.moduleProviderLoader.isModuleRegistered(moduleName)) {
-                    return;
-                }
-            }
-            // Warn for both required and non-required modules if provider still not registered
-            // This helps debug race conditions during page refresh
-            console.warn(`[AXPEntityDefinitionRegistryService] Module '${moduleName}' exists in manifest but provider not registered after ${maxRetries} retries (${maxRetries * retryDelay}ms). ` +
-                `Entity resolution will proceed, but may fail if provider is not available.`);
-        }
-        catch (error) {
-            // Only log for required modules to reduce noise
-            const manifest = this.manifestRegistry?.get(moduleName);
-            if (manifest?.required) {
-                console.warn(`[AXPEntityDefinitionRegistryService] Error checking module provider status for '${moduleName}':`, error);
-            }
-        }
-    }
     /**
      * Creates a unique key for an entity based on its module and name.
      *
@@ -1807,7 +1772,15 @@ class AXPDataSeederService {
     }
     async seed() {
         for (const loader of castArray(this.loaders)) {
-            await loader?.seed();
+            if (!loader)
+                continue;
+            const seederName = loader.constructor?.name || 'UnknownSeeder';
+            const startTime = performance.now();
+            await loader.seed();
+            const duration = performance.now() - startTime;
+            if (duration > 3000) {
+                console.warn(`[AXPDataSeeder] Seeder "${seederName}" took ${duration.toFixed(2)}ms (>3000ms threshold)`);
+            }
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataSeederService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -2284,7 +2257,6 @@ class AXPEntityCreateViewElementViewModel {
                 path: this.name(),
                 name: this.name(),
                 children: widget.children,
-                formula: widget.formula,
                 triggers: widget.triggers,
                 defaultValue: schema.defaultValue,
                 valueTransforms: widget.valueTransforms,
@@ -3594,7 +3566,6 @@ class AXPEntityMasterUpdateElementViewModel {
                 path: this.name(),
                 name: this.name(),
                 children: widget.children,
-                formula: widget.formula,
                 triggers: widget.triggers,
                 valueTransforms: widget.valueTransforms,
                 options: merge(schema.interface?.options, {
@@ -3852,7 +3823,6 @@ class AXPEntityMasterSingleElementViewModel {
                 mode: 'view',
                 path: this.path(),
                 children: widget.children,
-                formula: widget.formula,
                 valueTransforms: widget.valueTransforms,
                 options: merge(schema.interface?.options),
             };