BACKLOG-23514: fixed language switch not showing (#91)

Author: GauBen

src/server/layouts/MainLayout.jsx

@@ -1,23 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {HtmlFooter, HtmlHead} from '../components';
-import {AbsoluteArea, AddResources} from '@jahia/javascript-modules-library';
-
-// Const navMenu = {
-//     name: 'navMenu',
-//     nodeType: 'luxe:navMenu',
-//     mixins: ['jmix:renderable'],
-//     properties: {
-//         base: 'home',
-//         maxDepth: '2',
-//         startLevel: '0',
-//         menuItemView: 'menuElement'
-//     }
-// };
+import {AbsoluteArea, AddResources, useUrlBuilder} from '@jahia/javascript-modules-library';
 
 export const MainLayout = ({head, className, children}) => {
-    // Const {renderContext} = useServerContext();
-    // navMainArea.path = `/sites/${renderContext.getSite().getName()}`;
+    const {buildStaticUrl} = useUrlBuilder();
+    const bootstrap = buildStaticUrl({assetPath: 'javascript/bootstrap.bundle.min.js'});
     return (
         <>
             <HtmlHead>
@@ -29,7 +17,7 @@ export const MainLayout = ({head, className, children}) => {
                     {children}
                 </main>
                 <HtmlFooter/>
-                <AddResources type="javascript" resources="bootstrap.bundle.min.js"/>
+                <AddResources type="javascript" resources={bootstrap}/>
             </body>
         </>
     );

src/server/views/navMenu/LanguageSwitcher.jsx

@@ -4,13 +4,12 @@ import clsx from 'clsx';
 
 const getSiteLanguageAsLocales = renderContext => {
     const site = renderContext.getSite();
-    switch (true) {
-        case renderContext.isLiveMode():
-            return site.getActiveLiveLanguagesAsLocales().toArray();
 
-        default:
-            return site.getLanguagesAsLocales().toArray();
+    if (renderContext.isLiveMode()) {
+        return site.getActiveLiveLanguagesAsLocales().toArray();
     }
+
+    return site.getLanguagesAsLocales().toArray();
 };
 
 export const LanguageSwitcher = () => {
@@ -32,7 +31,7 @@ export const LanguageSwitcher = () => {
             >
                 {currentLocaleName}
             </button>
-            <ul className="dropdown-menu">
+            <ul className="dropdown-menu dropdown-menu-end">
                 {siteLocales?.map(locale => {
                     const localeCode = locale.getLanguage();
                     const localeName = locale.getDisplayLanguage(locale);