@crowdin/app-project-module 0.33.0 → 0.34.2

package/out/static/js/main.js

@@ -53,6 +53,7 @@ function catchRejection(e, message) {
         subscriptionModal.open();
         return;
     }
+    console.error(e.message || message);
     showToast(e.message || message);
 }
 

package/out/util/logger.d.ts

@@ -1,4 +1,4 @@
-import { Config } from '../models';
+import { Config, CrowdinContextInfo } from '../models';
 export type LogFunction = (message: string) => void;
 export type LogErrorFunction = (error: any) => void;
 export type LogContext = {
@@ -7,8 +7,9 @@ export type LogContext = {
     projectId: number;
 };
 export declare function initialize(config: Config): void;
-export declare function withContext(context: LogContext): LogFunction;
-export declare function withContextError(context: LogContext): LogFunction;
-export declare function log(message: string, context?: LogContext): void;
-export declare function logError(e: any, context?: LogContext): void;
+export declare function preprareContext(context: CrowdinContextInfo): LogContext;
+export declare function withContext(context: CrowdinContextInfo): LogFunction;
+export declare function withContextError(context: CrowdinContextInfo): LogFunction;
+export declare function log(message: string, context?: CrowdinContextInfo): void;
+export declare function logError(e: any, context?: CrowdinContextInfo): void;
 export declare function getErrorMessage(err: any): any;

package/out/util/logger.js

@@ -1,6 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorMessage = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.initialize = void 0;
+exports.getErrorMessage = exports.logError = exports.log = exports.withContextError = exports.withContext = exports.preprareContext = exports.initialize = void 0;
+const logsFormatter = __importStar(require("@crowdin/logs-formatter"));
 let logConfig;
 let onError;
 function initialize(config) {
@@ -8,6 +32,14 @@ function initialize(config) {
     onError = config.onError;
 }
 exports.initialize = initialize;
+function preprareContext(context) {
+    return {
+        orgId: context.crowdinId,
+        userId: context.clientId,
+        projectId: context.jwtPayload.context.project_id,
+    };
+}
+exports.preprareContext = preprareContext;
 function withContext(context) {
     return (message) => log(message, context);
 }
@@ -24,7 +56,16 @@ function log(message, context) {
         else {
             let prefix = `[${new Date().toISOString()}]`;
             if (context) {
-                prefix += ` Context [${JSON.stringify(context)}]`;
+                logsFormatter.setContext({
+                    project: {
+                        id: context.jwtPayload.context.project_id,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        organization_id: context.jwtPayload.context.organization_id,
+                        // eslint-disable-next-line @typescript-eslint/camelcase
+                        user_id: context.jwtPayload.context.user_id,
+                    },
+                });
+                prefix += ` Context [${JSON.stringify(preprareContext(context))}]`;
             }
             // eslint-disable-next-line no-console
             console.log(`${prefix} ${message}`);
@@ -39,7 +80,16 @@ function logError(e, context) {
     else {
         let message = `[${new Date().toISOString()}] Error.`;
         if (context) {
-            message += ` Context ${JSON.stringify(context)}`;
+            logsFormatter.setContext({
+                project: {
+                    id: context.jwtPayload.context.project_id,
+                    // eslint-disable-next-line @typescript-eslint/camelcase
+                    organization_id: context.jwtPayload.context.organization_id,
+                    // eslint-disable-next-line @typescript-eslint/camelcase
+                    user_id: context.jwtPayload.context.user_id,
+                },
+            });
+            message += ` Context ${JSON.stringify(preprareContext(context))}`;
         }
         if (isAxiosError(e)) {
             const request = e.config ? { url: e.config.url, method: e.config.method, data: e.config.data } : {};

package/out/views/main.handlebars

@@ -176,9 +176,21 @@
                         {{/ifeq}}
                     {{else}}
                         {{#if labelHtml}}
-                            <crowdin-p>{{labelHtml}}</crowdin-p>
+                                <crowdin-p
+                                    {{#if dependencySettings}}
+                                        data-dependency="{{dependencySettings}}"
+                                    {{/if}}
+                                >
+                                    {{{labelHtml}}}
+                                </crowdin-p>
                         {{else}}
-                            <crowdin-p>{{label}}</crowdin-p>
+                                <crowdin-p
+                                    {{#if dependencySettings}}
+                                        data-dependency="{{dependencySettings}}"
+                                    {{/if}}
+                                >
+                                    {{label}}
+                                </crowdin-p>
                         {{/if}}
                     {{/if}}
                     <div

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crowdin/app-project-module",
-  "version": "0.33.0",
+  "version": "0.34.2",
   "description": "Module that generates for you all common endpoints for serving standalone Crowdin App",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -15,26 +15,27 @@
   },
   "dependencies": {
     "@crowdin/crowdin-apps-functions": "0.5.1",
+    "@crowdin/logs-formatter": "^2.0.3",
     "@godaddy/terminus": "^4.12.1",
-    "@types/pg": "^8.6.6",
+    "@types/pg": "^8.10.2",
     "amqplib": "^0.10.3",
     "crypto-js": "^4.0.0",
     "express": "4.18.2",
     "express-handlebars": "^5.3.5",
     "mysql2": "^2.3.3",
     "node-cron": "^3.0.2",
-    "pg": "^8.10.0",
+    "pg": "^8.11.3",
     "redoc-express": "^2.1.0",
     "sqlite3": "^5.1.6",
     "swagger-jsdoc": "^6.2.8",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@babel/preset-react": "^7.22.3",
+    "@babel/preset-react": "^7.22.5",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.11.16",
-    "@mui/material": "^5.14.2",
+    "@mui/icons-material": "^5.14.7",
+    "@mui/material": "^5.14.7",
     "@rjsf/core": "^5.7.3",
     "@rjsf/mui": "^5.7.3",
     "@rjsf/utils": "^5.7.3",