lesli 5.0.19 → 5.0.21

data/app/operators/lesli/role_operator.rb

@@ -34,12 +34,14 @@ module Lesli
     class RoleOperator < Lesli::ApplicationLesliService
 
         @role = nil
+        @action = nil
 
-        def initialize role
+        def initialize role, action=nil
             @role = role
+            @action = action
         end
 
-        def add_profile_privileges
+        def add_profile_actions
 
             # Adding default system actions for profile descriptor
             [
@@ -100,12 +102,15 @@ module Lesli
                 lesli_role_actions.role_id as role_id,
                 lesli_system_controllers.route as controller, 
                 lesli_system_controller_actions.name as action,
-                true as active
+                lesli_role_actions.deleted_at IS NULL as active
             )).with_deleted
 
 
             # get privileges only for the given role, this is needed to sync only modified roles
-            records = records.where("lesli_role_actions.role_id" => @role)
+            records = records.where("lesli_role_actions.role_id" => @role.id)
+
+            # get privileges only for the given role action, this is needed to sync only modified actions
+            records = records.where("lesli_role_actions.id" => @action.id) if @action
 
 
             # we use the deleted_at column to know if a privilege is enable or disable, NULL values

data/app/services/lesli/role/action_service.rb

@@ -6,7 +6,7 @@ module Lesli
             super(Lesli::Role::Action.with_deleted.find(id))
         end
 
-        def index params
+        def index role_id
 
             def clean action 
                 {
@@ -21,6 +21,7 @@ module Lesli
             role_actions = {}
 
             Lesli::Role::Action.with_deleted.joins(system_controller_action: :system_controller)
+            .where(:role_id => role_id)
             .select(
                 :id,
                 :role_id,
@@ -68,8 +69,6 @@ module Lesli
                 end
             end
 
-
-
             role_actions
         end
     end

data/app/services/lesli/role_service.rb

@@ -74,7 +74,7 @@ module Lesli
                     from lesli_role_actions
                     group by role_id
                 ) actions on actions.role_id = lesli_roles.id
-            )).where("lesli_roles.permission_level <= ?", current_user.max_object_level_permission)
+            )).where("lesli_roles.permission_level <= ?", current_user.max_level_permission)
             .select(
                 :id, 
                 :name, 
@@ -82,13 +82,13 @@ module Lesli
                 :isolated, 
                 :description,
                 :path_default, 
-                :object_level_permission, 
+                :permission_level, 
                 "users.users",
                 "actions.actions"
             )
             .page(query[:pagination][:page])
             .per(query[:pagination][:perPage])
-            .order(object_level_permission: :desc, name: :asc)
+            .order(permission_level: :desc, name: :asc)
         end
 
         # @overwrite

data/app/views/lesli/abouts/welcome.html.erb

@@ -20,9 +20,9 @@ html, body, * {
     background-color: #ffffff;
     background-position: 0 0,55px 55px;
     background-image:  
-        radial-gradient(#0d52bf 2px, transparent 2px), 
-        radial-gradient(#0d52bf 2px, #ffffff 2px);
-        animation: rotateBackground 12s linear infinite;
+        radial-gradient(#0d52bf 1px, transparent 2px), 
+        radial-gradient(#0d52bf 1px, #ffffff 2px);
+        animation: rotateBackground 10s linear infinite;
 }
 
 .page-welcome svg {
@@ -118,15 +118,18 @@ html, body, * {
         The Open Source Ruby on Rails <span>SaaS Development Framework</span>
     </h1>
     <div class="buttons">
-        <a class="doc" target="blank" href="https://www.lesli.dev/">
+        <a class="doc" target="blank" href="https://www.lesli.dev/lesli/">
             Documentation
         </a>
         <a class="start" target="blank" href="https://www.lesli.dev/start/">
             Getting started
         </a>
     </div>
-    <%= link_to("Apps", "/lesli/apps") unless defined?(LesliDashboard) %>
+    <% unless defined?(LesliShield) %>
+        <%= link_to("Apps", "/lesli/apps") unless defined?(LesliDashboard) %>
+    <% end %>
     <% if defined?(LesliShield) %>
+        <%= link_to("Apps", "/lesli/apps") if user_signed_in? && !defined?(LesliDashboard) %>
         <%= link_to("Dashboard", "/dashboard") if user_signed_in? && defined?(LesliDashboard) %>
         <%= link_to("Logout", "/logout") if user_signed_in? %>
         <%= link_to("Login", "/login") unless user_signed_in? %>

data/app/views/lesli/apps/show.html.erb

@@ -9,40 +9,28 @@ document.addEventListener('turbo:load', () => {
     })
 })
 </script>
-
-<%= render(LesliView::Layout::Container.new("lesli-apps", dashboard: true)) do %>
-
+<%
+@navigation_engines = [
+    :dashboard, 
+    :admin, 
+    :mailer,
+    :bell, 
+    :calendar, 
+    :papers,
+    :support,
+    :shield, 
+    :security,
+    :audit,
+    :babel
+]
+%>
+
+<%= render(LesliView::Layout::Container.new("lesli-apps", dashboard: false)) do %>
     <%= render("lesli_dashboard/dashboards/shared/header") if defined?(LesliDashboard) %>
 
-    <section 
-        class="lesli-application-engines">
-        <div class="engines-container">
-            <div class="engines">
-                <%# 01. Administration %>
-                <%= navigation_engine_admin %>
-
-                <%# 02. Sales & Marketing %>
-                <%= navigation_engine_mailer %>
-
-                <%# 03. Productivity & Teamwork%>
-                <%= navigation_engine_calendar %>
-                <%= navigation_engine_dashboard %>
-                <%= navigation_engine_bell %>
-                <%= navigation_engine_papers %>
-
-                <%# 05. Analytics %>
-                <%= navigation_engine_audit %>
-
-                <%# 07. IT & Help Desk %>
-                <%= navigation_engine_support %>
-
-                <%# 08. Security & Privacy %>
-                <%= navigation_engine_shield %>
-                <%= navigation_engine_security %>
-
-                <%# 09. Integrations %>
-                <%= navigation_engine_babel %>
-            </div>
-        </div>
+    <section class="columns is-multiline is-mobile is-centered engines">
+        <% @navigation_engines.each do |engine| %>
+            <%= public_send("navigation_engine_#{engine}") %>
+        <% end %>
     </section>
 <% end %>

data/app/views/lesli/errors/not_found.html.erb

@@ -0,0 +1,32 @@
+<style>
+.error-404 .material-symbols {
+    font-size: 8rem;
+    color: rgb(190,190,190);
+}
+.error-404 h2 {
+    font-size: 2rem;
+    color: #3d211b;
+}
+
+.error-404 p {
+    font-size: 1.4rem;
+    font-weight: 300;
+}
+</style>
+<%= render(LesliView::Layout::Container.new("accounts")) do %>
+    <section class="hero is-medium error-404">
+        <div class="hero-body has-text-centered">
+
+            <div class="mb-6">
+                <%= render(LesliView::Elements::Empty.new(text:nil)) %>
+            </div>
+
+            <h2 class="mb-4">404 Not found</h2>
+
+            <p>
+                <%= @message %>
+            </p>
+        </div>
+    </section>
+<% end %>
+

data/app/views/lesli/errors/unauthorized.html.erb

@@ -0,0 +1,48 @@
+<style>
+.error-401 .material-symbols {
+    font-size: 8rem;
+    color: rgb(190,190,190);
+}
+.error-401 h2 {
+    font-size: 2rem;
+    color: #7a0000;
+}
+
+.error-401 p {
+    font-size: 1.4rem;
+    font-weight: 300;
+}
+</style>
+<%= render(LesliView::Layout::Container.new("accounts")) do %>
+    <section class="hero is-medium error-401">
+        <div class="hero-body has-text-centered">
+
+            <div class="mb-6">
+                <span class="icon">
+                    <span class="material-symbols">
+                        shield_lock
+                    </span>
+                </span>
+            </div>
+
+            <h2 class="mb-4">401 Unauthorized</h2>
+
+            <p>
+                We could not validate your privileges. 
+                Please ask the administrator to send you an invite to see this content.
+            </p>
+
+            <div class="box mt-6">
+                <ul>
+                    <!--li><%= @error_object[:error_message] %></li-->
+                    <li>
+                        <%= @error_object.dig(:error_detail, :controller) %>
+                        (<%= @error_object.dig(:error_detail, :action) %>)
+                    </li>
+                    <li><%= @error_object[:error_role] %></li>
+                </ul>
+            </div>
+        </div>
+    </section>
+<% end %>
+

data/app/views/lesli/layouts/application-devise.html.erb

@@ -36,8 +36,8 @@ Building a better future, one line of code at a time.
 <html>
 <head>
     <script>const Lesli = <%= @lesli.to_json.html_safe %></script>
-    <%= render partial: "lesli/partials/application-head" %>
-    <%# render partial: "lesli/partials/application-data" %>
+    <%= render(partial: "lesli/partials/application-head") %>
+    <%# render(partial: "lesli/partials/application-data") %>
     <%= stylesheet_link_tag("lesli_shield/#{devise_controller}", media: "all") %>
     <%# Disable back button in browser after Logout using JavaScript %>
     <% if flash[:logout] == true %>

data/app/views/lesli/layouts/application-lesli.html.erb

@@ -40,14 +40,13 @@ Building a better future, one line of code at a time.
 </head>
 <body class="<%= application_body_class %>">
     <%= render(partial: "lesli/partials/application-lesli-header") %>
-    <%= render(partial: "lesli/partials/application-lesli-navigation") %>
     <%= render(partial: "lesli/partials/application-lesli-notifications") %>
     <main class="lesli-application-app">
         <%= render(partial: "lesli/partials/application-lesli-sidebar") %>
         <%= render(partial: "lesli/partials/application-lesli-content") %>
     </main>
     <%= render(partial: "lesli_assets/partials/application-lesli-icons-engines") %>
-    <%#= render(partial: "lesli/partials/application-analytics" %>
+    <%= render(partial: "lesli/partials/application-analytics") %>
     <%= yield(:application_lesli_body_bottom) %>
 </body>
 </html>

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

@@ -36,14 +36,14 @@ Building a better future, one line of code at a time.
 <% protected_controllers = ["confirmations"] %>
 
 <% # Get an specific site tracking id or use the development default %>
-<% tracking_id = Rails.application.credentials.dig(:providers, :analytics) %>
+<% tracking_id = Rails.application.credentials.dig(:providers, :google, :tag_manager) || ENV["PROVIDERS_GOOGLE_TAG_MANAGER"] %>
 
 <% # check if analytics is enabled in the settings file %>
 <% enable_analytics = Lesli.config.security[:enable_analytics] %>
 
 <% if Rails.env.production? && enable_analytics && tracking_id %>
 
-    <% if !protected_controllers.include?(controller_name) %>
+    <% unless protected_controllers.include?(controller_name) %>
 
         <!-- Google tag (gtag.js) -->
         <script async src="https://www.googletagmanager.com/gtag/js?id=<%= tracking_id %>"></script>

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

@@ -32,7 +32,6 @@ Building a better future, one line of code at a time.
 
 <%
 
-@lesli[:tickets] = 0
 @lesli[:notifications] = Lesli::Courier.new(:lesli_bell, 0).from(:notification_service, current_user).call(:count)
 
 %>

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

@@ -2,7 +2,7 @@
 
 Lesli
 
-Copyright (c) 2023, Lesli Technologies, S. A.
+Copyright (c) 2025, 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
@@ -17,9 +17,9 @@ 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
+Made with ♥ by LesliTech
 Building a better future, one line of code at a time.
 
 @contact  hello@lesli.tech
@@ -42,7 +42,7 @@ Building a better future, one line of code at a time.
 
 <%# rails standard meta tags %>
 <%= csrf_meta_tags %>
-<%#= favicon %>
+<%= favicon %>
 
 <%# provide a short description of the page %>
 <meta name="description" content="<%#= website_meta_description %>">

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

@@ -30,23 +30,16 @@ Building a better future, one line of code at a time.
 // · 
 %>
 
-<%# check if custom navigation partial exists, getting the path from application helper %>
-<% custom_navigation_path = "partials/application-lesli-header" %>
+<%# Get the navigation partial for every engine %>
+<% engine_navigation_partial = navigation_partial %>
 
-<%# validate the path to be sure the partial exists when trying to render it %>
-<% custom_navigation_exists = lookup_context.exists?(custom_navigation_path, nil, true) %>
-
-<%# render navigation partial %>
-<% if custom_navigation_exists %>
-
-    <%= render partial: custom_navigation_path %>
-
-<% else %>
 <header class="lesli-application-header">
-    <nav class="lesli-navbar navbar" role="navigation" aria-label="main navigation">
-        <div class="container" x-data="{ navActive: false }">
+    <div class="container" x-data="{ navActive: false }">
+        <nav class="navbar" role="navigation" aria-label="main navigation">
             <div class="navbar-brand">
-                <a href="<%= defined?(LesliDashboard) ? '/dashboard' : '/' %>" class="application-navbar-brand">
+                <a 
+                    class="navbar-item p-0"
+                    href="<%= defined?(LesliDashboard) ? '/dashboard' : '/' %>">
                     <%= customization_instance_logo_tag(logo: "app-logo", options: { alt: "Lesli app logo" }) %>
                 </a>
                 <a  
@@ -62,68 +55,55 @@ Building a better future, one line of code at a time.
                     <span aria-hidden="true"></span>
                 </a>
             </div>
-            <div class="navbar-menu" 
-                :class="{ 'is-active': navActive }">
-                <div class="navbar-start">
-                </div>
-                <div class="navbar-end">
+            <div class="navbar-menu" :class="{ 'is-active': navActive }">
+                <div class="navbar-end is-flex is-justify-content-center">
 
+                    <!-- notifications -->
                     <div class="navbar-item">
-                        <div class="header-icons field is-grouped is-justify-content-center">
-                            <div class="control">
-
-                                <!-- tasks -->
-                                <% if defined?(LesliFocus) %>
-                                    <a v-if="props.showFocus" class="header-indicator"
-                                        @click="() => { storeLayout.showSuppor = true }">
-                                        <span class="ri-list-check-3">
-                                        </span>
-                                        <span class="count" v-if="storeLayout.header.support > 0">
-                                        </span>
-                                    </a>
-                                <% end %>
-
-                                <!-- tickets -->
-                                <% if defined?(LesliSupport) %>
-                                    <%= link_to(
-                                        lesli_support.tickets_path, 
-                                        :class => "header-indicator",
-                                        :data => { turbo_frame: '_top' }) do %>
-                                        <span class="ri-ticket-2-line"></span>
-                                        <% if @lesli[:tickets] > 0 %>
-                                            <span class="count"></span>
-                                        <% end %>
-                                    <% end %>
-                                <% end %>
-
-                                <!-- notifications -->
-                                <% if defined?(LesliBell) %>
-                                    <%= link_to(
-                                        lesli_bell.notifications_path, 
-                                        :class => "header-indicator",
-                                        :data => { turbo_frame: '_top' }) do %>
-                                        <% if @lesli[:notifications] > 0 %>
-                                            <span class="ri-notification-3-fill has-text-primary"></span>
-                                        <% else %>
-                                            <span class="ri-notification-3-line"></span>
-                                        <% end %>
-                                    <% end %>
+                        <% if defined?(LesliBell) %>
+                            <%= link_to(
+                                lesli_bell.notifications_path, 
+                                :class => "header-indicator",
+                                :data => { turbo_frame: '_top' }) do %>
+                                <% if @lesli[:notifications] > 0 %>
+                                    <span class="ri-notification-3-fill has-text-primary"></span>
+                                <% else %>
+                                    <span class="ri-notification-3-line"></span>
                                 <% end %>
+                            <% end %>
+                        <% end %>
+                    </div>
 
-                                <!-- module selector -->
-                                <%= navigation_link(lesli.apps_path, nil, "ri-apps-2-line") %>
+                    <!-- app selector -->
+                    <div class="navbar-item">
+                        <%= navigation_link(lesli.apps_path, nil, "ri-apps-2-line") %>
+                    </div>
 
-                                <!-- user profile -->
-                                <%= navigation_link(lesli.apps_path, nil, "ri-user-smile-line") %>
+                    <!-- user profile -->
+                    <div class="navbar-item">
+                        <%= navigation_link(lesli.apps_path, nil, "ri-user-smile-line") %>
+                    </div>
 
-                                <!-- logout from session -->
-                                <%= navigation_link(main_app.destroy_user_session_path, nil, "ri-logout-circle-r-line") if defined?(LesliShield) %>
-                            </div>
-                        </div>
+                    <!-- logout from session -->
+                    <div class="navbar-item">
+                        <%= navigation_link(main_app.destroy_user_session_path, nil, "ri-logout-circle-r-line") if defined?(LesliShield) %>
                     </div>
                 </div>
+                <div class="navbar-end is-hidden-desktop">
+                    <%= render(engine_navigation_partial) if engine_navigation_partial %>
+                </div>
+            </div>
+        </nav>
+    </div>
+</header>
+
+<%# Build the engine navigation %>
+<% if engine_navigation_partial %>
+    <nav class="navbar lesli-application-navigation is-hidden-touch">
+        <div class="navbar-menu">
+            <div class="navbar-start is-flex-grow-1 is-justify-content-center">
+                <%= render(engine_navigation_partial) %>
             </div>
         </div>
     </nav>
-</header>
 <% end %>

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

@@ -48,12 +48,30 @@ Building a better future, one line of code at a time.
 
 <%# render navigation partial %>
 <% if custom_sidebar_exists %>
-<nav class="lesli-navbar navbar lesli-application-navigation" role="navigation" aria-label="main navigation">
-        <div class="navbar-menu">
-            <div class="navbar-end">
-                <%= render partial: custom_sidebar_path %>
-            </div>
+<nav 
+    class="navbar lesli-application-navigation" 
+    role="navigation" 
+    aria-label="main navigation"
+    x-data="{ navActive: false }">
+    <div class="navbar-brand">
+        <a  
+            class="navbar-burger" 
+            role="button" 
+            aria-label="menu" 
+            aria-expanded="false" 
+            @click="navActive = !navActive"
+            :class="{ 'is-active': navActive }">
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+            <span aria-hidden="true"></span>
+        </a>
+    </div>
+    <div class="navbar-menu" :class="{ 'is-active': navActive }">
+        <div class="navbar-start is-flex-grow-1 is-justify-content-center">
+            <%= render partial: custom_sidebar_path %>
         </div>
+    </div>
 </nav>
 <% else %>
     <!-- no navigation found -->

data/config/importmap.rb

@@ -2,13 +2,3 @@
 
 pin "application", to: "lesli/application.js", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js"
-
-
-
-#pin "chart.js", to: "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.js"
-#pin "chart.js", to: "https://ga.jspm.io/npm:chart.js@4.5.1/dist/chart.esm.js"
-
-
-
-# my_engine/config/importmap.rb
-#pin_all_from File.expand_path("../app/assets/javascripts", __dir__)

data/config/initializers/devise_rails_8_patch.rb

@@ -0,0 +1,8 @@
+require 'devise'
+
+module Devise
+    def self.mappings
+        Rails.application.try(:reload_routes_unless_loaded)
+        @@mappings
+    end
+end