Commit Graph

420 Commits

Author SHA1 Message Date
Torkel Ödegaard
42ee81a97c fixed issue with switching panels 2018-12-14 10:47:18 +01:00
Torkel Ödegaard
0823712c9a refactored panel-option-section into react component 2018-12-14 09:44:48 +01:00
Torkel Ödegaard
9c13520e97 updated styles 2018-12-13 21:24:41 +01:00
Torkel Ödegaard
3f1adf1390 wip: styles are starting to come together 2018-12-13 14:28:44 +01:00
Torkel Ödegaard
fe0f66b3f2 wip: testing new styles 2018-12-13 13:14:39 +01:00
Torkel Ödegaard
5fde977185 wip: style changes 2018-12-13 13:05:43 +01:00
Torkel Ödegaard
226e55b188 fixed ordering changing panel types, fixes issues with loading panel options 2018-12-13 11:35:07 +01:00
Torkel Ödegaard
f39fd7655e wip: minor style changes 2018-12-13 08:56:20 +01:00
Torkel Ödegaard
666e8e8330 wip: changes 2018-12-13 07:44:58 +01:00
Torkel Ödegaard
1751a51088 wip 2018-12-12 14:44:40 +01:00
Torkel Ödegaard
5adb0f79df wip 2018-12-12 14:25:07 +01:00
Torkel Ödegaard
be7e7fcb40 things are working 2018-12-12 13:59:19 +01:00
Torkel Ödegaard
b6a5375af1 wip 2018-12-12 12:51:39 +01:00
Torkel Ödegaard
21e1d7b05b wip 2018-12-12 11:24:18 +01:00
Torkel Ödegaard
7161b2dc9b wip 2018-12-12 09:51:17 +01:00
Torkel Ödegaard
8497c854f6 Adding mixed query 2018-12-12 08:54:12 +01:00
Torkel Ödegaard
87e6f86f87 wip metrics tab changes 2018-12-12 08:33:49 +01:00
Torkel Ödegaard
3452ee5a9c wip: making things work again 2018-12-12 06:52:08 +01:00
Torkel Ödegaard
fa4fddf7b5 React-select refactorings 2018-12-11 22:17:32 +01:00
Torkel Ödegaard
1d7d72b49d wip: react select css refactoring 2018-12-11 18:49:48 +01:00
Torkel Ödegaard
d998527128 wip 2018-12-11 17:03:38 +01:00
Torkel Ödegaard
45fde57ef9 Merge branch 'develop' into metrics-tab-changes 2018-12-11 16:45:04 +01:00
Torkel Ödegaard
b0c014bf24 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 16:44:52 +01:00
Johannes Schill
a0da303f80 Change KeyboardNavigation from hoc to render prop component 2018-12-11 13:50:01 +01:00
Johannes Schill
07ce88f685 Clean up hoc and extend component props automatically 2018-12-11 13:50:01 +01:00
Johannes Schill
645812f643 Let VizTypePicker use the keyboard navigation hoc 2018-12-11 13:50:01 +01:00
Torkel Ödegaard
4591c3555c Moved more metrics tab to react 2018-12-11 13:36:44 +01:00
Torkel Ödegaard
d6c6ba642e Don't show heading for first tab 2018-12-11 10:33:09 +01:00
Torkel Ödegaard
75a1536c91
Merge pull request #14434 from grafana/14274-reset-search
14274 develop - Reset DsPicker and VizPicker state when closed
2018-12-11 09:14:41 +01:00
Johannes Schill
20134c902b Add keyboard navigation to datasource picker via a hoc. 2018-12-10 21:42:53 +01:00
Johannes Schill
1ffac5a33d Use react's onKeyDown event on the input instead of event listener on document 2018-12-10 21:38:07 +01:00
Johannes Schill
6ac8f5c7a5 Unmount component when fading out to reset its state, such as search.. 2018-12-10 15:51:41 +01:00
Johannes Schill
cdcc316310 Variable rename. Did not make sense at all. 2018-12-10 15:29:51 +01:00
Johannes Schill
856c0ee052 Fix styling for vizPicker keyboard nav and change so only arrow up/down is OK to use 2018-12-10 15:20:32 +01:00
Johannes Schill
ae5bc366c2 Start adding keyboard navigation to VizPicker 2018-12-10 14:45:49 +01:00
Torkel Ödegaard
1bb535bbe3 minor style change 2018-12-08 12:54:36 +01:00
Torkel Ödegaard
eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +01:00
Torkel Ödegaard
5d22cdab28 click on dashboard title moves you back to dashboard instead of search 2018-12-07 13:50:50 +01:00
Johannes Schill
276f2567ee Changing from PureComponent to Component to re-render on link updates made in Angular #14333 2018-12-06 10:54:31 +01:00
Johannes Schill
d62cd8a5c5 Fix transparent option #14333 2018-12-06 10:34:27 +01:00
Johannes Schill
827ffaccd3 Pass some panel props down as strings to trigger render #14333 2018-12-05 14:57:57 +01:00
Johannes Schill
e55659192a Small tooltip css-adjustments and add css for position "bottom-start" used by the panel header corner 2018-12-04 17:00:00 +01:00
Johannes Schill
c2aa64595a
Merge pull request #14234 from grafana/gauge-value-options
Gauge value options
2018-12-04 16:30:34 +01:00
Peter Holmberg
f77c354341 Merge remote-tracking branch 'origin/develop' into gauge-value-options 2018-12-04 12:56:54 +01:00
Johannes Schill
bc5a0d9120 Add VizPicker search #14274 2018-12-04 10:42:01 +01:00
Peter Holmberg
b6ef10b8db arrow function 2018-12-03 15:02:41 +01:00
Peter Holmberg
b4d5ddd6f4 fix for initial options 2018-12-03 13:33:17 +01:00
Torkel Ödegaard
9cbdd07315 Merge branch 'panel-edit-in-react-sidemenu' into develop 2018-12-03 13:21:07 +01:00
Torkel Ödegaard
9404d36ab5
Merge pull request #14135 from grafana/panel-edit-in-react
React Panel Editor Mode (For Angular and React Panels)
2018-12-03 11:50:06 +01:00
Torkel Ödegaard
d38a0a0b64
Merge pull request #14106 from grafana/unit-picker
Unit picker
2018-12-03 10:53:48 +01:00
Torkel Ödegaard
222f26ea80 Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-30 04:46:39 -08:00
Torkel Ödegaard
6c09373995 fix: minor style changes, removed hover scale increase 2018-11-30 04:45:25 -08:00
Johannes Schill
0b65558c21 react-panel: Add nullcheck to prevent error on datasources without meta options 2018-11-30 13:42:49 +01:00
Johannes Schill
363425d55e react-panel: Options button should always be enabled now when Time Range-options are there 2018-11-30 13:39:06 +01:00
Johannes Schill
d02839d2d1 react-panel: Move time range options to its own component and render it under the options button instead 2018-11-30 13:36:53 +01:00
Johannes Schill
a8e184c025 react-panel: Clean up input validation and increase code readability 2018-11-30 10:21:55 +01:00
Johannes Schill
69ae3d2e6a react-panel: Time range options moved to "Queries" tab 2018-11-30 10:21:54 +01:00
Johannes Schill
b7fcef3351 react-panel: Remove mock response button for now 2018-11-30 10:21:54 +01:00
Johannes Schill
a03900e6cf react-panel: Remove comments and improve readability in render() 2018-11-30 10:21:54 +01:00
Johannes Schill
3908e64ef0 react-panel: Use correct type for children prop to avoid the use of fragments <></> 2018-11-30 10:21:54 +01:00
Johannes Schill
23ae1c7184 react-panel: Move all query inspector logic into QueryInspector component and start with the "Mock response" 2018-11-30 10:21:54 +01:00
Johannes Schill
857bd3d8ad react-panel: Toggle Expand/Collapse json nodes in Query Inspector 2018-11-30 10:21:54 +01:00
Johannes Schill
8254086ecb react-panel: Add CopyToClipboard-component and separate QueryInspector to its own component from QueriesTab 2018-11-30 10:21:53 +01:00
Johannes Schill
be67801e84 react-panel: Trigger panel refresh when opening inspector. Add loading-message 2018-11-30 10:21:53 +01:00
Johannes Schill
348f2e4ec4 react-panel: Get real datasource query for query inspector 2018-11-30 10:21:53 +01:00
Johannes Schill
82ce733e9e react-panel: Create component for JSON formatting and use it on query inspector 2018-11-30 10:21:53 +01:00
ijin08
2c943d9aec added new icons, fixed so different icons in different themes, added animation to hover on icons, styled choose visualization and datasource for both themes, made som styling adjustments to whole panel editor 2018-11-28 15:51:45 +01:00
Torkel Ödegaard
39a1b11cb3 minor fixes 2018-11-23 15:01:36 +01:00
Torkel Ödegaard
9caae8c8c0 adding back button 2018-11-23 07:43:25 +01:00
Torkel Ödegaard
c8e42c0216 styling tweaks 2018-11-23 07:31:13 +01:00
Torkel Ödegaard
300bd75b54 edit mode styling 2018-11-22 12:22:59 +01:00
Torkel Ödegaard
1b92bc62cb edit mode styling 2018-11-22 12:19:52 +01:00
Torkel Ödegaard
d70dfd5fd7 edit mode styling 2018-11-22 12:13:28 +01:00
Torkel Ödegaard
547044b65f style tweaks 2018-11-22 11:41:33 +01:00
Torkel Ödegaard
9a2b2863fb styling progress 2018-11-22 08:46:54 +01:00
Torkel Ödegaard
c7e296307a panel edit ux experiments 2018-11-21 20:32:04 +01:00
Johannes Schill
1a7b8a3931 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-21 11:39:57 +01:00
Johannes Schill
69e5584d39 react-panel: Avoid duplicate keys 2018-11-20 17:11:47 +01:00
Torkel Ödegaard
874ff4a7af Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-20 17:10:38 +01:00
Torkel Ödegaard
9baa54e98c added alert tab to new react panel editor 2018-11-20 17:09:47 +01:00
Peter Holmberg
6084275119 started on thresholds 2018-11-20 17:01:58 +01:00
Johannes Schill
97f7a7fbba react-panel: Add data source "options". Needs UX, WIP. 2018-11-20 16:33:26 +01:00
Torkel Ödegaard
51e719493b Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-20 16:07:11 +01:00
Torkel Ödegaard
5ea34844ba fixes to view mode for panels, can now go back as before 2018-11-20 16:00:19 +01:00
Johannes Schill
bc9f3a33fe Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-20 14:17:46 +01:00
Johannes Schill
ff87cbd4db react-panel: Add data source "help" 2018-11-20 14:17:03 +01:00
Torkel Ödegaard
0575307786 added header section to legacy tabs 2018-11-20 11:06:36 +01:00
Torkel Ödegaard
7f46b75330 Merge branch 'develop' into panel-edit-in-react 2018-11-20 09:51:06 +01:00
Johannes Schill
00596f0afc react-panel: Finish the data source search on query tab and start moving switch-data-source-logic from angular 2018-11-19 14:35:16 +01:00
Johannes Schill
295fefb2dc Tooltip should be able to take up space when used on an absolute positioned element 2018-11-19 09:29:21 +01:00
Torkel Ödegaard
5d1c5502f1 minor fixes 2018-11-19 09:16:35 +01:00
Johannes Schill
5069c7f6bb panel-header: Move the corner information in the panel header to its own component 2018-11-19 09:16:35 +01:00
Johannes Schill
04571b8214 panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-19 09:16:35 +01:00
Johannes Schill
42154833cc panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-19 09:15:08 +01:00
Johannes Schill
48d1a574b9 panel-header: Avoid undefined classNames and use the real panel description 2018-11-19 09:15:08 +01:00
Johannes Schill
b97e2c7240 panel-header: Display description in modal 2018-11-19 09:15:08 +01:00
Peter Holmberg
cc7bf31c3e Merge remote-tracking branch 'origin/develop' into unit-picker 2018-11-16 16:54:02 +01:00
Torkel Ödegaard
57de2475b0 various fixes to angular loading 2018-11-16 15:09:14 +01:00
Torkel Ödegaard
7c72f8e028 panel options now load even when changing type 2018-11-16 10:44:39 +01:00
Torkel Ödegaard
f21fe65bb1 fixed issues when changing type, need to remove event listeners and cleanup props 2018-11-16 10:00:13 +01:00
Torkel Ödegaard
dac02d3d73 React edit mode for angular panels progress 2018-11-16 08:31:29 +01:00
Torkel Ödegaard
ad3e683739 Merge branch 'develop' into panel-edit-in-react 2018-11-16 07:43:37 +01:00
Torkel Ödegaard
e21a140fcc minor fixes 2018-11-16 07:41:40 +01:00
Johannes Schill
83073dea2f panel-header: Move the corner information in the panel header to its own component 2018-11-15 16:52:39 +01:00
Johannes Schill
0fa8ae4fac panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-15 14:30:59 +01:00
Johannes Schill
e73466a80d panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-15 12:47:32 +01:00
Torkel Ödegaard
911646f913 poc: handling panel edit mode in react even for angular panels poc 2018-11-15 09:46:21 +01:00
Torkel Ödegaard
487fd12d66 wip: minor update 2018-11-15 07:33:59 +01:00
Johannes Schill
0a5f920bf5 panel-header: Avoid undefined classNames and use the real panel description 2018-11-14 22:29:10 +01:00
Johannes Schill
e20eea978a panel-header: Display description in modal 2018-11-14 22:18:48 +01:00
Torkel Ödegaard
159c5cdb63 wip: adding general tab for react panel edit mode 2018-11-14 17:57:37 +01:00
Torkel Ödegaard
1eecda48f8 Moved query manipulations from metrics controller to metrics tab so they are more easily shared between angular and react panels 2018-11-14 14:40:03 +01:00
Torkel Ödegaard
888eb9d94c fixed panel focus for react panels 2018-11-14 13:31:40 +01:00
Torkel Ödegaard
080d611004 minor changes to react panels 2018-11-14 13:20:19 +01:00
Torkel Ödegaard
604add078b
Merge pull request #14066 from grafana/panel-size-refactor
Panel size refactor
2018-11-14 12:38:21 +01:00
Torkel Ödegaard
6d65432c8a Merge branch 'toggle-panel-menu-withreact' into develop 2018-11-14 12:24:30 +01:00
Torkel Ödegaard
90c41bb087 changed how size is calcualted and propagated and added proper interval calc to DataPanel 2018-11-14 12:03:25 +01:00
Peter Holmberg
e4e41474b1 first stuff 2018-11-14 11:06:02 +01:00
Torkel Ödegaard
dedeaf541e wip panel size handling 2018-11-13 18:50:12 +01:00
Peter Holmberg
a9b5cbf381 adced clickoutside wrapper 2018-11-13 17:00:28 +01:00
Torkel Ödegaard
f274195d81 wip: refactoring interval and time override handling 2018-11-13 15:05:07 +01:00
Torkel Ödegaard
d49e857bc0 Merge branch 'develop' into 12759-timeshift 2018-11-13 09:56:58 +01:00
Torkel Ödegaard
81a9a3a3c1 Merge branch 'develop' into 12759-timeshift 2018-11-13 08:51:48 +01:00
Torkel Ödegaard
7b805bdb81 minor react panels refafactor 2018-11-13 08:40:42 +01:00
Torkel Ödegaard
e331d24a38 removed console.log 2018-11-13 08:11:03 +01:00
Torkel Ödegaard
9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
Torkel Ödegaard
9dbb0db684 completed work on panel not found view 2018-11-13 07:54:02 +01:00
Torkel Ödegaard
119e94f745 wip: panel plugin not found 2018-11-12 17:54:44 +01:00
Torkel Ödegaard
727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard
e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +01:00
Johannes Schill
6d4d7c5032 wip: panel-header: On panel refresh, get new timeRange from timeSrv, not the old one from the state 2018-11-12 11:38:41 +01:00
Johannes Schill
e045169094 wip: panel-header: Avoid null returning to get better code readability. High five @ peterholmberg 2018-11-12 11:31:33 +01:00
Johannes Schill
a3f1a1c6b3 wip: panel-header: Remove the TimeData type 2018-11-12 11:31:33 +01:00
Johannes Schill
e55f3f883f wip: panel-header: Move getResolution and calculateInterval into utils-functions and use the same code from react and angular 2018-11-12 11:31:33 +01:00
Johannes Schill
9fd62b80d9 wip: panel-header: Start implementing the applyPanelTimeOverrides in the react panels by moving it to a util, make it pure and call it from angular and react. 2018-11-12 11:31:33 +01:00
Torkel Ödegaard
a0620ac8f6 minor style fixes & polish 2018-11-11 17:46:40 +01:00
Torkel Ödegaard
c4ad069083 refactoring & cleaning up css 2018-11-10 17:28:28 +01:00
Torkel Ödegaard
f74f7b017f Minor progress on edit mode 2018-11-10 07:34:09 -08:00
Torkel Ödegaard
c54ae5d124 improve dropdown pane connetion to tab toolbar 2018-11-09 11:33:33 -08:00
Torkel Ödegaard
1bad8db94c data source picker demo state 2018-11-09 15:50:09 +01:00
Torkel Ödegaard
a7daf58bb9 wip: progress on edit mode ux with tabs 2018-11-09 13:17:41 +01:00
Torkel Ödegaard
8a9d721c00 panel-edit-ux-tabs on top alternative 2018-11-08 12:25:22 +01:00
Torkel Ödegaard
964a21b091 Merge branch 'master' into panel-edit-ux 2018-11-08 11:46:04 +01:00
Torkel Ödegaard
93b4cb562d Fixed issues introduced by changing to PureComponent 2018-11-07 16:03:33 +01:00
Torkel Ödegaard
37eb7ca62b further refactoring of #13984 2018-11-07 13:55:02 +01:00
Torkel Ödegaard
a24f6998f2 refactorings and some clean-up / removal of things not used 2018-11-07 13:36:35 +01:00
Peter Holmberg
e25b2d0ab6 Merge branch 'master' into data-source-settings-to-react 2018-11-07 09:50:17 +01:00
Torkel Ödegaard
7d87f57367 experimental option boxes 2018-11-06 18:55:35 +01:00
Torkel Ödegaard
5975c4a737 ux: changed panel selection ux 2018-11-06 18:34:37 +01:00
Johannes Schill
9c28ff8f84 wip: panel-header: Remove custom menu items from panels completely 2018-11-06 16:44:13 +01:00