IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,495 Commits 5,416 Branches 554 Tags
67b9e3b26906ade67a0946406bb827866b68bed9
Commit Graph

168 Commits

Author SHA1 Message Date
ying-jeanne
6974f4340b NestedFolders: Fix nested folder deletion (#63572) 
---------

Co-authored-by: suntala <arati.rana@grafana.com>
Co-authored-by: ying-jeanne <ying-jeanne@users.noreply.github.com>
Co-authored-by: jeanne0731 <jeanne0731@users.noreply.github.com>
 2023-03-15 09:51:37 +01:00
Ieva
a52999a886 Access Control: revert to using folder store from the scope resolvers (#64132) 
* revert to using folder store from the resolvers

* fixing tests after revert

* api test fixes

---------

Co-authored-by: Kristin Laemmert <mildwonkey@users.noreply.github.com>
 2023-03-03 10:56:33 -05:00
Kristin Laemmert
bb798e24f3 chore(services): replace dependencies on dashboard store with dashboard service (#63937) 
* chore(services): replace dependencies on dashboard store with dashboard service

This continues the backend service/store split by replacing dashboard store dependencies with service dependencies. the folder service remains the single exception for now; otherwise we'd have a dependency cycle between the folder and dashboard services. I have some ideas for that, but I'll take care of all the easy parts first.

While doing this, I identified and removed a number of unused arguments from the following functions:

NewFolderNameScopeResolver
NewFolderIDScopeResolver
NewFolderUIDScopeResolver
NewDashboardIDScopeResolver
NewDashboardUIDScopeResolver
resolveDashboardScope

I have a small enterprise PR to support this commit.

* lingering fmt
 2023-03-02 08:09:57 -05:00
Ryan McKinley
22aa09d392 DashboardStore: Provide an interface directly rather than pointer receiver (#63910) 2023-03-01 07:52:16 -08:00
Ieva
4570131fe5 Folders: simplify guardian permissions checks (#63183) 
simplify code
 2023-02-09 07:19:08 -05:00
Sofia Papagiannaki
225c8dbba7 Chore: Fix fetching the General folder when nested folders is set and improve error handling (#62951) 
* Nested folders: Modify Get() not to fail fetching the General folder

* Add test
 2023-02-08 17:16:53 +02:00
Ieva
078639abcd RBAC: add folder UID scope resolver (#62695) 
* add folder uid scope resolver

* undo guardian change, move it to a separate PR

* fix test + linting
 2023-02-07 16:27:20 +00:00
Ryan McKinley
b1e58eb47e Chore: Replace short UID generation with more standard UUIDs (#62731) 2023-02-06 20:44:37 -05:00
Sofia Papagiannaki
ee2878f189 Chore: Fix logging message in folder service (#62939) 2023-02-06 13:11:32 +02:00
Josh Hunt
4d268cbcdb NestedFolders: use guardian.NewByUID to check folder permissions (#62864) 2023-02-06 10:14:22 +00:00
Sofia Papagiannaki
4eaff63eda SQLStore: Fix folder migration for MySQL < 5.7 (#62521) 
* Nested folders: Do not skip integration tests

* SQLStore: Fix folder migration

It reduces the length of the title column to be equal with the respective
dashboard column.
 2023-02-02 16:21:25 +02:00
Sofia Papagiannaki
adaf82ffb7 Nested Folder: Fix for SQLite not to overwrite the parent on restarts (#62709) 
Nested Folder: Fix for SQLite not to overwrite the arent on restarts
 2023-02-02 12:06:51 +02:00
Sofia Papagiannaki
f143b0a5b2 Chore: Move folder store interface, implementation and test under pkg/services/folder (#62586) 
* Chore: Move folder store into folder service package

* Split folder and dashboard store implementations
 2023-02-01 15:43:21 +02:00
Ieva
ee3d742c7d RBAC: inherit folder permissions when resolving managed permissions (#62244) 
* add nested folder scope inheritance to managed permission services

* add a more specific erorr

* remove circular dependencies

* use errutil for returning erorr

* fix tests

* fix tests

* define a new error in ac package
 2023-01-30 14:19:42 +00:00
Serge Zaitsev
bc2813ef06 Chore: Fix goimports grouping in pkg/services (#62420) 
* fix goimports

* fix goimports order
 2023-01-30 08:21:27 +00:00
Kristin Laemmert
e8b8a9e276 chore: move dashboard_acl models into dashboard service (#62151) 2023-01-26 08:46:30 -05:00
Sofia Papagiannaki
cd27562c76 Access control: Modify dashboard/folder resolvers so that return also the inherited scopes (#62025) 
* Access Control: Add folder service dependency to the dashboard/folder resolvers

* Expose the function fetching parents to folder interface

* Add generic prepend utility

* Modify dashboard resolvers to return inherited scopes
 2023-01-26 10:21:10 +02:00
Kristin Laemmert
7c27c866f6 chore: update folder model (json tags) to match previous model (#62117) 
chore: update folder model to match previous model
 2023-01-25 10:04:08 -05:00
idafurjes
b54b80f473 Chore: Remove Result from dashboard models (#61997) 
* Chore: Remove Result from dashboard models

* Fix lint tests

* Fix dashboard service tests

* Fix API tests

* Remove commented out code

* Chore: Merge main - cleanup
 2023-01-25 10:36:26 +01:00
idafurjes
421976e919 Chore: Remove folders from models pkg (#61853) 2023-01-25 09:14:32 +01:00
Sofia Papagiannaki
c7a7ebd3e0 Chore: Drop search service dependency from folder service (#61789) 
* Chore: Drop search service dependency from folder service
 2023-01-23 14:09:09 +02:00
idafurjes
68445a7c77 Chore: Remove dashboard ACL from models (#61749) 
* Remove dashboard ACL from models

* Remove unused comment
 2023-01-20 14:58:47 +01:00
Sofia Papagiannaki
c104cc7020 Chore: Split folder store and dashboard store interfaces (#61655) 
* update folder store mock

* Split folder store and dashboard store interfaces
 2023-01-19 18:38:07 +02:00
Sofia Papagiannaki
b80c9bb974 Chore: Drop dashboard service dependency from folder service (#61614) 
* Chore: Drop dashboard dependency from folder service
 2023-01-18 17:47:59 +02:00
idafurjes
b573b19ca3 Chore: Remove dashboards from models pkg (#61578) 
* Copy dashboard models to dashboard pkg

* Use some models from current pkg instead of models

* Adjust api pkg

* Adjust pkg services

* Fix lint

* Chore: Remove dashboards models

* Remove dashboards from models pkg

* Fix lint in tests

* Fix lint in tests 2

* Fix for import in auth

* Remove newline

* Revert unused fix
 2023-01-18 13:52:41 +01:00
Sofia Papagiannaki
f25d5199c5 Chore: Fix folder service tests (#61659) 
* Chore: Fix folder service tests
 2023-01-18 12:22:23 +02:00
idafurjes
7c2522c477 Chore: Move dashboard models to dashboard pkg (#61458) 
* Copy dashboard models to dashboard pkg

* Use some models from current pkg instead of models

* Adjust api pkg

* Adjust pkg services

* Fix lint
 2023-01-16 16:33:55 +01:00
Sofia Papagiannaki
e2ed42c2a3 Nested folders: Do not expose the sequential ID from the folder store (#60702) 
* Nested folders: Do not expose the sequential ID from the folder store
 2023-01-06 16:04:17 +02:00
Sofia Papagiannaki
4df78cebc2 Nested Folders: Unify folder services (#60390) 
* Nested Folders: Unify folder services
 2022-12-20 17:38:09 +02:00
Sofia Papagiannaki
55b014974d Nested folders: Refactor folder update (#60323) 
* Nested folders: Refactor folder update

* Apply suggestions from code review
 2022-12-20 15:00:33 +02:00
Sofia Papagiannaki
b1ef5ab320 Nested Folders: Support listing nested folder children (#58566) 
* Nested Folders: Support listing nested folder children

* Filter out subfolders with no permissions

* Apply suggestion from code review
 2022-12-19 10:52:04 +02:00
Sofia Papagiannaki
11d8bcbea9 Guardian: Introduce additional constructors (#59577) 
* Guardian: Use dashboard UID instead of ID

* Apply suggestions from code review

Introduce several guardian constructors and each time use
the most appropriate one.
 2022-12-15 16:34:17 +02:00
ying-jeanne
b059296cb0 [nested folder]Add circular reference detection in create nested folder (#60163) 
* add circulic reference detection in create neste folder

* redeclare mock

* add log for getHeight when depassing limit
 2022-12-14 11:07:55 -05:00
ying-jeanne
1131bac5da [Nested Folder] Block move operation that could introduce more than 8 level of depth,… (#59832) 
* block move operation that could introduce more than 8 level of depth, forbid circular reference

* move getHeight to store, mock store in service

* fix linter
 2022-12-08 08:49:17 -05:00
Sofia Papagiannaki
798a8ceb9c Nested folders: Fix delete (#59627) 
* Fix deleting subfolder

It used to fail with beause of missing signed in user

* Add logging

* fixup

* Fail request if deleting nested folder has failed

Before we only used to log the error

* Fix failing test

During failed nested folder creation
call the dashboard store deletion instead of the service one.
 2022-12-01 05:27:40 -05:00
Ryan McKinley
5b71a16acf Slugify: Replace gosimple/slug with a simple function (#59517) 2022-11-30 11:12:56 -05:00
Sofia Papagiannaki
933879a347 Chore: Delete accidentally committed test database (#59238) 2022-11-29 10:33:43 +02:00
Sofia Papagiannaki
8ab7ca45cd Nested folder: Fix for PostgreSQL (#59405) 
* Nested Folders: Fix PostgreSQL LastInsertId failure

* Fix children sorting

* Fix store tests
 2022-11-28 17:48:44 +02:00
Sofia Papagiannaki
f5c41ea497 Nested Folders: More API fixes (#59316) 
* Nested Folder: Fix create, use camel case for JSON properties

* Fix get parents if the folder does not exist

* Add store test for get parents
 2022-11-24 13:28:53 -05:00
Sofia Papagiannaki
8e6d343981 Nested Folders: Some API fixes (#59298) 
* Nested Folders: Fix API responses

* Fix panic during deletions

* Add test
 2022-11-24 08:59:47 -05:00
Sofia Papagiannaki
ad96b240fc Nested Folder: Enforce maximum nested folder depth (#59213) 
* Nested Folder: Enforce maximum nested folder depth

* Cleanup

* Fix logging
 2022-11-23 09:44:45 -05:00
Sofia Papagiannaki
0af96936be Nested Folders: Do not refer to the configuration for checking for the flag (#59197) 
* Nested Folders: Do not refer to the configuration for checking for the flag

Use always features.IsEnabled() instead

* Depend on the interface instead
 2022-11-23 06:16:00 -05:00
Sofia Papagiannaki
02b6b09121 Nested Folders: Set user in the API level (#59148) 2022-11-23 11:13:47 +02:00
Sofia Papagiannaki
9926931d40 Nested Folder: Include URL into the GET response (#59099) 2022-11-22 07:04:09 -05:00
Sofia Papagiannaki
93b4b9154e Chore: Restore folder properties (#58743) 
* Chore: Fix folder URL

* Restore more folder properties

* Fixup
 2022-11-15 12:58:12 +02:00
Sofia Papagiannaki
9855e74b92 Chore: Refactor quota service (#58643) 
Chore: Refactor quota service (#57586)

* Chore: refactore quota service

* Apply suggestions from code review
 2022-11-14 21:08:10 +02:00
ying-jeanne
69b5a9c752 Chore: [Nested Folder] Add db migration at service start time (#58590) 
* add db migration at service start time

* make changes for the 3 db

* revert migrator

* fix feature toggle check

Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
 2022-11-12 09:51:46 -05:00
idafurjes
080ea88af7 Nested Folders: Support getting of nested folder in folder service wh… (#58597) 
* Nested Folders: Support getting of nested folder in folder service when feature flag is set

* Fix lint

* Fix some tests

* Fix ngalert test

* ngalert fix

* Fix API tests

* Fix some tests and lint

* Fix lint 2

* Fix library elements and panels

* Add access control to get folder

* Cleanup and minor test change
 2022-11-11 14:28:24 +01:00
ying-jeanne
b13b58ebf8 Add move endpoint into folder service (#58575) 
* add move endpoint

* change signatures
 2022-11-10 09:06:52 -05:00
idafurjes
30f0d66983 Folder: Add implementation for Update for nested folder (#58479) 
* Add implementation for Update nested folder

* Remove parent uid from Update

* Fix update
 2022-11-10 14:28:55 +01:00