lesli 5.0.12 → 5.0.13

data/app/controllers/lesli/application_controller.rb

@@ -43,6 +43,7 @@ module Lesli
         end
 
         def language
+
             # check if param locale was sent by the user
             unless params[:locale].blank?
 

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

@@ -12,7 +12,7 @@ module Lesli
                     engine_path = nil
 
                     # check if the users is logged into the system
-                    unless user_signed_in?
+                    unless user_signed_in?()
 
                         message = "Please Login to view that page!"
 

data/app/helpers/lesli/assets_helper.rb

@@ -19,7 +19,7 @@ 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
@@ -39,9 +39,18 @@ module Lesli
         # lesli_application_stylesheet_path(:engine) (TODO) -> stylesheet from engine current
         # lesli_application_stylesheet_path(:cloud_driver)  -> stylesheet from engine specific
         def lesli_application_stylesheet_path(engine = nil)
+
+            # Stylesheets from specific engine
             return "#{engine}/templates/application" if engine
 
-            "#{lesli_engine(:code)}/application"
+            # Get current engine information
+            lesli_engine_code = lesli_engine(:code)
+
+            # Rails main host app stylesheets
+            return "application" if lesli_engine_code == "root"
+
+            # Rails engines stylesheets
+            "#{lesli_engine_code}/application"
         end
 
         # Return a string path to load the main engine stylesheet
@@ -57,12 +66,21 @@ module Lesli
         def lesli_application_javascript_path
             # get the namespace to load specific javascript file
             # for engine or specific javascript file for core controller
-            path_segments = controller_path.split("/")
-            lesli_engine = path_segments.shift
+            # path_segments = controller_path.split("/")
+            # lesli_engine = path_segments.shift
 
-            return "onboardings/application" if is_lesli_onboarding?
+            # return "onboardings/application" if is_lesli_onboarding?
 
-            "#{lesli_engine}/application"
+
+
+            # Get current engine information
+            lesli_engine_code = lesli_engine(:code)
+
+            # Rails main host app stylesheets
+            return "application" if lesli_engine_code == "root"
+
+            # Rails engines stylesheets
+            "#{lesli_engine_code}/application"
         end
 
         def javascript_googlemaps_sdk

data/app/helpers/lesli/navigation_helper.rb

@@ -42,9 +42,15 @@ module Lesli
 
         # Prints a html link inside a list item
         def navigation_item(path, label, icon = nil, reload: false)
+            content_tag(:li) do
+                navigation_link(path, label, icon, reload:reload)
+            end
+        end
+
+        def navigation_link(path, label, icon = nil, reload: false)
             # default vue router links for single page applications
             html_element = "router-link"
-            html_options = { to: path }
+            html_options = { to: path, class: "navbar-item", 'active-class': "navigation-link-active" }
 
             # if reload is nedeed, we use a standard "a" tag
             if reload
@@ -52,16 +58,14 @@ module Lesli
                 html_options = { href: path }
             end
 
-            content_tag(:li) do
-                content_tag(html_element, html_options) do
-                    # print a simple menu item (without icon)
-                    concat content_tag(:span, label, class: "text iconless") unless icon
-
-                    # print a full menu item if icon was requested
-                    if icon
-                        concat content_tag("span", nil, class: [icon, "icono"])
-                        concat content_tag(:span, label, class: "text")
-                    end
+            content_tag(html_element, html_options) do
+                # print a simple menu item (without icon)
+                concat content_tag(:span, label, class: "text iconless") unless icon
+
+                # print a full menu item if icon was requested
+                if icon
+                    concat content_tag(:span, nil, class: icon)
+                    concat content_tag(:span, label, class: "text")
                 end
             end
         end

data/app/lib/date2.rb

@@ -138,6 +138,11 @@ class Date2
         # get right format for dates
         format = self.db_format
 
+        # compatibility for SQLite
+        if ActiveRecord::Base.connection.adapter_name == "SQLite"
+            return "strftime('#{format}', #{table}#{column}) as #{column}_string"
+        end
+
         "TO_CHAR(#{table}#{column} at time zone 'utc' at time zone '#{@settings[:time_zone]}', '#{format}') as #{column}_string"
 
     end
@@ -175,6 +180,9 @@ class Date2
     def db_format
         format = @format
 
+        # SQLite format dates are the same of ruby format 
+        return format if ActiveRecord::Base.connection.adapter_name == "SQLite"
+
         # Convert Ruby to postgresql date format
         format = format.gsub("%Y", "YYYY")
         format = format.gsub("%m", "MM")

data/app/lib/lesli/system.rb

@@ -42,6 +42,9 @@ module Lesli
 
             engines() if ENGINES.empty?
 
+            # the Root engine represents the host Rails app
+            engine = "Root" unless LESLI_ENGINES.include?(engine)
+
             # return specific property if requested
             return ENGINES[engine][property.to_sym] unless property.blank?
 
@@ -59,7 +62,7 @@ module Lesli
             LESLI_ENGINES.each do |engine|
                 next unless Object.const_defined?(engine)
                 engine_instance = "#{engine}".constantize
-                ENGINES[engine]= {
+                ENGINES[engine] = {
                     :code => engine.underscore, 
                     :name => lesli_engine_name(engine), 
                     :path => engine_instance::Engine.routes.find_script_name({}),
@@ -69,6 +72,15 @@ module Lesli
                 }
             end 
 
+            ENGINES["Root"] = {
+                :code => "root", 
+                :name => "Root", 
+                :path => "/",
+                :version => "1.0.0",
+                :build => "0000000",
+                :dir => Rails.root.to_s
+            }
+
             ENGINES
         end
 

data/app/models/concerns/user_extensions.rb

@@ -57,6 +57,12 @@ module UserExtensions
     end
 
 
+    # @return [String] The first name of this user.
+    def name2
+        self.first_name
+    end
+
+
     # @return [String] The name of this user.
     # @description Retrieves and returns the name of the user depending on the available information.
     #     The name can be a full name (first and last names), just the first name, or, in case the information

data/app/models/lesli/user.rb

@@ -63,7 +63,7 @@ module Lesli
 
 
         # devise implementation
-        if defined? LesliSecurity
+        #if !defined?(LesliSecurity)
             devise( 
                 :database_authenticatable,
                 :registerable,
@@ -73,7 +73,7 @@ module Lesli
                 :confirmable,
                 :trackable);
                 #:omniauthable, omniauth_providers: [:google_oauth2, :facebook]
-        end
+        #end
 
 
         # users belongs to an account only... and must have a role

data/app/operators/lesli/controller_operator.rb

@@ -19,7 +19,7 @@ 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
@@ -120,6 +120,9 @@ module Lesli
             # Get the list of controllers and actions from engines
             Lesli::System.engines.each do |engine, engine_info|
 
+                # Do not process main Rails app
+                next if engine == "Root"
+
                 # load and retrieve the list of controllers and actions from an engine
                 routes = "#{engine}::Engine".constantize.routes.routes.each do |route| 
                     route = route.defaults 

data/app/services/lesli/user_service.rb

@@ -60,7 +60,7 @@ module Lesli
                 :id,
                 :email,
                 "CONCAT_WS(' ', first_name, last_name) as name",
-                "COALESCE(alias, email) as alias"
+                "COALESCE(NULLIF(alias,''), email) as alias"
             ).as_json
         end
     end

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

@@ -44,8 +44,10 @@ Building a better future, one line of code at a time.
         <%= render partial: "lesli/partials/application-lesli-header" %>
         <%= render partial: "lesli/partials/application-lesli-navigation" %>
         <%#= render partial: "lesli/partials/application-lesli-notices" %>
+        <section class="lesli-application-content">
         <%= render partial: "lesli/partials/application-lesli-sidebar" %>
         <%= render partial: "lesli/partials/application-lesli-content" %>
+        </section>
         <%= render partial: "lesli/partials/application-lesli-engines" %>
         <%= render partial: "lesli/partials/application-lesli-panels" %>
         <%#= render partial: "lesli/partials/application-lesli-footer" %>

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

@@ -18,9 +18,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
@@ -52,13 +52,13 @@ Building a better future, one line of code at a time.
 @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[:engine_paths] = {}
 Lesli::System.engines.each do |engine, engine_info|
     @lesli[:engine_paths][engine] = engine_info[:path]
 end 

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

@@ -32,41 +32,66 @@ Building a better future, one line of code at a time.
 =end
 %>
 
+<%# check if custom navigation partial exists, getting the path from application helper %>
+<% custom_navigation_path = "partials/application-lesli-header" %>
+
+<%# 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 %>
+
 <lesli-application-header 
-    :show-engines="true"
-    <%= "show-bell" if defined?(LesliBell) %>
+    engine-path="<%= "/dashboard" if defined?(LesliDashboard) %>"
     <%= "show-focus" if defined?(LesliFocus) %>
-    <%= "show-support-tickets" if defined?(LesliSupport) %>
-    engine-path="<%= defined?(LesliDashboard) ? lesli_dashboard.root_path : lesli_engine(:path)%>">
+    show-profile
+    show-engines
+    show-bell
+    show-support>
     
     <template v-slot:brand>
         <%= customization_instance_logo_tag(logo: "app-icon", options: { alt: "Lesli app logo", class: "is-hidden-desktop" }) %>
         <%= customization_instance_logo_tag(logo: "app-logo", options: { alt: "Lesli app logo", class: "is-hidden-touch" }) %>
     </template>
 
-    <template>
+    <template v-slot:end>
+        
         <%# language selector %>
-        <% if I18n.available_locales.length > 1 %>
-            <div class="dropdown is-hoverable header-language-selector">
-                <div class="dropdown-trigger">
-                    <span class="icon has-text-link">
-                        <%= lesli_svg("locale-#{locale}") %>
-                    </span>
-                </div>
-                <div class="dropdown-menu" id="dropdown-menu-locale" role="menu">
-                    <div class="dropdown-content">
-                        <% I18n.available_locales.each do |locale| %>
-                            <% next if locale == I18n.locale %>
-                            <%= link_to language_url(locale), { :class => "dropdown-item" } do %>
-                                <span class="icon has-text-grey-light">
-                                    <%= lesli_svg("locale-#{locale}") %>
-                                </span>
-                                <span><%= language_name(locale) %></span>
+        <% if Lesli.config.layout.dig(:locale) && I18n.available_locales.length > 1 %>
+            <div class="navbar-item">
+                <div class="dropdown is-hoverable">
+                    <div class="dropdown-trigger">
+                        <button 
+                            class="button is-ghost" 
+                            aria-haspopup="true" 
+                            aria-controls="dropdown-menu"
+                            @click="storeLayout.showProfile = true">
+                            <span class="icon is-size-5">
+                                <%= lesli_svg("locale-#{locale}") %>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="dropdown-menu" id="dropdown-menu-locale" role="menu">
+                        <div class="dropdown-content">
+                            <% I18n.available_locales.each do |locale| %>
+                                <% next if locale == I18n.locale %>
+                                <%= link_to language_url(locale), { :class => "dropdown-item" } do %>
+                                    <span class="icon has-text-grey-light">
+                                        <%= lesli_svg("locale-#{locale}") %>
+                                    </span>
+                                    <span><%= language_name(locale) %></span>
+                                <% end %>
                             <% end %>
-                        <% end %>
+                        </div>
                     </div>
                 </div>
             </div>
         <% end %>
     </template>
 </lesli-application-header>
+
+<% end %>

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

@@ -18,9 +18,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

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

@@ -33,7 +33,14 @@ Building a better future, one line of code at a time.
 %>
 
 <%# check if custom navigation partial exists, getting the path from application helper %>
-<% custom_sidebar_path = "#{lesli_engine.dig(:code)}/partials/engine-navigation" %>
+<% 
+    engine = lesli_engine.dig(:code) 
+    custom_sidebar_path = if engine == "root"
+        "partials/engine-navigation"
+        else
+        "#{engine}/partials/engine-navigation" 
+    end
+%>
 
 
 <%# validate the path to be sure the partial exists when trying to render it %>

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

@@ -18,9 +18,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

data/app/views/lesli/wrappers/_application-devise-simple.erb

@@ -44,7 +44,7 @@ Building a better future, one line of code at a time.
                     :class => "#{lesli_instance_code}-logo",        # dynamic class according to the instance
                     :alt => "Main logo") 
                 %>
-                <h1 class="title has-text-primary">
+                <h1 class="title is-size-4 has-text-primary">
                     <%#= I18n.t("core.users/sessions.view_text_welcome") %>
                     <%= title %>
                 </h1>

data/config/initializers/lesli.rb

@@ -45,7 +45,7 @@ Lesli.configure do |config|
     config.company = {
         name: "Lesli",
         email: "hello@lesli.tech",
-        tagline: "Ruby on Rails SaaS Development Platform."
+        tagline: "The Open SaaS Development Platform."
     }
 
 
@@ -105,6 +105,12 @@ Lesli.configure do |config|
         color_sidebar_hover: "#dee7ec"
     }
 
+
+    #
+    config.layout = {
+        locale: false
+    }
+
     config.path_after_login = "/"
     config.path_after_login = "/dashboard" if defined?(LesliDashboard)
 end

data/config/locales/translations.en.yml

@@ -16,6 +16,11 @@
       button_settings: Settings
       button_show: Show
       toolbar_search: Search...
+      message_operation_success: Operation completed successfully
+      message_operation_error: Operation failed. Please try again.
+    application:
+      navigation_logout: Logout
+      navigation_my_profile: My profile
     users/sessions:
       view_username: Username
     dashboards:
@@ -23,6 +28,3 @@
       column_name: Name
       column_default: Default
       view_add_component: Add component
-    application:
-      navigation_logout: Logout
-      navigation_my_profile: My profile

data/config/locales/translations.es.yml

@@ -16,6 +16,11 @@
       button_settings: Configuración
       button_show: Ver
       toolbar_search: Buscar...
+      message_operation_success: Operacion realizada satisfactoriamente
+      message_operation_error: Operación fallida. Por favor, inténtelo de nuevo.
+    application:
+      navigation_logout: Cerrar sesión
+      navigation_my_profile: Mi perfil
     users/sessions:
       view_username: Usuario
     dashboards:
@@ -23,6 +28,3 @@
       column_name: Nombre
       column_default: Default
       view_add_component: Agregar componente
-    application:
-      navigation_logout: Cerrar sesión
-      navigation_my_profile: Mi perfil

data/config/locales/translations.fr.yml

@@ -16,6 +16,11 @@
       button_settings: ":lesli.shared.button_settings:"
       button_show: ":lesli.shared.button_show:"
       toolbar_search: ":lesli.shared.toolbar_search:"
+      message_operation_success: ":lesli.shared.message_operation_success:"
+      message_operation_error: ":lesli.shared.message_operation_error:"
+    application:
+      navigation_logout: ":lesli.application.navigation_logout:"
+      navigation_my_profile: ":lesli.application.navigation_my_profile:"
     users/sessions:
       view_username: ":lesli.users/sessions.view_username:"
     dashboards:
@@ -23,6 +28,3 @@
       column_name: ":lesli.dashboards.column_name:"
       column_default: ":lesli.dashboards.column_default:"
       view_add_component: ":lesli.dashboards.view_add_component:"
-    application:
-      navigation_logout: ":lesli.application.navigation_logout:"
-      navigation_my_profile: ":lesli.application.navigation_my_profile:"

data/config/locales/translations.it.yml

@@ -16,6 +16,11 @@
       button_settings: ":lesli.shared.button_settings:"
       button_show: ":lesli.shared.button_show:"
       toolbar_search: ":lesli.shared.toolbar_search:"
+      message_operation_success: ":lesli.shared.message_operation_success:"
+      message_operation_error: ":lesli.shared.message_operation_error:"
+    application:
+      navigation_logout: ":lesli.application.navigation_logout:"
+      navigation_my_profile: ":lesli.application.navigation_my_profile:"
     users/sessions:
       view_username: ":lesli.users/sessions.view_username:"
     dashboards:
@@ -23,6 +28,3 @@
       column_name: ":lesli.dashboards.column_name:"
       column_default: ":lesli.dashboards.column_default:"
       view_add_component: ":lesli.dashboards.view_add_component:"
-    application:
-      navigation_logout: ":lesli.application.navigation_logout:"
-      navigation_my_profile: ":lesli.application.navigation_my_profile:"

data/config/locales/translations.pt.yml

@@ -16,6 +16,11 @@
       button_settings: ":lesli.shared.button_settings:"
       button_show: ":lesli.shared.button_show:"
       toolbar_search: ":lesli.shared.toolbar_search:"
+      message_operation_success: ":lesli.shared.message_operation_success:"
+      message_operation_error: ":lesli.shared.message_operation_error:"
+    application:
+      navigation_logout: ":lesli.application.navigation_logout:"
+      navigation_my_profile: ":lesli.application.navigation_my_profile:"
     users/sessions:
       view_username: ":lesli.users/sessions.view_username:"
     dashboards:
@@ -23,6 +28,3 @@
       column_name: ":lesli.dashboards.column_name:"
       column_default: ":lesli.dashboards.column_default:"
       view_add_component: ":lesli.dashboards.view_add_component:"
-    application:
-      navigation_logout: ":lesli.application.navigation_logout:"
-      navigation_my_profile: ":lesli.application.navigation_my_profile:"