Merge branch 'development'

huridocs · Mar 12, 2019 · 3d1083f · 3d1083f
2 parents 3495bcf + 89d60d1
commit 3d1083f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 16 deletions.
diff --git a/app/api/settings/routes.js b/app/api/settings/routes.js
@@ -25,6 +25,7 @@ export default (app) => {
           _id: Joi.string(),
           key: Joi.string(),
           label: Joi.string(),
+          rtl: Joi.boolean(),
           default: Joi.boolean()
         })
       ),

diff --git a/app/api/settings/specs/__snapshots__/routes.spec.js.snap b/app/api/settings/specs/__snapshots__/routes.spec.js.snap
@@ -128,6 +128,18 @@ Object {
               ],
               "type": "string",
             },
+            "rtl": Object {
+              "falsy": Array [
+                false,
+              ],
+              "flags": Object {
+                "insensitive": true,
+              },
+              "truthy": Array [
+                true,
+              ],
+              "type": "boolean",
+            },
           },
           "type": "object",
         },

diff --git a/app/react/ServerRouter.js b/app/react/ServerRouter.js
@@ -9,6 +9,7 @@ import { I18NUtils, t, Translate } from 'app/I18N';
 import JSONUtils from 'shared/JSONUtils';
 import RouteHandler from 'app/App/RouteHandler';
 import api from 'app/utils/api';
+import settingsModel from 'api/settings';
 import fs from 'fs';
 
 import { getPropsFromRoute } from './utils';
@@ -20,7 +21,6 @@ import createStore from './store';
 import translationsApi from '../api/i18n/translations';
 import handleError from '../api/utils/handleError';
 
-
 let assets = {};
 
 function renderComponentWithRoot(Component, componentProps, initialData, user, isRedux = false, language) {
@@ -211,23 +211,29 @@ const allowedRoute = (user = {}, url) => {
 };
 
 function routeMatch(req, res, location, languages) {
-  createStore({ user: req.user });
+  settingsModel.get()
+  .then((settings) => {
+    createStore({
+      user: req.user,
+      settings: { collection: settings },
+    });
 
-  match({ routes: Routes, location }, (error, redirectLocation, renderProps) => {
-    if (redirectLocation) {
-      return handleRedirect(res, redirectLocation);
-    }
-    if (renderProps && renderProps.params.lang && !languages.includes(renderProps.params.lang)) {
-      return handle404(res);
-    }
-    if (error) {
-      return respondError(res, error);
-    }
-    if (renderProps) {
-      return handleRoute(res, renderProps, req);
-    }
+    match({ routes: Routes, location }, (error, redirectLocation, renderProps) => {
+      if (redirectLocation) {
+        return handleRedirect(res, redirectLocation);
+      }
+      if (renderProps && renderProps.params.lang && !languages.includes(renderProps.params.lang)) {
+        return handle404(res);
+      }
+      if (error) {
+        return respondError(res, error);
+      }
+      if (renderProps) {
+        return handleRoute(res, renderProps, req);
+      }
 
-    return handle404(res);
+      return handle404(res);
+    });
   });
 }