Skip to content

Dm 9164 add lc help links #317

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 4 commits into from
Feb 27, 2017
Merged

Dm 9164 add lc help links #317

merged 4 commits into from
Feb 27, 2017

Conversation

ejoliet
Copy link
Contributor

@ejoliet ejoliet commented Feb 24, 2017

I've added the help links as discussed during the review. Luisa has been writing the docs that can be found in the wiki. See ticket in JIRA.

To test, checkout and build the branch. Then go to .../firefly/ts.html.

@ejoliet ejoliet requested review from robyww, xiuqin and wmiipac February 24, 2017 03:21
@@ -268,7 +272,7 @@ class PeriodogramOptionsBox extends Component {
</button>
<br/>
<div style={{marginTop: 10}}>
{'Leave the fields blank to use default values.'} <HelpIcon helpId={'periodogram.options'}/>
{'Leave the fields blank to use default values.'} <HelpIcon helpId={'findpTSV.pgramresults'}/>
Copy link
Contributor

Choose a reason for hiding this comment

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

this icon position could be adjusted to the lower right corner of the option panel, or line up with the "Periodogram Calculation" button

Copy link
Contributor

@loitly loitly left a comment

Choose a reason for hiding this comment

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

I approve this pull request. It works fine and the help icons appear where it should be.
However, in my opinion, some of the help icons are poorly placed. If time permit, I suggest fixing TableContainer as well.

@@ -143,9 +143,9 @@ export function getDefaultXYPlotOptions(tbl_id) {
* @param {string} params.tblId - table id
* @param {Function} [params.dispatcher=flux.process] - only for special dispatching uses such as remote
*/
export function loadXYPlot({chartId, xyPlotParams, tblId, dispatcher=flux.process}) {
export function loadXYPlot({chartId, xyPlotParams, help_id, tblId, dispatcher=flux.process}) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Parameter help_id added without updating jsdoc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will add it before merging. Good point!

@@ -37,13 +37,14 @@ export class TablesContainer extends Component {
}

nextState(props) {
var {mode, tbl_group, closeable} = props;
var {mode, tbl_group, closeable, tableOptions} = props;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it should take help_id similar to other components, not tableOptions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, i add it this way because you could add height, width, etc to it also.

} else {
return (
<Tabs defaultSelected={activeIdx} onTabSelect={onTabSelect} resizable={true}>
{tablesAsTab(tables, expandedMode)}
{tablesAsTab(tables, tableOptions, expandedMode)}
Copy link
Contributor

Choose a reason for hiding this comment

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

help_id can be passed on to TabPanel, which should also take help_id.

@@ -203,7 +203,7 @@ function updatePhaseTableChart(flux) {
x: {columnOrExpr: LC.PHASE_CNAME, options: 'grid'},
y: {columnOrExpr: flux, options: 'grid,flip'}
};
loadXYPlot({chartId: LC.PHASE_FOLDED, tblId: LC.PHASE_FOLDED, xyPlotParams});
loadXYPlot({chartId: LC.PHASE_FOLDED, tblId: LC.PHASE_FOLDED, xyPlotParams, help_id: 'main1TSV.plot'});
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of passing the same help_id into the individual chart, it should be passed into ChartContainer.
Although in this case, it may appear the same.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This would require a major refactoring. Chart is expecting the help_id from the dispatcher. We can talk to @tgoldina and make a separate ticket for the future.

Copy link
Contributor

@robyww robyww left a comment

Choose a reason for hiding this comment

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

I asked @loitly to look at this pull request since he has more experience with help. I would like to talk to you about UI layout and suggest some clean up.

@loitly
Copy link
Contributor

loitly commented Feb 27, 2017

The new placement of the help icons looks much better. Thanks for the fix.

@ejoliet ejoliet merged commit 456f33e into dev Feb 27, 2017
@ejoliet ejoliet deleted the DM-9164-add-lc-help-links branch February 27, 2017 19:27
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.

4 participants