@mdguggenbichler/slugbase-core 0.0.42 → 0.0.44

package/frontend/src/App.tsx

@@ -3,7 +3,7 @@ import { BrowserRouter, Routes, Route, Navigate, useLocation } from 'react-route
 import { useTranslation } from 'react-i18next';
 import { AuthProvider, useAuth } from './contexts/AuthContext';
 import { AppConfigProvider, useAppConfig } from './contexts/AppConfigContext';
-import { PlanProvider } from './contexts/PlanContext';
+import { PlanProvider, usePlan } from './contexts/PlanContext';
 import { ToastProvider } from './components/ui/Toast';
 import { TooltipProvider } from './components/ui/tooltip-base';
 import Layout from './components/Layout';
@@ -50,6 +50,17 @@ function AdminRoute({ children }: { children: React.ReactNode }) {
   return <>{children}</>;
 }
 
+/** Redirect /admin to first visible admin tab (e.g. in cloud free plan, Users/Teams are hidden so redirect to ai or billing). */
+function AdminIndexRedirect() {
+  const planInfo = usePlan();
+  const { extraAdminNavItems } = useAppConfig();
+  const showUsersAndTeams = !planInfo || planInfo.canShareWithTeams;
+  const firstPath = showUsersAndTeams
+    ? 'members'
+    : (extraAdminNavItems?.[0]?.path ?? 'ai');
+  return <Navigate to={firstPath} replace />;
+}
+
 function SharedRedirect() {
   const { pathPrefixForLinks } = useAppConfig();
   const to = `${pathPrefixForLinks || ''}/bookmarks?scope=shared_with_me`.replace(/\/+/g, '/') || '/bookmarks?scope=shared_with_me';
@@ -122,7 +133,7 @@ function AppRoutes() {
           <Route path="go-preferences" element={<GoPreferences />} />
           <Route path="search-engine-guide" element={<SearchEngineGuide />} />
           <Route path="admin" element={<AdminRoute><AdminLayout /></AdminRoute>}>
-            <Route index element={<Navigate to="members" replace />} />
+            <Route index element={<AdminIndexRedirect />} />
             <Route path="members" element={<AdminMembersPage />} />
             <Route path="teams" element={<AdminTeamsPage />} />
             {hideAdminOidcAndSmtp ? (

package/frontend/src/components/AppSidebar.tsx

@@ -30,6 +30,7 @@ import {
   useSidebar,
 } from './ui/sidebar';
 import { useAppConfig } from '../contexts/AppConfigContext';
+import { usePlan } from '../contexts/PlanContext';
 import type { User } from '../contexts/AuthContext';
 import { cn } from '../lib/utils';
 
@@ -45,6 +46,7 @@ export default function AppSidebar({ user, version = null }: AppSidebarProps) {
   const location = useLocation();
   const pathname = location.pathname;
   const { appBasePath, pathPrefixForLinks, hideAdminOidcAndSmtp, extraAdminNavItems } = useAppConfig();
+  const planInfo = usePlan();
   const { setOpenMobile, toggleSidebar, isMobile, state } = useSidebar();
   const prefix = pathPrefixForLinks || '';
   // For active matching use pathPrefixForLinks so it matches useLocation().pathname (e.g. when Router has basename="/app", pathname is "/bookmarks" not "/app/bookmarks").
@@ -52,9 +54,16 @@ export default function AppSidebar({ user, version = null }: AppSidebarProps) {
   const adminBaseFull = `${pathBaseForActive}/admin`.replace(/\/+/g, '/') || '/admin';
   const adminBaseLink = `${prefix}/admin`.replace(/\/+/g, '/') || '/admin';
 
+  // In cloud, show Users and Teams only on team plan; self-hosted (planInfo null) always shows them.
+  const showAdminUsersAndTeams = !planInfo || planInfo.canShareWithTeams;
+
   const adminNavItems = [
-    { pathForLink: `${adminBaseLink}/members`, pathForActive: `${adminBaseFull}/members`, label: t('admin.users'), icon: Users },
-    { pathForLink: `${adminBaseLink}/teams`, pathForActive: `${adminBaseFull}/teams`, label: t('admin.teams'), icon: UserCog },
+    ...(showAdminUsersAndTeams
+      ? [
+          { pathForLink: `${adminBaseLink}/members`, pathForActive: `${adminBaseFull}/members`, label: t('admin.users'), icon: Users },
+          { pathForLink: `${adminBaseLink}/teams`, pathForActive: `${adminBaseFull}/teams`, label: t('admin.teams'), icon: UserCog },
+        ]
+      : []),
     ...(!hideAdminOidcAndSmtp
       ? [
           { pathForLink: `${adminBaseLink}/oidc`, pathForActive: `${adminBaseFull}/oidc`, label: t('admin.oidcProviders'), icon: Key },

package/frontend/src/components/GlobalSearch.tsx

@@ -52,7 +52,7 @@ export default function GlobalSearch() {
     { type: 'navigation', title: t('folders.title'), path: `${prefix}/folders`.replace(/\/+/g, '/') || '/folders', id: 'nav-folders' },
     { type: 'navigation', title: t('tags.title'), path: `${prefix}/tags`.replace(/\/+/g, '/') || '/tags', id: 'nav-tags' },
     { type: 'navigation', title: t('shared.title'), path: `${prefix}/shared`.replace(/\/+/g, '/') || '/shared', id: 'nav-shared' },
-    ...(showAdmin ? [{ type: 'navigation' as const, title: t('admin.title'), path: `${prefix}/admin/members`.replace(/\/+/g, '/') || '/admin/members', id: 'nav-admin' }] : []),
+    ...(showAdmin ? [{ type: 'navigation' as const, title: t('admin.title'), path: `${prefix}/admin`.replace(/\/+/g, '/') || '/admin', id: 'nav-admin' }] : []),
   ], [showAdmin, t, prefix]);
 
   const actionItems: SearchResult[] = useMemo(() => [

package/frontend/src/components/UserDropdown.tsx

@@ -67,7 +67,7 @@ export default function UserDropdown({ user }: UserDropdownProps) {
         </DropdownMenuItem>
         {showAdmin && (
           <DropdownMenuItem asChild>
-            <Link to={`${prefix}/admin/members`} className="flex items-center gap-2 cursor-pointer">
+            <Link to={`${prefix}/admin`.replace(/\/+/g, '/') || '/admin'} className="flex items-center gap-2 cursor-pointer">
               <Settings className="h-4 w-4" />
               {t('admin.title')}
             </Link>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mdguggenbichler/slugbase-core",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "SlugBase core: backend and frontend entrypoints for self-hosted and cloud apps",
   "type": "module",
   "exports": {