@deenruv/admin-dashboard 1.0.17-dev.24 → 1.0.17-dev.26

package/dist/DeenruvAdminPanel.js

@@ -33,6 +33,8 @@ export const DeenruvAdminPanel = ({ plugins, settings }) => {
         ...settings,
         ui: {
             ...settings.ui,
+            showChannelPicker: settings?.ui?.showChannelPicker ?? true,
+            showLanguagePicker: settings?.ui?.showLanguagePicker ?? true,
             defaultChannelCode: settings?.ui?.defaultChannelCode || DEFAULT_CHANNEL_CODE,
             defaultLanguageCode: settings?.ui?.defaultLanguageCode || LanguageCode.en,
             defaultTranslationLanguageCode: settings?.ui?.defaultTranslationLanguageCode || LanguageCode.en,

package/dist/access/admin-router.js

@@ -1,15 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useLayoutEffect, useRef, useState } from 'react';
+import { Fragment, useLayoutEffect, useRef, useState } from 'react';
 import { Routes } from '@deenruv/react-ui-devkit';
 import { Navigate } from 'react-router';
 export const CommittedRouterOwner = ({ createRouter, children, }) => {
-    const [router, setRouter] = useState();
+    const [ownedRouter, setOwnedRouter] = useState();
     const activeRouter = useRef(undefined);
+    const routerGeneration = useRef(0);
     const disposedRouters = useRef(new WeakSet());
     useLayoutEffect(() => {
         const nextRouter = createRouter();
         activeRouter.current = nextRouter;
-        setRouter(nextRouter);
+        setOwnedRouter({ router: nextRouter, generation: ++routerGeneration.current });
         return () => {
             if (activeRouter.current === nextRouter) {
                 activeRouter.current = undefined;
@@ -22,7 +23,7 @@ export const CommittedRouterOwner = ({ createRouter, children, }) => {
             });
         };
     }, [createRouter]);
-    return router && activeRouter.current === router ? children(router) : null;
+    return ownedRouter && activeRouter.current === ownedRouter.router ? (_jsx(Fragment, { children: children(ownedRouter.router) }, ownedRouter.generation)) : null;
 };
 export const createAdminRouterRoutes = ({ permittedRoutes, defaultRoute, administratorAccessState, rootElement, errorElement, }) => {
     const children = permittedRoutes.map(({ id, path, element }) => ({ id, path, element }));

package/dist/access/channel-selection.js

@@ -3,7 +3,9 @@ export const switchSelectedChannel = (channel, actions) => {
     actions.selectChannel(channel);
     actions.setPermissionsForChannel(channel.id);
 };
-export const selectPreferredChannel = (channels, retainedChannel, configuredDefaultCode, builtInDefaultCode) => channels.find((channel) => channel.id === retainedChannel?.id) ??
-    channels.find((channel) => channel.code === configuredDefaultCode) ??
-    channels.find((channel) => channel.code === builtInDefaultCode) ??
-    channels[0];
+export const selectPreferredChannel = (channels, retainedChannel, configuredDefaultCode, builtInDefaultCode, forceConfiguredDefault = false) => forceConfiguredDefault
+    ? channels.find((channel) => channel.code === configuredDefaultCode)
+    : (channels.find((channel) => channel.id === retainedChannel?.id) ??
+        channels.find((channel) => channel.code === configuredDefaultCode) ??
+        channels.find((channel) => channel.code === builtInDefaultCode) ??
+        channels[0]);

package/dist/components/Menu/TopbarOverflow.js

@@ -3,7 +3,9 @@ import { Button, Popover, PopoverContent, PopoverTrigger, useTranslation, } from
 import { SlidersHorizontal } from 'lucide-react';
 import { ChannelSwitcher } from './ChannelSwitcher.js';
 import { LanguagesDropdown } from './LanguagesDropdown.js';
-export const TopbarOverflow = ({ components }) => {
+export const TopbarOverflow = ({ components, showChannelPicker, showLanguagePicker }) => {
     const { t } = useTranslation('common');
-    return (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx(Button, { variant: "outline", size: "icon", className: "size-9 shrink-0 lg:hidden", "aria-label": t('openTopbarControls'), title: t('openTopbarControls'), children: _jsx(SlidersHorizontal, { className: "size-4" }) }) }), _jsx(PopoverContent, { align: "end", className: "z-[2138] w-[min(20rem,calc(100vw-2rem))] p-3 lg:hidden", children: _jsxs("div", { className: "flex flex-col gap-3", children: [components.length > 0 && (_jsx("div", { className: "flex flex-wrap items-center gap-2 border-b pb-3", children: components.map(({ component: Component }, index) => (_jsx(Component, {}, index))) })), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx(LanguagesDropdown, {}), _jsx(ChannelSwitcher, { className: "min-w-0 flex-1" })] })] }) })] }));
+    if (components.length === 0 && !showChannelPicker && !showLanguagePicker)
+        return null;
+    return (_jsxs(Popover, { children: [_jsx(PopoverTrigger, { asChild: true, children: _jsx(Button, { variant: "outline", size: "icon", className: "size-9 shrink-0 lg:hidden", "aria-label": t('openTopbarControls'), title: t('openTopbarControls'), children: _jsx(SlidersHorizontal, { className: "size-4" }) }) }), _jsx(PopoverContent, { align: "end", className: "z-[2138] w-[min(20rem,calc(100vw-2rem))] p-3 lg:hidden", children: _jsxs("div", { className: "flex flex-col gap-3", children: [components.length > 0 && (_jsx("div", { className: `flex flex-wrap items-center gap-2 ${showChannelPicker || showLanguagePicker ? 'border-b pb-3' : ''}`, children: components.map(({ component: Component }, index) => (_jsx(Component, {}, index))) })), showChannelPicker || showLanguagePicker ? (_jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [showLanguagePicker ? _jsx(LanguagesDropdown, {}) : null, showChannelPicker ? _jsx(ChannelSwitcher, { className: "min-w-0 flex-1" }) : null] })) : null] }) })] }));
 };

package/dist/components/Menu/index.js

@@ -20,6 +20,8 @@ export const Menu = ({ children }) => {
     const { defaultRoute } = useAdminAccess();
     const userPermissions = useServer((state) => state.userPermissions);
     const { theme, setTheme } = useSettings();
+    const showChannelPicker = window.__DEENRUV_SETTINGS__.ui?.showChannelPicker !== false;
+    const showLanguagePicker = window.__DEENRUV_SETTINGS__.ui?.showLanguagePicker !== false;
     const { isCollapsed, isMobileOpen, manuallyOpenGroupIds, setIsCollapsed, setIsMobileOpen, setManuallyOpenGroupIds, toggleDesktop, } = useSidebarState();
     const defaultRoutePath = defaultRoute?.path || Routes.dashboard;
     const defaultRouteMenuKey = defaultRoute?.nav?.menuKey || defaultRoute?.search?.menuKey || 'dashboard';
@@ -39,5 +41,5 @@ export const Menu = ({ children }) => {
                                                 return (_jsxs(React.Fragment, { children: [_jsx(BreadcrumbItem, { className: "min-w-0", children: _jsx(NavLink, { to: buildURL(path), viewTransition: true, className: "truncate", children: _jsx("span", { className: "text-sm font-semibold tracking-tight text-foreground", children: index === 0 ? t(`menu.${dashToCamelCase(crumb)}`) : crumb }) }) }), index !== crumbs.length - 1 && (_jsx(BreadcrumbSeparator, { children: _jsx(Slash, { className: "text-muted-foreground" }) }))] }, `${crumb}-${index}`));
                                             })) : (_jsx(BreadcrumbItem, { children: _jsx(NavLink, { to: defaultRoutePath, viewTransition: true, children: _jsx("span", { className: "text-lg font-semibold tracking-tight text-foreground", children: t(defaultRouteMenuKey === 'dashboard'
                                                             ? 'dashboard'
-                                                            : `menu.${dashToCamelCase(defaultRouteMenuKey)}`) }) }) })) }) }) }), _jsxs("div", { className: "ml-auto flex min-w-0 items-center justify-end gap-1.5", children: [_jsx(TopbarOverflow, { components: allowedTopNavigationComponents || [] }), allowedTopNavigationComponents?.length ? (_jsx("div", { className: "hidden items-center gap-2 lg:flex", children: allowedTopNavigationComponents.map(({ component: Component }, index) => (_jsx(Component, {}, index))) })) : null, _jsxs("div", { className: "hidden items-center gap-1.5 lg:flex", children: [_jsx(LanguagesDropdown, {}), _jsx(ChannelSwitcher, { className: "min-w-44" })] }), _jsx(Button, { onClick: openGlobalSearch, variant: "outline", size: "icon", className: "relative size-9 shrink-0", "aria-label": t('openGlobalSearch'), title: t('openGlobalSearch'), children: _jsx(SearchIcon, { className: "size-4" }) }), _jsx(Notifications, {}), _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsxs(Button, { variant: "outline", size: "icon", className: "relative size-9 shrink-0", children: [theme === 'light' ? (_jsx(Sun, { className: "size-[1.2rem]" })) : theme === 'dark' ? (_jsx(Moon, { className: "size-[1.2rem]" })) : (_jsx(SunMoon, { className: "size-[1.2rem]" })), _jsx("span", { className: "sr-only", children: t('toggleTheme') })] }) }), _jsxs(DropdownMenuContent, { align: "end", children: [_jsx(DropdownMenuItem, { onClick: () => setTheme('light'), children: t('themeLight') }), _jsx(DropdownMenuItem, { onClick: () => setTheme('dark'), children: t('themeDark') }), _jsx(DropdownMenuItem, { onClick: () => setTheme('system'), children: t('themeSystem') })] })] })] })] }), _jsx(ScrollArea, { className: "relative min-h-0 flex-1 overflow-y-hidden bg-[var(--sidebar-canvas)]", children: children })] })] }) }));
+                                                            : `menu.${dashToCamelCase(defaultRouteMenuKey)}`) }) }) })) }) }) }), _jsxs("div", { className: "ml-auto flex min-w-0 items-center justify-end gap-1.5", children: [_jsx(TopbarOverflow, { components: allowedTopNavigationComponents || [], showChannelPicker: showChannelPicker, showLanguagePicker: showLanguagePicker }), allowedTopNavigationComponents?.length ? (_jsx("div", { className: "hidden items-center gap-2 lg:flex", children: allowedTopNavigationComponents.map(({ component: Component }, index) => (_jsx(Component, {}, index))) })) : null, showChannelPicker || showLanguagePicker ? (_jsxs("div", { className: "hidden items-center gap-1.5 lg:flex", children: [showLanguagePicker ? _jsx(LanguagesDropdown, {}) : null, showChannelPicker ? _jsx(ChannelSwitcher, { className: "min-w-44" }) : null] })) : null, _jsx(Button, { onClick: openGlobalSearch, variant: "outline", size: "icon", className: "relative size-9 shrink-0", "aria-label": t('openGlobalSearch'), title: t('openGlobalSearch'), children: _jsx(SearchIcon, { className: "size-4" }) }), _jsx(Notifications, {}), _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsxs(Button, { variant: "outline", size: "icon", className: "relative size-9 shrink-0", children: [theme === 'light' ? (_jsx(Sun, { className: "size-[1.2rem]" })) : theme === 'dark' ? (_jsx(Moon, { className: "size-[1.2rem]" })) : (_jsx(SunMoon, { className: "size-[1.2rem]" })), _jsx("span", { className: "sr-only", children: t('toggleTheme') })] }) }), _jsxs(DropdownMenuContent, { align: "end", children: [_jsx(DropdownMenuItem, { onClick: () => setTheme('light'), children: t('themeLight') }), _jsx(DropdownMenuItem, { onClick: () => setTheme('dark'), children: t('themeDark') }), _jsx(DropdownMenuItem, { onClick: () => setTheme('system'), children: t('themeSystem') })] })] })] })] }), _jsx(ScrollArea, { className: "relative min-h-0 flex-1 overflow-y-hidden bg-[var(--sidebar-canvas)]", children: children })] })] }) }));
 };

package/dist/pages/Root.js

@@ -156,6 +156,11 @@ export const Root = ({ allPaths }) => {
             return;
         hasInitializedAdministratorAccess.current = true;
         beginAdministratorAccessInitialization();
+        const uiSettings = window.__DEENRUV_SETTINGS__.ui;
+        if (uiSettings?.showLanguagePicker === false) {
+            setLanguage(uiSettings.defaultLanguageCode);
+            setTranslationLanguage(uiSettings.defaultTranslationLanguageCode);
+        }
         const init = async () => {
             const activeAdministratorResponse = await apiClient('query')({
                 activeAdministrator: activeAdministratorSelector,
@@ -168,6 +173,15 @@ export const Root = ({ allPaths }) => {
                 return;
             }
             else {
+                const channelPickerIsHidden = uiSettings?.showChannelPicker === false;
+                const configuredChannelCode = uiSettings?.defaultChannelCode;
+                const failFixedChannelInitialization = () => {
+                    failAdministratorAccess();
+                    setLoaded(true);
+                    toast.error(t('setup.failedAdmin'), {
+                        description: `Configured channel "${configuredChannelCode}" is not accessible to this administrator.`,
+                    });
+                };
                 let administratorChannelId = selectedChannel?.id;
                 if ([Permission.ReadChannel].some((p) => roles.some((r) => r.permissions.includes(p)))) {
                     const { channels: { items: allChannels = [] }, } = await apiClient('query')({
@@ -186,7 +200,11 @@ export const Root = ({ allPaths }) => {
                         ],
                     });
                     setChannels(allChannels);
-                    const preferredChannel = selectPreferredChannel(allChannels, selectedChannel, window?.__DEENRUV_SETTINGS__?.ui?.defaultChannelCode, DEFAULT_CHANNEL_CODE);
+                    const preferredChannel = selectPreferredChannel(allChannels, selectedChannel, configuredChannelCode, DEFAULT_CHANNEL_CODE, channelPickerIsHidden);
+                    if (channelPickerIsHidden && !preferredChannel) {
+                        failFixedChannelInitialization();
+                        return;
+                    }
                     if (preferredChannel && preferredChannel.id !== channel?.id) {
                         setSelectedChannel(preferredChannel);
                     }
@@ -195,21 +213,23 @@ export const Root = ({ allPaths }) => {
                 else {
                     const possibleChannels = roles.flatMap((role) => role.channels);
                     if (possibleChannels.length > 0) {
-                        setSelectedChannel(possibleChannels[0]);
-                        administratorChannelId = possibleChannels[0].id;
+                        const preferredChannel = channelPickerIsHidden
+                            ? selectPreferredChannel(possibleChannels, selectedChannel, configuredChannelCode, DEFAULT_CHANNEL_CODE, true)
+                            : possibleChannels[0];
+                        if (!preferredChannel) {
+                            failFixedChannelInitialization();
+                            return;
+                        }
+                        setSelectedChannel(preferredChannel);
+                        administratorChannelId = preferredChannel.id;
+                    }
+                    else if (channelPickerIsHidden) {
+                        failFixedChannelInitialization();
+                        return;
                     }
                 }
                 setAdministratorAccess(activeAdministratorResponse.activeAdministrator, administratorChannelId);
             }
-            // WE NEED TO CHECK IF LOCALSTORAGE HAS LANGUAGE SET
-            if (window?.__DEENRUV_SETTINGS__?.ui?.defaultLanguageCode) {
-                // window?.__DEENRUV_SETTINGS__.i18n.changeLanguage(window?.__DEENRUV_SETTINGS__?.ui?.defaultLanguageCode);
-                // setLanguage(window?.__DEENRUV_SETTINGS__?.ui?.defaultLanguageCode);
-            }
-            // WE NEED TO CHECK IF LOCALSTORAGE HAS LANGUAGE SET
-            if (window?.__DEENRUV_SETTINGS__?.ui?.defaultTranslationLanguageCode) {
-                // setTranslationLanguage(window?.__DEENRUV_SETTINGS__?.ui?.defaultTranslationLanguageCode);
-            }
             try {
                 const { globalSettings } = await apiClient('query')({
                     globalSettings: { serverConfig: serverConfigSelector, availableLanguages: true },

package/dist/version.js

@@ -1 +1 @@
-export const ADMIN_DASHBOARD_VERSION = '1.0.17-dev.24';
+export const ADMIN_DASHBOARD_VERSION = '1.0.17-dev.26';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deenruv/admin-dashboard",
-  "version": "1.0.17-dev.24",
+  "version": "1.0.17-dev.26",
   "main": "dist/index.js",
   "style": "dist/index.css",
   "types": "dist/index.d.ts",
@@ -80,10 +80,10 @@
     "yup": "^1.7.1",
     "zod": "^4.4.3",
     "zustand": "^5.0.14",
-    "@deenruv/admin-dashboard": "1.0.17-dev.24",
-    "@deenruv/admin-types": "1.0.17-dev.24",
-    "@deenruv/react-ui-devkit": "1.0.17-dev.24",
-    "@deenruv/deenruv-examples-plugin": "1.0.17-dev.24"
+    "@deenruv/admin-dashboard": "1.0.17-dev.26",
+    "@deenruv/admin-types": "1.0.17-dev.26",
+    "@deenruv/deenruv-examples-plugin": "1.0.17-dev.26",
+    "@deenruv/react-ui-devkit": "1.0.17-dev.26"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.20",