motor-admin 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a15345e4f0be22dda572c79266ae05e856362e2725850cd15e94689b2ce47f8
-  data.tar.gz: 523971a3051bc7fb09597187cc30cd1c643ae64307208d8391ea33915c858745
+  metadata.gz: a2381b665cf63ac72903b322e652a119c154215db95b477e4f723eb4c0bbdf97
+  data.tar.gz: 44ffba20a1acb4206a43abfba8ab58c36cb7fd5ff421926c06347f2df3e7a168
 SHA512:
-  metadata.gz: a1e695cbcba7f1d0b3d5eac466b3b3c56f2a69ee4a1a1cf0f0f335fa7db5bf3ee16c4e9a7db4e3914fa90a65c16bd2951914f1d9e1f6aa777f869d5864495f82
-  data.tar.gz: 22e36131c24fbd2a97cc7650a10a7158546a857b6b2ecfcf391c471176e5d827d23469815ae65ebdfe58cbfe02cafa7b26122b69176c889e9e6115fcdf49ca16
+  metadata.gz: 3f9c1360a6d42da64df2bfeed16d2765aef367ec535d3469d91b3093e3f12ab640fd72c13f76bc8e26dbccad1813c7583c7fce9d81dd8c725c79cbde92d6df97
+  data.tar.gz: 17daf2ac024c72d6614ea8fa21814c7f224d325f6f8872d1e8df4bbc54bdfe1019622e6c4570821bb17588645010c3b1e126e4865ca056ba62c492294f3e6202

data/README.md

@@ -1,12 +1,12 @@
 <div align="center">
 
-[![Motor Admin](https://user-images.githubusercontent.com/5418788/140520844-a947845d-b579-4b3f-9b49-c539ad3cf580.png)](https://www.getmotoradmin.com)
+[![Motor Admin Rails](https://user-images.githubusercontent.com/5418788/140520844-a947845d-b579-4b3f-9b49-c539ad3cf580.png)](https://www.getmotoradmin.com/ruby-on-rails)
 
-# Motor Admin
+# Motor Admin Rails
 
 Low-code Admin panel and Business intelligence Rails engine **(no DSL - configurable from the UI)**.
 
-🤓 [Demo App](https://motor-admin.herokuapp.com/demo) | 👀 [Features overview](https://www.youtube.com/watch?v=ngVoci8Hll4&list=PLu7llEMh0KcOkR3Uy_RJT0cXPZQKAYVsq&index=1) | ⭐ [Pro](https://www.getmotoradmin.com/rails)
+🤓 [Demo App](https://motor-admin.herokuapp.com/demo) | 👀 [Features overview](https://www.youtube.com/watch?v=ngVoci8Hll4&list=PLu7llEMh0KcOkR3Uy_RJT0cXPZQKAYVsq&index=1) | ⭐ [Pro](https://www.getmotoradmin.com/ruby-on-rails)
 </div>
 
 [![Admin Panel](https://user-images.githubusercontent.com/5418788/119318538-1f30e300-bc82-11eb-94a4-107c31c93b13.png)](https://motor-admin.herokuapp.com/demo)
@@ -45,7 +45,7 @@ $ rails motor:install && rake db:migrate
 * [Configurations sync between environments](#configurations-sync)
 * [Authentication](#authentication)
 
-## [Pro](https://www.getmotoradmin.com/rails)
+## [Pro](https://www.getmotoradmin.com/ruby-on-rails)
 
 * Multiple databases support
 * Audit log
@@ -55,7 +55,7 @@ $ rails motor:install && rake db:migrate
 * Personalized report alerts via Slack
 * Full-text search
 * Shareable forms and reports
-* [learn more](https://www.getmotoradmin.com/rails)
+* [learn more](https://www.getmotoradmin.com/ruby-on-rails)
 
 ### Customizable CRUD
 

data/lib/motor/build_schema/load_from_rails.rb

@@ -238,13 +238,18 @@ module Motor
       end
 
       def build_reference(model, name, reflection)
+        primary_key = reflection.polymorphic? ? 'id' : reflection.join_primary_key
+        foreign_key = reflection.join_foreign_key
+
+        primary_key, foreign_key = foreign_key, primary_key if reflection.has_one?
+
         {
           name: name,
           display_name: model.human_attribute_name(name),
           model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
           reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
-          foreign_key: reflection.join_foreign_key,
-          primary_key: reflection.polymorphic? ? 'id' : reflection.join_primary_key,
+          foreign_key: foreign_key,
+          primary_key: primary_key,
           options: reflection.options.slice(:through, :source),
           polymorphic: reflection.polymorphic?,
           virtual: false

data/lib/motor/configs/build_ui_app_tag.rb

@@ -26,6 +26,10 @@ module Motor
 
         key += Motor::DefineArModels.defined_models_schema_md5.to_s if defined?(Motor::DefineArModels)
 
+        if Rails.env.development?
+          key += Digest::MD5.hexdigest(ActiveRecord::Base.descendants.map(&:object_id).sort.join)
+        end
+
         key
       end
 

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.3.0'
+  VERSION = '0.3.3'
 end

data/ui/dist/manifest.json

@@ -3966,9 +3966,9 @@
   "images/marker-icon-2x.png": "images/marker-icon-2x.png",
   "images/marker-icon.png": "images/marker-icon.png",
   "images/marker-shadow.png": "images/marker-shadow.png",
-  "main-66147fbe72d9936a1243.css.gz": "main-66147fbe72d9936a1243.css.gz",
-  "main-66147fbe72d9936a1243.js.LICENSE.txt": "main-66147fbe72d9936a1243.js.LICENSE.txt",
-  "main-66147fbe72d9936a1243.js.gz": "main-66147fbe72d9936a1243.js.gz",
-  "main.css": "main-66147fbe72d9936a1243.css",
-  "main.js": "main-66147fbe72d9936a1243.js"
+  "main-53a1a9dffc796b4ca695.css.gz": "main-53a1a9dffc796b4ca695.css.gz",
+  "main-53a1a9dffc796b4ca695.js.LICENSE.txt": "main-53a1a9dffc796b4ca695.js.LICENSE.txt",
+  "main-53a1a9dffc796b4ca695.js.gz": "main-53a1a9dffc796b4ca695.js.gz",
+  "main.css": "main-53a1a9dffc796b4ca695.css",
+  "main.js": "main-53a1a9dffc796b4ca695.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-24 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -2219,8 +2219,8 @@ files:
 - ui/dist/images/marker-icon-2x.png
 - ui/dist/images/marker-icon.png
 - ui/dist/images/marker-shadow.png
-- ui/dist/main-66147fbe72d9936a1243.css.gz
-- ui/dist/main-66147fbe72d9936a1243.js.gz
+- ui/dist/main-53a1a9dffc796b4ca695.css.gz
+- ui/dist/main-53a1a9dffc796b4ca695.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: