@rebasepro/admin 0.2.3 → 0.2.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/admin",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Rebase CMS — content management views, forms, and routing",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -84,13 +84,13 @@
     "react-dropzone": "^14.4.1",
     "react-use-measure": "^2.1.7",
     "zod": "^3.25.76",
-    "@rebasepro/common": "0.2.3",
-    "@rebasepro/formex": "0.2.3",
-    "@rebasepro/core": "0.2.3",
-    "@rebasepro/schema-inference": "0.2.3",
-    "@rebasepro/ui": "0.2.3",
-    "@rebasepro/utils": "0.2.3",
-    "@rebasepro/types": "0.2.3"
+    "@rebasepro/common": "0.2.4",
+    "@rebasepro/formex": "0.2.4",
+    "@rebasepro/core": "0.2.4",
+    "@rebasepro/schema-inference": "0.2.4",
+    "@rebasepro/types": "0.2.4",
+    "@rebasepro/utils": "0.2.4",
+    "@rebasepro/ui": "0.2.4"
   },
   "peerDependencies": {
     "react": ">=19.0.0",

package/src/collection_editor/ConfigControllerProvider.tsx

@@ -8,7 +8,6 @@ import { useCustomizationController, useRebaseContext, useAuthController, useSna
 import { getTableName } from "@rebasepro/common";
 import { useNavigate } from "react-router-dom";
 import { CollectionEditorController } from "./types/collection_editor_controller";
-import { CollectionEditorPermissionsBuilder } from "./types/config_permissions";
 import { CollectionInference } from "./types/collection_inference";
 import { CollectionGenerationCallback } from "./api/generateCollectionApi";
 import { CollectionEditorDialogsContext, CollectionEditorDialogsState } from "./CollectionEditorDialogsContext";
@@ -27,10 +26,7 @@ export interface ConfigControllerProviderProps {
      */
     collectionInference?: CollectionInference;
 
-    /**
-     * Use this builder to define the permissions for the configuration per user.
-     */
-    configPermissions?: CollectionEditorPermissionsBuilder;
+
 
     extraView?: {
         View: React.ComponentType<{
@@ -59,7 +55,6 @@ export const ConfigControllerProvider = React.memo(
     function ConfigControllerProvider({
         children,
         collectionConfigController,
-        configPermissions,
         collectionInference,
         extraView,
         getUser,
@@ -123,11 +118,7 @@ export const ConfigControllerProvider = React.memo(
             collection?: EntityCollection;
         }>();
 
-        const defaultConfigPermissions: CollectionEditorPermissionsBuilder = useCallback(() => ({
-            createCollections: true,
-            editCollections: true,
-            deleteCollections: true
-        }), []);
+
 
         const editCollection = useCallback(({
             id,
@@ -381,10 +372,9 @@ export const ConfigControllerProvider = React.memo(
             editCollection,
             createCollection,
             editProperty,
-            configPermissions: configPermissions ?? defaultConfigPermissions,
             pathSuggestions,
             configController: collectionConfigController
-        }), [editCollection, createCollection, editProperty, configPermissions, defaultConfigPermissions, pathSuggestions, collectionConfigController]);
+        }), [editCollection, createCollection, editProperty, pathSuggestions, collectionConfigController]);
 
         return (
             <ConfigControllerContext.Provider value={collectionConfigController}>

package/src/collection_editor/index.ts

@@ -30,9 +30,7 @@ export type {
 export type {
     CollectionEditorController
 } from "./types/collection_editor_controller";
-export type {
-    CollectionEditorPermissions, CollectionEditorPermissionsBuilder
-} from "./types/config_permissions";
+
 export type {
     CollectionInference
 } from "./types/collection_inference";

package/src/collection_editor/types/collection_editor_controller.tsx

@@ -1,4 +1,3 @@
-import { CollectionEditorPermissionsBuilder } from "./config_permissions";
 import { CollectionsConfigController } from "./config_controller";
 import { Entity, EntityCollection, Property } from "@rebasepro/types";
 
@@ -57,8 +56,6 @@ export interface CollectionEditorController {
      */
     configController: CollectionsConfigController;
 
-    configPermissions: CollectionEditorPermissionsBuilder;
-
     pathSuggestions: string[] | undefined;
 
 }

package/src/collection_editor/ui/EditorCollectionAction.tsx

@@ -19,12 +19,7 @@ export function EditorCollectionAction({
 
     const parentCollection = parentCollectionSlugs.length > 0 ? collectionRegistry.getCollection(parentCollectionSlugs[parentCollectionSlugs.length - 1]) : undefined;
 
-    const canEditCollection = !collectionEditorController.configController?.readOnly && (collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true);
+    const canEditCollection = !collectionEditorController.configController?.readOnly;
 
     const tooltipTitle = collectionEditorController.configController?.readOnly
         ? (collectionEditorController.configController.readOnlyReason || t("studio_editor_collection_disabled"))

package/src/collection_editor/ui/EditorCollectionActionStart.tsx

@@ -25,12 +25,7 @@ export function EditorCollectionActionStart({
     const snackbarController = useSnackbarController();
     const { t } = useTranslation();
 
-    const canEditCollection = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true;
+    const canEditCollection = !configController.readOnly;
 
     let saveDefaultFilterButton = null;
     if (!equal(getObjectOrNull(tableController.filterValues), getObjectOrNull(collection.defaultFilter)) ||

package/src/collection_editor/ui/EditorEntityAction.tsx

@@ -19,12 +19,7 @@ export function EditorEntityAction({
 
     const parentCollection = parentCollectionSlugs.length > 0 ? collectionRegistry.getCollection(parentCollectionSlugs[parentCollectionSlugs.length - 1]) : undefined;
 
-    const canEditCollection = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true;
+    const canEditCollection = !collectionEditorController.configController?.readOnly;
 
     const isDirty = formContext?.formex.dirty ?? false;
 

package/src/collection_editor/ui/HomePageEditorCollectionAction.tsx

@@ -21,16 +21,9 @@ export function HomePageEditorCollectionAction({
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
 
-    const permissions = collectionEditorController?.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        })
-        : {
-            createCollections: false,
-            editCollections: false,
-            deleteCollections: false
-        };
+    const canCreateCollections = !configController.readOnly;
+    const canEditCollections = !configController.readOnly;
+    const canDeleteCollections = !configController.readOnly;
 
     const onEditCollectionClicked = () => {
         collectionEditorController?.editCollection({
@@ -67,13 +60,13 @@ export function HomePageEditorCollectionAction({
     return <>
 
         <div>
-            {permissions.deleteCollections &&
+            {canDeleteCollections &&
                 <Menu
                     trigger={<IconButton size={"small"}>
                         <MoreVerticalIcon/>
                     </IconButton>}
                 >
-                    {permissions.createCollections &&
+                    {canCreateCollections &&
                         <MenuItem
                             dense={true}
                             onClick={(event: React.MouseEvent) => {
@@ -100,11 +93,11 @@ export function HomePageEditorCollectionAction({
 
             }
 
-            {permissions.editCollections &&
+            {canEditCollections &&
                 <IconButton
                     size={"small"}
                     onClick={(event: React.MouseEvent) => {
-                        onEditCollectionClicked();
+                         onEditCollectionClicked();
                     }}>
                     <SettingsIcon/>
                 </IconButton>}

package/src/collection_editor/ui/NewCollectionCard.tsx

@@ -17,11 +17,7 @@ export function NewCollectionCard({
 
     if (!context.navigationStateController?.topLevelNavigation)
         return null;
-    const canCreateCollections = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user
-        }).createCollections
-        : true;
+    const canCreateCollections = !collectionEditorController?.configController?.readOnly;
 
     return (
         <Card className={cls("h-full p-4 min-h-[124px]")}

package/src/collection_editor/ui/PropertyAddColumnComponent.tsx

@@ -22,12 +22,7 @@ export function PropertyAddColumnComponent({
     const authController = useAuthController();
     const collectionEditorController = useCollectionEditorController();
     const { t } = useTranslation();
-    const canEditCollection = collectionEditorController.configPermissions
-        ? collectionEditorController.configPermissions({
-            user: authController.user,
-            collection
-        }).editCollections
-        : true;
+    const canEditCollection = !collectionEditorController.configController?.readOnly;
 
     return (
         <Tooltip
@@ -36,7 +31,7 @@ export function PropertyAddColumnComponent({
             <div
                 className={"p-0.5 w-20 h-full flex items-center justify-center cursor-pointer bg-surface-100/40 bg-surface-100/40 hover:bg-surface-100 dark:bg-surface-900 dark:bg-opacity-40 dark:bg-surface-900/40 dark:hover:bg-surface-800"}
                 // className={onHover ? "bg-white dark:bg-surface-900" : undefined}
-                onClick={() => {
+                onClick={canEditCollection ? () => {
                     collectionEditorController.editProperty({
                         editedCollectionId: collection.slug,
                         parentCollectionSlugs, parentEntityIds,
@@ -44,7 +39,7 @@ export function PropertyAddColumnComponent({
                         collection,
                         existingEntities: tableController.data
                     });
-                }}>
+                } : undefined}>
                 <PlusIcon/>
             </div>
         </Tooltip>

package/src/collection_editor/ui/collection_editor/CollectionJsonImportDialog.tsx

@@ -10,6 +10,7 @@ import {
     DialogContent,
     DialogTitle,
     iconSize,
+    TextField,
     Typography
 } from "@rebasepro/ui";
 import { EntityCollection } from "@rebasepro/types";
@@ -52,7 +53,7 @@ export function CollectionJsonImportDialog({
     const [errors, setErrors] = useState<CollectionValidationError[]>([]);
     const [touched, setTouched] = useState(false);
 
-    const handleJsonChange = useCallback((e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    const handleJsonChange = useCallback((e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
         const value = e.target.value;
         setJsonValue(value);
         setTouched(true);
@@ -105,20 +106,15 @@ export function CollectionJsonImportDialog({
                     <code className="bg-surface-200 dark:bg-surface-700 px-1 rounded">properties</code>.
                 </Typography>
 
-                <textarea
+                <TextField
+                    multiline
+                    minRows={12}
                     value={jsonValue}
                     onChange={handleJsonChange}
                     placeholder={EXAMPLE_JSON}
-                    rows={12}
-                    className={cls(
-                        "w-full p-3 font-mono text-sm rounded-md border resize-none overflow-y-auto",
-                        "bg-surface-50 dark:bg-surface-800",
-                        "focus:outline-none focus:ring-2 focus:ring-primary",
-                        "h-[300px]",
-                        errors.length > 0 && touched
-                            ? "border-red-500 dark:border-red-400"
-                            : "border-surface-300 dark:border-surface-600"
-                    )}
+                    error={errors.length > 0 && touched}
+                    className="w-full"
+                    inputClassName="font-mono text-sm resize-none overflow-y-auto h-[300px]"
                 />
 
                 {errors.length > 0 && touched && (

package/src/collection_editor/ui/collection_editor/CollectionPropertiesEditorForm.tsx

@@ -30,15 +30,15 @@ import { GetCodeDialog } from "./GetCodeDialog";
 import { useAIModifiedPaths } from "./AIModifiedPathsContext";
 import { useCollectionsConfigController } from "../../useCollectionsConfigController";
 
-type PropertyOrBuilder = Property | any;
+type PropertyOrBuilder = Property | Record<string, unknown>;
 
 type CollectionEditorFormProps = {
     showErrors: boolean;
     isNewCollection: boolean;
-    propertyErrorsRef?: React.MutableRefObject<any>;
-    onPropertyError: (propertyKey: string, namespace: string | undefined, error?: Record<string, any>) => void;
+    propertyErrorsRef?: React.MutableRefObject<Record<string, unknown> | undefined>;
+    onPropertyError: (propertyKey: string, namespace: string | undefined, error?: Record<string, unknown>) => void;
     setDirty?: (dirty: boolean) => void;
-    extraIcon: React.ReactNode | any;
+    extraIcon: React.ReactNode;
     getUser?: (uid: string) => User | null;
     getData?: () => Promise<object[]>;
     doCollectionInference?: (collection: EntityCollection) => Promise<Partial<EntityCollection> | null> | undefined;
@@ -138,16 +138,16 @@ export function CollectionPropertiesEditorForm({
                             } else if (
                                 typeof newProp === "object" &&
                                 "type" in newProp &&
-                                newProp.dataType === "map" &&
-                                newProp.properties
+                                (newProp as MapProperty).type === "map" &&
+                                (newProp as MapProperty).properties
                             ) {
                                 // This is a map property, check for new nested properties
                                 const existingMapProps = typeof existingProp === "object" &&
                                     "type" in existingProp &&
-                                    existingProp.dataType === "map"
+                                    (existingProp as MapProperty).type === "map"
                                     ? (existingProp as MapProperty).properties
                                     : undefined;
-                                keys.push(...findNewPropertyKeys(existingMapProps, newProp.properties as Record<string, PropertyOrBuilder>, fullKey));
+                                keys.push(...findNewPropertyKeys(existingMapProps, (newProp as MapProperty).properties as Record<string, PropertyOrBuilder>, fullKey));
                             }
                         }
                         return keys;
@@ -174,11 +174,11 @@ export function CollectionPropertiesEditorForm({
                             } else if (
                                 typeof existingProp === "object" &&
                                 "type" in existingProp &&
-                                existingProp.dataType === "map" &&
+                                (existingProp as MapProperty).type === "map" &&
                                 typeof newProp === "object" &&
                                 "type" in newProp &&
-                                newProp.dataType === "map" &&
-                                newProp.properties
+                                (newProp as MapProperty).type === "map" &&
+                                (newProp as MapProperty).properties
                             ) {
                                 // Both are map properties, recursively add new nested properties
                                 // Only if the existing map has properties, merge them; otherwise keep existing as-is
@@ -188,9 +188,9 @@ export function CollectionPropertiesEditorForm({
                                         ...existingProp,
                                         properties: addNewPropertiesOnly(
                                             existingMapProps,
-                                            newProp.properties as Record<string, PropertyOrBuilder>
-                                        )
-                                    };
+                                            (newProp as MapProperty).properties as Record<string, PropertyOrBuilder>
+                                        ) as Properties
+                                    } as MapProperty;
                                 }
                                 // If existingProp doesn't have properties, keep it as-is (don't overwrite with inferred)
                             }
@@ -354,7 +354,7 @@ export function CollectionPropertiesEditorForm({
 
     };
 
-    const onPropertyErrorInternal = (id: string, namespace?: string, error?: Record<string, any>) => {
+    const onPropertyErrorInternal = (id: string, namespace?: string, error?: Record<string, unknown>) => {
         const propertyPath = id ? getFullId(id, namespace) : undefined;
         console.debug("onPropertyErrorInternal", {
             id,
@@ -374,7 +374,7 @@ export function CollectionPropertiesEditorForm({
         setSelectedPropertyKey(undefined);
     };
 
-    const initialErrors = selectedPropertyKey && propertyErrorsRef?.current?.properties ? propertyErrorsRef.current.properties[selectedPropertyKey] : undefined;
+    const initialErrors = selectedPropertyKey && propertyErrorsRef?.current?.properties ? (propertyErrorsRef.current.properties as Record<string, unknown>)[selectedPropertyKey] as Record<string, any> | undefined : undefined;
 
     const emptyCollection = (values?.propertiesOrder === undefined || values.propertiesOrder.length === 0)
         && (!values?.properties || Object.keys(values.properties).length === 0);
@@ -496,8 +496,8 @@ export function CollectionPropertiesEditorForm({
                         className="sticky top-8 min-h-full w-full flex flex-col justify-center">
 
                         {selectedPropertyFullId &&
-                            selectedProperty &&
-                            !isPropertyBuilder(selectedProperty) &&
+                            !!selectedProperty &&
+                            !isPropertyBuilder(selectedProperty as Property) &&
                             <PropertyForm
                                 inArray={false}
                                 key={`edit_view_${selectedPropertyIndex}_${generationCounter}`}
@@ -507,7 +507,7 @@ export function CollectionPropertiesEditorForm({
                                 autoOpenTypeSelect={false}
                                 propertyKey={selectedPropertyKey}
                                 propertyNamespace={selectedPropertyNamespace}
-                                property={selectedProperty}
+                                property={selectedProperty as Property}
                                 onPropertyChanged={onPropertyChanged}
                                 onDelete={deleteProperty}
                                 onError={onPropertyErrorInternal}
@@ -534,7 +534,7 @@ export function CollectionPropertiesEditorForm({
                                 </Button>
                             </div>}
 
-                        {selectedProperty && isPropertyBuilder(selectedProperty) &&
+                        {!!selectedProperty && isPropertyBuilder(selectedProperty as Property) &&
                             <Typography variant={"label"} className="flex items-center justify-center">
                                 {"This property is defined as a property builder in code"}
                             </Typography>}
@@ -551,7 +551,7 @@ export function CollectionPropertiesEditorForm({
                 autoOpenTypeSelect={false}
                 propertyKey={selectedPropertyKey}
                 propertyNamespace={selectedPropertyNamespace}
-                property={selectedProperty}
+                property={selectedProperty as Property | undefined}
                 onPropertyChanged={onPropertyChanged}
                 onDelete={deleteProperty}
                 onError={onPropertyErrorInternal}

package/src/collection_editor/ui/collection_editor/CollectionRLSTab.tsx

@@ -102,7 +102,7 @@ export function CollectionRLSTab() {
                     return [];
                 };
                 const pRows = extractRows(result);
-                const policies: PostgresPolicy[] = pRows.map((p: any) => {
+                const policies: PostgresPolicy[] = pRows.map((p: Record<string, unknown>) => {
                     let parsedRoles: string[] = [];
                     const r = p.roles || p.ROLES;
                     if (Array.isArray(r)) {
@@ -313,7 +313,7 @@ function InlinePolicyEditor({
                     <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                         <div className="flex flex-col gap-1.5">
                             <Typography variant="caption" className="uppercase tracking-wider text-text-secondary">Policy Name</Typography>
-                            <TextField value={name} onChange={(e: any) => setName(e.target.value)} placeholder="e.g. allow_read_all"/>
+                            <TextField value={name} onChange={(e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => setName(e.target.value)} placeholder="e.g. allow_read_all"/>
                         </div>
                         <div className="flex flex-col gap-1.5">
                             <Typography variant="caption" className="uppercase tracking-wider text-text-secondary">Behavior</Typography>
@@ -342,13 +342,13 @@ function InlinePolicyEditor({
                     {command !== "INSERT" && (
                         <div className="flex flex-col gap-1.5">
                             <Typography variant="caption" className="uppercase tracking-wider text-text-secondary">USING expression</Typography>
-                            <TextField value={usingExpr} onChange={(e: any) => setUsingExpr(e.target.value)} placeholder="e.g. auth.uid() = user_id"/>
+                            <TextField value={usingExpr} onChange={(e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => setUsingExpr(e.target.value)} placeholder="e.g. auth.uid() = user_id"/>
                         </div>
                     )}
                     {showCheck && (
                         <div className="flex flex-col gap-1.5">
                             <Typography variant="caption" className="uppercase tracking-wider text-text-secondary">WITH CHECK expression</Typography>
-                            <TextField value={checkExpr} onChange={(e: any) => setCheckExpr(e.target.value)} placeholder="e.g. auth.uid() = user_id"/>
+                            <TextField value={checkExpr} onChange={(e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => setCheckExpr(e.target.value)} placeholder="e.g. auth.uid() = user_id"/>
                         </div>
                     )}
                 </Paper>

package/src/collection_editor/ui/collection_editor/EnumForm.tsx

@@ -335,7 +335,7 @@ function EnumEntryDialog({
         errors
     } = useFormex<EnumValues>();
 
-    const idError = index !== undefined ? getIn(errors, `${enumValuesPath}[${index}].id`) : undefined;
+    const idError = index !== undefined ? getIn(errors, `${enumValuesPath}[${index}].id`) as string | undefined : undefined;
     return <Dialog
         maxWidth="md"
         aria-labelledby="enum-edit-dialog"

package/src/collection_editor/ui/collection_editor/properties/BlockPropertyField.tsx

@@ -10,7 +10,7 @@ import {
     namespaceToPropertiesPath
 } from "../util";
 import { PropertyTree } from "../PropertyTree";
-import { ArrayProperty, PropertyConfig } from "@rebasepro/types";
+import { ArrayProperty, PropertyConfig, Property } from "@rebasepro/types";
 
 export function BlockPropertyField({
     disabled,
@@ -59,7 +59,7 @@ export function BlockPropertyField({
 
         setFieldValue(`oneOf.${idToPropertiesPath(fullId)}`, undefined, false);
         const propertiesOrderPath = `oneOf.${namespaceToPropertiesOrderPath(namespace)}`;
-        const currentPropertiesOrder: string[] = getIn(values, propertiesOrderPath) ?? Object.keys(getIn(values, namespaceToPropertiesPath(namespace)));
+        const currentPropertiesOrder: string[] = (getIn(values, propertiesOrderPath) as string[] | undefined) ?? Object.keys(getIn(values, namespaceToPropertiesPath(namespace)) as object ?? {});
         setFieldValue(propertiesOrderPath, currentPropertiesOrder.filter((p) => p !== propertyKey), false);
 
         setPropertyDialogOpen(false);
@@ -134,7 +134,7 @@ export function BlockPropertyField({
                 onDelete={deleteProperty}
                 propertyKey={selectedPropertyKey}
                 propertyNamespace={selectedPropertyNamespace}
-                property={selectedProperty}
+                property={selectedProperty as Property | undefined}
                 existingProperty={Boolean(selectedPropertyKey)}
                 autoUpdateId={!selectedPropertyKey}
                 autoOpenTypeSelect={!selectedPropertyKey}

package/src/collection_editor/ui/collection_editor/properties/CommonPropertyFields.tsx

@@ -35,13 +35,13 @@ export const CommonPropertyFields = React.forwardRef<HTMLDivElement, CommonPrope
         const { t } = useTranslation();
 
         const name = "name";
-        const nameError = showErrors && getIn(errors, name);
+        const nameError = showErrors && (getIn(errors, name) as string | undefined);
 
         const id = "id";
-        const idError = showErrors && getIn(errors, id);
+        const idError = showErrors && (getIn(errors, id) as string | undefined);
 
         const description = "description";
-        const descriptionError = showErrors && getIn(errors, description);
+        const descriptionError = showErrors && (getIn(errors, description) as string | undefined);
 
         return (
             <div className={"flex flex-col gap-2 col-span-12"}>

package/src/collection_editor/ui/collection_editor/properties/DateTimePropertyField.tsx

@@ -117,20 +117,20 @@ export function DateTimePropertyField({ disabled }: {
     const { t } = useTranslation();
 
     const modePath = "mode";
-    const modeValue: string | undefined = getIn(values, modePath);
-    const modeError: string | undefined = getIn(touched, modePath) && getIn(errors, modePath);
+    const modeValue: string | undefined = getIn(values, modePath) as string | undefined;
+    const modeError: string | undefined = (getIn(touched, modePath) && getIn(errors, modePath)) as string | undefined;
 
     const autoValuePath = "autoValue";
-    const autoValueValue: string | undefined = getIn(values, autoValuePath);
-    const autoValueError: string | undefined = getIn(touched, autoValuePath) && getIn(errors, autoValuePath);
+    const autoValueValue: string | undefined = getIn(values, autoValuePath) as string | undefined;
+    const autoValueError: string | undefined = (getIn(touched, autoValuePath) && getIn(errors, autoValuePath)) as string | undefined;
 
     const timezonePath = "timezone";
-    const timezoneValue: string | undefined = getIn(values, timezonePath);
-    const timezoneError: string | undefined = getIn(touched, timezonePath) && getIn(errors, timezonePath);
+    const timezoneValue: string | undefined = getIn(values, timezonePath) as string | undefined;
+    const timezoneError: string | undefined = (getIn(touched, timezonePath) && getIn(errors, timezonePath)) as string | undefined;
 
     const columnTypePath = "columnType";
-    const columnTypeValue: string | undefined = getIn(values, columnTypePath);
-    const columnTypeError: string | undefined = getIn(touched, columnTypePath) && getIn(errors, columnTypePath);
+    const columnTypeValue: string | undefined = getIn(values, columnTypePath) as string | undefined;
+    const columnTypeError: string | undefined = (getIn(touched, columnTypePath) && getIn(errors, columnTypePath)) as string | undefined;
 
     return (
         <>

package/src/collection_editor/ui/collection_editor/properties/EnumPropertyField.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 import { getIn, useFormex } from "@rebasepro/formex";
 import { useSnackbarController, useTranslation } from "@rebasepro/core";
-import { EnumValueConfig } from "@rebasepro/types";
+import { EnumValueConfig, EnumValues } from "@rebasepro/types";
 import { resolveEnumValues } from "@rebasepro/common";
 import { Select, SelectItem } from "@rebasepro/ui";
 import { EnumForm } from "../EnumForm";
@@ -39,9 +39,9 @@ export function EnumPropertyField({
 
     const enumValuesPath = multiselect ? "of.enum" : "enum";
 
-    const defaultValue = getIn(values, "defaultValue");
+    const defaultValue = getIn(values, "defaultValue") as string | number | undefined;
 
-    const valuesEnumValues = getIn(values, enumValuesPath);
+    const valuesEnumValues = getIn(values, enumValuesPath) as EnumValues | undefined;
     const enumValues: EnumValueConfig[] = useMemo(() => {
         if (!valuesEnumValues || typeof valuesEnumValues === "boolean")
             return [] as EnumValueConfig[];
@@ -81,7 +81,7 @@ export function EnumPropertyField({
                     }}
                     getData={getData && fullPropertyPath
                         ? () => getData()
-                            .then(res => res.map(entry => getIn(entry, fullPropertyPath)).filter(Boolean))
+                            .then(res => res.map(entry => getIn(entry, fullPropertyPath) as string).filter(Boolean))
                         : undefined}
                     onValuesChanged={onValuesChanged}/>
             </div>
@@ -108,7 +108,7 @@ export function EnumPropertyField({
                         setFieldValue("defaultValue", value);
                     }}
                     label={t("default_value")}
-                    value={defaultValue ?? ""}>
+                    value={defaultValue?.toString() ?? ""}>
                     {enumValues
                         .filter((enumValue) => Boolean(enumValue?.id))
                         .map((enumValue) => (

package/src/collection_editor/ui/collection_editor/properties/MapPropertyField.tsx

@@ -53,7 +53,7 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
         const propertiesPath = idToPropertiesPath(fullId);
         const propertiesOrderPath = namespaceToPropertiesOrderPath(namespace);
 
-        const currentPropertiesOrder: string[] = getIn(values, propertiesOrderPath) ?? Object.keys(getIn(values, namespaceToPropertiesPath(namespace)));
+        const currentPropertiesOrder: string[] = (getIn(values, propertiesOrderPath) as string[] | undefined) ?? Object.keys(getIn(values, namespaceToPropertiesPath(namespace)) as object ?? {});
 
         setFieldValue(propertiesPath, undefined, false);
         setFieldValue(propertiesOrderPath, currentPropertiesOrder.filter((p) => p !== propertyKey), false);
@@ -139,7 +139,7 @@ export function MapPropertyField({ disabled, getData, allowDataInference, proper
                 onDelete={deleteProperty}
                 propertyKey={selectedPropertyKey}
                 propertyNamespace={selectedPropertyNamespace}
-                property={selectedProperty}
+                property={selectedProperty as Property | undefined}
                 existingProperty={Boolean(selectedPropertyKey)}
                 autoUpdateId={!selectedPropertyKey}
                 autoOpenTypeSelect={!selectedPropertyKey}

package/src/collection_editor/ui/collection_editor/properties/MarkdownPropertyField.tsx

@@ -41,15 +41,15 @@ export function MarkdownPropertyField({
     const htmlPath = `${baseMarkdownPath}.html`;
     const transformPastedTextPath = `${baseMarkdownPath}.transformPastedText`;
 
-    const fileNameValue = getIn(values, fileName) ?? "{rand}_{file}";
-    const storagePathValue = getIn(values, storagePath) ?? "/";
+    const fileNameValue = (getIn(values, fileName) as string | undefined) ?? "{rand}_{file}";
+    const storagePathValue = (getIn(values, storagePath) as string | undefined) ?? "/";
     const maxSizeValue = getIn(values, maxSize);
 
     // Markdown config values - check if markdown is an object or boolean
     const markdownValue = getIn(values, "markdown");
     const isMarkdownObject = typeof markdownValue === "object" && markdownValue !== null;
-    const htmlValue = isMarkdownObject ? (markdownValue.html ?? true) : true;
-    const transformPastedTextValue = isMarkdownObject ? (markdownValue.transformPastedText ?? false) : false;
+    const htmlValue = isMarkdownObject ? (((markdownValue as Record<string, unknown>).html as boolean | undefined) ?? true) : true;
+    const transformPastedTextValue = isMarkdownObject ? (((markdownValue as Record<string, unknown>).transformPastedText as boolean | undefined) ?? false) : false;
 
     const hasFilenameCallback = typeof fileNameValue === "function";
     const hasStoragePathCallback = typeof storagePathValue === "function";
@@ -209,7 +209,7 @@ export function MarkdownPropertyField({
                         setFieldValue("defaultValue", e.target.value === "" ? undefined : e.target.value);
                     }}
                     label={t("default_value")}
-                    value={getIn(values, "defaultValue") ?? ""}/>
+                    value={(getIn(values, "defaultValue") as string | undefined) ?? ""}/>
 
             </div>
         </>