Torkel Ödegaard
5323971c21
refactoring: alert rule query refactoring ( #10941 )
2018-02-16 13:56:04 +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
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
Patrick O'Carroll
2248bf437c
added search function
2018-01-04 15:27:09 +01:00
Patrick O'Carroll
0068e82718
new styling and markup
2018-01-04 13:08:49 +01:00
Johannes Schill
8abef88b94
mobx: poc in using each store as individual prop on the react containers ( #10414 )
...
* mobx: poc in using each store as individual prop on the react containers
* prettier test
* fix: end the war between prettier vs tslint.
* mobx: Move stores into their own folders
* mobx: Refactor the AlertRule into its own file and add a helper-file
* mobx: Move NavItem out of NavStore and remove lodash dependancy
* mobx: Move ResultItem and SearchResultSection models out of the SearchStore
* mobx: ServerStatsStore rename .tsx => .ts. And move ServerStat-model to its own file.
* mobx: Remove lodash and jquery dependancy from ViewStore
* mobx: Remove issue with double question mark
2018-01-03 20:11:07 +01:00
Torkel Ödegaard
f049fc4816
mobx: fixed issue with view store, and added missing snapshot
2018-01-02 11:02:43 +01:00
Torkel Ödegaard
5981f67226
tech: enzyme container test working
2018-01-01 18:54:23 +01:00
Torkel Ödegaard
644adef465
tech: enzyme container test working
2018-01-01 16:04:32 +01:00
Torkel Ödegaard
3301f8f194
react: trying to get enzyme and mobx tests working
2018-01-01 15:39:26 +01:00
Torkel Ödegaard
8f50795a94
tech: url and query mobx store so now react components and containers can read and modify url path and query via mobx store
2017-12-31 22:31:11 +01:00
Torkel Ödegaard
029317ed18
tech: alert list react migration progress
2017-12-31 14:16:19 +01:00
Torkel Ödegaard
5a571f4784
tech: react mobx progress
2017-12-29 17:13:58 +01:00
