type fixes

react-openapi/components/EnhancedTable.tsx

@@ -100,7 +100,7 @@ export default function EnhancedTable({
       }
 
       if (muiType === 'singleSelect') {
-        col.valueOptions = toGridValueOptions(getFieldOptions(field));
+        (col as GridColDef & { valueOptions: any[] }).valueOptions = toGridValueOptions(getFieldOptions(field));
       }
 
       return col;

react-openapi/components/FilterBar.tsx

@@ -130,6 +130,7 @@ function extractOptions(
     if (Array.isArray(df)) {
       const parts = df.map((k) => item[k]).filter((v) => v != null);
       if (parts.length > 0) return parts.join(" ");
+      return null;
     }
     const v = item[df];
     if (v != null) return String(v);

react-openapi/components/ResourceView.tsx

@@ -201,7 +201,7 @@ export default function ResourceView({ config, onNavigateToResource, fieldCompon
         </Box>
       ) : (
         <Paper sx={{ p: 4 }}>
-          <components.GenericForm
+          {components && <components.GenericForm
             config={config}
             initialData={isCreate ? null : itemQuery.data}
             onSave={handleSave}
@@ -209,7 +209,7 @@ export default function ResourceView({ config, onNavigateToResource, fieldCompon
             loading={createMutation.isPending || updateMutation.isPending}
             readOnly={isView}
             onEditClick={() => navigate(`/admin/${config.name}/edit/${id}`)}
-          />
+          />}
         </Paper>
       )}
     </Box>

react-openapi/components/fields/DefaultFieldComponents.ts

@@ -1,4 +1,5 @@
-import { FieldComponents } from '../../types/overrides';
+import * as React from 'react';
+import { FieldComponents, FieldComponentProps } from '../../types/overrides';
 import TextFieldEntry from './TextField';
 import NumberField from './NumberField';
 import BooleanField from './BooleanField';
@@ -8,6 +9,19 @@ import RelationField from './RelationField';
 import ImageUploadField from './ImageUploadField';
 import FallbackField from './FallbackField';
 
+const WrappedImageUploadField = (props: FieldComponentProps) =>
+  React.createElement(ImageUploadField, {
+    label: props.field.label,
+    value: props.value || '',
+    onUpload: async (file: File) => {
+      const url = await props.uploadFile?.(file);
+      if (url) props.onChange(url);
+    },
+    uploading: props.uploading,
+    baseUrl: props.baseUrl || '',
+    disabled: props.disabled,
+  });
+
 export const defaultFieldComponents: FieldComponents = {
   string: TextFieldEntry,
   markdown: TextFieldEntry,
@@ -16,7 +30,7 @@ export const defaultFieldComponents: FieldComponents = {
   date: DateField,
   datetime: DateField,
   enum: EnumField,
-  image: ImageUploadField,
+  image: WrappedImageUploadField,
   relation: RelationField,
   default: FallbackField,
 };

react-openapi/components/fields/FormField.tsx

@@ -9,9 +9,9 @@ export interface FormFieldProps {
   value: any;
   onChange: (val: any) => void;
   disabled?: boolean;
-  uploadFile: (file: File) => Promise<string | null>;
-  uploading: boolean;
-  baseUrl: string;
+  uploadFile?: (file: File) => Promise<string | null>;
+  uploading?: boolean;
+  baseUrl?: string;
   relationDataMap?: Record<string, any[]>;
   components: FieldComponents;
 }
@@ -51,9 +51,9 @@ export default function FormField({
         value={childProps.value}
         onChange={childProps.onChange}
         disabled={childProps.disabled}
-        uploadFile={childProps.uploadFile!}
-        uploading={childProps.uploading!}
-        baseUrl={childProps.baseUrl!}
+        uploadFile={childProps.uploadFile}
+        uploading={childProps.uploading}
+        baseUrl={childProps.baseUrl}
         relationDataMap={childProps.relationDataMap}
         components={components}
       />

react-openapi/components/fields/RelationField.tsx

@@ -7,7 +7,7 @@ export default function RelationField({ field, value, onChange, disabled, relati
     return null;
   }
 
-  const relationData = relationDataMap[field.relation].data;
+  const relationData = relationDataMap[field.relation];
   const isArrayRelation = field.type === 'array';
   const options = getFieldOptions(field, relationData);
   const keyField = field.enumOption?.key ?? 'id';