@masterteam/properties 0.0.79 → 0.0.80

package/fesm2022/masterteam-properties.mjs

@@ -60,6 +60,37 @@ var PropertiesActionKey;
     PropertiesActionKey["DeletePropertyStatus"] = "deletePropertyStatus";
     PropertiesActionKey["ReorderPropertyStatuses"] = "reorderPropertyStatuses";
 })(PropertiesActionKey || (PropertiesActionKey = {}));
+/**
+ * The level the current property scope belongs to, or null on a standalone
+ * module screen. On a level/module screen the level is the scope parent; on a
+ * level screen it is the scope target itself.
+ */
+function resolvePropertiesScopeLevelId(state) {
+    const levelId = state.parentModuleType?.toString().toLowerCase() === 'level'
+        ? state.parentModuleId
+        : state.moduleType?.toString().toLowerCase() === 'level'
+            ? state.moduleId
+            : null;
+    return levelId === null || levelId === undefined || levelId === ''
+        ? null
+        : levelId.toString();
+}
+/**
+ * Source-field catalog URL for a configuration picker (Record List, module
+ * check list).
+ *
+ * The root `Properties/Module/{id}` route returns only the source module own
+ * properties. When the property is authored inside a level, the picker must
+ * offer the level-effective catalog instead — otherwise properties configured
+ * on that level are missing from it.
+ */
+function buildPropertiesCatalogUrl(baseUrl, state, moduleType, moduleId) {
+    const levelId = resolvePropertiesScopeLevelId(state);
+    if (levelId && moduleType.toString().toLowerCase() === 'module') {
+        return `${baseUrl}/level/${levelId}/module/${moduleId}`;
+    }
+    return `${baseUrl}/${moduleType}/${moduleId}`;
+}
 
 class GetProperties {
     params;
@@ -281,22 +312,22 @@ let PropertiesState = class PropertiesState extends CrudStateBase {
         return state.parentModuleId ?? null;
     }
     /**
-     * Canonical formula-builder context key for the current scope, in the same
-     * format used for the catalog request: `Level:5/Module:10` (module under a
-     * level), `Level:5` (level), or `Module:10` (standalone module). Returns
-     * null when no scope is set. This lets the formula builder address a
-     * standalone module as `Module:{id}` instead of mistaking it for a level.
+     * Canonical context key for the current scope, in the same format used for
+     * the catalog request: `Level:5/Module:10` (module under a level), `Level:5`
+     * (level), or `Module:10` (standalone module). Returns null when no scope is
+     * set. Callers use it to tell which scope a loaded catalog belongs to, so a
+     * catalog fetched for another level/module is never reused.
+     */
+    static scopeContextKey(state) {
+        return resolveScopeContextKey(state);
+    }
+    /**
+     * The formula builder addresses the current scope by that same key, so a
+     * standalone module reads as `Module:{id}` instead of being mistaken for a
+     * level.
      */
     static formulaContextKey(state) {
-        if (state.moduleType == null || state.moduleId == null) {
-            return null;
-        }
-        return buildPropertiesScopeContextKey({
-            target: { type: state.moduleType, id: state.moduleId },
-            parent: state.parentModuleType != null && state.parentModuleId != null
-                ? { type: state.parentModuleType, id: state.parentModuleId }
-                : undefined,
-        });
+        return resolveScopeContextKey(state);
     }
     static lookups(state) {
         return state.lookups;
@@ -573,7 +604,7 @@ let PropertiesState = class PropertiesState extends CrudStateBase {
     }
     getPropertiesForConfigType(ctx, action) {
         const { moduleType, moduleId } = action;
-        const req$ = this.http.get(`${this.configPropertiesUrl}/${moduleType}/${moduleId}`);
+        const req$ = this.http.get(buildPropertiesCatalogUrl(this.configPropertiesUrl, ctx.getState(), moduleType, moduleId));
         return handleApiRequest({
             ctx,
             key: PropertiesActionKey.GetConfigProperties,
@@ -840,6 +871,9 @@ __decorate([
 __decorate([
     Selector()
 ], PropertiesState, "parentModuleId", null);
+__decorate([
+    Selector()
+], PropertiesState, "scopeContextKey", null);
 __decorate([
     Selector()
 ], PropertiesState, "formulaContextKey", null);
@@ -894,6 +928,17 @@ PropertiesState = PropertiesState_1 = __decorate([
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.8", ngImport: i0, type: PropertiesState, decorators: [{
             type: Injectable
         }], propDecorators: { getAll: [], getOne: [], getLookups: [], getGroups: [], getConfigAsType: [], getCountries: [], testApiConfiguration: [], getPropertyStatuses: [], createPropertyStatus: [], updatePropertyStatus: [], deletePropertyStatus: [], reorderPropertyStatuses: [], getPropertiesForConfigType: [], resetConfigProperties: [], resetConfigScopes: [], resetSelectedProperty: [], resetApiConfiguration: [], resetPropertyStatuses: [], setModuleInfo: [], SetPropertyTypes: [], setBreadcrumb: [], setDefaultViewType: [], createProperty: [], updateProperty: [], deleteProperty: [] } });
+function resolveScopeContextKey(state) {
+    if (state.moduleType == null || state.moduleId == null) {
+        return null;
+    }
+    return buildPropertiesScopeContextKey({
+        target: { type: state.moduleType, id: state.moduleId },
+        parent: state.parentModuleType != null && state.parentModuleId != null
+            ? { type: state.parentModuleType, id: state.parentModuleId }
+            : undefined,
+    });
+}
 function mapCatalogProperty(property) {
     return {
         id: property.id,
@@ -922,6 +967,7 @@ class PropertiesFacade {
     moduleId = select(PropertiesState.moduleId);
     parentModuleId = select(PropertiesState.parentModuleId);
     formulaContextKey = select(PropertiesState.formulaContextKey);
+    scopeContextKey = select(PropertiesState.scopeContextKey);
     lookups = select(PropertiesState.lookups);
     configProperties = select(PropertiesState.configTypeProperties);
     groups = select(PropertiesState.groups);
@@ -1570,6 +1616,13 @@ class CheckListFormConfiguration {
     controlContainer = inject(ControlContainer);
     parentGroup = this.controlContainer.control;
     transloco = inject(TranslocoService);
+    /**
+     * Scope + source module the loaded catalog belongs to, e.g.
+     * `Level:9/Module:25|26`. Keyed on the scope as well as the source module so
+     * a catalog loaded for another level is never reused — the request itself is
+     * level-scoped.
+     */
+    loadedCatalogKey = signal(null, ...(ngDevMode ? [{ debugName: "loadedCatalogKey" }] : /* istanbul ignore next */ []));
     lookups = this.propertiesFacade.lookups;
     configScopes = this.propertiesFacade.configScopes;
     configProperties = this.propertiesFacade.configProperties;
@@ -1583,8 +1636,8 @@ class CheckListFormConfiguration {
             {
                 key: 'configuration',
                 label: this.transloco.translate('properties.form.configurationSection'),
-                cssClass: ' rounded-xl bg-content \
-    shadow-sm \
+                cssClass: ' rounded-xl bg-content \
+    shadow-sm \
    px-6 py-4',
                 type: 'header',
                 bodyClass: 'grid grid-cols-1 md:grid-cols-2 gap-3',
@@ -1631,12 +1684,25 @@ class CheckListFormConfiguration {
         });
         effect(() => {
             const scopeId = this.configuration()?.scopeId;
-            if (scopeId) {
-                const scopeType = this.configScopes()[0]?.scope;
-                if (scopeType) {
-                    this.propertiesFacade.loadPropertiesForConfigType(scopeType, scopeId);
-                }
+            if (!scopeId) {
+                return;
+            }
+            const scopeType = this.configScopes()[0]?.scope;
+            if (!scopeType) {
+                return;
+            }
+            // Wait for the scope: the catalog request is level-scoped, so loading
+            // before the scope is known would show the unscoped catalog first.
+            const scopeKey = this.propertiesFacade.scopeContextKey();
+            if (!scopeKey) {
+                return;
             }
+            const catalogKey = `${scopeKey}|${scopeId}`;
+            if (catalogKey === this.loadedCatalogKey()) {
+                return;
+            }
+            this.loadedCatalogKey.set(catalogKey);
+            this.propertiesFacade.loadPropertiesForConfigType(scopeType, scopeId);
         });
     }
     ngOnDestroy() {
@@ -1659,7 +1725,13 @@ class EntityListConfiguration {
     controlContainer = inject(ControlContainer);
     parentGroup = this.controlContainer.control;
     transloco = inject(TranslocoService);
-    previousModuleId = signal(null, ...(ngDevMode ? [{ debugName: "previousModuleId" }] : /* istanbul ignore next */ []));
+    /**
+     * Scope + source module the loaded catalog belongs to, e.g.
+     * `Level:9/Module:25|26`. Keyed on the scope as well as the source module so
+     * a catalog loaded for another level is never reused — the request itself is
+     * level-scoped.
+     */
+    loadedCatalogKey = signal(null, ...(ngDevMode ? [{ debugName: "loadedCatalogKey" }] : /* istanbul ignore next */ []));
     configurationControl = this.parentGroup.get('configuration');
     configScopes = this.propertiesFacade.configScopes;
     configProperties = this.propertiesFacade.configProperties;
@@ -1692,8 +1764,8 @@ class EntityListConfiguration {
             {
                 key: 'configuration',
                 label: this.transloco.translate('properties.form.configurationSection'),
-                cssClass: ' rounded-xl bg-content \
-    shadow-sm \
+                cssClass: ' rounded-xl bg-content \
+    shadow-sm \
    px-6 py-4',
                 type: 'header',
                 bodyClass: 'grid grid-cols-1 md:grid-cols-2 gap-3',
@@ -1766,14 +1838,24 @@ class EntityListConfiguration {
         effect(() => {
             const config = this.configuration();
             const moduleId = config?.moduleId;
-            if (!moduleId || moduleId === this.previousModuleId()) {
+            if (!moduleId) {
                 return;
             }
             const scopeType = this.configScopes()[0]?.scope;
             if (!scopeType) {
                 return;
             }
-            this.previousModuleId.set(moduleId);
+            // Wait for the scope: the catalog request is level-scoped, so loading
+            // before the scope is known would show the unscoped catalog first.
+            const scopeKey = this.propertiesFacade.scopeContextKey();
+            if (!scopeKey) {
+                return;
+            }
+            const catalogKey = `${scopeKey}|${moduleId}`;
+            if (catalogKey === this.loadedCatalogKey()) {
+                return;
+            }
+            this.loadedCatalogKey.set(catalogKey);
             this.propertiesFacade.loadPropertiesForConfigType(scopeType, moduleId);
         });
     }
@@ -3578,5 +3660,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.8", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { CreateProperty, CreatePropertyStatus, DeleteProperty, DeletePropertyStatus, GetConfigAsType, GetCountries, GetGroups, GetLookups, GetProperties, GetPropertiesForConfigType, GetProperty, GetPropertyStatuses, PropertiesActionKey, PropertiesFacade, PropertiesList, PropertiesState, PropertyForm, REQUEST_CONTEXT, ReorderPropertyStatuses, ResetApiConfiguration, ResetConfigProperties, ResetConfigScopes, ResetPropertyStatuses, ResetSelectedProperty, SetBreadcrumb, SetDefaultViewType, SetPropertiesModuleInfo, SetPropertyTypes, TestApiConfiguration, UpdateProperty, UpdatePropertyStatus, buildPropertiesScopeContextKey };
+export { CreateProperty, CreatePropertyStatus, DeleteProperty, DeletePropertyStatus, GetConfigAsType, GetCountries, GetGroups, GetLookups, GetProperties, GetPropertiesForConfigType, GetProperty, GetPropertyStatuses, PropertiesActionKey, PropertiesFacade, PropertiesList, PropertiesState, PropertyForm, REQUEST_CONTEXT, ReorderPropertyStatuses, ResetApiConfiguration, ResetConfigProperties, ResetConfigScopes, ResetPropertyStatuses, ResetSelectedProperty, SetBreadcrumb, SetDefaultViewType, SetPropertiesModuleInfo, SetPropertyTypes, TestApiConfiguration, UpdateProperty, UpdatePropertyStatus, buildPropertiesCatalogUrl, buildPropertiesScopeContextKey, resolvePropertiesScopeLevelId };
 //# sourceMappingURL=masterteam-properties.mjs.map