@etsoo/react 1.3.75 → 1.3.79

package/lib/app/ReactApp.d.ts

@@ -85,8 +85,9 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string);
+    constructor(settings: S, name: string, globalFields: string[]);
     /**
      * Change culture
      * @param culture New culture definition

package/lib/app/ReactApp.js

@@ -1,4 +1,5 @@
 import { CoreApp, createClient } from '@etsoo/appscript';
+import { DomUtils, WindowStorage } from '@etsoo/shared';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -53,9 +54,21 @@ export class ReactApp extends CoreApp {
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings, name) {
-        super(settings, ReactApp.createApi(settings), ReactApp.createNotifier(), name);
+    constructor(settings, name, globalFields) {
+        super(settings, ReactApp.createApi(settings), ReactApp.createNotifier(), new WindowStorage([
+            ...globalFields,
+            DomUtils.CountryField,
+            DomUtils.CultureField,
+            CoreApp.deviceIdField,
+            CoreApp.headerTokenField,
+            CoreApp.serversideDeviceIdField
+        ], (field, data, index) => {
+            if (index > 0 && field === CoreApp.headerTokenField)
+                return null;
+            return data;
+        }), name);
         /**
          * User state
          */

package/lib/app/ServiceApp.d.ts

@@ -30,8 +30,9 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string);
+    constructor(settings: S, name: string, globalFields: string[]);
     /**
      * Go to the login page
      */

package/lib/app/ServiceApp.js

@@ -13,9 +13,10 @@ export class ServiceApp extends ReactApp {
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings, name) {
-        super(settings, name);
+    constructor(settings, name, globalFields) {
+        super(settings, name, globalFields);
         /**
          * Service passphrase
          */
@@ -51,7 +52,7 @@ export class ServiceApp extends ReactApp {
                 '&serviceDeviceId=' +
                 encodeURIComponent(this.deviceId) +
                 '&' +
-                DomUtils.Culture +
+                DomUtils.CultureField +
                 '=' +
                 this.culture;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.75",
+    "version": "1.3.79",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,16 +50,16 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.89",
+        "@etsoo/appscript": "^1.1.96",
         "@etsoo/notificationbase": "^1.0.95",
-        "@etsoo/shared": "^1.0.82",
+        "@etsoo/shared": "^1.0.88",
         "@mui/icons-material": "^5.2.5",
         "@mui/material": "^5.2.5",
         "@reach/router": "^1.3.4",
         "@types/pica": "^5.1.3",
         "@types/pulltorefreshjs": "^0.1.5",
-        "@types/reach__router": "^1.3.9",
-        "@types/react": "^17.0.37",
+        "@types/reach__router": "^1.3.10",
+        "@types/react": "^17.0.38",
         "@types/react-avatar-editor": "^10.3.6",
         "@types/react-dom": "^17.0.11",
         "@types/react-input-mask": "^3.0.1",
@@ -86,7 +86,7 @@
         "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-react": "^7.27.1",
+        "eslint-plugin-react": "^7.28.0",
         "jest": "^27.4.5",
         "react-test-renderer": "^17.0.2",
         "ts-jest": "^27.1.2",

package/src/app/ReactApp.ts

@@ -7,7 +7,7 @@ import {
     IUserData
 } from '@etsoo/appscript';
 import { NotificationRenderProps } from '@etsoo/notificationbase';
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, DomUtils, WindowStorage } from '@etsoo/shared';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -182,12 +182,30 @@ export class ReactApp<
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string) {
+    constructor(settings: S, name: string, globalFields: string[]) {
         super(
             settings,
             ReactApp.createApi(settings),
             ReactApp.createNotifier(),
+            new WindowStorage(
+                [
+                    ...globalFields,
+
+                    DomUtils.CountryField,
+                    DomUtils.CultureField,
+
+                    CoreApp.deviceIdField,
+                    CoreApp.headerTokenField,
+                    CoreApp.serversideDeviceIdField
+                ],
+                (field, data, index) => {
+                    if (index > 0 && field === CoreApp.headerTokenField)
+                        return null;
+                    return data;
+                }
+            ),
             name
         );
         this.cultureState = new CultureState(settings.currentCulture);

package/src/app/ServiceApp.ts

@@ -50,9 +50,10 @@ export class ServiceApp<
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string) {
-        super(settings, name);
+    constructor(settings: S, name: string, globalFields: string[]) {
+        super(settings, name, globalFields);
 
         // Check
         if (settings.serviceId == null || settings.serviceEndpoint == null) {
@@ -79,7 +80,7 @@ export class ServiceApp<
             '&serviceDeviceId=' +
             encodeURIComponent(this.deviceId) +
             '&' +
-            DomUtils.Culture +
+            DomUtils.CultureField +
             '=' +
             this.culture;
     }