[Shared] Add language codes

services/backend/src/routes/users.ts

@@ -4,6 +4,8 @@ import { roles } from '../config/roles'
 import * as auth from '../middleware/auth'
 import { sendNotificationAboutAccessToUser, previewNotificationAboutAccessToUser } from '../services/mailService'
 import * as userService from '../services/userService'
+import { LANGUAGE_CODES } from '../shared/language'
+import { Language } from '../types'
 import logger from '../util/logger'
 
 const router = Router()
@@ -101,15 +103,15 @@ router.delete('/:uid/elements', auth.roles(['admin']), async (req: ElementsReque
 
 interface ChangeLanguageRequest extends Request {
   body: {
-    language: string
+    language: Language
   }
 }
 
 router.post('/language', async (req: ChangeLanguageRequest, res: Response) => {
   const {
     body: { language },
   } = req
-  if (!['fi', 'sv', 'en'].includes(language)) {
+  if (!LANGUAGE_CODES.includes(language)) {
     return res.status(400).json('Invalid language')
   }
   try {

services/frontend/src/components/LanguagePicker/index.jsx

@@ -1,6 +1,6 @@
 import { Dropdown } from 'semantic-ui-react'
 
-import { LANGUAGE_CODES } from '@/constants'
+import { LANGUAGE_CODES } from '@/shared/language'
 import { useLanguage } from './useLanguage'
 
 export const LanguagePicker = () => {

services/frontend/src/components/LanguagePicker/useLanguage.jsx

@@ -1,8 +1,8 @@
 import { createContext, useState, useCallback, useContext, useEffect } from 'react'
 
-import { DEFAULT_LANG, LANGUAGE_CODES } from '@/constants'
 import { useGetAuthorizedUserQuery } from '@/redux/auth'
 import { useModifyLanguageMutation } from '@/redux/users'
+import { DEFAULT_LANG, LANGUAGE_CODES } from '@/shared/language'
 
 const LanguageContext = createContext([[], () => {}])
 LanguageContext.displayName = 'Language'

services/frontend/src/constants/index.js

@@ -1,5 +1,3 @@
-export const DEFAULT_LANG = 'fi'
-
 export const PRIORITYCODE_TEXTS = {
   1: 'Main',
   2: 'Secondary',
@@ -10,5 +8,3 @@ export const PRIORITYCODE_TEXTS = {
 // Increment this if search history code changes
 // so it will be reseted for all users.
 export const SEARCH_HISTORY_VERSION = '1.0'
-
-export const LANGUAGE_CODES = ['fi', 'en', 'sv']

services/frontend/src/redux/settings.js

@@ -1,4 +1,4 @@
-import { DEFAULT_LANG } from '@/constants'
+import { DEFAULT_LANG } from '@/shared/language'
 
 const initialState = {
   language: DEFAULT_LANG,

services/shared/language.ts

@@ -0,0 +1,2 @@
+export const DEFAULT_LANG = 'fi'
+export const LANGUAGE_CODES = ['fi', 'en', 'sv'] as const

services/shared/tsconfig.json

@@ -19,5 +19,5 @@
     "inlineSources": true,
     "resolveJsonModule": true
   },
-  "include": ["util/**/*", "index.ts"]
+  "include": ["**/*.ts"]
 }