refactor: merge setInitialCorpora() into intializeCorpusSelection()

Author: arildm

CHANGELOG.md

@@ -8,6 +8,10 @@
 - Corpus selector: expand partially selected folders by default [#431](https://github.com/spraakbanken/korp-frontend/issues/431)
 - Statistics: link cells to corpus-filtered search [#455](https://github.com/spraakbanken/korp-frontend/issues/455)
 
+### Changed
+
+- Setting `preselected_corpora` to empty list used to select all, now it selects none. To select all, leave it unset.
+
 ## [9.11.4] – 2025-09-29
 
 ### Fixed

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/corpora/corpus-set.ts

@@ -60,7 +60,7 @@ export class CorpusSet {
         return ""
     }
 
-    /** Corpus ids in uppercase */
+    /** Lowercase corpus ids */
     getIds() {
         return this.map((corpus) => corpus.id)
     }

app/scripts/data_init.ts

@@ -1,7 +1,6 @@
 import { keyBy, mapValues, omit, pick } from "lodash"
 import settings, { setDefaultConfigValues } from "@/settings"
 import currentMode from "@/mode"
-import { getAllCorporaInFolders } from "@/corpora/corpus-chooser"
 import { corpusListing, setCorpusListing } from "@/corpora/corpus_listing"
 import { CorpusSet } from "@/corpora/corpus-set"
 import { CorpusSetParallel } from "@/parallel/corpus-set-parallel"
@@ -13,6 +12,7 @@ import { ConfigTransformed, CorpusTransformed } from "@/settings/config-transfor
 import { korpRequest } from "@/backend/common"
 import { getLocData } from "@/i18n/loc-data"
 import moment from "moment"
+import { getAllCorporaInFolders } from "./corpora/corpus-chooser"
 
 type InfoData = Record<string, Pick<CorpusTransformed, "info" | "private_struct_attributes">>
 
@@ -107,39 +107,19 @@ function transformConfig(config: Config, infos: InfoData): ConfigTransformed {
 
     const modes = config.modes.map((mode) => ({ ...mode, selected: mode.mode == currentMode }))
 
+    // Resolve folder names in the default corpus selection.
+    // Compat added in October 2025: from now on this setting doesn't need to prepend folder names with "__"
+    const preselectedCorpora = config.preselected_corpora?.flatMap((id) =>
+        getAllCorporaInFolders(config.folders || {}, id.replace(/^__/, "")),
+    )
+
     return {
         folders: {},
         ...omit(config, "pos_attributes", "corpora"),
         corpora: mapValues(config.corpora, transformCorpus),
         modes,
         mode: modes.find((mode) => mode.selected)!,
-    }
-}
-
-/** Determine initial corpus selection. */
-function setInitialCorpora(): void {
-    // if no preselectedCorpora is defined, use all of them
-    if (!settings.preselected_corpora?.length) {
-        // if all corpora in mode is limited_access, make them all preselected
-        if (corpusListing.corpora.filter((corpus) => !corpus.limited_access).length == 0) {
-            settings.preselected_corpora = corpusListing.corpora
-                .filter((corpus) => !corpus.hide)
-                .map((corpus) => corpus.id)
-
-            // else filter out the ones with limited_access
-        } else {
-            settings.preselected_corpora = corpusListing.corpora
-                .filter((corpus) => !(corpus.hide || corpus.limited_access))
-                .map((corpus) => corpus.id)
-        }
-    } else {
-        let expandedCorpora: string[] = []
-        for (let preItem of settings.preselected_corpora) {
-            preItem = preItem.replace(/^__/g, "")
-            expandedCorpora.push(...getAllCorporaInFolders(settings.folders, preItem))
-        }
-        // folders expanded, save
-        settings.preselected_corpora = expandedCorpora
+        preselected_corpora: preselectedCorpora,
     }
 }
 
@@ -179,8 +159,6 @@ export async function fetchInitialData(authDef: Promise<boolean>) {
         ? new CorpusSetParallel(corpora as CorpusTransformed<CorpusParallel>[])
         : new CorpusSet(corpora)
     setCorpusListing(corpusListing)
-
-    setInitialCorpora()
 }
 
 /** Find most recently updated corpora. */