mirror of
https://github.com/Kingsrook/qqq-frontend-material-dashboard.git
synced 2025-07-18 13:20:43 +00:00
CE-1180 Add joins to request for the record
This commit is contained in:
@ -129,6 +129,35 @@ export function renderSectionOfFields(key: string, fieldNames: string[], tableMe
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/***************************************************************************
|
||||||
|
**
|
||||||
|
***************************************************************************/
|
||||||
|
export function getVisibleJoinTables(tableMetaData: QTableMetaData): Set<string>
|
||||||
|
{
|
||||||
|
const visibleJoinTables = new Set<string>();
|
||||||
|
|
||||||
|
for (let i = 0; i < tableMetaData?.sections.length; i++)
|
||||||
|
{
|
||||||
|
const section = tableMetaData?.sections[i];
|
||||||
|
if (section.isHidden || !section.fieldNames || !section.fieldNames.length)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
section.fieldNames.forEach((fieldName) =>
|
||||||
|
{
|
||||||
|
const [field, tableForField] = TableUtils.getFieldAndTable(tableMetaData, fieldName);
|
||||||
|
if (tableForField && tableForField.name != tableMetaData.name)
|
||||||
|
{
|
||||||
|
visibleJoinTables.add(tableForField.name);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return (visibleJoinTables);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
** Record View Screen component.
|
** Record View Screen component.
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
@ -383,31 +412,6 @@ function RecordView({table, record: overrideRecord, launchProcess}: Props): JSX.
|
|||||||
reload();
|
reload();
|
||||||
}, [location.pathname, location.hash]);
|
}, [location.pathname, location.hash]);
|
||||||
|
|
||||||
const getVisibleJoinTables = (tableMetaData: QTableMetaData): Set<string> =>
|
|
||||||
{
|
|
||||||
const visibleJoinTables = new Set<string>();
|
|
||||||
|
|
||||||
for (let i = 0; i < tableMetaData?.sections.length; i++)
|
|
||||||
{
|
|
||||||
const section = tableMetaData?.sections[i];
|
|
||||||
if (section.isHidden || !section.fieldNames || !section.fieldNames.length)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
section.fieldNames.forEach((fieldName) =>
|
|
||||||
{
|
|
||||||
const [field, tableForField] = TableUtils.getFieldAndTable(tableMetaData, fieldName);
|
|
||||||
if (tableForField && tableForField.name != tableMetaData.name)
|
|
||||||
{
|
|
||||||
visibleJoinTables.add(tableForField.name);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return (visibleJoinTables);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
** get an element (or empty) to use as help content for a section
|
** get an element (or empty) to use as help content for a section
|
||||||
|
@ -25,11 +25,13 @@ import {QRecord} from "@kingsrook/qqq-frontend-core/lib/model/QRecord";
|
|||||||
import {QCriteriaOperator} from "@kingsrook/qqq-frontend-core/lib/model/query/QCriteriaOperator";
|
import {QCriteriaOperator} from "@kingsrook/qqq-frontend-core/lib/model/query/QCriteriaOperator";
|
||||||
import {QFilterCriteria} from "@kingsrook/qqq-frontend-core/lib/model/query/QFilterCriteria";
|
import {QFilterCriteria} from "@kingsrook/qqq-frontend-core/lib/model/query/QFilterCriteria";
|
||||||
import {QQueryFilter} from "@kingsrook/qqq-frontend-core/lib/model/query/QQueryFilter";
|
import {QQueryFilter} from "@kingsrook/qqq-frontend-core/lib/model/query/QQueryFilter";
|
||||||
|
import {QueryJoin} from "@kingsrook/qqq-frontend-core/lib/model/query/QueryJoin";
|
||||||
import {Alert, Box} from "@mui/material";
|
import {Alert, Box} from "@mui/material";
|
||||||
import Grid from "@mui/material/Grid";
|
import Grid from "@mui/material/Grid";
|
||||||
import BaseLayout from "qqq/layouts/BaseLayout";
|
import BaseLayout from "qqq/layouts/BaseLayout";
|
||||||
import RecordView from "qqq/pages/records/view/RecordView";
|
import RecordView, {getVisibleJoinTables} from "qqq/pages/records/view/RecordView";
|
||||||
import Client from "qqq/utils/qqq/Client";
|
import Client from "qqq/utils/qqq/Client";
|
||||||
|
import TableUtils from "qqq/utils/qqq/TableUtils";
|
||||||
import React, {useEffect, useState} from "react";
|
import React, {useEffect, useState} from "react";
|
||||||
import {useSearchParams} from "react-router-dom";
|
import {useSearchParams} from "react-router-dom";
|
||||||
|
|
||||||
@ -79,8 +81,15 @@ export default function RecordViewByUniqueKey({table}: RecordViewByUniqueKeyProp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let queryJoins: QueryJoin[] = null;
|
||||||
|
const visibleJoinTables = getVisibleJoinTables(tableMetaData);
|
||||||
|
if (visibleJoinTables.size > 0)
|
||||||
|
{
|
||||||
|
queryJoins = TableUtils.getQueryJoins(tableMetaData, visibleJoinTables);
|
||||||
|
}
|
||||||
|
|
||||||
const filter = new QQueryFilter(criteria, null, null, "AND", 0, 2);
|
const filter = new QQueryFilter(criteria, null, null, "AND", 0, 2);
|
||||||
qController.query(tableName, filter)
|
qController.query(tableName, filter, queryJoins)
|
||||||
.then((queryResult) =>
|
.then((queryResult) =>
|
||||||
{
|
{
|
||||||
setDoneLoading(true);
|
setDoneLoading(true);
|
||||||
|
Reference in New Issue
Block a user