apps/khata-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Vishesh 'ironeagle' Bangotra
2026-06-13 21:37:17 +05:30
parent b198f6748e
commit 2ea8cf1f8a
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
react-openapi/components/GenericForm.tsx
View File

@@ -53,7 +53,7 @@ export default function GenericForm({
const allRelations = React.useMemo(() => {
const rels = getRelationFields(config.fields);
console.log('Form resource', config.name, 'relations discovered:', rels);
// console.log('Form resource', config.name, 'relations discovered:', rels);
return rels;
}, [config.fields]);
@@ -67,7 +67,7 @@ export default function GenericForm({
...getListQueryOptions(),
enabled: !!relatedRes,
};
console.log('Query for relation', relName, 'resource', relatedRes?.name, 'enabled', !!relatedRes);
// console.log('Query for relation', relName, 'resource', relatedRes?.name, 'enabled', !!relatedRes);
return queryOpts;
}),
});
@@ -79,8 +79,8 @@ export default function GenericForm({
allRelations.forEach((relName, index) => {
const queryResult = queries[index];
const dataArray = queryResult?.data && Array.isArray(queryResult.data) ? queryResult.data : (queryResult?.data?.data ?? []);
console.log('Relation query result for', relName, 'raw:', queryResult?.data);
console.log('Relation data for', relName, ':', dataArray.slice(0, 1));
// console.log('Relation query result for', relName, 'raw:', queryResult?.data);
// console.log('Relation data for', relName, ':', dataArray.slice(0, 1));
map[relName] = dataArray;
});
return map;

8
react-openapi/components/fields/RelationField.tsx
View File

@@ -3,7 +3,7 @@ import { getFieldOptions } from '../../utils/options';
import { FieldComponentProps } from '../../types/overrides';
export default function RelationField({ field, value, onChange, disabled, relationDataMap = {} }: FieldComponentProps) {
console.log('RelationField render', field.label, 'enumOption:', field.enumOption, 'value prop:', value);
// console.log('RelationField render', field.label, 'enumOption:', field.enumOption, 'value prop:', value);
const relationName = field.relation ?? (field as any).refers;
if (!relationName || !relationDataMap[relationName]) {
throw new Error(`Relation data for "${relationName}" is missing – cannot render options for field "${field.label}"`);
@@ -13,7 +13,7 @@ if (!relationName || !relationDataMap[relationName]) {
const relationData = relationDataMap[relationName];
const isArrayRelation = field.type === 'array';
const options = getFieldOptions(field, relationData);
console.log('Options for', field.label, 'keys:', options.map(o=>o.key));
// console.log('Options for', field.label, 'keys:', options.map(o=>o.key));
if (options.length === 0) {
throw new Error(`No selectable options available for field "${field.label}" (relation "${relationName}")`);
}
@@ -47,12 +47,12 @@ if (!relationName || !relationDataMap[relationName]) {
onChange={(e) => onChange(e.target.value)}
disabled={disabled}
renderValue={(selected: any) => {
console.log('Select renderValue for', field.label, 'selected:', selected);
// console.log('Select renderValue for', field.label, 'selected:', selected);
if (isArrayRelation) {
return (selected as string[]).map(k => options.find(o => o.key === k)?.value ?? k).join(', ');
}
const display = options.find(o => o.key === selected)?.value ?? selected;
console.log('Display value for', field.label, ':', display);
// console.log('Display value for', field.label, ':', display);
return display;
}}
>

10
react-openapi/utils/openapi_loader.ts
View File

@@ -65,7 +65,7 @@ function parseSchemaFields(
const fields: Record<string, ResourceField> = {};
const { properties, required } = mergeProperties(schema);
const overrides = configuration[resourceName]?.fields || {};
console.log('inside parseSchemaFields configuration...', configuration['accounts']['referenceOptions'])
// console.log('inside parseSchemaFields configuration...', configuration['accounts']['referenceOptions'])
for (const [key, prop] of Object.entries(properties) as [string, any]) {
// Resolve oneOf/anyOf by merging all branch properties
@@ -117,7 +117,7 @@ function parseSchemaFields(
// Propagate enumOption from target resource config, or derive from target schema
const explicitEnumOption = configuration[relation].referenceOptions.enumOption;
console.log('if relation configuration...', configuration['accounts']['referenceOptions'])
// console.log('if relation configuration...', configuration['accounts']['referenceOptions'])
if (explicitEnumOption) {
fields[key].enumOption = explicitEnumOption;
} else {
@@ -133,7 +133,7 @@ function parseSchemaFields(
// Recursively parse nested objects (only if not a relation)
if (fields[key].type === "object" && resolvedProp.properties && !relation) {
console.log('recursive configuration...', configuration['accounts']['referenceOptions'])
// console.log('recursive configuration...', configuration['accounts']['referenceOptions'])
fields[key].schema = parseSchemaFields(resolvedProp, resourceName, schemaToResourceMap, configuration);
}
}
@@ -145,7 +145,7 @@ function parseSchemaFields(
* Scans paths to identify resources and their basic configuration
*/
export async function loadConfigFromOpenApi(baseUrl: string, configuration: Record<string, any> = {}, profileConfiguration: any = {}): Promise<AppConfig> {
console.log('init configuration...', configuration['accounts']['referenceOptions'])
// console.log('init configuration...', configuration['accounts']['referenceOptions'])
// Use SwaggerParser to dereference the spec.
// Dereferencing preserves object identity for $ref targets.
const api = await SwaggerParser.dereference(
@@ -222,7 +222,7 @@ export async function loadConfigFromOpenApi(baseUrl: string, configuration: Reco
fields: fo.fields,
},
});
console.log('Loaded resource:', name, 'endpoint:', listPath, 'fields count:', Object.keys(fields).length);
// console.log('Loaded resource:', name, 'endpoint:', listPath, 'fields count:', Object.keys(fields).length);
}
// Collect standalone enum schemas (e.g. FetchRequestStatus, AccountType, etc.)
const enums: Record<string, string[]> = {};

6
react-openapi/utils/options.ts
View File

@@ -8,7 +8,7 @@ export function resolveTemplate(template: string, item: any): string {
}
export function getFieldOptions(field: ResourceField, relationData?: any[]): SelectOption[] {
console.log('getFieldOptions called for field', field.label, 'type', field.type, 'enumOption', field.enumOption);
// console.log('getFieldOptions called for field', field.label, 'type', field.type, 'enumOption', field.enumOption);
if (field.type === 'enum') {
return (field.options ?? []).map(opt => ({
key: opt,
@@ -18,7 +18,7 @@ export function getFieldOptions(field: ResourceField, relationData?: any[]): Sel
if (field.relation) {
const data = Array.isArray(relationData) ? relationData : [];
console.log('Getting options for relation', field.relation, 'data count:', data.length);
// console.log('Getting options for relation', field.relation, 'data count:', data.length);
if (data.length === 0) {
throw new Error(`Relation data for "${field.relation}" is missing or empty – cannot build options for field "${field.label}"`);
}
@@ -33,7 +33,7 @@ export function getFieldOptions(field: ResourceField, relationData?: any[]): Sel
key: String(item[enumOption.key] ?? item.id ?? item._id),
value: resolveTemplate(enumOption.value, item),
}));
console.log('Option map for', field.relation, 'first entry:', data[0], 'result key:', result[0]?.key);
// console.log('Option map for', field.relation, 'first entry:', data[0], 'result key:', result[0]?.key);
return result;
}