@masterteam/delegations 0.0.39 → 0.0.41

package/fesm2022/masterteam-delegations.mjs

@@ -122,12 +122,13 @@ let DelegationSessionState = class DelegationSessionState {
     constructor() {
         this.actions$
             .pipe(ofActionSuccessful(GatewayLoginSuccessShell))
-            .subscribe(() => this.store.dispatch([
-            // Reset the prompt flag for the new login, then (re)load candidates so
-            // the "delegations available" prompt fires exactly once after login.
-            new MarkDelegationPrompted(false),
-            new LoadDelegationCandidates(),
-        ]));
+            .subscribe(() => 
+        // Only (re)load candidates here. The prompt flag is NOT reset on login
+        // because the host re-dispatches "Login Success" on every bootstrap /
+        // refresh — resetting here would re-prompt on each refresh. The flag is
+        // reset on explicit logout / user / app switch (see EndDelegationSession),
+        // so the prompt fires once per real login.
+        this.store.dispatch(new LoadDelegationCandidates()));
         this.actions$
             .pipe(ofActionDispatched(GatewayLogoutShell))
             .subscribe(() => this.store.dispatch(new EndDelegationSession('Logout')));
@@ -2167,17 +2168,24 @@ class ScopePicker {
                 }
             }
         });
-        // Default-expand Template nodes whenever options (re)load (levels collapse
-        // so large catalogs open compact; search auto-expands matches).
+        // Expansion on options (re)load: Template nodes expand by default (levels
+        // collapse so large catalogs open compact); additionally expand the path to
+        // any already-selected grant so an edit's saved selection is visible.
         effect(() => {
             const model = this.treeModel();
-            const keys = new Set();
-            for (const node of model) {
-                if (node.kind === 'template') {
-                    keys.add(node.key);
-                }
+            untracked(() => this.expandedKeys.set(this.collectExpansion(model, this.selectedKeys(), new Set())));
+        });
+        // One-time: when an initial (edit) scope arrives AFTER options, expand the
+        // path to its selected grants so the user sees what's re-selected.
+        let prefillExpanded = false;
+        effect(() => {
+            const grants = this.scope().grants;
+            const model = this.treeModel();
+            if (prefillExpanded || !grants.length || !model.length) {
+                return;
             }
-            untracked(() => this.expandedKeys.set(keys));
+            prefillExpanded = true;
+            untracked(() => this.expandedKeys.update((prev) => this.collectExpansion(model, this.selectedKeys(), prev)));
         });
         // Debounced scope preview.
         let timer = null;
@@ -2321,6 +2329,32 @@ class ScopePicker {
     trackVisible(_index, item) {
         return item.node.key;
     }
+    /**
+     * Template keys (open by default) plus the ancestor keys of every selected
+     * operation, so an edit's saved selection is expanded into view. Only valid
+     * grants (those matching an option node) contribute — invalid saved grants
+     * have no node and are simply ignored.
+     */
+    collectExpansion(model, selected, base) {
+        const keys = new Set(base);
+        const walk = (nodes, ancestors) => {
+            for (const node of nodes) {
+                if (node.kind === 'template') {
+                    keys.add(node.key);
+                }
+                if (node.kind === 'operation' && selected.has(node.key)) {
+                    for (const ancestor of ancestors) {
+                        keys.add(ancestor);
+                    }
+                }
+                if (node.children?.length) {
+                    walk(node.children, [...ancestors, node.key]);
+                }
+            }
+        };
+        model.forEach((node) => walk([node], []));
+        return keys;
+    }
     // --- App accessibility ----------------------------------------------------
     toggleAccessibility(key) {
         if (this.readonly()) {