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