lesli 5.0.0 → 5.0.1

data/app/controllers/lesli/application_lesli_controller.rb

@@ -47,7 +47,7 @@ module Lesli
         before_action :set_helpers_for_request
         before_action :set_customization
 
-        after_action  :log_user_requests
+        after_action  :log_requests
 
         layout "lesli/layouts/application-lesli"
 

data/app/controllers/lesli/interfaces/application/logger.rb

@@ -57,33 +57,58 @@ module Lesli
                     "#{user_agent.platform} #{user_agent.os} - #{user_agent.browser} #{user_agent_version}"
                 end
 
-                # Track all user activity
-                # this is disabled by default in the settings file
-                def log_user_requests
+                def log_requests
+                    log_account_requests
+                    log_user_requests
+                end 
+
+                def log_account_requests
                     return unless Lesli.config.security.dig(:enable_analytics)
                     return unless current_user
                     return unless session[:user_session_id]
 
-
                     # Try to save a unique record for this request configuration
-                    current_user.requests.upsert(
+                    current_user.account.requests.upsert(
                         {
                             request_controller: controller_path,
                             request_action: action_name,
                             request_method: request.method,
-                            request_count: 1,
-                            session_id: session[:user_session_id]
+                            request_count: 1
                         },
                         
                         # group of columns to consider a request as unique
-                        unique_by: %i[request_controller request_action user_id session_id],
+                        unique_by: %i[request_controller request_action created_at account_id],
 
                         # if request id is not unique, increase the counter for this configuration
-                        on_duplicate: Arel.sql("request_count = lesli_user_requests.request_count + 1")
+                        on_duplicate: Arel.sql("request_count = lesli_account_requests.request_count + 1")
                     )
+                end
 
-                    # update the last used date for the current session
-                    #current_user.sessions.where(id: session[:user_session_id]).first&.touch(:last_used_at)
+                # Track all user activity
+                # this is disabled by default in the settings file
+                def log_user_requests
+                    return unless Lesli.config.security.dig(:enable_analytics)
+                    return unless current_user
+                    return unless session[:user_session_id]
+
+                    # Try to save a unique record for this request configuration
+                    current_user.requests.upsert(
+                        {
+                            request_count: 1,
+                            session_id: session[:user_session_id]
+                        },
+                        
+                        # group of columns to consider a request as unique
+                        unique_by: %i[created_at user_id session_id],
+
+                        # if request id is not unique
+                        #   - increase the counter for this configuration
+                        #   - update the datetime of the last request
+                        on_duplicate: Arel.sql(
+                            'request_count = lesli_user_requests.request_count + 1,'\
+                            'updated_at = current_timestamp'
+                        )
+                    )
                 end
 
                 # Track user agents

data/app/helpers/lesli/navigation_helper.rb

@@ -280,10 +280,10 @@ module Lesli
 
         # 08.03 Audit engine
         def navigation_engine_audit(title: "Audit", subtitle: "Activity, logs, security and more")
-            return unless defined? CloudAudit
+            return unless defined? LesliAudit
 
-            navigation_engine_item(title, subtitle, "audit", cloud_audit.root_path,
-                                   controller_path.include?("cloud_audit"))
+            navigation_engine_item(title, subtitle, "audit", lesli_audit.root_path,
+                                   controller_path.include?("lesli_audit"))
         end
 
         # INTEGRATIONS

data/app/lib/lesli/system.rb

@@ -42,7 +42,7 @@ module Lesli
             engines() if ENGINES.empty?
 
             # return specific property if requested
-            return ENGINES[engine][property] unless property.blank?
+            return ENGINES[engine][property.to_sym] unless property.blank?
 
             # return the engine info
             return ENGINES[engine]
@@ -55,7 +55,7 @@ module Lesli
             # due we do not know the engine mounted path we have to look up for it every
             # time we load the html view so we can use the dynamic route from the main rails app
             # we use this in the url plugin 
-            ["Lesli", "LesliAdmin", "LesliBabel"].each do |engine|
+            LESLI_ENGINES.each do |engine|
                 next unless Object.const_defined?(engine)
                 ENGINES[engine]= {
                     :code => engine.underscore, 
@@ -76,5 +76,7 @@ module Lesli
             return "Lesli" if name == "Lesli"
             name.sub("Lesli", "")
         end
+
+        LESLI_ENGINES = ["Lesli", "LesliAdmin", "LesliBabel", "LesliAudit", "LesliBell"]
     end
 end

data/app/models/lesli/account/request.rb

@@ -0,0 +1,37 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module Lesli
+    class Account::Request < ApplicationRecord
+        belongs_to :account        
+    end
+end

data/app/models/lesli/account.rb

@@ -43,6 +43,7 @@ module Lesli
         has_many :roles
         has_many :files
         has_many :cronos
+        has_many :requests
         has_many :settings
         has_many :locations
         has_many :feedbacks

data/app/models/lesli/system_controller.rb

@@ -33,5 +33,70 @@ Building a better future, one line of code at a time.
 module Lesli
     class SystemController < ApplicationLesliRecord
         has_many :actions
+
+        def self.index matrix:false
+
+            # get a matrix of controllers and actions
+            c = SystemController.joins(:actions).select(
+                "lesli_system_controllers.engine as engine",
+                "lesli_system_controllers.reference as controller",
+                "lesli_system_controllers.name as controller_name",
+                "lesli_system_controllers.id as controller_id",
+                "lesli_system_controller_actions.name as action",
+                "lesli_system_controller_actions.id as action_id",
+                "case lesli_system_controller_actions.name
+                    when 'index'   then 1
+                    when 'show'    then 2
+                    when 'new'     then 3
+                    when 'edit'    then 4
+                    when 'create'  then 5
+                    when 'update'  then 6
+                    when 'destroy' then 7
+                    when 'options' then 8
+                    else 9
+                end as importance
+                "
+            )
+            .where("lesli_system_controllers.deleted_at is NULL")
+            #.where("system_controller_actions.name in ('index', 'create', 'update', 'show', 'destroy')")
+            #.order("system_controllers.name, importance, system_controller_actions.name")
+            .order("importance DESC")
+    
+            return c unless matrix
+    
+            cc = {}
+    
+            # convert the matrix to a hash of engines with controllers and available actions as values
+            # example:
+            #   my_engine: { my_controller: [ my list of actions ]}
+            c.each do |c|
+
+                engine = c[:engine]
+                controller = c[:controller]
+    
+                # create a uniq container for every action that belongs to a specific controller
+                if cc[engine].blank?
+                    cc[engine] = {}
+                end
+
+                # create a uniq container for every action that belongs to a specific controller
+                if cc[engine][controller].blank?
+                    cc[engine][controller] = { 
+                        id: c[:controller_id], 
+                        name: c[:controller_name], 
+                        actions: []
+                    } 
+                end
+
+                # push every action to his specic controller
+                cc[engine][controller][:actions].push({ 
+                    id: c[:action_id], 
+                    action: c[:action]
+                })
+            end
+    
+            return cc
+    
+        end
     end
 end

data/app/models/lesli/user/request.rb

@@ -33,5 +33,6 @@ Building a better future, one line of code at a time.
 module Lesli
     class User::Request < ApplicationRecord
         belongs_to :user
+        belongs_to :session
     end
 end

data/app/views/lesli/partials/_application-lesli-engines.html.erb

@@ -33,7 +33,7 @@ Building a better future, one line of code at a time.
 %>
 
 <%# Standard module selector %>
-<application-component-engines>
+<lesli-application-engines>
 
     <%# Core %>
     <%= navigation_engine_admin %>
@@ -80,4 +80,4 @@ Building a better future, one line of code at a time.
     <%# Intelligence %>
     <%= navigation_engine_scraper %>
 
-</application-component-engines>
+</lesli-application-engines>

data/app/views/lesli/partials/_application-lesli-header.html.erb

@@ -43,7 +43,7 @@ Building a better future, one line of code at a time.
 
 <%# if custom header does not exists, use the main from core %>
 <% unless custom_header_exists %>
-    <application-component-header 
+    <lesli-application-header 
         <%= "show-bell" if defined?(CloudBell) %>
         <%= "show-announcements" if defined?(CloudBell) %>
         <%= "show-focus" if defined?(CloudFocus) %>
@@ -75,5 +75,5 @@ Building a better future, one line of code at a time.
                 </div>
             </div>
         <% end %>
-    </application-component-header>
+    </lesli-application-header >
 <% end %>

data/db/migrate/v1.0/0010001210_create_lesli_account_activities.rb

@@ -33,7 +33,7 @@ Building a better future, one line of code at a time.
 class CreateLesliAccountActivities < ActiveRecord::Migration[6.0]
     def change
 
-        gem_path = Lesli::System.engine("lesli")
+        gem_path = Lesli::System.engine("Lesli", "dir")
         table_base_structure = JSON.parse(File.read(File.join(gem_path, "db", "structure", "00000004_activities.json")))
 
         create_table :lesli_account_activities do |t|

data/db/migrate/v1.0/0010001510_create_lesli_account_requests.rb

@@ -0,0 +1,45 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails Development Platform.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// ·
+=end
+
+class CreateLesliAccountRequests < ActiveRecord::Migration[6.0]
+    def change
+        create_table :lesli_account_requests do |t|
+            t.string    :request_controller
+            t.string    :request_action
+            t.string    :request_method
+            t.integer   :request_count
+            t.date      :created_at
+        end
+        add_reference(:lesli_account_requests, :account, foreign_key: { to_table: :lesli_accounts })
+        add_index(:lesli_account_requests, %i[request_controller request_action created_at account_id], unique: true, name: "lesli_account_requests_index")
+    end
+end

data/db/migrate/v1.0/{0010003310_create_lesli_user_requests.rb → 0010003810_create_lesli_user_requests.rb}

@@ -33,16 +33,12 @@ Building a better future, one line of code at a time.
 class CreateLesliUserRequests < ActiveRecord::Migration[6.0]
     def change
         create_table :lesli_user_requests do |t|
-            t.string    :request_controller
-            t.string    :request_action
-            t.string    :request_method
             t.integer   :request_count
-            t.timestamps
+            t.date      :created_at
+            t.datetime  :updated_at
         end
-
         add_reference(:lesli_user_requests, :user, foreign_key: { to_table: :lesli_users })
         add_reference(:lesli_user_requests, :session, foreign_key: { to_table: :lesli_user_sessions })
-        #add_index(:lesli_user_requests, %i[request_controller request_action user_id], unique: true, name: "lesli_user_requests_index")
-        add_index(:lesli_user_requests, %i[request_controller request_action user_id session_id], unique: true, name: "lesli_user_requests_index")
+        add_index(:lesli_user_requests, %i[created_at user_id session_id], unique: true, name: "lesli_user_requests_index")
     end
 end

data/lib/lesli/version.rb

@@ -1,34 +1,4 @@
-=begin
-Lesli
-
-Copyright (c) 2023, Lesli Technologies, S. A.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see http://www.gnu.org/licenses/.
-
-Lesli · Ruby on Rails SaaS Development Framework.
-
-Made with ♥ by https://www.lesli.tech
-Building a better future, one line of code at a time.
-
-@contact  hello@lesli.tech
-@website  https://www.lesli.dev
-@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
-
-// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// · 
-=end
-
 module Lesli
-    VERSION = "5.0.0"
+  VERSION = "5.0.1"
+  BUILD = "1696568414"
 end

data/lib/sass/lesli/layouts/application-component.scss

@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see http://www.gnu.org/licenses/.
 
-Lesli · Ruby on Rails SaaS development platform.
+Lesli · Ruby on Rails SaaS Development Framework.
 
 Made with ♥ by https://www.lesli.tech
 Building a better future, one line of code at a time.
@@ -27,24 +27,13 @@ Building a better future, one line of code at a time.
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// ·  
-
-*/
-
-
 // · 
-#lesli-application {
-    //padding-top: var(--lesli-header-height);
-    display: flex;
-    flex-wrap: wrap;
-}
+*/
 
 
 // · 
-section.lesli-element-content {
-    // margin-left: var(--lesli-sidebar-width);
-    // max-width: calc(100% - var(--lesli-sidebar-width));
-    // min-height: calc(100vh - var(--lesli-header-height) - var(--lesli-footer-height));
-    // min-height: calc(100vh - var(--lesli-header-height)); // footer is not enable
-    // background-color: aquamarine;
+.lesli-application-component {
+    border-radius: .6rem;
+    box-shadow: $lesli-box-shadow;
+    background-color: lesli-css-color(solid, white);
 }

data/lib/sass/lesli/{elements/content.scss → layouts/application-container.scss}

@@ -29,9 +29,3 @@ Building a better future, one line of code at a time.
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
 */
-
-div.lesli-element-content {
-    border-radius: .6rem;
-    box-shadow: $lesli-box-shadow;
-    background-color: lesli-css-color(solid, white);
-}

data/lib/sass/lesli/layouts/application-engines.scss

@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see http://www.gnu.org/licenses/.
 
-Lesli · Ruby on Rails SaaS development platform.
+Lesli · Ruby on Rails SaaS Development Framework.
 
 Made with ♥ by https://www.lesli.tech
 Building a better future, one line of code at a time.
@@ -27,8 +27,7 @@ Building a better future, one line of code at a time.
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// ·  
-
+// · 
 */
 
 .lesli-application-engines {
@@ -38,118 +37,89 @@ Building a better future, one line of code at a time.
     position: fixed;
     z-index: 98;
 
-    .engines {
+    .engines-container {
         width: 100%;
         height: 100%;
-        padding: 1.3rem;
+        padding: 1.6rem;
         
         overflow-y: scroll;
         margin-top: var(--lesli-header-height);
         background-color: var(--lesli-color-background);
         @include lesli-css-scrollbar(hide);
 
-        // engine
-        a {
+        .engines {
             width: 100%;
-            height: 105px;
+            margin: 0 auto;
+            max-width: 1408px;
+
             display: flex;
-            text-align: left;
+            flex-wrap: wrap;
             align-items: center;
-            padding: 1rem .4rem;
-            margin-bottom: 1rem;
-            border-radius: .8rem;
-            border: 2px solid transparent;
-            background-color: lesli-css-color(silver, 100);
-            box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.1);
-            transition: all ease-in-out .4s;
-            box-shadow: $lesli-box-shadow;
-            width: 320px;
-            height: 263px;
             flex-direction: column;
             justify-content: center;
-            margin-bottom: 2rem;
-            div {
-                text-align: center;
-            }
-            &:hover {
-                background-color: #F0F4FF;
-            }
-            &.is-active {
-                background-color: #F0F4FF;
-                border-color: var(--lesli-color-primary);
-                box-shadow: none;
-            }
-        }
 
-        // engine icon
-        svg {
-            margin-right: .4rem;
-            fill: $primary;
-        }
+            // engine link
+            a {
+                width: 100%;
+                height: 200px;
+                display: block;
 
-        // title
-        span {
-            font-weight: 600;
-            font-size: 20px;
-        }
+                text-align: center;
+                padding: 1rem .4rem;
+                margin-bottom: 2rem;
+                border-radius: .5rem;
+                border: transparent 1px solid;
+                box-shadow: $lesli-box-shadow;
+                background-color: lesli-css-color(silver, 100);
+                background-color: #FFFFFF;
+                transition: all ease-in-out .4s;
+
+                &:hover {
+                    border-color: var(--lesli-color-primary);
+                }
 
-        // subtitle
-        p {
-            font-size: 14;
-        }
+                &.is-active {
+                    background-color: #F0F4FF;
+                    border-color: var(--lesli-color-primary);
+                }
 
-        span, p {
-            color: var(--lesli-color-primary);
-        }
+                // engine logo
+                svg {
+                    margin-right: .4rem;
+                    fill: var(--lesli-color-primary);
+                }
 
-        // close button 
-        button {
-            width: 100%;
-        }
-    }
-}
+                // engine description
+                p {
+                    font-size: 14;
+                }
 
-@include lesli-css-breakpoint-tablet() {
-    .lesli-application-engines {
-        .container {
-            display: flex;
-            flex-wrap: wrap;
-            align-content: flex-start;
-            justify-content: space-between;
-            margin-left: var(--lesli-sidebar-width);
-            max-width: calc(100% - var(--lesli-sidebar-width));
+                // engine name
+                span {
+                    font-weight: 600;
+                    font-size: 20px;
+                }
 
-            // engine
-            a {
-                width: 320px;
-                height: 263px;
-                flex-direction: column;
-                justify-content: center;
-                margin-bottom: 2rem;
-                div {
-                    text-align: center;
+                span, p {
+                    color: var(--lesli-color-primary);
                 }
             }
+        }
 
-            // engine icon
-            svg {
-                margin-right: 0;
-                margin-bottom: 1rem;
-            }
+        // close button 
+        button {
+            width: 100%;
         }
     }
 }
 
-@include lesli-css-breakpoint-desktop() {
-    .lesli-application-engines {
-        .container {
-            justify-content: flex-start;
 
-            // engine
-            a {
-                margin-right: 1.4rem;
-                margin-bottom: 1.4rem;
-            }
+@include lesli-css-breakpoint-tablet() {
+    .lesli-application-engines .engines-container .engines {
+        flex-direction: row;
+        a {
+            width: 320px;
+            margin: 1rem;
         }
     }
 }

data/lib/sass/lesli/layouts/application-header.scss

@@ -139,6 +139,11 @@ header.lesli-application-header {
 
                 .dropdown-content {
                     width: 100%;
+                    padding: 0;
+
+                    hr.dropdown-divider {
+                        margin: 0;
+                    }
                 }
             }