@rebasepro/admin 0.9.0 → 0.9.1-canary.09aaf62

package/src/components/SelectableTable/filters/StringNumberFilterField.tsx

@@ -11,7 +11,7 @@ import {
     XIcon
 } from "@rebasepro/ui";
 import { EnumValueConfig } from "@rebasepro/types";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 interface StringNumberFilterFieldProps {
     name: string,

package/src/components/SideDialogs.tsx

@@ -2,7 +2,7 @@ import type { SideDialogPanelProps } from "../hooks/useSideDialogsController";
 import React, { useCallback, useContext, useEffect, useState, useMemo } from "react";
 import { useSideDialogsController } from "../hooks";
 import { Sheet, Dialog } from "@rebasepro/ui";
-import { useUnsavedChangesDialog, UnsavedChangesDialog } from "@rebasepro/core";
+import { useUnsavedChangesDialog, UnsavedChangesDialog } from "@rebasepro/app";
 import { ErrorBoundary } from "@rebasepro/ui";
 import type { SidePanelBindingProps } from "@rebasepro/types";
 

package/src/components/SidePanelBinding.tsx

@@ -9,7 +9,7 @@ import { EditViewBinding } from "./EditViewBinding";
 import { DetailViewBinding } from "./DetailViewBinding";
 import { useSideDialogContext } from "./SideDialogs";
 import { useNavigate } from "react-router-dom";
-import { saveEntityToMemoryCache, useComponentOverride } from "@rebasepro/core";
+import { saveEntityToMemoryCache, useComponentOverride } from "@rebasepro/app";
 import { useCollectionRegistryController, useSidePanel } from "../index";
 import { useUrlController } from "../index";
 import { resolveDefaultSelectedView } from "@rebasepro/common";

package/src/components/SidePanelProvider.tsx

@@ -8,11 +8,11 @@ import { BreadcrumbsProvider } from "../contexts/BreacrumbsContext";
 import { useBreadcrumbsController } from "../hooks/useBreadcrumbsController";
 import { useCollectionRegistryController, useUrlController } from "../index";
 import { useNavigationStateController } from "../index";
-import { useAuthController, useBridgeRegistration } from "@rebasepro/core";
+import { useAuthController, useBridgeRegistration } from "@rebasepro/app";
 
 /**
  * Provider that builds the SidePanelController and makes it available
- * via the SidePanelControllerContext from @rebasepro/core.
+ * via the SidePanelControllerContext from @rebasepro/app.
  *
  * After the CMS extraction refactor, `useBuildSidePanel` lives
  * in the CMS package while the context it feeds into lives in core.

package/src/components/UserSelector.tsx

@@ -21,7 +21,7 @@ import * as React from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Command as CommandPrimitive } from "cmdk";
 import { User } from "@rebasepro/types";
-import { useRebaseClient, useAuthController, UserDisplay } from "@rebasepro/core";
+import { useRebaseClient, useAuthController, UserDisplay } from "@rebasepro/app";
 import { EmptyValue } from "../preview";
 
 interface UserSelectorItem {

package/src/components/admin/CreationResultDialog.tsx

@@ -13,7 +13,7 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import { useSnackbarController, useTranslation } from "@rebasepro/core";
+import { useSnackbarController, useTranslation } from "@rebasepro/app";
 import { UserCreationResult } from "@rebasepro/types";
 
 export function CreationResultDialog({
@@ -90,8 +90,11 @@ export function CreationResultDialog({
                     <div className="flex flex-col gap-4 py-2">
                         <Alert color="warning">
                             <Typography variant="body2">
-                                {t("temporary_password_description") ??
-                                    "Email is not configured. Share this temporary password with the user securely. It will not be shown again."}
+                                {result.emailDeliveryFailed
+                                    ? (t("temporary_password_email_failed_description") ??
+                                        "The email could not be delivered. Share this temporary password with the user securely. It will not be shown again.")
+                                    : (t("temporary_password_description") ??
+                                        "Email is not configured. Share this temporary password with the user securely. It will not be shown again.")}
                             </Typography>
                         </Alert>
 

package/src/components/app/Scaffold.tsx

@@ -3,7 +3,7 @@ import { cls, defaultBorderMixin, IconButton, Sheet, Tooltip } from "@rebasepro/
 import { ChevronLeftIcon, ErrorBoundary, MenuIcon } from "@rebasepro/ui";
 import { deepEqual as equal } from "fast-equals"
 
-import { useLargeLayout, useAdminModeController, useTranslation } from "@rebasepro/core";
+import { useLargeLayout, useAdminModeController, useTranslation } from "@rebasepro/app";
 import { AppContext } from "./useApp";
 
 export const DRAWER_WIDTH = 280;
@@ -141,8 +141,12 @@ export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(
 
                         <div
                             className={cls(defaultBorderMixin, "bg-surface-50 dark:bg-surface-800", "grow overflow-auto m-0", {
-                                "lg:mt-4": !hasAppBar,
                                 "mt-1 lg:m-0 lg:mx-2 lg:mb-2 lg:rounded-lg lg:border-t lg:border-x lg:border-solid": padding,
+                                // No app bar means no DrawerHeader spacer above, so inset the
+                                // panel by the same amount as its sides and bottom.
+                                // Must come after the padding classes, which reset lg margins.
+                                "lg:mt-2": !hasAppBar && padding,
+                                "lg:mt-4": !hasAppBar && !padding,
                                 "border-t": hasAppBar && !padding
                             })}>
 

package/src/components/common/default_entity_actions.tsx

@@ -1,12 +1,29 @@
-import { CopyIcon, iconSize, KeyRoundIcon, PencilIcon, Trash2Icon } from "@rebasepro/ui";
+import {
+    Alert,
+    Button,
+    CopyIcon,
+    Dialog,
+    DialogActions,
+    DialogContent,
+    DialogTitle,
+    iconSize,
+    KeyRoundIcon,
+    Label,
+    LoadingButton,
+    PencilIcon,
+    RadioGroup,
+    RadioGroupItem,
+    TextField,
+    Trash2Icon,
+    Typography
+} from "@rebasepro/ui";
 import type { EntityAction, User, UserCreationResult } from "@rebasepro/types";
 import {
-    ConfirmationDialog,
     useAuthController,
     useRebaseClient,
     useSnackbarController,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
 import { addRecentId } from "../CollectionViewBinding/utils";
 import { navigateToEntity } from "../../util/navigation_utils";
@@ -193,9 +210,23 @@ export function ResetPasswordActionDialog({
     const { t } = useTranslation();
     const [loading, setLoading] = useState(false);
     const [creationResult, setCreationResult] = useState<UserCreationResult | null>(null);
+    const [mode, setMode] = useState<"email" | "manual">("email");
+    const [password, setPassword] = useState("");
+    const [confirmPassword, setConfirmPassword] = useState("");
+    const [error, setError] = useState<string | null>(null);
+
+    // Strength rules are enforced server side, and are overridable through auth
+    // hooks, so only the match is checked here; the server's message is surfaced.
+    const passwordsMatch = password === confirmPassword;
+    const canSubmit = mode === "email" || (password.length > 0 && passwordsMatch);
 
     const handleConfirm = async () => {
+        if (mode === "manual" && !passwordsMatch) {
+            setError(t("passwords_dont_match") || "Passwords don't match");
+            return;
+        }
         setLoading(true);
+        setError(null);
         try {
             const baseUrl = client?.baseUrl || "";
             const token = await getAuthToken?.();
@@ -204,28 +235,32 @@ export function ResetPasswordActionDialog({
                 headers: {
                     "Content-Type": "application/json",
                     ...(token ? { "Authorization": `Bearer ${token}` } : {})
-                }
+                },
+                body: JSON.stringify(mode === "manual" ? { password } : {})
             });
             if (!response.ok) {
-                const error = await response.json().catch(() => ({}));
-                throw new Error(error.message || "Failed to reset password");
+                const errorBody = await response.json().catch(() => ({}));
+                throw new Error(errorBody.error?.message || errorBody.message || "Failed to reset password");
             }
             const data = await response.json();
-            setCreationResult({
-                user,
-                invitationSent: data.invitationSent ?? false,
-                temporaryPassword: data.temporaryPassword
-            });
             snackbarController.open({
                 type: "success",
                 message: t("reset_password_success") || "Password reset successfully"
             });
-        } catch (error: unknown) {
-            snackbarController.open({
-                type: "error",
-                message: error instanceof Error ? error.message : (t("error_resetting_password") || "Error resetting password")
-            });
-            onClose();
+            // Setting a password directly returns neither an invitation nor a
+            // temporary password, so there is no result to show.
+            if (data.invitationSent || data.temporaryPassword) {
+                setCreationResult({
+                    user,
+                    invitationSent: data.invitationSent ?? false,
+                    temporaryPassword: data.temporaryPassword,
+                    emailDeliveryFailed: data.emailDeliveryFailed ?? false
+                });
+            } else {
+                onClose();
+            }
+        } catch (e: unknown) {
+            setError(e instanceof Error ? e.message : (t("error_resetting_password") || "Error resetting password"));
         } finally {
             setLoading(false);
         }
@@ -244,14 +279,77 @@ export function ResetPasswordActionDialog({
     }
 
     return (
-        <ConfirmationDialog
-            open={open}
-            loading={loading}
-            onAccept={handleConfirm}
-            onCancel={onClose}
-            title={<>{t("reset_password") || "Reset Password"}</>}
-            body={<>{t("reset_password_confirmation") || "Are you sure you want to reset this user's password?"}</>}
-        />
+        <Dialog open={open} onOpenChange={(o) => !o ? onClose() : undefined} maxWidth="xl">
+            <DialogTitle variant="h5" gutterBottom={false}>
+                {t("reset_password") || "Reset Password"}
+            </DialogTitle>
+            <DialogContent>
+                <div className="flex flex-col gap-4 py-2">
+                    <Typography variant="body2" color="secondary">
+                        {user.email}
+                    </Typography>
+
+                    <RadioGroup value={mode} onValueChange={(v) => {
+                        setMode(v as "email" | "manual");
+                        setError(null);
+                    }}>
+                        <div className="flex items-center gap-2">
+                            <RadioGroupItem value="email" id="reset-password-mode-email"/>
+                            <Label htmlFor="reset-password-mode-email">
+                                {t("reset_password_send_email") || "Send a password reset email"}
+                            </Label>
+                        </div>
+                        <div className="flex items-center gap-2">
+                            <RadioGroupItem value="manual" id="reset-password-mode-manual"/>
+                            <Label htmlFor="reset-password-mode-manual">
+                                {t("reset_password_set_manually") || "Set a password manually"}
+                            </Label>
+                        </div>
+                    </RadioGroup>
+
+                    {mode === "manual" && <>
+                        <TextField
+                            type="password"
+                            value={password}
+                            autoFocus
+                            autoComplete="new-password"
+                            label={t("new_password") || "New password"}
+                            onChange={(e) => {
+                                setPassword(e.target.value);
+                                setError(null);
+                            }}
+                        />
+                        <TextField
+                            type="password"
+                            value={confirmPassword}
+                            autoComplete="new-password"
+                            error={confirmPassword.length > 0 && !passwordsMatch}
+                            label={t("confirm_password") || "Confirm password"}
+                            onChange={(e) => {
+                                setConfirmPassword(e.target.value);
+                                setError(null);
+                            }}
+                        />
+                        <Typography variant="caption" color="secondary">
+                            {t("reset_password_set_manually_description") ||
+                                "The password is updated immediately and no email is sent. Share it with the user securely."}
+                        </Typography>
+                    </>}
+
+                    {error && <Alert color="error">
+                        <Typography variant="body2">{error}</Typography>
+                    </Alert>}
+                </div>
+            </DialogContent>
+            <DialogActions>
+                <Button variant="text" onClick={onClose} disabled={loading}>
+                    {t("cancel")}
+                </Button>
+                <LoadingButton variant="filled" onClick={handleConfirm} loading={loading} disabled={!canSubmit}>
+                    {t("reset_password") || "Reset Password"}
+                </LoadingButton>
+            </DialogActions>
+        </Dialog>
     );
 }
 

package/src/components/field_configs.tsx

@@ -142,7 +142,7 @@ Field: TextFieldBinding }
     },
     user_select: {
         key: "user_select",
-        name: "UserIcon select",
+        name: "User select",
         description: "Select a user from the user management system. Store the user ID.",
         Icon: UserIcon,
         property: {

package/src/components/history/EntityHistoryEntry.tsx

@@ -7,7 +7,7 @@ import { PreviewSize } from "../../types/components/PropertyPreviewProps";
 import { getPropertyInPath } from "../../util/property_utils";
 import { PropertyPreview } from "../../preview/PropertyPreview";
 import { SkeletonPropertyComponent } from "../../preview/property_previews/SkeletonPropertyComponent";
-import { useAuthController } from "@rebasepro/core";
+import { useAuthController } from "@rebasepro/app";
 import { UserChip } from "./UserChip";
 import { HistoryEntryData } from "../../hooks";
 import { getValueInPath } from "@rebasepro/utils";

package/src/components/history/EntityHistoryView.tsx

@@ -4,8 +4,8 @@ import { useRef, useEffect } from "react";
 import { cls, IconButton, Label, Tooltip, Typography } from "@rebasepro/ui";
 import { ErrorBoundary, HistoryIcon } from "@rebasepro/ui";
 import { EntityHistoryEntry } from "./EntityHistoryEntry";
-import { useSnackbarController, useAuthController } from "@rebasepro/core";
-import { ConfirmationDialog } from "@rebasepro/core";
+import { useSnackbarController, useAuthController } from "@rebasepro/app";
+import { ConfirmationDialog } from "@rebasepro/app";
 import { useState } from "react";
 import { useHistory } from "../../index";
 
@@ -72,7 +72,7 @@ export function EntityHistoryView<M extends Record<string, unknown>>({
 
     if (!entity) {
         return <div className="flex items-center justify-center h-full">
-            <Label>HistoryIcon is only available for existing entities</Label>
+            <Label>History is only available for existing entities</Label>
         </div>;
     }
 
@@ -117,7 +117,7 @@ export function EntityHistoryView<M extends Record<string, unknown>>({
         <div className="flex flex-col gap-2 max-w-6xl mx-auto w-full">
 
             <Typography variant={"h5"} className={"mt-24 ml-4"}>
-                HistoryIcon
+                History
             </Typography>
 
             {isLoading && entries.length === 0 && (

package/src/components/history/LastEditedByIndicator.tsx

@@ -1,8 +1,8 @@
 import type { CollectionConfig } from "@rebasepro/types";
 import React, { useEffect, useState, useCallback } from "react";
 ;
-import { useApiConfig } from "@rebasepro/core";
-import { useAuthController } from "@rebasepro/core";
+import { useApiConfig } from "@rebasepro/app";
+import { useAuthController } from "@rebasepro/app";
 import { HistoryEntryData } from "../../hooks";
 
 function getRelativeTimeString(date: Date): string {

package/src/components/index.ts

@@ -46,7 +46,7 @@ export * from "./DrawerNavigationGroup";
 export * from "./SideDialogs";
 
 export * from "./app/useApp";
-export * from "./RebaseCMS";
+export * from "./RebaseAdmin";
 export * from "./RebaseShell";
 
 // Composable shell layers — each independently usable

package/src/data_export/export/BasicExportAction.tsx

@@ -1,7 +1,7 @@
 
 import React, { useCallback } from "react";
 
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { Entity, Properties } from "@rebasepro/types";
 import {
     BooleanSwitchWithLabel,

package/src/data_export/export/ExportCollectionAction.tsx

@@ -6,7 +6,7 @@ import {
     useCustomizationController,
     useData,
     useTranslation
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { useCMSContext } from "../../hooks";
 import { CollectionActionsProps, Entity, CollectionConfig, ExportConfig, RebaseContext, User } from "@rebasepro/types";
 import { getDefaultValuesFor } from "@rebasepro/common";

package/src/data_import/components/DataNewPropertiesMapping.tsx

@@ -16,7 +16,7 @@ import {
     TextField,
     Typography
 } from "@rebasepro/ui";
-import { getIn, setIn } from "@rebasepro/formex";
+import { getIn, setIn } from "@rebasepro/forms";
 import { ImportConfig } from "../types";
 
 export interface DataPropertyMappingProps {

package/src/data_import/components/ImportFileUpload.tsx

@@ -1,6 +1,6 @@
 import { FileUpload, UploadIcon } from "@rebasepro/ui";
 import { convertFileToJson } from "../utils/file_to_json";
-import { useSnackbarController } from "@rebasepro/core";
+import { useSnackbarController } from "@rebasepro/app";
 
 export function ImportFileUpload({ onDataAdded }: {
     onDataAdded: (data: object[], propertiesOrder?: string[]) => void

package/src/data_import/components/ImportNewPropertyFieldPreview.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { useCustomizationController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
 import { Property } from "@rebasepro/types";
 import {
     getFieldConfig,

package/src/data_import/components/ImportSaveInProgress.tsx

@@ -1,4 +1,4 @@
-import { useData } from "@rebasepro/core";
+import { useData } from "@rebasepro/app";
 import { Entity, CollectionConfig } from "@rebasepro/types";
 import { RebaseData } from "@rebasepro/types";
 import { Button, CenteredView, CircularProgress, Typography } from "@rebasepro/ui";

package/src/data_import/import/ImportCollectionAction.tsx

@@ -3,7 +3,7 @@ import {
     useAuthController,
     useCustomizationController,
     useSnackbarController
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { getPropertiesWithPropertiesOrder, getPropertyInPath } from "../../util";
 import { CollectionActionsProps, Properties, Property, User, CollectionConfig } from "@rebasepro/types";
 import {
@@ -29,7 +29,7 @@ import {
     Typography,
     UploadIcon
 } from "@rebasepro/ui";
-import { buildEntityPropertiesFromData } from "@rebasepro/schema-inference";
+import { buildEntityPropertiesFromData } from "@rebasepro/inference";
 import { useImportConfig } from "../hooks";
 import { convertDataToEntity, getInferenceType } from "../utils";
 import { DataNewPropertiesMapping, ImportFileUpload, ImportSaveInProgress } from "../components";

package/src/data_import/utils/data.ts

@@ -2,8 +2,8 @@ import { getPropertyInPath } from "../../util";
 import { AuthController, Entity, CollectionConfig, EntityReference, CollectionRegistryController, Properties, Property, Vector } from "@rebasepro/types";
 import { isPropertyBuilder } from "@rebasepro/common";
 import { unflattenObject } from "./file_to_json";
-import { getIn } from "@rebasepro/formex";
-import { inferTypeFromValue } from "@rebasepro/schema-inference";
+import { getIn } from "@rebasepro/forms";
+import { inferTypeFromValue } from "@rebasepro/inference";
 import { mergeDeep } from "@rebasepro/utils";
 
 export function convertDataToEntity(authController: AuthController,

package/src/data_import/utils/get_properties_mapping.ts

@@ -1,7 +1,7 @@
 // import {
 //     type,
 //     getPropertyInPath
-// } from "@rebasepro/core";
+// } from "@rebasepro/app";
 import { Properties, Property } from "@rebasepro/types";
 // import { typeMapping } from "@rebasepro/types";
 //

package/src/editor/components/image-bubble.tsx

@@ -3,7 +3,7 @@ import { useProseMirrorContext } from "../hooks/useProseMirrorContext";
 import { autoUpdate, computePosition, flip, offset, shift, type VirtualElement, type Placement } from "@floating-ui/dom";
 import { NodeSelection } from "prosemirror-state";
 import { TextField, defaultBorderMixin, Typography, cls } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 export interface ImageBubbleProps {
     options?: { placement?: Placement; offset?: number };

package/src/editor/components/table-bubble.tsx

@@ -10,7 +10,7 @@ import {
     type Placement
 } from "@floating-ui/dom";
 import { IconButton, Tooltip, defaultBorderMixin, cls } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import {
     addColumnBefore,
     addColumnAfter,

package/src/editor/editor.tsx

@@ -2,7 +2,7 @@
 import React, { useEffect, useState, useRef, useMemo } from "react";
 import { EditorState, Selection } from "prosemirror-state";
 import { cls, defaultBorderMixin, Separator, TextareaAutosize, useInjectStyles } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { EditorBubble, ImageBubble, SlashCommandMenu, TableBubble, type JSONContent } from "./components";
 import { NodeSelector } from "./selectors/node-selector";
 import { LinkSelector } from "./selectors/link-selector";

package/src/editor/selectors/link-selector.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from "react";
 import { Button, CheckIcon, cls, focusedDisabled, iconSize, Popover, TextField, Trash2Icon } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { useProseMirrorContext } from "../hooks/useProseMirrorContext";
 import { getMarkAttributes, isMarkActive, setMark, unsetMark } from "../utils/prosemirror-utils";
 import { schema } from "../schema";

package/src/editor/selectors/node-selector.tsx

@@ -1,7 +1,7 @@
 
 import { EditorState, Transaction } from "prosemirror-state";
 import { EditorBubbleItem } from "../components";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 import {
     Button,

package/src/form/EntityForm.tsx

@@ -10,13 +10,13 @@ import { ErrorBoundary } from "@rebasepro/ui";
 import { AlignLeftIcon, CheckIcon, LoaderIcon, PencilIcon, useDebouncedCallback } from "@rebasepro/ui";
 import { getDefaultValuesFor, isHidden, isReadOnly } from "@rebasepro/common";
 
-import { useCustomizationController } from "@rebasepro/core";
-import { getFormFieldKeys } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
+import { getFormFieldKeys } from "@rebasepro/app";
 import { Alert, Button, Chip, cls, Dialog, DialogActions, DialogContent, DialogTitle, iconSize, paperMixin, Tooltip, Typography } from "@rebasepro/ui";
-import { Formex, FormexController, useCreateFormex } from "@rebasepro/formex";
+import { Formex, FormexController, useCreateFormex } from "@rebasepro/forms";
 
 import { FormEntry, FormLayout, LabelWithIconAndTooltip, PropertyFieldBinding } from "../form";
-import { flattenKeys } from "@rebasepro/core";
+import { flattenKeys } from "@rebasepro/app";
 import { ErrorFocus } from "./components/ErrorFocus";
 import { CustomFieldValidator, getEntitySchema } from "./validation";
 import { EntityFormActions } from "./EntityFormActions";

package/src/form/EntityFormActions.tsx

@@ -16,7 +16,7 @@ import {
     Tooltip,
     Typography
 } from "@rebasepro/ui";
-import { FormexController } from "@rebasepro/formex";
+import { FormexController } from "@rebasepro/forms";
 
 export function EntityFormActions({
     path,

package/src/form/EntityFormBinding.tsx

@@ -15,16 +15,16 @@ import {
     useSnackbarController,
     useTranslation,
     useSlot
-} from "@rebasepro/core";
-import { FormexController } from "@rebasepro/formex";
-import { useAnalyticsController } from "@rebasepro/core";
+} from "@rebasepro/app";
+import { FormexController } from "@rebasepro/forms";
+import { useAnalyticsController } from "@rebasepro/app";
 
 import {
     getEntityFromCache,
     removeEntityFromCache,
     removeEntityFromMemoryCache,
     saveEntityToCache
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 
 import { useCollectionRegistryController, useSidePanel, useCMSContext } from "../index";
 import { EntityForm } from "./EntityForm";

package/src/form/PropertyFieldBinding.tsx

@@ -4,15 +4,15 @@ import type { RebasePlugin, PluginFieldBuilderParams, Property } from "@rebasepr
 import React, { ComponentType, ReactElement, Suspense, useCallback, useRef } from "react";
 import { deepEqual as equal } from "fast-equals"
 
-import { resolveComponentRef } from "@rebasepro/core";
+import { resolveComponentRef } from "@rebasepro/app";
 
-import { Field, FormexFieldProps, getIn } from "@rebasepro/formex";
+import { Field, FormexFieldProps, getIn } from "@rebasepro/forms";
 
 ;
 import { ReadOnlyFieldBinding } from "./field_bindings/ReadOnlyFieldBinding";
 
 import { isHidden, isPropertyBuilder, isReadOnly, resolveProperty } from "@rebasepro/common";
-import { useAuthController, useCustomizationController } from "@rebasepro/core";
+import { useAuthController, useCustomizationController } from "@rebasepro/app";
 import { Typography } from "@rebasepro/ui";
 import { getFieldConfig, getFieldId } from "../components/field_configs";
 import { ErrorBoundary } from "@rebasepro/ui";

package/src/form/components/ErrorFocus.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef } from "react";
-import { useFormex } from "@rebasepro/formex";
+import { useFormex } from "@rebasepro/forms";
 
 export const ErrorFocus = ({ containerRef }:
     {

package/src/form/components/LocalChangesMenu.tsx

@@ -18,9 +18,9 @@ import {
     Typography,
     XCircleIcon
 } from "@rebasepro/ui";
-import { FormexController } from "@rebasepro/formex";
-import { useSnackbarController, useTranslation } from "@rebasepro/core";
-import { flattenKeys, removeEntityFromCache } from "@rebasepro/core";
+import { FormexController } from "@rebasepro/forms";
+import { useSnackbarController, useTranslation } from "@rebasepro/app";
+import { flattenKeys, removeEntityFromCache } from "@rebasepro/app";
 ;
 import { PropertyCollectionView } from "../../components/PropertyCollectionView";
 import { mergeDeep } from "@rebasepro/utils";

package/src/form/components/StorageItemPreview.tsx

@@ -6,7 +6,7 @@ import { PropertyPreview } from "../../preview";
 
 import { cls, IconButton, paperMixin, Tooltip } from "@rebasepro/ui";
 import { ErrorBoundary, FileTextIcon, MinusIcon } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 interface StorageItemPreviewProps {
     name: string;

package/src/form/components/StorageUploadProgress.tsx

@@ -1,8 +1,8 @@
 import React, { useCallback } from "react";
 
-import { useSnackbarController, useStorageSource } from "@rebasepro/core";
-import { StorageFieldItem } from "@rebasepro/core";
-import { ErrorView } from "@rebasepro/core";
+import { useSnackbarController, useStorageSource } from "@rebasepro/app";
+import { StorageFieldItem } from "@rebasepro/app";
+import { ErrorView } from "@rebasepro/app";
 import type { StorageSource } from "@rebasepro/types";
 import { cls, paperMixin, Skeleton } from "@rebasepro/ui";