motor-admin 0.2.10 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e7ce842fbd5202f73efe93edfea13a5391070ed46a44c4c7d15d9ed3ad68aed
-  data.tar.gz: cb7dee7ba4ca6b4542bf6d333eb04f2de1c4409a795d1530ac3c81e76cfb4dce
+  metadata.gz: 83d142a47680bf5eed1aea0f1fccb5b90de231d8105036a5d284cf79d43d586e
+  data.tar.gz: 2a9dfd66258c1c446aabc2e1367fad73f1df56867b61d79d47142eefea71622a
 SHA512:
-  metadata.gz: 468b9e8e9a4adab3e1006796e87894ca73e339e3663e9e2a61337512e305e5e22df787a260f49604c10c14934c1022164efda71fc59619848ee9f655e065e421
-  data.tar.gz: c31e7faea409f3e78ea2f6840d2b3cdc8aa6ae82cbc831edee65b7220777503c52d745f7ce78a74b21f2caca147bb6a7f5f38b154b7b4409c8a67be529286fac
+  metadata.gz: fdbfad1a4edd14c987c1f956e525044176ef445125a3e43ae4284618cc0721343a2a28a3c03dcb1d470fd9f746e699cff209911597c71b320540cc11655774b8
+  data.tar.gz: d2c662baf663b0cb76edc3ced65c1b331bbf452aaa1a6fa75d4a73cfcd72d7ad0018a4529536a33fe91d6825aa553ad867289895d79398cc73b86ebd1bc0116f

data/README.md

@@ -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)

data/app/controllers/motor/api_base_controller.rb

@@ -22,7 +22,11 @@ module Motor
       rescue_from CanCan::AccessDenied do |e|
         Rails.logger.error(e)
 
-        render json: { errors: [e.message] }, status: :forbidden
+        if params[:action].in?(%w[create update destroy])
+          render json: { errors: [I18n.t('motor.not_authorized_to_perform_action')] }, status: :forbidden
+        else
+          render json: { errors: [e.message] }, status: :forbidden
+        end
       end
     end
   end

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

@@ -265,3 +265,12 @@ en:
     audio: Audio
     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

@@ -265,6 +265,15 @@ es:
     audio: Audio
     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

@@ -261,6 +261,15 @@ pt:
     audio: Áudio
     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/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.10'
+  VERSION = '0.2.14'
 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-9d527c31af98f3d09fea.css.gz": "main-9d527c31af98f3d09fea.css.gz",
-  "main-9d527c31af98f3d09fea.js.LICENSE.txt": "main-9d527c31af98f3d09fea.js.LICENSE.txt",
-  "main-9d527c31af98f3d09fea.js.gz": "main-9d527c31af98f3d09fea.js.gz",
-  "main.css": "main-9d527c31af98f3d09fea.css",
-  "main.js": "main-9d527c31af98f3d09fea.js"
+  "main-6568183ef6647799a421.css.gz": "main-6568183ef6647799a421.css.gz",
+  "main-6568183ef6647799a421.js.LICENSE.txt": "main-6568183ef6647799a421.js.LICENSE.txt",
+  "main-6568183ef6647799a421.js.gz": "main-6568183ef6647799a421.js.gz",
+  "main.css": "main-6568183ef6647799a421.css",
+  "main.js": "main-6568183ef6647799a421.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.14
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-15 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-9d527c31af98f3d09fea.css.gz
-- ui/dist/main-9d527c31af98f3d09fea.js.gz
+- ui/dist/main-6568183ef6647799a421.css.gz
+- ui/dist/main-6568183ef6647799a421.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: