openapi-spec-reader #10
@@ -31,6 +31,7 @@ import VisibilityIcon from '@mui/icons-material/Visibility';
|
|||||||
import MoreVertIcon from '@mui/icons-material/MoreVert';
|
import MoreVertIcon from '@mui/icons-material/MoreVert';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import { ResourceConfig } from '../types/config';
|
import { ResourceConfig } from '../types/config';
|
||||||
|
import { getFieldOptions, toGridValueOptions } from '../utils/options';
|
||||||
|
|
||||||
interface EnhancedTableProps {
|
interface EnhancedTableProps {
|
||||||
config: ResourceConfig;
|
config: ResourceConfig;
|
||||||
@@ -96,8 +97,7 @@ export default function EnhancedTable({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (muiType === 'singleSelect' && field.options) {
|
if (muiType === 'singleSelect' && field.options) {
|
||||||
// @ts-ignore
|
col.valueOptions = toGridValueOptions(getFieldOptions(field));
|
||||||
col.valueOptions = field.options;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return col;
|
return col;
|
||||||
@@ -379,6 +379,11 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,
|
|||||||
|
|
||||||
if (field.type === 'datetime' || field.type === 'date') return value ? new Date(value).toLocaleString() : '';
|
if (field.type === 'datetime' || field.type === 'date') return value ? new Date(value).toLocaleString() : '';
|
||||||
|
|
||||||
|
if (field.type === 'enum' && field.options) {
|
||||||
|
const opt = getFieldOptions(field).find(o => o.key === value);
|
||||||
|
return opt?.value ?? value;
|
||||||
|
}
|
||||||
|
|
||||||
if (isPk && !isMobile) {
|
if (isPk && !isMobile) {
|
||||||
return (
|
return (
|
||||||
<Chip
|
<Chip
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
import DoneIcon from "@mui/icons-material/Done";
|
import DoneIcon from "@mui/icons-material/Done";
|
||||||
import FilterListIcon from "@mui/icons-material/FilterList";
|
import FilterListIcon from "@mui/icons-material/FilterList";
|
||||||
import { ResourceField, ResourceMode } from "../types/config";
|
import { ResourceField, ResourceMode } from "../types/config";
|
||||||
|
import { getFieldOptions } from "../utils/options";
|
||||||
|
|
||||||
function FilterAutocomplete({
|
function FilterAutocomplete({
|
||||||
options,
|
options,
|
||||||
@@ -110,7 +111,9 @@ function extractOptions(
|
|||||||
): string[] {
|
): string[] {
|
||||||
const values = new Set<string>();
|
const values = new Set<string>();
|
||||||
|
|
||||||
if (field.options) return field.options;
|
if (field.type === 'enum' && field.options) {
|
||||||
|
return getFieldOptions(field).map(o => o.key);
|
||||||
|
}
|
||||||
if (!data) return [];
|
if (!data) return [];
|
||||||
|
|
||||||
const pull = (item: any): string | null => {
|
const pull = (item: any): string | null => {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
Divider,
|
Divider,
|
||||||
} from '@mui/material';
|
} from '@mui/material';
|
||||||
import { ResourceField } from '../../types/config';
|
import { ResourceField } from '../../types/config';
|
||||||
|
import { getFieldOptions } from '../../utils/options';
|
||||||
import ImageUploadField from './ImageUploadField';
|
import ImageUploadField from './ImageUploadField';
|
||||||
|
|
||||||
interface FormFieldProps {
|
interface FormFieldProps {
|
||||||
@@ -73,40 +74,40 @@ export default function FormField({
|
|||||||
if (field.relation && relationDataMap[field.relation]) {
|
if (field.relation && relationDataMap[field.relation]) {
|
||||||
const relationData = relationDataMap[field.relation].data;
|
const relationData = relationDataMap[field.relation].data;
|
||||||
const isArrayRelation = field.type === 'array';
|
const isArrayRelation = field.type === 'array';
|
||||||
|
const options = getFieldOptions(field, relationData);
|
||||||
|
const keyField = field.enumOption?.key ?? 'id';
|
||||||
|
|
||||||
// Determine how to display the related item
|
// Normalize value: API returns whole objects on GET, but form uses key strings
|
||||||
const getOptionLabel = (option: any) => {
|
const normalizedValue = (() => {
|
||||||
if (!option) return "";
|
if (isArrayRelation && Array.isArray(value)) {
|
||||||
if (field.displayField && option[field.displayField]) return option[field.displayField];
|
return value.map((v: any) => (v != null && typeof v === 'object' ? String(v[keyField] ?? '') : String(v)));
|
||||||
// Standard naming fields
|
}
|
||||||
return option.name || option.title || option.label || option.id || JSON.stringify(option);
|
if (value != null && typeof value === 'object') {
|
||||||
};
|
return String(value[keyField] ?? '');
|
||||||
|
}
|
||||||
const getOptionValue = (option: any) => {
|
return value ?? (isArrayRelation ? [] : "");
|
||||||
// Return the whole object to maintain identity
|
})();
|
||||||
return option;
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FormControl fullWidth>
|
<FormControl fullWidth>
|
||||||
<InputLabel shrink>{label}</InputLabel>
|
<InputLabel shrink>{label}</InputLabel>
|
||||||
<Select
|
<Select
|
||||||
multiple={isArrayRelation}
|
multiple={isArrayRelation}
|
||||||
value={value || (isArrayRelation ? [] : "")}
|
value={normalizedValue}
|
||||||
label={label}
|
label={label}
|
||||||
displayEmpty
|
displayEmpty
|
||||||
onChange={(e) => onChange(e.target.value)}
|
onChange={(e) => onChange(e.target.value)}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
renderValue={(selected: any) => {
|
renderValue={(selected: any) => {
|
||||||
if (isArrayRelation) {
|
if (isArrayRelation) {
|
||||||
return (selected as any[]).map(getOptionLabel).join(', ');
|
return (selected as string[]).map(k => options.find(o => o.key === k)?.value ?? k).join(', ');
|
||||||
}
|
}
|
||||||
return getOptionLabel(selected);
|
return options.find(o => o.key === selected)?.value ?? selected;
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{relationData.map((option) => (
|
{options.map((opt) => (
|
||||||
<MenuItem key={option.id || JSON.stringify(option)} value={getOptionValue(option)}>
|
<MenuItem key={opt.key} value={opt.key}>
|
||||||
{getOptionLabel(option)}
|
{opt.value}
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
@@ -149,6 +150,7 @@ export default function FormField({
|
|||||||
|
|
||||||
// 5. Enum Handling
|
// 5. Enum Handling
|
||||||
if (field.type === 'enum' && field.options) {
|
if (field.type === 'enum' && field.options) {
|
||||||
|
const options = getFieldOptions(field);
|
||||||
return (
|
return (
|
||||||
<FormControl fullWidth>
|
<FormControl fullWidth>
|
||||||
<InputLabel>{label}</InputLabel>
|
<InputLabel>{label}</InputLabel>
|
||||||
@@ -158,9 +160,9 @@ export default function FormField({
|
|||||||
onChange={(e) => onChange(e.target.value)}
|
onChange={(e) => onChange(e.target.value)}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
>
|
>
|
||||||
{field.options.map((opt: string) => (
|
{options.map((opt) => (
|
||||||
<MenuItem key={opt} value={opt}>
|
<MenuItem key={opt.key} value={opt.key}>
|
||||||
{opt}
|
{opt.value}
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
|
|||||||
@@ -10,6 +10,16 @@ export type FieldType =
|
|||||||
| 'object'
|
| 'object'
|
||||||
| 'array';
|
| 'array';
|
||||||
|
|
||||||
|
export interface SelectOption {
|
||||||
|
key: string;
|
||||||
|
value: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface EnumOption {
|
||||||
|
key: string;
|
||||||
|
value: string | string[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface ResourceField {
|
export interface ResourceField {
|
||||||
type: FieldType;
|
type: FieldType;
|
||||||
label: string;
|
label: string;
|
||||||
@@ -19,8 +29,10 @@ export interface ResourceField {
|
|||||||
schema?: Record<string, ResourceField>;
|
schema?: Record<string, ResourceField>;
|
||||||
displayField?: string | string[];
|
displayField?: string | string[];
|
||||||
formatter?: (value: any) => string;
|
formatter?: (value: any) => string;
|
||||||
relation?: string; // Name of the target resource
|
relation?: string;
|
||||||
filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
|
filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
|
||||||
|
enumOption?: EnumOption;
|
||||||
|
enumLabels?: Record<string, string>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type ResourceMode = "server" | "client";
|
export type ResourceMode = "server" | "client";
|
||||||
@@ -38,6 +50,7 @@ export interface ResourceConfig {
|
|||||||
mode?: ResourceMode;
|
mode?: ResourceMode;
|
||||||
fields?: string[];
|
fields?: string[];
|
||||||
};
|
};
|
||||||
|
enumOption?: EnumOption;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AppConfig {
|
export interface AppConfig {
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
/**
|
export interface EnumOption {
|
||||||
* This file contains application-specific overrides and configuration
|
key: string;
|
||||||
* for the generic Admin Panel.
|
value: string | string[];
|
||||||
*/
|
}
|
||||||
|
|
||||||
export interface FieldOverride {
|
export interface FieldOverride {
|
||||||
displayField?: string | string[];
|
displayField?: string | string[];
|
||||||
display?: boolean;
|
display?: boolean;
|
||||||
formatter?: (value: any) => string;
|
formatter?: (value: any) => string;
|
||||||
filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
|
filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
|
||||||
|
enumLabels?: Record<string, string>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ResourceOverride {
|
export interface ResourceOverride {
|
||||||
@@ -18,4 +19,5 @@ export interface ResourceOverride {
|
|||||||
mode?: "server" | "client";
|
mode?: "server" | "client";
|
||||||
fields?: string[];
|
fields?: string[];
|
||||||
};
|
};
|
||||||
|
enumOption?: EnumOption;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,6 +80,21 @@ function parseSchemaFields(
|
|||||||
const relation = schemaToResourceMap.get(targetSchema);
|
const relation = schemaToResourceMap.get(targetSchema);
|
||||||
if (relation) {
|
if (relation) {
|
||||||
fields[key].relation = relation;
|
fields[key].relation = relation;
|
||||||
|
|
||||||
|
// Propagate enumOption from target resource config, or derive from target schema
|
||||||
|
const explicitEnumOption = configuration[relation]?.enumOption;
|
||||||
|
if (explicitEnumOption) {
|
||||||
|
fields[key].enumOption = explicitEnumOption;
|
||||||
|
} else {
|
||||||
|
const targetProps = targetSchema.properties || {};
|
||||||
|
const valueField = Object.entries(targetProps).find(
|
||||||
|
([name, p]: [string, any]) => name !== 'id' && p.type === 'string'
|
||||||
|
)?.[0];
|
||||||
|
fields[key].enumOption = {
|
||||||
|
key: 'id',
|
||||||
|
value: valueField ?? 'id',
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Recursively parse nested objects (only if not a relation)
|
// Recursively parse nested objects (only if not a relation)
|
||||||
|
|||||||
28
react-openapi/utils/options.ts
Normal file
28
react-openapi/utils/options.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import { ResourceField, SelectOption } from "../types/config";
|
||||||
|
|
||||||
|
export function getFieldOptions(field: ResourceField, relationData?: any[]): SelectOption[] {
|
||||||
|
if (field.type === 'enum' && field.options) {
|
||||||
|
return field.options.map(opt => ({
|
||||||
|
key: opt,
|
||||||
|
value: field.enumLabels?.[opt] ?? opt,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (field.relation) {
|
||||||
|
const data = relationData ?? [];
|
||||||
|
const enumOption = field.enumOption ?? { key: 'id', value: 'name' };
|
||||||
|
|
||||||
|
return data.map(item => ({
|
||||||
|
key: String(item[enumOption.key] ?? ''),
|
||||||
|
value: Array.isArray(enumOption.value)
|
||||||
|
? enumOption.value.map(k => item[k]).filter(v => v != null).join(' ')
|
||||||
|
: String(item[enumOption.value] ?? ''),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
export function toGridValueOptions(options: SelectOption[]): { value: string; label: string }[] {
|
||||||
|
return options.map(opt => ({ value: opt.key, label: opt.value }));
|
||||||
|
}
|
||||||
@@ -50,6 +50,18 @@ export const configuration: Record<string, ResourceOverride> = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
accounts: {
|
||||||
|
enumOption: {
|
||||||
|
key: 'id',
|
||||||
|
value: ['name', 'number']
|
||||||
|
}
|
||||||
|
},
|
||||||
|
tags: {
|
||||||
|
enumOption: {
|
||||||
|
key: 'id',
|
||||||
|
value: ['icon', 'name']
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
export const profileConfiguration = {
|
export const profileConfiguration = {
|
||||||
|
|||||||
Reference in New Issue
Block a user