lesli 5.0.12 → 5.0.14

data/app/services/lesli/{user_session_service.rb → user/session_service.rb}

@@ -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 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
@@ -28,11 +28,28 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-
 =end
 
 module Lesli
-    class UserSessionService < ApplicationLesliService
+    class User::SessionService < ApplicationLesliService
+
+        def index
+            Lesli::User::Session
+            .joins(:user)
+            .select(
+                :id,
+                :user_id,
+                :first_name,
+                :session_source,
+                Date2.new.date_time.db_column("created_at", "lesli_user_sessions"),
+                Date2.new.date_time.db_column("last_used_at"),
+                Date2.new.date_time.db_column("expiration_at"),
+                "CONCAT_WS(' ', agent_platform, agent_os, '/', agent_browser, agent_version) as device"
+            )
+            .page(query[:pagination][:page])
+            .per(query[:pagination][:perPage])
+            .order(updated_at: :desc)
+        end
 
         # create a new session
         def create(user_agent, remote_ip, session_source="devise_standard_session")
@@ -52,18 +69,10 @@ module Lesli
                 :usage_count => 1
             })
 
-            # register a successful sign-in log for the current user
-            current_user.logs.update(
-                session_id: current_session[:id], 
-                title: "session_creation_successful", 
-                description: current_session[:session_source] 
-            )
-
             # register or sync the current_user with the user representation on Firebase
             #Courier::One::Firebase::User.sync_user(@resource) if defined? CloudOne
 
-            return current_session
-
+            self.response(current_session)
         end
     end
 end

data/app/services/lesli/user_service.rb

@@ -33,6 +33,11 @@ Building a better future, one line of code at a time.
 module Lesli
     class UserService < Lesli::ApplicationLesliService
 
+        def find id
+            #super(current_user.account.users.joins(:detail).find_by(id: id))
+            super(current_user.account.users.find_by(id: id))
+        end
+
 
         # Return a list of users that belongs to the account of the current_user
         # this list is meant to be used in selectors, autocomplets, etc
@@ -42,6 +47,19 @@ module Lesli
             if params[:role].present?
                 # add simple quotes to the roles so the sql can manage the query
                 roles = params[:role].split(",").map { |role| "'#{role}'" }.join(", ")
+                # users = users.joins("
+                #     inner join (
+                #         select
+                #             ur.users_id, string_agg(r.\"name\", ', ') role_names
+                #         from user_roles ur
+                #         join roles r
+                #             on r.id = ur.role_id 
+                #             and r.name in ( #{ roles } )
+                #         where ur.deleted_at is null
+                #         group by ur.users_id
+                #     ) roles on roles.users_id = users.id
+                # ")
+
                 users = users.joins("
                     inner join (
                         select
@@ -49,19 +67,85 @@ module Lesli
                         from user_roles ur
                         join roles r
                             on r.id = ur.role_id 
-                            and r.name in ( #{ roles } )
+                            and r.name in (:roles)
                         where ur.deleted_at is null
                         group by ur.users_id
                     ) roles on roles.users_id = users.id
                 ")
+                .where('r.name IN (:roles)', roles: roles)
+
             end
 
             users.order(name: :asc).select(
                 :id,
                 :email,
                 "CONCAT_WS(' ', first_name, last_name) as name",
-                "COALESCE(alias, email) as alias"
+                "COALESCE(NULLIF(alias,''), email) as alias"
             ).as_json
         end
+
+        # @return [Array] Paginated index of users.
+        # @description Return a paginated array of users, used mostly in frontend views
+        # TODO: Implement pg_search
+        def index params
+
+            # sql string to join to user_roles and get all the roles assigned to a user
+            sql_string_for_user_roles = "left join (
+                select
+                    ur.user_id, string_agg(r.\"name\", ', ') rolenames
+                from lesli_user_roles ur
+                join lesli_roles r
+                    on r.id = ur.role_id
+                where ur.deleted_at is null
+                group by ur.user_id
+            ) roles on roles.user_id = lesli_users.id"
+
+            # sql string to joing to user_sessions and get all the active sessions of a user
+            sql_string_for_user_sessions = "left join (
+                select
+                    max(last_used_at) as last_action_performed_at,
+                    user_id
+                from lesli_user_sessions us
+                where us.deleted_at is null
+                group by(us.user_id)
+            ) sessions on sessions.user_id = lesli_users.id"
+
+            current_user.account.users
+            .joins(sql_string_for_user_roles)
+            .joins(sql_string_for_user_sessions)
+            .page(query[:pagination][:page])
+            .per(query[:pagination][:perPage])
+            .select(
+                :id,
+                "CONCAT(COALESCE(lesli_users.first_name, ''), ' ', COALESCE(lesli_users.last_name, '')) as fullname",
+                :email,
+                :active,
+                :rolenames,
+                Date2.new.date_time.db_column("current_sign_in_at")
+            )
+        end
+
+        # Creates a query that selects all user information from several tables if CloudLock is present
+        def show
+            resource
+        end
+
+        def update params
+
+            # old_attributes = resource.detail.attributes.merge({
+            #     active: resource.active
+            # })
+
+            if resource.update(params)
+                # new_attributes = resource.detail.attributes.merge({
+                #     active: resource.active
+                # })
+                #resource.log_activity_update(current_user, resource, old_attributes, new_attributes)
+            else
+                self.error(resource.errors.full_messages.to_sentence)
+            end
+            
+            self
+        end
     end
 end

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

@@ -0,0 +1,52 @@
+<script>
+document.addEventListener('turbo:load', () => {
+    const stored = localStorage.getItem('engineData')
+    const data = stored ? JSON.parse(stored) : { engines: [] }
+
+    data.engines.forEach(id => {
+        const el = document.getElementById(id.replace("lesli"))
+        console.log(id.replace("lesli",""))
+        console.log(el)
+        if (el) el.style.display = 'none'
+    })
+})
+</script>
+
+<%= render(LesliView::Layout::Container.new("lesli-apps", dashboard: true)) do %>
+    <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_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>
+            <button class="button is-hidden-tablet">
+                <span class="icon">
+                    <i class="ri-close-line"></i>
+                </span>
+                <span>close</span>
+            </button>
+        </div>
+    </section>
+<% end %>

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

@@ -1,9 +1,8 @@
-<%
-=begin
+<%#
 
 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
@@ -29,7 +28,6 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-=end
 %>
 
 <% devise_controller = controller_path.split('/')[1] %>
@@ -44,9 +42,9 @@ Building a better future, one line of code at a time.
     <%# Disable back button in browser after Logout using JavaScript %>
     <% if flash[:logout] == true %>
         <script>
-            history.pushState(null, null, null);
+            history.pushState(null, null, null, null, null);
             window.addEventListener('popstate', function () {
-                history.pushState(null, null, null);
+                history.pushState(null, null, null, null, null);
             });
         </script>
     <% end %>
@@ -54,6 +52,6 @@ Building a better future, one line of code at a time.
 <body class="<%= application_body_class() %>">
     <%= yield %>
     <%= javascript_include_tag("lesli_shield/#{devise_controller}") %>
-    <%= render partial: "lesli/partials/application-analytics" %>
+    <%= render(partial: "lesli/partials/application-analytics") %>
 </body>
 </html>

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

@@ -1,9 +1,8 @@
-<%
-=begin
+<%#
 
 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
@@ -20,38 +19,35 @@ 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
+Made with ♥ by LesliTech
 Building a better future, one line of code at a time.
 
 @contact  hello@lesli.tech
-@website  https://www.lesli.dev
+@website  https://www.lesli.tech
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-=end
 %>
 
 <!DOCTYPE html>
 <html>
 <head>
-    <%= render partial: "lesli/partials/application-head" %>
-    <%= render partial: "lesli/partials/application-data" %>
-    <%= render partial: "lesli/partials/application-lesli-scss" %>
+    <%= render(partial: "lesli/partials/application-head") %>
+    <%= render(partial: "lesli/partials/application-data") %>
+    <%= render(partial: "lesli/partials/application-lesli-scss") %>
+    <%= render(partial: "lesli/partials/application-lesli-javascript") %>
 </head>
-<body class="<%#= application_body_class() %>">
-    <main id="lesli-application" v-cloak>
-        <%= render partial: "lesli/partials/application-lesli-header" %>
-        <%= render partial: "lesli/partials/application-lesli-navigation" %>
-        <%#= render partial: "lesli/partials/application-lesli-notices" %>
-        <%= render partial: "lesli/partials/application-lesli-sidebar" %>
-        <%= render partial: "lesli/partials/application-lesli-content" %>
-        <%= render partial: "lesli/partials/application-lesli-engines" %>
-        <%= render partial: "lesli/partials/application-lesli-panels" %>
-        <%#= render partial: "lesli/partials/application-lesli-footer" %>
+<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/partials/application-lesli-javascript" %>
-    <%= render partial: "lesli/partials/application-lesli-icons" %>
-    <%= render partial: "lesli/partials/application-analytics" %>
+    <%= render(partial: "lesli_assets/partials/application-lesli-icons-engines") %>
+    <%#= render(partial: "lesli/partials/application-analytics" %>
+    <%= yield(:application_lesli_body_bottom) %>
 </body>
 </html>

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

@@ -36,12 +36,12 @@ 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, :analytics) %>
 
 <% # check if analytics is enabled in the settings file %>
 <% enable_analytics = Lesli.config.security[:enable_analytics] %>
 
-<% if Rails.env.production? && enable_analytics %>
+<% if Rails.env.production? && enable_analytics && tracking_id %>
 
     <% if !protected_controllers.include?(controller_name) %>
 

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

@@ -1,5 +1,4 @@
-<%
-=begin
+<%#
 
 Lesli
 
@@ -18,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
@@ -29,84 +28,11 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-=end
 %>
 
 <%
 
-# Should I move this to a base controller?
-
-# add company information (account)
-@lesli[:company] = {
-    name: current_user.account.name,
-}
-
-# set user information
-@lesli[:current_user] = {
-    id: current_user.id,
-    name: current_user.first_name
-}
-
-
-# Include defaults to account
-@lesli[:instance] = Rails.application.credentials.dig(:instance) || lesli_instance_code
-@lesli[:engine] = lesli_engine.dig(:code)   # use into url plugin to for dynamic search 
-@lesli[:url] = request.base_url.to_s        # use as base for url plugin
-@lesli[:engine_paths] = {}
-
-%>
-
-
-<% 
-# Dynamic build the engines mouted path
-Lesli::System.engines.each do |engine, engine_info|
-    @lesli[:engine_paths][engine] = engine_info[:path]
-end 
-%>
-
-
-<% # define @account data for the lesli plugin %>
-<script>const lesli = <%= @lesli.to_json.html_safe %></script>
-<script>const Lesli = <%= @lesli.to_json.html_safe %></script>
-
-<%#
-@lesli[:revision] = 0
-@lesli[:company] = {}
-
-@lesli[:revision] = 0 #Lesli::System.revision()
-@lesli[:notifications] = 0 #Courier::Bell::Notification.count(current_user, true)
-@lesli[:tasks] = 0 #Courier::Focus::Task.count(current_user)
-@lesli[:tickets] = 0 #Courier::Help::Ticket.count(current_user)
-@lesli[:shortcuts] = [] # current_user.shortcuts.select(:id, :name, :url)
-
-# default customization, set on before_action :set_customization hook
-@lesli[:customization] = { :logo => "image.svg", :color_primary => "#1f7ce3" }
-
-return @lesli if current_user.account.blank?
-
-@lesli[:settings] = {
-    datetime: Rails.application.config.lesli.dig(:configuration, :datetime),
-    currency: (Rails.application.config.lesli.dig(:configuration, :currency) || {})
-        .merge({ locale: Rails.application.config.lesli.dig(:env, :default_locale) }),
-}
-
-# set user information
-@lesli[:current_user] = {
-    id: current_user.id,
-    email: current_user.email,
-    full_name: current_user.full_name,
-    roles: current_user.roles.map(&:name),
-    abilities: current_user.abilities_by_controller,
-    max_object_level_permission: current_user.roles.map(&:object_level_permission).max,
-    settings: current_user.settings.map { |s| { name: s.name, value: s.value } }
-}
+@lesli[:tickets] = 0
+@lesli[:notifications] = Lesli::Courier.new(:lesli_bell, 0).from(:notification_service, current_user).call(:count)
 
-#
-@lesli[:providers] = {
-    firebase: {
-        config: Rails.application.credentials.dig(:providers, :firebase, :web),
-        user: Rails.application.credentials.dig(:providers, :firebase, :user)
-    },
-    google_translate: Rails.application.credentials.dig(:providers, :google_translate)
-}
 %>

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

@@ -1,5 +1,4 @@
-<%
-=begin
+<%#
 
 Lesli
 
@@ -29,7 +28,6 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-=end
 %>
 
 <%# the charset attribute specifies the character encoding for the HTML document. %>
@@ -40,7 +38,7 @@ Building a better future, one line of code at a time.
 <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 
 <%# defines the title of the document. %>
-<title><%#= website_title %></title>
+<title><%= website_title %></title>
 
 <%# rails standard meta tags %>
 <%= csrf_meta_tags %>
@@ -54,3 +52,8 @@ Building a better future, one line of code at a time.
 <% if appstore_app_id %>
     <meta name="apple-itunes-app" content="app-id=<%= appstore_app_id %>">
 <% end %>
+
+
+<%# enable turbo %>
+<meta name="turbo-prefetch" content="false">
+<meta name="view-transition" content="same-origin" />

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

@@ -0,0 +1,49 @@
+
+
+<%# Show announcements container only if cloud bell is installed %>
+<% if defined?(LesliBell)%>
+    <application-component-announcements></application-component-announcements>
+<% end %>
+
+
+<%# Search results container 
+<application-component-search></application-component-search>
+%>
+
+
+<%= render partial: "lesli/partials/flash" %>
+
+
+
+<style>
+.flash {
+  padding: 10px;
+  border-radius: 5px;
+  margin-bottom: 10px;
+  opacity: 1;
+  transition: opacity 1s ease-out;
+}
+
+.flash.notice {
+  background-color: #d4edda;
+  color: #155724;
+}
+
+.flash.alert {
+  background-color: #f8d7da;
+  color: #721c24;
+}
+
+.fade-out {
+  animation: fadeOut 5s forwards;
+}
+
+@keyframes fadeOut {
+  0% { opacity: 1; }
+  80% { opacity: 1; } /* Keep visible for most of the time */
+  100% { opacity: 0; display: none; }
+}
+
+</style>
+
+