Skip to content
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

Jump to bottom

Hotfix - APP - Se duplican tablas en el modo árbol - SDA#180 #181

Merged
merged 2 commits into from
Jul 10, 2024
Merged

Hotfix - APP - Se duplican tablas en el modo árbol - SDA#180 #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83f765d
issue tabla duplicadas al inicio y corrección del despliegue de solo …
ronaldchavezjortilles Jul 8, 2024
1e7311f
ordenamiento de las tablas generadas nuevamente
ronaldchavezjortilles Jul 9, 2024
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
16 changes: 10 additions & 6 deletions ...c/app/module/components/eda-panels/eda-blank-panel/panel-utils/panel-interaction-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,17 @@ export const PanelInteractionUtils = {
const rootTable = idTables.find((idTable: string) => ebp.rootTable?.table_name == idTable);

if (rootTable) {
const dataSource = ebp.inject.dataSource.model.tables;


// Tablas visibles para el usuario. Visibles una vez aplicada la seguridad
const visibleTables = ebp.inject.dataSource.model.tables.filter( t => t.visible == true);
const visibleTableNames = visibleTables.map( t=> t.table_name );
ebp.tableNodes = [];

const table = dataSource.find((source) => source.table_name == rootTable);
const table = visibleTables.find((source) => source.table_name == rootTable);

if (table) {
let isexpandible = table.relations.length > 0;
table.relations = table.relations.filter( r=> visibleTableNames.includes( r.target_table ) );

const isexpandible = table.relations.length > 0;

let node: any = {
label: table.display_name.default,
Expand Down Expand Up @@ -740,7 +743,8 @@ export const PanelInteractionUtils = {
// Buscar relacións per tornar a mostrar totes les taules
if (ebp.currentQuery.length === 0 && ebp.filtredColumns.length === 0) {
ebp.rootTable = undefined;
ebp.tablesToShow = ebp.tables;
ebp.tablesToShow = ebp.inject.dataSource.model.tables.filter( t => t.visible == true);
ebp.tablesToShow.sort((a, b) => (a.display_name.default > b.display_name.default) ? 1 : ((b.display_name.default > a.display_name.default) ? -1 : 0));

} else {
_.map(ebp.currentQuery, selected => selected.table_id === c.table_id);
Expand Down