Whole stats series

Author: arildm

app/scripts/components/wordpicture/word-picture-column.ts

@@ -68,7 +68,7 @@ angular.module("korpApp").component("wordPictureColumn", {
                 if (changes.limit?.currentValue || changes.items?.currentValue || changes.segment?.currentValue) {
                     $ctrl.rows = $ctrl.items
                         .filter((item) => item.stats[$ctrl.segment])
-                        .sort((a, b) => b.stats[$ctrl.segment][$ctrl.sort] - a.stats[$ctrl.segment][$ctrl.sort])
+                        .sort((a, b) => b.stats[$ctrl.segment]![$ctrl.sort] - a.stats[$ctrl.segment]![$ctrl.sort])
                         .slice(0, Number($ctrl.limit))
                 }
             }
@@ -93,7 +93,7 @@ angular.module("korpApp").component("wordPictureColumn", {
             }
 
             $ctrl.onClickExample = function (row) {
-                $rootScope.kwicTabs.push(new WordpicExampleTask(row.stats[$ctrl.segment].source.join(",")))
+                $rootScope.kwicTabs.push(new WordpicExampleTask(row.stats[$ctrl.segment]!.source.join(",")))
             }
         },
     ],

app/scripts/word-picture.ts

@@ -2,6 +2,7 @@ import { isEqual, once, pick } from "lodash"
 import { Relation } from "./backend/types/relations"
 import { getWordPictureConfig } from "./settings"
 import { WordPictureDef, WordPictureDefItem } from "./settings/app-settings.types"
+import { fromKeys } from "./util"
 
 export type WordType = "word" | "lemgram"
 
@@ -44,7 +45,8 @@ export type MatchedRelation = {
     otherpos: string
     /** Copy of `depextra` if the search word matches `head` – a preposition or other string to show together with the related word */
     prefix?: string
-    stats: Record<string, RelationStat>
+    /** Measurements and sources for all segments */
+    stats: Record<string, RelationStat | null>
 }
 
 export type RelationStat = Pick<Relation, "freq" | "mi" | "source">
@@ -64,7 +66,10 @@ export class WordPicture {
             const { head, headpos, dep, deppos, depextra } = item
             const base = {
                 rel: item.rel,
-                stats: { [bin]: pick(item, ["freq", "mi", "source"]) },
+                // Copy item stats to this segment slot, fill rest of series with null.
+                stats: fromKeys(this.segments, (segment) =>
+                    segment == bin ? pick(item, ["freq", "mi", "source"]) : null,
+                ),
             }
             // For ordinary word search, include multi-word items beginning with the searched word
             const getMatch = (word: string) => (type == "word" ? word.replace(/_.*/, "") : word)
@@ -84,7 +89,6 @@ export class WordPicture {
         }
 
         const isItemEqual = (a: MatchedRelation, b: MatchedRelation): boolean => {
-            // TODO Check correct?
             return (
                 a.rel == b.rel &&
                 a.other == b.other &&