@rebasepro/admin 0.8.0 → 0.9.0

package/src/components/{SideEntityProvider.tsx → SidePanelProvider.tsx}

@@ -1,8 +1,8 @@
-import type { SideEntityController } from "@rebasepro/types";
+import type { SidePanelController } from "@rebasepro/types";
 import React from "react";
-import { useBuildSideEntityController } from "../hooks/useBuildSideEntityController";
+import { useBuildSidePanel } from "../hooks/useBuildSidePanel";
 import { useBuildSideDialogsController } from "../hooks/useBuildSideDialogsController";
-import { SideEntityControllerContext } from "../hooks/useSideEntityController";
+import { SidePanelControllerContext } from "../hooks/useSidePanel";
 import { SideDialogsControllerContext } from "../contexts/SideDialogsControllerContext";
 import { BreadcrumbsProvider } from "../contexts/BreacrumbsContext";
 import { useBreadcrumbsController } from "../hooks/useBreadcrumbsController";
@@ -11,13 +11,13 @@ import { useNavigationStateController } from "../index";
 import { useAuthController, useBridgeRegistration } from "@rebasepro/core";
 
 /**
- * Provider that builds the SideEntityController and makes it available
- * via the SideEntityControllerContext from @rebasepro/core.
+ * Provider that builds the SidePanelController and makes it available
+ * via the SidePanelControllerContext from @rebasepro/core.
  *
- * After the CMS extraction refactor, `useBuildSideEntityController` lives
+ * After the CMS extraction refactor, `useBuildSidePanel` lives
  * in the CMS package while the context it feeds into lives in core.
  * This provider bridges the two: place it inside the `<Rebase>` tree and
- * above any component that calls `useSideEntityController()`.
+ * above any component that calls `useSidePanel()`.
  *
  * Also auto-registers the side entity controller and breadcrumbs into the
  * self-assembling Studio bridge (when a StudioBridgeRegistryProvider is
@@ -27,25 +27,25 @@ import { useAuthController, useBridgeRegistration } from "@rebasepro/core";
  * ```tsx
  * <Rebase ...>
  *   {({ loading }) => (
- *     <SideEntityProvider>
+ *     <SidePanelProvider>
  *       <RebaseRoutes>
  *         ...
  *       </RebaseRoutes>
- *     </SideEntityProvider>
+ *     </SidePanelProvider>
  *   )}
  * </Rebase>
  * ```
  *
  * @group Components
  */
-export function SideEntityProvider({ children }: { children: React.ReactNode }) {
+export function SidePanelProvider({ children }: { children: React.ReactNode }) {
     const collectionRegistryController = useCollectionRegistryController();
     const urlController = useUrlController();
     const navigationStateController = useNavigationStateController();
     const sideDialogsController = useBuildSideDialogsController();
     const authController = useAuthController();
 
-    const sideEntityController = useBuildSideEntityController(
+    const sidePanelController = useBuildSidePanel(
         collectionRegistryController,
         urlController,
         navigationStateController,
@@ -56,10 +56,10 @@ export function SideEntityProvider({ children }: { children: React.ReactNode })
     return (
         <BreadcrumbsProvider>
             <SideDialogsControllerContext.Provider value={sideDialogsController}>
-                <SideEntityControllerContext.Provider value={sideEntityController}>
-                    <BridgeAutoRegistrar sideEntityController={sideEntityController}/>
+                <SidePanelControllerContext.Provider value={sidePanelController}>
+                    <BridgeAutoRegistrar sidePanelController={sidePanelController}/>
                     {children}
-                </SideEntityControllerContext.Provider>
+                </SidePanelControllerContext.Provider>
             </SideDialogsControllerContext.Provider>
         </BreadcrumbsProvider>
     );
@@ -69,9 +69,9 @@ export function SideEntityProvider({ children }: { children: React.ReactNode })
  * Internal component that auto-registers side entity and breadcrumbs
  * into the Studio bridge. Must be a child of BreadcrumbsProvider.
  */
-function BridgeAutoRegistrar({ sideEntityController }: { sideEntityController: SideEntityController }) {
+function BridgeAutoRegistrar({ sidePanelController }: { sidePanelController: SidePanelController }) {
     const breadcrumbs = useBreadcrumbsController();
-    useBridgeRegistration("sideEntityController", sideEntityController);
+    useBridgeRegistration("sidePanelController", sidePanelController);
     useBridgeRegistration("breadcrumbs", breadcrumbs);
     return null;
 }

package/src/components/common/default_entity_actions.tsx

@@ -8,7 +8,7 @@ import {
     useTranslation
 } from "@rebasepro/core";
 import { DeleteEntityDialog } from "../DeleteEntityDialog";
-import { addRecentId } from "../EntityCollectionView/utils";
+import { addRecentId } from "../CollectionViewBinding/utils";
 import { navigateToEntity } from "../../util/navigation_utils";
 import { resolveDefaultSelectedView } from "@rebasepro/common";
 import { CreationResultDialog } from "../admin/CreationResultDialog";
@@ -25,7 +25,7 @@ export const editEntityAction: EntityAction = {
         collection,
         path,
         context,
-        sideEntityController,
+        sidePanelController,
         highlightEntity,
         unhighlightEntity,
         openEntityMode
@@ -35,8 +35,8 @@ export const editEntityAction: EntityAction = {
             throw new Error("INTERNAL: editEntityAction: Entity is undefined");
         }
 
-        if (!sideEntityController) {
-            throw new Error("INTERNAL: editEntityAction: sideEntityController is undefined");
+        if (!sidePanelController) {
+            throw new Error("INTERNAL: editEntityAction: sidePanelController is undefined");
         }
 
         highlightEntity?.(entity);
@@ -68,7 +68,7 @@ export const editEntityAction: EntityAction = {
             collection,
             entityId: entity.id,
             path: newFullIdPath,
-            sideEntityController,
+            sidePanelController,
             onClose: () => unhighlightEntity?.(entity),
             navigation: context.urlController,
             selectedTab: defaultSelectedView
@@ -88,7 +88,7 @@ export const copyEntityAction: EntityAction = {
         collection,
         context,
         path,
-        sideEntityController,
+        sidePanelController,
         highlightEntity,
         unhighlightEntity,
         openEntityMode
@@ -96,8 +96,8 @@ export const copyEntityAction: EntityAction = {
         if (!entity) {
             throw new Error("INTERNAL: copyEntityAction: Entity is undefined");
         }
-        if (!sideEntityController) {
-            throw new Error("INTERNAL: copyEntityAction: sideEntityController is undefined");
+        if (!sidePanelController) {
+            throw new Error("INTERNAL: copyEntityAction: sidePanelController is undefined");
         }
         highlightEntity?.(entity);
         context?.analyticsController?.onAnalyticsEvent?.("copy_entity_click", {
@@ -115,7 +115,7 @@ export const copyEntityAction: EntityAction = {
             entityId: entity.id,
             path: usedPath,
             copy: true,
-            sideEntityController,
+            sidePanelController,
             onClose: () => unhighlightEntity?.(entity),
             navigation: context.urlController
         });

package/src/components/history/EntityHistoryEntry.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import type { Property } from "@rebasepro/types";
 import * as React from "react";
 
@@ -39,7 +39,7 @@ function deepEqual(a: unknown, b: unknown): boolean {
 export type EntityHistoryEntryProps = {
     size: PreviewSize;
     actions?: React.ReactNode;
-    collection?: EntityCollection;
+    collection?: CollectionConfig;
     hover?: boolean;
     entry: HistoryEntryData;
     onClick?: (e: React.SyntheticEvent) => void;

package/src/components/history/EntityHistoryView.tsx

@@ -7,7 +7,7 @@ import { EntityHistoryEntry } from "./EntityHistoryEntry";
 import { useSnackbarController, useAuthController } from "@rebasepro/core";
 import { ConfirmationDialog } from "@rebasepro/core";
 import { useState } from "react";
-import { useEntityHistory } from "../../index";
+import { useHistory } from "../../index";
 
 /**
  * Entity history tab view. Shows a paginated list of entity revisions
@@ -32,7 +32,7 @@ export function EntityHistoryView<M extends Record<string, unknown>>({
         hasMore,
         loadMore,
         revert
-    } = useEntityHistory({
+    } = useHistory({
         slug,
         entityId,
         enabled: !!entityId,
@@ -136,7 +136,7 @@ export function EntityHistoryView<M extends Record<string, unknown>>({
                     No history available
                 </Label>
                 <Typography variant={"caption"} className={"ml-4"}>
-                    When you save an entity, a new version is created and stored in the history.
+                    When you save a entity, a new version is created and stored in the history.
                 </Typography>
             </>}
 

package/src/components/history/LastEditedByIndicator.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useEffect, useState, useCallback } from "react";
 ;
 import { useApiConfig } from "@rebasepro/core";
@@ -31,7 +31,7 @@ export function LastEditedByIndicator({
 }: {
     path: string;
     entityId: string;
-    collection: EntityCollection;
+    collection: CollectionConfig;
 }) {
     const apiConfig = useApiConfig();
     const authController = useAuthController();

package/src/components/index.ts

@@ -1,36 +1,37 @@
-export type { EntityViewProps } from "./EntityView";
-export { EntityView } from "./EntityView";
+export type { EntityViewBindingProps } from "./EntityViewBinding";
+export { EntityViewBinding } from "./EntityViewBinding";
 
-export * from "./EntityDetailView";
+export * from "./DetailViewBinding";
 
-export type { EntitySelectionProps } from "./ReferenceTable/EntitySelectionTable";
-export { EntitySelectionTable } from "./ReferenceTable/EntitySelectionTable";
+export type { SelectionProps } from "./ReferenceTable/SelectionTableBinding";
+export { SelectionTableBinding } from "./ReferenceTable/SelectionTableBinding";
 
 export * from "./SelectableTable/SelectableTable";
 export * from "./SelectableTable/SelectableTableContext";
-export * from "./EntityCollectionView/EntityCollectionView";
-export * from "./EntityCollectionView/EntityCollectionViewActions";
-export * from "./EntityCollectionView/EntityCollectionCardView";
-export * from "./EntityCollectionView/EntityCard";
-export * from "./EntityCollectionView/useSelectionController";
+export * from "./SelectableTable/filters/FilterFieldBinding";
+export * from "./CollectionViewBinding/CollectionViewBinding";
+export * from "./CollectionViewBinding/CollectionViewActions";
+export * from "./CollectionViewBinding/CollectionCardViewBinding";
+export * from "./CollectionViewBinding/EntityCardBinding";
+export * from "./CollectionViewBinding/useSelectionController";
 
 export * from "./PropertyConfigBadge";
 export * from "./PropertyIdCopyTooltip";
 
-export * from "./EntityCollectionTable";
+export * from "./CollectionTableBinding";
 // VirtualTable is exported from @rebasepro/ui
 export * from "./ArrayContainer";
 export * from "./ReferenceWidget";
 export * from "./SearchIconsView";
 export * from "./FieldCaption";
-export * from "./EntityPreview";
+export * from "./EntityPreviewBinding";
 
-// history is lazy-loaded by EntityEditView and resolutions.ts
+// history is lazy-loaded by EditViewBinding and resolutions.ts
 // export * from "./history";
 export * from "./common";
 export * from "./field_configs";
 
-export * from "./SideEntityProvider";
+export * from "./SidePanelProvider";
 export * from "./AdminModeSyncer";
 // Admin views: only CreationResultDialog remains (used by resetPasswordAction)
 export * from "./app/AppBar";

package/src/contexts/SidePanelControllerContext.tsx

@@ -0,0 +1,5 @@
+import type { SidePanelController } from "@rebasepro/types";
+import React from "react";
+;
+
+export const SidePanelControllerContext = React.createContext<SidePanelController>({} as SidePanelController);

package/src/data_export/export/ExportCollectionAction.tsx

@@ -8,7 +8,7 @@ import {
     useTranslation
 } from "@rebasepro/core";
 import { useCMSContext } from "../../hooks";
-import { CollectionActionsProps, Entity, EntityCollection, ExportConfig, RebaseContext, User } from "@rebasepro/types";
+import { CollectionActionsProps, Entity, CollectionConfig, ExportConfig, RebaseContext, User } from "@rebasepro/types";
 import { getDefaultValuesFor } from "@rebasepro/common";
 import {
     Alert,
@@ -38,8 +38,8 @@ export function ExportCollectionAction<M extends Record<string, unknown>, USER e
     onAnalyticsEvent,
     exportAllowed,
     notAllowedView
-}: CollectionActionsProps<M, USER, EntityCollection<M>> & {
-    exportAllowed?: (props: { collectionEntitiesCount: number, path: string, collection: EntityCollection }) => boolean;
+}: CollectionActionsProps<M, USER, CollectionConfig<M>> & {
+    exportAllowed?: (props: { collectionEntitiesCount: number, path: string, collection: CollectionConfig }) => boolean;
     notAllowedView?: React.ReactNode;
     onAnalyticsEvent?: (event: string, params?: any) => void;
 }) {
@@ -115,7 +115,7 @@ export function ExportCollectionAction<M extends Record<string, unknown>, USER e
         return [...resolvedExportColumnsValues, ...resolvedColumnsValues];
     }, [exportConfig?.additionalFields]);
 
-    const doDownload = useCallback(async (collection: EntityCollection<M>,
+    const doDownload = useCallback(async (collection: CollectionConfig<M>,
         exportConfig: ExportConfig<any> | undefined) => {
 
         onAnalyticsEvent?.("export_collection", {

package/src/data_import/components/ImportSaveInProgress.tsx

@@ -1,11 +1,11 @@
 import { useData } from "@rebasepro/core";
-import { Entity, EntityCollection } from "@rebasepro/types";
+import { Entity, CollectionConfig } from "@rebasepro/types";
 import { RebaseData } from "@rebasepro/types";
 import { Button, CenteredView, CircularProgress, Typography } from "@rebasepro/ui";
 import { useEffect, useRef, useState } from "react";
 import { ImportConfig } from "../types";
 
-export function ImportSaveInProgress<C extends EntityCollection<any>>
+export function ImportSaveInProgress<C extends CollectionConfig<any>>
     ({
         path,
         importConfig,
@@ -95,7 +95,7 @@ export function ImportSaveInProgress<C extends EntityCollection<any>>
 }
 
 function saveDataBatch(dataClient: RebaseData,
-    collection: EntityCollection,
+    collection: CollectionConfig,
     path: string,
     data: Partial<Entity<any>>[],
     offset = 0,

package/src/data_import/import/ImportCollectionAction.tsx

@@ -5,13 +5,13 @@ import {
     useSnackbarController
 } from "@rebasepro/core";
 import { getPropertiesWithPropertiesOrder, getPropertyInPath } from "../../util";
-import { CollectionActionsProps, Properties, Property, User, EntityCollection } from "@rebasepro/types";
+import { CollectionActionsProps, Properties, Property, User, CollectionConfig } from "@rebasepro/types";
 import {
     getFieldConfig,
     PropertyConfigBadge,
     useSelectionController
 } from "../../components";
-import { EntityCollectionTable } from "../../components/EntityCollectionTable/EntityCollectionTable";
+import { CollectionTableBinding } from "../../components/CollectionTableBinding/CollectionTableBinding";
 import { useCollectionRegistryController } from "../../hooks";
 import {
     Button,
@@ -176,7 +176,7 @@ export function ImportCollectionAction<M extends Record<string, unknown>, USER e
 
                 {step === "import_data_saving" && importConfig &&
                     <ImportSaveInProgress importConfig={importConfig}
-                        collection={collection as EntityCollection}
+                        collection={collection as CollectionConfig}
                         path={path}
                         onImportSuccess={(importedCollection) => {
                             handleClose();
@@ -396,7 +396,7 @@ export function ImportDataPreview<M extends Record<string, unknown>>({
 
     const selectionController = useSelectionController();
 
-    return <EntityCollectionTable
+    return <CollectionTableBinding
         title={<div>
             <Typography variant={"subtitle2"}>Imported data preview</Typography>
             <Typography variant={"caption"}>Entities with the same id will be overwritten</Typography>

package/src/data_import/utils/data.ts

@@ -1,5 +1,5 @@
 import { getPropertyInPath } from "../../util";
-import { AuthController, Entity, EntityCollection, EntityReference, CollectionRegistryController, Properties, Property, Vector } from "@rebasepro/types";
+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";
@@ -148,7 +148,7 @@ export function processValueMapping(authController: AuthController, value: any,
 
         // If no explicit database was provided in the string, try to get it from the collection
         if (databaseId === undefined) {
-            const targetCollection: EntityCollection<any> | undefined = navigation.getCollection(path);
+            const targetCollection: CollectionConfig<any> | undefined = navigation.getCollection(path);
             databaseId = targetCollection?.databaseId;
         }
 

package/src/form/EntityForm.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, EntityCustomViewParams, AdditionalFieldDelegateProps } from "@rebasepro/types";
+import type { CollectionConfig, EntityCustomViewParams, AdditionalFieldDelegateProps } from "@rebasepro/types";
 import type { FormContext, PropertyFieldBindingProps } from "../types/fields";
 import type { PropertyConfig } from "@rebasepro/types";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -33,7 +33,7 @@ import {
 /**
  * Headless entity form component.
  *
- * Renders a form for an entity collection without any CMS or backend dependencies.
+ * Renders a form for a entity collection without any CMS or backend dependencies.
  * All backend concerns (save, caching, analytics, plugin slots) are provided via
  * callback props. For CMS-connected usage, use {@link EntityFormBinding} instead.
  *

package/src/form/EntityFormActions.tsx

@@ -1,5 +1,5 @@
 
-import { type EntityCollection, getCollectionDataPath } from "@rebasepro/types";
+import { type CollectionConfig, getCollectionDataPath } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import type { EntityAction } from "@rebasepro/types";
 import React from "react";
@@ -81,7 +81,7 @@ type ActionsViewProps<M extends Record<string, unknown>> = {
     savingError: Error | undefined,
     entity: Entity<M> | undefined,
     formActions?: EntityAction[],
-    collection: EntityCollection,
+    collection: CollectionConfig,
     disabled: boolean,
     status: "new" | "existing" | "copy",
     pluginActions?: React.ReactNode[],
@@ -130,7 +130,7 @@ function buildBottomActions<M extends Record<string, unknown>>({
                                 path: path ?? getCollectionDataPath(collection),
                                 collection: collection,
                                 context: undefined,
-                                sideEntityController: undefined,
+                                sidePanelController: undefined,
                                 openEntityMode: openEntityMode,
                                 navigateBack,
                                 formContext

package/src/form/EntityFormBinding.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, PluginFormActionProps } from "@rebasepro/types";
+import type { CollectionConfig, PluginFormActionProps } from "@rebasepro/types";
 import type { FormContext } from "../types/fields";
 import React, { useCallback, useMemo, useState } from "react";
 import { AnalyticsEvent, Entity, EntityStatus, EntityValues } from "@rebasepro/types";
@@ -26,7 +26,7 @@ import {
     saveEntityToCache
 } from "@rebasepro/core";
 
-import { useCollectionRegistryController, useSideEntityController, useCMSContext } from "../index";
+import { useCollectionRegistryController, useSidePanel, useCMSContext } from "../index";
 import { EntityForm } from "./EntityForm";
 import {
     extractTouchedValues,
@@ -92,7 +92,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
 }: EntityFormBindingProps<M>) {
 
     const { t } = useTranslation();
-    const sideEntityController = useSideEntityController();
+    const sidePanelController = useSidePanel();
     const collectionRegistryController = useCollectionRegistryController();
     const authController = useAuthController();
     const dataClient = useData();
@@ -153,11 +153,11 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
             return;
         }
         if (openEntityMode === "side_panel" || openEntityMode === "dialog") {
-            sideEntityController.close();
+            sidePanelController.close();
         } else {
             window.history.back();
         }
-    }, [navigateBackProp, openEntityMode, sideEntityController]);
+    }, [navigateBackProp, openEntityMode, sidePanelController]);
 
     // --- Cache operations ---
     const clearDirtyCache = useCallback(() => {
@@ -276,7 +276,7 @@ export function EntityFormBinding<M extends Record<string, unknown>>({
         parentEntityIds,
         path,
         status,
-        collection: collection as EntityCollection,
+        collection: collection as CollectionConfig,
         context,
         formContext: undefined as unknown as FormContext<Record<string, unknown>>,
         openEntityMode,

package/src/form/PropertyFieldBinding.tsx

@@ -1,4 +1,4 @@
-import type { EntityCollection, FieldProps as CoreFieldProps } from "@rebasepro/types";
+import type { CollectionConfig, FieldProps as CoreFieldProps } from "@rebasepro/types";
 import type { FieldProps, PropertyFieldBindingProps } from "../types/fields";
 import type { RebasePlugin, PluginFieldBuilderParams, Property } from "@rebasepro/types";
 import React, { ComponentType, ReactElement, Suspense, useCallback, useRef } from "react";
@@ -29,7 +29,7 @@ import { ErrorBoundary } from "@rebasepro/ui";
  *
  * Please note that if you build a custom field in a component, the
  * **validation** passed in the property will have no effect. You need to set
- * the validation in the `EntityCollection` definition.
+ * the validation in the `CollectionConfig` definition.
  *
  * @param propertyKey You can use nested names such as `address.street` or `friends[2]`
  * @param property
@@ -292,7 +292,7 @@ const shouldPropertyReRender = (property: Property, plugins?: RebasePlugin[]): b
 
 interface UseWrappedComponentParams<M extends Record<string, unknown> = Record<string, unknown>> {
     path?: string,
-    collection?: EntityCollection<M>,
+    collection?: CollectionConfig<M>,
     propertyKey: string,
     property: Property,
     Component: ComponentType<FieldProps<Property, unknown, M>>,
@@ -323,7 +323,7 @@ function useWrappedComponent<T, M extends Record<string, unknown> = Record<strin
                         Field: Component as unknown as ComponentType<CoreFieldProps<Property, unknown, Record<string, unknown>>>,
                         plugin,
                         path,
-                        collection: collection as EntityCollection | undefined
+                        collection: collection as CollectionConfig | undefined
                     };
                     const enabled = plugin.fieldBuilder.enabled?.(params);
                     if (enabled === undefined || enabled)

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -1,5 +1,5 @@
-import { useEntitySelectionDialog } from "../../hooks/useEntitySelectionDialog";
-import type { EntityCollection } from "@rebasepro/types";
+import { useSelectionDialog } from "../../hooks/useSelectionDialog";
+import type { CollectionConfig } from "@rebasepro/types";
 import type { FieldProps } from "../../types/fields";
 import type { ArrayProperty, Property } from "@rebasepro/types";
 import React, { useCallback, useMemo } from "react";
@@ -56,7 +56,7 @@ export function ArrayOfReferencesFieldBinding({
     });
 
     const collectionRegistryController = useCollectionRegistryController();
-    const collection: EntityCollection | undefined = useMemo(() => {
+    const collection: CollectionConfig | undefined = useMemo(() => {
         return ofProperty.path ? collectionRegistryController.getCollection(ofProperty.path) : undefined;
     }, [ofProperty.path]);
 
@@ -69,7 +69,7 @@ export function ArrayOfReferencesFieldBinding({
         setValue(refs);
     }, [setValue]);
 
-    const referenceDialogController = useEntitySelectionDialog({
+    const referenceDialogController = useSelectionDialog({
         multiselect: true,
         path: ofProperty.path,
         collection,

package/src/form/field_bindings/KeyValueFieldBinding.tsx

@@ -134,13 +134,13 @@ function MapEditView<T extends Record<string, unknown>>({
         setInternalState(newRowIds);
     }, [value]);
 
-    const updatetype = (rowId: number, type: DataType) => {
-        if (!rowId) {
+    const updatetype = (id: number, type: DataType) => {
+        if (!id) {
             console.warn("No key selected for data type update");
             return;
         }
         setInternalState(internalState.map((row) => {
-            if (row[0] === rowId) {
+            if (row[0] === id) {
                 return [row[0], {
                     key: row[1].key,
                     type
@@ -150,27 +150,27 @@ function MapEditView<T extends Record<string, unknown>>({
         }));
         setValue({
             ...(value ?? {} as T),
-            [internalState.find((row) => row[0] === rowId)?.[1].key ?? ""]: getDefaultValueFortype(type)
+            [internalState.find((row) => row[0] === id)?.[1].key ?? ""]: getDefaultValueFortype(type)
         })
     };
 
     return <div className="py-1 flex flex-col gap-1">
         {internalState
-            .map(([rowId, {
+            .map(([id, {
                     key: fieldKey,
                     type
                 }], index) => {
                     const entryValue = fieldKey ? value?.[fieldKey] : "";
                     const onFieldKeyChange = (newKey: string) => {
 
-                        setInternalState(internalState.map((currentRowId) => {
-                            if (currentRowId[0] === rowId) {
-                                return [rowId, {
+                        setInternalState(internalState.map((currentId) => {
+                            if (currentId[0] === id) {
+                                return [id, {
                                     key: newKey ?? "",
-                                    type: currentRowId[1].type
+                                    type: currentId[1].type
                                 }];
                             }
-                            return currentRowId;
+                            return currentId;
                         }));
 
                         if (typeof value === "object" && newKey in value) {
@@ -189,8 +189,8 @@ function MapEditView<T extends Record<string, unknown>>({
                             [newKey ?? ""]: entryValue
                         });
                     };
-                    return <MapKeyValueRow rowId={rowId}
-                                           key={rowId}
+                    return <MapKeyValueRow id={id}
+                                           key={id}
                                            fieldKey={fieldKey}
                                            value={value ?? {} as T}
                                            onDeleteClick={() => {
@@ -200,7 +200,7 @@ function MapEditView<T extends Record<string, unknown>>({
                                                } else {
                                                    delete (newValue as Record<string, unknown>)[fieldKey];
                                                }
-                                               setInternalState(internalState.filter((currentRowId) => currentRowId[0] !== rowId));
+                                               setInternalState(internalState.filter((currentId) => currentId[0] !== id));
                                                setValue({
                                                    ...newValue
                                                });
@@ -238,7 +238,7 @@ function MapEditView<T extends Record<string, unknown>>({
 }
 
 function MapKeyValueRow<T extends Record<string, unknown>>({
-                                                               rowId,
+                                                               id,
                                                                fieldKey,
                                                                value,
                                                                onFieldKeyChange,
@@ -249,7 +249,7 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
                                                                updatetype,
                                                                disabled
                                                            }: {
-    rowId: number,
+    id: number,
     fieldKey: string,
     value: T,
     onFieldKeyChange: (newKey: string) => void,
@@ -258,7 +258,7 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
     entryValue: unknown,
     type: DataType,
     disabled?: boolean,
-    updatetype: (rowId: number, type: DataType) => void
+    updatetype: (id: number, type: DataType) => void
 }) {
 
     const { locale } = useCustomizationController();
@@ -327,7 +327,7 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
                 className={cls(defaultBorderMixin, "ml-2 pl-2 border-l border-solid")}>
                 <ArrayContainer value={arrayValue}
                                 newDefaultEntry={""}
-                                droppableId={rowId.toString()}
+                                droppableId={id.toString()}
                                 addLabel={fieldKey ? t("add_to_field", { fieldName: fieldKey }) : t("add")}
                                 size={"small"}
                                 disabled={disabled || !fieldKey}
@@ -379,11 +379,11 @@ function MapKeyValueRow<T extends Record<string, unknown>>({
     }
 
     function doUpdatetype(type: DataType) {
-        updatetype(rowId, type);
+        updatetype(id, type);
     }
 
     return (<>
-            <Typography key={rowId.toString()}
+            <Typography key={id.toString()}
                         component={"div"}
                         className="font-mono flex flex-row gap-1">
                 <div className="w-[300px] max-w-[30%]">