codenotch-react 1.0.34 → 1.0.36

package/dist/index.d.ts

@@ -4,7 +4,12 @@ export interface ICodenotchEnv {
     tenantName?: string;
     accessToken?: string;
     baseUrl?: string;
-    languages?: string[];
+    i18n?: {
+        [language: string]: {
+            [key: string]: string;
+        };
+    };
+    currentLanguage?: string;
     [key: string]: any;
 }
 export interface ICodenotchApi {
@@ -16,8 +21,8 @@ export interface ICodenotchApi {
     onSignal: (signalId: string, callback: () => void) => {
         dispose: () => void;
     };
+    i18n: (key: string, ...args: any[]) => string;
 }
-export type CodenotchAppFC<T> = React.FC<(ICodenotchEnv & T)>;
 declare const CODENOTCH_ENV: ICodenotchEnv;
 export declare function setupCodenotchEnv(env: any): void;
 /**
@@ -25,11 +30,5 @@ export declare function setupCodenotchEnv(env: any): void;
  * @returns {ICodenotchApi} Codenotch API
  */
 export declare function useCodenotch(): ICodenotchApi;
-/**
- * Setup Codenotch environment and return Codenotch API
- * @param props Codenotch app properties
- * @returns {ICodenotchApi} Codenotch API
- */
-export declare function useCodenotchApp(props?: ICodenotchEnv): ICodenotchApi;
 export { CODENOTCH_ENV };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,aAAa,CAAC;IACnB,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACjE,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACrE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK;QAAE,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;CACjF;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;AAE9D,QAAA,MAAM,aAAa,EAAE,aAAkB,CAAC;AAExC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAShD;AAED;;;GAGG;AACH,wBAAgB,YAAY,IAAI,aAAa,CA8D5C;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,aAAa,CAmBpE;AAGD,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACzD,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,aAAa,CAAC;IACnB,YAAY,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACjE,YAAY,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACrE,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK;QAAE,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IAC9E,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC;CACjD;AAED,QAAA,MAAM,aAAa,EAAE,aAAkB,CAAC;AAExC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA4ChD;AAED;;;GAGG;AACH,wBAAgB,YAAY,IAAI,aAAa,CAmG5C;AAGD,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CODENOTCH_ENV = void 0;
 exports.setupCodenotchEnv = setupCodenotchEnv;
 exports.useCodenotch = useCodenotch;
-exports.useCodenotchApp = useCodenotchApp;
 const CODENOTCH_ENV = {};
 exports.CODENOTCH_ENV = CODENOTCH_ENV;
 function setupCodenotchEnv(env) {
@@ -11,9 +10,41 @@ function setupCodenotchEnv(env) {
         console.warn("Codenotch environment is not defined. Please set it in the Codenotch configuration.");
         return;
     }
+    // i18n.fr.somekey=some value
+    let i18nLanguages = new Set();
     Object.keys(env).forEach((key) => {
-        CODENOTCH_ENV[key] = env[key];
+        if (key.startsWith("i18n.")) {
+            // Special case
+            let parts = key.split(".");
+            let language = parts[1];
+            let keyName = parts.slice(2).join(".");
+            i18nLanguages.add(language);
+            let keyValue = `${env[key]}`.trim();
+            if (keyValue.startsWith('"') && keyValue.endsWith('"')) {
+                // Parse like json
+                try {
+                    keyValue = JSON.parse(keyValue);
+                }
+                catch (error) {
+                    console.warn(`Codenotch environment variable ${key} is not a valid JSON string. Using raw value.`);
+                }
+            }
+            CODENOTCH_ENV.i18n = CODENOTCH_ENV.i18n ?? {};
+            CODENOTCH_ENV.i18n[language] = CODENOTCH_ENV.i18n[language] ?? {};
+            CODENOTCH_ENV.i18n[language][keyName] = keyValue;
+        }
+        else {
+            CODENOTCH_ENV[key] = env[key];
+            console.log(`Codenotch environment variable ${key} set to ${env[key]}`);
+        }
     });
+    if (CODENOTCH_ENV.currentLanguage === undefined) {
+        // If current language is not defined, we set it to the first language found in i18n
+        if (i18nLanguages.size > 0) {
+            CODENOTCH_ENV.currentLanguage = Array.from(i18nLanguages)[0];
+            console.log(`Codenotch current language set to ${CODENOTCH_ENV.currentLanguage}`);
+        }
+    }
 }
 /**
  * Return Codenotch API
@@ -22,6 +53,38 @@ function setupCodenotchEnv(env) {
 function useCodenotch() {
     return {
         ENV: CODENOTCH_ENV,
+        i18n: (key, ...args) => {
+            try {
+                if (CODENOTCH_ENV.i18n === undefined || Object.keys(CODENOTCH_ENV.i18n).length === 0) {
+                    console.warn("Codenotch i18n is not defined. Please set it in the Codenotch configuration.");
+                    return key;
+                }
+                let language = CODENOTCH_ENV.currentLanguage ?? "en";
+                let isLanguageExists = CODENOTCH_ENV.i18n[language] !== undefined;
+                if (isLanguageExists === false) {
+                    let fallbackLanguage = Object.keys(CODENOTCH_ENV.i18n)[0];
+                    console.warn(`Codenotch i18n language ${language} is not defined. Falling back to ${fallbackLanguage}. Please set the correct language in the Codenotch configuration.`);
+                    language = fallbackLanguage;
+                }
+                let dico = CODENOTCH_ENV.i18n[language];
+                let value = dico[key];
+                if (typeof value !== "string") {
+                    console.warn(`Codenotch i18n key ${key} is not defined for language ${language}. Please set it in the Codenotch configuration.`);
+                    return key;
+                }
+                args = args ?? [];
+                let result = value.replace(/{([\d ]*)}/g, (match, p1) => {
+                    let argValue = args[p1.trim()];
+                    // Instead of returning 'undefined', returns an empty string
+                    return argValue !== undefined ? argValue : "";
+                });
+                return result;
+            }
+            catch (error) {
+                console.error("Error in i18n function:", error);
+                return key;
+            }
+        },
         requestSioql: async (sioql, verbose) => {
             if (CODENOTCH_ENV.clusterUrl === undefined) {
                 throw new Error("Codenotch cluster URL is not defined. Please set it in the Codenotch configuration.");
@@ -71,30 +134,3 @@ function useCodenotch() {
         }
     };
 }
-/**
- * Setup Codenotch environment and return Codenotch API
- * @param props Codenotch app properties
- * @returns {ICodenotchApi} Codenotch API
- */
-function useCodenotchApp(props) {
-    if (props) {
-        if (props.clusterUrl)
-            CODENOTCH_ENV.clusterUrl = props.clusterUrl;
-        if (props.serviceName)
-            CODENOTCH_ENV.serviceName = props.serviceName;
-        if (props.tenantName)
-            CODENOTCH_ENV.tenantName = props.tenantName;
-        if (props.accessToken)
-            CODENOTCH_ENV.accessToken = props.accessToken;
-        // Inject URL parameters as props if they are not already defined
-        if (typeof window !== 'undefined') {
-            const params = new URL(window.location.href).searchParams;
-            params.forEach((value, key) => {
-                if (props[key] === undefined) {
-                    props[key] = value;
-                }
-            });
-        }
-    }
-    return useCodenotch();
-}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "codenotch-react",
-    "version": "1.0.34",
+    "version": "1.0.36",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "author": "Codenotch SA",