@smartbit4all/ng-client 7.3.27 → 7.3.28

package/fesm2022/smartbit4all-ng-client.mjs

@@ -4355,8 +4355,8 @@ function isSameKey(key1, key2) {
 
 /**
  * The Global Value Set Store: the value sets of the browser tab shared by every open view,
- * explicit sets by backend module, namespace and name, implicit sets by view uuid and key. It
- * fetches the versions a view context change names and it lacks, keeps what the open views read
+ * explicit sets by backend module, namespace, name and branch, implicit sets by view uuid and key.
+ * It fetches the versions a view context change names and it lacks, keeps what the open views read
  * and empties at a change of the session locale.
  */
 class SmartValueSetStore {
@@ -4391,8 +4391,8 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
         this.readExplicitKeys = new Map();
         /** The number of subscribers of {@link get} to each explicit set. */
         this.subscriberCounts = new Map();
-        /** The version of each branch item of the version maps, by its explicit key. */
-        this.branchVersions = new Map();
+        /** The explicit keys of the branch items of the last version map of each module. */
+        this.branchKeys = new Set();
         /** The fetches of each entry, by its explicit or implicit key. */
         this.fetchRecords = new Map();
         /** Numbers the fetches in the order they start. */
@@ -4414,8 +4414,8 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
             }
         });
     }
-    get(module, namespace, name) {
-        const key = createExplicitKey(module, namespace, name);
+    get(module, namespace, name, branchUri) {
+        const key = createExplicitKey(module, namespace, name, branchUri);
         return defer(() => {
             this.subscriberCounts.set(key, (this.subscriberCounts.get(key) ?? 0) + 1);
             return this.followChanges(name, () => this.explicitEntries.get(key)?.data);
@@ -4441,7 +4441,7 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
         };
         const data = this.findForSelection(viewUuid, selection);
         if (data && !this.viewEntries.get(viewUuid)?.get(name)?.implicit) {
-            this.registerExplicitRead(viewUuid, createExplicitKey(module, selection.valueSetNamespace, name));
+            this.registerExplicitRead(viewUuid, this.createLineKey(viewUuid, selection.valueSetNamespace, name));
         }
         return data;
     }
@@ -4534,32 +4534,17 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
     }
     applyVersions(viewContextChange, viewUuid) {
         const versions = viewContextChange?.valueSetVersions;
-        const requestViewUuid = viewUuid ?? viewContextChange?.changes?.[0]?.uuid;
-        if (!versions?.length || !requestViewUuid) {
+        if (!versions) {
             return Promise.resolve();
         }
-        const module = this.findViewModule(requestViewUuid);
+        const module = this.findViewModule(viewUuid);
+        this.writeBranchKeys(module, versions
+            .filter((version) => version.branchUri)
+            .map((version) => createExplicitKey(module, version.namespace, version.name, version.branchUri)));
         const readKeys = this.collectReadExplicitKeys();
         let isFetchPending = false;
-        /** The version noted before and the one noted now of each branch item queued for a fetch. */
-        const notedBranchVersions = new Map();
         versions.forEach((version) => {
             const key = createExplicitKey(module, version.namespace, version.name, version.branchUri);
-            if (version.branchUri) {
-                const previous = this.branchVersions.get(key);
-                this.branchVersions.set(key, version.version);
-                if (previous === undefined || previous === version.version) {
-                    return;
-                }
-                const holders = this.findViewsHoldingImplicitly(module, version.name);
-                if (!holders.length) {
-                    return;
-                }
-                holders.forEach((holder) => this.queueImplicitItem(holder, version.name));
-                notedBranchVersions.set(key, [previous, version.version]);
-                isFetchPending = true;
-                return;
-            }
             const held = this.explicitEntries.get(key)?.version;
             if (held === version.version ||
                 this.isFetching(key, version.version) ||
@@ -4567,7 +4552,7 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
                 return;
             }
             this.markFetching(key, version.version);
-            this.queueItem(module, requestViewUuid, {
+            this.queueItem(module, viewUuid, {
                 namespace: version.namespace,
                 name: version.name,
                 branchUri: version.branchUri,
@@ -4575,17 +4560,7 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
             });
             isFetchPending = true;
         });
-        if (!isFetchPending) {
-            return Promise.resolve();
-        }
-        const flush = this.scheduleFlush();
-        // A branch version whose fetch failed is taken back, so the next map fetches again.
-        flush.catch(() => notedBranchVersions.forEach(([previous, noted], key) => {
-            if (this.branchVersions.get(key) === noted) {
-                this.branchVersions.set(key, previous);
-            }
-        }));
-        return flush;
+        return isFetchPending ? this.scheduleFlush() : Promise.resolve();
     }
     fetch(module, viewUuid, items) {
         if (!items.length) {
@@ -4755,7 +4730,7 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
         return (!readKeys.has(key) &&
             this.findViewsHoldingImplicitly(module, name).some((viewUuid) => {
                 const selection = this.viewSelections.get(viewUuid)?.get(name);
-                return (!!selection && createExplicitKey(module, selection.valueSetNamespace, name) === key);
+                return (!!selection && this.createLineKey(viewUuid, selection.valueSetNamespace, name) === key);
             }));
     }
     /** The views of the module holding an implicit set under the name. */
@@ -4772,10 +4747,9 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
         const keys = new Set(this.subscriberCounts.keys());
         this.readExplicitKeys.forEach((viewKeys) => viewKeys.forEach((key) => keys.add(key)));
         this.viewSelections.forEach((selections, viewUuid) => {
-            const module = this.findViewModule(viewUuid);
             selections.forEach((selection, name) => {
                 if (!this.viewEntries.get(viewUuid)?.get(name)?.implicit) {
-                    keys.add(createExplicitKey(module, selection.valueSetNamespace, name));
+                    keys.add(this.createLineKey(viewUuid, selection.valueSetNamespace, name));
                 }
             });
         });
@@ -4860,9 +4834,51 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
         // An implicit set of the view wins: the explicit one is not read.
         const data = viewEntry?.implicit
             ? viewEntry.data
-            : this.explicitEntries.get(createExplicitKey(this.findViewModule(viewUuid), selection.valueSetNamespace, selection.valueSetName))?.data;
+            : this.findExplicitEntry(viewUuid, selection.valueSetNamespace, selection.valueSetName)
+                ?.data;
         return data && this.mergeViewExtras(data, viewEntry, selection);
     }
+    /**
+     * The explicit entry of the set on the line the view reads it on; until the entry of a branch is
+     * written, the main-line one, so a widget keeps its values while the branch fetch runs.
+     */
+    findExplicitEntry(viewUuid, namespace, name) {
+        return (this.explicitEntries.get(this.createLineKey(viewUuid, namespace, name)) ??
+            this.explicitEntries.get(createExplicitKey(this.findViewModule(viewUuid), namespace, name)));
+    }
+    /**
+     * The explicit key of the set on the line the view reads it on: the view's branch when the last
+     * version map of its module listed the set on that branch, else the main line.
+     */
+    createLineKey(viewUuid, namespace, name) {
+        const view = this.findView(viewUuid);
+        const module = view?.module ?? "";
+        const branchKey = view?.branchUri && createExplicitKey(module, namespace, name, view.branchUri);
+        return branchKey && this.branchKeys.has(branchKey)
+            ? branchKey
+            : createExplicitKey(module, namespace, name);
+    }
+    /**
+     * Replaces the branch keys of the module; a reader of a set whose line changed reads again.
+     */
+    writeBranchKeys(module, keys) {
+        const next = new Set(keys);
+        const changedNames = new Set();
+        this.branchKeys.forEach((key) => {
+            const parsed = parseExplicitKey(key);
+            if (parsed.module === module && !next.has(key)) {
+                this.branchKeys.delete(key);
+                changedNames.add(parsed.name);
+            }
+        });
+        next.forEach((key) => {
+            if (!this.branchKeys.has(key)) {
+                this.branchKeys.add(key);
+                changedNames.add(parseExplicitKey(key).name);
+            }
+        });
+        changedNames.forEach((name) => this.changeSource.next(name));
+    }
     mergeViewExtras(data, viewEntry, selection) {
         return viewEntry?.extras?.length || viewEntry?.excludedKeys?.length
             ? mergeExtraValues(data, viewEntry, selection)
@@ -4874,10 +4890,13 @@ class SmartValueSetMemoryStore extends SmartValueSetStore {
     }
     /** The module a view is served by; the empty string stands for the session's own backend. */
     findViewModule(viewUuid) {
-        return (this.injector
+        return this.findView(viewUuid)?.module ?? "";
+    }
+    findView(viewUuid) {
+        return this.injector
             .get(SmartViewContextService)
             .getCurrentViewContext()
-            ?.views?.find((view) => view.uuid === viewUuid)?.module ?? "");
+            ?.views?.find((view) => view.uuid === viewUuid);
     }
     /** Writes the explicit entry as the most recently written one. */
     writeExplicitEntry(key, name, entry) {
@@ -14171,7 +14190,7 @@ class SmartViewContextService {
     async message(messageData, messageResult) {
         return await this.handlePerformActionResponse(await this.view
             .message(messageData.viewUuid ?? "", messageData.uuid, messageResult)
-            .toPromise(), messageData.viewUuid);
+            .toPromise(), messageData.viewUuid ?? "");
         // in future use this.apiQueueService.addToQueue
     }
     getSmartViewContextApiErrorByCode(code) {
@@ -14342,9 +14361,10 @@ class SmartViewContextService {
      * report of the client reached the server after the close. So a view to be closed in the view
      * context not applied is closed all the same.
      *
-     * The Value Set Version Map of the change goes to the value set store, whose fetches are held
-     * until the change is applied, so one request carries the implicit sets the changed models name.
-     * The fetch is not awaited: the widgets follow the store.
+     * The Value Set Version Map of the change goes to the value set store under the module of
+     * `viewUuid`, the view the request was sent for, as the server built it. The store's fetches are
+     * held until the change is applied, so one request carries the implicit sets the changed models
+     * name. The fetch is not awaited: the widgets follow the store.
      */
     async handlePerformActionResponse(viewContextChange, viewUuid) {
         // The implicit sets the changed models name go in the Value Set Fetch of the version map.
@@ -22849,13 +22869,13 @@ class SmartGridComponent {
         this.isBlocked = true;
         const row = this.service.gridModel.page.rows?.find((gridRow) => gridRow.id === rowId);
         const viewContextChange = await this.service.select(this.smartGrid, row);
-        this.smartGrid.viewContextService.handlePerformActionResponse(viewContextChange, this.smartGrid.gridModel.viewUuid);
+        this.smartGrid.viewContextService.handlePerformActionResponse(viewContextChange, this.smartGrid.gridModel.viewUuid ?? "");
         this.refresh();
     }
     async onSelectAll(selected) {
         this.isBlocked = true;
         const viewContextChange = await this.service.selectAll(this.smartGrid, selected);
-        this.smartGrid.viewContextService.handlePerformActionResponse(viewContextChange, this.smartGrid.gridModel.viewUuid);
+        this.smartGrid.viewContextService.handlePerformActionResponse(viewContextChange, this.smartGrid.gridModel.viewUuid ?? "");
         this.refresh();
     }
     async onSelectRows(selectedIds, unselectedIds) {
@@ -22863,7 +22883,7 @@ class SmartGridComponent {
         let selected = selectedIds.filter((item) => item !== undefined);
         let unselected = unselectedIds.filter((item) => item !== undefined);
         const viewContextChange = await this.service.selectRows(this.smartGrid, selected, unselected);
-        this.smartGrid.viewContextService.handlePerformActionResponse(viewContextChange, this.smartGrid.gridModel.viewUuid);
+        this.smartGrid.viewContextService.handlePerformActionResponse(viewContextChange, this.smartGrid.gridModel.viewUuid ?? "");
         this.refresh();
     }
     editColumns() {