From 3d4c6f6b70193c44d704239a79f9bf22c92c06e8 Mon Sep 17 00:00:00 2001 From: baudelotphilippe Date: Thu, 26 Sep 2024 11:43:02 +0200 Subject: [PATCH 1/3] fix the tenant label cut --- daikoku/javascript/src/style/layout/navbar.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daikoku/javascript/src/style/layout/navbar.scss b/daikoku/javascript/src/style/layout/navbar.scss index 85e4b99da..365711a80 100644 --- a/daikoku/javascript/src/style/layout/navbar.scss +++ b/daikoku/javascript/src/style/layout/navbar.scss @@ -233,10 +233,10 @@ a.navbar-brand, flex-direction: column; .companion-title { - min-height: 40px; + // min-height: 40px; margin-bottom: 1rem; - overflow: hidden; - text-overflow: ellipsis; + // overflow: hidden; + // text-overflow: ellipsis; white-space: nowrap; line-height: 1.14286; color: $companion_text-color; From 4717fe171ce22e1989e770aa4363a3fd89dc232f Mon Sep 17 00:00:00 2001 From: baudelotphilippe Date: Thu, 26 Sep 2024 11:43:41 +0200 Subject: [PATCH 2/3] fix problem with translation order (remove settings) --- .../src/components/utils/sidebar/panels/SettingsPanel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daikoku/javascript/src/components/utils/sidebar/panels/SettingsPanel.tsx b/daikoku/javascript/src/components/utils/sidebar/panels/SettingsPanel.tsx index 5f6ff605c..5e527a7c2 100644 --- a/daikoku/javascript/src/components/utils/sidebar/panels/SettingsPanel.tsx +++ b/daikoku/javascript/src/components/utils/sidebar/panels/SettingsPanel.tsx @@ -78,7 +78,7 @@ export const SettingsPanel = ({ }) => {
{translate('settings')}
- {tenant.name} {translate('settings')} + {tenant.name} {connectedUser.isDaikokuAdmin && ( From bfa0dc9d8adb98fb9b13de4ed36e3357a4f6b850 Mon Sep 17 00:00:00 2001 From: baudelotphilippe Date: Thu, 26 Sep 2024 13:48:09 +0200 Subject: [PATCH 3/3] fix translation on Select --- .../src/components/frontend/api/issues/ApiFilter.tsx | 2 +- .../src/components/frontend/api/issues/ApiIssue.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daikoku/javascript/src/components/frontend/api/issues/ApiFilter.tsx b/daikoku/javascript/src/components/frontend/api/issues/ApiFilter.tsx index 9ea27c7dc..97bf7c6d1 100644 --- a/daikoku/javascript/src/components/frontend/api/issues/ApiFilter.tsx +++ b/daikoku/javascript/src/components/frontend/api/issues/ApiFilter.tsx @@ -99,7 +99,7 @@ export function ApiFilter({ const options: readonly VersionOption[] = [ ...availableApiVersions.map((iss) => ({ value: iss, label: `Version : ${iss}` })), - { value: 'all version', label: 'All version' }, + { value: 'all version', label: `${translate('All version')}` }, ] return ( diff --git a/daikoku/javascript/src/components/frontend/api/issues/ApiIssue.tsx b/daikoku/javascript/src/components/frontend/api/issues/ApiIssue.tsx index 170397e30..d7ca15846 100644 --- a/daikoku/javascript/src/components/frontend/api/issues/ApiIssue.tsx +++ b/daikoku/javascript/src/components/frontend/api/issues/ApiIssue.tsx @@ -18,9 +18,9 @@ export function ApiIssue({ const [api, setRootApi] = useState(); const [filter, setFilter] = useState('open'); - const [selectedVersion, setSelectedVersion] = useState({ value: 'all version', label: 'All version' }); - const { translate } = useContext(I18nContext); + + const [selectedVersion, setSelectedVersion] = useState({ value: 'all version', label: `${translate('All version')}` }); useEffect(() => { Services.getRootApi(props.api._humanReadableId)