merge: hotfix-9.11.1 into master

Author: arildm

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## [Unreleased]
 
+## [9.11.1] – 2025-09-20
+
+### Fixed
+
+- Uncaught exception from aborted trend diagram request (when zooming) [#449](https://github.com/spraakbanken/korp-frontend/issues/449)
+- Protected corpora can be selected using "Select all" button or selecting folder [#483](https://github.com/spraakbanken/korp-frontend/issues/483)
+- Missing translation for compounds option in extended search [#460](https://github.com/spraakbanken/korp-frontend/issues/460)
+- Escape HTML in statistics table unless a stringifier function exists [#486](https://github.com/spraakbanken/korp-frontend/issues/486)
+- Auto scroll to match column broken for RTL [#481](https://github.com/spraakbanken/korp-frontend/issues/481)
+- Remove colon and number from lemma (baseform) values [#484](https://github.com/spraakbanken/korp-frontend/issues/484)
+
 ## [9.11.0] – 2025-09-11
 
 ### Added
@@ -526,6 +537,7 @@
 - Lots of bug fixes for the sidebar
 
 [unreleased]: https://github.com/spraakbanken/korp-frontend/compare/master...dev
+[9.11.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.11.1
 [9.11.0]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.11.0
 [9.10.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.10.1
 [9.10.0]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.10.0

app/markup/about.html

@@ -1,5 +1,5 @@
 <div class="modal-header">
-    <h2>Korp version 9.11.0</h2>
+    <h2>Korp version 9.11.1</h2>
     <span ng-click="clickX()" class="close-x">×</span>
 </div>
 

app/scripts/components/corpus-chooser/corpus-chooser.ts

@@ -212,15 +212,15 @@ angular.module("korpApp").component("corpusChooser", {
 
             /** Handle selection change from GUI. */
             function select(ids: string[]) {
-                updateSelection(ids)
+                const selected = updateSelection(ids)
                 // Store new selection if it has actually changed
-                if (!isEqual(ids, store.corpus)) {
-                    store.corpus = [...ids]
+                if (!isEqual(selected, store.corpus)) {
+                    store.corpus = [...selected]
                 }
             }
 
             /** Update selected state, respecting authorization. */
-            function updateSelection(ids: string[]): void {
+            function updateSelection(ids: string[]): string[] {
                 // This modifies corpus.selected
                 const selection = filterCorporaOnCredentials(ids, auth.getCredentials())
 
@@ -231,6 +231,8 @@ angular.module("korpApp").component("corpusChooser", {
                 if (selection.length == 1) {
                     $ctrl.firstCorpus = settings.corpora[selection[0]].title
                 }
+
+                return selection
             }
 
             $ctrl.onShowInfo = (node: ChooserFolderSub | CorpusTransformed) => {

app/scripts/components/kwic/kwic.ts

@@ -542,13 +542,7 @@ angular.module("korpApp").component("kwic", {
             }
 
             function centerScrollbar() {
-                const m = $element.find(".match:first")
-                if (!m.length) return
-
-                const area = $element.find(".table_scrollarea").scrollLeft(0)
-                const match = m.first().position().left + m.width()! / 2
-                const sidebarWidth = $("#sidebar").outerWidth() || 0
-                area.stop(true, true).scrollLeft(match - ($("body").innerWidth()! - sidebarWidth) / 2)
+                $element.find(".match").get(0)?.scrollIntoView({ inline: "center" })
             }
 
             /** Add offsets to align each linked sentence with its main one */

app/scripts/components/results-trend-diagram.ts

@@ -264,6 +264,9 @@ angular.module("korpApp").component("resultsTrendDiagram", {
             }
 
             async function makeRequest(from: Moment, to: Moment) {
+                // Abort any running request
+                if ($ctrl.loading) $ctrl.task.abort()
+
                 drawPreloader(from, to)
                 $ctrl.setProgress(true, 0)
                 $ctrl.error = undefined
@@ -284,8 +287,10 @@ angular.module("korpApp").component("resultsTrendDiagram", {
                         }
                     })
                 } catch (error) {
+                    // AbortError is expected if a new search is made before the previous one is finished
+                    if (error.name == "AbortError") return
+                    console.error(error)
                     $timeout(() => {
-                        console.error(error)
                         $ctrl.error = error
                         $ctrl.setProgress(false, 0)
                     })

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

@@ -33,11 +33,11 @@ angular.module("korpApp").component("wordPictureTable", {
         <div class="lemgram_table">
             <div class="lemgram_help">
                 <span ng-repeat="column in $ctrl.table.columnsBefore" ng-class="column.config.css_class">
-                    {{'rel_' + column.rel | loc:$root.lang}}
+                    {{(column.config.alt_label || 'rel_' + column.rel) | loc:$root.lang}}
                 </span>
                 <span><b>{{$ctrl.heading}}</b></span>
                 <span ng-repeat="column in $ctrl.table.columnsAfter" ng-class="column.config.css_class">
-                    {{'rel_' + column.rel | loc:$root.lang}}
+                    {{(column.config.alt_label || 'rel_' + column.rel) | loc:$root.lang}}
                 </span>
             </div>
             <word-picture-column

app/scripts/statistics/statistics-grid.ts

@@ -8,7 +8,6 @@ import { Dataset, isTotalRow, Row, SingleRow } from "./statistics.types"
 import { StoreService } from "@/services/store"
 import settings from "@/settings"
 import { locObj } from "@/i18n"
-import { escapeHtml } from "@/util"
 import { formatFrequency } from "@/i18n/util"
 import { LangString } from "@/i18n/types"
 import { zip } from "lodash"
@@ -112,7 +111,7 @@ function createColumns(store: StoreService, corpora: string[], attrs: string[]):
             sortable: true,
             formatter: (row, cell, value, columnDef, data: Row) => {
                 if (isTotalRow(data)) return "Σ"
-                const output = escapeHtml(data.formattedValue[reduceVal!]) || `<span class="opacity-50">&empty;</span>`
+                const output = data.formattedValue[reduceVal!] || `<span class="opacity-50">&empty;</span>`
                 return `<div class="link" data-row="${data.rowId}" ${dir}>${output}</div>`
             },
             minWidth,

app/scripts/statistics/statistics.ts

@@ -9,6 +9,7 @@ import { corpusListing, corpusSelection } from "@/corpora/corpus_listing"
 import { CorpusSet } from "@/corpora/corpus-set"
 import { Lemgram } from "@/lemgram"
 import { Saldo } from "@/saldo"
+import { escape } from "lodash"
 
 type Stringifier = (tokens: string[], ignoreCase?: boolean) => string
 
@@ -132,14 +133,14 @@ function reduceStringify(name: string, cl?: CorpusSet): (values: string[]) => st
     // Use named stringifier from custom config code
     if (attr?.stats_stringify) return customFunctions[attr.stats_stringify]
 
-    const transforms: ((token: string) => string)[] = []
+    const transforms: ((token: string) => string)[] = [escape]
 
     if (attr?.ranked) transforms.push((token) => token.replace(/:.*/g, ""))
     if (attr?.translation) transforms.push((token) => locAttribute(attr.translation, token))
 
     if (["prefix", "suffix", "lex"].includes(name)) transforms.push((token) => Lemgram.parse(token)?.toHtml() || token)
     else if (name == "saldo" || name == "sense") transforms.push((token) => Saldo.parse(token)?.toHtml() || token)
-    else if (name == "lemma") transforms.push((lemma) => lemma.replace(/_/g, " "))
+    else if (name == "lemma") transforms.push((lemma) => lemma.replace(/_/g, " ").replace(/:\d+$/g, ""))
 
     // TODO This is specific to ASU corpus, move out to config
     if (name == "msd_orig") transforms.push((token) => ($("<span>").text(token) as any).outerHTML())

app/translations/locale-eng.json

@@ -422,6 +422,7 @@
     "not_compound_middle": "not medial part",
     "not_prefix": "do not start with",
     "not_suffix": "do not end with",
+    "compound_middle": "medial part",
     "prefix": "starts with",
     "suffix": "ends with"
 }

app/translations/locale-swe.json

@@ -421,6 +421,7 @@
     "not_compound_middle": "inte mellanled",
     "not_prefix": "börjar inte med",
     "not_suffix": "slutar inte med",
+    "compound_middle": "mellanled",
     "prefix": "börjar med",
     "suffix": "slutar med"
 }