fix: update LanguageISO6391 type usage in FilesMappers and commonSchemas

huridocs · Feb 6, 2025 · ed99d0d · ed99d0d
1 parent 526a037
commit ed99d0d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/api/files.v2/database/FilesMappers.ts b/app/api/files.v2/database/FilesMappers.ts
@@ -1,5 +1,4 @@
 import { LanguageUtils } from 'shared/language';
-import { LanguageISO6391 } from 'shared/types/commonTypes';
 import { FileDBOType } from './schemas/filesTypes';
 import { UwaziFile } from '../model/UwaziFile';
 import { Document } from '../model/Document';
@@ -43,7 +42,7 @@ export const FileMappers = {
       fileDBO.entity,
       fileDBO.totalPages,
       fileDBO.filename,
-      LanguageUtils.fromISO639_3(fileDBO.language).ISO639_1 as LanguageISO6391
+      LanguageUtils.fromISO639_3(fileDBO.language).ISO639_1!
     ).withCreationDate(new Date(fileDBO.creationDate));
   },
 };
diff --git a/app/shared/language/availableLanguages.ts b/app/shared/language/availableLanguages.ts
@@ -6,7 +6,7 @@ type LanguageCode = 'elastic' | 'ISO639_3' | 'ISO639_1';
 const otherLanguageSchema: LanguageSchema = {
   label: 'Other',
   key: 'other' as any,
-  ISO639_1: 'other',
+  ISO639_1: 'other' as any,
   ISO639_3: 'other',
   elastic: 'other',
   localized_label: 'Other',

diff --git a/app/shared/types/commonSchemas.ts b/app/shared/types/commonSchemas.ts
@@ -252,7 +252,7 @@ export const languageSchema = {
     default: { type: 'boolean' },
     ISO639_3: { type: 'string' },
     elastic: { type: 'string' },
-    ISO639_1: { type: 'string' },
+    ISO639_1: LanguageISO6391Schema,
     localized_label: { type: 'string' },
     translationAvailable: { type: 'boolean' },
   },

diff --git a/app/shared/types/commonTypes.d.ts b/app/shared/types/commonTypes.d.ts
@@ -245,7 +245,7 @@ export interface LanguageSchema {
   default?: boolean;
   ISO639_3?: string;
   elastic?: string;
-  ISO639_1?: string;
+  ISO639_1?: LanguageISO6391;
   localized_label?: string;
   translationAvailable?: boolean;
 }
@@ -258,7 +258,7 @@ export type LanguagesListSchema = {
   default?: boolean;
   ISO639_3?: string;
   elastic?: string;
-  ISO639_1?: string;
+  ISO639_1?: LanguageISO6391;
   localized_label?: string;
   translationAvailable?: boolean;
 }[];