@yuuvis/client-framework 3.8.3 → 3.9.0

package/fesm2022/yuuvis-client-framework-smart-search.mjs

@@ -695,7 +695,8 @@ class SmartSearchEditController {
         this.exitFormMode();
         this.blocks.set(state.blocks.map((block) => this.#normalizeBlock(block)));
         this.combinator.set(state.combinator);
-        this.fulltext.set(state.fulltext ?? { term: '', scope: 'all', types: [] });
+        const fulltext = state.fulltext ?? { term: '', scope: 'all', types: [] };
+        this.fulltext.set({ ...fulltext, types: fulltext.types.map((type) => this.#resolveIsSot(type)) });
     }
     /** Reset all search state back to its initial empty values. */
     reset() {
@@ -1177,11 +1178,24 @@ class SmartSearchEditController {
         this.#trackSeq(id);
         return {
             id,
-            types,
+            types: types.map((type) => this.#resolveIsSot(type)),
             conditions: legacy.conditions ?? [],
             conditionCombinator: legacy.conditionCombinator ?? 'AND'
         };
     }
+    /**
+     * Re-derive a type's `isSot` flag from the live schema. `isSot` drives whether the
+     * type restriction is emitted as `objectTypeId = …` or `system:secondaryObjectTypeIds
+     * IN (…)`, so it must reflect the schema's current classification rather than whatever
+     * was carried in by a persisted state (legacy saved queries predate the flag, and
+     * externally-constructed types may omit it). Resolved via the schema (not the
+     * `allowedTypes`-filtered list) so a saved type outside the current allow-list is still
+     * corrected; unknown ids are left untouched.
+     */
+    #resolveIsSot(type) {
+        const known = this.#system.getObjectType(type.id);
+        return known ? { ...type, isSot: known.isSot } : type;
+    }
     /**
      * Fields shared by *all* given types (the intersection by field id), shaped as
      * field suggestions. A field must be `queryable`, not in `skipProperties`, and