Skip to content

DM-6909: Filtering from expanded mode cancels expanded mode #120

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.

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 2 commits into from
Jul 19, 2016

Conversation

loitly
Copy link
Contributor

@loitly loitly commented Jul 15, 2016

https://jira.lsstcorp.org/browse/DM-6909

  • fixed above ticket
  • added close ('x') button to table options and xyplot options
  • fixed table's fixed column's transparency issue

@tgoldina
Copy link
Contributor

The layout issues described in the ticket are fixed.

However, after some filtering and sorting, XYPlot, which relies on tableMeta.source to detect table changes, does not follow the table.

It seems that tableMeta.source is not always set to the sorted or filtered table location in ${temp_files}. Sometimes it erroneously points to the original table in ${perm_files}

Even if the request passed to the server does not have META_INFO.source, it is being set [incorrectly] somewhere in server code. Then JsonTableUtil.java lines 40-44 copies all meta from request. If source attribute happens to be in the request, it overwrites the correct source set in TableDef.

@@ -452,7 +452,8 @@ class ChartsPanel extends React.Component {
if (optionsShown) {
return (
<div className='ChartPanelOptions'>
<OptionsWrapper {...{chartId, tableModel, tblStatsData, tblPlotData, tblHistogramData, chartType}}/>
<OptionsWrapper toggleOptions={this.toggleOptions}
{...{chartId, tableModel, tblStatsData, tblPlotData, tblHistogramData, chartType}}/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am wondering if toggleOptions can be handled here.
Otherwise we need to propagate this prop to all options components (for now it included HistogramOptions) and handle situations when toggleOptions do not make sense, like in Charts dropdown.

@tgoldina
Copy link
Contributor

I am done with the review. The original issues for which this ticket was created are fixed.

There are two new bugs I noticed:

  1. x in Charts dropdown, when scatter plot is selected. It should not be there.
  2. table-chart sync problems, because source meta attribute does not always reflect the location of the source IPAC table in our workarea correctly.

The second issue was not introduced in this ticket. Please, feel free to create a separate ticket for it.

  - fix tableMeta.source not consistently updated.  'source' is now tblFilePath.
@tgoldina
Copy link
Contributor

I have tested the latest commit, and everything works as expected. Thank you. Ready to merge.

@loitly loitly merged commit 1a1cc76 into dev Jul 19, 2016
@loitly loitly deleted the DM-6909_table_bugs branch July 19, 2016 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants