Trends switch

Author: arildm

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

@@ -28,6 +28,10 @@ type ResultsWordPictureScope = IScope & {
     sort: RelationsSort
     /** Model for the sort input. */
     sortLocal: RelationsSort
+    /** Whether data should be split by timespans */
+    split: boolean
+    /** Model for the split-by-time input. */
+    splitLocal: boolean
     warning?: string
 }
 
@@ -40,6 +44,10 @@ angular.module("korpApp").component("resultsWordPicture", {
 
         <div ng-show="!error && data">
             <div class="flex flex-wrap items-baseline mb-4 gap-4 bg-gray-100 p-2">
+                <label>
+                    <input ng-model="splitLocal" type="checkbox" />
+                    {{'word_pic_split' | loc:$root.lang}}
+                </label>
                 <label>
                     <input ng-model="showWordClass" type="checkbox" />
                     {{'show_wordclass' | loc:$root.lang}}
@@ -108,11 +116,13 @@ angular.module("korpApp").component("resultsWordPicture", {
                 $scope.limitOptions = LIMITS.slice(0, endIndex + 1)
                 // Clamp previously selected value
                 if (Number($scope.limit) > LIMITS[endIndex]) $scope.limit = String(LIMITS[endIndex])
-                // Apply sort
+                // Apply inputs
                 $scope.sort = $scope.sortLocal
+                $scope.split = $scope.splitLocal
             })
 
             $scope.$watch("sortLocal", () => $scope.sortLocal && makeRequest())
+            $scope.$watch("splitLocal", () => $scope.splitLocal != undefined && makeRequest())
 
             store.watch("globalFilter", () => {
                 if (store.globalFilter) $scope.warning = loc("word_pic_global_filter", store.lang)
@@ -166,7 +176,7 @@ angular.module("korpApp").component("resultsWordPicture", {
                 $scope.warning = undefined
                 $scope.proxy
                     .setProgressHandler((progressObj) => $timeout(() => $ctrl.setProgress(true, progressObj.percent)))
-                    .makeRequest(query.type, query.word, $scope.sortLocal)
+                    .makeRequest(query.type, query.word, $scope.sortLocal, $scope.splitLocal)
                     .then((data) => $timeout(() => ($scope.data = data)))
                     .catch((error) => {
                         // AbortError is expected if a new search is made before the previous one is finished

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

@@ -65,8 +65,8 @@ angular.module("korpApp").component("wordPictureColumn", {
             const $ctrl = this as WordPictureColumnController
 
             $ctrl.$onChanges = (changes) => {
-                if (changes.limit?.currentValue) {
-                    $ctrl.rows = $ctrl.items.slice(0, Number($ctrl.limit))
+                if (changes.limit?.currentValue || changes.items?.currentValue) {
+                    $ctrl.rows = $ctrl.items.filter((item) => item.stats[$ctrl.segment]).slice(0, Number($ctrl.limit))
                 }
             }
 

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

@@ -47,7 +47,7 @@ angular.module("korpApp").component("wordPicture", {
                         css-class="column.config.css_class"
                         items="column.rows"
                         limit="$ctrl.limit"
-                        segment="'all'"
+                        segment="$ctrl.data.segments[0]"
                         show-word-class="$ctrl.showWordClass"
                         sort="$ctrl.sort"
                     ></word-picture-column>

app/scripts/word-picture.ts

@@ -53,6 +53,7 @@ export class WordPicture {
     readonly config = getWordPictureConfig()
     readonly items: Record<string, MatchedRelation[]> = {}
     readonly headings: WordPictureSectionHeading[] = []
+    readonly segments: string[]
 
     constructor(
         readonly query: string,
@@ -93,6 +94,8 @@ export class WordPicture {
             )
         }
 
+        this.segments = Object.keys(itemsRaw)
+
         // Convert items data: assign head/dep to match, sort timespans under relations
         for (const segment in itemsRaw) {
             for (const itemRaw of itemsRaw[segment]) {

app/translations/locale-eng.json

@@ -103,6 +103,7 @@
     "word_pic_global_filter": "The word picture cannot be combined with global filters. Please clear the filters to continue.",
     "word_pic_description": "The Word picture shows words that tend to co-occur in syntactic relations with the search word.",
     "word_pic_result_description": "The part of speech of the search word determines what relations to show. Each list collects words that occur in the selected corpora and in the given relation to the search word.",
+    "word_pic_split": "Show trends",
     "word_pic_show_all": "Show all hits",
     "word_pic_show_some": "Show up to",
     "word_pic_hits": "hits",

app/translations/locale-swe.json

@@ -95,6 +95,7 @@
     "word_pic_pos_not_supported": "Ordbilden stödjer inte sökordets ordklass.",
     "word_pic_description": "I ordbilden visas vilka ord som tenderar att förekomma i syntaktiska relationer med sökordet.",
     "word_pic_result_description": "Vilka relationer som visas beror på sökordets ordklass. Varje lista innehåller ord som i det valda korpusmaterialet står i den givna relationen med sökordet.",
+    "word_pic_split": "Visa trender",
     "word_pic_show_all": "Visa alla träffar",
     "word_pic_show_some": "Visa upp till",
     "word_pic_hits": "träffar",