motor-admin 0.1.71 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9949e78f65ec1ec3e6800c1cc86093b88e13e935f5af74adcb6fc7425f2d3336
-  data.tar.gz: 92b8a11dad6cf4408cdb2d09a932e674a060d052b691c3faa634e2ff4637edad
+  metadata.gz: 06d50bf7bf7c919d161f50f8d8a258287696959c8b7f30957c1e690c18785f90
+  data.tar.gz: 2b9e032003062d26889f0b22541f0687e6389fa715e16b248726b65d499cbee8
 SHA512:
-  metadata.gz: dfe7b35a8f05b6bf0eb56e632f68774120438ac522c273ac2aae7720e3fc198069190a59edeef4083424ffda68d3ef3338f1b7d955d82052e75bf2ed46ba3aa5
-  data.tar.gz: 78e33a2de3d45dd419cf03ffba778a7051ddd59d8d976adfc2ab8e4b6e4e8a687a5e7a5a490c93b31690a240ea320e647b9b1a9e3bc547b22081eb369372752b
+  metadata.gz: ec3bac77b7826886d5412645e235a87fdefce3994fcc78c153c950adf44b1e4a04f14cd255d100ccaa91e686c9f088823d717c080551353fbe3cd500f7477433
+  data.tar.gz: e372e79f0fe48661200d8e4f2d4e812d25e4b68d44460324f7751e9053ffe0917e3a20096ba330d92cdfb27cbf64f27e2e40a5f007bb6e3441a786cc4e9ba169

data/config/locales/en.yml

@@ -18,6 +18,8 @@ en:
     add_query: Add Query
     add_scope: Add Scope
     add_tab: Add Tab
+    adjust_form: Adjust form
+    adjust_fields: Adjust fields
     alert_email_has_been_sent: Alert email has been sent!
     alert_has_been_activated: Alert has been activated
     alert_has_been_disabled: Alert has been disabled
@@ -36,6 +38,7 @@ en:
     bar_chart: Bar chart
     base: Base
     boolean: Boolean
+    build_custom_form: Build custom form
     cancel: Cancel
     cents: Cents
     checkbox: Checkbox
@@ -134,6 +137,7 @@ en:
     or: Or
     other_than: Other than
     param_name: Param name
+    password: Password
     path: Path
     percent: Percent
     pie_chart: Pie chart
@@ -158,6 +162,7 @@ en:
     revert: Revert
     revision_has_been_applied: Revision has been applied
     revisions: Revisions
+    richtext: Richtext
     row_chart: Row chart
     save: Save
     save_and_create_new: Save and Create New
@@ -214,4 +219,12 @@ en:
     visibility: Visibility
     visualization: Visualization
     write_only: Write-Only
-    richtext: Richtext
+    long_text: Long text
+    percentage: Percentage
+    change: Change
+    chart: Chart
+    tag: Tag
+    link: Link
+    color: Color
+    link_text: Link text
+    copied_to_the_clipboard: Copied to the clipboard

data/config/locales/es.yml

@@ -215,6 +215,19 @@ es:
     unit: Unidad
     write_only: Sólo escritura
     richtext: Texto enriquecido
+    adjust_form: Ajustar formulario
+    adjust_fields: Ajustar campos
+    build_custom_form: Crear formulario personalizado
+    password: Contraseña
+    long_text: Texto largo
+    percentage: Porcentaje
+    change: Cambia
+    chart: Gráfico
+    tag: Etiqueta
+    link: Enlace
+    color: Color
+    link_text: Texto del enlace
+    copied_to_the_clipboard: Copiado al portapapeles
     i:
       locale: es
       select:

data/lib/motor/build_schema.rb

@@ -11,6 +11,29 @@ module Motor
       ].freeze
     end
 
+    module ColumnTypes
+      ALL = [
+        STRING = 'string',
+        INTEGER = 'integer',
+        DECIMAL = 'float',
+        DATETIME = 'datetime',
+        DATE = 'date',
+        BOOLEAN = 'boolean',
+        TEXTAREA = 'textarea',
+        RICHTEXT = 'richtext',
+        CURRENCY = 'currency',
+        PERCENTAGE = 'percentage',
+        CHANGE = 'change',
+        CHART = 'chart',
+        TAG = 'tag',
+        LINK = 'link',
+        COLOR = 'color',
+        IMAGE = 'image',
+        FILE = 'file',
+        JSON = 'json'
+      ].freeze
+    end
+
     SEARCHABLE_COLUMN_TYPES = %i[citext text string bitstring].freeze
 
     COLUMN_NAME_ACCESS_TYPES = {

data/lib/motor/build_schema/load_from_rails.rb

@@ -13,6 +13,11 @@ module Motor
       ACTION_TEXT_SCOPE_PREFIX = 'with_rich_text_'
       ACTIVE_STORAGE_SCOPE_PREFIX = 'with_attached_'
 
+      DEFAULT_CURRENCY_FORMAT_HASH = {
+        currency: 'USD',
+        currency_base: 'units'
+      }.freeze
+
       module_function
 
       def call
@@ -109,22 +114,40 @@ module Motor
       end
 
       def build_table_column(column, model, default_attrs)
-        is_enum = model.defined_enums[column.name]
-
         {
           name: column.name,
           display_name: Utils.humanize_column_name(model.human_attribute_name(column.name)),
-          column_type: is_enum ? 'string' : UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
+          column_type: fetch_column_type(column, model),
           is_array: column.array?,
           access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
           reference: nil,
-          format: {},
+          format: fetch_format_hash(column, model),
           virtual: false
         }
       end
 
+      def fetch_format_hash(column, model)
+        return DEFAULT_CURRENCY_FORMAT_HASH if column.name == 'price'
+
+        inclusion_validator, = model.validators_on(column.name).grep(ActiveModel::Validations::InclusionValidator)
+        return { select_options: inclusion_validator.send(:delimiter) } if inclusion_validator
+
+        {}
+      end
+
+      def fetch_column_type(column, model)
+        return ColumnTypes::CURRENCY if column.name == 'price'
+        return ColumnTypes::COLOR if %w[hex color].include?(column.name)
+        return ColumnTypes::TAG if model.defined_enums[column.name]
+        return ColumnTypes::TAG if model.validators_on(column.name).any?(ActiveModel::Validations::InclusionValidator)
+        return ColumnTypes::RICHTEXT if column.name.ends_with?('_html')
+        return ColumnTypes::COLOR if column.name.match?(/_(color|hex)\z/)
+
+        UNIFIED_TYPES[column.type.to_s] || column.type.to_s
+      end
+
       def fetch_reference_columns(model)
         default_attrs = model.new.attributes
 
@@ -157,7 +180,7 @@ module Motor
         {
           name: column_name,
           display_name: model.human_attribute_name(name),
-          column_type: is_attachment ? 'file' : 'integer',
+          column_type: is_attachment ? ColumnTypes::FILE : ColumnTypes::INTEGER,
           access_type: access_type,
           default_value: default_attrs[column_name],
           validators: fetch_validators(model, column_name, ref),
@@ -173,8 +196,8 @@ module Motor
         {
           name: name + ACTION_TEXT_COLUMN_SUFFIX,
           display_name: model.human_attribute_name(name),
-          column_type: 'richtext',
-          access_type: BuildSchema::ColumnAccessTypes::READ_WRITE,
+          column_type: ColumnTypes::RICHTEXT,
+          access_type: ColumnAccessTypes::READ_WRITE,
           default_value: '',
           validators: fetch_validators(model, name, ref),
           format: {},

data/lib/motor/cancan_utils.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-module CancanUtils
+module Motor
+  module CancanUtils
+  end
 end
 
 require_relative './cancan_utils/ability_patch'

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -2068,11 +2068,11 @@
   "mail-opened.svg": "icons/mail-opened.svg",
   "mail.svg": "icons/mail.svg",
   "mailbox.svg": "icons/mailbox.svg",
-  "main-ff43eb24fb5b62cc171e.css.gz": "main-ff43eb24fb5b62cc171e.css.gz",
-  "main-ff43eb24fb5b62cc171e.js.LICENSE.txt": "main-ff43eb24fb5b62cc171e.js.LICENSE.txt",
-  "main-ff43eb24fb5b62cc171e.js.gz": "main-ff43eb24fb5b62cc171e.js.gz",
-  "main.css": "main-ff43eb24fb5b62cc171e.css",
-  "main.js": "main-ff43eb24fb5b62cc171e.js",
+  "main-0402aeca6e4cb904f4c9.css.gz": "main-0402aeca6e4cb904f4c9.css.gz",
+  "main-0402aeca6e4cb904f4c9.js.LICENSE.txt": "main-0402aeca6e4cb904f4c9.js.LICENSE.txt",
+  "main-0402aeca6e4cb904f4c9.js.gz": "main-0402aeca6e4cb904f4c9.js.gz",
+  "main.css": "main-0402aeca6e4cb904f4c9.css",
+  "main.js": "main-0402aeca6e4cb904f4c9.js",
   "man.svg": "icons/man.svg",
   "manual-gearbox.svg": "icons/manual-gearbox.svg",
   "map-2.svg": "icons/map-2.svg",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.71
+  version: 0.1.76
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1495,8 +1495,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-ff43eb24fb5b62cc171e.css.gz
-- ui/dist/main-ff43eb24fb5b62cc171e.js.gz
+- ui/dist/main-0402aeca6e4cb904f4c9.css.gz
+- ui/dist/main-0402aeca6e4cb904f4c9.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: