From e8ca23c3900c6e41d20c8807e46a3815d3187a98 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 18 Apr 2023 11:27:55 -0700 Subject: [PATCH 1/2] update mysql min versino to 5.7 --- scripts/check-db.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-db.js b/scripts/check-db.js index f4913e5d..08045390 100644 --- a/scripts/check-db.js +++ b/scripts/check-db.js @@ -53,7 +53,7 @@ async function checkDatabaseVersion(databaseType) { const query = await prisma.$queryRaw`select version() version`; const version = semver.valid(semver.coerce(query[0].version)); - const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.6.0'; + const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.7.0'; if (semver.lt(version, minVersion)) { throw new Error( From 0889542f3bfc49f21746d23faa618b4ca80743cc Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 18 Apr 2023 16:00:33 -0700 Subject: [PATCH 2/2] fix minimum password length message --- components/pages/settings/profile/PasswordEditForm.js | 4 ++-- components/pages/settings/users/UserEditForm.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/pages/settings/profile/PasswordEditForm.js b/components/pages/settings/profile/PasswordEditForm.js index 4ea934b0..5b29cfc8 100644 --- a/components/pages/settings/profile/PasswordEditForm.js +++ b/components/pages/settings/profile/PasswordEditForm.js @@ -37,7 +37,7 @@ export default function PasswordEditForm({ onSave, onClose }) { name="newPassword" rules={{ required: 'Required', - minLength: { value: 8, message: formatMessage(messages.minPasswordLength) }, + minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: 8 }) }, }} > @@ -48,7 +48,7 @@ export default function PasswordEditForm({ onSave, onClose }) { name="confirmPassword" rules={{ required: formatMessage(labels.required), - minLength: { value: 8, message: formatMessage(messages.minPasswordLength) }, + minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: 8 }) }, validate: samePassword, }} > diff --git a/components/pages/settings/users/UserEditForm.js b/components/pages/settings/users/UserEditForm.js index 49df4b24..373d1dbe 100644 --- a/components/pages/settings/users/UserEditForm.js +++ b/components/pages/settings/users/UserEditForm.js @@ -48,7 +48,7 @@ export default function UserEditForm({ userId, data, onSave }) {