@fluid-topics/ft-wc-utils 1.1.54 → 1.1.56

package/build/ClusteringHelper.d.ts

@@ -1,7 +1,9 @@
 import { FtMetadata, FtMetadataDescriptor, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
+import { Optional } from "./generic-types";
 export interface FlatMetadata {
     key: string;
-    value: string;
+    label: string;
+    value: Optional<string>;
     displayValue: string;
 }
 export interface ClusterItem {
@@ -15,9 +17,11 @@ export declare class ClusteringHelper {
     private metadataDescriptors;
     constructor(allResults: Array<FtSearchResultClusterEntry>, selectedResult: FtSearchResultClusterEntry, clusteringMetadata: Set<string>, metadataDescriptors: Array<FtMetadataDescriptor>);
     static extractResultMetadata(result: FtSearchResultClusterEntry): FlatMetadata[];
+    static extractResultMetadata(result: FtSearchResultClusterEntry, key: string): Optional<FlatMetadata>;
     static flattenMetadata(metadata: FtMetadata): FlatMetadata;
-    computeClustersItemsForMetadata(key: string, locale: string): ClusterItem[];
+    computeClustersItemsForMetadata(key: string, locale: string, undefinedDisplayValue?: string): ClusterItem[];
     private compareMetadata;
+    getMetadataDescriptor(key: string): FtMetadataDescriptor | undefined;
     private findBestResultForMetadataValue;
     private countMatchingMetadata;
 }

package/build/ClusteringHelper.js

@@ -5,9 +5,10 @@ export class ClusteringHelper {
         this.clusteringMetadata = clusteringMetadata;
         this.metadataDescriptors = metadataDescriptors;
     }
-    static extractResultMetadata(result) {
+    static extractResultMetadata(result, key) {
         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 => ClusteringHelper.flattenMetadata(m));
+        let flatMetadata = ((_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 => ClusteringHelper.flattenMetadata(m));
+        return key == null ? flatMetadata : flatMetadata.find(m => m.key === key);
     }
     static flattenMetadata(metadata) {
         if (metadata.hierarchicalValues) {
@@ -22,18 +23,31 @@ export class ClusteringHelper {
                     displayValues.push(tree.join(" > "));
                 }
             });
-            return { key: metadata.key, value: values.join(", "), displayValue: displayValues.join(", ") };
+            return {
+                key: metadata.key,
+                label: metadata.label,
+                value: values.join(", "),
+                displayValue: displayValues.join(", ")
+            };
         }
         else {
             const value = metadata.values.join(", ");
-            return { key: metadata.key, value: value, displayValue: value };
+            return {
+                key: metadata.key,
+                label: metadata.label,
+                value: value,
+                displayValue: value
+            };
         }
     }
-    computeClustersItemsForMetadata(key, locale) {
-        let currentResultMetadataTargeted = ClusteringHelper.extractResultMetadata(this.selectedResult).find(m => m.key === key);
+    computeClustersItemsForMetadata(key, locale, undefinedDisplayValue = "No value") {
+        var _a, _b;
+        let currentResultMetadataTargeted = ClusteringHelper.extractResultMetadata(this.selectedResult, key);
+        let metadataLabel = (_a = currentResultMetadataTargeted === null || currentResultMetadataTargeted === void 0 ? void 0 : currentResultMetadataTargeted.label) !== null && _a !== void 0 ? _a : (_b = this.getMetadataDescriptor(key)) === null || _b === void 0 ? void 0 : _b.label;
         const otherValues = this.allResults
-            .flatMap(result => ClusteringHelper.extractResultMetadata(result).filter(m => m.key === key))
-            .filter(m => !(m.key === (currentResultMetadataTargeted === null || currentResultMetadataTargeted === void 0 ? void 0 : currentResultMetadataTargeted.key) && m.value === (currentResultMetadataTargeted === null || currentResultMetadataTargeted === void 0 ? void 0 : currentResultMetadataTargeted.value)))
+            .map(result => ClusteringHelper.extractResultMetadata(result, key))
+            .map(m => m !== null && m !== void 0 ? m : { key: key, label: metadataLabel, value: undefined, displayValue: undefinedDisplayValue })
+            .filter(m => m.value != (currentResultMetadataTargeted === null || currentResultMetadataTargeted === void 0 ? void 0 : currentResultMetadataTargeted.value))
             .filter((flatMeta, index, array) => array.findIndex(i => i.value === flatMeta.value) === index); // for unicity
         return otherValues.map(meta => ({
             result: this.findBestResultForMetadataValue(key, meta.value),
@@ -41,7 +55,13 @@ export class ClusteringHelper {
         })).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);
+        if (a == null) {
+            return -1;
+        }
+        if (b == null) {
+            return 1;
+        }
+        let descriptor = this.getMetadataDescriptor(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") {
@@ -50,9 +70,12 @@ export class ClusteringHelper {
         }
         return 0;
     }
+    getMetadataDescriptor(key) {
+        return this.metadataDescriptors.find((descriptor) => key == descriptor.key);
+    }
     findBestResultForMetadataValue(key, value) {
         const resultsMatchingRequiredValue = this.allResults
-            .filter(result => ClusteringHelper.extractResultMetadata(result).find(em => em.key === key && em.value === value));
+            .filter(result => { var _a; return ((_a = ClusteringHelper.extractResultMetadata(result, key)) === null || _a === void 0 ? void 0 : _a.value) == value; });
         let currentResultMetadata = ClusteringHelper.extractResultMetadata(this.selectedResult)
             .filter(m => this.clusteringMetadata.has(m.key));
         let wishedMetadata = [...currentResultMetadata.filter(m => m.key !== key)];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-wc-utils",
-  "version": "1.1.54",
+  "version": "1.1.56",
   "description": "Internal web components tools",
   "author": "Fluid Topics <devtopics@antidot.net>",
   "license": "ISC",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@floating-ui/dom": "1.5.3",
     "@fluid-topics/design-system-variables": "0.0.22",
-    "@fluid-topics/public-api": "1.0.62",
+    "@fluid-topics/public-api": "1.0.63",
     "@reduxjs/toolkit": "1.9.5",
     "@types/mark.js": "8.11.12",
     "@webcomponents/scoped-custom-element-registry": "0.0.9",
@@ -24,5 +24,5 @@
     "lit": "3.1.0",
     "mark.js": "8.11.1"
   },
-  "gitHead": "b8c7a07061df6fb5c3c03d96879eda48fb73e5c8"
+  "gitHead": "8db48669c7baa325e7412b068ad510888a86f3ec"
 }