fix: middleware i18n localization.

server/src/api/controllers/BaseController.ts

@@ -1,7 +1,7 @@
 import { Response, Request, NextFunction } from 'express';
 import { matchedData, validationResult } from 'express-validator';
 import accepts from 'accepts';
-import { camelCase, snakeCase, omit, set, get } from 'lodash';
+import { isArray, drop, first, camelCase, snakeCase, omit, set, get } from 'lodash';
 import { mapKeysDeep } from 'utils';
 import asyncMiddleware from 'api/middleware/asyncMiddleware';
 
@@ -57,6 +57,37 @@ export default class BaseController {
     next();
   }
 
+  /**
+   * Sets localization to response object by the given path.
+   * @param {Response} response - 
+   * @param {string} path - 
+   * @param {Request} req - 
+   */
+  private setLocalizationByPath(
+    response: any,
+    path: string,
+    req: Request,
+  ) {
+    const DOT = '.';
+
+    if (isArray(response)) {
+      response.forEach((va) => {
+        const currentPath = first(path.split(DOT));
+        const value = get(va, currentPath);
+
+        if (isArray(value)) {
+          const nextPath = drop(path.split(DOT)).join(DOT);
+          this.setLocalizationByPath(value, nextPath, req);
+        } else {
+          set(va, path, req.__(value));
+        }
+      })
+    } else {
+      const value = get(response, path);
+      set(response, path, req.__(value));
+    }
+  }
+
   /**
    * Transform the given data to response.
    * @param {any} data
@@ -74,13 +105,14 @@ export default class BaseController {
         : [translatable];
 
       translatables.forEach((path) => {
-        const value = get(response, path);
-        set(response, path, req.__(value));
+        this.setLocalizationByPath(response, path, req);
       });
     }
     return response;
   }
 
+  
+
   /**
    * Async middleware.
    * @param {function} callback

server/src/api/controllers/Views.ts

@@ -37,9 +37,9 @@ export default class ViewsController extends BaseController {
 
   /**
    * List all views that associated with the given resource.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next  -
+   * @param {Request} req - Request object.
+   * @param {Response} res - Response object.
+   * @param {NextFunction} next  - Next function.
    */
   async listResourceViews(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
@@ -50,8 +50,9 @@ export default class ViewsController extends BaseController {
         tenantId,
         resourceModel
       );
-
-      return res.status(200).send({ views });
+      return res.status(200).send({
+        views: this.transfromToResponse(views, ['name', 'columns.label'], req),
+      });
     } catch (error) {
       next(error);
     }

server/src/api/index.ts

@@ -10,6 +10,7 @@ import TenancyMiddleware from 'api/middleware/TenancyMiddleware';
 import EnsureTenantIsInitialized from 'api/middleware/EnsureTenantIsInitialized';
 import SettingsMiddleware from 'api/middleware/SettingsMiddleware';
 import I18nMiddleware from 'api/middleware/I18nMiddleware';
+import I18nAuthenticatedMiddlware from 'api/middleware/I18nAuthenticatedMiddlware';
 import EnsureConfiguredMiddleware from 'api/middleware/EnsureConfiguredMiddleware';
 import EnsureTenantIsSeeded from 'api/middleware/EnsureTenantIsSeeded';
 
@@ -65,10 +66,10 @@ export default () => {
   dashboard.use(JWTAuth);
   dashboard.use(AttachCurrentTenantUser);
   dashboard.use(TenancyMiddleware);
-  dashboard.use(I18nMiddleware);
   dashboard.use(SubscriptionMiddleware('main'));
   dashboard.use(EnsureTenantIsInitialized);
   dashboard.use(SettingsMiddleware);
+  dashboard.use(I18nAuthenticatedMiddlware);
   dashboard.use(EnsureConfiguredMiddleware);
   dashboard.use(EnsureTenantIsSeeded);
 

server/src/api/middleware/I18nAuthenticatedMiddlware.ts

@@ -0,0 +1,30 @@
+import { Container } from 'typedi';
+import { Request, Response, NextFunction } from 'express';
+import i18n from 'i18n';
+
+/**
+ * I18n from organization settings.
+ */
+export default (req: Request, res: Response, next: NextFunction) => {
+  const Logger = Container.get('logger');
+  const { settings } = req;
+
+  if (!req.user) {
+    throw new Error('Should load this middleware after `JWTAuth`.');
+  }
+  if (!req.settings) {
+    throw new Error('Should load this middleware after `SettingsMiddleware`.');
+  }
+  // Get the organization language from settings.
+  const language = settings.get({
+    group: 'organization', key: 'language',
+  });
+  if (language) {
+    i18n.setLocale(req, language);
+  }
+  Logger.info('[i18n_authenticated_middleware] set locale language to i18n.', {
+    language,
+    user: req.user,
+  });
+  next();
+};

server/src/api/middleware/I18nMiddleware.ts

@@ -1,16 +1,23 @@
 import { Container } from 'typedi';
 import { Request, Response, NextFunction } from 'express';
+import { lowerCase } from 'lodash';
 import i18n from 'i18n';
 
+/**
+ * Set the language from request `accept-language` header
+*  or default application language.
+ */
 export default (req: Request, res: Response, next: NextFunction) => {
   const Logger = Container.get('logger');
-  let language = req.headers['accept-language'] || 'en';
 
-  if (req.user && req.user.language) {
-    language = req.user.language;
-  }
-  Logger.info('[i18n_middleware] set locale language to i18n.', { language, user: req.user });
+  // Parses the accepted language from request object.
+  const language = lowerCase(req.headers['accept-language']) || 'en';
+
+  Logger.info('[i18n_middleware] set locale language to i18n.', {
+    language,
+    user: req.user,
+  });
   i18n.setLocale(req, language);
 
   next();
-};
+};