lesli_admin 1.0.2 → 1.1.2

data/app/controllers/lesli_admin/account/currencies_controller.rb

@@ -25,7 +25,7 @@ module LesliAdmin
       @account_currency = Account::Currency.new(account_currency_params)
 
       if @account_currency.save
-        redirect_to @account_currency, notice: "Currency was successfully created."
+        redirect_to @account_currency, notice: "Currency was successfully created.", allow_other_host: false
       else
         render :new, status: :unprocessable_entity
       end
@@ -34,7 +34,7 @@ module LesliAdmin
     # PATCH/PUT /account/currencies/1
     def update
       if @account_currency.update(account_currency_params)
-        redirect_to @account_currency, notice: "Currency was successfully updated.", status: :see_other
+        redirect_to @account_currency, notice: "Currency was successfully updated.", status: :see_other, allow_other_host: false
       else
         render :edit, status: :unprocessable_entity
       end

data/app/controllers/lesli_admin/account/details_controller.rb

@@ -4,7 +4,7 @@ module LesliAdmin
 
     # GET /account/details
     def index
-      @account_details = Account::Detail.all
+      @account_details = Account::Detail.where(account: admin_account)
     end
 
     # GET /account/details/1
@@ -13,7 +13,7 @@ module LesliAdmin
 
     # GET /account/details/new
     def new
-      @account_detail = Account::Detail.new
+      @account_detail = admin_account.build_detail
     end
 
     # GET /account/details/1/edit
@@ -22,10 +22,10 @@ module LesliAdmin
 
     # POST /account/details
     def create
-      @account_detail = Account::Detail.new(account_detail_params)
+      @account_detail = admin_account.build_detail(account_detail_params)
 
       if @account_detail.save
-        redirect_to @account_detail, notice: "Detail was successfully created."
+        redirect_to @account_detail, notice: "Detail was successfully created.", allow_other_host: false
       else
         render :new, status: :unprocessable_entity
       end
@@ -34,7 +34,7 @@ module LesliAdmin
     # PATCH/PUT /account/details/1
     def update
       if @account_detail.update(account_detail_params)
-        redirect_to @account_detail, notice: "Detail was successfully updated.", status: :see_other
+        redirect_to @account_detail, notice: "Detail was successfully updated.", status: :see_other, allow_other_host: false
       else
         render :edit, status: :unprocessable_entity
       end
@@ -49,7 +49,14 @@ module LesliAdmin
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_account_detail
-        @account_detail = Account::Detail.find(params.expect(:id))
+        @account_detail = Account::Detail.find_by!(
+          id: params.expect(:id),
+          account: admin_account
+        )
+      end
+
+      def admin_account
+        current_user.account.admin
       end
 
       # Only allow a list of trusted parameters through.

data/app/controllers/lesli_admin/account/locations_controller.rb

@@ -4,7 +4,7 @@ module LesliAdmin
 
     # GET /account/locations
     def index
-      @account_locations = Account::Location.all
+      @account_locations = admin_account.locations
     end
 
     # GET /account/locations/1
@@ -13,7 +13,7 @@ module LesliAdmin
 
     # GET /account/locations/new
     def new
-      @account_location = Account::Location.new
+      @account_location = admin_account.locations.build
     end
 
     # GET /account/locations/1/edit
@@ -22,10 +22,10 @@ module LesliAdmin
 
     # POST /account/locations
     def create
-      @account_location = Account::Location.new(account_location_params)
+      @account_location = admin_account.locations.build(account_location_params)
 
       if @account_location.save
-        redirect_to @account_location, notice: "Location was successfully created."
+        redirect_to @account_location, notice: "Location was successfully created.", allow_other_host: false
       else
         render :new, status: :unprocessable_entity
       end
@@ -34,7 +34,7 @@ module LesliAdmin
     # PATCH/PUT /account/locations/1
     def update
       if @account_location.update(account_location_params)
-        redirect_to @account_location, notice: "Location was successfully updated.", status: :see_other
+        redirect_to @account_location, notice: "Location was successfully updated.", status: :see_other, allow_other_host: false
       else
         render :edit, status: :unprocessable_entity
       end
@@ -49,7 +49,11 @@ module LesliAdmin
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_account_location
-        @account_location = Account::Location.find(params.expect(:id))
+        @account_location = admin_account.locations.find(params.expect(:id))
+      end
+
+      def admin_account
+        current_user.account.admin
       end
 
       # Only allow a list of trusted parameters through.

data/app/controllers/lesli_admin/account/settings_controller.rb

@@ -25,7 +25,7 @@ module LesliAdmin
       @account_setting = Account::Setting.new(account_setting_params)
 
       if @account_setting.save
-        redirect_to @account_setting, notice: "Setting was successfully created."
+        redirect_to @account_setting, notice: "Setting was successfully created.", allow_other_host: false
       else
         render :new, status: :unprocessable_entity
       end
@@ -34,7 +34,7 @@ module LesliAdmin
     # PATCH/PUT /account/settings/1
     def update
       if @account_setting.update(account_setting_params)
-        redirect_to @account_setting, notice: "Setting was successfully updated.", status: :see_other
+        redirect_to @account_setting, notice: "Setting was successfully updated.", status: :see_other, allow_other_host: false
       else
         render :edit, status: :unprocessable_entity
       end

data/app/controllers/lesli_admin/accounts_controller.rb

@@ -36,25 +36,31 @@ module LesliAdmin
 
         def show
             @account = AccountService.new(current_user, query).show
+
             respond_to do |format|
                 format.html
                 format.turbo_stream
                 format.json do
-                    respond_with_successful(@account)
+                    respond_with_successful(account_payload(@account))
                 end
             end
         end
     
         def update
-
-            # check saved
-            if @account.update(account_params)
+            if AccountService.new(current_user, query).update(account_params)
                 log(:description => 'Updated the account details')
                 respond_with_lesli(
-                    :turbo => stream_notification_success('Account updated')
+                    turbo: stream_notification_success("Account updated successfully"),
+                    json: account_payload(@account),
+                    redirect: account_path
+                )
+            else
+                respond_with_lesli(
+                    turbo: stream_notification_danger(@account.errors.full_messages.to_sentence),
+                    json: { errors: @account.errors.to_hash },
+                    html: :show,
+                    status: :unprocessable_content
                 )
-            else 
-                #respond_with_error(@account.errors)
             end
         end
 
@@ -69,31 +75,39 @@ module LesliAdmin
         # Only allow a list of trusted parameters through.
         def account_params
             params.require(:account).permit(
-                :id,
                 :name,
                 :email,
+                :status,
+                :region,
                 detail_attributes: [
-                    :company_name_legal, 
-                    :company_tagline
+                    :company_name,
+                    :company_name_legal,
+                    :company_tagline,
+                    :country,
+                    :address,
+                    :region,
+                    :city,
+                    :postal_code,
+                    :website,
+                    :phone_number_1,
+                    :phone_number_2,
+                    :phone_number_3,
+                    :phone_number_4,
+                    :public_email,
+                    :github,
+                    :twitter,
+                    :youtube,
+                    :linkedin,
+                    :facebook
                 ]
-                # :company_name_legal,
-                # :company_tagline,
-                # :country,
-                # :city,
-                # :postal_code,
-                # :address,
-                # :region,
-                # :website,
-                # :phone_number_1,
-                # :public_email,
-                # :github,
-                # :twitter,
-                # :youtube,
-                # :linkedin,
-                # :facebook,
-                # :status,
-                # :users_id
             )
         end
+
+        def account_payload(account)
+            account.as_json.merge(
+                "detail_attributes" => (account.admin.detail&.as_json || {})
+            )
+        end
+
     end
 end

data/app/controllers/lesli_admin/dashboards_controller.rb

@@ -32,5 +32,26 @@ Building a better future, one line of code at a time.
 
 module LesliAdmin
     class DashboardsController < Lesli::Shared::DashboardsController
+        def show
+            @account_summary = AccountService.new(current_user, query).summary
+
+            synchronize_dashboard_components if defined?(LesliDashboard)
+
+            return super if defined?(LesliDashboard)
+
+            render :show
+        end
+
+        private
+
+        def synchronize_dashboard_components
+            dashboard_account = current_user.account.dashboard
+            return unless dashboard_account
+
+            LesliDashboard::DashboardService.new(current_user).register(dashboard_account)
+
+            dashboard = dashboard_account.dashboards.find_by(engine: "LesliAdmin")
+            dashboard&.components&.where(component: Dashboard::RETIRED_COMPONENTS)&.destroy_all
+        end
     end
 end

data/app/models/lesli_admin/account/currency.rb

@@ -1,4 +1,6 @@
 module LesliAdmin
-  class Account::Currency < ApplicationRecord
-  end
+    class Account::Currency < ApplicationRecord
+        belongs_to :account, class_name: "LesliAdmin::Account", inverse_of: :currencies
+        belongs_to :user, class_name: "Lesli::User", optional: true
+    end
 end

data/app/models/lesli_admin/account/detail.rb

@@ -1,4 +1,7 @@
 module LesliAdmin
     class Account::Detail < ApplicationRecord
+        belongs_to :account, class_name: "LesliAdmin::Account", inverse_of: :detail
+
+        validates :account_id, uniqueness: true
     end
 end

data/app/models/lesli_admin/account/location.rb

@@ -1,4 +1,14 @@
 module LesliAdmin
-  class Account::Location < ApplicationRecord
-  end
+    class Account::Location < ApplicationRecord
+        belongs_to :account, class_name: "LesliAdmin::Account", inverse_of: :locations
+        belongs_to :parent, class_name: "LesliAdmin::Account::Location", optional: true
+
+        has_many(
+            :children,
+            class_name: "LesliAdmin::Account::Location",
+            foreign_key: :parent_id,
+            inverse_of: :parent,
+            dependent: :nullify
+        )
+    end
 end

data/app/models/lesli_admin/account/setting.rb

@@ -1,4 +1,6 @@
 module LesliAdmin
-  class Account::Setting < ApplicationRecord
-  end
+    class Account::Setting < ApplicationRecord
+        belongs_to :account, class_name: "LesliAdmin::Account", inverse_of: :settings
+        belongs_to :user, class_name: "Lesli::User", optional: true
+    end
 end

data/app/models/lesli_admin/account.rb

@@ -32,8 +32,25 @@ Building a better future, one line of code at a time.
 
 module LesliAdmin
     class Account < ApplicationRecord
-        belongs_to :account, class_name: "Lesli::Account"
+        belongs_to :account, class_name: "Lesli::Account", inverse_of: :admin
+        validates :account_id, uniqueness: true
         has_many :dashboards
+        has_many :settings, class_name: "LesliAdmin::Account::Setting", dependent: :destroy
+        has_many :currencies, class_name: "LesliAdmin::Account::Currency", dependent: :destroy
+        has_many(
+            :locations,
+            class_name: "LesliAdmin::Account::Location",
+            inverse_of: :account,
+            dependent: :destroy
+        )
+        has_one(
+            :detail,
+            class_name: "LesliAdmin::Account::Detail",
+            inverse_of: :account,
+            dependent: :destroy
+        )
+
+        accepts_nested_attributes_for :detail, update_only: true
 
         after_create :initialize_account
 

data/app/models/lesli_admin/dashboard.rb

@@ -32,6 +32,13 @@ Building a better future, one line of code at a time.
 
 module LesliAdmin
     class Dashboard < Lesli::Shared::Dashboard
-        COMPONENTS = %i[installed_engines]
+        RETIRED_COMPONENTS = %w[locations currencies settings].freeze
+
+        COMPONENTS = [
+            { users: { size: 4, position: 1 } },
+            { roles: { size: 4, position: 2 } },
+            { installed_engines: { size: 4, position: 3 } },
+            { account_metadata: { size: 12, position: 4 } }
+        ].freeze
     end
 end

data/app/services/lesli_admin/account_service.rb

@@ -32,25 +32,52 @@ Building a better future, one line of code at a time.
 
 module LesliAdmin 
     class AccountService < Lesli::ApplicationLesliService
-        def show 
-            account = Lesli::Account #.left_joins(:detail)
-            .where(:id => current_user.account.id)
-            .select(:id, :email, :name, :status) #, :company_name_legal, :company_tagline)
-            .first
+        def show
+            account = Lesli::Account
+                .includes(:user, admin: :detail)
+                .find(current_user.account.id)
+
+            account.admin.build_detail unless account.admin.detail
+            account
+        end
+
+        def update(attributes)
+            account = current_user.account
+            account_attributes = attributes.to_h.deep_symbolize_keys
+            detail_attributes = account_attributes.delete(:detail_attributes)
+
+            ActiveRecord::Base.transaction do
+                account.update!(account_attributes)
+                account.admin.update!(detail_attributes: detail_attributes) if detail_attributes
+            end
+
+            account
+        rescue ActiveRecord::RecordInvalid => exception
+            copy_errors(exception.record, to: account)
+            false
+        end
+
+        def summary
+            account = Lesli::Account
+                .includes(:user, :users, :roles)
+                .find(current_user.account.id)
 
             {
-                id: account.id,
-                name: account.name,
-                email: account.email,
-                status: account.status,
-                # detail_attributes: {
-                #     company_name_legal: account.company_name_legal,
-                #     company_tagline: account.company_tagline
-                # }
+                account: account,
+                users: account.users.size,
+                roles: account.roles.size,
+                installed_engines: LesliSystem.engines.size
             }
+        end
+
+        private
+
+        def copy_errors(source, to:)
+            return if source.equal?(to)
 
-            #current_user.account.joins(:detail)
-            return account
-        end 
+            source.errors.each do |error|
+                to.errors.add(:detail, error.full_message)
+            end
+        end
     end 
 end

data/app/views/lesli_admin/accounts/show.html.erb

@@ -1,15 +1,112 @@
-
 <%= render(LesliView::Layout::Container.new("accounts")) do %>
+    <%= render(
+        LesliView::Components::Header.new(
+            "Account",
+            "Manage the core identity, company profile, and resources for #{@account.name}."
+        )
+    ) %>
 
-    <%= render(LesliView::Components::Header.new("Account information")) %>
+    <% if @account.errors.any? %>
+        <div class="mb-6 rounded-xl border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700" role="alert">
+            <p class="font-semibold">The account could not be updated.</p>
+            <ul class="mt-2 list-disc space-y-1 pl-5">
+                <% @account.errors.full_messages.each do |message| %>
+                    <li><%= message %></li>
+                <% end %>
+            </ul>
+        </div>
+    <% end %>
 
     <%= render LesliView::Components::Tabs.new do |tabs| %>
-        <% tabs.with_tab(title: "General Information", icon: "business") do  %>
+        <% tabs.with_tab(id: "general", title: "General", icon: "business") do %>
             <%= form_with(model: @account, url: account_path, builder: LesliView::Forms::Builder) do |form| %>
-                <%= form.fieldset do %>
-                    <%= form.field_control(:name, label: "Company name")%>
-                    <%= form.field_control(:email, label: "Email") %>
-                    <%= form.field_control_submit %>
+                <%= form.fieldset("Core account") do %>
+                    <p class="mb-5 text-sm leading-6 text-slate-500">
+                        These values identify the account throughout every installed Lesli engine.
+                    </p>
+
+                    <div class="grid grid-cols-1 gap-x-5 md:grid-cols-2">
+                        <%= form.field_control(
+                            :name,
+                            label: "Account name",
+                            autocomplete: "organization",
+                            required: true
+                        ) %>
+                        <%= form.field_control_email(
+                            :email,
+                            label: "Account email",
+                            autocomplete: "email",
+                            required: true
+                        ) %>
+                        <%= form.field_control_select(
+                            :status,
+                            Lesli::Account.statuses.keys.map { |status| [status, status] },
+                            label: "Status"
+                        ) %>
+                        <%= form.field_control_select(
+                            :region,
+                            Lesli::Account.regions.keys.map { |region| [region, region] },
+                            label: "Data region"
+                        ) %>
+                    </div>
+
+                    <div class="mt-2 flex justify-end">
+                        <%= form.field_control_button("Save account", category: "primary", icon: "save") %>
+                    </div>
+                <% end %>
+            <% end %>
+        <% end %>
+
+        <% tabs.with_tab(id: "company-profile", title: "Company profile", icon: "domain") do %>
+            <%= form_with(model: @account, url: account_path, builder: LesliView::Forms::Builder) do |form| %>
+                <%= form.fields_for(:detail, @account.admin.detail) do |detail| %>
+                    <%= detail.fieldset("Company information") do %>
+                        <div class="grid grid-cols-1 gap-x-5 md:grid-cols-2">
+                            <%= detail.field_control(:company_name, label: "Public company name", autocomplete: "organization") %>
+                            <%= detail.field_control(:company_name_legal, label: "Legal company name") %>
+                            <div class="md:col-span-2">
+                                <%= detail.field_control(:company_tagline, label: "Tagline") %>
+                            </div>
+                        </div>
+                    <% end %>
+
+                    <%= detail.fieldset("Address and contact") do %>
+                        <div class="grid grid-cols-1 gap-x-5 md:grid-cols-2">
+                            <div class="md:col-span-2">
+                                <%= detail.field_control(:address, label: "Address", autocomplete: "street-address") %>
+                            </div>
+                            <%= detail.field_control(:city, label: "City", autocomplete: "address-level2") %>
+                            <%= detail.field_control(:region, label: "State or region", autocomplete: "address-level1") %>
+                            <%= detail.field_control(
+                                :country,
+                                label: "Country catalog ID",
+                                message: "Numeric identifier from the configured country catalog.",
+                                type: "number",
+                                min: 0
+                            ) %>
+                            <%= detail.field_control(:postal_code, label: "Postal code", autocomplete: "postal-code") %>
+                            <%= detail.field_control_email(:public_email, label: "Public email", autocomplete: "email") %>
+                            <%= detail.field_control(:website, label: "Website", type: "url", autocomplete: "url") %>
+                            <%= detail.field_control(:phone_number_1, label: "Primary phone", type: "tel", autocomplete: "tel") %>
+                            <%= detail.field_control(:phone_number_2, label: "Secondary phone", type: "tel") %>
+                            <%= detail.field_control(:phone_number_3, label: "Additional phone 1", type: "tel") %>
+                            <%= detail.field_control(:phone_number_4, label: "Additional phone 2", type: "tel") %>
+                        </div>
+                    <% end %>
+
+                    <%= detail.fieldset("Social profiles") do %>
+                        <div class="grid grid-cols-1 gap-x-5 md:grid-cols-2">
+                            <%= detail.field_control(:github, label: "GitHub", type: "url") %>
+                            <%= detail.field_control(:linkedin, label: "LinkedIn", type: "url") %>
+                            <%= detail.field_control(:twitter, label: "X / Twitter", type: "url") %>
+                            <%= detail.field_control(:facebook, label: "Facebook", type: "url") %>
+                            <%= detail.field_control(:youtube, label: "YouTube", type: "url") %>
+                        </div>
+
+                        <div class="mt-2 flex justify-end">
+                            <%= detail.field_control_button("Save company profile", category: "primary", icon: "save") %>
+                        </div>
+                    <% end %>
                 <% end %>
             <% end %>
         <% end %>

data/app/views/lesli_admin/dashboards/_component-account-metadata.html.erb

@@ -0,0 +1,44 @@
+<%
+    account = @account_summary[:account]
+    status_classes = case account.status
+    when "active"
+        "bg-emerald-100 text-emerald-700"
+    when "suspended"
+        "bg-red-100 text-red-700"
+    when "onboarding"
+        "bg-amber-100 text-amber-700"
+    else
+        "bg-sky-100 text-sky-700"
+    end
+%>
+
+<section class="h-full rounded-2xl border border-slate-200 bg-white p-5 shadow-sm sm:p-6" aria-labelledby="account-metadata-title">
+    <div class="flex flex-wrap items-start justify-between gap-4">
+        <div>
+            <h2 id="account-metadata-title" class="text-base font-semibold text-slate-900">Account metadata</h2>
+            <p class="mt-1 text-sm text-slate-500">Read-only identifiers and lifecycle information.</p>
+        </div>
+        <span class="inline-flex items-center rounded-full px-2.5 py-1 text-xs font-semibold <%= status_classes %>">
+            <%= account.status.humanize %>
+        </span>
+    </div>
+
+    <dl class="mt-5 grid grid-cols-1 gap-x-6 gap-y-5 sm:grid-cols-2 xl:grid-cols-4">
+        <div>
+            <dt class="text-sm font-medium text-slate-500">Account ID</dt>
+            <dd class="mt-1 break-all text-sm text-slate-900"><%= account.id %></dd>
+        </div>
+        <div>
+            <dt class="text-sm font-medium text-slate-500">Owner</dt>
+            <dd class="mt-1 break-all text-sm text-slate-900"><%= account.user&.email || "Not assigned" %></dd>
+        </div>
+        <div>
+            <dt class="text-sm font-medium text-slate-500">Created</dt>
+            <dd class="mt-1 text-sm text-slate-900"><%= l(account.created_at, format: :long) %></dd>
+        </div>
+        <div>
+            <dt class="text-sm font-medium text-slate-500">Last updated</dt>
+            <dd class="mt-1 text-sm text-slate-900"><%= l(account.updated_at, format: :long) %></dd>
+        </div>
+    </dl>
+</section>

data/app/views/lesli_admin/dashboards/_component-installed-engines.html.erb

@@ -1,8 +1 @@
-<div class="box has-text-centered py-6">
-    <p class="is-title is-size-3 mb-2">
-        <b><%= LesliSystem.engines.size %></b>
-    </p>
-    <p class="is-title is-size-4">
-        Installed engines
-    </p>
-</div>
+<%= render(LesliView::Widgets::Count.new("Installed engines", @account_summary[:installed_engines])) %>

data/app/views/lesli_admin/dashboards/_component-roles.html.erb

@@ -0,0 +1 @@
+<%= render(LesliView::Widgets::Count.new("Roles", @account_summary[:roles])) %>

data/app/views/lesli_admin/dashboards/_component-users.html.erb

@@ -0,0 +1 @@
+<%= render(LesliView::Widgets::Count.new("Users", @account_summary[:users])) %>