tramway-admin 4.0 → 4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0da53840f67044b77ccf8d8c37b2dd02d23fde702aa09550182062056032fc5f
-  data.tar.gz: 50ae25d697d79b09e8aeb59b19d35a6be14b3b904dfaf0a47562cf5bc3e28401
+  metadata.gz: 78639584bbf4b055028b8d32816434c049812c9aa8711fdfcc4c988b22e4d28a
+  data.tar.gz: fd5f663efbceab4b1ac6aa2276488a2b7f5b287db196564b72419da25f1f2743
 SHA512:
-  metadata.gz: f7f23e28049699b42619820d7c643dcaff51983aa3430da9b5b77d8424e484531fd19f09ba4b07e540ed416c0d3eeb0a12b8551c001fc437634110e0247b0432
-  data.tar.gz: af55df2f1614906fd42ca0313e1acf463b08aa78dcb71f4ca1cca50aafe0de8f0f1af20995ea91910b3016d9e062bbdc06bc4dffa8e7f2d09062784a5e360f43
+  metadata.gz: d18a9fcb50694c039bfa5bcd702391260312cdc88eaa45922d35564b0a34cdda6049f55299d482a5dfb71ccbc4d3d38407a17156cdcf9705ab89fa6f89a35226
+  data.tar.gz: 1b8472ecb0adb65f49146cb5896d1757e82e96e07a3ede8c191bcc3f31ceaf0ab3444430b0a9e023dd8179032338b94ebfc975dae7529e81e4e665fe4c31e9a3

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/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'
+    VERSION = '4.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: '4.0'
+  version: '4.1'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tramway-core
@@ -180,16 +180,16 @@ dependencies:
   name: trap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
@@ -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