@deenruv/admin-dashboard 1.0.17-dev.18 → 1.0.17-dev.23

package/dist/DeenruvAdminPanel.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // eslint-disable-next-line no-restricted-imports
 import { I18nextProvider } from 'react-i18next';
-import { useEffect, useMemo } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import { createBrowserRouter, RouterProvider } from 'react-router';
 import { AnimatePresence } from 'framer-motion';
 import { Toaster } from 'sonner';
@@ -17,7 +17,7 @@ import { ADMIN_DASHBOARD_VERSION } from "./version.js";
 import { ORDER_STATUS_NOTIFICATION } from "./notifications/OrderStatusNotification.js";
 import { SYSTEM_STATUS_NOTIFICATION } from "./notifications/SystemStatusNotification.js";
 import { AdminAccessProvider, builtInAdminRoutes, getDefaultAdminRoute, getPermittedAdminRoutes, } from "./access/index.js";
-import { createAdminRouterRoutes } from "./access/admin-router.js";
+import { CommittedRouterOwner, createAdminRouterRoutes } from "./access/admin-router.js";
 const loadTranslations = () => {
     Object.entries(resources).forEach(([lang, value]) => {
         Object.entries(value).forEach(([, translations]) => {
@@ -54,7 +54,10 @@ export const DeenruvAdminPanel = ({ plugins, settings }) => {
         language: p.language,
         translationsLanguage: p.translationsLanguage,
     })));
-    const userPermissions = useServer((p) => p.userPermissions);
+    const { administratorAccessState, userPermissions } = useServer(useShallow((p) => ({
+        administratorAccessState: p.administratorAccessState,
+        userPermissions: p.userPermissions,
+    })));
     const pluginRoutes = useMemo(() => pluginsStore.routes.map((route) => ({
         id: `plugin.${route.plugin.name}.${route.path}`,
         path: route.path,
@@ -62,14 +65,17 @@ export const DeenruvAdminPanel = ({ plugins, settings }) => {
         ...route.access,
         search: { menuKey: `${route.plugin.name} - ${route.path}`, type: 'plugin' },
     })), [plugins]);
-    const permittedRoutes = useMemo(() => getPermittedAdminRoutes([...builtInAdminRoutes, ...pluginRoutes], userPermissions), [pluginRoutes, userPermissions]);
-    const defaultRoute = getDefaultAdminRoute(permittedRoutes);
-    const router = useMemo(() => createBrowserRouter(createAdminRouterRoutes({
+    const permittedRoutes = useMemo(() => administratorAccessState === 'ready'
+        ? getPermittedAdminRoutes([...builtInAdminRoutes, ...pluginRoutes], userPermissions)
+        : [], [administratorAccessState, pluginRoutes, userPermissions]);
+    const defaultRoute = administratorAccessState === 'ready' ? getDefaultAdminRoute(permittedRoutes) : undefined;
+    const createRouter = useCallback(() => createBrowserRouter(createAdminRouterRoutes({
         permittedRoutes,
         defaultRoute,
+        administratorAccessState,
         rootElement: _jsx(Root, { allPaths: permittedRoutes.map((route) => route.path).filter(Boolean) }),
         errorElement: _jsx(ErrorPage, {}),
-    })), [defaultRoute, permittedRoutes]);
+    })), [administratorAccessState, defaultRoute, permittedRoutes]);
     useEffect(() => {
         const root = window.document.documentElement;
         root.classList.remove('light', 'dark');
@@ -81,7 +87,7 @@ export const DeenruvAdminPanel = ({ plugins, settings }) => {
             root.classList.add(theme);
         }
     }, [theme]);
-    return (_jsx(GlobalStoreProvider, { ...settings, children: _jsxs(I18nextProvider, { i18n: i18n, defaultNS: 'common', children: [_jsx(AnimatePresence, { children: isLoggedIn ? (_jsx(AdminAccessProvider, { value: { routes: permittedRoutes, defaultRoute }, children: _jsx(PluginProvider, { plugins: pluginsStore, context: context, children: _jsx(NotificationProvider, { notifications: [ORDER_STATUS_NOTIFICATION, SYSTEM_STATUS_NOTIFICATION].concat(pluginsStore.notifications), children: _jsx(RouterProvider, { router: router }) }) }) })) : (_jsx(LoginScreen, {})) }), _jsx(Toaster, { theme: theme, className: "toaster group", richColors: true, expand: true, position: "bottom-right", toastOptions: {
+    return (_jsx(GlobalStoreProvider, { ...settings, children: _jsxs(I18nextProvider, { i18n: i18n, defaultNS: 'common', children: [_jsx(AnimatePresence, { children: isLoggedIn ? (_jsx(AdminAccessProvider, { value: { routes: permittedRoutes, defaultRoute }, children: _jsx(PluginProvider, { plugins: pluginsStore, context: context, children: _jsx(NotificationProvider, { notifications: [ORDER_STATUS_NOTIFICATION, SYSTEM_STATUS_NOTIFICATION].concat(pluginsStore.notifications), children: _jsx(CommittedRouterOwner, { createRouter: createRouter, children: (router) => _jsx(RouterProvider, { router: router }) }) }) }) })) : (_jsx(LoginScreen, {})) }), _jsx(Toaster, { theme: theme, className: "toaster group", richColors: true, expand: true, position: "bottom-right", toastOptions: {
                         classNames: {
                             toast: 'group toast group-[.toaster]:bg-background group-[.toaster]:text-foreground group-[.toaster]:border-border group-[.toaster]:shadow-lg group-[.toaster]:p-4',
                             title: 'group-[.toast]:font-semibold group-[.toast]:text-foreground',

package/dist/access/admin-router.js

@@ -1,21 +1,60 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useLayoutEffect, useRef, useState } from 'react';
 import { Routes } from '@deenruv/react-ui-devkit';
 import { Navigate } from 'react-router';
-export const createAdminRouterRoutes = ({ permittedRoutes, defaultRoute, rootElement, errorElement, }) => {
+export const CommittedRouterOwner = ({ createRouter, children, }) => {
+    const [router, setRouter] = useState();
+    const activeRouter = useRef(undefined);
+    const disposedRouters = useRef(new WeakSet());
+    useLayoutEffect(() => {
+        const nextRouter = createRouter();
+        activeRouter.current = nextRouter;
+        setRouter(nextRouter);
+        return () => {
+            if (activeRouter.current === nextRouter) {
+                activeRouter.current = undefined;
+            }
+            globalThis.queueMicrotask(() => {
+                if (activeRouter.current !== nextRouter && !disposedRouters.current.has(nextRouter)) {
+                    disposedRouters.current.add(nextRouter);
+                    nextRouter.dispose();
+                }
+            });
+        };
+    }, [createRouter]);
+    return router && activeRouter.current === router ? children(router) : null;
+};
+export const createAdminRouterRoutes = ({ permittedRoutes, defaultRoute, administratorAccessState, rootElement, errorElement, }) => {
     const children = permittedRoutes.map(({ id, path, element }) => ({ id, path, element }));
-    if (defaultRoute && !permittedRoutes.some((route) => route.path === Routes.dashboard)) {
+    if (administratorAccessState === 'ready' &&
+        defaultRoute &&
+        !permittedRoutes.some((route) => route.path === Routes.dashboard)) {
         children.push({
             id: 'admin.fallback.dashboard',
             path: Routes.dashboard,
             element: _jsx(Navigate, { to: defaultRoute.path, replace: true }),
         });
     }
-    if (defaultRoute) {
+    if (administratorAccessState === 'ready' && defaultRoute) {
         children.push({
             id: 'admin.fallback.wildcard',
             path: '*',
             element: _jsx(Navigate, { to: defaultRoute.path, replace: true }),
         });
     }
+    else if (administratorAccessState === 'pending') {
+        children.push({
+            id: 'admin.fallback.pending-access',
+            path: '*',
+            element: null,
+        });
+    }
+    else {
+        children.push({
+            id: 'admin.fallback.unavailable-access',
+            path: '*',
+            element: errorElement,
+        });
+    }
     return [{ id: 'admin.root', element: rootElement, errorElement, children }];
 };

package/dist/access/built-in-route-permissions.js

@@ -0,0 +1,44 @@
+import { Permission } from '@deenruv/admin-types';
+export const catalogRoutePermissions = {
+    products: {
+        read: [Permission.ReadProduct, Permission.ReadCatalog],
+        create: [Permission.CreateProduct, Permission.CreateCatalog],
+    },
+    collections: {
+        read: [Permission.ReadCollection, Permission.ReadCatalog],
+        create: [Permission.CreateCollection, Permission.CreateCatalog],
+    },
+    facets: {
+        read: [Permission.ReadFacet, Permission.ReadCatalog],
+        create: [Permission.CreateFacet, Permission.CreateCatalog],
+    },
+    assets: {
+        read: [Permission.ReadAsset, Permission.ReadCatalog],
+    },
+};
+export const settingsRoutePermissions = {
+    paymentMethods: {
+        read: [Permission.ReadPaymentMethod, Permission.ReadSettings],
+        create: [Permission.CreatePaymentMethod, Permission.CreateSettings],
+    },
+    shippingMethods: {
+        read: [Permission.ReadShippingMethod, Permission.ReadSettings],
+        create: [Permission.CreateShippingMethod, Permission.CreateSettings],
+    },
+    zones: {
+        read: [Permission.ReadZone, Permission.ReadSettings],
+        create: [Permission.CreateZone, Permission.CreateSettings],
+    },
+    countries: {
+        read: [Permission.ReadCountry, Permission.ReadSettings],
+        create: [Permission.CreateCountry, Permission.CreateSettings],
+    },
+    taxCategories: {
+        read: [Permission.ReadTaxCategory, Permission.ReadSettings],
+        create: [Permission.CreateTaxCategory, Permission.CreateSettings],
+    },
+    taxRates: {
+        read: [Permission.ReadTaxRate, Permission.ReadSettings],
+        create: [Permission.CreateTaxRate, Permission.CreateSettings],
+    },
+};

package/dist/access/built-in-routes.js

@@ -3,6 +3,7 @@ import { Permission } from '@deenruv/admin-types';
 import { Routes } from '@deenruv/react-ui-devkit';
 import { BarChart, Barcode, BadgePercent, Coins, Cog, CreditCard, Flag, Folder, Globe, Globe2, Images, MapPin, Percent, ScanBarcode, Server, ShoppingCart, Store, Tag, Truck, UserCog, UserRoundSearch, Users, UsersRound, } from 'lucide-react';
 import { AdminsDetailPage, AdminsListPage, AdminsProvisionPage, AssetsListPage, ChannelsDetailPage, ChannelsListPage, CollectionsDetailPage, CollectionsListPage, CountriesDetailPage, CountriesListPage, CustomerGroupsDetailPage, CustomerGroupsListPage, CustomersDetailPage, CustomersListPage, Dashboard, Extensions, FacetsDetailPage, FacetsListPage, GlobalSettings, OrdersDetailPage, OrdersListPage, PaymentMethodsDetailPage, PaymentMethodsListPage, ProductVariantDetailPage, ProductVariantsListPage, ProductsDetailPage, ProductsListPage, PromotionsDetailPage, PromotionsListPage, RolesDetailPage, RolesListPage, SellersDetailPage, SellersListPage, ShippingMethodsDetailPage, ShippingMethodsListPage, Status, StockLocationsDetailPage, StockLocationsListPage, TaxCategoriesDetailPage, TaxCategoriesListPage, TaxRatesDetailPage, TaxRatesListPage, ZonesDetailPage, ZonesListPage, } from "../pages/index.js";
+import { catalogRoutePermissions, settingsRoutePermissions } from './built-in-route-permissions.js';
 export const adminNavigationGroups = [
     { id: 'shop-group', labelKey: 'shop' },
     { id: 'assortment-group', labelKey: 'assortment' },
@@ -85,8 +86,8 @@ export const builtInAdminRoutes = [
         routes: Routes.products,
         listElement: () => _jsx(ProductsListPage, {}),
         detailElement: () => _jsx(ProductsDetailPage, {}),
-        readPermissions: [Permission.ReadProduct, Permission.ReadCatalog],
-        createPermissions: [Permission.CreateProduct],
+        readPermissions: catalogRoutePermissions.products.read,
+        createPermissions: catalogRoutePermissions.products.create,
         nav: { groupId: 'assortment-group', linkId: 'link-products', menuKey: 'products', icon: Barcode },
     }),
     ...createCrudRouteDefinitions({
@@ -95,8 +96,8 @@ export const builtInAdminRoutes = [
         routes: Routes.productVariants,
         listElement: () => _jsx(ProductVariantsListPage, {}),
         detailElement: () => _jsx(ProductVariantDetailPage, {}),
-        readPermissions: [Permission.ReadProduct, Permission.ReadCatalog],
-        createPermissions: [Permission.CreateProduct],
+        readPermissions: catalogRoutePermissions.products.read,
+        createPermissions: catalogRoutePermissions.products.create,
         nav: {
             groupId: 'assortment-group',
             linkId: 'link-product-variants',
@@ -110,8 +111,8 @@ export const builtInAdminRoutes = [
         routes: Routes.collections,
         listElement: () => _jsx(CollectionsListPage, {}),
         detailElement: () => _jsx(CollectionsDetailPage, {}),
-        readPermissions: [Permission.ReadCollection, Permission.ReadCatalog],
-        createPermissions: [Permission.CreateCollection],
+        readPermissions: catalogRoutePermissions.collections.read,
+        createPermissions: catalogRoutePermissions.collections.create,
         nav: { groupId: 'assortment-group', linkId: 'link-collections', menuKey: 'collections', icon: Folder },
     }),
     ...createCrudRouteDefinitions({
@@ -120,15 +121,15 @@ export const builtInAdminRoutes = [
         routes: Routes.facets,
         listElement: () => _jsx(FacetsListPage, {}),
         detailElement: () => _jsx(FacetsDetailPage, {}),
-        readPermissions: [Permission.ReadFacet, Permission.ReadCatalog],
-        createPermissions: [Permission.CreateFacet],
+        readPermissions: catalogRoutePermissions.facets.read,
+        createPermissions: catalogRoutePermissions.facets.create,
         nav: { groupId: 'assortment-group', linkId: 'link-facets', menuKey: 'facets', icon: Tag },
     }),
     {
         id: 'assets.list',
         path: Routes.assets.list,
         element: _jsx(AssetsListPage, {}),
-        requiredPermissions: [Permission.ReadAsset, Permission.ReadCatalog],
+        requiredPermissions: catalogRoutePermissions.assets.read,
         nav: { groupId: 'assortment-group', linkId: 'link-assets', menuKey: 'assets', icon: Images },
         search: { menuKey: 'assets', type: 'list' },
     },
@@ -185,8 +186,8 @@ export const builtInAdminRoutes = [
         routes: Routes.paymentMethods,
         listElement: () => _jsx(PaymentMethodsListPage, {}),
         detailElement: () => _jsx(PaymentMethodsDetailPage, {}),
-        readPermissions: [Permission.ReadPaymentMethod],
-        createPermissions: [Permission.CreatePaymentMethod],
+        readPermissions: settingsRoutePermissions.paymentMethods.read,
+        createPermissions: settingsRoutePermissions.paymentMethods.create,
         nav: {
             groupId: 'shipping-group',
             linkId: 'link-payment-methods',
@@ -200,8 +201,8 @@ export const builtInAdminRoutes = [
         routes: Routes.shippingMethods,
         listElement: () => _jsx(ShippingMethodsListPage, {}),
         detailElement: () => _jsx(ShippingMethodsDetailPage, {}),
-        readPermissions: [Permission.ReadShippingMethod],
-        createPermissions: [Permission.CreateShippingMethod],
+        readPermissions: settingsRoutePermissions.shippingMethods.read,
+        createPermissions: settingsRoutePermissions.shippingMethods.create,
         nav: {
             groupId: 'shipping-group',
             linkId: 'link-shipping-methods',
@@ -235,8 +236,8 @@ export const builtInAdminRoutes = [
         routes: Routes.zones,
         listElement: () => _jsx(ZonesListPage, {}),
         detailElement: () => _jsx(ZonesDetailPage, {}),
-        readPermissions: [Permission.ReadZone],
-        createPermissions: [Permission.CreateZone],
+        readPermissions: settingsRoutePermissions.zones.read,
+        createPermissions: settingsRoutePermissions.zones.create,
         nav: { groupId: 'settings-group', linkId: 'link-zones', menuKey: 'zones', icon: Globe },
     }),
     ...createCrudRouteDefinitions({
@@ -245,8 +246,8 @@ export const builtInAdminRoutes = [
         routes: Routes.countries,
         listElement: () => _jsx(CountriesListPage, {}),
         detailElement: () => _jsx(CountriesDetailPage, {}),
-        readPermissions: [Permission.ReadCountry],
-        createPermissions: [Permission.CreateCountry],
+        readPermissions: settingsRoutePermissions.countries.read,
+        createPermissions: settingsRoutePermissions.countries.create,
         nav: { groupId: 'settings-group', linkId: 'link-countries', menuKey: 'countries', icon: Flag },
     }),
     ...createCrudRouteDefinitions({
@@ -255,8 +256,8 @@ export const builtInAdminRoutes = [
         routes: Routes.taxCategories,
         listElement: () => _jsx(TaxCategoriesListPage, {}),
         detailElement: () => _jsx(TaxCategoriesDetailPage, {}),
-        readPermissions: [Permission.ReadTaxCategory],
-        createPermissions: [Permission.CreateTaxCategory],
+        readPermissions: settingsRoutePermissions.taxCategories.read,
+        createPermissions: settingsRoutePermissions.taxCategories.create,
         nav: {
             groupId: 'settings-group',
             linkId: 'link-tax-categories',
@@ -270,8 +271,8 @@ export const builtInAdminRoutes = [
         routes: Routes.taxRates,
         listElement: () => _jsx(TaxRatesListPage, {}),
         detailElement: () => _jsx(TaxRatesDetailPage, {}),
-        readPermissions: [Permission.ReadTaxRate],
-        createPermissions: [Permission.CreateTaxRate],
+        readPermissions: settingsRoutePermissions.taxRates.read,
+        createPermissions: settingsRoutePermissions.taxRates.create,
         nav: { groupId: 'settings-group', linkId: 'link-tax-rates', menuKey: 'taxRates', icon: Percent },
     }),
     {

package/dist/access/channel-selection.js

@@ -0,0 +1,9 @@
+export const switchSelectedChannel = (channel, actions) => {
+    actions.clearPermissions();
+    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];

package/dist/components/Menu/ChannelSwitcher.js

@@ -1,16 +1,23 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue, useServer, useSettings, DEFAULT_CHANNEL_CODE, cn, useTranslation, } from '@deenruv/react-ui-devkit';
 import { useCallback } from 'react';
+import { switchSelectedChannel } from "../../access/channel-selection.js";
 export function ChannelSwitcher({ className }) {
     const channels = useServer((p) => p.channels);
     const setSelectedChannel = useSettings((p) => p.setSelectedChannel);
     const selectedChannel = useSettings((p) => p.selectedChannel);
+    const setUserPermissions = useServer((p) => p.setUserPermissions);
+    const setSelectedChannelPermissions = useServer((p) => p.setSelectedChannelPermissions);
     const { t } = useTranslation('common');
     const onChannelChange = (id) => {
         const channel = channels.find((channel) => channel.id === id);
         if (!channel)
             return;
-        setSelectedChannel(channel);
+        switchSelectedChannel(channel, {
+            clearPermissions: () => setUserPermissions([]),
+            selectChannel: setSelectedChannel,
+            setPermissionsForChannel: setSelectedChannelPermissions,
+        });
     };
     const getChannelLabel = useCallback((code) => (code === DEFAULT_CHANNEL_CODE ? t('defaultChannel') : code), [t]);
     if (!channels || channels.length === 0) {

package/dist/graphql/scalars.js

@@ -1,5 +1,9 @@
 import { ZeusScalars } from '@deenruv/admin-types';
 export const scalars = ZeusScalars({
+    ID: {
+        encode: (e) => e,
+        decode: (e) => e,
+    },
     Money: {
         decode: (e) => e,
     },

package/dist/locales/en/orders.json

@@ -383,7 +383,15 @@
         "title": "Cancel and refund the order",
         "refund": "Refund",
         "returnToStock": "Return to warehouse",
-        "refundShipping": "Return for shipment"
+        "refundShipping": "Refund shipping",
+        "cancelShipping": "Return shipping to stock",
+        "cancelShippingRequiresLines": "Select at least one item to return before returning shipping.",
+        "refundQuantity": "Refund quantity",
+        "reason": "Reason",
+        "suggestedAmount": "Calculated refund",
+        "auto": "Automatic",
+        "submit": "Apply cancellation and refund",
+        "error": "Could not apply cancellation or refund"
     },
     "create": {
         "addModal": {

package/dist/locales/pl/orders.json

@@ -383,7 +383,15 @@
         "title": "Anuluj i refunduj zamówienie",
         "refund": "Refunduj",
         "returnToStock": "Zwróć do magazynu",
-        "refundShipping": "Zwróć za przesyłkę"
+        "refundShipping": "Zwróć koszt przesyłki",
+        "cancelShipping": "Zwróć przesyłkę do magazynu",
+        "cancelShippingRequiresLines": "Wybierz co najmniej jeden produkt do zwrotu przed zwrotem przesyłki.",
+        "refundQuantity": "Ilość do refundacji",
+        "reason": "Powód",
+        "suggestedAmount": "Wyliczony zwrot",
+        "auto": "Automatycznie",
+        "submit": "Zastosuj anulowanie i zwrot",
+        "error": "Nie udało się anulować lub zwrócić płatności"
     },
     "create": {
         "addModal": {

package/dist/pages/Root.js

@@ -10,6 +10,8 @@ import { GlobalSearch } from "../components/GlobalSearch.js";
 import { ContentAreaSkeleton } from "../components/ContentAreaSkeleton.js";
 import { DeenruvDeveloperIndicator } from "../DeenruvDeveloperIndicator.js";
 import { Permission } from '@deenruv/admin-types';
+import { selectPreferredChannel } from "../access/channel-selection.js";
+import { ErrorPage } from "./Custom404.js";
 const TAKE = 100;
 const getAllPaginatedCountries = async () => {
     let countries = [];
@@ -45,14 +47,17 @@ const getAllPaymentMethods = async () => {
 export const Root = ({ allPaths }) => {
     const isLocalhost = window.location.hostname === 'localhost';
     const { t } = useTranslation('common');
-    const clearAdministratorAccess = useServer((p) => p.clearAdministratorAccess);
+    const failAdministratorAccess = useServer((p) => p.failAdministratorAccess);
+    const beginAdministratorAccessInitialization = useServer((p) => p.beginAdministratorAccessInitialization);
     const setAdministratorAccess = useServer((p) => p.setAdministratorAccess);
+    const setSelectedChannelPermissions = useServer((p) => p.setSelectedChannelPermissions);
     const setServerConfig = useServer((p) => p.setServerConfig);
     const setCountries = useServer((p) => p.setCountries);
     const setFulfillmentHandlers = useServer((p) => p.setFulfillmentHandlers);
     const setPaymentMethodsType = useServer((p) => p.setPaymentMethodsType);
     const fetchPendingJobs = useServer((p) => p.fetchPendingJobs);
     const loaded = useServer((p) => p.loaded);
+    const administratorAccessState = useServer((p) => p.administratorAccessState);
     const setLoaded = useServer((p) => p.setLoaded);
     const setAvailableLanguages = useSettings((p) => p.setAvailableLanguages);
     const setLanguage = useSettings((p) => p.setLanguage);
@@ -69,6 +74,9 @@ export const Root = ({ allPaths }) => {
     const location = useLocation();
     const [searchParams] = useSearchParams();
     const hasInitializedAdministratorAccess = useRef(false);
+    useEffect(() => {
+        setSelectedChannelPermissions(selectedChannel?.id);
+    }, [selectedChannel?.id, setSelectedChannelPermissions]);
     const managePageTitle = useCallback(() => {
         const pathname = location.pathname;
         const isDeenruvPath = allPaths.some((path) => pathname.startsWith(path));
@@ -144,22 +152,23 @@ export const Root = ({ allPaths }) => {
         };
     }, [notifications.map((n) => n.id).join(','), loaded]);
     useEffect(() => {
-        if (hasInitializedAdministratorAccess.current)
+        if (administratorAccessState !== 'pending' || hasInitializedAdministratorAccess.current)
             return;
         hasInitializedAdministratorAccess.current = true;
-        clearAdministratorAccess();
+        beginAdministratorAccessInitialization();
         const init = async () => {
             const activeAdministratorResponse = await apiClient('query')({
                 activeAdministrator: activeAdministratorSelector,
             });
             const roles = activeAdministratorResponse.activeAdministrator?.user.roles || [];
             if (!activeAdministratorResponse.activeAdministrator) {
-                clearAdministratorAccess();
+                failAdministratorAccess();
+                setLoaded(true);
                 toast.error(t('setup.failedAdmin'));
                 return;
             }
             else {
-                setAdministratorAccess(activeAdministratorResponse.activeAdministrator, Array.from(new Set(roles.flatMap((role) => role.permissions))));
+                let administratorChannelId = selectedChannel?.id;
                 if ([Permission.ReadChannel].some((p) => roles.some((r) => r.permissions.includes(p)))) {
                     const { channels: { items: allChannels = [] }, } = await apiClient('query')({
                         channels: [
@@ -177,25 +186,20 @@ export const Root = ({ allPaths }) => {
                         ],
                     });
                     setChannels(allChannels);
-                    if (!channel) {
-                        if (selectedChannel) {
-                            const foundChannel = allChannels.find((ch) => ch.code === selectedChannel.code);
-                            setSelectedChannel(foundChannel || allChannels[0]);
-                        }
-                        const existingChannel = allChannels.find((ch) => ch.code === window?.__DEENRUV_SETTINGS__?.ui?.defaultChannelCode);
-                        if (existingChannel) {
-                            setSelectedChannel(existingChannel);
-                        }
-                        const defaultChannel = allChannels.find((ch) => ch.code === DEFAULT_CHANNEL_CODE) || allChannels[0];
-                        setSelectedChannel(defaultChannel);
+                    const preferredChannel = selectPreferredChannel(allChannels, selectedChannel, window?.__DEENRUV_SETTINGS__?.ui?.defaultChannelCode, DEFAULT_CHANNEL_CODE);
+                    if (preferredChannel && preferredChannel.id !== channel?.id) {
+                        setSelectedChannel(preferredChannel);
                     }
+                    administratorChannelId = preferredChannel?.id;
                 }
                 else {
                     const possibleChannels = roles.flatMap((role) => role.channels);
                     if (possibleChannels.length > 0) {
                         setSelectedChannel(possibleChannels[0]);
+                        administratorChannelId = possibleChannels[0].id;
                     }
                 }
+                setAdministratorAccess(activeAdministratorResponse.activeAdministrator, administratorChannelId);
             }
             // WE NEED TO CHECK IF LOCALSTORAGE HAS LANGUAGE SET
             if (window?.__DEENRUV_SETTINGS__?.ui?.defaultLanguageCode) {
@@ -261,8 +265,9 @@ export const Root = ({ allPaths }) => {
             await init();
         })
             .catch(() => {
-            clearAdministratorAccess();
+            failAdministratorAccess();
+            setLoaded(true);
         });
-    }, []);
-    return (_jsx(_Fragment, { children: _jsxs("div", { className: "flex max-h-screen w-full max-w-full overflow-hidden bg-background text-foreground antialiased", children: [_jsx(Menu, { children: loaded ? _jsx(Outlet, {}) : _jsx(ContentAreaSkeleton, {}) }), loaded && (_jsxs(_Fragment, { children: [_jsx(GlobalSearch, {}), _jsx(CanLeaveRouteDialog, {}), isLocalhost ? _jsx(DeenruvDeveloperIndicator, {}) : null] }))] }) }));
+    }, [administratorAccessState]);
+    return (_jsx(_Fragment, { children: _jsxs("div", { className: "flex max-h-screen w-full max-w-full overflow-hidden bg-background text-foreground antialiased", children: [_jsx(Menu, { children: administratorAccessState === 'unavailable' ? (_jsx(ErrorPage, {})) : administratorAccessState === 'pending' || !loaded ? (_jsx(ContentAreaSkeleton, {})) : (_jsx(Outlet, {})) }), loaded && administratorAccessState === 'ready' && (_jsxs(_Fragment, { children: [_jsx(GlobalSearch, {}), _jsx(CanLeaveRouteDialog, {}), isLocalhost ? _jsx(DeenruvDeveloperIndicator, {}) : null] }))] }) }));
 };

package/dist/pages/assets/List.js

@@ -78,5 +78,5 @@ export const AssetsListPage = () => {
                     return (_jsx("div", { className: "flex flex-wrap gap-1", children: tags.length ? (tags.map((tag, index) => (_jsx(Badge, { variant: "secondary", className: "text-xs", children: tag.value }, index)))) : (_jsx(Badge, { variant: "secondary", className: "text-xs", children: "No Tags" })) }));
                 },
             },
-        ], createPermissions: [Permission.CreateAsset], deletePermissions: [Permission.DeleteAsset] }));
+        ], createPermissions: [Permission.CreateAsset, Permission.CreateCatalog], deletePermissions: [Permission.DeleteAsset, Permission.DeleteCatalog] }));
 };

package/dist/pages/collections/Detail.js

@@ -4,6 +4,7 @@ import { useParams } from 'react-router';
 import { useValidators, DetailView, createDeenruvForm, getMutation, useMutation, useSettings, } from '@deenruv/react-ui-devkit';
 import { CollectionsDetailView } from "./_components/CollectionDetailView.js";
 import { CollectionStorefrontAction } from "./_components/collectionStorefrontAction";
+import { Permission } from '@deenruv/admin-types';
 const CreateCollectionMutation = getMutation('createCollection');
 const EditCollectionMutation = getMutation('updateCollection');
 const DeleteCollectionMutation = getMutation('deleteCollection');
@@ -76,5 +77,9 @@ export const CollectionsDetailPage = () => {
                 }),
             }, topActions: {
                 inline: [_jsx(CollectionStorefrontAction, {}, "collection-storefront-action")],
+            }, permissions: {
+                create: [Permission.CreateCollection, Permission.CreateCatalog],
+                edit: [Permission.UpdateCollection, Permission.UpdateCatalog],
+                delete: [Permission.DeleteCollection, Permission.DeleteCatalog],
             } }) }));
 };

package/dist/pages/collections/List.js

@@ -197,5 +197,5 @@ export const CollectionsListPage = () => {
                     return { success: '' };
                 },
             },
-        ], entityName: 'Collection', route: Routes['collections'], tableId: tableId, fetch: fetch, onRemove: onRemove, createPermissions: [Permission.CreateCollection], deletePermissions: [Permission.DeleteCollection] }));
+        ], entityName: 'Collection', route: Routes['collections'], tableId: tableId, fetch: fetch, onRemove: onRemove, createPermissions: [Permission.CreateCollection, Permission.CreateCatalog], deletePermissions: [Permission.DeleteCollection, Permission.DeleteCatalog] }));
 };

package/dist/pages/collections/_components/ContentsCard.js

@@ -31,7 +31,7 @@ export const ContentsCard = ({ collectionId }) => {
             totalItems: 0,
         });
     }, [collectionId]);
-    return (_jsx(CustomCard, { title: t('details.contents.title'), color: "green", icon: _jsx(CardIcons.group, {}), children: _jsx(DetailList, { noPaddings: true, detailLinkColumn: "id", filterFields: [{ key: 'id', operator: 'IDOperators' }], searchFields: ['code', 'name'], hideColumns: ['customFields', 'product', 'updatedAt', 'createdAt'], entityName: 'Product', route: Routes['products'], tableId: "products-list-view", fetch: fetch, noCreateButton: true, createPermissions: [Permission.CreateProduct], deletePermissions: [Permission.DeleteProduct], additionalColumns: [
+    return (_jsx(CustomCard, { title: t('details.contents.title'), color: "green", icon: _jsx(CardIcons.group, {}), children: _jsx(DetailList, { noPaddings: true, detailLinkColumn: "id", filterFields: [{ key: 'id', operator: 'IDOperators' }], searchFields: ['code', 'name'], hideColumns: ['customFields', 'product', 'updatedAt', 'createdAt'], entityName: 'Product', route: Routes['products'], tableId: "products-list-view", fetch: fetch, noCreateButton: true, createPermissions: [Permission.CreateProduct, Permission.CreateCatalog], deletePermissions: [Permission.DeleteProduct, Permission.DeleteCatalog], additionalColumns: [
                 {
                     accessorKey: 'product',
                     enableSorting: false,

package/dist/pages/countries/Detail.js

@@ -3,6 +3,7 @@ import { useParams } from 'react-router';
 import { useValidators, DetailView, createDeenruvForm, getMutation, useMutation, useTranslation, } from '@deenruv/react-ui-devkit';
 import { CountryDetailView } from "./_components/CountryDetailView.js";
 import { useCallback } from 'react';
+import { Permission } from '@deenruv/admin-types';
 const CreateCountryMutation = getMutation('createCountry');
 const EditCountryMutation = getMutation('updateCountry');
 const DeleteCountryMutation = getMutation('deleteCountry');
@@ -53,5 +54,9 @@ export const CountriesDetailPage = () => {
                     onSubmitted: onSubmitHandler,
                     onDeleted: onDeleteHandler,
                 }),
+            }, permissions: {
+                create: [Permission.CreateCountry, Permission.CreateSettings],
+                edit: [Permission.UpdateCountry, Permission.UpdateSettings],
+                delete: [Permission.DeleteCountry, Permission.DeleteSettings],
             } }) }));
 };

package/dist/pages/countries/List.js

@@ -43,5 +43,5 @@ export const CountriesListPage = () => {
             { key: 'name', operator: 'StringOperators' },
             { key: 'enabled', operator: 'BooleanOperators' },
             { key: 'code', operator: 'StringOperators' },
-        ], detailLinkColumn: "id", searchFields: ['name', 'code'], hideColumns: ['customFields', 'translations'], entityName: 'Country', route: Routes['countries'], tableId: tableId, fetch: fetch, onRemove: onRemove, createPermissions: [Permission.CreateCountry], deletePermissions: [Permission.DeleteCountry] }));
+        ], detailLinkColumn: "id", searchFields: ['name', 'code'], hideColumns: ['customFields', 'translations'], entityName: 'Country', route: Routes['countries'], tableId: tableId, fetch: fetch, onRemove: onRemove, createPermissions: [Permission.CreateCountry, Permission.CreateSettings], deletePermissions: [Permission.DeleteCountry, Permission.DeleteSettings] }));
 };

package/dist/pages/facets/Detail.js

@@ -3,6 +3,7 @@ import { useParams } from 'react-router';
 import { useValidators, DetailView, createDeenruvForm, getMutation, useMutation, useTranslation, } from '@deenruv/react-ui-devkit';
 import { FacetsDetailView } from "./_components/FacetDetailView.js";
 import { useCallback } from 'react';
+import { Permission } from '@deenruv/admin-types';
 const CreateFacetMutation = getMutation('createFacet');
 const EditFacetMutation = getMutation('updateFacet');
 const DeleteFacetMutation = getMutation('deleteFacet');
@@ -52,5 +53,9 @@ export const FacetsDetailPage = () => {
                     onSubmitted: onSubmitHandler,
                     onDeleted: onDeleteHandler,
                 }),
+            }, permissions: {
+                create: [Permission.CreateFacet, Permission.CreateCatalog],
+                edit: [Permission.UpdateFacet, Permission.UpdateCatalog],
+                delete: [Permission.DeleteFacet, Permission.DeleteCatalog],
             } }) }));
 };

package/dist/pages/facets/List.js

@@ -44,5 +44,5 @@ export const FacetsListPage = () => {
                 header: () => _jsx(TableLabel, { children: t('table.isPrivate') }),
                 cell: ({ row }) => row.original.isPrivate ? (_jsx(ListBadge, { className: "flex items-center justify-center border-orange-200 bg-orange-200 text-orange-800", children: t('visibility.private') })) : (_jsx(ListBadge, { className: "flex items-center justify-center border-green-200 bg-green-200 text-green-800", children: t('visibility.public') })),
             },
-        ], route: Routes['facets'], tableId: tableId, fetch: fetch, onRemove: onRemove, createPermissions: [Permission.CreateFacet], deletePermissions: [Permission.DeleteFacet] }));
+        ], route: Routes['facets'], tableId: tableId, fetch: fetch, onRemove: onRemove, createPermissions: [Permission.CreateFacet, Permission.CreateCatalog], deletePermissions: [Permission.DeleteFacet, Permission.DeleteCatalog] }));
 };

package/dist/pages/facets/_components/FacetDetailView.js

@@ -101,5 +101,5 @@ export const FacetsDetailView = () => {
                                 setFacetValueIdInModal(null);
                                 setOpen(true);
                             },
-                        }, searchFields: ['name'], tableId: tableId, noPaddings: true, createPermissions: [Permission.CreateFacet], deletePermissions: [Permission.DeleteFacet] }) }))] }) }));
+                        }, searchFields: ['name'], tableId: tableId, noPaddings: true, createPermissions: [Permission.CreateFacet, Permission.CreateCatalog], deletePermissions: [Permission.DeleteFacet, Permission.DeleteCatalog] }) }))] }) }));
 };