chore: merge master into beta (#494)

* fix: fix time based graph when timezone is different with database (#476)

* chore(release): 6.4.1 [skip ci]

## [6.4.1](v6.4.0...v6.4.1) (2021-06-01)

### Bug Fixes

* fix time based graph when timezone is different with database ([#476](#476)) ([5d9fb89](5d9fb89))

* feat(schema): move some meta data under stack attribute to prevent blocking scenarios on DWO (#469)

* chore(release): 6.5.0 [skip ci]

# [6.5.0](v6.4.1...v6.5.0) (2021-06-03)

### Features

* **schema:** move some meta data under stack attribute to prevent blocking scenarios on DWO ([#469](#469)) ([76aa754](76aa754))

* Fix broken image links in the README

* fix: allow smart action endpoints to start with slashes

* chore(release): 6.5.1 [skip ci]

## [6.5.1](v6.5.0...v6.5.1) (2021-06-08)

### Bug Fixes

* allow smart action endpoints to start with slashes ([d4f6a61](d4f6a61))
* allow smart action endpoints to start with slashes ([cf6c6a9](cf6c6a9))

* style: fix alt text in README (#484)

* feat: include role in the user data inside the request (#478)

* chore(release): 6.6.0 [skip ci]

# [6.6.0](v6.5.1...v6.6.0) (2021-06-09)

### Features

* include role in the user data inside the request ([#478](#478)) ([0a34716](0a34716))

* fix: support permissions infos with ruby < 2.7 (#486)

* chore(release): 6.6.1 [skip ci]

## [6.6.1](v6.6.0...v6.6.1) (2021-06-10)

### Bug Fixes

* support permissions infos with ruby < 2.7 ([#486](#486)) ([a611271](a611271))

* fix: stats permissions should be retrieved only one time per team (#489)

* fix: stats permissions should be retrieved only one time per team

* chore: fix the version of semantic-release (#492)

* chore(release): 6.6.2 [skip ci]

## [6.6.2](v6.6.1...v6.6.2) (2021-06-16)

### Bug Fixes

* stats permissions should be retrieved only one time per team ([#489](#489)) ([c2e9104](c2e9104))

Co-authored-by: Cisco Guillaume <[email protected]>
Co-authored-by: Forest Bot <[email protected]>
Co-authored-by: SteveBunlon <[email protected]>
Co-authored-by: Sandro Munda <[email protected]>
Co-authored-by: Sliman <[email protected]>
Co-authored-by: slimane <[email protected]>
Co-authored-by: Olessya KOROVINA <[email protected]>
Co-authored-by: Guillaume Gautreau <[email protected]>

Author: 8 people

.github/workflows/build.yml

@@ -83,6 +83,8 @@ jobs:
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v2
         id: semantic
+        with:
+          semantic_version: 17.3.0
         env:
           GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [6.6.2](https://github.com/ForestAdmin/forest-rails/compare/v6.6.1...v6.6.2) (2021-06-16)
+
+
+### Bug Fixes
+
+* stats permissions should be retrieved only one time per team ([#489](https://github.com/ForestAdmin/forest-rails/issues/489)) ([c2e9104](https://github.com/ForestAdmin/forest-rails/commit/c2e9104ebf32deeb3e5676706fdcbaae5de34869))
+
+## [6.6.1](https://github.com/ForestAdmin/forest-rails/compare/v6.6.0...v6.6.1) (2021-06-10)
+
+
+### Bug Fixes
+
+* support permissions infos with ruby < 2.7 ([#486](https://github.com/ForestAdmin/forest-rails/issues/486)) ([a611271](https://github.com/ForestAdmin/forest-rails/commit/a611271e709bb6a9ed0d3ebccfb64b6eea1d324d))
+
+# [6.6.0](https://github.com/ForestAdmin/forest-rails/compare/v6.5.1...v6.6.0) (2021-06-09)
+
+
+### Features
+
+* include role in the user data inside the request ([#478](https://github.com/ForestAdmin/forest-rails/issues/478)) ([0a34716](https://github.com/ForestAdmin/forest-rails/commit/0a347165897aa118e486895e55f4b29ba7fb888b))
+
+## [6.5.1](https://github.com/ForestAdmin/forest-rails/compare/v6.5.0...v6.5.1) (2021-06-08)
+
+
+### Bug Fixes
+
+* **dependency:** now using forestadmin-jsonapi-serializers instead of the jsonapi-serializers gem ([#475](https://github.com/ForestAdmin/forest-rails/issues/475)) ([3feea36](https://github.com/ForestAdmin/forest-rails/commit/3feea36b3b578638f3ad7c16ebab8e457a68d71f))
+
+
+### BREAKING CHANGES
+
+* **dependency:** Switch from jsonapi-serializers to forestadmin-jsonapi-serializers to serialize data to the JSONAPI format, mainly to avoid conflict with the jsonapi-serializer library
+* allow smart action endpoints to start with slashes ([d4f6a61](https://github.com/ForestAdmin/forest-rails/commit/d4f6a618aeea72364b0e7511545b67fbbfb17c99))
+* allow smart action endpoints to start with slashes ([cf6c6a9](https://github.com/ForestAdmin/forest-rails/commit/cf6c6a96498e6813e4b7ccaa56cacd9abefc332f))
+
 # [7.0.0-beta.2](https://github.com/ForestAdmin/forest-rails/compare/v7.0.0-beta.1...v7.0.0-beta.2) (2021-06-07)
 
 
@@ -11,17 +46,22 @@
 * **hooks:** fields parameters on hook function is no longer a map of field, it is now an array.
 change hook is no longer choosen by the field name, field need to have hook defined inside it definition by addin a props hook.
 
-# [7.0.0-beta.1](https://github.com/ForestAdmin/forest-rails/compare/v6.4.1-beta.1...v7.0.0-beta.1) (2021-06-01)
 
 
-### Bug Fixes
+# [6.5.0](https://github.com/ForestAdmin/forest-rails/compare/v6.4.1...v6.5.0) (2021-06-03)
 
-* **dependency:** now using forestadmin-jsonapi-serializers instead of the jsonapi-serializers gem ([#475](https://github.com/ForestAdmin/forest-rails/issues/475)) ([3feea36](https://github.com/ForestAdmin/forest-rails/commit/3feea36b3b578638f3ad7c16ebab8e457a68d71f))
 
+### Features
 
-### BREAKING CHANGES
+* **schema:** move some meta data under stack attribute to prevent blocking scenarios on DWO ([#469](https://github.com/ForestAdmin/forest-rails/issues/469)) ([76aa754](https://github.com/ForestAdmin/forest-rails/commit/76aa7540300f75b0ea1d00ec3b60e4976b7d800e))
 
-* **dependency:** Switch from jsonapi-serializers to forestadmin-jsonapi-serializers to serialize data to the JSONAPI format, mainly to avoid conflict with the jsonapi-serializer library
+# [7.0.0-beta.1](https://github.com/ForestAdmin/forest-rails/compare/v6.4.1-beta.1...v7.0.0-beta.1) (2021-06-01)
+## [6.4.1](https://github.com/ForestAdmin/forest-rails/compare/v6.4.0...v6.4.1) (2021-06-01)
+
+
+### Bug Fixes
+
+* fix time based graph when timezone is different with database ([#476](https://github.com/ForestAdmin/forest-rails/issues/476)) ([5d9fb89](https://github.com/ForestAdmin/forest-rails/commit/5d9fb8903ae53615dd1789bdebbc4d9c7d6f4576))
 
 # [6.4.0](https://github.com/ForestAdmin/forest-rails/compare/v6.3.8...v6.4.0) (2021-05-26)
 

README.md

@@ -34,7 +34,7 @@ This project has been designed with scalability in mind to fit requirements from
 ## How it works
 
 <p align="center" style="margin: 60px 0">
-  <img width="100%" src="https://www.forestadmin.com/public/img/rails/schemas/schema-1.png" alt="Howitworks">
+  <img width="100%" src="https://forest-assets.s3.amazonaws.com/Github+README+assets/howitworks.png" alt="Howitworks">
 </p>
 
 Forest Admin consists of two components:
@@ -55,23 +55,23 @@ All of your CRUD operations are natively supported. The API automatically
 supports your data models' validation and allows you to easily extend or
 override any API routes' with your very own custom logic.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-CRUD.jpg" alt="CRUD">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/crud.jpeg" alt="CRUD">
 
 ### Search & Filters
 
 Forest Admin has a built-in search allowing you to run basic queries to
 retrieve your application's data. Set advanced filters based on fields and
 relationships to handle complex search use cases.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Search.jpg" alt="Search and Filters">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/search+filters.jpeg" alt="Search and Filters">
 
 ### Sorting & Pagination
 
 Sorting and pagination features are natively handled by the Admin API. We're
 continuously optimizing how queries are run in order to display results faster
 and reduce the load of your servers.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Sorting.jpg" alt="Sorting and Pagination">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/sorting+pagination.jpeg" alt="Sorting and Pagination">
 
 ### Custom action
 
@@ -80,49 +80,49 @@ a custom logic. With virtually no limitations, you can extend the way you
 manipulate data and trigger actions (e.g. refund a customer, apply a coupon,
 ban a user, etc.)
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Custom.jpg" alt="Sorting and Pagination">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/custom+actions.jpeg" alt="Custom action">
 
 ### Export
 
 Sometimes you need to export your data to a good old fashioned CSV. Yes, we
 know this can come in handy sometimes :-)
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Export.jpg" alt="Export">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/exports.jpeg" alt="Export">
 
 ### Segments
 
 Get in app access to a subset of your application data by doing a basic search
 or typing an SQL query or implementing an API route.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Segments.jpg" alt="Segments">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/segments.jpeg" alt="Segments">
 
 ### Dashboards
 
 Forest Admin is able to tap into your actual data to chart out your metrics
 using a simple UI panel, a SQL query or a custom API call.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Dashboard.jpg" alt="Dashboard">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/dashboards.jpeg" alt="Dashboard">
 
 ### WYSIWYG
 
 The WYSIWYG interface saves you a tremendous amount of frontend development
 time using drag'n'drop as well as advanced widgets to build customizable views.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Wysiwyg.jpg" alt="WYSIWYG">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/wysiwyg.jpeg" alt="WYSIWYG">
 
 ### Custom HTML/JS/CSS
 
 Code your own views using JS, HTML, and CSS to display your application data in
 a more appropriate way (e.g. Kanban, Map, Calendar, Gallery, etc.).
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-CustomHTML.jpg" alt="Custom views">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/smart+views.jpeg" alt="Custom views">
 
 ### Team-based permissions
 
 Without any lines of code, manage directly from the UI who has access or can
 act on which data using a team-based permission system.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Teams.jpg" alt="Team based permissions">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/teams.jpeg" alt="Team based permissions">
 
 ### Third-party integrations
 
@@ -131,21 +131,21 @@ application’s data and providing it directly to your Admin Panel. All your
 actions can be performed at the same place, bringing additional intelligence to
 your Admin Panel and ensuring consistency.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-3rdParty.jpg" alt="Third-party integrations">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/integrations.jpeg" alt="Third-party integrations">
 
 ### Notes & Comments
 
 Assign your teammates to specific tasks, leave a note or simply comment a
 record, thereby simplifying collaboration all across your organization.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Notes.jpg" alt="Notes and Comments">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/notes+comments.jpeg" alt="Notes and Comments">
 
 ### Activity logs
 
 Monitor each action executed and follow the trail of modification on any data
 with an extensive activity log system.
 
-<img src="https://www.forestadmin.com/public/img/illustrations-dev/screens/ForestWebsite20-Activity.jpg" alt="Activity logs">
+<img src="https://forest-assets.s3.amazonaws.com/Github+README+assets/activity+logs.jpeg" alt="Activity logs">
 
 ## How to contribute
 

app/controllers/forest_liana/smart_actions_controller.rb

@@ -57,11 +57,8 @@ def find_resource(collection_name)
 
     # smart action permissions are retrieved from the action's endpoint and http_method
     def get_smart_action_request_info
-      endpoint = request.fullpath
-      # Trim starting '/'
-      endpoint[0] = '' if endpoint[0] == '/'
       {
-        endpoint: endpoint,
+        endpoint: request.fullpath,
         http_method: request.request_method
       }
     end

app/services/forest_liana/apimap_sorter.rb

@@ -93,6 +93,7 @@ def perform
           end
         end
 
+        @apimap['meta']['stack'] = reorder_keys_basic(@apimap['meta']['stack'])
         @apimap['meta'] = reorder_keys_basic(@apimap['meta'])
         @apimap
       rescue => exception

app/services/forest_liana/line_stat_getter.rb

@@ -23,7 +23,7 @@ def get_format
     end
 
     def perform
-      value = get_resource().eager_load(@includes)
+      value = get_resource().joins(@includes)
 
       unless @params[:filters].blank?
         value = FiltersParser.new(@params[:filters], value, @params[:timezone]).apply_filters

app/services/forest_liana/permissions_checker.rb

@@ -1,7 +1,7 @@
 module ForestLiana
   class PermissionsChecker
     @@permissions_cached = Hash.new
-    @@scopes_cached = Hash.new
+    @@renderings_cached = Hash.new
     @@roles_acl_activated = false
     # TODO: handle cache scopes per rendering
     @@expiration_in_seconds = (ENV['FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS'] || 3600).to_i
@@ -39,13 +39,16 @@ def fetch_permissions
         permissions['data'] = ForestLiana::PermissionsFormatter.convert_to_new_format(permissions['data'], @rendering_id)
         @@permissions_cached[@rendering_id] = permissions
       end
+
+      # NOTICE: Add stats permissions to the RenderingPermissions
+      permissions['data']['renderings'][@rendering_id]['stats'] = permissions['stats']
       add_scopes_to_cache(permissions)
     end
 
     def add_scopes_to_cache(permissions)
       permissions['data']['renderings'].keys.each { |rendering_id|
-        @@scopes_cached[rendering_id] = permissions['data']['renderings'][rendering_id]
-        @@scopes_cached[rendering_id]['last_fetch'] = Time.now
+        @@renderings_cached[rendering_id] = permissions['data']['renderings'][rendering_id]
+        @@renderings_cached[rendering_id]['last_fetch'] = Time.now
       } if permissions['data']['renderings']
     end
 
@@ -59,8 +62,6 @@ def is_allowed
         return stat_with_parameters_allowed?
       end
 
-      
-
       if permissions && permissions[@collection_name] &&
         permissions[@collection_name]['collection']
         if @permission_name === 'actions'
@@ -83,21 +84,25 @@ def is_allowed
     end
 
     def get_scope_in_permissions
-      @@scopes_cached[@rendering_id] &&
-      @@scopes_cached[@rendering_id][@collection_name] &&
-      @@scopes_cached[@rendering_id][@collection_name]['scope']
+      @@renderings_cached[@rendering_id] &&
+      @@renderings_cached[@rendering_id][@collection_name] &&
+      @@renderings_cached[@rendering_id][@collection_name]['scope']
     end
 
     def scope_cache_expired?
-      return true unless @@scopes_cached[@rendering_id] && @@scopes_cached[@rendering_id]['last_fetch']
+      return true unless @@renderings_cached[@rendering_id] && @@renderings_cached[@rendering_id]['last_fetch']
 
-      elapsed_seconds = date_difference_in_seconds(Time.now, @@scopes_cached[@rendering_id]['last_fetch'])
+      elapsed_seconds = date_difference_in_seconds(Time.now, @@renderings_cached[@rendering_id]['last_fetch'])
       elapsed_seconds >= @@expiration_in_seconds
     end
 
     # This will happen only on rolesACLActivated (as scope cache will always be up to date on disabled)
     def refresh_scope_cache
       permissions = ForestLiana::PermissionsGetter::get_permissions_for_rendering(@rendering_id, rendering_specific_only: true)
+
+      # NOTICE: Add stats permissions to the RenderingPermissions
+      permissions['data']['renderings'][@rendering_id]['stats'] = permissions['stats']
+
       add_scopes_to_cache(permissions)
     end
 
@@ -112,12 +117,12 @@ def get_permissions_content
     end
 
     def get_live_query_permissions_content
-      permissions = get_permissions
+      permissions = @@renderings_cached[@rendering_id]
       permissions && permissions['stats'] && permissions['stats']['queries']
     end
 
     def get_stat_with_parameters_content(statPermissionType)
-      permissions = get_permissions
+      permissions = @@renderings_cached[@rendering_id]
       permissions && permissions['stats'] && permissions['stats'][statPermissionType]
     end
 
@@ -177,7 +182,7 @@ def stat_with_parameters_allowed?
       return false unless pool_permissions
 
       # NOTICE: equivalent to Object.values in js & removes nil values
-      array_permission_infos = @query_request_info.values.filter_map{ |x| x unless x.nil? }
+      array_permission_infos = @query_request_info.values.select{ |x| !x.nil? }
 
       # NOTICE: Is there any pool_permissions containing the array_permission_infos
       return pool_permissions.any? {
@@ -201,7 +206,7 @@ def have_permissions_expired?
     # Used only for testing purpose
     def self.empty_cache
       @@permissions_cached = Hash.new
-      @@scopes_cached = Hash.new
+      @@renderings_cached = Hash.new
       @@roles_acl_activated = false
       @@expiration_in_seconds = (ENV['FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS'] || 3600).to_i
     end

app/services/forest_liana/token.rb

@@ -19,6 +19,7 @@ def self.create_token(user, rendering_id)
         first_name: user['first_name'],
         last_name: user['last_name'],
         team: user['teams'][0],
+        role: user['role'],
         rendering_id: rendering_id,
         exp: expiration_in_seconds()
       }, ForestLiana.auth_secret, 'HS256')

app/services/forest_liana/utils/beta_schema_utils.rb

@@ -6,7 +6,7 @@ def self.find_action_from_endpoint(collection_name, endpoint, http_method)
 
         return nil unless collection
 
-        collection.actions.find { |action| action.endpoint == endpoint && action.http_method == http_method }
+        collection.actions.find { |action| (action.endpoint == endpoint || "/#{action.endpoint}" == endpoint) && action.http_method == http_method }
       end
     end
   end

lib/forest_liana/bootstrapper.rb

@@ -203,10 +203,12 @@ def namespace_duplicated_models
 
     def setup_forest_liana_meta
       ForestLiana.meta = {
-        database_type: database_type,
         liana: 'forest-rails',
         liana_version: ForestLiana::VERSION,
-        orm_version: Gem.loaded_specs["activerecord"].version.version
+        stack: {
+           database_type: database_type,
+           orm_version: Gem.loaded_specs["activerecord"].version.version,
+        }
       }
     end