Merge branch 'master' into 646

MAIF · Oct 1, 2024 · fe21305 · fe21305
2 parents bed84fd + bfa0dc9
commit fe21305
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -18,9 +18,9 @@ export function ApiIssue({
   const [api, setRootApi] = useState<IApi>();
 
   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)

diff --git 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 = ({ }) => {
             <div className="mb-1 block__category">{translate('settings')}</div>
             <div className="ms-2 block__entries block__border d-flex flex-column">
               <Link to="/settings/settings/general" className="block__entry__link">
-                {tenant.name} {translate('settings')}
+                {tenant.name}
               </Link>
               {connectedUser.isDaikokuAdmin && (
                 <Link to="/settings/tenants" className="block__entry__link">

diff --git 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;