Skip to content

enhancement: Add Dynamic Business Entity APIs and Table Integration Support #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glitched-matrix44 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

enhancement: Add Dynamic Business Entity APIs and Table Integration Support #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1cd3f7
feat: add dynamic business entity list and show APIs
glitched-matrix44 Jun 15, 2026
00edb0a
Merge branch 'main' of https://github.com/iquesters/user-interface in…
glitched-matrix44 Jun 18, 2026
2724e79
Add business entity list API support for table schema generation
glitched-matrix44 Jun 18, 2026
309fbfa
Add dynamic business entity support and table integration
glitched-matrix44 Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
251 changes: 225 additions & 26 deletions public/js/form/form-block-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ async function setupFormBlock(formCol, formMeta) {
entityData = formData;
}

if (!entityData && formMeta.entity && entityUId) {
const getentityResponse = await getfetchEntityData(formMeta.entity, entityUId);
if (!entityData && entityUId) {
const getentityResponse = await getfetchEntityData(formMeta, entityUId);
entityData = getentityResponse?.data || null;
}

Expand Down Expand Up @@ -669,17 +669,28 @@ function sanitizeDomIdSegment(value) {
/**
* Fetch entity data from Laravel API with Sanctum token
*/
async function getfetchEntityData(entity,entityUId) {
function resolveFormApiPrefix(formMeta = {}) {
return formMeta.business_entity ? 'business-entity' : 'entity';
}

function resolveFormApiTarget(formMeta = {}) {
return formMeta.business_entity || formMeta.entity || null;
}

async function getfetchEntityData(formMeta, entityUId) {
try {
if (!entity || !entityUId) {
const target = resolveFormApiTarget(formMeta);
const prefix = resolveFormApiPrefix(formMeta);

if (!target || !entityUId) {
return { success: false, error: 'Missing entity or entity UID' };
}

if (typeof apiClient !== 'undefined' && apiClient) {
return await apiClient.get(`/api/entity/show/${entity}/${entityUId}`);
return await apiClient.get(`/api/${prefix}/show/${target}/${entityUId}`);
}

const res = await fetch(`/api/entity/show/${entity}/${entityUId}`, {
const res = await fetch(`/api/${prefix}/show/${target}/${entityUId}`, {
headers: {
'Accept': 'application/json',
'X-Requested-With': 'XMLHttpRequest'
Expand All @@ -704,24 +715,180 @@ async function getfetchEntityData(entity,entityUId) {
}

function resolveFieldValue(fieldId, formData, entityData) {
if (formData && Object.prototype.hasOwnProperty.call(formData, fieldId)) {
return formData[fieldId];
const resolvedFormData = entityData?.form_data || formData;
const normalizedFieldId = String(fieldId || '').trim();

if (!normalizedFieldId) {
return "";
}

if (resolvedFormData && Object.prototype.hasOwnProperty.call(resolvedFormData, normalizedFieldId)) {
return resolvedFormData[normalizedFieldId];
}

if (!entityData) {
return "";
}

if (Object.prototype.hasOwnProperty.call(entityData, fieldId)) {
return entityData[fieldId] ?? "";
if (Object.prototype.hasOwnProperty.call(entityData, normalizedFieldId)) {
return entityData[normalizedFieldId] ?? "";
}

const relationValue = resolveBusinessEntityFieldValue(entityData, normalizedFieldId);

if (relationValue !== undefined) {
return relationValue ?? "";
}

const primaryValue = resolvePrimaryBusinessEntityFieldValue(entityData, normalizedFieldId);
if (primaryValue !== undefined) {
return primaryValue ?? "";
}

const metaEntries = Array.isArray(entityData.meta) ? entityData.meta : [];
const metaItem = metaEntries.find((item) => item?.meta_key === fieldId);
const metaItem = metaEntries.find((item) => item?.meta_key === normalizedFieldId);

return metaItem ? (metaItem.meta_value ?? "") : "";
}

function resolveBusinessEntityDisplayValue(entityData, fieldId) {
const normalizedFieldId = String(fieldId || '').trim();

if (!normalizedFieldId || !entityData) {
return undefined;
}

const directValue = entityData?.[normalizedFieldId];
if (directValue !== undefined) {
return directValue;
}

const relationValue = resolveBusinessEntityFieldValue(entityData, normalizedFieldId);
if (relationValue !== undefined) {
return relationValue;
}

const primaryValue = resolvePrimaryBusinessEntityFieldValue(entityData, normalizedFieldId);
if (primaryValue !== undefined) {
return primaryValue;
}

return undefined;
}

function isBusinessEntityResponse(entityData) {
return Boolean(
entityData?.business_entity ||
entityData?.business_entity_name ||
entityData?.field_mapping?.primary_entity ||
entityData?.field_mapping?.entities
);
}

function resolveBusinessEntityPrimaryKey(entityData) {
return entityData?.field_mapping?.primary_entity
|| entityData?.business_entity_primary_entity
|| entityData?.field_mapping?.primary
|| entityData?.field_mapping?.primary_table
|| null;
}

function resolvePrimaryBusinessEntityFieldValue(entityData, fieldId) {
if (!fieldId) {
return undefined;
}

const normalizedFieldId = String(fieldId);
const primaryFieldKey = normalizedFieldId.split('_').slice(1).join('_') || normalizedFieldId;

if (!primaryFieldKey) {
return undefined;
}

if (Object.prototype.hasOwnProperty.call(entityData, primaryFieldKey)) {
return entityData[primaryFieldKey] ?? "";
}

const metaEntries = Array.isArray(entityData.meta) ? entityData.meta : [];
const metaItem = metaEntries.find((item) => item?.meta_key === primaryFieldKey);
if (metaItem) {
return metaItem.meta_value ?? "";
}

return undefined;
}

function resolveBusinessEntityFieldValue(entityData, fieldId) {
if (!entityData || !fieldId) {
return undefined;
}

const segments = String(fieldId).split('_');

for (let i = segments.length - 1; i >= 1; i--) {
const relationKey = segments.slice(0, i).join('_');
const leafKey = segments.slice(i).join('_');
const relationValue = entityData?.[relationKey];

if (!relationValue) {
continue;
}

if (Array.isArray(relationValue)) {
const match = relationValue.find((item) => item && typeof item === 'object' && Object.prototype.hasOwnProperty.call(item, leafKey));
if (match) {
return match[leafKey] ?? "";
}

const firstItem = relationValue.find((item) => item && typeof item === 'object');
if (firstItem && Object.prototype.hasOwnProperty.call(firstItem, leafKey)) {
return firstItem[leafKey] ?? "";
}
}

if (relationValue && typeof relationValue === 'object') {
if (Object.prototype.hasOwnProperty.call(relationValue, leafKey)) {
return relationValue[leafKey] ?? "";
}

if (Array.isArray(relationValue.meta)) {
const metaItem = relationValue.meta.find((item) => item?.meta_key === leafKey);
if (metaItem) {
return metaItem.meta_value ?? "";
}
}
}
}

return undefined;
}

function resolveBusinessEntityFormValue(entityData, fieldId) {
const normalizedFieldId = String(fieldId || '').trim();

if (!normalizedFieldId || !entityData) {
return undefined;
}

if (Object.prototype.hasOwnProperty.call(entityData, normalizedFieldId)) {
return entityData[normalizedFieldId] ?? "";
}

const relationValue = resolveBusinessEntityFieldValue(entityData, normalizedFieldId);
if (relationValue !== undefined) {
return relationValue ?? "";
}

const primaryValue = resolvePrimaryBusinessEntityFieldValue(entityData, normalizedFieldId);
if (primaryValue !== undefined) {
return primaryValue ?? "";
}

const metaEntries = Array.isArray(entityData.meta) ? entityData.meta : [];
const metaItem = metaEntries.find((item) => item?.meta_key === normalizedFieldId);
return metaItem ? (metaItem.meta_value ?? "") : undefined;
}

/**
*
* Render fetched entity data into form fields
Expand All @@ -731,28 +898,60 @@ async function renderEntityDataToForm(formSelector, entityResponse) {
? document.querySelector(formSelector)
: formSelector;
const entityData = entityResponse || null;
const formData = entityData?.form_data || null;
const formMeta = form?.__formMeta || {};
const isBusinessEntityForm = Boolean(formMeta.business_entity);

if (!form || !entityData) return;

for (const [key, value] of Object.entries(entityData)) {
const escapedKey = typeof CSS !== 'undefined' && typeof CSS.escape === 'function'
? CSS.escape(key)
: key.replace(/"/g, '\\"');
const field = form.querySelector(`#${escapedKey}, [name="${escapedKey}"]`);
const readOnlyField = form.querySelector(`[data-field-id="${escapedKey}"]`);
const fieldNodes = Array.from(form.querySelectorAll('input[name], textarea[name], select[name]'));
fieldNodes.forEach((fieldNode) => {
const fieldName = fieldNode.name || fieldNode.id;
if (!fieldName) {
return;
}

if (field) {
if (field.type === 'checkbox') {
field.checked = Boolean(Number(value)) || value === true || value === '1';
} else {
field.value = value ?? "";
}
if (fieldNode.value && fieldNode.value !== '' && fieldNode.value !== 'Enter ' + fieldName.toLowerCase()) {
return;
}

if (readOnlyField) {
readOnlyField.textContent = value ?? "—";
const directValue = formData?.[fieldName] ?? entityData?.[fieldName];
const relationValue = isBusinessEntityForm
? resolveBusinessEntityFormValue(entityData, fieldName)
: resolveBusinessEntityFieldValue(entityData, fieldName);
const metaEntries = Array.isArray(entityData.meta) ? entityData.meta : [];
const metaValue = metaEntries.find((item) => item?.meta_key === fieldName)?.meta_value;
const resolvedValue = directValue ?? relationValue ?? metaValue;

if (resolvedValue === undefined || resolvedValue === null || resolvedValue === '') {
return;
}
}

if (fieldNode.type === 'checkbox') {
fieldNode.checked = Boolean(Number(resolvedValue)) || resolvedValue === true || resolvedValue === '1';
} else {
fieldNode.value = resolvedValue;
}
});

const readOnlyNodes = Array.from(form.querySelectorAll('[data-field-id]'));
readOnlyNodes.forEach((readOnlyNode) => {
const fieldId = readOnlyNode.dataset.fieldId;
if (!fieldId) {
return;
}

const resolvedValue =
formData?.[fieldId] ??
entityData?.[fieldId] ??
(isBusinessEntityForm ? resolveBusinessEntityFormValue(entityData, fieldId) : resolveBusinessEntityFieldValue(entityData, fieldId));

if (resolvedValue === undefined || resolvedValue === null || resolvedValue === '') {
return;
}

readOnlyNode.textContent = resolvedValue;
});

const metaEntries = Array.isArray(entityData.meta) ? entityData.meta : [];
metaEntries.forEach((item) => {
Expand Down
25 changes: 18 additions & 7 deletions public/js/form/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,25 +728,27 @@ async function renderFormForModal(formElement, formMeta) {

const entityUId = formElement.dataset.entityUid;
let entityData = formElement.__entityDataCache || null;
let formDataFromSchema = null;

if (!entityData && formData && typeof formData === 'object' && !Array.isArray(formData)) {
entityData = formData;
}

if (!entityData && formMeta.entity && entityUId) {
const getentityResponse = await getfetchEntityData(formMeta.entity, entityUId);
if (!entityData && entityUId) {
const getentityResponse = await getfetchEntityData(formMeta, entityUId);
entityData = getentityResponse?.data || null;
}

if (entityData) {
formDataFromSchema = entityData.form_data || null;
formElement.__entityDataCache = entityData;
}

if (Array.isArray(formMeta.fields)) {
formMeta.fields.forEach((field, index) => {
field._renderIndex = index;
field._domId = buildFieldDomId(formMeta, field, index);
field.value = resolveFieldValue(field.id, formData, entityData);
field.value = resolveFieldValue(field.id, formDataFromSchema || formData, entityData);
addField(field, formElement, formMeta);
});
}
Expand Down Expand Up @@ -1199,25 +1201,34 @@ function resolveDynamicFormMethod(formMeta, form) {
}

function resolveDynamicFormEndpoint(formMeta, form, method) {
const apiPrefix = formMeta.business_entity ? 'business-entity' : 'entity';
const apiTarget = formMeta.business_entity || formMeta.entity || null;

if (formMeta.endpoint) {
if (formMeta.business_entity) {
return String(formMeta.endpoint)
.replace('/api/entity/', '/api/business-entity/')
.replace('/api/entity', '/api/business-entity');
}

return formMeta.endpoint;
}

if (!formMeta.entity) {
if (!apiTarget) {
return null;
}

const entityUid = form.dataset.entityUid;

if ((method === 'PUT' || method === 'PATCH') && entityUid) {
return `/api/entity/update/${formMeta.entity}/${entityUid}`;
return `/api/${apiPrefix}/update/${apiTarget}/${entityUid}`;
}

if (method === 'DELETE' && entityUid) {
return `/api/entity/delete/${formMeta.entity}/${entityUid}`;
return `/api/${apiPrefix}/delete/${apiTarget}/${entityUid}`;
}

return `/api/entity/store/${formMeta.entity}`;
return `/api/${apiPrefix}/store/${apiTarget}`;
}

function serializeDynamicFormPayload(form, formMeta) {
Expand Down
1 change: 1 addition & 0 deletions public/js/table/table-constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const DETAIL_RENDER_MODE_FORM = 'form';

const TABLE_COMPONENT_LAB_FORM = 'userinterface::components.lab-form';
const TABLE_API_ENTITY_LIST_PREFIX = '/api/entity/list/';
const TABLE_API_BUSINESS_ENTITY_LIST_PREFIX = '/api/business-entity/list/';
const TABLE_API_COMPONENT_TEMPLATE_PREFIX = '/api/components/templates/';

const TABLE_SELECTOR_LAB_TABLE = '.lab-table';
Expand Down
Loading