lesli_vault 0.1.0 → 0.2.0

data/app/controllers/lesli_vault/descriptors_controller.rb

@@ -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.
@@ -28,7 +28,6 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-
 =end
 
 module LesliVault
@@ -40,7 +39,7 @@ module LesliVault
             respond_to do |format|
                 format.html {}
                 format.json do
-                    respond_with_successful(DescriptorServices.new(current_user, @query).list)
+                    respond_with_successful(DescriptorService.new(current_user, query).list)
                 end
             end
         end
@@ -50,7 +49,8 @@ module LesliVault
             respond_to do |format|
                 format.html {}
                 format.json do
-                    respond_with_pagination(DescriptorServices.new(current_user, @query).index)
+                    #respond_with_successful(DescriptorService.new(current_user, query).index)
+                    respond_with_pagination(DescriptorService.new(current_user, query).index)
                 end
             end
         end
@@ -75,15 +75,14 @@ module LesliVault
 
         # POST /descriptors
         def create
-            descriptor = DescriptorServices.new(current_user, @query)
-            descriptor.create(descriptor_params)
+            descriptor = DescriptorService.new(current_user, query).create(descriptor_params)
 
             # Check if the creation went ok
-            unless descriptor.successful?
-                return respond_with_error(descriptor.errors)
+            if descriptor.successful?
+                respond_with_successful(descriptor)
+            else
+                respond_with_error(descriptor.errors)
             end
-
-            respond_with_successful(descriptor)
         end
 
         # PATCH/PUT /descriptors/:id

data/app/controllers/lesli_vault/roles_controller.rb

@@ -34,23 +34,7 @@ Building a better future, one line of code at a time.
 module LesliVault
     class RolesController < ApplicationController
 
-        before_action :set_role, only: %i[ show update destroy ]
-
-
-        #@return [HTML|JSON] HTML view for listing all roles or a Json that contains a list of all roles
-        #    associated to this *account*
-        #@description Retrieves and returns all roles associated to a *CloudHouse::Account*. The account
-        #    is obtained directly from *current_user*. The HTTP request has to specify
-        #    wheter the HTML or the JSON text should be rendered
-        #@example
-        #    # Executing this controller's action from javascript's frontend
-        #    this.http.get(`127.0.0.1/house/roles`);
-        def list
-            respond_to do |format|
-                format.html { }
-                format.json { respond_with_successful(RoleServices.new(current_user).list) }
-            end
-        end
+        #before_action :set_role, only: %i[ show update destroy ]
 
         #@return [HTML|JSON] HTML view for listing all roles or a Json that contains a list of all roles
         #    associated to this *account*
@@ -64,7 +48,8 @@ module LesliVault
             respond_to do |format|
                 format.html { }
                 format.json {
-                    respond_with_pagination(RoleServices.new(current_user, @query).index)
+                    respond_with_successful(RoleService.new(current_user, query).index)
+                    #respond_with_pagination(RoleService.new(current_user, query).index)
                 }
             end
         end
@@ -120,14 +105,13 @@ module LesliVault
         #     this.http.post('127.0.0.1/house/roles', data);
         def create
 
-            role = RoleServices.new(current_user)
-            role.create(role_params)
+            role = RoleService.new(current_user).create(role_params)
 
-            unless role.successful?
-                respond_with_error(role.errors)
+            if role.successful?
+                respond_with_successful(role.result) 
+            else
+                respond_with_error(role.errors_as_sentence)
             end
-
-            respond_with_successful(role)
         end
 
         # @controller_action_param :name [String] The name of the role
@@ -178,9 +162,7 @@ module LesliVault
         # @return [JSON]
         # @description Gets all the specific options for roles CRUD
         def options
-            respond_with_successful({ 
-                :object_level_permissions => RoleServices.new(current_user).options
-            })
+            respond_with_successful(RoleService.new(current_user).options)
         end
 
         private

data/app/services/{descriptor_services.rb → lesli_vault/descriptor_service.rb}

@@ -32,7 +32,7 @@ Building a better future, one line of code at a time.
 =end
 
 module LesliVault
-    class DescriptorServices < LesliVault::ApplicationLesliServices
+    class DescriptorService < Lesli::ApplicationLesliService
 
         # @overwrite
         # @return {Object}
@@ -46,14 +46,9 @@ module LesliVault
         # @return [Array] Paginated index of users.
         # @description Return a paginated array of users, used mostly in frontend views
         def index
+
             descriptors = current_user.account.descriptors.where.not(
                 :name => ["owner"]
-            ).select(
-                :id,
-                :name,
-                :category,
-                "coalesce(actions.total, 0) as privileges_count",
-                Date2.new.date_time.db_timestamps("descriptors")
             )
     
             # Count the amount of privileges assigned to every descriptor
@@ -62,12 +57,20 @@ module LesliVault
                     select
                         count(1) as total,
                         descriptor_id
-                    from descriptor_privileges
+                    from lesli_descriptor_privileges
                     --where apga.status = TRUE
                     group by descriptor_id
                 ) as actions
-                on actions.descriptor_id = descriptors.id
+                on actions.descriptor_id = lesli_descriptors.id
             ))
+
+            descriptors = descriptors.select(
+                :id,
+                :name,
+                :method,
+                "coalesce(actions.total, 0) as privileges_count",
+                Date2.new.date_time.db_timestamps("lesli_descriptors")
+            )
             
             # skip native descriptors
             #descriptors = descriptors.where.not("descriptors.name in (?)", ["owner", "sysadmin", "profile"])
@@ -77,10 +80,10 @@ module LesliVault
             #     descriptors = descriptors.where("(LOWER(descriptors.name) SIMILAR TO ?)", search_string)
             # end
     
-            descriptors.page(
-                query[:pagination][:page]
-            ).per(query[:pagination][:perPage]
-            ).order("#{query[:order][:by]} #{query[:order][:dir]} NULLS LAST")
+            return descriptors
+            .page(query[:pagination][:page])
+            .per(query[:pagination][:perPage])
+            .order("#{query[:order][:by]} #{query[:order][:dir]} NULLS LAST")
         end 
     
         # @overwrite
@@ -144,54 +147,6 @@ module LesliVault
             end
 
             self
-        end
-    
-        # @return [void]
-        # @param role_descriptor [RoleDescriptor] The role_descriptor on wich we want to add the system actions
-        # @description Return the list of privilege actions defined for
-        # profile descriptor
-        # Example
-        # RoleDescriptor::DefaultPrivilegeActionsService.add_profile_actions(RoleDescriptor.last)
-        def self.add_profile_privileges(descriptor)
-    
-            # Adding default system actions for profile descriptor
-            [
-                { controller: "Profiles", actions: ["show"] }, # enable profile view
-                #{ controller: "profile/subscriptions", actions: ["options", "index"] }, # enable profile subscriptions
-                #{ controller: "user/sessions", actions: ["index"] }, # seession management
-                { controller: "Users", actions: ["options", "update"] } # enable user edition
-            ].each do |controller_action|
-    
-                controller_action[:actions].each do |action_name|
-    
-                    system_controller_action = SystemController::Action.joins(:system_controller)
-                    .where("system_controllers.reference = ?", controller_action[:controller])
-                    .where("system_controller_actions.name = ?", action_name).first
-    
-                    descriptor.privileges.find_or_create_by(
-                        system_controller_action: system_controller_action
-                    )
-                end
-            end
-        end
-    
-        # @return [void]
-        # @param role_descriptor [RoleDescriptor] The role_descriptor on wich we want to add the system actions
-        # @description Return the list of privilege actions defined for
-        # profile descriptor
-        # Example
-        # RoleDescriptor::DefaultPrivilegeActionsService.add_profile_actions(RoleDescriptor.last)
-        def self.add_owner_privileges(descriptor)
-    
-            # Adding default system actions for profile descriptor
-            actions = SystemController::Action.all
-    
-            actions.each do |action|
-                descriptor.privileges.find_or_create_by(
-                    system_controller_action: action
-                )
-            end
-        end
-        
+        end    
     end
 end

data/app/services/{role_services.rb → lesli_vault/role_service.rb}

@@ -32,44 +32,28 @@ Building a better future, one line of code at a time.
 =end
 
 module LesliVault
-    class RoleServices < ApplicationLesliServices
+    class RoleService < Lesli::ApplicationLesliService
 
-        # @overwrite
-        # @return {Object}
-        # @description Finds a role according the ID given
-        def find id
-            self.resource = current_user.account.roles.find_by_id(id) 
-            self
-        end
 
-        # @overwrite
-        # @return {Object}
-        # @description Retrives the role
-        def show
-            self.resource
-        end
-
-        # @overwrite
-        # @return [Array] Paginated index of roles.
-        # @description Return a paginated array of roles, used mostly in frontend views
+        # @return [Array] Paginated index of users.
+        # @description Return a paginated array of users, used mostly in frontend views
         def index 
 
-            current_user.account.roles
-            .joins("
+            current_user.account.roles.where.not(
+                :name => ["owner"]
+            ).joins("
                 left join (
                     select
                         count(1) users,
                         role_id
-                    from user_roles
-                    inner join  users as u
-                        on u.id = user_roles.user_id
+                    from lesli_user_powers
+                    inner join lesli_users as u
+                        on u.id = lesli_user_powers.user_id
                         and u.deleted_at is null
-                    where user_roles.deleted_at is null
+                    where lesli_user_powers.deleted_at is null
                     group by (role_id)
-                )
-                users on users.role_id = roles.id
-            ")
-            .where("roles.object_level_permission < ?", current_user.max_object_level_permission)
+                ) users on users.role_id = lesli_roles.id
+            ").where("lesli_roles.object_level_permission <= ?", current_user.max_object_level_permission)
             .select(
                 :id, 
                 :name, 
@@ -85,15 +69,11 @@ module LesliVault
             .order(object_level_permission: :desc, name: :asc)
         end
 
-        # Return a list of roles that the user is able to work with
-        # according to object level permission
-        def list
-            current_user.account.roles.where(
-                "object_level_permission <= ?", current_user.max_object_level_permission
-            ).order(
-                object_level_permission: :desc, 
-                name: :asc
-            ).select(:id, :name, :object_level_permission)
+        # @overwrite
+        # @return {Object}
+        # @description Retrives the role
+        def show
+            self.resource
         end
 
         # @overwrite
@@ -101,6 +81,7 @@ module LesliVault
         # @param {params} Hash of the permitted attributes for a role
         # @description Creates a new role
         def create params
+
             role = current_user.account.roles.new(params)
 
             unless current_user.can_work_with_role?(role)
@@ -112,10 +93,13 @@ module LesliVault
                 self.error(I18n.t("core.roles.messages_danger_creating_role_object_level_permission_too_high"))
             end
 
+            # do not create if errors found
+            return self unless self.successful?
+
             # Try to save role and logs if it went OK
             if role.save
                 self.resource = role
-                Role::Activity.log_create(current_user, self.resource)
+                #Role::Activity.log_create(current_user, self.resource)
             else
                 self.error(role.errors.full_messages.to_sentence)
             end
@@ -158,7 +142,23 @@ module LesliVault
             self
         end
 
-        def options
+        # @overwrite
+        # @return {Object}
+        # @description Finds a role according the ID given
+        def find id
+            #self.resource = current_user.account.roles.find_by_id(id) 
+            #self
+        end
+
+        def options 
+            { 
+                :object_level_permissions => self.roles_with_object_level_permission
+            }
+        end 
+
+        private 
+
+        def roles_with_object_level_permission
             levels = {}
 
             # get all the different object level permission registered in the roles

data/app/{models/lesli_vault/system_controller.rb → views/lesli_vault/partials/_engine-navigation.html.erb}

@@ -1,3 +1,4 @@
+<%
 =begin
 
 Lesli
@@ -28,13 +29,9 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-
 =end
+%>
 
-module LesliVault
-    class SystemController < ApplicationRecord
-
-        has_many :actions
-
-    end
-end
+<%= navigation_item(lesli_vault.dashboard_path, "Dashboard", "ri-dashboard-3-line"); %>
+<%= navigation_item(lesli_vault.roles_path, "Roles", "ri-shield-user-line") %>
+<%= navigation_item(lesli_vault.descriptors_path, "Descriptors", "ri-shield-check-line") %>

data/config/routes.rb

@@ -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.
@@ -28,13 +28,17 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-
 =end
 
 LesliVault::Engine.routes.draw do
     root to: "dashboards#show"
 
+    resource :dashboard, only: [:show]
+
     resources :roles do
+        collection do
+            get :options
+        end 
         scope module: :role do
             resources :privileges
             resources :descriptors
@@ -42,7 +46,7 @@ LesliVault::Engine.routes.draw do
         end
     end
 
-    resources :descriptors do
+    resources :descriptors, only: [:index, :new, :create] do
         scope module: :descriptor do
             resources :privileges 
             resources :activities

data/lib/lesli_vault/version.rb

@@ -1,3 +1,4 @@
 module LesliVault
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
+  BUILD = "1697000148"
 end

data/lib/vue/application.js

@@ -1,7 +1,54 @@
+/*
+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
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+*/
+
 
 // · 
 import application from "Lesli/application"
+import appRolesNew from "LesliVault/apps/roles/new.vue"
+import appRolesIndex from "LesliVault/apps/roles/index.vue"
+import appDescriptorsIndex from "LesliVault/apps/descriptors/index.vue"
+import appDescriptorsNew from "LesliVault/apps/descriptors/new.vue"
 
 
 // · 
-application("LesliVault", [])
+application("LesliVault", [{
+    path: "/roles",
+    component: appRolesIndex
+}, {
+    path: "/roles/new",
+    component: appRolesNew
+}, {
+    path: "/descriptors",
+    component: appDescriptorsIndex
+}, {
+    path: "/descriptors/new",
+    component: appDescriptorsNew
+}])

data/{app/vue/lesli_vault → lib/vue}/apps/descriptors/components/form.vue

@@ -18,18 +18,17 @@ 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 · Your Smart Business Assistant. 
+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://lesli.tech
+@website  https://www.lesli.tech
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
-// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-
 */
 
 
@@ -38,14 +37,14 @@ Building a better future, one line of code at a time.
 import { inject, onMounted } from "vue"
 
 
-// · import lesli stores
-import { useDescriptor } from "../../../stores/descriptor"
-
-
 // · import vue router composable
 import { useRouter, useRoute } from "vue-router"
 
 
+// · import lesli stores
+import { useDescriptor } from "LesliVault/stores/descriptor"
+
+
 // · implement stores
 const storeDescriptor = useDescriptor()
 
@@ -73,21 +72,14 @@ const translations = {
         shared: I18n.t("core.shared"),
         role_descriptors: I18n.t('core.role_descriptors')
     }
-
 }
 
-/**
- * @description This function is used to update the descriptor information
- */
-const onUpdate = () => {
+function onUpdate() {
     storeDescriptor.updateDescriptor()
 }
 
-/**
- * @description This function is used to create a new descriptor
- */
-const onCreate = () => {
-    storeDescriptor.createDescriptor()
+function onCreate() {
+    storeDescriptor.postDescriptor()
 }
 
 onMounted(() => {
@@ -100,10 +92,7 @@ onMounted(() => {
 
 </script>
 <template>
-    <lesli-form 
-        class="information"
-        v-if="!storeDescriptor.loading"
-        @submit="isEditable ? onUpdate() : onCreate()">
+    <lesli-form @submit="isEditable ? onUpdate() : onCreate()">
 
         <div class="field">
             <label class="label">
@@ -111,7 +100,7 @@ onMounted(() => {
                 <sup class="has-text-danger">*</sup>
             </label>
             <div class="control">
-                <input name="name" v-model="storeDescriptor.descriptor.name" required="required" type="text" class="input"> 
+                <input name="name" v-model="storeDescriptor.descriptor.payload.name" required="required" type="text" class="input"> 
             </div>
         </div>
 
@@ -121,7 +110,7 @@ onMounted(() => {
             </label>
             <div class="control">
                 <lesli-select
-                    v-model="storeDescriptor.descriptor.descriptors_id"
+                    v-model="storeDescriptor.descriptor.payload.descriptors_id"
                     :options="storeDescriptor.descriptors_options">
                 </lesli-select>
             </div>
@@ -132,7 +121,7 @@ onMounted(() => {
                 {{ translations.core.role_descriptors.column_description }}
             </label>
             <div class="control">
-                <textarea class="textarea" v-model="storeDescriptor.descriptor.description"></textarea>
+                <textarea class="textarea" v-model="storeDescriptor.descriptor.payload.description"></textarea>
             </div>
         </div>
 

data/{app/vue/lesli_vault → lib/vue}/apps/descriptors/index.vue

@@ -38,7 +38,7 @@ import { useRouter } from 'vue-router'
 
 
 // · import lesli stores
-import { useDescriptors } from "LesliApp/administration/stores/descriptors"
+import { useDescriptors } from "LesliVault/stores/descriptors"
 
 
 // · initialize/inject plugins
@@ -87,30 +87,28 @@ onMounted(() => {
 
 </script>
 <template>
-    <application-component>
+    <lesli-application-container>
         <lesli-header title="Role Descriptors">
             <lesli-button icon="refresh"
                 :loading="storeDescriptors.index.loading"
                 @click="storeDescriptors.getDescriptors()">
-                {{ translations.core.shared.view_text_btn_reload }}
-            </lesli-button>
-            <lesli-button icon="add" :to="url.admin(`descriptors/new`)">
-                {{ translations.core.role_descriptors.view_btn_new_role_descriptor }}
+                Reload
             </lesli-button>
+            <lesli-link main icon="add" :to="url.vault('descriptors/new')">
+                Add descriptor
+            </lesli-link>
         </lesli-header>
 
-        <lesli-card>
-            <lesli-toolbar @search="storeDescriptors.search"></lesli-toolbar>
-
-            <lesli-table
-                :link="(descriptor) => url.admin('descriptors/:id', descriptor.id)"
-                :columns="columns"
-                :loading="storeDescriptors.index.loading"
-                :records="storeDescriptors.index.records"
-                :pagination="storeDescriptors.index.pagination"
-                @paginate="storeDescriptors.paginateIndex"
-                @sort="storeDescriptors.sortIndex">
-            </lesli-table>
-        </lesli-card>
-    </application-component>
+        <lesli-toolbar @search="storeDescriptors.search"></lesli-toolbar>
+
+        <lesli-table
+            :link="(descriptor) => url.vault('descriptors/:id', descriptor.id)"
+            :columns="columns"
+            :loading="storeDescriptors.index.loading"
+            :records="storeDescriptors.index.records"
+            :pagination="storeDescriptors.index.pagination"
+            @paginate="storeDescriptors.paginateIndex"
+            @sort="storeDescriptors.sortIndex">
+        </lesli-table>
+    </lesli-application-container>
 </template>