From 8d8cc83fd84cb68417e89e54e8617da6ef674be5 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 26 Sep 2025 20:47:54 +0800 Subject: [PATCH 01/26] chore: tweak assets link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25de484b8..00f988054 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Memos -Memos +Memos A modern, open-source, self-hosted knowledge management and note-taking platform designed for privacy-conscious users and organizations. Memos provides a lightweight yet powerful solution for capturing, organizing, and sharing thoughts with comprehensive Markdown support and cross-platform accessibility. @@ -17,7 +17,7 @@ A modern, open-source, self-hosted knowledge management and note-taking platform -![Memos Application Screenshot](https://www.usememos.com/demo.png) +![Memos Application Screenshot](https://raw.githubusercontent.com/usememos/.github/refs/heads/main/assets/demo.png) +

Special thanks to our sponsor:

+
+ + Warp + +

+ Warp is built for coding with multiple AI agents +

+
+ # Memos Memos From e3890ca9be2f64184b1f8e9da0f3c457308ea135 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Oct 2025 00:14:11 +0800 Subject: [PATCH 05/26] chore: bump typescript from 5.9.2 to 5.9.3 in /web (#5146) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package.json | 2 +- web/pnpm-lock.yaml | 96 +++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/web/package.json b/web/package.json index f0803b16c..e2612cdfd 100644 --- a/web/package.json +++ b/web/package.json @@ -83,7 +83,7 @@ "prettier": "^3.6.2", "terser": "^5.44.0", "tw-animate-css": "^1.3.8", - "typescript": "^5.9.2", + "typescript": "^5.9.3", "typescript-eslint": "^8.44.0", "vite": "^7.1.5" }, diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 66fd93471..e5e947706 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -91,7 +91,7 @@ importers: version: 11.11.1 i18next: specifier: ^25.5.2 - version: 25.5.2(typescript@5.9.2) + version: 25.5.2(typescript@5.9.3) katex: specifier: ^0.16.22 version: 0.16.22 @@ -130,7 +130,7 @@ importers: version: 2.6.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-i18next: specifier: ^15.7.3 - version: 15.7.3(i18next@25.5.2(typescript@5.9.2))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.9.2) + version: 15.7.3(i18next@25.5.2(typescript@5.9.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.9.3) react-leaflet: specifier: ^4.2.1 version: 4.2.1(leaflet@1.9.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -229,11 +229,11 @@ importers: specifier: ^1.3.8 version: 1.3.8 typescript: - specifier: ^5.9.2 - version: 5.9.2 + specifier: ^5.9.3 + version: 5.9.3 typescript-eslint: specifier: ^8.44.0 - version: 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) + version: 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) vite: specifier: ^7.1.5 version: 7.1.5(@types/node@24.5.1)(jiti@2.5.1)(lightningcss@1.30.1)(terser@5.44.0) @@ -3369,8 +3369,8 @@ packages: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - typescript@5.9.2: - resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} hasBin: true @@ -4808,41 +4808,41 @@ snapshots: '@types/uuid@10.0.0': {} - '@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)': + '@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) + '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) '@typescript-eslint/scope-manager': 8.44.0 - '@typescript-eslint/type-utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) - '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) + '@typescript-eslint/type-utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.44.0 eslint: 9.35.0(jiti@2.5.1) graphemer: 1.4.0 ignore: 7.0.5 natural-compare: 1.4.0 - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)': + '@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: '@typescript-eslint/scope-manager': 8.44.0 '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) '@typescript-eslint/visitor-keys': 8.44.0 debug: 4.4.3 eslint: 9.35.0(jiti@2.5.1) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.44.0(typescript@5.9.2)': + '@typescript-eslint/project-service@8.44.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.2) + '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.3) '@typescript-eslint/types': 8.44.0 debug: 4.4.3 - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -4851,28 +4851,28 @@ snapshots: '@typescript-eslint/types': 8.44.0 '@typescript-eslint/visitor-keys': 8.44.0 - '@typescript-eslint/tsconfig-utils@8.44.0(typescript@5.9.2)': + '@typescript-eslint/tsconfig-utils@8.44.0(typescript@5.9.3)': dependencies: - typescript: 5.9.2 + typescript: 5.9.3 - '@typescript-eslint/type-utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)': + '@typescript-eslint/type-utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2) - '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) debug: 4.4.3 eslint: 9.35.0(jiti@2.5.1) - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color '@typescript-eslint/types@8.44.0': {} - '@typescript-eslint/typescript-estree@8.44.0(typescript@5.9.2)': + '@typescript-eslint/typescript-estree@8.44.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.44.0(typescript@5.9.2) - '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.2) + '@typescript-eslint/project-service': 8.44.0(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.3) '@typescript-eslint/types': 8.44.0 '@typescript-eslint/visitor-keys': 8.44.0 debug: 4.4.3 @@ -4880,19 +4880,19 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.7.2 - ts-api-utils: 2.1.0(typescript@5.9.2) - typescript: 5.9.2 + ts-api-utils: 2.1.0(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)': + '@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1)) '@typescript-eslint/scope-manager': 8.44.0 '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2) + '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) eslint: 9.35.0(jiti@2.5.1) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -5903,11 +5903,11 @@ snapshots: hyphenate-style-name@1.1.0: {} - i18next@25.5.2(typescript@5.9.2): + i18next@25.5.2(typescript@5.9.3): dependencies: '@babel/runtime': 7.28.4 optionalDependencies: - typescript: 5.9.2 + typescript: 5.9.3 iconv-lite@0.6.3: dependencies: @@ -6495,15 +6495,15 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-i18next@15.7.3(i18next@25.5.2(typescript@5.9.2))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.9.2): + react-i18next@15.7.3(i18next@25.5.2(typescript@5.9.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.9.3): dependencies: '@babel/runtime': 7.28.4 html-parse-stringify: 3.0.1 - i18next: 25.5.2(typescript@5.9.2) + i18next: 25.5.2(typescript@5.9.3) react: 18.3.1 optionalDependencies: react-dom: 18.3.1(react@18.3.1) - typescript: 5.9.2 + typescript: 5.9.3 react-is@16.13.1: {} @@ -6906,9 +6906,9 @@ snapshots: toggle-selection@1.0.6: {} - ts-api-utils@2.1.0(typescript@5.9.2): + ts-api-utils@2.1.0(typescript@5.9.3): dependencies: - typescript: 5.9.2 + typescript: 5.9.3 ts-dedent@2.2.0: {} @@ -6957,18 +6957,18 @@ snapshots: possible-typed-array-names: 1.1.0 reflect.getprototypeof: 1.0.10 - typescript-eslint@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2): + typescript-eslint@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) - '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2) - '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2) + '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) eslint: 9.35.0(jiti@2.5.1) - typescript: 5.9.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - typescript@5.9.2: {} + typescript@5.9.3: {} ufo@1.6.1: {} From 698b08ae8dc87f7c4b3de460ef1a8a8ad52dac5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:27:39 +0800 Subject: [PATCH 06/26] chore: bump tw-animate-css from 1.3.8 to 1.4.0 in /web (#5145) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package.json | 2 +- web/pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/package.json b/web/package.json index e2612cdfd..564e71d0a 100644 --- a/web/package.json +++ b/web/package.json @@ -82,7 +82,7 @@ "nice-grpc-web": "^3.3.8", "prettier": "^3.6.2", "terser": "^5.44.0", - "tw-animate-css": "^1.3.8", + "tw-animate-css": "^1.4.0", "typescript": "^5.9.3", "typescript-eslint": "^8.44.0", "vite": "^7.1.5" diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index e5e947706..d0d15d52e 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -226,8 +226,8 @@ importers: specifier: ^5.44.0 version: 5.44.0 tw-animate-css: - specifier: ^1.3.8 - version: 1.3.8 + specifier: ^1.4.0 + version: 1.4.0 typescript: specifier: ^5.9.3 version: 5.9.3 @@ -3339,8 +3339,8 @@ packages: tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - tw-animate-css@1.3.8: - resolution: {integrity: sha512-Qrk3PZ7l7wUcGYhwZloqfkWCmaXZAoqjkdbIDvzfGshwGtexa/DAs9koXxIkrpEasyevandomzCBAV1Yyop5rw==} + tw-animate-css@1.4.0: + resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==} type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -6918,7 +6918,7 @@ snapshots: tslib@2.8.1: {} - tw-animate-css@1.3.8: {} + tw-animate-css@1.4.0: {} type-check@0.4.0: dependencies: From 498facdfbe8272d48f926bfbb4f5b8c15677882d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:27:48 +0800 Subject: [PATCH 07/26] chore: bump lucide-react from 0.486.0 to 0.544.0 in /web (#5144) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package.json | 2 +- web/pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/package.json b/web/package.json index 564e71d0a..a9522dae0 100644 --- a/web/package.json +++ b/web/package.json @@ -39,7 +39,7 @@ "katex": "^0.16.22", "leaflet": "^1.9.4", "lodash-es": "^4.17.21", - "lucide-react": "^0.486.0", + "lucide-react": "^0.544.0", "mermaid": "^11.11.0", "mime": "^4.1.0", "mobx": "^6.13.7", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index d0d15d52e..dea7cb9c4 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -102,8 +102,8 @@ importers: specifier: ^4.17.21 version: 4.17.21 lucide-react: - specifier: ^0.486.0 - version: 0.486.0(react@18.3.1) + specifier: ^0.544.0 + version: 0.544.0(react@18.3.1) mermaid: specifier: ^11.11.0 version: 11.11.0 @@ -2715,8 +2715,8 @@ packages: lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - lucide-react@0.486.0: - resolution: {integrity: sha512-xWop/wMsC1ikiEVLZrxXjPKw4vU/eAip33G2mZHgbWnr4Nr5Rt4Vx4s/q1D3B/rQVbxjOuqASkEZcUxDEKzecw==} + lucide-react@0.544.0: + resolution: {integrity: sha512-t5tS44bqd825zAW45UQxpG2CvcC4urOwn2TrwSH8u+MjeE+1NnWl6QqeQ/6NdjMqdOygyiT9p3Ev0p1NJykxjw==} peerDependencies: react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -6214,7 +6214,7 @@ snapshots: dependencies: yallist: 3.1.1 - lucide-react@0.486.0(react@18.3.1): + lucide-react@0.544.0(react@18.3.1): dependencies: react: 18.3.1 From 763a0d0dea76a332f0ac22c3c6f46d967de38de3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:27:58 +0800 Subject: [PATCH 08/26] chore: bump golang.org/x/mod from 0.27.0 to 0.28.0 (#5143) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ca6273c55..9e1f7b8a4 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/stretchr/testify v1.10.0 github.com/usememos/gomark v0.0.0-20250925160223-606d7debad77 golang.org/x/crypto v0.41.0 - golang.org/x/mod v0.27.0 + golang.org/x/mod v0.28.0 golang.org/x/net v0.43.0 golang.org/x/oauth2 v0.30.0 google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 diff --git a/go.sum b/go.sum index 2b0059054..3946ef395 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= -golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From cca33af8fd8d96e2b5b7b626f6e5aee83fa7109d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:28:06 +0800 Subject: [PATCH 09/26] chore: bump google.golang.org/grpc from 1.75.0 to 1.75.1 (#5142) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9e1f7b8a4..4e7dc30e0 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( golang.org/x/net v0.43.0 golang.org/x/oauth2 v0.30.0 google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 - google.golang.org/grpc v1.75.0 + google.golang.org/grpc v1.75.1 modernc.org/sqlite v1.38.2 ) diff --git a/go.sum b/go.sum index 3946ef395..99c2079f1 100644 --- a/go.sum +++ b/go.sum @@ -642,8 +642,8 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.75.0 h1:+TW+dqTd2Biwe6KKfhE5JpiYIBWq865PhKGSXiivqt4= -google.golang.org/grpc v1.75.0/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= +google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= +google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From ca62b8cd0c1b17bfe3529e1cb312ba02eb26e0e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:28:17 +0800 Subject: [PATCH 10/26] chore: bump google.golang.org/protobuf from 1.36.8 to 1.36.9 (#5140) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4e7dc30e0..6e877fd43 100644 --- a/go.mod +++ b/go.mod @@ -94,6 +94,6 @@ require ( golang.org/x/sys v0.35.0 // indirect golang.org/x/text v0.28.0 // indirect golang.org/x/time v0.12.0 // indirect - google.golang.org/protobuf v1.36.8 + google.golang.org/protobuf v1.36.9 gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 99c2079f1..4e2918112 100644 --- a/go.sum +++ b/go.sum @@ -654,8 +654,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc= -google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= +google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw= +google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 0f19713fce4aade14a0e10c0c7dcc6e10742c53a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:28:25 +0800 Subject: [PATCH 11/26] chore: bump github.com/aws/aws-sdk-go-v2/config from 1.31.6 to 1.31.12 (#5139) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 20 ++++++++++---------- go.sum | 40 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 6e877fd43..d568aec41 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/usememos/memos go 1.25 require ( - github.com/aws/aws-sdk-go-v2 v1.38.3 - github.com/aws/aws-sdk-go-v2/config v1.31.6 - github.com/aws/aws-sdk-go-v2/credentials v1.18.10 + github.com/aws/aws-sdk-go-v2 v1.39.2 + github.com/aws/aws-sdk-go-v2/config v1.31.12 + github.com/aws/aws-sdk-go-v2/credentials v1.18.16 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 github.com/go-sql-driver/mysql v1.9.3 @@ -68,18 +68,18 @@ require ( require ( github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 // indirect github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 // indirect github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 // indirect github.com/aws/smithy-go v1.23.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/disintegration/imaging v1.6.2 diff --git a/go.sum b/go.sum index 4e2918112..26ed9d003 100644 --- a/go.sum +++ b/go.sum @@ -28,22 +28,22 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/aws/aws-sdk-go-v2 v1.38.3 h1:B6cV4oxnMs45fql4yRH+/Po/YU+597zgWqvDpYMturk= -github.com/aws/aws-sdk-go-v2 v1.38.3/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= +github.com/aws/aws-sdk-go-v2 v1.39.2 h1:EJLg8IdbzgeD7xgvZ+I8M1e0fL0ptn/M47lianzth0I= +github.com/aws/aws-sdk-go-v2 v1.39.2/go.mod h1:sDioUELIUO9Znk23YVmIk86/9DOpkbyyVb1i/gUNFXY= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 h1:i8p8P4diljCr60PpJp6qZXNlgX4m2yQFpYk+9ZT+J4E= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1/go.mod h1:ddqbooRZYNoJ2dsTwOty16rM+/Aqmk/GOXrK8cg7V00= -github.com/aws/aws-sdk-go-v2/config v1.31.6 h1:a1t8fXY4GT4xjyJExz4knbuoxSCacB5hT/WgtfPyLjo= -github.com/aws/aws-sdk-go-v2/config v1.31.6/go.mod h1:5ByscNi7R+ztvOGzeUaIu49vkMk2soq5NaH5PYe33MQ= -github.com/aws/aws-sdk-go-v2/credentials v1.18.10 h1:xdJnXCouCx8Y0NncgoptztUocIYLKeQxrCgN6x9sdhg= -github.com/aws/aws-sdk-go-v2/credentials v1.18.10/go.mod h1:7tQk08ntj914F/5i9jC4+2HQTAuJirq7m1vZVIhEkWs= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6 h1:wbjnrrMnKew78/juW7I2BtKQwa1qlf6EjQgS69uYY14= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.6/go.mod h1:AtiqqNrDioJXuUgz3+3T0mBWN7Hro2n9wll2zRUc0ww= +github.com/aws/aws-sdk-go-v2/config v1.31.12 h1:pYM1Qgy0dKZLHX2cXslNacbcEFMkDMl+Bcj5ROuS6p8= +github.com/aws/aws-sdk-go-v2/config v1.31.12/go.mod h1:/MM0dyD7KSDPR+39p9ZNVKaHDLb9qnfDurvVS2KAhN8= +github.com/aws/aws-sdk-go-v2/credentials v1.18.16 h1:4JHirI4zp958zC026Sm+V4pSDwW4pwLefKrc0bF2lwI= +github.com/aws/aws-sdk-go-v2/credentials v1.18.16/go.mod h1:qQMtGx9OSw7ty1yLclzLxXCRbrkjWAM7JnObZjmCB7I= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9 h1:Mv4Bc0mWmv6oDuSWTKnk+wgeqPL5DRFu5bQL9BGPQ8Y= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.9/go.mod h1:IKlKfRppK2a1y0gy1yH6zD+yX5uplJ6UuPlgd48dJiQ= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4 h1:BTl+TXrpnrpPWb/J3527GsJ/lMkn7z3GO12j6OlsbRg= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.19.4/go.mod h1:cG2tenc/fscpChiZE29a2crG9uo2t6nQGflFllFL8M8= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6 h1:uF68eJA6+S9iVr9WgX1NaRGyQ/6MdIyc4JNUo6TN1FA= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.6/go.mod h1:qlPeVZCGPiobx8wb1ft0GHT5l+dc6ldnwInDFaMvC7Y= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6 h1:pa1DEC6JoI0zduhZePp3zmhWvk/xxm4NB8Hy/Tlsgos= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.6/go.mod h1:gxEjPebnhWGJoaDdtDkA0JX46VRg1wcTHYe63OfX5pE= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9 h1:se2vOWGD3dWQUtfn4wEjRQJb1HK1XsNIt825gskZ970= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.9/go.mod h1:hijCGH2VfbZQxqCDN7bwz/4dzxV+hkyhjawAtdPWKZA= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9 h1:6RBnKZLkJM4hQ+kN6E7yWFveOTg8NLPHAkqrs4ZPlTU= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.9/go.mod h1:V9rQKRmK7AWuEsOMnHzKj8WyrIir1yUJbZxDuZLFvXI= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo= github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo= github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.6 h1:R0tNFJqfjHL3900cqhXuwQ+1K4G0xc9Yf8EDbFXCKEw= @@ -52,18 +52,18 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 h1:oegbebP github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1/go.mod h1:kemo5Myr9ac0U9JfSjMo9yHLtw+pECEHsFtJ9tqCEI8= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6 h1:hncKj/4gR+TPauZgTAsxOxNcvBayhUlYZ6LO/BYiQ30= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.6/go.mod h1:OiIh45tp6HdJDDJGnja0mw8ihQGz3VGrUflLqSL0SmM= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6 h1:LHS1YAIJXJ4K9zS+1d/xa9JAA9sL2QyXIQCQFQW/X08= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.6/go.mod h1:c9PCiTEuh0wQID5/KqA32J+HAgZxN9tOGXKCiYJjTZI= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9 h1:5r34CgVOD4WZudeEKZ9/iKpiT6cM1JyEROpXjOcdWv8= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.9/go.mod h1:dB12CEbNWPbzO2uC6QSWHteqOg4JfBVJOojbAoAUb5I= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6 h1:nEXUSAwyUfLTgnc9cxlDWy637qsq4UWwp3sNAfl0Z3Y= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.6/go.mod h1:HGzIULx4Ge3Do2V0FaiYKcyKzOqwrhUZgCI77NisswQ= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3 h1:ETkfWcXP2KNPLecaDa++5bsQhCRa5M5sLUJa5DWYIIg= github.com/aws/aws-sdk-go-v2/service/s3 v1.87.3/go.mod h1:+/3ZTqoYb3Ur7DObD00tarKMLMuKg8iqz5CHEanqTnw= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg= -github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2/go.mod h1:x7+rkNmRoEN1U13A6JE2fXne9EWyJy54o3n6d4mGaXQ= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.2 h1:YZPjhyaGzhDQEvsffDEcpycq49nl7fiGcfJTIo8BszI= -github.com/aws/aws-sdk-go-v2/service/sts v1.38.2/go.mod h1:2dIN8qhQfv37BdUYGgEC8Q3tteM3zFxTI1MLO2O3J3c= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.6 h1:A1oRkiSQOWstGh61y4Wc/yQ04sqrQZr1Si/oAXj20/s= +github.com/aws/aws-sdk-go-v2/service/sso v1.29.6/go.mod h1:5PfYspyCU5Vw1wNPsxi15LZovOnULudOQuVxphSflQA= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1 h1:5fm5RTONng73/QA73LhCNR7UT9RpFH3hR6HWL6bIgVY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.1/go.mod h1:xBEjWD13h+6nq+z4AkqSfSvqRKFgDIQeaMguAJndOWo= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.6 h1:p3jIvqYwUZgu/XYeI48bJxOhvm47hZb5HUQ0tn6Q9kA= +github.com/aws/aws-sdk-go-v2/service/sts v1.38.6/go.mod h1:WtKK+ppze5yKPkZ0XwqIVWD4beCwv056ZbPQNoeHqM8= github.com/aws/smithy-go v1.23.0 h1:8n6I3gXzWJB2DxBDnfxgBaSX6oe0d/t10qGz7OKqMCE= github.com/aws/smithy-go v1.23.0/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= From 1db86bcd3016d576b71d3cbbe7fc352b870d4233 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:28:31 +0800 Subject: [PATCH 12/26] chore: bump typescript-eslint from 8.44.0 to 8.45.0 in /web (#5138) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package.json | 2 +- web/pnpm-lock.yaml | 128 ++++++++++++++++++++++----------------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/web/package.json b/web/package.json index a9522dae0..e6b5fe4f4 100644 --- a/web/package.json +++ b/web/package.json @@ -84,7 +84,7 @@ "terser": "^5.44.0", "tw-animate-css": "^1.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.44.0", + "typescript-eslint": "^8.45.0", "vite": "^7.1.5" }, "pnpm": { diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index dea7cb9c4..fc0b20456 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -232,8 +232,8 @@ importers: specifier: ^5.9.3 version: 5.9.3 typescript-eslint: - specifier: ^8.44.0 - version: 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + specifier: ^8.45.0 + version: 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) vite: specifier: ^7.1.5 version: 7.1.5(@types/node@24.5.1)(jiti@2.5.1)(lightningcss@1.30.1)(terser@5.44.0) @@ -1521,63 +1521,63 @@ packages: '@types/uuid@10.0.0': resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==} - '@typescript-eslint/eslint-plugin@8.44.0': - resolution: {integrity: sha512-EGDAOGX+uwwekcS0iyxVDmRV9HX6FLSM5kzrAToLTsr9OWCIKG/y3lQheCq18yZ5Xh78rRKJiEpP0ZaCs4ryOQ==} + '@typescript-eslint/eslint-plugin@8.45.0': + resolution: {integrity: sha512-HC3y9CVuevvWCl/oyZuI47dOeDF9ztdMEfMH8/DW/Mhwa9cCLnK1oD7JoTVGW/u7kFzNZUKUoyJEqkaJh5y3Wg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^8.44.0 + '@typescript-eslint/parser': ^8.45.0 eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/parser@8.44.0': - resolution: {integrity: sha512-VGMpFQGUQWYT9LfnPcX8ouFojyrZ/2w3K5BucvxL/spdNehccKhB4jUyB1yBCXpr2XFm0jkECxgrpXBW2ipoAw==} + '@typescript-eslint/parser@8.45.0': + resolution: {integrity: sha512-TGf22kon8KW+DeKaUmOibKWktRY8b2NSAZNdtWh798COm1NWx8+xJ6iFBtk3IvLdv6+LGLJLRlyhrhEDZWargQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/project-service@8.44.0': - resolution: {integrity: sha512-ZeaGNraRsq10GuEohKTo4295Z/SuGcSq2LzfGlqiuEvfArzo/VRrT0ZaJsVPuKZ55lVbNk8U6FcL+ZMH8CoyVA==} + '@typescript-eslint/project-service@8.45.0': + resolution: {integrity: sha512-3pcVHwMG/iA8afdGLMuTibGR7pDsn9RjDev6CCB+naRsSYs2pns5QbinF4Xqw6YC/Sj3lMrm/Im0eMfaa61WUg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/scope-manager@8.44.0': - resolution: {integrity: sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==} + '@typescript-eslint/scope-manager@8.45.0': + resolution: {integrity: sha512-clmm8XSNj/1dGvJeO6VGH7EUSeA0FMs+5au/u3lrA3KfG8iJ4u8ym9/j2tTEoacAffdW1TVUzXO30W1JTJS7dA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/tsconfig-utils@8.44.0': - resolution: {integrity: sha512-x5Y0+AuEPqAInc6yd0n5DAcvtoQ/vyaGwuX5HE9n6qAefk1GaedqrLQF8kQGylLUb9pnZyLf+iEiL9fr8APDtQ==} + '@typescript-eslint/tsconfig-utils@8.45.0': + resolution: {integrity: sha512-aFdr+c37sc+jqNMGhH+ajxPXwjv9UtFZk79k8pLoJ6p4y0snmYpPA52GuWHgt2ZF4gRRW6odsEj41uZLojDt5w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/type-utils@8.44.0': - resolution: {integrity: sha512-9cwsoSxJ8Sak67Be/hD2RNt/fsqmWnNE1iHohG8lxqLSNY8xNfyY7wloo5zpW3Nu9hxVgURevqfcH6vvKCt6yg==} + '@typescript-eslint/type-utils@8.45.0': + resolution: {integrity: sha512-bpjepLlHceKgyMEPglAeULX1vixJDgaKocp0RVJ5u4wLJIMNuKtUXIczpJCPcn2waII0yuvks/5m5/h3ZQKs0A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/types@8.44.0': - resolution: {integrity: sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==} + '@typescript-eslint/types@8.45.0': + resolution: {integrity: sha512-WugXLuOIq67BMgQInIxxnsSyRLFxdkJEJu8r4ngLR56q/4Q5LrbfkFRH27vMTjxEK8Pyz7QfzuZe/G15qQnVRA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.44.0': - resolution: {integrity: sha512-lqNj6SgnGcQZwL4/SBJ3xdPEfcBuhCG8zdcwCPgYcmiPLgokiNDKlbPzCwEwu7m279J/lBYWtDYL+87OEfn8Jw==} + '@typescript-eslint/typescript-estree@8.45.0': + resolution: {integrity: sha512-GfE1NfVbLam6XQ0LcERKwdTTPlLvHvXXhOeUGC1OXi4eQBoyy1iVsW+uzJ/J9jtCz6/7GCQ9MtrQ0fml/jWCnA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/utils@8.44.0': - resolution: {integrity: sha512-nktOlVcg3ALo0mYlV+L7sWUD58KG4CMj1rb2HUVOO4aL3K/6wcD+NERqd0rrA5Vg06b42YhF6cFxeixsp9Riqg==} + '@typescript-eslint/utils@8.45.0': + resolution: {integrity: sha512-bxi1ht+tLYg4+XV2knz/F7RVhU0k6VrSMc9sb8DQ6fyCTrGQLHfo7lDtN0QJjZjKkLA2ThrKuCdHEvLReqtIGg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 typescript: '>=4.8.4 <6.0.0' - '@typescript-eslint/visitor-keys@8.44.0': - resolution: {integrity: sha512-zaz9u8EJ4GBmnehlrpoKvj/E3dNbuQ7q0ucyZImm3cLqJ8INTc970B1qEqDX/Rzq65r3TvVTN7kHWPBoyW7DWw==} + '@typescript-eslint/visitor-keys@8.45.0': + resolution: {integrity: sha512-qsaFBA3e09MIDAGFUrTk+dzqtfv1XPVz8t8d1f0ybTzrCY7BKiMC5cjrl1O/P7UmHsNyW90EYSkU/ZWpmXelag==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@vitejs/plugin-react@4.7.0': @@ -3362,8 +3362,8 @@ packages: resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==} engines: {node: '>= 0.4'} - typescript-eslint@8.44.0: - resolution: {integrity: sha512-ib7mCkYuIzYonCq9XWF5XNw+fkj2zg629PSa9KNIQ47RXFF763S5BIX4wqz1+FLPogTZoiw8KmCiRPRa8bL3qw==} + typescript-eslint@8.45.0: + resolution: {integrity: sha512-qzDmZw/Z5beNLUrXfd0HIW6MzIaAV5WNDxmMs9/3ojGOpYavofgNAAD/nC6tGV2PczIi0iw8vot2eAe/sBn7zg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -4808,14 +4808,14 @@ snapshots: '@types/uuid@10.0.0': {} - '@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': + '@typescript-eslint/eslint-plugin@8.45.0(@typescript-eslint/parser@8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) - '@typescript-eslint/scope-manager': 8.44.0 - '@typescript-eslint/type-utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) - '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.44.0 + '@typescript-eslint/parser': 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.45.0 + '@typescript-eslint/type-utils': 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/utils': 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.45.0 eslint: 9.35.0(jiti@2.5.1) graphemer: 1.4.0 ignore: 7.0.5 @@ -4825,41 +4825,41 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': + '@typescript-eslint/parser@8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: - '@typescript-eslint/scope-manager': 8.44.0 - '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) - '@typescript-eslint/visitor-keys': 8.44.0 + '@typescript-eslint/scope-manager': 8.45.0 + '@typescript-eslint/types': 8.45.0 + '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3) + '@typescript-eslint/visitor-keys': 8.45.0 debug: 4.4.3 eslint: 9.35.0(jiti@2.5.1) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/project-service@8.44.0(typescript@5.9.3)': + '@typescript-eslint/project-service@8.45.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.3) - '@typescript-eslint/types': 8.44.0 + '@typescript-eslint/tsconfig-utils': 8.45.0(typescript@5.9.3) + '@typescript-eslint/types': 8.45.0 debug: 4.4.3 typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.44.0': + '@typescript-eslint/scope-manager@8.45.0': dependencies: - '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/visitor-keys': 8.44.0 + '@typescript-eslint/types': 8.45.0 + '@typescript-eslint/visitor-keys': 8.45.0 - '@typescript-eslint/tsconfig-utils@8.44.0(typescript@5.9.3)': + '@typescript-eslint/tsconfig-utils@8.45.0(typescript@5.9.3)': dependencies: typescript: 5.9.3 - '@typescript-eslint/type-utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': + '@typescript-eslint/type-utils@8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: - '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/types': 8.45.0 + '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) debug: 4.4.3 eslint: 9.35.0(jiti@2.5.1) ts-api-utils: 2.1.0(typescript@5.9.3) @@ -4867,14 +4867,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.44.0': {} + '@typescript-eslint/types@8.45.0': {} - '@typescript-eslint/typescript-estree@8.44.0(typescript@5.9.3)': + '@typescript-eslint/typescript-estree@8.45.0(typescript@5.9.3)': dependencies: - '@typescript-eslint/project-service': 8.44.0(typescript@5.9.3) - '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.3) - '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/visitor-keys': 8.44.0 + '@typescript-eslint/project-service': 8.45.0(typescript@5.9.3) + '@typescript-eslint/tsconfig-utils': 8.45.0(typescript@5.9.3) + '@typescript-eslint/types': 8.45.0 + '@typescript-eslint/visitor-keys': 8.45.0 debug: 4.4.3 fast-glob: 3.3.3 is-glob: 4.0.3 @@ -4885,20 +4885,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': + '@typescript-eslint/utils@8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1)) - '@typescript-eslint/scope-manager': 8.44.0 - '@typescript-eslint/types': 8.44.0 - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) + '@typescript-eslint/scope-manager': 8.45.0 + '@typescript-eslint/types': 8.45.0 + '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3) eslint: 9.35.0(jiti@2.5.1) typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.44.0': + '@typescript-eslint/visitor-keys@8.45.0': dependencies: - '@typescript-eslint/types': 8.44.0 + '@typescript-eslint/types': 8.45.0 eslint-visitor-keys: 4.2.1 '@vitejs/plugin-react@4.7.0(vite@7.1.5(@types/node@24.5.1)(jiti@2.5.1)(lightningcss@1.30.1)(terser@5.44.0))': @@ -6957,12 +6957,12 @@ snapshots: possible-typed-array-names: 1.1.0 reflect.getprototypeof: 1.0.10 - typescript-eslint@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3): + typescript-eslint@8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) - '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) - '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.3) - '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/eslint-plugin': 8.45.0(@typescript-eslint/parser@8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/parser': 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) + '@typescript-eslint/typescript-estree': 8.45.0(typescript@5.9.3) + '@typescript-eslint/utils': 8.45.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.3) eslint: 9.35.0(jiti@2.5.1) typescript: 5.9.3 transitivePeerDependencies: From 184e975664a1221863fb98e3012e70ee48667df5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:28:40 +0800 Subject: [PATCH 13/26] chore: bump mobx-react-lite from 4.1.0 to 4.1.1 in /web (#5137) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/package.json | 2 +- web/pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/package.json b/web/package.json index e6b5fe4f4..b790485e5 100644 --- a/web/package.json +++ b/web/package.json @@ -43,7 +43,7 @@ "mermaid": "^11.11.0", "mime": "^4.1.0", "mobx": "^6.13.7", - "mobx-react-lite": "^4.1.0", + "mobx-react-lite": "^4.1.1", "react": "^18.3.1", "react-dom": "^18.3.1", "react-force-graph-2d": "^1.29.0", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index fc0b20456..714119a0d 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -114,8 +114,8 @@ importers: specifier: ^6.13.7 version: 6.13.7 mobx-react-lite: - specifier: ^4.1.0 - version: 4.1.0(mobx@6.13.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^4.1.1 + version: 4.1.1(mobx@6.13.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -2774,8 +2774,8 @@ packages: mlly@1.8.0: resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==} - mobx-react-lite@4.1.0: - resolution: {integrity: sha512-QEP10dpHHBeQNv1pks3WnHRCem2Zp636lq54M2nKO2Sarr13pL4u6diQXf65yzXUn0mkk18SyIDCm9UOJYTi1w==} + mobx-react-lite@4.1.1: + resolution: {integrity: sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==} peerDependencies: mobx: ^6.9.0 react: ^16.8.0 || ^17 || ^18 || ^19 @@ -6285,7 +6285,7 @@ snapshots: pkg-types: 1.3.1 ufo: 1.6.1 - mobx-react-lite@4.1.0(mobx@6.13.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + mobx-react-lite@4.1.1(mobx@6.13.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: mobx: 6.13.7 react: 18.3.1 From 35141807213bf23e5cfba05274fb7e9f3adbc3ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:30:37 +0800 Subject: [PATCH 14/26] chore: bump golang.org/x/crypto from 0.41.0 to 0.42.0 (#5141) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index d568aec41..d0d058c9a 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 github.com/usememos/gomark v0.0.0-20250925160223-606d7debad77 - golang.org/x/crypto v0.41.0 + golang.org/x/crypto v0.42.0 golang.org/x/mod v0.28.0 golang.org/x/net v0.43.0 golang.org/x/oauth2 v0.30.0 @@ -91,8 +91,8 @@ require ( github.com/soheilhy/cmux v0.1.5 github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/sys v0.35.0 // indirect - golang.org/x/text v0.28.0 // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/text v0.29.0 // indirect golang.org/x/time v0.12.0 // indirect google.golang.org/protobuf v1.36.9 gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 26ed9d003..ccd23bb15 100644 --- a/go.sum +++ b/go.sum @@ -482,8 +482,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4= -golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= @@ -542,8 +542,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -574,15 +574,15 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= -golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= From f6e025d5833eb1f68761f34910ca2172d6cfe469 Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 8 Oct 2025 09:51:49 +0800 Subject: [PATCH 15/26] feat: implement theme management with system preference detection and early application --- web/src/main.tsx | 4 ++++ web/src/utils/theme.ts | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/web/src/main.tsx b/web/src/main.tsx index 8884e8495..038d4ee6c 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -8,8 +8,12 @@ import "./index.css"; import router from "./router"; import { initialUserStore } from "./store/user"; import { initialWorkspaceStore } from "./store/workspace"; +import { applyThemeEarly } from "./utils/theme"; import "leaflet/dist/leaflet.css"; +// Apply theme early to prevent flash of wrong theme +applyThemeEarly(); + const Main = observer(() => ( <> diff --git a/web/src/utils/theme.ts b/web/src/utils/theme.ts index 75570b0a6..83a8ffac7 100644 --- a/web/src/utils/theme.ts +++ b/web/src/utils/theme.ts @@ -16,6 +16,43 @@ const validateTheme = (theme: string): ValidTheme => { return VALID_THEMES.includes(theme as ValidTheme) ? (theme as ValidTheme) : "default"; }; +/** + * Detects system theme preference + */ +export const getSystemTheme = (): "default" | "default-dark" => { + if (typeof window !== "undefined" && window.matchMedia) { + return window.matchMedia("(prefers-color-scheme: dark)").matches ? "default-dark" : "default"; + } + return "default"; +}; + +/** + * Gets the theme that should be applied on initial load + * Priority: stored user preference -> system preference -> default + */ +export const getInitialTheme = (): ValidTheme => { + // Try to get stored theme from localStorage (where user settings might be cached) + try { + const storedTheme = localStorage.getItem("memos-theme"); + if (storedTheme && VALID_THEMES.includes(storedTheme as ValidTheme)) { + return storedTheme as ValidTheme; + } + } catch { + // localStorage might not be available + } + + // Fall back to system preference + return getSystemTheme(); +}; + +/** + * Applies the theme early to prevent flash of wrong theme + */ +export const applyThemeEarly = (): void => { + const theme = getInitialTheme(); + loadTheme(theme); +}; + export const loadTheme = (themeName: string): void => { const validTheme = validateTheme(themeName); @@ -35,4 +72,11 @@ export const loadTheme = (themeName: string): void => { // Set data attribute document.documentElement.setAttribute("data-theme", validTheme); + + // Store theme preference for future loads + try { + localStorage.setItem("memos-theme", validTheme); + } catch { + // localStorage might not be available + } }; From efe6013c36607f420fd16f59268739d6bb2e6e27 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 8 Oct 2025 20:30:05 +0800 Subject: [PATCH 16/26] fix: add user authentication checks --- server/router/api/v1/attachment_service.go | 9 ++++++ server/router/api/v1/memo_service.go | 15 ++++++++++ server/router/api/v1/reaction_service.go | 3 ++ server/router/api/v1/user_service.go | 34 ++++++++++++++++++---- server/router/api/v1/workspace_service.go | 3 ++ 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/server/router/api/v1/attachment_service.go b/server/router/api/v1/attachment_service.go index b774680c8..2a99b8351 100644 --- a/server/router/api/v1/attachment_service.go +++ b/server/router/api/v1/attachment_service.go @@ -53,6 +53,9 @@ func (s *APIV1Service) CreateAttachment(ctx context.Context, request *v1pb.Creat if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Validate required fields if request.Attachment == nil { @@ -124,6 +127,9 @@ func (s *APIV1Service) ListAttachments(ctx context.Context, request *v1pb.ListAt if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Set default page size pageSize := int(request.PageSize) @@ -364,6 +370,9 @@ func (s *APIV1Service) DeleteAttachment(ctx context.Context, request *v1pb.Delet if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } attachment, err := s.Store.GetAttachment(ctx, &store.FindAttachment{ UID: &attachmentUID, CreatorID: &user.ID, diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.go index 244059e60..aa111338f 100644 --- a/server/router/api/v1/memo_service.go +++ b/server/router/api/v1/memo_service.go @@ -29,6 +29,9 @@ func (s *APIV1Service) CreateMemo(ctx context.Context, request *v1pb.CreateMemoR if err != nil { return nil, status.Errorf(codes.Internal, "failed to get user") } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } create := &store.Memo{ UID: shortuuid.New(), @@ -318,6 +321,9 @@ func (s *APIV1Service) UpdateMemo(ctx context.Context, request *v1pb.UpdateMemoR if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user") } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Only the creator or admin can update the memo. if memo.CreatorID != user.ID && !isSuperUser(user) { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -453,6 +459,9 @@ func (s *APIV1Service) DeleteMemo(ctx context.Context, request *v1pb.DeleteMemoR if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user") } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Only the creator or admin can update the memo. if memo.CreatorID != user.ID && !isSuperUser(user) { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -689,6 +698,9 @@ func (s *APIV1Service) RenameMemoTag(ctx context.Context, request *v1pb.RenameMe if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user") } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } memoFind := &store.FindMemo{ CreatorID: &user.ID, @@ -739,6 +751,9 @@ func (s *APIV1Service) DeleteMemoTag(ctx context.Context, request *v1pb.DeleteMe if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user") } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } memoFind := &store.FindMemo{ CreatorID: &user.ID, diff --git a/server/router/api/v1/reaction_service.go b/server/router/api/v1/reaction_service.go index 561d776ad..7dd007d8f 100644 --- a/server/router/api/v1/reaction_service.go +++ b/server/router/api/v1/reaction_service.go @@ -37,6 +37,9 @@ func (s *APIV1Service) UpsertMemoReaction(ctx context.Context, request *v1pb.Ups if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user") } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } reaction, err := s.Store.UpsertReaction(ctx, &store.Reaction{ CreatorID: user.ID, ContentID: request.Reaction.ContentId, diff --git a/server/router/api/v1/user_service.go b/server/router/api/v1/user_service.go index 207427611..b1f0a96ec 100644 --- a/server/router/api/v1/user_service.go +++ b/server/router/api/v1/user_service.go @@ -36,6 +36,9 @@ func (s *APIV1Service) ListUsers(ctx context.Context, request *v1pb.ListUsersReq if err != nil { return nil, status.Errorf(codes.Internal, "failed to get user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } if currentUser.Role != store.RoleHost && currentUser.Role != store.RoleAdmin { return nil, status.Errorf(codes.PermissionDenied, "permission denied") } @@ -322,6 +325,9 @@ func (s *APIV1Service) GetUserSetting(ctx context.Context, request *v1pb.GetUser if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Only allow user to get their own settings if currentUser.ID != userID { @@ -356,6 +362,9 @@ func (s *APIV1Service) UpdateUserSetting(ctx context.Context, request *v1pb.Upda if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Only allow user to update their own settings if currentUser.ID != userID { @@ -442,6 +451,9 @@ func (s *APIV1Service) ListUserSettings(ctx context.Context, request *v1pb.ListU if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } // Only allow user to list their own settings if currentUser.ID != userID { @@ -500,7 +512,7 @@ func (s *APIV1Service) ListUserAccessTokens(ctx context.Context, request *v1pb.L return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } if currentUser == nil { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") } if currentUser.ID != userID { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -562,7 +574,7 @@ func (s *APIV1Service) CreateUserAccessToken(ctx context.Context, request *v1pb. return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } if currentUser == nil { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") } if currentUser.ID != userID { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -630,7 +642,7 @@ func (s *APIV1Service) DeleteUserAccessToken(ctx context.Context, request *v1pb. return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } if currentUser == nil { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") } if currentUser.ID != userID { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -673,7 +685,7 @@ func (s *APIV1Service) ListUserSessions(ctx context.Context, request *v1pb.ListU return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } if currentUser == nil { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") } if currentUser.ID != userID { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -736,7 +748,7 @@ func (s *APIV1Service) RevokeUserSession(ctx context.Context, request *v1pb.Revo return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } if currentUser == nil { - return nil, status.Errorf(codes.PermissionDenied, "permission denied") + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") } if currentUser.ID != userID { return nil, status.Errorf(codes.PermissionDenied, "permission denied") @@ -796,6 +808,9 @@ func (s *APIV1Service) ListUserWebhooks(ctx context.Context, request *v1pb.ListU if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } if currentUser.ID != userID && currentUser.Role != store.RoleHost && currentUser.Role != store.RoleAdmin { return nil, status.Errorf(codes.PermissionDenied, "permission denied") } @@ -825,6 +840,9 @@ func (s *APIV1Service) CreateUserWebhook(ctx context.Context, request *v1pb.Crea if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } if currentUser.ID != userID && currentUser.Role != store.RoleHost && currentUser.Role != store.RoleAdmin { return nil, status.Errorf(codes.PermissionDenied, "permission denied") } @@ -862,6 +880,9 @@ func (s *APIV1Service) UpdateUserWebhook(ctx context.Context, request *v1pb.Upda if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } if currentUser.ID != userID && currentUser.Role != store.RoleHost && currentUser.Role != store.RoleAdmin { return nil, status.Errorf(codes.PermissionDenied, "permission denied") } @@ -931,6 +952,9 @@ func (s *APIV1Service) DeleteUserWebhook(ctx context.Context, request *v1pb.Dele if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if currentUser == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } if currentUser.ID != userID && currentUser.Role != store.RoleHost && currentUser.Role != store.RoleAdmin { return nil, status.Errorf(codes.PermissionDenied, "permission denied") } diff --git a/server/router/api/v1/workspace_service.go b/server/router/api/v1/workspace_service.go index 2279245ca..0af794c62 100644 --- a/server/router/api/v1/workspace_service.go +++ b/server/router/api/v1/workspace_service.go @@ -83,6 +83,9 @@ func (s *APIV1Service) UpdateWorkspaceSetting(ctx context.Context, request *v1pb if err != nil { return nil, status.Errorf(codes.Internal, "failed to get current user: %v", err) } + if user == nil { + return nil, status.Errorf(codes.Unauthenticated, "user not authenticated") + } if user.Role != store.RoleHost { return nil, status.Errorf(codes.PermissionDenied, "permission denied") } From 4056a1badaa2a1a2751a5e9cd6a90235c5e02d4a Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 8 Oct 2025 20:42:15 +0800 Subject: [PATCH 17/26] chore: update sponsors --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3a9a60b68..e88162910 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ Access Memos at `http://localhost:5230` and complete the initial setup. Memos is made possible by the generous support of our sponsors. Their contributions help ensure the project's continued development, maintenance, and growth. +warp yourselfhosted fixermark alik-agaev From 20233c7051cd6504171f31c6fa1e4ddc48337489 Mon Sep 17 00:00:00 2001 From: Nic Luckie Date: Wed, 8 Oct 2025 12:40:08 -0400 Subject: [PATCH 18/26] feat(web): add accessible ConfirmDialog and migrate confirmations; and Markdown-safe descriptions (#5111) Signed-off-by: Nic Luckie Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- web/package.json | 2 +- web/src/components/ConfirmDialog/README.md | 131 ++++++++++++++++++ web/src/components/ConfirmDialog/index.tsx | 73 ++++++++++ .../components/CreateAccessTokenDialog.tsx | 7 +- .../HomeSidebar/ShortcutsSection.tsx | 26 +++- .../components/HomeSidebar/TagsSection.tsx | 30 ++-- web/src/components/MemoActionMenu.tsx | 97 ++++++++----- .../Settings/AccessTokenSection.tsx | 32 ++++- web/src/components/Settings/MemberSection.tsx | 72 +++++++--- web/src/components/Settings/SSOSection.tsx | 33 +++-- .../Settings/UserSessionsSection.tsx | 34 ++++- .../components/Settings/WebhookSection.tsx | 36 +++-- web/src/locales/en.json | 46 ++++-- web/src/pages/Attachments.tsx | 26 +--- 14 files changed, 506 insertions(+), 139 deletions(-) create mode 100644 web/src/components/ConfirmDialog/README.md create mode 100644 web/src/components/ConfirmDialog/index.tsx diff --git a/web/package.json b/web/package.json index b790485e5..4f0f18e66 100644 --- a/web/package.json +++ b/web/package.json @@ -92,4 +92,4 @@ "esbuild" ] } -} \ No newline at end of file +} diff --git a/web/src/components/ConfirmDialog/README.md b/web/src/components/ConfirmDialog/README.md new file mode 100644 index 000000000..98d41f8df --- /dev/null +++ b/web/src/components/ConfirmDialog/README.md @@ -0,0 +1,131 @@ +# ConfirmDialog - Accessible Confirmation Dialog + +## Overview + +`ConfirmDialog` standardizes confirmation flows across the app. It replaces ad‑hoc `window.confirm` usage with an accessible, themeable dialog that supports asynchronous operations. + +## Key Features + +### 1. Accessibility & UX +- Uses shared `Dialog` primitives (focus trap, ARIA roles) +- Blocks dismissal while async confirm is pending +- Clear separation of title (action) vs description (context) + +### 2. Async-Aware +- Accepts sync or async `onConfirm` +- Auto-closes on resolve; remains open on error for retry / toast + +### 3. Internationalization Ready +- All labels / text provided by caller through i18n hook +- Supports interpolation for dynamic context + +### 4. Minimal Surface, Easy Extension +- Lightweight API (few required props) +- Style hook via `.container` class (SCSS module) + +## Architecture + +``` +ConfirmDialog +├── State: loading (tracks pending confirm action) +├── Dialog primitives: Header (title + description), Footer (buttons) +└── External control: parent owns open state via onOpenChange +``` + +## Usage + +```tsx +import { useTranslate } from "@/utils/i18n"; +import ConfirmDialog from "@/components/ConfirmDialog"; + +const t = useTranslate(); + +; +``` + +## Props + +| Prop | Type | Required | Acceptable Values | +|------|------|----------|------------------| +| `open` | `boolean` | Yes | `true` (visible) / `false` (hidden) | +| `onOpenChange` | `(open: boolean) => void` | Yes | Callback receiving next state; should update parent state | +| `title` | `React.ReactNode` | Yes | Short localized action summary (text / node) | +| `description` | `React.ReactNode` | No | Optional contextual message | +| `confirmLabel` | `string` | Yes | Non-empty localized action text (1–2 words) | +| `cancelLabel` | `string` | Yes | Localized cancel label | +| `onConfirm` | `() => void | Promise` | Yes | Sync or async handler; resolve = close, reject = stay open | +| `confirmVariant` | `"default" | "destructive"` | No | Defaults to `"default"`; use `"destructive"` for irreversible actions | + +## Benefits vs Previous Implementation + +### Before (window.confirm / ad‑hoc dialogs) +- Blocking native prompt, inconsistent styling +- No async progress handling +- No rich formatting +- Hard to localize consistently + +### After (ConfirmDialog) +- Unified styling + accessibility semantics +- Async-safe with loading state shielding +- Plain description flexibility +- i18n-first via externalized labels + +## Technical Implementation Details + +### Async Handling +```tsx +const handleConfirm = async () => { + setLoading(true); + try { + await onConfirm(); // resolve -> close + onOpenChange(false); + } catch (e) { + console.error(e); // remain open for retry + } finally { + setLoading(false); + } +}; +``` + +### Close Guard +```tsx + !loading && onOpenChange(next)} /> +``` + +## Browser / Environment Support +- Works anywhere the existing `Dialog` primitives work (modern browsers) +- No ResizeObserver / layout dependencies + +## Performance Considerations +1. Minimal renders: loading state toggles once per confirm attempt +2. No portal churn—relies on underlying dialog infra + +## Future Enhancements +1. Severity icon / header accent +2. Auto-focus destructive button toggle +3. Secondary action (e.g. "Archive" vs "Delete") +4. Built-in retry / error slot +5. Optional checkbox confirmation ("I understand the consequences") +6. Motion/animation tokens integration + +## Styling +The `ConfirmDialog.module.scss` file provides a `.container` hook. It currently only hosts a harmless custom property so the stylesheet is non-empty. Add real layout or variant tokens there instead of inline styles. + +## Internationalization +All visible strings must come from the translation system. Use `useTranslate()` and pass localized values into props. Separate keys for title/description. + +## Error Handling +Errors thrown in `onConfirm` are caught and logged. The dialog stays open so the caller can surface a toast or inline message and allow retry. (Consider routing serious errors to a higher-level handler.) + +--- + +If you extend this component, update this README to keep usage discoverable. diff --git a/web/src/components/ConfirmDialog/index.tsx b/web/src/components/ConfirmDialog/index.tsx new file mode 100644 index 000000000..495d68ceb --- /dev/null +++ b/web/src/components/ConfirmDialog/index.tsx @@ -0,0 +1,73 @@ +import * as React from "react"; +import { Button } from "@/components/ui/button"; +import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; + +export interface ConfirmDialogProps { + /** Whether the dialog is open */ + open: boolean; + /** Open state change callback (closing disabled while loading) */ + onOpenChange: (open: boolean) => void; + /** Title content (plain text or React nodes) */ + title: React.ReactNode; + /** Optional description (plain text or React nodes) */ + description?: React.ReactNode; + /** Confirm / primary action button label */ + confirmLabel: string; + /** Cancel button label */ + cancelLabel: string; + /** Async or sync confirm handler. Dialog auto-closes on resolve, stays open on reject */ + onConfirm: () => void | Promise; + /** Variant style of confirm button */ + confirmVariant?: "default" | "destructive"; +} + +/** + * Accessible confirmation dialog. + * - Renders optional description content + * - Prevents closing while async confirm action is in-flight + * - Minimal opinionated styling; leverages existing UI primitives + */ +export default function ConfirmDialog({ + open, + onOpenChange, + title, + description, + confirmLabel, + cancelLabel, + onConfirm, + confirmVariant = "default", +}: ConfirmDialogProps) { + const [loading, setLoading] = React.useState(false); + + const handleConfirm = async () => { + try { + setLoading(true); + await onConfirm(); + onOpenChange(false); + } catch (e) { + // Intentionally swallow errors so user can retry; surface via caller's toast/logging + console.error("ConfirmDialog error for action:", title, e); + } finally { + setLoading(false); + } + }; + + return ( + !loading && onOpenChange(o)}> + + + {title} + {description ? {description} : null} + + + + + + + + ); +} diff --git a/web/src/components/CreateAccessTokenDialog.tsx b/web/src/components/CreateAccessTokenDialog.tsx index 2e8d22dcb..8af13e509 100644 --- a/web/src/components/CreateAccessTokenDialog.tsx +++ b/web/src/components/CreateAccessTokenDialog.tsx @@ -8,12 +8,13 @@ import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; import useLoading from "@/hooks/useLoading"; +import { UserAccessToken } from "@/types/proto/api/v1/user_service"; import { useTranslate } from "@/utils/i18n"; interface Props { open: boolean; onOpenChange: (open: boolean) => void; - onSuccess: () => void; + onSuccess: (created: UserAccessToken) => void; } interface State { @@ -72,7 +73,7 @@ function CreateAccessTokenDialog({ open, onOpenChange, onSuccess }: Props) { try { requestState.setLoading(); - await userServiceClient.createUserAccessToken({ + const created = await userServiceClient.createUserAccessToken({ parent: currentUser.name, accessToken: { description: state.description, @@ -81,7 +82,7 @@ function CreateAccessTokenDialog({ open, onOpenChange, onSuccess }: Props) { }); requestState.setFinish(); - onSuccess(); + onSuccess(created); onOpenChange(false); } catch (error: any) { toast.error(error.details); diff --git a/web/src/components/HomeSidebar/ShortcutsSection.tsx b/web/src/components/HomeSidebar/ShortcutsSection.tsx index f36c3a7f4..1b3d18bd3 100644 --- a/web/src/components/HomeSidebar/ShortcutsSection.tsx +++ b/web/src/components/HomeSidebar/ShortcutsSection.tsx @@ -1,6 +1,8 @@ import { Edit3Icon, MoreVerticalIcon, TrashIcon, PlusIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { useState } from "react"; +import toast from "react-hot-toast"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import { shortcutServiceClient } from "@/grpcweb"; import useAsyncEffect from "@/hooks/useAsyncEffect"; @@ -25,6 +27,7 @@ const ShortcutsSection = observer(() => { const t = useTranslate(); const shortcuts = userStore.state.shortcuts; const [isCreateShortcutDialogOpen, setIsCreateShortcutDialogOpen] = useState(false); + const [deleteTarget, setDeleteTarget] = useState(); const [editingShortcut, setEditingShortcut] = useState(); useAsyncEffect(async () => { @@ -32,11 +35,15 @@ const ShortcutsSection = observer(() => { }, []); const handleDeleteShortcut = async (shortcut: Shortcut) => { - const confirmed = window.confirm("Are you sure you want to delete this shortcut?"); - if (confirmed) { - await shortcutServiceClient.deleteShortcut({ name: shortcut.name }); - await userStore.fetchUserSettings(); - } + setDeleteTarget(shortcut); + }; + + const confirmDeleteShortcut = async () => { + if (!deleteTarget) return; + await shortcutServiceClient.deleteShortcut({ name: deleteTarget.name }); + await userStore.fetchUserSettings(); + toast.success(t("setting.shortcut.delete-success", { title: deleteTarget.title })); + setDeleteTarget(undefined); }; const handleCreateShortcut = () => { @@ -113,6 +120,15 @@ const ShortcutsSection = observer(() => { shortcut={editingShortcut} onSuccess={handleShortcutDialogSuccess} /> + !open && setDeleteTarget(undefined)} + title={t("setting.shortcut.delete-confirm", { title: deleteTarget?.title ?? "" })} + confirmLabel={t("common.delete")} + cancelLabel={t("common.cancel")} + onConfirm={confirmDeleteShortcut} + confirmVariant="destructive" + /> ); }); diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsx index 2eaeaf3d4..bed64fe2a 100644 --- a/web/src/components/HomeSidebar/TagsSection.tsx +++ b/web/src/components/HomeSidebar/TagsSection.tsx @@ -3,6 +3,7 @@ import { observer } from "mobx-react-lite"; import { useState } from "react"; import toast from "react-hot-toast"; import useLocalStorage from "react-use/lib/useLocalStorage"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Switch } from "@/components/ui/switch"; import { memoServiceClient } from "@/grpcweb"; import { useDialog } from "@/hooks/useDialog"; @@ -25,6 +26,7 @@ const TagsSection = observer((props: Props) => { const [treeAutoExpand, setTreeAutoExpand] = useLocalStorage("tag-tree-auto-expand", false); const renameTagDialog = useDialog(); const [selectedTag, setSelectedTag] = useState(""); + const [deleteTagName, setDeleteTagName] = useState(undefined); const tags = Object.entries(userStore.state.tagCount) .sort((a, b) => a[0].localeCompare(b[0])) .sort((a, b) => b[1] - a[1]); @@ -52,14 +54,17 @@ const TagsSection = observer((props: Props) => { }; const handleDeleteTag = async (tag: string) => { - const confirmed = window.confirm(t("tag.delete-confirm")); - if (confirmed) { - await memoServiceClient.deleteMemoTag({ - parent: "memos/-", - tag: tag, - }); - toast.success(t("message.deleted-successfully")); - } + setDeleteTagName(tag); + }; + + const confirmDeleteTag = async () => { + if (!deleteTagName) return; + await memoServiceClient.deleteMemoTag({ + parent: "memos/-", + tag: deleteTagName, + }); + toast.success(t("tag.delete-success")); + setDeleteTagName(undefined); }; return ( @@ -139,6 +144,15 @@ const TagsSection = observer((props: Props) => { tag={selectedTag} onSuccess={handleRenameSuccess} /> + !open && setDeleteTagName(undefined)} + title={t("tag.delete-confirm")} + confirmLabel={t("common.delete")} + cancelLabel={t("common.cancel")} + onConfirm={confirmDeleteTag} + confirmVariant="destructive" + /> ); }); diff --git a/web/src/components/MemoActionMenu.tsx b/web/src/components/MemoActionMenu.tsx index 051a9a8bc..a07401699 100644 --- a/web/src/components/MemoActionMenu.tsx +++ b/web/src/components/MemoActionMenu.tsx @@ -11,8 +11,10 @@ import { SquareCheckIcon, } from "lucide-react"; import { observer } from "mobx-react-lite"; +import { useState } from "react"; import toast from "react-hot-toast"; import { useLocation } from "react-router-dom"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { markdownServiceClient } from "@/grpcweb"; import useNavigateTo from "@/hooks/useNavigateTo"; import { memoStore, userStore } from "@/store"; @@ -49,6 +51,8 @@ const MemoActionMenu = observer((props: Props) => { const t = useTranslate(); const location = useLocation(); const navigateTo = useNavigateTo(); + const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); + const [removeTasksDialogOpen, setRemoveTasksDialogOpen] = useState(false); const hasCompletedTaskList = checkHasCompletedTaskList(memo); const isInMemoDetailPage = location.pathname.startsWith(`/${memo.name}`); const isComment = Boolean(memo.parent); @@ -101,7 +105,7 @@ const MemoActionMenu = observer((props: Props) => { }, ["state"], ); - toast(message); + toast.success(message); } catch (error: any) { toast.error(error.details); console.error(error); @@ -123,48 +127,50 @@ const MemoActionMenu = observer((props: Props) => { toast.success(t("message.succeed-copy-link")); }; - const handleDeleteMemoClick = async () => { - const confirmed = window.confirm(t("memo.delete-confirm")); - if (confirmed) { - await memoStore.deleteMemo(memo.name); - toast.success(t("message.deleted-successfully")); - if (isInMemoDetailPage) { - navigateTo("/"); - } - memoUpdatedCallback(); - } + const handleDeleteMemoClick = () => { + setDeleteDialogOpen(true); }; - const handleRemoveCompletedTaskListItemsClick = async () => { - const confirmed = window.confirm(t("memo.remove-completed-task-list-items-confirm")); - if (confirmed) { - const newNodes = JSON.parse(JSON.stringify(memo.nodes)); - for (const node of newNodes) { - if (node.type === NodeType.LIST && node.listNode?.children?.length > 0) { - const children = node.listNode.children; - for (let i = 0; i < children.length; i++) { - if (children[i].type === NodeType.TASK_LIST_ITEM && children[i].taskListItemNode?.complete) { - // Remove completed taskList item and next line breaks + const confirmDeleteMemo = async () => { + await memoStore.deleteMemo(memo.name); + toast.success(t("message.deleted-successfully")); + if (isInMemoDetailPage) { + navigateTo("/"); + } + memoUpdatedCallback(); + }; + + const handleRemoveCompletedTaskListItemsClick = () => { + setRemoveTasksDialogOpen(true); + }; + + const confirmRemoveCompletedTaskListItems = async () => { + const newNodes = JSON.parse(JSON.stringify(memo.nodes)); + for (const node of newNodes) { + if (node.type === NodeType.LIST && node.listNode?.children?.length > 0) { + const children = node.listNode.children; + for (let i = 0; i < children.length; i++) { + if (children[i].type === NodeType.TASK_LIST_ITEM && children[i].taskListItemNode?.complete) { + // Remove completed taskList item and next line breaks + children.splice(i, 1); + if (children[i]?.type === NodeType.LINE_BREAK) { children.splice(i, 1); - if (children[i]?.type === NodeType.LINE_BREAK) { - children.splice(i, 1); - } - i--; } + i--; } } } - const { markdown } = await markdownServiceClient.restoreMarkdownNodes({ nodes: newNodes }); - await memoStore.updateMemo( - { - name: memo.name, - content: markdown, - }, - ["content"], - ); - toast.success(t("message.remove-completed-task-list-items-successfully")); - memoUpdatedCallback(); } + const { markdown } = await markdownServiceClient.restoreMarkdownNodes({ nodes: newNodes }); + await memoStore.updateMemo( + { + name: memo.name, + content: markdown, + }, + ["content"], + ); + toast.success(t("message.remove-completed-task-list-items-successfully")); + memoUpdatedCallback(); }; return ( @@ -216,6 +222,27 @@ const MemoActionMenu = observer((props: Props) => { )} + {/* Delete confirmation dialog */} + + {/* Remove completed tasks confirmation */} + ); }); diff --git a/web/src/components/Settings/AccessTokenSection.tsx b/web/src/components/Settings/AccessTokenSection.tsx index 60c9f0e16..e4cf3f6da 100644 --- a/web/src/components/Settings/AccessTokenSection.tsx +++ b/web/src/components/Settings/AccessTokenSection.tsx @@ -2,6 +2,7 @@ import copy from "copy-to-clipboard"; import { ClipboardIcon, TrashIcon } from "lucide-react"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Button } from "@/components/ui/button"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; @@ -20,6 +21,7 @@ const AccessTokenSection = () => { const currentUser = useCurrentUser(); const [userAccessTokens, setUserAccessTokens] = useState([]); const createTokenDialog = useDialog(); + const [deleteTarget, setDeleteTarget] = useState(undefined); useEffect(() => { listAccessTokens(currentUser.name).then((accessTokens) => { @@ -27,9 +29,10 @@ const AccessTokenSection = () => { }); }, []); - const handleCreateAccessTokenDialogConfirm = async () => { + const handleCreateAccessTokenDialogConfirm = async (created: UserAccessToken) => { const accessTokens = await listAccessTokens(currentUser.name); setUserAccessTokens(accessTokens); + toast.success(t("setting.access-token-section.create-dialog.access-token-created", { description: created.description })); }; const handleCreateToken = () => { @@ -42,12 +45,17 @@ const AccessTokenSection = () => { }; const handleDeleteAccessToken = async (userAccessToken: UserAccessToken) => { - const formatedAccessToken = getFormatedAccessToken(userAccessToken.accessToken); - const confirmed = window.confirm(t("setting.access-token-section.access-token-deletion", { accessToken: formatedAccessToken })); - if (confirmed) { - await userServiceClient.deleteUserAccessToken({ name: userAccessToken.name }); - setUserAccessTokens(userAccessTokens.filter((token) => token.accessToken !== userAccessToken.accessToken)); - } + setDeleteTarget(userAccessToken); + }; + + const confirmDeleteAccessToken = async () => { + if (!deleteTarget) return; + const { name: tokenName, description } = deleteTarget; + await userServiceClient.deleteUserAccessToken({ name: tokenName }); + // Filter by stable resource name to avoid ambiguity with duplicate token strings + setUserAccessTokens((prev) => prev.filter((token) => token.name !== tokenName)); + setDeleteTarget(undefined); + toast.success(t("setting.access-token-section.access-token-deleted", { description })); }; const getFormatedAccessToken = (accessToken: string) => { @@ -134,6 +142,16 @@ const AccessTokenSection = () => { onOpenChange={createTokenDialog.setOpen} onSuccess={handleCreateAccessTokenDialogConfirm} /> + !open && setDeleteTarget(undefined)} + title={deleteTarget ? t("setting.access-token-section.access-token-deletion", { description: deleteTarget.description }) : ""} + description={t("setting.access-token-section.access-token-deletion-description")} + confirmLabel={t("common.delete")} + cancelLabel={t("common.cancel")} + onConfirm={confirmDeleteAccessToken} + confirmVariant="destructive" + /> ); }; diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsx index 7734063bf..f6ee2137e 100644 --- a/web/src/components/Settings/MemberSection.tsx +++ b/web/src/components/Settings/MemberSection.tsx @@ -2,6 +2,8 @@ import { sortBy } from "lodash-es"; import { MoreVerticalIcon, PlusIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import React, { useEffect, useState } from "react"; +import toast from "react-hot-toast"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Button } from "@/components/ui/button"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; @@ -21,6 +23,8 @@ const MemberSection = observer(() => { const editDialog = useDialog(); const [editingUser, setEditingUser] = useState(); const sortedUsers = sortBy(users, "id"); + const [archiveTarget, setArchiveTarget] = useState(undefined); + const [deleteTarget, setDeleteTarget] = useState(undefined); useEffect(() => { fetchUsers(); @@ -52,20 +56,26 @@ const MemberSection = observer(() => { }; const handleArchiveUserClick = async (user: User) => { - const confirmed = window.confirm(t("setting.member-section.archive-warning", { username: user.displayName })); - if (confirmed) { - await userServiceClient.updateUser({ - user: { - name: user.name, - state: State.ARCHIVED, - }, - updateMask: ["state"], - }); - fetchUsers(); - } + setArchiveTarget(user); + }; + + const confirmArchiveUser = async () => { + if (!archiveTarget) return; + const username = archiveTarget.username; + await userServiceClient.updateUser({ + user: { + name: archiveTarget.name, + state: State.ARCHIVED, + }, + updateMask: ["state"], + }); + setArchiveTarget(undefined); + toast.success(t("setting.member-section.archive-success", { username })); + await fetchUsers(); }; const handleRestoreUserClick = async (user: User) => { + const { username } = user; await userServiceClient.updateUser({ user: { name: user.name, @@ -73,15 +83,21 @@ const MemberSection = observer(() => { }, updateMask: ["state"], }); - fetchUsers(); + toast.success(t("setting.member-section.restore-success", { username })); + await fetchUsers(); }; const handleDeleteUserClick = async (user: User) => { - const confirmed = window.confirm(t("setting.member-section.delete-warning", { username: user.displayName })); - if (confirmed) { - await userStore.deleteUser(user.name); - fetchUsers(); - } + setDeleteTarget(user); + }; + + const confirmDeleteUser = async () => { + if (!deleteTarget) return; + const { username, name } = deleteTarget; + await userStore.deleteUser(name); + setDeleteTarget(undefined); + toast.success(t("setting.member-section.delete-success", { username })); + await fetchUsers(); }; return ( @@ -169,6 +185,28 @@ const MemberSection = observer(() => { {/* Edit User Dialog */} + + !open && setArchiveTarget(undefined)} + title={archiveTarget ? t("setting.member-section.archive-warning", { username: archiveTarget.username }) : ""} + description={archiveTarget ? t("setting.member-section.archive-warning-description") : ""} + confirmLabel={t("common.confirm")} + cancelLabel={t("common.cancel")} + onConfirm={confirmArchiveUser} + confirmVariant="default" + /> + + !open && setDeleteTarget(undefined)} + title={deleteTarget ? t("setting.member-section.delete-warning", { username: deleteTarget.username }) : ""} + description={deleteTarget ? t("setting.member-section.delete-warning-description") : ""} + confirmLabel={t("common.delete")} + cancelLabel={t("common.cancel")} + onConfirm={confirmDeleteUser} + confirmVariant="destructive" + /> ); }); diff --git a/web/src/components/Settings/SSOSection.tsx b/web/src/components/Settings/SSOSection.tsx index 0dfd7b94e..8cc31690c 100644 --- a/web/src/components/Settings/SSOSection.tsx +++ b/web/src/components/Settings/SSOSection.tsx @@ -1,6 +1,7 @@ import { MoreVerticalIcon } from "lucide-react"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Button } from "@/components/ui/button"; import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"; import { Separator } from "@/components/ui/separator"; @@ -15,6 +16,7 @@ const SSOSection = () => { const [identityProviderList, setIdentityProviderList] = useState([]); const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false); const [editingIdentityProvider, setEditingIdentityProvider] = useState(); + const [deleteTarget, setDeleteTarget] = useState(undefined); useEffect(() => { fetchIdentityProviderList(); @@ -26,16 +28,19 @@ const SSOSection = () => { }; const handleDeleteIdentityProvider = async (identityProvider: IdentityProvider) => { - const confirmed = window.confirm(t("setting.sso-section.confirm-delete", { name: identityProvider.title })); - if (confirmed) { - try { - await identityProviderServiceClient.deleteIdentityProvider({ name: identityProvider.name }); - } catch (error: any) { - console.error(error); - toast.error(error.details); - } - await fetchIdentityProviderList(); + setDeleteTarget(identityProvider); + }; + + const confirmDeleteIdentityProvider = async () => { + if (!deleteTarget) return; + try { + await identityProviderServiceClient.deleteIdentityProvider({ name: deleteTarget.name }); + } catch (error: any) { + console.error(error); + toast.error(error.details); } + await fetchIdentityProviderList(); + setDeleteTarget(undefined); }; const handleCreateIdentityProvider = () => { @@ -112,6 +117,16 @@ const SSOSection = () => { identityProvider={editingIdentityProvider} onSuccess={handleDialogSuccess} /> + + !open && setDeleteTarget(undefined)} + title={deleteTarget ? t("setting.sso-section.confirm-delete", { name: deleteTarget.title }) : ""} + confirmLabel={t("common.delete")} + cancelLabel={t("common.cancel")} + onConfirm={confirmDeleteIdentityProvider} + confirmVariant="destructive" + /> ); }; diff --git a/web/src/components/Settings/UserSessionsSection.tsx b/web/src/components/Settings/UserSessionsSection.tsx index 8e5d00e59..292e09140 100644 --- a/web/src/components/Settings/UserSessionsSection.tsx +++ b/web/src/components/Settings/UserSessionsSection.tsx @@ -1,6 +1,7 @@ import { ClockIcon, MonitorIcon, SmartphoneIcon, TabletIcon, TrashIcon, WifiIcon } from "lucide-react"; import { useEffect, useState } from "react"; import { toast } from "react-hot-toast"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Button } from "@/components/ui/button"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; @@ -16,6 +17,7 @@ const UserSessionsSection = () => { const t = useTranslate(); const currentUser = useCurrentUser(); const [userSessions, setUserSessions] = useState([]); + const [revokeTarget, setRevokeTarget] = useState(undefined); useEffect(() => { listUserSessions(currentUser.name).then((sessions) => { @@ -24,13 +26,15 @@ const UserSessionsSection = () => { }, []); const handleRevokeSession = async (userSession: UserSession) => { - const formattedSessionId = getFormattedSessionId(userSession.sessionId); - const confirmed = window.confirm(t("setting.user-sessions-section.session-revocation", { sessionId: formattedSessionId })); - if (confirmed) { - await userServiceClient.revokeUserSession({ name: userSession.name }); - setUserSessions(userSessions.filter((session) => session.sessionId !== userSession.sessionId)); - toast.success(t("setting.user-sessions-section.session-revoked")); - } + setRevokeTarget(userSession); + }; + + const confirmRevokeSession = async () => { + if (!revokeTarget) return; + await userServiceClient.revokeUserSession({ name: revokeTarget.name }); + setUserSessions(userSessions.filter((session) => session.sessionId !== revokeTarget.sessionId)); + toast.success(t("setting.user-sessions-section.session-revoked")); + setRevokeTarget(undefined); }; const getFormattedSessionId = (sessionId: string) => { @@ -148,6 +152,22 @@ const UserSessionsSection = () => { + !open && setRevokeTarget(undefined)} + title={ + revokeTarget + ? t("setting.user-sessions-section.session-revocation", { + sessionId: getFormattedSessionId(revokeTarget.sessionId), + }) + : "" + } + description={revokeTarget ? t("setting.user-sessions-section.session-revocation-description") : ""} + confirmLabel={t("setting.user-sessions-section.revoke-session-button")} + cancelLabel={t("common.cancel")} + onConfirm={confirmRevokeSession} + confirmVariant="destructive" + /> ); diff --git a/web/src/components/Settings/WebhookSection.tsx b/web/src/components/Settings/WebhookSection.tsx index 78e22a148..817db5c99 100644 --- a/web/src/components/Settings/WebhookSection.tsx +++ b/web/src/components/Settings/WebhookSection.tsx @@ -1,6 +1,8 @@ import { ExternalLinkIcon, TrashIcon } from "lucide-react"; import { useEffect, useState } from "react"; +import toast from "react-hot-toast"; import { Link } from "react-router-dom"; +import ConfirmDialog from "@/components/ConfirmDialog"; import { Button } from "@/components/ui/button"; import { userServiceClient } from "@/grpcweb"; import useCurrentUser from "@/hooks/useCurrentUser"; @@ -13,6 +15,7 @@ const WebhookSection = () => { const currentUser = useCurrentUser(); const [webhooks, setWebhooks] = useState([]); const [isCreateWebhookDialogOpen, setIsCreateWebhookDialogOpen] = useState(false); + const [deleteTarget, setDeleteTarget] = useState(undefined); const listWebhooks = async () => { if (!currentUser) return []; @@ -30,16 +33,22 @@ const WebhookSection = () => { const handleCreateWebhookDialogConfirm = async () => { const webhooks = await listWebhooks(); + const name = webhooks[webhooks.length - 1]?.displayName || ""; setWebhooks(webhooks); setIsCreateWebhookDialogOpen(false); + toast.success(t("setting.webhook-section.create-dialog.create-webhook-success", { name })); }; const handleDeleteWebhook = async (webhook: UserWebhook) => { - const confirmed = window.confirm(`Are you sure to delete webhook \`${webhook.displayName}\`? You cannot undo this action.`); - if (confirmed) { - await userServiceClient.deleteUserWebhook({ name: webhook.name }); - setWebhooks(webhooks.filter((item) => item.name !== webhook.name)); - } + setDeleteTarget(webhook); + }; + + const confirmDeleteWebhook = async () => { + if (!deleteTarget) return; + await userServiceClient.deleteUserWebhook({ name: deleteTarget.name }); + setWebhooks(webhooks.filter((item) => item.name !== deleteTarget.name)); + setDeleteTarget(undefined); + toast.success(t("setting.webhook-section.delete-dialog.delete-webhook-success", { name: deleteTarget.displayName })); }; return ( @@ -79,12 +88,7 @@ const WebhookSection = () => { {webhook.url} - @@ -118,6 +122,16 @@ const WebhookSection = () => { onOpenChange={setIsCreateWebhookDialogOpen} onSuccess={handleCreateWebhookDialogConfirm} /> + !open && setDeleteTarget(undefined)} + title={t("setting.webhook-section.delete-dialog.delete-webhook-title", { name: deleteTarget?.displayName || "" })} + description={t("setting.webhook-section.delete-dialog.delete-webhook-description")} + confirmLabel={t("common.delete")} + cancelLabel={t("common.cancel")} + onConfirm={confirmDeleteWebhook} + confirmVariant="destructive" + /> ); }; diff --git a/web/src/locales/en.json b/web/src/locales/en.json index d3833b9a6..7f001d02e 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -143,7 +143,8 @@ }, "copy-link": "Copy Link", "count-memos-in-date": "{{count}} {{memos}} in {{date}}", - "delete-confirm": "Are you sure you want to delete this memo? THIS ACTION IS IRREVERSIBLE", + "delete-confirm": "Are you sure you want to delete this memo?", + "delete-confirm-description": "This action is irreversible. Attachments, links, and references will also be removed.", "direction": "Direction", "direction-asc": "Ascending", "direction-desc": "Descending", @@ -174,7 +175,7 @@ "archived-successfully": "Archived successfully", "change-memo-created-time": "Change memo created time", "copied": "Copied", - "deleted-successfully": "Deleted successfully", + "deleted-successfully": "Memo deleted successfully", "description-is-required": "Description is required", "failed-to-embed-memo": "Failed to embed memo", "fill-all": "Please fill in all fields.", @@ -219,6 +220,8 @@ }, "delete-resource": "Delete Resource", "delete-selected-resources": "Delete Selected Resources", + "delete-all-unused": "Delete all unused", + "delete-all-unused-confirm": "Are you sure you want to delete all unused resources? THIS ACTION IS IRREVERSIBLE", "fetching-data": "Fetching data…", "file-drag-drop-prompt": "Drag and drop your file here to upload file", "linked-amount": "Linked amount", @@ -226,7 +229,7 @@ "no-resources": "No resources.", "no-unused-resources": "No unused resources", "reset-link": "Reset Link", - "reset-link-prompt": "Are you sure to reset the link? This will break all current link usages. THIS ACTION IS IRREVERSIBLE", + "reset-link-prompt": "Are you sure you want to reset the link? This will break all current link usages. THIS ACTION IS IRREVERSIBLE", "reset-resource-link": "Reset Resource Link", "unused-resources": "Unused resources" }, @@ -237,8 +240,11 @@ "setting": { "access-token-section": { "access-token-copied-to-clipboard": "Access token copied to clipboard", - "access-token-deletion": "Are you sure to delete access token {{accessToken}}? THIS ACTION IS IRREVERSIBLE.", + "access-token-deletion": "Are you sure you want to delete access token `{{description}}`?", + "access-token-deletion-description": "This action is irreversible. You will need to update any services using this token to use a new token.", + "access-token-deleted": "Access token `{{description}}` deleted", "create-dialog": { + "access-token-created": "Access token `{{description}}` created", "create-access-token": "Create Access Token", "created-at": "Created At", "description": "Description", @@ -262,9 +268,11 @@ "expires": "Expires", "current": "Current", "never": "Never", - "session-revocation": "Are you sure to revoke session {{sessionId}}? You will need to sign in again on that device.", + "session-revocation": "Are you sure you want to revoke session `{{sessionId}}`?", + "session-revocation-description": "You will need to sign in again on that device.", "session-revoked": "Session revoked successfully", "revoke-session": "Revoke session", + "revoke-session-button": "Revoke", "cannot-revoke-current": "Cannot revoke current session", "no-sessions": "No active sessions found" }, @@ -286,10 +294,15 @@ "member-section": { "admin": "Admin", "archive-member": "Archive member", - "archive-warning": "Are you sure to archive {{username}}?", + "archive-warning": "Are you sure you want to archive {{username}}?", + "archive-warning-description": "Archiving disables the account. You can restore or delete it later.", + "archive-success": "{{username}} archived successfully", + "restore-success": "{{username}} restored successfully", "create-a-member": "Create a member", "delete-member": "Delete Member", - "delete-warning": "Are you sure to delete {{username}}? THIS ACTION IS IRREVERSIBLE", + "delete-warning": "Are you sure you want to delete {{username}}?", + "delete-warning-description": "THIS ACTION IS IRREVERSIBLE", + "delete-success": "{{username}} deleted successfully", "user": "User" }, "memo-related": "Memo", @@ -309,12 +322,16 @@ "default-memo-visibility": "Default memo visibility", "theme": "Theme" }, + "shortcut": { + "delete-confirm": "Are you sure you want to delete shortcut `{{title}}`?", + "delete-success": "Shortcut `{{title}}` deleted successfully" + }, "sso": "SSO", "sso-section": { "authorization-endpoint": "Authorization endpoint", "client-id": "Client ID", "client-secret": "Client secret", - "confirm-delete": "Are you sure to delete \"{{name}}\" SSO configuration? THIS ACTION IS IRREVERSIBLE", + "confirm-delete": "Are you sure you want to delete `{{name}}` SSO configuration? THIS ACTION IS IRREVERSIBLE", "create-sso": "Create SSO", "custom": "Custom", "delete-sso": "Confirm delete", @@ -367,7 +384,7 @@ "url-prefix-placeholder": "Custom URL prefix, optional", "url-suffix": "URL suffix", "url-suffix-placeholder": "Custom URL suffix, optional", - "warning-text": "Are you sure to delete storage service \"{{name}}\"? THIS ACTION IS IRREVERSIBLE" + "warning-text": "Are you sure you want to delete storage service `{{name}}`? THIS ACTION IS IRREVERSIBLE" }, "system": "System", "system-section": { @@ -384,7 +401,7 @@ }, "disable-markdown-shortcuts-in-editor": "Disable Markdown shortcuts in editor", "disable-password-login": "Disable password login", - "disable-password-login-final-warning": "Please type \"CONFIRM\" if you know what you are doing.", + "disable-password-login-final-warning": "Please type `CONFIRM` if you know what you are doing.", "disable-password-login-warning": "This will disable password login for all users. It is not possible to log in without reverting this setting in the database if your configured identity providers fail. You’ll also have to be extra careful when removing an identity provider", "disable-public-memos": "Disable public memos", "display-with-updated-time": "Display with updated time", @@ -403,11 +420,17 @@ "create-dialog": { "an-easy-to-remember-name": "An easy-to-remember name", "create-webhook": "Create webhook", + "create-webhook-success": "Webhook `{{name}}` created", "edit-webhook": "Edit webhook", "payload-url": "Payload URL", "title": "Title", "url-example-post-receive": "https://example.com/postreceive" }, + "delete-dialog": { + "delete-webhook-description": "This action is irreversible.", + "delete-webhook-title": "Are you sure you want to delete webhook `{{name}}`?", + "delete-webhook-success": "Webhook `{{name}}` deleted successfully" + }, "no-webhooks-found": "No webhooks found.", "title": "Webhooks", "url": "URL" @@ -427,8 +450,9 @@ "all-tags": "All Tags", "create-tag": "Create Tag", "create-tags-guide": "You can create tags by inputting `#tag`.", - "delete-confirm": "Are you sure to delete this tag? All related memos will be archived.", + "delete-confirm": "Are you sure you want to delete this tag? All related memos will be archived.", "delete-tag": "Delete Tag", + "delete-success": "Tag deleted successfully", "new-name": "New Name", "no-tag-found": "No tag found", "old-name": "Old Name", diff --git a/web/src/pages/Attachments.tsx b/web/src/pages/Attachments.tsx index f8bafcdd5..7e6d33e40 100644 --- a/web/src/pages/Attachments.tsx +++ b/web/src/pages/Attachments.tsx @@ -1,15 +1,13 @@ import dayjs from "dayjs"; import { includes } from "lodash-es"; -import { PaperclipIcon, SearchIcon, TrashIcon } from "lucide-react"; +import { PaperclipIcon, SearchIcon } from "lucide-react"; import { observer } from "mobx-react-lite"; import { useEffect, useState } from "react"; import AttachmentIcon from "@/components/AttachmentIcon"; import Empty from "@/components/Empty"; import MobileHeader from "@/components/MobileHeader"; -import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Separator } from "@/components/ui/separator"; -import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"; import { attachmentServiceClient } from "@/grpcweb"; import useLoading from "@/hooks/useLoading"; import useResponsiveWidth from "@/hooks/useResponsiveWidth"; @@ -56,16 +54,6 @@ const Attachments = observer(() => { }); }, []); - const handleDeleteUnusedAttachments = async () => { - const confirmed = window.confirm("Are you sure to delete all unused attachments? This action cannot be undone."); - if (confirmed) { - for (const attachment of unusedAttachments) { - await attachmentServiceClient.deleteAttachment({ name: attachment.name }); - } - setAttachments(attachments.filter((attachment) => attachment.memo)); - } - }; - return (
{!md && } @@ -138,18 +126,6 @@ const Attachments = observer(() => {
{t("resource.unused-resources")} ({unusedAttachments.length}) - - - - - - -

Delete all

- - -
{unusedAttachments.map((attachment) => { return ( From d7e751997dcb7188452c85dd219688d36467815b Mon Sep 17 00:00:00 2001 From: Huang Cheng Ting <74168694+hchengting@users.noreply.github.com> Date: Thu, 9 Oct 2025 21:30:55 +0800 Subject: [PATCH 19/26] chore: update zh-Hant translation (#5159) --- web/src/locales/zh-Hant.json | 71 ++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 19 deletions(-) diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json index 421c4a530..905e14410 100644 --- a/web/src/locales/zh-Hant.json +++ b/web/src/locales/zh-Hant.json @@ -12,7 +12,7 @@ "new-password": "新密碼", "repeat-new-password": "再次輸入新密碼", "sign-in-tip": "已經有帳戶了嗎？", - "sign-up-tip": "還沒有帳戶？" + "sign-up-tip": "還沒有帳戶嗎？" }, "common": { "about": "關於", @@ -21,6 +21,7 @@ "archive": "封存", "archived": "已封存", "attachments": "附件", + "auto-expand": "自動展開", "avatar": "頭像", "basic": "基礎", "beta": "測試版", @@ -114,7 +115,7 @@ "add-your-comment-here": "在這裡添加您的評論...", "any-thoughts": "任何想法...", "save": "儲存", - "no-changes-detected": "未檢測到變更" + "no-changes-detected": "未發現變更" }, "filters": { "has-code": "有程式碼", @@ -122,9 +123,9 @@ "has-task-list": "有待辦事項" }, "inbox": { - "failed-to-load": "載入通知失敗", "memo-comment": "{{user}} 對您的 {{memo}} 發表了評論。", - "version-update": "新版本 {{version}} 現已推出！" + "version-update": "新版本 {{version}} 現已推出！", + "failed-to-load": "載入失敗" }, "markdown": { "checkbox": "核取方塊", @@ -141,8 +142,9 @@ "write-a-comment": "寫下評論" }, "copy-link": "複製連結", - "count-memos-in-date": "{{date}}的{{count}}條備忘錄", - "delete-confirm": "您確定要刪除此備忘錄？（此操作無法恢復）", + "count-memos-in-date": "{{date}} 的 {{count}} 條備忘錄", + "delete-confirm": "您確定要刪除此備忘錄嗎？", + "delete-confirm-description": "此操作無法恢復。附件、連結和引用將一併被移除。", "direction": "排序", "direction-asc": "升序", "direction-desc": "降序", @@ -154,7 +156,7 @@ "no-memos": "無備忘錄", "order-by": "排序", "remove-completed-task-list-items": "移除已完成的待辦事項", - "remove-completed-task-list-items-confirm": "您確定要移除所有完成的待辦事項嗎？（此操作無法恢復）", + "remove-completed-task-list-items-confirm": "您確定要移除所有完成的待辦事項嗎？此操作無法恢復。", "search-placeholder": "搜尋備忘錄", "show-less": "顯示較少", "show-more": "查看更多", @@ -173,12 +175,12 @@ "archived-successfully": "封存成功", "change-memo-created-time": "變更備忘錄建立時間", "copied": "已複製", - "deleted-successfully": "已成功刪除", + "deleted-successfully": "刪除成功", "description-is-required": "說明必填", "failed-to-embed-memo": "嵌入備忘錄失敗", "fill-all": "請填寫所有欄位。", "fill-all-required-fields": "請填寫所有必填欄位", - "maximum-upload-size-is": "最大允許檔案上傳大小 {{size}} MiB", + "maximum-upload-size-is": "最大允許上傳大小為 {{size}} MiB", "memo-not-found": "未找到備忘錄", "new-password-not-match": "新密碼不一致。", "no-data": "或許尋覓虛空，或者改換選擇之軌跡。", @@ -218,6 +220,8 @@ }, "delete-resource": "刪除檔案", "delete-selected-resources": "刪除所選的檔案", + "delete-all-unused": "刪除所有未使用的檔案", + "delete-all-unused-confirm": "您確定要刪除所有未使用的檔案嗎？此操作無法恢復。", "fetching-data": "抓取資料...", "file-drag-drop-prompt": "將您的檔案拖曳到此處以上傳", "linked-amount": "連結數量", @@ -225,7 +229,7 @@ "no-resources": "無檔案。", "no-unused-resources": "無未使用的檔案", "reset-link": "重設連結", - "reset-link-prompt": "您確定要重設連結嗎？這將導致當前使用的連結失效。（此操作無法恢復）", + "reset-link-prompt": "您確定要重設連結嗎？這將導致當前使用的連結失效。此操作無法恢復。", "reset-resource-link": "重設檔案連結", "unused-resources": "未使用的檔案" }, @@ -236,8 +240,11 @@ "setting": { "access-token-section": { "access-token-copied-to-clipboard": "存取令牌已複製到剪貼簿", - "access-token-deletion": "您確定要刪除存取令牌 {{accessToken}} 嗎？（此操作無法恢復）", + "access-token-deletion": "您確定要刪除存取令牌 `{{description}}` 嗎？", + "access-token-deletion-description": "此操作無法恢復。您需要更新所有使用此令牌的服務以使用新的令牌。", + "access-token-deleted": "存取令牌 `{{description}}` 已刪除", "create-dialog": { + "access-token-created": "存取令牌 `{{description}}` 已建立", "create-access-token": "建立存取令牌", "created-at": "建立於", "description": "說明", @@ -261,9 +268,11 @@ "expires": "過期時間", "current": "當前裝置", "never": "永不過期", - "session-revocation": "您確定要撤銷 {{device}} 的工作階段嗎？（此操作無法恢復）", + "session-revocation": "您確定要撤銷工作階段 `{{sessionId}}` 嗎？", + "session-revocation-description": "您需要在該裝置上重新登入。", "session-revoked": "工作階段撤銷成功", "revoke-session": "撤銷工作階段", + "revoke-session-button": "撤銷", "cannot-revoke-current": "無法撤銷當前裝置的工作階段", "no-sessions": "無工作階段" }, @@ -273,7 +282,7 @@ "export-memos": "導出備忘錄", "nickname-note": "顯示於橫幅", "openapi-reset": "重設 OpenAPI 密鑰（Key）", - "openapi-sample-post": "哈囉 來自 {{url}} 的 #memos", + "openapi-sample-post": "哈囉，來自 {{url}} 的 #memos", "openapi-title": "OpenAPI", "reset-api": "重設 API", "title": "帳號資訊", @@ -285,10 +294,15 @@ "member-section": { "admin": "管理者", "archive-member": "封存使用者", - "archive-warning": "您確定要封存 {{username}}?", + "archive-warning": "您確定要封存 {{username}} 嗎？", + "archive-warning-description": "封存會停用該帳戶。您可於日後恢復或刪除該帳戶。", + "archive-success": "{{username}} 封存成功", + "restore-success": "{{username}} 恢復成功", "create-a-member": "新增使用者", "delete-member": "刪除使用者", - "delete-warning": "您確定要刪除 {{username}}?（此操作無法恢復）", + "delete-warning": "您確定要刪除 {{username}} 嗎？", + "delete-warning-description": "此操作無法恢復。", + "delete-success": "{{username}} 刪除成功", "user": "使用者" }, "memo-related": "備忘錄", @@ -308,12 +322,16 @@ "default-memo-visibility": "備忘錄預設瀏覽權限", "theme": "主題" }, + "shortcut": { + "delete-confirm": "您確定要刪除快捷篩選 `{{title}}` 嗎？", + "delete-success": "快捷篩選 `{{title}}` 刪除成功" + }, "sso": "SSO", "sso-section": { "authorization-endpoint": "驗證端點（Authorization Endpoint）", "client-id": "客戶端 ID（Client ID）", "client-secret": "客戶端金鑰（Client Secret）", - "confirm-delete": "您確定要刪除 \"{{name}}\" 的單點登錄 (SSO) 配置嗎？（此操作無法恢復）", + "confirm-delete": "您確定要刪除 `{{name}}` 的單點登錄 (SSO) 配置嗎？此操作無法恢復。", "create-sso": "新增 SSO", "custom": "自訂", "delete-sso": "確認刪除", @@ -366,7 +384,7 @@ "url-prefix-placeholder": "自訂網址前綴（選填）", "url-suffix": "網址後綴", "url-suffix-placeholder": "自訂網址後綴（選填）", - "warning-text": "您確定要刪除存儲服務 \"{{name}}\" 嗎？（此操作無法恢復）" + "warning-text": "您確定要刪除存儲服務 `{{name}}` 嗎？此操作無法恢復。" }, "system": "系統", "system-section": { @@ -383,7 +401,7 @@ }, "disable-markdown-shortcuts-in-editor": "停用編輯器 Markdown 快捷鍵", "disable-password-login": "停用密碼登入", - "disable-password-login-final-warning": "如果您知道自己在做什麼，請輸入「CONFIRM」。", + "disable-password-login-final-warning": "如果您知道自己在做什麼，請輸入 `CONFIRM`。", "disable-password-login-warning": "所有使用者將無法使用密碼登入。如果設定的身份識別提供者失效，不在資料庫中恢復此設定將無法登入。刪除身分識別提供者時也要特別小心❗", "disable-public-memos": "停用公共備忘錄", "display-with-updated-time": "顯示更新時間", @@ -402,11 +420,17 @@ "create-dialog": { "an-easy-to-remember-name": "一個容易記住的名稱", "create-webhook": "建立 Webhook", + "create-webhook-success": "Webhook `{{name}}` 已建立", "edit-webhook": "編輯 Webhook", "payload-url": "URL", "title": "標題", "url-example-post-receive": "https://example.com/postreceive" }, + "delete-dialog": { + "delete-webhook-description": "此操作無法恢復。", + "delete-webhook-title": "您確定要刪除 webhook `{{name}}` 嗎？", + "delete-webhook-success": "Webhook `{{name}}` 刪除成功" + }, "no-webhooks-found": "尚未建立任何 Webhook。", "title": "Webhook", "url": "網址" @@ -428,13 +452,22 @@ "create-tags-guide": "您可以通過輸入`#標籤`來建立標籤。", "delete-confirm": "您確定要刪除此標籤嗎？所有關聯的備忘錄將會被封存", "delete-tag": "刪除標籤", - "no-tag-found": "未找到標籤", + "delete-success": "標籤刪除成功", "new-name": "新標籤名稱", + "no-tag-found": "未找到標籤", "old-name": "舊標籤名稱", "rename-error-empty": "標籤名稱不能為空", "rename-error-repeat": "標籤名稱已存在", "rename-success": "重新命名標籤成功", "rename-tag": "重新命名標籤", "rename-tip": "您的標籤名稱將會被更新" + }, + "tooltip": { + "link-memo": "連結備忘錄", + "markdown-menu": "Markdown", + "select-location": "位置", + "select-visibility": "瀏覽權限", + "tags": "標籤", + "upload-attachment": "上傳附件" } } \ No newline at end of file From 54e3c13435707fd535d91f52b520228408411657 Mon Sep 17 00:00:00 2001 From: asttool Date: Fri, 10 Oct 2025 22:28:35 +0800 Subject: [PATCH 20/26] refactor: use WaitGroup.Go to simplify code (#5162) Signed-off-by: asttool --- plugin/cron/cron.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugin/cron/cron.go b/plugin/cron/cron.go index 03411ddb0..f9318ced5 100644 --- a/plugin/cron/cron.go +++ b/plugin/cron/cron.go @@ -306,11 +306,9 @@ func (c *Cron) runScheduler() { // startJob runs the given job in a new goroutine. func (c *Cron) startJob(j Job) { - c.jobWaiter.Add(1) - go func() { - defer c.jobWaiter.Done() + c.jobWaiter.Go(func() { j.Run() - }() + }) } // now returns current time in c location. From 3245613a889d43d419d83503df82c5c4cba60485 Mon Sep 17 00:00:00 2001 From: Copilot <175728472+Copilot@users.noreply.github.com> Date: Sun, 12 Oct 2025 18:58:37 +0800 Subject: [PATCH 21/26] chore: cleanup components naming --- .../{BrandBanner.tsx => MemosLogo.tsx} | 4 ++-- web/src/components/Navigation.tsx | 8 ++++---- .../{UserBanner.tsx => UserMenu.tsx} | 19 +++++++++++++++++-- 3 files changed, 23 insertions(+), 8 deletions(-) rename web/src/components/{BrandBanner.tsx => MemosLogo.tsx} (92%) rename web/src/components/{UserBanner.tsx => UserMenu.tsx} (82%) diff --git a/web/src/components/BrandBanner.tsx b/web/src/components/MemosLogo.tsx similarity index 92% rename from web/src/components/BrandBanner.tsx rename to web/src/components/MemosLogo.tsx index 4746fef4f..603de7a79 100644 --- a/web/src/components/BrandBanner.tsx +++ b/web/src/components/MemosLogo.tsx @@ -8,7 +8,7 @@ interface Props { collapsed?: boolean; } -const BrandBanner = observer((props: Props) => { +const MemosLogo = observer((props: Props) => { const { collapsed } = props; const workspaceGeneralSetting = workspaceStore.state.generalSetting; const title = workspaceGeneralSetting.customProfile?.title || "Memos"; @@ -24,4 +24,4 @@ const BrandBanner = observer((props: Props) => { ); }); -export default BrandBanner; +export default MemosLogo; diff --git a/web/src/components/Navigation.tsx b/web/src/components/Navigation.tsx index 6991a3aee..d715ac7d8 100644 --- a/web/src/components/Navigation.tsx +++ b/web/src/components/Navigation.tsx @@ -8,8 +8,8 @@ import { cn } from "@/lib/utils"; import { Routes } from "@/router"; import { userStore } from "@/store"; import { useTranslate } from "@/utils/i18n"; -import BrandBanner from "./BrandBanner"; -import UserBanner from "./UserBanner"; +import MemosLogo from "./MemosLogo"; +import UserMenu from "./UserMenu"; interface NavLinkItem { id: string; @@ -67,7 +67,7 @@ const Navigation = observer((props: Props) => {
- + {navLinks.map((navLink) => ( {
{currentUser && (
- +
)}
diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserMenu.tsx similarity index 82% rename from web/src/components/UserBanner.tsx rename to web/src/components/UserMenu.tsx index a20c5598c..4eacbaf9d 100644 --- a/web/src/components/UserBanner.tsx +++ b/web/src/components/UserMenu.tsx @@ -12,7 +12,7 @@ interface Props { collapsed?: boolean; } -const UserBanner = (props: Props) => { +const UserMenu = (props: Props) => { const { collapsed } = props; const t = useTranslate(); const navigateTo = useNavigateTo(); @@ -20,6 +20,21 @@ const UserBanner = (props: Props) => { const handleSignOut = async () => { await authServiceClient.deleteSession({}); + + // Clear user-specific localStorage items (e.g., drafts) + // Preserve app-wide settings like theme + const keysToPreserve = ["memos-theme", "tag-view-as-tree", "tag-tree-auto-expand", "viewStore"]; + const keysToRemove: string[] = []; + + for (let i = 0; i < localStorage.length; i++) { + const key = localStorage.key(i); + if (key && !keysToPreserve.includes(key)) { + keysToRemove.push(key); + } + } + + keysToRemove.forEach((key) => localStorage.removeItem(key)); + window.location.href = Routes.AUTH; }; @@ -65,4 +80,4 @@ const UserBanner = (props: Props) => { ); }; -export default UserBanner; +export default UserMenu; From 435cc7b1771536e4e3e59e81ea0ca40f2e2c21ea Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 14 Oct 2025 19:46:09 +0800 Subject: [PATCH 22/26] feat: implement masonry layout with responsive columns and memo height tracking --- .../components/MasonryView/MasonryColumn.tsx | 43 ++++ .../components/MasonryView/MasonryItem.tsx | 45 ++++ .../components/MasonryView/MasonryView.tsx | 199 ++++-------------- web/src/components/MasonryView/constants.ts | 11 + .../components/MasonryView/distributeItems.ts | 94 +++++++++ web/src/components/MasonryView/index.ts | 26 ++- web/src/components/MasonryView/types.ts | 81 +++++++ .../MasonryView/useMasonryLayout.ts | 150 +++++++++++++ .../PagedMemoList/PagedMemoList.tsx | 4 +- web/src/pages/Archived.tsx | 5 +- web/src/pages/Explore.tsx | 5 +- web/src/pages/Home.tsx | 5 +- web/src/pages/UserProfile.tsx | 5 +- 13 files changed, 505 insertions(+), 168 deletions(-) create mode 100644 web/src/components/MasonryView/MasonryColumn.tsx create mode 100644 web/src/components/MasonryView/MasonryItem.tsx create mode 100644 web/src/components/MasonryView/constants.ts create mode 100644 web/src/components/MasonryView/distributeItems.ts create mode 100644 web/src/components/MasonryView/types.ts create mode 100644 web/src/components/MasonryView/useMasonryLayout.ts diff --git a/web/src/components/MasonryView/MasonryColumn.tsx b/web/src/components/MasonryView/MasonryColumn.tsx new file mode 100644 index 000000000..74b8d6ce1 --- /dev/null +++ b/web/src/components/MasonryView/MasonryColumn.tsx @@ -0,0 +1,43 @@ +import { MasonryItem } from "./MasonryItem"; +import { MasonryColumnProps } from "./types"; + +/** + * Column component for masonry layout + * + * Responsibilities: + * - Render a single column in the masonry grid + * - Display prefix element in the first column (e.g., memo editor) + * - Render all assigned memo items in order + * - Pass render context to items (includes compact mode flag) + */ +export function MasonryColumn({ + memoIndices, + memoList, + renderer, + renderContext, + onHeightChange, + isFirstColumn, + prefixElement, + prefixElementRef, +}: MasonryColumnProps) { + return ( +
+ {/* Prefix element (like memo editor) goes in first column */} + {isFirstColumn && prefixElement &&
{prefixElement}
} + + {/* Render all memos assigned to this column */} + {memoIndices?.map((memoIndex) => { + const memo = memoList[memoIndex]; + return memo ? ( + + ) : null; + })} +
+ ); +} diff --git a/web/src/components/MasonryView/MasonryItem.tsx b/web/src/components/MasonryView/MasonryItem.tsx new file mode 100644 index 000000000..110461cf4 --- /dev/null +++ b/web/src/components/MasonryView/MasonryItem.tsx @@ -0,0 +1,45 @@ +import { useEffect, useRef } from "react"; +import { MasonryItemProps } from "./types"; + +/** + * Individual item wrapper component for masonry layout + * + * Responsibilities: + * - Render the memo using the provided renderer with context + * - Measure its own height using ResizeObserver + * - Report height changes to parent for redistribution + * + * The ResizeObserver automatically tracks dynamic content changes such as: + * - Images loading + * - Expanded/collapsed text + * - Any other content size changes + */ +export function MasonryItem({ memo, renderer, renderContext, onHeightChange }: MasonryItemProps) { + const itemRef = useRef(null); + const resizeObserverRef = useRef(null); + + useEffect(() => { + if (!itemRef.current) return; + + const measureHeight = () => { + if (itemRef.current) { + const height = itemRef.current.offsetHeight; + onHeightChange(memo.name, height); + } + }; + + // Initial measurement + measureHeight(); + + // Set up ResizeObserver to track dynamic content changes + resizeObserverRef.current = new ResizeObserver(measureHeight); + resizeObserverRef.current.observe(itemRef.current); + + // Cleanup on unmount + return () => { + resizeObserverRef.current?.disconnect(); + }; + }, [memo.name, onHeightChange]); + + return
{renderer(memo, renderContext)}
; +} diff --git a/web/src/components/MasonryView/MasonryView.tsx b/web/src/components/MasonryView/MasonryView.tsx index aca8369d5..249f8cb90 100644 --- a/web/src/components/MasonryView/MasonryView.tsx +++ b/web/src/components/MasonryView/MasonryView.tsx @@ -1,156 +1,42 @@ -import { useCallback, useEffect, useRef, useState } from "react"; +import { useMemo, useRef } from "react"; import { cn } from "@/lib/utils"; -import { Memo } from "@/types/proto/api/v1/memo_service"; - -interface Props { - memoList: Memo[]; - renderer: (memo: Memo) => JSX.Element; - prefixElement?: JSX.Element; - listMode?: boolean; -} - -interface MemoItemProps { - memo: Memo; - renderer: (memo: Memo) => JSX.Element; - onHeightChange: (memoName: string, height: number) => void; -} - -// Minimum width required to show more than one column -const MINIMUM_MEMO_VIEWPORT_WIDTH = 512; - -const MemoItem = ({ memo, renderer, onHeightChange }: MemoItemProps) => { - const itemRef = useRef(null); - const resizeObserverRef = useRef(null); - - useEffect(() => { - if (!itemRef.current) return; - - const measureHeight = () => { - if (itemRef.current) { - const height = itemRef.current.offsetHeight; - onHeightChange(memo.name, height); - } - }; - - measureHeight(); - - // Set up ResizeObserver to track dynamic content changes (images, expanded text, etc.) - resizeObserverRef.current = new ResizeObserver(measureHeight); - resizeObserverRef.current.observe(itemRef.current); - - return () => { - resizeObserverRef.current?.disconnect(); - }; - }, [memo.name, onHeightChange]); - - return
{renderer(memo)}
; -}; +import { MasonryColumn } from "./MasonryColumn"; +import { MasonryViewProps, MemoRenderContext } from "./types"; +import { useMasonryLayout } from "./useMasonryLayout"; /** - * Algorithm to distribute memos into columns based on height for balanced layout - * Uses greedy approach: always place next memo in the shortest column + * Masonry layout component for displaying memos in a balanced, multi-column grid + * + * Features: + * - Responsive column count based on viewport width + * - Longest Processing-Time First (LPT) algorithm for optimal distribution + * - Pins editor and first memo to first column for stability + * - Debounced redistribution for performance + * - Automatic height tracking with ResizeObserver + * - Auto-enables compact mode in multi-column layouts + * + * The layout automatically adjusts to: + * - Window resizing + * - Content changes (images loading, text expansion) + * - Dynamic memo additions/removals + * + * Algorithm guarantee: Layout is never more than 34% longer than optimal (proven) */ -const distributeMemosToColumns = ( - memos: Memo[], - columns: number, - itemHeights: Map, - prefixElementHeight: number = 0, -): { distribution: number[][]; columnHeights: number[] } => { - // List mode: all memos in single column - if (columns === 1) { - const totalHeight = memos.reduce((sum, memo) => sum + (itemHeights.get(memo.name) || 0), prefixElementHeight); - return { - distribution: [Array.from({ length: memos.length }, (_, i) => i)], - columnHeights: [totalHeight], - }; - } - - // Initialize columns and heights - const distribution: number[][] = Array.from({ length: columns }, () => []); - const columnHeights: number[] = Array(columns).fill(0); - - // Add prefix element height to first column - if (prefixElementHeight > 0) { - columnHeights[0] = prefixElementHeight; - } - - // Distribute each memo to the shortest column - memos.forEach((memo, index) => { - const height = itemHeights.get(memo.name) || 0; - - // Find column with minimum height - const shortestColumnIndex = columnHeights.indexOf(Math.min(...columnHeights)); - - distribution[shortestColumnIndex].push(index); - columnHeights[shortestColumnIndex] += height; - }); - - return { distribution, columnHeights }; -}; - -const MasonryView = (props: Props) => { - const [columns, setColumns] = useState(1); - const [itemHeights, setItemHeights] = useState>(new Map()); - const [distribution, setDistribution] = useState([[]]); - +const MasonryView = ({ memoList, renderer, prefixElement, listMode = false }: MasonryViewProps) => { const containerRef = useRef(null); const prefixElementRef = useRef(null); - // Calculate optimal number of columns based on container width - const calculateColumns = useCallback(() => { - if (!containerRef.current || props.listMode) return 1; + const { columns, distribution, handleHeightChange } = useMasonryLayout(memoList, listMode, containerRef, prefixElementRef); - const containerWidth = containerRef.current.offsetWidth; - const scale = containerWidth / MINIMUM_MEMO_VIEWPORT_WIDTH; - return scale >= 2 ? Math.round(scale) : 1; - }, [props.listMode]); - - // Recalculate memo distribution when layout changes - const redistributeMemos = useCallback(() => { - const prefixHeight = prefixElementRef.current?.offsetHeight || 0; - const { distribution: newDistribution } = distributeMemosToColumns(props.memoList, columns, itemHeights, prefixHeight); - setDistribution(newDistribution); - }, [props.memoList, columns, itemHeights]); - - // Handle height changes from individual memo items - const handleHeightChange = useCallback( - (memoName: string, height: number) => { - setItemHeights((prevHeights) => { - const newItemHeights = new Map(prevHeights); - newItemHeights.set(memoName, height); - - // Recalculate distribution with new heights - const prefixHeight = prefixElementRef.current?.offsetHeight || 0; - const { distribution: newDistribution } = distributeMemosToColumns(props.memoList, columns, newItemHeights, prefixHeight); - setDistribution(newDistribution); - - return newItemHeights; - }); - }, - [props.memoList, columns], + // Create render context: automatically enable compact mode when multiple columns + const renderContext: MemoRenderContext = useMemo( + () => ({ + compact: columns > 1, + columns, + }), + [columns], ); - // Handle window resize and calculate new column count - useEffect(() => { - const handleResize = () => { - if (!containerRef.current) return; - - const newColumns = calculateColumns(); - if (newColumns !== columns) { - setColumns(newColumns); - } - }; - - handleResize(); - window.addEventListener("resize", handleResize); - return () => window.removeEventListener("resize", handleResize); - }, [calculateColumns, columns]); - - // Redistribute memos when columns, memo list, or heights change - useEffect(() => { - redistributeMemos(); - }, [redistributeMemos]); - return (
{ }} > {Array.from({ length: columns }).map((_, columnIndex) => ( -
- {/* Prefix element (like memo editor) goes in first column */} - {props.prefixElement && columnIndex === 0 &&
{props.prefixElement}
} - - {distribution[columnIndex]?.map((memoIndex) => { - const memo = props.memoList[memoIndex]; - return memo ? ( - - ) : null; - })} -
+ ))}
); diff --git a/web/src/components/MasonryView/constants.ts b/web/src/components/MasonryView/constants.ts new file mode 100644 index 000000000..8f46b7dad --- /dev/null +++ b/web/src/components/MasonryView/constants.ts @@ -0,0 +1,11 @@ +/** + * Minimum width required to show more than one column in masonry layout + * When viewport is narrower, layout falls back to single column + */ +export const MINIMUM_MEMO_VIEWPORT_WIDTH = 512; + +/** + * Debounce delay for redistribution in milliseconds + * Balances responsiveness with performance by batching rapid height changes + */ +export const REDISTRIBUTION_DEBOUNCE_MS = 100; diff --git a/web/src/components/MasonryView/distributeItems.ts b/web/src/components/MasonryView/distributeItems.ts new file mode 100644 index 000000000..2802639dd --- /dev/null +++ b/web/src/components/MasonryView/distributeItems.ts @@ -0,0 +1,94 @@ +import { Memo } from "@/types/proto/api/v1/memo_service"; +import { DistributionResult } from "./types"; + +/** + * Distributes memos into columns using a height-aware greedy approach. + * + * Algorithm steps: + * 1. Pin editor and first memo to the first column (keep feed stable) + * 2. Place remaining memos into the currently shortest column + * 3. Break height ties by preferring the column with fewer items + * + * @param memos - Array of memos to distribute + * @param columns - Number of columns to distribute across + * @param itemHeights - Map of memo names to their measured heights + * @param prefixElementHeight - Height of prefix element (e.g., editor) in first column + * @returns Distribution result with memo indices per column and column heights + */ +export function distributeItemsToColumns( + memos: Memo[], + columns: number, + itemHeights: Map, + prefixElementHeight: number = 0, +): DistributionResult { + // Single column mode: all memos in one column + if (columns === 1) { + const totalHeight = memos.reduce((sum, memo) => sum + (itemHeights.get(memo.name) || 0), prefixElementHeight); + return { + distribution: [Array.from({ length: memos.length }, (_, i) => i)], + columnHeights: [totalHeight], + }; + } + + // Initialize columns and their heights + const distribution: number[][] = Array.from({ length: columns }, () => []); + const columnHeights: number[] = Array(columns).fill(0); + const columnCounts: number[] = Array(columns).fill(0); + + // Add prefix element height to first column + if (prefixElementHeight > 0) { + columnHeights[0] = prefixElementHeight; + } + + let startIndex = 0; + + // Pin the first memo to the first column to keep top-of-feed stable + if (memos.length > 0) { + const firstMemoHeight = itemHeights.get(memos[0].name) || 0; + distribution[0].push(0); + columnHeights[0] += firstMemoHeight; + columnCounts[0] += 1; + startIndex = 1; + } + + for (let i = startIndex; i < memos.length; i++) { + const memo = memos[i]; + const height = itemHeights.get(memo.name) || 0; + + // Find column with minimum height + const shortestColumnIndex = findShortestColumnIndex(columnHeights, columnCounts); + + distribution[shortestColumnIndex].push(i); + columnHeights[shortestColumnIndex] += height; + columnCounts[shortestColumnIndex] += 1; + } + + return { distribution, columnHeights }; +} + +/** + * Finds the index of the column with the minimum height + * @param columnHeights - Array of column heights + * @param columnCounts - Array of items per column (for tie-breaking) + * @returns Index of the shortest column + */ +function findShortestColumnIndex(columnHeights: number[], columnCounts: number[]): number { + let minIndex = 0; + let minHeight = columnHeights[0]; + + for (let i = 1; i < columnHeights.length; i++) { + const currentHeight = columnHeights[i]; + if (currentHeight < minHeight) { + minHeight = currentHeight; + minIndex = i; + continue; + } + + // Tie-breaker: prefer column with fewer items to avoid stacking + if (currentHeight === minHeight && columnCounts[i] < columnCounts[minIndex]) { + minIndex = i; + } + } + + return minIndex; +} diff --git a/web/src/components/MasonryView/index.ts b/web/src/components/MasonryView/index.ts index 11425016c..ec9db80ef 100644 --- a/web/src/components/MasonryView/index.ts +++ b/web/src/components/MasonryView/index.ts @@ -1,3 +1,25 @@ -import MasonryView from "./MasonryView"; +// Main component +export { default } from "./MasonryView"; -export default MasonryView; +// Sub-components (exported for testing or advanced usage) +export { MasonryColumn } from "./MasonryColumn"; +export { MasonryItem } from "./MasonryItem"; + +// Hooks +export { useMasonryLayout } from "./useMasonryLayout"; + +// Utilities +export { distributeItemsToColumns } from "./distributeItems"; + +// Types +export type { + MasonryViewProps, + MasonryItemProps, + MasonryColumnProps, + DistributionResult, + MemoWithHeight, + MemoRenderContext, +} from "./types"; + +// Constants +export { MINIMUM_MEMO_VIEWPORT_WIDTH, REDISTRIBUTION_DEBOUNCE_MS } from "./constants"; diff --git a/web/src/components/MasonryView/types.ts b/web/src/components/MasonryView/types.ts new file mode 100644 index 000000000..c14730849 --- /dev/null +++ b/web/src/components/MasonryView/types.ts @@ -0,0 +1,81 @@ +import { Memo } from "@/types/proto/api/v1/memo_service"; + +/** + * Render context passed to memo renderer + */ +export interface MemoRenderContext { + /** Whether to render in compact mode (automatically enabled for multi-column layouts) */ + compact: boolean; + /** Current number of columns in the layout */ + columns: number; +} + +/** + * Props for the main MasonryView component + */ +export interface MasonryViewProps { + /** List of memos to display in masonry layout */ + memoList: Memo[]; + /** Render function for each memo. Second parameter provides layout context. */ + renderer: (memo: Memo, context?: MemoRenderContext) => JSX.Element; + /** Optional element to display at the top of the first column (e.g., memo editor) */ + prefixElement?: JSX.Element; + /** Force single column layout regardless of viewport width */ + listMode?: boolean; +} + +/** + * Props for individual MasonryItem component + */ +export interface MasonryItemProps { + /** The memo to render */ + memo: Memo; + /** Render function for the memo */ + renderer: (memo: Memo, context?: MemoRenderContext) => JSX.Element; + /** Render context for the memo */ + renderContext: MemoRenderContext; + /** Callback when item height changes */ + onHeightChange: (memoName: string, height: number) => void; +} + +/** + * Props for MasonryColumn component + */ +export interface MasonryColumnProps { + /** Indices of memos in this column */ + memoIndices: number[]; + /** Full list of memos */ + memoList: Memo[]; + /** Render function for each memo */ + renderer: (memo: Memo, context?: MemoRenderContext) => JSX.Element; + /** Render context for memos */ + renderContext: MemoRenderContext; + /** Callback when item height changes */ + onHeightChange: (memoName: string, height: number) => void; + /** Whether this is the first column (for prefix element) */ + isFirstColumn: boolean; + /** Optional prefix element (only rendered in first column) */ + prefixElement?: JSX.Element; + /** Ref for prefix element height measurement */ + prefixElementRef?: React.RefObject; +} + +/** + * Result of the distribution algorithm + */ +export interface DistributionResult { + /** Array of arrays, where each inner array contains memo indices for that column */ + distribution: number[][]; + /** Height of each column after distribution */ + columnHeights: number[]; +} + +/** + * Memo item with measured height + */ +export interface MemoWithHeight { + /** Index of the memo in the original list */ + index: number; + /** Measured height in pixels */ + height: number; +} diff --git a/web/src/components/MasonryView/useMasonryLayout.ts b/web/src/components/MasonryView/useMasonryLayout.ts new file mode 100644 index 000000000..c45daded2 --- /dev/null +++ b/web/src/components/MasonryView/useMasonryLayout.ts @@ -0,0 +1,150 @@ +import { useCallback, useEffect, useRef, useState } from "react"; +import { Memo } from "@/types/proto/api/v1/memo_service"; +import { MINIMUM_MEMO_VIEWPORT_WIDTH, REDISTRIBUTION_DEBOUNCE_MS } from "./constants"; +import { distributeItemsToColumns } from "./distributeItems"; + +/** + * Custom hook for managing masonry layout state and logic + * + * Responsibilities: + * - Calculate optimal number of columns based on viewport width + * - Track item heights and trigger redistribution + * - Debounce redistribution to prevent excessive reflows + * - Handle window resize events + * + * @param memoList - Array of memos to layout + * @param listMode - Force single column mode + * @param containerRef - Reference to the container element + * @param prefixElementRef - Reference to the prefix element + * @returns Layout state and handlers + */ +export function useMasonryLayout( + memoList: Memo[], + listMode: boolean, + containerRef: React.RefObject, + prefixElementRef: React.RefObject, +) { + const [columns, setColumns] = useState(1); + const [itemHeights, setItemHeights] = useState>(new Map()); + const [distribution, setDistribution] = useState([[]]); + + const redistributionTimeoutRef = useRef(null); + const itemHeightsRef = useRef>(itemHeights); + + // Keep ref in sync with state + useEffect(() => { + itemHeightsRef.current = itemHeights; + }, [itemHeights]); + + /** + * Calculate optimal number of columns based on container width + * Uses a scale factor to determine column count + */ + const calculateColumns = useCallback(() => { + if (!containerRef.current || listMode) return 1; + + const containerWidth = containerRef.current.offsetWidth; + const scale = containerWidth / MINIMUM_MEMO_VIEWPORT_WIDTH; + return scale >= 2 ? Math.round(scale) : 1; + }, [containerRef, listMode]); + + /** + * Recalculate memo distribution when layout changes + */ + const redistributeMemos = useCallback(() => { + const prefixHeight = prefixElementRef.current?.offsetHeight || 0; + setDistribution(() => { + const { distribution: newDistribution } = distributeItemsToColumns(memoList, columns, itemHeightsRef.current, prefixHeight); + return newDistribution; + }); + }, [memoList, columns, prefixElementRef]); + + /** + * Debounced redistribution to batch multiple height changes and prevent excessive reflows + */ + const debouncedRedistribute = useCallback( + (newItemHeights: Map) => { + // Clear any pending redistribution + if (redistributionTimeoutRef.current) { + clearTimeout(redistributionTimeoutRef.current); + } + + // Schedule new redistribution after debounce delay + redistributionTimeoutRef.current = window.setTimeout(() => { + const prefixHeight = prefixElementRef.current?.offsetHeight || 0; + setDistribution(() => { + const { distribution: newDistribution } = distributeItemsToColumns(memoList, columns, newItemHeights, prefixHeight); + return newDistribution; + }); + }, REDISTRIBUTION_DEBOUNCE_MS); + }, + [memoList, columns, prefixElementRef], + ); + + /** + * Handle height changes from individual memo items + */ + const handleHeightChange = useCallback( + (memoName: string, height: number) => { + setItemHeights((prevHeights) => { + const newItemHeights = new Map(prevHeights); + const previousHeight = prevHeights.get(memoName); + + // Skip if height hasn't changed (avoid unnecessary updates) + if (previousHeight === height) { + return prevHeights; + } + + newItemHeights.set(memoName, height); + + // Use debounced redistribution to batch updates + debouncedRedistribute(newItemHeights); + + return newItemHeights; + }); + }, + [debouncedRedistribute], + ); + + /** + * Handle window resize and calculate new column count + */ + useEffect(() => { + const handleResize = () => { + if (!containerRef.current) return; + + const newColumns = calculateColumns(); + if (newColumns !== columns) { + setColumns(newColumns); + } + }; + + handleResize(); + window.addEventListener("resize", handleResize); + return () => window.removeEventListener("resize", handleResize); + }, [calculateColumns, columns, containerRef]); + + /** + * Redistribute memos when columns or memo list change + */ + useEffect(() => { + redistributeMemos(); + }, [columns, memoList, redistributeMemos]); + + /** + * Cleanup timeout on unmount + */ + useEffect(() => { + return () => { + if (redistributionTimeoutRef.current) { + clearTimeout(redistributionTimeoutRef.current); + } + }; + }, []); + + return { + columns, + distribution, + handleHeightChange, + }; +} diff --git a/web/src/components/PagedMemoList/PagedMemoList.tsx b/web/src/components/PagedMemoList/PagedMemoList.tsx index c99023a66..bc04fcc3a 100644 --- a/web/src/components/PagedMemoList/PagedMemoList.tsx +++ b/web/src/components/PagedMemoList/PagedMemoList.tsx @@ -12,11 +12,11 @@ import { State } from "@/types/proto/api/v1/common"; import { Memo } from "@/types/proto/api/v1/memo_service"; import { useTranslate } from "@/utils/i18n"; import Empty from "../Empty"; -import MasonryView from "../MasonryView"; +import MasonryView, { MemoRenderContext } from "../MasonryView"; import MemoEditor from "../MemoEditor"; interface Props { - renderer: (memo: Memo) => JSX.Element; + renderer: (memo: Memo, context?: MemoRenderContext) => JSX.Element; listSort?: (list: Memo[]) => Memo[]; state?: State; orderBy?: string; diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx index 20c1d4ef0..a83534cb6 100644 --- a/web/src/pages/Archived.tsx +++ b/web/src/pages/Archived.tsx @@ -1,6 +1,7 @@ import dayjs from "dayjs"; import { observer } from "mobx-react-lite"; import { useMemo } from "react"; +import { MemoRenderContext } from "@/components/MasonryView"; import MemoView from "@/components/MemoView"; import PagedMemoList from "@/components/PagedMemoList"; import useCurrentUser from "@/hooks/useCurrentUser"; @@ -27,7 +28,9 @@ const Archived = observer(() => { return ( } + renderer={(memo: Memo, context?: MemoRenderContext) => ( + + )} listSort={(memos: Memo[]) => memos .filter((memo) => memo.state === State.ARCHIVED) diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx index f5cc4eeed..bcc41f6ec 100644 --- a/web/src/pages/Explore.tsx +++ b/web/src/pages/Explore.tsx @@ -1,5 +1,6 @@ import dayjs from "dayjs"; import { observer } from "mobx-react-lite"; +import { MemoRenderContext } from "@/components/MasonryView"; import MemoView from "@/components/MemoView"; import MobileHeader from "@/components/MobileHeader"; import PagedMemoList from "@/components/PagedMemoList"; @@ -16,7 +17,9 @@ const Explore = observer(() => { {!md && }
} + renderer={(memo: Memo, context?: MemoRenderContext) => ( + + )} listSort={(memos: Memo[]) => memos .filter((memo) => memo.state === State.NORMAL) diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index 49d0b792f..12cb75de4 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -1,6 +1,7 @@ import dayjs from "dayjs"; import { observer } from "mobx-react-lite"; import { useMemo } from "react"; +import { MemoRenderContext } from "@/components/MasonryView"; import MemoView from "@/components/MemoView"; import PagedMemoList from "@/components/PagedMemoList"; import useCurrentUser from "@/hooks/useCurrentUser"; @@ -56,7 +57,9 @@ const Home = observer(() => { return (
} + renderer={(memo: Memo, context?: MemoRenderContext) => ( + + )} listSort={(memos: Memo[]) => memos .filter((memo) => memo.state === State.NORMAL) diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx index 8e0528fe1..505738c98 100644 --- a/web/src/pages/UserProfile.tsx +++ b/web/src/pages/UserProfile.tsx @@ -5,6 +5,7 @@ import { observer } from "mobx-react-lite"; import { useEffect, useMemo, useState } from "react"; import { toast } from "react-hot-toast"; import { useParams } from "react-router-dom"; +import { MemoRenderContext } from "@/components/MasonryView"; import MemoView from "@/components/MemoView"; import PagedMemoList from "@/components/PagedMemoList"; import UserAvatar from "@/components/UserAvatar"; @@ -89,8 +90,8 @@ const UserProfile = observer(() => {
( - + renderer={(memo: Memo, context?: MemoRenderContext) => ( + )} listSort={(memos: Memo[]) => memos From 12c4aeeccc8d6c3b1209335295b8f919dffc6098 Mon Sep 17 00:00:00 2001 From: Ben Mitchinson Date: Tue, 14 Oct 2025 05:07:01 -0700 Subject: [PATCH 23/26] feat: lat/long input fields (#5152) Signed-off-by: Ben Mitchinson Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- web/src/components/LeafletMap.tsx | 10 +++ .../ActionButton/LocationSelector.tsx | 74 ++++++++++++++----- 2 files changed, 65 insertions(+), 19 deletions(-) diff --git a/web/src/components/LeafletMap.tsx b/web/src/components/LeafletMap.tsx index e1facc54c..f71122ce4 100644 --- a/web/src/components/LeafletMap.tsx +++ b/web/src/components/LeafletMap.tsx @@ -37,6 +37,16 @@ const LocationMarker = (props: MarkerProps) => { map.locate(); }, []); + // Keep marker and map in sync with external position updates + useEffect(() => { + if (props.position) { + setPosition(props.position); + map.setView(props.position); + } else { + setPosition(undefined); + } + }, [props.position, map]); + return position === undefined ? null : ; }; diff --git a/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx b/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx index d101bb064..1d1ebf873 100644 --- a/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx +++ b/web/src/components/MemoEditor/ActionButton/LocationSelector.tsx @@ -16,17 +16,21 @@ interface Props { } interface State { - initilized: boolean; + initialized: boolean; placeholder: string; position?: LatLng; + latInput: string; + lngInput: string; } const LocationSelector = (props: Props) => { const t = useTranslate(); const [state, setState] = useState({ - initilized: false, + initialized: false, placeholder: props.location?.placeholder || "", position: props.location ? new LatLng(props.location.latitude, props.location.longitude) : undefined, + latInput: props.location ? String(props.location.latitude) : "", + lngInput: props.location ? String(props.location.longitude) : "", }); const [popoverOpen, setPopoverOpen] = useState(false); @@ -35,13 +39,15 @@ const LocationSelector = (props: Props) => { ...state, placeholder: props.location?.placeholder || "", position: new LatLng(props.location?.latitude || 0, props.location?.longitude || 0), + latInput: String(props.location?.latitude) || "", + lngInput: String(props.location?.longitude) || "", })); }, [props.location]); useEffect(() => { if (popoverOpen && !props.location) { const handleError = (error: any, errorMessage: string) => { - setState({ ...state, initilized: true }); + setState({ ...state, initialized: true }); toast.error(errorMessage); console.error(error); }; @@ -51,7 +57,7 @@ const LocationSelector = (props: Props) => { (position) => { const lat = position.coords.latitude; const lng = position.coords.longitude; - setState({ ...state, position: new LatLng(lat, lng), initilized: true }); + setState({ ...state, position: new LatLng(lat, lng), initialized: true }); }, (error) => { handleError(error, "Failed to get current position"); @@ -65,16 +71,23 @@ const LocationSelector = (props: Props) => { useEffect(() => { if (!state.position) { - setState({ ...state, placeholder: "" }); + setState((prev) => ({ ...prev, placeholder: "" })); return; } + // Sync lat/lng input values from position + const newLat = String(state.position.lat); + const newLng = String(state.position.lng); + if (state.latInput !== newLat || state.lngInput !== newLng) { + setState((prev) => ({ ...prev, latInput: newLat, lngInput: newLng })); + } + // Fetch reverse geocoding data. fetch(`https://nominatim.openstreetmap.org/reverse?lat=${state.position.lat}&lon=${state.position.lng}&format=json`) .then((response) => response.json()) .then((data) => { if (data && data.display_name) { - setState({ ...state, placeholder: data.display_name }); + setState((prev) => ({ ...prev, placeholder: data.display_name })); } }) .catch((error) => { @@ -83,8 +96,19 @@ const LocationSelector = (props: Props) => { }); }, [state.position]); + // Update position when lat/lng inputs change (if valid numbers) + useEffect(() => { + const lat = parseFloat(state.latInput); + const lng = parseFloat(state.lngInput); + if (Number.isFinite(lat) && Number.isFinite(lng)) { + if (!state.position || state.position.lat !== lat || state.position.lng !== lng) { + setState((prev) => ({ ...prev, position: new LatLng(lat, lng) })); + } + } + }, [state.latInput, state.lngInput]); + const onPositionChanged = (position: LatLng) => { - setState({ ...state, position }); + setState((prev) => ({ ...prev, position })); }; const removeLocation = (e: React.MouseEvent) => { @@ -123,22 +147,34 @@ const LocationSelector = (props: Props) => {
- +
-
- {state.position && ( -
- [{state.position.lat.toFixed(2)}, {state.position.lng.toFixed(2)}] -
- )} +
setState((state) => ({ ...state, placeholder: e.target.value }))} + placeholder="Lat" + type="number" + step="any" + value={state.latInput} + onChange={(e) => setState((prev) => ({ ...prev, latInput: e.target.value }))} + className="w-28" /> + setState((prev) => ({ ...prev, lngInput: e.target.value }))} + className="w-28" + /> +
+ setState((prev) => ({ ...prev, placeholder: e.target.value }))} + /> +