codenotch-react 1.0.58 → 1.0.60

package/dist/components/Auml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Auml.d.ts","sourceRoot":"","sources":["../../src/components/Auml.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAS3G,UAAU,UAAU;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,UAAU;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,IAAK,SAAQ,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAE7D,kBAAkB,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;gBAEnC,KAAK,EAAE,UAAU;IAQ7B,iBAAiB;IAmCjB,oBAAoB;IAQpB,QAAQ,CAAC,CAAC,EAAE,eAAe;IAO3B,OAAO;IAYP,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS;IAclC,cAAc;;;IAMd,wBAAwB,IAAI,MAAM,GAAG,IAAI;IAoCzC,2BAA2B,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM;IAO/D,QAAQ,CAAC,EAAE,EAAE,MAAM;IAmBnB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAsBtB,MAAM;IA2CA,mBAAmB;CAqC5B"}
+{"version":3,"file":"Auml.d.ts","sourceRoot":"","sources":["../../src/components/Auml.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,0EAA0E,CAAC;AAU3G,UAAU,UAAU;IAChB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,UAAU;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,gBAAgB,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,IAAK,SAAQ,KAAK,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,CAAC;IAE7D,kBAAkB,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;gBAEnC,KAAK,EAAE,UAAU;IAY7B,iBAAiB;IAmCjB,oBAAoB;IAQpB,QAAQ,CAAC,CAAC,EAAE,eAAe;IAO3B,OAAO;IAYP,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS;IAclC,cAAc;;;IAMd,wBAAwB,IAAI,MAAM,GAAG,IAAI;IAmCzC,2BAA2B,CAAC,kBAAkB,EAAE,MAAM,GAAG,MAAM;IAO/D,QAAQ,CAAC,EAAE,EAAE,MAAM;IAmBnB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAsBtB,MAAM;IAoDA,mBAAmB;CAoC5B"}

package/dist/components/Auml.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Auml = void 0;
 const react_1 = __importDefault(require("react"));
 const SpaRenderWithBrowserRouter_1 = require("@echino/echino.ui.framework/components/SpaBuilder/SpaRender/SpaRenderWithBrowserRouter");
+const I18nUtils_1 = __importDefault(require("../utils/I18nUtils"));
 class Auml extends react_1.default.Component {
     constructor(props) {
         super(props);
@@ -13,6 +14,10 @@ class Auml extends react_1.default.Component {
             loaded: false,
             inspectorEnabled: false
         };
+        if (typeof user === 'undefined') {
+            let globalObject = typeof window !== 'undefined' ? window : globalThis;
+            globalObject['user'] = null; // Make sure user is defined
+        }
     }
     componentDidMount() {
         try {
@@ -20,7 +25,7 @@ class Auml extends react_1.default.Component {
             if (this._refreshTokenTimer) {
                 clearTimeout(this._refreshTokenTimer);
             }
-            if (!user) {
+            if (user === null) {
                 console.log("No user found, will not refresh the token");
                 return;
             }
@@ -150,8 +155,15 @@ export interface UserInfo {
             aumlManifest = appManifestObj.auml;
         }
         catch { }
+        let auml = this.props.value;
+        try {
+            auml = I18nUtils_1.default.compileAuml(auml);
+        }
+        catch (err) {
+            console.error("Error compiling AUML with i18n variables: " + err);
+        }
         return react_1.default.createElement("div", { className: "app" },
-            react_1.default.createElement(SpaRenderWithBrowserRouter_1.SpaRenderWithBrowserRouter, { appDescription: this.props.value, tenant: tenant, serviceName: serviceName, packageVersions: packageVersions, user: user, languages: languages, onProgress: (s) => this.progress(s), input: inputs, theme: theme, manifest: aumlManifest, inspectorEnabled: this.state.inspectorEnabled, children: [] }),
+            react_1.default.createElement(SpaRenderWithBrowserRouter_1.SpaRenderWithBrowserRouter, { appDescription: auml, tenant: tenant, serviceName: serviceName, packageVersions: packageVersions, user: user, languages: languages, onProgress: (s) => this.progress(s), input: inputs, theme: theme, manifest: aumlManifest, inspectorEnabled: this.state.inspectorEnabled, children: [] }),
             !this.state.loaded &&
                 react_1.default.createElement("div", { className: `app-loading ${this.getMode(theme)}` },
                     this.getLogo(),

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEpF,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,UAAU,MAAM,yBAAyB,CAAC;AAIjD,QAAA,MAAM,GAAG,EAAE,aAAkB,CAAC;AAO9B;;;;GAIG;AACH,iBAAS,IAAI,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI,CA4DrC;AAED,iBAAS,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAoCjD;AAED;;;GAGG;AACH,iBAAS,YAAY,IAAI,aAAa,CAkLrC;AAED,OAAO,EACH,GAAG,EACH,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,IAAI,EACJ,UAAU,EACb,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEpF,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,UAAU,MAAM,yBAAyB,CAAC;AAIjD,QAAA,MAAM,GAAG,EAAE,aAAkB,CAAC;AAM9B;;;;GAIG;AACH,iBAAS,IAAI,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI,CAqErC;AAED,iBAAS,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAoCjD;AAED;;;GAGG;AACH,iBAAS,YAAY,IAAI,aAAa,CAkLrC;AAED,OAAO,EACH,GAAG,EACH,IAAI,EACJ,YAAY,EACZ,IAAI,EACJ,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,IAAI,EACJ,UAAU,EACb,CAAC"}

package/dist/index.js

@@ -34,38 +34,46 @@ function init(envVariables) {
     // i18n.fr.somekey=some value
     let i18nLanguages = new Set();
     Object.keys(envVariables).forEach((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 = `${envVariables[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.`);
-                }
+        try {
+            if (key.startsWith('GLOBAL.')) {
+                // Global variable, we set it directly on the window object
+                let globalKey = key.substring('GLOBAL.'.length);
+                let globalObject = typeof window !== 'undefined' ? window : globalThis;
+                globalObject[globalKey] = JSON.parse(envVariables[key]);
+                console.log(`Codenotch global variable ${globalKey} set!`);
+                return;
             }
-            env.i18n = env.i18n ?? {};
-            env.i18n[language] = env.i18n[language] ?? {};
-            env.i18n[language][keyName] = keyValue;
-        }
-        else {
-            env[key] = envVariables[key];
-            if (['appManifest', 'projectManifest'].includes(key)) {
-                // Must be Json
-                try {
-                    env[key] = JSON.parse(envVariables[key]);
+            else if (key.startsWith("i18n.")) {
+                // Special case
+                let parts = key.split("."); // i18n.someKey.fr
+                let language = parts[parts.length - 1]; // fr
+                let keyName = parts.slice(1, parts.length - 1).join("."); // someKey
+                i18nLanguages.add(language);
+                let value = `${envVariables[key]}`.trim();
+                if (value.startsWith('"') && value.endsWith('"')) {
+                    // Parse like json
+                    value = JSON.parse(value);
                 }
-                catch (error) {
-                    console.warn(`Codenotch environment variable ${key} is not a valid JSON string. Using raw value.`);
+                env.i18n = env.i18n ?? {};
+                env.i18n[language] = env.i18n[language] ?? {};
+                env.i18n[language][keyName] = value;
+            }
+            else {
+                env[key] = envVariables[key];
+                if (['appManifest', 'projectManifest'].includes(key)) {
+                    // Must be Json
+                    try {
+                        env[key] = JSON.parse(envVariables[key]);
+                    }
+                    catch (error) {
+                        console.warn(`Codenotch environment variable ${key} is not a valid JSON string. Using raw value.`);
+                    }
                 }
+                console.log(`Codenotch environment variable ${key} set to ${env[key]}`);
             }
-            console.log(`Codenotch environment variable ${key} set to ${env[key]}`);
+        }
+        catch (error) {
+            console.error(`Error processing Codenotch environment variable ${key}:`, error);
         }
     });
     if (env.language === undefined) {

package/dist/utils/I18nUtils.d.ts

@@ -0,0 +1,5 @@
+export default abstract class I18nUtils {
+    static compileAuml(auml: string): string;
+    private static injectI18n;
+}
+//# sourceMappingURL=I18nUtils.d.ts.map

package/dist/utils/I18nUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"I18nUtils.d.ts","sourceRoot":"","sources":["../../src/utils/I18nUtils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,SAAS;WAErB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAO/C,OAAO,CAAC,MAAM,CAAC,UAAU;CAqB5B"}

package/dist/utils/I18nUtils.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("..");
+class I18nUtils {
+    static compileAuml(auml) {
+        auml = this.injectI18n(auml);
+        return auml;
+    }
+    static injectI18n(auml) {
+        let i18n = (0, __1.useCodenotch)().env.i18n ?? {};
+        if (Object.keys(i18n).length === 0) {
+            // No i18n variables, return original auml
+            return auml;
+        }
+        // Obtain the root tag of the file
+        let match = auml.match(/<([^!\r\n\t\f\v> ]+)/);
+        if (!match) {
+            return auml;
+        }
+        let rootTag = match[1];
+        auml = auml.replace(`</${rootTag}>`, `<${rootTag}.I18n><![CDATA[${JSON.stringify(i18n)}]]></${rootTag}.I18n></${rootTag}>`);
+        return auml;
+    }
+}
+exports.default = I18nUtils;

package/package.json

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