tramway-admin 4.0.0.1 → 4.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c198a3b0d6fad90c8de0c064e53843dc4c7471087f8ef379aeb28e37e1ee446
-  data.tar.gz: f0aa47073c3a211e5396179b06499cdf2f5782f255c017c83723e7e50dfeadc4
+  metadata.gz: 8b44fe24bffc41f9e73369d01d70066b3454fae31e483ba3b83b13a81efd0fbf
+  data.tar.gz: 21f8c5c22448dc3ac1df74ad91cfc8a1fa4ce82f684bcaf990cc1478549ccb87
 SHA512:
-  metadata.gz: 380e8552c48f0afc1f70700bd792af2718d9c4bdd486e0fb8a774a07dac46cc9b0a0ae679bffce7b8be8924ea745ebcda4b6b7d3ded34bdc7ecbf1994dcb59db
-  data.tar.gz: 9dc264f0b6310b6945932894171e780a6cc88da295fe9f0c01b16adb7f69571b10005d1ea7534150c74fae86a1d59fdd5341fe026b7700327ef1ae1920dd735c
+  metadata.gz: 31923f43c6a572341ef1c5561630bae7358a6c943651ed044e45a2a03bdb53e1fe6d85d2cda346829219d14b7fb98c060b8266fa05dc6a84707721fca8621e4e
+  data.tar.gz: 5873f1f00d1eb3f989d42ac9a3767c38a211ca3b456072ddd6e2c5fed9bd4bf3d1eae7109801ae2902821d397ede0dfb9ad722f37d5e4e319a089ff0cebe4676

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

@@ -21,6 +21,16 @@ module Tramway::Admin::ActionsHelper
     )
   end
 
+  def create_is_available?(association_class)
+    ::Tramway::Admin.action_is_available?(
+      nil,
+      project: (@application_engine || @application.name),
+      model_name: association_class,
+      role: current_admin.role,
+      action: :create
+    )
+  end
+
   # delete_button is in smart-buttons gem
 
   def edit_button(url:, button_options:)

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

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

@@ -4,10 +4,14 @@
     %meta{ content: "width=device-width, initial-scale=1, maximum-scale=0.8", name: "viewport" }
     %title
       = yield :title
-    = stylesheet_link_tag    'tramway/admin/application', media: "all"
+    = stylesheet_link_tag    'tramway/admin/application', media: :all
     = 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/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 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.0.1'
+    VERSION = '4.1.0.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 4.0.0.1
+  version: 4.1.0.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 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