motor-admin 0.1.47 → 0.1.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7c564e999344d1cd2b2939b095e1e5c0b27d441b176365192275f623a1a887
-  data.tar.gz: 748ecbf8188b5375efb7b957503f1d0986144e0fd394956edf81677623a73a59
+  metadata.gz: 55c1bf8c2fc221d84cbb142204893b6625d980d9c9966fe08cab12b1b8b9e9f6
+  data.tar.gz: 25c3c29dac2b0abd4414cf5c90ada44e4af357efb43ddd63fad4a632321bf89f
 SHA512:
-  metadata.gz: 8faab90b6e21873a78e2eab889d2a328550c4533b922040662011930d89e6d9e515ba1eb860ed2978033ab339b0cd686250994cf8ee8a70b89223fb66337ecb5
-  data.tar.gz: f51c89fdcd5f453793b89a37b4868f282ed2bb5d457cd4cb50b0a786592ccbceb8d0d458a98fa19a3b176698a1787b1845e7321a18ad5d3d11bbd94dd4684ca2
+  metadata.gz: 6faa1ebe8212cf8855b064f4c80df93b6f8a4ef93b09ba98d5565a24a86d6e4274f746511c28ffc5fca2da67710572ee53b2aaa384199ef3fa6de908cf774330
+  data.tar.gz: 737e7e1768be0721d825029176e3397007feb21794eb1eeec2ebe777c0a5c3880b3942f23be50476bdf7f12f564fd03fa3aadb8a69a31d8b06ba2dfb1111e845

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Pete Matsyburka
+Copyright (c) 2021 Pete Matsyburka <pete.matsy@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,9 +2,9 @@
 
 Low-code Admin panel and Business intelligence Rails engine **(no DSL - configurable from the UI)**.
 
-🤓 [Demo App](https://motor-admin-demo.herokuapp.com)
+🤓 [Demo App](https://motor-admin.herokuapp.com/demo) | [Features overview](https://www.youtube.com/watch?v=ngVoci8Hll4&list=PLu7llEMh0KcOkR3Uy_RJT0cXPZQKAYVsq&index=1)
 
-[![Admin Panel](https://user-images.githubusercontent.com/5418788/119258612-2351f780-bbd3-11eb-8264-2e044cde868d.png)](https://motor-admin-demo.herokuapp.com)
+[![Admin Panel](https://user-images.githubusercontent.com/5418788/119318538-1f30e300-bc82-11eb-94a4-107c31c93b13.png)](https://motor-admin.herokuapp.com/demo)
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -20,7 +20,7 @@ $ bundle install
 
 Create and run migration:
 ```bash
-$ rails generate motor:install && rake db:migrate
+$ rails motor:install && rake db:migrate
 ```
 
 ## Features
@@ -38,11 +38,11 @@ $ rails generate motor:install && rake db:migrate
 
 ### Customizable CRUD
 
-![Resource settings](https://user-images.githubusercontent.com/5418788/119262945-b136de00-bbe5-11eb-846a-6e01c8c42904.png)
+![Resource settings](https://user-images.githubusercontent.com/5418788/119318569-2a840e80-bc82-11eb-9ba3-f3964eb6f997.png)
 
 ![Settings UI](https://user-images.githubusercontent.com/5418788/119263883-90708780-bbe9-11eb-9f9f-f76fed0b7f27.png)
 
-Everything in the admin panel can be configured using the intuitive settings that can be opened via the icon in the top right corner.
+Everything in the admin panel can be configured using intuitive settings UI, which can be opened via the icon in the top right corner.
 
 Data displayed on the resource page can be completely custimized via [SQL queries](#sql-queries) and [dashboards](#dashboards) attached to the resource as a tab. Usually, queries used to display resource data should contain `{{resource_name_id}}` [variable](#sql-queries).
 
@@ -50,13 +50,13 @@ Data displayed on the resource page can be completely custimized via [SQL querie
 
 ![Custom actions](https://user-images.githubusercontent.com/5418788/119266132-3c1dd580-bbf2-11eb-9666-09e1640eaf7b.png)
 
-Custom resource actions can be added via Active Record method call, API endpoint, or [custom forms](#forms-builder). Also, it's possible to override default Create/Update/Delete actions.
+Custom resource actions can be added via Active Record method call, API endpoint, or [custom forms](#forms-builder). Also, it's possible to override default create/update/delete actions.
 
 ### Forms Builder
 
 ![Custom form](https://user-images.githubusercontent.com/5418788/119264008-1391dd80-bbea-11eb-9f14-cb405e77fb60.png)
 
-Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{field_name}/apply`
+Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`
 
 ### SQL Queries
 
@@ -68,7 +68,7 @@ Queries can include embeded variables via `{{variable}}` syntax ([mustache](http
 
 ![motor-visualization](https://user-images.githubusercontent.com/5418788/119264625-a2075e80-bbec-11eb-986c-6106dd6e47ce.png)
 
-Data from the SQL query can be represented as: [table](https://motor-admin-demo.herokuapp.com/queries/12), [number](https://motor-admin-demo.herokuapp.com/queries/6), [line chart](https://motor-admin-demo.herokuapp.com/queries/3), [bar chart](https://motor-admin-demo.herokuapp.com/queries/1), [pie chart](https://motor-admin-demo.herokuapp.com/queries/9), [funnel](https://motor-admin-demo.herokuapp.com/queries/7), [markdown](https://motor-admin-demo.herokuapp.com/queries/8)
+Data from the SQL query can be represented as: [table](https://motor-admin.herokuapp.com/demo/queries/12), [number](https://motor-admin.herokuapp.com/demo/queries/6), [line chart](https://motor-admin.herokuapp.com/demo/queries/3), [bar chart](https://motor-admin.herokuapp.com/demo/queries/1), [pie chart](https://motor-admin.herokuapp.com/demo/queries/9), [funnel](https://motor-admin.herokuapp.com/demo/queries/7), [markdown](https://motor-admin.herokuapp.com/demo/queries/8)
 
 ### Dashboards
 
@@ -80,20 +80,20 @@ SQL queries can be organized into dashboards to create a convenient representati
 
 ![Email alert](https://user-images.githubusercontent.com/5418788/119265049-feb74900-bbed-11eb-8070-bcc8d6113b9b.png)
 
-Query data can be sent via email periodically using the alerts feature. Interval of the alert email can be specified using natural language, e.g. `every day at midnight`, `every Monday at 8 PM`, `every weekday at 6AM and 6PM`, `every minute`.
+Query data can be sent via email periodically using the alerts feature. Interval of the alert email can be specified using natural language, e.g., `every day at midnight`, `every Monday at 8 PM`, `every weekday at 6AM and 6PM`, `every minute`.
 
-The sender address can be specified using `MOTOR_ADMIN_FROM_ADDRESS` environment variable.
+The sender address can be specified using `MOTOR_ALERTS_FROM_ADDRESS` environment variable.
 
 ### Intelligence Search
 
 ![Intelligence search](https://user-images.githubusercontent.com/5418788/119266559-eea26800-bbf3-11eb-8cb3-d0538aa386a9.png)
 
-Intelligence search can be opened from the top right corner or using <kbd>Cmd</kbd> + <kbd>P</kbd> shortcut.
+Intelligence search can be opened via the top right corner button or using <kbd>Cmd</kbd> + <kbd>P</kbd> shortcut.
 
 
 ### Optimized for Mobile
 
-![motor-mobile](https://user-images.githubusercontent.com/5418788/119265905-38d61a00-bbf1-11eb-95c8-a4c95a2d77f7.png)
+![motor-mobile](https://user-images.githubusercontent.com/5418788/119269566-03392d00-bc01-11eb-9e9d-1f6a58fe0749.png)
 
 
 ### Configurations Sync
@@ -127,6 +127,12 @@ Start webpack dev server:
 yarn install && yarn serve
 ```
 
+Setup development database:
+
+```bash
+rake app:db:create && rake app:db:setup
+```
+
 Start example application in development mode:
 
 ```bash
@@ -143,4 +149,4 @@ MOTOR_DEVELOPMENT=true rails s
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://github.com/omohokcoj/motor-admin/blob/master/LICENSE).

data/app/controllers/concerns/motor/current_user_method.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Motor
+  module CurrentUserMethod
+    def current_user
+      if defined?(current_admin)
+        current_admin
+      elsif defined?(current_admin_user)
+        current_admin_user
+      elsif defined?(super)
+        super
+      end
+    end
+  end
+end

data/app/controllers/motor/api_base_controller.rb

@@ -2,30 +2,24 @@
 
 module Motor
   class ApiBaseController < ActionController::API
+    include Motor::CurrentUserMethod
+
+    class CanCanAbilityManageAll
+      include CanCan::Ability
+
+      def initialize(_)
+        can :manage, :all
+      end
+    end
+
     rescue_from StandardError do |e|
       Rails.logger.error(e)
 
       render json: { errors: [e.message] }, status: :internal_server_error
     end
 
-    def current_user
-      if defined?(current_admin)
-        current_admin
-      elsif defined?(current_admin_user)
-        current_admin_user
-      elsif defined?(super)
-        super
-      end
-    end
-
     def current_ability
-      klass = Class.new
-      klass.include(CanCan::Ability)
-      klass.define_method(:initialize) do |_user|
-        can :manage, :all
-      end
-
-      klass.new(current_user)
+      CanCanAbilityManageAll.new(current_user)
     end
   end
 end

data/app/controllers/motor/application_controller.rb

@@ -2,5 +2,6 @@
 
 module Motor
   class ApplicationController < ActionController::Base
+    include Motor::CurrentUserMethod
   end
 end

data/app/controllers/motor/assets_controller.rb

@@ -20,7 +20,7 @@ module Motor
     def show
       filename = params[:filename]
 
-      return [404, {}, ''] unless Motor::Assets.manifest.values.include?(filename)
+      return [404, {}, ''] unless Motor::Assets.manifest.value?(filename)
 
       assign_headers(filename)
 

data/app/controllers/motor/ui_controller.rb

@@ -4,6 +4,8 @@ module Motor
   class UiController < ApplicationController
     layout 'motor/application'
 
+    helper_method :current_user
+
     def index
       Motor.reload! if Motor.development?
 

data/app/mailers/motor/alerts_mailer.rb

@@ -26,11 +26,11 @@ module Motor
     end
 
     def from_address
-      from = ENV['MOTOR_ADMIN_FROM_ADDRESS'].presence
+      from = ENV['MOTOR_ALERTS_FROM_ADDRESS'].presence
 
       from ||= application_mailer_default_from
       from ||= mailer_config_from_address
-      from ||= "reports@#{ENV['HOST'].sub(/\Awww\./, '')}" if ENV['HOST'].present?
+      from ||= "reports@#{ENV['HOST'].delete_prefix('www.')}" if ENV['HOST'].present?
 
       from || 'reports@example.com'
     end
@@ -44,7 +44,7 @@ module Motor
     def mailer_config_from_address
       return if Rails.application.config.action_mailer.default_url_options&.dig(:host).blank?
 
-      "reports@#{Rails.application.config.action_mailer.default_url_options[:host].sub(/\Awww\./, '')}"
+      "reports@#{Rails.application.config.action_mailer.default_url_options[:host].delete_prefix('www.')}"
     end
   end
 end

data/app/models/motor/tag.rb

@@ -2,6 +2,6 @@
 
 module Motor
   class Tag < ::Motor::ApplicationRecord
-    has_many :taggable_tags
+    has_many :taggable_tags, dependent: :destroy
   end
 end

data/app/views/motor/ui/show.html.erb

@@ -1 +1 @@
-<%= raw(Motor::Configs::BuildUiAppTag.call) %>
+<%= raw(Motor::Configs::BuildUiAppTag.call(current_user)) %>

data/lib/motor/api_query/apply_scope.rb

@@ -18,7 +18,7 @@ module Motor
       end
 
       def apply_filter_scope(rel, scope)
-        configs = Motor::Resource.find_by_name(rel.klass.name.underscore)
+        configs = Motor::Resource.find_by(name: rel.klass.name.underscore)
 
         return rel unless configs
 

data/lib/motor/api_query/build_json.rb

@@ -96,8 +96,8 @@ module Motor
       def normalize_include_params(params)
         case params
         when Array
-          params.each_with_object({}) do |name, hash|
-            hash[name] = { 'include' => {} }
+          params.index_with do |_|
+            { 'include' => {} }
           end
         when String
           { params => { 'include' => {} } }

data/lib/motor/api_query/search.rb

@@ -57,13 +57,7 @@ module Motor
       def find_searchable_columns(model)
         model.columns.map do |column|
           next unless column.type.in?(COLUMN_TYPES)
-
-          has_inclusion_validator =
-            model.validators_on(column.name).any? do |e|
-              e.is_a?(ActiveModel::Validations::InclusionValidator)
-            end
-
-          next if has_inclusion_validator
+          next if model.validators_on(column.name).any?(ActiveModel::Validations::InclusionValidator)
 
           column.name
         end.compact

data/lib/motor/assets.rb

@@ -16,7 +16,7 @@ module Motor
 
     def icons
       manifest.select do |k, v|
-        !k.ends_with?('.gz') && v.starts_with?('icons/') && !v.include?('DS_Store')
+        !k.ends_with?('.gz') && v.starts_with?('icons/') && v.exclude?('DS_Store')
       end.keys
     end
 

data/lib/motor/build_schema/find_icon.rb

@@ -13,6 +13,7 @@ module Motor
       'location' => 'gps',
       'photo' => 'photo',
       'image' => 'photo',
+      'screenshot' => 'photo',
       'picture' => 'photo',
       'video' => 'video',
       'file' => 'file',

data/lib/motor/configs/build_ui_app_tag.rb

@@ -12,21 +12,21 @@ module Motor
 
       module_function
 
-      def call
+      def call(current_user = nil)
         cache_keys = LoadFromCache.load_cache_keys
 
-        CACHE_STORE.fetch(cache_keys.hash) do
+        CACHE_STORE.fetch("#{cache_keys.hash}#{current_user&.id}") do
           CACHE_STORE.clear
 
-          Motor::ApplicationController.helpers.content_tag(
-            :div, '', id: 'app', data: build_data(cache_keys)
-          )
+          Motor::ApplicationController.helpers.tag.div('', id: 'app', data: build_data(cache_keys, current_user))
         end
       end
 
       # @return [Hash]
-      def build_data(cache_keys = {})
+      def build_data(cache_keys = {}, current_user = nil)
         {
+          current_user: current_user&.as_json(only: %i[id email]),
+          audits_count: Motor::Audit.count,
           base_path: Motor::Admin.routes.url_helpers.motor_path,
           schema: Motor::BuildSchema.call(cache_keys),
           header_links: header_links_data_hash(cache_keys[:configs]),

data/lib/motor/configs/load_from_cache.rb

@@ -57,7 +57,7 @@ module Motor
       end
 
       def maybe_fetch_from_cache(type, cache_key, &block)
-        return block.call unless cache_key
+        return yield unless cache_key
 
         CACHE_STORE.fetch(type + cache_key.to_s, &block)
       end

data/lib/motor/configs/sync_with_remote.rb

@@ -9,7 +9,7 @@ module Motor
       module_function
 
       def call(remote_url, api_key)
-        url = remote_url.sub(%r{/\z}, '') + Motor::Configs::SYNC_API_PATH
+        url = remote_url.delete_suffix('/') + Motor::Configs::SYNC_API_PATH
 
         sync_from_remote!(url, api_key)
         sync_to_remote!(url, api_key)

data/lib/motor/queries/run_query.rb

@@ -73,7 +73,7 @@ module Motor
 
         attributes = build_statement_attributes(query_variables)
 
-        [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit), 'SQL', attributes]
+        [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.delete_suffix(';'), limit: limit), 'SQL', attributes]
       end
 
       # @param variables [Array<(String, Object)>]

data/lib/motor/tags.rb

@@ -8,7 +8,7 @@ module Motor
       return taggable unless tags
 
       tags.each do |tag_name|
-        next if taggable.taggable_tags.find { |tt| tt.tag.name.downcase == tag_name.downcase }
+        next if taggable.taggable_tags.find { |tt| tt.tag.name.casecmp(tag_name).zero? }
 
         tag = Tag.where('lower(name) = ?', tag_name.downcase).take || Tag.new(name: tag_name)
 

data/lib/motor/tasks/motor.rake

@@ -3,6 +3,10 @@
 namespace :motor do
   desc 'Update configs/motor.yml file'
 
+  task install: :environment do
+    Rails::Generators.invoke('motor:install')
+  end
+
   task dump: :environment do
     Motor::Configs::WriteToFile.write_with_lock
 

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.47'
+  VERSION = '0.1.48'
 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-5cac10cadc5aa16e9b69.css.gz": "main-5cac10cadc5aa16e9b69.css.gz",
-  "main-5cac10cadc5aa16e9b69.js.LICENSE.txt": "main-5cac10cadc5aa16e9b69.js.LICENSE.txt",
-  "main-5cac10cadc5aa16e9b69.js.gz": "main-5cac10cadc5aa16e9b69.js.gz",
-  "main.css": "main-5cac10cadc5aa16e9b69.css",
-  "main.js": "main-5cac10cadc5aa16e9b69.js",
+  "main-af386d0c907b80c29f22.css.gz": "main-af386d0c907b80c29f22.css.gz",
+  "main-af386d0c907b80c29f22.js.LICENSE.txt": "main-af386d0c907b80c29f22.js.LICENSE.txt",
+  "main-af386d0c907b80c29f22.js.gz": "main-af386d0c907b80c29f22.js.gz",
+  "main.css": "main-af386d0c907b80c29f22.css",
+  "main.js": "main-af386d0c907b80c29f22.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.47
+  version: 0.1.48
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -118,6 +118,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/motor/current_user_method.rb
 - app/controllers/concerns/motor/load_and_authorize_dynamic_resource.rb
 - app/controllers/concerns/motor/wrap_io_params.rb
 - app/controllers/motor/active_storage_attachments_controller.rb
@@ -1480,8 +1481,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-5cac10cadc5aa16e9b69.css.gz
-- ui/dist/main-5cac10cadc5aa16e9b69.js.gz
+- ui/dist/main-af386d0c907b80c29f22.css.gz
+- ui/dist/main-af386d0c907b80c29f22.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: