Skip to content
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

Jump to bottom

Explore: Adds support for toggling raw query mode in explore #17870

Merged
merged 2 commits into from
Jul 3, 2019
Merged

Explore: Adds support for toggling raw query mode in explore #17870

merged 2 commits into from
Jul 3, 2019

Conversation

kaydelaney
Copy link
Contributor

What this PR does / why we need it:

  • Adds support for toggling text edit mode in explore for supported data sources.
  • Also modifies query-row-status css to use relative position instead of absolute position so that it doesn't need to be modified when another button is added to <QueryRow />, for example.

Which issue(s) this PR fixes:
Closes #16770

@kaydelaney
Explore: Adds support for toggling text edit mode in explore
c4287c4 
Also modifies query-row-status css to use relative position instead of absolute
Closes #16770
@kaydelaney kaydelaney added this to the 6.3.0-beta1 milestone Jul 2, 2019
@kaydelaney kaydelaney requested a review from marefr July 2, 2019 14:21
@kaydelaney kaydelaney self-assigned this Jul 2, 2019
@marefr marefr requested a review from torkelo July 3, 2019 11:55
torkelo
torkelo approved these changes Jul 3, 2019
View reviewed changes
Copy link
Member

@torkelo torkelo left a comment

Choose a reason for hiding this comment

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

looks ok, just 2 minor things that can be improved, like inline type and unnecessary constructor, after that merge!

public/app/features/explore/QueryRow.tsx Outdated Show resolved Hide resolved
public/app/features/explore/QueryRow.tsx Outdated Show resolved Hide resolved
@kaydelaney kaydelaney requested a review from torkelo July 3, 2019 12:14
@kaydelaney kaydelaney merged commit 98147fd into master Jul 3, 2019
@kaydelaney kaydelaney deleted the issue-16770 branch July 3, 2019 14:42
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into package-scss
67a136e 
* grafana/master:
  Explore: Adds support for toggling text edit mode in explore (grafana#17870)
  LDAP: Divide the requests (grafana#17885)
  Build: fixes missing shebang in release tagging script. (grafana#17894)
  Teams: show proper label for each auth provider (grafana#17860)
  Logging: Login and Logout logging actions (grafana#17760) (grafana#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (grafana#17872)
  Explore: Query rows are now reset when changing data sources (grafana#17865)
  Codestyle: add guidelines for removing the m alias for models (grafana#17890)
  Docs: How to work with themes (grafana#17876)
  Docs: Fix developing plugins index page (grafana#17877)
  StatsPicker: Fix multiple value input layout etc. (grafana#17827)
  Chore: Build grafana-cli when running bra run (grafana#17788)
  Build: use golangci-lint as a make command (grafana#17739)
  Explore: Log highlights only update when user stops typing (grafana#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (grafana#17852)
  Docs upgrading deps (grafana#17657)
  Testing: Include BatchRevoke for all tokens in the fake. (grafana#17728)
@marefr marefr changed the title Explore: Adds support for toggling text edit mode in explore Explore: Adds support for toggling raw query mode in explore Jul 3, 2019
ryantxu added a commit that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'origin/master' into gtl/webpack
c262af6 
* origin/master: (29 commits)
  Explore: Adds orgId to URL for sharing purposes (#17895)
  grafana/toolkit: copy sass files (#17888)
  ChangePassword: Rewrite change password page to react (#17811)
  AngularPanels: Fixed loading state indication for angular panels (#17900)
  Explore: Adds support for toggling text edit mode in explore (#17870)
  LDAP: Divide the requests (#17885)
  Build: fixes missing shebang in release tagging script. (#17894)
  Teams: show proper label for each auth provider (#17860)
  Logging: Login and Logout logging actions (#17760) (#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (#17872)
  Explore: Query rows are now reset when changing data sources (#17865)
  Codestyle: add guidelines for removing the m alias for models (#17890)
  Docs: How to work with themes (#17876)
  Docs: Fix developing plugins index page (#17877)
  StatsPicker: Fix multiple value input layout etc. (#17827)
  Chore: Build grafana-cli when running bra run (#17788)
  Build: use golangci-lint as a make command (#17739)
  Explore: Log highlights only update when user stops typing (#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (#17852)
  Docs upgrading deps (#17657)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into anno-regions
e673893 
* grafana/master: (22 commits)
  grafana/toolkit: bundle plugins with webpack (grafana#17850)
  Explore: Adds orgId to URL for sharing purposes (grafana#17895)
  grafana/toolkit: copy sass files (grafana#17888)
  ChangePassword: Rewrite change password page to react (grafana#17811)
  AngularPanels: Fixed loading state indication for angular panels (grafana#17900)
  Explore: Adds support for toggling text edit mode in explore (grafana#17870)
  LDAP: Divide the requests (grafana#17885)
  Build: fixes missing shebang in release tagging script. (grafana#17894)
  Teams: show proper label for each auth provider (grafana#17860)
  Logging: Login and Logout logging actions (grafana#17760) (grafana#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (grafana#17872)
  Explore: Query rows are now reset when changing data sources (grafana#17865)
  Codestyle: add guidelines for removing the m alias for models (grafana#17890)
  Docs: How to work with themes (grafana#17876)
  Docs: Fix developing plugins index page (grafana#17877)
  StatsPicker: Fix multiple value input layout etc. (grafana#17827)
  Chore: Build grafana-cli when running bra run (grafana#17788)
  Build: use golangci-lint as a make command (grafana#17739)
  Explore: Log highlights only update when user stops typing (grafana#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (grafana#17852)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into anno-panel
ac3a02c 
* grafana/master: (22 commits)
  grafana/toolkit: bundle plugins with webpack (grafana#17850)
  Explore: Adds orgId to URL for sharing purposes (grafana#17895)
  grafana/toolkit: copy sass files (grafana#17888)
  ChangePassword: Rewrite change password page to react (grafana#17811)
  AngularPanels: Fixed loading state indication for angular panels (grafana#17900)
  Explore: Adds support for toggling text edit mode in explore (grafana#17870)
  LDAP: Divide the requests (grafana#17885)
  Build: fixes missing shebang in release tagging script. (grafana#17894)
  Teams: show proper label for each auth provider (grafana#17860)
  Logging: Login and Logout logging actions (grafana#17760) (grafana#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (grafana#17872)
  Explore: Query rows are now reset when changing data sources (grafana#17865)
  Codestyle: add guidelines for removing the m alias for models (grafana#17890)
  Docs: How to work with themes (grafana#17876)
  Docs: Fix developing plugins index page (grafana#17877)
  StatsPicker: Fix multiple value input layout etc. (grafana#17827)
  Chore: Build grafana-cli when running bra run (grafana#17788)
  Build: use golangci-lint as a make command (grafana#17739)
  Explore: Log highlights only update when user stops typing (grafana#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (grafana#17852)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into extensions
7a0d223 
* grafana/master: (22 commits)
  grafana/toolkit: bundle plugins with webpack (grafana#17850)
  Explore: Adds orgId to URL for sharing purposes (grafana#17895)
  grafana/toolkit: copy sass files (grafana#17888)
  ChangePassword: Rewrite change password page to react (grafana#17811)
  AngularPanels: Fixed loading state indication for angular panels (grafana#17900)
  Explore: Adds support for toggling text edit mode in explore (grafana#17870)
  LDAP: Divide the requests (grafana#17885)
  Build: fixes missing shebang in release tagging script. (grafana#17894)
  Teams: show proper label for each auth provider (grafana#17860)
  Logging: Login and Logout logging actions (grafana#17760) (grafana#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (grafana#17872)
  Explore: Query rows are now reset when changing data sources (grafana#17865)
  Codestyle: add guidelines for removing the m alias for models (grafana#17890)
  Docs: How to work with themes (grafana#17876)
  Docs: Fix developing plugins index page (grafana#17877)
  StatsPicker: Fix multiple value input layout etc. (grafana#17827)
  Chore: Build grafana-cli when running bra run (grafana#17788)
  Build: use golangci-lint as a make command (grafana#17739)
  Explore: Log highlights only update when user stops typing (grafana#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (grafana#17852)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into move-threshold-and…
5b5c7dc 
…-mapping-to-field

* grafana/master: (22 commits)
  grafana/toolkit: bundle plugins with webpack (grafana#17850)
  Explore: Adds orgId to URL for sharing purposes (grafana#17895)
  grafana/toolkit: copy sass files (grafana#17888)
  ChangePassword: Rewrite change password page to react (grafana#17811)
  AngularPanels: Fixed loading state indication for angular panels (grafana#17900)
  Explore: Adds support for toggling text edit mode in explore (grafana#17870)
  LDAP: Divide the requests (grafana#17885)
  Build: fixes missing shebang in release tagging script. (grafana#17894)
  Teams: show proper label for each auth provider (grafana#17860)
  Logging: Login and Logout logging actions (grafana#17760) (grafana#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (grafana#17872)
  Explore: Query rows are now reset when changing data sources (grafana#17865)
  Codestyle: add guidelines for removing the m alias for models (grafana#17890)
  Docs: How to work with themes (grafana#17876)
  Docs: Fix developing plugins index page (grafana#17877)
  StatsPicker: Fix multiple value input layout etc. (grafana#17827)
  Chore: Build grafana-cli when running bra run (grafana#17788)
  Build: use golangci-lint as a make command (grafana#17739)
  Explore: Log highlights only update when user stops typing (grafana#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (grafana#17852)
  ...
ryantxu added a commit to ryantxu/grafana that referenced this pull request Jul 3, 2019
@ryantxu
Merge remote-tracking branch 'grafana/master' into reuse-query2
5e4ec96 
* grafana/master: (22 commits)
  grafana/toolkit: bundle plugins with webpack (grafana#17850)
  Explore: Adds orgId to URL for sharing purposes (grafana#17895)
  grafana/toolkit: copy sass files (grafana#17888)
  ChangePassword: Rewrite change password page to react (grafana#17811)
  AngularPanels: Fixed loading state indication for angular panels (grafana#17900)
  Explore: Adds support for toggling text edit mode in explore (grafana#17870)
  LDAP: Divide the requests (grafana#17885)
  Build: fixes missing shebang in release tagging script. (grafana#17894)
  Teams: show proper label for each auth provider (grafana#17860)
  Logging: Login and Logout logging actions (grafana#17760) (grafana#17883)
  Loki: Adds comment explaining usage of RFC3339Nano string (grafana#17872)
  Explore: Query rows are now reset when changing data sources (grafana#17865)
  Codestyle: add guidelines for removing the m alias for models (grafana#17890)
  Docs: How to work with themes (grafana#17876)
  Docs: Fix developing plugins index page (grafana#17877)
  StatsPicker: Fix multiple value input layout etc. (grafana#17827)
  Chore: Build grafana-cli when running bra run (grafana#17788)
  Build: use golangci-lint as a make command (grafana#17739)
  Explore: Log highlights only update when user stops typing (grafana#17845)
  Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (grafana#17852)
  ...
@kaydelaney kaydelaney mentioned this pull request Aug 2, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marefr marefr Awaiting requested review from marefr

@torkelo torkelo Awaiting requested review from torkelo

Assignees

@kaydelaney kaydelaney

Labels
add to changelog area/explore
Projects
None yet
Milestone
6.3.0-beta1
Development

Successfully merging this pull request may close these issues.

Explore: Support toggle query text edit mode
3 participants
@kaydelaney @torkelo @marefr