tramway-admin 4.0.1 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f49bf5b4e9e0ac337b90230037a618c730eb92fc0d11c2139a8452e4a44fc66
-  data.tar.gz: 1560fc7b9a504b76a78a3272f9feae6c672add55ce468255aee7593c4453f1dd
+  metadata.gz: 52f598a393f67ead5da2a67ef98a7b721edea4cda7c5968dcc5fe2224c75ba11
+  data.tar.gz: 4ea29fb442be1e667e843c813dd4dba340672add79d93437abd3226852e6f8a8
 SHA512:
-  metadata.gz: 27ce4b592fed1ea8a20b2c164187947313a35f044bea80cffa324647fad7191518e97b37e2b1eb6e0d2e23eae3d2afec95bddcdfbb03789ca5d93fbe1a3092f8
-  data.tar.gz: 3d44b49c30c6fea3c44db3e934613e8341cc0198e0c18280c6990965eedd91befa1bd8589a7c34f10816f4afe281830484839ecf54d5dbf144c281b519c45cd9
+  metadata.gz: 00645c93a5d1e36ad76fe059a9fd775146614cb8be7046c119f186bf9f81b00aefe636af0e56cebdebbe8abee5b4b288d3e3f0156bff8e35d336a574c13b555c
+  data.tar.gz: cdc9339fac651475ea6853d70096cf2ad3c7826d80668d61feb96012749e16e3f37d09310fbe4dfdedaf58a2457cae8b794ad82be98ea9b1895032d60f12fae6

data/README.md

@@ -574,6 +574,13 @@ end
 
 * **Model or Form is not available** - `params[:model]` or `params[:form]` is empty **OR** current user does not have access to model or form in `params[:model]` or `params[:form]`
 
+## Change admin user base model
+
+*config/initializers/tramway.rb*
+```ruby
+::Tramway::Admin.auth_config = { user_model: User, auth_attributes: %i[email username] }
+```
+
 ## Good features
 
 ### Get actions log in admin panel

data/app/controllers/tramway/admin/application_controller.rb

@@ -20,6 +20,10 @@ module Tramway
 
       protected
 
+      def admin_model
+        ::Tramway::Admin.admin_model
+      end
+
       def check_available!
         raise 'Tramway::Admin - Model or Form is not available. Looks like current user does not have access to change this model. Update your tramway initializer file' if !model_given? && !form_given?
       end
@@ -120,7 +124,7 @@ module Tramway
       end
 
       def current_admin
-        user = Tramway::User::User.find_by id: session[:admin_id]
+        user = admin_model.find_by id: session[:admin_id]
         return false unless user
 
         Tramway::User::UserDecorator.decorate user

data/app/controllers/tramway/admin/sessions_controller.rb

@@ -6,11 +6,11 @@ class Tramway::Admin::SessionsController < ::Tramway::Admin::ApplicationControll
   skip_before_action :collections_counts
 
   def new
-    @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.new
+    @session_form = ::Tramway::Auth::SessionForm.new admin_model.new
   end
 
   def create
-    @session_form = ::Tramway::Auth::SessionForm.new ::Tramway::User::User.find_or_initialize_by email: params[:user][:email]
+    @session_form = ::Tramway::Auth::SessionForm.new admin_model.find_or_initialize_by email: params[:user][:email]
     if @session_form.validate params[:user]
       admin_sign_in @session_form.model
       redirect_to Tramway::Admin::Engine.routes.url_helpers.root_path

data/app/helpers/tramway/admin/application_helper.rb

@@ -17,6 +17,7 @@ module Tramway
       include ::Tramway::Collections::Helper
       include ::Tramway::Core::CopyToClipboardHelper
       include ::Tramway::Admin::TramwayModelHelper
+      include ::Tramway::Admin::FrontendHelper
 
       def object_type(object)
         object_class_name = if object.class.ancestors.include? ::Tramway::Core::ApplicationDecorator
@@ -28,7 +29,7 @@ module Tramway
       end
 
       def current_admin
-        user = Tramway::User::User.find_by id: session[:admin_id]
+        user = Tramway::Admin.admin_model.find_by id: session[:admin_id]
         return false unless user
 
         Tramway::User::UserDecorator.decorate user

data/app/helpers/tramway/admin/frontend_helper.rb

@@ -0,0 +1,21 @@
+module Tramway::Admin::FrontendHelper
+  def react_params(form, action, method)
+    url = case action
+          when :create
+            Tramway::Admin::Engine.routes.url_helpers.records_path(model: form.model.class)
+          else
+            Tramway::Admin::Engine.routes.url_helpers.record_path(form.model.id, model: form.model.class)
+          end
+    form.properties.reduce({ action: url, method: method, authenticity_token: form_authenticity_token }) do |hash, property|
+      case property[1]
+      when :association
+        hash.merge!(
+          property[0] => {
+            collection: build_collection_for_association(form, property[0])
+          }
+        )
+      end
+      hash
+    end.merge model: form.model.attributes
+  end
+end

data/app/views/layouts/tramway/admin/application.html.haml

@@ -8,6 +8,10 @@
     = javascript_include_tag 'tramway/admin/application'
     - if File.exists?("#{Rails.root}/app/assets/javascripts/admin/application.js") || File.exists?("#{Rails.root}/app/assets/javascripts/admin/application.js.coffee")
       = javascript_include_tag 'admin/application'
+    - if File.exists?("#{Rails.root}/app/assets/stylesheets/admin/application.css") || File.exists?("#{Rails.root}/app/assets/stylesheets/admin/application.scss")
+      = stylesheet_link_tag 'admin/application'
+    - if File.exists?("#{Rails.root}/app/javascript/packs/admin/application.js")
+      = javascript_pack_tag 'admin/application'
     = csrf_meta_tags
     - if @application.favicon.present?
       = favicon_link_tag @application.favicon

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -1,5 +1,4 @@
 %nav.navbar.navbar-expand-md.navbar-dark.bg-dark
-  -# FIXME use helper methods
   - if ::Tramway::Admin.customized_admin_navbar.present?
     = ::Tramway::Admin.customized_admin_navbar
   - else
@@ -54,8 +53,6 @@
                   %span.badge.badge-light
                     = @notifications_count
           %li.nav-item
-            -# FIXME url_helpers return with /admin for some reason
-            -#= link_to Tramway::Auth::Engine.routes.url_helpers.session_path(model: Tramway::User::User).sub('/admin', ''), method: :delete, class: 'nav-link' do
             = link_to '/admin/sign_out', class: 'nav-link' do
               = fa_icon 'sign-out-alt'
               = t('helpers.links.sign_out')

data/app/views/tramway/admin/records/_form.html.haml

@@ -8,12 +8,15 @@
     = render 'tramway/core/shared/messages', object: @record_form
 .row
   .col-lg-12
-    = simple_form_for @record_form, url: { controller: :records, action: action, model: @record_form.model.class }, method: method, input_html: { class: 'form-horizontal' } do |f|
-      - @record_form.properties.each do |property, type|
-        = render 'tramway/core/shared/input', property: property, object: :record, type: type, form: f, destination: :admin, value: value_from_params(model_class: model_class, property: property, type: type)
-      = hidden_field_tag :redirect, params[:redirect]
-      = f.button :submit, t('helpers.links.save'), class: 'btn btn-success'
-      = link_to t('helpers.links.back'), current_model_records_path, class: 'btn btn-secondary'
+    - if @record_form.class.is_react_component?
+      = react_component "#{@record_form.class.name.gsub('::', '/')}", react_params(@record_form, action, method)
+    - else
+      = simple_form_for @record_form, url: { controller: :records, action: action, model: @record_form.model.class }, method: method, input_html: { class: 'form-horizontal' } do |f|
+        - @record_form.properties.each do |property, type|
+          = render 'tramway/core/shared/input', property: property, object: :record, type: type, form: f, destination: :admin, value: value_from_params(model_class: model_class, property: property, type: type)
+        = hidden_field_tag :redirect, params[:redirect]
+        = f.button :submit, t('helpers.links.save'), class: 'btn btn-success'
+        = link_to t('helpers.links.back'), current_model_records_path, class: 'btn btn-secondary'
 
 -# NOTES
 -# * value_from_params helper is in tramway-core gem app/helpers/inputs_helpers.rb

data/app/views/tramway/admin/records/_search.html.haml

@@ -3,8 +3,9 @@
     .d-flex.flex-row-reverse.filters
       = form_tag records_path, class: 'form-inline', method: :get do |f|
         - if searchable_model?(model_class)
-          .col-md-8
+          .input-group
             = text_field_tag :search, params[:search], class: 'text form-control'
+            = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'
         = hidden_field_tag :model, params[:model]
         = hidden_field_tag :scope, params[:scope]
         = hidden_field_tag :filter, (params[:filter].is_a?(ActionController::Parameters) ? params[:filter].permit!.to_h.to_json : params[:filter])
@@ -31,5 +32,3 @@
                     $('#filter_datepicker_begin_date').datepicker();
                     $('#filter_datepicker_end_date').datepicker();
                   });
-        .col-md-4.submit
-          = submit_tag t('helpers.actions.search'), class: 'btn btn-primary'

data/app/views/tramway/admin/records/index.html.haml

@@ -15,7 +15,7 @@
     .col
       = render 'search', model_class: model_class
 %hr
-%ul.nav.nav-tabs
+%ul.nav.nav-tabs.mb-3
   - if params[:search].present?
     %li.nav-item
       = link_to search_tab_title(@records.total_count), '#', class: 'nav-link active'

data/app/views/tramway/admin/shared/show/associations/_row.html.haml

@@ -7,7 +7,7 @@
       %td
         = model_class.human_attribute_name association.name
         %hr
-        - if create_is_available?(association.name) && (association_type != :has_one || !object.send(association.name).present?)
+        - if create_is_available?(association.class_name) && (association_type != :has_one || !object.send(association.name).present?)
           = link_to "#{I18n.t('helpers.actions.add')} #{model_class.human_attribute_name(association.name).singularize.downcase}", new_associated_record_path(association: association, object: object, as: object.send("#{association.name}_as")), class: 'btn btn-primary'
       %td{ colspan: 2 }
         - if association_type.in? [ :has_one, :belongs_to ]

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '4.0.1'
+    VERSION = '4.1.1'
   end
 end

data/lib/tramway/admin.rb

@@ -79,6 +79,36 @@ module Tramway
           new_hash.merge! pair[0].to_s => pair[1]
         end
       end
+
+      def admin_model
+        @@auth_config.first[:user_model]
+      end
+
+      def auth_config
+        @@auth_config ||= [{ user_model: ::Tramway::User::User, auth_attributes: :email }]
+      end
+
+      def auth_config=(params)
+        if params.is_a? Hash
+          @@auth_config = [params]
+        elsif params.is_a? Array
+          @@auth_config = params
+        end
+      end
+
+      def user_based_models
+        @@auth_config ||= []
+        @@auth_config.map do |conf|
+          conf[:user_model]
+        end
+      end
+
+      def auth_attributes
+        @@auth_config ||= []
+        @@auth_config.reduce({}) do |hash, conf|
+          hash.merge! conf[:user_model] => conf[:auth_attributes]
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -256,6 +256,7 @@ files:
 - app/helpers/tramway/admin/application_helper.rb
 - app/helpers/tramway/admin/cases_helper.rb
 - app/helpers/tramway/admin/focus_generator_helper.rb
+- app/helpers/tramway/admin/frontend_helper.rb
 - app/helpers/tramway/admin/navbar_helper.rb
 - app/helpers/tramway/admin/records_helper.rb
 - app/helpers/tramway/admin/russian_cases_helper.rb