@etsoo/materialui 1.4.78 → 1.4.80

package/__tests__/ReactAppTests.tsx

@@ -1,9 +1,4 @@
-import {
-  AddressUtils,
-  ApiAuthorizationScheme,
-  Culture,
-  ExternalSettings
-} from "@etsoo/appscript";
+import { AddressUtils, Culture } from "@etsoo/appscript";
 import { ReactApp } from "../src";
 import { DataTypes, DomUtils, IActionResult, Utils } from "@etsoo/shared";
 import React, { act } from "react";
@@ -28,49 +23,49 @@ const supportedCultures: DataTypes.CultureDefinition[] = [
 // Supported regions
 const supportedRegions = ["CN"];
 
-const settings = ExternalSettings.format({
-  /**
-   * Endpoint of the API service
-   */
-  endpoint: "http://{hostname}/com.etsoo.SmartERPApi/api/",
-
-  /**
-   * App root url
-   */
-  homepage: "/cms",
-
-  /**
-   * Web url of the cloud
-   */
-  webUrl: "http://localhost",
-
-  // Authorization scheme
-  authScheme: ApiAuthorizationScheme.Bearer,
-
-  // Detected culture
-  detectedCulture,
-
-  // Supported cultures
-  cultures: supportedCultures,
-
-  // Supported regions
-  regions: supportedRegions,
-
-  // Browser's time zone
-  timeZone: Utils.getTimeZone(),
-
-  // Current country or region
-  currentRegion: AddressUtils.getRegion(
-    supportedRegions,
-    detectedCountry,
-    detectedCulture
-  ),
-
-  // Current culture
-  currentCulture: DomUtils.getCulture(supportedCultures, detectedCulture)![0]
-});
-
-const app = new ReactApp(settings, "test");
+const app = new ReactApp(
+  {
+    appId: 0,
+
+    /**
+     * Endpoint of the API service
+     */
+    endpoint: "http://{hostname}/com.etsoo.SmartERPApi/api/",
+
+    /**
+     * App root url
+     */
+    homepage: "/cms",
+
+    /**
+     * Web url of the cloud
+     */
+    webUrl: "http://localhost",
+
+    // Detected culture
+    detectedCulture,
+
+    // Supported cultures
+    cultures: supportedCultures,
+
+    // Supported regions
+    regions: supportedRegions,
+
+    // Browser's time zone
+    timeZone: Utils.getTimeZone(),
+
+    // Current country or region
+    currentRegion: AddressUtils.getRegion(
+      supportedRegions,
+      detectedCountry,
+      detectedCulture
+    ),
+
+    // Current culture
+    currentCulture: DomUtils.getCulture(supportedCultures, detectedCulture)![0]
+  },
+  "test"
+);
 
 // Root
 const root = document.body;

package/lib/cjs/app/ReactApp.js

@@ -85,7 +85,7 @@ class ReactApp extends appscript_1.CoreApp {
                 this.notifier.message(notificationbase_1.NotificationMessageType.Success, this.get("updateTip") + `(${[app, version].join(", ")})`, this.get("updateReady"));
             });
         }
-        this.cultureState = new react_2.CultureState(settings.currentCulture);
+        this.cultureState = new react_2.CultureState(this.settings.currentCulture);
     }
     /**
      * Override alert action result

package/lib/cjs/app/ServiceApp.js

@@ -34,7 +34,7 @@ class ServiceApp extends ReactApp_1.ReactApp {
      */
     constructor(settings, name, debug = false) {
         super(settings, name, debug);
-        const coreEndpoint = settings.endpoints?.core;
+        const coreEndpoint = this.settings.endpoints?.core;
         if (coreEndpoint == null) {
             throw new Error("Core API endpont is required.");
         }

package/lib/mjs/app/ReactApp.js

@@ -77,7 +77,7 @@ export class ReactApp extends CoreApp {
                 this.notifier.message(NotificationMessageType.Success, this.get("updateTip") + `(${[app, version].join(", ")})`, this.get("updateReady"));
             });
         }
-        this.cultureState = new CultureState(settings.currentCulture);
+        this.cultureState = new CultureState(this.settings.currentCulture);
     }
     /**
      * Override alert action result

package/lib/mjs/app/ServiceApp.js

@@ -31,7 +31,7 @@ export class ServiceApp extends ReactApp {
      */
     constructor(settings, name, debug = false) {
         super(settings, name, debug);
-        const coreEndpoint = settings.endpoints?.core;
+        const coreEndpoint = this.settings.endpoints?.core;
         if (coreEndpoint == null) {
             throw new Error("Core API endpont is required.");
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.78",
+  "version": "1.4.80",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -40,12 +40,12 @@
     "@dnd-kit/sortable": "^10.0.0",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@etsoo/appscript": "^1.5.98",
+    "@etsoo/appscript": "^1.6.0",
     "@etsoo/notificationbase": "^1.1.58",
-    "@etsoo/react": "^1.8.28",
-    "@etsoo/shared": "^1.2.60",
-    "@mui/icons-material": "^6.4.3",
-    "@mui/material": "^6.4.3",
+    "@etsoo/react": "^1.8.29",
+    "@etsoo/shared": "^1.2.61",
+    "@mui/icons-material": "^6.4.4",
+    "@mui/material": "^6.4.4",
     "@mui/x-data-grid": "^7.26.0",
     "chart.js": "^4.4.7",
     "chartjs-plugin-datalabels": "^2.2.0",

package/src/app/ReactApp.ts

@@ -200,7 +200,7 @@ export class ReactApp<S extends IAppSettings, D extends IUser>
       });
     }
 
-    this.cultureState = new CultureState(settings.currentCulture);
+    this.cultureState = new CultureState(this.settings.currentCulture);
   }
 
   /**

package/src/app/ServiceApp.ts

@@ -57,7 +57,7 @@ export class ServiceApp<
   constructor(settings: S, name: string, debug: boolean = false) {
     super(settings, name, debug);
 
-    const coreEndpoint = settings.endpoints?.core;
+    const coreEndpoint = this.settings.endpoints?.core;
     if (coreEndpoint == null) {
       throw new Error("Core API endpont is required.");
     }