From 52acc9de90b1cd43ce00098353b2fbd5b829f11b Mon Sep 17 00:00:00 2001 From: Maksim Eltyshev Date: Mon, 8 Dec 2025 21:25:13 +0100 Subject: [PATCH] feat: Allow setting customer panel URL via environment variables --- .../common/AdministrationModal/SmtpPane.jsx | 2 +- .../components/users/UserStep/UserStep.jsx | 31 +++++++++++++++---- client/src/locales/ar-YE/core.js | 1 + client/src/locales/bg-BG/core.js | 1 + client/src/locales/ca-ES/core.js | 1 + client/src/locales/cs-CZ/core.js | 1 + client/src/locales/da-DK/core.js | 1 + client/src/locales/de-DE/core.js | 1 + client/src/locales/el-GR/core.js | 1 + client/src/locales/en-GB/core.js | 1 + client/src/locales/en-US/core.js | 1 + client/src/locales/es-ES/core.js | 1 + client/src/locales/et-EE/core.js | 1 + client/src/locales/fa-IR/core.js | 1 + client/src/locales/fi-FI/core.js | 1 + client/src/locales/fr-FR/core.js | 1 + client/src/locales/hu-HU/core.js | 1 + client/src/locales/id-ID/core.js | 1 + client/src/locales/it-IT/core.js | 1 + client/src/locales/ja-JP/core.js | 1 + client/src/locales/ko-KR/core.js | 1 + client/src/locales/nl-NL/core.js | 1 + client/src/locales/pl-PL/core.js | 1 + client/src/locales/pt-BR/core.js | 1 + client/src/locales/pt-PT/core.js | 1 + client/src/locales/ro-RO/core.js | 1 + client/src/locales/ru-RU/core.js | 1 + client/src/locales/sk-SK/core.js | 1 + client/src/locales/sr-Cyrl-RS/core.js | 1 + client/src/locales/sr-Latn-RS/core.js | 1 + client/src/locales/sv-SE/core.js | 1 + client/src/locales/tr-TR/core.js | 1 + client/src/locales/uk-UA/core.js | 1 + client/src/locales/uz-UZ/core.js | 1 + client/src/locales/zh-CN/core.js | 1 + client/src/locales/zh-TW/core.js | 1 + docker-compose-dev.yml | 1 + docker-compose.yml | 1 + server/.env.sample | 1 + server/api/controllers/bootstrap/show.js | 5 +++ server/api/helpers/bootstrap/present-one.js | 5 ++- server/config/custom.js | 1 + 42 files changed, 73 insertions(+), 8 deletions(-) diff --git a/client/src/components/common/AdministrationModal/SmtpPane.jsx b/client/src/components/common/AdministrationModal/SmtpPane.jsx index 9db6649f..2c0e9260 100644 --- a/client/src/components/common/AdministrationModal/SmtpPane.jsx +++ b/client/src/components/common/AdministrationModal/SmtpPane.jsx @@ -44,7 +44,7 @@ const SmtpPane = React.memo(() => { const [data, handleFieldChange] = useForm(() => ({ ...defaultData, smtpHost: defaultData.smtpHost || '', - smtpPort: defaultData.smtpPort || '', + smtpPort: defaultData.smtpPort === null ? '' : `${defaultData.smtpPort}`, smtpName: defaultData.smtpName || '', smtpSecure: defaultData.smtpSecure, smtpTlsRejectUnauthorized: defaultData.smtpTlsRejectUnauthorized, diff --git a/client/src/components/users/UserStep/UserStep.jsx b/client/src/components/users/UserStep/UserStep.jsx index de561600..0e043f87 100755 --- a/client/src/components/users/UserStep/UserStep.jsx +++ b/client/src/components/users/UserStep/UserStep.jsx @@ -19,6 +19,10 @@ import styles from './UserStep.module.scss'; const UserStep = React.memo(({ onClose }) => { const isLogouting = useSelector(selectors.selectIsLogouting); + const customerPanelUrl = useSelector( + (state) => selectors.selectBootstrap(state).customerPanelUrl, + ); + const withAdministration = useSelector( (state) => selectors.selectCurrentUser(state).role === UserRoles.ADMIN, ); @@ -67,12 +71,27 @@ const UserStep = React.memo(({ onClose }) => { })} {withAdministration && ( - - - {t('common.administration', { - context: 'title', - })} - + <> + + + {t('common.administration', { + context: 'title', + })} + + {customerPanelUrl && ( + + + {t('common.customerPanel', { + context: 'title', + })} + + )} + )}