@etsoo/materialui 1.4.25 → 1.4.27

package/__tests__/ComboBox.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { ComboBox } from "../src";
-import { fireEvent, render, screen } from "@testing-library/react";
+import { act, fireEvent, render, screen } from "@testing-library/react";
 
 it("Render ComboBox", async () => {
   // Arrange
@@ -10,13 +10,22 @@ it("Render ComboBox", async () => {
     { id: 2, name: "Name 2" }
   ];
 
-  render(
-    <ComboBox<T> name="Test" options={options} labelField="name" label="Test" />
-  );
+  act(() => {
+    render(
+      <ComboBox<T>
+        name="Test"
+        options={options}
+        labelField="name"
+        label="Test"
+      />
+    );
+  });
 
   // Act, click the list
-  const clicked = fireEvent.click(screen.getByRole("button"));
-  expect(clicked).toBeTruthy();
+  act(() => {
+    const clicked = fireEvent.click(screen.getByRole("button"));
+    expect(clicked).toBeTruthy();
+  });
 
   // Get list item
   const item = screen.getByText("Name 1");

package/__tests__/ReactAppTests.tsx

@@ -107,3 +107,20 @@ test("Test for properties", () => {
 
   expect(root.innerHTML).toContain(result.title);
 });
+
+test("Test for alertResult", () => {
+  const result: IActionResult = {
+    ok: false,
+    type: "TokenExpired",
+    title: "您的令牌已过期",
+    data: {}
+  };
+
+  act(() => {
+    app.alertResult(result);
+  });
+
+  expect(root.innerHTML).toContain(
+    '<span style="font-size: 9px;">(TokenExpired)</span>'
+  );
+});

package/__tests__/ResponsePage.tsx

@@ -21,33 +21,38 @@ const fieldTemplate = {
 } as const;
 
 it("Render ResponsePage", async () => {
-  // Act
-  render(
-    <ResponsivePage<Data, typeof fieldTemplate>
-      fields={[]}
-      columns={[
-        { field: "id", header: "ID" },
-        { field: "name", header: "Name" }
-      ]}
-      height={200}
-      itemSize={[118, MUGlobal.pagePaddings]}
-      fieldTemplate={fieldTemplate}
-      loadData={({ id }) =>
-        Promise.resolve([
-          { id: 1, name: "Name 1" },
-          { id: 2, name: "Name 2" },
-          { id: id ?? 0, name: "auto" }
-        ])
-      }
-      innerItemRenderer={(props) =>
-        MobileListItemRenderer(props, (data) => {
-          return [data.name, undefined, [], <React.Fragment></React.Fragment>];
-        })
-      }
-    />
-  );
-
   act(() => {
+    // Act
+    render(
+      <ResponsivePage<Data, typeof fieldTemplate>
+        fields={[]}
+        columns={[
+          { field: "id", header: "ID" },
+          { field: "name", header: "Name" }
+        ]}
+        height={200}
+        itemSize={[118, MUGlobal.pagePaddings]}
+        fieldTemplate={fieldTemplate}
+        loadData={({ id }) =>
+          Promise.resolve([
+            { id: 1, name: "Name 1" },
+            { id: 2, name: "Name 2" },
+            { id: id ?? 0, name: "auto" }
+          ])
+        }
+        innerItemRenderer={(props) =>
+          MobileListItemRenderer(props, (data) => {
+            return [
+              data.name,
+              undefined,
+              [],
+              <React.Fragment></React.Fragment>
+            ];
+          })
+        }
+      />
+    );
+
     // Fast forward
     vi.runOnlyPendingTimers();
   });

package/__tests__/SelectEx.tsx

@@ -1,6 +1,6 @@
 import React, { act } from "react";
 import { SelectEx } from "../src";
-import { findByText, fireEvent, render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import { ListType1, Utils } from "@etsoo/shared";
 
 it("Render SelectEx", async () => {
@@ -19,16 +19,18 @@ it("Render SelectEx", async () => {
   });
 
   // Render component
-  const { findByText } = render(
-    <SelectEx<T>
-      options={options}
-      name="test"
-      onItemChange={itemChangeCallback}
-      value={1}
-      search
-      labelField="name"
-    />
-  );
+  act(() => {
+    render(
+      <SelectEx<T>
+        options={options}
+        name="test"
+        onItemChange={itemChangeCallback}
+        value={1}
+        search
+        labelField="name"
+      />
+    );
+  });
 
   expect(itemChangeCallback).toHaveBeenCalled();
 
@@ -45,10 +47,10 @@ it("Render SelectEx", async () => {
   });
 
   // Get list item
-  const itemName2 = await findByText("Name 2");
+  const itemName2 = await screen.findByText("Name 2");
   expect(itemName2.nodeName).toBe("SPAN");
 
-  const itemBlank = await findByText("---");
+  const itemBlank = await screen.findByText("---");
   expect(itemBlank.nodeName).toBe("SPAN");
 
   act(() => {
@@ -90,12 +92,12 @@ it("Render multiple SelectEx", async () => {
   fireEvent.mouseDown(button); // Not click
 
   // Get list item
-  const itemName1 = await findByText(baseElement, "Name 1");
+  const itemName1 = await screen.findByText("Name 1");
   const checkbox1 = itemName1.closest("li")?.querySelector("input");
 
   expect(checkbox1?.checked).toBeTruthy();
 
-  const itemName3 = await findByText(baseElement, "Name 3");
+  const itemName3 = await screen.findByText("Name 3");
   expect(itemName3.nodeName).toBe("SPAN");
 
   // Checkbox

package/__tests__/SwitchAnt.tsx

@@ -1,4 +1,4 @@
-import { getByText, render } from "@testing-library/react";
+import { screen, render } from "@testing-library/react";
 import React, { act } from "react";
 import { SwitchAnt } from "../src/SwitchAnt";
 
@@ -8,11 +8,11 @@ it("SwitchAnt Tests", () => {
   );
 
   // Render component
-  const { baseElement } = render(
-    <SwitchAnt startLabel="No" endLabel="Yes" onChange={onChange} />
-  );
+  act(() => {
+    render(<SwitchAnt startLabel="No" endLabel="Yes" onChange={onChange} />);
+  });
 
-  const yes = getByText(baseElement, "Yes");
+  const yes = screen.getByText("Yes");
 
   act(() => {
     yes.click();

package/lib/app/ServiceApp.d.ts

@@ -32,8 +32,9 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
     constructor(settings: S, name: string, debug?: boolean);
     /**
      * Load core system UI
+     * @param tryLogin Try login or not
      */
-    loadCore(): void;
+    loadCore(tryLogin?: boolean): void;
     /**
      * Go to the login page
      * @param data Login parameters

package/lib/app/ServiceApp.js

@@ -2,6 +2,7 @@ import { AuthApi, BridgeUtils } from "@etsoo/appscript";
 import { ReactApp } from "./ReactApp";
 const coreName = "core";
 const coreTokenKey = "core-refresh-token";
+const tryLoginKey = "tryLogin";
 /**
  * Core Service App
  * Service login to core system, get the refesh token and access token
@@ -39,13 +40,20 @@ export class ServiceApp extends ReactApp {
     }
     /**
      * Load core system UI
+     * @param tryLogin Try login or not
      */
-    loadCore() {
+    loadCore(tryLogin = false) {
         if (BridgeUtils.host == null) {
-            globalThis.location.href = this.coreEndpoint.webUrl;
+            let url = this.coreEndpoint.webUrl;
+            if (!tryLogin)
+                url = url.addUrlParam(tryLoginKey, tryLogin);
+            globalThis.location.href = url;
         }
         else {
-            BridgeUtils.host.loadApp(coreName);
+            const startUrl = tryLogin
+                ? undefined
+                : "".addUrlParam(tryLoginKey, tryLogin);
+            BridgeUtils.host.loadApp(coreName, startUrl);
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.25",
+  "version": "1.4.27",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",
@@ -35,9 +35,9 @@
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.13.5",
     "@emotion/styled": "^11.13.5",
-    "@etsoo/appscript": "^1.5.67",
+    "@etsoo/appscript": "^1.5.69",
     "@etsoo/notificationbase": "^1.1.54",
-    "@etsoo/react": "^1.8.2",
+    "@etsoo/react": "^1.8.3",
     "@etsoo/shared": "^1.2.55",
     "@mui/icons-material": "^6.1.8",
     "@mui/material": "^6.1.8",
@@ -70,9 +70,9 @@
     "@types/react-dom": "^18.3.1",
     "@types/react-input-mask": "^3.0.6",
     "@types/react-window": "^1.8.8",
-    "@vitejs/plugin-react": "^4.3.3",
+    "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^25.0.1",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.5"
+    "vitest": "^2.1.6"
   }
 }

package/src/app/ServiceApp.ts

@@ -15,6 +15,7 @@ import { ReactApp } from "./ReactApp";
 
 const coreName = "core";
 const coreTokenKey = "core-refresh-token";
+const tryLoginKey = "tryLogin";
 
 /**
  * Core Service App
@@ -65,12 +66,18 @@ export class ServiceApp<
 
   /**
    * Load core system UI
+   * @param tryLogin Try login or not
    */
-  loadCore() {
+  loadCore(tryLogin: boolean = false) {
     if (BridgeUtils.host == null) {
-      globalThis.location.href = this.coreEndpoint.webUrl;
+      let url = this.coreEndpoint.webUrl;
+      if (!tryLogin) url = url.addUrlParam(tryLoginKey, tryLogin);
+      globalThis.location.href = url;
     } else {
-      BridgeUtils.host.loadApp(coreName);
+      const startUrl = tryLogin
+        ? undefined
+        : "".addUrlParam(tryLoginKey, tryLogin);
+      BridgeUtils.host.loadApp(coreName, startUrl);
     }
   }