@rebasepro/admin 0.11.1-canary.gfadf355 → 0.12.0

package/src/form/field_bindings/MultipleRelationFieldBinding.tsx

@@ -43,8 +43,19 @@ export function MultipleRelationFieldBinding({
 
     const parentCollection = context.collection;
     const capabilities = parentCollection ? getDataSourceCapabilities(parentCollection.engine) : undefined;
-    if (!parentCollection || !capabilities?.supportsRelations || !("relations" in parentCollection) || !parentCollection.relations) {
-        throw Error("RelationFieldBinding expected a collection with relations support");
+    // Only two things have to hold here: there is a collection, and its engine
+    // has relations at all. Whether *this* property's relation can be resolved
+    // is `resolveRelationProperty`'s question, and it answers it across all
+    // three forms — a pre-stamped `resolvedRelation`, an inline `relation`, or
+    // a lookup by name in the collection's `relations` array — with an error
+    // naming the property and the collection when it cannot.
+    //
+    // This used to demand the `relations` array as well, which the inline form
+    // does not produce. That is the documented way to declare a relation, so
+    // every collection using it threw here and rendered the error boundary
+    // instead of the field.
+    if (!parentCollection || !capabilities?.supportsRelations) {
+        throw Error("MultipleRelationFieldBinding expected a collection whose engine supports relations");
     }
     const resolvedProperty = resolveRelationProperty(property, parentCollection, propertyKey)
     const relation = resolvedProperty;
@@ -66,7 +77,7 @@ export function MultipleRelationFieldBinding({
         collection,
         onMultipleEntitiesSelected,
         selectedEntityIds,
-        fixedFilter: property.fixedFilter
+        fixedFilter: property.admin?.fixedFilter
     }
     );
 
@@ -92,8 +103,8 @@ export function MultipleRelationFieldBinding({
                 onClick={onEntryClick}
                 hover={!disabled}
                 relation={entryValue}
-                includeId={property.includeId}
-                includeEntityLink={property.includeEntityLink}
+                includeId={property.admin?.includeId}
+                includeEntityLink={property.admin?.includeEntityLink}
             />
         );
     }, [relation, property.admin?.previewProperties, value]);

package/src/form/field_bindings/ReferenceFieldBinding.tsx

@@ -85,7 +85,7 @@ function ReferenceFieldBindingInternal({
         collection,
         onSingleEntitySelected,
         selectedEntityIds: validValue && refValue ? [refValue.id] : undefined,
-        fixedFilter: property.fixedFilter
+        fixedFilter: property.admin?.fixedFilter
     }
     );
 
@@ -115,8 +115,8 @@ function ReferenceFieldBindingInternal({
                     size={size}
                     onClick={disabled || isSubmitting ? undefined : onEntryClick}
                     reference={refValue}
-                    includeEntityLink={property.includeEntityLink}
-                    includeId={property.includeId}
+                    includeEntityLink={property.admin?.includeEntityLink}
+                    includeId={property.admin?.includeId}
                 />}
 
                 {!refValue && <div className="justify-center text-left">

package/src/form/field_bindings/RelationFieldBinding.tsx

@@ -22,8 +22,19 @@ export function RelationFieldBinding(props: FieldProps<RelationProperty>) {
     }
     const collection = context.collection;
     const capabilities = collection ? getDataSourceCapabilities(collection.engine) : undefined;
-    if (!collection || !capabilities?.supportsRelations || !("relations" in collection) || !collection.relations) {
-        throw Error("RelationFieldBinding expected a collection with relations support");
+    // Only two things have to hold here: there is a collection, and its engine
+    // has relations at all. Whether *this* property's relation can be resolved
+    // is `resolveRelationProperty`'s question, and it answers it across all
+    // three forms — a pre-stamped `resolvedRelation`, an inline `relation`, or
+    // a lookup by name in the collection's `relations` array — with an error
+    // naming the property and the collection when it cannot.
+    //
+    // This used to demand the `relations` array as well, which the inline form
+    // does not produce. That is the documented way to declare a relation, so
+    // every collection using it threw here and rendered the error boundary
+    // instead of the field.
+    if (!collection || !capabilities?.supportsRelations) {
+        throw Error("RelationFieldBinding expected a collection whose engine supports relations");
     }
     const resolvedProperty = resolveRelationProperty(property, collection, propertyKey);
     const relation = resolvedProperty;
@@ -82,7 +93,7 @@ function RelationSelectorBinding({
                     }
                 }}
                 disabled={disabled || isSubmitting}
-                fixedFilter={property.fixedFilter}
+                fixedFilter={property.admin?.fixedFilter}
                 size={selectorSize}
             />
 
@@ -127,7 +138,7 @@ function SingleRelationFieldBinding({
         collection,
         onSingleEntitySelected,
         selectedEntityIds: validValue && normalizedValue ? [normalizedValue.id] : undefined,
-        fixedFilter: property.fixedFilter
+        fixedFilter: property.admin?.fixedFilter
     });
 
     const onEntryClick = (e: React.SyntheticEvent) => {
@@ -158,8 +169,8 @@ function SingleRelationFieldBinding({
                     size={size}
                     onClick={disabled || isSubmitting ? undefined : onEntryClick}
                     relation={usedRelation}
-                    includeEntityLink={property.includeEntityLink}
-                    includeId={property.includeId}
+                    includeEntityLink={property.admin?.includeEntityLink}
+                    includeId={property.admin?.includeId}
                 />}
 
                 {!value && <div className="justify-center text-left">

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -92,8 +92,8 @@ export function RepeatFieldBinding({
         </ErrorBoundary>;
     };
 
-    const canAddElements = !property.admin?.disabled && !isSubmitting && !disabled && (property.canAddElements || property.canAddElements === undefined);
-    const sortable = property.sortable === undefined ? true : property.sortable;
+    const canAddElements = !property.admin?.disabled && !isSubmitting && !disabled && (property.admin?.canAddElements || property.admin?.canAddElements === undefined);
+    const sortable = property.admin?.sortable === undefined ? true : property.admin.sortable;
     const arrayContainer = <ArrayContainer droppableId={propertyKey}
         addLabel={property.name ? t("add_to_field", { fieldName: property.name }) : t("add_entry")}
         value={(value as unknown[]) ?? []}

package/src/hooks/useHistory.ts

@@ -1,17 +1,13 @@
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
 import { useApiConfig } from "@rebasepro/app";
+import type { EntityHistoryEntry } from "@rebasepro/types";
 
-export interface HistoryEntryData {
-    id: string;
-    table_name: string;
-    entity_id: string;
-    action: "create" | "update" | "delete";
-    changed_fields: string[] | null;
-    values: Record<string, unknown> | null;
-    previous_values: Record<string, unknown> | null;
-    updated_by: string | null;
-    updated_at: string;
-}
+/**
+ * What the history REST endpoint returns. The fourth declaration of this shape
+ * — the two drivers had one each and disagreed on `updated_at` — now an alias
+ * of the one in `@rebasepro/types`.
+ */
+export type HistoryEntryData = EntityHistoryEntry;
 
 export interface UseEntityHistoryResult {
     entries: HistoryEntryData[];

package/src/preview/PropertyPreview.tsx

@@ -195,8 +195,8 @@ export const PropertyPreview = React.memo(function PropertyPreview<P extends Pro
                 content = <ReferencePreview
                     disabled={!property.path}
                     previewProperties={property.admin?.previewProperties}
-                    includeId={property.includeId}
-                    includeEntityLink={property.includeEntityLink}
+                    includeId={property.admin?.includeId}
+                    includeEntityLink={property.admin?.includeEntityLink}
                     size={props.size}
                     reference={value as EntityReference}
                     textOnly={props.textOnly}
@@ -224,8 +224,8 @@ export const PropertyPreview = React.memo(function PropertyPreview<P extends Pro
                                 <RelationPreview
                                     disabled={!property.relation}
                                     previewProperties={property.admin?.previewProperties}
-                                    includeId={property.includeId}
-                                    includeEntityLink={property.includeEntityLink}
+                                    includeId={property.admin?.includeId}
+                                    includeEntityLink={property.admin?.includeEntityLink}
                                     size={"small"}
                                     relation={entityRelation}
                                     textOnly={props.textOnly}
@@ -242,8 +242,8 @@ export const PropertyPreview = React.memo(function PropertyPreview<P extends Pro
                 content = <RelationPreview
                     disabled={!property.relation}
                     previewProperties={property.admin?.previewProperties}
-                    includeId={property.includeId}
-                    includeEntityLink={property.includeEntityLink}
+                    includeId={property.admin?.includeId}
+                    includeEntityLink={property.admin?.includeEntityLink}
                     size={props.size}
                     relation={relationValue}
                     textOnly={props.textOnly}

package/src/preview/property_previews/ArrayOfMapsPreview.tsx

@@ -28,7 +28,7 @@ export function ArrayOfMapsPreview({
         throw Error(`You need to specify a 'properties' prop (or specify a custom field) in your map property '${propertyKey}'${mapProperty.name ? ` ("${mapProperty.name}")` : ""}`);
     }
     const values = value as Record<string, unknown>[];
-    const previewProperties: string[] | undefined = (mapProperty as MapProperty).previewProperties;
+    const previewProperties: string[] | undefined = (mapProperty as MapProperty).admin?.previewProperties;
 
     if (!values) return null;
 

package/src/preview/property_previews/ArrayOfReferencesPreview.tsx

@@ -33,8 +33,8 @@ export function ArrayOfReferencesPreview({
                             previewProperties={ofProperty.admin?.previewProperties}
                             size={childSize}
                             reference={reference}
-                            includeId={ofProperty.includeId}
-                            includeEntityLink={ofProperty.includeEntityLink}
+                            includeId={ofProperty.admin?.includeId}
+                            includeEntityLink={ofProperty.admin?.includeEntityLink}
                         />
                     </div>;
                 }

package/src/preview/property_previews/ArrayOfRelationsPreview.tsx

@@ -39,8 +39,8 @@ export function ArrayOfRelationsPreview({
                                 previewProperties={ofProperty.admin?.previewProperties}
                                 size={"small"}
                                 relation={entityRelation}
-                                includeId={ofProperty.includeId}
-                                includeEntityLink={ofProperty.includeEntityLink}
+                                includeId={ofProperty.admin?.includeId}
+                                includeEntityLink={ofProperty.admin?.includeEntityLink}
                             />
                         </div>
                     );

package/src/preview/property_previews/SkeletonPropertyComponent.tsx

@@ -41,7 +41,7 @@ export function SkeletonPropertyComponent({
                 content = <>{arrayProperty.of.map((p, i) => renderGenericArrayCell(p, i))} </>;
             } else {
                 if (arrayProperty.of.type === "map" && arrayProperty.of.properties) {
-                    content = renderArrayOfMaps(arrayProperty.of.properties, size, arrayProperty.of.previewProperties);
+                    content = renderArrayOfMaps(arrayProperty.of.properties, size, arrayProperty.of.admin?.previewProperties);
                 } else if (arrayProperty.of.type === "string") {
                     if (arrayProperty.of.enum) {
                         content = renderArrayEnumTableCell();
@@ -79,7 +79,7 @@ function renderMap<T extends Record<string, any>>(property: MapProperty, size: P
     if (size === "large") {
         mapPropertyKeys = Object.keys(property.properties);
     } else {
-        mapPropertyKeys = (property.previewProperties || Object.keys(property.properties)) as string[];
+        mapPropertyKeys = (property.admin?.previewProperties || Object.keys(property.properties)) as string[];
         if (size === "medium")
             mapPropertyKeys = mapPropertyKeys.slice(0, 3);
         else if (size === "small")