RubyGems - motor-admin - Versions diffs - 0.1.21 → 0.1.28 - Mend

motor-admin 0.1.21 → 0.1.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +4 -4
data/app/controllers/motor/active_storage_attachments_controller.rb +6 -1
data/app/views/layouts/motor/application.html.erb +1 -1
data/lib/motor/admin.rb +15 -0
data/lib/motor/api_query/build_json.rb +17 -10
data/lib/motor/api_query/sort.rb +5 -1
data/lib/motor/build_schema/load_from_rails.rb +48 -34
data/lib/motor/build_schema/merge_schema_configs.rb +61 -14
data/lib/motor/build_schema/persist_resource_configs.rb +49 -46
data/lib/motor/build_schema/reorder_schema.rb +22 -14
data/lib/motor/queries.rb +1 -0
data/lib/motor/queries/render_sql_template.rb +51 -0
data/lib/motor/queries/run_query.rb +50 -22
data/lib/motor/ui_configs.rb +33 -13
data/lib/motor/version.rb +1 -1
data/ui/dist/main-4da1a5102d7bc66aefd0.css.gz +0 -0
data/ui/dist/main-4da1a5102d7bc66aefd0.js.gz +0 -0
data/ui/dist/manifest.json +5 -5
metadata +5 -4
data/ui/dist/main-015cc9721345d5b8af80.css.gz +0 -0
data/ui/dist/main-015cc9721345d5b8af80.js.gz +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6b8a4bcbd17fc0eed3b91dfac13285623adbfeda90a20a414193384070cccff
-  data.tar.gz: 303af4bb7f49abfd02dfe91c6aa03278e1d6572e1831e73cd60fcef0b2a96a29
+  metadata.gz: 5799ce999fa943638fa7c4d655400c1418ee80977bf47f64a71e6d5c496d02de
+  data.tar.gz: da99ec7b1c48708d983b663a7f9cb79b6d0e270b2fc9f5538a8121cfabdbc209
 SHA512:
-  metadata.gz: 144c32f7aa7902c4b2200fdde19b7487d1476856380c79b1d694d164227f98529b204a81f4bffcfc281a0951be13f585a9fe5ae57014bb66b38b94e49199b44b
-  data.tar.gz: 78b1501b59c676ecc389febca43eadc961514e3720fcc3256c6664086f60f5c0167973c7b19c7ce1a8705404b2111136872a683a451bd9633b21531bf59a06e0
+  metadata.gz: c5fc31a79b01ad0e716700a7c3daed980b293d13081294d1013918cce6f4d24cf4c104e0c44144cde225fd3b1ce07253f9b3ddaf44f1eca2252a01ff9124c52e
+  data.tar.gz: efca3a6d85ce6e33c83a63f3cd5addbd75b2baf099bd96c5efbac40445520a7725d68a5c3d0564792f06bdf12fed8958b13a6189047303d3c77f7f0af0ff0bd4

data/app/controllers/motor/active_storage_attachments_controller.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module Motor
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
     def create
-      if @attachment.record.respond_to?("#{@attachment.name}_attachment=") || @attachment.record.respond_to?("#{@attachment.name}_attachments=")
+      if attachable?(@attachment.record)
         @attachment.record.public_send(@attachment.name).attach(
           io: StringIO.new(params.dig(:data, :file, :io).to_s.encode('ISO-8859-1')),
           filename: params.dig(:data, :file, :filename)
@@ -21,6 +21,11 @@ module Motor
     private
+    def attachable?(record)
+      record.respond_to?("#{@attachment.name}_attachment=") ||
+        record.respond_to?("#{@attachment.name}_attachments=")
+    end
     def attachment_params
       params.require(:data).except(:file).permit!
     end

data/app/views/layouts/motor/application.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Motor Admin</title>
-    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
     <link rel="stylesheet" media="all" href="<%= Motor::Assets.asset_path('main.css') %>">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>

data/lib/motor/admin.rb CHANGED Viewed

@@ -14,6 +14,21 @@ module Motor
       end
     end
+    initializer 'motor.basic_auth' do
+      next if ENV['MOTOR_AUTH_PASSWORD'].blank?
+      config.middleware.use Rack::Auth::Basic do |username, password|
+        ActiveSupport::SecurityUtils.secure_compare(
+          ::Digest::SHA256.hexdigest(username),
+          ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_USERNAME'].to_s)
+        ) &
+          ActiveSupport::SecurityUtils.secure_compare(
+            ::Digest::SHA256.hexdigest(password),
+            ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_PASSWORD'].to_s)
+          )
+      end
+    end
     initializer 'motor.active_storage.extensions' do
       ActiveSupport.on_load(:active_storage_attachment) do
         ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)

data/lib/motor/api_query/build_json.rb CHANGED Viewed

@@ -29,9 +29,11 @@ module Motor
               hash = {}
               path.split('.').reduce(hash) do |acc, part|
-                acc[part] = {}
+                acc_hash = {}
-                acc[part]
+                acc[part] = acc_hash
+                acc_hash
               end
               accumulator.deep_merge(hash)
@@ -45,20 +47,25 @@ module Motor
         return if params[:fields].blank?
         model = rel.is_a?(ActiveRecord::Relation) ? rel.klass : rel.class
-        model_name = model.name.underscore
         params[:fields].each do |key, fields|
           fields = fields.split(',') if fields.is_a?(String)
-          if key == model_name || model_name.split('/').last == key
-            json_params.merge!(build_fields_hash(model, fields))
-          else
-            hash = find_key_in_params(json_params, key)
+          merge_fields_params!(key, fields, json_params, model)
+        end
+      end
-            fields_hash = build_fields_hash(model.reflections[key]&.klass, fields)
+      def merge_fields_params!(key, fields, json_params, model)
+        model_name = model.name.underscore
-            hash.merge!(fields_hash)
-          end
+        if key == model_name || model_name.split('/').last == key
+          json_params.merge!(build_fields_hash(model, fields))
+        else
+          hash = find_key_in_params(json_params, key)
+          fields_hash = build_fields_hash(model.reflections[key]&.klass, fields)
+          hash.merge!(fields_hash)
         end
       end

data/lib/motor/api_query/sort.rb CHANGED Viewed

@@ -22,7 +22,11 @@ module Motor
           *path, _ = key.split('.')
           path.reduce(result) do |acc, fragment|
-            acc[fragment] = {}
+            hash = {}
+            acc[fragment] = hash
+            hash
           end
         end
       end

data/lib/motor/build_schema/load_from_rails.rb CHANGED Viewed

@@ -3,6 +3,8 @@
 module Motor
   module BuildSchema
     module LoadFromRails
+      MUTEX = Mutex.new
       module_function
       def call
@@ -82,21 +84,26 @@ module Motor
           model.columns.map do |column|
             next if reference_columns.find { |c| c[:name] == column.name }
-            {
-              name: column.name,
-              display_name: column.name.humanize,
-              column_type: ActiveRecordUtils::Types::UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
-              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,
-              virtual: false
-            }
+            build_table_column(column, model, default_attrs)
           end.compact
         reference_columns + table_columns
       end
+      def build_table_column(column, model, default_attrs)
+        {
+          name: column.name,
+          display_name: column.name.humanize,
+          column_type: ActiveRecordUtils::Types::UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
+          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: {},
+          virtual: false
+        }
+      end
       def fetch_reference_columns(model)
         default_attrs = model.new.attributes
@@ -109,31 +116,36 @@ module Motor
             next
           end
-          column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
           next if ref.klass.name == 'ActiveStorage::Blob'
-          is_attachment = ref.klass.name == 'ActiveStorage::Attachment'
-          {
-            name: column_name,
-            display_name: column_name.humanize,
-            column_type: is_attachment ? 'file' : 'integer',
-            access_type: ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY,
-            default_value: default_attrs[column_name],
-            validators: fetch_validators(model, column_name),
-            reference: {
-              name: name,
-              model_name: ref.klass.name.underscore,
-              reference_type: ref.belongs_to? ? 'belongs_to' : 'has_one',
-              foreign_key: ref.foreign_key,
-              polymorphic: ref.polymorphic? || is_attachment
-            },
-            virtual: false
-          }
+          build_reflection_column(name, model, ref, default_attrs)
         end.compact
       end
+      def build_reflection_column(name, model, ref, default_attrs)
+        column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
+        is_attachment = ref.klass.name == 'ActiveStorage::Attachment'
+        access_type = ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY
+        {
+          name: column_name,
+          display_name: column_name.humanize,
+          column_type: is_attachment ? 'file' : 'integer',
+          access_type: access_type,
+          default_value: default_attrs[column_name],
+          validators: fetch_validators(model, column_name),
+          format: {},
+          reference: {
+            name: name,
+            model_name: ref.klass.name.underscore,
+            reference_type: ref.belongs_to? ? 'belongs_to' : 'has_one',
+            foreign_key: ref.foreign_key,
+            polymorphic: ref.polymorphic? || is_attachment
+          },
+          virtual: false
+        }
+      end
       def fetch_associations(model)
         model.reflections.map do |name, ref|
           next if ref.has_one? || ref.belongs_to?
@@ -180,10 +192,12 @@ module Motor
       end
       def eager_load_models!
-        if Rails::VERSION::MAJOR > 5 && defined?(Zeitwerk::Loader)
-          Zeitwerk::Loader.eager_load_all
-        else
-          Rails.application.eager_load!
+        MUTEX.synchronize do
+          if Rails::VERSION::MAJOR > 5 && defined?(Zeitwerk::Loader)
+            Zeitwerk::Loader.eager_load_all
+          else
+            Rails.application.eager_load!
+          end
         end
       end
     end

data/lib/motor/build_schema/merge_schema_configs.rb CHANGED Viewed

@@ -27,50 +27,97 @@ module Motor
       def merge_model(model, configs)
         updated_model = model.merge(configs.slice(*RESOURCE_ATTRS))
-        updated_model[:associations] = merge_by_name(
+        merge_actions!(updated_model, configs)
+        merge_assiciations!(updated_model, configs)
+        merge_columns!(updated_model, configs)
+        merge_tabs!(updated_model, configs)
+        merge_scopes!(updated_model, configs)
+        updated_model
+      end
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_assiciations!(model, configs)
+        model[:associations] = merge_by_name(
           model[:associations],
-          configs[:associations]
+          configs[:associations],
+          {},
+          ->(_) { true }
         )
-        updated_model[:columns] = merge_by_name(
+        model
+      end
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_columns!(model, configs)
+        model[:columns] = merge_by_name(
           model[:columns],
           configs[:columns],
-          COLUMN_DEFAULTS
+          COLUMN_DEFAULTS,
+          ->(scope) { !scope[:virtual] }
         )
-        updated_model[:actions] = merge_by_name(
+        model
+      end
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_actions!(model, configs)
+        model[:actions] = merge_by_name(
           model[:actions],
           configs[:actions],
           ACTION_DEFAULTS
         )
-        updated_model[:tabs] = merge_by_name(
+        model
+      end
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_tabs!(model, configs)
+        model[:tabs] = merge_by_name(
           model[:tabs],
           configs[:tabs],
           TAB_DEFAULTS
         )
-        updated_model[:scopes] = merge_by_name(
+        model
+      end
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_scopes!(model, configs)
+        model[:scopes] = merge_by_name(
           model[:scopes],
           configs[:scopes],
-          SCOPE_DEFAULTS
+          SCOPE_DEFAULTS,
+          ->(scope) { scope[:scope_type] != 'filter' }
         )
-        updated_model
+        model
       end
       # @param defaults [Array<HashWithIndifferentAccess>]
       # @param configs [Array<HashWithIndifferentAccess>]
       # @return [Array<HashWithIndifferentAccess>]
-      def merge_by_name(defaults, configs, default_attrs = {})
+      def merge_by_name(defaults, configs, default_attrs = {}, default_item_check = nil)
         return defaults if configs.blank?
         (defaults.pluck(:name) + configs.pluck(:name)).uniq.map do |name|
-          config_item = configs.find { |e| e[:name] == name } || {}
-          default_item = defaults.find { |e| e[:name] == name } || default_attrs
+          config_item = configs.find { |e| e[:name] == name }
+          default_item = defaults.find { |e| e[:name] == name }
-          default_item.merge(config_item)
-        end
+          next if default_item.nil? && default_item_check&.call(config_item)
+          (default_item || default_attrs).merge(config_item || {})
+        end.compact
       end
       # @return [HashWithIndifferentAccess<String, HashWithIndifferentAccess>]

data/lib/motor/build_schema/persist_resource_configs.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module Motor
   module BuildSchema
     module PersistResourceConfigs
       RESOURCE_ATTRS = %w[display_name visible].freeze
-      COLUMN_ATTRS = %w[name display_name column_type access_type default_value virtual].freeze
+      COLUMN_ATTRS = %w[name display_name column_type access_type default_value virtual format].freeze
       ASSOCIATION_ATTRS = %w[name display_name visible].freeze
       SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze
       ACTION_ATTRS = %w[name display_name action_type preferences visible].freeze
@@ -14,6 +14,7 @@ module Motor
         access_type: 'read_write',
         default_value: nil,
         reference: nil,
+        format: {},
         validators: []
       }.with_indifferent_access
@@ -24,6 +25,7 @@ module Motor
       TAB_DEFAULTS = {
         visible: true,
+        tab_type: 'default',
         preferences: {}
       }.with_indifferent_access
@@ -75,47 +77,26 @@ module Motor
         normalized_preferences = existing_prefs.merge(normalized_preferences)
         normalized_preferences = reject_default(default_prefs, normalized_preferences)
-        if new_prefs[:columns].present?
-          normalized_preferences[:columns] = normalize_columns(
-            default_prefs[:columns],
-            existing_prefs.fetch(:columns, []),
-            new_prefs.fetch(:columns, [])
-          )
-        end
+        normalize_configs!(normalized_preferences, :columns, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :associations, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :actions, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :tabs, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :scopes, default_prefs, existing_prefs, new_prefs)
-        if new_prefs[:associations].present?
-          normalized_preferences[:associations] = normalize_associations(
-            default_prefs[:associations],
-            existing_prefs.fetch(:associations, []),
-            new_prefs.fetch(:associations, [])
-          )
-        end
+        normalized_preferences.compact
+      end
-        if new_prefs[:actions].present?
-          normalized_preferences[:actions] = normalize_actions(
-            default_prefs[:actions],
-            existing_prefs.fetch(:actions, []),
-            new_prefs.fetch(:actions, [])
-          )
-        end
+      def normalize_configs!(preferences, configs_name, default_prefs, existing_prefs, new_prefs)
+        return preferences if new_prefs[configs_name].blank?
-        if new_prefs[:tabs].present?
-          normalized_preferences[:tabs] = normalize_tabs(
-            default_prefs[:tabs],
-            existing_prefs.fetch(:tabs, []),
-            new_prefs.fetch(:tabs, [])
-          )
-        end
+        normalized_configs = public_send("normalize_#{configs_name}",
+                                         default_prefs[:actions],
+                                         existing_prefs.fetch(:actions, []),
+                                         new_prefs.fetch(:actions, []))
-        if new_prefs[:scopes].present?
-          normalized_preferences[:scopes] = normalize_scopes(
-            default_prefs[:scopes],
-            existing_prefs.fetch(:scopes, []),
-            new_prefs.fetch(:scopes, [])
-          )
-        end
+        preferences[configs_name] = normalized_configs
-        normalized_preferences.compact
+        preferences
       end
       # @param default_columns [Array<HashWithIndifferentAccess>]
@@ -123,7 +104,7 @@ module Motor
       # @param new_columns [Array<HashWithIndifferentAccess>]
       # @return [Array<HashWithIndifferentAccess>]
       def normalize_columns(default_columns, existing_columns, new_columns)
-        (existing_columns.pluck(:name) + new_columns.pluck(:name)).uniq.map do |name|
+        fetch_update_names(existing_columns, new_columns).uniq.map do |name|
           new_column = safe_fetch_by_name(new_columns, name)
           next if new_column[:_remove]
@@ -135,7 +116,11 @@ module Motor
           normalized_column = existing_column.merge(column_attrs)
           normalized_column = reject_default(default_column, normalized_column)
-          normalized_column.merge(name: name) if normalized_column.present?
+          next if normalized_column.blank?
+          normalized_column[:name] ||= name
+          normalized_column
         end.compact.presence
       end
@@ -144,7 +129,7 @@ module Motor
       # @param new_actions [Array<HashWithIndifferentAccess>]
       # @return [Array<HashWithIndifferentAccess>]
       def normalize_actions(default_actions, existing_actions, new_actions)
-        (existing_actions.pluck(:name) + new_actions.pluck(:name)).uniq.map do |name|
+        fetch_update_names(existing_actions, new_actions).map do |name|
           new_action = safe_fetch_by_name(new_actions, name)
           next if new_action[:_remove]
@@ -156,7 +141,11 @@ module Motor
           normalized_action = existing_action.merge(action_attrs)
           normalized_action = reject_default(default_action.presence || ACTION_DEFAULTS, normalized_action)
-          normalized_action.merge(name: name) if normalized_action.present?
+          next if normalized_action.blank?
+          normalized_action[:name] ||= name
+          normalized_action
         end.compact.presence
       end
@@ -165,7 +154,7 @@ module Motor
       # @param new_tabs [Array<HashWithIndifferentAccess>]
       # @return [Array<HashWithIndifferentAccess>]
       def normalize_tabs(default_tabs, existing_tabs, new_tabs)
-        (existing_tabs.pluck(:name) + new_tabs.pluck(:name)).uniq.map do |name|
+        fetch_update_names(existing_tabs, new_tabs).uniq.map do |name|
           new_tab = safe_fetch_by_name(new_tabs, name)
           next if new_tab[:_remove]
@@ -177,7 +166,11 @@ module Motor
           normalized_tab = existing_tab.merge(tab_attrs)
           normalized_tab = reject_default(default_tab.presence || TAB_DEFAULTS, normalized_tab)
-          normalized_tab.merge(name: name) if normalized_tab.present?
+          next if normalized_tab.blank?
+          normalized_tab[:name] ||= name
+          normalized_tab
         end.compact.presence
       end
@@ -186,7 +179,7 @@ module Motor
       # @param new_scopes [Array<HashWithIndifferentAccess>]
       # @return [Array<HashWithIndifferentAccess>]
       def normalize_scopes(default_scopes, existing_scopes, new_scopes)
-        (existing_scopes.pluck(:name) + new_scopes.pluck(:name)).uniq.map do |name|
+        fetch_update_names(existing_scopes, new_scopes).uniq.map do |name|
           new_scope = safe_fetch_by_name(new_scopes, name)
           next if new_scope[:_remove]
@@ -198,7 +191,11 @@ module Motor
           normalized_scope = existing_scope.merge(scope_attrs)
           normalized_scope = reject_default(default_scope.presence || SCOPE_DEFAULTS, normalized_scope)
-          normalized_scope.merge(name: name) if normalized_scope.present?
+          next if normalized_scope.blank?
+          normalized_scope[:name] ||= name
+          normalized_scope
         end.compact.presence
       end
@@ -220,8 +217,14 @@ module Motor
         end.compact.presence
       end
+      def fetch_update_names(existing_items, new_items)
+        new_names = new_items.map { |e| e[:_update] || e[:name] }
+        (existing_items.pluck(:name) + new_names).uniq
+      end
       def safe_fetch_by_name(list, name)
-        list.find { |e| e[:name] == name } || {}
+        list.find { |e| e[:_update] == name || e[:name] == name } || {}
       end
       # @param resource_name [String]

data/lib/motor/build_schema/reorder_schema.rb CHANGED Viewed

@@ -23,21 +23,29 @@ module Motor
       schema = sort_by_name(schema, configs['resources.order'])
-      schema.map do |model|
-        columns_order = configs["resources.#{model[:name]}.columns.order"]
-        associations_order = configs["resources.#{model[:name]}.associations.order"]
-        actions_order = configs["resources.#{model[:name]}.actions.order"]
-        tabs_order = configs["resources.#{model[:name]}.tabs.order"]
-        scopes_order = configs["resources.#{model[:name]}.scopes.order"]
+      schema.map { |model| reorder_model(model, configs) }
+    end
-        model.merge(
-          columns: sort_by_name(sort_columns(model[:columns]), columns_order, sort_alphabetically: false),
-          associations: sort_by_name(model[:associations], associations_order),
-          actions: sort_by_name(model[:actions], actions_order, sort_alphabetically: false),
-          tabs: sort_by_name(model[:tabs], tabs_order, sort_alphabetically: false),
-          scopes: sort_by_name(model[:scopes], scopes_order)
-        )
-      end
+    def reorder_model(model, configs)
+      order_configs = build_order_configs(model[:name], configs)
+      model.merge(
+        columns: sort_by_name(sort_columns(model[:columns]), order_configs[:columns], sort_alphabetically: false),
+        associations: sort_by_name(model[:associations], order_configs[:associations]),
+        actions: sort_by_name(model[:actions], order_configs[:actions], sort_alphabetically: false),
+        tabs: sort_by_name(model[:tabs], order_configs[:tabs], sort_alphabetically: false),
+        scopes: sort_by_name(model[:scopes], order_configs[:scopes])
+      )
+    end
+    def build_order_configs(model_name, configs)
+      {
+        columns: configs["resources.#{model_name}.columns.order"],
+        associations: configs["resources.#{model_name}.associations.order"],
+        actions: configs["resources.#{model_name}.actions.order"],
+        tabs: configs["resources.#{model_name}.tabs.order"],
+        scopes: configs["resources.#{model_name}.scopes.order"]
+      }
     end
     # @param list [Array<HashWithIndifferentAccess>]

data/lib/motor/queries.rb CHANGED Viewed

@@ -5,6 +5,7 @@ module Motor
   end
 end
+require_relative './queries/render_sql_template'
 require_relative './queries/run_query'
 require_relative './queries/persistance'
 require_relative './queries/postgresql_exec_query'

data/lib/motor/queries/render_sql_template.rb ADDED Viewed

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+module Motor
+  module Queries
+    module RenderSqlTemplate
+      SECTION_OPEN_REGEXP = /{{([#^])\s*(\w+)}}.*\z/m.freeze
+      VARIABLE_REGEXP = /{{\s*(\w+)\s*}}/m.freeze
+      module_function
+      def call(sql, variables)
+        result = render_sections(sql, variables)
+        interpolate_variables(result, variables)
+      end
+      def interpolate_variables(sql, variables)
+        selected_variables = []
+        rendered =
+          sql.gsub(VARIABLE_REGEXP) do
+            variable_name = Regexp.last_match[1]
+            index = selected_variables.index { |name, _| name == variable_name }
+            selected_variables << [variable_name, variables[variable_name]] unless index
+            "$#{selected_variables.size}"
+          end
+        [rendered, selected_variables]
+      end
+      def render_sections(sql, variables)
+        sql.sub(SECTION_OPEN_REGEXP) do |e|
+          variable_name = Regexp.last_match[2]
+          is_negative = Regexp.last_match[1] == '^'
+          _, content, rest = e.split(build_section_close_regexp(variable_name), 3)
+          is_present = variables[variable_name].present?
+          render_sections(is_present ^ is_negative ? content + rest.to_s : rest, variables)
+        end
+      end
+      def build_section_close_regexp(variable_name)
+        %r{{{[#^/]s*#{Regexp.escape(variable_name)}\s*}}}m
+      end
+    end
+  end
+end

data/lib/motor/queries/run_query.rb CHANGED Viewed

@@ -3,8 +3,7 @@
 module Motor
   module Queries
     module RunQuery
-      DEFAULT_LIMIT = 1_000_000
-      INTERPOLATION_REGEXP = /{{(\w+)}}/.freeze
+      DEFAULT_LIMIT = 100_000
       QueryResult = Struct.new(:data, :columns, keyword_init: true)
@@ -14,6 +13,10 @@ module Motor
       module_function
+      # @param query [Motor::Query]
+      # @param variables_hash [Hash]
+      # @param limit [Integer]
+      # @return [Motor::Queries::RunQuery::QueryResult]
       def call(query, variables_hash: nil, limit: DEFAULT_LIMIT)
         variables_hash ||= {}
@@ -22,15 +25,27 @@ module Motor
         QueryResult.new(data: result.rows, columns: build_columns_hash(result))
       end
+      # @param query [Motor::Query]
+      # @param limit [Integer]
+      # @param variables_hash [Hash]
+      # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash)
+        result = nil
         statement = prepare_sql_statement(query, limit, variables_hash)
-        case ActiveRecord::Base.connection
-        when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-          PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
-        else
-          ActiveRecord::Base.connection.exec_query(*statement)
+        ActiveRecord::Base.transaction do
+          result =
+            case ActiveRecord::Base.connection
+            when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+              PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
+            else
+              ActiveRecord::Base.connection.exec_query(*statement)
+            end
+          raise ActiveRecord::Rollback
         end
+        result
       end
       # @param result [ActiveRecord::Result]
@@ -47,27 +62,40 @@ module Motor
         end
       end
+      # @param query [Motor::Query]
+      # @param limit [Integer]
+      # @param variables_hash [Hash]
+      # @return [Array]
       def prepare_sql_statement(query, limit, variables_hash)
-        variables = query.preferences.fetch(:variables, []).pluck(:name, :default_value)
-        sql =
-          query.sql_body.gsub(INTERPOLATION_REGEXP) do
-            index = variables.index { |name, _| name == (Regexp.last_match[1]) } + 1
+        variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
-            "$#{index}"
-          end
+        sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
-        attributes =
-          variables.map do |variable_name, default_value|
-            ActiveRecord::Relation::QueryAttribute.new(
-              variable_name,
-              variables_hash[variable_name] || default_value,
-              ActiveRecord::Type::Value.new
-            )
-          end
+        attributes = build_statement_attributes(query_variables)
         [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit), 'SQL', attributes]
       end
+      # @param variables [Array<(String, Object)>]
+      # @return [Array<ActiveRecord::Relation::QueryAttribute>]
+      def build_statement_attributes(variables)
+        variables.map do |variable_name, value|
+          ActiveRecord::Relation::QueryAttribute.new(
+            variable_name,
+            value,
+            ActiveRecord::Type::Value.new
+          )
+        end
+      end
+      # @param variable_configs [Array<Hash>]
+      # @param variable_hash [Hash]
+      # @return [Hash]
+      def merge_variable_default_values(variable_configs, variables_hash)
+        variable_configs.each_with_object({}) do |variable, acc|
+          acc[variable[:name]] = variables_hash[variable[:name]] || variable[:default_value]
+        end
+      end
     end
   end
 end

data/lib/motor/ui_configs.rb CHANGED Viewed

@@ -27,22 +27,42 @@ module Motor
       {
         base_path: Motor::Admin.routes.url_helpers.motor_path,
         schema: Motor::BuildSchema.call,
-        header_links: Motor::Config.find_by(key: 'header.links')&.value || [],
-        queries: Motor::Query.all.active.preload(:tags)
-                             .as_json(only: %i[id name updated_at],
-                                      include: { tags: { only: %i[id name] } }),
-        dashboards: Motor::Dashboard.all.active.preload(:tags)
-                                    .as_json(only: %i[id title updated_at],
-                                             include: { tags: { only: %i[id name] } }),
-        alerts: Motor::Alert.all.active.preload(:tags)
-                            .as_json(only: %i[id name is_enabled updated_at],
-                                     include: { tags: { only: %i[id name] } }),
-        forms: Motor::Form.all.active.preload(:tags)
-                          .as_json(only: %i[id name updated_at],
-                                   include: { tags: { only: %i[id name] } })
+        header_links: header_links_data_hash,
+        queries: queries_data_hash,
+        dashboards: dashboards_data_hash,
+        alerts: alerts_data_hash,
+        forms: forms_data_hash
       }
     end
+    def header_links_data_hash
+      Motor::Config.find_by(key: 'header.links')&.value || []
+    end
+    def queries_data_hash
+      Motor::Query.all.active.preload(:tags)
+                  .as_json(only: %i[id name updated_at],
+                           include: { tags: { only: %i[id name] } })
+    end
+    def dashboards_data_hash
+      Motor::Dashboard.all.active.preload(:tags)
+                      .as_json(only: %i[id title updated_at],
+                               include: { tags: { only: %i[id name] } })
+    end
+    def alerts_data_hash
+      Motor::Alert.all.active.preload(:tags)
+                  .as_json(only: %i[id name is_enabled updated_at],
+                           include: { tags: { only: %i[id name] } })
+    end
+    def forms_data_hash
+      Motor::Form.all.active.preload(:tags)
+                 .as_json(only: %i[id name updated_at],
+                          include: { tags: { only: %i[id name] } })
+    end
     # @return [String]
     def cache_key
       ActiveRecord::Base.connection.execute(

data/lib/motor/version.rb CHANGED Viewed

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

data/ui/dist/main-4da1a5102d7bc66aefd0.css.gz ADDED Viewed

Binary file

data/ui/dist/main-4da1a5102d7bc66aefd0.js.gz ADDED Viewed

Binary file

data/ui/dist/manifest.json CHANGED Viewed

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-015cc9721345d5b8af80.css.gz": "main-015cc9721345d5b8af80.css.gz",
-  "main-015cc9721345d5b8af80.js.LICENSE.txt": "main-015cc9721345d5b8af80.js.LICENSE.txt",
-  "main-015cc9721345d5b8af80.js.gz": "main-015cc9721345d5b8af80.js.gz",
-  "main.css": "main-015cc9721345d5b8af80.css",
-  "main.js": "main-015cc9721345d5b8af80.js"
+  "main-4da1a5102d7bc66aefd0.css.gz": "main-4da1a5102d7bc66aefd0.css.gz",
+  "main-4da1a5102d7bc66aefd0.js.LICENSE.txt": "main-4da1a5102d7bc66aefd0.js.LICENSE.txt",
+  "main-4da1a5102d7bc66aefd0.js.gz": "main-4da1a5102d7bc66aefd0.js.gz",
+  "main.css": "main-4da1a5102d7bc66aefd0.css",
+  "main.js": "main-4da1a5102d7bc66aefd0.js"
 }

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.28
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-02 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -208,13 +208,14 @@ files:
 - lib/motor/queries.rb
 - lib/motor/queries/persistance.rb
 - lib/motor/queries/postgresql_exec_query.rb
+- lib/motor/queries/render_sql_template.rb
 - lib/motor/queries/run_query.rb
 - lib/motor/tags.rb
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-015cc9721345d5b8af80.css.gz
-- ui/dist/main-015cc9721345d5b8af80.js.gz
+- ui/dist/main-4da1a5102d7bc66aefd0.css.gz
+- ui/dist/main-4da1a5102d7bc66aefd0.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:

data/ui/dist/main-015cc9721345d5b8af80.css.gz DELETED Viewed

Binary file

data/ui/dist/main-015cc9721345d5b8af80.js.gz DELETED Viewed

Binary file