@vendure/dashboard 3.8.1-master-202610230212 → 3.8.1

package/dist/bundle/chunks/{common-operations-DNYmbej0.js → common-operations-DaHPL4es.js}

@@ -4692,12 +4692,17 @@ const LS_KEY_USER_SETTINGS = "vendure-user-settings";
 const LS_KEY_SELECTED_CHANNEL_TOKEN = "vendure-selected-channel-token";
 const LS_KEY_SHIPPING_TEST_ORDER = "vendure-shipping-test-order";
 const LS_KEY_SHIPPING_TEST_ADDRESS = "vendure-shipping-test-address";
+const SETTINGS_STORE_KEY_USER_SETTINGS = "vendure.dashboard.userSettings";
 const NEW_ENTITY_PATH = "new";
 const AUTHENTICATED_ROUTE_PREFIX = "/_authenticated";
 const DEFAULT_CHANNEL_CODE = "__default_channel__";
 const SUPER_ADMIN_ROLE_CODE = "__super_admin_role__";
 const CUSTOMER_ROLE_CODE = "__customer_role__";
 const CurrencyCode = Object.fromEntries(schemaCurrencyCodes.map((code) => [code, code]));
+function isForbiddenError(error2) {
+  const code = error2?.extensions?.code;
+  return code === "FORBIDDEN" || code === "UNAUTHORIZED";
+}
 var GraphQLRequestError = class extends Error {
   query;
   variables;
@@ -9382,7 +9387,6 @@ const defaultSettings = {
   tableSettings: {}
 };
 const UserSettingsContext = createContext(void 0);
-const SETTINGS_STORE_KEY = "vendure.dashboard.userSettings";
 const UserSettingsProvider = ({
   queryClient,
   children
@@ -9415,16 +9419,16 @@ const UserSettingsProvider = ({
     isError: serverSettingsErrored,
     error: error2
   } = useQuery({
-    queryKey: ["user-settings", SETTINGS_STORE_KEY],
+    queryKey: ["user-settings", SETTINGS_STORE_KEY_USER_SETTINGS],
     queryFn: () => api.query(getSettingsStoreValueDocument, {
-      key: SETTINGS_STORE_KEY
+      key: SETTINGS_STORE_KEY_USER_SETTINGS
     }),
     retry: false,
     staleTime: 0,
     enabled: settingsStoreIsAvailable
   });
   useEffect(() => {
-    if (settingsStoreIsAvailable && error2?.message.includes("Settings store field not registered: vendure.dashboard.userSettings")) {
+    if (settingsStoreIsAvailable && error2?.message.includes(`Settings store field not registered: ${SETTINGS_STORE_KEY_USER_SETTINGS}`)) {
       logSettingsStoreWarning();
       setSettingsStoreIsAvailable(false);
     }
@@ -9432,7 +9436,7 @@ const UserSettingsProvider = ({
   const saveToServerMutation = useMutation({
     mutationFn: (settingsToSave) => api.mutate(setSettingsStoreValueDocument, {
       input: {
-        key: SETTINGS_STORE_KEY,
+        key: SETTINGS_STORE_KEY_USER_SETTINGS,
         value: settingsToSave
       }
     }),
@@ -9446,7 +9450,7 @@ const UserSettingsProvider = ({
     }
   });
   useEffect(() => {
-    if (isReady) {
+    if (serverSettings) {
       return;
     }
     if (serverSettingsLoaded) {
@@ -9469,11 +9473,12 @@ const UserSettingsProvider = ({
         setServerSettings(settings);
         setIsReady(true);
       }
-    } else if (serverSettingsErrored) {
-      setServerSettings(settings);
+      return;
+    }
+    if (serverSettingsErrored && !isForbiddenError(error2)) {
       setIsReady(true);
     }
-  }, [serverSettingsLoaded, serverSettingsErrored, serverSettingsResponse, settings, isReady]);
+  }, [serverSettings, serverSettingsLoaded, serverSettingsErrored, error2, serverSettingsResponse, settings]);
   useEffect(() => {
     try {
       localStorage.setItem(LS_KEY_USER_SETTINGS, JSON.stringify(settings));
@@ -40822,7 +40827,7 @@ function useDayPickerLocale() {
   } = useDisplayLocale();
   const [calendarLocale, setCalendarLocale] = useState(void 0);
   useEffect(() => {
-    import("./locale-DQffIWuP.js").then((mod) => {
+    import("./locale-cLfB2IZc.js").then((mod) => {
       setCalendarLocale(bcpTagToDatePickerLocale(bcp47Tag, mod));
     });
   }, [bcp47Tag]);
@@ -41361,6 +41366,9 @@ const CurrentUserQuery = graphql(`
         }
     }
 `);
+function hasDashboardAccess(currentUser) {
+  return !!currentUser?.me?.channels.length;
+}
 const CurrentAdministratorAvatarQuery = `
     query CurrentAdministratorAvatar {
         activeAdministrator {
@@ -41385,6 +41393,15 @@ function AuthProvider({
     setActiveChannelId
   } = useUserSettings();
   const queryClient = useQueryClient();
+  const {
+    _: _t
+  } = useLingui();
+  const noChannelAccessError = _t(
+    /*i18n*/
+    {
+      id: "z5xMBB"
+    }
+  );
   const {
     data: currentUserData,
     isLoading,
@@ -41406,7 +41423,7 @@ function AuthProvider({
       setActiveChannelId(currentUserData.me.channels[0].id);
     }
   }, [settings.activeChannelId, currentUserData?.me?.channels]);
-  const isAuthenticated = !!currentUserData?.me?.id;
+  const isAuthenticated = hasDashboardAccess(currentUserData);
   const {
     data: avatarData
   } = useQuery({
@@ -41416,6 +41433,19 @@ function AuthProvider({
     enabled: isAuthenticated,
     staleTime: Infinity
   });
+  const endSessionWithoutChannelAccess = React.useCallback(async () => {
+    setIsLoginLogoutInProgress(true);
+    try {
+      await api.mutate(LogOutMutation)({});
+    } catch {
+    }
+    queryClient.removeQueries({
+      queryKey: ["currentUser"]
+    });
+    setAuthenticationError(noChannelAccessError);
+    setStatus("unauthenticated");
+    setIsLoginLogoutInProgress(false);
+  }, [queryClient, noChannelAccessError]);
   const login = React.useCallback((username, password, onLoginSuccess) => {
     setIsLoginLogoutInProgress(true);
     setStatus("verifying");
@@ -41426,8 +41456,13 @@ function AuthProvider({
       if (data.login.__typename === "CurrentUser") {
         setAuthenticationError(void 0);
         const {
-          data: refetchedData
+          data: refetchedData,
+          error: refetchError
         } = await refetchCurrentUser();
+        if (!refetchError && !hasDashboardAccess(refetchedData)) {
+          await endSessionWithoutChannelAccess();
+          return;
+        }
         if (refetchedData?.me?.channels?.length) {
           const previousChannel = settings.activeChannelId ? refetchedData.me.channels.find((c2) => c2.id === settings.activeChannelId) : void 0;
           const channel = previousChannel ?? refetchedData.me.channels[0];
@@ -41440,6 +41475,17 @@ function AuthProvider({
         }
         await queryClient.cancelQueries();
         await queryClient.invalidateQueries();
+        const currentUserState = queryClient.getQueryState(["currentUser"]);
+        if (currentUserState?.status === "success" && !hasDashboardAccess(currentUserState.data)) {
+          await endSessionWithoutChannelAccess();
+          return;
+        }
+        if (!hasDashboardAccess(currentUserState?.data)) {
+          setAuthenticationError(currentUserState?.error?.message);
+          setStatus("unauthenticated");
+          setIsLoginLogoutInProgress(false);
+          return;
+        }
         setStatus("authenticated");
         setIsLoginLogoutInProgress(false);
         onLoginSuccess?.();
@@ -41453,7 +41499,7 @@ function AuthProvider({
       setStatus("unauthenticated");
       setIsLoginLogoutInProgress(false);
     });
-  }, [refetchCurrentUser, queryClient, settings.activeChannelId, setActiveChannelId]);
+  }, [refetchCurrentUser, queryClient, settings.activeChannelId, setActiveChannelId, endSessionWithoutChannelAccess]);
   const logout = React.useCallback(async (onLogoutSuccess) => {
     setAuthenticationError(void 0);
     setIsLoginLogoutInProgress(true);
@@ -41467,7 +41513,7 @@ function AuthProvider({
         data: refreshedData,
         error: refreshedError
       } = await refetchCurrentUser();
-      if (refreshedError || !refreshedData?.me?.id) {
+      if (refreshedError || !hasDashboardAccess(refreshedData)) {
         setStatus("unauthenticated");
       } else {
         setStatus("authenticated");
@@ -41498,13 +41544,15 @@ function AuthProvider({
       return;
     }
     if (!isLoading && status === "verifying") {
-      if (currentUserError || !currentUserData?.me?.id) {
+      if (!currentUserError && currentUserData?.me?.id && !isAuthenticated) {
+        void endSessionWithoutChannelAccess();
+      } else if (currentUserError || !isAuthenticated) {
         setStatus("unauthenticated");
       } else {
         setStatus("authenticated");
       }
     }
-  }, [isLoading, currentUserData, currentUserError, status, isLoginLogoutInProgress]);
+  }, [isLoading, currentUserData, currentUserError, isAuthenticated, status, isLoginLogoutInProgress, endSessionWithoutChannelAccess]);
   const refreshCurrentUser = () => {
     queryClient.invalidateQueries({
       queryKey: ["currentUser"]
@@ -41728,7 +41776,8 @@ const ServerConfigProvider = ({
   children
 }) => {
   const {
-    user
+    user,
+    isAuthenticated
   } = useAuth();
   const queryKey2 = ["getServerConfig", user?.id];
   const {
@@ -41737,7 +41786,8 @@ const ServerConfigProvider = ({
     queryKey: queryKey2,
     queryFn: () => api.query(getServerConfigDocument),
     retry: false,
-    enabled: !!user?.id,
+    // Like the Channel queries, the server config needs access to a Channel. See #5617
+    enabled: isAuthenticated,
     // The server config rarely changes during a session (it's driven by
     // VendureConfig at boot time). Treat it as session-stable so we don't
     // re-fetch on every reconnect, which would cause flashes of empty
@@ -94780,7 +94830,16 @@ function PaginatedListDataTable({
     includeSelectionColumn
   });
   const columnVisibility = getColumnVisibility(columns, defaultColumnVisibility, customFieldColumnNames);
-  const visibleColumns = columns.filter((c2) => columnVisibility[c2.id] !== false || c2.id === "id").map((c2) => ({
+  const [liveColumnVisibility, setLiveColumnVisibility] = React__default.useState();
+  const handleColumnVisibilityChange = (table, visibility) => {
+    setLiveColumnVisibility(visibility);
+    onColumnVisibilityChange?.(table, visibility);
+  };
+  const effectiveColumnVisibility = {
+    ...columnVisibility,
+    ...liveColumnVisibility
+  };
+  const visibleColumns = columns.filter((c2) => effectiveColumnVisibility[c2.id] !== false || c2.id === "id").map((c2) => ({
     name: c2.id,
     isCustomField: c2.meta?.isCustomField ?? false,
     dependencies: c2.meta?.dependencies ?? []
@@ -94840,7 +94899,7 @@ function PaginatedListDataTable({
   }, children: isError && errorState ? errorState({
     error: error2,
     retry: () => refetch()
-  }) : /* @__PURE__ */ jsx(DataTable, { columns, data: transformedData, isLoading: isFetching, page, itemsPerPage, sorting, columnFilters, totalItems: listData?.totalItems ?? 0, onPageChange, onSortChange, onFilterChange, onColumnVisibilityChange, onSearchTermChange: onSearchTermChange ? (term) => setSearchTerm(term) : void 0, searchPlaceholder, defaultColumnVisibility: columnVisibility, facetedFilters, disableViewOptions, enableViews, bulkActions, selectedItems, onSelectionChange, setTableOptions, onRefresh: refetchPaginatedList, onReorder, disableDragAndDrop, emptyStateAction, emptyStateIllustration, title, actions, frame: frame2 }) });
+  }) : /* @__PURE__ */ jsx(DataTable, { columns, data: transformedData, isLoading: isFetching, page, itemsPerPage, sorting, columnFilters, totalItems: listData?.totalItems ?? 0, onPageChange, onSortChange, onFilterChange, onColumnVisibilityChange: handleColumnVisibilityChange, onSearchTermChange: onSearchTermChange ? (term) => setSearchTerm(term) : void 0, searchPlaceholder, defaultColumnVisibility: columnVisibility, facetedFilters, disableViewOptions, enableViews, bulkActions, selectedItems, onSelectionChange, setTableOptions, onRefresh: refetchPaginatedList, onReorder, disableDragAndDrop, emptyStateAction, emptyStateIllustration, title, actions, frame: frame2 }) });
 }
 function Pagination({ className, ...props }) {
   return /* @__PURE__ */ jsx(
@@ -115574,7 +115633,7 @@ function useSortedLanguages(availableLanguages) {
     label: formatLanguageName(code)
   })).sort((a2, b2) => a2.label.localeCompare(b2.label)), [availableLanguages, formatLanguageName]);
 }
-const localeMessages = /* @__PURE__ */ Object.assign({ "../../i18n/locales/ar.po": () => import("./ar-DMK_eFVD.js"), "../../i18n/locales/bg.po": () => import("./bg-_l7rTFuK.js"), "../../i18n/locales/cs.po": () => import("./cs-DMrGo78x.js"), "../../i18n/locales/de.po": () => import("./de-DEE86yVt.js"), "../../i18n/locales/en.po": () => import("./en-Cl1y9IIy.js"), "../../i18n/locales/es.po": () => import("./es-BxdaHguU.js"), "../../i18n/locales/fa.po": () => import("./fa-DmehFzkF.js"), "../../i18n/locales/fr.po": () => import("./fr-OT8cvTDq.js"), "../../i18n/locales/he.po": () => import("./he-BKP3NS5j.js"), "../../i18n/locales/hr.po": () => import("./hr-BYAgAid3.js"), "../../i18n/locales/hu.po": () => import("./hu-D5RzrlfJ.js"), "../../i18n/locales/it.po": () => import("./it-DjrjGb8J.js"), "../../i18n/locales/ja.po": () => import("./ja-CHHuYFJd.js"), "../../i18n/locales/ko.po": () => import("./ko-CIrLMXet.js"), "../../i18n/locales/nb.po": () => import("./nb-CBS2CxWA.js"), "../../i18n/locales/ne.po": () => import("./ne-BKFoZX0n.js"), "../../i18n/locales/nl.po": () => import("./nl-CioNp_N5.js"), "../../i18n/locales/pl.po": () => import("./pl-ChqS0pNw.js"), "../../i18n/locales/pt_BR.po": () => import("./pt_BR-8wz_k8Ib.js"), "../../i18n/locales/pt_PT.po": () => import("./pt_PT-BsddGCVI.js"), "../../i18n/locales/ro.po": () => import("./ro-DLZ4JjP9.js"), "../../i18n/locales/ru.po": () => import("./ru-CDB-oX6Y.js"), "../../i18n/locales/sv.po": () => import("./sv-C05330I8.js"), "../../i18n/locales/tr.po": () => import("./tr-BmdyAxJM.js"), "../../i18n/locales/uk.po": () => import("./uk-UHmyTWD9.js"), "../../i18n/locales/uz.po": () => import("./uz-BPv1mncF.js"), "../../i18n/locales/zh_Hans.po": () => import("./zh_Hans-DYtmTSvd.js"), "../../i18n/locales/zh_Hant.po": () => import("./zh_Hant-CdyREtHJ.js") });
+const localeMessages = /* @__PURE__ */ Object.assign({ "../../i18n/locales/ar.po": () => import("./ar-ZYyYt3LW.js"), "../../i18n/locales/bg.po": () => import("./bg-BgDGBTKB.js"), "../../i18n/locales/cs.po": () => import("./cs-BYGURbP6.js"), "../../i18n/locales/de.po": () => import("./de-HdkR3fYi.js"), "../../i18n/locales/en.po": () => import("./en-BAhByZZJ.js"), "../../i18n/locales/es.po": () => import("./es-Dt0C52Mq.js"), "../../i18n/locales/fa.po": () => import("./fa-CREXA3HL.js"), "../../i18n/locales/fr.po": () => import("./fr-Cz8kKMli.js"), "../../i18n/locales/he.po": () => import("./he-9NoIAj8m.js"), "../../i18n/locales/hr.po": () => import("./hr-BwXcr71B.js"), "../../i18n/locales/hu.po": () => import("./hu-DUz4OEIA.js"), "../../i18n/locales/it.po": () => import("./it-CAlaDmH7.js"), "../../i18n/locales/ja.po": () => import("./ja-2JxS6pFi.js"), "../../i18n/locales/ko.po": () => import("./ko-BsFLDX_m.js"), "../../i18n/locales/nb.po": () => import("./nb-Dff7oHih.js"), "../../i18n/locales/ne.po": () => import("./ne-ByGdZmfQ.js"), "../../i18n/locales/nl.po": () => import("./nl-DniFiVio.js"), "../../i18n/locales/pl.po": () => import("./pl-B5DHommF.js"), "../../i18n/locales/pt_BR.po": () => import("./pt_BR-BAq7WTWG.js"), "../../i18n/locales/pt_PT.po": () => import("./pt_PT-DL7eSU8R.js"), "../../i18n/locales/ro.po": () => import("./ro-CGYxDEv8.js"), "../../i18n/locales/ru.po": () => import("./ru-BduayFrD.js"), "../../i18n/locales/sv.po": () => import("./sv-E3RLr9cy.js"), "../../i18n/locales/tr.po": () => import("./tr-pMuzyLjn.js"), "../../i18n/locales/uk.po": () => import("./uk-BFfpHemj.js"), "../../i18n/locales/uz.po": () => import("./uz-DBzLLOoE.js"), "../../i18n/locales/zh_Hans.po": () => import("./zh_Hans-DDD5yH27.js"), "../../i18n/locales/zh_Hant.po": () => import("./zh_Hant-B9iOWieA.js") });
 async function loadI18nMessages(locale2) {
   const loader = localeMessages[`../../i18n/locales/${locale2}.po`];
   if (!loader) {
@@ -120808,8 +120867,7 @@ function getErrorKind(error2) {
   if (error2 instanceof NotFoundError) {
     return "not-found";
   }
-  const code = error2?.extensions?.code;
-  if (code === "FORBIDDEN" || code === "UNAUTHORIZED") {
+  if (isForbiddenError(error2)) {
     return "forbidden";
   }
   const status = error2?.response?.status;