test components for charting in apps #1878
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
labkey-danield
approved these changes
Apr 6, 2024
| { | ||
| return elementCache().reactSelectByLabel("Y Axis").getValue(); | ||
| } | ||
|
|
There was a problem hiding this comment.
Wouldn't it be useful to have a getSelectionOptions for XAxis, YAxis & GroupBy? It seems like there should be a test that validates the correct fields/columns are returned for the options.
There was a problem hiding this comment.
Yes, those are probably going to be useful to have. I'll implement them here while we're thinking about it
Comment on lines
136
to
145
| public QueryChartDialog setChartType(CHART_TYPE chartType) | ||
| { | ||
| elementCache().selectChartType(chartType); | ||
| return this; | ||
| } | ||
|
|
||
| public CHART_TYPE getSelectedChartType() | ||
| { | ||
| return elementCache().getSelectedChartType(); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public QueryChartDialog setChartType(CHART_TYPE chartType) | |
| { | |
| elementCache().selectChartType(chartType); | |
| return this; | |
| } | |
| public CHART_TYPE getSelectedChartType() | |
| { | |
| return elementCache().getSelectedChartType(); | |
| } | |
| public QueryChartDialog setChartType(CHART_TYPE chartType) | |
| { | |
| if (getSelectedChartType().equals(chartType)) | |
| return this; | |
| // note: selecting a chart type will cause most select fields to go stale | |
| var el = elementCache().chartBuilderType.withAttribute("data-name", chartType.getChartType()) | |
| .waitForElement(this, 1500); | |
| getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable(el)); | |
| el.click(); | |
| WebDriverWrapper.waitFor(()-> getSelectedChartType().equals(chartType), | |
| "The requested chart type did not become selected", 2000); | |
| return this; | |
| } | |
| public CHART_TYPE getSelectedChartType() | |
| { | |
| var selectedEl = elementCache().chartBuilderType.withAttributeContaining("class", "selected") | |
| .waitForElement(this, 1500); | |
| String dataName = selectedEl.getAttribute("data-name"); | |
| return CHART_TYPE.fromChartType(dataName); | |
| } |
There was a problem hiding this comment.
This would clean up the elementCache and remove the methods that aren't really elements on the dialog.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale
We have added the ability (in biologics, with an experimental feature) to compose, edit, and delete charts on queryGrids. This change adds and updates classes necessary to interact with new UI in the apps.
The new Dialog
QueryChartDialogsupports create and edit of charts, and could (if we think that's a good idea) be refactored into 2 dialog classes that would only have methods related to buttons of the dialog in that mode. Here it is in create mode:and in edit mode:
Because we've introduced the ability to add, edit, save, and delete charts in the apps, I've taken the liberty of creating a new component, QueryChartPanel (which contains the chart in the QueryGrid when charts or reports are shown) to surface the ability to find the chart's svg, to click to edit the chart, and to close the chart view- it's highlit in red, here:
Related Pull Requests
https://github.com/LabKey/limsModules/pull/105 <- contains test coverage using new/changed components in this PR
Changes
QueryChartDialogQueryGrid,QueryChartPanel(which provides the means to get the edit dialog, to dismiss the chart when it is shown, to find the chart/report)