Commit Graph

495 Commits

Author SHA1 Message Date
Johannes Schill
6b9858c1d3 dashfolders: Working user picker on the dashboard permissions page #10275 2018-01-25 15:30:43 +01:00
Johannes Schill
b79a15b057 dashfolders: Re-use the API of the angular user picker instead, which is reusable #10275 2018-01-25 15:29:21 +01:00
Johannes Schill
1d8ce3673e dashfolders: Remove the PermissionsInner-strategy since we have a container for this route now #10275 2018-01-25 15:20:56 +01:00
Johannes Schill
a5d441e78e dashfolders: Permissions are injected via MST so it needs to be defined as optional #10275 2018-01-25 15:20:37 +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
Johannes Schill
7e13d0f773 dashfolders: Always get dashboardid and backendsrv from props #10275 2018-01-25 15:19:41 +01:00
Johannes Schill
3490c44636 dashfolders: Rem code to avoid tests to fail #10275 2018-01-25 15:19:30 +01:00
Johannes Schill
44ea8e58e2 wip: More on the permissions. Left are team picker and user picker, tests and error messages #10275 2018-01-25 15:19:17 +01:00
Johannes Schill
c8193e10b9 dashfolder: wip: More wip on acl.html2permissions.tsx #10275 2018-01-25 15:18:16 +01:00
Johannes Schill
7616cfb5f0 dashfolders: wip - Move Permissions into React #10275 2018-01-25 15:14:59 +01:00
Daniel Lee
bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Torkel Ödegaard
889bc29330 ux: minor change, added import dashboard link to dashboard search side view 2018-01-24 15:29:16 +01:00
Torkel Ödegaard
12b08b61d7 Merge remote-tracking branch 'origin/graphite-query-editor-enhancements' 2018-01-23 16:02:46 +01:00
Marcus Efraimsson
b5a6a9ab3b dashboards: Fix issue with first click when expanding folder in search
Fixes #10580
2018-01-22 16:12:52 +01:00
Torkel Ödegaard
38f4d5d06d
fix: restored previous behavior of form_dropdown, this fixes all my observerd bugs with the dropdown behavior 2018-01-16 17:02:03 -05:00
Dan Cech
ebad19b232
work on tag dropdown behavior 2018-01-16 17:02:03 -05:00
Torkel Ödegaard
11ba8070b8
Tag filters in search (#10521)
* tag filter: initial react component

* dashboard: move tag filter to filterbox

* tag filter: customize value rendering

* tag filter: get color from name

* tag filter:  custom option renderer

* tag filter: mode with tags in different container

* tag filter: refactor

* refactoring PR #10519

* tag filter: refactor of PR #10521
2018-01-16 12:52:13 +01:00
Daniel Lee
a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +01:00
Daniel Lee
58293ce5cc dashfolders: bugfix after rename 2018-01-15 10:15:52 +01:00
Daniel Lee
4948d4fd75 dashfolders: bugfix after rename 2018-01-15 10:14:10 +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
b76958f07b ux: minor change to alert list page 2018-01-10 14:18:58 +01:00
Torkel Ödegaard
686548a6ed fix: updated snapshot test 2018-01-10 13:16:16 +01:00
Torkel Ödegaard
7854f80f5a Merge remote-tracking branch 'origin/10289_user_picker' 2018-01-10 13:14:43 +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
Johannes Schill
ffda5eef95 test: Updated snapshot for UserPicker jest test #10289 2018-01-09 15:48:02 +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
Daniel Lee
e1aff1d5ff dashfolders: show/hide create folder or dashboard buttons
depending on the user role and the permissions the user has for a
folder.
2018-01-09 14:44:36 +01:00
Johannes Schill
c62a6aa7df fix: Clean up logging and remove unused css #10289 2018-01-09 14:42:23 +01:00
Johannes Schill
76ba7d1f8c test: Add snapshot tests for UserPicker and UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
68d43b865f fix: Add interface for props to UserPickerOption (#10289) 2018-01-09 14:39:10 +01:00
Johannes Schill
5931d6c87d ux: POC on new select box for the user picker (#10289) 2018-01-09 14:39:10 +01:00
Torkel Ödegaard
62165f91bf fix: added back colors to rootScope, fixes #10462 2018-01-09 11:13:37 +01:00
Torkel Ödegaard
27835f373e cleanup: removed unused typescript typings import 2018-01-04 10:12:02 +01:00
Torkel Ödegaard
c42a232644 Merge branch 'react-mobx' 2018-01-04 09:12:57 +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
Alexander Zobnin
62df406d7b fix info popover, #10302 (#10377) 2017-12-31 12:26:02 +01:00
Marcus Efraimsson
11ae7d5964 dashfolders: relative links should work when root_path is specified (#10363)
Fixes #10336
2017-12-31 12:24:21 +01:00
Torkel Ödegaard
8fd8853770 tech: progress on react pages 2017-12-28 17:03:40 +01:00
Torkel Ödegaard
02ad2e5f0f tech: cleaned up unused stuff 2017-12-21 12:31:04 +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
444240dffc tech: mobx tests 2017-12-21 08:27:47 +01:00
Marcus Efraimsson
d41ce4f9ca Various dashboard folders improvements (#10309)
* dashfolders: fix url for create dashboard from manage dashboards

Don't include folderId querystring if you don't manage a folder and
creating a new dashboard from there.

* dashfolders: don't store folderId in dashboard model

Use folderId from meta instead
#10307

* dashfolders: minor ux fix

* dashfolders: minor fix for edit folder title
2017-12-20 21:17:55 +01:00
Torkel Ödegaard
354913a704 mobx: progress on poc 2017-12-20 17:24:04 +01:00
Torkel Ödegaard
85879a7014 prettier: change to single quoting 2017-12-20 12:33:33 +01:00
Torkel Ödegaard
4acf6b0eee Merge remote-tracking branch 'origin/10190_fix_select_icon_and_firefox' 2017-12-20 11:22:29 +01:00
Torkel Ödegaard
fadfc665e4 tech: ran pretttier on all typescript files 2017-12-19 16:06:54 +01:00
Johannes Schill
143c0022b8 Merge branch 'master' into 10190_fix_select_icon_and_firefox 2017-12-19 15:54:02 +01:00
Marcus Efraimsson
b1621e1e8f
Merge pull request #10286 from grafana/10230_new_to_search_popup
added new to new dahsboard and folder
2017-12-19 15:51:04 +01:00
Daniel Lee
6ad06364c7
search: closes dash search when selecting current dashboard (#10285)
Fixes #10231.
2017-12-19 15:28:58 +01:00
Patrick O'Carroll
0d283214a0 added new to new dahsboard and folder 2017-12-19 14:52:34 +01:00
Johannes Schill
3e28ce94eb ux: Add icon to selected option in PageHeader navigation on small screens, update select boxes for Firefox so the arrow to the right is aligned with the other select boxes (#10190) 2017-12-19 13:19:44 +01:00
Mitsuhiro Tanda
6bb7f77346 use ace editor in panel edit (#10245) 2017-12-18 14:29:23 +01:00
Torkel Ödegaard
63d4499a2b ux: minor fixes 2017-12-15 13:14:00 +01:00
Torkel Ödegaard
69305c20a0 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-15 09:29:41 +01:00
Marcus Efraimsson
a84e03ddc4 dashfolders: styling of selected filters
#10081
2017-12-15 09:14:10 +01:00
Marcus Efraimsson
bd7837e8d7 dashfolders: styling of selected filters
#10081
2017-12-14 20:20:36 +01:00
Torkel Ödegaard
581257416e Merge remote-tracking branch 'origin/develop-icons' into develop 2017-12-14 19:56:19 +01:00
Marcus Efraimsson
854d22fa8e dashfolders: bulk move/delete improvements
bulk delete dashboards synchronously
moved bulk delete and move dashboards to backend_srv
better error handling/messages when moving and deleting folders/dashboards
fixes #10181
2017-12-14 15:09:17 +01:00
Torkel Ödegaard
4e38526404 playlist: fixed playlist buttons in dashboard header, fixes #10213 2017-12-14 14:27:47 +01:00
Johannes Schill
b012131050 Magnifying glass on search fields #10188 (#10206)
* ux: Add magnifying glass icon to search input and remove the text label (#10188)

* ux: Add new look on search field to manage dashboards, users, teams, data sources, plugins. Change to use our own icon class instead of .fa (#10188)

* ux: Add new search look on org/users (#10188)
2017-12-14 12:46:00 +01:00
Marcus Efraimsson
196a05d487 dashfolders: bulk move/delete improvements
Use slug and url instead of uri
Check/uncheck a folder will check/uncheck all its children dashboards
Allow to move dashboards when there are both folders and dashboards selected
Hide the header of section when only managing one folder
#10081 #10181
2017-12-14 11:26:16 +01:00
Trent White
2a32d01bd5 replace icon on dashboard list (fa-th-large - looked squished) with a smaller version of dashbord icon. This may not be the best way to do the css, so it's a separate commit 2017-12-13 17:51:01 -05:00
Marcus Efraimsson
d736795fe6 dashfolders: remove error message when moving to the same folder. #10135 2017-12-13 18:21:49 +01:00
Torkel Ödegaard
59ea19e03b Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 17:46:51 +01:00
Torkel Ödegaard
1eeb421ddb ux: updated login page 2017-12-13 17:46:14 +01:00
Daniel Lee
fa29ff0d79 fixes switching org when url contains orgId querystring param 2017-12-13 17:29:17 +01:00
Torkel Ödegaard
8ea94817f5 build: fixed build issue 2017-12-13 16:56:24 +01:00
Torkel Ödegaard
db95a01feb Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-13 16:31:11 +01:00
Torkel Ödegaard
3c65015671 ux: refactoring login page change 2017-12-13 16:30:31 +01:00
Daniel Lee
7d0ca63b72 navmodel: fix for signout link on pref page
without a target property on the link, the signout tab on
the preferences page returned a 404.
2017-12-13 16:28:36 +01:00
bergquist
f18eeaa920 change protip to go to manage dashboards 2017-12-13 16:08:32 +01:00
Torkel Ödegaard
aa4f1fa971 Merge remote-tracking branch 'origin/9879-login' into develop-login2 2017-12-13 16:06:17 +01:00
Torkel Ödegaard
313735bd75 search: worked on search results 2017-12-13 15:51:59 +01:00
Johannes Schill
c433597f99 Merge branch 'develop' into 9879-login 2017-12-13 14:21:39 +01:00
Johannes Schill
b8bfe51b03 ux: wip - Login animation POC (#9879) 2017-12-13 14:20:07 +01:00
Johannes Schill
0be9789364 ux: Move "Sign up" and "Reset password" to its own pages - and remove all inline styling (#9879) 2017-12-13 13:51:52 +01:00
Torkel Ödegaard
60e2ba111f plugins: fixed plugin edit page and plugin page 2017-12-13 11:12:35 +01:00
Torkel Ödegaard
2465fcbd6b fix: FolderId and IsFolder when saving dashboard 2017-12-13 10:00:54 +01:00
Johannes Schill
6a2b1e52b2 Merge branch 'develop' into 9879-login 2017-12-13 09:22:48 +01:00
Johannes Schill
1f8c1a5cc3 fix: Handle state when no password is entered on registration page (#9879) 2017-12-13 09:09:58 +01:00
Torkel Ödegaard
05cc1f85c3 Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team 2017-12-12 17:07:00 +01:00
Torkel Ödegaard
271c597c9b ux: style tweaks 2017-12-12 15:13:47 +01:00
Torkel Ödegaard
e98f573732 build: fixed broken test 2017-12-12 12:31:41 +01:00
Torkel Ödegaard
bbd0b98be9 Merge branch 'develop-settings' into develop 2017-12-12 12:03:10 +01:00
Torkel Ödegaard
0a8bd5d289 ux: dashboard settings updated 2017-12-12 11:49:01 +01:00
Patrick O'Carroll
515faa9ec5 new dashboard and folder in search (#10152)
* new dashboard and folder in search

* code formatting fixes
2017-12-12 11:26:15 +01:00
Daniel Lee
a37f1b77f1 dashfolders: new dashboard with folder selected
Fixes #10133
2017-12-11 16:37:40 +01:00
Torkel Ödegaard
a682475152 fix: fixed failing test 2017-12-11 13:09:25 +01:00
Torkel Ödegaard
09cc60ffe4 ux: dashboard settings progress 2017-12-11 12:13:45 +01:00
Marcus Efraimsson
1985027549 dashfolders: Folder picker should set correct default values. Fixes #10135 2017-12-08 17:46:52 +01:00
Alexander Zobnin
9e62a777c7 refactor: user groups to teams, rename frontend files 2017-12-08 18:47:55 +03:00
Alexander Zobnin
d8612380e9 refactor: rename User Groups to Teams 2017-12-08 18:25:45 +03: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
Marcus Efraimsson
f78f86d0ab dashfolders: Hide search input area when showing CTA. #10083 2017-12-08 11:23:57 +01:00
Marcus Efraimsson
017b337f00 dashfolders: create folder page
Fixes #10085
2017-12-07 19:32:38 +01:00
Marcus Efraimsson
2ea663df78 dashfolders: New Dashboard Folder page
Fixes #10083. Permissions page is just a placeholder
for now.
2017-12-07 17:30:54 +01:00