motor-admin 0.2.11 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5b90096b26ecbc08a8db9eab674f5eb73968cbd3e67fef43c476142f75543e
-  data.tar.gz: fba671589698de0216d59280c9935f940705d12c837808beed32e5de64dec443
+  metadata.gz: 0254bb1cf5ab3176c1c2e923ad755e1f6e445da757aa7981b93b127cb5757c57
+  data.tar.gz: b8c3a27811eb765056a67ffd9f1cb35fbc374b810be25cfa1de2f9791764f162
 SHA512:
-  metadata.gz: 64046834ea3379dc2e79b1261b985fff168c5c52d19cd2540b6e951d0d669816a78fa21ac544a9cf4b82f81425f73917db39430e42b04d12db66279a3c159a62
-  data.tar.gz: 22c5025d749429478eb6f2d2d74a2264cbe5153a42b32b6cb2986ed1d694714cfce007a8751cea224748e7521ee5efe40f1ff06531d185e475b8e2a0fe58dce6
+  metadata.gz: 07a1cfb97147d11a5f8abd505e7ab2f91a3568a817ced4043b0db394cf3c8d097ae1bbaca27a391af6b133aea89d9a9470afac9ed670b693098d854168c3656c
+  data.tar.gz: be58770afa9930c45e0e66e34d5762de7f3d44acf8775afc01cc945c7a13410a0c1b342f6be0e44f0f59047a5fc7a50d20fec1df5e7d1aaeb3a3c541c3743db3

data/README.md

@@ -2,7 +2,7 @@
 
 Low-code Admin panel and Business intelligence Rails engine **(no DSL - configurable from the UI)**.
 
-🤓 [Demo App](https://motor-admin.herokuapp.com/demo) | 👀 [Features overview](https://www.youtube.com/watch?v=ngVoci8Hll4&list=PLu7llEMh0KcOkR3Uy_RJT0cXPZQKAYVsq&index=1) | ⭐ [Stargathers](https://github.com/omohokcoj/motor-admin/stargazers)
+🤓 [Demo App](https://motor-admin.herokuapp.com/demo) | 👀 [Features overview](https://www.youtube.com/watch?v=ngVoci8Hll4&list=PLu7llEMh0KcOkR3Uy_RJT0cXPZQKAYVsq&index=1) | ⭐ [Pro](https://www.getmotoradmin.com/pro)
 
 [![Admin Panel](https://user-images.githubusercontent.com/5418788/119318538-1f30e300-bc82-11eb-94a4-107c31c93b13.png)](https://motor-admin.herokuapp.com/demo)
 
@@ -39,6 +39,19 @@ $ rails motor:install && rake db:migrate
 * [Optimized for mobile](#optimized-for-mobile)
 * [Configurations sync between environments](#configurations-sync)
 
+## [Pro](https://www.getmotoradmin.com/pro)
+
+* Multiple databases support
+* Audit log
+* Live collaboration
+* Multi-factor authentication
+* Custom styling
+* Personalized report alerts via Slack
+* Full-text search
+* Stripe integration
+* Shareable forms and reports
+* [learn more](https://www.getmotoradmin.com/pro)
+
 ### Customizable CRUD
 
 ![Resource settings](https://user-images.githubusercontent.com/5418788/119318569-2a840e80-bc82-11eb-9ba3-f3964eb6f997.png)
@@ -49,7 +62,7 @@ Everything in the admin panel can be configured using the intuitive settings UI,
 
 Data displayed on the resource page can be completely customized 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).
 
-[Learn more about resource customizations](https://github.com/omohokcoj/motor-admin/blob/master/guides/customizing_resource_table.md)
+[Learn more about resource customizations](https://github.com/motor-admin/motor-admin-rails/blob/master/guides/customizing_resource_table.md)
 
 ### Custom Actions
 
@@ -79,7 +92,7 @@ end
 
 Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`.
 
-[Learn more about custom forms builder](https://github.com/omohokcoj/motor-admin/blob/master/guides/building_custom_forms.md)
+[Learn more about custom forms builder](https://github.com/motor-admin/motor-admin-rails/blob/master/guides/building_custom_forms.md)
 
 ### SQL Queries
 
@@ -115,7 +128,7 @@ Intelligence search can be opened via the top right corner button or using <kbd>
 
 ### Authorization
 
-Motor Admin allows to set row-level and column-level permissions via [cancan](https://github.com/CanCanCommunity/cancancan) gem. Admin UI permissions should be defined in `app/models/motor/ability.rb` file in `Motor::Ability` class. See [Motor Admin guide](https://github.com/omohokcoj/motor-admin/blob/master/guides/defining_permissions.md) and [CanCan documentation](https://github.com/CanCanCommunity/cancancan/blob/develop/docs/Defining-Abilities.md) to learn how to define user permissions.
+Motor Admin allows to set row-level and column-level permissions via [cancan](https://github.com/CanCanCommunity/cancancan) gem. Admin UI permissions should be defined in `app/models/motor/ability.rb` file in `Motor::Ability` class. See [Motor Admin guide](https://github.com/motor-admin/motor-admin-rails/blob/master/guides/defining_permissions.md) and [CanCan documentation](https://github.com/CanCanCommunity/cancancan/blob/develop/docs/Defining-Abilities.md) to learn how to define user permissions.
 
 ### I18n
 
@@ -186,4 +199,4 @@ MOTOR_DEVELOPMENT=true rails s
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://github.com/omohokcoj/motor-admin/blob/master/LICENSE).
+The gem is available as open source under the terms of the [MIT License](https://github.com/motor-admin/motor-admin-rails/blob/master/LICENSE).

data/app/controllers/motor/data_controller.rb

@@ -10,10 +10,14 @@ module Motor
     def index
       @resources = Motor::ApiQuery.call(@resources, params)
 
-      render json: {
-        data: Motor::ApiQuery::BuildJson.call(@resources, params, current_ability),
-        meta: Motor::ApiQuery::BuildMeta.call(@resources, params)
-      }
+      if params[:format] == 'csv'
+        render plain: Motor::ActiveRecordUtils.generate_csv_for_relation(@resources, reset_limit: true)
+      else
+        render json: {
+          data: Motor::ApiQuery::BuildJson.call(@resources, params, current_ability),
+          meta: Motor::ApiQuery::BuildMeta.call(@resources, params)
+        }
+      end
     end
 
     def show

data/app/controllers/motor/sessions_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Motor
+  class SessionsController < ApiBaseController
+    skip_authorization_check
+
+    def destroy
+      session.clear
+
+      head :ok
+    end
+  end
+end

data/config/locales/en.yml

@@ -266,3 +266,11 @@ en:
     video: Video
     display_column: Display column
     not_authorized_to_perform_action: You are not authorized to perform this action.
+    download: Download
+    alert: Alert
+    downloading: Downloading
+    display_id: Display ID
+    display_settings: Display settings
+    sign_out: Sign out
+    header: Header
+    user_dropdown: User dropdown

data/config/locales/es.yml

@@ -266,6 +266,14 @@ es:
     video: Video
     display_column: Columna de visualización
     not_authorized_to_perform_action: No está autorizado a realizar esta acción.
+    download: Descargar
+    alert: Alerta
+    downloading: Descargando
+    display_id: Visualizar ID
+    display_settings: Configuración de la pantalla
+    sign_out: Sign out
+    header: Header
+    user_dropdown: User dropdown
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -262,6 +262,14 @@ pt:
     video: Vídeo
     display_column: Coluna de exibição
     not_authorized_to_perform_action: Não está autorizado a realizar esta acção.
+    download: Descarregar
+    alert: Alerta
+    downloading: Descarregamento
+    display_id: Mostrar ID
+    display_settings: Definições de visualização
+    sign_out: Sign out
+    header: Header
+    user_dropdown: User dropdown
     i:
       locale: pt
       select:

data/config/routes.rb

@@ -19,6 +19,7 @@ Motor::Admin.routes.draw do
       resources :icons, only: %i[index]
       resources :active_storage_attachments, only: %i[create], path: 'data/active_storage__attachments'
       resources :audits, only: %i[index]
+      resource :session, only: %i[destroy]
       resources :resources, path: '/data/:resource',
                             only: %i[index show update create destroy],
                             controller: 'data',

data/lib/generators/motor/templates/install.rb

@@ -150,7 +150,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
     model.create!(key: 'header.links', value: [{
       name: '⭐ Star on GitHub',
-      path: 'https://github.com/omohokcoj/motor-admin'
+      path: 'https://github.com/motor-admin/motor-admin-rails'
     }].to_json)
   end
 

data/lib/motor/active_record_utils/types.rb

@@ -21,6 +21,7 @@ module Motor
         'text' => 'string',
         'citext' => 'string',
         'jsonb' => 'json',
+        'bool' => 'boolean',
         'timestamp' => 'datetime'
       }.freeze
 

data/lib/motor/active_record_utils.rb

@@ -12,6 +12,18 @@ module Motor
         ActiveRecord::Base.connection.reset_sequence!(model.table_name, 'id')
       end
     end
+
+    def generate_csv_for_relation(relation, reset_limit: false)
+      relation = relation.limit(nil).offset(nil) if reset_limit
+
+      result = relation.klass.connection.exec_query(relation.to_sql)
+
+      CSV.generate do |csv|
+        csv << result.columns
+
+        result.rows.each { |row| csv << row }
+      end
+    end
   end
 end
 

data/lib/motor/build_schema/load_from_rails.rb

@@ -76,7 +76,8 @@ module Motor
           actions: BuildSchema::Defaults.actions,
           tabs: BuildSchema::Defaults.tabs,
           custom_sql: nil,
-          visible: true
+          visible: true,
+          display_primary_key: true
         }.with_indifferent_access
       end
 

data/lib/motor/build_schema/merge_schema_configs.rb

@@ -135,7 +135,7 @@ module Motor
               access_type: ColumnAccessTypes::READ_ONLY,
               column_source: ColumnSources::QUERY,
               virtual: false
-            )
+            ).with_indifferent_access
           end
 
         reflection_columns = columns_index.values.select { |c| c[:column_source] == ColumnSources::REFLECTION }

data/lib/motor/queries/run_query.rb

@@ -83,18 +83,52 @@ module Motor
       # @param result [ActiveRecord::Result]
       # @return [Hash]
       def build_columns_hash(result)
-        result.columns.map do |column_name|
-          column_type = result.column_types[column_name]
+        result.columns.map.with_index do |column_name, index|
+          column_type_class = result.column_types[column_name]
+
+          column_type =
+            if column_type_class
+              ActiveRecordUtils::Types.find_name_for_type(column_type_class)
+            else
+              not_nil_value = result.rows.reduce(nil) do |acc, row|
+                column = row[index]
+
+                break column unless column.nil?
+
+                acc
+              end
+
+              fetch_column_type_from_value(not_nil_value)
+            end
 
           {
             name: column_name,
             display_name: column_name.humanize,
-            column_type: ActiveRecordUtils::Types.find_name_for_type(column_type),
+            column_type: column_type,
             is_array: column_type.class.to_s == 'ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array'
           }
         end
       end
 
+      # @param value [Object]
+      # @return [String]
+      def fetch_column_type_from_value(value)
+        case value
+        when Integer
+          'integer'
+        when Float
+          'float'
+        when Time
+          'datetime'
+        when Date
+          'date'
+        when TrueClass, FalseClass
+          'boolean'
+        else
+          'string'
+        end
+      end
+
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]

data/lib/motor/resources.rb

@@ -2,7 +2,7 @@
 
 module Motor
   module Resources
-    RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible].freeze
+    RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key].freeze
     COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -2601,9 +2601,9 @@
   "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
   "icons/zoom-question.svg": "icons/zoom-question.svg",
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
-  "main-192e078f9e813b1ffe93.css.gz": "main-192e078f9e813b1ffe93.css.gz",
-  "main-192e078f9e813b1ffe93.js.LICENSE.txt": "main-192e078f9e813b1ffe93.js.LICENSE.txt",
-  "main-192e078f9e813b1ffe93.js.gz": "main-192e078f9e813b1ffe93.js.gz",
-  "main.css": "main-192e078f9e813b1ffe93.css",
-  "main.js": "main-192e078f9e813b1ffe93.js"
+  "main-e5afce0ea81ef4505dc5.css.gz": "main-e5afce0ea81ef4505dc5.css.gz",
+  "main-e5afce0ea81ef4505dc5.js.LICENSE.txt": "main-e5afce0ea81ef4505dc5.js.LICENSE.txt",
+  "main-e5afce0ea81ef4505dc5.js.gz": "main-e5afce0ea81ef4505dc5.js.gz",
+  "main.css": "main-e5afce0ea81ef4505dc5.css",
+  "main.js": "main-e5afce0ea81ef4505dc5.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.15
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -130,6 +130,7 @@ files:
 - app/controllers/motor/run_queries_controller.rb
 - app/controllers/motor/schema_controller.rb
 - app/controllers/motor/send_alerts_controller.rb
+- app/controllers/motor/sessions_controller.rb
 - app/controllers/motor/tags_controller.rb
 - app/controllers/motor/ui_controller.rb
 - app/jobs/motor/alert_sending_job.rb
@@ -1524,8 +1525,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-192e078f9e813b1ffe93.css.gz
-- ui/dist/main-192e078f9e813b1ffe93.js.gz
+- ui/dist/main-e5afce0ea81ef4505dc5.css.gz
+- ui/dist/main-e5afce0ea81ef4505dc5.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: