#434

frontend/src/lib/countsDefinitions.ts

@@ -27,11 +27,14 @@ export type CountsFieldMetadata = {
     setType?: 'tag_reference'; inputTypes?: string[]
     labelValues?: Record<string, string>
     nameLocale?: CountField['nameLocale']
+    legacy?: boolean
     choices?: { value: string; label: string }[] }
 export type CountsDefinition = {
     fields: CountsFieldMetadata[]
     outputFields?: CountField[]
     nameColumns?: CountField[]
+    columnAliases?: { key: string; value: string }[]
+    conditionAliases?: { key: string; value: string }[]
     filterFields?: CountsFieldMetadata[]
     defaults?: { definition: string; mode: string; params: { key: string; value: string }[] }[]
     axes: { latest: string[]; history: string[] }
@@ -53,12 +56,9 @@ const localiseCountsDefinition = (
   const heading = (name: CountField['nameLocale'], aliasesFlg: boolean) => {
     if (name == null) return null
     const language = languageUIMessage (name.languageCode, locale).text
-    const scripts = new Set ((definition.nameColumns ?? [])
-	.filter (field => field.nameLocale?.languageCode === name.languageCode)
-	.map (field => field.nameLocale!.scriptCode.toLowerCase ()))
     const label = aliasesFlg ? 'counts:localeAliases' : 'counts:localeName'
-    return { label: scripts.size > 1 ? `${label}WithScript` : label,
-	labelValues: { language, script: name.scriptCode } }
+    return { label: name.scriptCode == null ? label : `${label}WithScript`,
+	labelValues: { language, script: name.scriptCode ?? '' } }
   }
   const columns = (fields: CountField[]): CountField[] => fields.map (field => ({
       ...field, ...heading (field.nameLocale, field.multipleValues === true),