@getlupa/client 1.15.8 → 1.15.9

package/dist/lupaSearch.umd.js

@@ -8128,12 +8128,15 @@ var __async = (__this, __arguments, generator) => {
       value
     };
   };
-  const toggleTermFilter = (appendParams, facetAction, getQueryParamName, currentFilters) => {
+  const toggleTermFilter = (appendParams, facetAction, getQueryParamName, currentFilters, paramsToRemove = []) => {
     const currentFilter = currentFilters == null ? void 0 : currentFilters[facetAction.key];
     const newParams = toggleTermParam(currentFilter, facetAction.value);
     appendParams({
       params: [getFacetParam(facetAction.key, newParams)],
-      paramsToRemove: [getQueryParamName ? getQueryParamName(QUERY_PARAMS$1.PAGE) : QUERY_PARAMS$1.PAGE]
+      paramsToRemove: [
+        ...paramsToRemove,
+        ...[getQueryParamName ? getQueryParamName(QUERY_PARAMS$1.PAGE) : QUERY_PARAMS$1.PAGE]
+      ]
     });
   };
   const replaceHierarchyParam = (params = [], param = "") => {
@@ -24684,26 +24687,104 @@ and ensure you are accounting for this risk.
     RelatedQuerySourceType2["FACETS"] = "facets";
     return RelatedQuerySourceType2;
   })(RelatedQuerySourceType || {});
-  const extractFacetsRelatedSource = (source, searchResults2) => {
+  const combineIdenticalValues = (results) => {
+    const result2 = [];
+    const keys = /* @__PURE__ */ new Set();
+    for (const item of results) {
+      const trimmedValue = item.value.trim().toLowerCase();
+      if (!keys.has(trimmedValue)) {
+        keys.add(trimmedValue);
+        result2.push({ key: item.key, value: item.value.trim() });
+      }
+    }
+    return result2;
+  };
+  const processFacetsRelatedSourceSuggestionQuery = (searchText, querySource, options, activeFilters) => __async2(void 0, null, function* () {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    if ((_a = Object.keys(activeFilters != null ? activeFilters : {})) == null ? void 0 : _a.length) {
+      return [];
+    }
+    const lupaQuery = {
+      searchText,
+      limit: 1,
+      trackTerm: false
+    };
+    try {
+      const result2 = yield LupaSearchSdk.suggestions(querySource.queryKey, lupaQuery, options);
+      if (!result2.success || ((_c = (_b = result2.items) == null ? void 0 : _b[0].suggestion) == null ? void 0 : _c.toLocaleLowerCase()) !== (searchText == null ? void 0 : searchText.toLocaleLowerCase())) {
+        return [];
+      }
+      return (_i = (_h = (_f = (_e = (_d = result2.items) == null ? void 0 : _d[0].facets) == null ? void 0 : _e[querySource.facetKey]) == null ? void 0 : _f.map((item) => ({
+        key: querySource.facetKey,
+        value: item.title
+      }))) == null ? void 0 : _h.slice(0, (_g = querySource.maxCount) != null ? _g : 5)) != null ? _i : [];
+    } catch (error) {
+      return [];
+    }
+  });
+  const processFacetsRelatedSourceDocumentQuery = (searchText, querySource, options, activeFilters) => __async2(void 0, null, function* () {
+    const lupaQuery = {
+      searchText,
+      limit: 1,
+      filters: activeFilters,
+      trackTerm: false
+    };
+    try {
+      const result2 = yield LupaSearchSdk.query(querySource.queryKey, lupaQuery, options);
+      if (!result2.success) {
+        return [];
+      }
+      return extractFacetsRelatedSourceFromOriginalQuery(
+        {
+          type: RelatedQuerySourceType.FACETS,
+          key: querySource.facetKey,
+          count: querySource.maxCount
+        },
+        result2
+      );
+    } catch (error) {
+      return [];
+    }
+  });
+  const processFacetsRelatedSourceQuery = (searchText, query, options, activeFilters) => __async2(void 0, null, function* () {
+    switch (query.type) {
+      case "document":
+        return processFacetsRelatedSourceDocumentQuery(searchText, query, options, activeFilters);
+      case "suggestion":
+        return processFacetsRelatedSourceSuggestionQuery(searchText, query, options, activeFilters);
+    }
+  });
+  const extractFacetsRelatedSource = (source, searchResults2, options, activeFilters) => __async2(void 0, null, function* () {
+    var _a, _b;
+    if (!((_a = source.queries) == null ? void 0 : _a.length)) {
+      return extractFacetsRelatedSourceFromOriginalQuery(source, searchResults2);
+    }
+    const promises = source.queries.map(
+      (query) => processFacetsRelatedSourceQuery(searchResults2.searchText, query, options, activeFilters)
+    );
+    const result2 = (yield Promise.all(promises)).flat();
+    return (_b = combineIdenticalValues(result2)) == null ? void 0 : _b.slice(0, source.count);
+  });
+  const extractFacetsRelatedSourceFromOriginalQuery = (source, searchResults2) => __async2(void 0, null, function* () {
     var _a, _b, _c, _d, _e;
     const facet = (_a = searchResults2.facets) == null ? void 0 : _a.find((facet2) => facet2.key === source.key);
     if (!facet) {
       return [];
     }
     if (facet.type === "terms") {
-      return (_c = (_b = facet.items) == null ? void 0 : _b.slice(0, source.count)) == null ? void 0 : _c.map((item) => item.title);
+      return (_c = (_b = facet.items) == null ? void 0 : _b.slice(0, source.count)) == null ? void 0 : _c.map((item) => ({ key: source.key, value: item.title }));
     }
     if (facet.type === "hierarchy") {
-      return (_e = (_d = facet.items) == null ? void 0 : _d.slice(0, source.count)) == null ? void 0 : _e.map((item) => item.title);
+      return (_e = (_d = facet.items) == null ? void 0 : _d.slice(0, source.count)) == null ? void 0 : _e.map((item) => ({ key: source.key, value: item.title }));
     }
     return [];
-  };
-  const extractRelatedSource = (source, searchResults2) => {
+  });
+  const extractRelatedSource = (source, searchResults2, options, activeFilters) => __async2(void 0, null, function* () {
     switch (source.type) {
       case RelatedQuerySourceType.FACETS:
-        return extractFacetsRelatedSource(source, searchResults2);
+        return extractFacetsRelatedSource(source, searchResults2, options, activeFilters);
     }
-  };
+  });
   const _hoisted_1$h = { class: "lupa-related-query-item" };
   const _hoisted_2$e = { class: "lupa-related-query-image" };
   const _hoisted_3$a = { class: "lupa-related-query-label" };
@@ -24716,12 +24797,16 @@ and ensure you are accounting for this risk.
     __name: "RelatedQueryPanel",
     props: {
       query: {},
-      options: {}
+      sourceKey: {},
+      options: {},
+      existingItemsFromOtherQueries: {}
     },
-    setup(__props) {
+    emits: ["loaded"],
+    setup(__props, { emit: emit2 }) {
       const props = __props;
       const loading = ref(false);
       const relatedQueryResult = ref(null);
+      const itemToDisplay = ref(null);
       const optionsStore = useOptionsStore();
       const searchResultStore = useSearchResultStore();
       const { searchResultOptions } = storeToRefs(optionsStore);
@@ -24742,10 +24827,6 @@ and ensure you are accounting for this risk.
         var _a, _b;
         return ((_b = (_a = relatedQueryResult.value) == null ? void 0 : _a.items) == null ? void 0 : _b.length) > 0;
       });
-      const firstResultItem = computed(() => {
-        var _a, _b;
-        return (_b = (_a = relatedQueryResult.value) == null ? void 0 : _a.items) == null ? void 0 : _b[0];
-      });
       const totalItemCount = computed(() => {
         var _a, _b;
         return (_b = (_a = relatedQueryResult.value) == null ? void 0 : _a.total) != null ? _b : 0;
@@ -24755,19 +24836,19 @@ and ensure you are accounting for this risk.
         return ((_a = props.options.source) == null ? void 0 : _a.mode) === "filter" ? (_b = searchResult.value) == null ? void 0 : _b.searchText : (_c = props.query) == null ? void 0 : _c.toLowerCase();
       });
       const relatedQueryFilters = computed(() => {
-        var _a, _b, _c;
+        var _a;
         return ((_a = props.options.source) == null ? void 0 : _a.mode) === "filter" ? {
-          [(_c = (_b = props.options) == null ? void 0 : _b.source) == null ? void 0 : _c.key]: [props.query]
+          [props.sourceKey]: [props.query]
         } : {};
       });
       const searchForRelatedQuery = () => __async2(this, null, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!props.query) {
           return;
         }
         const lupaQuery = {
           searchText: searchText.value,
-          limit: 1,
+          limit: 3,
           filters: relatedQueryFilters.value,
           trackTerm: false
         };
@@ -24781,8 +24862,13 @@ and ensure you are accounting for this risk.
           if (result2.success) {
             relatedQueryResult.value = result2;
           }
+          const firstItem = (_c = (_b = relatedQueryResult.value) == null ? void 0 : _b.items) == null ? void 0 : _c[0];
+          itemToDisplay.value = (_f = (_e = (_d = relatedQueryResult == null ? void 0 : relatedQueryResult.value) == null ? void 0 : _d.items) == null ? void 0 : _e.find(
+            (i) => !props.existingItemsFromOtherQueries[`${i.id}`]
+          )) != null ? _f : firstItem;
+          emit2("loaded", itemToDisplay.value);
         } catch (error) {
-          (_c = (_b = searchResultOptions.value) == null ? void 0 : _b.options) == null ? void 0 : _c.onError(error);
+          (_h = (_g = searchResultOptions.value) == null ? void 0 : _g.options) == null ? void 0 : _h.onError(error);
         } finally {
           loading.value = false;
         }
@@ -24800,11 +24886,11 @@ and ensure you are accounting for this risk.
         var _a;
         return openBlock(), createElementBlock("div", _hoisted_1$h, [
           createBaseVNode("div", _hoisted_2$e, [
-            firstResultItem.value && image.value ? (openBlock(), createBlock(_sfc_main$1l, {
+            itemToDisplay.value && image.value ? (openBlock(), createBlock(_sfc_main$1l, {
               key: 0,
               "wrapper-class": "lupa-related-query-image-wrapper",
               "image-class": "lupa-related-query-image",
-              item: firstResultItem.value,
+              item: itemToDisplay.value,
               options: image.value
             }, null, 8, ["item", "options"])) : createCommentVNode("", true)
           ]),
@@ -24836,47 +24922,63 @@ and ensure you are accounting for this risk.
       const paramsStore = useParamsStore();
       const optionsStore = useOptionsStore();
       const { searchResult } = storeToRefs(searchResultStore);
+      const { searchResultOptions } = storeToRefs(optionsStore);
+      const relatedQueries = ref([]);
+      const allDisplayItems = ref({});
+      const querySourceResultMap = ref({});
       const currentSearchText = computed(() => {
         var _a, _b;
         return (_b = (_a = searchResult.value) == null ? void 0 : _a.searchText) != null ? _b : "";
       });
-      const relatedQueries = computed(() => {
-        if (!props.options || !searchResult.value) {
-          return [];
+      const currentFilters = computed(() => paramsStore.filters);
+      const querySources = computed(() => {
+        var _a, _b, _c, _d;
+        return (_d = (_c = (_b = (_a = props.options) == null ? void 0 : _a.source) == null ? void 0 : _b.queries) == null ? void 0 : _c.map((q) => q.facetKey)) != null ? _d : [];
+      });
+      const currentFiltersWithoutQuerySources = computed(() => {
+        const filters = {};
+        if (currentFilters.value) {
+          for (const key in currentFilters.value) {
+            if (!querySources.value.includes(key)) {
+              filters[key] = currentFilters.value[key];
+            }
+          }
         }
-        const queries = extractRelatedSource(props.options.source, searchResult.value);
-        return queries;
+        return filters;
       });
+      watch(searchResult, () => __async2(this, null, function* () {
+        allDisplayItems.value = {};
+        querySourceResultMap.value = {};
+        if (!props.options || !searchResult.value) {
+          relatedQueries.value = [];
+        }
+        const queries = yield extractRelatedSource(
+          props.options.source,
+          searchResult.value,
+          searchResultOptions.value.options,
+          currentFiltersWithoutQuerySources.value
+        );
+        relatedQueries.value = queries;
+      }));
       const hasEnoughRelatedQueries = computed(() => {
         return relatedQueries.value.length > 1;
       });
-      const goToResults = ({ searchText }) => {
-        paramsStore.goToResults({ searchText });
-      };
       const handleRelatedQueryClick = (query) => {
         var _a;
         if (((_a = props.options.source) == null ? void 0 : _a.mode) === "filter") {
           handleFilter(query);
         } else {
-          goToResults({ searchText: query });
+          paramsStore.goToResults({ searchText: query.value });
         }
       };
       const handleFilter = (query) => {
-        var _a, _b;
-        const facet = (_b = (_a = searchResult.value) == null ? void 0 : _a.facets) == null ? void 0 : _b.find(
-          (facet2) => {
-            var _a2, _b2;
-            return facet2.key === ((_b2 = (_a2 = props.options) == null ? void 0 : _a2.source) == null ? void 0 : _b2.key);
-          }
-        );
-        if (!facet || facet.type !== "terms") {
-          return [];
-        }
+        var _a;
         toggleTermFilter(
           paramsStore.appendParams,
-          { type: "terms", key: facet.key, value: query },
+          { type: "terms", key: query.key, value: query.value },
           optionsStore.getQueryParamName,
-          {}
+          {},
+          (_a = querySources.value) == null ? void 0 : _a.map((q) => `f.${q}`)
         );
       };
       const getSelectedFilterClass = (query) => {
@@ -24884,9 +24986,13 @@ and ensure you are accounting for this risk.
         if (((_a = props.options.source) == null ? void 0 : _a.mode) !== "filter") {
           return "";
         }
-        return Array.isArray((_c = (_b = searchResult.value) == null ? void 0 : _b.filters) == null ? void 0 : _c[props.options.source.key]) && ((_f = (_e = (_d = searchResult.value) == null ? void 0 : _d.filters) == null ? void 0 : _e[props.options.source.key]) == null ? void 0 : _f.includes(
-          query
-        )) ? "lupa-selected-related-query-filter" : "";
+        return Array.isArray((_c = (_b = searchResult.value) == null ? void 0 : _b.filters) == null ? void 0 : _c[query.key]) && ((_f = (_e = (_d = searchResult.value) == null ? void 0 : _d.filters) == null ? void 0 : _e[query.key]) == null ? void 0 : _f.includes(query.value)) ? "lupa-selected-related-query-filter" : "";
+      };
+      const processLoadedItem = (query, item) => {
+        if (item) {
+          allDisplayItems.value[`${item.id}`] = item;
+        }
+        querySourceResultMap.value[query.value] = Boolean(item);
       };
       return (_ctx, _cache) => {
         var _a, _b, _c, _d;
@@ -24894,19 +25000,24 @@ and ensure you are accounting for this risk.
           ((_b = (_a = _ctx.options) == null ? void 0 : _a.labels) == null ? void 0 : _b.title) ? (openBlock(), createElementBlock("h3", _hoisted_2$d, toDisplayString((_d = (_c = _ctx.options) == null ? void 0 : _c.labels) == null ? void 0 : _d.title), 1)) : createCommentVNode("", true),
           createBaseVNode("ul", null, [
             (openBlock(true), createElementBlock(Fragment, null, renderList(relatedQueries.value, (query) => {
-              return openBlock(), createElementBlock("li", {
-                key: query + currentSearchText.value,
+              return withDirectives((openBlock(), createElementBlock("li", {
+                key: query.value + query.key + currentSearchText.value,
                 class: normalizeClass(getSelectedFilterClass(query))
               }, [
                 createBaseVNode("a", {
                   onClick: ($event) => handleRelatedQueryClick(query)
                 }, [
                   createVNode(_sfc_main$j, {
+                    "source-key": query.key,
                     options: _ctx.options,
-                    query
-                  }, null, 8, ["options", "query"])
+                    query: query.value,
+                    "existing-items-from-other-queries": allDisplayItems.value,
+                    onLoaded: (item) => processLoadedItem(query, item)
+                  }, null, 8, ["source-key", "options", "query", "existing-items-from-other-queries", "onLoaded"])
                 ], 8, _hoisted_3$9)
-              ], 2);
+              ], 2)), [
+                [vShow, querySourceResultMap.value[query.value] !== false]
+              ]);
             }), 128))
           ])
         ])) : createCommentVNode("", true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getlupa/client",
-  "version": "1.15.8",
+  "version": "1.15.9",
   "main": "dist/lupaSearch.js",
   "module": "dist/index.mjs",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@getlupa/client-sdk": "^1.3.4",
-    "@getlupa/vue": "0.15.8",
+    "@getlupa/vue": "0.15.9",
     "@rushstack/eslint-patch": "^1.3.2",
     "@tsconfig/node18": "^2.0.1",
     "@types/jsdom": "^21.1.1",