Skip to content

IRSA-6431: Firefly tables in expanded mode was unable to switch tabs. #1661

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

Merged
merged 1 commit into from
Oct 24, 2024
Merged

IRSA-6431: Firefly tables in expanded mode was unable to switch tabs. #1661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/firefly/html/test/tests-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ <h4>use tbl.relatedCols to highlight related rows</h4>
const table2 = { tbl_id: 'table2', tableData: { columns, data } };
const table3 = { tbl_id: 'table3', tableData: { columns, data } };
firefly.showClientTable('single', table1);
firefly.showClientTable('single', table2);
firefly.showClientTable('tabs', table2);
firefly.showClientTable('tabs', table3);
[2,3].forEach(i => {
const {tbl_ui_id} = firefly.util.table.getTableUiByTblId("table"+i);
Expand Down
10 changes: 2 additions & 8 deletions src/firefly/js/tables/ui/TablesContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,17 @@ const logger = Logger('Tables').tag('TablesContainer');

export function TablesContainer(props) {
const {mode='both', closeable=true, tableOptions, style, expandedMode:xMode=false} = props;
let {tbl_group} = props;
const expandedMode = useStoreConnector(() => xMode || getExpandedMode() === LO_VIEW.tables);
const tbl_group = expandedMode && mode !== 'standard' ? TblUtil.getTblExpandedInfo().tbl_group : props.tbl_group;

const tables = useStoreConnector(() => TblUtil.getTableGroup(tbl_group)?.tables);
const active = useStoreConnector(() => TblUtil.getTableGroup(tbl_group)?.active);
const expandedMode = useStoreConnector(() => xMode || getExpandedMode() === LO_VIEW.tables);
useStoreConnector((lastTitles) => {// force a rerender if any title ui changes
const titles= getTblIdsByGroup().map( (tbl_id) => getTableUiByTblId(tbl_id)?.title);
if (!lastTitles) return titles;
return (union(titles,lastTitles).length === titles?.length) ? lastTitles : titles;
});

useEffect(() => {
if (expandedMode && mode !== 'standard') {
tbl_group = TblUtil.getTblExpandedInfo().tbl_group;
}
}, [expandedMode, mode]);

logger.debug('render... tbl_group: ' + tbl_group);

if (expandedMode) {
Expand Down