@rebasepro/app 0.9.1-canary.ff338b5 → 0.10.1-canary.14e53ae

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
1
  import React from "react";
2
- import { AdminModeController } from "../hooks";
2
+ import type { AdminModeController } from "../hooks/useAdminModeController";
3
3
  export declare const AdminModeControllerContext: React.Context<AdminModeController>;
4
4
  export declare const AdminModeControllerProvider: React.Provider<AdminModeController>;
@@ -1,4 +1,4 @@
1
1
  import React from "react";
2
- import { ModeController } from "../hooks";
2
+ import type { ModeController } from "../hooks/useModeController";
3
3
  export declare const ModeControllerContext: React.Context<ModeController>;
4
4
  export declare const ModeControllerProvider: React.Provider<ModeController>;
@@ -1,4 +1,4 @@
1
- import { AdminModeController } from "./index";
1
+ import type { AdminModeController } from "./useAdminModeController";
2
2
  /**
3
3
  * Use this hook to build an admin mode controller that determines
4
4
  * whether the UI shows Developer or Editor tools.
@@ -1,4 +1,4 @@
1
- import { ModeController } from "./index";
1
+ import type { ModeController } from "./useModeController";
2
2
  /**
3
3
  * Use this hook to build a color mode controller that determines
4
4
  * the theme of the CMS
@@ -0,0 +1,29 @@
1
+ import React from "react";
2
+ import { Blocker, BlockerFunction } from "react-router-dom";
3
+ /**
4
+ * Owns the single React Router blocker for the whole app.
5
+ *
6
+ * React Router only honours **one** blocker at a time: `shouldBlockNavigation`
7
+ * picks the last-registered blocker function and silently ignores every other
8
+ * one (it only logs a dev warning). Because blockers register in a `useEffect`,
9
+ * the winner is whichever surface mounted most recently — so an unsaved-changes
10
+ * guard could be disabled by an unrelated component mounting after it.
11
+ *
12
+ * This provider registers the only `useBlocker` in the tree and multiplexes it,
13
+ * so every surface that needs to guard navigation gets a say regardless of
14
+ * mount order. Surfaces register through {@link useNavigationBlocker}.
15
+ */
16
+ export declare function NavigationBlockerProvider({ children }: {
17
+ children: React.ReactNode;
18
+ }): React.JSX.Element;
19
+ /**
20
+ * Guard navigation with `predicate`, sharing the app-wide blocker.
21
+ *
22
+ * Returns a {@link Blocker} that is only ever in the `blocked` state when *this*
23
+ * registration is what blocked the navigation — so several guards can coexist
24
+ * without each of them popping a dialog.
25
+ *
26
+ * Returns an idle blocker when no {@link NavigationBlockerProvider} is mounted
27
+ * above, rather than competing for React Router's single blocker slot.
28
+ */
29
+ export declare function useNavigationBlocker(predicate: BlockerFunction): Blocker;
package/dist/index.d.ts CHANGED
@@ -7,6 +7,7 @@ export * from "./contexts";
7
7
  export { CONTAINER_FULL_WIDTH, ADDITIONAL_TAB_WIDTH, FORM_CONTAINER_WIDTH } from "./internal/common";
8
8
  export { useRestoreScroll } from "./internal/useRestoreScroll";
9
9
  export { useUnsavedChangesDialog } from "./hooks/useUnsavedChangesDialog";
10
+ export { NavigationBlockerProvider, useNavigationBlocker } from "./hooks/useNavigationBlocker";
10
11
  export type { UnsavedChangesDialogProps } from "./components/UnsavedChangesDialog";
11
12
  export { UnsavedChangesDialog } from "./components/UnsavedChangesDialog";
12
13
  export * from "./i18n/RebaseI18nProvider";
package/dist/index.es.js CHANGED
@@ -1,9 +1,9 @@
1
- import React, { createContext, lazy, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
1
+ import React, { createContext, lazy, useCallback, useContext, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from "react";
2
2
  import { Alert, AlertCircleIcon, AlertTriangleIcon, AppWindow, ArrowLeftIcon, Avatar, BooleanSwitch, Button, CHIP_COLORS, Card, CenteredView, CheckIcon, Checkbox, ChevronDownIcon, ChevronsLeftIcon, ChevronsRightIcon, Chip, CircleUserIcon, CircularProgress, ColumnsIcon, Container, Dialog, DialogActions, DialogContent, DialogTitle, ErrorBoundary, FileIcon, FileTextIcon, FilterChip, FilterIcon, FolderIcon, IconButton, KanbanIcon, KanbanView, LanguagesIcon, LayoutGridIcon, ListIcon, LoadingButton, LogOutIcon, MailIcon, Menu, MenuItem, MoonIcon, MultiSelect, MultiSelectItem, PanelLeftIcon, Paper, PencilIcon, PlusIcon, Popover, SearchBar, Select, SelectItem, Separator, SettingsIcon, Skeleton, SunIcon, SunMoonIcon, Tab, Table, TableBody, TableCell, TableHeader, TableRow, Tabs, TagIcon, TextField, ToggleButtonGroup, Tooltip, Trash2Icon, TypeIcon, Typography, UserIcon, Wand2Icon, cls, colorClassesMapping, coolIconKeys, defaultBorderMixin, getColorSchemeForSeed, iconKeys, iconSize, lucideIcons } from "@rebasepro/ui";
3
3
  import { DEFAULT_DATA_SOURCE_KEY, DEFAULT_STORAGE_SOURCE_KEY, EntityReference, EntityRelation, GeoPoint, RebaseApiError, Vector, isLazyComponentRef } from "@rebasepro/types";
4
4
  import { Fragment, jsx, jsxs } from "react/jsx-runtime";
5
5
  import { SnackbarProvider as SnackbarProvider$1, useSnackbar } from "notistack";
6
- import { buildRebaseData, canCreateEntity, canDeleteEntity, canEditEntity, canReadCollection, getLabelOrConfigFrom, getSubcollections, isPropertyBuilder, removeInitialAndTrailingSlashes, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource, stripCollectionPath, wrapAsEntityData, wrapAsSdkData } from "@rebasepro/common";
6
+ import { buildRebaseData, canCreateEntity, canDeleteEntity, canEditEntity, canReadCollection, getLabelOrConfigFrom, getSubcollections, getTitlePropertyKey, isPropertyBuilder, removeInitialAndTrailingSlashes, resolveStorageFilenameString, resolveStoragePathString, resolveStorageSource, stripCollectionPath, wrapAsEntityData, wrapAsSdkData } from "@rebasepro/common";
7
7
  import { Link, RouterProvider, Routes, createBrowserRouter, useBlocker, useLocation } from "react-router-dom";
8
8
  import { hashString, isObject, isPlainObject, mergeDeep, randomString, slugify } from "@rebasepro/utils";
9
9
  import { I18nextProvider, initReactI18next, useTranslation as useTranslation$1 } from "react-i18next";
@@ -472,29 +472,13 @@ function getRelationIncludeParams(collection) {
472
472
  if (!collection.properties) return void 0;
473
473
  return Object.values(collection.properties).some((property) => property && !isPropertyBuilder(property) && (isRelationProperty(property) || isReferenceProperty(property))) ? INCLUDE_ALL_RELATIONS : void 0;
474
474
  }
475
+ /**
476
+ * The property that fills the title slot for a collection. Ranking lives in
477
+ * `@rebasepro/common`, shared with the admin package so both agree on what an
478
+ * entity is called.
479
+ */
475
480
  function getEntityTitlePropertyKey(collection, propertyConfigs) {
476
- if (collection.titleProperty) return collection.titleProperty;
477
- const orderToSearch = collection.propertiesOrder || Object.keys(collection.properties);
478
- let firstStringCandidate;
479
- for (const key of orderToSearch) {
480
- const property = collection.properties[key];
481
- if (property && !isPropertyBuilder(property)) {
482
- const prop = property;
483
- if (isHiddenProperty(prop)) continue;
484
- if (prop.type === "string" && !prop.ui?.multiline && !prop.ui?.markdown && !prop.storage && !prop.isId) {
485
- if (!firstStringCandidate) firstStringCandidate = key;
486
- const lowerKey = key.toLowerCase();
487
- if ([
488
- "name",
489
- "title",
490
- "label",
491
- "displayname",
492
- "username"
493
- ].includes(lowerKey)) return key;
494
- }
495
- }
496
- }
497
- return firstStringCandidate;
481
+ return getTitlePropertyKey(collection);
498
482
  }
499
483
  //#endregion
500
484
  //#region src/hooks/data/useCollection.tsx
@@ -1080,6 +1064,91 @@ async function deleteEntityWithCallbacks({ data, entity, collection, callbacks,
1080
1064
  });
1081
1065
  }
1082
1066
  //#endregion
1067
+ //#region src/hooks/useNavigationBlocker.tsx
1068
+ var IDLE_BLOCKER = {
1069
+ state: "unblocked",
1070
+ proceed: void 0,
1071
+ reset: void 0,
1072
+ location: void 0
1073
+ };
1074
+ var NavigationBlockerContext = createContext(null);
1075
+ /**
1076
+ * Owns the single React Router blocker for the whole app.
1077
+ *
1078
+ * React Router only honours **one** blocker at a time: `shouldBlockNavigation`
1079
+ * picks the last-registered blocker function and silently ignores every other
1080
+ * one (it only logs a dev warning). Because blockers register in a `useEffect`,
1081
+ * the winner is whichever surface mounted most recently — so an unsaved-changes
1082
+ * guard could be disabled by an unrelated component mounting after it.
1083
+ *
1084
+ * This provider registers the only `useBlocker` in the tree and multiplexes it,
1085
+ * so every surface that needs to guard navigation gets a say regardless of
1086
+ * mount order. Surfaces register through {@link useNavigationBlocker}.
1087
+ */
1088
+ function NavigationBlockerProvider({ children }) {
1089
+ const predicates = useRef(/* @__PURE__ */ new Map());
1090
+ const [blockedBy, setBlockedBy] = useState(null);
1091
+ const blocker = useBlocker(useCallback((args) => {
1092
+ for (const [id, predicate] of predicates.current) if (predicate(args)) {
1093
+ setBlockedBy(id);
1094
+ return true;
1095
+ }
1096
+ setBlockedBy(null);
1097
+ return false;
1098
+ }, []));
1099
+ const register = useCallback((id, predicate) => {
1100
+ predicates.current.set(id, predicate);
1101
+ }, []);
1102
+ const unregister = useCallback((id) => {
1103
+ predicates.current.delete(id);
1104
+ setBlockedBy((current) => current === id ? null : current);
1105
+ }, []);
1106
+ const value = useMemo(() => ({
1107
+ register,
1108
+ unregister,
1109
+ blocker,
1110
+ blockedBy
1111
+ }), [
1112
+ register,
1113
+ unregister,
1114
+ blocker,
1115
+ blockedBy
1116
+ ]);
1117
+ return /* @__PURE__ */ jsx(NavigationBlockerContext.Provider, {
1118
+ value,
1119
+ children
1120
+ });
1121
+ }
1122
+ /**
1123
+ * Guard navigation with `predicate`, sharing the app-wide blocker.
1124
+ *
1125
+ * Returns a {@link Blocker} that is only ever in the `blocked` state when *this*
1126
+ * registration is what blocked the navigation — so several guards can coexist
1127
+ * without each of them popping a dialog.
1128
+ *
1129
+ * Returns an idle blocker when no {@link NavigationBlockerProvider} is mounted
1130
+ * above, rather than competing for React Router's single blocker slot.
1131
+ */
1132
+ function useNavigationBlocker(predicate) {
1133
+ const context = useContext(NavigationBlockerContext);
1134
+ const id = useId();
1135
+ const predicateRef = useRef(predicate);
1136
+ predicateRef.current = predicate;
1137
+ const register = context?.register;
1138
+ const unregister = context?.unregister;
1139
+ useEffect(() => {
1140
+ if (!register || !unregister) return;
1141
+ register(id, (args) => predicateRef.current(args));
1142
+ return () => unregister(id);
1143
+ }, [
1144
+ register,
1145
+ unregister,
1146
+ id
1147
+ ]);
1148
+ if (!context) return IDLE_BLOCKER;
1149
+ return context.blockedBy === id ? context.blocker : IDLE_BLOCKER;
1150
+ }
1151
+ //#endregion
1083
1152
  //#region src/hooks/useUnsavedChangesDialog.tsx
1084
1153
  /**
1085
1154
  * A single, unified hook to prevent navigation when there are unsaved changes.
@@ -1090,7 +1159,7 @@ async function deleteEntityWithCallbacks({ data, entity, collection, callbacks,
1090
1159
  */
1091
1160
  function useUnsavedChangesDialog(when, onOk) {
1092
1161
  const [manualDialogOpen, setManualDialogOpen] = useState(false);
1093
- const blocker = useBlocker(({ currentLocation, nextLocation }) => when && currentLocation.pathname !== nextLocation.pathname);
1162
+ const blocker = useNavigationBlocker(useCallback(({ currentLocation, nextLocation }) => when && currentLocation.pathname !== nextLocation.pathname, [when]));
1094
1163
  useEffect(() => {
1095
1164
  if (!when) return;
1096
1165
  const handleBeforeUnload = (e) => {
@@ -15570,6 +15639,7 @@ function Rebase(props) {
15570
15639
  executeSql: wsAdmin.executeSql.bind(wsAdmin),
15571
15640
  fetchAvailableDatabases: wsAdmin.fetchAvailableDatabases?.bind(wsAdmin),
15572
15641
  fetchAvailableRoles: wsAdmin.fetchAvailableRoles?.bind(wsAdmin),
15642
+ fetchApplicationRoles: wsAdmin.fetchApplicationRoles?.bind(wsAdmin),
15573
15643
  fetchCurrentDatabase: wsAdmin.fetchCurrentDatabase?.bind(wsAdmin),
15574
15644
  fetchUnmappedTables: wsAdmin.fetchUnmappedTables?.bind(wsAdmin),
15575
15645
  fetchTableMetadata: wsAdmin.fetchTableMetadata?.bind(wsAdmin),
@@ -16888,6 +16958,6 @@ function useBridgeRegistration(key, value) {
16888
16958
  ]);
16889
16959
  }
16890
16960
  //#endregion
16891
- export { ADDITIONAL_TAB_WIDTH, AIIcon, AIModifiedIndicator, AdminModeControllerContext, AdminModeControllerProvider, AnalyticsContext, ApiConfigProvider, AuthApiError, AuthControllerContext, CONTAINER_FULL_WIDTH, CollectionComponentOverrideProvider, CollectionResolverRegistrationContext, CollectionScopeContext, CollectionScopeProvider, ComponentOverrideContext, ConfirmationDialog, CrmDashboardDemo, CustomizationControllerContext, DEFAULT_PAGE_SIZE, DataDriverContext, DataSourcesContext, DialogsControllerContext, DialogsProvider, EffectiveRoleControllerContext, EffectiveRoleControllerProvider, ErrorTooltip, ErrorView, FORM_CONTAINER_WIDTH, GlobalComponentOverrideProvider, IconForView, LanguageToggle, LoginView, ModeControllerContext, ModeControllerProvider, NotFoundPage, PluginProviderStack, REBASE_LOCALE_STORAGE_KEY, Rebase, RebaseAuth, RebaseClientInstanceContext, RebaseDataContext, RebaseI18nProvider, RebaseLogo, RebaseRegistryProvider, RebaseRouter, RebaseRoutes, STUDIO_NAVIGATION_GROUPS, SchemaDriftBanner, SchemaDriftProvider, SnackbarProvider, StorageSourceContext, StorageSourcesContext, StudioBridgeContext, StudioBridgeProvider, StudioBridgeRegistryContext, StudioBridgeRegistryProvider, UIReferenceView, UIStyleGuide, UnsavedChangesDialog, UserConfigurationPersistenceContext, UserDisplay, UserSelectPopover, UserSettingsView, buildCollapsedDefaults, buildEnumLabel, clearAuthConfigCache, clearFetchCache, createAuthConfigCache, createFormexStub, deleteEntityWithCallbacks, en, es, fetchAuthConfig, flattenKeys, getColorScheme, getColumnKeysForProperty, getEntityFromCache, getEntityFromMemoryCache, getEntityPreviewKeys, getEntityTitlePropertyKey, getFormFieldKeys, getIcon, getRelationIncludeParams, getRowHeight, getSubcollectionColumnId, iconsSearch, isEnumValueDisabled, isSchemaDriftError, populateFetchCache, removeEntityFromCache, removeEntityFromMemoryCache, resolveComponentRef, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAdminModeController, useAnalyticsController, useApiConfig, useAuthController, useAuthSubscription, useBackendStorageSource, useBridgeRegistration, useBrowserTitleAndIcon, useBuildAdminModeController, useBuildEffectiveRoleController, useBuildLocalConfigurationPersistence, useBuildModeController, useClipboard, useCollapsedGroups, useCollection, useCollectionScope, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataSources, useDataTableController, useDebouncedData, useDialogsController, useEffectiveRoleController, useFetch, useLargeLayout, useModeController, usePermissions, useRebaseAuthController, useRebaseClient, useRebaseContext, useRebaseRegistry, useRebaseRegistryDispatch, useRelationSelector, useResolvedComponent, useRestoreScroll, useSchemaDriftContext, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageSources, useStorageUploadController, useStudioBreadcrumbs, useStudioCollectionRegistry, useStudioNavigationState, useStudioSidePanelController, useStudioUrlController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence };
16961
+ export { ADDITIONAL_TAB_WIDTH, AIIcon, AIModifiedIndicator, AdminModeControllerContext, AdminModeControllerProvider, AnalyticsContext, ApiConfigProvider, AuthApiError, AuthControllerContext, CONTAINER_FULL_WIDTH, CollectionComponentOverrideProvider, CollectionResolverRegistrationContext, CollectionScopeContext, CollectionScopeProvider, ComponentOverrideContext, ConfirmationDialog, CrmDashboardDemo, CustomizationControllerContext, DEFAULT_PAGE_SIZE, DataDriverContext, DataSourcesContext, DialogsControllerContext, DialogsProvider, EffectiveRoleControllerContext, EffectiveRoleControllerProvider, ErrorTooltip, ErrorView, FORM_CONTAINER_WIDTH, GlobalComponentOverrideProvider, IconForView, LanguageToggle, LoginView, ModeControllerContext, ModeControllerProvider, NavigationBlockerProvider, NotFoundPage, PluginProviderStack, REBASE_LOCALE_STORAGE_KEY, Rebase, RebaseAuth, RebaseClientInstanceContext, RebaseDataContext, RebaseI18nProvider, RebaseLogo, RebaseRegistryProvider, RebaseRouter, RebaseRoutes, STUDIO_NAVIGATION_GROUPS, SchemaDriftBanner, SchemaDriftProvider, SnackbarProvider, StorageSourceContext, StorageSourcesContext, StudioBridgeContext, StudioBridgeProvider, StudioBridgeRegistryContext, StudioBridgeRegistryProvider, UIReferenceView, UIStyleGuide, UnsavedChangesDialog, UserConfigurationPersistenceContext, UserDisplay, UserSelectPopover, UserSettingsView, buildCollapsedDefaults, buildEnumLabel, clearAuthConfigCache, clearFetchCache, createAuthConfigCache, createFormexStub, deleteEntityWithCallbacks, en, es, fetchAuthConfig, flattenKeys, getColorScheme, getColumnKeysForProperty, getEntityFromCache, getEntityFromMemoryCache, getEntityPreviewKeys, getEntityTitlePropertyKey, getFormFieldKeys, getIcon, getRelationIncludeParams, getRowHeight, getSubcollectionColumnId, iconsSearch, isEnumValueDisabled, isSchemaDriftError, populateFetchCache, removeEntityFromCache, removeEntityFromMemoryCache, resolveComponentRef, saveEntityToCache, saveEntityToMemoryCache, saveEntityWithCallbacks, useAdminModeController, useAnalyticsController, useApiConfig, useAuthController, useAuthSubscription, useBackendStorageSource, useBridgeRegistration, useBrowserTitleAndIcon, useBuildAdminModeController, useBuildEffectiveRoleController, useBuildLocalConfigurationPersistence, useBuildModeController, useClipboard, useCollapsedGroups, useCollection, useCollectionScope, useColumnIds, useComponentOverride, useCustomizationController, useData, useDataSources, useDataTableController, useDebouncedData, useDialogsController, useEffectiveRoleController, useFetch, useLargeLayout, useModeController, useNavigationBlocker, usePermissions, useRebaseAuthController, useRebaseClient, useRebaseContext, useRebaseRegistry, useRebaseRegistryDispatch, useRelationSelector, useResolvedComponent, useRestoreScroll, useSchemaDriftContext, useScrollRestoration, useSlot, useSnackbarController, useStorageSource, useStorageSources, useStorageUploadController, useStudioBreadcrumbs, useStudioCollectionRegistry, useStudioNavigationState, useStudioSidePanelController, useStudioUrlController, useTranslation, useUnsavedChangesDialog, useUserConfigurationPersistence };
16892
16962
 
16893
16963
  //# sourceMappingURL=index.es.js.map