@truedat/core 6.13.3 → 6.13.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truedat/core",
-  "version": "6.13.3",
+  "version": "6.13.5",
   "description": "Truedat Web Core",
   "sideEffects": false,
   "jsnext:main": "src/index.js",
@@ -118,5 +118,5 @@
     "react-dom": ">= 16.8.6 < 17",
     "semantic-ui-react": ">= 2.0.3 < 2.2"
   },
-  "gitHead": "2665e3bb640febd00aa49dd06e37b4d391164e74"
+  "gitHead": "8a56d5172d91597712cdeab607983c2b3282eb25"
 }

package/src/i18n/components/LangProvider.js

@@ -4,6 +4,7 @@ import { IntlProvider } from "react-intl";
 import { Loading } from "@truedat/core/components";
 import { useLocales } from "../../hooks/useLocales";
 import { useMessages } from "../../hooks/useMessages";
+import { getNavigatorLanguage } from "../../services/i18n";
 
 const LangProvider = ({ children, defaultMessages }) => {
   const { locales } = useLocales(false);
@@ -18,19 +19,9 @@ const LangProvider = ({ children, defaultMessages }) => {
     )(locales || []);
   }, [locales, setEnabledLocales]);
   useEffect(() => {
-    const language =
-      (navigator.languages && navigator.languages[0]) ||
-      navigator.language ||
-      navigator.userLanguage ||
-      "en-US";
-    const mapLocale = _.cond([
-      [() => _.size(enabledLocales) === 1, () => _.first(enabledLocales)],
-      [(l) => _.includes(l)(enabledLocales), (l) => l],
-      [(l) => _.includes(l)(["es", "ca", "eu", "gl"]), _.constant("es")],
-      [_.stubTrue, _.constant("en")],
-    ]);
-    _.flow(_.split("-"), _.head, mapLocale, setLang)(language);
-  }, [navigator, enabledLocales, setLang]);
+    const navigatorLang = getNavigatorLanguage(enabledLocales);
+    if (navigatorLang !== lang) setLang(navigatorLang);
+  }, [enabledLocales, setLang, lang]);
 
   return loading ? (
     <Loading />

package/src/services/axios.js

@@ -1,6 +1,7 @@
 import _ from "lodash/fp";
 import axios from "axios";
 import { clearToken, readToken } from "./storage";
+import { getNavigatorLanguage } from "./i18n";
 
 // If no authorization header is present and token exists in local storage, put
 // the bearer token authorization header
@@ -21,6 +22,18 @@ const maybePutAuthorization = (config) => {
   }
 };
 
+const putLanguage = (config) => {
+  const lang = getNavigatorLanguage();
+
+  return {
+    ...config,
+    headers: {
+      ...config.headers,
+      "Accept-Language": lang,
+    },
+  };
+};
+
 // If an unauthorized response is received, remove token from local storage
 const maybeClearToken = (error) => {
   if (error?.response?.status === 401) {
@@ -30,6 +43,7 @@ const maybeClearToken = (error) => {
 };
 
 axios.interceptors.request.use(maybePutAuthorization, Promise.reject);
+axios.interceptors.request.use(putLanguage, Promise.reject);
 axios.interceptors.response.use(_.identity, maybeClearToken);
 
 export default axios;

package/src/services/graphql.js

@@ -3,6 +3,7 @@ import { setContext } from "@apollo/client/link/context";
 import { onError } from "@apollo/client/link/error";
 import { unauthorized, logError } from "../routines";
 import { readToken } from "./storage";
+import { getNavigatorLanguage } from "./i18n";
 
 const authLink = setContext((_, { headers }) => {
   const token = readToken();
@@ -16,6 +17,17 @@ const authLink = setContext((_, { headers }) => {
     : { headers };
 });
 
+const langLink = setContext((_, { headers }) => {
+  const lang = getNavigatorLanguage();
+
+  return {
+    headers: {
+      ...headers,
+      "Accept-Language": lang,
+    },
+  };
+});
+
 const httpLink = createHttpLink({ uri: "/api/v2" });
 
 const errorLink = ({ dispatch }) =>
@@ -32,5 +44,5 @@ const errorLink = ({ dispatch }) =>
 export const createClient = (store) =>
   new ApolloClient({
     cache: new InMemoryCache({}),
-    link: authLink.concat(errorLink(store)).concat(httpLink),
+    link: authLink.concat(langLink).concat(errorLink(store)).concat(httpLink),
   });

package/src/services/i18n.js

@@ -10,3 +10,18 @@ export const makeOption = (translations, filter) => (value) =>
         value: value,
         text: translate(translations, filter)(value),
       };
+
+export const getNavigatorLanguage = (localesAllowed = []) => {
+  const language =
+    (navigator.languages && navigator.languages[0]) ||
+    navigator.language ||
+    navigator.userLanguage ||
+    "en-US";
+  const mapLocale = _.cond([
+    [() => _.size(localesAllowed) === 1, () => _.first(localesAllowed)],
+    [(l) => _.includes(l)(localesAllowed), (l) => l],
+    [(l) => _.includes(l)(["es", "ca", "eu", "gl"]), _.constant("es")],
+    [_.stubTrue, _.constant("en")],
+  ]);
+  return _.flow(_.split("-"), _.head, mapLocale)(language);
+};