From 17827c2c30b39b93b3d8589c9836dece02fad001 Mon Sep 17 00:00:00 2001 From: YANG QIA <2013xile@gmail.com> Date: Fri, 6 Sep 2024 22:34:42 +0800 Subject: [PATCH 1/4] fix(users): remove phone validation when editing user phones in user management (#5221) --- .../plugins/@nocobase/plugin-users/src/client/schemas/users.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts index 25bf19fac2..9241c489ff 100644 --- a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts +++ b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts @@ -376,7 +376,6 @@ export const usersSchema: ISchema = { phone: { title: '{{t("Phone")}}', 'x-component': 'Input', - 'x-validator': 'phone', 'x-decorator': 'FormItem', required: false, }, From 03be3e7c77755849d860e819784084e028a8dddd Mon Sep 17 00:00:00 2001 From: xilesun <2013xile@gmail.com> Date: Fri, 6 Sep 2024 22:40:18 +0800 Subject: [PATCH 2/4] fix(users): remove phone validation --- .../plugins/@nocobase/plugin-users/src/client/schemas/users.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts index 9241c489ff..629d9478d2 100644 --- a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts +++ b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts @@ -69,7 +69,6 @@ export const userCollection = { type: 'string', title: '{{t("Phone")}}', 'x-component': 'Input', - 'x-validator': 'phone', required: true, }, }, @@ -213,7 +212,6 @@ export const usersSchema: ISchema = { phone: { title: '{{t("Phone")}}', 'x-component': 'Input', - 'x-validator': 'phone', 'x-decorator': 'FormItem', required: false, }, From 96ce57addeb5224b2d894b61060af77d901c2ada Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:45:57 +0800 Subject: [PATCH 3/4] chore(deps): bump multer and @types/multer (#5173) * chore(deps): bump multer and @types/multer Bumps [multer](https://github.com/expressjs/multer) and [@types/multer](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/multer). These dependencies needed to be updated together. Updates `multer` from 1.4.4 to 1.4.5-lts.1 - [Changelog](https://github.com/expressjs/multer/blob/v1.4.5-lts.1/CHANGELOG.md) - [Commits](https://github.com/expressjs/multer/compare/v1.4.4...v1.4.5-lts.1) Updates `@types/multer` from 1.4.11 to 1.4.12 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/multer) --- updated-dependencies: - dependency-name: multer dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: "@types/multer" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore(e2e): make e2e more stable --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zeke Zhang <958414905@qq.com> --- .../form/__e2e__/schemaInitializer.test.ts | 2 +- yarn.lock | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/core/client/src/modules/blocks/filter-blocks/form/__e2e__/schemaInitializer.test.ts b/packages/core/client/src/modules/blocks/filter-blocks/form/__e2e__/schemaInitializer.test.ts index c348f5316a..74e4ec18e4 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/form/__e2e__/schemaInitializer.test.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/form/__e2e__/schemaInitializer.test.ts @@ -105,7 +105,7 @@ test.describe('configure fields', () => { }); // expect: should only display the record with the `root` role - await expect(page.getByRole('button', { name: 'root,admin,member' })).toBeVisible(); + await expect(page.getByRole('button', { name: 'root' })).toBeVisible(); await expect(page.getByRole('button', { name: record.roles.map((item) => item.name).join(',') })).not.toBeVisible(); }); diff --git a/yarn.lock b/yarn.lock index 2e0105ffc4..d12b7c24a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5493,10 +5493,10 @@ resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.14.0.tgz#9bc39a5a3a71b81bdb310eba6def5bc3966695b7" integrity sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A== -"@remix-run/router@1.19.0": - version "1.19.0" - resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.0.tgz#745dbffbce67f05386d57ca22c51dfd85c979593" - integrity sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA== +"@remix-run/router@1.19.1": + version "1.19.1" + resolved "https://registry.npmmirror.com/@remix-run/router/-/router-1.19.1.tgz#984771bfd1de2715f42394c87fb716c1349e014f" + integrity sha512-S45oynt/WH19bHbIXjtli6QmwNYvaz+vtnubvNpNDvUOoA/OWh6j1OikIP3G+v5GHdxyC6EXoChG3HgYGEUfcg== "@restart/hooks@^0.4.7": version "0.4.15" @@ -7021,9 +7021,9 @@ integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== "@types/multer@^1.4.5": - version "1.4.11" - resolved "https://registry.npmmirror.com/@types/multer/-/multer-1.4.11.tgz#c70792670513b4af1159a2b60bf48cc932af55c5" - integrity sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w== + version "1.4.12" + resolved "https://registry.npmmirror.com/@types/multer/-/multer-1.4.12.tgz#da67bd0c809f3a63fe097c458c0d4af1fea50ab7" + integrity sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg== dependencies: "@types/express" "*" @@ -22591,11 +22591,11 @@ react-router-dom@6.3.0, react-router-dom@6.x, react-router-dom@^6.11.2, react-ro react-router "6.21.0" react-router@6.21.0, react-router@6.3.0, react-router@^6.11.2: - version "6.26.0" - resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.0.tgz#d5af4c46835b202348ef2b7ddacd32a2db539fde" - integrity sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg== + version "6.26.1" + resolved "https://registry.npmmirror.com/react-router/-/react-router-6.26.1.tgz#88c64837e05ffab6899a49df2a1484a22471e4ce" + integrity sha512-kIwJveZNwp7teQRI5QmwWo39A5bXRyqpH0COKKmPnyD2vBvDwgFXSqDUYtt1h+FEyfnE8eXr7oe0MxRzVwCcvQ== dependencies: - "@remix-run/router" "1.19.0" + "@remix-run/router" "1.19.1" react-side-effect@^2.1.0: version "2.1.2" From 07ed06b10eef86e089c5c756bd4461ef6ee7aa37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:57:21 +0800 Subject: [PATCH 4/4] chore(deps): bump react-intersection-observer from 9.8.1 to 9.13.0 (#5171) Bumps [react-intersection-observer](https://github.com/thebuilder/react-intersection-observer) from 9.8.1 to 9.13.0. - [Release notes](https://github.com/thebuilder/react-intersection-observer/releases) - [Commits](https://github.com/thebuilder/react-intersection-observer/compare/v9.8.1...v9.13.0) --- updated-dependencies: - dependency-name: react-intersection-observer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/core/client/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 66405dcc63..e5021fa952 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -57,7 +57,7 @@ "react-i18next": "^11.15.1", "react-iframe": "~1.8.5", "react-image-lightbox": "^5.1.4", - "react-intersection-observer": "9.8.1", + "react-intersection-observer": "9.13.0", "react-js-cron": "^3.1.0", "react-quill": "^2.0.0", "react-router-dom": "^6.11.2", diff --git a/yarn.lock b/yarn.lock index d12b7c24a7..9c5b9e35b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22481,10 +22481,10 @@ react-image-lightbox@^5.1.4: prop-types "^15.7.2" react-modal "^3.11.1" -react-intersection-observer@9.8.1, react-intersection-observer@^9.8.1: - version "9.8.1" - resolved "https://registry.npmmirror.com/react-intersection-observer/-/react-intersection-observer-9.8.1.tgz#9c3631c0c9acd624a2af1c192318752ea73b5d91" - integrity sha512-QzOFdROX8D8MH3wE3OVKH0f3mLjKTtEN1VX/rkNuECCff+aKky0pIjulDhr3Ewqj5el/L+MhBkM3ef0Tbt+qUQ== +react-intersection-observer@9.13.0, react-intersection-observer@^9.8.1: + version "9.13.0" + resolved "https://registry.npmmirror.com/react-intersection-observer/-/react-intersection-observer-9.13.0.tgz#ee10827954cf6ccc204d027f8400a6ddb8df163a" + integrity sha512-y0UvBfjDiXqC8h0EWccyaj4dVBWMxgEx0t5RGNzQsvkfvZwugnKwxpu70StY4ivzYuMajavwUDjH4LJyIki9Lw== react-intl@^6.4.4: version "6.5.5"