merge: dev into master

Author: arildm

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 ## [Unreleased]
 
+## [9.12.0] – 2025-10-29
+
+### Added
+
+- Add loading indicators to global filter selectors [#429](https://github.com/spraakbanken/korp-frontend/issues/429)
+- Corpus selector: expand partially selected folders by default [#431](https://github.com/spraakbanken/korp-frontend/issues/431)
+- Show downtime announcements if backend is down [#436](https://github.com/spraakbanken/korp-frontend/issues/436)
+- Statistics: link cells to corpus-filtered search [#455](https://github.com/spraakbanken/korp-frontend/issues/455)
+- More accurate headers in KWIC CSV download
+
+### Changed
+
+- Setting `preselected_corpora` to empty list used to select all, now it selects none. To select all, leave it unset.
+
+### Fixed
+
+- Error when switching corpus after searching by a corpus-specific attribute [#490](https://github.com/spraakbanken/korp-frontend/issues/490)
+- Error when downloading example KWIC [#491](https://github.com/spraakbanken/korp-frontend/issues/491)
+
 ## [9.11.4] – 2025-09-29
 
 ### Fixed

app/markup/about.html

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

app/scripts/app.ts

@@ -172,21 +172,23 @@ korpApp.run([
         let waitForLogin = false
 
         async function initializeCorpusSelection(ids: string[], skipLogin?: boolean): Promise<void> {
-            if (!ids || ids.length == 0) ids = settings["preselected_corpora"] || []
-
-            // Resolve any folder ids to the contained corpus ids
-            ids = ids.flatMap((id) => getAllCorporaInFolders(settings.folders, id))
-
-            const hasAccess = (corpus: CorpusTransformed) => auth.hasCredential(corpus.id.toUpperCase())
-
-            const deniedCorpora = ids
-                .map((id) => settings.corpora[id])
-                .filter((corpus) => corpus?.limited_access && !hasAccess(corpus))
+            const isDenied = (corpus?: CorpusTransformed) =>
+                corpus?.limited_access && !auth.hasCredential(corpus.id.toUpperCase())
+
+            // If no id is given, use default
+            if (!ids || ids.length == 0) {
+                if (settings["preselected_corpora"]) ids = settings["preselected_corpora"]
+                else {
+                    // If the default setting is not given, fallback to selecting all non-protected corpora. If all are protected, select all.
+                    const nonhidden = corpusListing.corpora.filter((corpus) => !corpus.hide)
+                    const allowed = nonhidden.filter((corpus) => !isDenied(corpus))
+                    ids = (allowed.length ? allowed : nonhidden).map((corpus) => corpus.id)
+                }
+            }
 
+            const deniedCorpora = ids.map((id) => settings.corpora[id]).filter((corpus) => isDenied(corpus))
             const allowedIds = ids.filter((id) => !deniedCorpora.find((corpus) => corpus.id == id))
 
-            const allCorpusIds = corpusListing.map((corpus) => corpus.id)
-
             if (settings.initialization_checks && (await settings.initialization_checks())) {
                 // custom initialization code called
             } else if (isEmpty(settings.corpora)) {
@@ -234,12 +236,12 @@ korpApp.run([
                     // Login dismissed, fall back to allowed corpora
                     initializeCorpusSelection(allowedIds)
                 }
-            } else if (!ids.every((r) => allCorpusIds.includes(r))) {
+            } else if (!ids.every((id) => id in settings.corpora)) {
                 // some corpora missing
                 openErrorModal({
                     content: `{{'corpus_not_available' | loc:$root.lang}}`,
                     onClose: () => {
-                        const validIds = ids.filter((corpusId) => allCorpusIds.includes(corpusId))
+                        const validIds = ids.filter((corpusId) => corpusId in settings.corpora)
                         initializeCorpusSelection(validIds)
                     },
                 })

app/scripts/backend/proxy/relations-proxy.ts

@@ -1,30 +1,11 @@
 import ProxyBase from "./proxy-base"
 import { unregescape } from "@/util"
-import { ApiRelation, RelationsParams, RelationsSort } from "../types/relations"
+import { RelationsParams, RelationsSort } from "../types/relations"
 import { parse } from "@/cqp_parser/cqp"
 import { CqpQuery } from "@/cqp_parser/cqp.types"
 import { corpusSelection } from "@/corpora/corpus_listing"
 import { WordPicture, WordType } from "@/word-picture"
 
-/** A relation item modified for showing. */
-export type ShowableApiRelation = ApiRelation & {
-    /** Direction of relation */
-    show_rel: "head" | "dep"
-}
-
-export type TableData = {
-    table: ApiRelation[] | { word: string }
-    rel?: string
-    show_rel?: string
-}
-
-export type TableDrawData = {
-    token: string
-    wordClass: string
-    wordClassShort: string
-    data: TableData[][]
-}
-
 export type RelationsQuery = {
     type: WordType
     word: string

app/scripts/backend/types/relations.ts

@@ -12,14 +12,14 @@ export type RelationsParams = {
 }
 
 export type RelationsResponse = {
-    relations?: ApiRelation[]
+    relations?: Relation[]
     /** Execution time in seconds */
     time: number
 }
 
 export type RelationsSort = "freq" | "mi"
 
-export type ApiRelation = {
+export type Relation = {
     dep: string
     depextra: string
     deppos: string

app/scripts/components/kwic/kwic.ts

@@ -10,12 +10,13 @@ import { KwicWordScope } from "./kwic-word"
 import { SelectWordEvent } from "@/statemachine/types"
 import { ApiKwic, Token } from "@/backend/types"
 import { StoreService } from "@/services/store"
-import { QueryParamSort, QueryResponse } from "@/backend/types/query"
+import { QueryParams, QueryParamSort, QueryResponse } from "@/backend/types/query"
 import { CorpusTransformed } from "@/settings/config-transformed.types"
 import { JQueryExtended, JQueryStaticExtended } from "@/jquery.types"
 import { loc } from "@/i18n"
 import { calculateHitsPicture, HitsPictureItem, isKwic, isLinkedKwic, massageData, Row } from "@/kwic/kwic"
 import { corpusSelection } from "@/corpora/corpus_listing"
+import { RelationsSentencesParams } from "@/backend/types/relations-sentences"
 
 type KwicController = IController & {
     // Bindings
@@ -29,7 +30,7 @@ type KwicController = IController & {
     page: number
     pageEvent: (page: number) => void
     hitsPerPage: number
-    params: any
+    params: QueryParams | RelationsSentencesParams
     response?: QueryResponse
     corpusOrder: string[]
     /** Current page of results. */
@@ -622,7 +623,7 @@ angular.module("korpApp").component("kwic", {
                     const next = getNextToken()
                     if (next) {
                         next.trigger("click")
-                        scrollToShowWord(next)
+                        next.get(0)?.scrollIntoView({ block: "nearest", inline: "nearest" })
                         // Return false to prevent default behavior
                         return false
                     }
@@ -694,28 +695,6 @@ angular.module("korpApp").component("kwic", {
 
                 return output
             }
-
-            function scrollToShowWord(word: JQLite) {
-                if (!word.length) return
-                const offset = 200
-
-                if (word.offset()!.top + word.height()! > window.scrollY + $(window).height()!) {
-                    $("html, body")
-                        .stop(true, true)
-                        .animate({ scrollTop: window.scrollY + offset })
-                } else if (word.offset()!.top < window.scrollY) {
-                    $("html, body")
-                        .stop(true, true)
-                        .animate({ scrollTop: window.scrollY - offset })
-                }
-
-                const area = $element.find(".table_scrollarea")
-                if (word.offset()!.left + word.width()! > area.offset()!.left + area.width()!) {
-                    area.stop(true, true).animate({ scrollLeft: area.scrollLeft()! + offset })
-                } else if (word.offset()!.left < area.offset()!.left) {
-                    area.stop(true, true).animate({ scrollLeft: area.scrollLeft()! - offset })
-                }
-            }
         },
     ],
 })
@@ -757,7 +736,7 @@ class SelectionManager {
 // Add download links for other formats, defined in
 // settings["download_formats"] (Jyrki Niemi <[email protected]>
 // 2014-02-26/04-30)
-export function setDownloadLinks(params: string, result_data: { kwic: Row[]; corpus_order: string[] }): void {
+export function setDownloadLinks(params: any, result_data: { kwic: Row[]; corpus_order: string[] }): void {
     // If some of the required parameters are null, return without
     // adding the download links.
     if (!(params != null && result_data != null && result_data.corpus_order != null && result_data.kwic != null)) {

app/scripts/components/kwic/results-examples.ts

@@ -49,7 +49,7 @@ angular.module("korpApp").component("resultsExamples", {
                 page="page"
                 page-event="pageChange"
                 hits-per-page="hitsPerPage"
-                params="task.proxy.params"
+                params="$ctrl.task.proxy.params"
                 corpus-order="corpusOrder"
                 on-update-search="onUpdateSearch()"
             ></kwic>

app/scripts/components/search/extended/cqp-value.ts

@@ -58,14 +58,15 @@ angular.module("korpApp").component("extendedCqpValue", {
                 const write = (val: string) => (shouldUseRegexp() ? val : regescape(val))
                 const read = (val: string) => (shouldUseRegexp() ? val : unregescape(val))
                 // Set initial input value
-                childScope.input = read(childScope.model as string)
+                childScope.input = read((childScope.model as string) || "")
                 // Sync from input to model, escaping special characters if needed
-                childScope.$watch("input", () => (childScope.model = write(childScope.input)))
-                childScope.$watch("orObj.op", () => (childScope.model = write(childScope.input)))
+                childScope.$watch("input", () => (childScope.model = write(childScope.input || "")))
+                childScope.$watch("orObj.op", () => (childScope.model = write(childScope.input || "")))
 
                 const locals = { $scope: childScope }
                 const { template, controller } = getWidget()
 
+                // TODO Are we always creating a new component instance here? What happens to the old ones?
                 // @ts-ignore
                 $controller(controller, locals)
                 const tmplElem = $compile(template)(childScope)

app/scripts/components/search/extended/tokens.ts

@@ -6,7 +6,6 @@ import { html } from "@/util"
 import "./token"
 import "./struct-token"
 import "./add-box"
-import "@/directives/scroll-to-start"
 import { CqpQuery, CqpToken } from "@/cqp_parser/cqp.types"
 
 type ExtendedTokensController = IController & {
@@ -28,7 +27,7 @@ type ExtendedTokensController = IController & {
 angular.module("korpApp").component("extendedTokens", {
     template: html`
         <div id="query_table">
-            <div ui-sortable="{ items: '> .token', delay : 100 }" ng-model="$ctrl.data" scroll-to-start="scrollToStart">
+            <div ui-sortable="{ items: '> .token', delay : 100 }" ng-model="$ctrl.data">
                 <div class="token inline-block" ng-repeat="token in $ctrl.data track by $index">
                     <extended-token
                         ng-if="token.and_block"
@@ -105,14 +104,14 @@ angular.module("korpApp").component("extendedTokens", {
             ctrl.toggleStart = (idx) => () => ctrl.addStructToken(true, idx)
             ctrl.toggleEnd = (idx) => () => ctrl.addStructToken(false, idx + 1)
 
-            ctrl.scrollToStart = false
             ctrl.addStructToken = function (start = true, idx = -1) {
                 const token: CqpToken = { struct: undefined, start }
                 if (idx != -1) {
                     ctrl.data.splice(idx, 0, token)
                 } else if (start) {
-                    ctrl.scrollToStart = true
                     ctrl.data.unshift(token)
+                    // Scroll to start
+                    document.getElementById("query_table")?.scrollTo(0, 0)
                 } else {
                     ctrl.data.push(token)
                 }

app/scripts/components/search/extended/widgets/common.ts

@@ -5,6 +5,7 @@ import { Condition } from "@/cqp_parser/cqp.types"
 import { StoreService } from "@/services/store"
 import { AttributeOption } from "@/corpora/corpus-set"
 import { loadOptions } from "@/search/extended-search"
+import { isEqual } from "lodash"
 
 export type Widget = {
     template: string
@@ -38,9 +39,9 @@ export const selectController = (autocomplete: boolean): IController => [
     "$scope",
     "store",
     function ($scope: SelectWidgetScope, store: StoreService) {
-        store.watch("corpus", (selected) => {
+        store.watch("corpus", (selected, old) => {
             // TODO Destroy if new corpus selection doesn't support the attribute?
-            if (selected.length > 0) {
+            if (selected.length > 0 && !isEqual(selected, old)) {
                 reloadValues()
             }
         })
@@ -53,7 +54,7 @@ export const selectController = (autocomplete: boolean): IController => [
                 $scope.loading = false
                 $scope.options = options
                 // Reset old selection if that option has been removed.
-                if (!autocomplete && !currentInputExists) {
+                if (!autocomplete && !currentInputExists && $scope.options.length) {
                     $scope.input = $scope.options[0][0]
                 }
             })