refactor: Moar LangString

spraakbanken · Jul 5, 2024 · 15ba098 · 15ba098
1 parent 2bb13d4
commit 15ba098
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/scripts/settings/app-settings.types.ts b/app/scripts/settings/app-settings.types.ts
@@ -3,7 +3,7 @@
  * @format
  */
 
-import { Labeled, LangMap, LangString } from "@/i18n/types"
+import { Labeled, LangString } from "@/i18n/types"
 import { Attribute } from "./config.types"
 
 export type AppSettings = {

diff --git a/app/scripts/settings/config-transformed.types.ts b/app/scripts/settings/config-transformed.types.ts
@@ -3,14 +3,14 @@
  * @format
  */
 
-import { LangMap } from "@/i18n/types"
+import { LangString } from "@/i18n/types"
 import { Attribute, Config, Corpus, CustomAttribute, Folder } from "./config.types"
 
 export type ConfigTransformed = Omit<Config, "attributes" | "corpora" | "label"> & {
     corpora: Record<string, CorpusTransformed>
     folders: Record<string, Folder>
     mode: {
-        label: string | LangMap
+        label: LangString
     }
 }
 

diff --git a/app/scripts/statistics.ts b/app/scripts/statistics.ts
@@ -5,13 +5,14 @@ import { reduceStringify } from "../config/statistics_config"
 import type { StatsNormalized, StatisticsWorkerMessage, StatisticsWorkerResult, SearchParams } from "./statistics.types"
 import { hitCountHtml } from "@/util"
 import { Row } from "./statistics_worker"
+import { LangString } from "./i18n/types"
 const pieChartImg = require("../img/stats2.png")
 
 const createStatisticsService = function () {
     const createColumns = function (
         corpora: Record<string, any>,
         reduceVals: string[],
-        reduceValLabels: Label[]
+        reduceValLabels: LangString[]
     ): SlickgridColumn[] {
         const valueFormatter: SlickgridFormatter = function (row, cell, value, columnDef, dataContext) {
             const [absolute, relative] = [...dataContext[columnDef.id + "_value"]]
@@ -83,7 +84,7 @@ const createStatisticsService = function () {
         originalCorpora: string,
         data: StatsNormalized,
         reduceVals: string[],
-        reduceValLabels: Label[],
+        reduceValLabels: LangString[],
         ignoreCase: boolean,
         prevNonExpandedCQP: string
     ) {
@@ -120,16 +121,14 @@ export type SlickgridColumn = {
     field: string
     formatter: SlickgridFormatter
     name?: string
-    translation?: Label
+    translation?: LangString
     sortable?: boolean
     minWidth?: number
     maxWidth?: number
     cssClass?: string
     headerCssClass?: string
 }
 
-type Label = string | Record<string, string>
-
 type SlickgridFormatter = (
     // There's currently no Korp code that uses these first three args
     row: unknown,