@fluid-topics/ft-search-result-context 1.1.15 → 1.1.16

package/build/ClusteringHelper.d.ts

@@ -1,4 +1,4 @@
-import { FtSearchResultCluster, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
+import { FtMetadataDescriptor, FtSearchResultCluster, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
 import { FlatMetadata } from "./utils";
 export interface ClusterItem {
     metadata: FlatMetadata;
@@ -8,8 +8,10 @@ export declare class ClusteringHelper {
     private cluster;
     private selectedResult;
     private clusteringMetadata;
-    constructor(cluster: FtSearchResultCluster, selectedResult: FtSearchResultClusterEntry, clusteringMetadata: Set<string>);
-    computeClustersItemsForMetadata(key: string): ClusterItem[];
+    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,17 +1,28 @@
 import { extractResultMetadata } from "./utils";
 export class ClusteringHelper {
-    constructor(cluster, selectedResult, clusteringMetadata) {
+    constructor(cluster, selectedResult, clusteringMetadata, metadataDescriptors) {
         this.cluster = cluster;
         this.selectedResult = selectedResult;
         this.clusteringMetadata = clusteringMetadata;
+        this.metadataDescriptors = metadataDescriptors;
     }
-    computeClustersItemsForMetadata(key) {
+    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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-search-result-context",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "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.15",
+    "@fluid-topics/ft-wc-utils": "1.1.16",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.52"
+    "@fluid-topics/public-api": "1.0.54"
   },
-  "gitHead": "23ba72e09227eb846df014039cad4415e3549c84"
+  "gitHead": "28b18ce8d88cc14097865aad4a8b31406b351434"
 }