@orsetra/shared-ui 1.9.0 → 1.9.2

package/components/layout/layout-container.tsx

@@ -4,7 +4,7 @@ import { useState, useEffect } from "react"
 import { usePathname, useSearchParams, useParams } from "next/navigation"
 import { MainSidebar, type SidebarMode } from "./sidebar/main-sidebar"
 import { Sidebar, SidebarProvider, useSidebar } from "./sidebar/sidebar"
-import { type SidebarMenus, type MainMenuItem, resolveIcon } from "./sidebar/data"
+import { type SidebarMenus, type MainMenuItem, type SidebarMenuMeta, resolveIcon } from "./sidebar/data"
 import { Button } from "../ui"
 import { Logo } from "../ui/logo"
 import { getMenuFromPath } from "../../lib/menu-utils"
@@ -50,6 +50,7 @@ function LayoutContent({
   const [mainMenuItems, setMainMenuItems] = useState<MainMenuItem[]>([])
   const [fetchedSidebarMenus, setFetchedSidebarMenus] = useState<SidebarMenus>({})
   const [sectionLabels, setSectionLabels] = useState<Record<string, string>>({})
+  const [sidebarMenuMeta, setSidebarMenuMeta] = useState<Record<string, SidebarMenuMeta>>({})
 
   useEffect(() => {
     if (!fetchMenus) return
@@ -69,6 +70,7 @@ function LayoutContent({
 
       const menus: SidebarMenus = {}
       const labels: Record<string, string> = {}
+      const meta: Record<string, SidebarMenuMeta> = {}
       Object.entries(subMenus).forEach(([key, subMenu]) => {
         menus[key] = subMenu.items.map((item) => ({
           id: item.id,
@@ -78,9 +80,11 @@ function LayoutContent({
           icon: resolveIcon(item.icon),
         }))
         labels[key] = subMenu.header
+        meta[key] = { header: subMenu.header, description: subMenu.description }
       })
       setFetchedSidebarMenus(menus)
       setSectionLabels(labels)
+      setSidebarMenuMeta(meta)
     })
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
@@ -148,6 +152,7 @@ function LayoutContent({
           mode={isHidden ? "expanded" : mode}
           sidebarMenus={effectiveSidebarMenus}
           mainMenuItems={mainMenuItems}
+          sidebarMenuMeta={sidebarMenuMeta}
         />
 
         <main className="flex-1 bg-ibm-gray-10 min-h-0 overflow-auto">

package/components/layout/sidebar/data.tsx

@@ -88,9 +88,15 @@ export interface ApiSubMenuItem {
 }
 
 export interface ApiSubMenu {
-  id: string
-  header: string
-  items: ApiSubMenuItem[]
+  id:           string
+  header:       string
+  description?: string
+  items:        ApiSubMenuItem[]
+}
+
+export interface SidebarMenuMeta {
+  header?:      string
+  description?: string
 }
 
 export interface ApiMenuData {

package/components/layout/sidebar/main-sidebar-flyout.tsx

@@ -3,13 +3,24 @@
 import * as React from "react"
 import { cn } from "../../../lib/utils"
 import type { MainMenuItem, SubMenuItem } from "./data"
+import { Home, ExternalLink, type LucideIcon } from "lucide-react"
+
+export interface FlyoutDefaultLink {
+  label:        string
+  href:         string
+  description?: string
+  icon?:        LucideIcon
+}
 
 interface MainSidebarFlyoutProps {
-  item: MainMenuItem
-  /** Sub-items with hrefs already resolved by the parent */
-  subItems: SubMenuItem[]
-  onMouseEnter: () => void
-  onMouseLeave: () => void
+  item:                MainMenuItem | null
+  subItems:            SubMenuItem[]
+  onMouseEnter:        () => void
+  onMouseLeave:        () => void
+  main_base_url?:      string
+  defaultTitle?:       string
+  defaultDescription?: string
+  defaultLinks?:       FlyoutDefaultLink[]
 }
 
 export function MainSidebarFlyout({
@@ -17,8 +28,21 @@ export function MainSidebarFlyout({
   subItems,
   onMouseEnter,
   onMouseLeave,
+  main_base_url = "/",
+  defaultTitle = "Camel X Platform",
+  defaultDescription,
+  defaultLinks = [],
 }: MainSidebarFlyoutProps) {
-  const Icon = item.icon
+  const homePath = React.useMemo(() => {
+    if (!main_base_url) return "/"
+    try {
+      return (main_base_url.startsWith("http://") || main_base_url.startsWith("https://"))
+        ? new URL(main_base_url).pathname
+        : main_base_url
+    } catch {
+      return "/"
+    }
+  }, [main_base_url])
 
   return (
     <div
@@ -26,46 +50,98 @@ export function MainSidebarFlyout({
       onMouseLeave={onMouseLeave}
       className="h-full flex flex-col flex-shrink-0 overflow-hidden bg-gray-50 border-r border-ui-border shadow-[4px_0_20px_-4px_rgba(0,0,0,0.10)] w-72 lg:w-80"
     >
-      {/* ── Section header ───────────────────────────────────────────────────── */}
-      <div className="flex items-center px-4 lg:px-5 pt-5 pb-1 flex-shrink-0 gap-2.5">
-        <Icon className="h-5 w-5 flex-shrink-0" style={{ color: "#4589ff" }} />
-        <h2 className="text-sm font-semibold text-text-primary tracking-wide truncate flex-1">
-          {item.label}
-        </h2>
-      </div>
+      {item ? (
+        /* ── Hovered item: sub-menu list ─────────────────────────────────── */
+        <>
+          <div className="flex items-center px-4 lg:px-5 pt-5 pb-1 flex-shrink-0 gap-2.5">
+            <item.icon className="h-5 w-5 flex-shrink-0" style={{ color: "#4589ff" }} />
+            <h2 className="text-sm font-semibold text-text-primary tracking-wide truncate flex-1">
+              {item.label}
+            </h2>
+          </div>
 
-      {/* ── Section description ───────────────────────────────────────────────── */}
-      {item.description && (
-        <p className="px-4 lg:px-5 pt-1 pb-4 text-xs text-text-secondary leading-relaxed">
-          {item.description}
-        </p>
-      )}
+          {item.description && (
+            <p className="px-4 lg:px-5 pt-1 pb-4 text-xs text-text-secondary leading-relaxed">
+              {item.description}
+            </p>
+          )}
 
-      {/* ── Nav items ────────────────────────────────────────────────────────── */}
-      <nav className="flex-1 overflow-y-auto px-2 lg:px-3 py-2 space-y-0.5">
-        {subItems.map((sub) => {
-          const SubIcon = sub.icon
-          return (
+          <nav className="flex-1 overflow-y-auto px-2 lg:px-3 py-2 space-y-0.5">
+            {subItems.map((sub) => {
+              const SubIcon = sub.icon
+              return (
+                <a
+                  key={sub.id}
+                  href={sub.href}
+                  className={cn(
+                    "flex items-start transition-colors border-l-4",
+                    "px-2 lg:px-3 py-2 gap-x-3",
+                    "hover:bg-ui-background border-transparent hover:border-interactive",
+                  )}
+                >
+                  <SubIcon className="h-4 w-4 flex-shrink-0 mt-0.5" style={{ color: "#4589ff" }} />
+                  <div className="min-w-0 flex-1">
+                    <p className="text-sm font-medium text-text-primary leading-snug truncate">{sub.name}</p>
+                    {sub.description && (
+                      <p className="text-xs text-text-secondary leading-relaxed mt-0.5 line-clamp-2">{sub.description}</p>
+                    )}
+                  </div>
+                </a>
+              )
+            })}
+          </nav>
+        </>
+      ) : (
+        /* ── Default state: centré verticalement ────────────────────────── */
+        <div className="flex flex-col h-full items-center justify-center px-6 gap-6">
+          {/* Titre + texte + CTA */}
+          <div className="flex flex-col items-center gap-3 w-full">
+            <span className="text-sm font-semibold text-text-primary text-center">{defaultTitle}</span>
+            {defaultDescription && (
+              <p className="text-xs text-text-secondary text-center leading-relaxed">{defaultDescription}</p>
+            )}
             <a
-              key={sub.id}
-              href={sub.href}
-              className={cn(
-                "flex items-start transition-colors border-l-4",
-                "px-2 lg:px-3 py-2 gap-x-3",
-                "hover:bg-ui-background border-transparent hover:border-interactive",
-              )}
+              href={homePath}
+              className="flex items-center justify-center gap-2 w-full px-3 py-2 border border-ui-border text-text-secondary hover:text-text-primary hover:bg-ui-background text-sm font-medium transition-colors"
             >
-              <SubIcon className="h-4 w-4 flex-shrink-0 mt-0.5" style={{ color: "#4589ff" }} />
-              <div className="min-w-0 flex-1">
-                <p className="text-sm font-medium text-text-primary leading-snug truncate">{sub.name}</p>
-                {sub.description && (
-                  <p className="text-xs text-text-secondary leading-relaxed mt-0.5 line-clamp-2">{sub.description}</p>
-                )}
-              </div>
+              <Home className="h-4 w-4 flex-shrink-0" />
+              Tableau de bord
             </a>
-          )
-        })}
-      </nav>
+          </div>
+
+          {/* Liens ressources */}
+          {defaultLinks.length > 0 && (
+            <nav className="w-full space-y-0.5">
+              <p className="px-2 pb-1 text-[10px] font-semibold text-text-secondary uppercase tracking-widest">
+                Ressources
+              </p>
+              {defaultLinks.map((link, i) => {
+                const LinkIcon = link.icon ?? ExternalLink
+                const isExternal = link.href.startsWith("http://") || link.href.startsWith("https://")
+                return (
+                  <a
+                    key={i}
+                    href={link.href}
+                    {...(isExternal ? { target: "_blank", rel: "noopener noreferrer" } : {})}
+                    className="flex items-start gap-x-3 px-2 py-2 border-l-4 border-transparent hover:bg-ui-background hover:border-interactive transition-colors"
+                  >
+                    <LinkIcon className="h-4 w-4 flex-shrink-0 mt-0.5 text-text-secondary" />
+                    <div className="min-w-0 flex-1">
+                      <p className="text-sm font-medium text-text-primary leading-snug flex items-center gap-1.5">
+                        {link.label}
+                        {isExternal && <ExternalLink className="h-3 w-3 text-text-secondary flex-shrink-0" />}
+                      </p>
+                      {link.description && (
+                        <p className="text-xs text-text-secondary leading-relaxed mt-0.5 line-clamp-2">{link.description}</p>
+                      )}
+                    </div>
+                  </a>
+                )
+              })}
+            </nav>
+          )}
+        </div>
+      )}
     </div>
   )
 }

package/components/layout/sidebar/main-sidebar.tsx

@@ -4,10 +4,14 @@ import * as React from "react"
 import { cn } from "../../../lib/utils"
 import { Button } from "../../ui/button"
 import { Logo } from "../../ui/logo"
-import { type MainMenuItem, type SidebarMenus } from "./data"
+import { type MainMenuItem, type SidebarMenus, type SidebarMenuMeta } from "./data"
+
+export type { SidebarMenuMeta }
 import { X, Menu, ChevronDown, ChevronRight } from "lucide-react"
 import { useIsMobile } from "../../../hooks/use-mobile"
-import { MainSidebarFlyout } from "./main-sidebar-flyout"
+import { MainSidebarFlyout, type FlyoutDefaultLink } from "./main-sidebar-flyout"
+
+export type { FlyoutDefaultLink }
 
 export type SidebarMode = 'expanded' | 'minimized' | 'hidden'
 
@@ -21,6 +25,8 @@ interface MainSidebarProps {
   onSecondarySidebarOpen?: () => void
   sidebarMenus?: SidebarMenus
   mainMenuItems?: MainMenuItem[]
+  /** Per-submenu metadata (header + description) derived from the API menu response. */
+  sidebarMenuMeta?: Record<string, SidebarMenuMeta>
 }
 
 export function MainSidebar({
@@ -33,6 +39,7 @@ export function MainSidebar({
   onSecondarySidebarOpen,
   sidebarMenus = {},
   mainMenuItems = [],
+  sidebarMenuMeta = {},
 }: MainSidebarProps) {
   const isMinimized = mode === 'minimized'
   const isMobile = useIsMobile()
@@ -66,6 +73,40 @@ export function MainSidebar({
     setHoveredItem(item)
   }
 
+  const applyTemplateVars = (href: string): string => {
+    // Guard: SSR has no window/localStorage
+    if (typeof window === "undefined") return href
+    try {
+      const projRaw = localStorage.getItem("current-business-unit")
+      const envRaw  = localStorage.getItem("current-environment")
+      // Parse carefully: value may be null (not yet set), invalid JSON, or a non-object
+      const currentProject = typeof projRaw === "string"
+        ? (JSON.parse(projRaw)?.state?.currentProject ?? "")
+        : ""
+      const currentEnv = typeof envRaw === "string"
+        ? (JSON.parse(envRaw)?.state?.currentEnv ?? "")
+        : ""
+      // Only replace when the value is a non-empty string; if empty, leave the
+      // placeholder in the URL so the link is visibly broken rather than silently
+      // producing a protocol-relative URL (e.g. "//path") that navigates incorrectly.
+      let result = href
+      if (currentProject && typeof currentProject === "string") {
+        result = result.replace(/\$\{currentProject\}/g, currentProject)
+      }
+      if (currentEnv && typeof currentEnv === "string") {
+        result = result.replace(/\$\{currentEnv\}/g, currentEnv)
+      }
+      return result
+    } catch {
+      // localStorage blocked (Safari private mode), JSON parse error, etc. — return unchanged
+      return href
+    }
+  }
+
+  const safeUrlPathname = (url: string): string => {
+    try { return new URL(url).pathname } catch { return "/" }
+  }
+
   const handleMenuClick = (item: MainMenuItem) => {
     const menuId = item.id
     const hasSubMenu = (sidebarMenus[menuId]?.length ?? 0) > 0
@@ -81,26 +122,47 @@ export function MainSidebar({
     if (!isMinimized && onSecondarySidebarOpen) onSecondarySidebarOpen()
 
     if (item.href) {
-      const path = item.href.startsWith('http://') || item.href.startsWith('https://')
-        ? new URL(item.href).pathname
-        : item.href
-      window.location.href = path
+      try {
+        const resolved = applyTemplateVars(item.href)
+        const path = resolved.startsWith('http://') || resolved.startsWith('https://')
+          ? safeUrlPathname(resolved)
+          : resolved
+        window.location.href = path
+      } catch {
+        // navigation error — don't crash the sidebar
+      }
     }
 
     if (!isMinimized) onToggle()
   }
 
   const buildSubItemHref = (menuId: string, href: string): string => {
-    if (href.startsWith('http://') || href.startsWith('https://')) {
-      return new URL(href).pathname
+    try {
+      const resolved = applyTemplateVars(href)
+      if (resolved.startsWith('http://') || resolved.startsWith('https://')) {
+        return safeUrlPathname(resolved)
+      }
+      const cleanHref = resolved.replace(/^\//, '')
+      const cleanBase = (main_base_url.startsWith('http://') || main_base_url.startsWith('https://'))
+        ? safeUrlPathname(main_base_url).replace(/\/$/, '')
+        : (main_base_url ?? "").replace(/\/$/, '')
+      return `${cleanBase}/${menuId}/${cleanHref}`
+    } catch {
+      return "/"
     }
-    const cleanHref = href.replace(/^\//, '')
-    const cleanBase = (main_base_url.startsWith('http://') || main_base_url.startsWith('https://'))
-      ? new URL(main_base_url).pathname.replace(/\/$/, '')
-      : main_base_url.replace(/\/$/, '')
-    return `${cleanBase}/${menuId}/${cleanHref}`
   }
 
+  // Default flyout content derived from the "main" submenu in the loaded menu data
+  const mainMeta     = sidebarMenuMeta["main"] ?? {}
+  const defaultTitle = mainMeta.header      ?? "Camel X Platform"
+  const defaultDesc  = mainMeta.description ?? undefined
+  const defaultLinks: FlyoutDefaultLink[] = (sidebarMenus["main"] ?? []).map(sub => ({
+    label:       sub.name,
+    href:        sub.href,
+    description: sub.description,
+    icon:        sub.icon,
+  }))
+
   const handleSubMenuClick = (e: React.MouseEvent, menuId: string, href: string) => {
     e.preventDefault()
     window.location.href = buildSubItemHref(menuId, href)
@@ -157,9 +219,14 @@ export function MainSidebar({
               const isFlyActive  = hoveredItem?.id === item.id
 
               const itemHref = !hasSubMenu && item.href
-                ? (item.href.startsWith('http://') || item.href.startsWith('https://')
-                    ? new URL(item.href).pathname
-                    : item.href)
+                ? (() => {
+                    try {
+                      const resolved = applyTemplateVars(item.href)
+                      return resolved.startsWith('http://') || resolved.startsWith('https://')
+                        ? safeUrlPathname(resolved)
+                        : resolved
+                    } catch { return item.href }
+                  })()
                 : undefined
 
               const itemCls = cn(
@@ -231,15 +298,23 @@ export function MainSidebar({
         </div>
 
         {/* ── Flyout — desktop only, flex child to the right of nav ─────────── */}
-        {!isMobile && hoveredItem && (
+        {/* Shown when the sidebar is open (default state) or an item is hovered (sub-menu state) */}
+        {!isMobile && (hoveredItem || (isOpen && !isMinimized)) && (
           <MainSidebarFlyout
             item={hoveredItem}
-            subItems={(sidebarMenus[hoveredItem.id] ?? []).map(sub => ({
-              ...sub,
-              href: buildSubItemHref(hoveredItem.id, sub.href),
-            }))}
+            subItems={hoveredItem
+              ? (sidebarMenus[hoveredItem.id] ?? []).map(sub => ({
+                  ...sub,
+                  href: buildSubItemHref(hoveredItem.id, sub.href),
+                }))
+              : []
+            }
             onMouseEnter={cancelCloseTimer}
             onMouseLeave={startCloseTimer}
+            main_base_url={main_base_url}
+            defaultTitle={defaultTitle}
+            defaultDescription={defaultDesc}
+            defaultLinks={defaultLinks}
           />
         )}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orsetra/shared-ui",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Shared UI components for Orsetra platform",
   "main": "./index.ts",
   "types": "./index.ts",