@meshmakers/octo-ui 3.3.610 → 3.3.620

package/fesm2022/meshmakers-octo-ui.mjs

@@ -2710,7 +2710,14 @@ class AttributeSelectorDialogComponent {
     searchIcon = searchIcon;
     arrowUpIcon = arrowUpIcon;
     arrowDownIcon = arrowDownIcon;
-    data;
+    _data;
+    get data() { return this._data; }
+    set data(value) {
+        this._data = value;
+        if (value) {
+            this.initializeFromData(value);
+        }
+    }
     dialogTitle = 'Select Attributes';
     rtCkTypeId;
     singleSelect = false;
@@ -2744,29 +2751,28 @@ class AttributeSelectorDialogComponent {
     lastClickedItem = null;
     doubleClickDelay = 300; // milliseconds
     ngOnInit() {
-        if (this.data) {
-            this.rtCkTypeId = this.data.rtCkTypeId;
-            this.dialogTitle = this.data.dialogTitle || 'Select Attributes';
-            this.singleSelect = this.data.singleSelect ?? false;
-            this.includeNavigationProperties = this.data.includeNavigationProperties ?? true;
-            this.maxDepth = this.data.maxDepth ?? null;
-            this.additionalAttributes = this.data.additionalAttributes ?? [];
-            this.hideNavigationControls = this.data.hideNavigationControls ?? false;
-            this.attributePathsSet = this.data.attributePaths ? new Set(this.data.attributePaths) : null;
-            if (this.data.selectedAttributes && this.data.selectedAttributes.length > 0) {
-                if (this.singleSelect) {
-                    this.selectedSingleKey = [this.data.selectedAttributes[0]];
-                }
-                else {
-                    // Pre-populate selected attributes if provided
-                    this.loadInitialSelectedAttributes(this.data.selectedAttributes);
-                }
-            }
-        }
-        // Set up search debouncing
+        // Set up search debouncing (always, regardless of data timing)
         this.searchSubject.pipe(debounceTime(300), distinctUntilChanged()).subscribe(searchText => {
             this.loadAvailableAttributes(searchText);
         });
+    }
+    initializeFromData(data) {
+        this.rtCkTypeId = data.rtCkTypeId;
+        this.dialogTitle = data.dialogTitle || 'Select Attributes';
+        this.singleSelect = data.singleSelect ?? false;
+        this.includeNavigationProperties = data.includeNavigationProperties ?? true;
+        this.maxDepth = data.maxDepth ?? null;
+        this.additionalAttributes = data.additionalAttributes ?? [];
+        this.hideNavigationControls = data.hideNavigationControls ?? false;
+        this.attributePathsSet = data.attributePaths ? new Set(data.attributePaths) : null;
+        if (data.selectedAttributes && data.selectedAttributes.length > 0) {
+            if (this.singleSelect) {
+                this.selectedSingleKey = [data.selectedAttributes[0]];
+            }
+            else {
+                this.loadInitialSelectedAttributes(data.selectedAttributes);
+            }
+        }
         // Load initial attributes
         this.loadAvailableAttributes();
     }
@@ -2797,7 +2803,7 @@ class AttributeSelectorDialogComponent {
     }
     loadInitialSelectedAttributes(attributePaths) {
         // Load all attributes to get the details for selected ones
-        this.attributeService.getAvailableAttributes(this.rtCkTypeId).subscribe(result => {
+        this.attributeService.getAvailableAttributes(this.rtCkTypeId, undefined, undefined, undefined, undefined, undefined, this.includeNavigationProperties, this.maxDepth ?? undefined).subscribe(result => {
             // Create a map for quick lookup, including additional virtual attributes
             const attributeMap = new Map(result.items.map(item => [item.attributePath, item]));
             for (const attr of this.additionalAttributes) {
@@ -2808,11 +2814,14 @@ class AttributeSelectorDialogComponent {
                 .map(path => attributeMap.get(path))
                 .filter((item) => item !== undefined);
             this.updateSelectedGrid();
-            // Filter out selected from available
+            // Filter out selected from available, and apply attributePathsSet restriction
             const selectedPaths = new Set(this.selectedAttributes.map(a => a.attributePath));
+            const filteredItems = this.attributePathsSet
+                ? result.items.filter(item => this.attributePathsSet.has(item.attributePath))
+                : result.items;
             this.availableAttributes = [
                 ...this.additionalAttributes.filter(attr => !selectedPaths.has(attr.attributePath)),
-                ...result.items.filter(item => !selectedPaths.has(item.attributePath))
+                ...filteredItems.filter(item => !selectedPaths.has(item.attributePath))
             ];
             this.updateAvailableGrid();
         });