motor-admin 0.1.9 → 0.1.14

data/lib/motor/build_schema/merge_schema_configs.rb

@@ -7,6 +7,7 @@ module Motor
       COLUMN_DEFAULTS = PersistResourceConfigs::COLUMN_DEFAULTS
       ACTION_DEFAULTS = PersistResourceConfigs::ACTION_DEFAULTS
       TAB_DEFAULTS = PersistResourceConfigs::TAB_DEFAULTS
+      SCOPE_DEFAULTS = PersistResourceConfigs::SCOPE_DEFAULTS
 
       module_function
 
@@ -26,17 +27,17 @@ module Motor
       def merge_model(model, configs)
         updated_model = model.merge(configs.slice(*RESOURCE_ATTRS))
 
+        updated_model[:associations] = merge_by_name(
+          model[:associations],
+          configs[:associations]
+        )
+
         updated_model[:columns] = merge_by_name(
           model[:columns],
           configs[:columns],
           COLUMN_DEFAULTS
         )
 
-        updated_model[:associations] = merge_by_name(
-          model[:associations],
-          configs[:associations]
-        )
-
         updated_model[:actions] = merge_by_name(
           model[:actions],
           configs[:actions],
@@ -46,7 +47,13 @@ module Motor
         updated_model[:tabs] = merge_by_name(
           model[:tabs],
           configs[:tabs],
-          ACTION_DEFAULTS
+          TAB_DEFAULTS
+        )
+
+        updated_model[:scopes] = merge_by_name(
+          model[:scopes],
+          configs[:scopes],
+          SCOPE_DEFAULTS
         )
 
         updated_model

data/lib/motor/build_schema/persist_resource_configs.rb

@@ -6,12 +6,14 @@ module Motor
       RESOURCE_ATTRS = %w[display_name visible].freeze
       COLUMN_ATTRS = %w[name display_name column_type access_type default_value virtual].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
       TAB_ATTRS = %w[name display_name tab_type preferences visible].freeze
 
       COLUMN_DEFAULTS = {
         access_type: 'read_write',
         default_value: nil,
+        reference: nil,
         validators: []
       }.with_indifferent_access
 
@@ -25,6 +27,12 @@ module Motor
         preferences: {}
       }.with_indifferent_access
 
+      SCOPE_DEFAULTS = {
+        visible: true,
+        scope_type: 'default',
+        preferences: {}
+      }.with_indifferent_access
+
       module_function
 
       # @param resource [Motor::Resource]
@@ -99,6 +107,14 @@ module Motor
           )
         end
 
+        if new_prefs[:scopes].present?
+          normalized_preferences[:scopes] = normalize_scopes(
+            default_prefs[:scopes],
+            existing_prefs.fetch(:scopes, []),
+            new_prefs.fetch(:scopes, [])
+          )
+        end
+
         normalized_preferences.compact
       end
 
@@ -138,7 +154,7 @@ module Motor
           action_attrs = new_action.slice(*ACTION_ATTRS)
 
           normalized_action = existing_action.merge(action_attrs)
-          normalized_action = reject_default(default_action.presence || TAB_DEFAULTS, normalized_action)
+          normalized_action = reject_default(default_action.presence || ACTION_DEFAULTS, normalized_action)
 
           normalized_action.merge(name: name) if normalized_action.present?
         end.compact.presence
@@ -165,6 +181,27 @@ module Motor
         end.compact.presence
       end
 
+      # @param default_scopes [Array<HashWithIndifferentAccess>]
+      # @param existing_scopes [Array<HashWithIndifferentAccess>]
+      # @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|
+          new_scope = safe_fetch_by_name(new_scopes, name)
+
+          next if new_scope[:_remove]
+
+          existing_scope = safe_fetch_by_name(existing_scopes, name)
+          default_scope = safe_fetch_by_name(default_scopes, name)
+          scope_attrs = new_scope.slice(*SCOPE_ATTRS)
+
+          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?
+        end.compact.presence
+      end
+
       # @param default_assocs [Array<HashWithIndifferentAccess>]
       # @param existing_assocs [Array<HashWithIndifferentAccess>]
       # @param new_assocs [Array<HashWithIndifferentAccess>]

data/lib/motor/build_schema/reorder_schema.rb

@@ -2,6 +2,18 @@
 
 module Motor
   module ReorderSchema
+    COLUMNS_DEFAULT_ORDER_WEIGHTS = {
+      id: 0,
+      updated_at: 2,
+      edited_at: 2,
+      created_at: 3,
+      inserted_at: 3,
+      deleted_at: 4,
+      archived_at: 4
+    }.with_indifferent_access
+
+    COLUMNS_DEFAULT_ORDER_WEIGHT = 1
+
     module_function
 
     # @param schema [Array<HashWithIndifferentAccess>]
@@ -16,12 +28,14 @@ module Motor
         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"]
 
         model.merge(
-          columns: sort_by_name(model[:columns], columns_order, sort_alphabetically: false),
+          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)
+          tabs: sort_by_name(model[:tabs], tabs_order, sort_alphabetically: false),
+          scopes: sort_by_name(model[:scopes], scopes_order)
         )
       end
     end
@@ -42,6 +56,14 @@ module Motor
       end
     end
 
+    def sort_columns(columns)
+      columns.each_with_object([]) do |column, acc|
+        weight = COLUMNS_DEFAULT_ORDER_WEIGHTS.fetch(column[:name], COLUMNS_DEFAULT_ORDER_WEIGHT)
+
+        (acc[weight] ||= []) << column
+      end.flatten.compact
+    end
+
     # @return [Hash<String, HashWithIndifferentAccess>]
     def load_configs
       Motor::Config.all.each_with_object({}) do |config, acc|

data/lib/motor/dashboards/persistance.rb

@@ -30,10 +30,10 @@ module Motor
       end
 
       def update_from_params!(dashboard, params)
-        raise TitleAlreadyExists if title_already_exists?(dashboard)
-
         dashboard = assign_attributes(dashboard, params)
 
+        raise TitleAlreadyExists if title_already_exists?(dashboard)
+
         ApplicationRecord.transaction do
           dashboard.save!
         end

data/lib/motor/forms/persistance.rb

@@ -30,10 +30,10 @@ module Motor
       end
 
       def update_from_params!(form, params)
-        raise NameAlreadyExists if name_already_exists?(form)
-
         form = assign_attributes(form, params)
 
+        raise NameAlreadyExists if name_already_exists?(form)
+
         ApplicationRecord.transaction do
           form.save!
         end

data/lib/motor/queries/persistance.rb

@@ -30,10 +30,10 @@ module Motor
       end
 
       def update_from_params!(query, params)
-        raise NameAlreadyExists if name_already_exists?(query)
-
         query = assign_attributes(query, params)
 
+        raise NameAlreadyExists if name_already_exists?(query)
+
         ApplicationRecord.transaction do
           query.save!
         end

data/lib/motor/queries/run_query.rb

@@ -57,11 +57,16 @@ module Motor
             "$#{index}"
           end
 
-        [
-          format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit),
-          'SQL',
-          variables.map { |variable_name, default_value| variables_hash[variable_name] || default_value }
-        ]
+        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
+
+        [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit), 'SQL', attributes]
       end
     end
   end

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -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-46621a8bdbb789e17c3f.css.gz": "main-46621a8bdbb789e17c3f.css.gz",
-  "main-46621a8bdbb789e17c3f.js.LICENSE.txt": "main-46621a8bdbb789e17c3f.js.LICENSE.txt",
-  "main-46621a8bdbb789e17c3f.js.gz": "main-46621a8bdbb789e17c3f.js.gz",
-  "main.css": "main-46621a8bdbb789e17c3f.css",
-  "main.js": "main-46621a8bdbb789e17c3f.js"
+  "main-f7c7f445c53544d2d7b8.css.gz": "main-f7c7f445c53544d2d7b8.css.gz",
+  "main-f7c7f445c53544d2d7b8.js.LICENSE.txt": "main-f7c7f445c53544d2d7b8.js.LICENSE.txt",
+  "main-f7c7f445c53544d2d7b8.js.gz": "main-f7c7f445c53544d2d7b8.js.gz",
+  "main.css": "main-f7c7f445c53544d2d7b8.css",
+  "main.js": "main-f7c7f445c53544d2d7b8.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -132,6 +132,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/motor/active_storage_attachments_controller.rb
 - app/controllers/motor/alerts_controller.rb
 - app/controllers/motor/api_base_controller.rb
 - app/controllers/motor/application_controller.rb
@@ -172,6 +173,8 @@ files:
 - lib/motor-admin.rb
 - lib/motor.rb
 - lib/motor/active_record_utils.rb
+- lib/motor/active_record_utils/active_storage_links_extension.rb
+- lib/motor/active_record_utils/defined_scopes_extension.rb
 - lib/motor/active_record_utils/fetch_methods.rb
 - lib/motor/active_record_utils/types.rb
 - lib/motor/admin.rb
@@ -181,6 +184,7 @@ files:
 - lib/motor/alerts/scheduler.rb
 - lib/motor/api.rb
 - lib/motor/api_query.rb
+- lib/motor/api_query/apply_scope.rb
 - lib/motor/api_query/build_json.rb
 - lib/motor/api_query/build_meta.rb
 - lib/motor/api_query/filter.rb
@@ -189,6 +193,7 @@ files:
 - lib/motor/api_query/sort.rb
 - lib/motor/assets.rb
 - lib/motor/build_schema.rb
+- lib/motor/build_schema/active_storage_attachment_schema.rb
 - lib/motor/build_schema/find_display_column.rb
 - lib/motor/build_schema/load_from_rails.rb
 - lib/motor/build_schema/merge_schema_configs.rb
@@ -208,8 +213,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-46621a8bdbb789e17c3f.css.gz
-- ui/dist/main-46621a8bdbb789e17c3f.js.gz
+- ui/dist/main-f7c7f445c53544d2d7b8.css.gz
+- ui/dist/main-f7c7f445c53544d2d7b8.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: