@fluid-topics/ft-search-result-context 1.1.27 → 1.1.29

package/build/utils.d.ts

@@ -1,11 +1,4 @@
-import { FtMetadata, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
-export interface FlatMetadata {
-    key: string;
-    value: string;
-    displayValue: string;
-}
-export declare function flattenMetadata(metadata: FtMetadata): FlatMetadata;
-export declare function extractResultMetadata(result: FtSearchResultClusterEntry): FlatMetadata[];
+import { FtSearchResultClusterEntry } from "@fluid-topics/public-api";
 export declare function getResultUrl(result: FtSearchResultClusterEntry): string;
 export declare class SearchResultClickEvent extends CustomEvent<{
     result: FtSearchResultClusterEntry;

package/build/utils.js

@@ -1,29 +1,10 @@
 import { FtSearchResultType } from "@fluid-topics/public-api";
-export function flattenMetadata(metadata) {
-    if (metadata.hierarchicalValues) {
-        const values = [];
-        const displayValues = [];
-        metadata.hierarchicalValues.forEach(tree => {
-            values.push(tree.join(" / "));
-            if (tree.length > 2) {
-                displayValues.push(`... / ${tree[tree.length - 1]}`);
-            }
-            else {
-                displayValues.push(tree.join(" / "));
-            }
-        });
-        return { key: metadata.key, value: values.join(", "), displayValue: displayValues.join(", ") };
-    }
-    else {
-        const value = metadata.values.join(", ");
-        return { key: metadata.key, value: value, displayValue: value };
-    }
-}
-export function extractResultMetadata(result) {
-    var _a, _b;
-    return ((_b = (_a = result === null || result === void 0 ? void 0 : result.map) !== null && _a !== void 0 ? _a : result === null || result === void 0 ? void 0 : result.document) !== null && _b !== void 0 ? _b : result === null || result === void 0 ? void 0 : result.topic).metadata.map(m => flattenMetadata(m));
-}
 export function getResultUrl(result) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    let openMode = (_d = (_b = (_a = result.map) === null || _a === void 0 ? void 0 : _a.openMode) !== null && _b !== void 0 ? _b : (_c = result.topic) === null || _c === void 0 ? void 0 : _c.openMode) !== null && _d !== void 0 ? _d : (_e = result.document) === null || _e === void 0 ? void 0 : _e.openMode;
+    if (openMode === "EXTERNAL") {
+        return (_j = (_g = (_f = result.map) === null || _f === void 0 ? void 0 : _f.originUrl) !== null && _g !== void 0 ? _g : (_h = result.topic) === null || _h === void 0 ? void 0 : _h.originUrl) !== null && _j !== void 0 ? _j : (_k = result.document) === null || _k === void 0 ? void 0 : _k.originUrl;
+    }
     switch (result.type) {
         case FtSearchResultType.MAP:
             return result.map.readerUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-search-result-context",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "description": "Search result context for integrated search component",
   "keywords": [
     "Lit"
@@ -19,11 +19,11 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-wc-utils": "1.1.27",
+    "@fluid-topics/ft-wc-utils": "1.1.29",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.56"
+    "@fluid-topics/public-api": "1.0.57"
   },
-  "gitHead": "1eac81014b6ebbec9693fa4dded300ed209695c0"
+  "gitHead": "0d8f67879e2608a03b96d18ba7b3ad25e065178b"
 }

package/build/ClusteringHelper.d.ts

@@ -1,18 +0,0 @@
-import { FtMetadataDescriptor, FtSearchResultCluster, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
-import { FlatMetadata } from "./utils";
-export interface ClusterItem {
-    metadata: FlatMetadata;
-    result: FtSearchResultClusterEntry;
-}
-export declare class ClusteringHelper {
-    private cluster;
-    private selectedResult;
-    private clusteringMetadata;
-    private metadataDescriptors;
-    constructor(cluster: FtSearchResultCluster, selectedResult: FtSearchResultClusterEntry, clusteringMetadata: Set<string>, metadataDescriptors: Array<FtMetadataDescriptor>);
-    computeClustersItemsForMetadata(key: string, locale: string): ClusterItem[];
-    private compareMetadata;
-    private findMatchingResult;
-    private findResultMatchingMetadata;
-    private resultMatchesMetadata;
-}

package/build/ClusteringHelper.js

@@ -1,41 +0,0 @@
-import { extractResultMetadata } from "./utils";
-export class ClusteringHelper {
-    constructor(cluster, selectedResult, clusteringMetadata, metadataDescriptors) {
-        this.cluster = cluster;
-        this.selectedResult = selectedResult;
-        this.clusteringMetadata = clusteringMetadata;
-        this.metadataDescriptors = metadataDescriptors;
-    }
-    computeClustersItemsForMetadata(key, locale) {
-        var _a;
-        const metadataValues = (_a = this.cluster) === null || _a === void 0 ? void 0 : _a.entries.flatMap(result => extractResultMetadata(result).filter(m => m.key === key)).filter((flatMeta, index, array) => array.findIndex(i => i.value === flatMeta.value) === index); // for unicity
-        return metadataValues.map(flatMeta => ({
-            result: this.findMatchingResult(key, flatMeta.value),
-            metadata: flatMeta
-        })).sort((a, b) => this.compareMetadata(a.metadata.value, b.metadata.value, key, locale));
-    }
-    compareMetadata(a, b, key, locale) {
-        let descriptor = this.metadataDescriptors.find((descriptor) => key == descriptor.key);
-        let sortRule = (descriptor === null || descriptor === void 0 ? void 0 : descriptor.sortRule) || "NONE";
-        let reverseOrder = (descriptor === null || descriptor === void 0 ? void 0 : descriptor.reverseSort) || false;
-        if (sortRule == "ALPHABET" || sortRule == "VERSION") {
-            let result = a.localeCompare(b, locale, { numeric: true });
-            return reverseOrder ? result * -1 : result;
-        }
-        return 0;
-    }
-    findMatchingResult(key, value) {
-        var _a, _b;
-        let currentResultMetadata = extractResultMetadata(this.selectedResult)
-            .filter(m => this.clusteringMetadata.has(m.key));
-        let newExpectedMetadata = [...currentResultMetadata.filter(m => m.key !== key), { key, value, displayValue: value }];
-        return (_b = (_a = this.findResultMatchingMetadata(newExpectedMetadata)) !== null && _a !== void 0 ? _a : this.findResultMatchingMetadata([{ key, value, displayValue: value }])) !== null && _b !== void 0 ? _b : this.cluster.entries[0];
-    }
-    findResultMatchingMetadata(metadata) {
-        return this.cluster.entries.find(entry => this.resultMatchesMetadata(entry, metadata));
-    }
-    resultMatchesMetadata(result, expectedMetadata) {
-        let resultMetadata = extractResultMetadata(result);
-        return expectedMetadata.every(em => resultMetadata.some(rm => rm.key == em.key && rm.value == em.value));
-    }
-}