π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web] Guard closing input dialogs and test visible errors
AswinAsok3cb58332b8d8
diff --git a/web/apps/photos/package.json b/web/apps/photos/package.jsonindex 7319d624de..b2804f4eec 100644--- a/web/apps/photos/package.json+++ b/web/apps/photos/package.json@@ -39,6 +39,7 @@"@types/react-dom": "19.3.0","@types/react-window": "1.8.8","ente-build-config": "*",+ "jsdom": "30.1.3","vitest": "5.0.4"}}diff --git a/web/apps/photos/tests/single-input-dialog.test.tsx b/web/apps/photos/tests/single-input-dialog.test.tsxindex 3167ac0ba2..a3597a16e6 100644--- a/web/apps/photos/tests/single-input-dialog.test.tsx+++ b/web/apps/photos/tests/single-input-dialog.test.tsx@@ -1,86 +1,147 @@+// @vitest-environment jsdom+import { ThemeProvider } from "@mui/material";import { SingleInputDialog } from "ente-base/components/SingleInputDialog";import type { SingleInputFormProps } from "ente-base/components/SingleInputForm";import { photosTheme } from "ente-base/components/utils/theme";-import type { PropsWithChildren } from "react";-import { renderToStaticMarkup } from "react-dom/server";-import { beforeEach, describe, expect, test, vi } from "vitest";+import { act, useState } from "react";+import { createRoot, type Root } from "react-dom/client";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";-// Exercise the dialog's submission contract independently of browser form events.-const captured = vi.hoisted(() => ({- props: undefined as SingleInputFormProps | undefined,-}));-vi.mock("@mui/material", async (importOriginal) => ({- ...(await importOriginal<typeof import("@mui/material")>()),- Dialog: ({ children }: PropsWithChildren) => <div>{children}</div>,-}));-vi.mock("ente-base/components/SingleInputForm", () => ({- SingleInputForm: (props: SingleInputFormProps) => {- captured.props = props;- return null;- },-}));+vi.mock("i18next", () => ({ t: (key: string) => key }));+vi.mock("ente-base/log", () => ({ default: { error: vi.fn() } }));-const prepare = (onSubmit: SingleInputFormProps["onSubmit"]) => {- const onClose = vi.fn();- renderToStaticMarkup(- <ThemeProvider theme={photosTheme}>- <SingleInputDialog- open- title="Apply code"- label="Referral code"- submitButtonTitle="Apply"- onClose={onClose}- onSubmit={onSubmit}- />- </ThemeProvider>,- );- const submit = captured.props?.onSubmit;- if (!submit) throw new Error("The dialog did not render its form");- return { submit, onClose };-};+let root: Root;+let container: HTMLDivElement;beforeEach(() => {- captured.props = undefined;+ Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });+ container = document.createElement("div");+ document.body.append(container);+ root = createRoot(container);});+const flushUpdates = async (update: () => void) => {+ await act(async () => {+ update();+ await Promise.resolve();+ });+};++afterEach(async () => {+ await flushUpdates(() => root.unmount());+ container.remove();+});++const prepare = async (onSubmit: SingleInputFormProps["onSubmit"]) => {+ const onClose = vi.fn();+ const Dialog = () => {+ const [open, setOpen] = useState(true);+ return (+ <ThemeProvider theme={photosTheme}>+ <SingleInputDialog+ open={open}+ title="Apply code"+ label="Referral code"+ initialValue="FRIEND"+ submitButtonTitle="Apply"+ onClose={() => {+ onClose();+ setOpen(false);+ }}+ onSubmit={onSubmit}+ />+ </ThemeProvider>+ );+ };+ await flushUpdates(() => root.render(<Dialog />));+ const form = document.querySelector("form")!;+ const input = form.querySelector("input")!;+ const button = form.querySelector<HTMLButtonElement>(+ 'button[type="submit"]',+ )!;+ const submit = () =>+ flushUpdates(() => {+ form.dispatchEvent(+ new Event("submit", { bubbles: true, cancelable: true }),+ );+ });+ return { submit, onClose, input, button };+};++const expectVisibleError = (input: HTMLInputElement, message: string) => {+ const helperID = input.getAttribute("aria-describedby")!;+ const helper = document.getElementById(helperID)!;+ expect(helper.textContent).toBe(message);+ expect(input.getAttribute("aria-invalid")).toBe("true");+ expect(helper.closest('[role="dialog"]')).not.toBeNull();+ expect(getComputedStyle(helper).visibility).toBe("visible");+ expect(helper.closest('[aria-hidden="true"]')).toBeNull();+};+describe("single input dialog submission", () => {test("closes after a successful submission", async () => {const onSubmit = vi.fn();- const { submit, onClose } = prepare(onSubmit);- await submit("FRIEND", vi.fn());+ const { submit, onClose } = await prepare(onSubmit);+ await submit();expect(onSubmit).toHaveBeenCalledWith("FRIEND", expect.any(Function));expect(onClose).toHaveBeenCalledOnce();});- test("keeps referral validation errors visible", async () => {- const { submit, onClose } = prepare((_value, setFieldError) => {- setFieldError("Invalid code");- });- const setFieldError = vi.fn();- await submit("bad-code", setFieldError);- expect(setFieldError).toHaveBeenCalledWith("Invalid code");+ test("prevents duplicate submissions during the close animation", async () => {+ const onSubmit = vi.fn();+ const { submit, onClose } = await prepare(onSubmit);+ await submit();+ expect(onClose).toHaveBeenCalledOnce();++ const dialog = document.querySelector('[role="dialog"]')!;+ const button = dialog.querySelector<HTMLButtonElement>(+ 'button[type="submit"]',+ )!;+ expect(button.disabled).toBe(true);+ expect(dialog.querySelector("input")!.disabled).toBe(true);+ await flushUpdates(() => button.click());+ expect(onSubmit).toHaveBeenCalledOnce();+ expect(onClose).toHaveBeenCalledOnce();+ });++ test("keeps referral validation errors visible after submission finishes", async () => {+ const { submit, onClose, input, button } = await prepare(+ (_value, setFieldError) => setFieldError("Invalid code"),+ );+ await submit();+ expect(button.disabled).toBe(false);expect(onClose).not.toHaveBeenCalled();+ expectVisibleError(input, "Invalid code");});- test("keeps asynchronous server errors visible", async () => {- const { submit, onClose } = prepare(async (_value, setFieldError) => {- await Promise.resolve();- setFieldError("Code unavailable");+ test("keeps asynchronous server errors visible after submission finishes", async () => {+ let finishRequest!: () => void;+ const request = new Promise<void>((resolve) => {+ finishRequest = resolve;});- const setFieldError = vi.fn();- await submit("TAKEN", setFieldError);- expect(setFieldError).toHaveBeenCalledWith("Code unavailable");+ const { submit, onClose, input, button } = await prepare(+ async (_value, setFieldError) => {+ await request;+ setFieldError("Code unavailable");+ },+ );+ await submit();+ expect(button.disabled).toBe(true);+ expect(onClose).not.toHaveBeenCalled();+ await flushUpdates(finishRequest);+ expect(button.disabled).toBe(false);expect(onClose).not.toHaveBeenCalled();+ expectVisibleError(input, "Code unavailable");});- test("leaves thrown failures to the form without closing", async () => {- const { submit, onClose } = prepare(() => {+ test("shows a generic error for thrown failures without closing", async () => {+ const { submit, onClose, input, button } = await prepare(() => {throw new Error("Request failed");});- await expect(submit("FRIEND", vi.fn())).rejects.toThrow(- "Request failed",- );+ await submit();+ expect(button.disabled).toBe(false);expect(onClose).not.toHaveBeenCalled();+ expectVisibleError(input, "generic_error");});});diff --git a/web/package-lock.json b/web/package-lock.jsonindex 2e0ed9ca49..b40d447561 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -331,6 +331,7 @@"@types/react-dom": "19.3.0","@types/react-window": "1.8.8","ente-build-config": "*",+ "jsdom": "30.1.3","vitest": "5.0.4"}},@@ -382,6 +383,59 @@"ente-build-config": "*"}},+ "node_modules/@asamuzakjp/css-color": {+ "version": "7.1.7",+ "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-7.1.7.tgz",+ "integrity": "sha512-Q7ioeear07HwixdIitIn9KS1LZi97CEDFCSjPNm9v+y8KNbsu9q4Lrd4zUQW4faED+E7qxvfeVnbNRW46wFKuw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@csstools/css-calc": "^3.4.3",+ "@csstools/css-color-parser": "^4.2.6",+ "@csstools/css-parser-algorithms": "^4.0.2",+ "@csstools/css-tokenizer": "^4.0.2",+ "lru-cache": "^11.5.3"+ },+ "engines": {+ "node": "^22.22.2 || ^24.15.0 || >=26.0.0"+ }+ },+ "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {+ "version": "11.5.3",+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz",+ "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==",+ "dev": true,+ "license": "BlueOak-1.0.0",+ "engines": {+ "node": "20 || >=22"+ }+ },+ "node_modules/@asamuzakjp/dom-selector": {+ "version": "10.0.4",+ "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-10.0.4.tgz",+ "integrity": "sha512-A6f1nKy99I6tyoK82U6kBHvQQZmdHmTmPzJYPY/0eaOW0r8/qPmEOwjGHs+hL/vCgOwQTupu4LT1XtXNUuDruA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "bidi-js": "^1.1.0",+ "css-tree": "^3.2.1",+ "is-potential-custom-element-name": "^1.0.1",+ "lru-cache": "^11.5.3"+ },+ "engines": {+ "node": "^22.22.2 || ^24.15.0 || >=26.0.0"+ }+ },+ "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": {+ "version": "11.5.3",+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz",+ "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==",+ "dev": true,+ "license": "BlueOak-1.0.0",+ "engines": {+ "node": "20 || >=22"+ }+ },"node_modules/@babel/code-frame": {"version": "7.29.7","resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",@@ -660,6 +714,19 @@"url": "https://github.com/sponsors/Borewit"}},+ "node_modules/@bramus/specificity": {+ "version": "2.4.3",+ "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.3.tgz",+ "integrity": "sha512-0GEz8qJWokkUVYQYRukmkSHIFNoBH8QTreeHrAFbvz1XFYc3Y+puhMs8PQ5x8GNugiC2l5jvDBXKLbBIByeSBw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "css-tree": "^3.2.1"+ },+ "bin": {+ "specificity": "bin/cli.js"+ }+ },"node_modules/@cacheable/memory": {"version": "2.2.0","resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.2.0.tgz",@@ -684,18 +751,158 @@"keyv": "^5.6.0"}},- "node_modules/@emnapi/core": {+ "node_modules/@csstools/color-helpers": {+ "version": "6.1.2",+ "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.1.2.tgz",+ "integrity": "sha512-grhRy3OKmniaAEKXMjua5z/EODX0MSqBGjunw8+j/3HQjOnahs2AGhvEOIYVUWcU6ScApbhLhVrQTX8XqrMrow==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/csstools"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/csstools"+ }+ ],+ "license": "MIT-0",+ "engines": {+ "node": ">=20.19.0"+ }+ },+ "node_modules/@csstools/css-calc": {+ "version": "3.4.3",+ "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.4.3.tgz",+ "integrity": "sha512-iex20d8CHVkyvg6B7UKV7uHnI2Bqo9g+EFfT9E0y+GvTvhZ/DwONJ+9aKb1dlqm0ZiGsL5RXjp0fCoJYnkeDjA==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/csstools"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/csstools"+ }+ ],+ "license": "MIT",+ "engines": {+ "node": ">=20.19.0"+ },+ "peerDependencies": {+ "@csstools/css-parser-algorithms": "^4.0.2",+ "@csstools/css-tokenizer": "^4.0.2"+ }+ },+ "node_modules/@csstools/css-color-parser": {+ "version": "4.2.6",+ "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.2.6.tgz",+ "integrity": "sha512-iiPQ3iRWwnJkeEn6RIu6SJPr7hYrLz6XZ9s/QZl+2/LI5KQVjpl2fdmDSZKuD4xP6GMmMPgHFFXg6k1Wkz0Trg==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/csstools"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/csstools"+ }+ ],+ "license": "MIT","dependencies": {- "@emnapi/wasi-threads": "1.2.3",- "tslib": "^2.4.0"+ "@csstools/color-helpers": "^6.1.2",+ "@csstools/css-calc": "^3.4.3"+ },+ "engines": {+ "node": ">=20.19.0"+ },+ "peerDependencies": {+ "@csstools/css-parser-algorithms": "^4.0.2",+ "@csstools/css-tokenizer": "^4.0.2"+ }+ },+ "node_modules/@csstools/css-parser-algorithms": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.2.tgz",+ "integrity": "sha512-40cSKyMvK+tq4qz6Awrlye2WGuOKt3FwPgtGg6KTfbHOWNw+Rk1rzbAtZnZ6IBhsY491HLRnDXwoyBAijmmILA==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/csstools"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/csstools"+ }+ ],+ "license": "MIT",+ "engines": {+ "node": ">=20.19.0"},+ "peerDependencies": {+ "@csstools/css-tokenizer": "^4.0.2"+ }+ },+ "node_modules/@csstools/css-syntax-patches-for-csstree": {+ "version": "1.1.15",+ "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.15.tgz",+ "integrity": "sha512-J0u7HkVl2nzSlhsiTOp4AmwcUQ3D+mGEEKfBy/7To5/y7F2OHwyLrXfrhR0SMgr4p5Lo+eaMVSeai24zUcBIxA==","dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/csstools"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/csstools"+ }+ ],+ "license": "MIT-0",+ "peerDependencies": {+ "css-tree": "^3.2.1"+ },+ "peerDependenciesMeta": {+ "css-tree": {+ "optional": true+ }+ }+ },+ "node_modules/@csstools/css-tokenizer": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.2.tgz",+ "integrity": "sha512-OoKoR0f76dCY666JlcbhmVTs2drYj1GUXZTYTcbUgJjh9Nv41aFfZ21bPQTERm5+L5cBDo466NltB2lplS5GBw==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/csstools"+ },+ {+ "type": "opencollective",+ "url": "https://opencollective.com/csstools"+ }+ ],+ "license": "MIT",+ "engines": {+ "node": ">=20.19.0"+ }+ },+ "node_modules/@emnapi/core": {+ "version": "1.11.3",+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz","integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",+ "dev": true,"license": "MIT","optional": true,"peer": true,- "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",- "version": "1.11.3"+ "dependencies": {+ "@emnapi/wasi-threads": "1.2.3",+ "tslib": "^2.4.0"+ }},"node_modules/@emnapi/core/node_modules/@emnapi/wasi-threads": {"version": "1.2.3",@@ -1064,6 +1271,24 @@"node": "^20.19.0 || ^22.13.0 || >=24"}},+ "node_modules/@exodus/bytes": {+ "version": "1.16.0",+ "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.16.0.tgz",+ "integrity": "sha512-IcpW84uEn3N7ETtNZMlxKhfl6Pec8rUNGOTBtWbK1FKhJxIFAptZyVrvVRVBimAJxJCgc3PxepxkdWWG4DVzfA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": "^20.19.0 || ^22.12.0 || >=24.0.0"+ },+ "peerDependencies": {+ "@noble/hashes": "^1.8.0 || ^2.0.0"+ },+ "peerDependenciesMeta": {+ "@noble/hashes": {+ "optional": true+ }+ }+ },"node_modules/@ffmpeg/ffmpeg": {"version": "0.12.15","resolved": "https://registry.npmjs.org/@ffmpeg/ffmpeg/-/ffmpeg-0.12.15.tgz",@@ -3522,9 +3747,8 @@"version": "1.11.1","resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz","integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==",- "dev": true,+ "extraneous": true,"license": "MIT",- "optional": true,"dependencies": {"@emnapi/wasi-threads": "1.2.2","tslib": "^2.4.0"@@ -4558,6 +4782,16 @@"node": ">=6.0.0"}},+ "node_modules/bidi-js": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.1.0.tgz",+ "integrity": "sha512-fX1Onk0tdVPC7obPWB5EbJ1z7NVhLq4m2xZLq2YXBkxzMXIGRpNMU88n0EPgWseKl12J7zXs7qrDxPK4sRs2fg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "require-from-string": "^2.0.2"+ }+ },"node_modules/brace-expansion": {"version": "1.1.21","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",@@ -4949,6 +5183,20 @@"node": ">= 8"}},+ "node_modules/css-tree": {+ "version": "3.2.1",+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",+ "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "mdn-data": "2.27.1",+ "source-map-js": "^1.2.1"+ },+ "engines": {+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"+ }+ },"node_modules/csstype": {"version": "3.2.3","resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",@@ -4961,6 +5209,20 @@"integrity": "sha512-/HRYqJOa1ob5ik4q7FIJVYxTJCFs/FL3+cQPAJjUf2uiqrDEzbTgB315gQ2rG8oK3w094W9m5tcB8S5Qah+caA==","license": "MIT"},+ "node_modules/data-urls": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-8.0.0.tgz",+ "integrity": "sha512-JQUCCK+/CAGbGGx618PlFZMXH81Jtj7t73CHv9dd/zVWvxgGT2zLFRjnKb+Ng46GIwcy+f7f88qd4duqllK+WQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "whatwg-mimetype": "^5.0.0",+ "whatwg-url": "^17.1.2"+ },+ "engines": {+ "node": "^22.14.0 || >=24.0.0"+ }+ },"node_modules/data-view-buffer": {"version": "1.0.2","resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",@@ -5050,6 +5312,13 @@}}},+ "node_modules/decimal.js": {+ "version": "10.6.0",+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",+ "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",+ "dev": true,+ "license": "MIT"+ },"node_modules/decode-named-character-reference": {"version": "1.3.0","resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.3.0.tgz",@@ -6629,6 +6898,19 @@"dev": true,"license": "MIT"},+ "node_modules/html-encoding-sniffer": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-7.0.0.tgz",+ "integrity": "sha512-UikN5yr7xsCDAq87Or5or0PAlD3HJJOKVzM05az588WnpDJ4Ux7a2A53Qi6gofGg2/EtvF/H4hCi/TXfCW4Y6w==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@exodus/bytes": "^1.15.1"+ },+ "engines": {+ "node": "^22.13.0 || >=24.0.0"+ }+ },"node_modules/html-parse-stringify": {"version": "3.0.1","resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",@@ -7078,6 +7360,13 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/is-potential-custom-element-name": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",+ "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",+ "dev": true,+ "license": "MIT"+ },"node_modules/is-regex": {"version": "1.2.1","resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",@@ -7276,6 +7565,82 @@"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==","license": "MIT"},+ "node_modules/jsdom": {+ "version": "30.1.3",+ "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-30.1.3.tgz",+ "integrity": "sha512-hQMUPvRgN7KxsfIytDQji7bimuJeRQa6Qo5+iuiZQk5CafeRxLIA10/cG5YCBFNpD9RO3oqIiN4CO1Y44kxqXg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@asamuzakjp/css-color": "^7.1.3",+ "@asamuzakjp/dom-selector": "^10.0.3",+ "@bramus/specificity": "^2.4.2",+ "@csstools/css-syntax-patches-for-csstree": "^1.1.15",+ "@exodus/bytes": "^1.16.0",+ "css-tree": "^3.2.1",+ "data-urls": "^8.0.0",+ "decimal.js": "^10.6.0",+ "html-encoding-sniffer": "^7.0.0",+ "is-potential-custom-element-name": "^1.0.1",+ "lru-cache": "^11.5.3",+ "parse5": "^8.0.1",+ "saxes": "^6.0.0",+ "tough-cookie": "^6.0.2",+ "undici": "^8.12.1",+ "w3c-xmlserializer": "^6.0.0",+ "webidl-conversions": "^8.0.1",+ "whatwg-mimetype": "^5.0.0",+ "whatwg-url": "^17.2.0",+ "xml-name-validator": "^5.0.0"+ },+ "engines": {+ "node": "^22.22.2 || ^24.15.0 || >=26.0.0"+ },+ "peerDependencies": {+ "canvas": "^3.2.3"+ },+ "peerDependenciesMeta": {+ "canvas": {+ "optional": true+ }+ }+ },+ "node_modules/jsdom/node_modules/entities": {+ "version": "8.1.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-8.1.0.tgz",+ "integrity": "sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==",+ "dev": true,+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=20.19.0"+ },+ "funding": {+ "url": "https://github.com/fb55/entities?sponsor=1"+ }+ },+ "node_modules/jsdom/node_modules/lru-cache": {+ "version": "11.5.3",+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz",+ "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==",+ "dev": true,+ "license": "BlueOak-1.0.0",+ "engines": {+ "node": "20 || >=22"+ }+ },+ "node_modules/jsdom/node_modules/parse5": {+ "version": "8.0.1",+ "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.1.tgz",+ "integrity": "sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "entities": "^8.0.0"+ },+ "funding": {+ "url": "https://github.com/inikulin/parse5?sponsor=1"+ }+ },"node_modules/jsesc": {"version": "3.1.0","resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",@@ -8159,6 +8524,13 @@"url": "https://opencollective.com/unified"}},+ "node_modules/mdn-data": {+ "version": "2.27.1",+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",+ "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",+ "dev": true,+ "license": "CC0-1.0"+ },"node_modules/media-chrome": {"version": "4.19.2","resolved": "https://registry.npmjs.org/media-chrome/-/media-chrome-4.19.2.tgz",@@ -8179,7 +8551,6 @@"resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.61.6.tgz","integrity": "sha512-VHEZ53/7jGl4dQ+uOdndsZufFYwEUFWv9UXgvrGun3OapyzoqI9iaPOD7z3xxY/nAttLZBNwswgJzMtGJAquOQ==","license": "MPL-2.0",- "peer": true,"workspaces": [".","packages/*"@@ -10003,6 +10374,16 @@"url": "https://opencollective.com/unified"}},+ "node_modules/require-from-string": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/reselect": {"version": "5.3.0","resolved": "https://registry.npmjs.org/reselect/-/reselect-5.3.0.tgz",@@ -10184,6 +10565,19 @@"truncate-utf8-bytes": "^1.0.0"}},+ "node_modules/saxes": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",+ "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "xmlchars": "^2.2.0"+ },+ "engines": {+ "node": ">=v12.22.7"+ }+ },"node_modules/scheduler": {"version": "0.28.0","resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz",@@ -10542,6 +10936,15 @@"node": ">= 0.4"}},+ "node_modules/string_decoder": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",+ "license": "MIT",+ "dependencies": {+ "safe-buffer": "~5.1.0"+ }+ },"node_modules/string-width": {"version": "7.2.0","resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",@@ -10658,15 +11061,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/string_decoder": {- "version": "1.1.1",- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",- "license": "MIT",- "dependencies": {- "safe-buffer": "~5.1.0"- }- },"node_modules/stringify-entities": {"version": "4.0.4","resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",@@ -10883,6 +11277,26 @@"url": "https://github.com/sponsors/SuperchupuDev"}},+ "node_modules/tldts": {+ "version": "7.4.19",+ "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.19.tgz",+ "integrity": "sha512-48dH6aSpQnpbzDUc4vIQZ1VjB8tkK+e8c1yx05/SZK+rkssgjEOlxDd/yU8/a4vGYQ9vRgJr9dwMq9TJ0b3X2Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "tldts-core": "^7.4.19"+ },+ "bin": {+ "tldts": "bin/cli.js"+ }+ },+ "node_modules/tldts-core": {+ "version": "7.4.19",+ "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.19.tgz",+ "integrity": "sha512-goNXV6Ho9TIOfpJZanTd6CKG5DyYgYAL+k+22T0SLh8l6+KHIfBUPFuePuSZv05UttIaaLmI9tb7TmGIdK5AkQ==",+ "dev": true,+ "license": "MIT"+ },"node_modules/token-types": {"version": "6.1.2","resolved": "https://registry.npmjs.org/token-types/-/token-types-6.1.2.tgz",@@ -10901,6 +11315,32 @@"url": "https://github.com/sponsors/Borewit"}},+ "node_modules/tough-cookie": {+ "version": "6.0.2",+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.2.tgz",+ "integrity": "sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==",+ "dev": true,+ "license": "BSD-3-Clause",+ "dependencies": {+ "tldts": "^7.0.5"+ },+ "engines": {+ "node": ">=16"+ }+ },+ "node_modules/tr46": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-7.0.0.tgz",+ "integrity": "sha512-BcDSDW+SIGWVOns1Zm6Yg91q9AEj7eaID0QDY9oIqJD1A8dscNwMcl9Sms2DeuWCNov1X0/oXanHGYQBSLwZsg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "punycode": "^2.3.1"+ },+ "engines": {+ "node": "^22.14.0 || >=24.0.0"+ }+ },"node_modules/tree-kill": {"version": "1.2.2","resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",@@ -11133,6 +11573,16 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/undici": {+ "version": "8.12.3",+ "resolved": "https://registry.npmjs.org/undici/-/undici-8.12.3.tgz",+ "integrity": "sha512-+fdndUTwBP86cVjihTp21hZHo7d6oj1c/47XPA3lL8mM0XHs+C4EkcjmgRsFnFk2f/UONGDy9ItBItmXsLOQHw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=22.19.0"+ }+ },"node_modules/undici-types": {"version": "7.24.6","resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",@@ -11614,6 +12064,19 @@"node": ">=0.10.0"}},+ "node_modules/w3c-xmlserializer": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-6.0.0.tgz",+ "integrity": "sha512-4Nsy8K5Tr6SPDH9jhKJOHf7ChDrc1zufZTVSF7x72hwuEXBqxqk9G6cK+K2NRUtB3iELRJqjXb4JPDMBjMTl2Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "xml-name-validator": "^5.0.0"+ },+ "engines": {+ "node": "^22.22.2 || ^24.15.0 || >=26.0.0"+ }+ },"node_modules/walk-up-path": {"version": "4.0.0","resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz",@@ -11651,6 +12114,41 @@"url": "https://github.com/sponsors/wooorm"}},+ "node_modules/webidl-conversions": {+ "version": "8.0.1",+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz",+ "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==",+ "dev": true,+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=20"+ }+ },+ "node_modules/whatwg-mimetype": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",+ "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=20"+ }+ },+ "node_modules/whatwg-url": {+ "version": "17.3.0",+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-17.3.0.tgz",+ "integrity": "sha512-KwOAJrpf+GTgBvcBQJcP38sMF0DsQKdwtG+TxM2pW44P6E5k0hDbWrDmyuJDIF0Uef0aQq0ZoJs+5oI+k8ddhg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@exodus/bytes": "^1.16.0",+ "tr46": "^7.0.0",+ "webidl-conversions": "^8.0.1"+ },+ "engines": {+ "node": "^22.14.0 || >=24.0.0"+ }+ },"node_modules/which": {"version": "2.0.2","resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",@@ -11804,6 +12302,23 @@"url": "https://github.com/chalk/wrap-ansi?sponsor=1"}},+ "node_modules/xml-name-validator": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",+ "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",+ "dev": true,+ "license": "Apache-2.0",+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/xmlchars": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",+ "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",+ "dev": true,+ "license": "MIT"+ },"node_modules/y18n": {"version": "5.0.8","resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",diff --git a/web/packages/base/components/SingleInputDialog.tsx b/web/packages/base/components/SingleInputDialog.tsxindex 2c51f95325..4e0dc053b3 100644--- a/web/packages/base/components/SingleInputDialog.tsx+++ b/web/packages/base/components/SingleInputDialog.tsx@@ -92,6 +92,7 @@ export const SingleInputDialog: React.FC<SingleInputDialogProps> = ({.join(" ") || undefined,}}{...rest}+ disabled={!open || rest.disabled}/></Stack></Dialog>diff --git a/web/packages/base/components/SingleInputForm.tsx b/web/packages/base/components/SingleInputForm.tsxindex 576951fc20..2221f77808 100644--- a/web/packages/base/components/SingleInputForm.tsx+++ b/web/packages/base/components/SingleInputForm.tsx@@ -23,7 +23,7 @@ import { ShowHidePasswordInputAdornment } from "./mui/PasswordInputAdornment";export type SingleInputFormProps = Pick<TextFieldProps,- "label" | "placeholder" | "autoComplete" | "autoFocus"+ "label" | "placeholder" | "autoComplete" | "autoFocus" | "disabled"> & {inputProps?: InputBaseProps["inputProps"];endAdornment?: React.ReactNode;@@ -45,6 +45,7 @@ export const SingleInputForm: React.FC<SingleInputFormProps> = ({inputType,initialValue,autoFocus,+ disabled,endAdornment,selectOnFocus,submitButtonTitle,@@ -125,7 +126,7 @@ export const SingleInputForm: React.FC<SingleInputFormProps> = ({placeholder={rest.placeholder}autoComplete={rest.autoComplete}autoFocus={autoFocus ?? true}- disabled={formik.isSubmitting}+ disabled={disabled || formik.isSubmitting}error={!!error}sx={v2InputSx}endAdornment={@@ -151,7 +152,7 @@ export const SingleInputForm: React.FC<SingleInputFormProps> = ({{onCancel && (<ButtonBaseonClick={onCancel}- disabled={formik.isSubmitting}+ disabled={disabled || formik.isSubmitting}sx={[v2CancelButtonSx, peopleActionFocusSx]}>{t("cancel")}@@ -159,7 +160,7 @@ export const SingleInputForm: React.FC<SingleInputFormProps> = ({)}<ButtonBasetype="submit"- disabled={formik.isSubmitting}+ disabled={disabled || formik.isSubmitting}sx={[v2SubmitButtonSx, peopleActionFocusSx]}>{formik.isSubmitting ? (