Commit Graph

319 Commits

Author SHA1 Message Date
Johannes Schill
49550ccedf wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:12:04 +01:00
Johannes Schill
dbf7f3fb61 wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:05:34 +01:00
Johannes Schill
6c0c1254fe wip: panel-header: More merge conflicts 2018-11-06 15:44:04 +01:00
Johannes Schill
ca4612af26 wip: panel-header: Merge conflicts 2018-11-06 15:35:15 +01:00
Johannes Schill
f471482569 wip: panel-header: Fragment not needed anymore 2018-11-06 15:27:15 +01:00
Johannes Schill
f124b9de6a wip: panel-header: Separate all panel actions to its own file so we decouple them from react 2018-11-06 15:26:43 +01:00
Johannes Schill
6151310216 wip: panel-header: Start implementing the Toggle legend, but its not taken all the way 2018-11-06 15:26:34 +01:00
Johannes Schill
79da3dc9f6 wip: panel-header: Change DashboardPanel to a PureComponent to avoid unwanted rerenders 2018-11-06 15:25:59 +01:00
Johannes Schill
5375ce5ffd wip: panel-header: Refactor so "Share" use the same code in angular+react 2018-11-06 15:25:46 +01:00
Johannes Schill
f9dd516578 wip: panel-header: Add "Edit JSON" functionality + make sure everyone using the json editor pass in the model property instead of the scope property when triggering the json modal 2018-11-06 15:25:36 +01:00
Johannes Schill
edceb204e7 wip: panel-header: Add "Copy" functionality 2018-11-06 15:25:13 +01:00
Johannes Schill
b296d724e5 wip: panel-header: Add "Duplicate" 2018-11-06 15:25:07 +01:00
Johannes Schill
839057dc7a wip: Add "Share" to the react panels 2018-11-06 15:25:02 +01:00
Johannes Schill
bf8703edb8 wip: panel-header: Move code existing in both angular+react to utility functions 2018-11-06 15:24:25 +01:00
Johannes Schill
820e47b4c0 wip: panel-header: Remove panel 2018-11-06 15:24:06 +01:00
Johannes Schill
9f6683de2c wip: Initial commit for PanelHeaderMenu 2018-11-06 15:23:52 +01:00
Torkel Ödegaard
b372b4323d Merge branch 'master' into panel-edit-ux 2018-11-06 15:01:16 +01:00
Torkel Ödegaard
9393b06166 basic panel options working 2018-11-05 10:31:39 -08:00
Torkel Ödegaard
35e62bbbe0 wip: react panel options architecture 2018-11-05 17:46:09 +01:00
Peter Holmberg
ffc06e9962 extract store from configurestore 2018-11-05 16:54:48 +01:00
Torkel Ödegaard
c9802c283e minor fix 2018-11-05 12:33:40 +01:00
Torkel Ödegaard
0e26fad30b minor tweak to back to dashboard buttons 2018-11-01 19:25:54 +01:00
Torkel Ödegaard
3da62f1083 Merge branch 'master' into panel-edit-ux 2018-10-27 17:44:04 +02:00
Torkel Ödegaard
c5f9d8092f Reduce re-renderings when changing view modes 2018-10-27 16:54:04 +02:00
Torkel Ödegaard
b1b534a005 more ux progress 2018-10-27 15:09:36 +02:00
Torkel Ödegaard
a4674ecaa1 panel edit mode changes 2018-10-27 10:14:38 +02:00
Torkel Ödegaard
bcf669fab5 ux experiments 2018-10-26 16:29:08 +02:00
Torkel Ödegaard
94c35e2577 testing panel edit ux idea 2018-10-26 13:20:10 +02:00
Torkel Ödegaard
16a2b207cc fix: DataPanel isFirstLoad state fix 2018-10-22 09:54:43 +02:00
Torkel Ödegaard
11f66bb909 fixed issue with template refresh 2018-10-19 09:43:54 +02:00
Torkel Ödegaard
ae7a1bc139 Can render graph 2018-10-15 21:52:24 +02:00
Torkel Ödegaard
a28c25a2e0 progress on react time series infra 2018-10-15 08:22:20 +02:00
Torkel Ödegaard
2fb721d3c6 various fixes to to queries tab (in react mode) 2018-10-14 21:14:11 +02:00
Torkel Ödegaard
8e85295b2b react panels query processing 2018-10-14 18:19:49 +02:00
Torkel Ödegaard
543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Torkel Ödegaard
cd4619dad1 working on react data / query exectution 2018-10-14 15:39:34 +02:00
Torkel Ödegaard
2e1d45a875 changed DataPanel from HOC to use render props 2018-10-14 12:41:09 +02:00
Torkel Ödegaard
0662b5f962 fixing unit tests 2018-10-14 11:13:04 +02:00
Torkel Ödegaard
8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Torkel Ödegaard
ee1d4ce0e2 fix tab switching 2018-10-10 09:26:17 +02:00
praveensastry
1093f9da7e refactoring after review comments 2018-10-10 09:57:37 +11:00
praveensastry
b74e76298f render drag handle only in edit mode 2018-10-09 13:40:17 +11:00
Torkel Ödegaard
b7ba73819c mini fix 2018-10-04 09:14:47 +02:00
Torkel Ödegaard
3c7e54461f updated 2018-09-18 15:32:06 +02:00
Torkel Ödegaard
c82bf7f67f fix: changing edit / view fullscreen modes now work 2018-09-10 17:55:06 +02:00
Torkel Ödegaard
100ab0ba23 Merge branch 'master' into react-panels 2018-09-10 15:42:36 +02:00
Carl Bergquist
7e0637aa9d
Merge pull request #12260 from strohi/panelids-for-htmlbookmark
added id tag to Panels for html bookmarking on longer Dashboards
2018-09-10 13:01:35 +02:00
Torkel Ödegaard
e1beaaa0f7
tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard
35c00891e7
tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard
9b978b7203
tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
Torkel Ödegaard
fd81f89509 wip: angular panels now have similar edit mode and panel type selection enabling quick changing between panel react and angular panel types 2018-08-25 12:22:50 -07:00
Torkel Ödegaard
91b343403c wip: minor fixes 2018-08-25 07:21:00 -07:00
Torkel Ödegaard
1c97816275 wip: trying to align react & angular edit modes 2018-08-24 18:46:17 +02:00
Torkel Ödegaard
4e089229fb minor fix for legacy panels 2018-07-16 14:56:40 +02:00
Torkel Ödegaard
211e0f2199 wip: another baby step, another million to go 2018-07-11 12:11:21 -07:00
Torkel Ödegaard
dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Torkel Ödegaard
761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Torkel Ödegaard
8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
Torkel Ödegaard
50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
Torkel Ödegaard
dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -07:00
Torkel Ödegaard
dec62d7340 another baby step 2018-07-06 04:42:59 -07:00
Torkel Ödegaard
c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07:00
Torkel Ödegaard
447bc3a6e0 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-05 09:37:42 -07:00
Torkel Ödegaard
ab9e1b35cd wip: minor progress on DataPanel 2018-07-01 17:34:42 +02:00
Torkel Ödegaard
70c808130f react panels wip 2018-06-28 04:31:55 -07:00
Torkel Ödegaard
682c792dfb wip: react panels editor mode, tabs working 2018-06-26 12:07:41 -07:00
Torkel Ödegaard
2f5bcd37ec react panels wip 2018-06-26 16:45:42 +02:00
Torkel Ödegaard
cec70c1ed8 feat: panels v2, metrics-tab loading 2018-06-26 16:32:01 +02:00
Torkel Ödegaard
230606146d wip: react panel minor progrss 2018-06-19 21:25:57 +02:00
Torkel Ödegaard
13bc9f6fb2 updated 2018-06-19 17:30:10 +02:00
Torkel Ödegaard
db52ea66bd react panels minor progress 2018-06-19 16:57:55 +02:00
Torkel Ödegaard
aa5c9f199a react panel minor progress 2018-06-19 14:51:57 +02:00
Torkel Ödegaard
35403c1875 wip: react panel makeover mini progress 2018-06-19 08:42:41 +02:00
Torkel Ödegaard
542da8dc45 Merge branch 'master' into react-panels 2018-06-18 15:08:06 +02:00
André Niemann
757e2b0b7e added comment to reason the id tag 2018-06-18 10:59:44 +02:00
André Niemann
23c97d080f added id tag to Panels for html bookmarking on longer Dashboards 2018-06-13 10:07:47 +02:00
ryan
09dbb52423 Merge remote-tracking branch 'grafana/master' into focus-panel-search
* grafana/master:
  nicer collapsed row behaviour (#12186)
  remove DashboardRowCtrl (#12187)
  Annotations support for ifql datasource
  Template variable support for ifql datasource
  Query helpers for IFQL datasource
2018-06-07 10:31:46 +02:00
Ryan McKinley
17a2ce13f0 nicer collapsed row behaviour (#12186)
* nicer collapsed row behavior

* don't block events

* use a div to toggle

* use singular name
2018-06-06 21:58:42 -07:00
ryan
c71608aae8 add panel on enter 2018-06-07 03:08:39 +02:00
ryan
37c45a81a9 autoFocus the search filter 2018-06-07 02:48:54 +02:00
Torkel Ödegaard
ddd5e5ae70 tech: updated react-grid-layout to latest official release, closes #12100 2018-05-29 13:23:07 +02:00
Patrick O'Carroll
45e6d9fcc4 removed import config 2018-04-23 17:45:51 +02:00
Patrick O'Carroll
3eaaa5d32d fixed so user who can edit dashboard can edit row, fixes #11466 2018-04-23 17:44:29 +02:00
Marcus Efraimsson
606257a1da
move jest test file to specs 2018-04-18 14:00:15 +02:00
Marcus Efraimsson
ce97f89de6
make add panel panel scrollbar adjust when panel/dashboard grid are resized 2018-04-18 13:59:26 +02:00
Patrick O'Carroll
23f644c2f5 changed copied message and added forced render for width change 2018-04-18 10:34:43 +02:00
Patrick O'Carroll
0120023aba added forceupdate to grid item so addpanel items rezie instantly, renamed function to copyPanel, fixed panel items height issue 2018-04-17 13:10:08 +02:00
Marcus Efraimsson
0e0976b0a2
Merge branch 'master' into 10427_addpanel_filter 2018-04-16 23:30:34 +02:00
Alexander Zobnin
41e5d66e39 scrollbar: fix add panel height bug 2018-04-06 20:31:44 +03:00
Patrick O'Carroll
1d190de918 added test for sorting and filtering 2018-03-12 11:58:47 +01:00
Patrick O'Carroll
834c421943 replaced if with classNames 2018-03-07 15:01:50 +01:00
Patrick O'Carroll
8d4c439eeb add panel to list now copy, started on jest 2018-03-07 12:46:27 +01:00
bergquist
d3b23b01d8 hide row actions for viewers
closes #11112
2018-03-06 12:32:50 +01:00
Torkel Ödegaard
dff2c14aed fix: changed react-grid-layout to use grafana fork to a commit before 15503084fb, this fixes all the panel movement bugs, fixes #10831 2018-02-27 11:34:29 +01:00
Patrick O'Carroll
07c3fb7e0f changed name of copy tab to paste 2018-02-22 10:38:22 +01:00
Patrick O'Carroll
ce9c8ae854 added no copies div 2018-02-22 09:58:52 +01:00
Patrick O'Carroll
5e5a4cf1b0 added highlighter, fixed setState and changed back flex to spacea around 2018-02-21 15:39:15 +01:00
Patrick O'Carroll
9ac82f3d0e added tabs and searchfilter to addpanel, fixes#10427 2018-02-21 14:51:28 +01:00
Torkel Ödegaard
541b0a0ca1 fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817 2018-02-07 14:10:23 +01:00
Torkel Ödegaard
636cca8332 poc: merge sync 2018-02-02 16:01:01 +01:00
Torkel Ödegaard
5aeded8cf3 Merge branch 'master' into react-panels 2018-02-02 15:47:13 +01:00
Alexander Zobnin
479658489a fix: remove repeated rows when repeat was disabled. (#10653) 2018-01-29 15:17:27 +01:00
Johannes Schill
aac1b250af ux: When adding a new panel we should scroll to top until we figure o… (#10417)
* ux: When adding a new panel we should scroll to top until we figure out a better solution #10299

* ux: Use jquery to add smooth scrolling when scrolling up to add a panel, and make sure to pass the scope to the event emitter, #10299

* ux: Add a close button to the "New panel"-box and make sure you scroll to top every time you click "Add panel" #10299
2018-01-09 15:27:53 +01:00
Torkel Ödegaard
456b4d2a66 poc: began react panel experiments, step2 2018-01-03 13:33:54 +01:00
Torkel Ödegaard
3eb5f23209 poc: began react panel experiments, step2 2018-01-03 13:03:26 +01:00
Torkel Ödegaard
13efc529ec poc: began react panel experiments 2018-01-02 14:52:30 +01:00
Torkel Ödegaard
3e7420320c Merge branch 'master' into react-mobx 2017-12-26 13:53:39 +01:00
Torkel Ödegaard
c11cf18879 refactor: tried to simplify and also minimize scope a bit for #10323 2017-12-26 13:22:01 +01:00
Marcus Efraimsson
68457f5636 dashboard: copy panel to clipboard
Adds a new menu item to panels, Copy to Clipboard, that will both
copy the panel json to the clipboard and temporarily store the panel object
in the browsers window object. The temporarily stored panel object are
available in Add Panel from any dashboard for as long you don't refresh
the browser.
Fixes #10248, #1004
2017-12-22 10:24:55 +01:00
Torkel Ödegaard
4181602b78 react: progress on react containers and mobx-state-tree store 2017-12-21 11:56:45 +01:00
Torkel Ödegaard
3a1f52d8a2 prettier: ran on all files again, sorry. now settings are defined in package.json 2017-12-21 08:39:31 +01:00
Torkel Ödegaard
85879a7014 prettier: change to single quoting 2017-12-20 12:33:33 +01:00
Marcus Efraimsson
bbdb1cddd7 dashboard: delete row improvements
Possibility to delete row and all its panels or
only the row which will leave its panels in the dashboard.
2017-12-20 11:13:24 +01:00
Torkel Ödegaard
fadfc665e4 tech: ran pretttier on all typescript files 2017-12-19 16:06:54 +01:00
Torkel Ödegaard
71658d1e76 grid: disable resize and drag on non editable dashboards, closes #10235 2017-12-15 16:23:26 +01:00
Torkel Ödegaard
4112abd699 logging: removed logging from panel loader 2017-12-15 15:43:32 +01:00
Torkel Ödegaard
4e38526404 playlist: fixed playlist buttons in dashboard header, fixes #10213 2017-12-14 14:27:47 +01:00
Torkel Ödegaard
776c39fd79 templating: made templateSrv globally accessable as ES6 module, DashboardRow can not interpolate row title 2017-12-14 12:31:57 +01:00
Alexander Zobnin
a48ba7b19e Dashboard grid fixes (#10194)
* grid: fix layout saving after panel move, #10185

* don't allow to drag fullscreen panels, #10171
2017-12-13 17:53:57 +01:00
Torkel Ödegaard
79d9b64f82 fix: fixed issue with optimized build grid directive missing ngInject comment, fixes #10161 2017-12-12 11:00:16 +01:00
Torkel Ödegaard
77b537f45f ux: added react scrollbar component and added it to add panel panel 2017-12-08 13:30:16 +01:00
Torkel Ödegaard
2bc23d2063 tech: updated ngreact and with custom PR applied 2017-12-08 12:26:19 +01:00
Torkel Ödegaard
e03abde778 refactoring: #10130 2017-12-08 12:17:09 +01:00
Torkel Ödegaard
974d4d9739 Revert "Don't animate panels on initial render (#10130)"
This reverts commit e0c173c5af.
2017-12-08 11:53:51 +01:00
Alexander Zobnin
e0c173c5af Don't animate panels on initial render (#10130)
* grid: dont animate panels on initial render

* grid: dont animate panels on initial render
2017-12-08 11:49:14 +01:00
Alexander Zobnin
3de17ecda7 dashboard grid: enable CSS transforms (#10125) 2017-12-08 08:21:00 +01:00
Torkel Ödegaard
e871e56522 ux: add new panel and dash nav improvements 2017-12-01 20:11:55 +01:00
Torkel Ödegaard
830c307bba progress on scrollable panels work 2017-11-21 14:30:33 +01:00
Torkel Ödegaard
cae852a1a2 updated icons 2017-10-27 08:33:04 +02:00
Torkel Ödegaard
7559982b05 grid: minor changes 2017-10-25 12:38:08 +02:00
Torkel Ödegaard
a299118c92 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-24 20:29:53 +02:00
Torkel Ödegaard
38f97d5cc9 grid: worked on row options modal and row removal 2017-10-24 20:13:34 +02:00
Torkel Ödegaard
df12cbc4a7 tests: added test for DashboardRow 2017-10-24 15:46:03 +02:00
Torkel Ödegaard
15024e96e4 ux: row collapse / expand starting to work 2017-10-24 12:33:14 +02:00
Torkel Ödegaard
bc8c2409c0 ux: work on rows 2017-10-17 14:53:52 +02:00
Torkel Ödegaard
e375159eec grid: row work 2017-10-17 12:04:18 +02:00
Torkel Ödegaard
cd10be0f52 newgrid: row progress 2017-10-16 16:09:23 +02:00
Torkel Ödegaard
a979767439 grid: minor progress on new row concept 2017-10-16 10:58:08 +02:00
Torkel Ödegaard
2ff4b86781 ux: add panel progress 2017-10-16 10:39:50 +02:00
Torkel Ödegaard
772ab7812f ux: worked on add panel function 2017-10-16 09:55:55 +02:00
Torkel Ödegaard
825cac38b4 ux: minor fixes 2017-10-13 17:01:38 +02:00
Torkel Ödegaard
e5a6cb6241 newgrid: added constants, changed grid to 24 cols, added tests for panel repeats 2017-10-13 13:51:05 +02:00
Torkel Ödegaard
8bb9d92a73 grid: minor progress on panel repeats 2017-10-12 21:37:27 +02:00
Torkel Ödegaard
215d59865e changed name back to use underscore instead of camelcase, need to think more about this 2017-10-12 20:02:07 +02:00
Torkel Ödegaard
770a21b368 newgrid: worked panel duplicate 2017-10-12 19:01:02 +02:00
Torkel Ödegaard
3a089dd04c newgrid: various fixes 2017-10-11 21:36:03 +02:00
Torkel Ödegaard
331b50dcaa grid: edit/view now works 2017-10-11 16:32:05 +02:00
Torkel Ödegaard
d8e4decc60 grid: fixed migration for rows without height 2017-10-11 14:36:25 +02:00
Torkel Ödegaard
087b55aece newgrid: progress on fullscreen/edit view modes 2017-10-11 11:42:49 +02:00
Torkel Ödegaard
2e77bd0cb1 grid: progress on react grid 2017-10-10 17:57:53 +02:00
Torkel Ödegaard
10a3504309 grid: progress on new grid, resize & saving layouts works 2017-10-10 14:20:53 +02:00
Torkel Ödegaard
207773e07e grid: minor progress 2017-10-10 09:34:14 +02:00
Torkel Ödegaard
a867dc069b tech: got angular component to load inside react grid 2017-10-09 20:38:48 +02:00
Torkel Ödegaard
63bf2a0278 grid: need to find a way to add angular component inside react 2017-10-09 17:52:25 +02:00
Torkel Ödegaard
6cd2624caf ux: initial react grid poc 2017-10-09 17:24:10 +02:00
Torkel Ödegaard
d38c891fac merge with master 2017-10-02 14:14:45 +02:00
Torkel Ödegaard
18337f610d Merge branch 'master' into develop 2017-09-22 08:42:07 +02:00
Torkel Ödegaard
1aa5ed0cde ux: minor fixes 2017-08-25 10:41:24 +02:00
Torkel Ödegaard
d87653b079 ux: new grid progress 2017-08-25 10:19:08 +02:00
Torkel Ödegaard
160d8cec92 grid: minor progres on new grid 2017-08-24 16:37:00 +02:00
Torkel Ödegaard
47cf8e6337 grid: minor progres on new grid 2017-08-24 14:08:05 +02:00
Torkel Ödegaard
afe0137c66 grid work 2017-08-18 17:39:07 +02:00
Torkel Ödegaard
55c6b4b99c started on rows as panels in single grid 2017-08-18 13:25:51 +02:00
Torkel Ödegaard
8f2975c69b moving panels betwen rows are starting to work 2017-08-11 12:12:17 +02:00
Torkel Ödegaard
9f945578b8 grid: progress on row support 2017-08-10 17:17:15 +02:00
Torkel Ödegaard
7cb6093dba new-grid: fixed destory issues 2017-08-10 15:08:53 +02:00
Torkel Ödegaard
23666c0f78 grid: remove panel works 2017-08-10 14:54:56 +02:00
Torkel Ödegaard
77b42220f4 feat: new grid fixes 2017-08-09 15:33:19 +02:00
Torkel Ödegaard
de7bb8cb62 feat: new grid system progressW 2017-08-04 10:47:23 +02:00