motor-admin 0.1.37 → 0.1.43

data/lib/motor/queries/persistance.rb

@@ -29,16 +29,20 @@ module Motor
         retry
       end
 
-      def update_from_params!(query, params)
+      def update_from_params!(query, params, force_replace: false)
+        tag_ids = query.tags.ids
+
         query = assign_attributes(query, params)
 
-        raise NameAlreadyExists if name_already_exists?(query)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(query)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(query) if force_replace
+
           query.save!
         end
 
-        query.tags.reload
+        query.touch if tag_ids.sort != query.tags.reload.ids.sort && params[:updated_at].blank?
 
         query
       rescue ActiveRecord::RecordNotUnique
@@ -47,10 +51,16 @@ module Motor
 
       def assign_attributes(query, params)
         query.assign_attributes(params.slice(:name, :description, :sql_body, :preferences))
+        query.updated_at = [params[:updated_at], Time.current].min if params[:updated_at].present?
 
         Motor::Tags.assign_tags(query, params[:tags])
       end
 
+      def archive_with_existing_name(query)
+        Motor::Query.where(['lower(name) = ? AND id != ?', query.name.to_s.downcase, query.id])
+                    .update_all(deleted_at: Time.current)
+      end
+
       def name_already_exists?(query)
         if query.new_record?
           Query.exists?(['lower(name) = ?', query.name.to_s.downcase])

data/lib/motor/railtie.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Motor
+  class Railtie < Rails::Railtie
+    railtie_name :motor_admin
+
+    rake_tasks do
+      Dir[Motor::PATH.join('./motor/tasks/**/*.rake')].each { |f| load f }
+    end
+  end
+end

data/lib/motor/tasks/motor.rake

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+namespace :motor do
+  desc 'Update configs/motor.yml file'
+
+  task dump: :environment do
+    Motor::Configs::WriteToFile.write_with_lock
+
+    puts '✅ configs/motor.yml has been updated'
+  end
+
+  desc 'Load configs from configs/motor.yml file'
+
+  task load: :environment do
+    Motor::Configs::SyncFromFile.call(with_exception: true)
+
+    puts '✅ configs have been loaded from configs/motor.yml'
+  end
+
+  desc 'Synchronize configs with remote application'
+
+  task sync: :environment do
+    remote_url = ENV['MOTOR_SYNC_REMOTE_URL']
+    api_key = ENV['MOTOR_SYNC_API_KEY']
+
+    raise 'Specify target app url using `MOTOR_SYNC_REMOTE_URL` env variable' if remote_url.blank?
+    raise 'Specify sync api key using `MOTOR_SYNC_API_KEY` env variable' if api_key.blank?
+
+    Motor::Configs::SyncWithRemote.call(remote_url, api_key)
+    Motor::Configs::WriteToFile.write_with_lock
+
+    puts "✅ Motor Admin configurations have been synced with #{remote_url}"
+  rescue Motor::Configs::SyncWithRemote::ApiNotFound
+    puts '⚠️  Synchronization failed: you need to specify `MOTOR_SYNC_API_KEY` ' \
+         'env variable in your remote app in order to enable this feature'
+  end
+end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.37'
+  VERSION = '0.1.43'
 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-358ea31cd7020f915067.css.gz": "main-358ea31cd7020f915067.css.gz",
-  "main-358ea31cd7020f915067.js.LICENSE.txt": "main-358ea31cd7020f915067.js.LICENSE.txt",
-  "main-358ea31cd7020f915067.js.gz": "main-358ea31cd7020f915067.js.gz",
-  "main.css": "main-358ea31cd7020f915067.css",
-  "main.js": "main-358ea31cd7020f915067.js"
+  "main-c3893a249308242d20f5.css.gz": "main-c3893a249308242d20f5.css.gz",
+  "main-c3893a249308242d20f5.js.LICENSE.txt": "main-c3893a249308242d20f5.js.LICENSE.txt",
+  "main-c3893a249308242d20f5.js.gz": "main-c3893a249308242d20f5.js.gz",
+  "main.css": "main-c3893a249308242d20f5.css",
+  "main.js": "main-c3893a249308242d20f5.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.43
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -217,22 +217,33 @@ files:
 - lib/motor/build_schema/persist_resource_configs.rb
 - lib/motor/build_schema/reorder_schema.rb
 - lib/motor/build_schema/utils.rb
+- lib/motor/configs.rb
+- lib/motor/configs/build_configs_hash.rb
+- lib/motor/configs/build_ui_app_tag.rb
+- lib/motor/configs/load_from_cache.rb
+- lib/motor/configs/sync_from_file.rb
+- lib/motor/configs/sync_from_hash.rb
+- lib/motor/configs/sync_middleware.rb
+- lib/motor/configs/sync_with_remote.rb
+- lib/motor/configs/write_to_file.rb
 - lib/motor/dashboards.rb
 - lib/motor/dashboards/persistance.rb
 - lib/motor/forms.rb
 - lib/motor/forms/persistance.rb
 - lib/motor/hash_serializer.rb
+- lib/motor/net_http_utils.rb
 - 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/railtie.rb
 - lib/motor/tags.rb
-- lib/motor/ui_configs.rb
+- lib/motor/tasks/motor.rake
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-358ea31cd7020f915067.css.gz
-- ui/dist/main-358ea31cd7020f915067.js.gz
+- ui/dist/main-c3893a249308242d20f5.css.gz
+- ui/dist/main-c3893a249308242d20f5.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:

data/lib/motor/ui_configs.rb

@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-
-module Motor
-  module UiConfigs
-    CACHE_STORE =
-      if Motor.development?
-        ActiveSupport::Cache::NullStore.new
-      else
-        ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
-      end
-
-    module_function
-
-    # @return [String]
-    def app_tag
-      CACHE_STORE.fetch(cache_key) do
-        CACHE_STORE.clear
-
-        Motor::ApplicationController.helpers.content_tag(
-          :div, '', id: 'app', data: ui_data
-        )
-      end
-    end
-
-    # @return [Hash]
-    def ui_data
-      {
-        base_path: Motor::Admin.routes.url_helpers.motor_path,
-        schema: Motor::BuildSchema.call,
-        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(
-        "(#{
-          [
-            Motor::Config.select('MAX(updated_at)').to_sql,
-            Motor::Resource.select('MAX(updated_at)').to_sql,
-            Motor::Dashboard.select('MAX(updated_at)').to_sql,
-            Motor::Alert.select('MAX(updated_at)').to_sql,
-            Motor::Query.select('MAX(updated_at)').to_sql,
-            Motor::Form.select('MAX(updated_at)').to_sql
-          ].join(') UNION (')
-        })"
-      ).to_a.hash.to_s
-    end
-  end
-end