IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,421 Commits 5,451 Branches 554 Tags 1.9 GiB
0fc4da810f
Commit Graph

67 Commits

Author SHA1 Message Date
David Kaltschmidt
949e3d29e8 Explore: add support for multiple queries 
* adds +/- buttons to query rows in the Explore section
* on Run Query all query expressions are submitted
* `generateQueryKey` and `ensureQueries` are helpers to ensure each
 query field has a unique key for react.
 2018-04-27 15:42:35 +02:00
David Kaltschmidt
d338b7ea7b Import and typescript fixups 2018-04-27 11:49:11 +02:00
David Kaltschmidt
f1220fd2a4 Explore WIP 2018-04-26 20:27:19 +02:00
David Kaltschmidt
0695e431ea Move function calls w/ side-effects to componentDidMount 
* loadStore() modified the url which triggered a new render path, this
gets noticed by react. Moved to componentDidMount.
 2018-04-24 12:07:24 +02:00
David Kaltschmidt
cc5d7002b0 Add weback-dev-server with hot/hmr support 
* adds `npm start` / `yarn start` script
* starts a webpack-dev-server using the dev config, served on :3333
* hot reloading (HMR) for react/styles, not working for angular code
* new entry `dev.ts` for dynamic imports of CSS theme (ExtractText does
not work with HMR)
* TS loader pipeline moved out of common to add HMR for react
* applied `hot()` to some react containers (that's their new default
 export, named exports remains for testing)
* added sections to README
* updated yarn.lock
 2018-04-19 11:42:53 +02:00
Patrick O'Carroll
99626b8e07 added save icon to save buttons 2018-03-22 17:04:00 +01:00
Patrick O'Carroll
823f903048 removed trash can icon from save buttons 2018-03-22 16:59:06 +01:00
Marcus Efraimsson
fce1e3f7f1 Merge branch 'master' into 10630_folder_api 2018-02-19 13:32:45 +01:00
Torkel Ödegaard
5323971c21
refactoring: alert rule query refactoring (#10941) 2018-02-16 13:56:04 +01:00
Marcus Efraimsson
cb8c82f7f6 Merge branch 'master' into 10630_folder_api 2018-02-12 15:14:41 +01:00
Torkel Ödegaard
e6b82b2fb1 fix: fixed permission list caching issue, fixes #10750 2018-02-05 15:23:46 +01:00
Daniel Lee
2d1bd270fb Stale permissions (#10768) 
* dashfolders: hide permissions in settings if folder has changed

and the dashboard has not been saved yet. Otherwise the use will
see stale permissions from the original folder.

* dashfolders: return folder url for inherited permissions
 2018-02-05 14:28:24 +01:00
Marcus Efraimsson
55100d5ff9
Merge pull request #10760 from grafana/10749_link_to_folder 
Fix link to folder from permissions list
 2018-02-05 11:34:59 +01:00
Marcus Efraimsson
7d3b990e91 permissions: fix link to folder from permissions list 
Also, closing Add Permissions CTA when DashboardPermissions and
FolderPermissions unmounts.
Fixes #10749"
 2018-02-05 11:10:37 +01:00
Torkel Ödegaard
07fa2f1722
fix: alert list links did not work, changed dashboardUri to Url, this is breaking api change in alert api (#10756) 2018-02-05 09:42:41 +01:00
Marcus Efraimsson
d217688d5e folders: use new folder api in frontend 2018-02-01 22:32:26 +01:00
Marcus Efraimsson
cd61d2b237 Merge branch 'master' into 7883_new_url_structure 2018-02-01 17:32:43 +01:00
Marcus Efraimsson
cef910dd78 Merge branch '7883_new_url_structure' of github.com:grafana/grafana into 7883_new_url_structure 2018-02-01 16:32:33 +01:00
Marcus Efraimsson
3db328f516 fix for dashboard/folder url's when having a sub path in root_url config 2018-02-01 16:30:48 +01:00
Daniel Lee
cc55ab6bc8 dashfolders: adds permission modal to dashboard settings 2018-02-01 14:32:19 +01:00
bergquist
74ca6f6dbf changes dashboard url in alertlist 2018-02-01 14:08:51 +01:00
Daniel Lee
9cdc1428d7 Merge remote-tracking branch 'upstream/master' into add_permissions_10676 2018-02-01 14:02:14 +01:00
Marcus Efraimsson
ee9c408188 folders: changes needed due to merge 2018-02-01 13:21:24 +01:00
Johannes Schill
2ad4c30bc6 ux: POC - Update "Add permissions" design and add a fancy animation #10676 2018-01-31 14:19:07 +01:00
Johannes Schill
666d29fafa dashfolders: POC - Use separate component for "Add permission" #10676 2018-01-31 10:39:38 +01:00
Daniel Lee
eb765d288c alertlist: disable pause button when user does not have permission 2018-01-30 23:35:27 +01:00
Johannes Schill
787b493c00 dashfolders: Use grafana's question mark instead of FA's and use the react tooltip instead of angular's #10275 2018-01-29 14:53:10 +01:00
Daniel Lee
50b20a0e5a dashfolders: use react component for dashboard permissions 
Switch out the angular component for the new react component on the
dashboard permissions editview on the settings page.
 2018-01-27 17:26:40 +01:00
Johannes Schill
49634593cf dashfolders: New snapshot since we changed from defaultValue to value per latest React documentation #10275 2018-01-25 15:37:49 +01:00
Johannes Schill
4ea9f3027a dashfolders: Remove variables not used and pass in the real dashboardId #10275 2018-01-25 15:36:56 +01:00
Johannes Schill
3a94918b8f dashfolders: Rename UserPicker folder => Picker. Inject the permission-store in the FolderPermissions-container instead of the Permissions component, add the PermissionsStore to the RootStore and and the error-message to the Permissions-store #10275 2018-01-25 15:36:04 +01:00
Johannes Schill
6b421b80a6 dashfolders: Fix page max width #10275 2018-01-25 15:33:45 +01:00
Johannes Schill
c3664e1d87 dashfolders: Update jest tests with backendSrv #10275 2018-01-25 15:33:36 +01:00
Johannes Schill
2de0489868 dashfolders: Send down backendSrv to the react components #10275 2018-01-25 15:30:15 +01:00
Johannes Schill
f23fb740a9 dashfolders: Add FolderPermissions container and make sure isFolder is passed to PermissionsStore #10275 2018-01-25 15:20:00 +01:00
Daniel Lee
a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +01:00
Daniel Lee
21b5ded75b dashfolder: refactor breadcrumbs in PageHeader 
Combines title and breadcrumbs in PageHeader instead of having to
set title to empty and add it as a breadcrumb.
 2018-01-11 17:53:06 +01:00
Daniel Lee
545d7b9477 dashfolders: convert folder settings to React 2018-01-11 15:42:45 +01:00
Torkel Ödegaard
32df74ffec ux: minor word change to alert list 2018-01-10 13:17:43 +01:00
Torkel Ödegaard
5d5de23025 refactoring: alert list improvments PR #10452 2018-01-10 11:54:47 +01:00
Johannes Schill
e4a2bda4f2 10389 react tooltip components (#10473) 
* poc: Use react-popper for tooltips #10389

* poc: Add popover component and use a hoc() for Tooltip + Popover to avoid code duplication #10389

* jest: Add snapshot tests to Popover and Tooltip #10389

* poc: Move target from hoc into Popover/Tooltip-component #10389

* poc: Clean up unused styles and use the existing Grafana style/colors on popper tooltip #10389

* poc: Remove test code before PR

* poc: Remove imports used in poc but shouldn't be included anymore #10389
 2018-01-10 10:27:33 +01:00
Patrick O'Carroll
d48be3ca15 naming fixes and added test file 2018-01-09 15:16:55 +01:00
Patrick O'Carroll
48548f0641 put this.props.search in the Highlighter 2018-01-09 13:18:16 +01:00
Patrick O'Carroll
bebcc24f3d moved state handling for search to store 2018-01-09 13:05:50 +01:00
Patrick O'Carroll
025835c9bf updated snapshot 2018-01-08 17:43:33 +01:00
Patrick O'Carroll
8b00e65a83 styling fix 2018-01-08 17:28:18 +01:00
Patrick O'Carroll
457a02b970 added highlight to search 2018-01-08 17:22:44 +01:00
Patrick O'Carroll
fc6d14127d fixed regex issue 2018-01-05 15:19:25 +01:00
Patrick O'Carroll
3797054eb4 made a view of filtered list 2018-01-05 14:17:50 +01:00
Patrick O'Carroll
5079dcdc62 updated jest file and snapshot 2018-01-05 10:34:01 +01:00