The Wayback Machine - https://web.archive.org/web/20201120180234/https://github.com/grafana/grafana/pull/27997
Skip to content

/ grafana

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

Jump to bottom

Migration: TestData Query Editor #27997

Merged
merged 45 commits into from Oct 14, 2020
Merged

Migration: TestData Query Editor #27997

merged 45 commits into from Oct 14, 2020

Conversation

@Clarity-89
Copy link
Contributor

@Clarity-89 Clarity-89 commented Oct 2, 2020

What this PR does / why we need it:

  • Migrate TestData Query Editor to React
  • Use new Inline form components
  • Minor UI updates

Screenshots:
Screenshot 2020-10-02 at 13 53 03
Screenshot 2020-10-02 at 13 32 22
Screenshot 2020-10-02 at 13 32 44

(Wide screen)
Screenshot 2020-10-02 at 13 33 13

Which issue(s) this PR fixes:

Fixes #27526

Special notes for your reviewer:

There is an error in console when adding new point via Manual Entry, which happens because the datapoints value is null. Couldn't get to the bottom of it. It also happens in production, with the old editor.
Screenshot 2020-10-02 at 13 30 32
Clarity-89 added 30 commits Sep 15, 2020
@Clarity-89
Use new editor
8494477
@Clarity-89
Add basic fields
7ed19e6
@Clarity-89
Add labels
b5a964a
@Clarity-89
Add ids
77a22e9
@Clarity-89
Add ManualEntryEditor
73904f6
@Clarity-89
Use tooltip prop
96fee1b
@Clarity-89
Merge branch 'master' into migraton/test-data-q-editor
1401bd7 
# Conflicts:
#	public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
@Clarity-89
Switch to inline labels
b295532
@Clarity-89
Fix inline label tooltip position
9c1e424
@Clarity-89
Merge branch 'grafana-ui/fix-forms' into migraton/test-data-q-editor
bf30be0
@Clarity-89
Allow resetting max-width
Loading status checks…
ce88e29
@Clarity-89
Merge branch 'grafana-ui/fix-forms' into migraton/test-data-q-editor
9ca79fc
@Clarity-89
Replace form inputs
207988f
@Clarity-89
Add random walk editor
be7fbe6
@Clarity-89
separate editors
f89c435
@Clarity-89
Merge branch 'master' into migraton/test-data-q-editor
e97e60e
@Clarity-89
Add logs and endpoints fields
6d81587
@Clarity-89
Add PredictablePulseEditor
8cd3bc5
@Clarity-89
Add CSVWaveEditor
0c43ee0
@Clarity-89
Add grow prop
e687269
@Clarity-89
Add default query
80bb323
@Clarity-89
Fix types
348b02f
@Clarity-89
Fix manual editor
ad59ad8
@Clarity-89
Fix type issues
d9cdacf
@Clarity-89
Handle scenario change
bf32461
@Clarity-89
Sort scenarios by label
66e5679
@Clarity-89
Add ManualEditor test
77a0e7e
@Clarity-89
Fix label height
0ca0f3f
@Clarity-89
test manual editor
b097bdc
@Clarity-89
Update test
9ccc203
Clarity-89 added 5 commits Oct 2, 2020
@Clarity-89
Fix random walk editor
9704598
@Clarity-89
Cleanup
5c84c82
@Clarity-89
Convert scenarios to ts
e23ef28
@Clarity-89
Remove extra icon styles
a0778a0
@Clarity-89
Minor tweaks
Loading status checks…
88e2baa
@Clarity-89 Clarity-89 added this to the 7.3 milestone Oct 2, 2020
@Clarity-89 Clarity-89 requested a review from torkelo Oct 2, 2020
@Clarity-89 Clarity-89 requested a review from grafana/grafana-frontend-platform as a code owner Oct 2, 2020
@Clarity-89 Clarity-89 self-assigned this Oct 2, 2020
@Clarity-89 Clarity-89 requested review from kaydelaney, peterholmberg, dprokop and hugohaggmark and removed request for grafana/grafana-frontend-platform Oct 2, 2020
@torkelo
Copy link
Member

@torkelo torkelo commented Oct 3, 2020

Awesome job! Will take if for test spin later
@Clarity-89
Copy link
Contributor Author

@Clarity-89 Clarity-89 commented Oct 5, 2020

Noticed that a few e2e tests got broken because of the new Select, which cannot be selected by cypress. @hugohaggmark do you know if we have any way to test our Select in e2e tests?
@hugohaggmark
Copy link
Member

@hugohaggmark hugohaggmark commented Oct 5, 2020

Noticed that a few e2e tests got broken because of the new Select, which cannot be selected by cypress. @hugohaggmark do you know if we have any way to test our Select in e2e tests?

I think I've added some aria-label for the Select, check where this is used by e2e

grafana/packages/grafana-e2e-selectors/src/selectors/components.ts

Line 129 in 0ffd9a9

option: 'Select option',
@Clarity-89
Copy link
Contributor Author

@Clarity-89 Clarity-89 commented Oct 5, 2020

Noticed that a few e2e tests got broken because of the new Select, which cannot be selected by cypress. @hugohaggmark do you know if we have any way to test our Select in e2e tests?

I think I've added some aria-label for the Select, check where this is used by e2e

grafana/packages/grafana-e2e-selectors/src/selectors/components.ts

Line 129 in 0ffd9a9

option: 'Select option',

Thank you! I'll check it out.
Clarity-89 added 6 commits Oct 5, 2020
@Clarity-89
Update e2e tests
Loading status checks…
bed88c9
@Clarity-89
Merge branch 'master' into migraton/test-data-q-editor
3264198
@Clarity-89
Remove useEffect
Loading status checks…
0db13aa
@Clarity-89
Add missing aria-labels
Loading status checks…
2ef56af
@Clarity-89
Merge branch 'master' into migraton/test-data-q-editor
6af1c4b
@Clarity-89
Use new button components
Loading status checks…
4fcd1f4
@torkelo
torkelo approved these changes Oct 14, 2020
View changes
Copy link
Member

@torkelo torkelo left a comment

Looks good, awesome job!
@Clarity-89 Clarity-89 merged commit 3225b11 into master Oct 14, 2020
6 checks passed
6 checks passed
Analyze (javascript)
Details
Analyze (go)
Details
Analyze (python)
Details
CodeQL No new alerts
Details
continuous-integration/drone/pr Build is passing
Details
license/cla Contributor License Agreement is signed.
Details
@Clarity-89 Clarity-89 deleted the migraton/test-data-q-editor branch Oct 14, 2020
ryantxu added a commit that referenced this pull request Nov 18, 2020
@Clarity-89 @ryantxu
Migration: TestData Query Editor (#27997)
356459e 
* Use new editor

* Add basic fields

* Add labels

* Add ids

* Add ManualEntryEditor

* Use tooltip prop

* Switch to inline labels

* Fix inline label tooltip position

* Allow resetting max-width

* Replace form inputs

* Add random walk editor

* separate editors

* Add logs and endpoints fields

* Add PredictablePulseEditor

* Add CSVWaveEditor

* Add grow prop

* Add default query

* Fix types

* Fix manual editor

* Fix type issues

* Handle scenario change

* Sort scenarios by label

* Add ManualEditor test

* Fix label height

* test manual editor

* Update test

* Setup QueryEditor tests

* Fix selected value

* Connect CSVWaveEditor

* Convert stream data to numbers

* Fix random walk editor

* Cleanup

* Convert scenarios to ts

* Remove extra icon styles

* Minor tweaks

* Update e2e tests

* Remove useEffect

* Add missing aria-labels

* Use new button components
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torkelo torkelo

@kaydelaney kaydelaney

@peterholmberg peterholmberg

@dprokop dprokop

@hugohaggmark hugohaggmark

Assignees

@Clarity-89 Clarity-89

Labels
type/angular-2-react
Projects
None yet
Milestone
7.3.0-beta1
Linked issues

Successfully merging this pull request may close these issues.

TestData: Migrate TestData Query Editor to react
3 participants
@Clarity-89 @torkelo @hugohaggmark
You can’t perform that action at this time.